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

Merge branch 'v3' into v3_updateSpine 

Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
This commit is contained in:
Huabing.Xu 2014-10-15 15:55:17 +08:00
parent 85ba18b4db 41d2929060
commit 8135b09c98
55 changed files with 448 additions and 665 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -103,6 +103,7 @@ CMakeCache.txt
CMakeFiles
Makefile
cmake_install.cmake
CMakeLists.txt.user
# Ignore files generated by console
build/build/

1
CHANGELOG
View File

@ -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()

22
build/android-build.py
View File

@ -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):

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

@ -1933,6 +1933,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 */; };
@ -2982,6 +2986,8 @@
B67C624519D4186F00F11FC6 /* ccShader_3D_PositionNormalTex.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_3D_PositionNormalTex.vert; sourceTree = "<group>"; };
DA8C62A019E52C6400000516 /* ioapi_mem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ioapi_mem.cpp; sourceTree = "<group>"; };
DA8C62A119E52C6400000516 /* ioapi_mem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ioapi_mem.h; sourceTree = "<group>"; };
DABC9FA719E7DFA900FA252C /* CCClippingRectangleNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCClippingRectangleNode.cpp; sourceTree = "<group>"; };
DABC9FA819E7DFA900FA252C /* CCClippingRectangleNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCClippingRectangleNode.h; sourceTree = "<group>"; };
ED9C6A9218599AD8000A5232 /* CCNodeGrid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = CCNodeGrid.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
ED9C6A9318599AD8000A5232 /* CCNodeGrid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCNodeGrid.h; sourceTree = "<group>"; };
/* End PBXFileReference section */
@ -3386,6 +3392,8 @@
1A5701FF180BCBBD0088DEC7 /* misc-nodes */ = {
isa = PBXGroup;
children = (
DABC9FA719E7DFA900FA252C /* CCClippingRectangleNode.cpp */,
DABC9FA819E7DFA900FA252C /* CCClippingRectangleNode.h */,
ED9C6A9218599AD8000A5232 /* CCNodeGrid.cpp */,
ED9C6A9318599AD8000A5232 /* CCNodeGrid.h */,
1A57020C180BCBF40088DEC7 /* CCProgressTimer.cpp */,
@ -5132,6 +5140,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 */,
B276EF631988D1D500CD400F /* CCVertexIndexBuffer.h in Headers */,
B29A7DE519EE1B7700872B35 /* SkeletonAnimation.h in Headers */,
@ -5671,6 +5680,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 */,
@ -6556,6 +6566,7 @@
B29A7DE319EE1B7700872B35 /* SkeletonBounds.c 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 */,
@ -6694,6 +6705,7 @@
15AE1ABC19AAD40300C27E9E /* b2PolygonAndCircleContact.cpp in Sources */,
15AE1ADA19AAD41000C27E9E /* b2Rope.cpp in Sources */,
B29A7E1619EE1B7700872B35 /* BoundingBoxAttachment.c in Sources */,
DABC9FAA19E7DFA900FA252C /* CCClippingRectangleNode.cpp in Sources */,
15AE1BF119AAE01E00C27E9E /* CCControlPotentiometer.cpp in Sources */,
15AE1B8419AADA9A00C27E9E /* UITextField.cpp in Sources */,
15AE198E19AAD36E00C27E9E /* CheckBoxReader.cpp in Sources */,

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

@ -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 = "<group>"; };
150F918719DA409E00B89F57 /* lua_test_bindings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_test_bindings.h; sourceTree = "<group>"; };
1529F04219ED88640064B9B1 /* ltn12.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ltn12.lua; path = ../external/lua/luasocket/script/ltn12.lua; sourceTree = "<group>"; };
1529F04319ED88640064B9B1 /* mime.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = mime.lua; path = ../external/lua/luasocket/script/mime.lua; sourceTree = "<group>"; };
1529F04419ED88640064B9B1 /* socket.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = socket.lua; path = ../external/lua/luasocket/script/socket.lua; sourceTree = "<group>"; };
1529F04B19ED88830064B9B1 /* ftp.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ftp.lua; path = ../external/lua/luasocket/script/socket/ftp.lua; sourceTree = "<group>"; };
1529F04C19ED88830064B9B1 /* headers.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = headers.lua; path = ../external/lua/luasocket/script/socket/headers.lua; sourceTree = "<group>"; };
1529F04D19ED88830064B9B1 /* http.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = http.lua; path = ../external/lua/luasocket/script/socket/http.lua; sourceTree = "<group>"; };
1529F04E19ED88830064B9B1 /* mbox.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = mbox.lua; path = ../external/lua/luasocket/script/socket/mbox.lua; sourceTree = "<group>"; };
1529F04F19ED88830064B9B1 /* smtp.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = smtp.lua; path = ../external/lua/luasocket/script/socket/smtp.lua; sourceTree = "<group>"; };
1529F05019ED88830064B9B1 /* tp.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = tp.lua; path = ../external/lua/luasocket/script/socket/tp.lua; sourceTree = "<group>"; };
1529F05119ED88830064B9B1 /* url.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = url.lua; path = ../external/lua/luasocket/script/socket/url.lua; sourceTree = "<group>"; };
15427B76198B750300DC375D /* lua_module_register.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_module_register.h; sourceTree = "<group>"; };
15427B77198B843300DC375D /* lua_module_register.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_module_register.h; sourceTree = "<group>"; };
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 = "<group>"; };
@ -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 = "<group>"; };
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 = "<group>"; };
15D1FCDE1998637C00302043 /* bitExtend.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = bitExtend.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/bitExtend.lua"; sourceTree = "<group>"; };
15D1FCDF1998637C00302043 /* Cocos2d.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2d.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/Cocos2d.lua"; sourceTree = "<group>"; };
15D1FCE01998637C00302043 /* Cocos2dConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2dConstants.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/Cocos2dConstants.lua"; sourceTree = "<group>"; };
15D1FCE11998637C00302043 /* DeprecatedCocos2dClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dClass.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dClass.lua"; sourceTree = "<group>"; };
15D1FCE21998637C00302043 /* DeprecatedCocos2dEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dEnum.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dEnum.lua"; sourceTree = "<group>"; };
15D1FCE31998637C00302043 /* DeprecatedCocos2dFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dFunc.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dFunc.lua"; sourceTree = "<group>"; };
15D1FCE41998637C00302043 /* DeprecatedOpenglEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedOpenglEnum.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/DeprecatedOpenglEnum.lua"; sourceTree = "<group>"; };
15D1FCE51998637C00302043 /* DrawPrimitives.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DrawPrimitives.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/DrawPrimitives.lua"; sourceTree = "<group>"; };
15D1FCE61998637C00302043 /* extern.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = extern.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/extern.lua"; sourceTree = "<group>"; };
15D1FCE71998637C00302043 /* json.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/json.lua"; sourceTree = "<group>"; };
15D1FCE81998637C00302043 /* luaj.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaj.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/luaj.lua"; sourceTree = "<group>"; };
15D1FCE91998637C00302043 /* luaoc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaoc.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/luaoc.lua"; sourceTree = "<group>"; };
15D1FCEA1998637C00302043 /* Opengl.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Opengl.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/Opengl.lua"; sourceTree = "<group>"; };
15D1FCEB1998637C00302043 /* OpenglConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OpenglConstants.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/OpenglConstants.lua"; sourceTree = "<group>"; };
15D1FD32199863BA00302043 /* CCBReaderLoad.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CCBReaderLoad.lua; path = "../cocos/scripting/lua-bindings/script/cocosbuilder/CCBReaderLoad.lua"; sourceTree = "<group>"; };
15D1FD33199863BA00302043 /* DeprecatedCocosBuilderClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosBuilderClass.lua; path = "../cocos/scripting/lua-bindings/script/cocosbuilder/DeprecatedCocosBuilderClass.lua"; sourceTree = "<group>"; };
15D1FD38199863CA00302043 /* AudioEngine.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AudioEngine.lua; path = "../cocos/scripting/lua-bindings/script/cocosdenshion/AudioEngine.lua"; sourceTree = "<group>"; };
15D1FD39199863CA00302043 /* DeprecatedCocosDenshionClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosDenshionClass.lua; path = "../cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionClass.lua"; sourceTree = "<group>"; };
15D1FD3A199863CA00302043 /* DeprecatedCocosDenshionFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosDenshionFunc.lua; path = "../cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionFunc.lua"; sourceTree = "<group>"; };
15D1FD4D199863F900302043 /* DeprecatedExtensionClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedExtensionClass.lua; path = "../cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionClass.lua"; sourceTree = "<group>"; };
15D1FD4E199863F900302043 /* DeprecatedExtensionEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedExtensionEnum.lua; path = "../cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionEnum.lua"; sourceTree = "<group>"; };
15D1FD4F199863F900302043 /* DeprecatedExtensionFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedExtensionFunc.lua; path = "../cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionFunc.lua"; sourceTree = "<group>"; };
15D1FD50199863F900302043 /* ExtensionConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ExtensionConstants.lua; path = "../cocos/scripting/lua-bindings/script/extension/ExtensionConstants.lua"; sourceTree = "<group>"; };
15D1FD591998641200302043 /* DeprecatedNetworkClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedNetworkClass.lua; path = "../cocos/scripting/lua-bindings/script/network/DeprecatedNetworkClass.lua"; sourceTree = "<group>"; };
15D1FD5A1998641200302043 /* DeprecatedNetworkEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedNetworkEnum.lua; path = "../cocos/scripting/lua-bindings/script/network/DeprecatedNetworkEnum.lua"; sourceTree = "<group>"; };
15D1FD5B1998641200302043 /* DeprecatedNetworkFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedNetworkFunc.lua; path = "../cocos/scripting/lua-bindings/script/network/DeprecatedNetworkFunc.lua"; sourceTree = "<group>"; };
15D1FD5C1998641200302043 /* NetworkConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = NetworkConstants.lua; path = "../cocos/scripting/lua-bindings/script/network/NetworkConstants.lua"; sourceTree = "<group>"; };
15D1FD6D1998642800302043 /* DeprecatedUIEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedUIEnum.lua; path = "../cocos/scripting/lua-bindings/script/ui/DeprecatedUIEnum.lua"; sourceTree = "<group>"; };
15D1FD6E1998642800302043 /* DeprecatedUIFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedUIFunc.lua; path = "../cocos/scripting/lua-bindings/script/ui/DeprecatedUIFunc.lua"; sourceTree = "<group>"; };
15D1FD6F1998642800302043 /* experimentalUIConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = experimentalUIConstants.lua; path = "../cocos/scripting/lua-bindings/script/ui/experimentalUIConstants.lua"; sourceTree = "<group>"; };
15D1FD701998642800302043 /* GuiConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = GuiConstants.lua; path = "../cocos/scripting/lua-bindings/script/ui/GuiConstants.lua"; sourceTree = "<group>"; };
15D7637E19E8FC980069EAE8 /* CocosStudio.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CocosStudio.lua; path = "../cocos/scripting/lua-bindings/script/cocosstudio/CocosStudio.lua"; sourceTree = "<group>"; };
15D7637F19E8FC980069EAE8 /* DeprecatedCocoStudioClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocoStudioClass.lua; path = "../cocos/scripting/lua-bindings/script/cocosstudio/DeprecatedCocoStudioClass.lua"; sourceTree = "<group>"; };
15D7638019E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocoStudioFunc.lua; path = "../cocos/scripting/lua-bindings/script/cocosstudio/DeprecatedCocoStudioFunc.lua"; sourceTree = "<group>"; };
15D7638119E8FC980069EAE8 /* StudioConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = StudioConstants.lua; path = "../cocos/scripting/lua-bindings/script/cocosstudio/StudioConstants.lua"; sourceTree = "<group>"; };
15EE465A19A7200300AF29F1 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = ../external/curl/prebuilt/ios/libcurl.a; sourceTree = "<group>"; };
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 = "<group>";
};
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 = "<group>";
};
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 */

84
cocos/2d/CCClippingRectangleNode.cpp Normal file
View File

@ -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

77
cocos/2d/CCClippingRectangleNode.h Normal file
View File

@ -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

1
cocos/2d/CMakeLists.txt
View File

@ -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

2
cocos/2d/libcocos2d.vcxproj
View File

@ -477,6 +477,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
<ClCompile Include="CCAnimationCache.cpp" />
<ClCompile Include="CCAtlasNode.cpp" />
<ClCompile Include="CCClippingNode.cpp" />
<ClCompile Include="CCClippingRectangleNode.cpp" />
<ClCompile Include="CCComponent.cpp" />
<ClCompile Include="CCComponentContainer.cpp" />
<ClCompile Include="CCDrawingPrimitives.cpp" />
@ -896,6 +897,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
<ClInclude Include="CCAnimationCache.h" />
<ClInclude Include="CCAtlasNode.h" />
<ClInclude Include="CCClippingNode.h" />
<ClInclude Include="CCClippingRectangleNode.h" />
<ClInclude Include="CCComponent.h" />
<ClInclude Include="CCComponentContainer.h" />
<ClInclude Include="CCDrawingPrimitives.h" />

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

@ -334,6 +334,9 @@
<ClCompile Include="CCClippingNode.cpp">
<Filter>2d</Filter>
</ClCompile>
<ClCompile Include="CCClippingRectangleNode.cpp">
<Filter>2d</Filter>
</ClCompile>
<ClCompile Include="CCComponent.cpp">
<Filter>2d</Filter>
</ClCompile>
@ -1373,6 +1376,9 @@
<ClInclude Include="CCClippingNode.h">
<Filter>2d</Filter>
</ClInclude>
<ClInclude Include="CCClippingRectangleNode.h">
<Filter>2d</Filter>
</ClInclude>
<ClInclude Include="CCComponent.h">
<Filter>2d</Filter>
</ClInclude>

1
cocos/Android.mk
View File

@ -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 \

1
cocos/cocos2d.h
View File

@ -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"

2
cocos/scripting/lua-bindings/script/cocosstudio/CocosStudio.lua → cocos/scripting/lua-bindings/script/cocostudio/CocoStudio.lua
View File

@ -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)

