diff --git a/.gitignore b/.gitignore index 81e7834dde..863d29c9fd 100644 --- a/.gitignore +++ b/.gitignore @@ -103,6 +103,7 @@ CMakeCache.txt CMakeFiles Makefile cmake_install.cmake +CMakeLists.txt.user # Ignore files generated by console build/build/ diff --git a/CHANGELOG b/CHANGELOG index 48ced0e53a..8542848645 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ cocos2d-x-3.3-beta1 [NEW] Audio: new audio supports Mac OS X and Windows [NEW] Application: added openUrl() [NEW] Armature: added getOffsetPoints() + [NEW] C++: added ClippingRectangleNode [NEW] Lua-binding: added Camera3DTest ,BillBoradTest [NEW] Node: schedule/unschedule lambda functions [NEW] Rect: added merge() diff --git a/build/android-build.py b/build/android-build.py index 967228bf7f..3465d37d8c 100755 --- a/build/android-build.py +++ b/build/android-build.py @@ -157,22 +157,12 @@ def copy_resources(target, app_android_root): os.mkdir(assets_src_dir) copy_files(src_dir, assets_src_dir) - common_script_dir = os.path.join(app_android_root, "../../../../cocos/scripting/lua-bindings/script") - if target == "lua-tests": - copy_files(os.path.join(common_script_dir, "cocos2d"), assets_dir) - copy_files(os.path.join(common_script_dir, "cocosbuilder"), assets_dir) - copy_files(os.path.join(common_script_dir, "cocosdenshion"), assets_dir) - copy_files(os.path.join(common_script_dir, "cocosstudio"), assets_dir) - copy_files(os.path.join(common_script_dir, "extension"), assets_dir) - copy_files(os.path.join(common_script_dir, "network"), assets_dir) - copy_files(os.path.join(common_script_dir, "ui"), assets_dir) - elif target == "lua-empty-test": - copy_files(os.path.join(common_script_dir, "cocos2d"), assets_dir) - copy_files(os.path.join(common_script_dir, "cocosdenshion"), assets_dir) - copy_files(os.path.join(common_script_dir, "network"), assets_dir) - elif target == "lua-game-controller-test": - copy_files(os.path.join(common_script_dir, "cocos2d"), assets_dir) - copy_files(os.path.join(common_script_dir, "controller"), assets_dir) + common_script_dir = os.path.join(app_android_root, "../../../../cocos/scripting/lua-bindings/script/") + cocos_src_dir = os.path.join(assets_src_dir,"cocos") + if os.path.exists(cocos_src_dir): + shutil.rmtree(cocos_src_dir) + os.mkdir(cocos_src_dir) + copy_files(common_script_dir, cocos_src_dir) luasocket_script_dir = os.path.join(app_android_root, "../../../../external/lua/luasocket") for root, dirs, files in os.walk(luasocket_script_dir): diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj b/build/cocos2d_libs.xcodeproj/project.pbxproj index 298ef59064..93107220a7 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj @@ -1913,6 +1913,10 @@ DA8C62A319E52C6400000516 /* ioapi_mem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA8C62A019E52C6400000516 /* ioapi_mem.cpp */; }; DA8C62A419E52C6400000516 /* ioapi_mem.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8C62A119E52C6400000516 /* ioapi_mem.h */; }; DA8C62A519E52C6400000516 /* ioapi_mem.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8C62A119E52C6400000516 /* ioapi_mem.h */; }; + DABC9FA919E7DFA900FA252C /* CCClippingRectangleNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DABC9FA719E7DFA900FA252C /* CCClippingRectangleNode.cpp */; }; + DABC9FAA19E7DFA900FA252C /* CCClippingRectangleNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DABC9FA719E7DFA900FA252C /* CCClippingRectangleNode.cpp */; }; + DABC9FAB19E7DFA900FA252C /* CCClippingRectangleNode.h in Headers */ = {isa = PBXBuildFile; fileRef = DABC9FA819E7DFA900FA252C /* CCClippingRectangleNode.h */; }; + DABC9FAC19E7DFA900FA252C /* CCClippingRectangleNode.h in Headers */ = {isa = PBXBuildFile; fileRef = DABC9FA819E7DFA900FA252C /* CCClippingRectangleNode.h */; }; ED9C6A9418599AD8000A5232 /* CCNodeGrid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED9C6A9218599AD8000A5232 /* CCNodeGrid.cpp */; }; ED9C6A9518599AD8000A5232 /* CCNodeGrid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED9C6A9218599AD8000A5232 /* CCNodeGrid.cpp */; }; ED9C6A9618599AD8000A5232 /* CCNodeGrid.h in Headers */ = {isa = PBXBuildFile; fileRef = ED9C6A9318599AD8000A5232 /* CCNodeGrid.h */; }; @@ -2952,6 +2956,8 @@ B67C624519D4186F00F11FC6 /* ccShader_3D_PositionNormalTex.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_3D_PositionNormalTex.vert; sourceTree = ""; }; DA8C62A019E52C6400000516 /* ioapi_mem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ioapi_mem.cpp; sourceTree = ""; }; DA8C62A119E52C6400000516 /* ioapi_mem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ioapi_mem.h; sourceTree = ""; }; + DABC9FA719E7DFA900FA252C /* CCClippingRectangleNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCClippingRectangleNode.cpp; sourceTree = ""; }; + DABC9FA819E7DFA900FA252C /* CCClippingRectangleNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCClippingRectangleNode.h; sourceTree = ""; }; ED9C6A9218599AD8000A5232 /* CCNodeGrid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = CCNodeGrid.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; ED9C6A9318599AD8000A5232 /* CCNodeGrid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCNodeGrid.h; sourceTree = ""; }; /* End PBXFileReference section */ @@ -3356,6 +3362,8 @@ 1A5701FF180BCBBD0088DEC7 /* misc-nodes */ = { isa = PBXGroup; children = ( + DABC9FA719E7DFA900FA252C /* CCClippingRectangleNode.cpp */, + DABC9FA819E7DFA900FA252C /* CCClippingRectangleNode.h */, ED9C6A9218599AD8000A5232 /* CCNodeGrid.cpp */, ED9C6A9318599AD8000A5232 /* CCNodeGrid.h */, 1A57020C180BCBF40088DEC7 /* CCProgressTimer.cpp */, @@ -5089,6 +5097,7 @@ 15AE18A319AAD33D00C27E9E /* CCParticleSystemQuadLoader.h in Headers */, 46A170F01807CECA005B8026 /* CCPhysicsWorld.h in Headers */, 15AE199D19AAD39600C27E9E /* ScrollViewReader.h in Headers */, + DABC9FAB19E7DFA900FA252C /* CCClippingRectangleNode.h in Headers */, 50ABBEC11925AB6F00A911A9 /* CCValue.h in Headers */, 15AE19EB19AAD3A700C27E9E /* SlotData.h in Headers */, B276EF631988D1D500CD400F /* CCVertexIndexBuffer.h in Headers */, @@ -5625,6 +5634,7 @@ 1A57006C180BC5A10088DEC7 /* CCActionCatmullRom.h in Headers */, 15AE195C19AAD35100C27E9E /* CCSGUIReader.h in Headers */, 5034CA3A191D591100CE6051 /* ccShader_PositionColorLengthTexture.frag in Headers */, + DABC9FAC19E7DFA900FA252C /* CCClippingRectangleNode.h in Headers */, 50ABBEC41925AB6F00A911A9 /* CCVector.h in Headers */, 50ABBE501925AB6F00A911A9 /* CCEventCustom.h in Headers */, 15AE1AD719AAD40300C27E9E /* b2WheelJoint.h in Headers */, @@ -6501,6 +6511,7 @@ 15AE190B19AAD35000C27E9E /* CCDisplayFactory.cpp in Sources */, 1A9DCA27180E6955007A3AD4 /* CCGLBufferedNode.cpp in Sources */, 50ABBD541925AB0000A911A9 /* TransformUtils.cpp in Sources */, + DABC9FA919E7DFA900FA252C /* CCClippingRectangleNode.cpp in Sources */, 3E2F27A619CFBFE100E7C490 /* AudioEngine.cpp in Sources */, 15AE1A3619AAD3D500C27E9E /* b2PolygonShape.cpp in Sources */, 50ABBD9B1925AB4100A911A9 /* ccGLStateCache.cpp in Sources */, @@ -6637,6 +6648,7 @@ 1A570072180BC5A10088DEC7 /* CCActionGrid.cpp in Sources */, 15AE1ABC19AAD40300C27E9E /* b2PolygonAndCircleContact.cpp in Sources */, 15AE1ADA19AAD41000C27E9E /* b2Rope.cpp in Sources */, + DABC9FAA19E7DFA900FA252C /* CCClippingRectangleNode.cpp in Sources */, 15AE1BF119AAE01E00C27E9E /* CCControlPotentiometer.cpp in Sources */, 15AE1B8419AADA9A00C27E9E /* UITextField.cpp in Sources */, 15AE198E19AAD36E00C27E9E /* CheckBoxReader.cpp in Sources */, diff --git a/build/cocos2d_tests.xcodeproj/project.pbxproj b/build/cocos2d_tests.xcodeproj/project.pbxproj index 626e1593de..93e6da9abb 100644 --- a/build/cocos2d_tests.xcodeproj/project.pbxproj +++ b/build/cocos2d_tests.xcodeproj/project.pbxproj @@ -40,46 +40,6 @@ /* Begin PBXBuildFile section */ 150F918819DA409E00B89F57 /* lua_test_bindings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 150F918619DA409E00B89F57 /* lua_test_bindings.cpp */; }; 150F918919DA409F00B89F57 /* lua_test_bindings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 150F918619DA409E00B89F57 /* lua_test_bindings.cpp */; }; - 1529F04519ED88640064B9B1 /* ltn12.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04219ED88640064B9B1 /* ltn12.lua */; }; - 1529F04619ED88640064B9B1 /* ltn12.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04219ED88640064B9B1 /* ltn12.lua */; }; - 1529F04719ED88640064B9B1 /* mime.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04319ED88640064B9B1 /* mime.lua */; }; - 1529F04819ED88640064B9B1 /* mime.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04319ED88640064B9B1 /* mime.lua */; }; - 1529F04919ED88640064B9B1 /* socket.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04419ED88640064B9B1 /* socket.lua */; }; - 1529F04A19ED88640064B9B1 /* socket.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04419ED88640064B9B1 /* socket.lua */; }; - 1529F05219ED88830064B9B1 /* ftp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04B19ED88830064B9B1 /* ftp.lua */; }; - 1529F05319ED88830064B9B1 /* ftp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04B19ED88830064B9B1 /* ftp.lua */; }; - 1529F05419ED88830064B9B1 /* headers.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04C19ED88830064B9B1 /* headers.lua */; }; - 1529F05519ED88830064B9B1 /* headers.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04C19ED88830064B9B1 /* headers.lua */; }; - 1529F05619ED88830064B9B1 /* http.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04D19ED88830064B9B1 /* http.lua */; }; - 1529F05719ED88830064B9B1 /* http.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04D19ED88830064B9B1 /* http.lua */; }; - 1529F05819ED88830064B9B1 /* mbox.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04E19ED88830064B9B1 /* mbox.lua */; }; - 1529F05919ED88830064B9B1 /* mbox.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04E19ED88830064B9B1 /* mbox.lua */; }; - 1529F05A19ED88830064B9B1 /* smtp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04F19ED88830064B9B1 /* smtp.lua */; }; - 1529F05B19ED88830064B9B1 /* smtp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04F19ED88830064B9B1 /* smtp.lua */; }; - 1529F05C19ED88830064B9B1 /* tp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F05019ED88830064B9B1 /* tp.lua */; }; - 1529F05D19ED88830064B9B1 /* tp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F05019ED88830064B9B1 /* tp.lua */; }; - 1529F05E19ED88830064B9B1 /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F05119ED88830064B9B1 /* url.lua */; }; - 1529F05F19ED88830064B9B1 /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F05119ED88830064B9B1 /* url.lua */; }; - 1529F06019ED8A4E0064B9B1 /* ftp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04B19ED88830064B9B1 /* ftp.lua */; }; - 1529F06119ED8A4E0064B9B1 /* headers.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04C19ED88830064B9B1 /* headers.lua */; }; - 1529F06219ED8A4E0064B9B1 /* http.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04D19ED88830064B9B1 /* http.lua */; }; - 1529F06319ED8A4E0064B9B1 /* mbox.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04E19ED88830064B9B1 /* mbox.lua */; }; - 1529F06419ED8A4E0064B9B1 /* smtp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04F19ED88830064B9B1 /* smtp.lua */; }; - 1529F06519ED8A4E0064B9B1 /* tp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F05019ED88830064B9B1 /* tp.lua */; }; - 1529F06619ED8A4E0064B9B1 /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F05119ED88830064B9B1 /* url.lua */; }; - 1529F06719ED8A4E0064B9B1 /* ltn12.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04219ED88640064B9B1 /* ltn12.lua */; }; - 1529F06819ED8A4E0064B9B1 /* mime.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04319ED88640064B9B1 /* mime.lua */; }; - 1529F06919ED8A4E0064B9B1 /* socket.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04419ED88640064B9B1 /* socket.lua */; }; - 1529F06A19ED8A510064B9B1 /* ftp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04B19ED88830064B9B1 /* ftp.lua */; }; - 1529F06B19ED8A510064B9B1 /* headers.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04C19ED88830064B9B1 /* headers.lua */; }; - 1529F06C19ED8A510064B9B1 /* http.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04D19ED88830064B9B1 /* http.lua */; }; - 1529F06D19ED8A510064B9B1 /* mbox.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04E19ED88830064B9B1 /* mbox.lua */; }; - 1529F06E19ED8A510064B9B1 /* smtp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04F19ED88830064B9B1 /* smtp.lua */; }; - 1529F06F19ED8A510064B9B1 /* tp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F05019ED88830064B9B1 /* tp.lua */; }; - 1529F07019ED8A510064B9B1 /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F05119ED88830064B9B1 /* url.lua */; }; - 1529F07119ED8A510064B9B1 /* ltn12.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04219ED88640064B9B1 /* ltn12.lua */; }; - 1529F07219ED8A510064B9B1 /* mime.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04319ED88640064B9B1 /* mime.lua */; }; - 1529F07319ED8A510064B9B1 /* socket.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04419ED88640064B9B1 /* socket.lua */; }; 15427B79198B879900DC375D /* libluacocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA665198B33EE000C57D3 /* libluacocos2d iOS.a */; }; 15427B7A198B87AA00DC375D /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */; }; 15427B7D198B880100DC375D /* lua_cocos2dx_controller_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15427B7B198B880100DC375D /* lua_cocos2dx_controller_manual.cpp */; }; @@ -119,134 +79,6 @@ 15CBA9DE196EEAF8005877BB /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E61773C1960FBD100DE83F5 /* GameController.framework */; }; 15CBA9E0196EEBD4005877BB /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EA0FB65191B933000B170C8 /* MediaPlayer.framework */; }; 15CBA9ED196F7BD8005877BB /* lua_cocos2dx_controller_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15CBA9EB196F7BD8005877BB /* lua_cocos2dx_controller_auto.cpp */; }; - 15D1FCEC1998637C00302043 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDE1998637C00302043 /* bitExtend.lua */; }; - 15D1FCED1998637C00302043 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDE1998637C00302043 /* bitExtend.lua */; }; - 15D1FCEE1998637C00302043 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDE1998637C00302043 /* bitExtend.lua */; }; - 15D1FCEF1998637C00302043 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDE1998637C00302043 /* bitExtend.lua */; }; - 15D1FCF01998637C00302043 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDE1998637C00302043 /* bitExtend.lua */; }; - 15D1FCF11998637C00302043 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDF1998637C00302043 /* Cocos2d.lua */; }; - 15D1FCF21998637C00302043 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDF1998637C00302043 /* Cocos2d.lua */; }; - 15D1FCF31998637C00302043 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDF1998637C00302043 /* Cocos2d.lua */; }; - 15D1FCF41998637C00302043 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDF1998637C00302043 /* Cocos2d.lua */; }; - 15D1FCF51998637C00302043 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDF1998637C00302043 /* Cocos2d.lua */; }; - 15D1FCF61998637C00302043 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE01998637C00302043 /* Cocos2dConstants.lua */; }; - 15D1FCF71998637C00302043 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE01998637C00302043 /* Cocos2dConstants.lua */; }; - 15D1FCF81998637C00302043 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE01998637C00302043 /* Cocos2dConstants.lua */; }; - 15D1FCF91998637C00302043 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE01998637C00302043 /* Cocos2dConstants.lua */; }; - 15D1FCFA1998637C00302043 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE01998637C00302043 /* Cocos2dConstants.lua */; }; - 15D1FCFB1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE11998637C00302043 /* DeprecatedCocos2dClass.lua */; }; - 15D1FCFC1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE11998637C00302043 /* DeprecatedCocos2dClass.lua */; }; - 15D1FCFD1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE11998637C00302043 /* DeprecatedCocos2dClass.lua */; }; - 15D1FCFE1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE11998637C00302043 /* DeprecatedCocos2dClass.lua */; }; - 15D1FCFF1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE11998637C00302043 /* DeprecatedCocos2dClass.lua */; }; - 15D1FD001998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE21998637C00302043 /* DeprecatedCocos2dEnum.lua */; }; - 15D1FD011998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE21998637C00302043 /* DeprecatedCocos2dEnum.lua */; }; - 15D1FD021998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE21998637C00302043 /* DeprecatedCocos2dEnum.lua */; }; - 15D1FD031998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE21998637C00302043 /* DeprecatedCocos2dEnum.lua */; }; - 15D1FD041998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE21998637C00302043 /* DeprecatedCocos2dEnum.lua */; }; - 15D1FD051998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE31998637C00302043 /* DeprecatedCocos2dFunc.lua */; }; - 15D1FD061998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE31998637C00302043 /* DeprecatedCocos2dFunc.lua */; }; - 15D1FD071998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE31998637C00302043 /* DeprecatedCocos2dFunc.lua */; }; - 15D1FD081998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE31998637C00302043 /* DeprecatedCocos2dFunc.lua */; }; - 15D1FD091998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE31998637C00302043 /* DeprecatedCocos2dFunc.lua */; }; - 15D1FD0A1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE41998637C00302043 /* DeprecatedOpenglEnum.lua */; }; - 15D1FD0B1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE41998637C00302043 /* DeprecatedOpenglEnum.lua */; }; - 15D1FD0C1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE41998637C00302043 /* DeprecatedOpenglEnum.lua */; }; - 15D1FD0D1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE41998637C00302043 /* DeprecatedOpenglEnum.lua */; }; - 15D1FD0E1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE41998637C00302043 /* DeprecatedOpenglEnum.lua */; }; - 15D1FD0F1998637C00302043 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE51998637C00302043 /* DrawPrimitives.lua */; }; - 15D1FD101998637C00302043 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE51998637C00302043 /* DrawPrimitives.lua */; }; - 15D1FD111998637C00302043 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE51998637C00302043 /* DrawPrimitives.lua */; }; - 15D1FD121998637C00302043 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE51998637C00302043 /* DrawPrimitives.lua */; }; - 15D1FD131998637C00302043 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE51998637C00302043 /* DrawPrimitives.lua */; }; - 15D1FD141998637C00302043 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE61998637C00302043 /* extern.lua */; }; - 15D1FD151998637C00302043 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE61998637C00302043 /* extern.lua */; }; - 15D1FD161998637C00302043 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE61998637C00302043 /* extern.lua */; }; - 15D1FD171998637C00302043 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE61998637C00302043 /* extern.lua */; }; - 15D1FD181998637C00302043 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE61998637C00302043 /* extern.lua */; }; - 15D1FD191998637C00302043 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE71998637C00302043 /* json.lua */; }; - 15D1FD1A1998637C00302043 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE71998637C00302043 /* json.lua */; }; - 15D1FD1B1998637C00302043 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE71998637C00302043 /* json.lua */; }; - 15D1FD1C1998637C00302043 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE71998637C00302043 /* json.lua */; }; - 15D1FD1D1998637C00302043 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE71998637C00302043 /* json.lua */; }; - 15D1FD1E1998637C00302043 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE81998637C00302043 /* luaj.lua */; }; - 15D1FD1F1998637C00302043 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE81998637C00302043 /* luaj.lua */; }; - 15D1FD201998637C00302043 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE81998637C00302043 /* luaj.lua */; }; - 15D1FD211998637C00302043 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE81998637C00302043 /* luaj.lua */; }; - 15D1FD221998637C00302043 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE81998637C00302043 /* luaj.lua */; }; - 15D1FD231998637C00302043 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE91998637C00302043 /* luaoc.lua */; }; - 15D1FD241998637C00302043 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE91998637C00302043 /* luaoc.lua */; }; - 15D1FD251998637C00302043 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE91998637C00302043 /* luaoc.lua */; }; - 15D1FD261998637C00302043 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE91998637C00302043 /* luaoc.lua */; }; - 15D1FD271998637C00302043 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE91998637C00302043 /* luaoc.lua */; }; - 15D1FD281998637C00302043 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEA1998637C00302043 /* Opengl.lua */; }; - 15D1FD291998637C00302043 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEA1998637C00302043 /* Opengl.lua */; }; - 15D1FD2A1998637C00302043 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEA1998637C00302043 /* Opengl.lua */; }; - 15D1FD2B1998637C00302043 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEA1998637C00302043 /* Opengl.lua */; }; - 15D1FD2C1998637C00302043 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEA1998637C00302043 /* Opengl.lua */; }; - 15D1FD2D1998637C00302043 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEB1998637C00302043 /* OpenglConstants.lua */; }; - 15D1FD2E1998637C00302043 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEB1998637C00302043 /* OpenglConstants.lua */; }; - 15D1FD2F1998637C00302043 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEB1998637C00302043 /* OpenglConstants.lua */; }; - 15D1FD301998637C00302043 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEB1998637C00302043 /* OpenglConstants.lua */; }; - 15D1FD311998637C00302043 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEB1998637C00302043 /* OpenglConstants.lua */; }; - 15D1FD34199863BA00302043 /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD32199863BA00302043 /* CCBReaderLoad.lua */; }; - 15D1FD35199863BA00302043 /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD32199863BA00302043 /* CCBReaderLoad.lua */; }; - 15D1FD36199863BA00302043 /* DeprecatedCocosBuilderClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD33199863BA00302043 /* DeprecatedCocosBuilderClass.lua */; }; - 15D1FD37199863BA00302043 /* DeprecatedCocosBuilderClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD33199863BA00302043 /* DeprecatedCocosBuilderClass.lua */; }; - 15D1FD3B199863CA00302043 /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD38199863CA00302043 /* AudioEngine.lua */; }; - 15D1FD3C199863CA00302043 /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD38199863CA00302043 /* AudioEngine.lua */; }; - 15D1FD3D199863CA00302043 /* DeprecatedCocosDenshionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD39199863CA00302043 /* DeprecatedCocosDenshionClass.lua */; }; - 15D1FD3E199863CA00302043 /* DeprecatedCocosDenshionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD39199863CA00302043 /* DeprecatedCocosDenshionClass.lua */; }; - 15D1FD3F199863CA00302043 /* DeprecatedCocosDenshionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD3A199863CA00302043 /* DeprecatedCocosDenshionFunc.lua */; }; - 15D1FD40199863CA00302043 /* DeprecatedCocosDenshionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD3A199863CA00302043 /* DeprecatedCocosDenshionFunc.lua */; }; - 15D1FD51199863F900302043 /* DeprecatedExtensionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD4D199863F900302043 /* DeprecatedExtensionClass.lua */; }; - 15D1FD52199863F900302043 /* DeprecatedExtensionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD4D199863F900302043 /* DeprecatedExtensionClass.lua */; }; - 15D1FD53199863F900302043 /* DeprecatedExtensionEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD4E199863F900302043 /* DeprecatedExtensionEnum.lua */; }; - 15D1FD54199863F900302043 /* DeprecatedExtensionEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD4E199863F900302043 /* DeprecatedExtensionEnum.lua */; }; - 15D1FD55199863F900302043 /* DeprecatedExtensionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD4F199863F900302043 /* DeprecatedExtensionFunc.lua */; }; - 15D1FD56199863F900302043 /* DeprecatedExtensionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD4F199863F900302043 /* DeprecatedExtensionFunc.lua */; }; - 15D1FD57199863F900302043 /* ExtensionConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD50199863F900302043 /* ExtensionConstants.lua */; }; - 15D1FD58199863F900302043 /* ExtensionConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD50199863F900302043 /* ExtensionConstants.lua */; }; - 15D1FD5D1998641200302043 /* DeprecatedNetworkClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD591998641200302043 /* DeprecatedNetworkClass.lua */; }; - 15D1FD5E1998641200302043 /* DeprecatedNetworkClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD591998641200302043 /* DeprecatedNetworkClass.lua */; }; - 15D1FD5F1998641200302043 /* DeprecatedNetworkClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD591998641200302043 /* DeprecatedNetworkClass.lua */; }; - 15D1FD601998641200302043 /* DeprecatedNetworkClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD591998641200302043 /* DeprecatedNetworkClass.lua */; }; - 15D1FD611998641200302043 /* DeprecatedNetworkEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5A1998641200302043 /* DeprecatedNetworkEnum.lua */; }; - 15D1FD621998641200302043 /* DeprecatedNetworkEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5A1998641200302043 /* DeprecatedNetworkEnum.lua */; }; - 15D1FD631998641200302043 /* DeprecatedNetworkEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5A1998641200302043 /* DeprecatedNetworkEnum.lua */; }; - 15D1FD641998641200302043 /* DeprecatedNetworkEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5A1998641200302043 /* DeprecatedNetworkEnum.lua */; }; - 15D1FD651998641200302043 /* DeprecatedNetworkFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5B1998641200302043 /* DeprecatedNetworkFunc.lua */; }; - 15D1FD661998641200302043 /* DeprecatedNetworkFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5B1998641200302043 /* DeprecatedNetworkFunc.lua */; }; - 15D1FD671998641200302043 /* DeprecatedNetworkFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5B1998641200302043 /* DeprecatedNetworkFunc.lua */; }; - 15D1FD681998641200302043 /* DeprecatedNetworkFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5B1998641200302043 /* DeprecatedNetworkFunc.lua */; }; - 15D1FD691998641200302043 /* NetworkConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5C1998641200302043 /* NetworkConstants.lua */; }; - 15D1FD6A1998641200302043 /* NetworkConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5C1998641200302043 /* NetworkConstants.lua */; }; - 15D1FD6B1998641200302043 /* NetworkConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5C1998641200302043 /* NetworkConstants.lua */; }; - 15D1FD6C1998641200302043 /* NetworkConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5C1998641200302043 /* NetworkConstants.lua */; }; - 15D1FD711998642800302043 /* DeprecatedUIEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD6D1998642800302043 /* DeprecatedUIEnum.lua */; }; - 15D1FD721998642800302043 /* DeprecatedUIEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD6D1998642800302043 /* DeprecatedUIEnum.lua */; }; - 15D1FD731998642800302043 /* DeprecatedUIFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD6E1998642800302043 /* DeprecatedUIFunc.lua */; }; - 15D1FD741998642800302043 /* DeprecatedUIFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD6E1998642800302043 /* DeprecatedUIFunc.lua */; }; - 15D1FD751998642800302043 /* experimentalUIConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD6F1998642800302043 /* experimentalUIConstants.lua */; }; - 15D1FD761998642800302043 /* experimentalUIConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD6F1998642800302043 /* experimentalUIConstants.lua */; }; - 15D1FD771998642800302043 /* GuiConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD701998642800302043 /* GuiConstants.lua */; }; - 15D1FD781998642800302043 /* GuiConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD701998642800302043 /* GuiConstants.lua */; }; - 15D7638219E8FC980069EAE8 /* CocosStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D7637E19E8FC980069EAE8 /* CocosStudio.lua */; }; - 15D7638319E8FC980069EAE8 /* CocosStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D7637E19E8FC980069EAE8 /* CocosStudio.lua */; }; - 15D7638419E8FC980069EAE8 /* CocosStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D7637E19E8FC980069EAE8 /* CocosStudio.lua */; }; - 15D7638519E8FC980069EAE8 /* CocosStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D7637E19E8FC980069EAE8 /* CocosStudio.lua */; }; - 15D7638619E8FC980069EAE8 /* DeprecatedCocoStudioClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D7637F19E8FC980069EAE8 /* DeprecatedCocoStudioClass.lua */; }; - 15D7638719E8FC980069EAE8 /* DeprecatedCocoStudioClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D7637F19E8FC980069EAE8 /* DeprecatedCocoStudioClass.lua */; }; - 15D7638819E8FC980069EAE8 /* DeprecatedCocoStudioClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D7637F19E8FC980069EAE8 /* DeprecatedCocoStudioClass.lua */; }; - 15D7638919E8FC980069EAE8 /* DeprecatedCocoStudioClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D7637F19E8FC980069EAE8 /* DeprecatedCocoStudioClass.lua */; }; - 15D7638A19E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D7638019E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua */; }; - 15D7638B19E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D7638019E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua */; }; - 15D7638C19E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D7638019E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua */; }; - 15D7638D19E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D7638019E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua */; }; - 15D7638E19E8FC980069EAE8 /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D7638119E8FC980069EAE8 /* StudioConstants.lua */; }; - 15D7638F19E8FC980069EAE8 /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D7638119E8FC980069EAE8 /* StudioConstants.lua */; }; - 15D7639019E8FC980069EAE8 /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D7638119E8FC980069EAE8 /* StudioConstants.lua */; }; - 15D7639119E8FC980069EAE8 /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D7638119E8FC980069EAE8 /* StudioConstants.lua */; }; 15E66FC8192D957100C20A52 /* Sprite3DTest in Resources */ = {isa = PBXBuildFile; fileRef = 3E92EA841921A7720094CD21 /* Sprite3DTest */; }; 15E66FD6192DC8C700C20A52 /* Sprite3DTest in Resources */ = {isa = PBXBuildFile; fileRef = 3E92EA841921A7720094CD21 /* Sprite3DTest */; }; 15EE465B19A7200300AF29F1 /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EE465A19A7200300AF29F1 /* libcurl.a */; }; @@ -1162,16 +994,6 @@ /* Begin PBXFileReference section */ 150F918619DA409E00B89F57 /* lua_test_bindings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_test_bindings.cpp; sourceTree = ""; }; 150F918719DA409E00B89F57 /* lua_test_bindings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_test_bindings.h; sourceTree = ""; }; - 1529F04219ED88640064B9B1 /* ltn12.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ltn12.lua; path = ../external/lua/luasocket/script/ltn12.lua; sourceTree = ""; }; - 1529F04319ED88640064B9B1 /* mime.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = mime.lua; path = ../external/lua/luasocket/script/mime.lua; sourceTree = ""; }; - 1529F04419ED88640064B9B1 /* socket.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = socket.lua; path = ../external/lua/luasocket/script/socket.lua; sourceTree = ""; }; - 1529F04B19ED88830064B9B1 /* ftp.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ftp.lua; path = ../external/lua/luasocket/script/socket/ftp.lua; sourceTree = ""; }; - 1529F04C19ED88830064B9B1 /* headers.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = headers.lua; path = ../external/lua/luasocket/script/socket/headers.lua; sourceTree = ""; }; - 1529F04D19ED88830064B9B1 /* http.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = http.lua; path = ../external/lua/luasocket/script/socket/http.lua; sourceTree = ""; }; - 1529F04E19ED88830064B9B1 /* mbox.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = mbox.lua; path = ../external/lua/luasocket/script/socket/mbox.lua; sourceTree = ""; }; - 1529F04F19ED88830064B9B1 /* smtp.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = smtp.lua; path = ../external/lua/luasocket/script/socket/smtp.lua; sourceTree = ""; }; - 1529F05019ED88830064B9B1 /* tp.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = tp.lua; path = ../external/lua/luasocket/script/socket/tp.lua; sourceTree = ""; }; - 1529F05119ED88830064B9B1 /* url.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = url.lua; path = ../external/lua/luasocket/script/socket/url.lua; sourceTree = ""; }; 15427B76198B750300DC375D /* lua_module_register.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_module_register.h; sourceTree = ""; }; 15427B77198B843300DC375D /* lua_module_register.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_module_register.h; sourceTree = ""; }; 15427B7B198B880100DC375D /* lua_cocos2dx_controller_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = lua_cocos2dx_controller_manual.cpp; path = "../../../../cocos/scripting/lua-bindings/manual/controller/lua_cocos2dx_controller_manual.cpp"; sourceTree = ""; }; @@ -2299,41 +2121,6 @@ 15CBA9DC196EEAA6005877BB /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; }; 15CBA9EB196F7BD8005877BB /* lua_cocos2dx_controller_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = lua_cocos2dx_controller_auto.cpp; path = "../../../../cocos/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.cpp"; sourceTree = ""; }; 15CBA9EC196F7BD8005877BB /* lua_cocos2dx_controller_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = lua_cocos2dx_controller_auto.hpp; path = "../../../../cocos/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.hpp"; sourceTree = ""; }; - 15D1FCDE1998637C00302043 /* bitExtend.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = bitExtend.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/bitExtend.lua"; sourceTree = ""; }; - 15D1FCDF1998637C00302043 /* Cocos2d.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2d.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/Cocos2d.lua"; sourceTree = ""; }; - 15D1FCE01998637C00302043 /* Cocos2dConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2dConstants.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/Cocos2dConstants.lua"; sourceTree = ""; }; - 15D1FCE11998637C00302043 /* DeprecatedCocos2dClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dClass.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dClass.lua"; sourceTree = ""; }; - 15D1FCE21998637C00302043 /* DeprecatedCocos2dEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dEnum.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dEnum.lua"; sourceTree = ""; }; - 15D1FCE31998637C00302043 /* DeprecatedCocos2dFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dFunc.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dFunc.lua"; sourceTree = ""; }; - 15D1FCE41998637C00302043 /* DeprecatedOpenglEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedOpenglEnum.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/DeprecatedOpenglEnum.lua"; sourceTree = ""; }; - 15D1FCE51998637C00302043 /* DrawPrimitives.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DrawPrimitives.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/DrawPrimitives.lua"; sourceTree = ""; }; - 15D1FCE61998637C00302043 /* extern.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = extern.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/extern.lua"; sourceTree = ""; }; - 15D1FCE71998637C00302043 /* json.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/json.lua"; sourceTree = ""; }; - 15D1FCE81998637C00302043 /* luaj.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaj.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/luaj.lua"; sourceTree = ""; }; - 15D1FCE91998637C00302043 /* luaoc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaoc.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/luaoc.lua"; sourceTree = ""; }; - 15D1FCEA1998637C00302043 /* Opengl.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Opengl.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/Opengl.lua"; sourceTree = ""; }; - 15D1FCEB1998637C00302043 /* OpenglConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OpenglConstants.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/OpenglConstants.lua"; sourceTree = ""; }; - 15D1FD32199863BA00302043 /* CCBReaderLoad.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CCBReaderLoad.lua; path = "../cocos/scripting/lua-bindings/script/cocosbuilder/CCBReaderLoad.lua"; sourceTree = ""; }; - 15D1FD33199863BA00302043 /* DeprecatedCocosBuilderClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosBuilderClass.lua; path = "../cocos/scripting/lua-bindings/script/cocosbuilder/DeprecatedCocosBuilderClass.lua"; sourceTree = ""; }; - 15D1FD38199863CA00302043 /* AudioEngine.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AudioEngine.lua; path = "../cocos/scripting/lua-bindings/script/cocosdenshion/AudioEngine.lua"; sourceTree = ""; }; - 15D1FD39199863CA00302043 /* DeprecatedCocosDenshionClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosDenshionClass.lua; path = "../cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionClass.lua"; sourceTree = ""; }; - 15D1FD3A199863CA00302043 /* DeprecatedCocosDenshionFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosDenshionFunc.lua; path = "../cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionFunc.lua"; sourceTree = ""; }; - 15D1FD4D199863F900302043 /* DeprecatedExtensionClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedExtensionClass.lua; path = "../cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionClass.lua"; sourceTree = ""; }; - 15D1FD4E199863F900302043 /* DeprecatedExtensionEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedExtensionEnum.lua; path = "../cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionEnum.lua"; sourceTree = ""; }; - 15D1FD4F199863F900302043 /* DeprecatedExtensionFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedExtensionFunc.lua; path = "../cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionFunc.lua"; sourceTree = ""; }; - 15D1FD50199863F900302043 /* ExtensionConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ExtensionConstants.lua; path = "../cocos/scripting/lua-bindings/script/extension/ExtensionConstants.lua"; sourceTree = ""; }; - 15D1FD591998641200302043 /* DeprecatedNetworkClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedNetworkClass.lua; path = "../cocos/scripting/lua-bindings/script/network/DeprecatedNetworkClass.lua"; sourceTree = ""; }; - 15D1FD5A1998641200302043 /* DeprecatedNetworkEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedNetworkEnum.lua; path = "../cocos/scripting/lua-bindings/script/network/DeprecatedNetworkEnum.lua"; sourceTree = ""; }; - 15D1FD5B1998641200302043 /* DeprecatedNetworkFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedNetworkFunc.lua; path = "../cocos/scripting/lua-bindings/script/network/DeprecatedNetworkFunc.lua"; sourceTree = ""; }; - 15D1FD5C1998641200302043 /* NetworkConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = NetworkConstants.lua; path = "../cocos/scripting/lua-bindings/script/network/NetworkConstants.lua"; sourceTree = ""; }; - 15D1FD6D1998642800302043 /* DeprecatedUIEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedUIEnum.lua; path = "../cocos/scripting/lua-bindings/script/ui/DeprecatedUIEnum.lua"; sourceTree = ""; }; - 15D1FD6E1998642800302043 /* DeprecatedUIFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedUIFunc.lua; path = "../cocos/scripting/lua-bindings/script/ui/DeprecatedUIFunc.lua"; sourceTree = ""; }; - 15D1FD6F1998642800302043 /* experimentalUIConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = experimentalUIConstants.lua; path = "../cocos/scripting/lua-bindings/script/ui/experimentalUIConstants.lua"; sourceTree = ""; }; - 15D1FD701998642800302043 /* GuiConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = GuiConstants.lua; path = "../cocos/scripting/lua-bindings/script/ui/GuiConstants.lua"; sourceTree = ""; }; - 15D7637E19E8FC980069EAE8 /* CocosStudio.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CocosStudio.lua; path = "../cocos/scripting/lua-bindings/script/cocosstudio/CocosStudio.lua"; sourceTree = ""; }; - 15D7637F19E8FC980069EAE8 /* DeprecatedCocoStudioClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocoStudioClass.lua; path = "../cocos/scripting/lua-bindings/script/cocosstudio/DeprecatedCocoStudioClass.lua"; sourceTree = ""; }; - 15D7638019E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocoStudioFunc.lua; path = "../cocos/scripting/lua-bindings/script/cocosstudio/DeprecatedCocoStudioFunc.lua"; sourceTree = ""; }; - 15D7638119E8FC980069EAE8 /* StudioConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = StudioConstants.lua; path = "../cocos/scripting/lua-bindings/script/cocosstudio/StudioConstants.lua"; sourceTree = ""; }; 15EE465A19A7200300AF29F1 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = ../external/curl/prebuilt/ios/libcurl.a; sourceTree = ""; }; 1A0EE2B218CDF6DA004CD58F /* cpp-empty-test Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "cpp-empty-test Mac.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 1A0EE31418CDF733004CD58F /* lua-empty-test Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "lua-empty-test Mac.app"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -5317,58 +5104,6 @@ name = "Other Frameworks"; sourceTree = ""; }; - 1ABCA36418CD9E060087CE3A /* Lua Common */ = { - isa = PBXGroup; - children = ( - 1529F04B19ED88830064B9B1 /* ftp.lua */, - 1529F04C19ED88830064B9B1 /* headers.lua */, - 1529F04D19ED88830064B9B1 /* http.lua */, - 1529F04E19ED88830064B9B1 /* mbox.lua */, - 1529F04F19ED88830064B9B1 /* smtp.lua */, - 1529F05019ED88830064B9B1 /* tp.lua */, - 1529F05119ED88830064B9B1 /* url.lua */, - 1529F04219ED88640064B9B1 /* ltn12.lua */, - 1529F04319ED88640064B9B1 /* mime.lua */, - 1529F04419ED88640064B9B1 /* socket.lua */, - 15D7637E19E8FC980069EAE8 /* CocosStudio.lua */, - 15D7637F19E8FC980069EAE8 /* DeprecatedCocoStudioClass.lua */, - 15D7638019E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua */, - 15D7638119E8FC980069EAE8 /* StudioConstants.lua */, - 15D1FD6D1998642800302043 /* DeprecatedUIEnum.lua */, - 15D1FD6E1998642800302043 /* DeprecatedUIFunc.lua */, - 15D1FD6F1998642800302043 /* experimentalUIConstants.lua */, - 15D1FD701998642800302043 /* GuiConstants.lua */, - 15D1FD591998641200302043 /* DeprecatedNetworkClass.lua */, - 15D1FD5A1998641200302043 /* DeprecatedNetworkEnum.lua */, - 15D1FD5B1998641200302043 /* DeprecatedNetworkFunc.lua */, - 15D1FD5C1998641200302043 /* NetworkConstants.lua */, - 15D1FD4D199863F900302043 /* DeprecatedExtensionClass.lua */, - 15D1FD4E199863F900302043 /* DeprecatedExtensionEnum.lua */, - 15D1FD4F199863F900302043 /* DeprecatedExtensionFunc.lua */, - 15D1FD50199863F900302043 /* ExtensionConstants.lua */, - 15D1FD38199863CA00302043 /* AudioEngine.lua */, - 15D1FD39199863CA00302043 /* DeprecatedCocosDenshionClass.lua */, - 15D1FD3A199863CA00302043 /* DeprecatedCocosDenshionFunc.lua */, - 15D1FD32199863BA00302043 /* CCBReaderLoad.lua */, - 15D1FD33199863BA00302043 /* DeprecatedCocosBuilderClass.lua */, - 15D1FCDE1998637C00302043 /* bitExtend.lua */, - 15D1FCDF1998637C00302043 /* Cocos2d.lua */, - 15D1FCE01998637C00302043 /* Cocos2dConstants.lua */, - 15D1FCE11998637C00302043 /* DeprecatedCocos2dClass.lua */, - 15D1FCE21998637C00302043 /* DeprecatedCocos2dEnum.lua */, - 15D1FCE31998637C00302043 /* DeprecatedCocos2dFunc.lua */, - 15D1FCE41998637C00302043 /* DeprecatedOpenglEnum.lua */, - 15D1FCE51998637C00302043 /* DrawPrimitives.lua */, - 15D1FCE61998637C00302043 /* extern.lua */, - 15D1FCE71998637C00302043 /* json.lua */, - 15D1FCE81998637C00302043 /* luaj.lua */, - 15D1FCE91998637C00302043 /* luaoc.lua */, - 15D1FCEA1998637C00302043 /* Opengl.lua */, - 15D1FCEB1998637C00302043 /* OpenglConstants.lua */, - ); - name = "Lua Common"; - sourceTree = ""; - }; 1AC358B618CEC19F00F37B72 /* cpp-empty-test */ = { isa = PBXGroup; children = ( @@ -6950,7 +6685,6 @@ 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */, 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */, 29B97323FDCFA39411CA2CEA /* Frameworks */, - 1ABCA36418CD9E060087CE3A /* Lua Common */, 19C28FACFE9D520D11CA2CBB /* Products */, 1AC35E0318CEE78300F37B72 /* tests */, ); @@ -7217,6 +6951,7 @@ 15CBA020196EE56C005877BB /* Sources */, 15CBA025196EE56C005877BB /* Frameworks */, 15CBA036196EE56C005877BB /* Resources */, + 1529F07B19EDA35E0064B9B1 /* ShellScript */, ); buildRules = ( ); @@ -7254,6 +6989,7 @@ 1A0EE2C318CDF733004CD58F /* Sources */, 1A0EE2C818CDF733004CD58F /* Frameworks */, 1A0EE2D818CDF733004CD58F /* Resources */, + 1529F07D19EDA3B90064B9B1 /* ShellScript */, ); buildRules = ( ); @@ -7291,6 +7027,7 @@ 1A0EE42418CDF799004CD58F /* Sources */, 1A0EE42B18CDF799004CD58F /* Frameworks */, 1A0EE43B18CDF799004CD58F /* Resources */, + 1529F07C19EDA3860064B9B1 /* ShellScript */, ); buildRules = ( ); @@ -7307,9 +7044,11 @@ isa = PBXNativeTarget; buildConfigurationList = 1ABCA2B218CD91520087CE3A /* Build configuration list for PBXNativeTarget "lua-tests Mac" */; buildPhases = ( + 1529F07F19EDA4260064B9B1 /* ShellScript */, 1ABCA28218CD91510087CE3A /* Sources */, 1ABCA28318CD91510087CE3A /* Frameworks */, 1ABCA28418CD91510087CE3A /* Resources */, + 1529F07E19EDA3F20064B9B1 /* ShellScript */, ); buildRules = ( ); @@ -7330,6 +7069,7 @@ 1ABCA2C918CD93580087CE3A /* Sources */, 1ABCA2CA18CD93580087CE3A /* Frameworks */, 1ABCA2CB18CD93580087CE3A /* Resources */, + 1529F07A19EDA0650064B9B1 /* ShellScript */, ); buildRules = ( ); @@ -7483,24 +7223,10 @@ buildActionMask = 2147483647; files = ( 15CBA9B3196EE824005877BB /* src in Resources */, - 15D1FD311998637C00302043 /* OpenglConstants.lua in Resources */, - 15D1FD131998637C00302043 /* DrawPrimitives.lua in Resources */, 15CBA9AF196EE80B005877BB /* fonts in Resources */, - 15D1FD2C1998637C00302043 /* Opengl.lua in Resources */, 15CBA9B0196EE80B005877BB /* ipad in Resources */, - 15D1FD221998637C00302043 /* luaj.lua in Resources */, - 15D1FD0E1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */, 15CBA9B1196EE80B005877BB /* ipadhd in Resources */, - 15D1FD091998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */, - 15D1FCFF1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */, - 15D1FCF01998637C00302043 /* bitExtend.lua in Resources */, - 15D1FD041998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */, - 15D1FD1D1998637C00302043 /* json.lua in Resources */, - 15D1FD181998637C00302043 /* extern.lua in Resources */, 15CBA9B2196EE80B005877BB /* iphone in Resources */, - 15D1FD271998637C00302043 /* luaoc.lua in Resources */, - 15D1FCFA1998637C00302043 /* Cocos2dConstants.lua in Resources */, - 15D1FCF51998637C00302043 /* Cocos2d.lua in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -7523,43 +7249,11 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 15D7638719E8FC980069EAE8 /* DeprecatedCocoStudioClass.lua in Resources */, 1AC35D5C18CEDE9E00F37B72 /* InfoPlist.strings in Resources */, 1AC35D5D18CEDE9E00F37B72 /* MainMenu.xib in Resources */, - 15D1FD621998641200302043 /* DeprecatedNetworkEnum.lua in Resources */, - 15D1FD2E1998637C00302043 /* OpenglConstants.lua in Resources */, - 15D1FD1F1998637C00302043 /* luaj.lua in Resources */, - 15D1FCED1998637C00302043 /* bitExtend.lua in Resources */, - 1529F06319ED8A4E0064B9B1 /* mbox.lua in Resources */, - 1529F06619ED8A4E0064B9B1 /* url.lua in Resources */, - 15D1FD291998637C00302043 /* Opengl.lua in Resources */, - 15D7638F19E8FC980069EAE8 /* StudioConstants.lua in Resources */, - 15D1FCF71998637C00302043 /* Cocos2dConstants.lua in Resources */, - 1529F06219ED8A4E0064B9B1 /* http.lua in Resources */, - 15D1FD0B1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */, - 15D7638B19E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua in Resources */, - 15D7638319E8FC980069EAE8 /* CocosStudio.lua in Resources */, - 1529F06819ED8A4E0064B9B1 /* mime.lua in Resources */, - 15D1FD661998641200302043 /* DeprecatedNetworkFunc.lua in Resources */, - 15D1FD241998637C00302043 /* luaoc.lua in Resources */, 1AC35D5E18CEDE9E00F37B72 /* Icon.icns in Resources */, - 15D1FCF21998637C00302043 /* Cocos2d.lua in Resources */, - 15D1FD061998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */, - 15D1FD151998637C00302043 /* extern.lua in Resources */, - 1529F06719ED8A4E0064B9B1 /* ltn12.lua in Resources */, - 15D1FD5E1998641200302043 /* DeprecatedNetworkClass.lua in Resources */, - 15D1FD6A1998641200302043 /* NetworkConstants.lua in Resources */, - 15D1FD011998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */, - 15D1FD1A1998637C00302043 /* json.lua in Resources */, - 15D1FD101998637C00302043 /* DrawPrimitives.lua in Resources */, - 1529F06919ED8A4E0064B9B1 /* socket.lua in Resources */, 1AC35D2918CEDE7200F37B72 /* res in Resources */, - 1529F06019ED8A4E0064B9B1 /* ftp.lua in Resources */, - 1529F06519ED8A4E0064B9B1 /* tp.lua in Resources */, - 1529F06419ED8A4E0064B9B1 /* smtp.lua in Resources */, - 15D1FCFC1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */, 1AC35D2B18CEDE7200F37B72 /* src in Resources */, - 1529F06119ED8A4E0064B9B1 /* headers.lua in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -7593,50 +7287,18 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 15D1FD171998637C00302043 /* extern.lua in Resources */, - 15D1FD641998641200302043 /* DeprecatedNetworkEnum.lua in Resources */, - 15D7638D19E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua in Resources */, - 1529F07219ED8A510064B9B1 /* mime.lua in Resources */, - 15D1FCF41998637C00302043 /* Cocos2d.lua in Resources */, - 1529F06E19ED8A510064B9B1 /* smtp.lua in Resources */, - 15D7638519E8FC980069EAE8 /* CocosStudio.lua in Resources */, 1AC35D4A18CEDE9400F37B72 /* Icon-120.png in Resources */, - 15D1FD681998641200302043 /* DeprecatedNetworkFunc.lua in Resources */, 1AC35D4D18CEDE9400F37B72 /* Icon-57.png in Resources */, - 15D1FD121998637C00302043 /* DrawPrimitives.lua in Resources */, - 1529F07319ED8A510064B9B1 /* socket.lua in Resources */, - 1529F06F19ED8A510064B9B1 /* tp.lua in Resources */, 1AC35D4B18CEDE9400F37B72 /* Icon-144.png in Resources */, 1AC35D4618CEDE9400F37B72 /* Default-568h@2x.png in Resources */, - 1529F06B19ED8A510064B9B1 /* headers.lua in Resources */, 1AC35D4818CEDE9400F37B72 /* Default@2x.png in Resources */, - 15D1FD601998641200302043 /* DeprecatedNetworkClass.lua in Resources */, - 15D1FD2B1998637C00302043 /* Opengl.lua in Resources */, - 15D7639119E8FC980069EAE8 /* StudioConstants.lua in Resources */, 1AC35D4E18CEDE9400F37B72 /* Icon-72.png in Resources */, 1AC35D4F18CEDE9400F37B72 /* Icon-76.png in Resources */, - 15D1FD1C1998637C00302043 /* json.lua in Resources */, - 15D1FCF91998637C00302043 /* Cocos2dConstants.lua in Resources */, - 1529F07119ED8A510064B9B1 /* ltn12.lua in Resources */, - 15D1FD301998637C00302043 /* OpenglConstants.lua in Resources */, 1AC35D4918CEDE9400F37B72 /* Icon-114.png in Resources */, - 15D7638919E8FC980069EAE8 /* DeprecatedCocoStudioClass.lua in Resources */, - 15D1FCEF1998637C00302043 /* bitExtend.lua in Resources */, 1AC35D2A18CEDE7200F37B72 /* res in Resources */, - 1529F06C19ED8A510064B9B1 /* http.lua in Resources */, 1AC35D2C18CEDE7200F37B72 /* src in Resources */, 1AC35D4C18CEDE9400F37B72 /* Icon-152.png in Resources */, - 15D1FD031998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */, - 15D1FD211998637C00302043 /* luaj.lua in Resources */, - 15D1FCFE1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */, - 15D1FD6C1998641200302043 /* NetworkConstants.lua in Resources */, - 1529F07019ED8A510064B9B1 /* url.lua in Resources */, 1AC35D4718CEDE9400F37B72 /* Default.png in Resources */, - 15D1FD261998637C00302043 /* luaoc.lua in Resources */, - 1529F06D19ED8A510064B9B1 /* mbox.lua in Resources */, - 1529F06A19ED8A510064B9B1 /* ftp.lua in Resources */, - 15D1FD081998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */, - 15D1FD0D1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -7644,86 +7306,41 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 1529F05E19ED88830064B9B1 /* url.lua in Resources */, - 15D1FD751998642800302043 /* experimentalUIConstants.lua in Resources */, 156EAE071977D0BD00F53709 /* ActionTimeline in Resources */, - 15D7638219E8FC980069EAE8 /* CocosStudio.lua in Resources */, 15E66FD6192DC8C700C20A52 /* Sprite3DTest in Resources */, - 15D1FD001998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */, - 15D1FD2D1998637C00302043 /* OpenglConstants.lua in Resources */, - 15D1FCF11998637C00302043 /* Cocos2d.lua in Resources */, 3E2F27BC19D00D7200E7C490 /* audio in Resources */, 1AC35DC318CEE65100F37B72 /* Misc in Resources */, 1AC35DC618CEE65100F37B72 /* Shaders in Resources */, - 1529F05C19ED88830064B9B1 /* tp.lua in Resources */, - 15D1FD141998637C00302043 /* extern.lua in Resources */, 1AC35DBB18CEE65100F37B72 /* components in Resources */, - 15D7638E19E8FC980069EAE8 /* StudioConstants.lua in Resources */, 1AC35DE218CEE65900F37B72 /* effect2.ogg in Resources */, - 1529F05A19ED88830064B9B1 /* smtp.lua in Resources */, - 15D1FD651998641200302043 /* DeprecatedNetworkFunc.lua in Resources */, 1AC35DB118CEE5DA00F37B72 /* InfoPlist.strings in Resources */, 1AC35DDD18CEE65900F37B72 /* CocosBuilderExample.ccbproj in Resources */, 1AC35DB218CEE5DA00F37B72 /* MainMenu.xib in Resources */, - 15D1FD53199863F900302043 /* DeprecatedExtensionEnum.lua in Resources */, 1AC35DBF18CEE65100F37B72 /* hd in Resources */, 1AC35DC818CEE65100F37B72 /* TileMaps in Resources */, 1AC35DBE18CEE65100F37B72 /* fonts in Resources */, - 15D7638619E8FC980069EAE8 /* DeprecatedCocoStudioClass.lua in Resources */, - 15D1FD691998641200302043 /* NetworkConstants.lua in Resources */, 1AC35DDE18CEE65900F37B72 /* CocosBuilderExample.ccbresourcelog in Resources */, - 15D1FD34199863BA00302043 /* CCBReaderLoad.lua in Resources */, 1AC35DBC18CEE65100F37B72 /* configs in Resources */, - 1529F05219ED88830064B9B1 /* ftp.lua in Resources */, - 15D1FD611998641200302043 /* DeprecatedNetworkEnum.lua in Resources */, 1AC35DE118CEE65900F37B72 /* background.ogg in Resources */, - 1529F04919ED88640064B9B1 /* socket.lua in Resources */, 1AC35DDF18CEE65900F37B72 /* music.mid in Resources */, 1AC35D7518CEE58500F37B72 /* src in Resources */, 1AC35DE018CEE65900F37B72 /* background.mp3 in Resources */, 1A1645A6191B6281008C7C7F /* ccs-res in Resources */, C08689C218D370C90093E810 /* background.caf in Resources */, - 15D1FD0A1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */, - 15D7638A19E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua in Resources */, - 15D1FD281998637C00302043 /* Opengl.lua in Resources */, 1AC35DE918CEE65900F37B72 /* effect1.wav in Resources */, 3E2F27BD19D00D7D00E7C490 /* background.wav in Resources */, - 15D1FD57199863F900302043 /* ExtensionConstants.lua in Resources */, 1AC35DE518CEE65900F37B72 /* Hello.png in Resources */, - 1529F05419ED88830064B9B1 /* headers.lua in Resources */, 1AC35DEA18CEE65900F37B72 /* pew-pew-lei.wav in Resources */, 1AC35DC418CEE65100F37B72 /* Particles in Resources */, - 15D1FD3F199863CA00302043 /* DeprecatedCocosDenshionFunc.lua in Resources */, - 15D1FD191998637C00302043 /* json.lua in Resources */, 1AC35DB918CEE65100F37B72 /* ccb in Resources */, - 15D1FD55199863F900302043 /* DeprecatedExtensionFunc.lua in Resources */, - 15D1FD3B199863CA00302043 /* AudioEngine.lua in Resources */, - 1529F05619ED88830064B9B1 /* http.lua in Resources */, - 15D1FD231998637C00302043 /* luaoc.lua in Resources */, 1AC35DB318CEE5DA00F37B72 /* Icon.icns in Resources */, - 15D1FD051998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */, - 15D1FD3D199863CA00302043 /* DeprecatedCocosDenshionClass.lua in Resources */, - 15D1FD731998642800302043 /* DeprecatedUIFunc.lua in Resources */, 1AC35DE318CEE65900F37B72 /* fileLookup.plist in Resources */, - 15D1FD36199863BA00302043 /* DeprecatedCocosBuilderClass.lua in Resources */, - 15D1FCF61998637C00302043 /* Cocos2dConstants.lua in Resources */, - 1529F04719ED88640064B9B1 /* mime.lua in Resources */, - 15D1FD0F1998637C00302043 /* DrawPrimitives.lua in Resources */, - 15D1FD711998642800302043 /* DeprecatedUIEnum.lua in Resources */, - 1529F04519ED88640064B9B1 /* ltn12.lua in Resources */, 1AC35DE618CEE65900F37B72 /* effect1.raw in Resources */, 1AC35DC018CEE65100F37B72 /* Images in Resources */, - 15D1FD5D1998641200302043 /* DeprecatedNetworkClass.lua in Resources */, 1AC35D7918CEE59900F37B72 /* cocosbuilderRes in Resources */, 1AC35DC918CEE65100F37B72 /* zwoptex in Resources */, - 15D1FCEC1998637C00302043 /* bitExtend.lua in Resources */, - 1529F05819ED88830064B9B1 /* mbox.lua in Resources */, - 15D1FD51199863F900302043 /* DeprecatedExtensionClass.lua in Resources */, 1AC35DBD18CEE65100F37B72 /* extensions in Resources */, - 15D1FD771998642800302043 /* GuiConstants.lua in Resources */, - 15D1FD1E1998637C00302043 /* luaj.lua in Resources */, 1AC35DC718CEE65100F37B72 /* spine in Resources */, - 15D1FCFB1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */, 1AC35DB718CEE65100F37B72 /* animations in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -7735,91 +7352,46 @@ 15AECE0F195C1FDD00907DB0 /* cocosvideo.mp4 in Resources */, 15B0870D195AD52000D6F62B /* ActionTimeline in Resources */, 15E66FC8192D957100C20A52 /* Sprite3DTest in Resources */, - 15D1FD58199863F900302043 /* ExtensionConstants.lua in Resources */, - 15D1FD111998637C00302043 /* DrawPrimitives.lua in Resources */, - 15D1FD1B1998637C00302043 /* json.lua in Resources */, 1AC35DD618CEE65200F37B72 /* Misc in Resources */, - 15D1FD3E199863CA00302043 /* DeprecatedCocosDenshionClass.lua in Resources */, 1AC35DF718CEE65B00F37B72 /* effect1.wav in Resources */, C08689C418D370C90093E810 /* background.caf in Resources */, 1AC35DD118CEE65200F37B72 /* fonts in Resources */, 1AC35DCC18CEE65200F37B72 /* ccb in Resources */, 1AC35DD218CEE65200F37B72 /* hd in Resources */, - 15D1FD251998637C00302043 /* luaoc.lua in Resources */, 1AC35DD718CEE65200F37B72 /* Particles in Resources */, - 15D1FD761998642800302043 /* experimentalUIConstants.lua in Resources */, 3E2BDB0219C5E5D40055CDCD /* background.wav in Resources */, 1AC35D9D18CEE5D100F37B72 /* Icon-120.png in Resources */, - 1529F05319ED88830064B9B1 /* ftp.lua in Resources */, - 15D1FD781998642800302043 /* GuiConstants.lua in Resources */, 1AC35DA018CEE5D100F37B72 /* Icon-57.png in Resources */, 1AC35DF118CEE65B00F37B72 /* fileLookup.plist in Resources */, 1AC35DEF18CEE65B00F37B72 /* background.ogg in Resources */, 1AC35D9E18CEE5D100F37B72 /* Icon-144.png in Resources */, - 1529F05919ED88830064B9B1 /* mbox.lua in Resources */, - 15D1FD021998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */, 1AC35DF818CEE65B00F37B72 /* pew-pew-lei.wav in Resources */, 1AC35D9918CEE5D100F37B72 /* Default-568h@2x.png in Resources */, - 15D1FD071998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */, - 15D1FD201998637C00302043 /* luaj.lua in Resources */, 1AC35D9B18CEE5D100F37B72 /* Default@2x.png in Resources */, 1AC35DCE18CEE65200F37B72 /* components in Resources */, - 15D1FD631998641200302043 /* DeprecatedNetworkEnum.lua in Resources */, 1AC35D7618CEE58500F37B72 /* src in Resources */, 1AC35DDC18CEE65200F37B72 /* zwoptex in Resources */, - 1529F04A19ED88640064B9B1 /* socket.lua in Resources */, 1AC35DEC18CEE65B00F37B72 /* CocosBuilderExample.ccbresourcelog in Resources */, - 15D1FD3C199863CA00302043 /* AudioEngine.lua in Resources */, - 15D1FD35199863BA00302043 /* CCBReaderLoad.lua in Resources */, 1AC35DED18CEE65B00F37B72 /* music.mid in Resources */, - 15D1FCFD1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */, - 15D1FD721998642800302043 /* DeprecatedUIEnum.lua in Resources */, - 15D1FD5F1998641200302043 /* DeprecatedNetworkClass.lua in Resources */, - 15D1FD0C1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */, - 15D1FD6B1998641200302043 /* NetworkConstants.lua in Resources */, - 1529F04619ED88640064B9B1 /* ltn12.lua in Resources */, 1AC35DD018CEE65200F37B72 /* extensions in Resources */, - 15D1FD2A1998637C00302043 /* Opengl.lua in Resources */, - 15D1FCF81998637C00302043 /* Cocos2dConstants.lua in Resources */, 1AC35DD318CEE65200F37B72 /* Images in Resources */, - 1529F05D19ED88830064B9B1 /* tp.lua in Resources */, 1AC35DF018CEE65B00F37B72 /* effect2.ogg in Resources */, 3E2BDAFF19C5E5B40055CDCD /* audio in Resources */, 1AC35DEB18CEE65B00F37B72 /* CocosBuilderExample.ccbproj in Resources */, - 15D1FD56199863F900302043 /* DeprecatedExtensionFunc.lua in Resources */, 1AC35DCA18CEE65200F37B72 /* animations in Resources */, - 15D1FD54199863F900302043 /* DeprecatedExtensionEnum.lua in Resources */, - 15D1FD2F1998637C00302043 /* OpenglConstants.lua in Resources */, - 15D1FD671998641200302043 /* DeprecatedNetworkFunc.lua in Resources */, - 1529F05B19ED88830064B9B1 /* smtp.lua in Resources */, 1A1645A9191B6283008C7C7F /* ccs-res in Resources */, - 15D1FD37199863BA00302043 /* DeprecatedCocosBuilderClass.lua in Resources */, - 1529F05519ED88830064B9B1 /* headers.lua in Resources */, 1AC35DA118CEE5D100F37B72 /* Icon-72.png in Resources */, - 15D7638819E8FC980069EAE8 /* DeprecatedCocoStudioClass.lua in Resources */, - 15D1FD161998637C00302043 /* extern.lua in Resources */, 1AC35DA218CEE5D100F37B72 /* Icon-76.png in Resources */, - 1529F04819ED88640064B9B1 /* mime.lua in Resources */, - 1529F05719ED88830064B9B1 /* http.lua in Resources */, - 15D1FD40199863CA00302043 /* DeprecatedCocosDenshionFunc.lua in Resources */, - 15D7638419E8FC980069EAE8 /* CocosStudio.lua in Resources */, 1AC35DF418CEE65B00F37B72 /* effect1.raw in Resources */, 1AC35DD918CEE65200F37B72 /* Shaders in Resources */, - 1529F05F19ED88830064B9B1 /* url.lua in Resources */, 1AC35DCF18CEE65200F37B72 /* configs in Resources */, 1AC35DDA18CEE65200F37B72 /* spine in Resources */, - 15D1FD741998642800302043 /* DeprecatedUIFunc.lua in Resources */, 1AC35DDB18CEE65200F37B72 /* TileMaps in Resources */, - 15D1FCEE1998637C00302043 /* bitExtend.lua in Resources */, 1AC35DF318CEE65B00F37B72 /* Hello.png in Resources */, - 15D1FCF31998637C00302043 /* Cocos2d.lua in Resources */, 1AC35D7A18CEE59900F37B72 /* cocosbuilderRes in Resources */, 1AC35D9C18CEE5D100F37B72 /* Icon-114.png in Resources */, - 15D1FD52199863F900302043 /* DeprecatedExtensionClass.lua in Resources */, 1AC35D9F18CEE5D100F37B72 /* Icon-152.png in Resources */, - 15D7638C19E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua in Resources */, 1AC35DEE18CEE65B00F37B72 /* background.mp3 in Resources */, - 15D7639019E8FC980069EAE8 /* StudioConstants.lua in Resources */, 1AC35D9A18CEE5D100F37B72 /* Default.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -7964,6 +7536,84 @@ shellPath = /bin/sh; shellScript = "find ${SRCROOT}/../tests/lua-tests/src/ -name \"*\" -exec touch -cm {} \\;"; }; + 1529F07A19EDA0650064B9B1 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "#!/bin/bash\ncocos_dir=${SRCROOT}/../tests/lua-tests/src/cocos\nif [ -d \"${cocos_dir}\" ]; then\nrm -rv \"${cocos_dir}\"\nmkdir \"${cocos_dir}\"\nelse\nmkdir \"${cocos_dir}\"\nfi\n\ncp -r \"${SRCROOT}/../cocos/scripting/lua-bindings/script/\" \"${cocos_dir}\""; + }; + 1529F07B19EDA35E0064B9B1 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "#!/bin/bash\ncocos_dir=${SRCROOT}/../tests/lua-game-controller-test/src/cocos\nif [ -d \"${cocos_dir}\" ]; then\nrm -rv \"${cocos_dir}\"\nmkdir \"${cocos_dir}\"\nelse\nmkdir \"${cocos_dir}\"\nfi\n\ncp -r \"${SRCROOT}/../cocos/scripting/lua-bindings/script/\" \"${cocos_dir}\""; + }; + 1529F07C19EDA3860064B9B1 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "#!/bin/bash\ncocos_dir=${SRCROOT}/../tests/lua-empty-test/src/cocos\nif [ -d \"${cocos_dir}\" ]; then\nrm -rv \"${cocos_dir}\"\nmkdir \"${cocos_dir}\"\nelse\nmkdir \"${cocos_dir}\"\nfi\n\ncp -r \"${SRCROOT}/../cocos/scripting/lua-bindings/script/\" \"${cocos_dir}\""; + }; + 1529F07D19EDA3B90064B9B1 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "#!/bin/bash\ncocos_dir=${SRCROOT}/../tests/lua-empty-test/src/cocos\nif [ -d \"${cocos_dir}\" ]; then\nrm -rv \"${cocos_dir}\"\nmkdir \"${cocos_dir}\"\nelse\nmkdir \"${cocos_dir}\"\nfi\n\ncp -r \"${SRCROOT}/../cocos/scripting/lua-bindings/script/\" \"${cocos_dir}\""; + }; + 1529F07E19EDA3F20064B9B1 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "#!/bin/bash\ncocos_dir=${SRCROOT}/../tests/lua-tests/src/cocos\nif [ -d \"${cocos_dir}\" ]; then\nrm -rv \"${cocos_dir}\"\nmkdir \"${cocos_dir}\"\nelse\nmkdir \"${cocos_dir}\"\nfi\n\ncp -r \"${SRCROOT}/../cocos/scripting/lua-bindings/script/\" \"${cocos_dir}\""; + }; + 1529F07F19EDA4260064B9B1 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "find ${SRCROOT}/../tests/lua-tests/src/ -name \"*\" -exec touch -cm {} \\;"; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/cocos/2d/CCClippingRectangleNode.cpp b/cocos/2d/CCClippingRectangleNode.cpp new file mode 100644 index 0000000000..fa0cb5549d --- /dev/null +++ b/cocos/2d/CCClippingRectangleNode.cpp @@ -0,0 +1,84 @@ + +#include "CCClippingRectangleNode.h" +#include "base/CCDirector.h" +#include "renderer/CCRenderer.h" +#include "math/Vec2.h" +#include "CCGLView.h" + +NS_CC_BEGIN + +ClippingRectangleNode* ClippingRectangleNode::create(const Rect& clippingRegion) +{ + ClippingRectangleNode* node = new ClippingRectangleNode(); + if (node && node->init()) { + node->setClippingRegion(clippingRegion); + node->autorelease(); + } else { + CC_SAFE_DELETE(node); + } + + return node; +} + +ClippingRectangleNode* ClippingRectangleNode::create() +{ + ClippingRectangleNode* node = new ClippingRectangleNode(); + if (node && node->init()) { + node->autorelease(); + } else { + CC_SAFE_DELETE(node); + } + + return node; +} + +void ClippingRectangleNode::setClippingRegion(const Rect &clippingRegion) +{ + _clippingRegion = clippingRegion; +} + +void ClippingRectangleNode::onBeforeVisitScissor() +{ + if (_clippingEnabled) { + glEnable(GL_SCISSOR_TEST); + + float scaleX = _scaleX; + float scaleY = _scaleY; + Node *parent = this->getParent(); + while (parent) { + scaleX *= parent->getScaleX(); + scaleY *= parent->getScaleY(); + parent = parent->getParent(); + } + + const Point pos = convertToWorldSpace(Point(_clippingRegion.origin.x, _clippingRegion.origin.y)); + GLView* glView = Director::getInstance()->getOpenGLView(); + glView->setScissorInPoints(pos.x * scaleX, + pos.y * scaleY, + _clippingRegion.size.width * scaleX, + _clippingRegion.size.height * scaleY); + } +} + +void ClippingRectangleNode::onAfterVisitScissor() +{ + if (_clippingEnabled) + { + glDisable(GL_SCISSOR_TEST); + } +} + +void ClippingRectangleNode::visit(Renderer *renderer, const Mat4 &parentTransform, uint32_t parentFlags) +{ + _beforeVisitCmdScissor.init(_globalZOrder); + _beforeVisitCmdScissor.func = CC_CALLBACK_0(ClippingRectangleNode::onBeforeVisitScissor, this); + renderer->addCommand(&_beforeVisitCmdScissor); + + Node::visit(renderer, parentTransform, parentFlags); + + _afterVisitCmdScissor.init(_globalZOrder); + _afterVisitCmdScissor.func = CC_CALLBACK_0(ClippingRectangleNode::onAfterVisitScissor, this); + renderer->addCommand(&_afterVisitCmdScissor); +} + +NS_CC_END diff --git a/cocos/2d/CCClippingRectangleNode.h b/cocos/2d/CCClippingRectangleNode.h new file mode 100644 index 0000000000..08e2673730 --- /dev/null +++ b/cocos/2d/CCClippingRectangleNode.h @@ -0,0 +1,77 @@ +/* + * cocos2d for iPhone: http://www.cocos2d-iphone.org + * cocos2d-x: http://www.cocos2d-x.org + * + * Copyright (c) 2012 Pierre-David Bélanger + * Copyright (c) 2012 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 __MISCNODE_CCCLIPPING_RECTANGLE_NODE_H__ +#define __MISCNODE_CCCLIPPING_RECTANGLE_NODE_H__ + +#include "2d/CCNode.h" +#include "renderer/CCCustomCommand.h" +#include "platform/CCGL.h" + +NS_CC_BEGIN + +class CC_DLL ClippingRectangleNode : public Node +{ +public: + static ClippingRectangleNode* create(const Rect& clippingRegion); + static ClippingRectangleNode* create(); + + const Rect& getClippingRegion() const { + return _clippingRegion; + } + void setClippingRegion(const Rect& clippingRegion); + + const bool isClippingEnabled() const { + return _clippingEnabled; + } + void setClippingEnabled(bool enabled) { + _clippingEnabled = enabled; + } + + //virtual void draw(Renderer* renderer, const Mat4 &transform, uint32_t flags) override; + virtual void visit(Renderer *renderer, const Mat4 &parentTransform, uint32_t parentFlags) override; + +protected: + ClippingRectangleNode() + : _clippingEnabled(true) + { + } + + void onBeforeVisitScissor(); + void onAfterVisitScissor(); + + Rect _clippingRegion; + bool _clippingEnabled; + + CustomCommand _beforeVisitCmdScissor; + CustomCommand _afterVisitCmdScissor; +}; + +NS_CC_END + +#endif + diff --git a/cocos/2d/CMakeLists.txt b/cocos/2d/CMakeLists.txt index 356c94dbad..bfbd6a8447 100644 --- a/cocos/2d/CMakeLists.txt +++ b/cocos/2d/CMakeLists.txt @@ -21,6 +21,7 @@ set(COCOS_2D_SRC 2d/CCAnimation.cpp 2d/CCAtlasNode.cpp 2d/CCClippingNode.cpp + 2d/CCClippingRectangleNode.cpp 2d/CCComponentContainer.cpp 2d/CCComponent.cpp 2d/CCDrawingPrimitives.cpp diff --git a/cocos/2d/libcocos2d.vcxproj b/cocos/2d/libcocos2d.vcxproj index e64d07a933..d787f79719 100644 --- a/cocos/2d/libcocos2d.vcxproj +++ b/cocos/2d/libcocos2d.vcxproj @@ -477,6 +477,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.* + @@ -896,6 +897,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.* + diff --git a/cocos/2d/libcocos2d.vcxproj.filters b/cocos/2d/libcocos2d.vcxproj.filters index 698b66f6f7..90ff9ccc53 100644 --- a/cocos/2d/libcocos2d.vcxproj.filters +++ b/cocos/2d/libcocos2d.vcxproj.filters @@ -334,6 +334,9 @@ 2d + + 2d + 2d @@ -1373,6 +1376,9 @@ 2d + + 2d + 2d diff --git a/cocos/Android.mk b/cocos/Android.mk index 11d63039b2..3b27a5af3a 100644 --- a/cocos/Android.mk +++ b/cocos/Android.mk @@ -25,6 +25,7 @@ cocos2d.cpp \ 2d/CCAnimationCache.cpp \ 2d/CCAtlasNode.cpp \ 2d/CCClippingNode.cpp \ +2d/CCClippingRectangleNode.cpp \ 2d/CCComponent.cpp \ 2d/CCComponentContainer.cpp \ 2d/CCDrawNode.cpp \ diff --git a/cocos/cocos2d.h b/cocos/cocos2d.h index 3a740520da..0bc497855e 100644 --- a/cocos/cocos2d.h +++ b/cocos/cocos2d.h @@ -126,6 +126,7 @@ THE SOFTWARE. #include "2d/CCMenu.h" #include "2d/CCMenuItem.h" #include "2d/CCClippingNode.h" +#include "2d/CCClippingRectangleNode.h" #include "2d/CCMotionStreak.h" #include "2d/CCProgressTimer.h" #include "2d/CCRenderTexture.h" diff --git a/cocos/scripting/lua-bindings/auto/api/CSLoader.lua b/cocos/scripting/lua-bindings/auto/api/CSLoader.lua new file mode 100644 index 0000000000..f8903c75e2 --- /dev/null +++ b/cocos/scripting/lua-bindings/auto/api/CSLoader.lua @@ -0,0 +1,146 @@ + +-------------------------------- +-- @module CSLoader +-- @parent_module cc + +-------------------------------- +-- +-- @function [parent=#CSLoader] createNodeFromJson +-- @param self +-- @param #string filename +-- @return Node#Node ret (return value: cc.Node) + +-------------------------------- +-- +-- @function [parent=#CSLoader] createNodeFromProtocolBuffers +-- @param self +-- @param #string filename +-- @return Node#Node ret (return value: cc.Node) + +-------------------------------- +-- +-- @function [parent=#CSLoader] init +-- @param self + +-------------------------------- +-- +-- @function [parent=#CSLoader] setRecordXMLPath +-- @param self +-- @param #bool record + +-------------------------------- +-- +-- @function [parent=#CSLoader] setJsonPath +-- @param self +-- @param #string jsonPath + +-------------------------------- +-- +-- @function [parent=#CSLoader] loadNodeWithFile +-- @param self +-- @param #string fileName +-- @return Node#Node ret (return value: cc.Node) + +-------------------------------- +-- +-- @function [parent=#CSLoader] loadNodeWithContent +-- @param self +-- @param #string content +-- @return Node#Node ret (return value: cc.Node) + +-------------------------------- +-- +-- @function [parent=#CSLoader] isRecordProtocolBuffersPath +-- @param self +-- @return bool#bool ret (return value: bool) + +-------------------------------- +-- +-- @function [parent=#CSLoader] isRecordXMLPath +-- @param self +-- @return bool#bool ret (return value: bool) + +-------------------------------- +-- +-- @function [parent=#CSLoader] getProtocolBuffersPath +-- @param self +-- @return string#string ret (return value: string) + +-------------------------------- +-- +-- @function [parent=#CSLoader] getXMLPath +-- @param self +-- @return string#string ret (return value: string) + +-------------------------------- +-- +-- @function [parent=#CSLoader] createNodeFromXML +-- @param self +-- @param #string filename +-- @return Node#Node ret (return value: cc.Node) + +-------------------------------- +-- +-- @function [parent=#CSLoader] isRecordJsonPath +-- @param self +-- @return bool#bool ret (return value: bool) + +-------------------------------- +-- +-- @function [parent=#CSLoader] setRecordProtocolBuffersPath +-- @param self +-- @param #bool record + +-------------------------------- +-- +-- @function [parent=#CSLoader] getJsonPath +-- @param self +-- @return string#string ret (return value: string) + +-------------------------------- +-- +-- @function [parent=#CSLoader] setRecordJsonPath +-- @param self +-- @param #bool record + +-------------------------------- +-- +-- @function [parent=#CSLoader] setProtocolBuffersPath +-- @param self +-- @param #string protocolBuffersPath + +-------------------------------- +-- +-- @function [parent=#CSLoader] purge +-- @param self + +-------------------------------- +-- +-- @function [parent=#CSLoader] setXMLPath +-- @param self +-- @param #string xmlPath + +-------------------------------- +-- +-- @function [parent=#CSLoader] destroyInstance +-- @param self + +-------------------------------- +-- +-- @function [parent=#CSLoader] createNode +-- @param self +-- @param #string filename +-- @return Node#Node ret (return value: cc.Node) + +-------------------------------- +-- +-- @function [parent=#CSLoader] getInstance +-- @param self +-- @return CSLoader#CSLoader ret (return value: cc.CSLoader) + +-------------------------------- +-- +-- @function [parent=#CSLoader] CSLoader +-- @param self + +return nil diff --git a/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua b/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua index b1455b5ffc..830d9c7f87 100644 --- a/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua +++ b/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua @@ -1216,4 +1216,9 @@ -- @field [parent=#cc] Component#Component Component preloaded module +-------------------------------------------------------- +-- the cc CSLoader +-- @field [parent=#cc] CSLoader#CSLoader CSLoader preloaded module + + return nil diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp index 3ad8dcb87b..6444249b56 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp @@ -1,6 +1,7 @@ #include "lua_cocos2dx_auto.hpp" #include "cocos2d.h" #include "CCProtectedNode.h" +#include "CSLoader.h" #include "tolua_fix.h" #include "LuaBasicConversions.h" @@ -65632,6 +65633,1035 @@ int lua_register_cocos2dx_Component(lua_State* tolua_S) g_typeCast["Component"] = "cc.Component"; return 1; } + +int lua_cocos2dx_CSLoader_createNodeFromJson(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::CSLoader* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.CSLoader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::CSLoader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_CSLoader_createNodeFromJson'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + std::string arg0; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.CSLoader:createNodeFromJson"); + if(!ok) + return 0; + cocos2d::Node* ret = cobj->createNodeFromJson(arg0); + object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CSLoader:createNodeFromJson",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_CSLoader_createNodeFromJson'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_CSLoader_createNodeFromProtocolBuffers(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::CSLoader* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.CSLoader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::CSLoader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_CSLoader_createNodeFromProtocolBuffers'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + std::string arg0; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.CSLoader:createNodeFromProtocolBuffers"); + if(!ok) + return 0; + cocos2d::Node* ret = cobj->createNodeFromProtocolBuffers(arg0); + object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CSLoader:createNodeFromProtocolBuffers",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_CSLoader_createNodeFromProtocolBuffers'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_CSLoader_init(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::CSLoader* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.CSLoader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::CSLoader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_CSLoader_init'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->init(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CSLoader:init",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_CSLoader_init'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_CSLoader_setRecordXMLPath(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::CSLoader* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.CSLoader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::CSLoader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_CSLoader_setRecordXMLPath'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + bool arg0; + + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.CSLoader:setRecordXMLPath"); + if(!ok) + return 0; + cobj->setRecordXMLPath(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CSLoader:setRecordXMLPath",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_CSLoader_setRecordXMLPath'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_CSLoader_setJsonPath(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::CSLoader* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.CSLoader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::CSLoader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_CSLoader_setJsonPath'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + std::string arg0; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.CSLoader:setJsonPath"); + if(!ok) + return 0; + cobj->setJsonPath(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CSLoader:setJsonPath",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_CSLoader_setJsonPath'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_CSLoader_loadNodeWithFile(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::CSLoader* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.CSLoader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::CSLoader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_CSLoader_loadNodeWithFile'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + std::string arg0; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.CSLoader:loadNodeWithFile"); + if(!ok) + return 0; + cocos2d::Node* ret = cobj->loadNodeWithFile(arg0); + object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CSLoader:loadNodeWithFile",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_CSLoader_loadNodeWithFile'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_CSLoader_loadNodeWithContent(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::CSLoader* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.CSLoader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::CSLoader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_CSLoader_loadNodeWithContent'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + std::string arg0; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.CSLoader:loadNodeWithContent"); + if(!ok) + return 0; + cocos2d::Node* ret = cobj->loadNodeWithContent(arg0); + object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CSLoader:loadNodeWithContent",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_CSLoader_loadNodeWithContent'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_CSLoader_isRecordProtocolBuffersPath(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::CSLoader* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.CSLoader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::CSLoader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_CSLoader_isRecordProtocolBuffersPath'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + bool ret = cobj->isRecordProtocolBuffersPath(); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CSLoader:isRecordProtocolBuffersPath",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_CSLoader_isRecordProtocolBuffersPath'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_CSLoader_isRecordXMLPath(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::CSLoader* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.CSLoader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::CSLoader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_CSLoader_isRecordXMLPath'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + bool ret = cobj->isRecordXMLPath(); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CSLoader:isRecordXMLPath",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_CSLoader_isRecordXMLPath'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_CSLoader_getProtocolBuffersPath(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::CSLoader* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.CSLoader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::CSLoader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_CSLoader_getProtocolBuffersPath'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + std::string ret = cobj->getProtocolBuffersPath(); + tolua_pushcppstring(tolua_S,ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CSLoader:getProtocolBuffersPath",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_CSLoader_getProtocolBuffersPath'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_CSLoader_getXMLPath(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::CSLoader* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.CSLoader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::CSLoader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_CSLoader_getXMLPath'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + std::string ret = cobj->getXMLPath(); + tolua_pushcppstring(tolua_S,ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CSLoader:getXMLPath",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_CSLoader_getXMLPath'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_CSLoader_createNodeFromXML(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::CSLoader* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.CSLoader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::CSLoader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_CSLoader_createNodeFromXML'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + std::string arg0; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.CSLoader:createNodeFromXML"); + if(!ok) + return 0; + cocos2d::Node* ret = cobj->createNodeFromXML(arg0); + object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CSLoader:createNodeFromXML",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_CSLoader_createNodeFromXML'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_CSLoader_isRecordJsonPath(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::CSLoader* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.CSLoader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::CSLoader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_CSLoader_isRecordJsonPath'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + bool ret = cobj->isRecordJsonPath(); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CSLoader:isRecordJsonPath",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_CSLoader_isRecordJsonPath'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_CSLoader_setRecordProtocolBuffersPath(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::CSLoader* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.CSLoader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::CSLoader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_CSLoader_setRecordProtocolBuffersPath'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + bool arg0; + + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.CSLoader:setRecordProtocolBuffersPath"); + if(!ok) + return 0; + cobj->setRecordProtocolBuffersPath(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CSLoader:setRecordProtocolBuffersPath",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_CSLoader_setRecordProtocolBuffersPath'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_CSLoader_getJsonPath(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::CSLoader* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.CSLoader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::CSLoader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_CSLoader_getJsonPath'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + std::string ret = cobj->getJsonPath(); + tolua_pushcppstring(tolua_S,ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CSLoader:getJsonPath",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_CSLoader_getJsonPath'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_CSLoader_setRecordJsonPath(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::CSLoader* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.CSLoader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::CSLoader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_CSLoader_setRecordJsonPath'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + bool arg0; + + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.CSLoader:setRecordJsonPath"); + if(!ok) + return 0; + cobj->setRecordJsonPath(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CSLoader:setRecordJsonPath",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_CSLoader_setRecordJsonPath'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_CSLoader_setProtocolBuffersPath(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::CSLoader* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.CSLoader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::CSLoader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_CSLoader_setProtocolBuffersPath'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + std::string arg0; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.CSLoader:setProtocolBuffersPath"); + if(!ok) + return 0; + cobj->setProtocolBuffersPath(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CSLoader:setProtocolBuffersPath",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_CSLoader_setProtocolBuffersPath'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_CSLoader_purge(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::CSLoader* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.CSLoader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::CSLoader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_CSLoader_purge'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->purge(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CSLoader:purge",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_CSLoader_purge'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_CSLoader_setXMLPath(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::CSLoader* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.CSLoader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::CSLoader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_CSLoader_setXMLPath'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + std::string arg0; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.CSLoader:setXMLPath"); + if(!ok) + return 0; + cobj->setXMLPath(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CSLoader:setXMLPath",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_CSLoader_setXMLPath'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_CSLoader_destroyInstance(lua_State* tolua_S) +{ + int argc = 0; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertable(tolua_S,1,"cc.CSLoader",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::CSLoader::destroyInstance(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.CSLoader:destroyInstance",argc, 0); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_CSLoader_destroyInstance'.",&tolua_err); +#endif + return 0; +} +int lua_cocos2dx_CSLoader_createNode(lua_State* tolua_S) +{ + int argc = 0; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertable(tolua_S,1,"cc.CSLoader",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 1) + { + std::string arg0; + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.CSLoader:createNode"); + if(!ok) + return 0; + cocos2d::Node* ret = cocos2d::CSLoader::createNode(arg0); + object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.CSLoader:createNode",argc, 1); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_CSLoader_createNode'.",&tolua_err); +#endif + return 0; +} +int lua_cocos2dx_CSLoader_getInstance(lua_State* tolua_S) +{ + int argc = 0; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertable(tolua_S,1,"cc.CSLoader",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::CSLoader* ret = cocos2d::CSLoader::getInstance(); + object_to_luaval(tolua_S, "cc.CSLoader",(cocos2d::CSLoader*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.CSLoader:getInstance",argc, 0); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_CSLoader_getInstance'.",&tolua_err); +#endif + return 0; +} +int lua_cocos2dx_CSLoader_constructor(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::CSLoader* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj = new cocos2d::CSLoader(); + tolua_pushusertype(tolua_S,(void*)cobj,"cc.CSLoader"); + tolua_register_gc(tolua_S,lua_gettop(tolua_S)); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CSLoader:CSLoader",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_CSLoader_constructor'.",&tolua_err); +#endif + + return 0; +} + +static int lua_cocos2dx_CSLoader_finalize(lua_State* tolua_S) +{ + printf("luabindings: finalizing LUA object (CSLoader)"); + return 0; +} + +int lua_register_cocos2dx_CSLoader(lua_State* tolua_S) +{ + tolua_usertype(tolua_S,"cc.CSLoader"); + tolua_cclass(tolua_S,"CSLoader","cc.CSLoader","",nullptr); + + tolua_beginmodule(tolua_S,"CSLoader"); + tolua_function(tolua_S,"new",lua_cocos2dx_CSLoader_constructor); + tolua_function(tolua_S,"createNodeFromJson",lua_cocos2dx_CSLoader_createNodeFromJson); + tolua_function(tolua_S,"createNodeFromProtocolBuffers",lua_cocos2dx_CSLoader_createNodeFromProtocolBuffers); + tolua_function(tolua_S,"init",lua_cocos2dx_CSLoader_init); + tolua_function(tolua_S,"setRecordXMLPath",lua_cocos2dx_CSLoader_setRecordXMLPath); + tolua_function(tolua_S,"setJsonPath",lua_cocos2dx_CSLoader_setJsonPath); + tolua_function(tolua_S,"loadNodeWithFile",lua_cocos2dx_CSLoader_loadNodeWithFile); + tolua_function(tolua_S,"loadNodeWithContent",lua_cocos2dx_CSLoader_loadNodeWithContent); + tolua_function(tolua_S,"isRecordProtocolBuffersPath",lua_cocos2dx_CSLoader_isRecordProtocolBuffersPath); + tolua_function(tolua_S,"isRecordXMLPath",lua_cocos2dx_CSLoader_isRecordXMLPath); + tolua_function(tolua_S,"getProtocolBuffersPath",lua_cocos2dx_CSLoader_getProtocolBuffersPath); + tolua_function(tolua_S,"getXMLPath",lua_cocos2dx_CSLoader_getXMLPath); + tolua_function(tolua_S,"createNodeFromXML",lua_cocos2dx_CSLoader_createNodeFromXML); + tolua_function(tolua_S,"isRecordJsonPath",lua_cocos2dx_CSLoader_isRecordJsonPath); + tolua_function(tolua_S,"setRecordProtocolBuffersPath",lua_cocos2dx_CSLoader_setRecordProtocolBuffersPath); + tolua_function(tolua_S,"getJsonPath",lua_cocos2dx_CSLoader_getJsonPath); + tolua_function(tolua_S,"setRecordJsonPath",lua_cocos2dx_CSLoader_setRecordJsonPath); + tolua_function(tolua_S,"setProtocolBuffersPath",lua_cocos2dx_CSLoader_setProtocolBuffersPath); + tolua_function(tolua_S,"purge",lua_cocos2dx_CSLoader_purge); + tolua_function(tolua_S,"setXMLPath",lua_cocos2dx_CSLoader_setXMLPath); + tolua_function(tolua_S,"destroyInstance", lua_cocos2dx_CSLoader_destroyInstance); + tolua_function(tolua_S,"createNode", lua_cocos2dx_CSLoader_createNode); + tolua_function(tolua_S,"getInstance", lua_cocos2dx_CSLoader_getInstance); + tolua_endmodule(tolua_S); + std::string typeName = typeid(cocos2d::CSLoader).name(); + g_luaType[typeName] = "cc.CSLoader"; + g_typeCast["CSLoader"] = "cc.CSLoader"; + return 1; +} TOLUA_API int register_all_cocos2dx(lua_State* tolua_S) { tolua_open(tolua_S); @@ -65639,6 +66669,7 @@ TOLUA_API int register_all_cocos2dx(lua_State* tolua_S) tolua_module(tolua_S,"cc",0); tolua_beginmodule(tolua_S,"cc"); + lua_register_cocos2dx_CSLoader(tolua_S); lua_register_cocos2dx_Ref(tolua_S); lua_register_cocos2dx_Console(tolua_S); lua_register_cocos2dx_Node(tolua_S); diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp index 5fd5122c08..56cb3b93bd 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp @@ -1562,6 +1562,30 @@ int register_all_cocos2dx(lua_State* tolua_S); + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cocos/scripting/lua-bindings/script/cocosstudio/CocosStudio.lua b/cocos/scripting/lua-bindings/script/cocostudio/CocoStudio.lua similarity index 99% rename from cocos/scripting/lua-bindings/script/cocosstudio/CocosStudio.lua rename to cocos/scripting/lua-bindings/script/cocostudio/CocoStudio.lua index 9bcf06144e..e24251a7cf 100644 --- a/cocos/scripting/lua-bindings/script/cocosstudio/CocosStudio.lua +++ b/cocos/scripting/lua-bindings/script/cocostudio/CocoStudio.lua @@ -5,7 +5,7 @@ end ccs = ccs or {} -require "cocos.cocosstudio.StudioConstants" +require "cocos.cocostudio.StudioConstants" function ccs.sendTriggerEvent(event) local triggerObjArr = ccs.TriggerMng.getInstance():get(event) diff --git a/cocos/scripting/lua-bindings/script/cocosstudio/DeprecatedCocoStudioClass.lua b/cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioClass.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/cocosstudio/DeprecatedCocoStudioClass.lua rename to cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioClass.lua diff --git a/cocos/scripting/lua-bindings/script/cocosstudio/DeprecatedCocoStudioFunc.lua b/cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioFunc.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/cocosstudio/DeprecatedCocoStudioFunc.lua rename to cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioFunc.lua diff --git a/cocos/scripting/lua-bindings/script/cocosstudio/StudioConstants.lua b/cocos/scripting/lua-bindings/script/cocostudio/StudioConstants.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/cocosstudio/StudioConstants.lua rename to cocos/scripting/lua-bindings/script/cocostudio/StudioConstants.lua diff --git a/cocos/scripting/lua-bindings/script/init.lua b/cocos/scripting/lua-bindings/script/init.lua index c3fe6b93eb..c31e436578 100644 --- a/cocos/scripting/lua-bindings/script/init.lua +++ b/cocos/scripting/lua-bindings/script/init.lua @@ -7,14 +7,18 @@ require "cocos.cocos2d.extern" require "cocos.cocos2d.Opengl" require "cocos.cocos2d.OpenglConstants" +-- cocosbuilder +require "cocos.cocosbuilder.CCBReaderLoad" + -- cocosdenshion require "cocos.cocosdenshion.AudioEngine" -- cocosstudio -require "cocos.cocosstudio.CocosStudio" +require "cocos.cocostudio.CocoStudio" -- ui require "cocos.ui.GuiConstants" +require "cocos.ui.experimentalUIConstants" -- extensions require "cocos.extension.ExtensionConstants" @@ -29,8 +33,8 @@ if CC_USE_DEPRECATED_API then require "cocos.cocos2d.DeprecatedCocos2dFunc" -- register_cocostudio_module - require "cocos.cocosstudio.DeprecatedCocoStudioClass" - require "cocos.cocosstudio.DeprecatedCocoStudioFunc" + require "cocos.cocostudio.DeprecatedCocoStudioClass" + require "cocos.cocostudio.DeprecatedCocoStudioFunc" -- register_cocosbuilder_module require "cocos.cocosbuilder.DeprecatedCocosBuilderClass" diff --git a/templates/cocos2dx_files.json b/templates/cocos2dx_files.json index 483efb488f..ea79fbbb8e 100644 --- a/templates/cocos2dx_files.json +++ b/templates/cocos2dx_files.json @@ -90,6 +90,8 @@ "cocos/2d/CCAtlasNode.h", "cocos/2d/CCClippingNode.cpp", "cocos/2d/CCClippingNode.h", + "cocos/2d/CCClippingRectangleNode.cpp", + "cocos/2d/CCClippingRectangleNode.h", "cocos/2d/CCComponent.cpp", "cocos/2d/CCComponent.h", "cocos/2d/CCComponentContainer.cpp", @@ -4250,6 +4252,7 @@ "cocos/scripting/lua-bindings/auto/api/Button.lua", "cocos/scripting/lua-bindings/auto/api/CCBAnimationManager.lua", "cocos/scripting/lua-bindings/auto/api/CCBReader.lua", + "cocos/scripting/lua-bindings/auto/api/CSLoader.lua", "cocos/scripting/lua-bindings/auto/api/CallFunc.lua", "cocos/scripting/lua-bindings/auto/api/Camera.lua", "cocos/scripting/lua-bindings/auto/api/CardinalSplineBy.lua", @@ -4715,10 +4718,10 @@ "cocos/scripting/lua-bindings/script/cocosdenshion/AudioEngine.lua", "cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionClass.lua", "cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionFunc.lua", - "cocos/scripting/lua-bindings/script/cocosstudio/CocosStudio.lua", - "cocos/scripting/lua-bindings/script/cocosstudio/DeprecatedCocoStudioClass.lua", - "cocos/scripting/lua-bindings/script/cocosstudio/DeprecatedCocoStudioFunc.lua", - "cocos/scripting/lua-bindings/script/cocosstudio/StudioConstants.lua", + "cocos/scripting/lua-bindings/script/cocostudio/CocoStudio.lua", + "cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioClass.lua", + "cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioFunc.lua", + "cocos/scripting/lua-bindings/script/cocostudio/StudioConstants.lua", "cocos/scripting/lua-bindings/script/controller/ControllerConstants.lua", "cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionClass.lua", "cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionEnum.lua", diff --git a/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp b/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp index 2ae93ee353..0f7054be65 100644 --- a/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp +++ b/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp @@ -33,6 +33,7 @@ static std::function createFunctions[] = { CL(RawStencilBufferTest5), CL(RawStencilBufferTest6), CL(ClippingToRenderTextureTest), + CL(ClippingRectangleNodeTest), }; static int sceneIdx=-1; @@ -1097,6 +1098,32 @@ void ClippingToRenderTextureTest::reproduceBug() rt->end(); } +// ClippingRectangleNodeDemo + +std::string ClippingRectangleNodeTest::title() const +{ + return "ClippingRectangleNode Test"; +} + +std::string ClippingRectangleNodeTest::subtitle() const +{ + return "more effectively"; +} + +void ClippingRectangleNodeTest::setup() +{ + auto clipper = ClippingRectangleNode::create(); + clipper->setClippingRegion(Rect(this->getContentSize().width / 2 - 100, this->getContentSize().height / 2 - 100, 200, 200)); + clipper->setTag( kTagClipperNode ); + this->addChild(clipper); + + auto content = Sprite::create(s_back2); + content->setTag( kTagContentNode ); + content->setAnchorPoint( Vec2(0.5, 0.5) ); + content->setPosition(this->getContentSize().width / 2, this->getContentSize().height / 2); + clipper->addChild(content); +} + // main entry point diff --git a/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.h b/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.h index 4b9faa13cb..535259b13a 100644 --- a/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.h +++ b/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.h @@ -244,6 +244,16 @@ public: virtual std::string subtitle() const override; }; +class ClippingRectangleNodeTest : public BaseClippingNodeTest +{ +public: + CREATE_FUNC(ClippingRectangleNodeTest); + + virtual std::string title() const override; + virtual std::string subtitle() const override; + virtual void setup(); +}; + class ClippingNodeTestScene : public TestScene { diff --git a/tests/game-controller-test/proj.ios/AppController.mm b/tests/game-controller-test/proj.ios/AppController.mm index b32bf90a76..fafbe6ef9c 100644 --- a/tests/game-controller-test/proj.ios/AppController.mm +++ b/tests/game-controller-test/proj.ios/AppController.mm @@ -25,7 +25,7 @@ #import "AppController.h" #import "cocos2d.h" #import "AppDelegate.h" -#import "CCEAGLView.h" +#import "CCEAGLView-ios.h" #import "RootViewController.h" @implementation AppController diff --git a/tests/lua-empty-test/project/CMakeLists.txt b/tests/lua-empty-test/project/CMakeLists.txt index 57e893c682..d220056157 100644 --- a/tests/lua-empty-test/project/CMakeLists.txt +++ b/tests/lua-empty-test/project/CMakeLists.txt @@ -37,7 +37,5 @@ pre_build(${APP_NAME} COMMAND ${CMAKE_COMMAND} -E remove_directory ${APP_BIN_DIR}/Resources COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../res ${APP_BIN_DIR}/Resources/res COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../src ${APP_BIN_DIR}/Resources/src - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/cocos2d ${APP_BIN_DIR}/Resources - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/cocosdenshion ${APP_BIN_DIR}/Resources - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/network ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/ ${APP_BIN_DIR}/Resources/src/cocos ) diff --git a/tests/lua-empty-test/project/proj.android/build-cfg.json b/tests/lua-empty-test/project/proj.android/build-cfg.json index 4ecffa65f0..497120df2f 100644 --- a/tests/lua-empty-test/project/proj.android/build-cfg.json +++ b/tests/lua-empty-test/project/proj.android/build-cfg.json @@ -14,16 +14,8 @@ "to": "res" }, { - "from": "../../../../cocos/scripting/lua-bindings/script/cocos2d", - "to": "" - }, - { - "from": "../../../../cocos/scripting/lua-bindings/script/network", - "to": "" - }, - { - "from": "../../../../cocos/scripting/lua-bindings/script/cocosdenshion", - "to": "" + "from": "../../../../cocos/scripting/lua-bindings/script/", + "to": "src/cocos" }, { "from": "../../../../external/lua/luasocket", diff --git a/tests/lua-empty-test/src/hello.lua b/tests/lua-empty-test/src/hello.lua index fd6bfb17c3..afe930a1ac 100644 --- a/tests/lua-empty-test/src/hello.lua +++ b/tests/lua-empty-test/src/hello.lua @@ -1,5 +1,7 @@ -require "Cocos2d" -require "Cocos2dConstants" +cc.FileUtils:getInstance():addSearchPath("src") +cc.FileUtils:getInstance():addSearchPath("res") +-- CC_USE_DEPRECATED_API = true +require "cocos.init" -- cclog cclog = function(...) @@ -40,15 +42,7 @@ local function main() initGLView() - --support debug,when used on ios7.1 64bit,these codes should be commented - local targetPlatform = cc.Application:getInstance():getTargetPlatform() - if (cc.PLATFORM_OS_IPHONE == targetPlatform) or (cc.PLATFORM_OS_IPAD == targetPlatform) or - (cc.PLATFORM_OS_ANDROID == targetPlatform) or (cc.PLATFORM_OS_WINDOWS == targetPlatform) or - (cc.PLATFORM_OS_MAC == targetPlatform) then - local host = 'localhost' -- please change localhost to your PC's IP for on-device debugging - require('src/mobdebug').start(host) - end - require "src/hello2" + require "hello2" cclog("result is " .. myadd(1, 1)) --------------- @@ -62,7 +56,7 @@ local function main() local frameHeight = 95 -- create dog animate - local textureDog = cc.Director:getInstance():getTextureCache():addImage("res/dog.png") + local textureDog = cc.Director:getInstance():getTextureCache():addImage("dog.png") local rect = cc.rect(0, 0, frameWidth, frameHeight) local frame0 = cc.SpriteFrame:createWithTexture(textureDog, rect) rect = cc.rect(frameWidth, 0, frameWidth, frameHeight) @@ -105,21 +99,21 @@ local function main() local layerFarm = cc.Layer:create() -- add in farm background - local bg = cc.Sprite:create("res/farm.jpg") + local bg = cc.Sprite:create("farm.jpg") bg:setPosition(origin.x + visibleSize.width / 2 + 80, origin.y + visibleSize.height / 2) layerFarm:addChild(bg) -- add land sprite for i = 0, 3 do for j = 0, 1 do - local spriteLand = cc.Sprite:create("res/land.png") + local spriteLand = cc.Sprite:create("land.png") spriteLand:setPosition(200 + j * 180 - i % 2 * 90, 10 + i * 95 / 2) layerFarm:addChild(spriteLand) end end -- add crop - local frameCrop = cc.SpriteFrame:create("res/crop.png", cc.rect(0, 0, 105, 95)) + local frameCrop = cc.SpriteFrame:create("crop.png", cc.rect(0, 0, 105, 95)) for i = 0, 3 do for j = 0, 1 do local spriteCrop = cc.Sprite:createWithSpriteFrame(frameCrop) @@ -186,13 +180,13 @@ local function main() local function menuCallbackOpenPopup() -- loop test sound effect - local effectPath = cc.FileUtils:getInstance():fullPathForFilename("res/effect1.wav") + local effectPath = cc.FileUtils:getInstance():fullPathForFilename("effect1.wav") effectID = cc.SimpleAudioEngine:getInstance():playEffect(effectPath) menuPopup:setVisible(true) end -- add a popup menu - local menuPopupItem = cc.MenuItemImage:create("res/menu2.png", "res/menu2.png") + local menuPopupItem = cc.MenuItemImage:create("menu2.png", "menu2.png") menuPopupItem:setPosition(0, 0) menuPopupItem:registerScriptTapHandler(menuCallbackClosePopup) menuPopup = cc.Menu:create(menuPopupItem) @@ -201,7 +195,7 @@ local function main() layerMenu:addChild(menuPopup) -- add the left-bottom "tools" menu to invoke menuPopup - local menuToolsItem = cc.MenuItemImage:create("res/menu1.png", "res/menu1.png") + local menuToolsItem = cc.MenuItemImage:create("menu1.png", "menu1.png") menuToolsItem:setPosition(0, 0) menuToolsItem:registerScriptTapHandler(menuCallbackOpenPopup) menuTools = cc.Menu:create(menuToolsItem) @@ -214,9 +208,9 @@ local function main() end -- play background music, preload effect - local bgMusicPath = cc.FileUtils:getInstance():fullPathForFilename("res/background.mp3") + local bgMusicPath = cc.FileUtils:getInstance():fullPathForFilename("background.mp3") cc.SimpleAudioEngine:getInstance():playMusic(bgMusicPath, true) - local effectPath = cc.FileUtils:getInstance():fullPathForFilename("res/effect1.wav") + local effectPath = cc.FileUtils:getInstance():fullPathForFilename("effect1.wav") cc.SimpleAudioEngine:getInstance():preloadEffect(effectPath) -- run diff --git a/tests/lua-game-controller-test/project/Classes/AppDelegate.h b/tests/lua-game-controller-test/project/Classes/AppDelegate.h index b708f4bdca..01b5e6da2f 100644 --- a/tests/lua-game-controller-test/project/Classes/AppDelegate.h +++ b/tests/lua-game-controller-test/project/Classes/AppDelegate.h @@ -1,7 +1,7 @@ #ifndef _APP_DELEGATE_H_ #define _APP_DELEGATE_H_ -#include "CCApplication.h" +#include "platform/CCApplication.h" /** @brief The cocos2d Application. diff --git a/tests/lua-game-controller-test/project/proj.android/build-cfg.json b/tests/lua-game-controller-test/project/proj.android/build-cfg.json index e379d249eb..71c3d466a0 100644 --- a/tests/lua-game-controller-test/project/proj.android/build-cfg.json +++ b/tests/lua-game-controller-test/project/proj.android/build-cfg.json @@ -14,12 +14,8 @@ "to": "res" }, { - "from": "../../../../cocos/scripting/lua-bindings/script/cocos2d", - "to": "" - }, - { - "from": "../../../../cocos/scripting/lua-bindings/script/controller", - "to": "" + "from": "../../../../cocos/scripting/lua-bindings/script/", + "to": "src/cocos" }, { "from": "../../../game-controller-test/Resources", diff --git a/tests/lua-game-controller-test/project/proj.ios/AppController.mm b/tests/lua-game-controller-test/project/proj.ios/AppController.mm index a4a76d5cc1..c0e2b1820e 100644 --- a/tests/lua-game-controller-test/project/proj.ios/AppController.mm +++ b/tests/lua-game-controller-test/project/proj.ios/AppController.mm @@ -24,7 +24,7 @@ #import #import "AppController.h" #import "cocos2d.h" -#import "CCEAGLView.h" +#import "CCEAGLView-ios.h" #import "AppDelegate.h" #import "RootViewController.h" diff --git a/tests/lua-game-controller-test/src/GameControllerTest.lua b/tests/lua-game-controller-test/src/GameControllerTest.lua index a822d85981..9b186fb84b 100644 --- a/tests/lua-game-controller-test/src/GameControllerTest.lua +++ b/tests/lua-game-controller-test/src/GameControllerTest.lua @@ -1,5 +1,3 @@ -require("extern") -require("ControllerConstants") local ControllerHolder = class("ControllerHolder") diff --git a/tests/lua-game-controller-test/src/main.lua b/tests/lua-game-controller-test/src/main.lua index cdc55801c3..dd26d250a2 100644 --- a/tests/lua-game-controller-test/src/main.lua +++ b/tests/lua-game-controller-test/src/main.lua @@ -1,5 +1,6 @@ -require("Cocos2d") -require("Cocos2dConstants") +cc.FileUtils:getInstance():addSearchPath("src") +-- CC_USE_DEPRECATED_API = true +require "cocos.init" collectgarbage("setpause", 100) collectgarbage("setstepmul", 5000) @@ -52,7 +53,7 @@ end fileUtils:setSearchPaths(searchPaths) local scene = cc.Scene:create() -scene:addChild(require("src/GameControllerTest").new()) +scene:addChild(require("GameControllerTest").new()) if cc.Director:getInstance():getRunningScene() then cc.Director:getInstance():replaceScene(scene) else diff --git a/tests/lua-tests/project/CMakeLists.txt b/tests/lua-tests/project/CMakeLists.txt index 8c8114fd88..481472bae4 100644 --- a/tests/lua-tests/project/CMakeLists.txt +++ b/tests/lua-tests/project/CMakeLists.txt @@ -45,13 +45,7 @@ pre_build(${APP_NAME} COMMAND ${CMAKE_COMMAND} -E remove_directory ${APP_BIN_DIR}/Resources COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../res ${APP_BIN_DIR}/Resources/res COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../src ${APP_BIN_DIR}/Resources/src - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/cocos2d ${APP_BIN_DIR}/Resources - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/cocosdenshion ${APP_BIN_DIR}/Resources - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/network ${APP_BIN_DIR}/Resources - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/cocosbuilder ${APP_BIN_DIR}/Resources - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/cocosstudio ${APP_BIN_DIR}/Resources - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/extension ${APP_BIN_DIR}/Resources - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/ui ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/ ${APP_BIN_DIR}/Resources/src/cocos COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/tests/cpp-tests/Resources ${APP_BIN_DIR}/Resources/res ) diff --git a/tests/lua-tests/project/proj.android/build-cfg.json b/tests/lua-tests/project/proj.android/build-cfg.json index 476b9ef682..4f18ce29ab 100644 --- a/tests/lua-tests/project/proj.android/build-cfg.json +++ b/tests/lua-tests/project/proj.android/build-cfg.json @@ -21,33 +21,10 @@ ] }, { - "from": "../../../../cocos/scripting/lua-bindings/script/cocos2d", - "to": "" - }, - { - "from": "../../../../cocos/scripting/lua-bindings/script/cocosbuilder", - "to": "" - }, - { - "from": "../../../../cocos/scripting/lua-bindings/script/cocosdenshion", - "to": "" - }, - { - "from": "../../../../cocos/scripting/lua-bindings/script/cocosstudio", - "to": "" - }, - { - "from": "../../../../cocos/scripting/lua-bindings/script/extension", - "to": "" - }, - { - "from": "../../../../cocos/scripting/lua-bindings/script/network", - "to": "" - }, - { - "from": "../../../../cocos/scripting/lua-bindings/script/ui", - "to": "" + "from": "../../../../cocos/scripting/lua-bindings/script/", + "to": "src/cocos" }, + { "from": "../../../../external/lua/luasocket", "to": "", diff --git a/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj b/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj index 1201e19204..b574995047 100644 --- a/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj +++ b/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj @@ -1,4 +1,4 @@ - + @@ -108,13 +108,8 @@ - xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocos2d" "$(ProjectDir)..\..\" /e /Y -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocosdenshion" "$(ProjectDir)..\..\" /e /Y -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\network" "$(ProjectDir)..\..\" /e /Y -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocosbuilder" "$(ProjectDir)..\..\" /e /Y -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocosstudio" "$(ProjectDir)..\..\" /e /Y -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\extension" "$(ProjectDir)..\..\" /e /Y -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\ui" "$(ProjectDir)..\..\" /e /Y + if not exist "$(ProjectDir)..\..\src\cocos" mkdir "$(ProjectDir)..\..\src\cocos" +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(ProjectDir)..\..\src\cocos" /e /Y xcopy "$(ProjectDir)..\..\..\..\external\lua\luasocket\*.lua" "$(ProjectDir)..\..\" /e /Y xcopy "$(ProjectDir)..\..\..\cpp-tests\Resources" "$(ProjectDir)..\..\res" /e /Y copy files @@ -163,13 +158,8 @@ xcopy "$(ProjectDir)..\..\..\cpp-tests\Resources" "$(ProjectDir)..\..\res" /e /Y - xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocos2d" "$(ProjectDir)..\..\" /e /Y -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocosdenshion" "$(ProjectDir)..\..\" /e /Y -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\network" "$(ProjectDir)..\..\" /e /Y -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocosbuilder" "$(ProjectDir)..\..\" /e /Y -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocosstudio" "$(ProjectDir)..\..\" /e /Y -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\extension" "$(ProjectDir)..\..\" /e /Y -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\ui" "$(ProjectDir)..\..\" /e /Y + if not exist "$(ProjectDir)..\..\src\cocos" mkdir "$(ProjectDir)..\..\src\cocos" +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(ProjectDir)..\..\src\cocos" /e /Y xcopy "$(ProjectDir)..\..\..\..\external\lua\luasocket\*.lua" "$(ProjectDir)..\..\" /e /Y xcopy "$(ProjectDir)..\..\..\cpp-tests\Resources" "$(ProjectDir)..\..\res" /e /Y copy files @@ -200,4 +190,4 @@ xcopy "$(ProjectDir)..\..\..\cpp-tests\Resources" "$(ProjectDir)..\..\res" /e /Y - + \ No newline at end of file diff --git a/tests/lua-tests/src/AssetsManagerTest/AssetsManagerTest.lua b/tests/lua-tests/src/AssetsManagerTest/AssetsManagerTest.lua index 4d6000557a..3ea12a07f4 100644 --- a/tests/lua-tests/src/AssetsManagerTest/AssetsManagerTest.lua +++ b/tests/lua-tests/src/AssetsManagerTest/AssetsManagerTest.lua @@ -104,7 +104,7 @@ local function updateLayer() addSearchPath(realPath,true) end - assetsManagerModule = reloadModule("src/AssetsManagerTest/AssetsManagerModule") + assetsManagerModule = reloadModule("AssetsManagerTest/AssetsManagerModule") assetsManagerModule.newScene(AssetsManagerTestMain) end diff --git a/tests/lua-tests/src/ByteCodeEncryptTest/ByteCodeEncryptTest.lua b/tests/lua-tests/src/ByteCodeEncryptTest/ByteCodeEncryptTest.lua index 01cb341e17..db3c1f1ecb 100644 --- a/tests/lua-tests/src/ByteCodeEncryptTest/ByteCodeEncryptTest.lua +++ b/tests/lua-tests/src/ByteCodeEncryptTest/ByteCodeEncryptTest.lua @@ -1,8 +1,8 @@ local targetPlatform = cc.Application:getInstance():getTargetPlatform() local isIOS64bit = cc.Application:getInstance():isIOS64bit() if cc.PLATFORM_OS_LINUX ~= targetPlatform and isIOS64bit ~= true then -require("src/ByteCodeEncryptTest/ByteCodeTest") -require("src/ByteCodeEncryptTest/ByteCodeAndEncryptTest") +require("ByteCodeEncryptTest/ByteCodeTest") +require("ByteCodeEncryptTest/ByteCodeAndEncryptTest") end local LINE_SPACE = 40 diff --git a/tests/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua b/tests/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua index 19cdabbbe5..856affe621 100644 --- a/tests/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua +++ b/tests/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua @@ -1,6 +1,6 @@ -require "src/CocoStudioTest/CocoStudioSceneTest/TriggerCode/acts" -require "src/CocoStudioTest/CocoStudioSceneTest/TriggerCode/cons" -require "src/CocoStudioTest/CocoStudioSceneTest/TriggerCode/eventDef" +require "CocoStudioTest/CocoStudioSceneTest/TriggerCode/acts" +require "CocoStudioTest/CocoStudioSceneTest/TriggerCode/cons" +require "CocoStudioTest/CocoStudioSceneTest/TriggerCode/eventDef" local itemTagBasic = 1000 diff --git a/tests/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/TriggerCode/acts.lua b/tests/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/TriggerCode/acts.lua index ef7b828cbf..6d1ca8c553 100644 --- a/tests/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/TriggerCode/acts.lua +++ b/tests/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/TriggerCode/acts.lua @@ -1,5 +1,3 @@ -require "CocoStudio" - local TMoveBy = class("TMoveBy") TMoveBy._tag = -1 TMoveBy._duration = 0 diff --git a/tests/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/TriggerCode/cons.lua b/tests/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/TriggerCode/cons.lua index 2f6b10c038..e05c918fd7 100644 --- a/tests/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/TriggerCode/cons.lua +++ b/tests/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/TriggerCode/cons.lua @@ -1,5 +1,3 @@ -require ("CocoStudio") - local NodeInRect = class("NodeInRect") NodeInRect._tag = -1 NodeInRect._origin = nil diff --git a/tests/lua-tests/src/CocoStudioTest/CocoStudioTest.lua b/tests/lua-tests/src/CocoStudioTest/CocoStudioTest.lua index e05b4d4e06..3776489105 100644 --- a/tests/lua-tests/src/CocoStudioTest/CocoStudioTest.lua +++ b/tests/lua-tests/src/CocoStudioTest/CocoStudioTest.lua @@ -1,8 +1,8 @@ -require "src/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest" -require "src/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest" -require "src/CocoStudioTest/CocoStudioArmatureTest/CocoStudioArmatureTest" -require "src/CocoStudioTest/CocoStudioUIEditorTest/CocoStudioUIEditorTest" -require "src/CocoStudioTest/CocoStudioActionTimelineTest/CocoStudioActionTimelineTest" +require "CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest" +require "CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest" +require "CocoStudioTest/CocoStudioArmatureTest/CocoStudioArmatureTest" +require "CocoStudioTest/CocoStudioUIEditorTest/CocoStudioUIEditorTest" +require "CocoStudioTest/CocoStudioActionTimelineTest/CocoStudioActionTimelineTest" local LINE_SPACE = 40 local ITEM_TAG_BASIC = 1000 diff --git a/tests/lua-tests/src/CocosDenshionTest/CocosDenshionTest.lua b/tests/lua-tests/src/CocosDenshionTest/CocosDenshionTest.lua index 7697ba5a66..6c6112a2b1 100644 --- a/tests/lua-tests/src/CocosDenshionTest/CocosDenshionTest.lua +++ b/tests/lua-tests/src/CocosDenshionTest/CocosDenshionTest.lua @@ -1,4 +1,3 @@ -require "AudioEngine" local EFFECT_FILE = "effect1.wav" local MUSIC_FILE = nil diff --git a/tests/lua-tests/src/EffectsTest/EffectsTest.lua b/tests/lua-tests/src/EffectsTest/EffectsTest.lua index c70ee0097d..715171e926 100644 --- a/tests/lua-tests/src/EffectsTest/EffectsTest.lua +++ b/tests/lua-tests/src/EffectsTest/EffectsTest.lua @@ -1,4 +1,4 @@ -require "src/EffectsTest/EffectsName" +require "EffectsTest/EffectsName" local ActionIdx = -1 diff --git a/tests/lua-tests/src/ExtensionTest/CocosBuilderTest.lua b/tests/lua-tests/src/ExtensionTest/CocosBuilderTest.lua index d9465b215f..5158de0d51 100644 --- a/tests/lua-tests/src/ExtensionTest/CocosBuilderTest.lua +++ b/tests/lua-tests/src/ExtensionTest/CocosBuilderTest.lua @@ -1,6 +1,3 @@ - -require "CCBReaderLoad" - HelloCocosBuilderLayer = HelloCocosBuilderLayer or {} ccb["HelloCocosBuilderLayer"] = HelloCocosBuilderLayer diff --git a/tests/lua-tests/src/ExtensionTest/ExtensionTest.lua b/tests/lua-tests/src/ExtensionTest/ExtensionTest.lua index 602aa260d3..91fb9db48a 100644 --- a/tests/lua-tests/src/ExtensionTest/ExtensionTest.lua +++ b/tests/lua-tests/src/ExtensionTest/ExtensionTest.lua @@ -1,6 +1,5 @@ -require "ExtensionConstants" -require "src/ExtensionTest/CocosBuilderTest" -require "src/ExtensionTest/WebProxyTest" +require "ExtensionTest/CocosBuilderTest" +require "ExtensionTest/WebProxyTest" local LINE_SPACE = 40 local kItemTagBasic = 1000 diff --git a/tests/lua-tests/src/ExtensionTest/WebProxyTest.lua b/tests/lua-tests/src/ExtensionTest/WebProxyTest.lua index c14ffeab8c..10e91b9ac4 100644 --- a/tests/lua-tests/src/ExtensionTest/WebProxyTest.lua +++ b/tests/lua-tests/src/ExtensionTest/WebProxyTest.lua @@ -1,5 +1,4 @@ - require "NetworkConstants" - local function WebSocketTestLayer() +local function WebSocketTestLayer() local layer = cc.Layer:create() local winSize = cc.Director:getInstance():getWinSize() diff --git a/tests/lua-tests/src/OpenGLTest/OpenGLTest.lua b/tests/lua-tests/src/OpenGLTest/OpenGLTest.lua index 428ba1d3aa..b8830dcded 100644 --- a/tests/lua-tests/src/OpenGLTest/OpenGLTest.lua +++ b/tests/lua-tests/src/OpenGLTest/OpenGLTest.lua @@ -1,7 +1,3 @@ -require "OpenglConstants" -require "Cocos2dConstants" -require "Opengl" - local vertDefaultSource = "\n".."\n" .. "attribute vec4 a_position;\n" .. "attribute vec2 a_texCoord;\n" .. diff --git a/tests/lua-tests/src/PerformanceTest/PerformanceTest.lua b/tests/lua-tests/src/PerformanceTest/PerformanceTest.lua index 825ae2010a..db6a5e8c4b 100644 --- a/tests/lua-tests/src/PerformanceTest/PerformanceTest.lua +++ b/tests/lua-tests/src/PerformanceTest/PerformanceTest.lua @@ -1,4 +1,4 @@ -require "src/PerformanceTest/PerformanceSpriteTest" +require "PerformanceTest/PerformanceSpriteTest" local MAX_COUNT = 6 local LINE_SPACE = 40 diff --git a/tests/lua-tests/src/TouchesTest/Ball.lua b/tests/lua-tests/src/TouchesTest/Ball.lua index 7d5603e41d..9c75586d35 100644 --- a/tests/lua-tests/src/TouchesTest/Ball.lua +++ b/tests/lua-tests/src/TouchesTest/Ball.lua @@ -1,7 +1,5 @@ - -require "extern" -require "src/VisibleRect" -require "src/TouchesTest/Paddle" +require "VisibleRect" +require "TouchesTest/Paddle" Ball = class("Ball", function(texture) return cc.Sprite:createWithTexture(texture) diff --git a/tests/lua-tests/src/TouchesTest/Paddle.lua b/tests/lua-tests/src/TouchesTest/Paddle.lua index 65a319c44b..e7022387de 100644 --- a/tests/lua-tests/src/TouchesTest/Paddle.lua +++ b/tests/lua-tests/src/TouchesTest/Paddle.lua @@ -1,5 +1,4 @@ -require "extern" -require "src/VisibleRect" +require "VisibleRect" Paddle = class("Paddle", function(texture) return cc.Sprite:createWithTexture(texture) diff --git a/tests/lua-tests/src/TouchesTest/TouchesTest.lua b/tests/lua-tests/src/TouchesTest/TouchesTest.lua index 241e5a369f..04f4418ca8 100644 --- a/tests/lua-tests/src/TouchesTest/TouchesTest.lua +++ b/tests/lua-tests/src/TouchesTest/TouchesTest.lua @@ -1,7 +1,7 @@ -require "src/testResource" -require "src/TouchesTest/Ball" -require "src/TouchesTest/Paddle" -require "src/VisibleRect" +require "testResource" +require "TouchesTest/Ball" +require "TouchesTest/Paddle" +require "VisibleRect" local kHighPlayer = 0 local kLowPlayer = 1 diff --git a/tests/lua-tests/src/TransitionsTest/TransitionsName.lua b/tests/lua-tests/src/TransitionsTest/TransitionsName.lua index c49f4caae2..96c6828b8c 100644 --- a/tests/lua-tests/src/TransitionsTest/TransitionsName.lua +++ b/tests/lua-tests/src/TransitionsTest/TransitionsName.lua @@ -1,4 +1,4 @@ -require "src/helper" +require "helper" Transition_Table = { diff --git a/tests/lua-tests/src/TransitionsTest/TransitionsTest.lua b/tests/lua-tests/src/TransitionsTest/TransitionsTest.lua index 3f27897a73..79b6eeb09e 100644 --- a/tests/lua-tests/src/TransitionsTest/TransitionsTest.lua +++ b/tests/lua-tests/src/TransitionsTest/TransitionsTest.lua @@ -1,4 +1,4 @@ -require "src/TransitionsTest/TransitionsName" +require "TransitionsTest/TransitionsName" local SceneIdx = -1 diff --git a/tests/lua-tests/src/VideoPlayerTest/VideoPlayerTest.lua b/tests/lua-tests/src/VideoPlayerTest/VideoPlayerTest.lua index ad082ce774..0ac74b5da6 100644 --- a/tests/lua-tests/src/VideoPlayerTest/VideoPlayerTest.lua +++ b/tests/lua-tests/src/VideoPlayerTest/VideoPlayerTest.lua @@ -1,6 +1,3 @@ -require("experimentalUIConstants") - - local visibleRect = cc.Director:getInstance():getOpenGLView():getVisibleRect() local centerPos = cc.p(visibleRect.x + visibleRect.width / 2,visibleRect.y + visibleRect.height /2) diff --git a/tests/lua-tests/src/VisibleRect.lua b/tests/lua-tests/src/VisibleRect.lua index 5d53b1f8e5..1b867cb668 100644 --- a/tests/lua-tests/src/VisibleRect.lua +++ b/tests/lua-tests/src/VisibleRect.lua @@ -1,6 +1,3 @@ -require "extern" -require "Cocos2d" - VisibleRect = class("VisibleRect") VisibleRect.__index = VisibleRect diff --git a/tests/lua-tests/src/controller.lua b/tests/lua-tests/src/controller.lua index df010e4491..aaec7837ff 100644 --- a/tests/lua-tests/src/controller.lua +++ b/tests/lua-tests/src/controller.lua @@ -5,6 +5,10 @@ collectgarbage("setstepmul", 5000) ---------------- -- run +cc.FileUtils:getInstance():addSearchPath("src") +-- CC_USE_DEPRECATED_API = true +require "cocos.init" + local director = cc.Director:getInstance() local glView = director:getOpenGLView() if nil == glView then @@ -71,7 +75,7 @@ end addSearchPath("res/", screenSize.height) addSearchPath("", screenSize.height) -require "src/mainMenu" +require "mainMenu" local scene = cc.Scene:create() scene:addChild(CreateTestMenu()) diff --git a/tests/lua-tests/src/helper.lua b/tests/lua-tests/src/helper.lua index 0e242a1c43..84dbc49827 100644 --- a/tests/lua-tests/src/helper.lua +++ b/tests/lua-tests/src/helper.lua @@ -1,4 +1,3 @@ -require "Cocos2d" CC_CONTENT_SCALE_FACTOR = function() return cc.Director:getInstance():getContentScaleFactor() diff --git a/tests/lua-tests/src/mainMenu.lua b/tests/lua-tests/src/mainMenu.lua index 63a4a55dba..9f76196f5b 100644 --- a/tests/lua-tests/src/mainMenu.lua +++ b/tests/lua-tests/src/mainMenu.lua @@ -1,65 +1,58 @@ -require "Cocos2d" -require "Cocos2dConstants" -require "Opengl" -require "OpenglConstants" -require "StudioConstants" -require "GuiConstants" -require "bitExtend" -require "src/helper" -require "src/testResource" -require "src/VisibleRect" +require "helper" +require "testResource" +require "VisibleRect" -require "src/AccelerometerTest/AccelerometerTest" -require "src/ActionManagerTest/ActionManagerTest" -require "src/ActionsEaseTest/ActionsEaseTest" -require "src/ActionsProgressTest/ActionsProgressTest" -require "src/ActionsTest/ActionsTest" -require "src/AssetsManagerTest/AssetsManagerTest" -require "src/BillBoardTest/BillBoardTest" -require "src/BugsTest/BugsTest" -require "src/ByteCodeEncryptTest/ByteCodeEncryptTest" -require "src/Camera3DTest/Camera3DTest" -require "src/ClickAndMoveTest/ClickAndMoveTest" -require "src/CocosDenshionTest/CocosDenshionTest" -require "src/CocoStudioTest/CocoStudioTest" -require "src/CurrentLanguageTest/CurrentLanguageTest" -require "src/DrawPrimitivesTest/DrawPrimitivesTest" -require "src/EffectsTest/EffectsTest" -require "src/EffectsAdvancedTest/EffectsAdvancedTest" -require "src/ExtensionTest/ExtensionTest" -require "src/FontTest/FontTest" -require "src/IntervalTest/IntervalTest" -require "src/KeypadTest/KeypadTest" -require "src/LabelTest/LabelTest" -require "src/LabelTestNew/LabelTestNew" -require "src/LayerTest/LayerTest" -require "src/MenuTest/MenuTest" -require "src/MotionStreakTest/MotionStreakTest" -require "src/NewEventDispatcherTest/NewEventDispatcherTest" -require "src/NodeTest/NodeTest" -require "src/OpenGLTest/OpenGLTest" -require "src/ParallaxTest/ParallaxTest" -require "src/ParticleTest/ParticleTest" -require "src/PerformanceTest/PerformanceTest" -require "src/RenderTextureTest/RenderTextureTest" -require "src/RotateWorldTest/RotateWorldTest" -require "src/Sprite3DTest/Sprite3DTest" -require "src/SpriteTest/SpriteTest" -require "src/SceneTest/SceneTest" -require "src/SpineTest/SpineTest" -require "src/Texture2dTest/Texture2dTest" -require "src/TileMapTest/TileMapTest" -require "src/TouchesTest/TouchesTest" -require "src/TransitionsTest/TransitionsTest" -require "src/UserDefaultTest/UserDefaultTest" -require "src/ZwoptexTest/ZwoptexTest" -require "src/LuaBridgeTest/LuaBridgeTest" -require "src/XMLHttpRequestTest/XMLHttpRequestTest" -require "src/PhysicsTest/PhysicsTest" -require "src/CaptureScreenTest/CaptureScreenTest" -require "src/VideoPlayerTest/VideoPlayerTest" -require "src/FastTiledMapTest/FastTiledMapTest" -require "src/NewAudioEngineTest/NewAudioEngineTest" +require "AccelerometerTest/AccelerometerTest" +require "ActionManagerTest/ActionManagerTest" +require "ActionsEaseTest/ActionsEaseTest" +require "ActionsProgressTest/ActionsProgressTest" +require "ActionsTest/ActionsTest" +require "AssetsManagerTest/AssetsManagerTest" +require "BillBoardTest/BillBoardTest" +require "BugsTest/BugsTest" +require "ByteCodeEncryptTest/ByteCodeEncryptTest" +require "Camera3DTest/Camera3DTest" +require "ClickAndMoveTest/ClickAndMoveTest" +require "CocosDenshionTest/CocosDenshionTest" +require "CocoStudioTest/CocoStudioTest" +require "CurrentLanguageTest/CurrentLanguageTest" +require "DrawPrimitivesTest/DrawPrimitivesTest" +require "EffectsTest/EffectsTest" +require "EffectsAdvancedTest/EffectsAdvancedTest" +require "ExtensionTest/ExtensionTest" +require "FontTest/FontTest" +require "IntervalTest/IntervalTest" +require "KeypadTest/KeypadTest" +require "LabelTest/LabelTest" +require "LabelTestNew/LabelTestNew" +require "LayerTest/LayerTest" +require "MenuTest/MenuTest" +require "MotionStreakTest/MotionStreakTest" +require "NewEventDispatcherTest/NewEventDispatcherTest" +require "NodeTest/NodeTest" +require "OpenGLTest/OpenGLTest" +require "ParallaxTest/ParallaxTest" +require "ParticleTest/ParticleTest" +require "PerformanceTest/PerformanceTest" +require "RenderTextureTest/RenderTextureTest" +require "RotateWorldTest/RotateWorldTest" +require "Sprite3DTest/Sprite3DTest" +require "SpriteTest/SpriteTest" +require "SceneTest/SceneTest" +require "SpineTest/SpineTest" +require "Texture2dTest/Texture2dTest" +require "TileMapTest/TileMapTest" +require "TouchesTest/TouchesTest" +require "TransitionsTest/TransitionsTest" +require "UserDefaultTest/UserDefaultTest" +require "ZwoptexTest/ZwoptexTest" +require "LuaBridgeTest/LuaBridgeTest" +require "XMLHttpRequestTest/XMLHttpRequestTest" +require "PhysicsTest/PhysicsTest" +require "CaptureScreenTest/CaptureScreenTest" +require "VideoPlayerTest/VideoPlayerTest" +require "FastTiledMapTest/FastTiledMapTest" +require "NewAudioEngineTest/NewAudioEngineTest" local LINE_SPACE = 40