Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change the interface of LocalizationHelper::setCurrentManager.

This commit is contained in:
beichen.liu 2016-03-03 16:19:16 +08:00
parent 0489fd76e8 a6b02fcc5b
commit b207d559ae
147 changed files with 19076 additions and 12970 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
CMakeLists.txt
View File

@ -1,6 +1,7 @@
#/****************************************************************************
# Copyright (c) 2013 cocos2d-x.org
# Copyright (c) 2014 martell malone
# Copyright (c) 2015 Chukong Technologies Inc.
#
# http://www.cocos2d-x.org
#
@ -23,7 +24,7 @@
# THE SOFTWARE.
# ****************************************************************************/
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 3.1)
# It ensures that when Find*.cmake files included from cmake's Modules dir
# include another *.cmake file with relative path, that file will be included
# also from cmake's Modules dir, to not clash with per-project files.
@ -38,7 +39,7 @@ endif()
project (Cocos2d-X)
# The version number
set(COCOS2D_X_VERSION 3.10)
set(COCOS2D_X_VERSION 3.11)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/Modules/")
include(CocosBuildHelpers)
@ -55,6 +56,7 @@ if(MINGW)
set(USE_PREBUILT_LIBS_DEFAULT OFF)
endif()
set(BUILD_CPP_EMPTY_TEST_DEFAULT ON)
set(BUILD_CPP_TESTS_DEFAULT ON)
set(BUILD_LUA_LIBS_DEFAULT ON)
set(BUILD_LUA_TESTS_DEFAULT ON)
@ -62,6 +64,7 @@ set(BUILD_JS_LIBS_DEFAULT ON)
set(BUILD_JS_TESTS_DEFAULT ON)
# TODO: fix test samples for MSVC
if(MSVC)
set(BUILD_CPP_EMPTY_TEST_DEFAULT OFF)
set(BUILD_CPP_TESTS_DEFAULT OFF)
set(BUILD_LUA_LIBS_DEFAULT OFF)
set(BUILD_LUA_TESTS_DEFAULT OFF)
@ -81,6 +84,7 @@ 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_CPP_TESTS "Build TestCpp samples" ${BUILD_CPP_TESTS_DEFAULT})
option(BUILD_CPP_EMPTY_TEST "Build TestCpp samples" ${BUILD_CPP_EMPTY_TEST_DEFAULT})
option(BUILD_LUA_LIBS "Build lua libraries" ${BUILD_LUA_LIBS_DEFAULT})
option(BUILD_LUA_TESTS "Build TestLua samples" ${BUILD_LUA_TESTS_DEFAULT})
option(BUILD_JS_LIBS "Build js libraries" ${BUILD_JS_LIBS_DEFAULT})
@ -116,7 +120,7 @@ if(MSVC)
else()
set(CMAKE_C_FLAGS_DEBUG "-g -Wall -Wextra -DCOCOS2D_DEBUG=1")
set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-deprecated-declarations -Wno-reorder")
if(CLANG)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
@ -146,6 +150,8 @@ elseif(LINUX)
elseif(ANDROID)
ADD_DEFINITIONS (-DUSE_FILE32API)
set(PLATFORM_FOLDER android)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fexceptions")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char -latomic")
else()
message( FATAL_ERROR "Unsupported platform, CMake will exit" )
endif()
@ -224,7 +230,9 @@ endif(USE_WEBP)
# Chipmunk
if(USE_CHIPMUNK)
cocos_find_package(Chipmunk CHIPMUNK REQUIRED)
if(USE_PREBUILT_LIBS)
cocos_find_package(Chipmunk CHIPMUNK REQUIRED)
endif()
add_definitions(-DCC_ENABLE_CHIPMUNK_INTEGRATION=1)
if(IOS OR MACOSX)
# without this chipmunk will try to use apple defined geometry types, that conflicts with cocos
@ -347,9 +355,13 @@ endif()
# libcocos2d.a
add_subdirectory(cocos)
# build cpp tests
if(BUILD_CPP_TESTS)
# build cpp-empty-test
if(BUILD_CPP_EMPTY_TEST)
add_subdirectory(tests/cpp-empty-test)
endif(BUILD_CPP_EMPTY_TEST)
# build cpp-tests
if(BUILD_CPP_TESTS)
add_subdirectory(tests/cpp-tests)
endif(BUILD_CPP_TESTS)

317
build/cocos2d_libs.xcodeproj/project.pbxproj
View File

@ -3359,6 +3359,99 @@
507B40F71C31BDD30067B53E /* ButtonReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB6B18C72017004AD434 /* ButtonReader.h */; };
507B40F81C31BDD30067B53E /* btTriangleCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = B6CAB0941AF9AA1900B9B856 /* btTriangleCallback.h */; };
507B40F91C31BDD30067B53E /* CCIDownloaderImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = A0534A691B87306E006B03E5 /* CCIDownloaderImpl.h */; };
50864C8B1C7BC1B000B3BAB1 /* chipmunk.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C6D1C7BC1B000B3BAB1 /* chipmunk.h */; };
50864C8C1C7BC1B000B3BAB1 /* chipmunk.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C6D1C7BC1B000B3BAB1 /* chipmunk.h */; };
50864C8D1C7BC1B000B3BAB1 /* chipmunk.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C6D1C7BC1B000B3BAB1 /* chipmunk.h */; };
50864C8E1C7BC1B000B3BAB1 /* chipmunk_ffi.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C6E1C7BC1B000B3BAB1 /* chipmunk_ffi.h */; };
50864C8F1C7BC1B000B3BAB1 /* chipmunk_ffi.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C6E1C7BC1B000B3BAB1 /* chipmunk_ffi.h */; };
50864C901C7BC1B000B3BAB1 /* chipmunk_ffi.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C6E1C7BC1B000B3BAB1 /* chipmunk_ffi.h */; };
50864C911C7BC1B000B3BAB1 /* chipmunk_private.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C6F1C7BC1B000B3BAB1 /* chipmunk_private.h */; };
50864C921C7BC1B000B3BAB1 /* chipmunk_private.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C6F1C7BC1B000B3BAB1 /* chipmunk_private.h */; };
50864C931C7BC1B000B3BAB1 /* chipmunk_private.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C6F1C7BC1B000B3BAB1 /* chipmunk_private.h */; };
50864C941C7BC1B000B3BAB1 /* chipmunk_types.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C701C7BC1B000B3BAB1 /* chipmunk_types.h */; };
50864C951C7BC1B000B3BAB1 /* chipmunk_types.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C701C7BC1B000B3BAB1 /* chipmunk_types.h */; };
50864C961C7BC1B000B3BAB1 /* chipmunk_types.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C701C7BC1B000B3BAB1 /* chipmunk_types.h */; };
50864C971C7BC1B000B3BAB1 /* chipmunk_unsafe.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C711C7BC1B000B3BAB1 /* chipmunk_unsafe.h */; };
50864C981C7BC1B000B3BAB1 /* chipmunk_unsafe.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C711C7BC1B000B3BAB1 /* chipmunk_unsafe.h */; };
50864C991C7BC1B000B3BAB1 /* chipmunk_unsafe.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C711C7BC1B000B3BAB1 /* chipmunk_unsafe.h */; };
50864C9A1C7BC1B000B3BAB1 /* cpCompat62.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C721C7BC1B000B3BAB1 /* cpCompat62.h */; };
50864C9B1C7BC1B000B3BAB1 /* cpCompat62.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C721C7BC1B000B3BAB1 /* cpCompat62.h */; };
50864C9C1C7BC1B000B3BAB1 /* cpCompat62.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C721C7BC1B000B3BAB1 /* cpCompat62.h */; };
50864C9D1C7BC1B000B3BAB1 /* cpArbiter.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C731C7BC1B000B3BAB1 /* cpArbiter.h */; };
50864C9E1C7BC1B000B3BAB1 /* cpArbiter.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C731C7BC1B000B3BAB1 /* cpArbiter.h */; };
50864C9F1C7BC1B000B3BAB1 /* cpArbiter.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C731C7BC1B000B3BAB1 /* cpArbiter.h */; };
50864CA01C7BC1B000B3BAB1 /* cpBB.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C741C7BC1B000B3BAB1 /* cpBB.h */; };
50864CA11C7BC1B000B3BAB1 /* cpBB.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C741C7BC1B000B3BAB1 /* cpBB.h */; };
50864CA21C7BC1B000B3BAB1 /* cpBB.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C741C7BC1B000B3BAB1 /* cpBB.h */; };
50864CA31C7BC1B000B3BAB1 /* cpBody.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C751C7BC1B000B3BAB1 /* cpBody.h */; };
50864CA41C7BC1B000B3BAB1 /* cpBody.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C751C7BC1B000B3BAB1 /* cpBody.h */; };
50864CA51C7BC1B000B3BAB1 /* cpBody.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C751C7BC1B000B3BAB1 /* cpBody.h */; };
50864CA61C7BC1B000B3BAB1 /* cpConstraint.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C761C7BC1B000B3BAB1 /* cpConstraint.h */; };
50864CA71C7BC1B000B3BAB1 /* cpConstraint.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C761C7BC1B000B3BAB1 /* cpConstraint.h */; };
50864CA81C7BC1B000B3BAB1 /* cpConstraint.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C761C7BC1B000B3BAB1 /* cpConstraint.h */; };
50864CA91C7BC1B000B3BAB1 /* cpDampedRotarySpring.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C771C7BC1B000B3BAB1 /* cpDampedRotarySpring.h */; };
50864CAA1C7BC1B000B3BAB1 /* cpDampedRotarySpring.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C771C7BC1B000B3BAB1 /* cpDampedRotarySpring.h */; };
50864CAB1C7BC1B000B3BAB1 /* cpDampedRotarySpring.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C771C7BC1B000B3BAB1 /* cpDampedRotarySpring.h */; };
50864CAC1C7BC1B000B3BAB1 /* cpDampedSpring.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C781C7BC1B000B3BAB1 /* cpDampedSpring.h */; };
50864CAD1C7BC1B000B3BAB1 /* cpDampedSpring.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C781C7BC1B000B3BAB1 /* cpDampedSpring.h */; };
50864CAE1C7BC1B000B3BAB1 /* cpDampedSpring.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C781C7BC1B000B3BAB1 /* cpDampedSpring.h */; };
50864CAF1C7BC1B000B3BAB1 /* cpGearJoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C791C7BC1B000B3BAB1 /* cpGearJoint.h */; };
50864CB01C7BC1B000B3BAB1 /* cpGearJoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C791C7BC1B000B3BAB1 /* cpGearJoint.h */; };
50864CB11C7BC1B000B3BAB1 /* cpGearJoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C791C7BC1B000B3BAB1 /* cpGearJoint.h */; };
50864CB21C7BC1B000B3BAB1 /* cpGrooveJoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C7A1C7BC1B000B3BAB1 /* cpGrooveJoint.h */; };
50864CB31C7BC1B000B3BAB1 /* cpGrooveJoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C7A1C7BC1B000B3BAB1 /* cpGrooveJoint.h */; };
50864CB41C7BC1B000B3BAB1 /* cpGrooveJoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C7A1C7BC1B000B3BAB1 /* cpGrooveJoint.h */; };
50864CB51C7BC1B000B3BAB1 /* cpHastySpace.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C7B1C7BC1B000B3BAB1 /* cpHastySpace.h */; };
50864CB61C7BC1B000B3BAB1 /* cpHastySpace.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C7B1C7BC1B000B3BAB1 /* cpHastySpace.h */; };
50864CB71C7BC1B000B3BAB1 /* cpHastySpace.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C7B1C7BC1B000B3BAB1 /* cpHastySpace.h */; };
50864CB81C7BC1B000B3BAB1 /* cpMarch.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C7C1C7BC1B000B3BAB1 /* cpMarch.h */; };
50864CB91C7BC1B000B3BAB1 /* cpMarch.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C7C1C7BC1B000B3BAB1 /* cpMarch.h */; };
50864CBA1C7BC1B000B3BAB1 /* cpMarch.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C7C1C7BC1B000B3BAB1 /* cpMarch.h */; };
50864CBB1C7BC1B000B3BAB1 /* cpPinJoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C7D1C7BC1B000B3BAB1 /* cpPinJoint.h */; };
50864CBC1C7BC1B000B3BAB1 /* cpPinJoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C7D1C7BC1B000B3BAB1 /* cpPinJoint.h */; };
50864CBD1C7BC1B000B3BAB1 /* cpPinJoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C7D1C7BC1B000B3BAB1 /* cpPinJoint.h */; };
50864CBE1C7BC1B000B3BAB1 /* cpPivotJoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C7E1C7BC1B000B3BAB1 /* cpPivotJoint.h */; };
50864CBF1C7BC1B000B3BAB1 /* cpPivotJoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C7E1C7BC1B000B3BAB1 /* cpPivotJoint.h */; };
50864CC01C7BC1B000B3BAB1 /* cpPivotJoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C7E1C7BC1B000B3BAB1 /* cpPivotJoint.h */; };
50864CC11C7BC1B000B3BAB1 /* cpPolyline.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C7F1C7BC1B000B3BAB1 /* cpPolyline.h */; };
50864CC21C7BC1B100B3BAB1 /* cpPolyline.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C7F1C7BC1B000B3BAB1 /* cpPolyline.h */; };
50864CC31C7BC1B100B3BAB1 /* cpPolyline.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C7F1C7BC1B000B3BAB1 /* cpPolyline.h */; };
50864CC41C7BC1B100B3BAB1 /* cpPolyShape.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C801C7BC1B000B3BAB1 /* cpPolyShape.h */; };
50864CC51C7BC1B100B3BAB1 /* cpPolyShape.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C801C7BC1B000B3BAB1 /* cpPolyShape.h */; };
50864CC61C7BC1B100B3BAB1 /* cpPolyShape.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C801C7BC1B000B3BAB1 /* cpPolyShape.h */; };
50864CC71C7BC1B100B3BAB1 /* cpRatchetJoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C811C7BC1B000B3BAB1 /* cpRatchetJoint.h */; };
50864CC81C7BC1B100B3BAB1 /* cpRatchetJoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C811C7BC1B000B3BAB1 /* cpRatchetJoint.h */; };
50864CC91C7BC1B100B3BAB1 /* cpRatchetJoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C811C7BC1B000B3BAB1 /* cpRatchetJoint.h */; };
50864CCA1C7BC1B100B3BAB1 /* cpRobust.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C821C7BC1B000B3BAB1 /* cpRobust.h */; };
50864CCB1C7BC1B100B3BAB1 /* cpRobust.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C821C7BC1B000B3BAB1 /* cpRobust.h */; };
50864CCC1C7BC1B100B3BAB1 /* cpRobust.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C821C7BC1B000B3BAB1 /* cpRobust.h */; };
50864CCD1C7BC1B100B3BAB1 /* cpRotaryLimitJoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C831C7BC1B000B3BAB1 /* cpRotaryLimitJoint.h */; };
50864CCE1C7BC1B100B3BAB1 /* cpRotaryLimitJoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C831C7BC1B000B3BAB1 /* cpRotaryLimitJoint.h */; };
50864CCF1C7BC1B100B3BAB1 /* cpRotaryLimitJoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C831C7BC1B000B3BAB1 /* cpRotaryLimitJoint.h */; };
50864CD01C7BC1B100B3BAB1 /* cpShape.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C841C7BC1B000B3BAB1 /* cpShape.h */; };
50864CD11C7BC1B100B3BAB1 /* cpShape.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C841C7BC1B000B3BAB1 /* cpShape.h */; };
50864CD21C7BC1B100B3BAB1 /* cpShape.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C841C7BC1B000B3BAB1 /* cpShape.h */; };
50864CD31C7BC1B100B3BAB1 /* cpSimpleMotor.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C851C7BC1B000B3BAB1 /* cpSimpleMotor.h */; };
50864CD41C7BC1B100B3BAB1 /* cpSimpleMotor.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C851C7BC1B000B3BAB1 /* cpSimpleMotor.h */; };
50864CD51C7BC1B100B3BAB1 /* cpSimpleMotor.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C851C7BC1B000B3BAB1 /* cpSimpleMotor.h */; };
50864CD61C7BC1B100B3BAB1 /* cpSlideJoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C861C7BC1B000B3BAB1 /* cpSlideJoint.h */; };
50864CD71C7BC1B100B3BAB1 /* cpSlideJoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C861C7BC1B000B3BAB1 /* cpSlideJoint.h */; };
50864CD81C7BC1B100B3BAB1 /* cpSlideJoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C861C7BC1B000B3BAB1 /* cpSlideJoint.h */; };
50864CD91C7BC1B100B3BAB1 /* cpSpace.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C871C7BC1B000B3BAB1 /* cpSpace.h */; };
50864CDA1C7BC1B100B3BAB1 /* cpSpace.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C871C7BC1B000B3BAB1 /* cpSpace.h */; };
50864CDB1C7BC1B100B3BAB1 /* cpSpace.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C871C7BC1B000B3BAB1 /* cpSpace.h */; };
50864CDC1C7BC1B100B3BAB1 /* cpSpatialIndex.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C881C7BC1B000B3BAB1 /* cpSpatialIndex.h */; };
50864CDD1C7BC1B100B3BAB1 /* cpSpatialIndex.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C881C7BC1B000B3BAB1 /* cpSpatialIndex.h */; };
50864CDE1C7BC1B100B3BAB1 /* cpSpatialIndex.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C881C7BC1B000B3BAB1 /* cpSpatialIndex.h */; };
50864CDF1C7BC1B100B3BAB1 /* cpTransform.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C891C7BC1B000B3BAB1 /* cpTransform.h */; };
50864CE01C7BC1B100B3BAB1 /* cpTransform.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C891C7BC1B000B3BAB1 /* cpTransform.h */; };
50864CE11C7BC1B100B3BAB1 /* cpTransform.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C891C7BC1B000B3BAB1 /* cpTransform.h */; };
50864CE21C7BC1B100B3BAB1 /* cpVect.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C8A1C7BC1B000B3BAB1 /* cpVect.h */; };
50864CE31C7BC1B100B3BAB1 /* cpVect.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C8A1C7BC1B000B3BAB1 /* cpVect.h */; };
50864CE41C7BC1B100B3BAB1 /* cpVect.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864C8A1C7BC1B000B3BAB1 /* cpVect.h */; };
50864CEA1C7BC90A00B3BAB1 /* cpCompat62.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864CE61C7BC90A00B3BAB1 /* cpCompat62.h */; };
50864CEB1C7BC90A00B3BAB1 /* cpCompat62.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864CE61C7BC90A00B3BAB1 /* cpCompat62.h */; };
50864CEC1C7BC90A00B3BAB1 /* cpCompat62.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864CE61C7BC90A00B3BAB1 /* cpCompat62.h */; };
5091A7A319BFABA800AC8789 /* CCPlatformDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 5091A7A219BFABA800AC8789 /* CCPlatformDefine.h */; };
50ABBD381925AB0000A911A9 /* CCAffineTransform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD1B1925AB0000A911A9 /* CCAffineTransform.cpp */; };
50ABBD391925AB0000A911A9 /* CCAffineTransform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD1B1925AB0000A911A9 /* CCAffineTransform.cpp */; };
@ -5514,6 +5607,19 @@
C50306771B60B5B2001E6D43 /* CSBoneBinary_generated.h in Headers */ = {isa = PBXBuildFile; fileRef = C50306721B60B5B2001E6D43 /* CSBoneBinary_generated.h */; };
C50306781B60B5B2001E6D43 /* SkeletonNodeReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C50306731B60B5B2001E6D43 /* SkeletonNodeReader.cpp */; };
C50306791B60B5B2001E6D43 /* SkeletonNodeReader.h in Headers */ = {isa = PBXBuildFile; fileRef = C50306741B60B5B2001E6D43 /* SkeletonNodeReader.h */; };
C5F516121C8216660013B695 /* UITabControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C5F516101C8216660013B695 /* UITabControl.cpp */; };
C5F516131C8216660013B695 /* UITabControl.h in Headers */ = {isa = PBXBuildFile; fileRef = C5F516111C8216660013B695 /* UITabControl.h */; };
C5F516181C8216C60013B695 /* CSTabControl_generated.h in Headers */ = {isa = PBXBuildFile; fileRef = C5F516151C8216C60013B695 /* CSTabControl_generated.h */; };
C5F516191C8216C60013B695 /* TabControlReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C5F516161C8216C60013B695 /* TabControlReader.cpp */; };
C5F5161A1C8216C60013B695 /* TabControlReader.h in Headers */ = {isa = PBXBuildFile; fileRef = C5F516171C8216C60013B695 /* TabControlReader.h */; };
C5F5161D1C822D400013B695 /* TabControlReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C5F516161C8216C60013B695 /* TabControlReader.cpp */; };
C5F5161E1C822D5B0013B695 /* TabControlReader.h in Headers */ = {isa = PBXBuildFile; fileRef = C5F516171C8216C60013B695 /* TabControlReader.h */; };
C5F5161F1C822D6D0013B695 /* UITabControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C5F516101C8216660013B695 /* UITabControl.cpp */; };
C5F516201C822D900013B695 /* UITabControl.h in Headers */ = {isa = PBXBuildFile; fileRef = C5F516111C8216660013B695 /* UITabControl.h */; };
C5F516211C822DED0013B695 /* UITabControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C5F516101C8216660013B695 /* UITabControl.cpp */; };
C5F516221C822E060013B695 /* TabControlReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C5F516161C8216C60013B695 /* TabControlReader.cpp */; };
C5F516231C822E190013B695 /* UITabControl.h in Headers */ = {isa = PBXBuildFile; fileRef = C5F516111C8216660013B695 /* UITabControl.h */; };
C5F516251C822E470013B695 /* TabControlReader.h in Headers */ = {isa = PBXBuildFile; fileRef = C5F516171C8216C60013B695 /* TabControlReader.h */; };
D0FD03491A3B51AA00825BB5 /* CCAllocatorBase.h in Headers */ = {isa = PBXBuildFile; fileRef = D0FD033B1A3B51AA00825BB5 /* CCAllocatorBase.h */; };
D0FD034A1A3B51AA00825BB5 /* CCAllocatorBase.h in Headers */ = {isa = PBXBuildFile; fileRef = D0FD033B1A3B51AA00825BB5 /* CCAllocatorBase.h */; };
D0FD034B1A3B51AA00825BB5 /* CCAllocatorDiagnostics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0FD033C1A3B51AA00825BB5 /* CCAllocatorDiagnostics.cpp */; };
@ -6351,6 +6457,37 @@
507003191B69735200E83DDD /* HttpConnection-winrt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "HttpConnection-winrt.cpp"; sourceTree = "<group>"; };
5070031A1B69735200E83DDD /* HttpConnection-winrt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "HttpConnection-winrt.h"; sourceTree = "<group>"; };
507B40FD1C31BDD30067B53E /* libcocos2d tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos2d tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
50864C6D1C7BC1B000B3BAB1 /* chipmunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chipmunk.h; sourceTree = "<group>"; };
50864C6E1C7BC1B000B3BAB1 /* chipmunk_ffi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chipmunk_ffi.h; sourceTree = "<group>"; };
50864C6F1C7BC1B000B3BAB1 /* chipmunk_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chipmunk_private.h; sourceTree = "<group>"; };
50864C701C7BC1B000B3BAB1 /* chipmunk_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chipmunk_types.h; sourceTree = "<group>"; };
50864C711C7BC1B000B3BAB1 /* chipmunk_unsafe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chipmunk_unsafe.h; sourceTree = "<group>"; };
50864C721C7BC1B000B3BAB1 /* cpCompat62.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpCompat62.h; sourceTree = "<group>"; };
50864C731C7BC1B000B3BAB1 /* cpArbiter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpArbiter.h; sourceTree = "<group>"; };
50864C741C7BC1B000B3BAB1 /* cpBB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpBB.h; sourceTree = "<group>"; };
50864C751C7BC1B000B3BAB1 /* cpBody.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpBody.h; sourceTree = "<group>"; };
50864C761C7BC1B000B3BAB1 /* cpConstraint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpConstraint.h; sourceTree = "<group>"; };
50864C771C7BC1B000B3BAB1 /* cpDampedRotarySpring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpDampedRotarySpring.h; sourceTree = "<group>"; };
50864C781C7BC1B000B3BAB1 /* cpDampedSpring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpDampedSpring.h; sourceTree = "<group>"; };
50864C791C7BC1B000B3BAB1 /* cpGearJoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpGearJoint.h; sourceTree = "<group>"; };
50864C7A1C7BC1B000B3BAB1 /* cpGrooveJoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpGrooveJoint.h; sourceTree = "<group>"; };
50864C7B1C7BC1B000B3BAB1 /* cpHastySpace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpHastySpace.h; sourceTree = "<group>"; };
50864C7C1C7BC1B000B3BAB1 /* cpMarch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpMarch.h; sourceTree = "<group>"; };
50864C7D1C7BC1B000B3BAB1 /* cpPinJoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpPinJoint.h; sourceTree = "<group>"; };
50864C7E1C7BC1B000B3BAB1 /* cpPivotJoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpPivotJoint.h; sourceTree = "<group>"; };
50864C7F1C7BC1B000B3BAB1 /* cpPolyline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpPolyline.h; sourceTree = "<group>"; };
50864C801C7BC1B000B3BAB1 /* cpPolyShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpPolyShape.h; sourceTree = "<group>"; };
50864C811C7BC1B000B3BAB1 /* cpRatchetJoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpRatchetJoint.h; sourceTree = "<group>"; };
50864C821C7BC1B000B3BAB1 /* cpRobust.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpRobust.h; sourceTree = "<group>"; };
50864C831C7BC1B000B3BAB1 /* cpRotaryLimitJoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpRotaryLimitJoint.h; sourceTree = "<group>"; };
50864C841C7BC1B000B3BAB1 /* cpShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpShape.h; sourceTree = "<group>"; };
50864C851C7BC1B000B3BAB1 /* cpSimpleMotor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpSimpleMotor.h; sourceTree = "<group>"; };
50864C861C7BC1B000B3BAB1 /* cpSlideJoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpSlideJoint.h; sourceTree = "<group>"; };
50864C871C7BC1B000B3BAB1 /* cpSpace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpSpace.h; sourceTree = "<group>"; };
50864C881C7BC1B000B3BAB1 /* cpSpatialIndex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpSpatialIndex.h; sourceTree = "<group>"; };
50864C891C7BC1B000B3BAB1 /* cpTransform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpTransform.h; sourceTree = "<group>"; };
50864C8A1C7BC1B000B3BAB1 /* cpVect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpVect.h; sourceTree = "<group>"; };
50864CE61C7BC90A00B3BAB1 /* cpCompat62.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpCompat62.h; sourceTree = "<group>"; };
5091A7A219BFABA800AC8789 /* CCPlatformDefine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPlatformDefine.h; sourceTree = "<group>"; };
50ABBD1B1925AB0000A911A9 /* CCAffineTransform.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCAffineTransform.cpp; sourceTree = "<group>"; };
50ABBD1C1925AB0000A911A9 /* CCAffineTransform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCAffineTransform.h; sourceTree = "<group>"; };
@ -7500,6 +7637,11 @@
C50306721B60B5B2001E6D43 /* CSBoneBinary_generated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSBoneBinary_generated.h; path = SkeletonReader/CSBoneBinary_generated.h; sourceTree = "<group>"; };
C50306731B60B5B2001E6D43 /* SkeletonNodeReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkeletonNodeReader.cpp; path = SkeletonReader/SkeletonNodeReader.cpp; sourceTree = "<group>"; };
C50306741B60B5B2001E6D43 /* SkeletonNodeReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SkeletonNodeReader.h; path = SkeletonReader/SkeletonNodeReader.h; sourceTree = "<group>"; };
C5F516101C8216660013B695 /* UITabControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UITabControl.cpp; sourceTree = "<group>"; };
C5F516111C8216660013B695 /* UITabControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UITabControl.h; sourceTree = "<group>"; };
C5F516151C8216C60013B695 /* CSTabControl_generated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSTabControl_generated.h; path = TabControlReader/CSTabControl_generated.h; sourceTree = "<group>"; };
C5F516161C8216C60013B695 /* TabControlReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TabControlReader.cpp; path = TabControlReader/TabControlReader.cpp; sourceTree = "<group>"; };
C5F516171C8216C60013B695 /* TabControlReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TabControlReader.h; path = TabControlReader/TabControlReader.h; sourceTree = "<group>"; };
D0FD033B1A3B51AA00825BB5 /* CCAllocatorBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCAllocatorBase.h; sourceTree = "<group>"; };
D0FD033C1A3B51AA00825BB5 /* CCAllocatorDiagnostics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCAllocatorDiagnostics.cpp; sourceTree = "<group>"; };
D0FD033D1A3B51AA00825BB5 /* CCAllocatorDiagnostics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCAllocatorDiagnostics.h; sourceTree = "<group>"; };
@ -8906,6 +9048,8 @@
29CB8F531929D67D00C841D6 /* widgets */ = {
isa = PBXGroup;
children = (
C5F516101C8216660013B695 /* UITabControl.cpp */,
C5F516111C8216660013B695 /* UITabControl.h */,
292DB12E19B4574100A80320 /* UIEditBox */,
2905F9FE18CF08D000240AA3 /* UIListView.cpp */,
2905F9FF18CF08D000240AA3 /* UIListView.h */,
@ -9336,6 +9480,7 @@
46A1693A1807AFD6005B8026 /* chipmunk */ = {
isa = PBXGroup;
children = (
50864C6C1C7BC1B000B3BAB1 /* chipmunk */,
29031E0519BFE8C400EFA1DF /* mac */,
29031E0419BFE8BE00EFA1DF /* ios */,
);
@ -9375,6 +9520,7 @@
46A170611807CE7A005B8026 /* physics */ = {
isa = PBXGroup;
children = (
50864CE61C7BC90A00B3BAB1 /* cpCompat62.h */,
ED74D7681A5B8A2600157FD4 /* CCPhysicsHelper.h */,
46A1706E1807CE7A005B8026 /* CCPhysicsBody.cpp */,
46A1706F1807CE7A005B8026 /* CCPhysicsBody.h */,
@ -9627,6 +9773,44 @@
name = WebSocket;
sourceTree = "<group>";
};
50864C6C1C7BC1B000B3BAB1 /* chipmunk */ = {
isa = PBXGroup;
children = (
50864C6D1C7BC1B000B3BAB1 /* chipmunk.h */,
50864C6E1C7BC1B000B3BAB1 /* chipmunk_ffi.h */,
50864C6F1C7BC1B000B3BAB1 /* chipmunk_private.h */,
50864C701C7BC1B000B3BAB1 /* chipmunk_types.h */,
50864C711C7BC1B000B3BAB1 /* chipmunk_unsafe.h */,
50864C721C7BC1B000B3BAB1 /* cpCompat62.h */,
50864C731C7BC1B000B3BAB1 /* cpArbiter.h */,
50864C741C7BC1B000B3BAB1 /* cpBB.h */,
50864C751C7BC1B000B3BAB1 /* cpBody.h */,
50864C761C7BC1B000B3BAB1 /* cpConstraint.h */,
50864C771C7BC1B000B3BAB1 /* cpDampedRotarySpring.h */,
50864C781C7BC1B000B3BAB1 /* cpDampedSpring.h */,
50864C791C7BC1B000B3BAB1 /* cpGearJoint.h */,
50864C7A1C7BC1B000B3BAB1 /* cpGrooveJoint.h */,
50864C7B1C7BC1B000B3BAB1 /* cpHastySpace.h */,
50864C7C1C7BC1B000B3BAB1 /* cpMarch.h */,
50864C7D1C7BC1B000B3BAB1 /* cpPinJoint.h */,
50864C7E1C7BC1B000B3BAB1 /* cpPivotJoint.h */,
50864C7F1C7BC1B000B3BAB1 /* cpPolyline.h */,
50864C801C7BC1B000B3BAB1 /* cpPolyShape.h */,
50864C811C7BC1B000B3BAB1 /* cpRatchetJoint.h */,
50864C821C7BC1B000B3BAB1 /* cpRobust.h */,
50864C831C7BC1B000B3BAB1 /* cpRotaryLimitJoint.h */,
50864C841C7BC1B000B3BAB1 /* cpShape.h */,
50864C851C7BC1B000B3BAB1 /* cpSimpleMotor.h */,
50864C861C7BC1B000B3BAB1 /* cpSlideJoint.h */,
50864C871C7BC1B000B3BAB1 /* cpSpace.h */,
50864C881C7BC1B000B3BAB1 /* cpSpatialIndex.h */,
50864C891C7BC1B000B3BAB1 /* cpTransform.h */,
50864C8A1C7BC1B000B3BAB1 /* cpVect.h */,
);
name = chipmunk;
path = include/chipmunk;
sourceTree = "<group>";
};
50ABBEDB1926664700A911A9 /* platform */ = {
isa = PBXGroup;
children = (
@ -9709,6 +9893,7 @@
50FCEB6818C72017004AD434 /* WidgetReader */ = {
isa = PBXGroup;
children = (
C5F516141C8216AB0013B695 /* TabControlReader */,
0C261F251BE7528900707478 /* Light3DReader */,
A045F6EC1BA81821005076C7 /* GameNode3DReader */,
C503066F1B60B590001E6D43 /* SkeletonReader */,
@ -10974,6 +11159,16 @@
name = SkeletonReader;
sourceTree = "<group>";
};
C5F516141C8216AB0013B695 /* TabControlReader */ = {
isa = PBXGroup;
children = (
C5F516151C8216C60013B695 /* CSTabControl_generated.h */,
C5F516161C8216C60013B695 /* TabControlReader.cpp */,
C5F516171C8216C60013B695 /* TabControlReader.h */,
);
name = TabControlReader;
sourceTree = "<group>";
};
D0FD03391A3B51AA00825BB5 /* allocator */ = {
isa = PBXGroup;
children = (
@ -11051,6 +11246,7 @@
B6CAAFF81AF9A9E100B9B856 /* CCPhysics3DShape.h in Headers */,
B665E2201AA80A6500DDB1C5 /* CCPUBehaviourManager.h in Headers */,
15AE180A19AAD2F700C27E9E /* CCAABB.h in Headers */,
50864CDF1C7BC1B100B3BAB1 /* cpTransform.h in Headers */,
B665E28C1AA80A6500DDB1C5 /* CCPUDynamicAttribute.h in Headers */,
B665E3941AA80A6500DDB1C5 /* CCPUPlaneColliderTranslator.h in Headers */,
46A170E71807CECA005B8026 /* CCPhysicsBody.h in Headers */,
@ -11089,6 +11285,7 @@
B6CAB3D91AF9AA1A00B9B856 /* btSolverBody.h in Headers */,
15AE1A5C19AAD40300C27E9E /* b2Timer.h in Headers */,
B665E1FC1AA80A6500DDB1C5 /* CCPUAffectorTranslator.h in Headers */,
50864CBB1C7BC1B000B3BAB1 /* cpPinJoint.h in Headers */,
50ABBED31925AB6F00A911A9 /* uthash.h in Headers */,
B6CAB4B51AF9AA1A00B9B856 /* SpuDoubleBuffer.h in Headers */,
46A170E91807CECA005B8026 /* CCPhysicsContact.h in Headers */,
@ -11165,6 +11362,7 @@
B6CAB38D1AF9AA1A00B9B856 /* btPolyhedralContactClipping.h in Headers */,
15AE182A19AAD2F700C27E9E /* CCMeshSkin.h in Headers */,
B276EF5F1988D1D500CD400F /* CCVertexIndexData.h in Headers */,
50864CA31C7BC1B000B3BAB1 /* cpBody.h in Headers */,
1A57007F180BC5A10088DEC7 /* CCActionInterval.h in Headers */,
298C75D71C0465D1006BAE63 /* CCStencilStateManager.hpp in Headers */,
B6DD2FDB1B04825B00E47F5F /* DetourLocalBoundary.h in Headers */,
@ -11214,6 +11412,7 @@
B6CAB4CF1AF9AA1A00B9B856 /* SpuContactResult.h in Headers */,
B6CAB4E11AF9AA1A00B9B856 /* SpuSampleTask.h in Headers */,
50ABBDB71925AB4100A911A9 /* CCTexture2D.h in Headers */,
C5F516181C8216C60013B695 /* CSTabControl_generated.h in Headers */,
50ABBE811925AB6F00A911A9 /* CCEventType.h in Headers */,
B665E2B81AA80A6500DDB1C5 /* CCPUForceFieldAffector.h in Headers */,
1A57008F180BC5A10088DEC7 /* CCActionTiledGrid.h in Headers */,
@ -11254,6 +11453,7 @@
1A570110180BC8EE0088DEC7 /* CCDrawingPrimitives.h in Headers */,
B6CAB5091AF9AA1A00B9B856 /* btGrahamScan2dConvexHull.h in Headers */,
50CB247D19D9C5A100687767 /* AudioPlayer.h in Headers */,
50864CA01C7BC1B000B3BAB1 /* cpBB.h in Headers */,
1A570114180BC8EE0088DEC7 /* CCDrawNode.h in Headers */,
B665E3141AA80A6500DDB1C5 /* CCPUObserverManager.h in Headers */,
B665E2E01AA80A6500DDB1C5 /* CCPULineAffector.h in Headers */,
@ -11262,6 +11462,7 @@
B6CAB2A11AF9AA1A00B9B856 /* btConvex2dShape.h in Headers */,
15AE188319AAD33D00C27E9E /* CCBSelectorResolver.h in Headers */,
B29A7E2719EE1B7700872B35 /* spine-cocos2dx.h in Headers */,
50864CBE1C7BC1B000B3BAB1 /* cpPivotJoint.h in Headers */,
B665E2F01AA80A6500DDB1C5 /* CCPULineEmitter.h in Headers */,
B6CAB49D1AF9AA1A00B9B856 /* PlatformDefinitions.h in Headers */,
15AE1B5819AADA9900C27E9E /* UISlider.h in Headers */,
@ -11271,11 +11472,13 @@
B665E3781AA80A6500DDB1C5 /* CCPUParticleFollowerTranslator.h in Headers */,
15AE1B6819AADA9900C27E9E /* UIScale9Sprite.h in Headers */,
1A570121180BC90D0088DEC7 /* CCGrid.h in Headers */,
50864C9A1C7BC1B000B3BAB1 /* cpCompat62.h in Headers */,
5034CA2D191D591100CE6051 /* ccShader_PositionTextureA8Color.frag in Headers */,
382383F21A258FA7002C4610 /* idl.h in Headers */,
B29A7E0F19EE1B7700872B35 /* SkeletonJson.h in Headers */,
B665E2141AA80A6500DDB1C5 /* CCPUBaseForceAffectorTranslator.h in Headers */,
B29A7E2919EE1B7700872B35 /* SkeletonData.h in Headers */,
50864CC11C7BC1B000B3BAB1 /* cpPolyline.h in Headers */,
1AC0269C1914068200FA920D /* ConvertUTF.h in Headers */,
15AE1A7119AAD40300C27E9E /* b2Contact.h in Headers */,
B6CAB23B1AF9AA1A00B9B856 /* btCompoundCompoundCollisionAlgorithm.h in Headers */,
@ -11290,6 +11493,7 @@
1A5701A7180BCB590088DEC7 /* CCFontAtlasCache.h in Headers */,
B6CAB3D31AF9AA1A00B9B856 /* btSliderConstraint.h in Headers */,
15AE1A7D19AAD40300C27E9E /* b2MotorJoint.h in Headers */,
50864CEA1C7BC90A00B3BAB1 /* cpCompat62.h in Headers */,
B68779021A8CA82E00643ABF /* CCParticle3DRender.h in Headers */,
B6CAB2471AF9AA1A00B9B856 /* btConvexConvexAlgorithm.h in Headers */,
B6CAB3A71AF9AA1A00B9B856 /* btConstraintSolver.h in Headers */,
@ -11297,6 +11501,7 @@
15AE1B6C19AADA9900C27E9E /* UIWidget.h in Headers */,
B665E2681AA80A6500DDB1C5 /* CCPUDoExpireEventHandlerTranslator.h in Headers */,
15FB208B1AE7C57D00C31518 /* utils.h in Headers */,
50864C971C7BC1B000B3BAB1 /* chipmunk_unsafe.h in Headers */,
B6DD2FB51B04825B00E47F5F /* RecastDump.h in Headers */,
B6CAB3411AF9AA1A00B9B856 /* gim_bitset.h in Headers */,
15AE180E19AAD2F700C27E9E /* CCAnimate3D.h in Headers */,
@ -11307,6 +11512,7 @@
15AE1BD919AAE01E00C27E9E /* CCControlStepper.h in Headers */,
291A09241C5F06A60068C1D2 /* CCUIEditBoxMac.h in Headers */,
15AE192119AAD35000C27E9E /* CocoStudio.h in Headers */,
50864CB21C7BC1B000B3BAB1 /* cpGrooveJoint.h in Headers */,
B6CAB3891AF9AA1A00B9B856 /* btPointCollector.h in Headers */,
15AE18A119AAD33D00C27E9E /* CCNodeLoaderListener.h in Headers */,
5034CA47191D591100CE6051 /* ccShader_Label_normal.frag in Headers */,
@ -11347,6 +11553,7 @@
B6CAB33F1AF9AA1A00B9B856 /* gim_basic_geometry_operations.h in Headers */,
B6CAAFFC1AF9A9E100B9B856 /* CCPhysics3DWorld.h in Headers */,
50ABBE5F1925AB6F00A911A9 /* CCEventListener.h in Headers */,
50864CAC1C7BC1B000B3BAB1 /* cpDampedSpring.h in Headers */,
15AE197519AAD35700C27E9E /* CCTimeLine.h in Headers */,
1A5701C9180BCB5A0088DEC7 /* CCLabelTextFormatter.h in Headers */,
5034CA37191D591100CE6051 /* ccShader_PositionColorLengthTexture.vert in Headers */,
@ -11387,6 +11594,7 @@
B665E35C1AA80A6500DDB1C5 /* CCPUOnRandomObserver.h in Headers */,
15AE196F19AAD35700C27E9E /* CCActionTimelineCache.h in Headers */,
1A5701F0180BCB8C0088DEC7 /* CCTransitionProgress.h in Headers */,
50864CD61C7BC1B100B3BAB1 /* cpSlideJoint.h in Headers */,
1A5701F9180BCBAD0088DEC7 /* CCMenu.h in Headers */,
B6CAB4A11AF9AA1A00B9B856 /* PosixThreadSupport.h in Headers */,
C50306791B60B5B2001E6D43 /* SkeletonNodeReader.h in Headers */,
@ -11479,12 +11687,14 @@
5034CA4B191D591100CE6051 /* ccShader_Label_df_glow.frag in Headers */,
50ABBE4F1925AB6F00A911A9 /* CCEventCustom.h in Headers */,
50ABBD521925AB0000A911A9 /* Quaternion.h in Headers */,
50864C9D1C7BC1B000B3BAB1 /* cpArbiter.h in Headers */,
15AE186219AAD31D00C27E9E /* CDAudioManager.h in Headers */,
B6CAB3931AF9AA1A00B9B856 /* btSimplexSolverInterface.h in Headers */,
B6CAB22D1AF9AA1A00B9B856 /* btCollisionObject.h in Headers */,
B6CAB2CF1AF9AA1A00B9B856 /* btMultimaterialTriangleMeshShape.h in Headers */,
15AE18F119AAD35000C27E9E /* CCArmatureAnimation.h in Headers */,
1A57022F180BCC1A0088DEC7 /* CCParticleSystemQuad.h in Headers */,
50864C8B1C7BC1B000B3BAB1 /* chipmunk.h in Headers */,
B6CAB4EB1AF9AA1A00B9B856 /* TrbStateVec.h in Headers */,
B6CAB2831AF9AA1A00B9B856 /* btBoxShape.h in Headers */,
B665E37C1AA80A6500DDB1C5 /* CCPUParticleSystem3D.h in Headers */,
@ -11519,6 +11729,7 @@
5034CA3D191D591100CE6051 /* ccShader_PositionColor.frag in Headers */,
A0534A6A1B87306E006B03E5 /* CCIDownloaderImpl.h in Headers */,
15AE18FB19AAD35000C27E9E /* CCColliderDetector.h in Headers */,
50864CC71C7BC1B100B3BAB1 /* cpRatchetJoint.h in Headers */,
1A570280180BCC900088DEC7 /* CCSprite.h in Headers */,
292DB14719B4574100A80320 /* UIEditBoxImpl-ios.h in Headers */,
B665E3FC1AA80A6600DDB1C5 /* CCPUSphere.h in Headers */,
@ -11588,11 +11799,13 @@
15AE1A7919AAD40300C27E9E /* b2PolygonAndCircleContact.h in Headers */,
B665E2081AA80A6500DDB1C5 /* CCPUBaseCollider.h in Headers */,
B6CAB40D1AF9AA1A00B9B856 /* btMultiBodyJointMotor.h in Headers */,
C5F5161A1C8216C60013B695 /* TabControlReader.h in Headers */,
15AE199719AAD39600C27E9E /* ListViewReader.h in Headers */,
B29A7E1D19EE1B7700872B35 /* PolygonBatch.h in Headers */,
B665E3441AA80A6500DDB1C5 /* CCPUOnExpireObserver.h in Headers */,
50ABBD4E1925AB0000A911A9 /* MathUtil.h in Headers */,
15AE1A7319AAD40300C27E9E /* b2ContactSolver.h in Headers */,
50864CD91C7BC1B100B3BAB1 /* cpSpace.h in Headers */,
B6CAB3B91AF9AA1A00B9B856 /* btGeneric6DofConstraint.h in Headers */,
B6CAB24B1AF9AA1A00B9B856 /* btConvexPlaneCollisionAlgorithm.h in Headers */,
B6CAB5391AF9AA1A00B9B856 /* cl.h in Headers */,
@ -11644,8 +11857,10 @@
B6CAB2631AF9AA1A00B9B856 /* btManifoldResult.h in Headers */,
15AE191019AAD35000C27E9E /* CCInputDelegate.h in Headers */,
B665E4301AA80A6600DDB1C5 /* CCPUVelocityMatchingAffectorTranslator.h in Headers */,
50864CA91C7BC1B000B3BAB1 /* cpDampedRotarySpring.h in Headers */,
15AE184C19AAD30800C27E9E /* SimpleAudioEngine.h in Headers */,
50ABBDA11925AB4100A911A9 /* CCGroupCommand.h in Headers */,
50864C911C7BC1B000B3BAB1 /* chipmunk_private.h in Headers */,
B665E24C1AA80A6500DDB1C5 /* CCPUColorAffector.h in Headers */,
29394CF019B01DBA00D2DE1A /* UIWebView.h in Headers */,
15AE186519AAD31D00C27E9E /* CDOpenALSupport.h in Headers */,
@ -11684,6 +11899,7 @@
B6CAB41D1AF9AA1A00B9B856 /* btDantzigSolver.h in Headers */,
50ABBD851925AB4100A911A9 /* CCBatchCommand.h in Headers */,
B6CAB3351AF9AA1A00B9B856 /* btGImpactShape.h in Headers */,
C5F516131C8216660013B695 /* UITabControl.h in Headers */,
15AE1A6F19AAD40300C27E9E /* b2CircleContact.h in Headers */,
B6CAB3431AF9AA1A00B9B856 /* gim_box_collision.h in Headers */,
B6CAB39B1AF9AA1A00B9B856 /* btVoronoiSimplexSolver.h in Headers */,
@ -11694,6 +11910,7 @@
50643BD419BFAECF00EF68ED /* CCGL.h in Headers */,
15AE190C19AAD35000C27E9E /* CCDisplayFactory.h in Headers */,
15AE1A8B19AAD40300C27E9E /* b2PulleyJoint.h in Headers */,
50864CA61C7BC1B000B3BAB1 /* cpConstraint.h in Headers */,
B5CE6DCA1B3C05BA002B0419 /* UIRadioButton.h in Headers */,
15AE1A5119AAD40300C27E9E /* b2BlockAllocator.h in Headers */,
15AE199119AAD37200C27E9E /* ImageViewReader.h in Headers */,
@ -11705,9 +11922,11 @@
B6CAB4E51AF9AA1A00B9B856 /* SpuSampleTaskProcess.h in Headers */,
B6CAB2B51AF9AA1A00B9B856 /* btConvexShape.h in Headers */,
B60C5BD619AC68B10056FBDE /* CCBillBoard.h in Headers */,
50864CD01C7BC1B100B3BAB1 /* cpShape.h in Headers */,
15AE1BA419AADFDF00C27E9E /* UILayoutManager.h in Headers */,
2962D5E81C61CBF9004821A3 /* CCUITextInput.h in Headers */,
1A01C69418F57BE800EFE3A6 /* CCFloat.h in Headers */,
50864CB81C7BC1B000B3BAB1 /* cpMarch.h in Headers */,
1A57034D180BD09B0088DEC7 /* tinyxml2.h in Headers */,
B6CAB4C31AF9AA1A00B9B856 /* Box.h in Headers */,
15AE18F519AAD35000C27E9E /* CCArmatureDefine.h in Headers */,
@ -11745,6 +11964,7 @@
B6CAB2E31AF9AA1A00B9B856 /* btShapeHull.h in Headers */,
B29A7E0D19EE1B7700872B35 /* Bone.h in Headers */,
15AE186719AAD31D00C27E9E /* CDXMacOSXSupport.h in Headers */,
50864CCD1C7BC1B100B3BAB1 /* cpRotaryLimitJoint.h in Headers */,
C503066A1B60B583001E6D43 /* CCBoneNode.h in Headers */,
B6CAB5131AF9AA1A00B9B856 /* btMatrixX.h in Headers */,
B6CAB4091AF9AA1A00B9B856 /* btMultiBodyJointLimitConstraint.h in Headers */,
@ -11795,6 +12015,7 @@
B257B4501989D5E800D9A687 /* CCPrimitive.h in Headers */,
B6CAB2C71AF9AA1A00B9B856 /* btMaterial.h in Headers */,
B29A7DCF19EE1B7700872B35 /* RegionAttachment.h in Headers */,
50864CB51C7BC1B000B3BAB1 /* cpHastySpace.h in Headers */,
15B3707E19EE414C00ABE682 /* CCEventAssetsManagerEx.h in Headers */,
50ABBE6B1925AB6F00A911A9 /* CCEventListenerFocus.h in Headers */,
B6CAAFF41AF9A9E100B9B856 /* CCPhysics3DObject.h in Headers */,
@ -11866,6 +12087,7 @@
B665E3E41AA80A6600DDB1C5 /* CCPUSineForceAffector.h in Headers */,
15AE188D19AAD33D00C27E9E /* CCLabelBMFontLoader.h in Headers */,
B665E3701AA80A6500DDB1C5 /* CCPUOnVelocityObserverTranslator.h in Headers */,
50864CDC1C7BC1B100B3BAB1 /* cpSpatialIndex.h in Headers */,
15AE1B5019AADA9900C27E9E /* UILoadingBar.h in Headers */,
50ABBFFD1926664800A911A9 /* CCFileUtils-apple.h in Headers */,
15B3708219EE414C00ABE682 /* CCEventListenerAssetsManagerEx.h in Headers */,
@ -11896,6 +12118,7 @@
15AE199F19AAD39600C27E9E /* SliderReader.h in Headers */,
B665E2641AA80A6500DDB1C5 /* CCPUDoExpireEventHandler.h in Headers */,
B6CAB2B91AF9AA1A00B9B856 /* btConvexTriangleMeshShape.h in Headers */,
50864CE21C7BC1B100B3BAB1 /* cpVect.h in Headers */,
B6CAB32B1AF9AA1A00B9B856 /* btGImpactCollisionAlgorithm.h in Headers */,
B6CAB24F1AF9AA1A00B9B856 /* btDefaultCollisionConfiguration.h in Headers */,
50ABBD9D1925AB4100A911A9 /* ccGLStateCache.h in Headers */,
@ -11906,7 +12129,9 @@
50ABBEB91925AB6F00A911A9 /* ccUTF8.h in Headers */,
B6CAB3C51AF9AA1A00B9B856 /* btHingeConstraint.h in Headers */,
15AE191A19AAD35000C27E9E /* CCSSceneReader.h in Headers */,
50864CCA1C7BC1B100B3BAB1 /* cpRobust.h in Headers */,
B665E2241AA80A6500DDB1C5 /* CCPUBehaviourTranslator.h in Headers */,
50864C8E1C7BC1B000B3BAB1 /* chipmunk_ffi.h in Headers */,
292DB13F19B4574100A80320 /* UIEditBox.h in Headers */,
B665E3881AA80A6500DDB1C5 /* CCPUPathFollowerTranslator.h in Headers */,
B665E2541AA80A6500DDB1C5 /* CCPUDoAffectorEventHandler.h in Headers */,
@ -11944,6 +12169,7 @@
5034CA45191D591100CE6051 /* ccShader_Label_outline.frag in Headers */,
B6CAB4311AF9AA1A00B9B856 /* btWheelInfo.h in Headers */,
D0FD035F1A3B51AA00825BB5 /* CCAllocatorStrategyPool.h in Headers */,
50864CD31C7BC1B100B3BAB1 /* cpSimpleMotor.h in Headers */,
B6CAB3611AF9AA1A00B9B856 /* gim_tri_collision.h in Headers */,
B665E3741AA80A6500DDB1C5 /* CCPUParticleFollower.h in Headers */,
50ABBEB11925AB6F00A911A9 /* CCUserDefault.h in Headers */,
@ -11955,6 +12181,7 @@
B665E2FC1AA80A6500DDB1C5 /* CCPUMaterialManager.h in Headers */,
15AE1BC619AAE00000C27E9E /* AssetsManager.h in Headers */,
50ABBEA91925AB6F00A911A9 /* CCTouch.h in Headers */,
50864CC41C7BC1B100B3BAB1 /* cpPolyShape.h in Headers */,
B6CAB51F1AF9AA1A00B9B856 /* btQuadWord.h in Headers */,
15AE1A5E19AAD40300C27E9E /* b2Body.h in Headers */,
B6CAB22F1AF9AA1A00B9B856 /* btCollisionObjectWrapper.h in Headers */,
@ -11976,6 +12203,7 @@
B6CAB2EB1AF9AA1A00B9B856 /* btStaticPlaneShape.h in Headers */,
3EACC9A219F5014D00EB3C5E /* CCCamera.h in Headers */,
B6CAB5331AF9AA1A00B9B856 /* btTransformUtil.h in Headers */,
50864CAF1C7BC1B000B3BAB1 /* cpGearJoint.h in Headers */,
B6DD2FEF1B04825B00E47F5F /* DetourTileCache.h in Headers */,
50ABBECD1925AB6F00A911A9 /* s3tc.h in Headers */,
B6CAB3651AF9AA1A00B9B856 /* btContinuousConvexCollision.h in Headers */,
@ -11996,6 +12224,7 @@
50ABC0091926664800A911A9 /* CCCommon.h in Headers */,
50ABBE531925AB6F00A911A9 /* CCEventDispatcher.h in Headers */,
B29A7DEB19EE1B7700872B35 /* MeshAttachment.h in Headers */,
50864C941C7BC1B000B3BAB1 /* chipmunk_types.h in Headers */,
464AD6E7197EBB1400E502D8 /* pvr.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
@ -12004,6 +12233,8 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
C5F516251C822E470013B695 /* TabControlReader.h in Headers */,
C5F516231C822E190013B695 /* UITabControl.h in Headers */,
507B3D121C31BDD30067B53E /* CCStdC-ios.h in Headers */,
507B3D131C31BDD30067B53E /* b2Math.h in Headers */,
507B3D141C31BDD30067B53E /* CCUITextInput.h in Headers */,
@ -12104,6 +12335,7 @@
507B3D721C31BDD30067B53E /* UIRadioButton.h in Headers */,
507B3D731C31BDD30067B53E /* CCPUDoStopSystemEventHandlerTranslator.h in Headers */,
507B3D741C31BDD30067B53E /* CCSprite3DMaterial.h in Headers */,
50864CD21C7BC1B100B3BAB1 /* cpShape.h in Headers */,
507B3D751C31BDD30067B53E /* DetourMath.h in Headers */,
507B3D761C31BDD30067B53E /* btList.h in Headers */,
507B3D771C31BDD30067B53E /* CCControlUtils.h in Headers */,
@ -12160,6 +12392,8 @@
507B3DAA1C31BDD30067B53E /* CCAllocatorDiagnostics.h in Headers */,
507B3DAB1C31BDD30067B53E /* CCPUEventHandlerManager.h in Headers */,
507B3DAC1C31BDD30067B53E /* btDbvtBroadphase.h in Headers */,
50864CC01C7BC1B000B3BAB1 /* cpPivotJoint.h in Headers */,
50864CE41C7BC1B100B3BAB1 /* cpVect.h in Headers */,
507B3DAD1C31BDD30067B53E /* CCClippingRectangleNode.h in Headers */,
507B3DAE1C31BDD30067B53E /* CCPUVelocityMatchingAffectorTranslator.h in Headers */,
507B3DAF1C31BDD30067B53E /* btEmptyShape.h in Headers */,
@ -12206,11 +12440,13 @@
507B3DD81C31BDD30067B53E /* CCPUMaterialManager.h in Headers */,
507B3DD91C31BDD30067B53E /* FlatBuffersSerialize.h in Headers */,
507B3DDA1C31BDD30067B53E /* btHingeConstraint.h in Headers */,
50864CAB1C7BC1B000B3BAB1 /* cpDampedRotarySpring.h in Headers */,
507B3DDB1C31BDD30067B53E /* CCActionInterval.h in Headers */,
507B3DDC1C31BDD30067B53E /* CCPUEventHandler.h in Headers */,
507B3DDD1C31BDD30067B53E /* CCActionFrame.h in Headers */,
507B3DDE1C31BDD30067B53E /* CCActionFrameEasing.h in Headers */,
507B3DDF1C31BDD30067B53E /* CCActionManager.h in Headers */,
50864C931C7BC1B000B3BAB1 /* chipmunk_private.h in Headers */,
507B3DE01C31BDD30067B53E /* CCPUObserverManager.h in Headers */,
507B3DE11C31BDD30067B53E /* CCLayerLoader.h in Headers */,
507B3DE21C31BDD30067B53E /* PpuAddressSpace.h in Headers */,
@ -12252,11 +12488,13 @@
507B3E061C31BDD30067B53E /* BoneNodeReader.h in Headers */,
507B3E071C31BDD30067B53E /* SpuPreferredPenetrationDirections.h in Headers */,
507B3E081C31BDD30067B53E /* CCDirectorCaller-ios.h in Headers */,
50864CDE1C7BC1B100B3BAB1 /* cpSpatialIndex.h in Headers */,
507B3E091C31BDD30067B53E /* CCTimelineMacro.h in Headers */,
507B3E0A1C31BDD30067B53E /* extension.h in Headers */,
507B3E0B1C31BDD30067B53E /* btConvex2dShape.h in Headers */,
507B3E0C1C31BDD30067B53E /* CCPUColorAffector.h in Headers */,
507B3E0D1C31BDD30067B53E /* SpuGatheringCollisionTask.h in Headers */,
50864CC61C7BC1B100B3BAB1 /* cpPolyShape.h in Headers */,
507B3E0E1C31BDD30067B53E /* UIPageView.h in Headers */,
507B3E0F1C31BDD30067B53E /* CCCustomCommand.h in Headers */,
507B3E101C31BDD30067B53E /* CSBoneBinary_generated.h in Headers */,
@ -12272,6 +12510,7 @@
507B3E1A1C31BDD30067B53E /* UIScrollView.h in Headers */,
507B3E1B1C31BDD30067B53E /* ccShader_PositionTexture.vert in Headers */,
507B3E1C1C31BDD30067B53E /* ProjectNodeReader.h in Headers */,
50864CB71C7BC1B000B3BAB1 /* cpHastySpace.h in Headers */,
507B3E1D1C31BDD30067B53E /* CCDrawingPrimitives.h in Headers */,
507B3E1E1C31BDD30067B53E /* btMatrix3x3.h in Headers */,
507B3E1F1C31BDD30067B53E /* CCConsole.h in Headers */,
@ -12303,6 +12542,7 @@
507B3E391C31BDD30067B53E /* CCMath.h in Headers */,
507B3E3A1C31BDD30067B53E /* CCFont.h in Headers */,
507B3E3B1C31BDD30067B53E /* btStaticPlaneShape.h in Headers */,
50864CCF1C7BC1B100B3BAB1 /* cpRotaryLimitJoint.h in Headers */,
507B3E3C1C31BDD30067B53E /* btPolyhedralConvexShape.h in Headers */,
507B3E3D1C31BDD30067B53E /* UIEditBoxImpl-ios.h in Headers */,
507B3E3E1C31BDD30067B53E /* MiniCLTaskScheduler.h in Headers */,
@ -12335,6 +12575,7 @@
507B3E591C31BDD30067B53E /* CCFontAtlas.h in Headers */,
507B3E5A1C31BDD30067B53E /* Box.h in Headers */,
507B3E5B1C31BDD30067B53E /* CCScrollView.h in Headers */,
50864CBA1C7BC1B000B3BAB1 /* cpMarch.h in Headers */,
507B3E5C1C31BDD30067B53E /* CCFontAtlasCache.h in Headers */,
507B3E5D1C31BDD30067B53E /* CCPUSineForceAffector.h in Headers */,
507B3E5E1C31BDD30067B53E /* UserCameraReader.h in Headers */,
@ -12346,6 +12587,7 @@
507B3E641C31BDD30067B53E /* DetourAssert.h in Headers */,
507B3E651C31BDD30067B53E /* CCParticleSystemQuadLoader.h in Headers */,
507B3E661C31BDD30067B53E /* CCPUOnEventFlagObserverTranslator.h in Headers */,
50864CAE1C7BC1B000B3BAB1 /* cpDampedSpring.h in Headers */,
507B3E671C31BDD30067B53E /* btDefaultMotionState.h in Headers */,
507B3E681C31BDD30067B53E /* btScalar.h in Headers */,
507B3E691C31BDD30067B53E /* DetourTileCacheBuilder.h in Headers */,
@ -12371,6 +12613,8 @@
507B3E7D1C31BDD30067B53E /* CCPUFlockCenteringAffector.h in Headers */,
507B3E7E1C31BDD30067B53E /* DictionaryHelper.h in Headers */,
507B3E7F1C31BDD30067B53E /* SpuLibspe2Support.h in Headers */,
50864CC91C7BC1B100B3BAB1 /* cpRatchetJoint.h in Headers */,
50864C9F1C7BC1B000B3BAB1 /* cpArbiter.h in Headers */,
507B3E801C31BDD30067B53E /* clipper.hpp in Headers */,
507B3E811C31BDD30067B53E /* btConvexHullComputer.h in Headers */,
507B3E821C31BDD30067B53E /* CCPUCircleEmitterTranslator.h in Headers */,
@ -12378,6 +12622,7 @@
507B3E841C31BDD30067B53E /* b2Fixture.h in Headers */,
507B3E851C31BDD30067B53E /* btHinge2Constraint.h in Headers */,
507B3E861C31BDD30067B53E /* btSimpleBroadphase.h in Headers */,
50864C901C7BC1B000B3BAB1 /* chipmunk_ffi.h in Headers */,
507B3E871C31BDD30067B53E /* vectormath2bullet.h in Headers */,
507B3E881C31BDD30067B53E /* HttpClient.h in Headers */,
507B3E891C31BDD30067B53E /* btCollisionConfiguration.h in Headers */,
@ -12425,6 +12670,7 @@
507B3EB31C31BDD30067B53E /* btQuaternion.h in Headers */,
507B3EB41C31BDD30067B53E /* CCStdC.h in Headers */,
507B3EB51C31BDD30067B53E /* ccShader_PositionTextureColorAlphaTest.frag in Headers */,
50864CE11C7BC1B100B3BAB1 /* cpTransform.h in Headers */,
507B3EB61C31BDD30067B53E /* UIDeprecated.h in Headers */,
507B3EB71C31BDD30067B53E /* Box2D.h in Headers */,
507B3EB81C31BDD30067B53E /* s3tc.h in Headers */,
@ -12477,6 +12723,7 @@
507B3EE71C31BDD30067B53E /* CCControlButtonLoader.h in Headers */,
507B3EE81C31BDD30067B53E /* CCMenuItem.h in Headers */,
507B3EE91C31BDD30067B53E /* CCDevice.h in Headers */,
50864C9C1C7BC1B000B3BAB1 /* cpCompat62.h in Headers */,
507B3EEA1C31BDD30067B53E /* CCClippingNode.h in Headers */,
507B3EEB1C31BDD30067B53E /* btTriangleIndexVertexMaterialArray.h in Headers */,
507B3EEC1C31BDD30067B53E /* UICheckBox.h in Headers */,
@ -12503,6 +12750,7 @@
507B3F011C31BDD30067B53E /* CCComAttribute.h in Headers */,
507B3F021C31BDD30067B53E /* btMotionState.h in Headers */,
507B3F031C31BDD30067B53E /* CCPhysics3D.h in Headers */,
50864C8D1C7BC1B000B3BAB1 /* chipmunk.h in Headers */,
507B3F041C31BDD30067B53E /* btCollisionAlgorithm.h in Headers */,
507B3F051C31BDD30067B53E /* GameMapReader.h in Headers */,
507B3F061C31BDD30067B53E /* DetourLocalBoundary.h in Headers */,
@ -12533,6 +12781,7 @@
507B3F1F1C31BDD30067B53E /* CCIMEDelegate.h in Headers */,
507B3F201C31BDD30067B53E /* CCPhysics3DConstraint.h in Headers */,
507B3F211C31BDD30067B53E /* CCParticleExamples.h in Headers */,
50864CA51C7BC1B000B3BAB1 /* cpBody.h in Headers */,
507B3F221C31BDD30067B53E /* CCPUVortexAffector.h in Headers */,
507B3F231C31BDD30067B53E /* CCParticleSystem.h in Headers */,
507B3F241C31BDD30067B53E /* btSphereBoxCollisionAlgorithm.h in Headers */,
@ -12547,6 +12796,7 @@
507B3F2D1C31BDD30067B53E /* CCFastTMXLayer.h in Headers */,
507B3F2E1C31BDD30067B53E /* b2EdgeAndCircleContact.h in Headers */,
507B3F2F1C31BDD30067B53E /* UIListView.h in Headers */,
50864CA21C7BC1B000B3BAB1 /* cpBB.h in Headers */,
507B3F301C31BDD30067B53E /* TriggerMng.h in Headers */,
507B3F311C31BDD30067B53E /* ccShader_PositionTextureA8Color.vert in Headers */,
507B3F321C31BDD30067B53E /* btSphereTriangleCollisionAlgorithm.h in Headers */,
@ -12572,6 +12822,7 @@
507B3F461C31BDD30067B53E /* btQuantizedBvh.h in Headers */,
507B3F471C31BDD30067B53E /* CCPUDoAffectorEventHandlerTranslator.h in Headers */,
507B3F481C31BDD30067B53E /* CCPUAffectorManager.h in Headers */,
50864CA81C7BC1B000B3BAB1 /* cpConstraint.h in Headers */,
507B3F491C31BDD30067B53E /* CCUIEditBoxIOS.h in Headers */,
507B3F4A1C31BDD30067B53E /* CCPUBoxEmitter.h in Headers */,
507B3F4B1C31BDD30067B53E /* btConvexPenetrationDepthSolver.h in Headers */,
@ -12589,6 +12840,7 @@
507B3F571C31BDD30067B53E /* UIText.h in Headers */,
507B3F581C31BDD30067B53E /* SlotData.h in Headers */,
507B3F591C31BDD30067B53E /* CCPhysics3DShape.h in Headers */,
50864CB41C7BC1B000B3BAB1 /* cpGrooveJoint.h in Headers */,
507B3F5A1C31BDD30067B53E /* CCPUScriptLexer.h in Headers */,
507B3F5B1C31BDD30067B53E /* CCEventListenerKeyboard.h in Headers */,
507B3F5C1C31BDD30067B53E /* CCBSequence.h in Headers */,
@ -12609,6 +12861,7 @@
507B3F6B1C31BDD30067B53E /* CCPUFlockCenteringAffectorTranslator.h in Headers */,
507B3F6C1C31BDD30067B53E /* btSphereShape.h in Headers */,
507B3F6D1C31BDD30067B53E /* b2PolygonContact.h in Headers */,
50864CC31C7BC1B100B3BAB1 /* cpPolyline.h in Headers */,
507B3F6E1C31BDD30067B53E /* CCTouch.h in Headers */,
507B3F6F1C31BDD30067B53E /* UILayoutParameter.h in Headers */,
507B3F701C31BDD30067B53E /* CCMenuItemImageLoader.h in Headers */,
@ -12619,6 +12872,7 @@
507B3F751C31BDD30067B53E /* CCStencilStateManager.hpp in Headers */,
507B3F761C31BDD30067B53E /* CCNodeLoaderLibrary.h in Headers */,
507B3F771C31BDD30067B53E /* b2DistanceJoint.h in Headers */,
50864C961C7BC1B000B3BAB1 /* chipmunk_types.h in Headers */,
507B3F781C31BDD30067B53E /* btQuickprof.h in Headers */,
507B3F791C31BDD30067B53E /* UITextView+CCUITextInput.h in Headers */,
507B3F7A1C31BDD30067B53E /* CCEventListenerMouse.h in Headers */,
@ -12704,6 +12958,7 @@
507B3FCA1C31BDD30067B53E /* CCPUBaseForceAffectorTranslator.h in Headers */,
507B3FCB1C31BDD30067B53E /* CCSet.h in Headers */,
507B3FCC1C31BDD30067B53E /* CCPUSphereColliderTranslator.h in Headers */,
50864CBD1C7BC1B000B3BAB1 /* cpPinJoint.h in Headers */,
507B3FCD1C31BDD30067B53E /* utlist.h in Headers */,
507B3FCE1C31BDD30067B53E /* unzip.h in Headers */,
507B3FCF1C31BDD30067B53E /* btThreadSupportInterface.h in Headers */,
@ -12794,6 +13049,7 @@
507B40241C31BDD30067B53E /* CCAABB.h in Headers */,
507B40251C31BDD30067B53E /* CCGLProgramCache.h in Headers */,
507B40261C31BDD30067B53E /* btTriangleMeshShape.h in Headers */,
50864CCC1C7BC1B100B3BAB1 /* cpRobust.h in Headers */,
507B40271C31BDD30067B53E /* CCProfiling.h in Headers */,
507B40281C31BDD30067B53E /* TextAtlasReader.h in Headers */,
507B40291C31BDD30067B53E /* CCScale9SpriteLoader.h in Headers */,
@ -12864,6 +13120,7 @@
507B406A1C31BDD30067B53E /* CCAllocatorStrategyDefault.h in Headers */,
507B406B1C31BDD30067B53E /* CCVertex.h in Headers */,
507B406C1C31BDD30067B53E /* SpuLocalSupport.h in Headers */,
50864CB11C7BC1B000B3BAB1 /* cpGearJoint.h in Headers */,
507B406D1C31BDD30067B53E /* btCollisionShape.h in Headers */,
507B406E1C31BDD30067B53E /* btSimulationIslandManager.h in Headers */,
507B406F1C31BDD30067B53E /* CCPUOnCollisionObserver.h in Headers */,
@ -12891,11 +13148,13 @@
507B40851C31BDD30067B53E /* ccShader_PositionTexture.frag in Headers */,
507B40861C31BDD30067B53E /* CCFastTMXTiledMap.h in Headers */,
507B40871C31BDD30067B53E /* MeshAttachment.h in Headers */,
50864CDB1C7BC1B100B3BAB1 /* cpSpace.h in Headers */,
507B40881C31BDD30067B53E /* ccTypes.h in Headers */,
507B40891C31BDD30067B53E /* btHashMap.h in Headers */,
507B408A1C31BDD30067B53E /* CDAudioManager.h in Headers */,
507B408B1C31BDD30067B53E /* btMinkowskiPenetrationDepthSolver.h in Headers */,
507B408C1C31BDD30067B53E /* Light3DReader.h in Headers */,
50864C991C7BC1B000B3BAB1 /* chipmunk_unsafe.h in Headers */,
507B408D1C31BDD30067B53E /* CCPUPlane.h in Headers */,
507B408E1C31BDD30067B53E /* gim_geom_types.h in Headers */,
507B408F1C31BDD30067B53E /* btSimplexSolverInterface.h in Headers */,
@ -12944,6 +13203,7 @@
507B40BA1C31BDD30067B53E /* UIPageViewIndicator.h in Headers */,
507B40BB1C31BDD30067B53E /* CCControlColourPicker.h in Headers */,
507B40BC1C31BDD30067B53E /* CCDatas.h in Headers */,
50864CEC1C7BC90A00B3BAB1 /* cpCompat62.h in Headers */,
507B40BD1C31BDD30067B53E /* CCBReader.h in Headers */,
507B40BE1C31BDD30067B53E /* CCNodeLoaderListener.h in Headers */,
507B40BF1C31BDD30067B53E /* SimpleAudioEngine.h in Headers */,
@ -12955,6 +13215,7 @@
507B40C51C31BDD30067B53E /* CCPURendererTranslator.h in Headers */,
507B40C61C31BDD30067B53E /* CCMaterial.h in Headers */,
507B40C71C31BDD30067B53E /* CCPUBaseColliderTranslator.h in Headers */,
50864CD81C7BC1B100B3BAB1 /* cpSlideJoint.h in Headers */,
507B40C81C31BDD30067B53E /* CCDeprecated.h in Headers */,
507B40C91C31BDD30067B53E /* CCPULinearForceAffector.h in Headers */,
507B40CA1C31BDD30067B53E /* ParticleReader.h in Headers */,
@ -12994,6 +13255,7 @@
507B40EC1C31BDD30067B53E /* CCArmature.h in Headers */,
507B40ED1C31BDD30067B53E /* CCAsyncTaskPool.h in Headers */,
507B40EE1C31BDD30067B53E /* cocos-ext.h in Headers */,
50864CD51C7BC1B100B3BAB1 /* cpSimpleMotor.h in Headers */,
507B40EF1C31BDD30067B53E /* UIImageView.h in Headers */,
507B40F01C31BDD30067B53E /* b2TimeOfImpact.h in Headers */,
507B40F11C31BDD30067B53E /* CCPUBillboardChain.h in Headers */,
@ -13012,6 +13274,8 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
C5F516201C822D900013B695 /* UITabControl.h in Headers */,
C5F5161E1C822D5B0013B695 /* TabControlReader.h in Headers */,
503DD8F01926736A00CD74DD /* CCStdC-ios.h in Headers */,
15AE1A9A19AAD40300C27E9E /* b2Math.h in Headers */,
2980F0281BA9A5550059E678 /* CCUITextInput.h in Headers */,
@ -13112,6 +13376,7 @@
B5CE6DCB1B3C05BA002B0419 /* UIRadioButton.h in Headers */,
B665E2891AA80A6500DDB1C5 /* CCPUDoStopSystemEventHandlerTranslator.h in Headers */,
15AE184719AAD2F700C27E9E /* CCSprite3DMaterial.h in Headers */,
50864CD11C7BC1B100B3BAB1 /* cpShape.h in Headers */,
B6DD2FC21B04825B00E47F5F /* DetourMath.h in Headers */,
B6CAB5101AF9AA1A00B9B856 /* btList.h in Headers */,
15AE1BFC19AAE01E00C27E9E /* CCControlUtils.h in Headers */,
@ -13168,6 +13433,8 @@
D0FD034E1A3B51AA00825BB5 /* CCAllocatorDiagnostics.h in Headers */,
B665E2A51AA80A6500DDB1C5 /* CCPUEventHandlerManager.h in Headers */,
B6CAB1FC1AF9AA1A00B9B856 /* btDbvtBroadphase.h in Headers */,
50864CBF1C7BC1B000B3BAB1 /* cpPivotJoint.h in Headers */,
50864CE31C7BC1B100B3BAB1 /* cpVect.h in Headers */,
DABC9FAC19E7DFA900FA252C /* CCClippingRectangleNode.h in Headers */,
B665E4311AA80A6600DDB1C5 /* CCPUVelocityMatchingAffectorTranslator.h in Headers */,
B6CAB2C21AF9AA1A00B9B856 /* btEmptyShape.h in Headers */,
@ -13214,11 +13481,13 @@
B665E2FD1AA80A6500DDB1C5 /* CCPUMaterialManager.h in Headers */,
3823840A1A25900F002C4610 /* FlatBuffersSerialize.h in Headers */,
B6CAB3C61AF9AA1A00B9B856 /* btHingeConstraint.h in Headers */,
50864CAA1C7BC1B000B3BAB1 /* cpDampedRotarySpring.h in Headers */,
1A570080180BC5A10088DEC7 /* CCActionInterval.h in Headers */,
B665E2A11AA80A6500DDB1C5 /* CCPUEventHandler.h in Headers */,
15AE192D19AAD35100C27E9E /* CCActionFrame.h in Headers */,
15AE192F19AAD35100C27E9E /* CCActionFrameEasing.h in Headers */,
1A570084180BC5A10088DEC7 /* CCActionManager.h in Headers */,
50864C921C7BC1B000B3BAB1 /* chipmunk_private.h in Headers */,
B665E3151AA80A6500DDB1C5 /* CCPUObserverManager.h in Headers */,
15AE18C619AAD33D00C27E9E /* CCLayerLoader.h in Headers */,
B6CAB4A41AF9AA1A00B9B856 /* PpuAddressSpace.h in Headers */,
@ -13260,11 +13529,13 @@
85505F0B1B60E3D1003F2CD4 /* BoneNodeReader.h in Headers */,
B6CAB4DE1AF9AA1A00B9B856 /* SpuPreferredPenetrationDirections.h in Headers */,
503DD8E41926736A00CD74DD /* CCDirectorCaller-ios.h in Headers */,
50864CDD1C7BC1B100B3BAB1 /* cpSpatialIndex.h in Headers */,
15AE198119AAD35700C27E9E /* CCTimelineMacro.h in Headers */,
B29A7E0219EE1B7700872B35 /* extension.h in Headers */,
B6CAB2A21AF9AA1A00B9B856 /* btConvex2dShape.h in Headers */,
B665E24D1AA80A6500DDB1C5 /* CCPUColorAffector.h in Headers */,
B6CAB4D61AF9AA1A00B9B856 /* SpuGatheringCollisionTask.h in Headers */,
50864CC51C7BC1B100B3BAB1 /* cpPolyShape.h in Headers */,
15AE1B7719AADA9A00C27E9E /* UIPageView.h in Headers */,
50ABBD8A1925AB4100A911A9 /* CCCustomCommand.h in Headers */,
85505F0C1B60E3D5003F2CD4 /* CSBoneBinary_generated.h in Headers */,
@ -13280,6 +13551,7 @@
15AE1B7B19AADA9A00C27E9E /* UIScrollView.h in Headers */,
5034CA30191D591100CE6051 /* ccShader_PositionTexture.vert in Headers */,
382384391A259126002C4610 /* ProjectNodeReader.h in Headers */,
50864CB61C7BC1B000B3BAB1 /* cpHastySpace.h in Headers */,
1A570111180BC8EE0088DEC7 /* CCDrawingPrimitives.h in Headers */,
B6CAB5121AF9AA1A00B9B856 /* btMatrix3x3.h in Headers */,
50ABBE381925AB6F00A911A9 /* CCConsole.h in Headers */,
@ -13311,6 +13583,7 @@
50ABBD411925AB0000A911A9 /* CCMath.h in Headers */,
1A5701A0180BCB590088DEC7 /* CCFont.h in Headers */,
B6CAB2EC1AF9AA1A00B9B856 /* btStaticPlaneShape.h in Headers */,
50864CCE1C7BC1B100B3BAB1 /* cpRotaryLimitJoint.h in Headers */,
B6CAB2DC1AF9AA1A00B9B856 /* btPolyhedralConvexShape.h in Headers */,
292DB14819B4574100A80320 /* UIEditBoxImpl-ios.h in Headers */,
B6CAB54A1AF9AA1A00B9B856 /* MiniCLTaskScheduler.h in Headers */,
@ -13343,6 +13616,7 @@
1A5701A4180BCB590088DEC7 /* CCFontAtlas.h in Headers */,
B6CAB4C41AF9AA1A00B9B856 /* Box.h in Headers */,
15AE1C0219AAE01E00C27E9E /* CCScrollView.h in Headers */,
50864CB91C7BC1B000B3BAB1 /* cpMarch.h in Headers */,
1A5701A8180BCB590088DEC7 /* CCFontAtlasCache.h in Headers */,
B665E3E51AA80A6600DDB1C5 /* CCPUSineForceAffector.h in Headers */,
182C5CE81A9D725400C30D34 /* UserCameraReader.h in Headers */,
@ -13354,6 +13628,7 @@
B6DD2FBC1B04825B00E47F5F /* DetourAssert.h in Headers */,
15AE18D419AAD33D00C27E9E /* CCParticleSystemQuadLoader.h in Headers */,
B665E3411AA80A6500DDB1C5 /* CCPUOnEventFlagObserverTranslator.h in Headers */,
50864CAD1C7BC1B000B3BAB1 /* cpDampedSpring.h in Headers */,
B6CAB5041AF9AA1A00B9B856 /* btDefaultMotionState.h in Headers */,
B6CAB52A1AF9AA1A00B9B856 /* btScalar.h in Headers */,
B6DD2FF41B04825B00E47F5F /* DetourTileCacheBuilder.h in Headers */,
@ -13379,6 +13654,8 @@
B665E2AD1AA80A6500DDB1C5 /* CCPUFlockCenteringAffector.h in Headers */,
15AE196B19AAD35100C27E9E /* DictionaryHelper.h in Headers */,
B6CAB4C21AF9AA1A00B9B856 /* SpuLibspe2Support.h in Headers */,
50864CC81C7BC1B100B3BAB1 /* cpRatchetJoint.h in Headers */,
50864C9E1C7BC1B000B3BAB1 /* cpArbiter.h in Headers */,
8525E3A31B291E42008EE815 /* clipper.hpp in Headers */,
B6CAB5021AF9AA1A00B9B856 /* btConvexHullComputer.h in Headers */,
B665E2411AA80A6500DDB1C5 /* CCPUCircleEmitterTranslator.h in Headers */,
@ -13386,6 +13663,7 @@
15AE1AA619AAD40300C27E9E /* b2Fixture.h in Headers */,
B6CAB3C21AF9AA1A00B9B856 /* btHinge2Constraint.h in Headers */,
B6CAB2121AF9AA1A00B9B856 /* btSimpleBroadphase.h in Headers */,
50864C8F1C7BC1B000B3BAB1 /* chipmunk_ffi.h in Headers */,
B6CAB4EE1AF9AA1A00B9B856 /* vectormath2bullet.h in Headers */,
15AE1BBA19AADFF000C27E9E /* HttpClient.h in Headers */,
B6CAB2241AF9AA1A00B9B856 /* btCollisionConfiguration.h in Headers */,
@ -13433,6 +13711,7 @@
B6CAB5221AF9AA1A00B9B856 /* btQuaternion.h in Headers */,
50643BDC19BFAF4400EF68ED /* CCStdC.h in Headers */,
5034CA22191D591100CE6051 /* ccShader_PositionTextureColorAlphaTest.frag in Headers */,
50864CE01C7BC1B100B3BAB1 /* cpTransform.h in Headers */,
15AE1B8E19AADA9A00C27E9E /* UIDeprecated.h in Headers */,
15AE1A3919AAD3D500C27E9E /* Box2D.h in Headers */,
50ABBECE1925AB6F00A911A9 /* s3tc.h in Headers */,
@ -13485,6 +13764,7 @@
15AE18BA19AAD33D00C27E9E /* CCControlButtonLoader.h in Headers */,
1A5701FE180BCBAD0088DEC7 /* CCMenuItem.h in Headers */,
50ABC00C1926664800A911A9 /* CCDevice.h in Headers */,
50864C9B1C7BC1B000B3BAB1 /* cpCompat62.h in Headers */,
1A570205180BCBD40088DEC7 /* CCClippingNode.h in Headers */,
B6CAB3041AF9AA1A00B9B856 /* btTriangleIndexVertexMaterialArray.h in Headers */,
15AE1B8919AADA9A00C27E9E /* UICheckBox.h in Headers */,
@ -13511,6 +13791,7 @@
15AE194619AAD35100C27E9E /* CCComAttribute.h in Headers */,
B6CAB5181AF9AA1A00B9B856 /* btMotionState.h in Headers */,
B6CAAFE51AF9A9E100B9B856 /* CCPhysics3D.h in Headers */,
50864C8C1C7BC1B000B3BAB1 /* chipmunk.h in Headers */,
B6CAB1F41AF9AA1A00B9B856 /* btCollisionAlgorithm.h in Headers */,
382384241A2590DA002C4610 /* GameMapReader.h in Headers */,
B6DD2FDC1B04825B00E47F5F /* DetourLocalBoundary.h in Headers */,
@ -13541,6 +13822,7 @@
503DD8F61926B0DB00CD74DD /* CCIMEDelegate.h in Headers */,
B6CAAFED1AF9A9E100B9B856 /* CCPhysics3DConstraint.h in Headers */,
1A570228180BCC1A0088DEC7 /* CCParticleExamples.h in Headers */,
50864CA41C7BC1B000B3BAB1 /* cpBody.h in Headers */,
B665E4391AA80A6600DDB1C5 /* CCPUVortexAffector.h in Headers */,
1A57022C180BCC1A0088DEC7 /* CCParticleSystem.h in Headers */,
B6CAB26C1AF9AA1A00B9B856 /* btSphereBoxCollisionAlgorithm.h in Headers */,
@ -13555,6 +13837,7 @@
B24AA988195A675C007B4522 /* CCFastTMXLayer.h in Headers */,
15AE1AB919AAD40300C27E9E /* b2EdgeAndCircleContact.h in Headers */,
15AE1B7319AADA9A00C27E9E /* UIListView.h in Headers */,
50864CA11C7BC1B000B3BAB1 /* cpBB.h in Headers */,
15AE192A19AAD35100C27E9E /* TriggerMng.h in Headers */,
5034CA2C191D591100CE6051 /* ccShader_PositionTextureA8Color.vert in Headers */,
B6CAB2741AF9AA1A00B9B856 /* btSphereTriangleCollisionAlgorithm.h in Headers */,
@ -13580,6 +13863,7 @@
B6CAB20E1AF9AA1A00B9B856 /* btQuantizedBvh.h in Headers */,
B665E2591AA80A6500DDB1C5 /* CCPUDoAffectorEventHandlerTranslator.h in Headers */,
B665E1F91AA80A6500DDB1C5 /* CCPUAffectorManager.h in Headers */,
50864CA71C7BC1B000B3BAB1 /* cpConstraint.h in Headers */,
2980F0221BA9A5550059E678 /* CCUIEditBoxIOS.h in Headers */,
B665E2351AA80A6500DDB1C5 /* CCPUBoxEmitter.h in Headers */,
B6CAB36C1AF9AA1A00B9B856 /* btConvexPenetrationDepthSolver.h in Headers */,
@ -13597,6 +13881,7 @@
15AE1B7F19AADA9A00C27E9E /* UIText.h in Headers */,
B29A7E3419EE1B7700872B35 /* SlotData.h in Headers */,
B6CAAFF91AF9A9E100B9B856 /* CCPhysics3DShape.h in Headers */,
50864CB31C7BC1B000B3BAB1 /* cpGrooveJoint.h in Headers */,
B665E3D51AA80A6600DDB1C5 /* CCPUScriptLexer.h in Headers */,
50ABBE701925AB6F00A911A9 /* CCEventListenerKeyboard.h in Headers */,
15AE18B619AAD33D00C27E9E /* CCBSequence.h in Headers */,
@ -13617,6 +13902,7 @@
B665E2B11AA80A6500DDB1C5 /* CCPUFlockCenteringAffectorTranslator.h in Headers */,
B6CAB2E81AF9AA1A00B9B856 /* btSphereShape.h in Headers */,
15AE1ABF19AAD40300C27E9E /* b2PolygonContact.h in Headers */,
50864CC21C7BC1B100B3BAB1 /* cpPolyline.h in Headers */,
50ABBEAA1925AB6F00A911A9 /* CCTouch.h in Headers */,
15AE1BAE19AADFDF00C27E9E /* UILayoutParameter.h in Headers */,
15AE18C819AAD33D00C27E9E /* CCMenuItemImageLoader.h in Headers */,
@ -13627,6 +13913,7 @@
298C75D81C0465D1006BAE63 /* CCStencilStateManager.hpp in Headers */,
15AE18D119AAD33D00C27E9E /* CCNodeLoaderLibrary.h in Headers */,
15AE1AC319AAD40300C27E9E /* b2DistanceJoint.h in Headers */,
50864C951C7BC1B000B3BAB1 /* chipmunk_types.h in Headers */,
B6CAB5261AF9AA1A00B9B856 /* btQuickprof.h in Headers */,
2980F02B1BA9A5550059E678 /* UITextView+CCUITextInput.h in Headers */,
50ABBE741925AB6F00A911A9 /* CCEventListenerMouse.h in Headers */,
@ -13712,6 +13999,7 @@
B665E2151AA80A6500DDB1C5 /* CCPUBaseForceAffectorTranslator.h in Headers */,
1A01C69B18F57BE800EFE3A6 /* CCSet.h in Headers */,
B665E4051AA80A6600DDB1C5 /* CCPUSphereColliderTranslator.h in Headers */,
50864CBC1C7BC1B000B3BAB1 /* cpPinJoint.h in Headers */,
50ABBED61925AB6F00A911A9 /* utlist.h in Headers */,
1A57035B180BD0B00088DEC7 /* unzip.h in Headers */,
B6CAB44A1AF9AA1A00B9B856 /* btThreadSupportInterface.h in Headers */,
@ -13802,6 +14090,7 @@
15AE180B19AAD2F700C27E9E /* CCAABB.h in Headers */,
50ABBD921925AB4100A911A9 /* CCGLProgramCache.h in Headers */,
B6CAB30E1AF9AA1A00B9B856 /* btTriangleMeshShape.h in Headers */,
50864CCB1C7BC1B100B3BAB1 /* cpRobust.h in Headers */,
50ABBE961925AB6F00A911A9 /* CCProfiling.h in Headers */,
15AE19B519AAD39700C27E9E /* TextAtlasReader.h in Headers */,
15AE18D619AAD33D00C27E9E /* CCScale9SpriteLoader.h in Headers */,
@ -13872,6 +14161,7 @@
D0FD035A1A3B51AA00825BB5 /* CCAllocatorStrategyDefault.h in Headers */,
50ABBD471925AB0000A911A9 /* CCVertex.h in Headers */,
B6CAB4D81AF9AA1A00B9B856 /* SpuLocalSupport.h in Headers */,
50864CB01C7BC1B000B3BAB1 /* cpGearJoint.h in Headers */,
B6CAB2921AF9AA1A00B9B856 /* btCollisionShape.h in Headers */,
B6CAB2681AF9AA1A00B9B856 /* btSimulationIslandManager.h in Headers */,
B665E3251AA80A6500DDB1C5 /* CCPUOnCollisionObserver.h in Headers */,
@ -13899,11 +14189,13 @@
5034CA36191D591100CE6051 /* ccShader_PositionTexture.frag in Headers */,
B24AA98C195A675C007B4522 /* CCFastTMXTiledMap.h in Headers */,
B29A7DEC19EE1B7700872B35 /* MeshAttachment.h in Headers */,
50864CDA1C7BC1B100B3BAB1 /* cpSpace.h in Headers */,
50ABBEAE1925AB6F00A911A9 /* ccTypes.h in Headers */,
B6CAB50C1AF9AA1A00B9B856 /* btHashMap.h in Headers */,
15AE185819AAD31200C27E9E /* CDAudioManager.h in Headers */,
B6CAB3841AF9AA1A00B9B856 /* btMinkowskiPenetrationDepthSolver.h in Headers */,
0C261F2B1BE7528900707478 /* Light3DReader.h in Headers */,
50864C981C7BC1B000B3BAB1 /* chipmunk_unsafe.h in Headers */,
B665E38D1AA80A6500DDB1C5 /* CCPUPlane.h in Headers */,
B6CAB3501AF9AA1A00B9B856 /* gim_geom_types.h in Headers */,
B6CAB3941AF9AA1A00B9B856 /* btSimplexSolverInterface.h in Headers */,
@ -13952,6 +14244,7 @@
B5A738991BB0051F00BAAEF8 /* UIPageViewIndicator.h in Headers */,
15AE1BED19AAE01E00C27E9E /* CCControlColourPicker.h in Headers */,
15AE195019AAD35100C27E9E /* CCDatas.h in Headers */,
50864CEB1C7BC90A00B3BAB1 /* cpCompat62.h in Headers */,
15AE18B319AAD33D00C27E9E /* CCBReader.h in Headers */,
15AE18D219AAD33D00C27E9E /* CCNodeLoaderListener.h in Headers */,
15AE184D19AAD30800C27E9E /* SimpleAudioEngine.h in Headers */,
@ -13963,6 +14256,7 @@
B665E3B51AA80A6500DDB1C5 /* CCPURendererTranslator.h in Headers */,
501216A31AC473AD009A4BEA /* CCMaterial.h in Headers */,
B665E20D1AA80A6500DDB1C5 /* CCPUBaseColliderTranslator.h in Headers */,
50864CD71C7BC1B100B3BAB1 /* cpSlideJoint.h in Headers */,
1A01C68D18F57BE800EFE3A6 /* CCDeprecated.h in Headers */,
B665E2E91AA80A6500DDB1C5 /* CCPULinearForceAffector.h in Headers */,
382384321A259112002C4610 /* ParticleReader.h in Headers */,
@ -14002,6 +14296,7 @@
15AE193719AAD35100C27E9E /* CCArmature.h in Headers */,
B63990CF1A490AFE00B07923 /* CCAsyncTaskPool.h in Headers */,
15AE1BC319AADFFB00C27E9E /* cocos-ext.h in Headers */,
50864CD41C7BC1B100B3BAB1 /* cpSimpleMotor.h in Headers */,
15AE1B8B19AADA9A00C27E9E /* UIImageView.h in Headers */,
15AE1A4619AAD3D500C27E9E /* b2TimeOfImpact.h in Headers */,
B665E2291AA80A6500DDB1C5 /* CCPUBillboardChain.h in Headers */,
@ -14177,6 +14472,7 @@
B665E36E1AA80A6500DDB1C5 /* CCPUOnVelocityObserverTranslator.cpp in Sources */,
15AE190119AAD35000C27E9E /* CCComController.cpp in Sources */,
B6CAB4071AF9AA1A00B9B856 /* btMultiBodyJointLimitConstraint.cpp in Sources */,
C5F516191C8216C60013B695 /* TabControlReader.cpp in Sources */,
B6CAB38F1AF9AA1A00B9B856 /* btRaycastCallback.cpp in Sources */,
15AE1BE619AAE01E00C27E9E /* CCTableViewCell.cpp in Sources */,
50ABBEBB1925AB6F00A911A9 /* ccUtils.cpp in Sources */,
@ -14453,6 +14749,7 @@
B6CAB4B71AF9AA1A00B9B856 /* SpuFakeDma.cpp in Sources */,
B665E3361AA80A6500DDB1C5 /* CCPUOnEmissionObserverTranslator.cpp in Sources */,
15B3708819EE414C00ABE682 /* Manifest.cpp in Sources */,
C5F516121C8216660013B695 /* UITabControl.cpp in Sources */,
B665E27E1AA80A6500DDB1C5 /* CCPUDoScaleEventHandlerTranslator.cpp in Sources */,
B63990CC1A490AFE00B07923 /* CCAsyncTaskPool.cpp in Sources */,
182C5CE51A9D725400C30D34 /* UserCameraReader.cpp in Sources */,
@ -14947,6 +15244,8 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
C5F516221C822E060013B695 /* TabControlReader.cpp in Sources */,
C5F516211C822DED0013B695 /* UITabControl.cpp in Sources */,
507B39C21C31BDD30067B53E /* CCAllocatorGlobalNewDelete.cpp in Sources */,
507B39C31C31BDD30067B53E /* UIVideoPlayer-ios.mm in Sources */,
507B39C41C31BDD30067B53E /* CCPUPlaneCollider.cpp in Sources */,
@ -15791,6 +16090,8 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
C5F5161F1C822D6D0013B695 /* UITabControl.cpp in Sources */,
C5F5161D1C822D400013B695 /* TabControlReader.cpp in Sources */,
D0FD03541A3B51AA00825BB5 /* CCAllocatorGlobalNewDelete.cpp in Sources */,
15AE1B9819AADAA100C27E9E /* UIVideoPlayer-ios.mm in Sources */,
B665E38F1AA80A6500DDB1C5 /* CCPUPlaneCollider.cpp in Sources */,
@ -16668,7 +16969,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../external/chipmunk/include/chipmunk $(SRCROOT)/../external $(SRCROOT)/../extensions $(SRCROOT)/../external/poly2tri $(SRCROOT)/../external/poly2tri/common $(SRCROOT)/../external/poly2tri/sweep";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../external/chipmunk/include $(SRCROOT)/../external $(SRCROOT)/../extensions $(SRCROOT)/../external/poly2tri $(SRCROOT)/../external/poly2tri/common $(SRCROOT)/../external/poly2tri/sweep";
};
name = Debug;
};
@ -16701,7 +17002,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../external/chipmunk/include/chipmunk $(SRCROOT)/../external $(SRCROOT)/../extensions $(SRCROOT)/../external/poly2tri $(SRCROOT)/../external/poly2tri/common $(SRCROOT)/../external/poly2tri/sweep";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../external/chipmunk/include $(SRCROOT)/../external $(SRCROOT)/../extensions $(SRCROOT)/../external/poly2tri $(SRCROOT)/../external/poly2tri/common $(SRCROOT)/../external/poly2tri/sweep";
VALIDATE_PRODUCT = YES;
};
name = Release;
@ -16738,7 +17039,7 @@
);
MACH_O_TYPE = staticlib;
OTHER_LDFLAGS = "-llibsql3";
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 $(SRCROOT)/../external/websockets/include/mac $(SRCROOT)/../external/chipmunk/include/chipmunk $(SRCROOT)/../external/curl/include/mac $(SRCROOT)/../external/freetype2/include/mac/freetype2";
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 $(SRCROOT)/../external/websockets/include/mac $(SRCROOT)/../external/curl/include/mac $(SRCROOT)/../external/freetype2/include/mac/freetype2";
};
name = Debug;
};
@ -16775,7 +17076,7 @@
);
MACH_O_TYPE = staticlib;
OTHER_LDFLAGS = "-llibsql3";
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 $(SRCROOT)/../external/websockets/include/mac $(SRCROOT)/../external/chipmunk/include/chipmunk $(SRCROOT)/../external/curl/include/mac $(SRCROOT)/../external/freetype2/include/mac/freetype2";
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 $(SRCROOT)/../external/websockets/include/mac $(SRCROOT)/../external/curl/include/mac $(SRCROOT)/../external/freetype2/include/mac/freetype2";
};
name = Release;
};
@ -16806,7 +17107,7 @@
OTHER_LDFLAGS = "-llibsql3";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos9.1;
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 $(SRCROOT)/../external/websockets/include/ios $(SRCROOT)/../external/chipmunk/include/chipmunk $(SRCROOT)/../external/freetype2/include/ios/freetype2";
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 $(SRCROOT)/../external/websockets/include/ios $(SRCROOT)/../external/freetype2/include/ios/freetype2";
};
name = Debug;
};
@ -16838,7 +17139,7 @@
OTHER_LDFLAGS = "-llibsql3";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos9.1;
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 $(SRCROOT)/../external/websockets/include/ios $(SRCROOT)/../external/chipmunk/include/chipmunk $(SRCROOT)/../external/freetype2/include/ios/freetype2";
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 $(SRCROOT)/../external/websockets/include/ios $(SRCROOT)/../external/freetype2/include/ios/freetype2";
};
name = Release;
};
@ -16870,7 +17171,7 @@
OTHER_LDFLAGS = "-llibsql3";
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 $(SRCROOT)/../external/websockets/include/ios $(SRCROOT)/../external/chipmunk/include/chipmunk $(SRCROOT)/../external/freetype2/include/ios/freetype2";
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 $(SRCROOT)/../external/websockets/include/ios $(SRCROOT)/../external/freetype2/include/ios/freetype2";
VALID_ARCHS = "arm64 armv7";
};
name = Debug;
@ -16904,7 +17205,7 @@
OTHER_LDFLAGS = "-llibsql3";
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 $(SRCROOT)/../external/websockets/include/ios $(SRCROOT)/../external/chipmunk/include/chipmunk $(SRCROOT)/../external/freetype2/include/ios/freetype2";
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 $(SRCROOT)/../external/websockets/include/ios $(SRCROOT)/../external/freetype2/include/ios/freetype2";
VALID_ARCHS = "arm64 armv7";
};
name = Release;

42
build/cocos2d_tests.xcodeproj/project.pbxproj
View File

@ -1391,6 +1391,9 @@
C08689C218D370C90093E810 /* background.caf in Resources */ = {isa = PBXBuildFile; fileRef = C08689C018D370C90093E810 /* background.caf */; };
C08689C318D370C90093E810 /* background.caf in Resources */ = {isa = PBXBuildFile; fileRef = C08689C018D370C90093E810 /* background.caf */; };
C08689C418D370C90093E810 /* background.caf in Resources */ = {isa = PBXBuildFile; fileRef = C08689C018D370C90093E810 /* background.caf */; };
C5384A7E1C85314A00EC986E /* UITabControlTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C5384A7C1C8530E200EC986E /* UITabControlTest.cpp */; };
C5384A7F1C8531A700EC986E /* UITabControlTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C5384A7C1C8530E200EC986E /* UITabControlTest.cpp */; };
C5384A801C85339200EC986E /* UITabControlTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C5384A7C1C8530E200EC986E /* UITabControlTest.cpp */; };
D0FD03641A3B546400825BB5 /* AllocatorTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0FD03621A3B546400825BB5 /* AllocatorTest.cpp */; };
D0FD03651A3B546400825BB5 /* AllocatorTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0FD03621A3B546400825BB5 /* AllocatorTest.cpp */; };
D60AE43417F7FFE100757E4B /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D60AE43317F7FFE100757E4B /* CoreMotion.framework */; };
@ -2704,6 +2707,8 @@
C04F93581941B05400E9FEAB /* TileMapTest2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TileMapTest2.cpp; sourceTree = "<group>"; };
C04F93591941B05400E9FEAB /* TileMapTest2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TileMapTest2.h; sourceTree = "<group>"; };
C08689C018D370C90093E810 /* background.caf */ = {isa = PBXFileReference; lastKnownFileType = file; name = background.caf; path = "../tests/cpp-tests/Resources/background.caf"; sourceTree = "<group>"; };
C5384A7C1C8530E200EC986E /* UITabControlTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UITabControlTest.cpp; path = UITabControlTest/UITabControlTest.cpp; sourceTree = "<group>"; };
C5384A7D1C8530E200EC986E /* UITabControlTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UITabControlTest.h; path = UITabControlTest/UITabControlTest.h; sourceTree = "<group>"; };
D0FD03621A3B546400825BB5 /* AllocatorTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AllocatorTest.cpp; path = AllocatorTest/AllocatorTest.cpp; sourceTree = "<group>"; };
D0FD03631A3B546400825BB5 /* AllocatorTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AllocatorTest.h; path = AllocatorTest/AllocatorTest.h; sourceTree = "<group>"; };
D60AE43317F7FFE100757E4B /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/CoreMotion.framework; sourceTree = DEVELOPER_DIR; };
@ -5116,6 +5121,7 @@
29FBBC00196A9F0D00E65826 /* UIAndEditorTests */ = {
isa = PBXGroup;
children = (
C58126F61C84959600C92DE2 /* UITabControlTest */,
29080D1F191B595E0066F8DF /* CocosGUIScene.cpp */,
29080D20191B595E0066F8DF /* CocosGUIScene.h */,
29080D37191B595E0066F8DF /* GUIEditorTest.cpp */,
@ -5467,6 +5473,15 @@
name = NavMeshTest;
sourceTree = "<group>";
};
C58126F61C84959600C92DE2 /* UITabControlTest */ = {
isa = PBXGroup;
children = (
C5384A7C1C8530E200EC986E /* UITabControlTest.cpp */,
C5384A7D1C8530E200EC986E /* UITabControlTest.h */,
);
name = UITabControlTest;
sourceTree = "<group>";
};
D0FD03611A3B543700825BB5 /* AllocatorTest */ = {
isa = PBXGroup;
children = (
@ -7075,6 +7090,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
C5384A801C85339200EC986E /* UITabControlTest.cpp in Sources */,
3825CC491A2C982A00C92EA8 /* CustomRootNode.cpp in Sources */,
1AC35B3118CECF0C00F37B72 /* GLES-Render.cpp in Sources */,
29080DE1191B595E0066F8DF /* UITextTest_Editor.cpp in Sources */,
@ -7281,6 +7297,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
C5384A7F1C8531A700EC986E /* UITabControlTest.cpp in Sources */,
507B413C1C31BEA60067B53E /* GLES-Render.cpp in Sources */,
507B413D1C31BEA60067B53E /* SpritePolygonTest.cpp in Sources */,
507B413E1C31BEA60067B53E /* TextInputTest.cpp in Sources */,
@ -7538,6 +7555,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
C5384A7E1C85314A00EC986E /* UITabControlTest.cpp in Sources */,
1AC35B3218CECF0C00F37B72 /* GLES-Render.cpp in Sources */,
688669721AE8E8B500C2CFD9 /* SpritePolygonTest.cpp in Sources */,
1AC35C5418CECF0C00F37B72 /* TextInputTest.cpp in Sources */,
@ -8209,7 +8227,7 @@
);
PRODUCT_NAME = "js-tests Mac";
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external/spidermonkey/include/mac $(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../external/chipmunk/include/chipmunk $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external/spidermonkey/include/mac $(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual";
};
name = Debug;
};
@ -8241,7 +8259,7 @@
);
PRODUCT_NAME = "js-tests Mac";
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external/spidermonkey/include/mac $(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../external/chipmunk/include/chipmunk $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external/spidermonkey/include/mac $(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual";
VALIDATE_PRODUCT = YES;
};
name = Release;
@ -8272,7 +8290,7 @@
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../external/chipmunk/include/chipmunk $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual $(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/spidermonkey/include/ios $(SRCROOT)/../external/curl/include/ios";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual $(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/spidermonkey/include/ios $(SRCROOT)/../external/curl/include/ios";
VALID_ARCHS = "arm64 armv7";
};
name = Debug;
@ -8304,7 +8322,7 @@
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../external/chipmunk/include/chipmunk $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual $(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/spidermonkey/include/ios $(SRCROOT)/../external/curl/include/ios";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual $(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/spidermonkey/include/ios $(SRCROOT)/../external/curl/include/ios";
VALIDATE_PRODUCT = YES;
VALID_ARCHS = "arm64 armv7";
};
@ -8706,7 +8724,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
SDKROOT = appletvos;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../external/chipmunk/include/chipmunk $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual $(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/spidermonkey/include/ios $(SRCROOT)/../external/curl/include/ios";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual $(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/spidermonkey/include/ios $(SRCROOT)/../external/curl/include/ios";
};
name = Debug;
};
@ -8730,7 +8748,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
SDKROOT = appletvos;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../external/chipmunk/include/chipmunk $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual $(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/spidermonkey/include/ios $(SRCROOT)/../external/curl/include/ios";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual $(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/spidermonkey/include/ios $(SRCROOT)/../external/curl/include/ios";
VALIDATE_PRODUCT = YES;
};
name = Release;
@ -8849,7 +8867,7 @@
);
PRODUCT_NAME = "$(TARGET_NAME)";
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external/spidermonkey/include/mac $(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../external/chipmunk/include/chipmunk $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external/spidermonkey/include/mac $(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual";
};
name = Debug;
};
@ -8881,7 +8899,7 @@
);
PRODUCT_NAME = "$(TARGET_NAME)";
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external/spidermonkey/include/mac $(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../external/chipmunk/include/chipmunk $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external/spidermonkey/include/mac $(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual";
VALIDATE_PRODUCT = YES;
};
name = Release;
@ -8912,7 +8930,7 @@
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../external/chipmunk/include/chipmunk $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual $(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/spidermonkey/include/ios $(SRCROOT)/../external/curl/include/ios";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual $(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/spidermonkey/include/ios $(SRCROOT)/../external/curl/include/ios";
VALID_ARCHS = "arm64 armv7";
};
name = Debug;
@ -8944,7 +8962,7 @@
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../external/chipmunk/include/chipmunk $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual $(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/spidermonkey/include/ios $(SRCROOT)/../external/curl/include/ios";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/gui $(SRCROOT)/../cocos/network $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../cocos/scripting/js-bindings/auto $(SRCROOT)/../cocos/scripting/js-bindings/manual $(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/spidermonkey/include/ios $(SRCROOT)/../external/curl/include/ios";
VALIDATE_PRODUCT = YES;
VALID_ARCHS = "arm64 armv7";
};
@ -9062,7 +9080,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "org.cocos2d-x.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../external/chipmunk/include/chipmunk";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../external/chipmunk/include";
};
name = Debug;
};
@ -9089,7 +9107,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "org.cocos2d-x.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../external/chipmunk/include/chipmunk";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../external/chipmunk/include";
};
name = Release;
};

96
cmake/AndroidNdkGdb.cmake Normal file
View File

@ -0,0 +1,96 @@
# Copyright (c) 2014, Pavel Rojtberg
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
#
# 2. Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
# 3. Neither the name of the copyright holder nor the names of its
# contributors may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
# 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 HOLDER 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.
# ------------------------------------------------------------------------------
# Usage:
# 1. place AndroidNdkGdb.cmake somewhere inside ${CMAKE_MODULE_PATH}
# 2. inside your project add
#
# include(AndroidNdkGdb)
# android_ndk_gdb_enable()
# # for each target
# add_library(MyLibrary ...)
# android_ndk_gdb_debuggable(MyLibrary)
# add gdbserver and general gdb configuration to project
# also create a mininal NDK skeleton so ndk-gdb finds the paths
#
# the optional parameter defines the path to the android project.
# uses PROJECT_SOURCE_DIR by default.
macro(android_ndk_gdb_enable)
if(ANDROID)
# create custom target that depends on the real target so it gets executed afterwards
add_custom_target(NDK_GDB ALL)
if(${ARGC})
set(ANDROID_PROJECT_DIR ${ARGV0})
else()
set(ANDROID_PROJECT_DIR ${PROJECT_SOURCE_DIR})
endif()
set(NDK_GDB_SOLIB_PATH ${ANDROID_PROJECT_DIR}/obj/local/${ANDROID_NDK_ABI_NAME}/)
file(MAKE_DIRECTORY ${NDK_GDB_SOLIB_PATH})
# 1. generate essential Android Makefiles
file(MAKE_DIRECTORY ${ANDROID_PROJECT_DIR}/jni)
if(NOT EXISTS ${ANDROID_PROJECT_DIR}/jni/Android.mk)
file(WRITE ${ANDROID_PROJECT_DIR}/jni/Android.mk "APP_ABI := ${ANDROID_NDK_ABI_NAME}\n")
endif()
if(NOT EXISTS ${ANDROID_PROJECT_DIR}/jni/Application.mk)
file(WRITE ${ANDROID_PROJECT_DIR}/jni/Application.mk "APP_ABI := ${ANDROID_NDK_ABI_NAME}\n")
endif()
# 2. generate gdb.setup
get_directory_property(PROJECT_INCLUDES DIRECTORY ${PROJECT_SOURCE_DIR} INCLUDE_DIRECTORIES)
string(REGEX REPLACE ";" " " PROJECT_INCLUDES "${PROJECT_INCLUDES}")
file(WRITE ${LIBRARY_OUTPUT_PATH}/gdb.setup "set solib-search-path ${NDK_GDB_SOLIB_PATH}\n")
file(APPEND ${LIBRARY_OUTPUT_PATH}/gdb.setup "directory ${PROJECT_INCLUDES}\n")
# 3. copy gdbserver executable
file(COPY ${ANDROID_NDK}/prebuilt/android-${ANDROID_ARCH_NAME}/gdbserver/gdbserver DESTINATION ${LIBRARY_OUTPUT_PATH})
endif()
endmacro()
# register a target for remote debugging
# copies the debug version to NDK_GDB_SOLIB_PATH then strips symbols of original
macro(android_ndk_gdb_debuggable TARGET_NAME)
if(ANDROID)
get_property(TARGET_LOCATION TARGET ${TARGET_NAME} PROPERTY LOCATION)
# create custom target that depends on the real target so it gets executed afterwards
add_dependencies(NDK_GDB ${TARGET_NAME})
# 4. copy lib to obj
add_custom_command(TARGET NDK_GDB POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${TARGET_LOCATION} ${NDK_GDB_SOLIB_PATH})
# 5. strip symbols
add_custom_command(TARGET NDK_GDB POST_BUILD COMMAND ${CMAKE_STRIP} ${TARGET_LOCATION})
endif()
endmacro()

58
cmake/AndroidNdkModules.cmake Normal file
View File

@ -0,0 +1,58 @@
# Copyright (c) 2014, Pavel Rojtberg
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
#
# 2. Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
# 3. Neither the name of the copyright holder nor the names of its
# contributors may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
# 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 HOLDER 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.
macro(android_ndk_import_module_cpufeatures)
if(ANDROID)
include_directories(${ANDROID_NDK}/sources/android/cpufeatures)
add_library(cpufeatures ${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c)
target_link_libraries(cpufeatures dl)
endif()
endmacro()
macro(android_ndk_import_module_native_app_glue)
if(ANDROID)
include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
add_library(native_app_glue ${ANDROID_NDK}/sources/android/native_app_glue/android_native_app_glue.c)
target_link_libraries(native_app_glue log)
endif()
endmacro()
macro(android_ndk_import_module_ndk_helper)
if(ANDROID)
android_ndk_import_module_cpufeatures()
android_ndk_import_module_native_app_glue()
include_directories(${ANDROID_NDK}/sources/android/ndk_helper)
file(GLOB _NDK_HELPER_SRCS ${ANDROID_NDK}/sources/android/ndk_helper/*.cpp ${ANDROID_NDK}/sources/android/ndk_helper/gl3stub.c)
add_library(ndk_helper ${_NDK_HELPER_SRCS})
target_link_libraries(ndk_helper log android EGL GLESv2 cpufeatures native_app_glue)
unset(_NDK_HELPER_SRCS)
endif()
endmacro()

15
cmake/Modules/CocosUsePrebuiltLibs.cmake
View File

@ -2,12 +2,13 @@
# START CONFIG
set(_chipmunk_inc chipmunk.h)
set(_chipmunk_inc_paths chipmunk)
set(_chipmunk_inc chipmunk/chipmunk.h)
set(_chipmunk_inc_paths include)
set(_chipmunk_libs chipmunk libchipmunk)
set(_curl_inc curl/curl.h)
set(_curl_libs crypto ssl libeay32 ssleay32 curl libcurl_imp libcurl)
# order: curl, ssl, crypto
set(_curl_libs curl libcurl_imp libcurl ssl libeay32 ssleay32 crypto)
set(_freetype2_prefix FREETYPE)
set(_freetype2_inc ft2build.h freetype/freetype.h)
@ -89,6 +90,11 @@ if(LINUX)
list(APPEND all_prebuilt_libs fmod)
endif()
if(ANDROID)
list(APPEND all_prebuilt_libs zlib)
endif()
# END CONFIG
foreach(_lib ${all_prebuilt_libs})
@ -122,6 +128,7 @@ foreach(_lib ${all_prebuilt_libs})
endif()
foreach(_inc_name ${_${_lib}_inc})
unset(_inc_tmp CACHE)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER)
find_path(_inc_tmp ${_inc_name} PATH_SUFFIXES ${_suffixes} PATHS ${_dir} NO_DEFAULT_PATH)
if(_inc_tmp)
list(APPEND include_dirs ${_inc_tmp})
@ -135,6 +142,7 @@ foreach(_lib ${all_prebuilt_libs})
#message(STATUS "${_lib} ${_prefix}_INCLUDE_DIRS: ${${_prefix}_INCLUDE_DIRS}")
set(lib_dir_candidates
${_root}/prebuilt/${PLATFORM_FOLDER}/${ANDROID_ABI}
${_root}/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR}
${_root}/prebuilt/${PLATFORM_FOLDER}
${_root}/prebuilt/${PLATFORM_FOLDER}/release-lib
@ -148,6 +156,7 @@ foreach(_lib ${all_prebuilt_libs})
# find all libs
foreach(_lib_name ${_${_lib}_libs})
unset(_lib_tmp CACHE)
set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER )
find_library(_lib_tmp ${_lib_name} PATHS ${_dir} NO_DEFAULT_PATH)
if(_lib_tmp)
list(APPEND libs ${_lib_tmp})

8
cmake/Modules/FindChipmunk.cmake
View File

@ -9,7 +9,7 @@
# ::
#
# CHIPMUNK_LIBRARIES, the library to link against
# CHIPMUNK_FOUND, if false, do not try to link to FREETYPE
# CHIPMUNK_FOUND, if false, do not try to link to Chipmunk
# CHIPMUNK_INCLUDE_DIRS, where to find headers.
# This is the concatenation of the paths:
# CHIPMUNK_INCLUDE_DIR
@ -27,10 +27,10 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
FIND_PATH(CHIPMUNK_INCLUDE_DIR chipmunk.h
FIND_PATH(CHIPMUNK_INCLUDE_DIR chipmunk/chipmunk.h
HINTS
ENV CHIPMUNK_DIR
PATH_SUFFIXES include/chipmunk include
PATH_SUFFIXES include
PATHS
~/Library/Frameworks
/Library/Frameworks
@ -42,7 +42,7 @@ FIND_PATH(CHIPMUNK_INCLUDE_DIR chipmunk.h
/opt
)
FIND_LIBRARY(CHIPMUNK_LIBRARY
FIND_LIBRARY(CHIPMUNK_LIBRARY
NAMES chipmunk libchipmunk
HINTS
ENV CHIPMUNK_DIR

711
cmake/android.toolchain.cmake
View File

File diff suppressed because it is too large Load Diff

8
cocos/2d/CCAutoPolygon.cpp
View File

@ -114,22 +114,22 @@ void PolygonInfo::releaseVertsAndIndices()
}
}
const unsigned int PolygonInfo::getVertCount() const
unsigned int PolygonInfo::getVertCount() const
{
return (unsigned int)triangles.vertCount;
}
const unsigned int PolygonInfo::getTrianglesCount() const
unsigned int PolygonInfo::getTrianglesCount() const
{
return (unsigned int)triangles.indexCount/3;
}
const unsigned int PolygonInfo::getTriaglesCount() const
unsigned int PolygonInfo::getTriaglesCount() const
{
return getTrianglesCount();
}
const float PolygonInfo::getArea() const
float PolygonInfo::getArea() const
{
float area = 0;
V3F_C4B_T2F *verts = triangles.verts;

8
cocos/2d/CCAutoPolygon.h
View File

@ -101,22 +101,22 @@ public:
* get vertex count
* @return number of vertices
*/
const unsigned int getVertCount() const;
unsigned int getVertCount() const;
/**
* get triangles count
* @return number of triangles
*/
const unsigned int getTrianglesCount() const;
unsigned int getTrianglesCount() const;
/** @deprecated Use method getTrianglesCount() instead */
CC_DEPRECATED_ATTRIBUTE const unsigned int getTriaglesCount() const;
CC_DEPRECATED_ATTRIBUTE unsigned int getTriaglesCount() const;
/**
* get sum of all triangle area size
* @return sum of all triangle area size
*/
const float getArea() const;
float getArea() const;
Rect rect;
std::string filename;

2
cocos/2d/CCClippingRectangleNode.h
View File

@ -77,7 +77,7 @@ public:
@brief Get whether the clipping is enabled or not.
@return Whether the clipping is enabled or not. Default is true.
*/
const bool isClippingEnabled() const {
bool isClippingEnabled() const {
return _clippingEnabled;
}

4
cocos/2d/CCRenderTexture.cpp
View File

@ -566,7 +566,7 @@ Image* RenderTexture::newImage(bool fliimage)
glBindFramebuffer(GL_FRAMEBUFFER, _FBO);
// TODO: move this to configuration, so we don't check it every time
/* Certain Qualcomm Andreno gpu's will retain data in memory after a frame buffer switch which corrupts the render to the texture. The solution is to clear the frame buffer before rendering to the texture. However, calling glClear has the unintended result of clearing the current texture. Create a temporary texture to overcome this. At the end of RenderTexture::begin(), switch the attached texture to the second one, call glClear, and then switch back to the original texture. This solution is unnecessary for other devices as they don't have the same issue with switching frame buffers.
/* Certain Qualcomm Adreno GPU's will retain data in memory after a frame buffer switch which corrupts the render to the texture. The solution is to clear the frame buffer before rendering to the texture. However, calling glClear has the unintended result of clearing the current texture. Create a temporary texture to overcome this. At the end of RenderTexture::begin(), switch the attached texture to the second one, call glClear, and then switch back to the original texture. This solution is unnecessary for other devices as they don't have the same issue with switching frame buffers.
*/
if (Configuration::getInstance()->checkForGLExtension("GL_QCOM"))
{
@ -651,7 +651,7 @@ void RenderTexture::onBegin()
glBindFramebuffer(GL_FRAMEBUFFER, _FBO);
// TODO: move this to configuration, so we don't check it every time
/* Certain Qualcomm Andreno gpu's will retain data in memory after a frame buffer switch which corrupts the render to the texture. The solution is to clear the frame buffer before rendering to the texture. However, calling glClear has the unintended result of clearing the current texture. Create a temporary texture to overcome this. At the end of RenderTexture::begin(), switch the attached texture to the second one, call glClear, and then switch back to the original texture. This solution is unnecessary for other devices as they don't have the same issue with switching frame buffers.
/* Certain Qualcomm Adreno GPU's will retain data in memory after a frame buffer switch which corrupts the render to the texture. The solution is to clear the frame buffer before rendering to the texture. However, calling glClear has the unintended result of clearing the current texture. Create a temporary texture to overcome this. At the end of RenderTexture::begin(), switch the attached texture to the second one, call glClear, and then switch back to the original texture. This solution is unnecessary for other devices as they don't have the same issue with switching frame buffers.
*/
if (Configuration::getInstance()->checkForGLExtension("GL_QCOM"))
{

2
cocos/2d/CCSprite.h
View File

@ -474,7 +474,7 @@ public:
virtual bool isOpacityModifyRGB() const override;
/// @}
const int getResourceType() const { return _fileType; }
int getResourceType() const { return _fileType; }
const std::string& getResourceName() const { return _fileName; }
CC_CONSTRUCTOR_ACCESS :

9
cocos/2d/libcocos2d.vcxproj
View File

@ -75,7 +75,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\box2d;$(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\OpenalSoft\include;$(EngineRoot)external\win32-specific\MP3Decoder\include;$(EngineRoot)external\win32-specific\OggDecoder\include;$(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\curl\include\win32;$(EngineRoot)external\websockets\include\win32;$(EngineRoot)external\poly2tri\common;$(EngineRoot)external\poly2tri\sweep;$(EngineRoot)external\poly2tri;$(EngineRoot)external;$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\box2d;$(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\OpenalSoft\include;$(EngineRoot)external\win32-specific\MP3Decoder\include;$(EngineRoot)external\win32-specific\OggDecoder\include;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\include\win32;$(EngineRoot)external\poly2tri\common;$(EngineRoot)external\poly2tri\sweep;$(EngineRoot)external\poly2tri;$(EngineRoot)external;$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_USRDLL;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;PROTOBUF_USE_DLLS;LIBPROTOBUF_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -130,7 +130,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\debug-lib\*.*"
</Command>
</PreBuildEvent>
<ClCompile>
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\MP3Decoder\include;$(EngineRoot)external\win32-specific\OggDecoder\include;$(EngineRoot)external\win32-specific\OpenalSoft\include;$(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\Box2d;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\include\win32\;$(EngineRoot)external\poly2tri\common;$(EngineRoot)external\poly2tri\sweep;$(EngineRoot)external\poly2tri;$(EngineRoot)external;$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\MP3Decoder\include;$(EngineRoot)external\win32-specific\OggDecoder\include;$(EngineRoot)external\win32-specific\OpenalSoft\include;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\Box2d;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\include\win32\;$(EngineRoot)external\poly2tri\common;$(EngineRoot)external\poly2tri\sweep;$(EngineRoot)external\poly2tri;$(EngineRoot)external;$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_USRDLL;NDEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;PROTOBUF_USE_DLLS;LIBPROTOBUF_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@ -554,6 +554,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\SkeletonReader\SkeletonNodeReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\SliderReader\SliderReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\SpriteReader\SpriteReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\TabControlReader\TabControlReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\TextAtlasReader\TextAtlasReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\TextBMFontReader\TextBMFontReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\TextFieldReader\TextFieldReader.cpp" />
@ -661,6 +662,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
<ClCompile Include="..\ui\UIScrollView.cpp" />
<ClCompile Include="..\ui\UIScrollViewBar.cpp" />
<ClCompile Include="..\ui\UISlider.cpp" />
<ClCompile Include="..\ui\UITabControl.cpp" />
<ClCompile Include="..\ui\UIText.cpp" />
<ClCompile Include="..\ui\UITextAtlas.cpp" />
<ClCompile Include="..\ui\UITextBMFont.cpp" />
@ -1161,6 +1163,8 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\SkeletonReader\SkeletonNodeReader.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\SliderReader\SliderReader.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\SpriteReader\SpriteReader.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\TabControlReader\CSTabControl_generated.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\TabControlReader\TabControlReader.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\TextAtlasReader\TextAtlasReader.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\TextBMFontReader\TextBMFontReader.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\TextFieldReader\TextFieldReader.h" />
@ -1282,6 +1286,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
<ClInclude Include="..\ui\UIScale9Sprite.h" />
<ClInclude Include="..\ui\UIScrollView.h" />
<ClInclude Include="..\ui\UISlider.h" />
<ClInclude Include="..\ui\UITabControl.h" />
<ClInclude Include="..\ui\UIText.h" />
<ClInclude Include="..\ui\UITextAtlas.h" />
<ClInclude Include="..\ui\UITextBMFont.h" />

18
cocos/2d/libcocos2d.vcxproj.filters
View File

@ -283,6 +283,9 @@
<Filter Include="cocostudio\TimelineAction\Skeleton">
<UniqueIdentifier>{ca5e1475-3bfd-4aae-ad54-2e19d5021b92}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio\reader\WidgetReader\TabControlReader">
<UniqueIdentifier>{8686c220-18af-4bea-abce-f4797afd01f1}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\physics\CCPhysicsBody.cpp">
@ -1941,6 +1944,12 @@
<Filter>network</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\Light3DReader\Light3DReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\TabControlReader\TabControlReader.cpp">
<Filter>cocostudio\reader\WidgetReader\TabControlReader</Filter>
</ClCompile>
<ClCompile Include="..\ui\UITabControl.cpp">
<Filter>ui\UIWidgets</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\LocalizationManager.cpp">
<Filter>cocostudio\json</Filter>
</ClCompile>
@ -3794,6 +3803,15 @@
<ClInclude Include="..\editor-support\cocostudio\CSLanguageDataBinary_generated.h">
<Filter>cocostudio\json</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\TabControlReader\CSTabControl_generated.h">
<Filter>cocostudio\reader\WidgetReader\TabControlReader</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\TabControlReader\TabControlReader.h">
<Filter>cocostudio\reader\WidgetReader\TabControlReader</Filter>
</ClInclude>
<ClInclude Include="..\ui\UITabControl.h">
<Filter>ui\UIWidgets</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\LocalizationManager.h">
<Filter>cocostudio\json</Filter>
</ClInclude>

5
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems
View File

@ -430,6 +430,8 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\SkeletonReader\SkeletonNodeReader.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\SliderReader\SliderReader.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\SpriteReader\SpriteReader.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\TabControlReader\CSTabControl_generated.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\TabControlReader\TabControlReader.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\TextAtlasReader\TextAtlasReader.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\TextBMFontReader\TextBMFontReader.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\TextFieldReader\TextFieldReader.h" />
@ -564,6 +566,7 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\ui\UIScale9Sprite.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\ui\UIScrollView.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\ui\UISlider.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\ui\UITabControl.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\ui\UIText.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\ui\UITextAtlas.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\ui\UITextBMFont.h" />
@ -1040,6 +1043,7 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\SkeletonReader\SkeletonNodeReader.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\SliderReader\SliderReader.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\SpriteReader\SpriteReader.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\TabControlReader\TabControlReader.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\TextAtlasReader\TextAtlasReader.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\TextBMFontReader\TextBMFontReader.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\TextFieldReader\TextFieldReader.cpp" />
@ -1164,6 +1168,7 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\ui\UIScrollView.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\ui\UIScrollViewBar.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\ui\UISlider.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\ui\UITabControl.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\ui\UIText.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\ui\UITextAtlas.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\ui\UITextBMFont.cpp" />

18
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
View File

@ -1877,6 +1877,15 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\Light3DReader\Light3DReader.h">
<Filter>cocostudio\reader\WidgetReader\Light3DReader</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\ui\UITabControl.h">
<Filter>ui\UIWidgets</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\TabControlReader\CSTabControl_generated.h">
<Filter>cocostudio\reader\WidgetReader\TabControlReader</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\TabControlReader\TabControlReader.h">
<Filter>cocostudio\reader\WidgetReader\TabControlReader</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\LocalizationManager.h">
<Filter>cocostudio\components</Filter>
</ClInclude>
@ -3592,6 +3601,12 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\Light3DReader\Light3DReader.cpp">
<Filter>cocostudio\reader\WidgetReader\Light3DReader</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\ui\UITabControl.cpp">
<Filter>ui\UIWidgets</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\WidgetReader\TabControlReader\TabControlReader.cpp">
<Filter>cocostudio\reader\WidgetReader\TabControlReader</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\LocalizationManager.cpp">
<Filter>cocostudio\components</Filter>
</ClCompile>
@ -3873,6 +3888,9 @@
<Filter Include="cocostudio\reader\WidgetReader\Light3DReader">
<UniqueIdentifier>{815a6275-839e-45a6-9f35-4e84b13ba538}</UniqueIdentifier>
</Filter>
<Filter Include="cocostudio\reader\WidgetReader\TabControlReader">
<UniqueIdentifier>{fe153deb-3cee-416d-bdcb-fa409ae48240}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)..\..\..\cocos2d.def" />

2
cocos/2d/winrt_8.1_props/cocos2d_winrt_8.1.props
View File

@ -7,7 +7,7 @@
<PropertyGroup />
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(EngineRoot)external\$(COCOS2D_PLATFORM)-specific\angle\include;$(EngineRoot)external\freetype2\include\$(COCOS2D_PLATFORM)\freetype2;$(EngineRoot)external\curl\include\$(COCOS2D_PLATFORM);$(EngineRoot)external\websockets\include\$(COCOS2D_PLATFORM);$(EngineRoot)cocos\platform\winrt;$(EngineRoot)cocos\platform;$(EngineRoot)cocos\editor-support;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\sqlite3\include;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos;$(EngineRoot)extensions;$(EngineRoot)external;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\unzip;$(EngineRoot)external\tinyxml2;$(EngineRoot);$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\xxhash;$(EngineRoot)external\poly2tri;$(EngineRoot)external\poly2tri\common;$(EngineRoot)external\poly2tri\sweep;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(EngineRoot)external\$(COCOS2D_PLATFORM)-specific\angle\include;$(EngineRoot)external\freetype2\include\$(COCOS2D_PLATFORM)\freetype2;$(EngineRoot)external\curl\include\$(COCOS2D_PLATFORM);$(EngineRoot)external\websockets\include\$(COCOS2D_PLATFORM);$(EngineRoot)cocos\platform\winrt;$(EngineRoot)cocos\platform;$(EngineRoot)cocos\editor-support;$(EngineRoot)external\chipmunk\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos;$(EngineRoot)extensions;$(EngineRoot)external;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\unzip;$(EngineRoot)external\tinyxml2;$(EngineRoot);$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\xxhash;$(EngineRoot)external\poly2tri;$(EngineRoot)external\poly2tri\common;$(EngineRoot)external\poly2tri\sweep;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<ClCompile>
<PreprocessorDefinitions>WINRT;_VARIADIC_MAX=10;NOMINMAX;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_UNICODE;UNICODE;RAPIDJSON_ENDIAN=RAPIDJSON_LITTLEENDIAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>

42
cocos/CMakeLists.txt
View File

@ -1,6 +1,7 @@
#/****************************************************************************
# Copyright (c) 2013 cocos2d-x.org
# Copyright (c) 2014 martell malone
# Copyright (c) 2015 Chukong Technologies Inc.
#
# http://www.cocos2d-x.org
#
@ -25,7 +26,7 @@
# this CMakeLists is to generate libcocos2d.a
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 3.1)
if(WINDOWS)
ADD_DEFINITIONS(-DUNICODE -D_UNICODE)
@ -86,21 +87,20 @@ set(COCOS_SRC cocos2d.cpp
include_directories(../external/xxtea)
include_directories(../external/clipper)
add_library(cocos2d ${COCOS_SRC})
add_library(cocos2dInternal ${COCOS_SRC})
set(PLATFORM_SPECIFIC_LIBS)
if(WINDOWS)
foreach(_pkg OPENGL GLEW GLFW3 VORBIS MPG123 OPENAL)
cocos_use_pkg(cocos2d ${_pkg})
cocos_use_pkg(cocos2dInternal ${_pkg})
endforeach()
list(APPEND PLATFORM_SPECIFIC_LIBS ws2_32 winmm)
elseif(LINUX)
foreach(_pkg OPENGL GLEW GLFW3 FMOD FONTCONFIG THREADS GTK3)
cocos_use_pkg(cocos2d ${_pkg})
foreach(_pkg OPENGL GLEW GLFW3 FMOD FONTCONFIG THREADS GTK3)
cocos_use_pkg(cocos2dInternal ${_pkg})
endforeach()
elseif(MACOSX OR APPLE)
cocos_use_pkg(cocos2d GLFW3)
cocos_use_pkg(cocos2dInternal GLFW3)
INCLUDE_DIRECTORIES ( /System/Library/Frameworks )
@ -125,42 +125,54 @@ elseif(MACOSX OR APPLE)
)
elseif(ANDROID)
set(PLATFORM_SPECIFIC_LIBS GLESv2 log android)
set(PLATFORM_SPECIFIC_LIBS GLESv1_CM GLESv2 EGL log android OpenSLES)
get_filename_component(__module_path "${CMAKE_TOOLCHAIN_FILE}" DIRECTORY)
include(${__module_path}/AndroidNdkModules.cmake)
android_ndk_import_module_cpufeatures()
else()
message( FATAL_ERROR "Unsupported platform, CMake will exit" )
endif()
foreach(pkg ZLIB MINIZIP JPEG PNG TIFF TinyXML2 FREETYPE WEBSOCKETS CURL FLATBUFFERS XXHASH)
cocos_use_pkg(cocos2d ${pkg})
cocos_use_pkg(cocos2dInternal ${pkg})
endforeach()
if(LINUX)
set(glfw_other_linker_flags X11)
endif(LINUX)
target_link_libraries(cocos2d ${PLATFORM_SPECIFIC_LIBS} ${glfw_other_linker_flags})
target_link_libraries(cocos2dInternal ${PLATFORM_SPECIFIC_LIBS} ${glfw_other_linker_flags})
if(USE_WEBP)
add_definitions(-DCC_USE_WEBP=1)
cocos_use_pkg(cocos2d WEBP)
cocos_use_pkg(cocos2dInternal WEBP)
else()
add_definitions(-DCC_USE_WEBP=0)
endif()
if(USE_CHIPMUNK)
cocos_use_pkg(cocos2d CHIPMUNK)
cocos_use_pkg(cocos2dInternal CHIPMUNK)
endif()
if(USE_BOX2D)
cocos_use_pkg(cocos2d Box2D)
cocos_use_pkg(cocos2dInternal Box2D)
endif()
if(USE_BULLET)
cocos_use_pkg(cocos2d BULLET)
cocos_use_pkg(cocos2dInternal BULLET)
endif()
if(USE_RECAST)
cocos_use_pkg(cocos2d RECAST)
cocos_use_pkg(cocos2dInternal RECAST)
endif()
ADD_LIBRARY(cocos2d cc_dummy.c)
if(ANDROID)
target_link_libraries(cocos2d -Wl,-whole-archive cocos2dxandroid_static -Wl,-no-whole-archive)
target_link_libraries(cocos2d cocos2dInternal cpufeatures)
else()
target_link_libraries(cocos2d cocos2dInternal)
endif()
set_target_properties(cocos2d

8
cocos/audio/CMakeLists.txt
View File

@ -13,6 +13,14 @@ if(WINDOWS)
audio/win32/AudioPlayer.cpp
)
ELSEIF(ANDROID)
set(COCOS_AUDIO_PLATFORM_SRC
audio/android/AudioEngine-inl.cpp
audio/android/ccdandroidUtils.cpp
audio/android/cddSimpleAudioEngine.cpp
audio/android/jni/cddandroidAndroidJavaEngine.cpp
)
elseif(LINUX)
set(COCOS_AUDIO_PLATFORM_SRC
audio/linux/SimpleAudioEngine.cpp

2
cocos/audio/android/jni/cddandroidAndroidJavaEngine.cpp
View File

@ -27,7 +27,7 @@ THE SOFTWARE.
#include <stdlib.h>
#include <android/log.h>
#include <sys/system_properties.h>
#include "ccdandroidUtils.h"
#include "audio/android/ccdandroidUtils.h"
#include "audio/include/AudioEngine.h"
#include "platform/android/jni/JniHelper.h"

2
cocos/base/CCProperties.cpp
View File

@ -707,7 +707,7 @@ bool Properties::exists(const char* name) const
return false;
}
static const bool isStringNumeric(const char* str)
static bool isStringNumeric(const char* str)
{
CCASSERT(str, "invalid str");

12
cocos/base/CMakeLists.txt
View File

@ -1,11 +1,15 @@
if(MACOSX OR APPLE)
set(COCOS_BASE_SPECIFIC_SRC
base/CCUserDefault-apple.mm)
endif()
base/CCUserDefault-apple.mm
)
# todo: android support via base/CCUserDefaultAndroid.cpp
# todo: also base/CCController-android.cpp
elseif(ANDROID)
set(COCOS_BASE_SPECIFIC_SRC
base/CCUserDefault-android.cpp
base/CCController-android.cpp
)
endif()
set(COCOS_BASE_SRC
base/CCAsyncTaskPool.cpp

2
cocos/base/allocator/CCAllocatorStrategyFixedBlock.h
View File

@ -222,7 +222,7 @@ protected:
protected:
// @brief Returns the size of a page in bytes + overhead.
const size_t pageSize() const
size_t pageSize() const
{
return AllocatorBase::kDefaultAlignment + AllocatorBase::nextPow2BlockSize(block_size) * _pageSize;
}

3
cocos/cc_dummy.c Normal file
View File

@ -0,0 +1,3 @@
static void making_cmake_happy(void)
{
}

2
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
View File

@ -65,6 +65,7 @@
#include "cocostudio/WidgetReader/Particle3DReader/Particle3DReader.h"
#include "cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.h"
#include "cocostudio/WidgetReader/Light3DReader/Light3DReader.h"
#include "cocostudio/WidgetReader/TabControlReader/TabControlReader.h"
#include "cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.h"
#include "cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.h"
@ -218,6 +219,7 @@ CSLoader::CSLoader()
CREATE_CLASS_NODE_READER_INFO(Particle3DReader);
CREATE_CLASS_NODE_READER_INFO(GameNode3DReader);
CREATE_CLASS_NODE_READER_INFO(Light3DReader);
CREATE_CLASS_NODE_READER_INFO(TabControlReader);
CREATE_CLASS_NODE_READER_INFO(BoneNodeReader);
CREATE_CLASS_NODE_READER_INFO(SkeletonNodeReader);

1
cocos/editor-support/cocostudio/Android.mk
View File

@ -82,6 +82,7 @@ ActionTimeline/CCSkinNode.cpp \
FlatBuffersSerialize.cpp \
WidgetCallBackHandlerProtocol.cpp \
WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp \
WidgetReader/TabControlReader/TabControlReader.cpp \
CCComExtensionData.cpp \
CocoStudio.cpp

2
cocos/editor-support/cocostudio/CCArmature.cpp
View File

@ -38,7 +38,7 @@ THE SOFTWARE.
#if ENABLE_PHYSICS_BOX2D_DETECT
#include "Box2D/Box2D.h"
#elif ENABLE_PHYSICS_CHIPMUNK_DETECT
#include "chipmunk.h"
#include "chipmunk/chipmunk.h"
#endif
using namespace cocos2d;

2
cocos/editor-support/cocostudio/CCColliderDetector.h
View File

@ -35,7 +35,7 @@ THE SOFTWARE.
#if ENABLE_PHYSICS_CHIPMUNK_DETECT
#include "chipmunk.h"
#include "chipmunk/chipmunk.h"
#elif ENABLE_PHYSICS_BOX2D_DETECT
#include "Box2D/Box2D.h"
#endif

2
cocos/editor-support/cocostudio/CCComExtensionData.cpp
View File

@ -88,7 +88,7 @@ namespace cocostudio
_timelineData->setActionTag(actionTag);
}
const int ComExtensionData::getActionTag() const
int ComExtensionData::getActionTag() const
{
return _timelineData->getActionTag();
}

2
cocos/editor-support/cocostudio/CCComExtensionData.h
View File

@ -73,7 +73,7 @@ namespace cocostudio
virtual std::string getCustomProperty() const { return _customProperty; };
virtual void setActionTag(int actionTag);
virtual const int getActionTag() const;
virtual int getActionTag() const;
public:
ComExtensionData();

2
cocos/editor-support/cocostudio/CCDatas.cpp
View File

@ -142,7 +142,7 @@ Color4B BaseData::getColor()
return Color4B(r, g, b, a);
}
const std::string DisplayData::changeDisplayToTexture(const std::string& displayName)
std::string DisplayData::changeDisplayToTexture(const std::string& displayName)
{
// remove .xxx
std::string textureName = displayName;

2
cocos/editor-support/cocostudio/CCDatas.h
View File

@ -143,7 +143,7 @@ class CC_STUDIO_DLL DisplayData : public cocos2d::Ref
public:
CC_CREATE_NO_PARAM_NO_INIT(DisplayData)
static const std::string changeDisplayToTexture(const std::string& displayName);
static std::string changeDisplayToTexture(const std::string& displayName);
public:
/**
* @js ctor

2
cocos/editor-support/cocostudio/CCSGUIReader.cpp
View File

@ -145,7 +145,7 @@ void GUIReader::storeFileDesignSize(const char *fileName, const cocos2d::Size &s
_fileDesignSizes[keyHeight] = cocos2d::Value(size.height);
}
const cocos2d::Size GUIReader::getFileDesignSize(const char* fileName) const
cocos2d::Size GUIReader::getFileDesignSize(const char* fileName) const
{
std::string keyWidth = fileName;
keyWidth.append("width");

2
cocos/editor-support/cocostudio/CCSGUIReader.h
View File

@ -73,7 +73,7 @@ public:
/**
* @js NA
*/
const cocos2d::Size getFileDesignSize(const char* fileName) const;
cocos2d::Size getFileDesignSize(const char* fileName) const;
void setFilePath(const std::string& strFilePath) { m_strFilePath = strFilePath; }
const std::string& getFilePath() const { return m_strFilePath; }

1
cocos/editor-support/cocostudio/CMakeLists.txt
View File

@ -87,6 +87,7 @@ set(COCOS_CS_SRC
editor-support/cocostudio/ActionTimeline/CCSkinNode.cpp
editor-support/cocostudio/FlatBuffersSerialize.cpp
editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp
editor-support/cocostudio/WidgetReader/TabControlReader/TabControlReader.cpp
)
include_directories( editor-support )

4
cocos/editor-support/cocostudio/CSParseBinary_generated.h
View File

@ -1519,7 +1519,7 @@ struct ScrollViewOptions : private flatbuffers::Table {
uint8_t bounceEnabled() const { return GetField<uint8_t>(32, 0); }
uint8_t scrollbarEnabeld() const { return GetField<uint8_t>(34, 1); }
uint8_t scrollbarAutoHide() const { return GetField<uint8_t>(36, 1); }
float scrollbarAutoHideTime() const { return GetField<float>(38, 0.2); }
float scrollbarAutoHideTime() const { return GetField<float>(38, 0.2f); }
bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) &&
VerifyField<flatbuffers::uoffset_t>(verifier, 4 /* widgetOptions */) &&
@ -1566,7 +1566,7 @@ struct ScrollViewOptionsBuilder {
void add_bounceEnabled(uint8_t bounceEnabled) { fbb_.AddElement<uint8_t>(32, bounceEnabled, 0); }
void add_scrollbarEnabeld(uint8_t scrollbarEnabeld) { fbb_.AddElement<uint8_t>(34, scrollbarEnabeld, 1); }
void add_scrollbarAutoHide(uint8_t scrollbarAutoHide) { fbb_.AddElement<uint8_t>(36, scrollbarAutoHide, 1); }
void add_scrollbarAutoHideTime(float scrollbarAutoHideTime) { fbb_.AddElement<float>(38, scrollbarAutoHideTime, 0.2); }
void add_scrollbarAutoHideTime(float scrollbarAutoHideTime) { fbb_.AddElement<float>(38, scrollbarAutoHideTime, 0.2f); }
ScrollViewOptionsBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
ScrollViewOptionsBuilder &operator=(const ScrollViewOptionsBuilder &);
flatbuffers::Offset<ScrollViewOptions> Finish() {

15
cocos/editor-support/cocostudio/LocalizationManager.cpp
View File

@ -143,17 +143,22 @@ std::string BinLocalizationManager::getLocalizationString(std::string key)
static bool isCurrentBinManager = true;
static ILocalizationManager* _sharedLocalizationManager = nullptr;
ILocalizationManager* LocalizationHelper::getCurrentManager()
{
if (isCurrentBinManager)
return BinLocalizationManager::getInstance();
else
return JsonLocalizationManager::getInstance();
if (!_sharedLocalizationManager)
{
_sharedLocalizationManager = BinLocalizationManager::getInstance();
isCurrentBinManager = true;
}
return _sharedLocalizationManager;
}
void LocalizationHelper::setCurrentManager(bool isBinary)
void LocalizationHelper::setCurrentManager(ILocalizationManager* manager, bool isBinary)
{
_sharedLocalizationManager = manager;
isCurrentBinManager = isBinary;
}

7
cocos/editor-support/cocostudio/LocalizationManager.h
View File

@ -83,15 +83,16 @@ namespace cocostudio {
public:
/* Get current localization manager.
* @return The instance of current localization manager.
* If the manager hasn't been set, the default manager will be BinLocalizationManager.
* If the manager hasn't been set, it will return the singleton instance of BinLocalizationManager.
*/
static ILocalizationManager* getCurrentManager();
/* Set current localization manager.
* @param isBinary If the param is true, current manager will be set to BinLocalizationManager.
* @param manager The instance of current manager.
* @param isBinary Wether the manager is binary localization manager.
* If the param is false, current manager will be set to JsonLocalizationManager.
*/
static void setCurrentManager(bool isBinary);
static void setCurrentManager(ILocalizationManager* manager, bool isBinary);
/* Get the type of current localization manager.
* @return If current manager is BinLocalizationManager, return true.

211
cocos/editor-support/cocostudio/WidgetReader/TabControlReader/CSTabControl_generated.h Normal file
View File

@ -0,0 +1,211 @@
// automatically generated by the FlatBuffers compiler, do not modify
#ifndef FLATBUFFERS_GENERATED_CSTABCONTROL_FLATBUFFERS_H_
#define FLATBUFFERS_GENERATED_CSTABCONTROL_FLATBUFFERS_H_
#include "flatbuffers/flatbuffers.h"
namespace flatbuffers {
struct WidgetOptions;
struct PanelOptions;
struct Color;
struct TabControlOption;
struct TabHeaderOption;
struct TabItemOption;
struct ResourceItemData;
struct TabControlOption : private flatbuffers::Table {
const WidgetOptions *nodeOptions() const { return GetPointer<const WidgetOptions *>(4); }
int32_t headerPlace() const { return GetField<int32_t>(6, 0); }
int32_t headerWidth() const { return GetField<int32_t>(8, 0); }
int32_t headerHeight() const { return GetField<int32_t>(10, 0); }
float selectedTabZoom() const { return GetField<float>(12, 0); }
int32_t selectedTabIndex() const { return GetField<int32_t>(14, 0); }
uint8_t ignoreHeaderTextureSize() const { return GetField<uint8_t>(16, 0); }
const flatbuffers::Vector<flatbuffers::Offset<TabItemOption>> *tabItems() const { return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<TabItemOption>> *>(18); }
bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) &&
VerifyField<flatbuffers::uoffset_t>(verifier, 4 /* nodeOptions */) &&
verifier.VerifyTable(nodeOptions()) &&
VerifyField<int32_t>(verifier, 6 /* headerPlace */) &&
VerifyField<int32_t>(verifier, 8 /* headerWidth */) &&
VerifyField<int32_t>(verifier, 10 /* headerHeight */) &&
VerifyField<float>(verifier, 12 /* selectedTabZoom */) &&
VerifyField<int32_t>(verifier, 14 /* selectedTabIndex */) &&
VerifyField<uint8_t>(verifier, 16 /* ignoreHeaderTextureSize */) &&
VerifyField<flatbuffers::uoffset_t>(verifier, 18 /* tabItems */) &&
verifier.Verify(tabItems()) &&
verifier.VerifyVectorOfTables(tabItems()) &&
verifier.EndTable();
}
};
struct TabControlOptionBuilder {
flatbuffers::FlatBufferBuilder &fbb_;
flatbuffers::uoffset_t start_;
void add_nodeOptions(flatbuffers::Offset<WidgetOptions> nodeOptions) { fbb_.AddOffset(4, nodeOptions); }
void add_headerPlace(int32_t headerPlace) { fbb_.AddElement<int32_t>(6, headerPlace, 0); }
void add_headerWidth(int32_t headerWidth) { fbb_.AddElement<int32_t>(8, headerWidth, 0); }
void add_headerHeight(int32_t headerHeight) { fbb_.AddElement<int32_t>(10, headerHeight, 0); }
void add_selectedTabZoom(float selectedTabZoom) { fbb_.AddElement<float>(12, selectedTabZoom, 0); }
void add_selectedTabIndex(int32_t selectedTabIndex) { fbb_.AddElement<int32_t>(14, selectedTabIndex, 0); }
void add_ignoreHeaderTextureSize(uint8_t ignoreHeaderTextureSize) { fbb_.AddElement<uint8_t>(16, ignoreHeaderTextureSize, 0); }
void add_tabItems(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<TabItemOption>>> tabItems) { fbb_.AddOffset(18, tabItems); }
TabControlOptionBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
TabControlOptionBuilder &operator=(const TabControlOptionBuilder &);
flatbuffers::Offset<TabControlOption> Finish() {
auto o = flatbuffers::Offset<TabControlOption>(fbb_.EndTable(start_, 8));
return o;
}
};
inline flatbuffers::Offset<TabControlOption> CreateTabControlOption(flatbuffers::FlatBufferBuilder &_fbb,
flatbuffers::Offset<WidgetOptions> nodeOptions = 0,
int32_t headerPlace = 0,
int32_t headerWidth = 0,
int32_t headerHeight = 0,
float selectedTabZoom = 0,
int32_t selectedTabIndex = 0,
uint8_t ignoreHeaderTextureSize = 0,
flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<TabItemOption>>> tabItems = 0) {
TabControlOptionBuilder builder_(_fbb);
builder_.add_tabItems(tabItems);
builder_.add_selectedTabIndex(selectedTabIndex);
builder_.add_selectedTabZoom(selectedTabZoom);
builder_.add_headerHeight(headerHeight);
builder_.add_headerWidth(headerWidth);
builder_.add_headerPlace(headerPlace);
builder_.add_nodeOptions(nodeOptions);
builder_.add_ignoreHeaderTextureSize(ignoreHeaderTextureSize);
return builder_.Finish();
}
struct TabHeaderOption : private flatbuffers::Table {
const WidgetOptions *nodeOptions() const { return GetPointer<const WidgetOptions *>(4); }
const ResourceData *fontRes() const { return GetPointer<const ResourceData *>(6); }
int32_t fontSize() const { return GetField<int32_t>(8, 0); }
const flatbuffers::String *titleText() const { return GetPointer<const flatbuffers::String *>(10); }
const Color *textColor() const { return GetStruct<const Color *>(12); }
const ResourceData *normalBackFile() const { return GetPointer<const ResourceData *>(14); }
const ResourceData *pressBackFile() const { return GetPointer<const ResourceData *>(16); }
const ResourceData *disableBackFile() const { return GetPointer<const ResourceData *>(18); }
const ResourceData *crossNormalFile() const { return GetPointer<const ResourceData *>(20); }
const ResourceData *crossDisableFile() const { return GetPointer<const ResourceData *>(22); }
bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) &&
VerifyField<flatbuffers::uoffset_t>(verifier, 4 /* nodeOptions */) &&
verifier.VerifyTable(nodeOptions()) &&
VerifyField<flatbuffers::uoffset_t>(verifier, 6 /* fontRes */) &&
verifier.VerifyTable(fontRes()) &&
VerifyField<int32_t>(verifier, 8 /* fontSize */) &&
VerifyField<flatbuffers::uoffset_t>(verifier, 10 /* titleText */) &&
verifier.Verify(titleText()) &&
VerifyField<Color>(verifier, 12 /* textColor */) &&
VerifyField<flatbuffers::uoffset_t>(verifier, 14 /* normalBackFile */) &&
verifier.VerifyTable(normalBackFile()) &&
VerifyField<flatbuffers::uoffset_t>(verifier, 16 /* pressBackFile */) &&
verifier.VerifyTable(pressBackFile()) &&
VerifyField<flatbuffers::uoffset_t>(verifier, 18 /* disableBackFile */) &&
verifier.VerifyTable(disableBackFile()) &&
VerifyField<flatbuffers::uoffset_t>(verifier, 20 /* crossNormalFile */) &&
verifier.VerifyTable(crossNormalFile()) &&
VerifyField<flatbuffers::uoffset_t>(verifier, 22 /* crossDisableFile */) &&
verifier.VerifyTable(crossDisableFile()) &&
verifier.EndTable();
}
};
struct TabHeaderOptionBuilder {
flatbuffers::FlatBufferBuilder &fbb_;
flatbuffers::uoffset_t start_;
void add_nodeOptions(flatbuffers::Offset<WidgetOptions> nodeOptions) { fbb_.AddOffset(4, nodeOptions); }
void add_fontRes(flatbuffers::Offset<ResourceData> fontRes) { fbb_.AddOffset(6, fontRes); }
void add_fontSize(int32_t fontSize) { fbb_.AddElement<int32_t>(8, fontSize, 0); }
void add_titleText(flatbuffers::Offset<flatbuffers::String> titleText) { fbb_.AddOffset(10, titleText); }
void add_textColor(const Color *textColor) { fbb_.AddStruct(12, textColor); }
void add_normalBackFile(flatbuffers::Offset<ResourceData> normalBackFile) { fbb_.AddOffset(14, normalBackFile); }
void add_pressBackFile(flatbuffers::Offset<ResourceData> pressBackFile) { fbb_.AddOffset(16, pressBackFile); }
void add_disableBackFile(flatbuffers::Offset<ResourceData> disableBackFile) { fbb_.AddOffset(18, disableBackFile); }
void add_crossNormalFile(flatbuffers::Offset<ResourceData> crossNormalFile) { fbb_.AddOffset(20, crossNormalFile); }
void add_crossDisableFile(flatbuffers::Offset<ResourceData> crossDisableFile) { fbb_.AddOffset(22, crossDisableFile); }
TabHeaderOptionBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
TabHeaderOptionBuilder &operator=(const TabHeaderOptionBuilder &);
flatbuffers::Offset<TabHeaderOption> Finish() {
auto o = flatbuffers::Offset<TabHeaderOption>(fbb_.EndTable(start_, 10));
return o;
}
};
inline flatbuffers::Offset<TabHeaderOption> CreateTabHeaderOption(flatbuffers::FlatBufferBuilder &_fbb,
flatbuffers::Offset<WidgetOptions> nodeOptions = 0,
flatbuffers::Offset<ResourceData> fontRes = 0,
int32_t fontSize = 0,
flatbuffers::Offset<flatbuffers::String> titleText = 0,
const Color *textColor = 0,
flatbuffers::Offset<ResourceData> normalBackFile = 0,
flatbuffers::Offset<ResourceData> pressBackFile = 0,
flatbuffers::Offset<ResourceData> disableBackFile = 0,
flatbuffers::Offset<ResourceData> crossNormalFile = 0,
flatbuffers::Offset<ResourceData> crossDisableFile = 0) {
TabHeaderOptionBuilder builder_(_fbb);
builder_.add_crossDisableFile(crossDisableFile);
builder_.add_crossNormalFile(crossNormalFile);
builder_.add_disableBackFile(disableBackFile);
builder_.add_pressBackFile(pressBackFile);
builder_.add_normalBackFile(normalBackFile);
builder_.add_textColor(textColor);
builder_.add_titleText(titleText);
builder_.add_fontSize(fontSize);
builder_.add_fontRes(fontRes);
builder_.add_nodeOptions(nodeOptions);
return builder_.Finish();
}
struct TabItemOption : private flatbuffers::Table {
const TabHeaderOption *header() const { return GetPointer<const TabHeaderOption *>(4); }
const NodeTree *container() const { return GetPointer<const NodeTree *>(6); }
bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) &&
VerifyField<flatbuffers::uoffset_t>(verifier, 4 /* header */) &&
verifier.VerifyTable(header()) &&
VerifyField<flatbuffers::uoffset_t>(verifier, 6 /* container */) &&
verifier.VerifyTable(container()) &&
verifier.EndTable();
}
};
struct TabItemOptionBuilder {
flatbuffers::FlatBufferBuilder &fbb_;
flatbuffers::uoffset_t start_;
void add_header(flatbuffers::Offset<TabHeaderOption> header) { fbb_.AddOffset(4, header); }
void add_container(flatbuffers::Offset<NodeTree> container) { fbb_.AddOffset(6, container); }
TabItemOptionBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
TabItemOptionBuilder &operator=(const TabItemOptionBuilder &);
flatbuffers::Offset<TabItemOption> Finish() {
auto o = flatbuffers::Offset<TabItemOption>(fbb_.EndTable(start_, 2));
return o;
}
};
inline flatbuffers::Offset<TabItemOption> CreateTabItemOption(flatbuffers::FlatBufferBuilder &_fbb,
flatbuffers::Offset<TabHeaderOption> header = 0,
flatbuffers::Offset<NodeTree> container = 0) {
TabItemOptionBuilder builder_(_fbb);
builder_.add_container(container);
builder_.add_header(header);
return builder_.Finish();
}
inline const TabControlOption *GetTabControlOption(const void *buf) { return flatbuffers::GetRoot<TabControlOption>(buf); }
inline bool VerifyTabControlOptionBuffer(flatbuffers::Verifier &verifier) { return verifier.VerifyBuffer<TabControlOption>(); }
inline void FinishTabControlOptionBuffer(flatbuffers::FlatBufferBuilder &fbb, flatbuffers::Offset<TabControlOption> root) { fbb.Finish(root); }
} // namespace flatbuffers
#endif // FLATBUFFERS_GENERATED_CSTABCONTROL_FLATBUFFERS_H_

1004
cocos/editor-support/cocostudio/WidgetReader/TabControlReader/TabControlReader.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

103
cocos/editor-support/cocostudio/WidgetReader/TabControlReader/TabControlReader.h Normal file
View File

@ -0,0 +1,103 @@
/****************************************************************************
Copyright (c) 2016 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 __TABCONTROLREADER_H_
#define __TABCONTROLREADER_H_
#include "cocostudio/WidgetReader/NodeReaderProtocol.h"
#include "cocostudio/WidgetReader/NodeReaderDefine.h"
#include "cocostudio/WidgetReader/TabControlReader/CSTabControl_generated.h"
class TabControlReader : public cocos2d::Ref, public cocostudio::NodeReaderProtocol
{
DECLARE_CLASS_NODE_READER_INFO
public:
TabControlReader();
~TabControlReader();
static TabControlReader* getInstance();
static void destroyInstance();
flatbuffers::Offset<flatbuffers::Table> createOptionsWithFlatBuffers(const tinyxml2::XMLElement* objectData,
flatbuffers::FlatBufferBuilder* builder) override;
void setPropsWithFlatBuffers(cocos2d::Node* node, const flatbuffers::Table* nodeOption) override;
cocos2d::Node* createNodeWithFlatBuffers(const flatbuffers::Table* nodeOptions) override;
private:
static TabControlReader* _tabReaderInstance;
};
class TabHeaderReader : public cocos2d::Ref, public cocostudio::NodeReaderProtocol
{
DECLARE_CLASS_NODE_READER_INFO
public:
TabHeaderReader();
~TabHeaderReader();
static TabHeaderReader* getInstance();
static void destroyInstance();
flatbuffers::Offset<flatbuffers::Table> createOptionsWithFlatBuffers(const tinyxml2::XMLElement* objectData,
flatbuffers::FlatBufferBuilder* builder) override;
void setPropsWithFlatBuffers(cocos2d::Node* node, const flatbuffers::Table* nodeOption) override;
//CSArmatureNode
cocos2d::Node* createNodeWithFlatBuffers(const flatbuffers::Table* nodeOptions) override;
private:
static TabHeaderReader* _tabheaderReaderInstance;
int getResourceType(std::string key);
};
class TabItemReader : public cocos2d::Ref, public cocostudio::NodeReaderProtocol
{
DECLARE_CLASS_NODE_READER_INFO
public:
TabItemReader();
~TabItemReader();
static TabItemReader* getInstance();
static void destroyInstance();
flatbuffers::Offset<flatbuffers::TabItemOption> createTabItemOptionWithFlatBuffers(
const tinyxml2::XMLElement* objectData,
flatbuffers::FlatBufferBuilder* builder);
void setPropsWithFlatBuffers(cocos2d::Node* node, const flatbuffers::Table* nodeOption) override;
cocos2d::Node* createNodeWithFlatBuffers(const flatbuffers::Table* nodeOptions) override;
virtual flatbuffers::Offset<flatbuffers::Table> createOptionsWithFlatBuffers(
const tinyxml2::XMLElement* objectData, flatbuffers::FlatBufferBuilder* builder) override;
private:
static TabItemReader* _tabItemReaderInstance;
};
#endif //__TABCONTROLREADER_H_

11
cocos/network/CMakeLists.txt
View File

@ -3,12 +3,20 @@ if(WINDOWS)
set(PLATFORM_LINK websockets)
elseif(LINUX)
set(PLATFORM_LINK websockets ssl crypto)
elseif(ANDROID)
set(PLATFORM_LINK websockets)
else()
set(PLATFORM_LINK websockets)
endif()
set(COCOS_NETWORK_SRC
if(ANDROID)
set(COCOS_NETWORK_PLATFORM_SRC
network/CCDownloader-android.cpp
)
endif()
set(COCOS_NETWORK_SRC
${COCOS_NETWORK_PLATFORM_SRC}
network/HttpClient.cpp
network/SocketIO.cpp
network/WebSocket.cpp
@ -16,6 +24,7 @@ set(COCOS_NETWORK_SRC
network/CCDownloader-curl.cpp
)
if(MSVC)
set(COCOS_NETWORK_LINK
libcurl_imp

0
cocos/network/HttpAsynConnection-apple.m Executable file → Normal file
View File

2
cocos/network/WebSocket.cpp
View File

@ -587,7 +587,7 @@ void WebSocket::onSubThreadStarted()
info.options = 0;
info.user = this;
int log_level = LLL_ERR | LLL_WARN | LLL_NOTICE/* | LLL_INFO | LLL_DEBUG/* | LLL_PARSER*/ | LLL_HEADER | LLL_EXT | LLL_CLIENT | LLL_LATENCY;
int log_level = LLL_ERR | LLL_WARN | LLL_NOTICE/* | LLL_INFO | LLL_DEBUG | LLL_PARSER*/ | LLL_HEADER | LLL_EXT | LLL_CLIENT | LLL_LATENCY;
lws_set_log_level(log_level, printWebSocketLog);
_wsContext = lws_create_context(&info);

117
cocos/physics/CCPhysicsBody.cpp
View File

@ -28,7 +28,7 @@
#include <algorithm>
#include <cmath>
#include "chipmunk.h"
#include "chipmunk/chipmunk_private.h"
#include "2d/CCScene.h"
#include "physics/CCPhysicsShape.h"
@ -36,9 +36,35 @@
#include "physics/CCPhysicsWorld.h"
#include "physics/CCPhysicsHelper.h"
static inline void cpBodyUpdateVelocityWithoutGravity(cpBody *body, cpVect gravity, cpFloat damping, cpFloat dt)
static void internalBodySetMass(cpBody *body, cpFloat mass)
{
cpBodyActivate(body);
body->m = mass;
body->m_inv = 1.0f/mass;
//cpAssertSaneBody(body);
}
static void internalBodyUpdateVelocity(cpBody *body, cpVect gravity, cpFloat damping, cpFloat dt)
{
cpBodyUpdateVelocity(body, cpvzero, damping, dt);
// Skip kinematic bodies.
if(cpBodyGetType(body) == CP_BODY_TYPE_KINEMATIC) return;
cpAssertSoft(body->m > 0.0f && body->i > 0.0f, "Body's mass and moment must be positive to simulate. (Mass: %f Moment: f)", body->m, body->i);
cocos2d::PhysicsBody *physicsBody = static_cast<cocos2d::PhysicsBody*>(body->userData);
if(physicsBody->isGravityEnabled())
body->v = cpvclamp(cpvadd(cpvmult(body->v, damping), cpvmult(cpvadd(gravity, cpvmult(body->f, body->m_inv)), dt)), physicsBody->getVelocityLimit());
else
body->v = cpvclamp(cpvadd(cpvmult(body->v, damping), cpvmult(cpvmult(body->f, body->m_inv), dt)), physicsBody->getVelocityLimit());
cpFloat w_limit = physicsBody->getAngularVelocityLimit();
body->w = cpfclamp(body->w*damping + body->t*body->i_inv*dt, -w_limit, w_limit);
// Reset forces.
body->f = cpvzero;
//to check body sanity
cpBodySetTorque(body, 0.0f);
}
NS_CC_BEGIN
@ -64,6 +90,8 @@ PhysicsBody::PhysicsBody()
, _area(0.0f)
, _density(0.0f)
, _moment(MOMENT_DEFAULT)
, _velocityLimit(PHYSICS_INFINITY)
, _angularVelocityLimit(PHYSICS_INFINITY)
, _isDamping(false)
, _linearDamping(0.0f)
, _angularDamping(0.0f)
@ -258,6 +286,9 @@ bool PhysicsBody::init()
do
{
_cpBody = cpBodyNew(_mass, _moment);
internalBodySetMass(_cpBody, _mass);
cpBodySetUserData(_cpBody, this);
cpBodySetVelocityUpdateFunc(_cpBody, internalBodyUpdateVelocity);
CC_BREAK_IF(_cpBody == nullptr);
@ -284,31 +315,13 @@ void PhysicsBody::setDynamic(bool dynamic)
_dynamic = dynamic;
if (dynamic)
{
if (_world && _cpBody->CP_PRIVATE(space))
{
cpSpaceConvertBodyToDynamic(_world->_cpSpace, _cpBody, _mass, _moment);
cpSpaceAddBody(_world->_cpSpace, _cpBody);
}
else
{
cpBodySetMass(_cpBody, _mass);
cpBodySetMoment(_cpBody, _moment);
}
cpBodySetType(_cpBody, CP_BODY_TYPE_DYNAMIC);
internalBodySetMass(_cpBody, _mass);
cpBodySetMoment(_cpBody, _moment);
}
else
{
if (_world && _cpBody->CP_PRIVATE(space))
{
cpSpaceRemoveBody(_world->_cpSpace, _cpBody);
cpSpaceConvertBodyToStatic(_world->_cpSpace, _cpBody);
}
else
{
cpBodySetMass(_cpBody, PHYSICS_INFINITY);
cpBodySetMoment(_cpBody, PHYSICS_INFINITY);
cpBodySetVel(_cpBody, cpvzero);
cpBodySetAngVel(_cpBody, 0.0);
}
cpBodySetType(_cpBody, CP_BODY_TYPE_KINEMATIC);
}
}
}
@ -325,15 +338,6 @@ void PhysicsBody::setRotationEnable(bool enable)
void PhysicsBody::setGravityEnable(bool enable)
{
_gravityEnabled = enable;
if (enable)
{
_cpBody->velocity_func = cpBodyUpdateVelocity;
}
else
{
_cpBody->velocity_func = cpBodyUpdateVelocityWithoutGravity;
}
}
void PhysicsBody::setRotation(float rotation)
@ -370,12 +374,13 @@ void PhysicsBody::setPosition(float positionX, float positionY)
tt.x = positionX + _positionOffset.x;
tt.y = positionY + _positionOffset.y;
cpBodySetPos(_cpBody, tt);
cpBodySetPosition(_cpBody, tt);
}
Vec2 PhysicsBody::getPosition() const
{
return Vec2(_cpBody->p.x - _positionOffset.x, _cpBody->p.y - _positionOffset.y);
cpVect tt = cpBodyGetPosition(_cpBody);
return Vec2(tt.x - _positionOffset.x, tt.y - _positionOffset.y);
}
void PhysicsBody::setPositionOffset(const Vec2& position)
@ -415,7 +420,7 @@ PhysicsShape* PhysicsBody::addShape(PhysicsShape* shape, bool addMassAndMoment/*
addMoment(shape->getMoment());
}
if (_world && _cpBody->CP_PRIVATE(space))
if (_world && cpBodyGetSpace(_cpBody))
{
_world->addShape(shape);
}
@ -430,18 +435,18 @@ void PhysicsBody::applyForce(const Vec2& force, const Vec2& offset)
{
if (_dynamic && _mass != PHYSICS_INFINITY)
{
cpBodyApplyForce(_cpBody, PhysicsHelper::point2cpv(force), PhysicsHelper::point2cpv(offset));
cpBodyApplyForceAtLocalPoint(_cpBody, PhysicsHelper::point2cpv(force), PhysicsHelper::point2cpv(offset));
}
}
void PhysicsBody::resetForces()
{
cpBodyResetForces(_cpBody);
cpBodySetForce(_cpBody, PhysicsHelper::point2cpv(Vec2(0,0)));
}
void PhysicsBody::applyImpulse(const Vec2& impulse, const Vec2& offset)
{
cpBodyApplyImpulse(_cpBody, PhysicsHelper::point2cpv(impulse), PhysicsHelper::point2cpv(offset));
cpBodyApplyImpulseAtLocalPoint(_cpBody, PhysicsHelper::point2cpv(impulse), PhysicsHelper::point2cpv(offset));
}
void PhysicsBody::applyTorque(float torque)
@ -478,7 +483,7 @@ void PhysicsBody::setMass(float mass)
// the static body's mass and moment is always infinity
if (_dynamic)
{
cpBodySetMass(_cpBody, _mass);
internalBodySetMass(_cpBody, _mass);
}
}
@ -524,7 +529,7 @@ void PhysicsBody::addMass(float mass)
// the static body's mass and moment is always infinity
if (_dynamic)
{
cpBodySetMass(_cpBody, _mass);
internalBodySetMass(_cpBody, _mass);
}
}
@ -578,22 +583,22 @@ void PhysicsBody::setVelocity(const Vec2& velocity)
return;
}
cpBodySetVel(_cpBody, PhysicsHelper::point2cpv(velocity));
cpBodySetVelocity(_cpBody, PhysicsHelper::point2cpv(velocity));
}
Vec2 PhysicsBody::getVelocity()
{
return PhysicsHelper::cpv2point(cpBodyGetVel(_cpBody));
return PhysicsHelper::cpv2point(cpBodyGetVelocity(_cpBody));
}
Vec2 PhysicsBody::getVelocityAtLocalPoint(const Vec2& point)
{
return PhysicsHelper::cpv2point(cpBodyGetVelAtLocalPoint(_cpBody, PhysicsHelper::point2cpv(point)));
return PhysicsHelper::cpv2point(cpBodyGetVelocityAtLocalPoint(_cpBody, PhysicsHelper::point2cpv(point)));
}
Vec2 PhysicsBody::getVelocityAtWorldPoint(const Vec2& point)
{
return PhysicsHelper::cpv2point(cpBodyGetVelAtWorldPoint(_cpBody, PhysicsHelper::point2cpv(point)));
return PhysicsHelper::cpv2point(cpBodyGetVelocityAtWorldPoint(_cpBody, PhysicsHelper::point2cpv(point)));
}
void PhysicsBody::setAngularVelocity(float velocity)
@ -604,32 +609,32 @@ void PhysicsBody::setAngularVelocity(float velocity)
return;
}
cpBodySetAngVel(_cpBody, velocity);
cpBodySetAngularVelocity(_cpBody, velocity);
}
float PhysicsBody::getAngularVelocity()
{
return PhysicsHelper::cpfloat2float(cpBodyGetAngVel(_cpBody));
return PhysicsHelper::cpfloat2float(cpBodyGetAngularVelocity(_cpBody));
}
void PhysicsBody::setVelocityLimit(float limit)
{
cpBodySetVelLimit(_cpBody, limit);
_velocityLimit = limit;
}
float PhysicsBody::getVelocityLimit()
{
return PhysicsHelper::cpfloat2float(cpBodyGetVelLimit(_cpBody));
return _velocityLimit;
}
void PhysicsBody::setAngularVelocityLimit(float limit)
{
cpBodySetAngVelLimit(_cpBody, limit);
_angularVelocityLimit = limit;
}
float PhysicsBody::getAngularVelocityLimit()
{
return PhysicsHelper::cpfloat2float(cpBodyGetAngVelLimit(_cpBody));
return _angularVelocityLimit;
}
void PhysicsBody::setMoment(float moment)
@ -750,7 +755,7 @@ void PhysicsBody::setEnabled(bool enable)
bool PhysicsBody::isResting() const
{
return CP_PRIVATE(_cpBody->node).root != ((cpBody*)0);
return cpBodyIsSleeping(_cpBody);
}
void PhysicsBody::setResting(bool rest) const
@ -768,12 +773,12 @@ void PhysicsBody::setResting(bool rest) const
void PhysicsBody::update(float delta)
{
// damping compute
if (_isDamping && _dynamic && !isResting())
/*if (_isDamping && _dynamic && !isResting())
{
_cpBody->v.x *= cpfclamp(1.0f - delta * _linearDamping, 0.0f, 1.0f);
_cpBody->v.y *= cpfclamp(1.0f - delta * _linearDamping, 0.0f, 1.0f);
_cpBody->w *= cpfclamp(1.0f - delta * _angularDamping, 0.0f, 1.0f);
}
}*/
}
void PhysicsBody::setCategoryBitmask(int bitmask)
@ -868,12 +873,12 @@ void PhysicsBody::setRotationOffset(float rotation)
Vec2 PhysicsBody::world2Local(const Vec2& point)
{
return PhysicsHelper::cpv2point(cpBodyWorld2Local(_cpBody, PhysicsHelper::point2cpv(point)));
return PhysicsHelper::cpv2point(cpBodyWorldToLocal(_cpBody, PhysicsHelper::point2cpv(point)));
}
Vec2 PhysicsBody::local2World(const Vec2& point)
{
return PhysicsHelper::cpv2point(cpBodyLocal2World(_cpBody, PhysicsHelper::point2cpv(point)));
return PhysicsHelper::cpv2point(cpBodyLocalToWorld(_cpBody, PhysicsHelper::point2cpv(point)));
}
void PhysicsBody::beforeSimulation(const Mat4& parentToWorldTransform, const Mat4& nodeToWorldTransform, float scaleX, float scaleY, float rotation)

2
cocos/physics/CCPhysicsBody.h
View File

@ -524,6 +524,8 @@ protected:
float _area;
float _density;
float _moment;
float _velocityLimit;
float _angularVelocityLimit;
bool _isDamping;
float _linearDamping;
float _angularDamping;

24
cocos/physics/CCPhysicsContact.cpp
View File

@ -23,7 +23,7 @@
****************************************************************************/
#include "CCPhysicsContact.h"
#if CC_USE_PHYSICS
#include "chipmunk.h"
#include "chipmunk/chipmunk.h"
#include "CCPhysicsBody.h"
#include "CCPhysicsHelper.h"
@ -96,10 +96,10 @@ void PhysicsContact::generateContactData()
_contactData->count = cpArbiterGetCount(arb);
for (int i=0; i<_contactData->count && i<PhysicsContactData::POINT_MAX; ++i)
{
_contactData->points[i] = PhysicsHelper::cpv2point(cpArbiterGetPoint(arb, i));
_contactData->points[i] = PhysicsHelper::cpv2point(cpArbiterGetPointA(arb, i));
}
_contactData->normal = _contactData->count > 0 ? PhysicsHelper::cpv2point(cpArbiterGetNormal(arb, 0)) : Vec2::ZERO;
_contactData->normal = _contactData->count > 0 ? PhysicsHelper::cpv2point(cpArbiterGetNormal(arb)) : Vec2::ZERO;
}
// PhysicsContactPreSolve implementation
@ -114,32 +114,32 @@ PhysicsContactPreSolve::~PhysicsContactPreSolve()
float PhysicsContactPreSolve::getRestitution() const
{
return static_cast<cpArbiter*>(_contactInfo)->e;
return cpArbiterGetRestitution(static_cast<cpArbiter*>(_contactInfo));
}
float PhysicsContactPreSolve::getFriction() const
{
return static_cast<cpArbiter*>(_contactInfo)->u;
return cpArbiterGetFriction(static_cast<cpArbiter*>(_contactInfo));
}
Vec2 PhysicsContactPreSolve::getSurfaceVelocity() const
{
return PhysicsHelper::cpv2point(static_cast<cpArbiter*>(_contactInfo)->surface_vr);
return PhysicsHelper::cpv2point(cpArbiterGetSurfaceVelocity(static_cast<cpArbiter*>(_contactInfo)));
}
void PhysicsContactPreSolve::setRestitution(float restitution)
{
static_cast<cpArbiter*>(_contactInfo)->e = restitution;
cpArbiterSetRestitution(static_cast<cpArbiter*>(_contactInfo), restitution);
}
void PhysicsContactPreSolve::setFriction(float friction)
{
static_cast<cpArbiter*>(_contactInfo)->u = friction;
cpArbiterSetFriction(static_cast<cpArbiter*>(_contactInfo), friction);
}
void PhysicsContactPreSolve::setSurfaceVelocity(const Vec2& velocity)
{
static_cast<cpArbiter*>(_contactInfo)->surface_vr = PhysicsHelper::point2cpv(velocity);
cpArbiterSetSurfaceVelocity(static_cast<cpArbiter*>(_contactInfo), PhysicsHelper::point2cpv(velocity));
}
void PhysicsContactPreSolve::ignore()
@ -161,17 +161,17 @@ PhysicsContactPostSolve::~PhysicsContactPostSolve()
float PhysicsContactPostSolve::getRestitution() const
{
return static_cast<cpArbiter*>(_contactInfo)->e;
return cpArbiterGetRestitution(static_cast<cpArbiter*>(_contactInfo));
}
float PhysicsContactPostSolve::getFriction() const
{
return static_cast<cpArbiter*>(_contactInfo)->u;
return cpArbiterGetFriction(static_cast<cpArbiter*>(_contactInfo));
}
Vec2 PhysicsContactPostSolve::getSurfaceVelocity() const
{
return PhysicsHelper::cpv2point(static_cast<cpArbiter*>(_contactInfo)->surface_vr);
return PhysicsHelper::cpv2point(cpArbiterGetSurfaceVelocity(static_cast<cpArbiter*>(_contactInfo)));
}
EventListenerPhysicsContact::EventListenerPhysicsContact()

2
cocos/physics/CCPhysicsHelper.h
View File

@ -28,7 +28,7 @@
#include "base/ccConfig.h"
#if CC_USE_PHYSICS
#include "chipmunk.h"
#include "chipmunk/chipmunk.h"
#include "platform/CCPlatformMacros.h"
#include "math/CCGeometry.h"

28
cocos/physics/CCPhysicsJoint.cpp
View File

@ -24,7 +24,7 @@
#include "physics/CCPhysicsJoint.h"
#if CC_USE_PHYSICS
#include "chipmunk.h"
#include "chipmunk/chipmunk.h"
#include "CCPhysicsBody.h"
#include "CCPhysicsWorld.h"
@ -87,8 +87,8 @@ bool PhysicsJoint::initJoint()
for (auto subjoint : _cpConstraints)
{
subjoint->maxForce = _maxForce;
subjoint->errorBias = cpfpow(1.0f - 0.15f, 60.0f);
cpConstraintSetMaxForce(subjoint, _maxForce);
cpConstraintSetErrorBias(subjoint, cpfpow(1.0f - 0.15f, 60.0f));
cpSpaceAddConstraint(_world->_cpSpace, subjoint);
}
_initDirty = false;
@ -139,7 +139,7 @@ void PhysicsJoint::setMaxForce(float force)
_maxForce = force;
for (auto joint : _cpConstraints)
{
joint->maxForce = force;
cpConstraintSetMaxForce(joint, force);
}
}
@ -304,22 +304,22 @@ void PhysicsJointLimit::setMax(float max)
Vec2 PhysicsJointLimit::getAnchr1() const
{
return PhysicsHelper::cpv2point(cpSlideJointGetAnchr1(_cpConstraints.front()));
return PhysicsHelper::cpv2point(cpSlideJointGetAnchorA(_cpConstraints.front()));
}
void PhysicsJointLimit::setAnchr1(const Vec2& anchr)
{
cpSlideJointSetAnchr1(_cpConstraints.front(), PhysicsHelper::point2cpv(anchr));
cpSlideJointSetAnchorA(_cpConstraints.front(), PhysicsHelper::point2cpv(anchr));
}
Vec2 PhysicsJointLimit::getAnchr2() const
{
return PhysicsHelper::cpv2point(cpSlideJointGetAnchr2(_cpConstraints.front()));
return PhysicsHelper::cpv2point(cpSlideJointGetAnchorB(_cpConstraints.front()));
}
void PhysicsJointLimit::setAnchr2(const Vec2& anchr)
{
cpSlideJointSetAnchr1(_cpConstraints.front(), PhysicsHelper::point2cpv(anchr));
cpSlideJointSetAnchorB(_cpConstraints.front(), PhysicsHelper::point2cpv(anchr));
}
PhysicsJointDistance* PhysicsJointDistance::construct(PhysicsBody* a, PhysicsBody* b, const Vec2& anchr1, const Vec2& anchr2)
@ -405,22 +405,22 @@ bool PhysicsJointSpring::createConstraints()
Vec2 PhysicsJointSpring::getAnchr1() const
{
return PhysicsHelper::cpv2point(cpDampedSpringGetAnchr1(_cpConstraints.front()));
return PhysicsHelper::cpv2point(cpDampedSpringGetAnchorA(_cpConstraints.front()));
}
void PhysicsJointSpring::setAnchr1(const Vec2& anchr)
{
cpDampedSpringSetAnchr1(_cpConstraints.front(), PhysicsHelper::point2cpv(anchr));
cpDampedSpringSetAnchorA(_cpConstraints.front(), PhysicsHelper::point2cpv(anchr));
}
Vec2 PhysicsJointSpring::getAnchr2() const
{
return PhysicsHelper::cpv2point(cpDampedSpringGetAnchr2(_cpConstraints.front()));
return PhysicsHelper::cpv2point(cpDampedSpringGetAnchorB(_cpConstraints.front()));
}
void PhysicsJointSpring::setAnchr2(const Vec2& anchr)
{
cpDampedSpringSetAnchr1(_cpConstraints.front(), PhysicsHelper::point2cpv(anchr));
cpDampedSpringSetAnchorB(_cpConstraints.front(), PhysicsHelper::point2cpv(anchr));
}
float PhysicsJointSpring::getRestLength() const
@ -510,12 +510,12 @@ void PhysicsJointGroove::setGrooveB(const Vec2& grooveB)
Vec2 PhysicsJointGroove::getAnchr2() const
{
return PhysicsHelper::cpv2point(cpGrooveJointGetAnchr2(_cpConstraints.front()));
return PhysicsHelper::cpv2point(cpGrooveJointGetAnchorB(_cpConstraints.front()));
}
void PhysicsJointGroove::setAnchr2(const Vec2& anchr2)
{
cpGrooveJointSetAnchr2(_cpConstraints.front(), PhysicsHelper::point2cpv(anchr2));
cpGrooveJointSetAnchorB(_cpConstraints.front(), PhysicsHelper::point2cpv(anchr2));
}
PhysicsJointRotarySpring* PhysicsJointRotarySpring::construct(PhysicsBody* a, PhysicsBody* b, float stiffness, float damping)

143
cocos/physics/CCPhysicsShape.cpp
View File

@ -28,8 +28,8 @@
#include <climits>
#include <unordered_map>
#include "chipmunk.h"
#include "chipmunk_unsafe.h"
#include "chipmunk/chipmunk.h"
#include "chipmunk/chipmunk_unsafe.h"
#include "CCPhysicsBody.h"
#include "CCPhysicsWorld.h"
@ -37,7 +37,6 @@
NS_CC_BEGIN
extern const float PHYSICS_INFINITY;
std::unordered_map<cpShape*, PhysicsShape*> s_physicsShapeMap;
static cpBody* s_sharedBody = nullptr;
PhysicsShape::PhysicsShape()
@ -67,8 +66,6 @@ PhysicsShape::~PhysicsShape()
{
for (auto shape : _cpShapes)
{
s_physicsShapeMap.erase(shape);
cpShapeFree(shape);
}
}
@ -143,9 +140,9 @@ void PhysicsShape::addShape(cpShape* shape)
{
if (shape)
{
cpShapeSetGroup(shape, _group);
cpShapeSetUserData(shape, this);
cpShapeSetFilter(shape, cpShapeFilterNew(_group, CP_ALL_CATEGORIES, CP_ALL_CATEGORIES));
_cpShapes.push_back(shape);
s_physicsShapeMap.insert(std::pair<cpShape*, PhysicsShape*>(shape, this));
}
}
@ -271,8 +268,11 @@ void PhysicsShape::setSensor(bool sensor)
void PhysicsShape::recenterPoints(Vec2* points, int count, const Vec2& center)
{
cpVect* cpvs = new (std::nothrow) cpVect[count];
cpRecenterPoly(count, PhysicsHelper::points2cpvs(points, cpvs, count));
cpVect* cpvs = new cpVect[count];
cpVect centroid = cpCentroidForPoly(count, cpvs);
for(int i=0; i<count; i++){
cpvs[i] = cpvsub(cpvs[i], centroid);
}
PhysicsHelper::cpvs2points(cpvs, points, count);
delete[] cpvs;
@ -335,8 +335,8 @@ bool PhysicsShapeCircle::init(float radius, const PhysicsMaterial& material/* =
_type = Type::CIRCLE;
auto shape = cpCircleShapeNew(s_sharedBody, radius, PhysicsHelper::point2cpv(offset));
CC_BREAK_IF(shape == nullptr);
cpShapeSetUserData(shape, this);
addShape(shape);
@ -398,7 +398,7 @@ void PhysicsShapeCircle::updateScale()
cpShape* shape = _cpShapes.front();
cpVect v = cpCircleShapeGetOffset(shape);
v = cpvmult(v, factor);
((cpCircleShape*)shape)->c = v;
cpCircleShapeSetOffset(shape, v);
cpCircleShapeSetRadius(shape, cpCircleShapeGetRadius(shape) * factor);
@ -429,8 +429,8 @@ bool PhysicsShapeEdgeSegment::init(const Vec2& a, const Vec2& b, const PhysicsMa
PhysicsHelper::point2cpv(a),
PhysicsHelper::point2cpv(b),
border);
CC_BREAK_IF(shape == nullptr);
cpShapeSetUserData(shape, this);
addShape(shape);
@ -447,12 +447,12 @@ bool PhysicsShapeEdgeSegment::init(const Vec2& a, const Vec2& b, const PhysicsMa
Vec2 PhysicsShapeEdgeSegment::getPointA() const
{
return PhysicsHelper::cpv2point(((cpSegmentShape*)(_cpShapes.front()))->ta);
return PhysicsHelper::cpv2point(cpSegmentShapeGetA(_cpShapes.front()));
}
Vec2 PhysicsShapeEdgeSegment::getPointB() const
{
return PhysicsHelper::cpv2point(((cpSegmentShape*)(_cpShapes.front()))->tb);
return PhysicsHelper::cpv2point(cpSegmentShapeGetB(_cpShapes.front()));
}
Vec2 PhysicsShapeEdgeSegment::getCenter()
@ -480,10 +480,10 @@ void PhysicsShapeEdgeSegment::updateScale()
}
// PhysicsShapeBox
PhysicsShapeBox* PhysicsShapeBox::create(const Size& size, const PhysicsMaterial& material/* = MaterialDefault*/, const Vec2& offset/* = Vec2(0, 0)*/)
PhysicsShapeBox* PhysicsShapeBox::create(const Size& size, const PhysicsMaterial& material/* = MaterialDefault*/, const Vec2& offset/* = Vec2(0, 0)*/, float radius/* = 0.0f*/)
{
PhysicsShapeBox* shape = new (std::nothrow) PhysicsShapeBox();
if (shape && shape->init(size, material, offset))
if (shape && shape->init(size, material, offset, radius))
{
shape->autorelease();
return shape;
@ -493,7 +493,7 @@ PhysicsShapeBox* PhysicsShapeBox::create(const Size& size, const PhysicsMaterial
return nullptr;
}
bool PhysicsShapeBox::init(const Size& size, const PhysicsMaterial& material/* = MaterialDefault*/, const Vec2& offset /*= Vec2(0, 0)*/)
bool PhysicsShapeBox::init(const Size& size, const PhysicsMaterial& material/* = MaterialDefault*/, const Vec2& offset /*= Vec2(0, 0)*/, float radius/* = 0.0f*/)
{
do
{
@ -505,9 +505,11 @@ bool PhysicsShapeBox::init(const Size& size, const PhysicsMaterial& material/* =
{-wh.x/2.0f, -wh.y/2.0f}, {-wh.x/2.0f, wh.y/2.0f}, {wh.x/2.0f, wh.y/2.0f}, {wh.x/2.0f, -wh.y/2.0f}
};
auto shape = cpPolyShapeNew(s_sharedBody, 4, vec, PhysicsHelper::point2cpv(offset));
cpTransform transform = cpTransformTranslate(PhysicsHelper::point2cpv(offset));
auto shape = cpPolyShapeNew(s_sharedBody, 4, vec, transform, radius);
CC_BREAK_IF(shape == nullptr);
cpShapeSetUserData(shape, this);
addShape(shape);
@ -531,10 +533,10 @@ Size PhysicsShapeBox::getSize() const
}
// PhysicsShapePolygon
PhysicsShapePolygon* PhysicsShapePolygon::create(const Vec2* points, int count, const PhysicsMaterial& material/* = MaterialDefault*/, const Vec2& offset/* = Vec2(0, 0)*/)
PhysicsShapePolygon* PhysicsShapePolygon::create(const Vec2* points, int count, const PhysicsMaterial& material/* = MaterialDefault*/, const Vec2& offset/* = Vec2(0, 0)*/, float radius/* = 0.0f*/)
{
PhysicsShapePolygon* shape = new (std::nothrow) PhysicsShapePolygon();
if (shape && shape->init(points, count, material, offset))
if (shape && shape->init(points, count, material, offset, radius))
{
shape->autorelease();
return shape;
@ -544,18 +546,20 @@ PhysicsShapePolygon* PhysicsShapePolygon::create(const Vec2* points, int count,
return nullptr;
}
bool PhysicsShapePolygon::init(const Vec2* points, int count, const PhysicsMaterial& material/* = MaterialDefault*/, const Vec2& offset/* = Vec2(0, 0)*/)
bool PhysicsShapePolygon::init(const Vec2* points, int count, const PhysicsMaterial& material/* = MaterialDefault*/, const Vec2& offset/* = Vec2(0, 0)*/, float radius/* = 0.0f*/)
{
do
{
_type = Type::POLYGEN;
auto vecs = new (std::nothrow) cpVect[count];
PhysicsHelper::points2cpvs(points, vecs, count);
auto shape = cpPolyShapeNew(s_sharedBody, count, vecs, PhysicsHelper::point2cpv(offset));
PhysicsHelper::points2cpvs(points, vecs, count); //count = cpConvexHull((int)count, vecs, nullptr, nullptr, 0);
cpTransform transform = cpTransformTranslate(PhysicsHelper::point2cpv(offset));
auto shape = cpPolyShapeNew(s_sharedBody, count, vecs, transform, radius);
CC_SAFE_DELETE_ARRAY(vecs);
CC_BREAK_IF(shape == nullptr);
cpShapeSetUserData(shape, this);
addShape(shape);
@ -575,18 +579,18 @@ float PhysicsShapePolygon::calculateArea(const Vec2* points, int count)
{
cpVect* vecs = new (std::nothrow) cpVect[count];
PhysicsHelper::points2cpvs(points, vecs, count);
float area = PhysicsHelper::cpfloat2float(cpAreaForPoly(count, vecs));
float area = PhysicsHelper::cpfloat2float(cpAreaForPoly(count, vecs, 0.0f));
CC_SAFE_DELETE_ARRAY(vecs);
return area;
}
float PhysicsShapePolygon::calculateMoment(float mass, const Vec2* points, int count, const Vec2& offset)
float PhysicsShapePolygon::calculateMoment(float mass, const Vec2* points, int count, const Vec2& offset, float radius)
{
cpVect* vecs = new (std::nothrow) cpVect[count];
PhysicsHelper::points2cpvs(points, vecs, count);
float moment = mass == PHYSICS_INFINITY ? PHYSICS_INFINITY
: PhysicsHelper::cpfloat2float(cpMomentForPoly(mass, count, vecs, PhysicsHelper::point2cpv(offset)));
: PhysicsHelper::cpfloat2float(cpMomentForPoly(mass, count, vecs, PhysicsHelper::point2cpv(offset), radius));
CC_SAFE_DELETE_ARRAY(vecs);
return moment;
@ -595,14 +599,32 @@ float PhysicsShapePolygon::calculateMoment(float mass, const Vec2* points, int c
float PhysicsShapePolygon::calculateArea()
{
auto shape = _cpShapes.front();
return PhysicsHelper::cpfloat2float(cpAreaForPoly(((cpPolyShape*)shape)->numVerts, ((cpPolyShape*)shape)->verts));
int count = cpPolyShapeGetCount(shape);
cpVect* vecs = new cpVect[count];
for(int i=0;i<count;++i)
vecs[i] = cpPolyShapeGetVert(shape, i);
float area = PhysicsHelper::cpfloat2float(cpAreaForPoly(count, vecs, cpPolyShapeGetRadius(shape)));
CC_SAFE_DELETE_ARRAY(vecs);
return area;
}
float PhysicsShapePolygon::calculateDefaultMoment()
{
auto shape = _cpShapes.front();
return _mass == PHYSICS_INFINITY ? PHYSICS_INFINITY
: PhysicsHelper::cpfloat2float(cpMomentForPoly(_mass, ((cpPolyShape*)shape)->numVerts, ((cpPolyShape*)shape)->verts, cpvzero));
if(_mass == PHYSICS_INFINITY)
{
return PHYSICS_INFINITY;
}
else
{
auto shape = _cpShapes.front();
int count = cpPolyShapeGetCount(shape);
cpVect* vecs = new cpVect[count];
for(int i=0;i<count;++i)
vecs[i] = cpPolyShapeGetVert(shape, i);
float moment = PhysicsHelper::cpfloat2float(cpMomentForPoly(_mass, count, vecs, cpvzero, cpPolyShapeGetRadius(shape)));
CC_SAFE_DELETE_ARRAY(vecs);
return moment;
}
}
Vec2 PhysicsShapePolygon::getPoint(int i) const
@ -613,17 +635,31 @@ Vec2 PhysicsShapePolygon::getPoint(int i) const
void PhysicsShapePolygon::getPoints(Vec2* outPoints) const
{
auto shape = _cpShapes.front();
PhysicsHelper::cpvs2points(((cpPolyShape*)shape)->verts, outPoints, ((cpPolyShape*)shape)->numVerts);
int count = cpPolyShapeGetCount(shape);
cpVect* vecs = new cpVect[count];
for(int i=0;i<count;++i)
vecs[i] = cpPolyShapeGetVert(shape, i);
PhysicsHelper::cpvs2points(vecs, outPoints, count);
CC_SAFE_DELETE_ARRAY(vecs);
}
int PhysicsShapePolygon::getPointsCount() const
{
return ((cpPolyShape*)_cpShapes.front())->numVerts;
return cpPolyShapeGetCount(_cpShapes.front());
}
Vec2 PhysicsShapePolygon::getCenter()
{
return PhysicsHelper::cpv2point(cpCentroidForPoly(((cpPolyShape*)_cpShapes.front())->numVerts, ((cpPolyShape*)_cpShapes.front())->verts));
auto shape = _cpShapes.front();
int count = cpPolyShapeGetCount(shape);
cpVect* vecs = new cpVect[count];
for(int i=0;i<count;++i)
vecs[i] = cpPolyShapeGetVert(shape, i);
Vec2 center = PhysicsHelper::cpv2point(cpCentroidForPoly(count, vecs));
CC_SAFE_DELETE_ARRAY(vecs);
return center;
}
void PhysicsShapePolygon::updateScale()
@ -632,9 +668,10 @@ void PhysicsShapePolygon::updateScale()
cpFloat factorY = _newScaleY / _scaleY;
auto shape = _cpShapes.front();
int count = cpPolyShapeGetNumVerts(shape);
cpVect* vects = ((cpPolyShape*)shape)->verts;
cpSplittingPlane* planes = ((cpPolyShape*)shape)->planes;
int count = cpPolyShapeGetCount(shape);
cpVect* vects = new cpVect[count];
for(int i=0;i<count;++i)
vects[i] = cpPolyShapeGetVert(shape, i);
for (int i = 0; i < count; ++i)
{
@ -652,18 +689,9 @@ void PhysicsShapePolygon::updateScale()
vects[count - i - 1] = v;
}
}
for (int i = 0; i < count; ++i)
{
// cpVect n = cpvnormalize(cpvperp(cpvsub(vects[i], vects[(i + 1) % count])));
//
// planes[i].n = n;
// planes[i].d = cpvdot(n, vects[i]);
// FIXED ME: if update 'planes[i]' as the above codes, then can not query polygon shape by PhysicsWorld::getShapes().
// But modified like this, then ray test can not work correctly on some cases.
planes[i].d = cpvdot(planes[i].n, vects[i]);
}
cpPolyShapeSetVertsRaw(shape, count, vects);
CC_SAFE_DELETE_ARRAY(vects);
PhysicsShape::updateScale();
}
@ -699,6 +727,7 @@ bool PhysicsShapeEdgeBox::init(const Size& size, const PhysicsMaterial& material
{
auto shape = cpSegmentShapeNew(s_sharedBody, vec[i], vec[(i + 1) % 4], border);
CC_BREAK_IF(shape == nullptr);
cpShapeSetUserData(shape, this);
addShape(shape);
}
CC_BREAK_IF(i < 4);
@ -743,6 +772,7 @@ bool PhysicsShapeEdgePolygon::init(const Vec2* points, int count, const PhysicsM
{
auto shape = cpSegmentShapeNew(s_sharedBody, vec[i], vec[(i + 1) % count], border);
CC_BREAK_IF(shape == nullptr);
cpShapeSetUserData(shape, this);
cpShapeSetElasticity(shape, 1.0f);
cpShapeSetFriction(shape, 1.0f);
addShape(shape);
@ -771,7 +801,7 @@ Vec2 PhysicsShapeEdgePolygon::getCenter()
int i = 0;
for(auto shape : _cpShapes)
{
points[i++] = ((cpSegmentShape*)shape)->a;
points[i++] = cpSegmentShapeGetA(shape);
}
Vec2 center = PhysicsHelper::cpv2point(cpCentroidForPoly(count, points));
@ -785,7 +815,7 @@ void PhysicsShapeEdgePolygon::getPoints(cocos2d::Vec2 *outPoints) const
int i = 0;
for(auto shape : _cpShapes)
{
outPoints[i++] = PhysicsHelper::cpv2point(((cpSegmentShape*)shape)->a);
outPoints[i++] = PhysicsHelper::cpv2point(cpSegmentShapeGetA(shape));
}
}
@ -842,6 +872,7 @@ bool PhysicsShapeEdgeChain::init(const Vec2* points, int count, const PhysicsMat
{
auto shape = cpSegmentShapeNew(s_sharedBody, vec[i], vec[i + 1], border);
CC_BREAK_IF(shape == nullptr);
cpShapeSetUserData(shape, this);
cpShapeSetElasticity(shape, 1.0f);
cpShapeSetFriction(shape, 1.0f);
addShape(shape);
@ -869,10 +900,10 @@ Vec2 PhysicsShapeEdgeChain::getCenter()
int i = 0;
for(auto shape : _cpShapes)
{
points[i++] = ((cpSegmentShape*)shape)->a;
points[i++] = cpSegmentShapeGetA(shape);
}
points[i++] = ((cpSegmentShape*)_cpShapes.back())->b;
points[i++] = cpSegmentShapeGetB(_cpShapes.back());
Vec2 center = PhysicsHelper::cpv2point(cpCentroidForPoly(count, points));
delete[] points;
@ -885,10 +916,10 @@ void PhysicsShapeEdgeChain::getPoints(Vec2* outPoints) const
int i = 0;
for(auto shape : _cpShapes)
{
outPoints[i++] = PhysicsHelper::cpv2point(((cpSegmentShape*)shape)->a);
outPoints[i++] = PhysicsHelper::cpv2point(cpSegmentShapeGetA(shape));
}
outPoints[i++] = PhysicsHelper::cpv2point(((cpSegmentShape*)_cpShapes.back())->b);
outPoints[i++] = PhysicsHelper::cpv2point(cpSegmentShapeGetB(_cpShapes.back()));
}
int PhysicsShapeEdgeChain::getPointsCount() const
@ -921,7 +952,7 @@ void PhysicsShape::setGroup(int group)
{
for (auto shape : _cpShapes)
{
cpShapeSetGroup(shape, (cpGroup)group);
cpShapeSetFilter(shape, cpShapeFilterNew(group, CP_ALL_CATEGORIES, CP_ALL_CATEGORIES));
}
}
@ -932,7 +963,7 @@ bool PhysicsShape::containsPoint(const Vec2& point) const
{
for (auto shape : _cpShapes)
{
if (cpShapePointQuery(shape, PhysicsHelper::point2cpv(point)))
if (cpShapePointQuery(shape, PhysicsHelper::point2cpv(point), nullptr) < 0)
{
return true;
}

10
cocos/physics/CCPhysicsShape.h
View File

@ -445,7 +445,7 @@ public:
* @param offset A Vec2 object, it is the offset from the body's center of gravity in body local coordinates.
* @return An autoreleased PhysicsShapePolygon object pointer.
*/
static PhysicsShapePolygon* create(const Vec2* points, int count, const PhysicsMaterial& material = PHYSICSSHAPE_MATERIAL_DEFAULT, const Vec2& offset = Vec2::ZERO);
static PhysicsShapePolygon* create(const Vec2* points, int count, const PhysicsMaterial& material = PHYSICSSHAPE_MATERIAL_DEFAULT, const Vec2& offset = Vec2::ZERO, float radius = 0.0f);
/**
* Calculate the area of a polygon with specified value.
@ -465,7 +465,7 @@ public:
* @param offset A Vec2 object, it is the offset from the body's center of gravity in body local coordinates.
* @return A float number
*/
static float calculateMoment(float mass, const Vec2* points, int count, const Vec2& offset = Vec2::ZERO);
static float calculateMoment(float mass, const Vec2* points, int count, const Vec2& offset = Vec2::ZERO, float radius = 0.0f);
/**
* Calculate the moment for a polygon.
@ -503,7 +503,7 @@ public:
*/
virtual Vec2 getCenter() override;
protected:
bool init(const Vec2* points, int count, const PhysicsMaterial& material = PHYSICSSHAPE_MATERIAL_DEFAULT, const Vec2& offset = Vec2::ZERO);
bool init(const Vec2* points, int count, const PhysicsMaterial& material = PHYSICSSHAPE_MATERIAL_DEFAULT, const Vec2& offset = Vec2::ZERO, float radius = 0.0f);
float calculateArea() override;
virtual void updateScale() override;
@ -524,7 +524,7 @@ public:
* @param offset A Vec2 object, it is the offset from the body's center of gravity in body local coordinates.
* @return An autoreleased PhysicsShapeBox object pointer.
*/
static PhysicsShapeBox* create(const Size& size, const PhysicsMaterial& material = PHYSICSSHAPE_MATERIAL_DEFAULT, const Vec2& offset = Vec2::ZERO);
static PhysicsShapeBox* create(const Size& size, const PhysicsMaterial& material = PHYSICSSHAPE_MATERIAL_DEFAULT, const Vec2& offset = Vec2::ZERO, float radius = 0.0f);
/**
* Get this box's width and height.
@ -541,7 +541,7 @@ public:
virtual Vec2 getOffset() override { return getCenter(); }
protected:
bool init(const Size& size, const PhysicsMaterial& material = PHYSICSSHAPE_MATERIAL_DEFAULT, const Vec2& offset = Vec2::ZERO);
bool init(const Size& size, const PhysicsMaterial& material = PHYSICSSHAPE_MATERIAL_DEFAULT, const Vec2& offset = Vec2::ZERO, float radius = 0.0f);
protected:
PhysicsShapeBox();

484
cocos/physics/CCPhysicsWorld.cpp
View File

@ -27,7 +27,7 @@
#include <algorithm>
#include <climits>
#include "chipmunk.h"
#include "chipmunk/chipmunk_private.h"
#include "CCPhysicsBody.h"
#include "CCPhysicsShape.h"
#include "CCPhysicsContact.h"
@ -42,9 +42,8 @@
#include "base/CCEventCustom.h"
NS_CC_BEGIN
const float PHYSICS_INFINITY = INFINITY;
const float PHYSICS_INFINITY = FLT_MAX;
extern const char* PHYSICSCONTACT_EVENT_NAME;
extern std::unordered_map<cpShape*, PhysicsShape*> s_physicsShapeMap;
const int PhysicsWorld::DEBUGDRAW_NONE = 0x00;
const int PhysicsWorld::DEBUGDRAW_SHAPE = 0x01;
@ -81,14 +80,14 @@ namespace
class PhysicsWorldCallback
{
public:
static int collisionBeginCallbackFunc(cpArbiter *arb, struct cpSpace *space, PhysicsWorld *world);
static int collisionPreSolveCallbackFunc(cpArbiter *arb, cpSpace *space, PhysicsWorld *world);
static cpBool collisionBeginCallbackFunc(cpArbiter *arb, struct cpSpace *space, PhysicsWorld *world);
static cpBool collisionPreSolveCallbackFunc(cpArbiter *arb, cpSpace *space, PhysicsWorld *world);
static void collisionPostSolveCallbackFunc(cpArbiter *arb, cpSpace *space, PhysicsWorld *world);
static void collisionSeparateCallbackFunc(cpArbiter *arb, cpSpace *space, PhysicsWorld *world);
static void rayCastCallbackFunc(cpShape *shape, cpFloat t, cpVect n, RayCastCallbackInfo *info);
static void rayCastCallbackFunc(cpShape *shape, cpVect point, cpVect normal, cpFloat alpha, RayCastCallbackInfo *info);
static void queryRectCallbackFunc(cpShape *shape, RectQueryCallbackInfo *info);
static void queryPointFunc(cpShape *shape, cpFloat distance, cpVect point, PointQueryCallbackInfo *info);
static void getShapesAtPointFunc(cpShape *shape, cpFloat distance, cpVect point, Vector<PhysicsShape*>* arr);
static void queryPointFunc(cpShape *shape, cpVect point, cpFloat distance, cpVect gradient, PointQueryCallbackInfo *info);
static void getShapesAtPointFunc(cpShape *shape, cpVect point, cpFloat distance, cpVect gradient, Vector<PhysicsShape*>* arr);
public:
static bool continues;
@ -96,58 +95,58 @@ public:
bool PhysicsWorldCallback::continues = true;
int PhysicsWorldCallback::collisionBeginCallbackFunc(cpArbiter *arb, struct cpSpace *space, PhysicsWorld *world)
cpBool PhysicsWorldCallback::collisionBeginCallbackFunc(cpArbiter *arb, struct cpSpace *space, PhysicsWorld *world)
{
CP_ARBITER_GET_SHAPES(arb, a, b);
auto ita = s_physicsShapeMap.find(a);
auto itb = s_physicsShapeMap.find(b);
CC_ASSERT(ita != s_physicsShapeMap.end() && itb != s_physicsShapeMap.end());
PhysicsShape *shapeA = static_cast<PhysicsShape*>(cpShapeGetUserData(a));
PhysicsShape *shapeB = static_cast<PhysicsShape*>(cpShapeGetUserData(b));
CC_ASSERT(shapeA != nullptr && shapeB != nullptr);
auto contact = PhysicsContact::construct(ita->second, itb->second);
arb->data = contact;
auto contact = PhysicsContact::construct(shapeA, shapeB);
cpArbiterSetUserData(arb, contact);
contact->_contactInfo = arb;
return world->collisionBeginCallback(*contact);
}
int PhysicsWorldCallback::collisionPreSolveCallbackFunc(cpArbiter *arb, cpSpace *space, PhysicsWorld *world)
cpBool PhysicsWorldCallback::collisionPreSolveCallbackFunc(cpArbiter *arb, cpSpace *space, PhysicsWorld *world)
{
return world->collisionPreSolveCallback(*static_cast<PhysicsContact*>(arb->data));
return world->collisionPreSolveCallback(*static_cast<PhysicsContact*>(cpArbiterGetUserData(arb)));
}
void PhysicsWorldCallback::collisionPostSolveCallbackFunc(cpArbiter *arb, cpSpace *space, PhysicsWorld *world)
{
world->collisionPostSolveCallback(*static_cast<PhysicsContact*>(arb->data));
world->collisionPostSolveCallback(*static_cast<PhysicsContact*>(cpArbiterGetUserData(arb)));
}
void PhysicsWorldCallback::collisionSeparateCallbackFunc(cpArbiter *arb, cpSpace *space, PhysicsWorld *world)
{
PhysicsContact* contact = static_cast<PhysicsContact*>(arb->data);
PhysicsContact* contact = static_cast<PhysicsContact*>(cpArbiterGetUserData(arb));
world->collisionSeparateCallback(*contact);
delete contact;
}
void PhysicsWorldCallback::rayCastCallbackFunc(cpShape *shape, cpFloat t, cpVect n, RayCastCallbackInfo *info)
void PhysicsWorldCallback::rayCastCallbackFunc(cpShape *shape, cpVect point, cpVect normal, cpFloat alpha, RayCastCallbackInfo *info)
{
if (!PhysicsWorldCallback::continues)
{
return;
}
auto it = s_physicsShapeMap.find(shape);
CC_ASSERT(it != s_physicsShapeMap.end());
PhysicsShape *physicsShape = static_cast<PhysicsShape*>(cpShapeGetUserData(shape));
CC_ASSERT(physicsShape != nullptr);
PhysicsRayCastInfo callbackInfo =
{
it->second,
physicsShape,
info->p1,
info->p2,
Vec2(info->p1.x+(info->p2.x-info->p1.x)*t, info->p1.y+(info->p2.y-info->p1.y)*t),
Vec2(n.x, n.y),
(float)t,
PhysicsHelper::cpv2point(point),
PhysicsHelper::cpv2point(normal),
static_cast<float>(alpha),
};
PhysicsWorldCallback::continues = info->func(*info->world, callbackInfo, info->data);
@ -155,79 +154,149 @@ void PhysicsWorldCallback::rayCastCallbackFunc(cpShape *shape, cpFloat t, cpVect
void PhysicsWorldCallback::queryRectCallbackFunc(cpShape *shape, RectQueryCallbackInfo *info)
{
auto it = s_physicsShapeMap.find(shape);
CC_ASSERT(it != s_physicsShapeMap.end());
PhysicsShape *physicsShape = static_cast<PhysicsShape*>(cpShapeGetUserData(shape));
CC_ASSERT(physicsShape != nullptr);
if (!PhysicsWorldCallback::continues)
{
return;
}
PhysicsWorldCallback::continues = info->func(*info->world, *it->second, info->data);
PhysicsWorldCallback::continues = info->func(*info->world, *physicsShape, info->data);
}
void PhysicsWorldCallback::getShapesAtPointFunc(cpShape *shape, cpFloat distance, cpVect point, Vector<PhysicsShape*>* arr)
void PhysicsWorldCallback::getShapesAtPointFunc(cpShape *shape, cpVect point, cpFloat distance, cpVect gradient, Vector<PhysicsShape*>* arr)
{
auto it = s_physicsShapeMap.find(shape);
CC_ASSERT(it != s_physicsShapeMap.end());
arr->pushBack(it->second);
PhysicsShape *physicsShape = static_cast<PhysicsShape*>(cpShapeGetUserData(shape));
CC_ASSERT(physicsShape != nullptr);
arr->pushBack(physicsShape);
}
void PhysicsWorldCallback::queryPointFunc(cpShape *shape, cpFloat distance, cpVect point, PointQueryCallbackInfo *info)
void PhysicsWorldCallback::queryPointFunc(cpShape *shape, cpVect point, cpFloat distance, cpVect gradient, PointQueryCallbackInfo *info)
{
auto it = s_physicsShapeMap.find(shape);
CC_ASSERT(it != s_physicsShapeMap.end());
PhysicsWorldCallback::continues = info->func(*info->world, *it->second, info->data);
PhysicsShape *physicsShape = static_cast<PhysicsShape*>(cpShapeGetUserData(shape));
CC_ASSERT(physicsShape != nullptr);
PhysicsWorldCallback::continues = info->func(*info->world, *physicsShape, info->data);
}
static inline cpSpaceDebugColor RGBAColor(float r, float g, float b, float a){
cpSpaceDebugColor color = {r, g, b, a};
return color;
}
static inline cpSpaceDebugColor LAColor(float l, float a){
cpSpaceDebugColor color = {l, l, l, a};
return color;
}
static void DrawCircle(cpVect p, cpFloat a, cpFloat r, cpSpaceDebugColor outline, cpSpaceDebugColor fill, cpDataPointer data)
{
const Color4F fillColor(fill.r, fill.g, fill.b, fill.a);
const Color4F outlineColor(outline.r, outline.g, outline.b, outline.a);
DrawNode* drawNode = static_cast<DrawNode*>(data);
float radius = PhysicsHelper::cpfloat2float(r);
Vec2 centre = PhysicsHelper::cpv2point(p);
static const int CIRCLE_SEG_NUM = 12;
Vec2 seg[CIRCLE_SEG_NUM] = {};
for (int i = 0; i < CIRCLE_SEG_NUM; ++i)
{
float angle = (float)i * M_PI / (float)CIRCLE_SEG_NUM * 2.0f;
Vec2 d(radius * cosf(angle), radius * sinf(angle));
seg[i] = centre + d;
}
drawNode->drawPolygon(seg, CIRCLE_SEG_NUM, fillColor, 1, outlineColor);
}
static void DrawFatSegment(cpVect a, cpVect b, cpFloat r, cpSpaceDebugColor outline, cpSpaceDebugColor fill, cpDataPointer data)
{
const Color4F outlineColor(outline.r, outline.g, outline.b, outline.a);
DrawNode* drawNode = static_cast<DrawNode*>(data);
drawNode->drawSegment(PhysicsHelper::cpv2point(a),
PhysicsHelper::cpv2point(b),
PhysicsHelper::cpfloat2float(r==0 ? 1 : r), outlineColor);
}
static void DrawSegment(cpVect a, cpVect b, cpSpaceDebugColor color, cpDataPointer data)
{
DrawFatSegment(a, b, 0.0, color, color, data);
}
static void DrawPolygon(int count, const cpVect *verts, cpFloat r, cpSpaceDebugColor outline, cpSpaceDebugColor fill, cpDataPointer data)
{
const Color4F fillColor(fill.r, fill.g, fill.b, fill.a);
const Color4F outlineColor(outline.r, outline.g, outline.b, outline.a);
DrawNode* drawNode = static_cast<DrawNode*>(data);
int num = count;
Vec2* seg = new (std::nothrow) Vec2[num];
for(int i=0;i<num;++i)
seg[i] = PhysicsHelper::cpv2point(verts[i]);
drawNode->drawPolygon(seg, num, fillColor, 1.0f, outlineColor);
delete[] seg;
}
static void DrawDot(cpFloat size, cpVect pos, cpSpaceDebugColor color, cpDataPointer data)
{
const Color4F dotColor(color.r, color.g, color.b, color.a);
DrawNode* drawNode = static_cast<DrawNode*>(data);
drawNode->drawDot(PhysicsHelper::cpv2point(pos), 2, dotColor);
}
static cpSpaceDebugColor ColorForShape(cpShape *shape, cpDataPointer data)
{
if(cpShapeGetSensor(shape)){
return LAColor(1.0f, 0.3f);
} else {
cpBody *body = cpShapeGetBody(shape);
if(cpBodyIsSleeping(body)){
return LAColor(0.2f, 0.3f);
} else if(body->sleeping.idleTime > shape->space->sleepTimeThreshold) {
return LAColor(0.66f, 0.3f);
} else {
GLfloat intensity = (cpBodyGetType(body) == CP_BODY_TYPE_STATIC ? 0.15f : 0.75f);
return RGBAColor(intensity, 0.0f, 0.0f, 0.3f);
}
}
}
void PhysicsWorld::debugDraw()
{
if (_debugDraw == nullptr)
{
_debugDraw = new (std::nothrow) PhysicsDebugDraw(*this);
_debugDraw = DrawNode::create();
_debugDraw->retain();
Director::getInstance()->getRunningScene()->addChild(_debugDraw);
}
if (_debugDraw && !_bodies.empty())
cpSpaceDebugDrawOptions drawOptions = {
DrawCircle,
DrawSegment,
DrawFatSegment,
DrawPolygon,
DrawDot,
(cpSpaceDebugDrawFlags)(_debugDrawMask),
{1.0f, 0.0f, 0.0f, 1.0f},
ColorForShape,
{0.0f, 0.75f, 0.0f, 1.0f},
{0.0f, 0.0f, 1.0f, 1.0f},
_debugDraw,
};
if (_debugDraw)
{
if (_debugDraw->begin())
{
if (_debugDrawMask & DEBUGDRAW_SHAPE)
{
for (Ref* obj : _bodies)
{
PhysicsBody* body = dynamic_cast<PhysicsBody*>(obj);
if (!body->isEnabled())
{
continue;
}
for (auto& shape : body->getShapes())
{
_debugDraw->drawShape(*dynamic_cast<PhysicsShape*>(shape));
}
}
}
if (_debugDrawMask & DEBUGDRAW_JOINT)
{
for (auto joint : _joints)
{
_debugDraw->drawJoint(*joint);
}
}
_debugDraw->end();
}
_debugDraw->clear();
cpSpaceDebugDraw(_cpSpace, &drawOptions);
}
}
int PhysicsWorld::collisionBeginCallback(PhysicsContact& contact)
bool PhysicsWorld::collisionBeginCallback(PhysicsContact& contact)
{
bool ret = true;
@ -287,7 +356,7 @@ int PhysicsWorld::collisionBeginCallback(PhysicsContact& contact)
return ret ? contact.resetResult() : false;
}
int PhysicsWorld::collisionPreSolveCallback(PhysicsContact& contact)
bool PhysicsWorld::collisionPreSolveCallback(PhysicsContact& contact)
{
if (!contact.isNotificationEnabled())
{
@ -341,8 +410,8 @@ void PhysicsWorld::rayCast(PhysicsRayCastCallbackFunc func, const Vec2& point1,
cpSpaceSegmentQuery(_cpSpace,
PhysicsHelper::point2cpv(point1),
PhysicsHelper::point2cpv(point2),
CP_ALL_LAYERS,
CP_NO_GROUP,
0.0f,
CP_SHAPE_FILTER_ALL,
(cpSpaceSegmentQueryFunc)PhysicsWorldCallback::rayCastCallbackFunc,
&info);
}
@ -363,8 +432,7 @@ void PhysicsWorld::queryRect(PhysicsQueryRectCallbackFunc func, const Rect& rect
PhysicsWorldCallback::continues = true;
cpSpaceBBQuery(_cpSpace,
PhysicsHelper::rect2cpbb(rect),
CP_ALL_LAYERS,
CP_NO_GROUP,
CP_SHAPE_FILTER_ALL,
(cpSpaceBBQueryFunc)PhysicsWorldCallback::queryRectCallbackFunc,
&info);
}
@ -383,12 +451,11 @@ void PhysicsWorld::queryPoint(PhysicsQueryPointCallbackFunc func, const Vec2& po
PointQueryCallbackInfo info = {this, func, data};
PhysicsWorldCallback::continues = true;
cpSpaceNearestPointQuery(_cpSpace,
cpSpacePointQuery(_cpSpace,
PhysicsHelper::point2cpv(point),
0,
CP_ALL_LAYERS,
CP_NO_GROUP,
(cpSpaceNearestPointQueryFunc)PhysicsWorldCallback::queryPointFunc,
CP_SHAPE_FILTER_ALL,
(cpSpacePointQueryFunc)PhysicsWorldCallback::queryPointFunc,
&info);
}
}
@ -396,12 +463,11 @@ void PhysicsWorld::queryPoint(PhysicsQueryPointCallbackFunc func, const Vec2& po
Vector<PhysicsShape*> PhysicsWorld::getShapes(const Vec2& point) const
{
Vector<PhysicsShape*> arr;
cpSpaceNearestPointQuery(_cpSpace,
cpSpacePointQuery(_cpSpace,
PhysicsHelper::point2cpv(point),
0,
CP_ALL_LAYERS,
CP_NO_GROUP,
(cpSpaceNearestPointQueryFunc)PhysicsWorldCallback::getShapesAtPointFunc,
CP_SHAPE_FILTER_ALL,
(cpSpacePointQueryFunc)PhysicsWorldCallback::getShapesAtPointFunc,
&arr);
return arr;
@ -409,31 +475,34 @@ Vector<PhysicsShape*> PhysicsWorld::getShapes(const Vec2& point) const
PhysicsShape* PhysicsWorld::getShape(const Vec2& point) const
{
cpShape* shape = cpSpaceNearestPointQueryNearest(_cpSpace,
cpShape* shape = cpSpacePointQueryNearest(_cpSpace,
PhysicsHelper::point2cpv(point),
0,
CP_ALL_LAYERS,
CP_NO_GROUP,
CP_SHAPE_FILTER_ALL,
nullptr);
return shape == nullptr ? nullptr : s_physicsShapeMap.find(shape)->second;
return shape == nullptr ? nullptr : static_cast<PhysicsShape*>(cpShapeGetUserData(shape));
}
bool PhysicsWorld::init()
{
do
{
_cpSpace = cpSpaceNew();
#if CC_TARGET_PLATFORM == CC_PLATFORM_WINRT || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
_cpSpace = cpSpaceNew();
#else
_cpSpace = cpHastySpaceNew();
cpHastySpaceSetThreads(_cpSpace, 0);
#endif
CC_BREAK_IF(_cpSpace == nullptr);
cpSpaceSetGravity(_cpSpace, PhysicsHelper::point2cpv(_gravity));
cpSpaceSetDefaultCollisionHandler(_cpSpace,
(cpCollisionBeginFunc)PhysicsWorldCallback::collisionBeginCallbackFunc,
(cpCollisionPreSolveFunc)PhysicsWorldCallback::collisionPreSolveCallbackFunc,
(cpCollisionPostSolveFunc)PhysicsWorldCallback::collisionPostSolveCallbackFunc,
(cpCollisionSeparateFunc)PhysicsWorldCallback::collisionSeparateCallbackFunc,
this);
cpCollisionHandler *handler = cpSpaceAddDefaultCollisionHandler(_cpSpace);
handler->userData = this;
handler->beginFunc = (cpCollisionBeginFunc)PhysicsWorldCallback::collisionBeginCallbackFunc;
handler->preSolveFunc = (cpCollisionPreSolveFunc)PhysicsWorldCallback::collisionPreSolveCallbackFunc;
handler->postSolveFunc = (cpCollisionPostSolveFunc)PhysicsWorldCallback::collisionPostSolveCallbackFunc;
handler->separateFunc = (cpCollisionSeparateFunc)PhysicsWorldCallback::collisionSeparateCallbackFunc;
return true;
} while (false);
@ -465,7 +534,7 @@ void PhysicsWorld::doAddBody(PhysicsBody* body)
if (body->isEnabled())
{
// add body to space
if (body->isDynamic() && !cpSpaceContainsBody(_cpSpace, body->_cpBody))
if (!cpSpaceContainsBody(_cpSpace, body->_cpBody))
{
cpSpaceAddBody(_cpSpace, body->_cpBody);
}
@ -745,7 +814,8 @@ void PhysicsWorld::setDebugDrawMask(int mask)
{
if (mask == DEBUGDRAW_NONE)
{
CC_SAFE_DELETE(_debugDraw);
_debugDraw->removeFromParent();
CC_SAFE_RELEASE_NULL(_debugDraw);
}
_debugDrawMask = mask;
@ -825,20 +895,49 @@ void PhysicsWorld::update(float delta, bool userCall/* = false*/)
if (userCall)
{
cpSpaceStep(_cpSpace, delta);
#if CC_TARGET_PLATFORM == CC_PLATFORM_WINRT || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
cpSpaceStep(_cpSpace, delta);
#else
cpHastySpaceStep(_cpSpace, delta);
#endif
}
else
{
_updateTime += delta;
if (++_updateRateCount >= _updateRate)
if(_fixedRate)
{
const float dt = _updateTime * _speed / _substeps;
for (int i = 0; i < _substeps; ++i)
const float step = 1.0f / _fixedRate;
const float dt = step * _speed;
while(_updateTime>step)
{
cpSpaceStep(_cpSpace, dt);
_updateTime-=step;
#if CC_TARGET_PLATFORM == CC_PLATFORM_WINRT || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
cpSpaceStep(_cpSpace, dt);
#else
cpHastySpaceStep(_cpSpace, dt);
#endif
}
}
else
{
if (++_updateRateCount >= _updateRate)
{
const float dt = _updateTime * _speed / _substeps;
for (int i = 0; i < _substeps; ++i)
{
#if CC_TARGET_PLATFORM == CC_PLATFORM_WINRT || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
cpSpaceStep(_cpSpace, dt);
#else
cpHastySpaceStep(_cpSpace, dt);
#endif
for (auto& body : _bodies)
{
body->update(dt);
}
}
_updateRateCount = 0;
_updateTime = 0.0f;
}
_updateRateCount = 0;
_updateTime = 0.0f;
}
}
@ -873,6 +972,7 @@ PhysicsWorld::PhysicsWorld()
, _updateRateCount(0)
, _updateTime(0.0f)
, _substeps(1)
, _fixedRate(0)
, _cpSpace(nullptr)
, _updateBodyTransform(false)
, _scene(nullptr)
@ -890,9 +990,13 @@ PhysicsWorld::~PhysicsWorld()
removeAllBodies();
if (_cpSpace)
{
cpSpaceFree(_cpSpace);
#if CC_TARGET_PLATFORM == CC_PLATFORM_WINRT || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
cpSpaceFree(_cpSpace);
#else
cpHastySpaceFree(_cpSpace);
#endif
}
CC_SAFE_DELETE(_debugDraw);
CC_SAFE_RELEASE_NULL(_debugDraw);
}
void PhysicsWorld::beforeSimulation(Node *node, const Mat4& parentToWorldTransform, float nodeParentScaleX, float nodeParentScaleY, float parentRotation)
@ -928,166 +1032,6 @@ void PhysicsWorld::afterSimulation(Node *node, const Mat4& parentToWorldTransfor
afterSimulation(child, nodeToWorldTransform, nodeRotation);
}
PhysicsDebugDraw::PhysicsDebugDraw(PhysicsWorld& world)
: _drawNode(nullptr)
, _world(world)
{
_drawNode = DrawNode::create();
Director::getInstance()->getRunningScene()->addChild(_drawNode);
}
PhysicsDebugDraw::~PhysicsDebugDraw()
{
_drawNode->removeFromParent();
_drawNode = nullptr;
}
bool PhysicsDebugDraw::begin()
{
_drawNode->clear();
return true;
}
void PhysicsDebugDraw::end()
{
}
void PhysicsDebugDraw::drawShape(PhysicsShape& shape)
{
const Color4F fillColor(1.0f, 0.0f, 0.0f, 0.3f);
const Color4F outlineColor(1.0f, 0.0f, 0.0f, 1.0f);
for (auto it = shape._cpShapes.begin(); it != shape._cpShapes.end(); ++it)
{
cpShape *subShape = *it;
switch ((*it)->klass_private->type)
{
case CP_CIRCLE_SHAPE:
{
float radius = PhysicsHelper::cpfloat2float(cpCircleShapeGetRadius(subShape));
Vec2 centre = PhysicsHelper::cpv2point(cpBodyGetPos(cpShapeGetBody(subShape)));
Vec2 offset = PhysicsHelper::cpv2point(cpCircleShapeGetOffset(subShape));
Vec2 rotation(PhysicsHelper::cpv2point(cpBodyGetRot(cpShapeGetBody(subShape))));
centre += offset.rotate(rotation);
static const int CIRCLE_SEG_NUM = 12;
Vec2 seg[CIRCLE_SEG_NUM] = {};
for (int i = 0; i < CIRCLE_SEG_NUM; ++i)
{
float angle = (float)i * M_PI / (float)CIRCLE_SEG_NUM * 2.0f;
Vec2 d(radius * cosf(angle), radius * sinf(angle));
seg[i] = centre + d;
}
_drawNode->drawPolygon(seg, CIRCLE_SEG_NUM, fillColor, 1, outlineColor);
break;
}
case CP_SEGMENT_SHAPE:
{
cpSegmentShape *seg = (cpSegmentShape *)subShape;
_drawNode->drawSegment(PhysicsHelper::cpv2point(seg->ta),
PhysicsHelper::cpv2point(seg->tb),
PhysicsHelper::cpfloat2float(seg->r==0 ? 1 : seg->r), outlineColor);
break;
}
case CP_POLY_SHAPE:
{
cpPolyShape* poly = (cpPolyShape*)subShape;
int num = poly->numVerts;
Vec2* seg = new (std::nothrow) Vec2[num];
PhysicsHelper::cpvs2points(poly->tVerts, seg, num);
_drawNode->drawPolygon(seg, num, fillColor, 1.0f, outlineColor);
delete[] seg;
break;
}
default:
break;
}
}
}
void PhysicsDebugDraw::drawJoint(PhysicsJoint& joint)
{
const Color4F lineColor(0.0f, 0.0f, 1.0f, 1.0f);
const Color4F jointPointColor(0.0f, 1.0f, 0.0f, 1.0f);
for (auto it = joint._cpConstraints.begin(); it != joint._cpConstraints.end(); ++it)
{
cpConstraint *constraint = *it;
cpBody *body_a = constraint->a;
cpBody *body_b = constraint->b;
const cpConstraintClass *klass = constraint->klass_private;
if(klass == cpPinJointGetClass())
{
cpPinJoint *subJoint = (cpPinJoint *)constraint;
cpVect a = cpvadd(body_a->p, cpvrotate(subJoint->anchr1, body_a->rot));
cpVect b = cpvadd(body_b->p, cpvrotate(subJoint->anchr2, body_b->rot));
_drawNode->drawSegment(PhysicsHelper::cpv2point(a), PhysicsHelper::cpv2point(b), 1, lineColor);
_drawNode->drawDot(PhysicsHelper::cpv2point(a), 2, jointPointColor);
_drawNode->drawDot(PhysicsHelper::cpv2point(b), 2, jointPointColor);
}
else if(klass == cpSlideJointGetClass())
{
cpSlideJoint *subJoint = (cpSlideJoint *)constraint;
cpVect a = cpvadd(body_a->p, cpvrotate(subJoint->anchr1, body_a->rot));
cpVect b = cpvadd(body_b->p, cpvrotate(subJoint->anchr2, body_b->rot));
_drawNode->drawSegment(PhysicsHelper::cpv2point(a), PhysicsHelper::cpv2point(b), 1, lineColor);
_drawNode->drawDot(PhysicsHelper::cpv2point(a), 2, jointPointColor);
_drawNode->drawDot(PhysicsHelper::cpv2point(b), 2, jointPointColor);
}
else if(klass == cpPivotJointGetClass())
{
cpPivotJoint *subJoint = (cpPivotJoint *)constraint;
cpVect a = cpvadd(body_a->p, cpvrotate(subJoint->anchr1, body_a->rot));
cpVect b = cpvadd(body_b->p, cpvrotate(subJoint->anchr2, body_b->rot));
_drawNode->drawDot(PhysicsHelper::cpv2point(a), 2, jointPointColor);
_drawNode->drawDot(PhysicsHelper::cpv2point(b), 2, jointPointColor);
}
else if(klass == cpGrooveJointGetClass())
{
cpGrooveJoint *subJoint = (cpGrooveJoint *)constraint;
cpVect a = cpvadd(body_a->p, cpvrotate(subJoint->grv_a, body_a->rot));
cpVect b = cpvadd(body_a->p, cpvrotate(subJoint->grv_b, body_a->rot));
cpVect c = cpvadd(body_b->p, cpvrotate(subJoint->anchr2, body_b->rot));
_drawNode->drawSegment(PhysicsHelper::cpv2point(a), PhysicsHelper::cpv2point(b), 1, lineColor);
_drawNode->drawDot(PhysicsHelper::cpv2point(c), 2, jointPointColor);
}
else if(klass == cpDampedSpringGetClass())
{
cpDampedSpring *subJoint = (cpDampedSpring *)constraint;
cpVect a = cpvadd(body_a->p, cpvrotate(subJoint->anchr1, body_a->rot));
cpVect b = cpvadd(body_b->p, cpvrotate(subJoint->anchr2, body_b->rot));
_drawNode->drawSegment(PhysicsHelper::cpv2point(a), PhysicsHelper::cpv2point(b), 1, lineColor);
_drawNode->drawDot(PhysicsHelper::cpv2point(a), 2, jointPointColor);
_drawNode->drawDot(PhysicsHelper::cpv2point(b), 2, jointPointColor);
}
}
}
void PhysicsDebugDraw::drawContact()
{
}
NS_CC_END
#endif // CC_USE_PHYSICS

46
cocos/physics/CCPhysicsWorld.h
View File

@ -59,6 +59,13 @@ typedef struct PhysicsRayCastInfo
Vec2 end; //< in lua, it's name is "ended"
Vec2 contact;
Vec2 normal;
// FIXME: correct thing to do is use `cpFlaot` instead of float.
// but in order to do so, we should include "chipmunk_types.h"
// in in Chipmunk v7.0, chipmunk_types includes all the mac types that
// conflicts with cocos2d Size, Point,... etc types. And all the CocosStudio
// lib will need to use the `cocos2d::` namespace prefix. And it is easier to do this
// than change all the cocosstudio library (and also users code)
float fraction;
void* data;
}PhysicsRayCastInfo;
@ -284,6 +291,15 @@ public:
* @return An integer number.
*/
inline int getSubsteps() const { return _substeps; }
/**
* set the number of update of the physics world in a second.
* 0 - disable fixed step system
* default value is 0
*/
void setFixedUpdateRate(int updatesPerSecond) { if(updatesPerSecond > 0) { _fixedRate = updatesPerSecond; } }
/** get the number of substeps */
inline int getFixedUpdateRate() const { return _fixedRate; }
/**
* Set the debug draw mask of this physics world.
@ -338,8 +354,8 @@ protected:
virtual void debugDraw();
virtual int collisionBeginCallback(PhysicsContact& contact);
virtual int collisionPreSolveCallback(PhysicsContact& contact);
virtual bool collisionBeginCallback(PhysicsContact& contact);
virtual bool collisionPreSolveCallback(PhysicsContact& contact);
virtual void collisionPostSolveCallback(PhysicsContact& contact);
virtual void collisionSeparateCallback(PhysicsContact& contact);
@ -358,6 +374,7 @@ protected:
int _updateRateCount;
float _updateTime;
int _substeps;
int _fixedRate;
cpSpace* _cpSpace;
bool _updateBodyTransform;
@ -366,7 +383,7 @@ protected:
Scene* _scene;
bool _autoStep;
PhysicsDebugDraw* _debugDraw;
DrawNode* _debugDraw;
int _debugDrawMask;
EventDispatcher* _eventDispatcher;
@ -394,29 +411,6 @@ protected:
friend class PhysicsDebugDraw;
};
/** A physics helper class. Draw physics shape, joint in debug mode.
* You do not create PhysicsDebugDraw objects directly; Instead, you can activate it by PhysicsWorld::setDebugDrawMask.
*/
class CC_DLL PhysicsDebugDraw
{
protected:
virtual bool begin();
virtual void end();
virtual void drawShape(PhysicsShape& shape);
virtual void drawJoint(PhysicsJoint& joint);
virtual void drawContact();
protected:
PhysicsDebugDraw(PhysicsWorld& world);
virtual ~PhysicsDebugDraw();
protected:
DrawNode* _drawNode;
PhysicsWorld& _world;
friend class PhysicsWorld;
};
extern const float CC_DLL PHYSICS_INFINITY;
/** @} */

116
cocos/physics/cpCompat62.h Normal file
View File

@ -0,0 +1,116 @@
/* Copyright (c) 2013 Scott Lembcke and Howling Moon Software
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
#ifndef CHIPMUNK_COMPAT_62_H
#define CHIPMUNK_COMPAT_62_H
#include "chipmunk/chipmunk.h"
//
// Body
//
inline cpVect cpBodyGetVel(const cpBody *body)
{
return cpBodyGetVelocity(body);
}
inline void cpBodySetVel(cpBody *body, cpVect velocity)
{
cpBodySetVelocity(body, velocity);
}
inline cpVect cpBodyGetPos(const cpBody *body)
{
return cpBodyGetPosition(body);
}
inline void cpBodySetPos(cpBody *body, cpVect pos)
{
cpBodySetPosition(body, pos);
}
inline cpVect cpBodyGetRot(const cpBody *body)
{
return cpBodyGetRotation(body);
}
inline cpFloat cpBodyGetAngVel(const cpBody *body)
{
return cpBodyGetAngularVelocity(body);
}
inline void cpBodySetAngVel(cpBody *body, cpFloat angularVelocity)
{
cpBodySetAngularVelocity(body, angularVelocity);
}
inline cpVect cpBodyLocal2World(const cpBody *body, const cpVect point)
{
return cpBodyLocalToWorld(body, point);
}
inline cpVect cpBodyWorld2Local(const cpBody *body, const cpVect point)
{
return cpBodyWorldToLocal(body, point);
}
inline void cpBodyApplyImpulse(cpBody *body, const cpVect j, const cpVect r)
{
cpBodyApplyImpulseAtWorldPoint(body, j, r);
}
//
// Shapes
//
inline void cpShapeSetLayers(cpShape* shape, unsigned int layer)
{
cpShapeFilter filter = cpShapeGetFilter(shape);
filter.mask = layer;
filter.categories = layer;
cpShapeSetFilter(shape, filter);
}
inline unsigned int cpShapeGetLayers(cpShape* shape)
{
cpShapeFilter filter = cpShapeGetFilter(shape);
return filter.mask;
}
inline void cpShapeSetGroup(cpShape* shape, uintptr_t group)
{
cpShapeFilter filter = cpShapeGetFilter(shape);
filter.group = group;
cpShapeSetFilter(shape, filter);
}
inline uintptr_t cpShapeGetGroup(cpShape* shape)
{
cpShapeFilter filter = cpShapeGetFilter(shape);
return filter.group;
}
inline int cpPolyShapeGetNumVerts(const cpShape *shape)
{
return cpPolyShapeGetCount(shape);
}
inline cpFloat cpShapeNearestPointQuery(cpShape *shape, cpVect p, cpPointQueryInfo *out)
{
return cpShapePointQuery(shape, p, out);
}
//
// Space
//
inline cpShape* cpSpaceAddStaticShape(cpSpace *space, cpShape *shape)
{
return cpSpaceAddShape(space, shape);
}
#endif // CHIPMUNK_COMPAT_62_H

2
cocos/platform/CCImage.cpp
View File

@ -1838,7 +1838,7 @@ bool Image::initWithTGAData(tImageTGA* tgaData)
namespace
{
static const uint32_t makeFourCC(char ch0, char ch1, char ch2, char ch3)
static uint32_t makeFourCC(char ch0, char ch1, char ch2, char ch3)
{
const uint32_t fourCC = ((uint32_t)(char)(ch0) | ((uint32_t)(char)(ch1) << 8) | ((uint32_t)(char)(ch2) << 16) | ((uint32_t)(char)(ch3) << 24 ));
return fourCC;

41
cocos/platform/CMakeLists.txt
View File

@ -1,3 +1,26 @@
#/****************************************************************************
# Copyright (c) 2015 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.
# ****************************************************************************/
if(WINDOWS)
@ -42,21 +65,33 @@ set(COCOS_PLATFORM_SPECIFIC_SRC
elseif(ANDROID)
include_directories(
platform/android
)
set(COCOS_PLATFORM_SPECIFIC_SRC
platform/android/CCApplication-android.cpp
platform/android/CCCommon-android.cpp
platform/android/CCDevice-android.cpp
platform/android/CCGLViewImpl-android.cpp
platform/android/CCFileUtils-android.cpp
platform/android/CCEnhanceAPI-android.cpp
platform/android/jni/JniHelper.cpp
)
set(COCOS2DX_ANDROID_STATIC
platform/android/CCDevice-android.cpp
platform/android/javaactivity-android.cpp
platform/android/jni/TouchesJni.cpp
platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxAccelerometer.cpp
platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.cpp
platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp
platform/android/jni/JniHelper.cpp
platform/android/jni/TouchesJni.cpp
)
add_library(cocos2dxandroid_static STATIC ${COCOS2DX_ANDROID_STATIC})
set_property(TARGET cocos2dxandroid_static PROPERTY POSITION_INDEPENDENT_CODE TRUE)
endif()
#leave andatory external stuff here also

2
cocos/renderer/CCGLProgram.h
View File

@ -489,7 +489,7 @@ public:
*/
void reset();
/** returns the OpenGL Program object */
inline const GLuint getProgram() const { return _program; }
inline GLuint getProgram() const { return _program; }
/** returns the Uniform flags */
inline const UniformFlags& getUniformFlags() const { return _flags; }

2
cocos/renderer/CCTextureCache.cpp
View File

@ -542,7 +542,7 @@ void TextureCache::reloadAllTextures()
// #endif
}
const std::string TextureCache::getTextureFilePath( cocos2d::Texture2D *texture )const
std::string TextureCache::getTextureFilePath(cocos2d::Texture2D* texture) const
{
for(auto& item : _textures)
{

2
cocos/renderer/CCTextureCache.h
View File

@ -202,7 +202,7 @@ public:
*
* @return The full path of the file.
*/
const std::string getTextureFilePath(Texture2D* texture)const;
std::string getTextureFilePath(Texture2D* texture) const;
/** Reload texture from a new file.
* This function is mainly for editor, won't suggest use it in game for performance reason.

6
cocos/scripting/js-bindings/CMakeLists.txt
View File

@ -45,6 +45,8 @@ set(JSBINDING_SRC
auto/jsb_cocos2dx_3d_extension_auto.cpp
auto/jsb_cocos2dx_physics3d_auto.cpp
auto/jsb_cocos2dx_navmesh_auto.cpp
auto/js_bindings_chipmunk_functions.cpp
auto/js_bindings_chipmunk_auto_classes.cpp
manual/ScriptingCore.cpp
manual/cocos2d_specifics.cpp
manual/js_manual_conversions.cpp
@ -56,8 +58,6 @@ set(JSBINDING_SRC
manual/jsb_event_dispatcher_manual.cpp
manual/component/CCComponentJS.cpp
manual/chipmunk/js_bindings_chipmunk_manual.cpp
manual/chipmunk/js_bindings_chipmunk_functions.cpp
manual/chipmunk/js_bindings_chipmunk_auto_classes.cpp
manual/chipmunk/js_bindings_chipmunk_registration.cpp
manual/cocosbuilder/js_bindings_ccbreader.cpp
manual/cocostudio/jsb_cocos2dx_studio_manual.cpp
@ -101,7 +101,7 @@ include_directories(
${cocos_root}/cocos/editor-support/spine
${cocos_root}/cocos/editor-support/cocosbuilder
${cocos_root}/cocos/editor-support/cocostudio
${cocos_root}/external/chipmunk/include/chipmunk
${CHIPMUNK_INCLUDE_DIRS}
)
add_library(jscocos2d STATIC

5760
cocos/scripting/js-bindings/auto/js_bindings_chipmunk_auto_classes.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

17
cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_auto_classes.h → cocos/scripting/js-bindings/auto/js_bindings_chipmunk_auto_classes.h
View File

@ -1,12 +1,12 @@
/*
* AUTOGENERATED FILE. DO NOT EDIT IT
* Generated by "generate_js_bindings.py -c chipmunk_jsb.ini" on 2012-11-07
* Script version: v0.3
* Generated by "generate_jsb.py -c chipmunk_jsb.ini" on 2016-02-23
* Script version: v0.10
*/
#include "js_bindings_config.h"
#ifdef JSB_INCLUDE_CHIPMUNK
#include "js_bindings_chipmunk_manual.h"
#include "chipmunk/js_bindings_chipmunk_manual.h"
extern JSObject *JSB_cpConstraint_object;
extern JSClass *JSB_cpConstraint_class;
void JSB_cpConstraint_createClass(JSContext *cx, JS::HandleObject globalObj, const char* name );
@ -61,13 +61,6 @@ void JSB_cpSegmentShape_createClass(JSContext *cx, JS::HandleObject globalObj, c
extern JSObject *JSB_cpPolyShape_object;
extern JSClass *JSB_cpPolyShape_class;
void JSB_cpPolyShape_createClass(JSContext *cx, JS::HandleObject globalObj, const char* name );
extern JSObject *JSB_cpSegmentQueryInfo_object;
extern JSClass *JSB_cpSegmentQueryInfo_class;
void JSB_cpSegmentQueryInfo_createClass(JSContext *cx, JS::HandleObject globalObj, const char* name );
extern JSObject *JSB_cpNearestPointQueryInfo_object;
extern JSClass *JSB_cpNearestPointQueryInfo_class;
void JSB_cpNearestPointQueryInfo_createClass(JSContext *cx, JS::HandleObject globalObj, const char* name );
extern JSObject *JSB_cpSplittingPlane_object;
extern JSClass *JSB_cpSplittingPlane_class;
void JSB_cpSplittingPlane_createClass(JSContext *cx, JS::HandleObject globalObj, const char* name );
#endif // JSB_INCLUDE_CHIPMUNK

10
cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_auto_classes_registration.h → cocos/scripting/js-bindings/auto/js_bindings_chipmunk_auto_classes_registration.h
View File

@ -1,11 +1,12 @@
/*
* AUTOGENERATED FILE. DO NOT EDIT IT
* Generated by "generate_js_bindings.py -c chipmunk_jsb.ini" on 2012-11-07
* Script version: v0.3
* Generated by "generate_jsb.py -c chipmunk_jsb.ini" on 2016-02-23
* Script version: v0.10
*/
#include "js_bindings_config.h"
#ifdef JSB_INCLUDE_CHIPMUNK
#include "chipmunk/js_bindings_chipmunk_manual.h"
JSB_cpConstraint_createClass(cx, chipmunk, "Constraint");
JSB_cpGrooveJoint_createClass(cx, chipmunk, "GrooveJoint");
JSB_cpSimpleMotor_createClass(cx, chipmunk, "SimpleMotor");
@ -24,7 +25,6 @@ JSB_cpShape_createClass(cx, chipmunk, "Shape");
JSB_cpCircleShape_createClass(cx, chipmunk, "CircleShape");
JSB_cpSegmentShape_createClass(cx, chipmunk, "SegmentShape");
JSB_cpPolyShape_createClass(cx, chipmunk, "PolyShape");
JSB_cpSegmentQueryInfo_createClass(cx, chipmunk, "SegmentQueryInfo");
JSB_cpNearestPointQueryInfo_createClass(cx, chipmunk, "NearestPointQueryInfo");
JSB_cpSplittingPlane_createClass(cx, chipmunk, "SplittingPlane");
#endif // JSB_INCLUDE_CHIPMUNK

6637
cocos/scripting/js-bindings/auto/js_bindings_chipmunk_functions.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

167
cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_functions.h → cocos/scripting/js-bindings/auto/js_bindings_chipmunk_functions.h
View File

@ -1,33 +1,44 @@
/*
* AUTOGENERATED FILE. DO NOT EDIT IT
* Generated by "generate_js_bindings.py -c chipmunk_jsb.ini" on 2012-11-07
* Script version: v0.3
* Generated by "generate_jsb.py -c chipmunk_jsb.ini" on 2016-02-23
* Script version: v0.10
*/
#include "js_bindings_config.h"
#ifdef JSB_INCLUDE_CHIPMUNK
#include "js_bindings_chipmunk_manual.h"
#include "chipmunk/js_bindings_chipmunk_manual.h"
#ifdef __cplusplus
extern "C" {
#endif
bool JSB_cpArbiterCallWildcardBeginA(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpArbiterCallWildcardBeginB(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpArbiterCallWildcardPostSolveA(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpArbiterCallWildcardPostSolveB(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpArbiterCallWildcardPreSolveA(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpArbiterCallWildcardPreSolveB(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpArbiterCallWildcardSeparateA(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpArbiterCallWildcardSeparateB(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpArbiterGetCount(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpArbiterGetDepth(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpArbiterGetElasticity(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpArbiterGetFriction(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpArbiterGetNormal(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpArbiterGetPoint(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpArbiterGetPointA(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpArbiterGetPointB(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpArbiterGetRestitution(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpArbiterGetSurfaceVelocity(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpArbiterIgnore(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpArbiterIsFirstContact(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpArbiterSetElasticity(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpArbiterIsRemoval(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpArbiterSetFriction(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpArbiterSetRestitution(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpArbiterSetSurfaceVelocity(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpArbiterTotalImpulse(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpArbiterTotalImpulseWithFriction(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpArbiterTotalKE(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpAreaForCircle(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpAreaForSegment(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBBArea(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBBCenter(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBBClampVect(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBBContainsBB(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBBContainsVect(JSContext *cx, uint32_t argc, jsval *vp);
@ -38,68 +49,80 @@ bool JSB_cpBBMerge(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBBMergedArea(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBBNew(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBBNewForCircle(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBBNewForExtents(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBBOffset(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBBSegmentQuery(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBBWrapVect(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyActivate(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyActivateStatic(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyApplyForce(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyApplyImpulse(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyApplyForceAtLocalPoint(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyApplyForceAtWorldPoint(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyApplyImpulseAtLocalPoint(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyApplyImpulseAtWorldPoint(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyDestroy(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyFree(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyGetAngVel(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyGetAngVelLimit(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyGetAngle(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyGetAngularVelocity(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyGetCenterOfGravity(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyGetForce(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyGetMass(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyGetMoment(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyGetPos(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyGetRot(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyGetPosition(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyGetRotation(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyGetSpace(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyGetTorque(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyGetVel(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyGetVelAtLocalPoint(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyGetVelAtWorldPoint(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyGetVelLimit(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyGetType(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyGetVelocity(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyGetVelocityAtLocalPoint(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyGetVelocityAtWorldPoint(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyInit(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyInitStatic(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyIsRogue(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyIsSleeping(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyIsStatic(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyKineticEnergy(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyLocal2World(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyLocalToWorld(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyNew(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyNewKinematic(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyNewStatic(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyResetForces(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodySetAngVel(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodySetAngVelLimit(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodySetAngle(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodySetAngularVelocity(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodySetCenterOfGravity(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodySetForce(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodySetMass(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodySetMoment(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodySetPos(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodySetPosition(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodySetTorque(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodySetVel(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodySetVelLimit(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodySetType(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodySetVelocity(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodySleep(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodySleepWithGroup(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyUpdatePosition(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyUpdateVelocity(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyWorld2Local(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBodyWorldToLocal(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBoxShapeNew(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBoxShapeNew2(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpCircleShapeGetOffset(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpCircleShapeGetRadius(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpCircleShapeNew(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpConstraintActivateBodies(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpConstraintDestroy(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpConstraintFree(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpConstraintGetA(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpConstraintGetB(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpConstraintGetBodyA(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpConstraintGetBodyB(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpConstraintGetCollideBodies(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpConstraintGetErrorBias(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpConstraintGetImpulse(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpConstraintGetMaxBias(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpConstraintGetMaxForce(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpConstraintGetSpace(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpConstraintIsDampedRotarySpring(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpConstraintIsDampedSpring(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpConstraintIsGearJoint(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpConstraintIsGrooveJoint(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpConstraintIsPinJoint(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpConstraintIsPivotJoint(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpConstraintIsRatchetJoint(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpConstraintIsRotaryLimitJoint(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpConstraintIsSimpleMotor(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpConstraintIsSlideJoint(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpConstraintSetCollideBodies(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpConstraintSetErrorBias(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpConstraintSetMaxBias(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpConstraintSetMaxForce(JSContext *cx, uint32_t argc, jsval *vp);
@ -110,14 +133,14 @@ bool JSB_cpDampedRotarySpringNew(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpDampedRotarySpringSetDamping(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpDampedRotarySpringSetRestAngle(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpDampedRotarySpringSetStiffness(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpDampedSpringGetAnchr1(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpDampedSpringGetAnchr2(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpDampedSpringGetAnchorA(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpDampedSpringGetAnchorB(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpDampedSpringGetDamping(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpDampedSpringGetRestLength(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpDampedSpringGetStiffness(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpDampedSpringNew(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpDampedSpringSetAnchr1(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpDampedSpringSetAnchr2(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpDampedSpringSetAnchorA(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpDampedSpringSetAnchorB(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpDampedSpringSetDamping(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpDampedSpringSetRestLength(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpDampedSpringSetStiffness(JSContext *cx, uint32_t argc, jsval *vp);
@ -126,32 +149,32 @@ bool JSB_cpGearJointGetRatio(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpGearJointNew(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpGearJointSetPhase(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpGearJointSetRatio(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpGrooveJointGetAnchr2(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpGrooveJointGetAnchorB(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpGrooveJointGetGrooveA(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpGrooveJointGetGrooveB(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpGrooveJointNew(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpGrooveJointSetAnchr2(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpGrooveJointSetAnchorB(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpGrooveJointSetGrooveA(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpGrooveJointSetGrooveB(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpInitChipmunk(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpMessage(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpMomentForBox(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpMomentForBox2(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpMomentForCircle(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpMomentForSegment(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpPinJointGetAnchr1(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpPinJointGetAnchr2(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpPinJointGetAnchorA(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpPinJointGetAnchorB(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpPinJointGetDist(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpPinJointNew(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpPinJointSetAnchr1(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpPinJointSetAnchr2(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpPinJointSetAnchorA(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpPinJointSetAnchorB(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpPinJointSetDist(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpPivotJointGetAnchr1(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpPivotJointGetAnchr2(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpPivotJointGetAnchorA(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpPivotJointGetAnchorB(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpPivotJointNew(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpPivotJointNew2(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpPivotJointSetAnchr1(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpPivotJointSetAnchr2(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpPolyShapeGetNumVerts(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpPivotJointSetAnchorA(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpPivotJointSetAnchorB(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpPolyShapeGetCount(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpPolyShapeGetRadius(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpPolyShapeGetVert(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpRatchetJointGetAngle(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpRatchetJointGetPhase(JSContext *cx, uint32_t argc, jsval *vp);
@ -160,7 +183,6 @@ bool JSB_cpRatchetJointNew(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpRatchetJointSetAngle(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpRatchetJointSetPhase(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpRatchetJointSetRatchet(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpResetShapeIdCounter(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpRotaryLimitJointGetMax(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpRotaryLimitJointGetMin(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpRotaryLimitJointNew(JSContext *cx, uint32_t argc, jsval *vp);
@ -174,44 +196,47 @@ bool JSB_cpSegmentShapeNew(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSegmentShapeSetNeighbors(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapeCacheBB(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapeDestroy(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapeFilterNew(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapeFree(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapeGetArea(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapeGetBB(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapeGetBody(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapeGetCenterOfGravity(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapeGetCollisionType(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapeGetDensity(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapeGetElasticity(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapeGetFilter(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapeGetFriction(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapeGetGroup(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapeGetLayers(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapeGetMass(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapeGetMoment(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapeGetSensor(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapeGetSpace(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapeGetSurfaceVelocity(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapePointQuery(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapeSetBody(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapeSetCollisionType(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapeSetDensity(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapeSetElasticity(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapeSetFilter(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapeSetFriction(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapeSetGroup(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapeSetLayers(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapeSetMass(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapeSetSensor(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapeSetSurfaceVelocity(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShapeUpdate(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSimpleMotorGetRate(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSimpleMotorNew(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSimpleMotorSetRate(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSlideJointGetAnchr1(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSlideJointGetAnchr2(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSlideJointGetAnchorA(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSlideJointGetAnchorB(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSlideJointGetMax(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSlideJointGetMin(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSlideJointNew(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSlideJointSetAnchr1(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSlideJointSetAnchr2(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSlideJointSetAnchorA(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSlideJointSetAnchorB(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSlideJointSetMax(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSlideJointSetMin(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceActivateShapesTouchingShape(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceAddBody(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceAddConstraint(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceAddShape(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceAddStaticShape(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceContainsBody(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceContainsConstraint(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceContainsShape(JSContext *cx, uint32_t argc, jsval *vp);
@ -222,7 +247,6 @@ bool JSB_cpSpaceGetCollisionPersistence(JSContext *cx, uint32_t argc, jsval *vp)
bool JSB_cpSpaceGetCollisionSlop(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceGetCurrentTimeStep(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceGetDamping(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceGetEnableContactGraph(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceGetGravity(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceGetIdleSpeedThreshold(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceGetIterations(JSContext *cx, uint32_t argc, jsval *vp);
@ -231,25 +255,39 @@ bool JSB_cpSpaceGetStaticBody(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceInit(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceIsLocked(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceNew(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpacePointQueryFirst(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceReindexShape(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceReindexShapesForBody(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceReindexStatic(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceRemoveBody(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceRemoveConstraint(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceRemoveShape(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceRemoveStaticShape(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceSetCollisionBias(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceSetCollisionPersistence(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceSetCollisionSlop(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceSetDamping(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceSetEnableContactGraph(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceSetGravity(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceSetIdleSpeedThreshold(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceSetIterations(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceSetSleepTimeThreshold(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceStep(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpaceUseSpatialHash(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpTransformAxialScale(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpTransformBoneScale(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpTransformInverse(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpTransformMult(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpTransformNew(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpTransformNewTranspose(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpTransformOrtho(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpTransformPoint(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpTransformRigid(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpTransformRigidInverse(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpTransformRotate(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpTransformScale(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpTransformTranslate(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpTransformVect(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpTransformWrap(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpTransformWrapInverse(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpTransformbBB(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpfabs(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpfclamp(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpfclamp01(JSContext *cx, uint32_t argc, jsval *vp);
@ -273,7 +311,6 @@ bool JSB_cpvmult(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpvnear(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpvneg(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpvnormalize(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpvnormalize_safe(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpvperp(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpvproject(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpvrotate(JSContext *cx, uint32_t argc, jsval *vp);

321
cocos/scripting/js-bindings/auto/js_bindings_chipmunk_functions_registration.h Normal file
View File

@ -0,0 +1,321 @@
/*
* AUTOGENERATED FILE. DO NOT EDIT IT
* Generated by "generate_jsb.py -c chipmunk_jsb.ini" on 2016-02-23
* Script version: v0.10
*/
#include "js_bindings_config.h"
#ifdef JSB_INCLUDE_CHIPMUNK
#include "chipmunk/js_bindings_chipmunk_manual.h"
JS_DefineFunction(cx, chipmunk, "arbiterCallWildcardBeginA", JSB_cpArbiterCallWildcardBeginA, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterCallWildcardBeginB", JSB_cpArbiterCallWildcardBeginB, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterCallWildcardPostSolveA", JSB_cpArbiterCallWildcardPostSolveA, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterCallWildcardPostSolveB", JSB_cpArbiterCallWildcardPostSolveB, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterCallWildcardPreSolveA", JSB_cpArbiterCallWildcardPreSolveA, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterCallWildcardPreSolveB", JSB_cpArbiterCallWildcardPreSolveB, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterCallWildcardSeparateA", JSB_cpArbiterCallWildcardSeparateA, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterCallWildcardSeparateB", JSB_cpArbiterCallWildcardSeparateB, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterGetCount", JSB_cpArbiterGetCount, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterGetDepth", JSB_cpArbiterGetDepth, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterGetFriction", JSB_cpArbiterGetFriction, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterGetNormal", JSB_cpArbiterGetNormal, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterGetPointA", JSB_cpArbiterGetPointA, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterGetPointB", JSB_cpArbiterGetPointB, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterGetRestitution", JSB_cpArbiterGetRestitution, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterGetSurfaceVelocity", JSB_cpArbiterGetSurfaceVelocity, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterIgnore", JSB_cpArbiterIgnore, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterIsFirstContact", JSB_cpArbiterIsFirstContact, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterIsRemoval", JSB_cpArbiterIsRemoval, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterSetFriction", JSB_cpArbiterSetFriction, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterSetRestitution", JSB_cpArbiterSetRestitution, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterSetSurfaceVelocity", JSB_cpArbiterSetSurfaceVelocity, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterTotalImpulse", JSB_cpArbiterTotalImpulse, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterTotalKE", JSB_cpArbiterTotalKE, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "areaForCircle", JSB_cpAreaForCircle, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "areaForSegment", JSB_cpAreaForSegment, 3, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bBArea", JSB_cpBBArea, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bBCenter", JSB_cpBBCenter, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bBClampVect", JSB_cpBBClampVect, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bBContainsBB", JSB_cpBBContainsBB, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bBContainsVect", JSB_cpBBContainsVect, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bBExpand", JSB_cpBBExpand, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bBIntersects", JSB_cpBBIntersects, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bBIntersectsSegment", JSB_cpBBIntersectsSegment, 3, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bBMerge", JSB_cpBBMerge, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bBMergedArea", JSB_cpBBMergedArea, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bBNew", JSB_cpBBNew, 4, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bBNewForCircle", JSB_cpBBNewForCircle, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bBNewForExtents", JSB_cpBBNewForExtents, 3, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bBOffset", JSB_cpBBOffset, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bBSegmentQuery", JSB_cpBBSegmentQuery, 3, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bBWrapVect", JSB_cpBBWrapVect, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyActivate", JSB_cpBodyActivate, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyActivateStatic", JSB_cpBodyActivateStatic, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyApplyForceAtLocalPoint", JSB_cpBodyApplyForceAtLocalPoint, 3, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyApplyForceAtWorldPoint", JSB_cpBodyApplyForceAtWorldPoint, 3, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyApplyImpulseAtLocalPoint", JSB_cpBodyApplyImpulseAtLocalPoint, 3, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyApplyImpulseAtWorldPoint", JSB_cpBodyApplyImpulseAtWorldPoint, 3, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyDestroy", JSB_cpBodyDestroy, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyFree", JSB_cpBodyFree, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyGetAngle", JSB_cpBodyGetAngle, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyGetAngularVelocity", JSB_cpBodyGetAngularVelocity, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyGetCenterOfGravity", JSB_cpBodyGetCenterOfGravity, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyGetForce", JSB_cpBodyGetForce, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyGetMass", JSB_cpBodyGetMass, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyGetMoment", JSB_cpBodyGetMoment, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyGetPosition", JSB_cpBodyGetPosition, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyGetRotation", JSB_cpBodyGetRotation, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyGetSpace", JSB_cpBodyGetSpace, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyGetTorque", JSB_cpBodyGetTorque, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyGetType", JSB_cpBodyGetType, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyGetVelocity", JSB_cpBodyGetVelocity, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyGetVelocityAtLocalPoint", JSB_cpBodyGetVelocityAtLocalPoint, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyGetVelocityAtWorldPoint", JSB_cpBodyGetVelocityAtWorldPoint, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyInit", JSB_cpBodyInit, 3, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyIsSleeping", JSB_cpBodyIsSleeping, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyKineticEnergy", JSB_cpBodyKineticEnergy, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyLocalToWorld", JSB_cpBodyLocalToWorld, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyNew", JSB_cpBodyNew, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyNewKinematic", JSB_cpBodyNewKinematic, 0, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyNewStatic", JSB_cpBodyNewStatic, 0, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodySetAngle", JSB_cpBodySetAngle, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodySetAngularVelocity", JSB_cpBodySetAngularVelocity, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodySetCenterOfGravity", JSB_cpBodySetCenterOfGravity, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodySetForce", JSB_cpBodySetForce, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodySetMass", JSB_cpBodySetMass, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodySetMoment", JSB_cpBodySetMoment, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodySetPosition", JSB_cpBodySetPosition, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodySetTorque", JSB_cpBodySetTorque, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodySetType", JSB_cpBodySetType, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodySetVelocity", JSB_cpBodySetVelocity, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodySleep", JSB_cpBodySleep, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodySleepWithGroup", JSB_cpBodySleepWithGroup, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyUpdatePosition", JSB_cpBodyUpdatePosition, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyUpdateVelocity", JSB_cpBodyUpdateVelocity, 4, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyWorldToLocal", JSB_cpBodyWorldToLocal, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "boxShapeNew", JSB_cpBoxShapeNew, 4, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "boxShapeNew2", JSB_cpBoxShapeNew2, 3, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "circleShapeGetOffset", JSB_cpCircleShapeGetOffset, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "circleShapeGetRadius", JSB_cpCircleShapeGetRadius, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "circleShapeNew", JSB_cpCircleShapeNew, 3, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintDestroy", JSB_cpConstraintDestroy, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintFree", JSB_cpConstraintFree, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintGetBodyA", JSB_cpConstraintGetBodyA, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintGetBodyB", JSB_cpConstraintGetBodyB, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintGetCollideBodies", JSB_cpConstraintGetCollideBodies, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintGetErrorBias", JSB_cpConstraintGetErrorBias, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintGetImpulse", JSB_cpConstraintGetImpulse, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintGetMaxBias", JSB_cpConstraintGetMaxBias, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintGetMaxForce", JSB_cpConstraintGetMaxForce, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintGetSpace", JSB_cpConstraintGetSpace, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintIsDampedRotarySpring", JSB_cpConstraintIsDampedRotarySpring, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintIsDampedSpring", JSB_cpConstraintIsDampedSpring, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintIsGearJoint", JSB_cpConstraintIsGearJoint, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintIsGrooveJoint", JSB_cpConstraintIsGrooveJoint, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintIsPinJoint", JSB_cpConstraintIsPinJoint, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintIsPivotJoint", JSB_cpConstraintIsPivotJoint, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintIsRatchetJoint", JSB_cpConstraintIsRatchetJoint, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintIsRotaryLimitJoint", JSB_cpConstraintIsRotaryLimitJoint, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintIsSimpleMotor", JSB_cpConstraintIsSimpleMotor, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintIsSlideJoint", JSB_cpConstraintIsSlideJoint, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintSetCollideBodies", JSB_cpConstraintSetCollideBodies, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintSetErrorBias", JSB_cpConstraintSetErrorBias, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintSetMaxBias", JSB_cpConstraintSetMaxBias, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintSetMaxForce", JSB_cpConstraintSetMaxForce, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedRotarySpringGetDamping", JSB_cpDampedRotarySpringGetDamping, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedRotarySpringGetRestAngle", JSB_cpDampedRotarySpringGetRestAngle, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedRotarySpringGetStiffness", JSB_cpDampedRotarySpringGetStiffness, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedRotarySpringNew", JSB_cpDampedRotarySpringNew, 5, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedRotarySpringSetDamping", JSB_cpDampedRotarySpringSetDamping, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedRotarySpringSetRestAngle", JSB_cpDampedRotarySpringSetRestAngle, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedRotarySpringSetStiffness", JSB_cpDampedRotarySpringSetStiffness, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedSpringGetAnchorA", JSB_cpDampedSpringGetAnchorA, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedSpringGetAnchorB", JSB_cpDampedSpringGetAnchorB, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedSpringGetDamping", JSB_cpDampedSpringGetDamping, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedSpringGetRestLength", JSB_cpDampedSpringGetRestLength, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedSpringGetStiffness", JSB_cpDampedSpringGetStiffness, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedSpringNew", JSB_cpDampedSpringNew, 7, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedSpringSetAnchorA", JSB_cpDampedSpringSetAnchorA, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedSpringSetAnchorB", JSB_cpDampedSpringSetAnchorB, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedSpringSetDamping", JSB_cpDampedSpringSetDamping, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedSpringSetRestLength", JSB_cpDampedSpringSetRestLength, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedSpringSetStiffness", JSB_cpDampedSpringSetStiffness, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "gearJointGetPhase", JSB_cpGearJointGetPhase, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "gearJointGetRatio", JSB_cpGearJointGetRatio, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "gearJointNew", JSB_cpGearJointNew, 4, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "gearJointSetPhase", JSB_cpGearJointSetPhase, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "gearJointSetRatio", JSB_cpGearJointSetRatio, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "grooveJointGetAnchorB", JSB_cpGrooveJointGetAnchorB, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "grooveJointGetGrooveA", JSB_cpGrooveJointGetGrooveA, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "grooveJointGetGrooveB", JSB_cpGrooveJointGetGrooveB, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "grooveJointNew", JSB_cpGrooveJointNew, 5, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "grooveJointSetAnchorB", JSB_cpGrooveJointSetAnchorB, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "grooveJointSetGrooveA", JSB_cpGrooveJointSetGrooveA, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "grooveJointSetGrooveB", JSB_cpGrooveJointSetGrooveB, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "message", JSB_cpMessage, 6, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "momentForBox", JSB_cpMomentForBox, 3, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "momentForBox2", JSB_cpMomentForBox2, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "momentForCircle", JSB_cpMomentForCircle, 4, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "pinJointGetAnchorA", JSB_cpPinJointGetAnchorA, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "pinJointGetAnchorB", JSB_cpPinJointGetAnchorB, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "pinJointGetDist", JSB_cpPinJointGetDist, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "pinJointNew", JSB_cpPinJointNew, 4, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "pinJointSetAnchorA", JSB_cpPinJointSetAnchorA, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "pinJointSetAnchorB", JSB_cpPinJointSetAnchorB, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "pinJointSetDist", JSB_cpPinJointSetDist, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "pivotJointGetAnchorA", JSB_cpPivotJointGetAnchorA, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "pivotJointGetAnchorB", JSB_cpPivotJointGetAnchorB, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "pivotJointNew", JSB_cpPivotJointNew, 3, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "pivotJointNew2", JSB_cpPivotJointNew2, 4, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "pivotJointSetAnchorA", JSB_cpPivotJointSetAnchorA, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "pivotJointSetAnchorB", JSB_cpPivotJointSetAnchorB, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "polyShapeGetCount", JSB_cpPolyShapeGetCount, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "polyShapeGetRadius", JSB_cpPolyShapeGetRadius, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "polyShapeGetVert", JSB_cpPolyShapeGetVert, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "ratchetJointGetAngle", JSB_cpRatchetJointGetAngle, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "ratchetJointGetPhase", JSB_cpRatchetJointGetPhase, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "ratchetJointGetRatchet", JSB_cpRatchetJointGetRatchet, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "ratchetJointNew", JSB_cpRatchetJointNew, 4, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "ratchetJointSetAngle", JSB_cpRatchetJointSetAngle, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "ratchetJointSetPhase", JSB_cpRatchetJointSetPhase, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "ratchetJointSetRatchet", JSB_cpRatchetJointSetRatchet, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "rotaryLimitJointGetMax", JSB_cpRotaryLimitJointGetMax, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "rotaryLimitJointGetMin", JSB_cpRotaryLimitJointGetMin, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "rotaryLimitJointNew", JSB_cpRotaryLimitJointNew, 4, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "rotaryLimitJointSetMax", JSB_cpRotaryLimitJointSetMax, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "rotaryLimitJointSetMin", JSB_cpRotaryLimitJointSetMin, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "segmentShapeGetA", JSB_cpSegmentShapeGetA, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "segmentShapeGetB", JSB_cpSegmentShapeGetB, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "segmentShapeGetNormal", JSB_cpSegmentShapeGetNormal, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "segmentShapeGetRadius", JSB_cpSegmentShapeGetRadius, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "segmentShapeNew", JSB_cpSegmentShapeNew, 4, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "segmentShapeSetNeighbors", JSB_cpSegmentShapeSetNeighbors, 3, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeCacheBB", JSB_cpShapeCacheBB, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeDestroy", JSB_cpShapeDestroy, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeFilterNew", JSB_cpShapeFilterNew, 3, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeFree", JSB_cpShapeFree, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeGetArea", JSB_cpShapeGetArea, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeGetBB", JSB_cpShapeGetBB, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeGetBody", JSB_cpShapeGetBody, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeGetCenterOfGravity", JSB_cpShapeGetCenterOfGravity, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeGetCollisionType", JSB_cpShapeGetCollisionType, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeGetDensity", JSB_cpShapeGetDensity, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeGetElasticity", JSB_cpShapeGetElasticity, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeGetFilter", JSB_cpShapeGetFilter, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeGetFriction", JSB_cpShapeGetFriction, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeGetMass", JSB_cpShapeGetMass, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeGetMoment", JSB_cpShapeGetMoment, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeGetSensor", JSB_cpShapeGetSensor, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeGetSpace", JSB_cpShapeGetSpace, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeGetSurfaceVelocity", JSB_cpShapeGetSurfaceVelocity, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeSetBody", JSB_cpShapeSetBody, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeSetCollisionType", JSB_cpShapeSetCollisionType, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeSetDensity", JSB_cpShapeSetDensity, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeSetElasticity", JSB_cpShapeSetElasticity, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeSetFilter", JSB_cpShapeSetFilter, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeSetFriction", JSB_cpShapeSetFriction, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeSetMass", JSB_cpShapeSetMass, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeSetSensor", JSB_cpShapeSetSensor, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeSetSurfaceVelocity", JSB_cpShapeSetSurfaceVelocity, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeUpdate", JSB_cpShapeUpdate, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "simpleMotorGetRate", JSB_cpSimpleMotorGetRate, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "simpleMotorNew", JSB_cpSimpleMotorNew, 3, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "simpleMotorSetRate", JSB_cpSimpleMotorSetRate, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "slideJointGetAnchorA", JSB_cpSlideJointGetAnchorA, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "slideJointGetAnchorB", JSB_cpSlideJointGetAnchorB, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "slideJointGetMax", JSB_cpSlideJointGetMax, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "slideJointGetMin", JSB_cpSlideJointGetMin, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "slideJointNew", JSB_cpSlideJointNew, 6, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "slideJointSetAnchorA", JSB_cpSlideJointSetAnchorA, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "slideJointSetAnchorB", JSB_cpSlideJointSetAnchorB, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "slideJointSetMax", JSB_cpSlideJointSetMax, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "slideJointSetMin", JSB_cpSlideJointSetMin, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceAddBody", JSB_cpSpaceAddBody, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceAddConstraint", JSB_cpSpaceAddConstraint, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceAddShape", JSB_cpSpaceAddShape, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceContainsBody", JSB_cpSpaceContainsBody, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceContainsConstraint", JSB_cpSpaceContainsConstraint, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceContainsShape", JSB_cpSpaceContainsShape, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceDestroy", JSB_cpSpaceDestroy, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceFree", JSB_cpSpaceFree, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceGetCollisionBias", JSB_cpSpaceGetCollisionBias, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceGetCollisionPersistence", JSB_cpSpaceGetCollisionPersistence, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceGetCollisionSlop", JSB_cpSpaceGetCollisionSlop, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceGetCurrentTimeStep", JSB_cpSpaceGetCurrentTimeStep, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceGetDamping", JSB_cpSpaceGetDamping, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceGetGravity", JSB_cpSpaceGetGravity, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceGetIdleSpeedThreshold", JSB_cpSpaceGetIdleSpeedThreshold, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceGetIterations", JSB_cpSpaceGetIterations, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceGetSleepTimeThreshold", JSB_cpSpaceGetSleepTimeThreshold, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceGetStaticBody", JSB_cpSpaceGetStaticBody, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceInit", JSB_cpSpaceInit, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceIsLocked", JSB_cpSpaceIsLocked, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceNew", JSB_cpSpaceNew, 0, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceReindexShape", JSB_cpSpaceReindexShape, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceReindexShapesForBody", JSB_cpSpaceReindexShapesForBody, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceReindexStatic", JSB_cpSpaceReindexStatic, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceRemoveBody", JSB_cpSpaceRemoveBody, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceRemoveConstraint", JSB_cpSpaceRemoveConstraint, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceRemoveShape", JSB_cpSpaceRemoveShape, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceSetCollisionBias", JSB_cpSpaceSetCollisionBias, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceSetCollisionPersistence", JSB_cpSpaceSetCollisionPersistence, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceSetCollisionSlop", JSB_cpSpaceSetCollisionSlop, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceSetDamping", JSB_cpSpaceSetDamping, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceSetGravity", JSB_cpSpaceSetGravity, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceSetIdleSpeedThreshold", JSB_cpSpaceSetIdleSpeedThreshold, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceSetIterations", JSB_cpSpaceSetIterations, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceSetSleepTimeThreshold", JSB_cpSpaceSetSleepTimeThreshold, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceStep", JSB_cpSpaceStep, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceUseSpatialHash", JSB_cpSpaceUseSpatialHash, 3, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "transformAxialScale", JSB_cpTransformAxialScale, 3, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "transformBoneScale", JSB_cpTransformBoneScale, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "transformInverse", JSB_cpTransformInverse, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "transformMult", JSB_cpTransformMult, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "transformNew", JSB_cpTransformNew, 6, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "transformNewTranspose", JSB_cpTransformNewTranspose, 6, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "transformOrtho", JSB_cpTransformOrtho, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "transformPoint", JSB_cpTransformPoint, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "transformRigid", JSB_cpTransformRigid, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "transformRigidInverse", JSB_cpTransformRigidInverse, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "transformRotate", JSB_cpTransformRotate, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "transformScale", JSB_cpTransformScale, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "transformTranslate", JSB_cpTransformTranslate, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "transformVect", JSB_cpTransformVect, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "transformWrap", JSB_cpTransformWrap, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "transformWrapInverse", JSB_cpTransformWrapInverse, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "transformbBB", JSB_cpTransformbBB, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "fabs", JSB_cpfabs, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "fclamp", JSB_cpfclamp, 3, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "fclamp01", JSB_cpfclamp01, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "flerp", JSB_cpflerp, 3, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "flerpconst", JSB_cpflerpconst, 3, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "fmax", JSB_cpfmax, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "fmin", JSB_cpfmin, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vadd", JSB_cpvadd, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vclamp", JSB_cpvclamp, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vcross", JSB_cpvcross, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vdist", JSB_cpvdist, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vdistsq", JSB_cpvdistsq, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vdot", JSB_cpvdot, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "veql", JSB_cpveql, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vforangle", JSB_cpvforangle, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vlength", JSB_cpvlength, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vlengthsq", JSB_cpvlengthsq, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vlerp", JSB_cpvlerp, 3, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vlerpconst", JSB_cpvlerpconst, 3, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vmult", JSB_cpvmult, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vnear", JSB_cpvnear, 3, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vneg", JSB_cpvneg, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vnormalize", JSB_cpvnormalize, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vperp", JSB_cpvperp, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vproject", JSB_cpvproject, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vrotate", JSB_cpvrotate, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vrperp", JSB_cpvrperp, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vslerp", JSB_cpvslerp, 3, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vslerpconst", JSB_cpvslerpconst, 3, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vsub", JSB_cpvsub, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vtoangle", JSB_cpvtoangle, 1, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vunrotate", JSB_cpvunrotate, 2, JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_ENUMERATE );
#endif // JSB_INCLUDE_CHIPMUNK

4
cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp
View File

@ -46066,7 +46066,7 @@ bool js_cocos2dx_Sprite_getResourceType(JSContext *cx, uint32_t argc, jsval *vp)
cocos2d::Sprite* cobj = (cocos2d::Sprite *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Sprite_getResourceType : Invalid Native Object");
if (argc == 0) {
const int ret = cobj->getResourceType();
int ret = cobj->getResourceType();
jsval jsret = JSVAL_NULL;
jsret = int32_to_jsval(cx, ret);
args.rval().set(jsret);
@ -58388,7 +58388,7 @@ bool js_cocos2dx_TextureCache_getTextureFilePath(JSContext *cx, uint32_t argc, j
JSB_PRECONDITION2( arg0, cx, false, "Invalid Native Object");
} while (0);
JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_TextureCache_getTextureFilePath : Error processing arguments");
const std::string ret = cobj->getTextureFilePath(arg0);
std::string ret = cobj->getTextureFilePath(arg0);
jsval jsret = JSVAL_NULL;
jsret = std_string_to_jsval(cx, ret);
args.rval().set(jsret);

2
cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
View File

@ -12457,7 +12457,7 @@ bool js_cocos2dx_studio_ComExtensionData_getActionTag(JSContext *cx, uint32_t ar
cocostudio::ComExtensionData* cobj = (cocostudio::ComExtensionData *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_studio_ComExtensionData_getActionTag : Invalid Native Object");
if (argc == 0) {
const int ret = cobj->getActionTag();
int ret = cobj->getActionTag();
jsval jsret = JSVAL_NULL;
jsret = int32_to_jsval(cx, ret);
args.rval().set(jsret);

4
cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.cpp
View File

@ -3080,7 +3080,7 @@ bool js_cocos2dx_ui_Button_getTitleText(JSContext *cx, uint32_t argc, jsval *vp)
cocos2d::ui::Button* cobj = (cocos2d::ui::Button *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_ui_Button_getTitleText : Invalid Native Object");
if (argc == 0) {
const std::string ret = cobj->getTitleText();
std::string ret = cobj->getTitleText();
jsval jsret = JSVAL_NULL;
jsret = std_string_to_jsval(cx, ret);
args.rval().set(jsret);
@ -3817,7 +3817,7 @@ bool js_cocos2dx_ui_Button_getTitleFontName(JSContext *cx, uint32_t argc, jsval
cocos2d::ui::Button* cobj = (cocos2d::ui::Button *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_ui_Button_getTitleFontName : Invalid Native Object");
if (argc == 0) {
const std::string ret = cobj->getTitleFontName();
std::string ret = cobj->getTitleFontName();
jsval jsret = JSVAL_NULL;
jsret = std_string_to_jsval(cx, ret);
args.rval().set(jsret);

5526
cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_auto_classes.cpp
View File

File diff suppressed because it is too large Load Diff

5039
cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_functions.cpp
View File

File diff suppressed because it is too large Load Diff

285
cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_functions_registration.h
View File

@ -1,285 +0,0 @@
/*
* AUTOGENERATED FILE. DO NOT EDIT IT
* Generated by "generate_js_bindings.py -c chipmunk_jsb.ini" on 2012-10-18
* Script version: v0.3
*/
#include "js_bindings_config.h"
#ifdef JSB_INCLUDE_CHIPMUNK
#include "js_bindings_chipmunk_manual.h"
JS_DefineFunction(cx, chipmunk, "arbiterGetCount", JSB_cpArbiterGetCount, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterGetDepth", JSB_cpArbiterGetDepth, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterGetElasticity", JSB_cpArbiterGetElasticity, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterGetFriction", JSB_cpArbiterGetFriction, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterGetNormal", JSB_cpArbiterGetNormal, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterGetPoint", JSB_cpArbiterGetPoint, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterGetSurfaceVelocity", JSB_cpArbiterGetSurfaceVelocity, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterIgnore", JSB_cpArbiterIgnore, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterIsFirstContact", JSB_cpArbiterIsFirstContact, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterSetElasticity", JSB_cpArbiterSetElasticity, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterSetFriction", JSB_cpArbiterSetFriction, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterSetSurfaceVelocity", JSB_cpArbiterSetSurfaceVelocity, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterTotalImpulse", JSB_cpArbiterTotalImpulse, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterTotalImpulseWithFriction", JSB_cpArbiterTotalImpulseWithFriction, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "arbiterTotalKE", JSB_cpArbiterTotalKE, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "areaForCircle", JSB_cpAreaForCircle, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "areaForSegment", JSB_cpAreaForSegment, 3, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bBArea", JSB_cpBBArea, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bBClampVect", JSB_cpBBClampVect, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bBContainsBB", JSB_cpBBContainsBB, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bBContainsVect", JSB_cpBBContainsVect, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bBExpand", JSB_cpBBExpand, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bBIntersects", JSB_cpBBIntersects, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bBIntersectsSegment", JSB_cpBBIntersectsSegment, 3, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bBMerge", JSB_cpBBMerge, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bBMergedArea", JSB_cpBBMergedArea, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bBNew", JSB_cpBBNew, 4, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bBNewForCircle", JSB_cpBBNewForCircle, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bBSegmentQuery", JSB_cpBBSegmentQuery, 3, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bBWrapVect", JSB_cpBBWrapVect, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyActivate", JSB_cpBodyActivate, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyActivateStatic", JSB_cpBodyActivateStatic, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyApplyForce", JSB_cpBodyApplyForce, 3, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyApplyImpulse", JSB_cpBodyApplyImpulse, 3, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyDestroy", JSB_cpBodyDestroy, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyFree", JSB_cpBodyFree, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyGetAngVel", JSB_cpBodyGetAngVel, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyGetAngVelLimit", JSB_cpBodyGetAngVelLimit, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyGetAngle", JSB_cpBodyGetAngle, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyGetForce", JSB_cpBodyGetForce, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyGetMass", JSB_cpBodyGetMass, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyGetMoment", JSB_cpBodyGetMoment, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyGetPos", JSB_cpBodyGetPos, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyGetRot", JSB_cpBodyGetRot, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyGetSpace", JSB_cpBodyGetSpace, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyGetTorque", JSB_cpBodyGetTorque, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyGetVel", JSB_cpBodyGetVel, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyGetVelAtLocalPoint", JSB_cpBodyGetVelAtLocalPoint, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyGetVelAtWorldPoint", JSB_cpBodyGetVelAtWorldPoint, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyGetVelLimit", JSB_cpBodyGetVelLimit, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyInit", JSB_cpBodyInit, 3, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyInitStatic", JSB_cpBodyInitStatic, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyIsRogue", JSB_cpBodyIsRogue, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyIsSleeping", JSB_cpBodyIsSleeping, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyIsStatic", JSB_cpBodyIsStatic, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyKineticEnergy", JSB_cpBodyKineticEnergy, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyLocal2World", JSB_cpBodyLocal2World, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyNew", JSB_cpBodyNew, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyNewStatic", JSB_cpBodyNewStatic, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyResetForces", JSB_cpBodyResetForces, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodySetAngVel", JSB_cpBodySetAngVel, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodySetAngVelLimit", JSB_cpBodySetAngVelLimit, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodySetAngle", JSB_cpBodySetAngle, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodySetForce", JSB_cpBodySetForce, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodySetMass", JSB_cpBodySetMass, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodySetMoment", JSB_cpBodySetMoment, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodySetPos", JSB_cpBodySetPos, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodySetTorque", JSB_cpBodySetTorque, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodySetVel", JSB_cpBodySetVel, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodySetVelLimit", JSB_cpBodySetVelLimit, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodySleep", JSB_cpBodySleep, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodySleepWithGroup", JSB_cpBodySleepWithGroup, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyUpdatePosition", JSB_cpBodyUpdatePosition, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyUpdateVelocity", JSB_cpBodyUpdateVelocity, 4, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "bodyWorld2Local", JSB_cpBodyWorld2Local, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "boxShapeNew", JSB_cpBoxShapeNew, 3, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "boxShapeNew2", JSB_cpBoxShapeNew2, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "circleShapeGetOffset", JSB_cpCircleShapeGetOffset, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "circleShapeGetRadius", JSB_cpCircleShapeGetRadius, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "circleShapeNew", JSB_cpCircleShapeNew, 3, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintActivateBodies", JSB_cpConstraintActivateBodies, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintDestroy", JSB_cpConstraintDestroy, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintFree", JSB_cpConstraintFree, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintGetA", JSB_cpConstraintGetA, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintGetB", JSB_cpConstraintGetB, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintGetErrorBias", JSB_cpConstraintGetErrorBias, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintGetImpulse", JSB_cpConstraintGetImpulse, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintGetMaxBias", JSB_cpConstraintGetMaxBias, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintGetMaxForce", JSB_cpConstraintGetMaxForce, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintGetSpace", JSB_cpConstraintGetSpace, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintSetErrorBias", JSB_cpConstraintSetErrorBias, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintSetMaxBias", JSB_cpConstraintSetMaxBias, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "constraintSetMaxForce", JSB_cpConstraintSetMaxForce, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedRotarySpringGetDamping", JSB_cpDampedRotarySpringGetDamping, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedRotarySpringGetRestAngle", JSB_cpDampedRotarySpringGetRestAngle, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedRotarySpringGetStiffness", JSB_cpDampedRotarySpringGetStiffness, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedRotarySpringNew", JSB_cpDampedRotarySpringNew, 5, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedRotarySpringSetDamping", JSB_cpDampedRotarySpringSetDamping, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedRotarySpringSetRestAngle", JSB_cpDampedRotarySpringSetRestAngle, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedRotarySpringSetStiffness", JSB_cpDampedRotarySpringSetStiffness, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedSpringGetAnchr1", JSB_cpDampedSpringGetAnchr1, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedSpringGetAnchr2", JSB_cpDampedSpringGetAnchr2, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedSpringGetDamping", JSB_cpDampedSpringGetDamping, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedSpringGetRestLength", JSB_cpDampedSpringGetRestLength, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedSpringGetStiffness", JSB_cpDampedSpringGetStiffness, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedSpringNew", JSB_cpDampedSpringNew, 7, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedSpringSetAnchr1", JSB_cpDampedSpringSetAnchr1, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedSpringSetAnchr2", JSB_cpDampedSpringSetAnchr2, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedSpringSetDamping", JSB_cpDampedSpringSetDamping, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedSpringSetRestLength", JSB_cpDampedSpringSetRestLength, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "dampedSpringSetStiffness", JSB_cpDampedSpringSetStiffness, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "gearJointGetPhase", JSB_cpGearJointGetPhase, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "gearJointGetRatio", JSB_cpGearJointGetRatio, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "gearJointNew", JSB_cpGearJointNew, 4, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "gearJointSetPhase", JSB_cpGearJointSetPhase, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "gearJointSetRatio", JSB_cpGearJointSetRatio, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "grooveJointGetAnchr2", JSB_cpGrooveJointGetAnchr2, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "grooveJointGetGrooveA", JSB_cpGrooveJointGetGrooveA, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "grooveJointGetGrooveB", JSB_cpGrooveJointGetGrooveB, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "grooveJointNew", JSB_cpGrooveJointNew, 5, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "grooveJointSetAnchr2", JSB_cpGrooveJointSetAnchr2, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "grooveJointSetGrooveA", JSB_cpGrooveJointSetGrooveA, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "grooveJointSetGrooveB", JSB_cpGrooveJointSetGrooveB, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "initChipmunk", JSB_cpInitChipmunk, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "momentForBox", JSB_cpMomentForBox, 3, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "momentForBox2", JSB_cpMomentForBox2, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "momentForCircle", JSB_cpMomentForCircle, 4, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "momentForSegment", JSB_cpMomentForSegment, 3, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "pinJointGetAnchr1", JSB_cpPinJointGetAnchr1, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "pinJointGetAnchr2", JSB_cpPinJointGetAnchr2, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "pinJointGetDist", JSB_cpPinJointGetDist, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "pinJointNew", JSB_cpPinJointNew, 4, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "pinJointSetAnchr1", JSB_cpPinJointSetAnchr1, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "pinJointSetAnchr2", JSB_cpPinJointSetAnchr2, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "pinJointSetDist", JSB_cpPinJointSetDist, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "pivotJointGetAnchr1", JSB_cpPivotJointGetAnchr1, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "pivotJointGetAnchr2", JSB_cpPivotJointGetAnchr2, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "pivotJointNew", JSB_cpPivotJointNew, 3, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "pivotJointNew2", JSB_cpPivotJointNew2, 4, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "pivotJointSetAnchr1", JSB_cpPivotJointSetAnchr1, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "pivotJointSetAnchr2", JSB_cpPivotJointSetAnchr2, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "polyShapeGetNumVerts", JSB_cpPolyShapeGetNumVerts, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "polyShapeGetVert", JSB_cpPolyShapeGetVert, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "ratchetJointGetAngle", JSB_cpRatchetJointGetAngle, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "ratchetJointGetPhase", JSB_cpRatchetJointGetPhase, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "ratchetJointGetRatchet", JSB_cpRatchetJointGetRatchet, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "ratchetJointNew", JSB_cpRatchetJointNew, 4, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "ratchetJointSetAngle", JSB_cpRatchetJointSetAngle, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "ratchetJointSetPhase", JSB_cpRatchetJointSetPhase, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "ratchetJointSetRatchet", JSB_cpRatchetJointSetRatchet, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "resetShapeIdCounter", JSB_cpResetShapeIdCounter, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "rotaryLimitJointGetMax", JSB_cpRotaryLimitJointGetMax, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "rotaryLimitJointGetMin", JSB_cpRotaryLimitJointGetMin, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "rotaryLimitJointNew", JSB_cpRotaryLimitJointNew, 4, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "rotaryLimitJointSetMax", JSB_cpRotaryLimitJointSetMax, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "rotaryLimitJointSetMin", JSB_cpRotaryLimitJointSetMin, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "segmentShapeGetA", JSB_cpSegmentShapeGetA, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "segmentShapeGetB", JSB_cpSegmentShapeGetB, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "segmentShapeGetNormal", JSB_cpSegmentShapeGetNormal, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "segmentShapeGetRadius", JSB_cpSegmentShapeGetRadius, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "segmentShapeNew", JSB_cpSegmentShapeNew, 4, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "segmentShapeSetNeighbors", JSB_cpSegmentShapeSetNeighbors, 3, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeCacheBB", JSB_cpShapeCacheBB, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeDestroy", JSB_cpShapeDestroy, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeFree", JSB_cpShapeFree, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeGetBB", JSB_cpShapeGetBB, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeGetBody", JSB_cpShapeGetBody, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeGetCollisionType", JSB_cpShapeGetCollisionType, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeGetElasticity", JSB_cpShapeGetElasticity, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeGetFriction", JSB_cpShapeGetFriction, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeGetGroup", JSB_cpShapeGetGroup, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeGetLayers", JSB_cpShapeGetLayers, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeGetSensor", JSB_cpShapeGetSensor, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeGetSpace", JSB_cpShapeGetSpace, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeGetSurfaceVelocity", JSB_cpShapeGetSurfaceVelocity, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapePointQuery", JSB_cpShapePointQuery, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeSetBody", JSB_cpShapeSetBody, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeSetCollisionType", JSB_cpShapeSetCollisionType, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeSetElasticity", JSB_cpShapeSetElasticity, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeSetFriction", JSB_cpShapeSetFriction, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeSetGroup", JSB_cpShapeSetGroup, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeSetLayers", JSB_cpShapeSetLayers, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeSetSensor", JSB_cpShapeSetSensor, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeSetSurfaceVelocity", JSB_cpShapeSetSurfaceVelocity, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "shapeUpdate", JSB_cpShapeUpdate, 3, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "simpleMotorGetRate", JSB_cpSimpleMotorGetRate, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "simpleMotorNew", JSB_cpSimpleMotorNew, 3, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "simpleMotorSetRate", JSB_cpSimpleMotorSetRate, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "slideJointGetAnchr1", JSB_cpSlideJointGetAnchr1, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "slideJointGetAnchr2", JSB_cpSlideJointGetAnchr2, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "slideJointGetMax", JSB_cpSlideJointGetMax, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "slideJointGetMin", JSB_cpSlideJointGetMin, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "slideJointNew", JSB_cpSlideJointNew, 6, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "slideJointSetAnchr1", JSB_cpSlideJointSetAnchr1, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "slideJointSetAnchr2", JSB_cpSlideJointSetAnchr2, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "slideJointSetMax", JSB_cpSlideJointSetMax, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "slideJointSetMin", JSB_cpSlideJointSetMin, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceActivateShapesTouchingShape", JSB_cpSpaceActivateShapesTouchingShape, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceAddBody", JSB_cpSpaceAddBody, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceAddConstraint", JSB_cpSpaceAddConstraint, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceAddShape", JSB_cpSpaceAddShape, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceAddStaticShape", JSB_cpSpaceAddStaticShape, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceContainsBody", JSB_cpSpaceContainsBody, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceContainsConstraint", JSB_cpSpaceContainsConstraint, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceContainsShape", JSB_cpSpaceContainsShape, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceDestroy", JSB_cpSpaceDestroy, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceFree", JSB_cpSpaceFree, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceGetCollisionBias", JSB_cpSpaceGetCollisionBias, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceGetCollisionPersistence", JSB_cpSpaceGetCollisionPersistence, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceGetCollisionSlop", JSB_cpSpaceGetCollisionSlop, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceGetCurrentTimeStep", JSB_cpSpaceGetCurrentTimeStep, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceGetDamping", JSB_cpSpaceGetDamping, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceGetEnableContactGraph", JSB_cpSpaceGetEnableContactGraph, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceGetGravity", JSB_cpSpaceGetGravity, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceGetIdleSpeedThreshold", JSB_cpSpaceGetIdleSpeedThreshold, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceGetIterations", JSB_cpSpaceGetIterations, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceGetSleepTimeThreshold", JSB_cpSpaceGetSleepTimeThreshold, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceGetStaticBody", JSB_cpSpaceGetStaticBody, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceInit", JSB_cpSpaceInit, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceIsLocked", JSB_cpSpaceIsLocked, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceNew", JSB_cpSpaceNew, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spacePointQueryFirst", JSB_cpSpacePointQueryFirst, 4, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceReindexShape", JSB_cpSpaceReindexShape, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceReindexShapesForBody", JSB_cpSpaceReindexShapesForBody, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceReindexStatic", JSB_cpSpaceReindexStatic, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceRemoveBody", JSB_cpSpaceRemoveBody, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceRemoveConstraint", JSB_cpSpaceRemoveConstraint, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceRemoveShape", JSB_cpSpaceRemoveShape, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceRemoveStaticShape", JSB_cpSpaceRemoveStaticShape, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceSetCollisionBias", JSB_cpSpaceSetCollisionBias, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceSetCollisionPersistence", JSB_cpSpaceSetCollisionPersistence, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceSetCollisionSlop", JSB_cpSpaceSetCollisionSlop, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceSetDamping", JSB_cpSpaceSetDamping, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceSetEnableContactGraph", JSB_cpSpaceSetEnableContactGraph, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceSetGravity", JSB_cpSpaceSetGravity, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceSetIdleSpeedThreshold", JSB_cpSpaceSetIdleSpeedThreshold, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceSetIterations", JSB_cpSpaceSetIterations, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceSetSleepTimeThreshold", JSB_cpSpaceSetSleepTimeThreshold, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceStep", JSB_cpSpaceStep, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "spaceUseSpatialHash", JSB_cpSpaceUseSpatialHash, 3, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "fabs", JSB_cpfabs, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "fclamp", JSB_cpfclamp, 3, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "fclamp01", JSB_cpfclamp01, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "flerp", JSB_cpflerp, 3, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "flerpconst", JSB_cpflerpconst, 3, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "fmax", JSB_cpfmax, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "fmin", JSB_cpfmin, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vadd", JSB_cpvadd, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vclamp", JSB_cpvclamp, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vcross", JSB_cpvcross, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vdist", JSB_cpvdist, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vdistsq", JSB_cpvdistsq, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vdot", JSB_cpvdot, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "veql", JSB_cpveql, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vforangle", JSB_cpvforangle, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vlength", JSB_cpvlength, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vlengthsq", JSB_cpvlengthsq, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vlerp", JSB_cpvlerp, 3, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vlerpconst", JSB_cpvlerpconst, 3, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vmult", JSB_cpvmult, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vnear", JSB_cpvnear, 3, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vneg", JSB_cpvneg, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vnormalize", JSB_cpvnormalize, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vnormalize_safe", JSB_cpvnormalize_safe, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vperp", JSB_cpvperp, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vproject", JSB_cpvproject, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vrotate", JSB_cpvrotate, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vrperp", JSB_cpvrperp, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vslerp", JSB_cpvslerp, 3, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vslerpconst", JSB_cpvslerpconst, 3, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vsub", JSB_cpvsub, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vtoangle", JSB_cpvtoangle, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "vunrotate", JSB_cpvunrotate, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE );
#endif // JSB_INCLUDE_CHIPMUNK

1184
cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp
View File

File diff suppressed because it is too large Load Diff

24
cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.h
View File

@ -31,7 +31,7 @@
#include "ScriptingCore.h"
#ifdef JSB_INCLUDE_CHIPMUNK
#include "chipmunk_private.h"
#include "chipmunk/chipmunk_private.h"
#include "js_bindings_chipmunk_auto_classes.h"
// Free Functions
@ -59,22 +59,27 @@ bool JSB_cpSpace_removeCollisionHandler(JSContext *cx, uint32_t argc, jsval *vp)
bool JSB_cpSpace_addBody(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpace_addConstraint(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpace_addShape(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpace_addStaticShape(JSContext *cx, uint32_t argc, jsval *vp);
/* FIXME: removed in Chipmunk v7.0: bool JSB_cpSpace_addStaticShape(JSContext *cx, uint32_t argc, jsval *vp); */
bool JSB_cpSpace_removeBody(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpace_removeConstraint(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpace_removeShape(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpace_removeStaticShape(JSContext *cx, uint32_t argc, jsval *vp);
/* FIXME: removed in Chipmunk v7.0: bool JSB_cpSpace_removeStaticShape(JSContext *cx, uint32_t argc, jsval *vp); */
bool JSB_cpSpace_segmentQueryFirst(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpace_nearestPointQueryNearest(JSContext *cx, uint32_t argc, jsval *vp);
/* FIXME: removed in Chipmunk 7.0: bool JSB_cpSpace_nearestPointQueryNearest(JSContext *cx, uint32_t argc, jsval *vp); */
bool JSB_cpSpace_eachShape(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpace_eachBody(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpace_eachConstraint(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpace_pointQuery(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpace_nearestPointQuery(JSContext *cx, uint32_t argc, jsval *vp);
/* FIXME: renamed in chipmunk v7.0: bool JSB_cpSpace_nearestPointQuery(JSContext *cx, uint32_t argc, jsval *vp); */
/* FIXME: New in Chipmunk 7.0*/
bool JSB_cpSpace_pointQueryNearest(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpace_segmentQuery(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpace_bbQuery(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpSpace_addPostStepCallback(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShape_pointQuery(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpShape_segmentQuery(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpArbiter_getBodies(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpArbiter_getShapes(JSContext *cx, uint32_t argc, jsval *vp);
@ -86,6 +91,9 @@ bool JSB_cpBody_eachShape(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBody_eachConstraint(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpBody_eachArbiter(JSContext *cx, uint32_t argc, jsval *vp);
// Chipmunk v6.2 / 7.0 compatibility
bool JSB_cpMomentForSegment(JSContext *cx, uint32_t argc, jsval *vp);
bool JSB_cpPolyShape_getVerts(JSContext *cx, uint32_t argc, jsval *vp);
// conversions
@ -94,6 +102,12 @@ bool jsval_to_cpBB( JSContext *cx, jsval vp, cpBB *ret );
bool jsval_to_array_of_cpvect( JSContext *cx, jsval vp, cpVect**verts, int *numVerts);
bool jsval_to_cpVect( JSContext *cx, jsval vp, cpVect *out );
jsval cpVect_to_jsval( JSContext *cx, cpVect p );
bool jsval_to_cpShapeFilter( JSContext *cx, jsval vp, cpShapeFilter *out );
jsval cpShapeFilter_to_jsval( JSContext *cx, cpShapeFilter filter);
bool jsval_to_cpTransform( JSContext *cx, jsval vp, cpTransform *transform);
jsval cpTransform_to_jsval( JSContext *cx, cpTransform transform);
jsval cpPointQueryInfo_to_jsval(JSContext *cx, cpPointQueryInfo pointQueryInfo);
jsval cpSegmentQueryInfo_to_jsval(JSContext *cx, cpSegmentQueryInfo segmentQueryInfo);
// Object Oriented Chipmunk
void JSB_cpBase_createClass(JSContext* cx, JS::HandleObject globalObj, const char * name );

15
cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_registration.cpp
View File

@ -63,12 +63,19 @@ void jsb_register_chipmunk(JSContext* cx, JS::HandleObject object)
JS_DefineFunction(cx, chipmunk, "centroidForPoly", JSB_cpCentroidForPoly, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
JS_DefineFunction(cx, chipmunk, "recenterPoly", JSB_cpRecenterPoly, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE );
// Compatibility with Chipmunk 6.2
JS_DefineFunction(cx, chipmunk, "momentForSegment", JSB_cpMomentForSegment, 4, JSPROP_PERMANENT | JSPROP_ENUMERATE);
JS::RootedObject space(cx, JSB_cpSpace_object);
JS_DefineFunction(cx, space, "segmentQueryFirst", JSB_cpSpace_segmentQueryFirst, 4, JSPROP_PERMANENT | JSPROP_ENUMERATE);
JS_DefineFunction(cx, space, "nearestPointQueryNearest", JSB_cpSpace_nearestPointQueryNearest, 4, JSPROP_PERMANENT | JSPROP_ENUMERATE);
JS_DefineFunction(cx, space, "eachShape", JSB_cpSpace_eachShape, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE);
JS_DefineFunction(cx, space, "eachBody", JSB_cpSpace_eachBody, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE);
JS_DefineFunction(cx, space, "eachConstraint", JSB_cpSpace_eachConstraint, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE);
JS_DefineFunction(cx, space, "pointQueryNearest", JSB_cpSpace_pointQueryNearest, 3, JSPROP_PERMANENT | JSPROP_ENUMERATE);
// Compatibility with Chipmunk 6.2
JS_DefineFunction(cx, space, "removeCollisionHandler", JSB_cpSpace_removeCollisionHandler, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE);
JS_DefineFunction(cx, space, "setDefaultCollisionHandler", JSB_cpSpace_setDefaultCollisionHandler, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE);
JS::RootedObject polyShape(cx, JSB_cpPolyShape_object);
JS_DefineFunction(cx, polyShape, "getVerts", JSB_cpPolyShape_getVerts, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE);
register_CCPhysicsSprite(cx, object);
register_CCPhysicsDebugNode(cx, object);

4
cocos/scripting/js-bindings/proj.android/Android.mk
View File

@ -48,6 +48,8 @@ LOCAL_SRC_FILES := ../auto/jsb_cocos2dx_3d_auto.cpp \
../auto/jsb_cocos2dx_builder_auto.cpp \
../auto/jsb_cocos2dx_ui_auto.cpp \
../auto/jsb_cocos2dx_physics3d_auto.cpp \
../auto/js_bindings_chipmunk_auto_classes.cpp \
../auto/js_bindings_chipmunk_functions.cpp \
../manual/ScriptingCore.cpp \ \
../manual/cocos2d_specifics.cpp \
../manual/js_manual_conversions.cpp \
@ -62,8 +64,6 @@ LOCAL_SRC_FILES := ../auto/jsb_cocos2dx_3d_auto.cpp \
../manual/3d/jsb_cocos2dx_3d_manual.cpp \
../manual/experimental/jsb_cocos2dx_experimental_video_manual.cpp \
../manual/experimental/jsb_cocos2dx_experimental_webView_manual.cpp \
../manual/chipmunk/js_bindings_chipmunk_auto_classes.cpp \
../manual/chipmunk/js_bindings_chipmunk_functions.cpp \
../manual/chipmunk/js_bindings_chipmunk_manual.cpp \
../manual/chipmunk/js_bindings_chipmunk_registration.cpp \
../manual/cocosbuilder/js_bindings_ccbreader.cpp \

100
cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj
View File

@ -32,18 +32,6 @@
1A119EA218BDF19200352BAA /* jsb_cocos2dx_studio_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A119E3E18BDF19200352BAA /* jsb_cocos2dx_studio_auto.cpp */; };
1A119EA318BDF19200352BAA /* jsb_cocos2dx_studio_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1A119E3F18BDF19200352BAA /* jsb_cocos2dx_studio_auto.hpp */; };
1A119EA418BDF19200352BAA /* jsb_cocos2dx_studio_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1A119E3F18BDF19200352BAA /* jsb_cocos2dx_studio_auto.hpp */; };
1A119EA718BDF19200352BAA /* js_bindings_chipmunk_auto_classes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A119E4418BDF19200352BAA /* js_bindings_chipmunk_auto_classes.cpp */; };
1A119EA818BDF19200352BAA /* js_bindings_chipmunk_auto_classes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A119E4418BDF19200352BAA /* js_bindings_chipmunk_auto_classes.cpp */; };
1A119EA918BDF19200352BAA /* js_bindings_chipmunk_auto_classes.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A119E4518BDF19200352BAA /* js_bindings_chipmunk_auto_classes.h */; };
1A119EAA18BDF19200352BAA /* js_bindings_chipmunk_auto_classes.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A119E4518BDF19200352BAA /* js_bindings_chipmunk_auto_classes.h */; };
1A119EAB18BDF19200352BAA /* js_bindings_chipmunk_auto_classes_registration.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A119E4618BDF19200352BAA /* js_bindings_chipmunk_auto_classes_registration.h */; };
1A119EAC18BDF19200352BAA /* js_bindings_chipmunk_auto_classes_registration.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A119E4618BDF19200352BAA /* js_bindings_chipmunk_auto_classes_registration.h */; };
1A119EAD18BDF19200352BAA /* js_bindings_chipmunk_functions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A119E4718BDF19200352BAA /* js_bindings_chipmunk_functions.cpp */; };
1A119EAE18BDF19200352BAA /* js_bindings_chipmunk_functions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A119E4718BDF19200352BAA /* js_bindings_chipmunk_functions.cpp */; };
1A119EAF18BDF19200352BAA /* js_bindings_chipmunk_functions.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A119E4818BDF19200352BAA /* js_bindings_chipmunk_functions.h */; };
1A119EB018BDF19200352BAA /* js_bindings_chipmunk_functions.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A119E4818BDF19200352BAA /* js_bindings_chipmunk_functions.h */; };
1A119EB118BDF19200352BAA /* js_bindings_chipmunk_functions_registration.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A119E4918BDF19200352BAA /* js_bindings_chipmunk_functions_registration.h */; };
1A119EB218BDF19200352BAA /* js_bindings_chipmunk_functions_registration.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A119E4918BDF19200352BAA /* js_bindings_chipmunk_functions_registration.h */; };
1A119EB318BDF19200352BAA /* js_bindings_chipmunk_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A119E4A18BDF19200352BAA /* js_bindings_chipmunk_manual.cpp */; };
1A119EB418BDF19200352BAA /* js_bindings_chipmunk_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A119E4A18BDF19200352BAA /* js_bindings_chipmunk_manual.cpp */; };
1A119EB518BDF19200352BAA /* js_bindings_chipmunk_manual.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A119E4B18BDF19200352BAA /* js_bindings_chipmunk_manual.h */; };
@ -164,7 +152,6 @@
507B42161C31DCC60067B53E /* JavaScriptObjCBridge.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0541A74E1973876100E45470 /* JavaScriptObjCBridge.mm */; };
507B42171C31DCC60067B53E /* jsb_cocos2dx_3d_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBCF51AA48EE900493976 /* jsb_cocos2dx_3d_manual.cpp */; };
507B42181C31DCC60067B53E /* jsb_cocos2dx_builder_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A119E3218BDF19200352BAA /* jsb_cocos2dx_builder_auto.cpp */; };
507B42191C31DCC60067B53E /* js_bindings_chipmunk_functions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A119E4718BDF19200352BAA /* js_bindings_chipmunk_functions.cpp */; };
507B421A1C31DCC60067B53E /* js_bindings_system_functions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A119E7118BDF19200352BAA /* js_bindings_system_functions.cpp */; };
507B421B1C31DCC60067B53E /* js_bindings_chipmunk_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A119E4A18BDF19200352BAA /* js_bindings_chipmunk_manual.cpp */; };
507B421C1C31DCC60067B53E /* jsb_opengl_registration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A119E6D18BDF19200352BAA /* jsb_opengl_registration.cpp */; };
@ -200,7 +187,6 @@
507B423A1C31DCC60067B53E /* js_manual_conversions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A119E6618BDF19200352BAA /* js_manual_conversions.cpp */; };
507B423B1C31DCC60067B53E /* jsb_socketio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83A5661718DA878400FC31A0 /* jsb_socketio.cpp */; };
507B423C1C31DCC60067B53E /* jsb_opengl_functions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A119E6918BDF19200352BAA /* jsb_opengl_functions.cpp */; };
507B423D1C31DCC60067B53E /* js_bindings_chipmunk_auto_classes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A119E4418BDF19200352BAA /* js_bindings_chipmunk_auto_classes.cpp */; };
507B423E1C31DCC60067B53E /* jsb_cocos2dx_studio_conversions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BA4095C01A6F730A005E53F6 /* jsb_cocos2dx_studio_conversions.cpp */; };
507B423F1C31DCC60067B53E /* jsb_cocos2dx_navmesh_conversions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BAFA59071B319F7E004F9246 /* jsb_cocos2dx_navmesh_conversions.cpp */; };
507B42401C31DCC60067B53E /* ScriptingCore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A119E7C18BDF19200352BAA /* ScriptingCore.cpp */; };
@ -227,7 +213,6 @@
507B42571C31DCC60067B53E /* jsb_cocos2dx_experimental_webView_manual.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B22F4A81B159A7A0044C14E /* jsb_cocos2dx_experimental_webView_manual.h */; };
507B42581C31DCC60067B53E /* jsb_cocos2dx_builder_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1A119E3318BDF19200352BAA /* jsb_cocos2dx_builder_auto.hpp */; };
507B42591C31DCC60067B53E /* jsb_cocos2dx_experimental_webView_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4BE089E11ADF965E00D65D4B /* jsb_cocos2dx_experimental_webView_auto.hpp */; };
507B425A1C31DCC60067B53E /* js_bindings_chipmunk_auto_classes.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A119E4518BDF19200352BAA /* js_bindings_chipmunk_auto_classes.h */; };
507B425B1C31DCC60067B53E /* jsb_cocos2dx_spine_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1A119E3C18BDF19200352BAA /* jsb_cocos2dx_spine_auto.hpp */; };
507B425C1C31DCC60067B53E /* jsb_opengl_registration.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A119E6E18BDF19200352BAA /* jsb_opengl_registration.h */; };
507B425D1C31DCC60067B53E /* spidermonkey_specifics.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A119E7E18BDF19200352BAA /* spidermonkey_specifics.h */; };
@ -247,18 +232,33 @@
507B426B1C31DCC60067B53E /* jsb_cocos2dx_studio_manual.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A119E5818BDF19200352BAA /* jsb_cocos2dx_studio_manual.h */; };
507B426C1C31DCC60067B53E /* jsb_cocos2dx_physics3d_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 42638FFC1B0EC1B7004C53A2 /* jsb_cocos2dx_physics3d_auto.hpp */; };
507B426D1C31DCC60067B53E /* jsb_cocos2dx_3d_manual.h in Headers */ = {isa = PBXBuildFile; fileRef = 420BBCF61AA48EE900493976 /* jsb_cocos2dx_3d_manual.h */; };
507B426E1C31DCC60067B53E /* js_bindings_chipmunk_auto_classes_registration.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A119E4618BDF19200352BAA /* js_bindings_chipmunk_auto_classes_registration.h */; };
507B426F1C31DCC60067B53E /* CCComponentJS.h in Headers */ = {isa = PBXBuildFile; fileRef = BA9FD5D11BAC0A7600996C85 /* CCComponentJS.h */; };
507B42701C31DCC60067B53E /* jsb_cocos2dx_3d_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 420BBCEF1AA48EDE00493976 /* jsb_cocos2dx_3d_auto.hpp */; };
507B42711C31DCC60067B53E /* js_bindings_chipmunk_registration.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A119E4D18BDF19200352BAA /* js_bindings_chipmunk_registration.h */; };
507B42721C31DCC60067B53E /* js_bindings_chipmunk_functions.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A119E4818BDF19200352BAA /* js_bindings_chipmunk_functions.h */; };
507B42731C31DCC60067B53E /* jsb_cocos2dx_experimental_webView_manual.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BE089EA1ADF967400D65D4B /* jsb_cocos2dx_experimental_webView_manual.h */; };
507B42741C31DCC60067B53E /* jsb_cocos2dx_navmesh_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BAFA58FA1B319F05004F9246 /* jsb_cocos2dx_navmesh_auto.hpp */; };
507B42751C31DCC60067B53E /* js_bindings_chipmunk_functions_registration.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A119E4918BDF19200352BAA /* js_bindings_chipmunk_functions_registration.h */; };
507B42761C31DCC60067B53E /* js_bindings_system_functions_registration.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A119E7318BDF19200352BAA /* js_bindings_system_functions_registration.h */; };
507B42771C31DCC60067B53E /* jsb_cocos2dx_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1A119E3018BDF19200352BAA /* jsb_cocos2dx_auto.hpp */; };
507B42781C31DCC60067B53E /* jsb_cocos2dx_spine_manual.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A119E8218BDF19200352BAA /* jsb_cocos2dx_spine_manual.h */; };
507B42791C31DCC60067B53E /* jsb_cocos2dx_experimental_video_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = B38AD56D1B1D38700057DD7F /* jsb_cocos2dx_experimental_video_auto.hpp */; };
50864CF61C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes_registration.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864CF01C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes_registration.h */; };
50864CF71C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes_registration.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864CF01C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes_registration.h */; };
50864CF81C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes_registration.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864CF01C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes_registration.h */; };
50864CF91C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50864CF11C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes.cpp */; };
50864CFA1C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50864CF11C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes.cpp */; };
50864CFB1C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50864CF11C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes.cpp */; };
50864CFC1C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864CF21C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes.h */; };
50864CFD1C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864CF21C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes.h */; };
50864CFE1C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864CF21C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes.h */; };
50864CFF1C7CA95200B3BAB1 /* js_bindings_chipmunk_functions_registration.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864CF31C7CA95200B3BAB1 /* js_bindings_chipmunk_functions_registration.h */; };
50864D001C7CA95200B3BAB1 /* js_bindings_chipmunk_functions_registration.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864CF31C7CA95200B3BAB1 /* js_bindings_chipmunk_functions_registration.h */; };
50864D011C7CA95200B3BAB1 /* js_bindings_chipmunk_functions_registration.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864CF31C7CA95200B3BAB1 /* js_bindings_chipmunk_functions_registration.h */; };
50864D021C7CA95200B3BAB1 /* js_bindings_chipmunk_functions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50864CF41C7CA95200B3BAB1 /* js_bindings_chipmunk_functions.cpp */; };
50864D031C7CA95200B3BAB1 /* js_bindings_chipmunk_functions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50864CF41C7CA95200B3BAB1 /* js_bindings_chipmunk_functions.cpp */; };
50864D041C7CA95200B3BAB1 /* js_bindings_chipmunk_functions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50864CF41C7CA95200B3BAB1 /* js_bindings_chipmunk_functions.cpp */; };
50864D051C7CA95200B3BAB1 /* js_bindings_chipmunk_functions.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864CF51C7CA95200B3BAB1 /* js_bindings_chipmunk_functions.h */; };
50864D061C7CA95200B3BAB1 /* js_bindings_chipmunk_functions.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864CF51C7CA95200B3BAB1 /* js_bindings_chipmunk_functions.h */; };
50864D071C7CA95200B3BAB1 /* js_bindings_chipmunk_functions.h in Headers */ = {isa = PBXBuildFile; fileRef = 50864CF51C7CA95200B3BAB1 /* js_bindings_chipmunk_functions.h */; };
83A5661918DA878400FC31A0 /* jsb_socketio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83A5661718DA878400FC31A0 /* jsb_socketio.cpp */; };
83A5661A18DA878400FC31A0 /* jsb_socketio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83A5661718DA878400FC31A0 /* jsb_socketio.cpp */; };
83A5661B18DA878400FC31A0 /* jsb_socketio.h in Headers */ = {isa = PBXBuildFile; fileRef = 83A5661818DA878400FC31A0 /* jsb_socketio.h */; };
@ -314,12 +314,6 @@
1A119E3C18BDF19200352BAA /* jsb_cocos2dx_spine_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = jsb_cocos2dx_spine_auto.hpp; sourceTree = "<group>"; };
1A119E3E18BDF19200352BAA /* jsb_cocos2dx_studio_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jsb_cocos2dx_studio_auto.cpp; sourceTree = "<group>"; };
1A119E3F18BDF19200352BAA /* jsb_cocos2dx_studio_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = jsb_cocos2dx_studio_auto.hpp; sourceTree = "<group>"; };
1A119E4418BDF19200352BAA /* js_bindings_chipmunk_auto_classes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_bindings_chipmunk_auto_classes.cpp; sourceTree = "<group>"; };
1A119E4518BDF19200352BAA /* js_bindings_chipmunk_auto_classes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_bindings_chipmunk_auto_classes.h; sourceTree = "<group>"; };
1A119E4618BDF19200352BAA /* js_bindings_chipmunk_auto_classes_registration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_bindings_chipmunk_auto_classes_registration.h; sourceTree = "<group>"; };
1A119E4718BDF19200352BAA /* js_bindings_chipmunk_functions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_bindings_chipmunk_functions.cpp; sourceTree = "<group>"; };
1A119E4818BDF19200352BAA /* js_bindings_chipmunk_functions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_bindings_chipmunk_functions.h; sourceTree = "<group>"; };
1A119E4918BDF19200352BAA /* js_bindings_chipmunk_functions_registration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_bindings_chipmunk_functions_registration.h; sourceTree = "<group>"; };
1A119E4A18BDF19200352BAA /* js_bindings_chipmunk_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_bindings_chipmunk_manual.cpp; sourceTree = "<group>"; };
1A119E4B18BDF19200352BAA /* js_bindings_chipmunk_manual.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_bindings_chipmunk_manual.h; sourceTree = "<group>"; };
1A119E4C18BDF19200352BAA /* js_bindings_chipmunk_registration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_bindings_chipmunk_registration.cpp; sourceTree = "<group>"; };
@ -387,6 +381,12 @@
4BE089E11ADF965E00D65D4B /* jsb_cocos2dx_experimental_webView_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = jsb_cocos2dx_experimental_webView_auto.hpp; sourceTree = "<group>"; };
4BE089EA1ADF967400D65D4B /* jsb_cocos2dx_experimental_webView_manual.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jsb_cocos2dx_experimental_webView_manual.h; sourceTree = "<group>"; };
507B427D1C31DCC60067B53E /* libjscocos2d tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libjscocos2d tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
50864CF01C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes_registration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_bindings_chipmunk_auto_classes_registration.h; sourceTree = "<group>"; };
50864CF11C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_bindings_chipmunk_auto_classes.cpp; sourceTree = "<group>"; };
50864CF21C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_bindings_chipmunk_auto_classes.h; sourceTree = "<group>"; };
50864CF31C7CA95200B3BAB1 /* js_bindings_chipmunk_functions_registration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_bindings_chipmunk_functions_registration.h; sourceTree = "<group>"; };
50864CF41C7CA95200B3BAB1 /* js_bindings_chipmunk_functions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_bindings_chipmunk_functions.cpp; sourceTree = "<group>"; };
50864CF51C7CA95200B3BAB1 /* js_bindings_chipmunk_functions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_bindings_chipmunk_functions.h; sourceTree = "<group>"; };
83A5661718DA878400FC31A0 /* jsb_socketio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jsb_socketio.cpp; sourceTree = "<group>"; };
83A5661818DA878400FC31A0 /* jsb_socketio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jsb_socketio.h; sourceTree = "<group>"; };
ADD1C0D91C196BDF00733781 /* js_module_register.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_module_register.cpp; sourceTree = "<group>"; };
@ -465,6 +465,12 @@
1A119E2E18BDF19200352BAA /* auto */ = {
isa = PBXGroup;
children = (
50864CF01C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes_registration.h */,
50864CF11C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes.cpp */,
50864CF21C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes.h */,
50864CF31C7CA95200B3BAB1 /* js_bindings_chipmunk_functions_registration.h */,
50864CF41C7CA95200B3BAB1 /* js_bindings_chipmunk_functions.cpp */,
50864CF51C7CA95200B3BAB1 /* js_bindings_chipmunk_functions.h */,
B38AD56C1B1D38700057DD7F /* jsb_cocos2dx_experimental_video_auto.cpp */,
B38AD56D1B1D38700057DD7F /* jsb_cocos2dx_experimental_video_auto.hpp */,
4BE089E01ADF965E00D65D4B /* jsb_cocos2dx_experimental_webView_auto.cpp */,
@ -545,12 +551,6 @@
1A119E4218BDF19200352BAA /* chipmunk */ = {
isa = PBXGroup;
children = (
1A119E4418BDF19200352BAA /* js_bindings_chipmunk_auto_classes.cpp */,
1A119E4518BDF19200352BAA /* js_bindings_chipmunk_auto_classes.h */,
1A119E4618BDF19200352BAA /* js_bindings_chipmunk_auto_classes_registration.h */,
1A119E4718BDF19200352BAA /* js_bindings_chipmunk_functions.cpp */,
1A119E4818BDF19200352BAA /* js_bindings_chipmunk_functions.h */,
1A119E4918BDF19200352BAA /* js_bindings_chipmunk_functions_registration.h */,
1A119E4A18BDF19200352BAA /* js_bindings_chipmunk_manual.cpp */,
1A119E4B18BDF19200352BAA /* js_bindings_chipmunk_manual.h */,
1A119E4C18BDF19200352BAA /* js_bindings_chipmunk_registration.cpp */,
@ -730,6 +730,7 @@
507B424A1C31DCC60067B53E /* cocos2d_specifics.hpp in Headers */,
507B424B1C31DCC60067B53E /* jsb_socketio.h in Headers */,
507B424C1C31DCC60067B53E /* jsb_event_dispatcher_manual.h in Headers */,
50864D011C7CA95200B3BAB1 /* js_bindings_chipmunk_functions_registration.h in Headers */,
507B424D1C31DCC60067B53E /* jsb_cocos2dx_navmesh_manual.h in Headers */,
507B424E1C31DCC60067B53E /* js_bindings_system_registration.h in Headers */,
507B424F1C31DCC60067B53E /* jsb_cocos2dx_studio_conversions.h in Headers */,
@ -743,7 +744,6 @@
507B42571C31DCC60067B53E /* jsb_cocos2dx_experimental_webView_manual.h in Headers */,
507B42581C31DCC60067B53E /* jsb_cocos2dx_builder_auto.hpp in Headers */,
507B42591C31DCC60067B53E /* jsb_cocos2dx_experimental_webView_auto.hpp in Headers */,
507B425A1C31DCC60067B53E /* js_bindings_chipmunk_auto_classes.h in Headers */,
507B425B1C31DCC60067B53E /* jsb_cocos2dx_spine_auto.hpp in Headers */,
507B425C1C31DCC60067B53E /* jsb_opengl_registration.h in Headers */,
507B425D1C31DCC60067B53E /* spidermonkey_specifics.h in Headers */,
@ -754,6 +754,7 @@
507B42621C31DCC60067B53E /* jsb_cocos2dx_extension_manual.h in Headers */,
507B42631C31DCC60067B53E /* js_bindings_system_functions.h in Headers */,
507B42641C31DCC60067B53E /* js_manual_conversions.h in Headers */,
50864CFE1C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes.h in Headers */,
507B42651C31DCC60067B53E /* XMLHTTPRequest.h in Headers */,
507B42661C31DCC60067B53E /* jsb_cocos2dx_ui_manual.h in Headers */,
507B42671C31DCC60067B53E /* jsb_opengl_functions.h in Headers */,
@ -763,16 +764,15 @@
507B426B1C31DCC60067B53E /* jsb_cocos2dx_studio_manual.h in Headers */,
507B426C1C31DCC60067B53E /* jsb_cocos2dx_physics3d_auto.hpp in Headers */,
507B426D1C31DCC60067B53E /* jsb_cocos2dx_3d_manual.h in Headers */,
507B426E1C31DCC60067B53E /* js_bindings_chipmunk_auto_classes_registration.h in Headers */,
507B426F1C31DCC60067B53E /* CCComponentJS.h in Headers */,
507B42701C31DCC60067B53E /* jsb_cocos2dx_3d_auto.hpp in Headers */,
507B42711C31DCC60067B53E /* js_bindings_chipmunk_registration.h in Headers */,
507B42721C31DCC60067B53E /* js_bindings_chipmunk_functions.h in Headers */,
507B42731C31DCC60067B53E /* jsb_cocos2dx_experimental_webView_manual.h in Headers */,
507B42741C31DCC60067B53E /* jsb_cocos2dx_navmesh_auto.hpp in Headers */,
507B42751C31DCC60067B53E /* js_bindings_chipmunk_functions_registration.h in Headers */,
507B42761C31DCC60067B53E /* js_bindings_system_functions_registration.h in Headers */,
507B42771C31DCC60067B53E /* jsb_cocos2dx_auto.hpp in Headers */,
50864D071C7CA95200B3BAB1 /* js_bindings_chipmunk_functions.h in Headers */,
50864CF81C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes_registration.h in Headers */,
507B42781C31DCC60067B53E /* jsb_cocos2dx_spine_manual.h in Headers */,
507B42791C31DCC60067B53E /* jsb_cocos2dx_experimental_video_auto.hpp in Headers */,
);
@ -795,8 +795,9 @@
1A119EB518BDF19200352BAA /* js_bindings_chipmunk_manual.h in Headers */,
1A119EF918BDF19200352BAA /* jsb_websocket.h in Headers */,
1A119E9118BDF19200352BAA /* jsb_cocos2dx_extension_auto.hpp in Headers */,
50864CF61C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes_registration.h in Headers */,
1A119E8B18BDF19200352BAA /* jsb_cocos2dx_builder_auto.hpp in Headers */,
1A119EA918BDF19200352BAA /* js_bindings_chipmunk_auto_classes.h in Headers */,
50864D051C7CA95200B3BAB1 /* js_bindings_chipmunk_functions.h in Headers */,
1A119E9D18BDF19200352BAA /* jsb_cocos2dx_spine_auto.hpp in Headers */,
BAEE4D731AC3FFAD003BEB0F /* jsb_cocos2dx_3d_extension_auto.hpp in Headers */,
1A119EEB18BDF19200352BAA /* jsb_opengl_registration.h in Headers */,
@ -813,6 +814,7 @@
BAFA58FD1B319F05004F9246 /* jsb_cocos2dx_navmesh_auto.hpp in Headers */,
1A119EFD18BDF19200352BAA /* XMLHTTPRequest.h in Headers */,
1AB5E63518D05BF30088DAA4 /* jsb_cocos2dx_ui_manual.h in Headers */,
50864CFC1C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes.h in Headers */,
1A119EE318BDF19200352BAA /* jsb_opengl_functions.h in Headers */,
42638FFF1B0EC1B7004C53A2 /* jsb_cocos2dx_physics3d_auto.hpp in Headers */,
0541A74F1973876100E45470 /* JavaScriptObjCBridge.h in Headers */,
@ -824,13 +826,11 @@
BA4095C41A6F730A005E53F6 /* jsb_cocos2dx_studio_conversions.h in Headers */,
1A119EC718BDF19200352BAA /* jsb_cocos2dx_studio_manual.h in Headers */,
BA9FD5D41BAC0A7600996C85 /* CCComponentJS.h in Headers */,
1A119EAB18BDF19200352BAA /* js_bindings_chipmunk_auto_classes_registration.h in Headers */,
1A119EB918BDF19200352BAA /* js_bindings_chipmunk_registration.h in Headers */,
420BBCF21AA48EDE00493976 /* jsb_cocos2dx_3d_auto.hpp in Headers */,
1A119EAF18BDF19200352BAA /* js_bindings_chipmunk_functions.h in Headers */,
BAF638DE1B5F5DC900CDB43A /* jsb_cocos2dx_audioengine_auto.hpp in Headers */,
1A119EB118BDF19200352BAA /* js_bindings_chipmunk_functions_registration.h in Headers */,
1A119EF118BDF19200352BAA /* js_bindings_system_functions_registration.h in Headers */,
50864CFF1C7CA95200B3BAB1 /* js_bindings_chipmunk_functions_registration.h in Headers */,
1A119E8518BDF19200352BAA /* jsb_cocos2dx_auto.hpp in Headers */,
1A119F0718BDF19200352BAA /* jsb_cocos2dx_spine_manual.h in Headers */,
);
@ -847,6 +847,7 @@
1A119EBE18BDF19200352BAA /* cocos2d_specifics.hpp in Headers */,
83A5661C18DA878400FC31A0 /* jsb_socketio.h in Headers */,
1A1D3B7B18C44FD000922D3C /* jsb_event_dispatcher_manual.h in Headers */,
50864D001C7CA95200B3BAB1 /* js_bindings_chipmunk_functions_registration.h in Headers */,
BAFA59061B319F38004F9246 /* jsb_cocos2dx_navmesh_manual.h in Headers */,
1A119EF618BDF19200352BAA /* js_bindings_system_registration.h in Headers */,
BA4095C51A6F730A005E53F6 /* jsb_cocos2dx_studio_conversions.h in Headers */,
@ -860,7 +861,6 @@
4B22F4AC1B159A7A0044C14E /* jsb_cocos2dx_experimental_webView_manual.h in Headers */,
1A119E8C18BDF19200352BAA /* jsb_cocos2dx_builder_auto.hpp in Headers */,
4BE089E51ADF965E00D65D4B /* jsb_cocos2dx_experimental_webView_auto.hpp in Headers */,
1A119EAA18BDF19200352BAA /* js_bindings_chipmunk_auto_classes.h in Headers */,
1A119E9E18BDF19200352BAA /* jsb_cocos2dx_spine_auto.hpp in Headers */,
1A119EEC18BDF19200352BAA /* jsb_opengl_registration.h in Headers */,
1A119F0418BDF19200352BAA /* spidermonkey_specifics.h in Headers */,
@ -871,6 +871,7 @@
1A119ECC18BDF19200352BAA /* jsb_cocos2dx_extension_manual.h in Headers */,
1A119EF018BDF19200352BAA /* js_bindings_system_functions.h in Headers */,
1A119EDE18BDF19200352BAA /* js_manual_conversions.h in Headers */,
50864CFD1C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes.h in Headers */,
1A119EFE18BDF19200352BAA /* XMLHTTPRequest.h in Headers */,
1AB5E63618D05BF30088DAA4 /* jsb_cocos2dx_ui_manual.h in Headers */,
1A119EE418BDF19200352BAA /* jsb_opengl_functions.h in Headers */,
@ -880,16 +881,15 @@
1A119EC818BDF19200352BAA /* jsb_cocos2dx_studio_manual.h in Headers */,
426390001B0EC1B7004C53A2 /* jsb_cocos2dx_physics3d_auto.hpp in Headers */,
420BBCFA1AA48EE900493976 /* jsb_cocos2dx_3d_manual.h in Headers */,
1A119EAC18BDF19200352BAA /* js_bindings_chipmunk_auto_classes_registration.h in Headers */,
BA9FD5D51BAC0A7600996C85 /* CCComponentJS.h in Headers */,
420BBCF31AA48EDE00493976 /* jsb_cocos2dx_3d_auto.hpp in Headers */,
1A119EBA18BDF19200352BAA /* js_bindings_chipmunk_registration.h in Headers */,
1A119EB018BDF19200352BAA /* js_bindings_chipmunk_functions.h in Headers */,
4BE089EC1ADF967400D65D4B /* jsb_cocos2dx_experimental_webView_manual.h in Headers */,
BAFA58FE1B319F05004F9246 /* jsb_cocos2dx_navmesh_auto.hpp in Headers */,
1A119EB218BDF19200352BAA /* js_bindings_chipmunk_functions_registration.h in Headers */,
1A119EF218BDF19200352BAA /* js_bindings_system_functions_registration.h in Headers */,
1A119E8618BDF19200352BAA /* jsb_cocos2dx_auto.hpp in Headers */,
50864D061C7CA95200B3BAB1 /* js_bindings_chipmunk_functions.h in Headers */,
50864CF71C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes_registration.h in Headers */,
1A119F0818BDF19200352BAA /* jsb_cocos2dx_spine_manual.h in Headers */,
B38AD56F1B1D38700057DD7F /* jsb_cocos2dx_experimental_video_auto.hpp in Headers */,
);
@ -986,7 +986,6 @@
507B42161C31DCC60067B53E /* JavaScriptObjCBridge.mm in Sources */,
507B42171C31DCC60067B53E /* jsb_cocos2dx_3d_manual.cpp in Sources */,
507B42181C31DCC60067B53E /* jsb_cocos2dx_builder_auto.cpp in Sources */,
507B42191C31DCC60067B53E /* js_bindings_chipmunk_functions.cpp in Sources */,
507B421A1C31DCC60067B53E /* js_bindings_system_functions.cpp in Sources */,
507B421B1C31DCC60067B53E /* js_bindings_chipmunk_manual.cpp in Sources */,
507B421C1C31DCC60067B53E /* jsb_opengl_registration.cpp in Sources */,
@ -1010,6 +1009,7 @@
507B422E1C31DCC60067B53E /* cocos2d_specifics.cpp in Sources */,
507B422F1C31DCC60067B53E /* jsb_cocos2dx_physics3d_manual.cpp in Sources */,
507B42301C31DCC60067B53E /* jsb_cocos2dx_physics3d_auto.cpp in Sources */,
50864D041C7CA95200B3BAB1 /* js_bindings_chipmunk_functions.cpp in Sources */,
507B42311C31DCC60067B53E /* jsb_opengl_manual.cpp in Sources */,
507B42321C31DCC60067B53E /* jsb_cocos2dx_spine_manual.cpp in Sources */,
507B42331C31DCC60067B53E /* jsb_cocos2dx_3d_extension_auto.cpp in Sources */,
@ -1022,8 +1022,8 @@
507B423A1C31DCC60067B53E /* js_manual_conversions.cpp in Sources */,
507B423B1C31DCC60067B53E /* jsb_socketio.cpp in Sources */,
507B423C1C31DCC60067B53E /* jsb_opengl_functions.cpp in Sources */,
507B423D1C31DCC60067B53E /* js_bindings_chipmunk_auto_classes.cpp in Sources */,
507B423E1C31DCC60067B53E /* jsb_cocos2dx_studio_conversions.cpp in Sources */,
50864CFB1C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes.cpp in Sources */,
507B423F1C31DCC60067B53E /* jsb_cocos2dx_navmesh_conversions.cpp in Sources */,
507B42401C31DCC60067B53E /* ScriptingCore.cpp in Sources */,
507B42411C31DCC60067B53E /* jsb_cocos2dx_experimental_video_manual.cpp in Sources */,
@ -1036,7 +1036,7 @@
buildActionMask = 2147483647;
files = (
1A119E8918BDF19200352BAA /* jsb_cocos2dx_builder_auto.cpp in Sources */,
1A119EAD18BDF19200352BAA /* js_bindings_chipmunk_functions.cpp in Sources */,
50864D021C7CA95200B3BAB1 /* js_bindings_chipmunk_functions.cpp in Sources */,
1A119EED18BDF19200352BAA /* js_bindings_system_functions.cpp in Sources */,
426390041B0EC1C6004C53A2 /* jsb_cocos2dx_physics3d_manual.cpp in Sources */,
0541A7501973876100E45470 /* JavaScriptObjCBridge.mm in Sources */,
@ -1059,6 +1059,7 @@
BAF638DC1B5F5DC900CDB43A /* jsb_cocos2dx_audioengine_auto.cpp in Sources */,
1A119EE518BDF19200352BAA /* jsb_opengl_manual.cpp in Sources */,
1A119F0518BDF19200352BAA /* jsb_cocos2dx_spine_manual.cpp in Sources */,
50864CF91C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes.cpp in Sources */,
1A119EB718BDF19200352BAA /* js_bindings_chipmunk_registration.cpp in Sources */,
420BBCF71AA48EE900493976 /* jsb_cocos2dx_3d_manual.cpp in Sources */,
BA4095C21A6F730A005E53F6 /* jsb_cocos2dx_studio_conversions.cpp in Sources */,
@ -1073,7 +1074,6 @@
1A119EE118BDF19200352BAA /* jsb_opengl_functions.cpp in Sources */,
BAFA59091B319F7E004F9246 /* jsb_cocos2dx_navmesh_conversions.cpp in Sources */,
42638FFD1B0EC1B7004C53A2 /* jsb_cocos2dx_physics3d_auto.cpp in Sources */,
1A119EA718BDF19200352BAA /* js_bindings_chipmunk_auto_classes.cpp in Sources */,
BAFA58FB1B319F05004F9246 /* jsb_cocos2dx_navmesh_auto.cpp in Sources */,
1A119EFF18BDF19200352BAA /* ScriptingCore.cpp in Sources */,
1A1D3B7818C44FD000922D3C /* jsb_event_dispatcher_manual.cpp in Sources */,
@ -1088,7 +1088,6 @@
0541A75B19738AD200E45470 /* JavaScriptObjCBridge.mm in Sources */,
420BBCF81AA48EE900493976 /* jsb_cocos2dx_3d_manual.cpp in Sources */,
1A119E8A18BDF19200352BAA /* jsb_cocos2dx_builder_auto.cpp in Sources */,
1A119EAE18BDF19200352BAA /* js_bindings_chipmunk_functions.cpp in Sources */,
1A119EEE18BDF19200352BAA /* js_bindings_system_functions.cpp in Sources */,
1A119EB418BDF19200352BAA /* js_bindings_chipmunk_manual.cpp in Sources */,
1A119EEA18BDF19200352BAA /* jsb_opengl_registration.cpp in Sources */,
@ -1112,6 +1111,7 @@
1A119EBC18BDF19200352BAA /* cocos2d_specifics.cpp in Sources */,
426390051B0EC1C6004C53A2 /* jsb_cocos2dx_physics3d_manual.cpp in Sources */,
42638FFE1B0EC1B7004C53A2 /* jsb_cocos2dx_physics3d_auto.cpp in Sources */,
50864D031C7CA95200B3BAB1 /* js_bindings_chipmunk_functions.cpp in Sources */,
1A119EE618BDF19200352BAA /* jsb_opengl_manual.cpp in Sources */,
1A119F0618BDF19200352BAA /* jsb_cocos2dx_spine_manual.cpp in Sources */,
BAEE4D721AC3FFAD003BEB0F /* jsb_cocos2dx_3d_extension_auto.cpp in Sources */,
@ -1124,8 +1124,8 @@
1A119EDC18BDF19200352BAA /* js_manual_conversions.cpp in Sources */,
83A5661A18DA878400FC31A0 /* jsb_socketio.cpp in Sources */,
1A119EE218BDF19200352BAA /* jsb_opengl_functions.cpp in Sources */,
1A119EA818BDF19200352BAA /* js_bindings_chipmunk_auto_classes.cpp in Sources */,
BA4095C31A6F730A005E53F6 /* jsb_cocos2dx_studio_conversions.cpp in Sources */,
50864CFA1C7CA95200B3BAB1 /* js_bindings_chipmunk_auto_classes.cpp in Sources */,
BAFA590A1B319F7E004F9246 /* jsb_cocos2dx_navmesh_conversions.cpp in Sources */,
1A119F0018BDF19200352BAA /* ScriptingCore.cpp in Sources */,
B38AD56A1B1D384A0057DD7F /* jsb_cocos2dx_experimental_video_manual.cpp in Sources */,
@ -1169,7 +1169,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../.. $(SRCROOT)/../../../../cocos $(SRCROOT)/../../../../cocos/base $(SRCROOT)/../../../../cocos/3d $(SRCROOT)/../../../../cocos/2d $(SRCROOT)/../../../../cocos/physics3d $(SRCROOT)/../../../../cocos/navmesh $(SRCROOT)/../../../../cocos/platform $(SRCROOT)/../../../../cocos/audio/include $(SRCROOT)/../../../../cocos/editor-support $(SRCROOT)/../../../../cocos/editor-support/cocosbuilder $(SRCROOT)/../../../../cocos/editor-support/cocostudio $(SRCROOT)/../../../../cocos/editor-support/spine $(SRCROOT)/../../../../cocos/ui $(SRCROOT)/../../../../cocos/storage $(SRCROOT)/../../../../extensions $(SRCROOT)/../../../../external/chipmunk/include/chipmunk $(SRCROOT)/../../../../external $(SRCROOT)/../auto $(SRCROOT)/../manual";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../.. $(SRCROOT)/../../../../cocos $(SRCROOT)/../../../../cocos/base $(SRCROOT)/../../../../cocos/3d $(SRCROOT)/../../../../cocos/2d $(SRCROOT)/../../../../cocos/physics3d $(SRCROOT)/../../../../cocos/navmesh $(SRCROOT)/../../../../cocos/platform $(SRCROOT)/../../../../cocos/audio/include $(SRCROOT)/../../../../cocos/editor-support $(SRCROOT)/../../../../cocos/editor-support/cocosbuilder $(SRCROOT)/../../../../cocos/editor-support/cocostudio $(SRCROOT)/../../../../cocos/editor-support/spine $(SRCROOT)/../../../../cocos/ui $(SRCROOT)/../../../../cocos/storage $(SRCROOT)/../../../../extensions $(SRCROOT)/../../../../external/chipmunk/include $(SRCROOT)/../../../../external $(SRCROOT)/../auto $(SRCROOT)/../manual";
};
name = Debug;
};
@ -1201,7 +1201,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../.. $(SRCROOT)/../../../../cocos $(SRCROOT)/../../../../cocos/base $(SRCROOT)/../../../../cocos/3d $(SRCROOT)/../../../../cocos/2d $(SRCROOT)/../../../../cocos/physics3d $(SRCROOT)/../../../../cocos/navmesh $(SRCROOT)/../../../../cocos/platform $(SRCROOT)/../../../../cocos/audio/include $(SRCROOT)/../../../../cocos/editor-support $(SRCROOT)/../../../../cocos/editor-support/cocosbuilder $(SRCROOT)/../../../../cocos/editor-support/cocostudio $(SRCROOT)/../../../../cocos/editor-support/spine $(SRCROOT)/../../../../cocos/ui $(SRCROOT)/../../../../cocos/storage $(SRCROOT)/../../../../extensions $(SRCROOT)/../../../../external/chipmunk/include/chipmunk $(SRCROOT)/../../../../external $(SRCROOT)/../auto $(SRCROOT)/../manual";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../.. $(SRCROOT)/../../../../cocos $(SRCROOT)/../../../../cocos/base $(SRCROOT)/../../../../cocos/3d $(SRCROOT)/../../../../cocos/2d $(SRCROOT)/../../../../cocos/physics3d $(SRCROOT)/../../../../cocos/navmesh $(SRCROOT)/../../../../cocos/platform $(SRCROOT)/../../../../cocos/audio/include $(SRCROOT)/../../../../cocos/editor-support $(SRCROOT)/../../../../cocos/editor-support/cocosbuilder $(SRCROOT)/../../../../cocos/editor-support/cocostudio $(SRCROOT)/../../../../cocos/editor-support/spine $(SRCROOT)/../../../../cocos/ui $(SRCROOT)/../../../../cocos/storage $(SRCROOT)/../../../../extensions $(SRCROOT)/../../../../external/chipmunk/include $(SRCROOT)/../../../../external $(SRCROOT)/../auto $(SRCROOT)/../manual";
VALIDATE_PRODUCT = YES;
};
name = Release;

18
cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj
View File

@ -23,8 +23,8 @@
<ClCompile Include="..\auto\jsb_cocos2dx_studio_auto.cpp" />
<ClCompile Include="..\auto\jsb_cocos2dx_ui_auto.cpp" />
<ClCompile Include="..\manual\3d\jsb_cocos2dx_3d_manual.cpp" />
<ClCompile Include="..\manual\chipmunk\js_bindings_chipmunk_auto_classes.cpp" />
<ClCompile Include="..\manual\chipmunk\js_bindings_chipmunk_functions.cpp" />
<ClCompile Include="..\auto\js_bindings_chipmunk_auto_classes.cpp" />
<ClCompile Include="..\auto\js_bindings_chipmunk_functions.cpp" />
<ClCompile Include="..\manual\chipmunk\js_bindings_chipmunk_manual.cpp" />
<ClCompile Include="..\manual\chipmunk\js_bindings_chipmunk_registration.cpp" />
<ClCompile Include="..\manual\cocos2d_specifics.cpp" />
@ -65,11 +65,11 @@
<ClInclude Include="..\auto\jsb_cocos2dx_spine_auto.hpp" />
<ClInclude Include="..\auto\jsb_cocos2dx_studio_auto.hpp" />
<ClInclude Include="..\auto\jsb_cocos2dx_ui_auto.hpp" />
<ClInclude Include="..\auto\js_bindings_chipmunk_auto_classes.h" />
<ClInclude Include="..\auto\js_bindings_chipmunk_auto_classes_registration.h" />
<ClInclude Include="..\auto\js_bindings_chipmunk_functions.h" />
<ClInclude Include="..\auto\js_bindings_chipmunk_functions_registration.h" />
<ClInclude Include="..\manual\3d\jsb_cocos2dx_3d_manual.h" />
<ClInclude Include="..\manual\chipmunk\js_bindings_chipmunk_auto_classes.h" />
<ClInclude Include="..\manual\chipmunk\js_bindings_chipmunk_auto_classes_registration.h" />
<ClInclude Include="..\manual\chipmunk\js_bindings_chipmunk_functions.h" />
<ClInclude Include="..\manual\chipmunk\js_bindings_chipmunk_functions_registration.h" />
<ClInclude Include="..\manual\chipmunk\js_bindings_chipmunk_manual.h" />
<ClInclude Include="..\manual\chipmunk\js_bindings_chipmunk_registration.h" />
<ClInclude Include="..\manual\cocos2d_specifics.hpp" />
@ -164,7 +164,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_LIB;COCOS2D_DEBUG=1;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_USRJSSTATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\base;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\navmesh;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot)external;$(ProjectDir)..\auto;$(ProjectDir)..\manual;$(ProjectDir)..\manual\cocostudio;$(ProjectDir)..\manual\navmesh;$(ProjectDir)..\manual\spine;$(ProjectDir)..\..\..\..\external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\base;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\navmesh;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot)external;$(ProjectDir)..\auto;$(ProjectDir)..\manual;$(ProjectDir)..\manual\cocostudio;$(ProjectDir)..\manual\navmesh;$(ProjectDir)..\manual\spine;$(ProjectDir)..\..\..\..\external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4068;4101;4800;4251;4244;4099;4083;4700;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
@ -190,7 +190,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*"
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_LIB;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_USRJSSTATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\base;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\navmesh;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot)external;$(ProjectDir)..\auto;$(ProjectDir)..\manual;$(ProjectDir)..\manual\cocostudio;$(ProjectDir)..\manual\navmesh;$(ProjectDir)..\manual\spine;$(ProjectDir)..\..\..\..\external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\base;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\navmesh;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot)external;$(ProjectDir)..\auto;$(ProjectDir)..\manual;$(ProjectDir)..\manual\cocostudio;$(ProjectDir)..\manual\navmesh;$(ProjectDir)..\manual\spine;$(ProjectDir)..\..\..\..\external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4068;4101;4800;4251;4244;4099;4083;4700;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<DebugInformationFormat>None</DebugInformationFormat>
@ -211,4 +211,4 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*"
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

26
cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj.filters
View File

@ -95,11 +95,11 @@
<ClCompile Include="..\auto\jsb_cocos2dx_ui_auto.cpp">
<Filter>auto</Filter>
</ClCompile>
<ClCompile Include="..\manual\chipmunk\js_bindings_chipmunk_auto_classes.cpp">
<Filter>manual\chipmunk</Filter>
<ClCompile Include="..\auto\js_bindings_chipmunk_auto_classes.cpp">
<Filter>auto</Filter>
</ClCompile>
<ClCompile Include="..\manual\chipmunk\js_bindings_chipmunk_functions.cpp">
<Filter>manual\chipmunk</Filter>
<ClCompile Include="..\auto\js_bindings_chipmunk_functions.cpp">
<Filter>auto</Filter>
</ClCompile>
<ClCompile Include="..\manual\chipmunk\js_bindings_chipmunk_manual.cpp">
<Filter>manual\chipmunk</Filter>
@ -229,17 +229,17 @@
<ClInclude Include="..\auto\jsb_cocos2dx_ui_auto.hpp">
<Filter>auto</Filter>
</ClInclude>
<ClInclude Include="..\manual\chipmunk\js_bindings_chipmunk_auto_classes.h">
<Filter>manual\chipmunk</Filter>
<ClInclude Include="..\auto\js_bindings_chipmunk_auto_classes.h">
<Filter>auto</Filter>
</ClInclude>
<ClInclude Include="..\manual\chipmunk\js_bindings_chipmunk_auto_classes_registration.h">
<Filter>manual\chipmunk</Filter>
<ClInclude Include="..\auto\js_bindings_chipmunk_auto_classes_registration.h">
<Filter>auto</Filter>
</ClInclude>
<ClInclude Include="..\manual\chipmunk\js_bindings_chipmunk_functions.h">
<Filter>manual\chipmunk</Filter>
<ClInclude Include="..\auto\js_bindings_chipmunk_functions.h">
<Filter>auto</Filter>
</ClInclude>
<ClInclude Include="..\manual\chipmunk\js_bindings_chipmunk_functions_registration.h">
<Filter>manual\chipmunk</Filter>
<ClInclude Include="..\auto\js_bindings_chipmunk_functions_registration.h">
<Filter>auto</Filter>
</ClInclude>
<ClInclude Include="..\manual\chipmunk\js_bindings_chipmunk_manual.h">
<Filter>manual\chipmunk</Filter>
@ -320,4 +320,4 @@
<Filter>manual</Filter>
</ClInclude>
</ItemGroup>
</Project>
</Project>

16
cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.Shared/libjscocos2d.Shared.vcxitems
View File

@ -25,13 +25,13 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\auto\jsb_cocos2dx_spine_auto.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\auto\jsb_cocos2dx_studio_auto.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\auto\jsb_cocos2dx_ui_auto.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\3d\jsb_cocos2dx_3d_manual.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\chipmunk\js_bindings_chipmunk_auto_classes.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\chipmunk\js_bindings_chipmunk_auto_classes_registration.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\chipmunk\js_bindings_chipmunk_functions.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\chipmunk\js_bindings_chipmunk_functions_registration.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\auto\js_bindings_chipmunk_auto_classes.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\auto\js_bindings_chipmunk_auto_classes_registration.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\auto\js_bindings_chipmunk_functions.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\auto\js_bindings_chipmunk_functions_registration.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\chipmunk\js_bindings_chipmunk_manual.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\chipmunk\js_bindings_chipmunk_registration.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\3d\jsb_cocos2dx_3d_manual.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\cocos2d_specifics.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\cocosbuilder\cocosbuilder_specifics.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\cocosbuilder\js_bindings_ccbreader.h" />
@ -78,8 +78,8 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\auto\jsb_cocos2dx_studio_auto.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\auto\jsb_cocos2dx_ui_auto.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\3d\jsb_cocos2dx_3d_manual.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\chipmunk\js_bindings_chipmunk_auto_classes.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\chipmunk\js_bindings_chipmunk_functions.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\auto\js_bindings_chipmunk_auto_classes.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\auto\js_bindings_chipmunk_functions.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\chipmunk\js_bindings_chipmunk_manual.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\chipmunk\js_bindings_chipmunk_registration.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\cocos2d_specifics.cpp" />
@ -120,4 +120,4 @@
<None Include="$(MSBuildThisFileDirectory)..\..\..\auto\api\jsb_cocos2dx_studio_auto_api.js" />
<None Include="$(MSBuildThisFileDirectory)..\..\..\auto\api\jsb_cocos2dx_ui_auto_api.js" />
</ItemGroup>
</Project>
</Project>

24
cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.Shared/libjscocos2d.Shared.vcxitems.filters
View File

@ -65,18 +65,6 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\3d\jsb_cocos2dx_3d_manual.h">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\chipmunk\js_bindings_chipmunk_auto_classes.h">
<Filter>manual\chipmunk</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\chipmunk\js_bindings_chipmunk_auto_classes_registration.h">
<Filter>manual\chipmunk</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\chipmunk\js_bindings_chipmunk_functions.h">
<Filter>manual\chipmunk</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\chipmunk\js_bindings_chipmunk_functions_registration.h">
<Filter>manual\chipmunk</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\chipmunk\js_bindings_chipmunk_manual.h">
<Filter>manual\chipmunk</Filter>
</ClInclude>
@ -147,6 +135,10 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\manual\js-BindingsExport.h">
<Filter>manual</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\auto\js_bindings_chipmunk_auto_classes.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\auto\js_bindings_chipmunk_auto_classes_registration.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\auto\js_bindings_chipmunk_functions.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\auto\js_bindings_chipmunk_functions_registration.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\auto\jsb_cocos2dx_3d_auto.cpp">
@ -203,12 +195,6 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\3d\jsb_cocos2dx_3d_manual.cpp">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\chipmunk\js_bindings_chipmunk_auto_classes.cpp">
<Filter>manual\chipmunk</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\chipmunk\js_bindings_chipmunk_functions.cpp">
<Filter>manual\chipmunk</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\chipmunk\js_bindings_chipmunk_manual.cpp">
<Filter>manual\chipmunk</Filter>
</ClCompile>
@ -270,6 +256,8 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\manual\js_module_register.cpp">
<Filter>manual</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\auto\js_bindings_chipmunk_auto_classes.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\auto\js_bindings_chipmunk_functions.cpp" />
</ItemGroup>
<ItemGroup>
<Filter Include="auto">

177
cocos/scripting/js-bindings/script/chipmunk/jsb_chipmunk.js
View File

@ -144,6 +144,164 @@ cp.bb = function(l, b, r, t) {
return new cp.BB(l, b, r, t);
};
//
// BEGIN OF CHIPMUNK V6.2 COMPATIBILIY
// Define them before the properties
//
// Body
cp.Body.prototype.getVel = function() {
return this.getVelocity();
}
cp.Body.prototype.setVel = function(velocity) {
this.setVelocity(velocity);
}
cp.Body.prototype.getPos = function() {
return this.getPosition();
}
cp.Body.prototype.setPos = function(pos) {
this.setPosition(pos);
}
cp.Body.prototype.getRot = function() {
return this.getRotation();
}
cp.Body.prototype.getAngVel = function() {
return this.getAngularVelocity();
}
cp.Body.prototype.setAngVel = function(angularVelocity) {
this.setAngularVelocity(angularVelocity);
}
cp.Body.prototype.local2World = function(point) {
return this.localToWorld(point);
}
cp.Body.prototype.world2Local = function(point) {
return this.worldToLocal(point);
}
cp.Body.prototype.applyImpulse = function(j,r) {
this.applyImpulseAtWorldPoint(j,r);
}
cp.Body.prototype.applyForce = function(force, point) {
this.applyForceAtWorldPoint(force, point);
}
// Shapes
cp.Shape.prototype.setLayers = function(layer) {
var filter = this.getFilter();
filter.mask = layer;
filter.categories.layer;
this.setFilter(filter);
}
cp.Shape.prototype.getLayers = function() {
var filter = this.getFilter();
return filter.mask;
}
cp.Shape.prototype.setGroup = function(group) {
var filter = this.getFilter();
filter.group = group;
this.setFilter(filter);
}
cp.Shape.prototype.getGroup = function() {
var filter = this.getFilter();
return filter.group;
}
cp.Shape.prototype.nearestPointQuery = function(p) {
return this.pointQuery(p);
}
cp.PolyShape.prototype.getNumVerts = function() {
return this.getCount();
}
// Space
cp.Space.prototype.addStaticShape = function(shape) {
this.addShape(shape);
}
// Joints
cp.PinJoint.prototype.getAnchr1 = function() {
return this.getAnchorA();
};
cp.PinJoint.prototype.getAnchr2 = function() {
return this.getAnchorB();
};
cp.SlideJoint.prototype.getAnchr1 = function() {
return this.getAnchorA();
};
cp.SlideJoint.prototype.getAnchr2 = function() {
return this.getAnchorB();
};
cp.PivotJoint.prototype.getAnchr1 = function() {
return this.getAnchorA();
};
cp.PivotJoint.prototype.getAnchr2 = function() {
return this.getAnchorB();
};
cp.GrooveJoint.prototype.getAnchr2 = function() {
return this.getAnchorB();
};
cp.DampedSpring.prototype.getAnchr1 = function() {
return this.getAnchorA();
};
cp.DampedSpring.prototype.getAnchr2 = function() {
return this.getAnchorB();
};
cp.Space.prototype.addStaticShape = function(shape) {
this.addShape(shape);
};
// END OF CHIPMUNK V6.2 COMPATIBILIY
// Chipmunk v7.0 constants
cp.SHAPE_FILTER_ALL = {
group:cp.NO_GROUP,
categories:cp.ALL_CATEGORIES,
mask:cp.ALL_CATEGORIES
};
cp.privateAPI = function() {
cc.log("Private API not exposed in Chipmunk v7.0");
}
// helpers for the properties. see below, in the properties section
cp.Arbiter.prototype.getBodyA = function() {
return this.getBodies()[0];
}
cp.Arbiter.prototype.getBodyB = function() {
return this.getBodies()[1];
}
cp.Body.prototype.getVelocityX = function() {
return this.getVelocity().x;
}
cp.Body.prototype.getVelocityY = function() {
return this.getVelocity().y;
}
cp.Shape.prototype.getBBL = function() {
return this.getBB().l;
}
cp.Shape.prototype.getBBB = function() {
return this.getBB().b;
}
cp.Shape.prototype.getBBR = function() {
return this.getBB().r;
}
cp.Shape.prototype.getBBT = function() {
return this.getBB().t;
}
//
// Some properties
//
@ -268,6 +426,11 @@ cc.defineGetterSetter(_proto, "space", _proto.getSpace);
cc.defineGetterSetter(_proto, "rot", _proto.getRot);
cc.defineGetterSetter(_proto, "m", _proto.getMass, _proto.setMass);
cc.defineGetterSetter(_proto, "i", _proto.getMoment, _proto.setMoment);
cc.defineGetterSetter(_proto, "vx", _proto.getVelocityX);
cc.defineGetterSetter(_proto, "vy", _proto.getVelocityY);
cc.defineGetterSetter(_proto, "m_inv", cp.privateAPI);
cc.defineGetterSetter(_proto, "i_inv", cp.privateAPI);
// Shape properties
_proto = cp.Shape.prototype;
@ -280,6 +443,11 @@ cc.defineGetterSetter(_proto, "space", _proto.getSpace);
cc.defineGetterSetter(_proto, "surface_v", _proto.getSurfaceVelocity, _proto.setSurfaceVelocity);
cc.defineGetterSetter(_proto, "e", _proto.getElasticity, _proto.setElasticity);
cc.defineGetterSetter(_proto, "u", _proto.getFriction, _proto.setFriction);
cc.defineGetterSetter(_proto, "bb_l", _proto.getBBL, cp.privateAPI);
cc.defineGetterSetter(_proto, "bb_b", _proto.getBBB, cp.privateAPI);
cc.defineGetterSetter(_proto, "bb_r", _proto.getBBR, cp.privateAPI);
cc.defineGetterSetter(_proto, "bb_t", _proto.getBBT, cp.privateAPI);
_proto.cacheData = _proto.update;
//CircleShape properties
@ -295,10 +463,13 @@ cc.defineGetterSetter(_proto, "a", _proto.getA);
cc.defineGetterSetter(_proto, "b", _proto.getB);
cc.defineGetterSetter(_proto, "n", _proto.getNormal);
cc.defineGetterSetter(_proto, "r", _proto.getRadius);
cc.defineGetterSetter(_proto, "a_tangent", cp.privateAPI);
cc.defineGetterSetter(_proto, "b_tangent", cp.privateAPI);
//PolyShape properties
_proto = cp.PolyShape.prototype;
_proto.type = "poly";
cc.defineGetterSetter(_proto, "verts", _proto.getVerts);
// Constraint properties
_proto = cp.Constraint.prototype;
@ -372,5 +543,11 @@ _proto = cp.Arbiter.prototype;
cc.defineGetterSetter(_proto, "e", _proto.getElasticity, _proto.setElasticity);
cc.defineGetterSetter(_proto, "u", _proto.getFriction, _proto.setFriction);
cc.defineGetterSetter(_proto, "surface_vr", _proto.getSurfaceVelocity, _proto.setSurfaceVelocity);
// not auto-generated
cc.defineGetterSetter(_proto, "a", _proto.getPointA);
cc.defineGetterSetter(_proto, "b", _proto.getPointA);
cc.defineGetterSetter(_proto, "body_a", _proto.getBodyA);
cc.defineGetterSetter(_proto, "body_b", _proto.getBodyB);
_proto = null;

26
cocos/scripting/js-bindings/script/chipmunk/jsb_chipmunk_constants.js
View File

@ -1,22 +1,34 @@
/*
* AUTOGENERATED FILE. DO NOT EDIT IT
* Generated by "generate_jsb.py -c chipmunk_jsb.ini" on 2013-03-05
* Script version: v0.6
* Generated by "generate_jsb.py -c chipmunk_jsb.ini" on 2016-02-19
* Script version: v0.10
*/
var cp = cp || {};
cp.ALLOW_PRIVATE_ACCESS = 0x1;
cp.ALL_LAYERS = 0xffffffff;
cp.ALL_CATEGORIES = 0xffffffff;
cp.ARBITER_STATE_CACHED = 0x3;
cp.ARBITER_STATE_FIRST_COLLISION = 0x0;
cp.ARBITER_STATE_IGNORE = 0x2;
cp.ARBITER_STATE_INVALIDATED = 0x4;
cp.ARBITER_STATE_NORMAL = 0x1;
cp.BODY_TYPE_DYNAMIC = 0x0;
cp.BODY_TYPE_KINEMATIC = 0x1;
cp.BODY_TYPE_STATIC = 0x2;
cp.BUFFER_BYTES = 0x8000;
cp.CIRCLE_SHAPE = 0x0;
cp.HASH_COEF = 0xc75f71e1;
cp.MAX_CONTACTS_PER_ARBITER = 0x4;
cp.MAX_CONTACTS_PER_ARBITER = 0x2;
cp.NO_GROUP = 0x0;
cp.NUM_SHAPES = 0x3;
cp.POLY_SHAPE = 0x2;
cp.POLY_SHAPE_INLINE_ALLOC = 0x6;
cp.SEGMENT_SHAPE = 0x1;
cp.USE_CGPOINTS = 0x1;
cp.SPACE_DEBUG_DRAW_COLLISION_POINTS = 0x4;
cp.SPACE_DEBUG_DRAW_CONSTRAINTS = 0x2;
cp.SPACE_DEBUG_DRAW_SHAPES = 0x1;
cp.USE_DOUBLES = 0x0;
cp.VERSION_MAJOR = 0x6;
cp.VERSION_MINOR = 0x1;
cp.VERSION_MAJOR = 0x7;
cp.VERSION_MINOR = 0x0;
cp.VERSION_RELEASE = 0x1;
cp.WILDCARD_COLLISION_TYPE = 0xffffffff;

12
cocos/scripting/js-bindings/script/debugger/actors/object.js
View File

@ -676,6 +676,15 @@ ObjectActor.prototype = {
functionDisplayName: stack.functionDisplayName
};
});
},
/**
* Added by minggo
* To get the name of this object. It is used to get function name,
* which is needed by dispalying function name in stack strace.
*/
onName: function() {
return { from: this.actorID, name: this.obj.name };
}
};
@ -694,7 +703,8 @@ ObjectActor.prototype.requestTypes = {
"dependentPromises": ObjectActor.prototype.onDependentPromises,
"allocationStack": ObjectActor.prototype.onAllocationStack,
"fulfillmentStack": ObjectActor.prototype.onFulfillmentStack,
"rejectionStack": ObjectActor.prototype.onRejectionStack
"rejectionStack": ObjectActor.prototype.onRejectionStack,
"name": ObjectActor.prototype.onName, // added by minggo
};
/**

6
cocos/scripting/lua-bindings/auto/api/PhysicsDebugDraw.lua
View File

@ -1,6 +0,0 @@
--------------------------------
-- @module PhysicsDebugDraw
-- @parent_module cc
return nil

1
cocos/scripting/lua-bindings/auto/api/PhysicsShapeBox.lua
View File

@ -22,6 +22,7 @@
-- @param #size_table size
-- @param #cc.PhysicsMaterial material
-- @param #vec2_table offset
-- @param #float radius
-- @return PhysicsShapeBox#PhysicsShapeBox ret (return value: cc.PhysicsShapeBox)
--------------------------------

23
cocos/scripting/lua-bindings/auto/api/PhysicsWorld.lua
View File

@ -19,11 +19,13 @@
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- Get the debug draw mask.<br>
-- return An integer number.
-- @function [parent=#PhysicsWorld] getDebugDrawMask
-- set the number of update of the physics world in a second.<br>
-- 0 - disable fixed step system<br>
-- default value is 0
-- @function [parent=#PhysicsWorld] setFixedUpdateRate
-- @param self
-- @return int#int ret (return value: int)
-- @param #int updatesPerSecond
-- @return PhysicsWorld#PhysicsWorld self (return value: cc.PhysicsWorld)
--------------------------------
-- set the number of substeps in an update of the physics world.<br>
@ -62,6 +64,13 @@
-- @param self
-- @return PhysicsWorld#PhysicsWorld self (return value: cc.PhysicsWorld)
--------------------------------
-- Get the debug draw mask.<br>
-- return An integer number.
-- @function [parent=#PhysicsWorld] getDebugDrawMask
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
-- Get the auto step of this physics world.<br>
-- return A bool object.
@ -137,6 +146,12 @@
-- @param #int rate
-- @return PhysicsWorld#PhysicsWorld self (return value: cc.PhysicsWorld)
--------------------------------
-- get the number of substeps
-- @function [parent=#PhysicsWorld] getFixedUpdateRate
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
-- Get the number of substeps of this physics world.<br>
-- return An integer number.

5
cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_physics_auto_api.lua
View File

@ -146,9 +146,4 @@
-- @field [parent=#cc] PhysicsWorld#PhysicsWorld PhysicsWorld preloaded module
--------------------------------------------------------
-- the cc PhysicsDebugDraw
-- @field [parent=#cc] PhysicsDebugDraw#PhysicsDebugDraw PhysicsDebugDraw preloaded module
return nil

12
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
View File

@ -20451,7 +20451,7 @@ int lua_cocos2dx_PolygonInfo_getArea(lua_State* tolua_S)
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_PolygonInfo_getArea'", nullptr);
return 0;
}
const float ret = cobj->getArea();
double ret = cobj->getArea();
tolua_pushnumber(tolua_S,(lua_Number)ret);
return 1;
}
@ -20498,7 +20498,7 @@ int lua_cocos2dx_PolygonInfo_getVertCount(lua_State* tolua_S)
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_PolygonInfo_getVertCount'", nullptr);
return 0;
}
const unsigned int ret = cobj->getVertCount();
unsigned int ret = cobj->getVertCount();
tolua_pushnumber(tolua_S,(lua_Number)ret);
return 1;
}
@ -20545,7 +20545,7 @@ int lua_cocos2dx_PolygonInfo_getTrianglesCount(lua_State* tolua_S)
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_PolygonInfo_getTrianglesCount'", nullptr);
return 0;
}
const unsigned int ret = cobj->getTrianglesCount();
unsigned int ret = cobj->getTrianglesCount();
tolua_pushnumber(tolua_S,(lua_Number)ret);
return 1;
}
@ -49576,7 +49576,7 @@ int lua_cocos2dx_ClippingRectangleNode_isClippingEnabled(lua_State* tolua_S)
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ClippingRectangleNode_isClippingEnabled'", nullptr);
return 0;
}
const bool ret = cobj->isClippingEnabled();
bool ret = cobj->isClippingEnabled();
tolua_pushboolean(tolua_S,(bool)ret);
return 1;
}
@ -71675,7 +71675,7 @@ int lua_cocos2dx_Sprite_getResourceType(lua_State* tolua_S)
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Sprite_getResourceType'", nullptr);
return 0;
}
const int ret = cobj->getResourceType();
int ret = cobj->getResourceType();
tolua_pushnumber(tolua_S,(lua_Number)ret);
return 1;
}
@ -88979,7 +88979,7 @@ int lua_cocos2dx_TextureCache_getTextureFilePath(lua_State* tolua_S)
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_TextureCache_getTextureFilePath'", nullptr);
return 0;
}
const std::string ret = cobj->getTextureFilePath(arg0);
std::string ret = cobj->getTextureFilePath(arg0);
tolua_pushcppstring(tolua_S,ret);
return 1;
}

156
cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.cpp
View File

@ -2005,6 +2005,25 @@ int lua_cocos2dx_physics_PhysicsShapeBox_create(lua_State* tolua_S)
object_to_luaval<cocos2d::PhysicsShapeBox>(tolua_S, "cc.PhysicsShapeBox",(cocos2d::PhysicsShapeBox*)ret);
return 1;
}
if (argc == 4)
{
cocos2d::Size arg0;
cocos2d::PhysicsMaterial arg1;
cocos2d::Vec2 arg2;
double arg3;
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");
ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.PhysicsShapeBox:create");
if(!ok)
{
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_physics_PhysicsShapeBox_create'", nullptr);
return 0;
}
cocos2d::PhysicsShapeBox* ret = cocos2d::PhysicsShapeBox::create(arg0, arg1, arg2, arg3);
object_to_luaval<cocos2d::PhysicsShapeBox>(tolua_S, "cc.PhysicsShapeBox",(cocos2d::PhysicsShapeBox*)ret);
return 1;
}
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsShapeBox:create",argc, 1);
return 0;
#if COCOS2D_DEBUG >= 1
@ -11409,7 +11428,7 @@ int lua_cocos2dx_physics_PhysicsWorld_getAllBodies(lua_State* tolua_S)
return 0;
}
int lua_cocos2dx_physics_PhysicsWorld_getDebugDrawMask(lua_State* tolua_S)
int lua_cocos2dx_physics_PhysicsWorld_setFixedUpdateRate(lua_State* tolua_S)
{
int argc = 0;
cocos2d::PhysicsWorld* cobj = nullptr;
@ -11429,29 +11448,32 @@ int lua_cocos2dx_physics_PhysicsWorld_getDebugDrawMask(lua_State* tolua_S)
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getDebugDrawMask'", nullptr);
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_setFixedUpdateRate'", nullptr);
return 0;
}
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 0)
if (argc == 1)
{
int arg0;
ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsWorld:setFixedUpdateRate");
if(!ok)
{
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_physics_PhysicsWorld_getDebugDrawMask'", nullptr);
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_physics_PhysicsWorld_setFixedUpdateRate'", nullptr);
return 0;
}
int ret = cobj->getDebugDrawMask();
tolua_pushnumber(tolua_S,(lua_Number)ret);
cobj->setFixedUpdateRate(arg0);
lua_settop(tolua_S, 1);
return 1;
}
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:getDebugDrawMask",argc, 0);
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:setFixedUpdateRate",argc, 1);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getDebugDrawMask'.",&tolua_err);
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_setFixedUpdateRate'.",&tolua_err);
#endif
return 0;
@ -11667,6 +11689,53 @@ int lua_cocos2dx_physics_PhysicsWorld_removeAllJoints(lua_State* tolua_S)
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)
{
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_physics_PhysicsWorld_getDebugDrawMask'", nullptr);
return 0;
}
int ret = cobj->getDebugDrawMask();
tolua_pushnumber(tolua_S,(lua_Number)ret);
return 1;
}
luaL_error(tolua_S, "%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_isAutoStep(lua_State* tolua_S)
{
int argc = 0;
@ -12083,6 +12152,53 @@ int lua_cocos2dx_physics_PhysicsWorld_setUpdateRate(lua_State* tolua_S)
return 0;
}
int lua_cocos2dx_physics_PhysicsWorld_getFixedUpdateRate(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_getFixedUpdateRate'", nullptr);
return 0;
}
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 0)
{
if(!ok)
{
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_physics_PhysicsWorld_getFixedUpdateRate'", nullptr);
return 0;
}
int ret = cobj->getFixedUpdateRate();
tolua_pushnumber(tolua_S,(lua_Number)ret);
return 1;
}
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:getFixedUpdateRate",argc, 0);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getFixedUpdateRate'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_physics_PhysicsWorld_getSubsteps(lua_State* tolua_S)
{
int argc = 0;
@ -12435,11 +12551,12 @@ int lua_register_cocos2dx_physics_PhysicsWorld(lua_State* tolua_S)
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,"setFixedUpdateRate",lua_cocos2dx_physics_PhysicsWorld_setFixedUpdateRate);
tolua_function(tolua_S,"setSubsteps",lua_cocos2dx_physics_PhysicsWorld_setSubsteps);
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,"getDebugDrawMask",lua_cocos2dx_physics_PhysicsWorld_getDebugDrawMask);
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);
@ -12448,6 +12565,7 @@ int lua_register_cocos2dx_physics_PhysicsWorld(lua_State* tolua_S)
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,"getFixedUpdateRate",lua_cocos2dx_physics_PhysicsWorld_getFixedUpdateRate);
tolua_function(tolua_S,"getSubsteps",lua_cocos2dx_physics_PhysicsWorld_getSubsteps);
tolua_function(tolua_S,"getSpeed",lua_cocos2dx_physics_PhysicsWorld_getSpeed);
tolua_function(tolua_S,"getUpdateRate",lua_cocos2dx_physics_PhysicsWorld_getUpdateRate);
@ -12461,25 +12579,6 @@ int lua_register_cocos2dx_physics_PhysicsWorld(lua_State* tolua_S)
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;
}
TOLUA_API int register_all_cocos2dx_physics(lua_State* tolua_S)
{
tolua_open(tolua_S);
@ -12504,7 +12603,6 @@ TOLUA_API int register_all_cocos2dx_physics(lua_State* tolua_S)
lua_register_cocos2dx_physics_PhysicsShapeEdgePolygon(tolua_S);
lua_register_cocos2dx_physics_PhysicsJointPin(tolua_S);
lua_register_cocos2dx_physics_PhysicsContactPreSolve(tolua_S);
lua_register_cocos2dx_physics_PhysicsDebugDraw(tolua_S);
lua_register_cocos2dx_physics_PhysicsShapeEdgeChain(tolua_S);
lua_register_cocos2dx_physics_PhysicsShapeEdgeSegment(tolua_S);
lua_register_cocos2dx_physics_PhysicsJointGear(tolua_S);

1
cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.hpp
View File

@ -276,6 +276,7 @@ int register_all_cocos2dx_physics(lua_State* tolua_S);
#endif // __cocos2dx_physics_h__

4
cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp
View File

@ -3192,7 +3192,7 @@ int lua_cocos2dx_studio_DisplayData_changeDisplayToTexture(lua_State* tolua_S)
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_DisplayData_changeDisplayToTexture'", nullptr);
return 0;
}
const std::string ret = cocostudio::DisplayData::changeDisplayToTexture(arg0);
std::string ret = cocostudio::DisplayData::changeDisplayToTexture(arg0);
tolua_pushcppstring(tolua_S,ret);
return 1;
}
@ -24859,7 +24859,7 @@ int lua_cocos2dx_studio_ComExtensionData_getActionTag(lua_State* tolua_S)
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_studio_ComExtensionData_getActionTag'", nullptr);
return 0;
}
const int ret = cobj->getActionTag();
int ret = cobj->getActionTag();
tolua_pushnumber(tolua_S,(lua_Number)ret);
return 1;
}

4
cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp
View File

@ -6180,7 +6180,7 @@ int lua_cocos2dx_ui_Button_getTitleText(lua_State* tolua_S)
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Button_getTitleText'", nullptr);
return 0;
}
const std::string ret = cobj->getTitleText();
std::string ret = cobj->getTitleText();
tolua_pushcppstring(tolua_S,ret);
return 1;
}
@ -7895,7 +7895,7 @@ int lua_cocos2dx_ui_Button_getTitleFontName(lua_State* tolua_S)
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Button_getTitleFontName'", nullptr);
return 0;
}
const std::string ret = cobj->getTitleFontName();
std::string ret = cobj->getTitleFontName();
tolua_pushcppstring(tolua_S,ret);
return 1;
}

4
cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj
View File

@ -1591,7 +1591,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../.. $(SRCROOT)/../../.. $(SRCROOT)/../../../base $(SRCROOT)/../../../3d $(SRCROOT)/../../../2d $(SRCROOT)/../../../deprecated $(SRCROOT)/../../../physics $(SRCROOT)/../../../2d/platform $(SRCROOT)/../../../audio/include $(SRCROOT)/../../../editor-support $(SRCROOT)/../../../editor-support/spine $(SRCROOT)/../../../editor-support/cocostudio $(SRCROOT)/../../../editor-support/cocosbuilder $(SRCROOT)/../../../ui $(SRCROOT)/../../../storage $(SRCROOT)/../../../../extensions $(SRCROOT)/../../../../external $(SRCROOT)/../../../../external/chipmunk/include/chipmunk $(SRCROOT)/../../../../external/lua $(SRCROOT)/../../../../external/lua/luajit/include $(SRCROOT)/../../../../external/lua/tolua $(SRCROOT)/../../../editor-support/cocostudio/ActionTimeline $(SRCROOT)/../../../physics3d $(SRCROOT)/../../../navmesh";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../.. $(SRCROOT)/../../.. $(SRCROOT)/../../../base $(SRCROOT)/../../../3d $(SRCROOT)/../../../2d $(SRCROOT)/../../../deprecated $(SRCROOT)/../../../physics $(SRCROOT)/../../../2d/platform $(SRCROOT)/../../../audio/include $(SRCROOT)/../../../editor-support $(SRCROOT)/../../../editor-support/spine $(SRCROOT)/../../../editor-support/cocostudio $(SRCROOT)/../../../editor-support/cocosbuilder $(SRCROOT)/../../../ui $(SRCROOT)/../../../storage $(SRCROOT)/../../../../extensions $(SRCROOT)/../../../../external $(SRCROOT)/../../../../external/chipmunk/include $(SRCROOT)/../../../../external/lua $(SRCROOT)/../../../../external/lua/luajit/include $(SRCROOT)/../../../../external/lua/tolua $(SRCROOT)/../../../editor-support/cocostudio/ActionTimeline $(SRCROOT)/../../../physics3d $(SRCROOT)/../../../navmesh";
};
name = Debug;
};
@ -1623,7 +1623,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../.. $(SRCROOT)/../../.. $(SRCROOT)/../../../base $(SRCROOT)/../../../3d $(SRCROOT)/../../../2d $(SRCROOT)/../../../deprecated $(SRCROOT)/../../../physics $(SRCROOT)/../../../2d/platform $(SRCROOT)/../../../audio/include $(SRCROOT)/../../../editor-support $(SRCROOT)/../../../editor-support/spine $(SRCROOT)/../../../editor-support/cocostudio $(SRCROOT)/../../../editor-support/cocosbuilder $(SRCROOT)/../../../ui $(SRCROOT)/../../../storage $(SRCROOT)/../../../../extensions $(SRCROOT)/../../../../external $(SRCROOT)/../../../../external/chipmunk/include/chipmunk $(SRCROOT)/../../../../external/lua $(SRCROOT)/../../../../external/lua/luajit/include $(SRCROOT)/../../../../external/lua/tolua $(SRCROOT)/../../../editor-support/cocostudio/ActionTimeline $(SRCROOT)/../../../physics3d $(SRCROOT)/../../../navmesh";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../.. $(SRCROOT)/../../.. $(SRCROOT)/../../../base $(SRCROOT)/../../../3d $(SRCROOT)/../../../2d $(SRCROOT)/../../../deprecated $(SRCROOT)/../../../physics $(SRCROOT)/../../../2d/platform $(SRCROOT)/../../../audio/include $(SRCROOT)/../../../editor-support $(SRCROOT)/../../../editor-support/spine $(SRCROOT)/../../../editor-support/cocostudio $(SRCROOT)/../../../editor-support/cocosbuilder $(SRCROOT)/../../../ui $(SRCROOT)/../../../storage $(SRCROOT)/../../../../extensions $(SRCROOT)/../../../../external $(SRCROOT)/../../../../external/chipmunk/include $(SRCROOT)/../../../../external/lua $(SRCROOT)/../../../../external/lua/luajit/include $(SRCROOT)/../../../../external/lua/tolua $(SRCROOT)/../../../editor-support/cocostudio/ActionTimeline $(SRCROOT)/../../../physics3d $(SRCROOT)/../../../navmesh";
VALIDATE_PRODUCT = YES;
};
name = Release;

1
cocos/ui/Android.mk
View File

@ -45,6 +45,7 @@ UIEditBox/UIEditBox.cpp \
UIEditBox/UIEditBoxImpl-android.cpp \
UIEditBox/UIEditBoxImpl-common.cpp \
UILayoutComponent.cpp \
UITabControl.cpp \
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../editor-support

14
cocos/ui/CMakeLists.txt
View File

@ -10,12 +10,22 @@ if(WINDOWS)
elseif(MACOSX)
set(COCOS_UI_SPECIFIC_SRC
ui/UIEditBox/UIEditBoxImpl-mac.mm
ui/UIEditBox/Mac/CCUIEditBoxMac.mm
ui/UIEditBox/Mac/CCUIMultilineTextField.m
ui/UIEditBox/Mac/CCUIPasswordTextField.m
ui/UIEditBox/Mac/CCUISingleLineTextField.m
ui/UIEditBox/Mac/CCUITextFieldFormatter.m
)
elseif(LINUX)
set(COCOS_UI_SPECIFIC_SRC
ui/UIEditBox/UIEditBoxImpl-common.cpp
ui/UIEditBox/UIEditBoxImpl-linux.cpp
)
ELSEIF(ANDROID)
set(COCOS_UI_SPECIFIC_SRC
ui/UIEditBox/UIEditBoxImpl-android.cpp
ui/UIVideoPlayer-android.cpp
ui/UIWebViewImpl-android.cpp
)
endif()
#todo: android UIWebViewImpl and UIVideoPlayer
@ -54,6 +64,8 @@ set(COCOS_UI_SRC
ui/UIWidget.cpp
ui/UIEditBox/UIEditBox.cpp
ui/UILayoutComponent.cpp
ui/UIEditBox/UIEditBoxImpl-common.cpp
ui/UITabControl.cpp
${COCOS_UI_SPECIFIC_SRC}
)

4
cocos/ui/UIButton.cpp
View File

@ -714,7 +714,7 @@ void Button::setTitleText(const std::string& text)
updateTitleLocation();
}
const std::string Button::getTitleText() const
std::string Button::getTitleText() const
{
if(nullptr == _titleRenderer)
{
@ -824,7 +824,7 @@ Label* Button::getTitleRenderer()const
return _titleRenderer;
}
const std::string Button::getTitleFontName() const
std::string Button::getTitleFontName() const
{
if (nullptr != _titleRenderer)
{

4
cocos/ui/UIButton.h
View File

@ -210,7 +210,7 @@ public:
* Query the button title content.
*@return Get the button's title content.
*/
const std::string getTitleText() const;
std::string getTitleText() const;
/**
* Change the color of button's title.
@ -246,7 +246,7 @@ public:
* Query the font name of button's title
*@return font name in std::string
*/
const std::string getTitleFontName() const;
std::string getTitleFontName() const;
/**
* Sets the title's text horizontal alignment.

4
cocos/ui/UIEditBox/Mac/CCUIEditBoxMac.h
View File

@ -25,11 +25,13 @@
#import <Foundation/Foundation.h>
#import <AppKit/AppKit.h>
#include "UIEditboxImpl-mac.h"
#include "../UIEditBoxImpl-mac.h"
#include "CCUITextInput.h"
#pragma mark - UIEditBox mac implementation
@class NSFont;
@interface UIEditBoxImplMac : NSObject <NSTextFieldDelegate, NSTextViewDelegate>
{
BOOL _editState;

Some files were not shown because too many files have changed in this diff Show More