0
cocos/scripting/lua-bindings/script/cocosstudio/DeprecatedCocoStudioClass.lua → cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioClass.lua
View File

0
cocos/scripting/lua-bindings/script/cocosstudio/DeprecatedCocoStudioFunc.lua → cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioFunc.lua
View File

0
cocos/scripting/lua-bindings/script/cocosstudio/StudioConstants.lua → cocos/scripting/lua-bindings/script/cocostudio/StudioConstants.lua
View File

10
cocos/scripting/lua-bindings/script/init.lua
View File

@ -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"

11
templates/cocos2dx_files.json
View File

@ -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",

27
tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp
View File

@ -33,6 +33,7 @@ static std::function<Layer*()> 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

10
tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.h
View File

@ -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
{

2
tests/game-controller-test/proj.ios/AppController.mm
View File

@ -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

4
tests/lua-empty-test/project/CMakeLists.txt
View File

@ -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
)

12
tests/lua-empty-test/project/proj.android/build-cfg.json
View File

@ -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",

34
tests/lua-empty-test/src/hello.lua
View File

@ -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

2
tests/lua-game-controller-test/project/Classes/AppDelegate.h
View File

@ -1,7 +1,7 @@
#ifndef _APP_DELEGATE_H_
#define _APP_DELEGATE_H_
#include "CCApplication.h"
#include "platform/CCApplication.h"
/**
@brief The cocos2d Application.

8
tests/lua-game-controller-test/project/proj.android/build-cfg.json
View File

@ -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",

2
tests/lua-game-controller-test/project/proj.ios/AppController.mm
View File

@ -24,7 +24,7 @@
#import <UIKit/UIKit.h>
#import "AppController.h"
#import "cocos2d.h"
#import "CCEAGLView.h"
#import "CCEAGLView-ios.h"
#import "AppDelegate.h"
#import "RootViewController.h"

2
tests/lua-game-controller-test/src/GameControllerTest.lua
View File

@ -1,5 +1,3 @@
require("extern")
require("ControllerConstants")
local ControllerHolder = class("ControllerHolder")

7
tests/lua-game-controller-test/src/main.lua
View File

@ -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

8
tests/lua-tests/project/CMakeLists.txt
View File

@ -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
)

29
tests/lua-tests/project/proj.android/build-cfg.json
View File

@ -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": "",

22
tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@ -108,13 +108,8 @@
</DllDataFileName>
</Midl>
<PreBuildEvent>
<Command>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
<Command>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</Command>
<Message>copy files</Message>
@ -163,13 +158,8 @@ xcopy "$(ProjectDir)..\..\..\cpp-tests\Resources" "$(ProjectDir)..\..\res" /e /Y
</DllDataFileName>
</Midl>
<PreBuildEvent>
<Command>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
<Command>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</Command>
<Message>copy files</Message>
@ -200,4 +190,4 @@ xcopy "$(ProjectDir)..\..\..\cpp-tests\Resources" "$(ProjectDir)..\..\res" /e /Y
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

2
tests/lua-tests/src/AssetsManagerTest/AssetsManagerTest.lua
View File

@ -104,7 +104,7 @@ local function updateLayer()
addSearchPath(realPath,true)
end
assetsManagerModule = reloadModule("src/AssetsManagerTest/AssetsManagerModule")
assetsManagerModule = reloadModule("AssetsManagerTest/AssetsManagerModule")
assetsManagerModule.newScene(AssetsManagerTestMain)
end

4
tests/lua-tests/src/ByteCodeEncryptTest/ByteCodeEncryptTest.lua
View File

@ -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

6
tests/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua
View File

@ -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

2
tests/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/TriggerCode/acts.lua
View File

@ -1,5 +1,3 @@
require "CocoStudio"
local TMoveBy = class("TMoveBy")
TMoveBy._tag = -1
TMoveBy._duration = 0

2
tests/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/TriggerCode/cons.lua
View File

@ -1,5 +1,3 @@
require ("CocoStudio")
local NodeInRect = class("NodeInRect")
NodeInRect._tag = -1
NodeInRect._origin = nil

10
tests/lua-tests/src/CocoStudioTest/CocoStudioTest.lua
View File

@ -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

1
tests/lua-tests/src/CocosDenshionTest/CocosDenshionTest.lua
View File

@ -1,4 +1,3 @@
require "AudioEngine"
local EFFECT_FILE = "effect1.wav"
local MUSIC_FILE = nil

2
tests/lua-tests/src/EffectsTest/EffectsTest.lua
View File

@ -1,4 +1,4 @@
require "src/EffectsTest/EffectsName"
require "EffectsTest/EffectsName"
local ActionIdx = -1

3
tests/lua-tests/src/ExtensionTest/CocosBuilderTest.lua
View File

@ -1,6 +1,3 @@
require "CCBReaderLoad"
HelloCocosBuilderLayer = HelloCocosBuilderLayer or {}
ccb["HelloCocosBuilderLayer"] = HelloCocosBuilderLayer

5
tests/lua-tests/src/ExtensionTest/ExtensionTest.lua
View File

@ -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

3
tests/lua-tests/src/ExtensionTest/WebProxyTest.lua
View File

@ -1,5 +1,4 @@
require "NetworkConstants"
local function WebSocketTestLayer()
local function WebSocketTestLayer()
local layer = cc.Layer:create()
local winSize = cc.Director:getInstance():getWinSize()

4
tests/lua-tests/src/OpenGLTest/OpenGLTest.lua
View File

@ -1,7 +1,3 @@
require "OpenglConstants"
require "Cocos2dConstants"
require "Opengl"
local vertDefaultSource = "\n".."\n" ..
"attribute vec4 a_position;\n" ..
"attribute vec2 a_texCoord;\n" ..

2
tests/lua-tests/src/PerformanceTest/PerformanceTest.lua
View File

@ -1,4 +1,4 @@
require "src/PerformanceTest/PerformanceSpriteTest"
require "PerformanceTest/PerformanceSpriteTest"
local MAX_COUNT = 6
local LINE_SPACE = 40

6
tests/lua-tests/src/TouchesTest/Ball.lua
View File

@ -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)

3
tests/lua-tests/src/TouchesTest/Paddle.lua
View File

@ -1,5 +1,4 @@
require "extern"
require "src/VisibleRect"
require "VisibleRect"
Paddle = class("Paddle", function(texture)
return cc.Sprite:createWithTexture(texture)

8
tests/lua-tests/src/TouchesTest/TouchesTest.lua
View File

@ -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

2
tests/lua-tests/src/TransitionsTest/TransitionsName.lua
View File

@ -1,4 +1,4 @@
require "src/helper"
require "helper"
Transition_Table =
{

2
tests/lua-tests/src/TransitionsTest/TransitionsTest.lua
View File

@ -1,4 +1,4 @@
require "src/TransitionsTest/TransitionsName"
require "TransitionsTest/TransitionsName"
local SceneIdx = -1

3
tests/lua-tests/src/VideoPlayerTest/VideoPlayerTest.lua
View File

@ -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)

3
tests/lua-tests/src/VisibleRect.lua
View File

@ -1,6 +1,3 @@
require "extern"
require "Cocos2d"
VisibleRect = class("VisibleRect")
VisibleRect.__index = VisibleRect

6
tests/lua-tests/src/controller.lua
View File

@ -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())

1
tests/lua-tests/src/helper.lua
View File

@ -1,4 +1,3 @@
require "Cocos2d"
CC_CONTENT_SCALE_FACTOR = function()
return cc.Director:getInstance():getContentScaleFactor()

115
tests/lua-tests/src/mainMenu.lua
View File

@ -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