diff --git a/CHANGELOG b/CHANGELOG index a8b8a5cffd..9e4b52c463 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,16 +2,22 @@ cocos2d-x-3.3 ?? [NEW] Added submesh support, and support attaching a Sprite3D object to a bone [NEW] Added UIScale9Sprite [NEW] Added Camera + [NEW] Added render primitive and render primitive command, support passing point, line and triangle data [NEW] EventMouse: support getDelta, getDeltaX, getDeltaY functions [NEW] FileUtils: add isDirectoryExist(), createDirectory(), removeDirectory(), removeFile(), renameFile() getFileSize() [NEW] FileUtilsApple: allow setting bundle to use in file utils on iOS and Mac OS X [NEW] Image: support of software PVRTC v1 decompression + [NEW] Lua-binding: added release_print that can print log even in release mode + [NEW] Physics Integration: can invoke update in demand + [NEW] RenderTexture: add a call back function for saveToFile() [NEW] RotateTo: added 3D rotation support [NEW] ScrollView: added `setMinScale()` and `setMaxScale()` + [NEW] Sprite3D: added setCullFace() and setCullFaceEnabled() [NEW] SpriteFrameCache: load from plist file content data [NEW] utils: added gettime() - [NEW] TextField: support utf8 + [NEW] ui::TextField: support utf8 + [NEW] ui::TextField: support set color and placehold color [NEW] Text: added getter and setter for TextColor [FIX] EditBox: font size is not scaled when glview is scaled on Mac OS X @@ -20,6 +26,7 @@ cocos2d-x-3.3 ?? [FIX] Label: setTextColor does not have any effect on Mac OS X [FIX] Label: result of LabelTTF::getBoundingBox() is wrong [FIX] Label: can not set outline color correctly if using system font on iOS + [FIX] Label: character edeg will be cut a little if character size is small [FIX] LabelBMFont: result of LabelBMFont::getBoundingBox() is wrong [FIX] ListView: can not insert an item in specific position, it is added at bottom [FIX] LoadingBar: position is changed if changing direction diff --git a/build/android-build.py b/build/android-build.py index 675ff3ae56..cb1405b38e 100755 --- a/build/android-build.py +++ b/build/android-build.py @@ -123,6 +123,10 @@ def copy_files(src, dst): os.mkdir(new_dst) copy_files(path, new_dst) +def copy_file(src_file, dst): + if not src_file.startswith('.') and not src_file.endswith('.gz') and os.path.isfile(src_file): + shutil.copy(src_file, dst) + def copy_resources(target, app_android_root): # remove app_android_root/assets if it exists @@ -154,7 +158,21 @@ def copy_resources(target, app_android_root): copy_files(src_dir, assets_src_dir) common_script_dir = os.path.join(app_android_root, "../../../../cocos/scripting/lua-bindings/script") - copy_files(common_script_dir, assets_dir) + if target == "lua-tests": + copy_files(os.path.join(common_script_dir, "cocos2d"), assets_dir) + copy_files(os.path.join(common_script_dir, "cocosbuilder"), assets_dir) + copy_files(os.path.join(common_script_dir, "cocosdenshion"), assets_dir) + copy_files(os.path.join(common_script_dir, "cocostudio"), assets_dir) + copy_files(os.path.join(common_script_dir, "extension"), assets_dir) + copy_files(os.path.join(common_script_dir, "network"), assets_dir) + copy_files(os.path.join(common_script_dir, "ui"), assets_dir) + elif target == "lua-empty-test": + copy_files(os.path.join(common_script_dir, "cocos2d"), assets_dir) + copy_files(os.path.join(common_script_dir, "cocosdenshion"), assets_dir) + copy_files(os.path.join(common_script_dir, "network"), assets_dir) + elif target == "lua-game-controller-test": + copy_files(os.path.join(common_script_dir, "cocos2d"), assets_dir) + copy_files(os.path.join(common_script_dir, "controller"), assets_dir) luasocket_script_dir = os.path.join(app_android_root, "../../../../external/lua/luasocket") for root, dirs, files in os.walk(luasocket_script_dir): diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj b/build/cocos2d_libs.xcodeproj/project.pbxproj index e5b3dbac4b..33c62659d0 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj @@ -546,7 +546,6 @@ 1AAF5354180E3060000584C8 /* AssetsManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5351180E3060000584C8 /* AssetsManager.cpp */; }; 1AAF5355180E3060000584C8 /* AssetsManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5352180E3060000584C8 /* AssetsManager.h */; }; 1AAF5356180E3060000584C8 /* AssetsManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5352180E3060000584C8 /* AssetsManager.h */; }; - 1AAF541D180E3B6A000584C8 /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AAF541C180E3B6A000584C8 /* libcurl.a */; }; 1AAF584F180E40B9000584C8 /* LocalStorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF584C180E40B9000584C8 /* LocalStorage.cpp */; }; 1AAF5850180E40B9000584C8 /* LocalStorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF584C180E40B9000584C8 /* LocalStorage.cpp */; }; 1AAF5851180E40B9000584C8 /* LocalStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF584D180E40B9000584C8 /* LocalStorage.h */; }; @@ -584,14 +583,6 @@ 3E6176771960F89B00DE83F5 /* CCEventListenerController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E6176641960F89B00DE83F5 /* CCEventListenerController.h */; }; 3E6176781960F89B00DE83F5 /* CCGameController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E6176651960F89B00DE83F5 /* CCGameController.h */; }; 3E61781D1966A5A300DE83F5 /* CCController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E61781C1966A5A300DE83F5 /* CCController.cpp */; }; - 3E9E75E41993D8E4005B7047 /* CCAABB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E75E01993D8E4005B7047 /* CCAABB.cpp */; }; - 3E9E75E51993D8E4005B7047 /* CCAABB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E75E01993D8E4005B7047 /* CCAABB.cpp */; }; - 3E9E75E61993D8E4005B7047 /* CCAABB.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E9E75E11993D8E4005B7047 /* CCAABB.h */; }; - 3E9E75E71993D8E4005B7047 /* CCAABB.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E9E75E11993D8E4005B7047 /* CCAABB.h */; }; - 3E9E75E81993D8E4005B7047 /* CCOBB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E75E21993D8E4005B7047 /* CCOBB.cpp */; }; - 3E9E75E91993D8E4005B7047 /* CCOBB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E75E21993D8E4005B7047 /* CCOBB.cpp */; }; - 3E9E75EA1993D8E4005B7047 /* CCOBB.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E9E75E31993D8E4005B7047 /* CCOBB.h */; }; - 3E9E75EB1993D8E4005B7047 /* CCOBB.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E9E75E31993D8E4005B7047 /* CCOBB.h */; }; 3E9E80E9198639EF00FA95D0 /* CCAttachNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E80E3198639EF00FA95D0 /* CCAttachNode.cpp */; }; 3E9E80EA198639EF00FA95D0 /* CCAttachNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E80E3198639EF00FA95D0 /* CCAttachNode.cpp */; }; 3E9E80EB198639EF00FA95D0 /* CCAttachNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E9E80E4198639EF00FA95D0 /* CCAttachNode.h */; }; @@ -1260,11 +1251,8 @@ 50ABC0651926664800A911A9 /* CCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF531926664700A911A9 /* CCGL.h */; }; 50ABC0671926664800A911A9 /* CCPlatformDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF541926664700A911A9 /* CCPlatformDefine.h */; }; 50ABC0691926664800A911A9 /* CCStdC.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF551926664700A911A9 /* CCStdC.h */; }; - 5E7EAC03199469D200CCFA35 /* CCRay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E7EAC01199469D200CCFA35 /* CCRay.cpp */; }; - 5E7EAC04199469D200CCFA35 /* CCRay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E7EAC01199469D200CCFA35 /* CCRay.cpp */; }; - 5E7EAC05199469D200CCFA35 /* CCRay.h in Headers */ = {isa = PBXBuildFile; fileRef = 5E7EAC02199469D200CCFA35 /* CCRay.h */; }; - 5E7EAC06199469D200CCFA35 /* CCRay.h in Headers */ = {isa = PBXBuildFile; fileRef = 5E7EAC02199469D200CCFA35 /* CCRay.h */; }; A07A4CAF1783777C0073F6A7 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1551A342158F2AB200E66CFE /* Foundation.framework */; }; + B2165EEA19921124000BE3E6 /* CCPrimitiveCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B257B45E198A353E00D9A687 /* CCPrimitiveCommand.cpp */; }; B217703C1977ECB4009EE11B /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B217703B1977ECB4009EE11B /* IOKit.framework */; }; B21770401977ECE6009EE11B /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B217703F1977ECE6009EE11B /* OpenGL.framework */; }; B21770421977ECF8009EE11B /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B21770411977ECF8009EE11B /* ApplicationServices.framework */; }; @@ -1288,6 +1276,20 @@ B24AA98A195A675C007B4522 /* CCFastTMXTiledMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B24AA983195A675C007B4522 /* CCFastTMXTiledMap.cpp */; }; B24AA98B195A675C007B4522 /* CCFastTMXTiledMap.h in Headers */ = {isa = PBXBuildFile; fileRef = B24AA984195A675C007B4522 /* CCFastTMXTiledMap.h */; }; B24AA98C195A675C007B4522 /* CCFastTMXTiledMap.h in Headers */ = {isa = PBXBuildFile; fileRef = B24AA984195A675C007B4522 /* CCFastTMXTiledMap.h */; }; + B257B44E1989D5E800D9A687 /* CCPrimitive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B257B44C1989D5E800D9A687 /* CCPrimitive.cpp */; }; + B257B44F1989D5E800D9A687 /* CCPrimitive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B257B44C1989D5E800D9A687 /* CCPrimitive.cpp */; }; + B257B4501989D5E800D9A687 /* CCPrimitive.h in Headers */ = {isa = PBXBuildFile; fileRef = B257B44D1989D5E800D9A687 /* CCPrimitive.h */; }; + B257B4511989D5E800D9A687 /* CCPrimitive.h in Headers */ = {isa = PBXBuildFile; fileRef = B257B44D1989D5E800D9A687 /* CCPrimitive.h */; }; + B257B460198A353E00D9A687 /* CCPrimitiveCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B257B45E198A353E00D9A687 /* CCPrimitiveCommand.cpp */; }; + B257B461198A353E00D9A687 /* CCPrimitiveCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = B257B45F198A353E00D9A687 /* CCPrimitiveCommand.h */; }; + B276EF5F1988D1D500CD400F /* CCVertexIndexData.h in Headers */ = {isa = PBXBuildFile; fileRef = B276EF5B1988D1D500CD400F /* CCVertexIndexData.h */; }; + B276EF601988D1D500CD400F /* CCVertexIndexData.h in Headers */ = {isa = PBXBuildFile; fileRef = B276EF5B1988D1D500CD400F /* CCVertexIndexData.h */; }; + B276EF611988D1D500CD400F /* CCVertexIndexData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B276EF5C1988D1D500CD400F /* CCVertexIndexData.cpp */; }; + B276EF621988D1D500CD400F /* CCVertexIndexData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B276EF5C1988D1D500CD400F /* CCVertexIndexData.cpp */; }; + B276EF631988D1D500CD400F /* CCVertexIndexBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = B276EF5D1988D1D500CD400F /* CCVertexIndexBuffer.h */; }; + B276EF641988D1D500CD400F /* CCVertexIndexBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = B276EF5D1988D1D500CD400F /* CCVertexIndexBuffer.h */; }; + B276EF651988D1D500CD400F /* CCVertexIndexBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B276EF5E1988D1D500CD400F /* CCVertexIndexBuffer.cpp */; }; + B276EF661988D1D500CD400F /* CCVertexIndexBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B276EF5E1988D1D500CD400F /* CCVertexIndexBuffer.cpp */; }; B27AEE0219768934008BD575 /* libwebsockets.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AAF5384180E35A3000584C8 /* libwebsockets.a */; }; B282B4801980E08F00666787 /* CCEditBoxImplMac.h in Headers */ = {isa = PBXBuildFile; fileRef = B282B47D1980E02B00666787 /* CCEditBoxImplMac.h */; }; B282B4811980E0A300666787 /* CCEditBoxImplMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = B282B47C1980E02B00666787 /* CCEditBoxImplMac.mm */; }; @@ -1869,6 +1871,18 @@ B3AF01A31842FBA400A98B85 /* b2MotorJoint.h in Headers */ = {isa = PBXBuildFile; fileRef = B3AF019F1842FBA400A98B85 /* b2MotorJoint.h */; }; B3B12A5A17E7F44000026B4A /* libchipmunk Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A03F2CB81780BD04006731B9 /* libchipmunk Mac.a */; }; B3B12A5B17E7F45C00026B4A /* libchipmunk iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A07A4F3B178387670073F6A7 /* libchipmunk iOS.a */; }; + B610517B199CB1A600DC41CE /* CCAABB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6105175199CB1A600DC41CE /* CCAABB.cpp */; }; + B610517C199CB1A600DC41CE /* CCAABB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6105175199CB1A600DC41CE /* CCAABB.cpp */; }; + B610517D199CB1A600DC41CE /* CCAABB.h in Headers */ = {isa = PBXBuildFile; fileRef = B6105176199CB1A600DC41CE /* CCAABB.h */; }; + B610517E199CB1A600DC41CE /* CCAABB.h in Headers */ = {isa = PBXBuildFile; fileRef = B6105176199CB1A600DC41CE /* CCAABB.h */; }; + B610517F199CB1A600DC41CE /* CCOBB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6105177199CB1A600DC41CE /* CCOBB.cpp */; }; + B6105180199CB1A600DC41CE /* CCOBB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6105177199CB1A600DC41CE /* CCOBB.cpp */; }; + B6105181199CB1A600DC41CE /* CCOBB.h in Headers */ = {isa = PBXBuildFile; fileRef = B6105178199CB1A600DC41CE /* CCOBB.h */; }; + B6105182199CB1A600DC41CE /* CCOBB.h in Headers */ = {isa = PBXBuildFile; fileRef = B6105178199CB1A600DC41CE /* CCOBB.h */; }; + B6105183199CB1A600DC41CE /* CCRay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6105179199CB1A600DC41CE /* CCRay.cpp */; }; + B6105184199CB1A600DC41CE /* CCRay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6105179199CB1A600DC41CE /* CCRay.cpp */; }; + B6105185199CB1A600DC41CE /* CCRay.h in Headers */ = {isa = PBXBuildFile; fileRef = B610517A199CB1A600DC41CE /* CCRay.h */; }; + B6105186199CB1A600DC41CE /* CCRay.h in Headers */ = {isa = PBXBuildFile; fileRef = B610517A199CB1A600DC41CE /* CCRay.h */; }; B6AAF84119404E0D0069DE01 /* CCBundle3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6AAF83F19404E0D0069DE01 /* CCBundle3D.cpp */; }; B6AAF84219404E0D0069DE01 /* CCBundle3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6AAF83F19404E0D0069DE01 /* CCBundle3D.cpp */; }; B6AAF84319404E0D0069DE01 /* CCBundle3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B6AAF84019404E0D0069DE01 /* CCBundle3D.h */; }; @@ -1891,6 +1905,8 @@ ED9C6A9518599AD8000A5232 /* CCNodeGrid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED9C6A9218599AD8000A5232 /* CCNodeGrid.cpp */; }; ED9C6A9618599AD8000A5232 /* CCNodeGrid.h in Headers */ = {isa = PBXBuildFile; fileRef = ED9C6A9318599AD8000A5232 /* CCNodeGrid.h */; }; ED9C6A9718599AD8000A5232 /* CCNodeGrid.h in Headers */ = {isa = PBXBuildFile; fileRef = ED9C6A9318599AD8000A5232 /* CCNodeGrid.h */; }; + FAA9E17D1998A42A00E2E252 /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AAF541C180E3B6A000584C8 /* libcurl.a */; }; + FAA9E17E1998A43800E2E252 /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AAF541C180E3B6A000584C8 /* libcurl.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -2485,10 +2501,6 @@ 3E6176641960F89B00DE83F5 /* CCEventListenerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventListenerController.h; path = ../base/CCEventListenerController.h; sourceTree = ""; }; 3E6176651960F89B00DE83F5 /* CCGameController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCGameController.h; path = ../base/CCGameController.h; sourceTree = ""; }; 3E61781C1966A5A300DE83F5 /* CCController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCController.cpp; path = ../base/CCController.cpp; sourceTree = ""; }; - 3E9E75E01993D8E4005B7047 /* CCAABB.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCAABB.cpp; sourceTree = ""; }; - 3E9E75E11993D8E4005B7047 /* CCAABB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCAABB.h; sourceTree = ""; }; - 3E9E75E21993D8E4005B7047 /* CCOBB.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCOBB.cpp; sourceTree = ""; }; - 3E9E75E31993D8E4005B7047 /* CCOBB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCOBB.h; sourceTree = ""; }; 3E9E80E3198639EF00FA95D0 /* CCAttachNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCAttachNode.cpp; sourceTree = ""; }; 3E9E80E4198639EF00FA95D0 /* CCAttachNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCAttachNode.h; sourceTree = ""; }; 3E9E80E5198639EF00FA95D0 /* CCSubMesh.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCSubMesh.cpp; sourceTree = ""; }; @@ -2996,8 +3008,6 @@ 50FCEB9018C72017004AD434 /* WidgetReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WidgetReader.cpp; sourceTree = ""; }; 50FCEB9118C72017004AD434 /* WidgetReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WidgetReader.h; sourceTree = ""; }; 50FCEB9218C72017004AD434 /* WidgetReaderProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WidgetReaderProtocol.h; sourceTree = ""; }; - 5E7EAC01199469D200CCFA35 /* CCRay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCRay.cpp; sourceTree = ""; }; - 5E7EAC02199469D200CCFA35 /* CCRay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCRay.h; sourceTree = ""; }; A03F2CB81780BD04006731B9 /* libchipmunk Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libchipmunk Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; A03F2D9B1780BDF7006731B9 /* libbox2d Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libbox2d Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; A03F2ED617814268006731B9 /* libcocosdenshion Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocosdenshion Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -3026,6 +3036,14 @@ B24EEA7619775ECE004493CC /* libcocosbuilder iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocosbuilder iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; B24EEA7E19775EE1004493CC /* libspine iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libspine iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; B24EEA8619775EF3004493CC /* libnetwork iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libnetwork iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B257B44C1989D5E800D9A687 /* CCPrimitive.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCPrimitive.cpp; sourceTree = ""; }; + B257B44D1989D5E800D9A687 /* CCPrimitive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPrimitive.h; sourceTree = ""; }; + B257B45E198A353E00D9A687 /* CCPrimitiveCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCPrimitiveCommand.cpp; sourceTree = ""; }; + B257B45F198A353E00D9A687 /* CCPrimitiveCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPrimitiveCommand.h; sourceTree = ""; }; + B276EF5B1988D1D500CD400F /* CCVertexIndexData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCVertexIndexData.h; sourceTree = ""; }; + B276EF5C1988D1D500CD400F /* CCVertexIndexData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCVertexIndexData.cpp; sourceTree = ""; }; + B276EF5D1988D1D500CD400F /* CCVertexIndexBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCVertexIndexBuffer.h; sourceTree = ""; }; + B276EF5E1988D1D500CD400F /* CCVertexIndexBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCVertexIndexBuffer.cpp; sourceTree = ""; }; B282B47C1980E02B00666787 /* CCEditBoxImplMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCEditBoxImplMac.mm; sourceTree = ""; }; B282B47D1980E02B00666787 /* CCEditBoxImplMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEditBoxImplMac.h; sourceTree = ""; }; B29594AF1926D5D9003EEF37 /* ccShader_3D_Color.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_3D_Color.frag; sourceTree = ""; }; @@ -3059,6 +3077,12 @@ B375104F1823AC7B00B3BA6A /* CCPhysicsWorldInfo_chipmunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPhysicsWorldInfo_chipmunk.h; sourceTree = ""; }; B3AF019E1842FBA400A98B85 /* b2MotorJoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = b2MotorJoint.cpp; sourceTree = ""; }; B3AF019F1842FBA400A98B85 /* b2MotorJoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = b2MotorJoint.h; sourceTree = ""; }; + B6105175199CB1A600DC41CE /* CCAABB.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCAABB.cpp; sourceTree = ""; }; + B6105176199CB1A600DC41CE /* CCAABB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCAABB.h; sourceTree = ""; }; + B6105177199CB1A600DC41CE /* CCOBB.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCOBB.cpp; sourceTree = ""; }; + B6105178199CB1A600DC41CE /* CCOBB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCOBB.h; sourceTree = ""; }; + B6105179199CB1A600DC41CE /* CCRay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCRay.cpp; sourceTree = ""; }; + B610517A199CB1A600DC41CE /* CCRay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCRay.h; sourceTree = ""; }; B6AAF83F19404E0D0069DE01 /* CCBundle3D.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCBundle3D.cpp; sourceTree = ""; }; B6AAF84019404E0D0069DE01 /* CCBundle3D.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBundle3D.h; sourceTree = ""; }; B6ACD895193D6693005E0B8A /* CCMeshSkin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCMeshSkin.cpp; sourceTree = ""; }; @@ -3134,7 +3158,6 @@ 1A5703A4180BD2350088DEC7 /* libtiff.a in Frameworks */, 1A5703BB180BD2800088DEC7 /* libwebp.a in Frameworks */, 1A57052E180BD3280088DEC7 /* libfreetype.a in Frameworks */, - 1AAF541D180E3B6A000584C8 /* libcurl.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3142,6 +3165,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FAA9E17D1998A42A00E2E252 /* libcurl.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3205,6 +3229,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FAA9E17E1998A43800E2E252 /* libcurl.a in Frameworks */, B2CC502E1977638A0041958E /* libwebsockets.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -4915,6 +4940,10 @@ 500DC89819105D41007B91BF /* renderer */ = { isa = PBXGroup; children = ( + B276EF5B1988D1D500CD400F /* CCVertexIndexData.h */, + B276EF5C1988D1D500CD400F /* CCVertexIndexData.cpp */, + B276EF5D1988D1D500CD400F /* CCVertexIndexBuffer.h */, + B276EF5E1988D1D500CD400F /* CCVertexIndexBuffer.cpp */, 50ABBD641925AB4100A911A9 /* CCBatchCommand.cpp */, 50ABBD651925AB4100A911A9 /* CCBatchCommand.h */, 50ABBD661925AB4100A911A9 /* CCCustomCommand.cpp */, @@ -4948,6 +4977,10 @@ 50ABBD801925AB4100A911A9 /* CCTextureAtlas.h */, 50ABBD811925AB4100A911A9 /* CCTextureCache.cpp */, 50ABBD821925AB4100A911A9 /* CCTextureCache.h */, + B257B44C1989D5E800D9A687 /* CCPrimitive.cpp */, + B257B44D1989D5E800D9A687 /* CCPrimitive.h */, + B257B45E198A353E00D9A687 /* CCPrimitiveCommand.cpp */, + B257B45F198A353E00D9A687 /* CCPrimitiveCommand.h */, 5034CA5D191D591900CE6051 /* shaders */, ); name = renderer; @@ -5214,12 +5247,12 @@ B29594B81926D61F003EEF37 /* 3d */ = { isa = PBXGroup; children = ( - 5E7EAC01199469D200CCFA35 /* CCRay.cpp */, - 5E7EAC02199469D200CCFA35 /* CCRay.h */, - 3E9E75E01993D8E4005B7047 /* CCAABB.cpp */, - 3E9E75E11993D8E4005B7047 /* CCAABB.h */, - 3E9E75E21993D8E4005B7047 /* CCOBB.cpp */, - 3E9E75E31993D8E4005B7047 /* CCOBB.h */, + B6105175199CB1A600DC41CE /* CCAABB.cpp */, + B6105176199CB1A600DC41CE /* CCAABB.h */, + B6105177199CB1A600DC41CE /* CCOBB.cpp */, + B6105178199CB1A600DC41CE /* CCOBB.h */, + B6105179199CB1A600DC41CE /* CCRay.cpp */, + B610517A199CB1A600DC41CE /* CCRay.h */, 3EA2A83E1987A6810077B3D4 /* CCSkeleton3D.cpp */, 3EA2A83F1987A6810077B3D4 /* CCSkeleton3D.h */, 3E9E80E3198639EF00FA95D0 /* CCAttachNode.cpp */, @@ -5282,6 +5315,7 @@ B375107B1823AC9F00B3BA6A /* CCPhysicsWorldInfo_chipmunk.h in Headers */, 46A170F01807CECA005B8026 /* CCPhysicsWorld.h in Headers */, 50ABBEC11925AB6F00A911A9 /* CCValue.h in Headers */, + B276EF631988D1D500CD400F /* CCVertexIndexBuffer.h in Headers */, 50ABBE871925AB6F00A911A9 /* ccMacros.h in Headers */, 50ABBE731925AB6F00A911A9 /* CCEventListenerMouse.h in Headers */, 1A570063180BC5A10088DEC7 /* CCAction.h in Headers */, @@ -5292,6 +5326,7 @@ 5034CA3B191D591100CE6051 /* ccShader_PositionColor.vert in Headers */, 1A570077180BC5A10088DEC7 /* CCActionGrid3D.h in Headers */, 1A57007B180BC5A10088DEC7 /* CCActionInstant.h in Headers */, + B276EF5F1988D1D500CD400F /* CCVertexIndexData.h in Headers */, 1A57007F180BC5A10088DEC7 /* CCActionInterval.h in Headers */, 1A01C69A18F57BE800EFE3A6 /* CCSet.h in Headers */, 1A570083180BC5A10088DEC7 /* CCActionManager.h in Headers */, @@ -5318,11 +5353,11 @@ 1A570114180BC8EE0088DEC7 /* CCDrawNode.h in Headers */, 1A57011D180BC90D0088DEC7 /* CCGrabber.h in Headers */, 1A570121180BC90D0088DEC7 /* CCGrid.h in Headers */, - 5E7EAC05199469D200CCFA35 /* CCRay.h in Headers */, 5034CA2D191D591100CE6051 /* ccShader_PositionTextureA8Color.frag in Headers */, 1AC0269C1914068200FA920D /* ConvertUTF.h in Headers */, 50ABBED11925AB6F00A911A9 /* TGAlib.h in Headers */, 1A57019F180BCB590088DEC7 /* CCFont.h in Headers */, + B6105185199CB1A600DC41CE /* CCRay.h in Headers */, 1A5701A3180BCB590088DEC7 /* CCFontAtlas.h in Headers */, 1A01C68618F57BE800EFE3A6 /* CCArray.h in Headers */, 1A5701A7180BCB590088DEC7 /* CCFontAtlasCache.h in Headers */, @@ -5351,11 +5386,11 @@ 1A5701FD180BCBAD0088DEC7 /* CCMenuItem.h in Headers */, 1A570204180BCBD40088DEC7 /* CCClippingNode.h in Headers */, 1A01C6A618F58F7500EFE3A6 /* CCNotificationCenter.h in Headers */, + B6105181199CB1A600DC41CE /* CCOBB.h in Headers */, 1A57020A180BCBDF0088DEC7 /* CCMotionStreak.h in Headers */, 1A570212180BCBF40088DEC7 /* CCProgressTimer.h in Headers */, 1A570216180BCBF40088DEC7 /* CCRenderTexture.h in Headers */, 1A01C69618F57BE800EFE3A6 /* CCInteger.h in Headers */, - 3E9E75EA1993D8E4005B7047 /* CCOBB.h in Headers */, 1A570223180BCC1A0088DEC7 /* CCParticleBatchNode.h in Headers */, 50ABBD891925AB4100A911A9 /* CCCustomCommand.h in Headers */, 5034CA43191D591100CE6051 /* ccShader_Label.vert in Headers */, @@ -5404,7 +5439,6 @@ 50ABBDBB1925AB4100A911A9 /* CCTextureAtlas.h in Headers */, 1A570302180BCE890088DEC7 /* CCParallaxNode.h in Headers */, 50ABBE4B1925AB6F00A911A9 /* CCEventAcceleration.h in Headers */, - 3E9E75E61993D8E4005B7047 /* CCAABB.h in Headers */, 1A57030E180BCF190088DEC7 /* CCComponent.h in Headers */, 3E9E80EF198639EF00FA95D0 /* CCSubMesh.h in Headers */, 1A570312180BCF190088DEC7 /* CCComponentContainer.h in Headers */, @@ -5424,6 +5458,7 @@ 5034CA35191D591100CE6051 /* ccShader_PositionTexture.frag in Headers */, 50ABBE6F1925AB6F00A911A9 /* CCEventListenerKeyboard.h in Headers */, 50ABBE9D1925AB6F00A911A9 /* CCRefPtr.h in Headers */, + B257B461198A353E00D9A687 /* CCPrimitiveCommand.h in Headers */, 5034CA31191D591100CE6051 /* ccShader_PositionTexture_uColor.vert in Headers */, 50ABBE7B1925AB6F00A911A9 /* CCEventMouse.h in Headers */, 503DD8F91926B0DB00CD74DD /* CCIMEDispatcher.h in Headers */, @@ -5431,6 +5466,7 @@ 50ABBE8F1925AB6F00A911A9 /* CCPlatformConfig.h in Headers */, 50ABBE291925AB6F00A911A9 /* CCAutoreleasePool.h in Headers */, 50ABBE471925AB6F00A911A9 /* CCEvent.h in Headers */, + B257B4501989D5E800D9A687 /* CCPrimitive.h in Headers */, 50ABBE6B1925AB6F00A911A9 /* CCEventListenerFocus.h in Headers */, 50ABBDA51925AB4100A911A9 /* CCQuadCommand.h in Headers */, 50ABBD3A1925AB0000A911A9 /* CCAffineTransform.h in Headers */, @@ -5474,6 +5510,7 @@ 50ABBDB31925AB4100A911A9 /* ccShaders.h in Headers */, 50ABBDAB1925AB4100A911A9 /* CCRenderCommandPool.h in Headers */, 5034CA45191D591100CE6051 /* ccShader_Label_outline.frag in Headers */, + B610517D199CB1A600DC41CE /* CCAABB.h in Headers */, 50ABBEB11925AB6F00A911A9 /* CCUserDefault.h in Headers */, 50ABBEC71925AB6F00A911A9 /* etc1.h in Headers */, 50ABBEA91925AB6F00A911A9 /* CCTouch.h in Headers */, @@ -5637,10 +5674,8 @@ 46A170FF1807CECB005B8026 /* CCPhysicsContact.h in Headers */, 50ABBDA21925AB4100A911A9 /* CCGroupCommand.h in Headers */, 503DD8EF1926736A00CD74DD /* CCPlatformDefine.h in Headers */, - 5E7EAC06199469D200CCFA35 /* CCRay.h in Headers */, 46A171041807CECB005B8026 /* CCPhysicsShape.h in Headers */, 50ABBD3B1925AB0000A911A9 /* CCAffineTransform.h in Headers */, - 3E9E75EB1993D8E4005B7047 /* CCOBB.h in Headers */, 5034CA38191D591100CE6051 /* ccShader_PositionColorLengthTexture.vert in Headers */, 50ABBE7C1925AB6F00A911A9 /* CCEventMouse.h in Headers */, B29594D11926D61F003EEF37 /* CCSprite3DMaterial.h in Headers */, @@ -5657,6 +5692,7 @@ 5034CA40191D591100CE6051 /* ccShader_Position_uColor.vert in Headers */, 50ABBEC21925AB6F00A911A9 /* CCValue.h in Headers */, 50ABBECA1925AB6F00A911A9 /* firePngData.h in Headers */, + B257B4511989D5E800D9A687 /* CCPrimitive.h in Headers */, 50ABBE401925AB6F00A911A9 /* CCDataVisitor.h in Headers */, 1A570064180BC5A10088DEC7 /* CCAction.h in Headers */, 503DD8EC1926736A00CD74DD /* CCGLViewImpl.h in Headers */, @@ -5740,6 +5776,7 @@ 50ABC00C1926664800A911A9 /* CCDevice.h in Headers */, 1A570205180BCBD40088DEC7 /* CCClippingNode.h in Headers */, 5034CA34191D591100CE6051 /* ccShader_PositionTexture_uColor.frag in Headers */, + B6105182199CB1A600DC41CE /* CCOBB.h in Headers */, 50ABBEA21925AB6F00A911A9 /* CCScheduler.h in Headers */, 1A57020B180BCBDF0088DEC7 /* CCMotionStreak.h in Headers */, 1A570213180BCBF40088DEC7 /* CCProgressTimer.h in Headers */, @@ -5831,11 +5868,13 @@ 50ABBDBC1925AB4100A911A9 /* CCTextureAtlas.h in Headers */, 50ABBE541925AB6F00A911A9 /* CCEventDispatcher.h in Headers */, 1A12775A18DFCC4F0005F345 /* CCTweenFunction.h in Headers */, + B276EF601988D1D500CD400F /* CCVertexIndexData.h in Headers */, 50ABBD5F1925AB0000A911A9 /* Vec3.h in Headers */, 50ABBE921925AB6F00A911A9 /* CCPlatformMacros.h in Headers */, 50ABBE821925AB6F00A911A9 /* CCEventType.h in Headers */, 1AAF5852180E40B9000584C8 /* LocalStorage.h in Headers */, 50ABBD471925AB0000A911A9 /* CCVertex.h in Headers */, + B6105186199CB1A600DC41CE /* CCRay.h in Headers */, 1A9DCA2A180E6955007A3AD4 /* CCGLBufferedNode.h in Headers */, 1A01C69F18F57BE800EFE3A6 /* CCString.h in Headers */, 464AD6E8197EBB1400E502D8 /* pvr.h in Headers */, @@ -5848,8 +5887,10 @@ 1A01C6A718F58F7500EFE3A6 /* CCNotificationCenter.h in Headers */, 50ABBEDA1925AB6F00A911A9 /* ZipUtils.h in Headers */, 50ABBDC01925AB4100A911A9 /* CCTextureCache.h in Headers */, + B276EF641988D1D500CD400F /* CCVertexIndexBuffer.h in Headers */, ED9C6A9718599AD8000A5232 /* CCNodeGrid.h in Headers */, 50ABC0201926664800A911A9 /* CCThread.h in Headers */, + B610517E199CB1A600DC41CE /* CCAABB.h in Headers */, 1A01C69318F57BE800EFE3A6 /* CCDouble.h in Headers */, 50ABBE221925AB6F00A911A9 /* atitc.h in Headers */, 3EA47873195478E00068D9D1 /* CCBundleReader.h in Headers */, @@ -5870,7 +5911,6 @@ B6B2634019381FBF0088FE25 /* CCAnimationCurve.h in Headers */, B6B26346193884D60088FE25 /* CCAnimation3D.h in Headers */, B6ACD89A193D6693005E0B8A /* CCMeshSkin.h in Headers */, - 3E9E75E71993D8E4005B7047 /* CCAABB.h in Headers */, B6ACD8A1193DC0CC005E0B8A /* CCAnimate3D.h in Headers */, B6AAF84419404E0D0069DE01 /* CCBundle3D.h in Headers */, ); @@ -6773,6 +6813,7 @@ 46A170ED1807CECA005B8026 /* CCPhysicsShape.cpp in Sources */, 50ABBE991925AB6F00A911A9 /* CCRef.cpp in Sources */, ED9C6A9418599AD8000A5232 /* CCNodeGrid.cpp in Sources */, + B610517F199CB1A600DC41CE /* CCOBB.cpp in Sources */, 46A170E61807CECA005B8026 /* CCPhysicsBody.cpp in Sources */, 50ABBDA71925AB4100A911A9 /* CCRenderCommand.cpp in Sources */, 50ABBD501925AB0000A911A9 /* Quaternion.cpp in Sources */, @@ -6788,6 +6829,7 @@ 1A570065180BC5A10088DEC7 /* CCActionCamera.cpp in Sources */, 50ABBEAB1925AB6F00A911A9 /* ccTypes.cpp in Sources */, 1A570069180BC5A10088DEC7 /* CCActionCatmullRom.cpp in Sources */, + B257B44E1989D5E800D9A687 /* CCPrimitive.cpp in Sources */, 1A57006D180BC5A10088DEC7 /* CCActionEase.cpp in Sources */, 1A570071180BC5A10088DEC7 /* CCActionGrid.cpp in Sources */, B37510761823AC9F00B3BA6A /* CCPhysicsJointInfo_chipmunk.cpp in Sources */, @@ -6806,6 +6848,7 @@ 3E9E80E9198639EF00FA95D0 /* CCAttachNode.cpp in Sources */, 1A570098180BC5C10088DEC7 /* CCAtlasNode.cpp in Sources */, 1A57009E180BC5D20088DEC7 /* CCNode.cpp in Sources */, + B257B460198A353E00D9A687 /* CCPrimitiveCommand.cpp in Sources */, 50ABBE651925AB6F00A911A9 /* CCEventListenerCustom.cpp in Sources */, B37510781823AC9F00B3BA6A /* CCPhysicsShapeInfo_chipmunk.cpp in Sources */, 50ABBE391925AB6F00A911A9 /* CCData.cpp in Sources */, @@ -6850,12 +6893,12 @@ 1A570210180BCBF40088DEC7 /* CCProgressTimer.cpp in Sources */, 50ABBDB51925AB4100A911A9 /* CCTexture2D.cpp in Sources */, 1A570214180BCBF40088DEC7 /* CCRenderTexture.cpp in Sources */, + B276EF651988D1D500CD400F /* CCVertexIndexBuffer.cpp in Sources */, 50ABBE411925AB6F00A911A9 /* CCDirector.cpp in Sources */, 1A570221180BCC1A0088DEC7 /* CCParticleBatchNode.cpp in Sources */, 1A570225180BCC1A0088DEC7 /* CCParticleExamples.cpp in Sources */, 1A570229180BCC1A0088DEC7 /* CCParticleSystem.cpp in Sources */, 1A57022D180BCC1A0088DEC7 /* CCParticleSystemQuad.cpp in Sources */, - 5E7EAC03199469D200CCFA35 /* CCRay.cpp in Sources */, 1A57027E180BCC900088DEC7 /* CCSprite.cpp in Sources */, 1A570282180BCC900088DEC7 /* CCSpriteBatchNode.cpp in Sources */, 1A570286180BCC900088DEC7 /* CCSpriteFrame.cpp in Sources */, @@ -6887,6 +6930,7 @@ 1A01C69C18F57BE800EFE3A6 /* CCString.cpp in Sources */, 50ABBD3C1925AB0000A911A9 /* CCGeometry.cpp in Sources */, 50ABC0011926664800A911A9 /* CCLock.cpp in Sources */, + B6105183199CB1A600DC41CE /* CCRay.cpp in Sources */, 50ABBD931925AB4100A911A9 /* CCGLProgramState.cpp in Sources */, 1A57034B180BD09B0088DEC7 /* tinyxml2.cpp in Sources */, 1A570354180BD0B00088DEC7 /* ioapi.cpp in Sources */, @@ -6897,6 +6941,7 @@ 50ABBE831925AB6F00A911A9 /* ccFPSImages.c in Sources */, 50ABBEA71925AB6F00A911A9 /* CCTouch.cpp in Sources */, 50ABBD8B1925AB4100A911A9 /* CCGLProgram.cpp in Sources */, + B610517B199CB1A600DC41CE /* CCAABB.cpp in Sources */, 464AD6E5197EBB1400E502D8 /* pvr.cpp in Sources */, 50ABBDA31925AB4100A911A9 /* CCQuadCommand.cpp in Sources */, B29594C61926D61F003EEF37 /* CCObjLoader.cpp in Sources */, @@ -6905,7 +6950,7 @@ 50ABBD481925AB0000A911A9 /* Mat4.cpp in Sources */, 50ABBD8F1925AB4100A911A9 /* CCGLProgramCache.cpp in Sources */, 50ABBD441925AB0000A911A9 /* CCVertex.cpp in Sources */, - 3E9E75E81993D8E4005B7047 /* CCOBB.cpp in Sources */, + B276EF611988D1D500CD400F /* CCVertexIndexData.cpp in Sources */, 503DD8F71926B0DB00CD74DD /* CCIMEDispatcher.cpp in Sources */, 50ABBE751925AB6F00A911A9 /* CCEventListenerTouch.cpp in Sources */, 50ABBE511925AB6F00A911A9 /* CCEventDispatcher.cpp in Sources */, @@ -6925,7 +6970,6 @@ 50ABBECF1925AB6F00A911A9 /* TGAlib.cpp in Sources */, 50ABBE451925AB6F00A911A9 /* CCEvent.cpp in Sources */, 50ABBE611925AB6F00A911A9 /* CCEventListenerAcceleration.cpp in Sources */, - 3E9E75E41993D8E4005B7047 /* CCAABB.cpp in Sources */, 50ABBD9F1925AB4100A911A9 /* CCGroupCommand.cpp in Sources */, 50ABBD871925AB4100A911A9 /* CCCustomCommand.cpp in Sources */, 50ABBDBD1925AB4100A911A9 /* CCTextureCache.cpp in Sources */, @@ -7096,32 +7140,37 @@ 1A01C6A518F58F7500EFE3A6 /* CCNotificationCenter.cpp in Sources */, ED9C6A9518599AD8000A5232 /* CCNodeGrid.cpp in Sources */, 1A01C68F18F57BE800EFE3A6 /* CCDictionary.cpp in Sources */, + B276EF621988D1D500CD400F /* CCVertexIndexData.cpp in Sources */, 50ABBE561925AB6F00A911A9 /* CCEventFocus.cpp in Sources */, 503DD8E11926736A00CD74DD /* CCApplication.mm in Sources */, 50ABC01A1926664800A911A9 /* CCSAXParser.cpp in Sources */, B2CC507C19776DD10041958E /* CCPhysicsJoint.cpp in Sources */, + B2165EEA19921124000BE3E6 /* CCPrimitiveCommand.cpp in Sources */, 503DD8EE1926736A00CD74DD /* CCImage.mm in Sources */, 3EA47871195478E00068D9D1 /* CCBundleReader.cpp in Sources */, B37510811823ACA100B3BA6A /* CCPhysicsJointInfo_chipmunk.cpp in Sources */, 46A170FC1807CECB005B8026 /* CCPhysicsBody.cpp in Sources */, 50ABBD941925AB4100A911A9 /* CCGLProgramState.cpp in Sources */, + B257B44F1989D5E800D9A687 /* CCPrimitive.cpp in Sources */, 50ABBE281925AB6F00A911A9 /* CCAutoreleasePool.cpp in Sources */, 46A170FE1807CECB005B8026 /* CCPhysicsContact.cpp in Sources */, 1A570062180BC5A10088DEC7 /* CCAction.cpp in Sources */, 1A570066180BC5A10088DEC7 /* CCActionCamera.cpp in Sources */, 3E9E80F2198639EF00FA95D0 /* CCSubMeshState.cpp in Sources */, + B276EF661988D1D500CD400F /* CCVertexIndexBuffer.cpp in Sources */, 1A57006A180BC5A10088DEC7 /* CCActionCatmullRom.cpp in Sources */, 1A57006E180BC5A10088DEC7 /* CCActionEase.cpp in Sources */, 50ABBD8C1925AB4100A911A9 /* CCGLProgram.cpp in Sources */, 1A570072180BC5A10088DEC7 /* CCActionGrid.cpp in Sources */, 50ABBE621925AB6F00A911A9 /* CCEventListenerAcceleration.cpp in Sources */, 3E6176681960F89B00DE83F5 /* CCController-iOS.mm in Sources */, + B6105180199CB1A600DC41CE /* CCOBB.cpp in Sources */, B29594B51926D5EC003EEF37 /* CCMeshCommand.cpp in Sources */, + B6105184199CB1A600DC41CE /* CCRay.cpp in Sources */, 50ABBE7E1925AB6F00A911A9 /* CCEventTouch.cpp in Sources */, 50ABBE6E1925AB6F00A911A9 /* CCEventListenerKeyboard.cpp in Sources */, 50ABBE461925AB6F00A911A9 /* CCEvent.cpp in Sources */, 50ABBEA01925AB6F00A911A9 /* CCScheduler.cpp in Sources */, - 3E9E75E91993D8E4005B7047 /* CCOBB.cpp in Sources */, 3E9E80EA198639EF00FA95D0 /* CCAttachNode.cpp in Sources */, 50ABBE4E1925AB6F00A911A9 /* CCEventCustom.cpp in Sources */, 50ABBE761925AB6F00A911A9 /* CCEventListenerTouch.cpp in Sources */, @@ -7129,7 +7178,6 @@ 1A570076180BC5A10088DEC7 /* CCActionGrid3D.cpp in Sources */, B37510851823ACA100B3BA6A /* CCPhysicsWorldInfo_chipmunk.cpp in Sources */, 50ABBD551925AB0000A911A9 /* TransformUtils.cpp in Sources */, - 3E9E75E51993D8E4005B7047 /* CCAABB.cpp in Sources */, 1A57007A180BC5A10088DEC7 /* CCActionInstant.cpp in Sources */, 50ABBEC01925AB6F00A911A9 /* CCValue.cpp in Sources */, 50ABBD591925AB0000A911A9 /* Vec2.cpp in Sources */, @@ -7142,7 +7190,6 @@ 50ABBED81925AB6F00A911A9 /* ZipUtils.cpp in Sources */, 1A57008E180BC5A10088DEC7 /* CCActionTiledGrid.cpp in Sources */, 1A570092180BC5A10088DEC7 /* CCActionTween.cpp in Sources */, - 5E7EAC04199469D200CCFA35 /* CCRay.cpp in Sources */, 1A570099180BC5C10088DEC7 /* CCAtlasNode.cpp in Sources */, 50ABBD4D1925AB0000A911A9 /* MathUtil.cpp in Sources */, 50ABBE3E1925AB6F00A911A9 /* CCDataVisitor.cpp in Sources */, @@ -7272,6 +7319,7 @@ 50ABBE4A1925AB6F00A911A9 /* CCEventAcceleration.cpp in Sources */, 46C02E0818E91123004B7456 /* xxhash.c in Sources */, 50ABBED01925AB6F00A911A9 /* TGAlib.cpp in Sources */, + B610517C199CB1A600DC41CE /* CCAABB.cpp in Sources */, 1A01C68518F57BE800EFE3A6 /* CCArray.cpp in Sources */, 503DD8E31926736A00CD74DD /* CCDevice.mm in Sources */, 50ABBEB41925AB6F00A911A9 /* CCUserDefault.mm in Sources */, @@ -8247,7 +8295,10 @@ GCC_TREAT_WARNINGS_AS_ERRORS = NO; HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; - LIBRARY_SEARCH_PATHS = "$(inherited)"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)/../external/curl/prebuilt/ios", + ); SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/curl/include/ios"; @@ -8268,7 +8319,10 @@ GCC_TREAT_WARNINGS_AS_ERRORS = NO; HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; - LIBRARY_SEARCH_PATHS = "$(inherited)"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)/../external/curl/prebuilt/ios", + ); SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/curl/include/ios"; @@ -8607,6 +8661,7 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/../external/websockets/prebuilt/ios\"", + "$(SRCROOT)/../external/curl/prebuilt/ios", ); PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; @@ -8632,6 +8687,7 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/../external/websockets/prebuilt/ios\"", + "$(SRCROOT)/../external/curl/prebuilt/ios", ); PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; diff --git a/build/cocos2d_tests.xcodeproj/project.pbxproj b/build/cocos2d_tests.xcodeproj/project.pbxproj index 6613a084c1..24d4e9d5be 100644 --- a/build/cocos2d_tests.xcodeproj/project.pbxproj +++ b/build/cocos2d_tests.xcodeproj/project.pbxproj @@ -62,71 +62,9 @@ 15427B7A198B87AA00DC375D /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */; }; 15427B7D198B880100DC375D /* lua_cocos2dx_controller_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15427B7B198B880100DC375D /* lua_cocos2dx_controller_manual.cpp */; }; 15427B7E198B896D00DC375D /* libcocosdenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC61807A4F9005B8026 /* libcocosdenshion iOS.a */; }; - 15427D05198F55E000DC375D /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CF3198F55E000DC375D /* DeprecatedCocos2dClass.lua */; }; - 15427D06198F55E000DC375D /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CF3198F55E000DC375D /* DeprecatedCocos2dClass.lua */; }; - 15427D07198F55E000DC375D /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CF4198F55E000DC375D /* DeprecatedCocos2dEnum.lua */; }; - 15427D08198F55E000DC375D /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CF4198F55E000DC375D /* DeprecatedCocos2dEnum.lua */; }; - 15427D09198F55E000DC375D /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CF5198F55E000DC375D /* DeprecatedCocos2dFunc.lua */; }; - 15427D0A198F55E000DC375D /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CF5198F55E000DC375D /* DeprecatedCocos2dFunc.lua */; }; - 15427D0B198F55E000DC375D /* DeprecatedCocosBuilderClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CF6198F55E000DC375D /* DeprecatedCocosBuilderClass.lua */; }; - 15427D0C198F55E000DC375D /* DeprecatedCocosBuilderClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CF6198F55E000DC375D /* DeprecatedCocosBuilderClass.lua */; }; - 15427D0D198F55E000DC375D /* DeprecatedCocosDenshionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CF7198F55E000DC375D /* DeprecatedCocosDenshionClass.lua */; }; - 15427D0E198F55E000DC375D /* DeprecatedCocosDenshionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CF7198F55E000DC375D /* DeprecatedCocosDenshionClass.lua */; }; - 15427D0F198F55E000DC375D /* DeprecatedCocosDenshionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CF8198F55E000DC375D /* DeprecatedCocosDenshionFunc.lua */; }; - 15427D10198F55E000DC375D /* DeprecatedCocosDenshionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CF8198F55E000DC375D /* DeprecatedCocosDenshionFunc.lua */; }; - 15427D11198F55E000DC375D /* DeprecatedCocoStudioClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CF9198F55E000DC375D /* DeprecatedCocoStudioClass.lua */; }; - 15427D12198F55E000DC375D /* DeprecatedCocoStudioClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CF9198F55E000DC375D /* DeprecatedCocoStudioClass.lua */; }; - 15427D13198F55E000DC375D /* DeprecatedCocoStudioFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CFA198F55E000DC375D /* DeprecatedCocoStudioFunc.lua */; }; - 15427D14198F55E000DC375D /* DeprecatedCocoStudioFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CFA198F55E000DC375D /* DeprecatedCocoStudioFunc.lua */; }; - 15427D15198F55E000DC375D /* DeprecatedExtensionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CFB198F55E000DC375D /* DeprecatedExtensionClass.lua */; }; - 15427D16198F55E000DC375D /* DeprecatedExtensionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CFB198F55E000DC375D /* DeprecatedExtensionClass.lua */; }; - 15427D17198F55E000DC375D /* DeprecatedExtensionEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CFC198F55E000DC375D /* DeprecatedExtensionEnum.lua */; }; - 15427D18198F55E000DC375D /* DeprecatedExtensionEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CFC198F55E000DC375D /* DeprecatedExtensionEnum.lua */; }; - 15427D19198F55E000DC375D /* DeprecatedExtensionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CFD198F55E000DC375D /* DeprecatedExtensionFunc.lua */; }; - 15427D1A198F55E000DC375D /* DeprecatedExtensionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CFD198F55E000DC375D /* DeprecatedExtensionFunc.lua */; }; - 15427D1B198F55E000DC375D /* DeprecatedNetworkClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CFE198F55E000DC375D /* DeprecatedNetworkClass.lua */; }; - 15427D1C198F55E000DC375D /* DeprecatedNetworkClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CFE198F55E000DC375D /* DeprecatedNetworkClass.lua */; }; - 15427D1D198F55E000DC375D /* DeprecatedNetworkEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CFF198F55E000DC375D /* DeprecatedNetworkEnum.lua */; }; - 15427D1E198F55E000DC375D /* DeprecatedNetworkEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CFF198F55E000DC375D /* DeprecatedNetworkEnum.lua */; }; - 15427D1F198F55E000DC375D /* DeprecatedNetworkFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427D00198F55E000DC375D /* DeprecatedNetworkFunc.lua */; }; - 15427D20198F55E000DC375D /* DeprecatedNetworkFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427D00198F55E000DC375D /* DeprecatedNetworkFunc.lua */; }; - 15427D21198F55E000DC375D /* DeprecatedUIEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427D01198F55E000DC375D /* DeprecatedUIEnum.lua */; }; - 15427D22198F55E000DC375D /* DeprecatedUIEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427D01198F55E000DC375D /* DeprecatedUIEnum.lua */; }; - 15427D23198F55E000DC375D /* DeprecatedUIFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427D02198F55E000DC375D /* DeprecatedUIFunc.lua */; }; - 15427D24198F55E000DC375D /* DeprecatedUIFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427D02198F55E000DC375D /* DeprecatedUIFunc.lua */; }; - 15427D25198F55E000DC375D /* ExtensionConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427D03198F55E000DC375D /* ExtensionConstants.lua */; }; - 15427D26198F55E000DC375D /* ExtensionConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427D03198F55E000DC375D /* ExtensionConstants.lua */; }; - 15427D27198F55E000DC375D /* NetworkConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427D04198F55E000DC375D /* NetworkConstants.lua */; }; - 15427D28198F55E000DC375D /* NetworkConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427D04198F55E000DC375D /* NetworkConstants.lua */; }; - 15427D29198F6B2100DC375D /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CF3198F55E000DC375D /* DeprecatedCocos2dClass.lua */; }; - 15427D2A198F6B2200DC375D /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CF3198F55E000DC375D /* DeprecatedCocos2dClass.lua */; }; - 15427D2B198F6B2600DC375D /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CF3198F55E000DC375D /* DeprecatedCocos2dClass.lua */; }; - 15427D2C198F6B2A00DC375D /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CF4198F55E000DC375D /* DeprecatedCocos2dEnum.lua */; }; - 15427D2D198F6B2C00DC375D /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CF4198F55E000DC375D /* DeprecatedCocos2dEnum.lua */; }; - 15427D2E198F6B2D00DC375D /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CF4198F55E000DC375D /* DeprecatedCocos2dEnum.lua */; }; - 15427D2F198F6B3200DC375D /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CF5198F55E000DC375D /* DeprecatedCocos2dFunc.lua */; }; - 15427D30198F6B3300DC375D /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CF5198F55E000DC375D /* DeprecatedCocos2dFunc.lua */; }; - 15427D31198F6B3500DC375D /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CF5198F55E000DC375D /* DeprecatedCocos2dFunc.lua */; }; - 15427D32198F6B3E00DC375D /* DeprecatedCocosDenshionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CF7198F55E000DC375D /* DeprecatedCocosDenshionClass.lua */; }; - 15427D34198F6B4100DC375D /* DeprecatedCocosDenshionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CF7198F55E000DC375D /* DeprecatedCocosDenshionClass.lua */; }; - 15427D35198F6B4300DC375D /* DeprecatedCocosDenshionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CF8198F55E000DC375D /* DeprecatedCocosDenshionFunc.lua */; }; - 15427D36198F6B4500DC375D /* DeprecatedCocosDenshionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CF8198F55E000DC375D /* DeprecatedCocosDenshionFunc.lua */; }; - 15427D37198F6B4A00DC375D /* DeprecatedNetworkClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CFE198F55E000DC375D /* DeprecatedNetworkClass.lua */; }; - 15427D38198F6B4B00DC375D /* DeprecatedNetworkClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CFE198F55E000DC375D /* DeprecatedNetworkClass.lua */; }; - 15427D39198F6B4E00DC375D /* DeprecatedNetworkEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CFF198F55E000DC375D /* DeprecatedNetworkEnum.lua */; }; - 15427D3A198F6B4F00DC375D /* DeprecatedNetworkEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427CFF198F55E000DC375D /* DeprecatedNetworkEnum.lua */; }; - 15427D3B198F6B5300DC375D /* DeprecatedNetworkFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427D00198F55E000DC375D /* DeprecatedNetworkFunc.lua */; }; - 15427D3C198F6B5400DC375D /* DeprecatedNetworkFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427D00198F55E000DC375D /* DeprecatedNetworkFunc.lua */; }; - 15427D49198F7F4C00DC375D /* ControllerConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427D48198F7F4C00DC375D /* ControllerConstants.lua */; }; - 156229331973D400009C9067 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 156229321973D400009C9067 /* bitExtend.lua */; }; - 156229341973D400009C9067 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 156229321973D400009C9067 /* bitExtend.lua */; }; 156EAE071977D0BD00F53709 /* ActionTimeline in Resources */ = {isa = PBXBuildFile; fileRef = 38FA2E75194AECF800FF2BE4 /* ActionTimeline */; }; 15AECE0B195C0F8A00907DB0 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EA0FB65191B933000B170C8 /* MediaPlayer.framework */; }; 15AECE0F195C1FDD00907DB0 /* cocosvideo.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 3EA0FB5D191B92F100B170C8 /* cocosvideo.mp4 */; }; - 15AECE1F195D0EC500907DB0 /* experimentalConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AECE1E195D0EC500907DB0 /* experimentalConstants.lua */; }; - 15AECE22195D122400907DB0 /* experimentalConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AECE1E195D0EC500907DB0 /* experimentalConstants.lua */; }; - 15AECE23195D122600907DB0 /* experimentalConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AECE1E195D0EC500907DB0 /* experimentalConstants.lua */; }; - 15AECE24195D122700907DB0 /* experimentalConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AECE1E195D0EC500907DB0 /* experimentalConstants.lua */; }; 15AECE25195D467D00907DB0 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EA0FB65191B933000B170C8 /* MediaPlayer.framework */; }; 15B0870D195AD52000D6F62B /* ActionTimeline in Resources */ = {isa = PBXBuildFile; fileRef = 38FA2E75194AECF800FF2BE4 /* ActionTimeline */; }; 15C64825165F3934007D4F18 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64824165F3934007D4F18 /* OpenGL.framework */; }; @@ -156,9 +94,6 @@ 15C90B4A18E66C2B00D69802 /* tp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB118DA8B6C00F6518C /* tp.lua */; }; 15C90B4B18E66C2F00D69802 /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB218DA8B6C00F6518C /* url.lua */; }; 15C90B4C18E66C3100D69802 /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB218DA8B6C00F6518C /* url.lua */; }; - 15CBA9A9196EE7FA005877BB /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36818CD9E180087CE3A /* Cocos2d.lua */; }; - 15CBA9AA196EE7FA005877BB /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36918CD9E180087CE3A /* Cocos2dConstants.lua */; }; - 15CBA9AB196EE7FA005877BB /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36A18CD9E180087CE3A /* CocoStudio.lua */; }; 15CBA9AF196EE80B005877BB /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = 3E6177F01960FEFE00DE83F5 /* fonts */; }; 15CBA9B0196EE80B005877BB /* ipad in Resources */ = {isa = PBXBuildFile; fileRef = 3E6177F11960FEFE00DE83F5 /* ipad */; }; 15CBA9B1196EE80B005877BB /* ipadhd in Resources */ = {isa = PBXBuildFile; fileRef = 3E6177F21960FEFE00DE83F5 /* ipadhd */; }; @@ -181,8 +116,126 @@ 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 */; }; - 15CBA9F1196F865C005877BB /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37218CD9E180087CE3A /* json.lua */; }; - 15CBA9F2196F8718005877BB /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37018CD9E180087CE3A /* extern.lua */; }; + 15D1FCEC1998637C00302043 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDE1998637C00302043 /* bitExtend.lua */; }; + 15D1FCED1998637C00302043 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDE1998637C00302043 /* bitExtend.lua */; }; + 15D1FCEE1998637C00302043 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDE1998637C00302043 /* bitExtend.lua */; }; + 15D1FCEF1998637C00302043 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDE1998637C00302043 /* bitExtend.lua */; }; + 15D1FCF01998637C00302043 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDE1998637C00302043 /* bitExtend.lua */; }; + 15D1FCF11998637C00302043 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDF1998637C00302043 /* Cocos2d.lua */; }; + 15D1FCF21998637C00302043 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDF1998637C00302043 /* Cocos2d.lua */; }; + 15D1FCF31998637C00302043 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDF1998637C00302043 /* Cocos2d.lua */; }; + 15D1FCF41998637C00302043 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDF1998637C00302043 /* Cocos2d.lua */; }; + 15D1FCF51998637C00302043 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDF1998637C00302043 /* Cocos2d.lua */; }; + 15D1FCF61998637C00302043 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE01998637C00302043 /* Cocos2dConstants.lua */; }; + 15D1FCF71998637C00302043 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE01998637C00302043 /* Cocos2dConstants.lua */; }; + 15D1FCF81998637C00302043 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE01998637C00302043 /* Cocos2dConstants.lua */; }; + 15D1FCF91998637C00302043 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE01998637C00302043 /* Cocos2dConstants.lua */; }; + 15D1FCFA1998637C00302043 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE01998637C00302043 /* Cocos2dConstants.lua */; }; + 15D1FCFB1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE11998637C00302043 /* DeprecatedCocos2dClass.lua */; }; + 15D1FCFC1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE11998637C00302043 /* DeprecatedCocos2dClass.lua */; }; + 15D1FCFD1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE11998637C00302043 /* DeprecatedCocos2dClass.lua */; }; + 15D1FCFE1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE11998637C00302043 /* DeprecatedCocos2dClass.lua */; }; + 15D1FCFF1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE11998637C00302043 /* DeprecatedCocos2dClass.lua */; }; + 15D1FD001998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE21998637C00302043 /* DeprecatedCocos2dEnum.lua */; }; + 15D1FD011998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE21998637C00302043 /* DeprecatedCocos2dEnum.lua */; }; + 15D1FD021998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE21998637C00302043 /* DeprecatedCocos2dEnum.lua */; }; + 15D1FD031998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE21998637C00302043 /* DeprecatedCocos2dEnum.lua */; }; + 15D1FD041998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE21998637C00302043 /* DeprecatedCocos2dEnum.lua */; }; + 15D1FD051998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE31998637C00302043 /* DeprecatedCocos2dFunc.lua */; }; + 15D1FD061998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE31998637C00302043 /* DeprecatedCocos2dFunc.lua */; }; + 15D1FD071998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE31998637C00302043 /* DeprecatedCocos2dFunc.lua */; }; + 15D1FD081998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE31998637C00302043 /* DeprecatedCocos2dFunc.lua */; }; + 15D1FD091998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE31998637C00302043 /* DeprecatedCocos2dFunc.lua */; }; + 15D1FD0A1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE41998637C00302043 /* DeprecatedOpenglEnum.lua */; }; + 15D1FD0B1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE41998637C00302043 /* DeprecatedOpenglEnum.lua */; }; + 15D1FD0C1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE41998637C00302043 /* DeprecatedOpenglEnum.lua */; }; + 15D1FD0D1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE41998637C00302043 /* DeprecatedOpenglEnum.lua */; }; + 15D1FD0E1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE41998637C00302043 /* DeprecatedOpenglEnum.lua */; }; + 15D1FD0F1998637C00302043 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE51998637C00302043 /* DrawPrimitives.lua */; }; + 15D1FD101998637C00302043 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE51998637C00302043 /* DrawPrimitives.lua */; }; + 15D1FD111998637C00302043 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE51998637C00302043 /* DrawPrimitives.lua */; }; + 15D1FD121998637C00302043 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE51998637C00302043 /* DrawPrimitives.lua */; }; + 15D1FD131998637C00302043 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE51998637C00302043 /* DrawPrimitives.lua */; }; + 15D1FD141998637C00302043 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE61998637C00302043 /* extern.lua */; }; + 15D1FD151998637C00302043 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE61998637C00302043 /* extern.lua */; }; + 15D1FD161998637C00302043 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE61998637C00302043 /* extern.lua */; }; + 15D1FD171998637C00302043 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE61998637C00302043 /* extern.lua */; }; + 15D1FD181998637C00302043 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE61998637C00302043 /* extern.lua */; }; + 15D1FD191998637C00302043 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE71998637C00302043 /* json.lua */; }; + 15D1FD1A1998637C00302043 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE71998637C00302043 /* json.lua */; }; + 15D1FD1B1998637C00302043 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE71998637C00302043 /* json.lua */; }; + 15D1FD1C1998637C00302043 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE71998637C00302043 /* json.lua */; }; + 15D1FD1D1998637C00302043 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE71998637C00302043 /* json.lua */; }; + 15D1FD1E1998637C00302043 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE81998637C00302043 /* luaj.lua */; }; + 15D1FD1F1998637C00302043 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE81998637C00302043 /* luaj.lua */; }; + 15D1FD201998637C00302043 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE81998637C00302043 /* luaj.lua */; }; + 15D1FD211998637C00302043 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE81998637C00302043 /* luaj.lua */; }; + 15D1FD221998637C00302043 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE81998637C00302043 /* luaj.lua */; }; + 15D1FD231998637C00302043 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE91998637C00302043 /* luaoc.lua */; }; + 15D1FD241998637C00302043 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE91998637C00302043 /* luaoc.lua */; }; + 15D1FD251998637C00302043 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE91998637C00302043 /* luaoc.lua */; }; + 15D1FD261998637C00302043 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE91998637C00302043 /* luaoc.lua */; }; + 15D1FD271998637C00302043 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE91998637C00302043 /* luaoc.lua */; }; + 15D1FD281998637C00302043 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEA1998637C00302043 /* Opengl.lua */; }; + 15D1FD291998637C00302043 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEA1998637C00302043 /* Opengl.lua */; }; + 15D1FD2A1998637C00302043 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEA1998637C00302043 /* Opengl.lua */; }; + 15D1FD2B1998637C00302043 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEA1998637C00302043 /* Opengl.lua */; }; + 15D1FD2C1998637C00302043 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEA1998637C00302043 /* Opengl.lua */; }; + 15D1FD2D1998637C00302043 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEB1998637C00302043 /* OpenglConstants.lua */; }; + 15D1FD2E1998637C00302043 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEB1998637C00302043 /* OpenglConstants.lua */; }; + 15D1FD2F1998637C00302043 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEB1998637C00302043 /* OpenglConstants.lua */; }; + 15D1FD301998637C00302043 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEB1998637C00302043 /* OpenglConstants.lua */; }; + 15D1FD311998637C00302043 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEB1998637C00302043 /* OpenglConstants.lua */; }; + 15D1FD34199863BA00302043 /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD32199863BA00302043 /* CCBReaderLoad.lua */; }; + 15D1FD35199863BA00302043 /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD32199863BA00302043 /* CCBReaderLoad.lua */; }; + 15D1FD36199863BA00302043 /* DeprecatedCocosBuilderClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD33199863BA00302043 /* DeprecatedCocosBuilderClass.lua */; }; + 15D1FD37199863BA00302043 /* DeprecatedCocosBuilderClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD33199863BA00302043 /* DeprecatedCocosBuilderClass.lua */; }; + 15D1FD3B199863CA00302043 /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD38199863CA00302043 /* AudioEngine.lua */; }; + 15D1FD3C199863CA00302043 /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD38199863CA00302043 /* AudioEngine.lua */; }; + 15D1FD3D199863CA00302043 /* DeprecatedCocosDenshionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD39199863CA00302043 /* DeprecatedCocosDenshionClass.lua */; }; + 15D1FD3E199863CA00302043 /* DeprecatedCocosDenshionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD39199863CA00302043 /* DeprecatedCocosDenshionClass.lua */; }; + 15D1FD3F199863CA00302043 /* DeprecatedCocosDenshionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD3A199863CA00302043 /* DeprecatedCocosDenshionFunc.lua */; }; + 15D1FD40199863CA00302043 /* DeprecatedCocosDenshionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD3A199863CA00302043 /* DeprecatedCocosDenshionFunc.lua */; }; + 15D1FD45199863E800302043 /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD41199863E800302043 /* CocoStudio.lua */; }; + 15D1FD46199863E800302043 /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD41199863E800302043 /* CocoStudio.lua */; }; + 15D1FD47199863E800302043 /* DeprecatedCocoStudioClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD42199863E800302043 /* DeprecatedCocoStudioClass.lua */; }; + 15D1FD48199863E800302043 /* DeprecatedCocoStudioClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD42199863E800302043 /* DeprecatedCocoStudioClass.lua */; }; + 15D1FD49199863E800302043 /* DeprecatedCocoStudioFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD43199863E800302043 /* DeprecatedCocoStudioFunc.lua */; }; + 15D1FD4A199863E800302043 /* DeprecatedCocoStudioFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD43199863E800302043 /* DeprecatedCocoStudioFunc.lua */; }; + 15D1FD4B199863E800302043 /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD44199863E800302043 /* StudioConstants.lua */; }; + 15D1FD4C199863E800302043 /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD44199863E800302043 /* StudioConstants.lua */; }; + 15D1FD51199863F900302043 /* DeprecatedExtensionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD4D199863F900302043 /* DeprecatedExtensionClass.lua */; }; + 15D1FD52199863F900302043 /* DeprecatedExtensionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD4D199863F900302043 /* DeprecatedExtensionClass.lua */; }; + 15D1FD53199863F900302043 /* DeprecatedExtensionEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD4E199863F900302043 /* DeprecatedExtensionEnum.lua */; }; + 15D1FD54199863F900302043 /* DeprecatedExtensionEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD4E199863F900302043 /* DeprecatedExtensionEnum.lua */; }; + 15D1FD55199863F900302043 /* DeprecatedExtensionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD4F199863F900302043 /* DeprecatedExtensionFunc.lua */; }; + 15D1FD56199863F900302043 /* DeprecatedExtensionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD4F199863F900302043 /* DeprecatedExtensionFunc.lua */; }; + 15D1FD57199863F900302043 /* ExtensionConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD50199863F900302043 /* ExtensionConstants.lua */; }; + 15D1FD58199863F900302043 /* ExtensionConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD50199863F900302043 /* ExtensionConstants.lua */; }; + 15D1FD5D1998641200302043 /* DeprecatedNetworkClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD591998641200302043 /* DeprecatedNetworkClass.lua */; }; + 15D1FD5E1998641200302043 /* DeprecatedNetworkClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD591998641200302043 /* DeprecatedNetworkClass.lua */; }; + 15D1FD5F1998641200302043 /* DeprecatedNetworkClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD591998641200302043 /* DeprecatedNetworkClass.lua */; }; + 15D1FD601998641200302043 /* DeprecatedNetworkClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD591998641200302043 /* DeprecatedNetworkClass.lua */; }; + 15D1FD611998641200302043 /* DeprecatedNetworkEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5A1998641200302043 /* DeprecatedNetworkEnum.lua */; }; + 15D1FD621998641200302043 /* DeprecatedNetworkEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5A1998641200302043 /* DeprecatedNetworkEnum.lua */; }; + 15D1FD631998641200302043 /* DeprecatedNetworkEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5A1998641200302043 /* DeprecatedNetworkEnum.lua */; }; + 15D1FD641998641200302043 /* DeprecatedNetworkEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5A1998641200302043 /* DeprecatedNetworkEnum.lua */; }; + 15D1FD651998641200302043 /* DeprecatedNetworkFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5B1998641200302043 /* DeprecatedNetworkFunc.lua */; }; + 15D1FD661998641200302043 /* DeprecatedNetworkFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5B1998641200302043 /* DeprecatedNetworkFunc.lua */; }; + 15D1FD671998641200302043 /* DeprecatedNetworkFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5B1998641200302043 /* DeprecatedNetworkFunc.lua */; }; + 15D1FD681998641200302043 /* DeprecatedNetworkFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5B1998641200302043 /* DeprecatedNetworkFunc.lua */; }; + 15D1FD691998641200302043 /* NetworkConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5C1998641200302043 /* NetworkConstants.lua */; }; + 15D1FD6A1998641200302043 /* NetworkConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5C1998641200302043 /* NetworkConstants.lua */; }; + 15D1FD6B1998641200302043 /* NetworkConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5C1998641200302043 /* NetworkConstants.lua */; }; + 15D1FD6C1998641200302043 /* NetworkConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5C1998641200302043 /* NetworkConstants.lua */; }; + 15D1FD711998642800302043 /* DeprecatedUIEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD6D1998642800302043 /* DeprecatedUIEnum.lua */; }; + 15D1FD721998642800302043 /* DeprecatedUIEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD6D1998642800302043 /* DeprecatedUIEnum.lua */; }; + 15D1FD731998642800302043 /* DeprecatedUIFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD6E1998642800302043 /* DeprecatedUIFunc.lua */; }; + 15D1FD741998642800302043 /* DeprecatedUIFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD6E1998642800302043 /* DeprecatedUIFunc.lua */; }; + 15D1FD751998642800302043 /* experimentalUIConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD6F1998642800302043 /* experimentalUIConstants.lua */; }; + 15D1FD761998642800302043 /* experimentalUIConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD6F1998642800302043 /* experimentalUIConstants.lua */; }; + 15D1FD771998642800302043 /* GuiConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD701998642800302043 /* GuiConstants.lua */; }; + 15D1FD781998642800302043 /* GuiConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD701998642800302043 /* GuiConstants.lua */; }; 15E66FC8192D957100C20A52 /* Sprite3DTest in Resources */ = {isa = PBXBuildFile; fileRef = 3E92EA841921A7720094CD21 /* Sprite3DTest */; }; 15E66FD6192DC8C700C20A52 /* Sprite3DTest in Resources */ = {isa = PBXBuildFile; fileRef = 3E92EA841921A7720094CD21 /* Sprite3DTest */; }; 15EFA25B198A4A47000C57D3 /* libluacocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA258198A4A24000C57D3 /* libluacocos2d Mac.a */; }; @@ -269,36 +322,6 @@ 1A0EE43318CDF799004CD58F /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA39E18CD9EE50087CE3A /* UIKit.framework */; }; 1A0EE43418CDF799004CD58F /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA39C18CD9ED80087CE3A /* AVFoundation.framework */; }; 1A0EE43518CDF799004CD58F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64832165F3AFD007D4F18 /* Foundation.framework */; }; - 1A0EE55C18CDFBBD004CD58F /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36618CD9E180087CE3A /* AudioEngine.lua */; }; - 1A0EE55D18CDFBBD004CD58F /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36718CD9E180087CE3A /* CCBReaderLoad.lua */; }; - 1A0EE55E18CDFBBD004CD58F /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36818CD9E180087CE3A /* Cocos2d.lua */; }; - 1A0EE55F18CDFBBD004CD58F /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36918CD9E180087CE3A /* Cocos2dConstants.lua */; }; - 1A0EE56018CDFBBD004CD58F /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36A18CD9E180087CE3A /* CocoStudio.lua */; }; - 1A0EE56418CDFBBD004CD58F /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36E18CD9E180087CE3A /* DeprecatedOpenglEnum.lua */; }; - 1A0EE56518CDFBBD004CD58F /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36F18CD9E180087CE3A /* DrawPrimitives.lua */; }; - 1A0EE56618CDFBBD004CD58F /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37018CD9E180087CE3A /* extern.lua */; }; - 1A0EE56718CDFBBD004CD58F /* GuiConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37118CD9E180087CE3A /* GuiConstants.lua */; }; - 1A0EE56818CDFBBD004CD58F /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37218CD9E180087CE3A /* json.lua */; }; - 1A0EE56918CDFBBD004CD58F /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37318CD9E180087CE3A /* luaj.lua */; }; - 1A0EE56A18CDFBBD004CD58F /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37418CD9E180087CE3A /* luaoc.lua */; }; - 1A0EE56B18CDFBBD004CD58F /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37518CD9E180087CE3A /* Opengl.lua */; }; - 1A0EE56C18CDFBBD004CD58F /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37618CD9E180087CE3A /* OpenglConstants.lua */; }; - 1A0EE56D18CDFBBD004CD58F /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37718CD9E180087CE3A /* StudioConstants.lua */; }; - 1A0EE56E18CDFBBE004CD58F /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36618CD9E180087CE3A /* AudioEngine.lua */; }; - 1A0EE56F18CDFBBE004CD58F /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36718CD9E180087CE3A /* CCBReaderLoad.lua */; }; - 1A0EE57018CDFBBE004CD58F /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36818CD9E180087CE3A /* Cocos2d.lua */; }; - 1A0EE57118CDFBBE004CD58F /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36918CD9E180087CE3A /* Cocos2dConstants.lua */; }; - 1A0EE57218CDFBBE004CD58F /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36A18CD9E180087CE3A /* CocoStudio.lua */; }; - 1A0EE57618CDFBBE004CD58F /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36E18CD9E180087CE3A /* DeprecatedOpenglEnum.lua */; }; - 1A0EE57718CDFBBE004CD58F /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36F18CD9E180087CE3A /* DrawPrimitives.lua */; }; - 1A0EE57818CDFBBE004CD58F /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37018CD9E180087CE3A /* extern.lua */; }; - 1A0EE57918CDFBBE004CD58F /* GuiConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37118CD9E180087CE3A /* GuiConstants.lua */; }; - 1A0EE57A18CDFBBE004CD58F /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37218CD9E180087CE3A /* json.lua */; }; - 1A0EE57B18CDFBBE004CD58F /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37318CD9E180087CE3A /* luaj.lua */; }; - 1A0EE57C18CDFBBE004CD58F /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37418CD9E180087CE3A /* luaoc.lua */; }; - 1A0EE57D18CDFBBE004CD58F /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37518CD9E180087CE3A /* Opengl.lua */; }; - 1A0EE57E18CDFBBE004CD58F /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37618CD9E180087CE3A /* OpenglConstants.lua */; }; - 1A0EE57F18CDFBBE004CD58F /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37718CD9E180087CE3A /* StudioConstants.lua */; }; 1A1645A6191B6281008C7C7F /* ccs-res in Resources */ = {isa = PBXBuildFile; fileRef = 1A221C9B191771E300FD2BE4 /* ccs-res */; }; 1A1645A9191B6283008C7C7F /* ccs-res in Resources */ = {isa = PBXBuildFile; fileRef = 1A221C9B191771E300FD2BE4 /* ccs-res */; }; 1A221C9C191771E300FD2BE4 /* ccs-res in Resources */ = {isa = PBXBuildFile; fileRef = 1A221C9B191771E300FD2BE4 /* ccs-res */; }; @@ -329,36 +352,6 @@ 1ABCA35F18CD9AAE0087CE3A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EDCC747E17C455FD007B692C /* IOKit.framework */; }; 1ABCA36118CD9AC00087CE3A /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA36018CD9AC00087CE3A /* libz.dylib */; }; 1ABCA36218CD9AC60087CE3A /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A9F808C177E98A600D9A1CB /* libcurl.dylib */; }; - 1ABCA37818CD9E180087CE3A /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36618CD9E180087CE3A /* AudioEngine.lua */; }; - 1ABCA37918CD9E180087CE3A /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36618CD9E180087CE3A /* AudioEngine.lua */; }; - 1ABCA37A18CD9E180087CE3A /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36718CD9E180087CE3A /* CCBReaderLoad.lua */; }; - 1ABCA37B18CD9E180087CE3A /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36718CD9E180087CE3A /* CCBReaderLoad.lua */; }; - 1ABCA37C18CD9E180087CE3A /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36818CD9E180087CE3A /* Cocos2d.lua */; }; - 1ABCA37D18CD9E180087CE3A /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36818CD9E180087CE3A /* Cocos2d.lua */; }; - 1ABCA37E18CD9E180087CE3A /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36918CD9E180087CE3A /* Cocos2dConstants.lua */; }; - 1ABCA37F18CD9E180087CE3A /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36918CD9E180087CE3A /* Cocos2dConstants.lua */; }; - 1ABCA38018CD9E180087CE3A /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36A18CD9E180087CE3A /* CocoStudio.lua */; }; - 1ABCA38118CD9E180087CE3A /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36A18CD9E180087CE3A /* CocoStudio.lua */; }; - 1ABCA38818CD9E180087CE3A /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36E18CD9E180087CE3A /* DeprecatedOpenglEnum.lua */; }; - 1ABCA38918CD9E180087CE3A /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36E18CD9E180087CE3A /* DeprecatedOpenglEnum.lua */; }; - 1ABCA38A18CD9E180087CE3A /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36F18CD9E180087CE3A /* DrawPrimitives.lua */; }; - 1ABCA38B18CD9E180087CE3A /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36F18CD9E180087CE3A /* DrawPrimitives.lua */; }; - 1ABCA38C18CD9E180087CE3A /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37018CD9E180087CE3A /* extern.lua */; }; - 1ABCA38D18CD9E180087CE3A /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37018CD9E180087CE3A /* extern.lua */; }; - 1ABCA38E18CD9E180087CE3A /* GuiConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37118CD9E180087CE3A /* GuiConstants.lua */; }; - 1ABCA38F18CD9E180087CE3A /* GuiConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37118CD9E180087CE3A /* GuiConstants.lua */; }; - 1ABCA39018CD9E180087CE3A /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37218CD9E180087CE3A /* json.lua */; }; - 1ABCA39118CD9E180087CE3A /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37218CD9E180087CE3A /* json.lua */; }; - 1ABCA39218CD9E180087CE3A /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37318CD9E180087CE3A /* luaj.lua */; }; - 1ABCA39318CD9E180087CE3A /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37318CD9E180087CE3A /* luaj.lua */; }; - 1ABCA39418CD9E180087CE3A /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37418CD9E180087CE3A /* luaoc.lua */; }; - 1ABCA39518CD9E180087CE3A /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37418CD9E180087CE3A /* luaoc.lua */; }; - 1ABCA39618CD9E180087CE3A /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37518CD9E180087CE3A /* Opengl.lua */; }; - 1ABCA39718CD9E180087CE3A /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37518CD9E180087CE3A /* Opengl.lua */; }; - 1ABCA39818CD9E180087CE3A /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37618CD9E180087CE3A /* OpenglConstants.lua */; }; - 1ABCA39918CD9E180087CE3A /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37618CD9E180087CE3A /* OpenglConstants.lua */; }; - 1ABCA39A18CD9E180087CE3A /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37718CD9E180087CE3A /* StudioConstants.lua */; }; - 1ABCA39B18CD9E180087CE3A /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37718CD9E180087CE3A /* StudioConstants.lua */; }; 1ABCA39D18CD9ED80087CE3A /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA39C18CD9ED80087CE3A /* AVFoundation.framework */; }; 1ABCA39F18CD9EE50087CE3A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA39E18CD9EE50087CE3A /* UIKit.framework */; }; 1ABCA3A118CD9EF60087CE3A /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA3A018CD9EF60087CE3A /* OpenGLES.framework */; }; @@ -1873,27 +1866,6 @@ 15427B77198B843300DC375D /* lua_module_register.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_module_register.h; sourceTree = ""; }; 15427B7B198B880100DC375D /* lua_cocos2dx_controller_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = lua_cocos2dx_controller_manual.cpp; path = "../../../../cocos/scripting/lua-bindings/manual/controller/lua_cocos2dx_controller_manual.cpp"; sourceTree = ""; }; 15427B7C198B880100DC375D /* lua_cocos2dx_controller_manual.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = lua_cocos2dx_controller_manual.hpp; path = "../../../../cocos/scripting/lua-bindings/manual/controller/lua_cocos2dx_controller_manual.hpp"; sourceTree = ""; }; - 15427CF3198F55E000DC375D /* DeprecatedCocos2dClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dClass.lua; path = "../cocos/scripting/lua-bindings/script/DeprecatedCocos2dClass.lua"; sourceTree = ""; }; - 15427CF4198F55E000DC375D /* DeprecatedCocos2dEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dEnum.lua; path = "../cocos/scripting/lua-bindings/script/DeprecatedCocos2dEnum.lua"; sourceTree = ""; }; - 15427CF5198F55E000DC375D /* DeprecatedCocos2dFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dFunc.lua; path = "../cocos/scripting/lua-bindings/script/DeprecatedCocos2dFunc.lua"; sourceTree = ""; }; - 15427CF6198F55E000DC375D /* DeprecatedCocosBuilderClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosBuilderClass.lua; path = "../cocos/scripting/lua-bindings/script/DeprecatedCocosBuilderClass.lua"; sourceTree = ""; }; - 15427CF7198F55E000DC375D /* DeprecatedCocosDenshionClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosDenshionClass.lua; path = "../cocos/scripting/lua-bindings/script/DeprecatedCocosDenshionClass.lua"; sourceTree = ""; }; - 15427CF8198F55E000DC375D /* DeprecatedCocosDenshionFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosDenshionFunc.lua; path = "../cocos/scripting/lua-bindings/script/DeprecatedCocosDenshionFunc.lua"; sourceTree = ""; }; - 15427CF9198F55E000DC375D /* DeprecatedCocoStudioClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocoStudioClass.lua; path = "../cocos/scripting/lua-bindings/script/DeprecatedCocoStudioClass.lua"; sourceTree = ""; }; - 15427CFA198F55E000DC375D /* DeprecatedCocoStudioFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocoStudioFunc.lua; path = "../cocos/scripting/lua-bindings/script/DeprecatedCocoStudioFunc.lua"; sourceTree = ""; }; - 15427CFB198F55E000DC375D /* DeprecatedExtensionClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedExtensionClass.lua; path = "../cocos/scripting/lua-bindings/script/DeprecatedExtensionClass.lua"; sourceTree = ""; }; - 15427CFC198F55E000DC375D /* DeprecatedExtensionEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedExtensionEnum.lua; path = "../cocos/scripting/lua-bindings/script/DeprecatedExtensionEnum.lua"; sourceTree = ""; }; - 15427CFD198F55E000DC375D /* DeprecatedExtensionFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedExtensionFunc.lua; path = "../cocos/scripting/lua-bindings/script/DeprecatedExtensionFunc.lua"; sourceTree = ""; }; - 15427CFE198F55E000DC375D /* DeprecatedNetworkClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedNetworkClass.lua; path = "../cocos/scripting/lua-bindings/script/DeprecatedNetworkClass.lua"; sourceTree = ""; }; - 15427CFF198F55E000DC375D /* DeprecatedNetworkEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedNetworkEnum.lua; path = "../cocos/scripting/lua-bindings/script/DeprecatedNetworkEnum.lua"; sourceTree = ""; }; - 15427D00198F55E000DC375D /* DeprecatedNetworkFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedNetworkFunc.lua; path = "../cocos/scripting/lua-bindings/script/DeprecatedNetworkFunc.lua"; sourceTree = ""; }; - 15427D01198F55E000DC375D /* DeprecatedUIEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedUIEnum.lua; path = "../cocos/scripting/lua-bindings/script/DeprecatedUIEnum.lua"; sourceTree = ""; }; - 15427D02198F55E000DC375D /* DeprecatedUIFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedUIFunc.lua; path = "../cocos/scripting/lua-bindings/script/DeprecatedUIFunc.lua"; sourceTree = ""; }; - 15427D03198F55E000DC375D /* ExtensionConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ExtensionConstants.lua; path = "../cocos/scripting/lua-bindings/script/ExtensionConstants.lua"; sourceTree = ""; }; - 15427D04198F55E000DC375D /* NetworkConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = NetworkConstants.lua; path = "../cocos/scripting/lua-bindings/script/NetworkConstants.lua"; sourceTree = ""; }; - 15427D48198F7F4C00DC375D /* ControllerConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ControllerConstants.lua; path = "../cocos/scripting/lua-bindings/script/ControllerConstants.lua"; sourceTree = ""; }; - 156229321973D400009C9067 /* bitExtend.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = bitExtend.lua; path = "../cocos/scripting/lua-bindings/script/bitExtend.lua"; sourceTree = ""; }; - 15AECE1E195D0EC500907DB0 /* experimentalConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = experimentalConstants.lua; path = "../cocos/scripting/lua-bindings/script/experimentalConstants.lua"; sourceTree = ""; }; 15C64822165F391E007D4F18 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Cocoa.framework; sourceTree = DEVELOPER_DIR; }; 15C64824165F3934007D4F18 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/OpenGL.framework; sourceTree = DEVELOPER_DIR; }; 15C64826165F394E007D4F18 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/QuartzCore.framework; sourceTree = DEVELOPER_DIR; }; @@ -3017,6 +2989,41 @@ 15CBA9DC196EEAA6005877BB /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; }; 15CBA9EB196F7BD8005877BB /* lua_cocos2dx_controller_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = lua_cocos2dx_controller_auto.cpp; path = "../../../../cocos/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.cpp"; sourceTree = ""; }; 15CBA9EC196F7BD8005877BB /* lua_cocos2dx_controller_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = lua_cocos2dx_controller_auto.hpp; path = "../../../../cocos/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.hpp"; sourceTree = ""; }; + 15D1FCDE1998637C00302043 /* bitExtend.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = bitExtend.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/bitExtend.lua"; sourceTree = ""; }; + 15D1FCDF1998637C00302043 /* Cocos2d.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2d.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/Cocos2d.lua"; sourceTree = ""; }; + 15D1FCE01998637C00302043 /* Cocos2dConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2dConstants.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/Cocos2dConstants.lua"; sourceTree = ""; }; + 15D1FCE11998637C00302043 /* DeprecatedCocos2dClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dClass.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dClass.lua"; sourceTree = ""; }; + 15D1FCE21998637C00302043 /* DeprecatedCocos2dEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dEnum.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dEnum.lua"; sourceTree = ""; }; + 15D1FCE31998637C00302043 /* DeprecatedCocos2dFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dFunc.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dFunc.lua"; sourceTree = ""; }; + 15D1FCE41998637C00302043 /* DeprecatedOpenglEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedOpenglEnum.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/DeprecatedOpenglEnum.lua"; sourceTree = ""; }; + 15D1FCE51998637C00302043 /* DrawPrimitives.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DrawPrimitives.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/DrawPrimitives.lua"; sourceTree = ""; }; + 15D1FCE61998637C00302043 /* extern.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = extern.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/extern.lua"; sourceTree = ""; }; + 15D1FCE71998637C00302043 /* json.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/json.lua"; sourceTree = ""; }; + 15D1FCE81998637C00302043 /* luaj.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaj.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/luaj.lua"; sourceTree = ""; }; + 15D1FCE91998637C00302043 /* luaoc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaoc.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/luaoc.lua"; sourceTree = ""; }; + 15D1FCEA1998637C00302043 /* Opengl.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Opengl.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/Opengl.lua"; sourceTree = ""; }; + 15D1FCEB1998637C00302043 /* OpenglConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OpenglConstants.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/OpenglConstants.lua"; sourceTree = ""; }; + 15D1FD32199863BA00302043 /* CCBReaderLoad.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CCBReaderLoad.lua; path = "../cocos/scripting/lua-bindings/script/cocosbuilder/CCBReaderLoad.lua"; sourceTree = ""; }; + 15D1FD33199863BA00302043 /* DeprecatedCocosBuilderClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosBuilderClass.lua; path = "../cocos/scripting/lua-bindings/script/cocosbuilder/DeprecatedCocosBuilderClass.lua"; sourceTree = ""; }; + 15D1FD38199863CA00302043 /* AudioEngine.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AudioEngine.lua; path = "../cocos/scripting/lua-bindings/script/cocosdenshion/AudioEngine.lua"; sourceTree = ""; }; + 15D1FD39199863CA00302043 /* DeprecatedCocosDenshionClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosDenshionClass.lua; path = "../cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionClass.lua"; sourceTree = ""; }; + 15D1FD3A199863CA00302043 /* DeprecatedCocosDenshionFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosDenshionFunc.lua; path = "../cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionFunc.lua"; sourceTree = ""; }; + 15D1FD41199863E800302043 /* CocoStudio.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CocoStudio.lua; path = "../cocos/scripting/lua-bindings/script/cocostudio/CocoStudio.lua"; sourceTree = ""; }; + 15D1FD42199863E800302043 /* DeprecatedCocoStudioClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocoStudioClass.lua; path = "../cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioClass.lua"; sourceTree = ""; }; + 15D1FD43199863E800302043 /* DeprecatedCocoStudioFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocoStudioFunc.lua; path = "../cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioFunc.lua"; sourceTree = ""; }; + 15D1FD44199863E800302043 /* StudioConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = StudioConstants.lua; path = "../cocos/scripting/lua-bindings/script/cocostudio/StudioConstants.lua"; sourceTree = ""; }; + 15D1FD4D199863F900302043 /* DeprecatedExtensionClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedExtensionClass.lua; path = "../cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionClass.lua"; sourceTree = ""; }; + 15D1FD4E199863F900302043 /* DeprecatedExtensionEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedExtensionEnum.lua; path = "../cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionEnum.lua"; sourceTree = ""; }; + 15D1FD4F199863F900302043 /* DeprecatedExtensionFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedExtensionFunc.lua; path = "../cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionFunc.lua"; sourceTree = ""; }; + 15D1FD50199863F900302043 /* ExtensionConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ExtensionConstants.lua; path = "../cocos/scripting/lua-bindings/script/extension/ExtensionConstants.lua"; sourceTree = ""; }; + 15D1FD591998641200302043 /* DeprecatedNetworkClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedNetworkClass.lua; path = "../cocos/scripting/lua-bindings/script/network/DeprecatedNetworkClass.lua"; sourceTree = ""; }; + 15D1FD5A1998641200302043 /* DeprecatedNetworkEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedNetworkEnum.lua; path = "../cocos/scripting/lua-bindings/script/network/DeprecatedNetworkEnum.lua"; sourceTree = ""; }; + 15D1FD5B1998641200302043 /* DeprecatedNetworkFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedNetworkFunc.lua; path = "../cocos/scripting/lua-bindings/script/network/DeprecatedNetworkFunc.lua"; sourceTree = ""; }; + 15D1FD5C1998641200302043 /* NetworkConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = NetworkConstants.lua; path = "../cocos/scripting/lua-bindings/script/network/NetworkConstants.lua"; sourceTree = ""; }; + 15D1FD6D1998642800302043 /* DeprecatedUIEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedUIEnum.lua; path = "../cocos/scripting/lua-bindings/script/ui/DeprecatedUIEnum.lua"; sourceTree = ""; }; + 15D1FD6E1998642800302043 /* DeprecatedUIFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedUIFunc.lua; path = "../cocos/scripting/lua-bindings/script/ui/DeprecatedUIFunc.lua"; sourceTree = ""; }; + 15D1FD6F1998642800302043 /* experimentalUIConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = experimentalUIConstants.lua; path = "../cocos/scripting/lua-bindings/script/ui/experimentalUIConstants.lua"; sourceTree = ""; }; + 15D1FD701998642800302043 /* GuiConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = GuiConstants.lua; path = "../cocos/scripting/lua-bindings/script/ui/GuiConstants.lua"; sourceTree = ""; }; 1A0EE2B218CDF6DA004CD58F /* cpp-empty-test Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "cpp-empty-test Mac.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 1A0EE31418CDF733004CD58F /* lua-empty-test Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "lua-empty-test Mac.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 1A0EE41318CDF775004CD58F /* cpp-empty-test iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "cpp-empty-test iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -3036,21 +3043,6 @@ 1ABCA35A18CD9A950087CE3A /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; }; 1ABCA35C18CD9A9E0087CE3A /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 1ABCA36018CD9AC00087CE3A /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; - 1ABCA36618CD9E180087CE3A /* AudioEngine.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AudioEngine.lua; path = "../cocos/scripting/lua-bindings/script/AudioEngine.lua"; sourceTree = ""; }; - 1ABCA36718CD9E180087CE3A /* CCBReaderLoad.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CCBReaderLoad.lua; path = "../cocos/scripting/lua-bindings/script/CCBReaderLoad.lua"; sourceTree = ""; }; - 1ABCA36818CD9E180087CE3A /* Cocos2d.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2d.lua; path = "../cocos/scripting/lua-bindings/script/Cocos2d.lua"; sourceTree = ""; }; - 1ABCA36918CD9E180087CE3A /* Cocos2dConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2dConstants.lua; path = "../cocos/scripting/lua-bindings/script/Cocos2dConstants.lua"; sourceTree = ""; }; - 1ABCA36A18CD9E180087CE3A /* CocoStudio.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CocoStudio.lua; path = "../cocos/scripting/lua-bindings/script/CocoStudio.lua"; sourceTree = ""; }; - 1ABCA36E18CD9E180087CE3A /* DeprecatedOpenglEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedOpenglEnum.lua; path = "../cocos/scripting/lua-bindings/script/DeprecatedOpenglEnum.lua"; sourceTree = ""; }; - 1ABCA36F18CD9E180087CE3A /* DrawPrimitives.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DrawPrimitives.lua; path = "../cocos/scripting/lua-bindings/script/DrawPrimitives.lua"; sourceTree = ""; }; - 1ABCA37018CD9E180087CE3A /* extern.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = extern.lua; path = "../cocos/scripting/lua-bindings/script/extern.lua"; sourceTree = ""; }; - 1ABCA37118CD9E180087CE3A /* GuiConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = GuiConstants.lua; path = "../cocos/scripting/lua-bindings/script/GuiConstants.lua"; sourceTree = ""; }; - 1ABCA37218CD9E180087CE3A /* json.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json.lua; path = "../cocos/scripting/lua-bindings/script/json.lua"; sourceTree = ""; }; - 1ABCA37318CD9E180087CE3A /* luaj.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaj.lua; path = "../cocos/scripting/lua-bindings/script/luaj.lua"; sourceTree = ""; }; - 1ABCA37418CD9E180087CE3A /* luaoc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaoc.lua; path = "../cocos/scripting/lua-bindings/script/luaoc.lua"; sourceTree = ""; }; - 1ABCA37518CD9E180087CE3A /* Opengl.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Opengl.lua; path = "../cocos/scripting/lua-bindings/script/Opengl.lua"; sourceTree = ""; }; - 1ABCA37618CD9E180087CE3A /* OpenglConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OpenglConstants.lua; path = "../cocos/scripting/lua-bindings/script/OpenglConstants.lua"; sourceTree = ""; }; - 1ABCA37718CD9E180087CE3A /* StudioConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = StudioConstants.lua; path = "../cocos/scripting/lua-bindings/script/StudioConstants.lua"; sourceTree = ""; }; 1ABCA39C18CD9ED80087CE3A /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/AVFoundation.framework; sourceTree = DEVELOPER_DIR; }; 1ABCA39E18CD9EE50087CE3A /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; 1ABCA3A018CD9EF60087CE3A /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/OpenGLES.framework; sourceTree = DEVELOPER_DIR; }; @@ -6080,27 +6072,41 @@ 1ABCA36418CD9E060087CE3A /* Lua Common */ = { isa = PBXGroup; children = ( - 15427D48198F7F4C00DC375D /* ControllerConstants.lua */, - 15427CF3198F55E000DC375D /* DeprecatedCocos2dClass.lua */, - 15427CF4198F55E000DC375D /* DeprecatedCocos2dEnum.lua */, - 15427CF5198F55E000DC375D /* DeprecatedCocos2dFunc.lua */, - 15427CF6198F55E000DC375D /* DeprecatedCocosBuilderClass.lua */, - 15427CF7198F55E000DC375D /* DeprecatedCocosDenshionClass.lua */, - 15427CF8198F55E000DC375D /* DeprecatedCocosDenshionFunc.lua */, - 15427CF9198F55E000DC375D /* DeprecatedCocoStudioClass.lua */, - 15427CFA198F55E000DC375D /* DeprecatedCocoStudioFunc.lua */, - 15427CFB198F55E000DC375D /* DeprecatedExtensionClass.lua */, - 15427CFC198F55E000DC375D /* DeprecatedExtensionEnum.lua */, - 15427CFD198F55E000DC375D /* DeprecatedExtensionFunc.lua */, - 15427CFE198F55E000DC375D /* DeprecatedNetworkClass.lua */, - 15427CFF198F55E000DC375D /* DeprecatedNetworkEnum.lua */, - 15427D00198F55E000DC375D /* DeprecatedNetworkFunc.lua */, - 15427D01198F55E000DC375D /* DeprecatedUIEnum.lua */, - 15427D02198F55E000DC375D /* DeprecatedUIFunc.lua */, - 15427D03198F55E000DC375D /* ExtensionConstants.lua */, - 15427D04198F55E000DC375D /* NetworkConstants.lua */, - 156229321973D400009C9067 /* bitExtend.lua */, - 15AECE1E195D0EC500907DB0 /* experimentalConstants.lua */, + 15D1FD6D1998642800302043 /* DeprecatedUIEnum.lua */, + 15D1FD6E1998642800302043 /* DeprecatedUIFunc.lua */, + 15D1FD6F1998642800302043 /* experimentalUIConstants.lua */, + 15D1FD701998642800302043 /* GuiConstants.lua */, + 15D1FD591998641200302043 /* DeprecatedNetworkClass.lua */, + 15D1FD5A1998641200302043 /* DeprecatedNetworkEnum.lua */, + 15D1FD5B1998641200302043 /* DeprecatedNetworkFunc.lua */, + 15D1FD5C1998641200302043 /* NetworkConstants.lua */, + 15D1FD4D199863F900302043 /* DeprecatedExtensionClass.lua */, + 15D1FD4E199863F900302043 /* DeprecatedExtensionEnum.lua */, + 15D1FD4F199863F900302043 /* DeprecatedExtensionFunc.lua */, + 15D1FD50199863F900302043 /* ExtensionConstants.lua */, + 15D1FD41199863E800302043 /* CocoStudio.lua */, + 15D1FD42199863E800302043 /* DeprecatedCocoStudioClass.lua */, + 15D1FD43199863E800302043 /* DeprecatedCocoStudioFunc.lua */, + 15D1FD44199863E800302043 /* StudioConstants.lua */, + 15D1FD38199863CA00302043 /* AudioEngine.lua */, + 15D1FD39199863CA00302043 /* DeprecatedCocosDenshionClass.lua */, + 15D1FD3A199863CA00302043 /* DeprecatedCocosDenshionFunc.lua */, + 15D1FD32199863BA00302043 /* CCBReaderLoad.lua */, + 15D1FD33199863BA00302043 /* DeprecatedCocosBuilderClass.lua */, + 15D1FCDE1998637C00302043 /* bitExtend.lua */, + 15D1FCDF1998637C00302043 /* Cocos2d.lua */, + 15D1FCE01998637C00302043 /* Cocos2dConstants.lua */, + 15D1FCE11998637C00302043 /* DeprecatedCocos2dClass.lua */, + 15D1FCE21998637C00302043 /* DeprecatedCocos2dEnum.lua */, + 15D1FCE31998637C00302043 /* DeprecatedCocos2dFunc.lua */, + 15D1FCE41998637C00302043 /* DeprecatedOpenglEnum.lua */, + 15D1FCE51998637C00302043 /* DrawPrimitives.lua */, + 15D1FCE61998637C00302043 /* extern.lua */, + 15D1FCE71998637C00302043 /* json.lua */, + 15D1FCE81998637C00302043 /* luaj.lua */, + 15D1FCE91998637C00302043 /* luaoc.lua */, + 15D1FCEA1998637C00302043 /* Opengl.lua */, + 15D1FCEB1998637C00302043 /* OpenglConstants.lua */, 1503FAA918DA8B6C00F6518C /* ftp.lua */, 1503FAAA18DA8B6C00F6518C /* headers.lua */, 1503FAAB18DA8B6C00F6518C /* http.lua */, @@ -6111,21 +6117,6 @@ 1503FAB018DA8B6C00F6518C /* socket.lua */, 1503FAB118DA8B6C00F6518C /* tp.lua */, 1503FAB218DA8B6C00F6518C /* url.lua */, - 1ABCA36618CD9E180087CE3A /* AudioEngine.lua */, - 1ABCA36718CD9E180087CE3A /* CCBReaderLoad.lua */, - 1ABCA36818CD9E180087CE3A /* Cocos2d.lua */, - 1ABCA36918CD9E180087CE3A /* Cocos2dConstants.lua */, - 1ABCA36A18CD9E180087CE3A /* CocoStudio.lua */, - 1ABCA36E18CD9E180087CE3A /* DeprecatedOpenglEnum.lua */, - 1ABCA36F18CD9E180087CE3A /* DrawPrimitives.lua */, - 1ABCA37018CD9E180087CE3A /* extern.lua */, - 1ABCA37118CD9E180087CE3A /* GuiConstants.lua */, - 1ABCA37218CD9E180087CE3A /* json.lua */, - 1ABCA37318CD9E180087CE3A /* luaj.lua */, - 1ABCA37418CD9E180087CE3A /* luaoc.lua */, - 1ABCA37518CD9E180087CE3A /* Opengl.lua */, - 1ABCA37618CD9E180087CE3A /* OpenglConstants.lua */, - 1ABCA37718CD9E180087CE3A /* StudioConstants.lua */, ); name = "Lua Common"; sourceTree = ""; @@ -8508,20 +8499,25 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 15427D2E198F6B2D00DC375D /* DeprecatedCocos2dEnum.lua in Resources */, 15CBA9B3196EE824005877BB /* src in Resources */, - 15427D2B198F6B2600DC375D /* DeprecatedCocos2dClass.lua 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 */, - 15427D31198F6B3500DC375D /* DeprecatedCocos2dFunc.lua in Resources */, - 15427D49198F7F4C00DC375D /* ControllerConstants.lua in Resources */, + 15D1FD221998637C00302043 /* luaj.lua in Resources */, + 15D1FD0E1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */, 15CBA9B1196EE80B005877BB /* ipadhd in Resources */, + 15D1FD091998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */, + 15D1FCFF1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */, + 15D1FCF01998637C00302043 /* bitExtend.lua in Resources */, + 15D1FD041998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */, + 15D1FD1D1998637C00302043 /* json.lua in Resources */, + 15D1FD181998637C00302043 /* extern.lua in Resources */, 15CBA9B2196EE80B005877BB /* iphone in Resources */, - 15CBA9F2196F8718005877BB /* extern.lua in Resources */, - 15CBA9F1196F865C005877BB /* json.lua in Resources */, - 15CBA9A9196EE7FA005877BB /* Cocos2d.lua in Resources */, - 15CBA9AA196EE7FA005877BB /* Cocos2dConstants.lua in Resources */, - 15CBA9AB196EE7FA005877BB /* CocoStudio.lua in Resources */, + 15D1FD271998637C00302043 /* luaoc.lua in Resources */, + 15D1FCFA1998637C00302043 /* Cocos2dConstants.lua in Resources */, + 15D1FCF51998637C00302043 /* Cocos2d.lua in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -8545,43 +8541,37 @@ buildActionMask = 2147483647; files = ( 1AC35D5C18CEDE9E00F37B72 /* InfoPlist.strings in Resources */, - 15427D39198F6B4E00DC375D /* DeprecatedNetworkEnum.lua in Resources */, - 1A0EE57118CDFBBE004CD58F /* Cocos2dConstants.lua in Resources */, 1AC35D5D18CEDE9E00F37B72 /* MainMenu.xib in Resources */, + 15D1FD621998641200302043 /* DeprecatedNetworkEnum.lua in Resources */, 1503FABD18DA8B6C00F6518C /* mime.lua in Resources */, - 15427D3B198F6B5300DC375D /* DeprecatedNetworkFunc.lua in Resources */, - 1A0EE56F18CDFBBE004CD58F /* CCBReaderLoad.lua in Resources */, - 15AECE23195D122600907DB0 /* experimentalConstants.lua in Resources */, - 15427D2C198F6B2A00DC375D /* DeprecatedCocos2dEnum.lua in Resources */, - 1A0EE57018CDFBBE004CD58F /* Cocos2d.lua in Resources */, - 15427D32198F6B3E00DC375D /* DeprecatedCocosDenshionClass.lua in Resources */, - 1A0EE57B18CDFBBE004CD58F /* luaj.lua in Resources */, - 1A0EE57918CDFBBE004CD58F /* GuiConstants.lua in Resources */, + 15D1FD2E1998637C00302043 /* OpenglConstants.lua in Resources */, 1503FAC518DA8B6C00F6518C /* url.lua in Resources */, - 1A0EE57E18CDFBBE004CD58F /* OpenglConstants.lua in Resources */, + 15D1FD1F1998637C00302043 /* luaj.lua in Resources */, + 15D1FCED1998637C00302043 /* bitExtend.lua in Resources */, 1503FABF18DA8B6C00F6518C /* smtp.lua in Resources */, - 15427D37198F6B4A00DC375D /* DeprecatedNetworkClass.lua in Resources */, + 15D1FD291998637C00302043 /* Opengl.lua in Resources */, 1503FAB318DA8B6C00F6518C /* ftp.lua in Resources */, 1503FAB718DA8B6C00F6518C /* http.lua in Resources */, - 1A0EE56E18CDFBBE004CD58F /* AudioEngine.lua in Resources */, - 1A0EE57F18CDFBBE004CD58F /* StudioConstants.lua in Resources */, + 15D1FCF71998637C00302043 /* Cocos2dConstants.lua in Resources */, 1503FAC118DA8B6C00F6518C /* socket.lua in Resources */, - 15427D35198F6B4300DC375D /* DeprecatedCocosDenshionFunc.lua in Resources */, 1503FAB918DA8B6C00F6518C /* ltn12.lua in Resources */, - 1A0EE57718CDFBBE004CD58F /* DrawPrimitives.lua in Resources */, - 1A0EE57A18CDFBBE004CD58F /* json.lua in Resources */, + 15D1FD0B1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */, + 15D1FD661998641200302043 /* DeprecatedNetworkFunc.lua in Resources */, + 15D1FD241998637C00302043 /* luaoc.lua in Resources */, 1AC35D5E18CEDE9E00F37B72 /* Icon.icns in Resources */, + 15D1FCF21998637C00302043 /* Cocos2d.lua in Resources */, + 15D1FD061998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */, 1503FABB18DA8B6C00F6518C /* mbox.lua in Resources */, - 15427D2F198F6B3200DC375D /* DeprecatedCocos2dFunc.lua in Resources */, - 1A0EE57818CDFBBE004CD58F /* extern.lua in Resources */, + 15D1FD151998637C00302043 /* extern.lua in Resources */, 1503FAB518DA8B6C00F6518C /* headers.lua in Resources */, - 1A0EE57618CDFBBE004CD58F /* DeprecatedOpenglEnum.lua in Resources */, 1503FAC318DA8B6C00F6518C /* tp.lua in Resources */, - 1A0EE57218CDFBBE004CD58F /* CocoStudio.lua in Resources */, - 1A0EE57C18CDFBBE004CD58F /* luaoc.lua in Resources */, - 1A0EE57D18CDFBBE004CD58F /* Opengl.lua in Resources */, + 15D1FD5E1998641200302043 /* DeprecatedNetworkClass.lua in Resources */, + 15D1FD6A1998641200302043 /* NetworkConstants.lua in Resources */, + 15D1FD011998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */, + 15D1FD1A1998637C00302043 /* json.lua in Resources */, + 15D1FD101998637C00302043 /* DrawPrimitives.lua in Resources */, 1AC35D2918CEDE7200F37B72 /* res in Resources */, - 15427D29198F6B2100DC375D /* DeprecatedCocos2dClass.lua in Resources */, + 15D1FCFC1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */, 1AC35D2B18CEDE7200F37B72 /* src in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -8616,52 +8606,46 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 15427D3C198F6B5400DC375D /* DeprecatedNetworkFunc.lua in Resources */, - 1A0EE56B18CDFBBD004CD58F /* Opengl.lua in Resources */, - 1A0EE55E18CDFBBD004CD58F /* Cocos2d.lua in Resources */, - 1A0EE55D18CDFBBD004CD58F /* CCBReaderLoad.lua in Resources */, + 15D1FD171998637C00302043 /* extern.lua in Resources */, + 15D1FD641998641200302043 /* DeprecatedNetworkEnum.lua in Resources */, + 15D1FCF41998637C00302043 /* Cocos2d.lua in Resources */, 1AC35D4A18CEDE9400F37B72 /* Icon-120.png in Resources */, 1503FAC018DA8B6C00F6518C /* smtp.lua in Resources */, + 15D1FD681998641200302043 /* DeprecatedNetworkFunc.lua in Resources */, 1AC35D4D18CEDE9400F37B72 /* Icon-57.png in Resources */, - 1A0EE56018CDFBBD004CD58F /* CocoStudio.lua in Resources */, + 15D1FD121998637C00302043 /* DrawPrimitives.lua in Resources */, 1503FAB818DA8B6C00F6518C /* http.lua in Resources */, - 15AECE22195D122400907DB0 /* experimentalConstants.lua in Resources */, 1AC35D4B18CEDE9400F37B72 /* Icon-144.png in Resources */, 1503FAC618DA8B6C00F6518C /* url.lua in Resources */, 1AC35D4618CEDE9400F37B72 /* Default-568h@2x.png in Resources */, 1AC35D4818CEDE9400F37B72 /* Default@2x.png in Resources */, 1503FAC418DA8B6C00F6518C /* tp.lua in Resources */, 1503FABA18DA8B6C00F6518C /* ltn12.lua in Resources */, - 15427D38198F6B4B00DC375D /* DeprecatedNetworkClass.lua in Resources */, - 15427D3A198F6B4F00DC375D /* DeprecatedNetworkEnum.lua in Resources */, - 1A0EE56518CDFBBD004CD58F /* DrawPrimitives.lua in Resources */, - 1A0EE56418CDFBBD004CD58F /* DeprecatedOpenglEnum.lua in Resources */, 1503FABE18DA8B6C00F6518C /* mime.lua in Resources */, - 1A0EE55F18CDFBBD004CD58F /* Cocos2dConstants.lua in Resources */, - 1A0EE56718CDFBBD004CD58F /* GuiConstants.lua in Resources */, + 15D1FD601998641200302043 /* DeprecatedNetworkClass.lua in Resources */, + 15D1FD2B1998637C00302043 /* Opengl.lua in Resources */, 1AC35D4E18CEDE9400F37B72 /* Icon-72.png in Resources */, 1AC35D4F18CEDE9400F37B72 /* Icon-76.png in Resources */, - 1A0EE56A18CDFBBD004CD58F /* luaoc.lua in Resources */, - 15427D30198F6B3300DC375D /* DeprecatedCocos2dFunc.lua in Resources */, 1503FAC218DA8B6C00F6518C /* socket.lua in Resources */, - 1A0EE56918CDFBBD004CD58F /* luaj.lua in Resources */, - 1A0EE56618CDFBBD004CD58F /* extern.lua in Resources */, - 1A0EE56C18CDFBBD004CD58F /* OpenglConstants.lua in Resources */, - 1A0EE56D18CDFBBD004CD58F /* StudioConstants.lua in Resources */, 1503FABC18DA8B6C00F6518C /* mbox.lua in Resources */, + 15D1FD1C1998637C00302043 /* json.lua in Resources */, + 15D1FCF91998637C00302043 /* Cocos2dConstants.lua in Resources */, + 15D1FD301998637C00302043 /* OpenglConstants.lua in Resources */, 1503FAB618DA8B6C00F6518C /* headers.lua in Resources */, - 1A0EE56818CDFBBD004CD58F /* json.lua in Resources */, 1AC35D4918CEDE9400F37B72 /* Icon-114.png in Resources */, - 1A0EE55C18CDFBBD004CD58F /* AudioEngine.lua in Resources */, 1503FAB418DA8B6C00F6518C /* ftp.lua in Resources */, + 15D1FCEF1998637C00302043 /* bitExtend.lua in Resources */, 1AC35D2A18CEDE7200F37B72 /* res in Resources */, - 15427D34198F6B4100DC375D /* DeprecatedCocosDenshionClass.lua in Resources */, 1AC35D2C18CEDE7200F37B72 /* src in Resources */, - 15427D2D198F6B2C00DC375D /* DeprecatedCocos2dEnum.lua in Resources */, 1AC35D4C18CEDE9400F37B72 /* Icon-152.png in Resources */, - 15427D36198F6B4500DC375D /* DeprecatedCocosDenshionFunc.lua in Resources */, - 15427D2A198F6B2200DC375D /* DeprecatedCocos2dClass.lua in Resources */, + 15D1FD031998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */, + 15D1FD211998637C00302043 /* luaj.lua in Resources */, + 15D1FCFE1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */, + 15D1FD6C1998641200302043 /* NetworkConstants.lua in Resources */, 1AC35D4718CEDE9400F37B72 /* Default.png in Resources */, + 15D1FD261998637C00302043 /* luaoc.lua in Resources */, + 15D1FD081998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */, + 15D1FD0D1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -8669,85 +8653,85 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 15D1FD751998642800302043 /* experimentalUIConstants.lua in Resources */, 156EAE071977D0BD00F53709 /* ActionTimeline in Resources */, 15E66FD6192DC8C700C20A52 /* Sprite3DTest in Resources */, + 15D1FD001998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */, + 15D1FD2D1998637C00302043 /* OpenglConstants.lua in Resources */, + 15D1FCF11998637C00302043 /* Cocos2d.lua in Resources */, + 15D1FD47199863E800302043 /* DeprecatedCocoStudioClass.lua in Resources */, 1AC35DC318CEE65100F37B72 /* Misc in Resources */, 1AC35DC618CEE65100F37B72 /* Shaders in Resources */, - 15427D17198F55E000DC375D /* DeprecatedExtensionEnum.lua in Resources */, + 15D1FD141998637C00302043 /* extern.lua in Resources */, 1AC35DBB18CEE65100F37B72 /* components in Resources */, 1AC35DE218CEE65900F37B72 /* effect2.ogg in Resources */, - 1ABCA39A18CD9E180087CE3A /* StudioConstants.lua in Resources */, - 15AECE24195D122700907DB0 /* experimentalConstants.lua in Resources */, 15C90B4318E66C1700D69802 /* mime.lua in Resources */, + 15D1FD651998641200302043 /* DeprecatedNetworkFunc.lua in Resources */, 1AC35DB118CEE5DA00F37B72 /* InfoPlist.strings in Resources */, 1AC35DDD18CEE65900F37B72 /* CocosBuilderExample.ccbproj in Resources */, - 1ABCA39218CD9E180087CE3A /* luaj.lua in Resources */, - 15427D05198F55E000DC375D /* DeprecatedCocos2dClass.lua in Resources */, 1AC35DB218CEE5DA00F37B72 /* MainMenu.xib in Resources */, + 15D1FD53199863F900302043 /* DeprecatedExtensionEnum.lua in Resources */, 1AC35DBF18CEE65100F37B72 /* hd in Resources */, - 1ABCA38018CD9E180087CE3A /* CocoStudio.lua in Resources */, 1AC35DC818CEE65100F37B72 /* TileMaps in Resources */, - 1ABCA37C18CD9E180087CE3A /* Cocos2d.lua in Resources */, 1AC35DBE18CEE65100F37B72 /* fonts in Resources */, - 15427D25198F55E000DC375D /* ExtensionConstants.lua in Resources */, - 15427D09198F55E000DC375D /* DeprecatedCocos2dFunc.lua in Resources */, + 15D1FD691998641200302043 /* NetworkConstants.lua in Resources */, 1AC35DDE18CEE65900F37B72 /* CocosBuilderExample.ccbresourcelog in Resources */, - 15427D1B198F55E000DC375D /* DeprecatedNetworkClass.lua in Resources */, + 15D1FD34199863BA00302043 /* CCBReaderLoad.lua in Resources */, 1AC35DBC18CEE65100F37B72 /* configs in Resources */, - 1ABCA38818CD9E180087CE3A /* DeprecatedOpenglEnum.lua in Resources */, + 15D1FD611998641200302043 /* DeprecatedNetworkEnum.lua in Resources */, 1AC35DE118CEE65900F37B72 /* background.ogg in Resources */, 15C90B4B18E66C2F00D69802 /* url.lua in Resources */, - 1ABCA37A18CD9E180087CE3A /* CCBReaderLoad.lua in Resources */, 1AC35DDF18CEE65900F37B72 /* music.mid in Resources */, 1AC35D7518CEE58500F37B72 /* src in Resources */, - 15427D11198F55E000DC375D /* DeprecatedCocoStudioClass.lua in Resources */, - 15427D1D198F55E000DC375D /* DeprecatedNetworkEnum.lua in Resources */, 1AC35DE018CEE65900F37B72 /* background.mp3 in Resources */, 1A1645A6191B6281008C7C7F /* ccs-res in Resources */, C08689C218D370C90093E810 /* background.caf in Resources */, - 15427D1F198F55E000DC375D /* DeprecatedNetworkFunc.lua in Resources */, - 15427D13198F55E000DC375D /* DeprecatedCocoStudioFunc.lua in Resources */, + 15D1FD0A1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */, 15C90B4918E66C2A00D69802 /* tp.lua in Resources */, + 15D1FD281998637C00302043 /* Opengl.lua in Resources */, 1AC35DE918CEE65900F37B72 /* effect1.wav in Resources */, - 1ABCA38E18CD9E180087CE3A /* GuiConstants.lua in Resources */, - 156229331973D400009C9067 /* bitExtend.lua in Resources */, 15C90B3F18E66C0C00D69802 /* ltn12.lua in Resources */, 15C90B4718E66C2400D69802 /* socket.lua in Resources */, 15C90B3A18E66BE200D69802 /* ftp.lua in Resources */, - 15427D27198F55E000DC375D /* NetworkConstants.lua in Resources */, - 1ABCA37E18CD9E180087CE3A /* Cocos2dConstants.lua in Resources */, - 15427D0F198F55E000DC375D /* DeprecatedCocosDenshionFunc.lua in Resources */, + 15D1FD57199863F900302043 /* ExtensionConstants.lua in Resources */, 1AC35DE518CEE65900F37B72 /* Hello.png in Resources */, 1AC35DEA18CEE65900F37B72 /* pew-pew-lei.wav in Resources */, - 15427D15198F55E000DC375D /* DeprecatedExtensionClass.lua in Resources */, 1AC35DC418CEE65100F37B72 /* Particles in Resources */, - 15427D0D198F55E000DC375D /* DeprecatedCocosDenshionClass.lua in Resources */, + 15D1FD3F199863CA00302043 /* DeprecatedCocosDenshionFunc.lua in Resources */, + 15D1FD191998637C00302043 /* json.lua in Resources */, + 15D1FD4B199863E800302043 /* StudioConstants.lua in Resources */, 1AC35DB918CEE65100F37B72 /* ccb in Resources */, + 15D1FD49199863E800302043 /* DeprecatedCocoStudioFunc.lua in Resources */, 15C90B4118E66C1100D69802 /* mbox.lua in Resources */, - 1ABCA38A18CD9E180087CE3A /* DrawPrimitives.lua in Resources */, + 15D1FD55199863F900302043 /* DeprecatedExtensionFunc.lua in Resources */, + 15D1FD3B199863CA00302043 /* AudioEngine.lua in Resources */, + 15D1FD231998637C00302043 /* luaoc.lua in Resources */, 1AC35DB318CEE5DA00F37B72 /* Icon.icns in Resources */, - 15427D23198F55E000DC375D /* DeprecatedUIFunc.lua in Resources */, + 15D1FD051998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */, + 15D1FD3D199863CA00302043 /* DeprecatedCocosDenshionClass.lua in Resources */, + 15D1FD731998642800302043 /* DeprecatedUIFunc.lua in Resources */, 1AC35DE318CEE65900F37B72 /* fileLookup.plist in Resources */, + 15D1FD36199863BA00302043 /* DeprecatedCocosBuilderClass.lua in Resources */, 15C90B3D18E66BF100D69802 /* http.lua in Resources */, + 15D1FCF61998637C00302043 /* Cocos2dConstants.lua in Resources */, + 15D1FD0F1998637C00302043 /* DrawPrimitives.lua in Resources */, + 15D1FD711998642800302043 /* DeprecatedUIEnum.lua in Resources */, 1AC35DE618CEE65900F37B72 /* effect1.raw in Resources */, - 15427D0B198F55E000DC375D /* DeprecatedCocosBuilderClass.lua in Resources */, - 1ABCA39818CD9E180087CE3A /* OpenglConstants.lua in Resources */, - 15427D21198F55E000DC375D /* DeprecatedUIEnum.lua in Resources */, 1AC35DC018CEE65100F37B72 /* Images in Resources */, - 1ABCA37818CD9E180087CE3A /* AudioEngine.lua in Resources */, - 15427D07198F55E000DC375D /* DeprecatedCocos2dEnum.lua in Resources */, - 1ABCA39418CD9E180087CE3A /* luaoc.lua in Resources */, - 15427D19198F55E000DC375D /* DeprecatedExtensionFunc.lua in Resources */, - 1ABCA39018CD9E180087CE3A /* json.lua in Resources */, + 15D1FD5D1998641200302043 /* DeprecatedNetworkClass.lua in Resources */, 1AC35D7918CEE59900F37B72 /* cocosbuilderRes in Resources */, 15C90B3B18E66BEB00D69802 /* headers.lua in Resources */, - 1ABCA38C18CD9E180087CE3A /* extern.lua in Resources */, 1AC35DC918CEE65100F37B72 /* zwoptex in Resources */, + 15D1FCEC1998637C00302043 /* bitExtend.lua in Resources */, + 15D1FD51199863F900302043 /* DeprecatedExtensionClass.lua in Resources */, 1AC35DBD18CEE65100F37B72 /* extensions in Resources */, + 15D1FD771998642800302043 /* GuiConstants.lua in Resources */, + 15D1FD45199863E800302043 /* CocoStudio.lua in Resources */, + 15D1FD1E1998637C00302043 /* luaj.lua in Resources */, 1AC35DC718CEE65100F37B72 /* spine in Resources */, 15C90B4518E66C1E00D69802 /* smtp.lua in Resources */, + 15D1FCFB1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */, 1AC35DB718CEE65100F37B72 /* animations in Resources */, - 1ABCA39618CD9E180087CE3A /* Opengl.lua in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -8757,88 +8741,88 @@ files = ( 15AECE0F195C1FDD00907DB0 /* cocosvideo.mp4 in Resources */, 15B0870D195AD52000D6F62B /* ActionTimeline in Resources */, - 15427D06198F55E000DC375D /* DeprecatedCocos2dClass.lua in Resources */, 15E66FC8192D957100C20A52 /* Sprite3DTest in Resources */, + 15D1FD58199863F900302043 /* ExtensionConstants.lua in Resources */, 15C90B4418E66C1800D69802 /* mime.lua in Resources */, - 15427D1A198F55E000DC375D /* DeprecatedExtensionFunc.lua in Resources */, - 156229341973D400009C9067 /* bitExtend.lua in Resources */, + 15D1FD111998637C00302043 /* DrawPrimitives.lua in Resources */, 15C90B4C18E66C3100D69802 /* url.lua in Resources */, - 15427D20198F55E000DC375D /* DeprecatedNetworkFunc.lua in Resources */, + 15D1FD1B1998637C00302043 /* json.lua in Resources */, 1AC35DD618CEE65200F37B72 /* Misc in Resources */, - 15427D12198F55E000DC375D /* DeprecatedCocoStudioClass.lua in Resources */, - 1ABCA37B18CD9E180087CE3A /* CCBReaderLoad.lua in Resources */, + 15D1FD3E199863CA00302043 /* DeprecatedCocosDenshionClass.lua in Resources */, 1AC35DF718CEE65B00F37B72 /* effect1.wav in Resources */, - 15427D18198F55E000DC375D /* DeprecatedExtensionEnum.lua in Resources */, - 15427D28198F55E000DC375D /* NetworkConstants.lua in Resources */, - 1ABCA39318CD9E180087CE3A /* luaj.lua in Resources */, C08689C418D370C90093E810 /* background.caf in Resources */, 1AC35DD118CEE65200F37B72 /* fonts in Resources */, + 15D1FD4C199863E800302043 /* StudioConstants.lua in Resources */, 1AC35DCC18CEE65200F37B72 /* ccb in Resources */, 1AC35DD218CEE65200F37B72 /* hd in Resources */, + 15D1FD251998637C00302043 /* luaoc.lua in Resources */, 1AC35DD718CEE65200F37B72 /* Particles in Resources */, + 15D1FD761998642800302043 /* experimentalUIConstants.lua in Resources */, 1AC35D9D18CEE5D100F37B72 /* Icon-120.png in Resources */, + 15D1FD781998642800302043 /* GuiConstants.lua in Resources */, 15C90B3E18E66BF200D69802 /* http.lua in Resources */, - 15427D14198F55E000DC375D /* DeprecatedCocoStudioFunc.lua in Resources */, - 15AECE1F195D0EC500907DB0 /* experimentalConstants.lua in Resources */, - 15427D0A198F55E000DC375D /* DeprecatedCocos2dFunc.lua in Resources */, 1AC35DA018CEE5D100F37B72 /* Icon-57.png in Resources */, - 1ABCA37F18CD9E180087CE3A /* Cocos2dConstants.lua in Resources */, 1AC35DF118CEE65B00F37B72 /* fileLookup.plist in Resources */, - 1ABCA39518CD9E180087CE3A /* luaoc.lua in Resources */, 1AC35DEF18CEE65B00F37B72 /* background.ogg in Resources */, 1AC35D9E18CEE5D100F37B72 /* Icon-144.png in Resources */, - 15427D16198F55E000DC375D /* DeprecatedExtensionClass.lua in Resources */, + 15D1FD021998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */, 1AC35DF818CEE65B00F37B72 /* pew-pew-lei.wav in Resources */, 1AC35D9918CEE5D100F37B72 /* Default-568h@2x.png in Resources */, + 15D1FD4A199863E800302043 /* DeprecatedCocoStudioFunc.lua in Resources */, + 15D1FD071998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */, 15C90B4218E66C1200D69802 /* mbox.lua in Resources */, + 15D1FD201998637C00302043 /* luaj.lua in Resources */, 1AC35D9B18CEE5D100F37B72 /* Default@2x.png in Resources */, 15C90B3718E66BE000D69802 /* ftp.lua in Resources */, 1AC35DCE18CEE65200F37B72 /* components in Resources */, + 15D1FD631998641200302043 /* DeprecatedNetworkEnum.lua in Resources */, 1AC35D7618CEE58500F37B72 /* src in Resources */, 15C90B4A18E66C2B00D69802 /* tp.lua in Resources */, 1AC35DDC18CEE65200F37B72 /* zwoptex in Resources */, - 1ABCA38918CD9E180087CE3A /* DeprecatedOpenglEnum.lua in Resources */, 1AC35DEC18CEE65B00F37B72 /* CocosBuilderExample.ccbresourcelog in Resources */, 15C90B4618E66C1F00D69802 /* smtp.lua in Resources */, - 15427D22198F55E000DC375D /* DeprecatedUIEnum.lua in Resources */, + 15D1FD3C199863CA00302043 /* AudioEngine.lua in Resources */, + 15D1FD35199863BA00302043 /* CCBReaderLoad.lua in Resources */, 1AC35DED18CEE65B00F37B72 /* music.mid in Resources */, + 15D1FCFD1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */, + 15D1FD721998642800302043 /* DeprecatedUIEnum.lua in Resources */, + 15D1FD5F1998641200302043 /* DeprecatedNetworkClass.lua in Resources */, + 15D1FD0C1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */, + 15D1FD6B1998641200302043 /* NetworkConstants.lua in Resources */, 1AC35DD018CEE65200F37B72 /* extensions in Resources */, + 15D1FD2A1998637C00302043 /* Opengl.lua in Resources */, + 15D1FCF81998637C00302043 /* Cocos2dConstants.lua in Resources */, 1AC35DD318CEE65200F37B72 /* Images in Resources */, 1AC35DF018CEE65B00F37B72 /* effect2.ogg in Resources */, - 1ABCA37D18CD9E180087CE3A /* Cocos2d.lua in Resources */, - 1ABCA39B18CD9E180087CE3A /* StudioConstants.lua in Resources */, - 1ABCA38D18CD9E180087CE3A /* extern.lua in Resources */, - 15427D08198F55E000DC375D /* DeprecatedCocos2dEnum.lua in Resources */, 1AC35DEB18CEE65B00F37B72 /* CocosBuilderExample.ccbproj in Resources */, + 15D1FD56199863F900302043 /* DeprecatedExtensionFunc.lua in Resources */, 1AC35DCA18CEE65200F37B72 /* animations in Resources */, + 15D1FD54199863F900302043 /* DeprecatedExtensionEnum.lua in Resources */, + 15D1FD2F1998637C00302043 /* OpenglConstants.lua in Resources */, + 15D1FD671998641200302043 /* DeprecatedNetworkFunc.lua in Resources */, 1A1645A9191B6283008C7C7F /* ccs-res in Resources */, + 15D1FD46199863E800302043 /* CocoStudio.lua in Resources */, + 15D1FD37199863BA00302043 /* DeprecatedCocosBuilderClass.lua in Resources */, 1AC35DA118CEE5D100F37B72 /* Icon-72.png in Resources */, - 15427D0C198F55E000DC375D /* DeprecatedCocosBuilderClass.lua in Resources */, 15C90B4018E66C0D00D69802 /* ltn12.lua in Resources */, + 15D1FD48199863E800302043 /* DeprecatedCocoStudioClass.lua in Resources */, + 15D1FD161998637C00302043 /* extern.lua in Resources */, 1AC35DA218CEE5D100F37B72 /* Icon-76.png in Resources */, 15C90B4818E66C2500D69802 /* socket.lua in Resources */, + 15D1FD40199863CA00302043 /* DeprecatedCocosDenshionFunc.lua in Resources */, 15C90B3C18E66BEC00D69802 /* headers.lua in Resources */, - 15427D26198F55E000DC375D /* ExtensionConstants.lua in Resources */, 1AC35DF418CEE65B00F37B72 /* effect1.raw in Resources */, 1AC35DD918CEE65200F37B72 /* Shaders in Resources */, 1AC35DCF18CEE65200F37B72 /* configs in Resources */, - 1ABCA38F18CD9E180087CE3A /* GuiConstants.lua in Resources */, - 1ABCA39118CD9E180087CE3A /* json.lua in Resources */, 1AC35DDA18CEE65200F37B72 /* spine in Resources */, - 1ABCA39718CD9E180087CE3A /* Opengl.lua in Resources */, + 15D1FD741998642800302043 /* DeprecatedUIFunc.lua in Resources */, 1AC35DDB18CEE65200F37B72 /* TileMaps in Resources */, - 15427D1C198F55E000DC375D /* DeprecatedNetworkClass.lua in Resources */, - 15427D1E198F55E000DC375D /* DeprecatedNetworkEnum.lua in Resources */, + 15D1FCEE1998637C00302043 /* bitExtend.lua in Resources */, 1AC35DF318CEE65B00F37B72 /* Hello.png in Resources */, + 15D1FCF31998637C00302043 /* Cocos2d.lua in Resources */, 1AC35D7A18CEE59900F37B72 /* cocosbuilderRes in Resources */, - 15427D24198F55E000DC375D /* DeprecatedUIFunc.lua in Resources */, - 1ABCA38118CD9E180087CE3A /* CocoStudio.lua in Resources */, 1AC35D9C18CEE5D100F37B72 /* Icon-114.png in Resources */, - 1ABCA38B18CD9E180087CE3A /* DrawPrimitives.lua in Resources */, - 15427D0E198F55E000DC375D /* DeprecatedCocosDenshionClass.lua in Resources */, - 1ABCA39918CD9E180087CE3A /* OpenglConstants.lua in Resources */, - 15427D10198F55E000DC375D /* DeprecatedCocosDenshionFunc.lua in Resources */, - 1ABCA37918CD9E180087CE3A /* AudioEngine.lua in Resources */, + 15D1FD52199863F900302043 /* DeprecatedExtensionClass.lua in Resources */, 1AC35D9F18CEE5D100F37B72 /* Icon-152.png in Resources */, 1AC35DEE18CEE65B00F37B72 /* background.mp3 in Resources */, 1AC35D9A18CEE5D100F37B72 /* Default.png in Resources */, diff --git a/cocos/2d/CCFastTMXLayer.cpp b/cocos/2d/CCFastTMXLayer.cpp index 7b422e766a..e2646aa42a 100644 --- a/cocos/2d/CCFastTMXLayer.cpp +++ b/cocos/2d/CCFastTMXLayer.cpp @@ -121,8 +121,10 @@ TMXLayer::TMXLayer() , _useAutomaticVertexZ(false) , _dirty(true) , _quadsDirty(true) +, _vertexBuffer(nullptr) +, _vData(nullptr) +, _indexBuffer(nullptr) { - _buffersVBO[0] = _buffersVBO[1] = 0; } TMXLayer::~TMXLayer() @@ -130,15 +132,10 @@ TMXLayer::~TMXLayer() CC_SAFE_RELEASE(_tileSet); CC_SAFE_RELEASE(_texture); CC_SAFE_DELETE_ARRAY(_tiles); - if(glIsBuffer(_buffersVBO[0])) - { - glDeleteBuffers(1, &_buffersVBO[0]); - } + CC_SAFE_RELEASE(_vData); + CC_SAFE_RELEASE(_vertexBuffer); + CC_SAFE_RELEASE(_indexBuffer); - if(glIsBuffer(_buffersVBO[1])) - { - glDeleteBuffers(1, &_buffersVBO[1]); - } } void TMXLayer::draw(Renderer *renderer, const Mat4& transform, uint32_t flags) @@ -156,43 +153,37 @@ void TMXLayer::draw(Renderer *renderer, const Mat4& transform, uint32_t flags) updateTiles(rect); updateIndexBuffer(); + updatePrimitives(); _dirty = false; } - if(_renderCommands.size() < _indicesVertexZNumber.size()) + if(_renderCommands.size() < _primitives.size()) { - _renderCommands.resize(_indicesVertexZNumber.size()); + _renderCommands.resize(_primitives.size()); } int index = 0; - for(const auto& iter : _indicesVertexZNumber) + for(const auto& iter : _primitives) { - auto& cmd = _renderCommands[index++]; - - cmd.init(iter.first); - cmd.func = CC_CALLBACK_0(TMXLayer::onDraw, this, _indicesVertexZOffsets[iter.first], iter.second); - renderer->addCommand(&cmd); + if(iter.second->getCount() > 0) + { + auto& cmd = _renderCommands[index++]; + cmd.init(iter.first, _texture->getName(), getGLProgramState(), BlendFunc::ALPHA_NON_PREMULTIPLIED, iter.second, _modelViewTransform); + renderer->addCommand(&cmd); + } } - } -void TMXLayer::onDraw(int offset, int count) +void TMXLayer::onDraw(Primitive *primitive) { GL::bindTexture2D(_texture->getName()); getGLProgramState()->apply(_modelViewTransform); GL::bindVAO(0); - glBindBuffer(GL_ARRAY_BUFFER, _buffersVBO[0]); - glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _buffersVBO[1]); - - GL::enableVertexAttribs(GL::VERTEX_ATTRIB_FLAG_POS_COLOR_TEX); - glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 3, GL_FLOAT, GL_FALSE, sizeof(V3F_C4B_T2F), (GLvoid*)0); - glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(V3F_C4B_T2F), (GLvoid*)offsetof(V3F_C4B_T2F, colors)); - glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, sizeof(V3F_C4B_T2F), (GLvoid*)offsetof(V3F_C4B_T2F, texCoords)); - glDrawElements(GL_TRIANGLES, (GLsizei)count * 6, GL_UNSIGNED_INT, (GLvoid*)(offset * 6 * sizeof(int))); + primitive->draw(); glBindBuffer(GL_ARRAY_BUFFER, 0); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); - CC_INCREMENT_GL_DRAWN_BATCHES_AND_VERTICES(1, count * 4); + CC_INCREMENT_GL_DRAWN_BATCHES_AND_VERTICES(1, primitive->getCount() * 4); } void TMXLayer::updateTiles(const Rect& culledRect) @@ -291,25 +282,32 @@ void TMXLayer::updateTiles(const Rect& culledRect) void TMXLayer::updateVertexBuffer() { GL::bindVAO(0); - if(!glIsBuffer(_buffersVBO[0])) + if(nullptr == _vData) { - glGenBuffers(1, &_buffersVBO[0]); + _vertexBuffer = VertexBuffer::create(sizeof(V3F_C4B_T2F), (int)_totalQuads.size() * 4); + _vData = VertexData::create(); + _vData->setStream(_vertexBuffer, VertexStreamAttribute(0, GLProgram::VERTEX_ATTRIB_POSITION, GL_FLOAT, 3)); + _vData->setStream(_vertexBuffer, VertexStreamAttribute(offsetof(V3F_C4B_T2F, colors), GLProgram::VERTEX_ATTRIB_COLOR, GL_UNSIGNED_BYTE, 4, true)); + _vData->setStream(_vertexBuffer, VertexStreamAttribute(offsetof(V3F_C4B_T2F, texCoords), GLProgram::VERTEX_ATTRIB_TEX_COORD, GL_FLOAT, 2)); + CC_SAFE_RETAIN(_vData); + CC_SAFE_RETAIN(_vertexBuffer); + } + if(_vertexBuffer) + { + _vertexBuffer->updateVertices((void*)&_totalQuads[0], (int)_totalQuads.size() * 4, 0); } - glBindBuffer(GL_ARRAY_BUFFER, _buffersVBO[0]); - glBufferData(GL_ARRAY_BUFFER, sizeof(V3F_C4B_T2F_Quad) * _totalQuads.size(), (GLvoid*)&_totalQuads[0], GL_STATIC_DRAW); - glBindBuffer(GL_ARRAY_BUFFER, 0); } void TMXLayer::updateIndexBuffer() { - if(!glIsBuffer(_buffersVBO[1])) + if(nullptr == _indexBuffer) { - glGenBuffers(1, &_buffersVBO[1]); + _indexBuffer = IndexBuffer::create(IndexBuffer::IndexType::INDEX_TYPE_UINT_32, (int)_indices.size()); + CC_SAFE_RETAIN(_indexBuffer); } - glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _buffersVBO[1]); - glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(int) * _indices.size(), &_indices[0], GL_DYNAMIC_DRAW); - glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); + _indexBuffer->updateIndices(&_indices[0], (int)_indices.size(), 0); + } // FastTMXLayer - setup Tiles @@ -405,6 +403,29 @@ Mat4 TMXLayer::tileToNodeTransform() } +void TMXLayer::updatePrimitives() +{ + for(const auto& iter : _indicesVertexZNumber) + { + int start = _indicesVertexZOffsets.at(iter.first); + + auto primitiveIter= _primitives.find(iter.first); + if(primitiveIter == _primitives.end()) + { + auto primitive = Primitive::create(_vData, _indexBuffer, GL_TRIANGLES); + primitive->setCount(iter.second * 6); + primitive->setStart(start * 6); + + _primitives.insert(iter.first, primitive); + } + else + { + primitiveIter->second->setCount(iter.second * 6); + primitiveIter->second->setStart(start * 6); + } + } +} + void TMXLayer::updateTotalQuads() { if(_quadsDirty) diff --git a/cocos/2d/CCFastTMXLayer.h b/cocos/2d/CCFastTMXLayer.h index f148eccc19..db1e0b7e3a 100644 --- a/cocos/2d/CCFastTMXLayer.h +++ b/cocos/2d/CCFastTMXLayer.h @@ -32,6 +32,7 @@ THE SOFTWARE. #include "CCNode.h" #include "renderer/CCCustomCommand.h" #include "renderer/CCQuadCommand.h" +#include "renderer/CCPrimitiveCommand.h" #include #include @@ -199,12 +200,12 @@ protected: // void updateTotalQuads(); - void onDraw(int offset, int count); - + void onDraw(Primitive* primitive); inline int getTileIndexByPos(int x, int y) const { return x + y * (int) _layerSize.width; } void updateVertexBuffer(); void updateIndexBuffer(); + void updatePrimitives(); protected: //! name of the layer @@ -228,7 +229,7 @@ protected: /** container for sprite children. map > */ std::map > _spriteContainer; - GLuint _buffersVBO[2]; //0: vertex, 1: indices + //GLuint _buffersVBO; //0: vertex, 1: indices Size _screenGridSize; Rect _screenGridRect; @@ -246,9 +247,17 @@ protected: std::vector _indices; std::map _indicesVertexZOffsets; std::unordered_map _indicesVertexZNumber; - std::vector _renderCommands; + std::vector _renderCommands; bool _dirty; + VertexBuffer* _vertexBuffer; + + VertexData* _vData; + + IndexBuffer* _indexBuffer; + + Map _primitives; + public: /** Possible orientations of the TMX map */ static const int FAST_TMX_ORIENTATION_ORTHO; diff --git a/cocos/2d/CCFontFNT.h b/cocos/2d/CCFontFNT.h index 945f81c0ac..78413fcf53 100644 --- a/cocos/2d/CCFontFNT.h +++ b/cocos/2d/CCFontFNT.h @@ -32,7 +32,7 @@ NS_CC_BEGIN class BMFontConfiguration; -class FontFNT : public Font +class CC_DLL FontFNT : public Font { public: diff --git a/cocos/2d/CCFontFreeType.cpp b/cocos/2d/CCFontFreeType.cpp index 9e462e7bdf..6a4623d392 100644 --- a/cocos/2d/CCFontFreeType.cpp +++ b/cocos/2d/CCFontFreeType.cpp @@ -267,7 +267,7 @@ unsigned char* FontFreeType::getGlyphBitmap(unsigned short theChar, long &outWid } else { - if (FT_Load_Glyph(_fontRef,glyphIndex,FT_LOAD_RENDER)) + if (FT_Load_Glyph(_fontRef,glyphIndex,FT_LOAD_RENDER | FT_LOAD_NO_AUTOHINT)) break; } diff --git a/cocos/2d/CCNode.h b/cocos/2d/CCNode.h index e907d06c1d..b40cec89be 100644 --- a/cocos/2d/CCNode.h +++ b/cocos/2d/CCNode.h @@ -1284,12 +1284,12 @@ public: * Resumes all scheduled selectors, actions and event listeners. * This method is called internally by onEnter */ - void resume(void); + virtual void resume(void); /** * Pauses all scheduled selectors, actions and event listeners.. * This method is called internally by onExit */ - void pause(void); + virtual void pause(void); /** * Resumes all scheduled selectors, actions and event listeners. diff --git a/cocos/2d/CCProtectedNode.cpp b/cocos/2d/CCProtectedNode.cpp index 58ce8ff5f4..de9bbc8bc0 100644 --- a/cocos/2d/CCProtectedNode.cpp +++ b/cocos/2d/CCProtectedNode.cpp @@ -382,8 +382,9 @@ void ProtectedNode::updateDisplayedOpacity(GLubyte parentOpacity) child->updateDisplayedOpacity(_displayedOpacity); } } + for(auto child : _protectedChildren){ - child->setOpacity(_realOpacity); + child->updateDisplayedOpacity(_displayedOpacity); } } @@ -401,7 +402,7 @@ void ProtectedNode::updateDisplayedColor(const Color3B& parentColor) } } for(const auto &child : _protectedChildren){ - child->setColor(_realColor); + child->updateDisplayedColor(_displayedColor); } } @@ -411,7 +412,7 @@ void ProtectedNode::disableCascadeColor() child->updateDisplayedColor(Color3B::WHITE); } for(auto child : _protectedChildren){ - child->setColor(Color3B::WHITE); + child->updateDisplayedColor(Color3B::WHITE); } } diff --git a/cocos/2d/CCRenderTexture.cpp b/cocos/2d/CCRenderTexture.cpp index 8a60335503..9cee8b1434 100644 --- a/cocos/2d/CCRenderTexture.cpp +++ b/cocos/2d/CCRenderTexture.cpp @@ -67,6 +67,7 @@ RenderTexture::RenderTexture() , _rtTextureRect(Rect::ZERO) , _fullRect(Rect::ZERO) , _fullviewPort(Rect::ZERO) +, _saveFileCallback(nullptr) { #if CC_ENABLE_CACHE_TEXTURE_DATA // Listen this event to save render texture before come to background. @@ -415,33 +416,36 @@ void RenderTexture::visit(Renderer *renderer, const Mat4 &parentTransform, uint3 _orderOfArrival = 0; } -bool RenderTexture::saveToFile(const std::string& filename, bool isRGBA) +bool RenderTexture::saveToFile(const std::string& filename, bool isRGBA, std::function callback) { std::string basename(filename); std::transform(basename.begin(), basename.end(), basename.begin(), ::tolower); if (basename.find(".png") != std::string::npos) { - return saveToFile(filename, Image::Format::PNG, isRGBA); + return saveToFile(filename, Image::Format::PNG, isRGBA, callback); } else if (basename.find(".jpg") != std::string::npos) { if (isRGBA) CCLOG("RGBA is not supported for JPG format."); - return saveToFile(filename, Image::Format::JPG, false); + return saveToFile(filename, Image::Format::JPG, false, callback); } else { CCLOG("Only PNG and JPG format are supported now!"); } - return saveToFile(filename, Image::Format::JPG, false); + return saveToFile(filename, Image::Format::JPG, false, callback); } -bool RenderTexture::saveToFile(const std::string& fileName, Image::Format format, bool isRGBA) + +bool RenderTexture::saveToFile(const std::string& fileName, Image::Format format, bool isRGBA, std::function callback) { CCASSERT(format == Image::Format::JPG || format == Image::Format::PNG, "the image can only be saved as JPG or PNG format"); if (isRGBA && format == Image::Format::JPG) CCLOG("RGBA is not supported for JPG format"); + _saveFileCallback = callback; + std::string fullpath = FileUtils::getInstance()->getWritablePath() + fileName; _saveToFileCommand.init(_globalZOrder); _saveToFileCommand.func = CC_CALLBACK_0(RenderTexture::onSaveToFile, this, fullpath, isRGBA); @@ -457,7 +461,10 @@ void RenderTexture::onSaveToFile(const std::string& filename, bool isRGBA) { image->saveToFile(filename.c_str(), !isRGBA); } - + if(_saveFileCallback) + { + _saveFileCallback(this, filename); + } CC_SAFE_DELETE(image); } diff --git a/cocos/2d/CCRenderTexture.h b/cocos/2d/CCRenderTexture.h index 187acc18b3..384a466bb6 100644 --- a/cocos/2d/CCRenderTexture.h +++ b/cocos/2d/CCRenderTexture.h @@ -103,12 +103,12 @@ public: /** saves the texture into a file using JPEG format. The file will be saved in the Documents folder. Returns true if the operation is successful. */ - bool saveToFile(const std::string& filename, bool isRGBA = true); + bool saveToFile(const std::string& filename, bool isRGBA = true, std::function callback = nullptr); /** saves the texture into a file. The format could be JPG or PNG. The file will be saved in the Documents folder. Returns true if the operation is successful. */ - bool saveToFile(const std::string& filename, Image::Format format, bool isRGBA = true); + bool saveToFile(const std::string& filename, Image::Format format, bool isRGBA = true, std::function callback = nullptr); /** Listen "come to background" message, and save render texture. It only has effect on Android. @@ -213,7 +213,12 @@ protected: CustomCommand _clearCommand; CustomCommand _beginCommand; CustomCommand _endCommand; + /*this command is used to encapsulate saveToFile, + call saveToFile twice will overwrite this command and callback + and the command and callback will be executed twice. + */ CustomCommand _saveToFileCommand; + std::function _saveFileCallback; protected: //renderer caches and callbacks void onBegin(); diff --git a/cocos/2d/CCScene.cpp b/cocos/2d/CCScene.cpp index cfc5f4f83a..93a644a2f6 100644 --- a/cocos/2d/CCScene.cpp +++ b/cocos/2d/CCScene.cpp @@ -28,6 +28,8 @@ THE SOFTWARE. #include "2d/CCScene.h" #include "base/CCDirector.h" #include "base/CCCamera.h" +#include "base/CCEventDispatcher.h" +#include "base/CCEventListenerCustom.h" #include "2d/CCLayer.h" #include "2d/CCSprite.h" #include "2d/CCSpriteBatchNode.h" @@ -43,6 +45,13 @@ Scene::Scene() { _ignoreAnchorPointForPosition = true; setAnchorPoint(Vec2(0.5f, 0.5f)); + + //create default camera + _defaultCamera = Camera::create(); + addChild(_defaultCamera); + + _event = Director::getInstance()->getEventDispatcher()->addCustomEventListener(Director::EVENT_PROJECTION_CHANGED, std::bind(&Scene::onProjectionChanged, this, std::placeholders::_1)); + _event->retain(); } Scene::~Scene() @@ -50,6 +59,8 @@ Scene::~Scene() #if CC_USE_PHYSICS CC_SAFE_DELETE(_physicsWorld); #endif + Director::getInstance()->getEventDispatcher()->removeEventListener(_event); + CC_SAFE_RELEASE(_event); } bool Scene::init() @@ -125,7 +136,7 @@ void Scene::addChild(Node* child, int zOrder, const std::string &name) void Scene::update(float delta) { Node::update(delta); - if (nullptr != _physicsWorld) + if (nullptr != _physicsWorld && _physicsWorld->isAutoStep()) { _physicsWorld->update(delta); } @@ -153,9 +164,6 @@ bool Scene::initWithPhysics() { Director * director; CC_BREAK_IF( ! (director = Director::getInstance()) ); - // add camera - auto camera = Camera::create(); - addChild(camera); this->setContentSize(director->getWinSize()); CC_BREAK_IF(! (_physicsWorld = PhysicsWorld::construct(*this))); @@ -189,6 +197,14 @@ void Scene::addChildToPhysicsWorld(Node* child) } } +void Scene::onProjectionChanged(EventCustom* event) +{ + if (_defaultCamera) + { + _defaultCamera->initDefault(); + } +} + #endif NS_CC_END diff --git a/cocos/2d/CCScene.h b/cocos/2d/CCScene.h index 41c53659a4..7630111cc9 100644 --- a/cocos/2d/CCScene.h +++ b/cocos/2d/CCScene.h @@ -74,6 +74,8 @@ CC_CONSTRUCTOR_ACCESS: bool init(); bool initWithSize(const Size& size); + + void onProjectionChanged(EventCustom* event); protected: friend class Node; @@ -83,6 +85,8 @@ protected: friend class Director; std::vector _cameras; //weak ref to Camera + Camera* _defaultCamera; //weak ref, default camera created by scene, _cameras[0], Caution that the default camera can not be added to _cameras before onEnter is called + EventListenerCustom* _event; private: CC_DISALLOW_COPY_AND_ASSIGN(Scene); diff --git a/cocos/2d/CCTextFieldTTF.cpp b/cocos/2d/CCTextFieldTTF.cpp index 5a0848d3a8..fef8b66e66 100644 --- a/cocos/2d/CCTextFieldTTF.cpp +++ b/cocos/2d/CCTextFieldTTF.cpp @@ -259,7 +259,9 @@ const std::string& TextFieldTTF::getContentText() void TextFieldTTF::setTextColor(const Color4B &color) { _colorText = color; - Label::setTextColor(_colorText); + if (_inputText.length() > 0) { + Label::setTextColor(_colorText); + } } void TextFieldTTF::visit(Renderer *renderer, const Mat4 &parentTransform, uint32_t parentFlags) @@ -282,11 +284,18 @@ void TextFieldTTF::setColorSpaceHolder(const Color3B& color) _colorSpaceHolder.g = color.g; _colorSpaceHolder.b = color.b; _colorSpaceHolder.a = 255; + if (0 == _inputText.length()) + { + Label::setTextColor(_colorSpaceHolder); + } } void TextFieldTTF::setColorSpaceHolder(const Color4B& color) { _colorSpaceHolder = color; + if (0 == _inputText.length()) { + Label::setTextColor(_colorSpaceHolder); + } } ////////////////////////////////////////////////////////////////////////// @@ -321,7 +330,7 @@ void TextFieldTTF::setString(const std::string &text) } // if there is no input text, display placeholder instead - if (! _inputText.length()) + if (0 == _inputText.length()) { Label::setTextColor(_colorSpaceHolder); Label::setString(_placeHolder); @@ -343,7 +352,7 @@ const std::string& TextFieldTTF::getString() const void TextFieldTTF::setPlaceHolder(const std::string& text) { _placeHolder = text; - if (! _inputText.length()) + if (0 == _inputText.length()) { Label::setTextColor(_colorSpaceHolder); Label::setString(_placeHolder); diff --git a/cocos/2d/libcocos2d.vcxproj b/cocos/2d/libcocos2d.vcxproj index 1f6b2e20d4..8a156a1dc5 100644 --- a/cocos/2d/libcocos2d.vcxproj +++ b/cocos/2d/libcocos2d.vcxproj @@ -290,6 +290,8 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + @@ -297,6 +299,8 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + @@ -505,6 +509,8 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + @@ -513,6 +519,8 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + diff --git a/cocos/2d/libcocos2d.vcxproj.filters b/cocos/2d/libcocos2d.vcxproj.filters index 3fd4c35925..7106afdaaa 100644 --- a/cocos/2d/libcocos2d.vcxproj.filters +++ b/cocos/2d/libcocos2d.vcxproj.filters @@ -1,4 +1,4 @@ - + @@ -622,6 +622,18 @@ 3d + + renderer + + + renderer + + + renderer + + + renderer + @@ -1264,6 +1276,18 @@ 3d + + renderer + + + renderer + + + renderer + + + renderer + diff --git a/cocos/3d/CCMeshSkin.h b/cocos/3d/CCMeshSkin.h index 160df4c635..bd5ff24245 100644 --- a/cocos/3d/CCMeshSkin.h +++ b/cocos/3d/CCMeshSkin.h @@ -28,6 +28,7 @@ #include #include "3d/CCBundle3DData.h" +#include "3d/CCSkeleton3D.h" #include "base/ccMacros.h" #include "base/CCRef.h" @@ -44,7 +45,7 @@ class Skeleton3D; * MeshSkin, A class maintain a collection of bones that affect Mesh vertex. * And it is responsible for computing matrix palletes that used by skin mesh rendering. */ -class MeshSkin: public Ref +class CC_DLL MeshSkin: public Ref { public: diff --git a/cocos/3d/CCSprite3D.cpp b/cocos/3d/CCSprite3D.cpp index 629c141c30..4d0c39c4aa 100644 --- a/cocos/3d/CCSprite3D.cpp +++ b/cocos/3d/CCSprite3D.cpp @@ -424,4 +424,18 @@ Rect Sprite3D::getBoundingBox() const return ret; } +void Sprite3D::setCullFace(GLenum cullFace) +{ + for (auto& it : _meshCommands) { + it.setCullFace(cullFace); + } +} + +void Sprite3D::setCullFaceEnabled(bool enable) +{ + for (auto& it : _meshCommands) { + it.setCullFaceEnabled(enable); + } +} + NS_CC_END diff --git a/cocos/3d/CCSprite3D.h b/cocos/3d/CCSprite3D.h index 340a6ca9c2..fb47bd3a85 100644 --- a/cocos/3d/CCSprite3D.h +++ b/cocos/3d/CCSprite3D.h @@ -95,6 +95,11 @@ public: */ virtual Rect getBoundingBox() const override; + // set which face is going to cull, GL_BACK, GL_FRONT, GL_FRONT_AND_BACK, default GL_BACK + void setCullFace(GLenum cullFace); + // set cull face enable or not + void setCullFaceEnabled(bool enable); + CC_CONSTRUCTOR_ACCESS: Sprite3D(); diff --git a/cocos/Android.mk b/cocos/Android.mk index 881a944dfe..4b7251eee2 100644 --- a/cocos/Android.mk +++ b/cocos/Android.mk @@ -170,6 +170,10 @@ renderer/CCTextureAtlas.cpp \ renderer/CCTextureCache.cpp \ renderer/ccGLStateCache.cpp \ renderer/ccShaders.cpp \ +renderer/CCVertexIndexBuffer.cpp \ +renderer/CCVertexIndexData.cpp \ +renderer/CCPrimitive.cpp \ +renderer/CCPrimitiveCommand.cpp \ deprecated/CCArray.cpp \ deprecated/CCSet.cpp \ deprecated/CCString.cpp \ diff --git a/cocos/base/CCCamera.cpp b/cocos/base/CCCamera.cpp index d4ee14911d..3cb67e4a46 100644 --- a/cocos/base/CCCamera.cpp +++ b/cocos/base/CCCamera.cpp @@ -33,30 +33,10 @@ Camera* Camera::_visitingCamera = nullptr; Camera* Camera::create() { - Camera* camera = nullptr; - auto size = Director::getInstance()->getWinSize(); - //create default camera - auto projection = Director::getInstance()->getProjection(); - switch (projection) - { - case Director::Projection::_2D: - { - camera = Camera::createOrthographic(size.width, size.height, -1024, 1024); - break; - } - case Director::Projection::_3D: - { - float zeye = Director::getInstance()->getZEye(); - camera = Camera::createPerspective(60, (GLfloat)size.width / size.height, 10, zeye + size.height / 2.0f); - Vec3 eye(size.width/2, size.height/2.0f, zeye), center(size.width/2, size.height/2, 0.0f), up(0.0f, 1.0f, 0.0f); - camera->setPosition3D(eye); - camera->lookAt(center, up); - break; - } - default: - CCLOG("unrecognized projection"); - break; - } + Camera* camera = new Camera(); + camera->initDefault(); + camera->autorelease(); + return camera; } @@ -65,20 +45,7 @@ Camera* Camera::createPerspective(float fieldOfView, float aspectRatio, float ne auto ret = new Camera(); if (ret) { - ret->_fieldOfView = fieldOfView; - ret->_aspectRatio = aspectRatio; - ret->_nearPlane = nearPlane; - ret->_farPlane = farPlane; - Mat4::createPerspective(ret->_fieldOfView, ret->_aspectRatio, ret->_nearPlane, ret->_farPlane, &ret->_projection); -#if CC_TARGET_PLATFORM == CC_PLATFORM_WP8 - //if needed, we need to add a rotation for Landscape orientations on Windows Phone 8 since it is always in Portrait Mode - GLView* view = Director::getInstance()->getOpenGLView(); - if(view != nullptr) - { - setAdditionalProjection(view->getOrientationMatrix()); - } -#endif - ret->_viewProjectionDirty = true; + ret->initPerspective(fieldOfView, aspectRatio, nearPlane, farPlane); ret->autorelease(); return ret; } @@ -91,20 +58,7 @@ Camera* Camera::createOrthographic(float zoomX, float zoomY, float nearPlane, fl auto ret = new Camera(); if (ret) { - ret->_zoom[0] = zoomX; - ret->_zoom[1] = zoomY; - ret->_nearPlane = nearPlane; - ret->_farPlane = farPlane; - Mat4::createOrthographic(ret->_zoom[0], ret->_zoom[1], ret->_nearPlane, ret->_farPlane, &ret->_projection); -#if CC_TARGET_PLATFORM == CC_PLATFORM_WP8 - //if needed, we need to add a rotation for Landscape orientations on Windows Phone 8 since it is always in Portrait Mode - GLView* view = Director::getInstance()->getOpenGLView(); - if(view != nullptr) - { - setAdditionalProjection(view->getOrientationMatrix()); - } -#endif - ret->_viewProjectionDirty = true; + ret->initOrthographic(zoomX, zoomY, nearPlane, farPlane); ret->autorelease(); return ret; } @@ -203,6 +157,76 @@ void Camera::setAdditionalProjection(const Mat4& mat) getViewProjectionMatrix(); } +bool Camera::initDefault() +{ + auto size = Director::getInstance()->getWinSize(); + //create default camera + auto projection = Director::getInstance()->getProjection(); + switch (projection) + { + case Director::Projection::_2D: + { + initOrthographic(size.width, size.height, -1024, 1024); + setPosition3D(Vec3(0.0f, 0.0f, 0.0f)); + setRotation3D(Vec3(0.f, 0.f, 0.f)); + break; + } + case Director::Projection::_3D: + { + float zeye = Director::getInstance()->getZEye(); + initPerspective(60, (GLfloat)size.width / size.height, 10, zeye + size.height / 2.0f); + Vec3 eye(size.width/2, size.height/2.0f, zeye), center(size.width/2, size.height/2, 0.0f), up(0.0f, 1.0f, 0.0f); + setPosition3D(eye); + lookAt(center, up); + break; + } + default: + CCLOG("unrecognized projection"); + break; + } + return true; +} + +bool Camera::initPerspective(float fieldOfView, float aspectRatio, float nearPlane, float farPlane) +{ + _fieldOfView = fieldOfView; + _aspectRatio = aspectRatio; + _nearPlane = nearPlane; + _farPlane = farPlane; + Mat4::createPerspective(_fieldOfView, _aspectRatio, _nearPlane, _farPlane, &_projection); +#if CC_TARGET_PLATFORM == CC_PLATFORM_WP8 + //if needed, we need to add a rotation for Landscape orientations on Windows Phone 8 since it is always in Portrait Mode + GLView* view = Director::getInstance()->getOpenGLView(); + if(view != nullptr) + { + setAdditionalProjection(view->getOrientationMatrix()); + } +#endif + _viewProjectionDirty = true; + + return true; +} + +bool Camera::initOrthographic(float zoomX, float zoomY, float nearPlane, float farPlane) +{ + _zoom[0] = zoomX; + _zoom[1] = zoomY; + _nearPlane = nearPlane; + _farPlane = farPlane; + Mat4::createOrthographicOffCenter(0, _zoom[0], 0, _zoom[1], _nearPlane, _farPlane, &_projection); +#if CC_TARGET_PLATFORM == CC_PLATFORM_WP8 + //if needed, we need to add a rotation for Landscape orientations on Windows Phone 8 since it is always in Portrait Mode + GLView* view = Director::getInstance()->getOpenGLView(); + if(view != nullptr) + { + setAdditionalProjection(view->getOrientationMatrix()); + } +#endif + _viewProjectionDirty = true; + + return true; +} + void Camera::unproject(const Size& viewport, Vec3* src, Vec3* dst) const { assert(dst); diff --git a/cocos/base/CCCamera.h b/cocos/base/CCCamera.h index d65ba3798e..6825b14268 100644 --- a/cocos/base/CCCamera.h +++ b/cocos/base/CCCamera.h @@ -50,6 +50,7 @@ enum class CameraFlag */ class CC_DLL Camera :public Node { + friend class Scene; public: /** * The type of camera. @@ -142,6 +143,11 @@ CC_CONSTRUCTOR_ACCESS: /**set additional matrix for the projection matrix, it multiplys mat to projection matrix when called, used by WP8*/ void setAdditionalProjection(const Mat4& mat); + + /** init camera */ + bool initDefault(); + bool initPerspective(float fieldOfView, float aspectRatio, float nearPlane, float farPlane); + bool initOrthographic(float zoomX, float zoomY, float nearPlane, float farPlane); protected: diff --git a/cocos/base/CCEventTouch.h b/cocos/base/CCEventTouch.h index 412db171a0..52bbbf9a2c 100644 --- a/cocos/base/CCEventTouch.h +++ b/cocos/base/CCEventTouch.h @@ -36,7 +36,7 @@ NS_CC_BEGIN class CC_DLL EventTouch : public Event { public: - static const int MAX_TOUCHES = 5; + static const int MAX_TOUCHES = 15; enum class EventCode { diff --git a/cocos/cocos2d.cpp b/cocos/cocos2d.cpp index d96b55ce20..7e4cb18e48 100644 --- a/cocos/cocos2d.cpp +++ b/cocos/cocos2d.cpp @@ -29,7 +29,7 @@ THE SOFTWARE. NS_CC_BEGIN -const char* cocos2dVersion() +CC_DLL const char* cocos2dVersion() { return "cocos2d-x 3.2"; } diff --git a/cocos/editor-support/cocostudio/CCBone.cpp b/cocos/editor-support/cocostudio/CCBone.cpp index 2b110c9f94..44ff408343 100644 --- a/cocos/editor-support/cocostudio/CCBone.cpp +++ b/cocos/editor-support/cocostudio/CCBone.cpp @@ -201,8 +201,8 @@ void Bone::update(float delta) _worldInfo->y = _tweenData->y + _position.y; _worldInfo->scaleX = _tweenData->scaleX * _scaleX; _worldInfo->scaleY = _tweenData->scaleY * _scaleY; - _worldInfo->skewX = _tweenData->skewX + _skewX + _rotationZ_X; - _worldInfo->skewY = _tweenData->skewY + _skewY - _rotationZ_Y; + _worldInfo->skewX = _tweenData->skewX + _skewX + CC_DEGREES_TO_RADIANS(_rotationZ_X); + _worldInfo->skewY = _tweenData->skewY + _skewY - CC_DEGREES_TO_RADIANS(_rotationZ_Y); if(_parentBone) { diff --git a/cocos/physics/CCPhysicsWorld.cpp b/cocos/physics/CCPhysicsWorld.cpp index be97f220c6..27ed867c47 100644 --- a/cocos/physics/CCPhysicsWorld.cpp +++ b/cocos/physics/CCPhysicsWorld.cpp @@ -879,7 +879,19 @@ void PhysicsWorld::setGravity(const Vect& gravity) _info->setGravity(gravity); } -void PhysicsWorld::update(float delta) +void PhysicsWorld::step(float delta) +{ + if (_autoStep) + { + CCLOG("Physics Warning: You need to close auto step( setAutoStep(false) ) first"); + } + else + { + update(delta, true); + } +} + +void PhysicsWorld::update(float delta, bool userCall/* = false*/) { while (_delayDirty) { @@ -889,16 +901,27 @@ void PhysicsWorld::update(float delta) _delayDirty = !(_delayAddBodies.size() == 0 && _delayRemoveBodies.size() == 0 && _delayAddJoints.size() == 0 && _delayRemoveJoints.size() == 0); } - _updateTime += delta; - if (++_updateRateCount >= _updateRate) + if (userCall) { - _info->step(_updateTime * _speed); + _info->step(delta); for (auto& body : _bodies) { - body->update(_updateTime * _speed); + body->update(delta); + } + } + else + { + _updateTime += delta; + if (++_updateRateCount >= _updateRate) + { + _info->step(_updateTime * _speed); + for (auto& body : _bodies) + { + body->update(_updateTime * _speed); + } + _updateRateCount = 0; + _updateTime = 0.0f; } - _updateRateCount = 0; - _updateTime = 0.0f; } if (_debugDrawMask != DEBUGDRAW_NONE) @@ -916,6 +939,7 @@ PhysicsWorld::PhysicsWorld() , _info(nullptr) , _scene(nullptr) , _delayDirty(false) +, _autoStep(true) , _debugDraw(nullptr) , _debugDrawMask(DEBUGDRAW_NONE) { diff --git a/cocos/physics/CCPhysicsWorld.h b/cocos/physics/CCPhysicsWorld.h index c10ac3cc35..7a9263e153 100644 --- a/cocos/physics/CCPhysicsWorld.h +++ b/cocos/physics/CCPhysicsWorld.h @@ -125,14 +125,18 @@ public: inline Vect getGravity() const { return _gravity; } /** set the gravity value */ void setGravity(const Vect& gravity); - /** Set the speed of physics world, speed is the rate at which the simulation executes. default value is 1.0 */ + /** + * Set the speed of physics world, speed is the rate at which the simulation executes. default value is 1.0 + * Note: if you setAutoStep(false), this won't work. + */ inline void setSpeed(float speed) { if(speed >= 0.0f) { _speed = speed; } } /** get the speed of physics world */ inline float getSpeed() { return _speed; } - /** + /** * set the update rate of physics world, update rate is the value of EngineUpdateTimes/PhysicsWorldUpdateTimes. * set it higher can improve performance, set it lower can improve accuracy of physics world simulation. * default value is 1.0 + * Note: if you setAutoStep(false), this won't work. */ inline void setUpdateRate(int rate) { if(rate > 0) { _updateRate = rate; } } /** get the update rate */ @@ -143,6 +147,20 @@ public: /** get the bebug draw mask */ inline int getDebugDrawMask() { return _debugDrawMask; } + /** + * To control the step of physics, if you want control it by yourself( fixed-timestep for example ), you can set this to false and call step by yourself. + * Defaut value is true. + * Note: if you set auto step to false, setSpeed and setUpdateRate won't work, you need to control the time step by yourself. + */ + void setAutoStep(bool autoStep){ _autoStep = autoStep; } + /** Get the auto step */ + bool isAutoStep() { return _autoStep; } + /** + * The step for physics world, The times passing for simulate the physics. + * Note: you need to setAutoStep(false) first before it can work. + */ + void step(float delta); + protected: static PhysicsWorld* construct(Scene& scene); bool init(Scene& scene); @@ -150,7 +168,7 @@ protected: virtual void addBody(PhysicsBody* body); virtual void addShape(PhysicsShape* shape); virtual void removeShape(PhysicsShape* shape); - virtual void update(float delta); + virtual void update(float delta, bool userCall = false); virtual void debugDraw(); @@ -183,6 +201,7 @@ protected: Scene* _scene; bool _delayDirty; + bool _autoStep; PhysicsDebugDraw* _debugDraw; int _debugDrawMask; diff --git a/cocos/platform/CCGLView.h b/cocos/platform/CCGLView.h index 8f08b438d4..cb0e133702 100644 --- a/cocos/platform/CCGLView.h +++ b/cocos/platform/CCGLView.h @@ -117,11 +117,16 @@ public: */ virtual void setFrameSize(float width, float height); + /** Set and get zoom factor for frame. This two methods are for + debugging big resolution (e.g.new ipad) app on desktop.*/ + virtual void setFrameZoomFactor(float zoomFactor) {} virtual float getFrameZoomFactor() const { return 1.0; } /** Get retina factor */ virtual int getRetinaFactor() const { return 1; } - + + /** only works on ios platform*/ + virtual bool setContentScaleFactor(float scaleFactor) { return false; } virtual float getContentScaleFactor() const { return 1.0; } /** returns whether or not the view is in Retina Display mode */ diff --git a/cocos/platform/desktop/CCGLViewImpl.cpp b/cocos/platform/desktop/CCGLViewImpl.cpp index c61a38f39b..534e52623a 100644 --- a/cocos/platform/desktop/CCGLViewImpl.cpp +++ b/cocos/platform/desktop/CCGLViewImpl.cpp @@ -31,6 +31,7 @@ THE SOFTWARE. #include "base/CCEventMouse.h" #include "base/CCIMEDispatcher.h" #include "base/ccUtils.h" +#include "base/ccUTF8.h" #include @@ -646,15 +647,20 @@ void GLViewImpl::onGLFWKeyCallback(GLFWwindow *window, int key, int scancode, in EventKeyboard event(g_keyCodeMap[key], GLFW_PRESS == action); auto dispatcher = Director::getInstance()->getEventDispatcher(); dispatcher->dispatchEvent(&event); - if (key == GLFW_KEY_BACKSPACE && action == GLFW_PRESS) { - IMEDispatcher::sharedDispatcher()->dispatchDeleteBackward(); - } + } + if (GLFW_RELEASE != action && g_keyCodeMap[key] == EventKeyboard::KeyCode::KEY_BACKSPACE) + { + IMEDispatcher::sharedDispatcher()->dispatchDeleteBackward(); } } void GLViewImpl::onGLFWCharCallback(GLFWwindow *window, unsigned int character) { - IMEDispatcher::sharedDispatcher()->dispatchInsertText((const char*) &character, 1); + char16_t wcharString[2] = { (char16_t) character, 0 }; + std::string utf8String; + + StringUtils::UTF16ToUTF8( wcharString, utf8String ); + IMEDispatcher::sharedDispatcher()->dispatchInsertText( utf8String.c_str(), utf8String.size() ); } void GLViewImpl::onGLFWWindowPosCallback(GLFWwindow *windows, int x, int y) diff --git a/cocos/renderer/CCMeshCommand.cpp b/cocos/renderer/CCMeshCommand.cpp index ad251cb9cc..8b69a7c3b0 100644 --- a/cocos/renderer/CCMeshCommand.cpp +++ b/cocos/renderer/CCMeshCommand.cpp @@ -41,6 +41,12 @@ NS_CC_BEGIN +//render state +static bool s_cullFaceEnabled = false; +static GLenum s_cullFace = 0; +static bool s_depthTestEnabled = false; +static bool s_depthWriteEnabled = false; + MeshCommand::MeshCommand() : _textureID(0) , _blendType(BlendFunc::DISABLE) @@ -86,7 +92,7 @@ void MeshCommand::init(float globalOrder, _primitive = primitive; _indexFormat = indexFormat; _indexCount = indexCount; - _mv = mv; + _mv.set(mv); } void MeshCommand::setCullFaceEnabled(bool enable) @@ -124,35 +130,46 @@ MeshCommand::~MeshCommand() void MeshCommand::applyRenderState() { - if (_cullFaceEnabled) + if (_cullFaceEnabled && !s_cullFaceEnabled) { glEnable(GL_CULL_FACE); - glCullFace(_cullFace); + if (s_cullFace != _cullFace) + { + glCullFace(_cullFace); + s_cullFace = _cullFace; + } + s_cullFaceEnabled = true; } - if (_depthTestEnabled) + if (_depthTestEnabled && !s_depthTestEnabled) { glEnable(GL_DEPTH_TEST); + s_depthTestEnabled = true; } - if (_depthWriteEnabled) + if (_depthWriteEnabled && !s_depthWriteEnabled) { glDepthMask(GL_TRUE); + s_depthWriteEnabled = true; } } void MeshCommand::restoreRenderState() { - if (_cullFaceEnabled) + if (s_cullFaceEnabled) { glDisable(GL_CULL_FACE); + s_cullFaceEnabled = false; } - if (_depthTestEnabled) + if (s_depthTestEnabled) { glDisable(GL_DEPTH_TEST); + s_depthTestEnabled = false; } - if (_depthWriteEnabled) + if (s_depthWriteEnabled) { glDepthMask(GL_FALSE); + s_depthWriteEnabled = false; } + s_cullFace = 0; } void MeshCommand::genMaterialID(GLuint texID, void* glProgramState, void* mesh, const BlendFunc& blend) @@ -177,8 +194,6 @@ void MeshCommand::MatrixPalleteCallBack( GLProgram* glProgram, Uniform* uniform) void MeshCommand::preBatchDraw() { - // set render state - applyRenderState(); // Set material GL::bindTexture2D(_textureID); GL::blendFunc(_blendType.src, _blendType.dst); @@ -198,6 +213,9 @@ void MeshCommand::preBatchDraw() } void MeshCommand::batchDraw() { + // set render state + applyRenderState(); + _glProgramState->setUniformVec4("u_color", _displayColor); if (_matrixPaletteSize && _matrixPalette) diff --git a/cocos/renderer/CCPrimitive.cpp b/cocos/renderer/CCPrimitive.cpp new file mode 100644 index 0000000000..8d0d27f63d --- /dev/null +++ b/cocos/renderer/CCPrimitive.cpp @@ -0,0 +1,108 @@ +/**************************************************************************** + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +#include "renderer/CCPrimitive.h" + +NS_CC_BEGIN + +Primitive* Primitive::create(VertexData* verts, IndexBuffer* indices, int type) +{ + auto result = new (std::nothrow) Primitive(); + if( result && result->init(verts, indices, type)) + { + result->autorelease(); + return result; + } + + CC_SAFE_DELETE(result); + return nullptr; +} + +const VertexData* Primitive::getVertexData() const +{ + return _verts; +} + +const IndexBuffer* Primitive::getIndexData() const +{ + return _indices; +} + +Primitive::Primitive() +: _verts(nullptr) +, _indices(nullptr) +, _type(GL_POINTS) +{ +} + +Primitive::~Primitive() +{ + CC_SAFE_RELEASE_NULL(_verts); + CC_SAFE_RELEASE_NULL(_indices); +} + +bool Primitive::init(VertexData* verts, IndexBuffer* indices, int type) +{ + if( nullptr == verts ) return false; + if(verts != _verts) + { + CC_SAFE_RELEASE(_verts); + CC_SAFE_RETAIN(verts); + _verts = verts; + } + + if(indices != _indices) + { + CC_SAFE_RETAIN(indices); + CC_SAFE_RELEASE(_indices); + _indices = indices; + } + + _type = type; + + return true; +} + +void Primitive::draw() +{ + if(_verts && _indices) + { + _verts->use(); + if(_indices!= nullptr) + { + GLenum type = (_indices->getType() == IndexBuffer::IndexType::INDEX_TYPE_SHORT_16) ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT; + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _indices->getVBO()); + glDrawElements((GLenum)_type, _count, type, (GLvoid*)(_start * _indices->getSizePerIndex())); + } + else + { + glDrawArrays((GLenum)_type, _count, _start); + } + + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); + glBindBuffer(GL_ARRAY_BUFFER, 0); + } +} + +NS_CC_END diff --git a/cocos/renderer/CCPrimitive.h b/cocos/renderer/CCPrimitive.h new file mode 100644 index 0000000000..83d3aef2b3 --- /dev/null +++ b/cocos/renderer/CCPrimitive.h @@ -0,0 +1,67 @@ +/**************************************************************************** + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +#ifndef __CC_PRIMITIVE_H__ +#define __CC_PRIMITIVE_H__ + +#include "renderer/CCVertexIndexData.h" + +NS_CC_BEGIN + +class CC_DLL Primitive : public Ref +{ +public: + static Primitive* create(VertexData* verts, IndexBuffer* indices, int type); + + const VertexData* getVertexData() const; + + const IndexBuffer* getIndexData() const; + + int getType() const { return _type; } + + //called by rendering framework + void draw(); + + int getStart() const { return _start; } + int getCount() const { return _count; } + void setStart(int start) { _start = start; } + void setCount(int count) { _count = count; } + +protected: + Primitive(); + virtual ~Primitive(); + + bool init(VertexData* verts, IndexBuffer* indices, int type); + +protected: + VertexData* _verts; + IndexBuffer* _indices; + int _start; + int _count; + int _type; +}; + +NS_CC_END + +#endif //__CC_PRIMITIVE_H__ diff --git a/cocos/renderer/CCPrimitiveCommand.cpp b/cocos/renderer/CCPrimitiveCommand.cpp new file mode 100644 index 0000000000..69d6ade233 --- /dev/null +++ b/cocos/renderer/CCPrimitiveCommand.cpp @@ -0,0 +1,82 @@ +/**************************************************************************** + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +#include "renderer/CCPrimitiveCommand.h" + +#include "renderer/ccGLStateCache.h" +#include "renderer/CCGLProgram.h" +#include "renderer/CCGLProgramState.h" +#include "xxhash.h" + +NS_CC_BEGIN + +PrimitiveCommand::PrimitiveCommand() +: _materialID(0) +, _textureID(0) +, _glProgramState(nullptr) +, _blendType(BlendFunc::DISABLE) +, _primitive(nullptr) +{ + _type = RenderCommand::Type::PRIMITIVE_COMMAND; +} + +PrimitiveCommand::~PrimitiveCommand() +{ +} + +void PrimitiveCommand::init(float globalOrder, GLuint textureID, GLProgramState* glProgramState, BlendFunc blendType, Primitive* primitive,const Mat4& mv) +{ + CCASSERT(glProgramState, "Invalid GLProgramState"); + CCASSERT(glProgramState->getVertexAttribsFlags() == 0, "No custom attributes are supported in PrimitiveCommand"); + CCASSERT(primitive != nullptr, "Could not render null primitive"); + + _globalOrder = globalOrder; + + _primitive = primitive; + + _mv = mv; + + if( _textureID != textureID || _blendType.src != blendType.src || _blendType.dst != blendType.dst || _glProgramState != glProgramState) { + + _textureID = textureID; + _blendType = blendType; + _glProgramState = glProgramState; + + } +} + +void PrimitiveCommand::execute() const +{ + //Set texture + GL::bindTexture2D(_textureID); + + //set blend mode + GL::blendFunc(_blendType.src, _blendType.dst); + + _glProgramState->apply(_mv); + + _primitive->draw(); +} + +NS_CC_END diff --git a/cocos/renderer/CCPrimitiveCommand.h b/cocos/renderer/CCPrimitiveCommand.h new file mode 100644 index 0000000000..402ffdbca9 --- /dev/null +++ b/cocos/renderer/CCPrimitiveCommand.h @@ -0,0 +1,60 @@ +/**************************************************************************** + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +#ifndef _CC_PRIMITIVE_COMMAND_H__ +#define _CC_PRIMITIVE_COMMAND_H__ + +#include "renderer/CCPrimitive.h" +#include "renderer/CCRenderCommand.h" + +NS_CC_BEGIN +class GLProgramState; +class CC_DLL PrimitiveCommand : public RenderCommand +{ +public: + PrimitiveCommand(); + ~PrimitiveCommand(); + + void init(float globalOrder, GLuint textureID, GLProgramState* glProgramState, BlendFunc blendType, Primitive* primitive,const Mat4& mv); + + inline uint32_t getMaterialID() const { return _materialID; } + inline GLuint getTextureID() const { return _textureID; } + inline GLProgramState* getGLProgramState() const { return _glProgramState; } + inline BlendFunc getBlendType() const { return _blendType; } + inline const Mat4& getModelView() const { return _mv; } + + void execute() const; +protected: + + uint32_t _materialID; + GLuint _textureID; + GLProgramState* _glProgramState; + BlendFunc _blendType; + Primitive* _primitive; + Mat4 _mv; +}; + +NS_CC_END + +#endif //_CC_PRIMITIVE_COMMAND_H__ diff --git a/cocos/renderer/CCRenderCommand.h b/cocos/renderer/CCRenderCommand.h index 22ebd6095f..77332e01b0 100644 --- a/cocos/renderer/CCRenderCommand.h +++ b/cocos/renderer/CCRenderCommand.h @@ -49,6 +49,7 @@ public: BATCH_COMMAND, GROUP_COMMAND, MESH_COMMAND, + PRIMITIVE_COMMAND, }; /** Get Render Command Id */ diff --git a/cocos/renderer/CCRenderer.cpp b/cocos/renderer/CCRenderer.cpp index b7c9b47e23..2eca2d9ead 100644 --- a/cocos/renderer/CCRenderer.cpp +++ b/cocos/renderer/CCRenderer.cpp @@ -30,6 +30,7 @@ #include "renderer/CCBatchCommand.h" #include "renderer/CCCustomCommand.h" #include "renderer/CCGroupCommand.h" +#include "renderer/CCPrimitiveCommand.h" #include "renderer/CCGLProgramCache.h" #include "renderer/ccGLStateCache.h" #include "renderer/CCMeshCommand.h" @@ -321,6 +322,12 @@ void Renderer::visitRenderQueue(const RenderQueue& queue) auto cmd = static_cast(command); cmd->execute(); } + else if(RenderCommand::Type::PRIMITIVE_COMMAND == commandType) + { + flush(); + auto cmd = static_cast(command); + cmd->execute(); + } else if (RenderCommand::Type::MESH_COMMAND == commandType) { flush2D(); diff --git a/cocos/renderer/CCVertexIndexBuffer.cpp b/cocos/renderer/CCVertexIndexBuffer.cpp new file mode 100644 index 0000000000..5fdd9f31b6 --- /dev/null +++ b/cocos/renderer/CCVertexIndexBuffer.cpp @@ -0,0 +1,314 @@ +/**************************************************************************** + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +#include "renderer/CCVertexIndexBuffer.h" +#include "base/CCEventType.h" +#include "base/CCEventListenerCustom.h" + +NS_CC_BEGIN + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) +bool VertexBuffer::_enableShadowCopy = true; +#else +bool VertexBuffer::_enableShadowCopy = false; +#endif + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) +bool IndexBuffer::_enableShadowCopy = true; +#else +bool IndexBuffer::_enableShadowCopy = false; +#endif + +VertexBuffer* VertexBuffer::create(int sizePerVertex, int vertexNumber) +{ + auto result = new (std::nothrow) VertexBuffer(); + if(result && result->init(sizePerVertex, vertexNumber)) + { + result->autorelease(); + return result; + } + CC_SAFE_DELETE(result); + return nullptr; + +} + +VertexBuffer::VertexBuffer() +: _vbo(0) +, _vertexNumber(0) +, _sizePerVertex(0) +{ + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) + Director::getInstance()->getEventDispatcher()->addCustomEventListener(EVENT_COME_TO_BACKGROUND, CC_CALLBACK_1(VertexBuffer::listenToBackground, this)); + +#endif +} + +VertexBuffer::~VertexBuffer() +{ + if(glIsBuffer(_vbo)) + { + glDeleteBuffers(1, &_vbo); + _vbo = 0; + } +} + +bool VertexBuffer::init(int sizePerVertex, int vertexNumber) +{ + if(0 == sizePerVertex || 0 == vertexNumber) + return false; + _sizePerVertex = sizePerVertex; + _vertexNumber = vertexNumber; + + if(isShadowCopyEnabled()) + { + _shadowCopy.resize(sizePerVertex * _vertexNumber); + } + + glGenBuffers(1, &_vbo); + glBindBuffer(GL_ARRAY_BUFFER, _vbo); + glBufferData(GL_ARRAY_BUFFER, getSize(), nullptr, GL_STATIC_DRAW); + glBindBuffer(GL_ARRAY_BUFFER, 0); + return true; +} + +int VertexBuffer::getSizePerVertex() const +{ + return _sizePerVertex; +} + +int VertexBuffer::getVertexNumber() const +{ + return _vertexNumber; +} + +bool VertexBuffer::updateVertices(const void* verts, int count, int begin) +{ + if(count <= 0 || nullptr == verts) return false; + + if(begin < 0) + { + CCLOGERROR("Update vertices with begin = %d, will set begin to 0", begin); + begin = 0; + } + + if(count + begin > _vertexNumber) + { + CCLOGERROR("updated vertices exceed the max size of vertex buffer, will set count to _vertexNumber-begin"); + count = _vertexNumber - begin; + } + + if(isShadowCopyEnabled()) + { + memcpy(&_shadowCopy[begin * _sizePerVertex], verts, count * _sizePerVertex); + } + + glBindBuffer(GL_ARRAY_BUFFER, _vbo); + glBufferSubData(GL_ARRAY_BUFFER, begin * _sizePerVertex, count * _sizePerVertex, verts); + glBindBuffer(GL_ARRAY_BUFFER, 0); + + return true; +} + +void VertexBuffer::listenToBackground(EventCustom *event) +{ + if(glIsBuffer(_vbo)) + { + glDeleteBuffers(1, &_vbo); + _vbo = 0; + } +} + +GLuint VertexBuffer::getVBO() const +{ + if(0 == _vbo) + { + recreateVBO(); + } + return _vbo; +} + +void VertexBuffer::recreateVBO() const +{ + CCLOG("come to foreground of VertexBuffer"); + glGenBuffers(1, &_vbo); + glBindBuffer(GL_ARRAY_BUFFER, _vbo); + const void* buffer = nullptr; + if(isShadowCopyEnabled()) + { + buffer = &_shadowCopy[0]; + } + + glBufferData(GL_ARRAY_BUFFER, _sizePerVertex * _vertexNumber, buffer, GL_STATIC_DRAW); + glBindBuffer(GL_ARRAY_BUFFER, 0); + if(!glIsBuffer(_vbo)) + { + CCLOGERROR("recreate VertexBuffer Error"); + } +} + +int VertexBuffer::getSize() const +{ + return _sizePerVertex * _vertexNumber; +} + +IndexBuffer* IndexBuffer::create(IndexType type, int number) +{ + auto result = new (std::nothrow) IndexBuffer(); + if(result && result->init(type, number)) + { + result->autorelease(); + return result; + } + CC_SAFE_DELETE(result); + return nullptr; +} + +IndexBuffer::IndexBuffer() +: _vbo(0) +, _type(IndexType::INDEX_TYPE_SHORT_16) +, _indexNumber(0) +{ +#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) + Director::getInstance()->getEventDispatcher()->addCustomEventListener(EVENT_COME_TO_BACKGROUND, CC_CALLBACK_1(IndexBuffer::listenToBackground, this)); + +#endif +} + +IndexBuffer::~IndexBuffer() +{ + if(glIsBuffer(_vbo)) + { + glDeleteBuffers(1, &_vbo); + _vbo = 0; + } +} + +bool IndexBuffer::init(IndexBuffer::IndexType type, int number) +{ + if(number <=0 ) return false; + + _type = type; + _indexNumber = number; + + glGenBuffers(1, &_vbo); + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _vbo); + glBufferData(GL_ELEMENT_ARRAY_BUFFER, getSize(), nullptr, GL_STATIC_DRAW); + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); + + if(isShadowCopyEnabled()) + { + _shadowCopy.resize(getSize()); + } + + return true; +} + +IndexBuffer::IndexType IndexBuffer::getType() const +{ + return _type; +} + +int IndexBuffer::getSizePerIndex() const +{ + return IndexType::INDEX_TYPE_SHORT_16 == _type ? 2 : 4; +} + +int IndexBuffer::getIndexNumber() const +{ + return _indexNumber; +} + +bool IndexBuffer::updateIndices(const void* indices, int count, int begin) +{ + if(count <= 0 || nullptr == indices) return false; + + if(begin < 0) + { + CCLOGERROR("Update indices with begin = %d, will set begin to 0", begin); + begin = 0; + } + + if(count + begin > _indexNumber) + { + CCLOGERROR("updated indices exceed the max size of vertex buffer, will set count to _indexNumber-begin"); + count = _indexNumber - begin; + } + + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _vbo); + glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, begin * getSizePerIndex(), count * getSizePerIndex(), indices); + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); + + if(isShadowCopyEnabled()) + { + memcpy(&_shadowCopy[begin * getSizePerIndex()], indices, count * getSizePerIndex()); + } + + return true; +} + +int IndexBuffer::getSize() const +{ + return getSizePerIndex() * _indexNumber; +} + +void IndexBuffer::listenToBackground(EventCustom *event) +{ + if(glIsBuffer(_vbo)) + { + glDeleteBuffers(1, &_vbo); + _vbo = 0; + } +} + +GLuint IndexBuffer::getVBO() const +{ + if(0 == _vbo) + { + recreateVBO(); + } + + return _vbo; +} + +void IndexBuffer::recreateVBO() const +{ + CCLOG("come to foreground of IndexBuffer"); + glGenBuffers(1, &_vbo); + glBindBuffer(GL_ARRAY_BUFFER, _vbo); + const void* buffer = nullptr; + if(isShadowCopyEnabled()) + { + buffer = &_shadowCopy[0]; + } + + glBufferData(GL_ARRAY_BUFFER, getSize(), buffer, GL_STATIC_DRAW); + glBindBuffer(GL_ARRAY_BUFFER, 0); + if(!glIsBuffer(_vbo)) + { + CCLOGERROR("recreate IndexBuffer Error"); + } +} + +NS_CC_END diff --git a/cocos/renderer/CCVertexIndexBuffer.h b/cocos/renderer/CCVertexIndexBuffer.h new file mode 100644 index 0000000000..3c38af4422 --- /dev/null +++ b/cocos/renderer/CCVertexIndexBuffer.h @@ -0,0 +1,117 @@ +/**************************************************************************** + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +#ifndef __CC_VERTEX_INDEX_BUFFER_H__ +#define __CC_VERTEX_INDEX_BUFFER_H__ + +#include "base/CCRef.h" +#include "base/CCDirector.h" + +NS_CC_BEGIN + +class CC_DLL VertexBuffer : public Ref +{ +public: + static VertexBuffer* create(int sizePerVertex, int vertexNumber); + + int getSizePerVertex() const; + int getVertexNumber() const; + bool updateVertices(const void* verts, int count, int begin); + + int getSize() const; + + GLuint getVBO() const; + +protected: + VertexBuffer(); + virtual ~VertexBuffer(); + + bool init(int sizePerVertex, int vertexNumber); +protected: + //event listener for foreground and background + void listenToBackground(EventCustom *event); + void recreateVBO() const; +protected: + mutable GLuint _vbo; + int _sizePerVertex; + int _vertexNumber; + //buffer used for shadow copy + std::vector _shadowCopy; +protected: + static bool _enableShadowCopy; +public: + static bool isShadowCopyEnabled() { return _enableShadowCopy; } + static void enableShadowCopy(bool enabled) { _enableShadowCopy = enabled; } +}; + +class CC_DLL IndexBuffer : public Ref +{ +public: + enum class IndexType + { + INDEX_TYPE_SHORT_16, + INDEX_TYPE_UINT_32 + }; + +public: + static IndexBuffer* create(IndexType type, int number); + + IndexType getType() const; + int getSizePerIndex() const; + int getIndexNumber() const; + bool updateIndices(const void* indices, int count, int begin); + + int getSize() const; + + GLuint getVBO() const; + +protected: + IndexBuffer(); + virtual ~IndexBuffer(); + + bool init(IndexType type, int number); + +protected: + mutable GLuint _vbo; + IndexType _type; + int _indexNumber; + +protected: + //event listener for foreground and background + void listenToBackground(EventCustom *event); + void recreateVBO() const; + + //buffer used for shadow copy + std::vector _shadowCopy; +protected: + static bool _enableShadowCopy; +public: + static bool isShadowCopyEnabled() { return _enableShadowCopy; } + static void enableShadowCopy(bool enabled) { _enableShadowCopy = enabled; } +}; + + +NS_CC_END + +#endif /* __CC_VERTEX_INDEX_BUFFER_H__*/ diff --git a/cocos/renderer/CCVertexIndexData.cpp b/cocos/renderer/CCVertexIndexData.cpp new file mode 100644 index 0000000000..068230e455 --- /dev/null +++ b/cocos/renderer/CCVertexIndexData.cpp @@ -0,0 +1,132 @@ +/**************************************************************************** + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +#include "renderer/CCVertexIndexData.h" +NS_CC_BEGIN + +VertexData* VertexData::create() +{ + VertexData* result = new (std::nothrow) VertexData(); + if(result) + { + result->autorelease(); + return result; + } + + CC_SAFE_DELETE(result); + return nullptr; +} + +size_t VertexData::getVertexStreamCount() const +{ + return _vertexStreams.size(); +} + +bool VertexData::setStream(VertexBuffer* buffer, const VertexStreamAttribute& stream) +{ + if( buffer == nullptr ) return false; + auto iter = _vertexStreams.find(stream._semantic); + if(iter == _vertexStreams.end()) + { + buffer->retain(); + auto& bufferAttribute = _vertexStreams[stream._semantic]; + bufferAttribute._buffer = buffer; + bufferAttribute._stream = stream; + } + else + { + buffer->retain(); + iter->second._buffer->release(); + iter->second._stream = stream; + iter->second._buffer = buffer; + } + + return true; +} + +void VertexData::removeStream(int semantic) +{ + auto iter = _vertexStreams.find(semantic); + if(iter != _vertexStreams.end()) + { + iter->second._buffer->release(); + _vertexStreams.erase(iter); + } +} + +const VertexStreamAttribute* VertexData::getStreamAttribute(int semantic) const +{ + auto iter = _vertexStreams.find(semantic); + if(iter == _vertexStreams.end()) return nullptr; + else return &iter->second._stream; +} + +VertexStreamAttribute* VertexData::getStreamAttribute(int semantic) +{ + auto iter = _vertexStreams.find(semantic); + if(iter == _vertexStreams.end()) return nullptr; + else return &iter->second._stream; +} + +VertexBuffer* VertexData::getStreamBuffer(int semantic) const +{ + auto iter = _vertexStreams.find(semantic); + if(iter == _vertexStreams.end()) return nullptr; + else return iter->second._buffer; +} + +VertexData::VertexData() +{ + +} + +VertexData::~VertexData() +{ + for(auto& element : _vertexStreams) + { + element.second._buffer->release(); + } + _vertexStreams.clear(); +} + +void VertexData::use() +{ + uint32_t flags(0); + for(auto& element : _vertexStreams) + { + flags = flags | (1 << element.second._stream._semantic); + } + + GL::enableVertexAttribs(flags); + + for(auto& element : _vertexStreams) + { + //glEnableVertexAttribArray((GLint)element.second._stream._semantic); + glBindBuffer(GL_ARRAY_BUFFER, element.second._buffer->getVBO()); + glVertexAttribPointer(GLint(element.second._stream._semantic),element.second._stream._size, + element.second._stream._type,element.second._stream._normalize, element.second._buffer->getSizePerVertex(), (GLvoid*)element.second._stream._offset); + } +} + +NS_CC_END diff --git a/cocos/renderer/CCVertexIndexData.h b/cocos/renderer/CCVertexIndexData.h new file mode 100644 index 0000000000..7af66da4cc --- /dev/null +++ b/cocos/renderer/CCVertexIndexData.h @@ -0,0 +1,90 @@ +/**************************************************************************** + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +#ifndef __CC_VERTEX_INDEX_DATA_H__ +#define __CC_VERTEX_INDEX_DATA_H__ + +#include "base/CCRef.h" +#include "renderer/CCVertexIndexBuffer.h" +#include "base/CCMap.h" +#include + +NS_CC_BEGIN + +class VertexBuffer; + +struct CC_DLL VertexStreamAttribute +{ + VertexStreamAttribute() + : _offset(0),_semantic(0),_type(0),_size(0), _normalize(false) + { + } + + VertexStreamAttribute(int offset, int semantic, int type, int size) + : _offset(offset),_semantic(semantic),_type(type),_size(size), _normalize(false) + { + } + + VertexStreamAttribute(int offset, int semantic, int type, int size, bool normalize) + : _offset(offset),_semantic(semantic),_type(type),_size(size), _normalize(normalize) + { + } + + bool _normalize; + int _offset; + int _semantic; + int _type; + int _size; +}; + +class CC_DLL VertexData : public Ref +{ +public: + static VertexData* create(); + + size_t getVertexStreamCount() const; + bool setStream(VertexBuffer* buffer, const VertexStreamAttribute& stream); + void removeStream(int semantic); + const VertexStreamAttribute* getStreamAttribute(int semantic) const; + VertexStreamAttribute* getStreamAttribute(int semantic); + + VertexBuffer* getStreamBuffer(int semantic) const; + + void use(); +protected: + VertexData(); + virtual ~VertexData(); +protected: + struct BufferAttribute + { + VertexBuffer* _buffer; + VertexStreamAttribute _stream; + }; + + std::map _vertexStreams; +}; + +NS_CC_END + +#endif //__CC_VERTEX_INDEX_DATA_H__ diff --git a/cocos/renderer/CMakeLists.txt b/cocos/renderer/CMakeLists.txt index fd794aa25d..4e02154825 100644 --- a/cocos/renderer/CMakeLists.txt +++ b/cocos/renderer/CMakeLists.txt @@ -15,4 +15,8 @@ set(COCOS_RENDERER_SRC renderer/CCTexture2D.cpp renderer/CCTextureAtlas.cpp renderer/CCTextureCache.cpp + renderer/CCVertexIndexBuffer.cpp + renderer/CCVertexIndexData.cpp + renderer/CCPrimitive.cpp + renderer/CCPrimitiveCommand.cpp ) diff --git a/cocos/scripting/lua-bindings/auto/api/GLView.lua b/cocos/scripting/lua-bindings/auto/api/GLView.lua index 9471789098..1fa8ba7aae 100644 --- a/cocos/scripting/lua-bindings/auto/api/GLView.lua +++ b/cocos/scripting/lua-bindings/auto/api/GLView.lua @@ -15,6 +15,12 @@ -- @param self -- @return rect_table#rect_table ret (return value: rect_table) +-------------------------------- +-- @function [parent=#GLView] setContentScaleFactor +-- @param self +-- @param #float float +-- @return bool#bool ret (return value: bool) + -------------------------------- -- @function [parent=#GLView] getContentScaleFactor -- @param self @@ -67,6 +73,11 @@ -- @param self -- @return size_table#size_table ret (return value: size_table) +-------------------------------- +-- @function [parent=#GLView] setFrameZoomFactor +-- @param self +-- @param #float float + -------------------------------- -- @function [parent=#GLView] getFrameZoomFactor -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsWorld.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsWorld.lua index df5c6d9783..6c16ea6dc4 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsWorld.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsWorld.lua @@ -4,9 +4,9 @@ -- @parent_module cc -------------------------------- --- @function [parent=#PhysicsWorld] getGravity +-- @function [parent=#PhysicsWorld] setGravity -- @param self --- @return vec2_table#vec2_table ret (return value: vec2_table) +-- @param #vec2_table vec2 -------------------------------- -- @function [parent=#PhysicsWorld] getAllBodies @@ -14,14 +14,28 @@ -- @return array_table#array_table ret (return value: array_table) -------------------------------- --- @function [parent=#PhysicsWorld] setGravity +-- @function [parent=#PhysicsWorld] getDebugDrawMask -- @param self --- @param #vec2_table vec2 +-- @return int#int ret (return value: int) -------------------------------- --- @function [parent=#PhysicsWorld] getSpeed +-- @function [parent=#PhysicsWorld] setAutoStep -- @param self --- @return float#float ret (return value: float) +-- @param #bool bool + +-------------------------------- +-- @function [parent=#PhysicsWorld] addJoint +-- @param self +-- @param #cc.PhysicsJoint physicsjoint + +-------------------------------- +-- @function [parent=#PhysicsWorld] removeAllJoints +-- @param self + +-------------------------------- +-- @function [parent=#PhysicsWorld] isAutoStep +-- @param self +-- @return bool#bool ret (return value: bool) -------------------------------- -- @overload self, int @@ -36,16 +50,6 @@ -- @param #cc.PhysicsJoint physicsjoint -- @param #bool bool --------------------------------- --- @function [parent=#PhysicsWorld] getUpdateRate --- @param self --- @return int#int ret (return value: int) - --------------------------------- --- @function [parent=#PhysicsWorld] setSpeed --- @param self --- @param #float float - -------------------------------- -- @function [parent=#PhysicsWorld] getShapes -- @param self @@ -53,8 +57,43 @@ -- @return array_table#array_table ret (return value: array_table) -------------------------------- --- @function [parent=#PhysicsWorld] removeAllJoints +-- @function [parent=#PhysicsWorld] step -- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#PhysicsWorld] setDebugDrawMask +-- @param self +-- @param #int int + +-------------------------------- +-- @function [parent=#PhysicsWorld] getGravity +-- @param self +-- @return vec2_table#vec2_table ret (return value: vec2_table) + +-------------------------------- +-- @function [parent=#PhysicsWorld] setUpdateRate +-- @param self +-- @param #int int + +-------------------------------- +-- @function [parent=#PhysicsWorld] getSpeed +-- @param self +-- @return float#float ret (return value: float) + +-------------------------------- +-- @function [parent=#PhysicsWorld] getUpdateRate +-- @param self +-- @return int#int ret (return value: int) + +-------------------------------- +-- @function [parent=#PhysicsWorld] removeAllBodies +-- @param self + +-------------------------------- +-- @function [parent=#PhysicsWorld] setSpeed +-- @param self +-- @param #float float -------------------------------- -- @function [parent=#PhysicsWorld] getShape @@ -62,34 +101,10 @@ -- @param #vec2_table vec2 -- @return PhysicsShape#PhysicsShape ret (return value: cc.PhysicsShape) --------------------------------- --- @function [parent=#PhysicsWorld] removeAllBodies --- @param self - --------------------------------- --- @function [parent=#PhysicsWorld] getDebugDrawMask --- @param self --- @return int#int ret (return value: int) - --------------------------------- --- @function [parent=#PhysicsWorld] setDebugDrawMask --- @param self --- @param #int int - -------------------------------- -- @function [parent=#PhysicsWorld] getBody -- @param self -- @param #int int -- @return PhysicsBody#PhysicsBody ret (return value: cc.PhysicsBody) --------------------------------- --- @function [parent=#PhysicsWorld] setUpdateRate --- @param self --- @param #int int - --------------------------------- --- @function [parent=#PhysicsWorld] addJoint --- @param self --- @param #cc.PhysicsJoint physicsjoint - return nil diff --git a/cocos/scripting/lua-bindings/auto/api/RenderTexture.lua b/cocos/scripting/lua-bindings/auto/api/RenderTexture.lua index 4717d8015e..661a25c17e 100644 --- a/cocos/scripting/lua-bindings/auto/api/RenderTexture.lua +++ b/cocos/scripting/lua-bindings/auto/api/RenderTexture.lua @@ -65,13 +65,14 @@ -- @param self -------------------------------- --- @overload self, string, int, bool --- @overload self, string, bool +-- @overload self, string, int, bool, function +-- @overload self, string, bool, function -- @function [parent=#RenderTexture] saveToFile -- @param self -- @param #string str -- @param #int format -- @param #bool bool +-- @param #function func -- @return bool#bool ret (retunr value: bool) -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/Skeleton3D.lua b/cocos/scripting/lua-bindings/auto/api/Skeleton3D.lua new file mode 100644 index 0000000000..ae57f8f9c1 --- /dev/null +++ b/cocos/scripting/lua-bindings/auto/api/Skeleton3D.lua @@ -0,0 +1,51 @@ + +-------------------------------- +-- @module Skeleton3D +-- @extend Ref +-- @parent_module cc + +-------------------------------- +-- @function [parent=#Skeleton3D] getBoneByName +-- @param self +-- @param #string str +-- @return Bone3D#Bone3D ret (return value: cc.Bone3D) + +-------------------------------- +-- @function [parent=#Skeleton3D] getRootBone +-- @param self +-- @return Bone3D#Bone3D ret (return value: cc.Bone3D) + +-------------------------------- +-- @function [parent=#Skeleton3D] updateBoneMatrix +-- @param self + +-------------------------------- +-- @function [parent=#Skeleton3D] getBoneByIndex +-- @param self +-- @param #unsigned int int +-- @return Bone3D#Bone3D ret (return value: cc.Bone3D) + +-------------------------------- +-- @function [parent=#Skeleton3D] setRootBone +-- @param self +-- @param #cc.Bone3D bone3d + +-------------------------------- +-- @function [parent=#Skeleton3D] getBoneIndex +-- @param self +-- @param #cc.Bone3D bone3d +-- @return int#int ret (return value: int) + +-------------------------------- +-- @function [parent=#Skeleton3D] getBoneCount +-- @param self +-- @return long#long ret (return value: long) + +-------------------------------- +-- @function [parent=#Skeleton3D] create +-- @param self +-- @param #string str +-- @param #string str +-- @return Skeleton3D#Skeleton3D ret (return value: cc.Skeleton3D) + +return nil diff --git a/cocos/scripting/lua-bindings/auto/api/Sprite3D.lua b/cocos/scripting/lua-bindings/auto/api/Sprite3D.lua index 52a51e7248..62dd9dcdd1 100644 --- a/cocos/scripting/lua-bindings/auto/api/Sprite3D.lua +++ b/cocos/scripting/lua-bindings/auto/api/Sprite3D.lua @@ -4,6 +4,11 @@ -- @extend Node,BlendProtocol -- @parent_module cc +-------------------------------- +-- @function [parent=#Sprite3D] setCullFaceEnabled +-- @param self +-- @param #bool bool + -------------------------------- -- @overload self, cc.Texture2D -- @overload self, string @@ -30,6 +35,11 @@ -- @param self -- @return BlendFunc#BlendFunc ret (return value: cc.BlendFunc) +-------------------------------- +-- @function [parent=#Sprite3D] setCullFace +-- @param self +-- @param #unsigned int int + -------------------------------- -- @function [parent=#Sprite3D] removeAttachNode -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TextField.lua b/cocos/scripting/lua-bindings/auto/api/TextField.lua index b2c82a059d..c4e22b25bc 100644 --- a/cocos/scripting/lua-bindings/auto/api/TextField.lua +++ b/cocos/scripting/lua-bindings/auto/api/TextField.lua @@ -19,6 +19,11 @@ -- @param self -- @return string#string ret (return value: string) +-------------------------------- +-- @function [parent=#TextField] setPasswordStyleText +-- @param self +-- @param #char char + -------------------------------- -- @function [parent=#TextField] getDeleteBackward -- @param self @@ -92,6 +97,11 @@ -- @param self -- @param #bool bool +-------------------------------- +-- @function [parent=#TextField] getPlaceHolderColor +-- @param self +-- @return color4b_table#color4b_table ret (return value: color4b_table) + -------------------------------- -- @function [parent=#TextField] getPasswordStyleText -- @param self @@ -103,9 +113,9 @@ -- @param #bool bool -------------------------------- --- @function [parent=#TextField] setPasswordStyleText +-- @function [parent=#TextField] isPasswordEnabled -- @param self --- @param #char char +-- @return bool#bool ret (return value: bool) -------------------------------- -- @function [parent=#TextField] setDeleteBackward @@ -123,15 +133,22 @@ -- @param #string str -------------------------------- --- @function [parent=#TextField] isPasswordEnabled +-- @overload self, color4b_table +-- @overload self, color3b_table +-- @function [parent=#TextField] setPlaceHolderColor -- @param self --- @return bool#bool ret (return value: bool) - +-- @param #color3b_table color3b + -------------------------------- -- @function [parent=#TextField] setTextHorizontalAlignment -- @param self -- @param #int texthalignment +-------------------------------- +-- @function [parent=#TextField] setTextColor +-- @param self +-- @param #color4b_table color4b + -------------------------------- -- @function [parent=#TextField] getMaxLength -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua b/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua index 2656af7e64..1a9c6ff721 100644 --- a/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua +++ b/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua @@ -1216,6 +1216,11 @@ -- @field [parent=#cc] Mesh#Mesh Mesh preloaded module +-------------------------------------------------------- +-- the cc Skeleton3D +-- @field [parent=#cc] Skeleton3D#Skeleton3D Skeleton3D preloaded module + + -------------------------------------------------------- -- the cc Animation3D -- @field [parent=#cc] Animation3D#Animation3D Animation3D preloaded module diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp index 098b261d26..44115b5555 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp @@ -11932,6 +11932,53 @@ int lua_cocos2dx_GLView_getViewPortRect(lua_State* tolua_S) return 0; } +int lua_cocos2dx_GLView_setContentScaleFactor(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_setContentScaleFactor'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + double arg0; + + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.GLView:setContentScaleFactor"); + if(!ok) + return 0; + bool ret = cobj->setContentScaleFactor(arg0); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:setContentScaleFactor",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_setContentScaleFactor'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_GLView_getContentScaleFactor(lua_State* tolua_S) { int argc = 0; @@ -12384,6 +12431,52 @@ int lua_cocos2dx_GLView_getFrameSize(lua_State* tolua_S) return 0; } +int lua_cocos2dx_GLView_setFrameZoomFactor(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_setFrameZoomFactor'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + double arg0; + + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.GLView:setFrameZoomFactor"); + if(!ok) + return 0; + cobj->setFrameZoomFactor(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:setFrameZoomFactor",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_setFrameZoomFactor'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_GLView_getFrameZoomFactor(lua_State* tolua_S) { int argc = 0; @@ -13077,6 +13170,7 @@ int lua_register_cocos2dx_GLView(lua_State* tolua_S) tolua_beginmodule(tolua_S,"GLView"); tolua_function(tolua_S,"setFrameSize",lua_cocos2dx_GLView_setFrameSize); tolua_function(tolua_S,"getViewPortRect",lua_cocos2dx_GLView_getViewPortRect); + tolua_function(tolua_S,"setContentScaleFactor",lua_cocos2dx_GLView_setContentScaleFactor); tolua_function(tolua_S,"getContentScaleFactor",lua_cocos2dx_GLView_getContentScaleFactor); tolua_function(tolua_S,"setIMEKeyboardState",lua_cocos2dx_GLView_setIMEKeyboardState); tolua_function(tolua_S,"setScissorInPoints",lua_cocos2dx_GLView_setScissorInPoints); @@ -13087,6 +13181,7 @@ int lua_register_cocos2dx_GLView(lua_State* tolua_S) tolua_function(tolua_S,"getScaleX",lua_cocos2dx_GLView_getScaleX); tolua_function(tolua_S,"getVisibleOrigin",lua_cocos2dx_GLView_getVisibleOrigin); tolua_function(tolua_S,"getFrameSize",lua_cocos2dx_GLView_getFrameSize); + tolua_function(tolua_S,"setFrameZoomFactor",lua_cocos2dx_GLView_setFrameZoomFactor); tolua_function(tolua_S,"getFrameZoomFactor",lua_cocos2dx_GLView_getFrameZoomFactor); tolua_function(tolua_S,"getDesignResolutionSize",lua_cocos2dx_GLView_getDesignResolutionSize); tolua_function(tolua_S,"windowShouldClose",lua_cocos2dx_GLView_windowShouldClose); @@ -48103,6 +48198,34 @@ int lua_cocos2dx_RenderTexture_saveToFile(lua_State* tolua_S) } }while(0); ok = true; + do{ + if (argc == 4) { + std::string arg0; + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.RenderTexture:saveToFile"); + + if (!ok) { break; } + cocos2d::Image::Format arg1; + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.RenderTexture:saveToFile"); + + if (!ok) { break; } + bool arg2; + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.RenderTexture:saveToFile"); + + if (!ok) { break; } + std::function &)> arg3; + do { + // Lambda binding for lua is not supported. + assert(false); + } while(0) + ; + + if (!ok) { break; } + bool ret = cobj->saveToFile(arg0, arg1, arg2, arg3); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + }while(0); + ok = true; do{ if (argc == 1) { std::string arg0; @@ -48131,6 +48254,30 @@ int lua_cocos2dx_RenderTexture_saveToFile(lua_State* tolua_S) } }while(0); ok = true; + do{ + if (argc == 3) { + std::string arg0; + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.RenderTexture:saveToFile"); + + if (!ok) { break; } + bool arg1; + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.RenderTexture:saveToFile"); + + if (!ok) { break; } + std::function &)> arg2; + do { + // Lambda binding for lua is not supported. + assert(false); + } while(0) + ; + + if (!ok) { break; } + bool ret = cobj->saveToFile(arg0, arg1, arg2); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + }while(0); + ok = true; CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:saveToFile",argc, 1); return 0; @@ -63771,6 +63918,52 @@ int lua_register_cocos2dx_Component(lua_State* tolua_S) return 1; } +int lua_cocos2dx_Sprite3D_setCullFaceEnabled(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Sprite3D* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.Sprite3D",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Sprite3D*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Sprite3D_setCullFaceEnabled'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + bool arg0; + + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Sprite3D:setCullFaceEnabled"); + if(!ok) + return 0; + cobj->setCullFaceEnabled(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite3D:setCullFaceEnabled",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Sprite3D_setCullFaceEnabled'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_Sprite3D_setTexture(lua_State* tolua_S) { int argc = 0; @@ -64001,6 +64194,52 @@ int lua_cocos2dx_Sprite3D_getBlendFunc(lua_State* tolua_S) return 0; } +int lua_cocos2dx_Sprite3D_setCullFace(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Sprite3D* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.Sprite3D",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Sprite3D*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Sprite3D_setCullFace'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + unsigned int arg0; + + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.Sprite3D:setCullFace"); + if(!ok) + return 0; + cobj->setCullFace(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite3D:setCullFace",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Sprite3D_setCullFace'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_Sprite3D_removeAttachNode(lua_State* tolua_S) { int argc = 0; @@ -64157,11 +64396,13 @@ int lua_register_cocos2dx_Sprite3D(lua_State* tolua_S) tolua_cclass(tolua_S,"Sprite3D","cc.Sprite3D","cc.Node",nullptr); tolua_beginmodule(tolua_S,"Sprite3D"); + tolua_function(tolua_S,"setCullFaceEnabled",lua_cocos2dx_Sprite3D_setCullFaceEnabled); tolua_function(tolua_S,"setTexture",lua_cocos2dx_Sprite3D_setTexture); tolua_function(tolua_S,"removeAllAttachNode",lua_cocos2dx_Sprite3D_removeAllAttachNode); tolua_function(tolua_S,"setBlendFunc",lua_cocos2dx_Sprite3D_setBlendFunc); tolua_function(tolua_S,"getMesh",lua_cocos2dx_Sprite3D_getMesh); tolua_function(tolua_S,"getBlendFunc",lua_cocos2dx_Sprite3D_getBlendFunc); + tolua_function(tolua_S,"setCullFace",lua_cocos2dx_Sprite3D_setCullFace); tolua_function(tolua_S,"removeAttachNode",lua_cocos2dx_Sprite3D_removeAttachNode); tolua_function(tolua_S,"getAttachNode",lua_cocos2dx_Sprite3D_getAttachNode); tolua_function(tolua_S,"create", lua_cocos2dx_Sprite3D_create); @@ -64559,6 +64800,386 @@ int lua_register_cocos2dx_Mesh(lua_State* tolua_S) return 1; } +int lua_cocos2dx_Skeleton3D_getBoneByName(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Skeleton3D* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.Skeleton3D",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Skeleton3D*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Skeleton3D_getBoneByName'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + std::string arg0; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Skeleton3D:getBoneByName"); + if(!ok) + return 0; + cocos2d::Bone3D* ret = cobj->getBoneByName(arg0); + object_to_luaval(tolua_S, "cc.Bone3D",(cocos2d::Bone3D*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Skeleton3D:getBoneByName",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Skeleton3D_getBoneByName'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_Skeleton3D_getRootBone(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Skeleton3D* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.Skeleton3D",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Skeleton3D*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Skeleton3D_getRootBone'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Bone3D* ret = cobj->getRootBone(); + object_to_luaval(tolua_S, "cc.Bone3D",(cocos2d::Bone3D*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Skeleton3D:getRootBone",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Skeleton3D_getRootBone'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_Skeleton3D_updateBoneMatrix(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Skeleton3D* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.Skeleton3D",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Skeleton3D*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Skeleton3D_updateBoneMatrix'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->updateBoneMatrix(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Skeleton3D:updateBoneMatrix",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Skeleton3D_updateBoneMatrix'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_Skeleton3D_getBoneByIndex(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Skeleton3D* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.Skeleton3D",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Skeleton3D*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Skeleton3D_getBoneByIndex'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + unsigned int arg0; + + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.Skeleton3D:getBoneByIndex"); + if(!ok) + return 0; + cocos2d::Bone3D* ret = cobj->getBoneByIndex(arg0); + object_to_luaval(tolua_S, "cc.Bone3D",(cocos2d::Bone3D*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Skeleton3D:getBoneByIndex",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Skeleton3D_getBoneByIndex'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_Skeleton3D_setRootBone(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Skeleton3D* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.Skeleton3D",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Skeleton3D*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Skeleton3D_setRootBone'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Bone3D* arg0; + + ok &= luaval_to_object(tolua_S, 2, "cc.Bone3D",&arg0); + if(!ok) + return 0; + cobj->setRootBone(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Skeleton3D:setRootBone",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Skeleton3D_setRootBone'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_Skeleton3D_getBoneIndex(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Skeleton3D* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.Skeleton3D",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Skeleton3D*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Skeleton3D_getBoneIndex'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Bone3D* arg0; + + ok &= luaval_to_object(tolua_S, 2, "cc.Bone3D",&arg0); + if(!ok) + return 0; + int ret = cobj->getBoneIndex(arg0); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Skeleton3D:getBoneIndex",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Skeleton3D_getBoneIndex'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_Skeleton3D_getBoneCount(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Skeleton3D* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.Skeleton3D",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Skeleton3D*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Skeleton3D_getBoneCount'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + ssize_t ret = cobj->getBoneCount(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Skeleton3D:getBoneCount",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Skeleton3D_getBoneCount'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_Skeleton3D_create(lua_State* tolua_S) +{ + int argc = 0; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertable(tolua_S,1,"cc.Skeleton3D",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 2) + { + std::string arg0; + std::string arg1; + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Skeleton3D:create"); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Skeleton3D:create"); + if(!ok) + return 0; + cocos2d::Skeleton3D* ret = cocos2d::Skeleton3D::create(arg0, arg1); + object_to_luaval(tolua_S, "cc.Skeleton3D",(cocos2d::Skeleton3D*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Skeleton3D:create",argc, 2); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Skeleton3D_create'.",&tolua_err); +#endif + return 0; +} +static int lua_cocos2dx_Skeleton3D_finalize(lua_State* tolua_S) +{ + printf("luabindings: finalizing LUA object (Skeleton3D)"); + return 0; +} + +int lua_register_cocos2dx_Skeleton3D(lua_State* tolua_S) +{ + tolua_usertype(tolua_S,"cc.Skeleton3D"); + tolua_cclass(tolua_S,"Skeleton3D","cc.Skeleton3D","cc.Ref",nullptr); + + tolua_beginmodule(tolua_S,"Skeleton3D"); + tolua_function(tolua_S,"getBoneByName",lua_cocos2dx_Skeleton3D_getBoneByName); + tolua_function(tolua_S,"getRootBone",lua_cocos2dx_Skeleton3D_getRootBone); + tolua_function(tolua_S,"updateBoneMatrix",lua_cocos2dx_Skeleton3D_updateBoneMatrix); + tolua_function(tolua_S,"getBoneByIndex",lua_cocos2dx_Skeleton3D_getBoneByIndex); + tolua_function(tolua_S,"setRootBone",lua_cocos2dx_Skeleton3D_setRootBone); + tolua_function(tolua_S,"getBoneIndex",lua_cocos2dx_Skeleton3D_getBoneIndex); + tolua_function(tolua_S,"getBoneCount",lua_cocos2dx_Skeleton3D_getBoneCount); + tolua_function(tolua_S,"create", lua_cocos2dx_Skeleton3D_create); + tolua_endmodule(tolua_S); + std::string typeName = typeid(cocos2d::Skeleton3D).name(); + g_luaType[typeName] = "cc.Skeleton3D"; + g_typeCast["Skeleton3D"] = "cc.Skeleton3D"; + return 1; +} + int lua_cocos2dx_Animation3D_getDuration(lua_State* tolua_S) { int argc = 0; @@ -65887,6 +66508,7 @@ TOLUA_API int register_all_cocos2dx(lua_State* tolua_S) lua_register_cocos2dx_EventFocus(tolua_S); lua_register_cocos2dx_EaseQuinticActionInOut(tolua_S); lua_register_cocos2dx_SpriteFrameCache(tolua_S); + lua_register_cocos2dx_Skeleton3D(tolua_S); lua_register_cocos2dx_TransitionCrossFade(tolua_S); lua_register_cocos2dx_Ripple3D(tolua_S); lua_register_cocos2dx_Lens3D(tolua_S); diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp index fa251a5146..a951802a00 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp @@ -1576,6 +1576,19 @@ int register_all_cocos2dx(lua_State* tolua_S); + + + + + + + + + + + + + diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.cpp index c4b13b740f..1bedeb5d24 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.cpp @@ -5435,7 +5435,7 @@ int lua_register_cocos2dx_physics_PhysicsBody(lua_State* tolua_S) return 1; } -int lua_cocos2dx_physics_PhysicsWorld_getGravity(lua_State* tolua_S) +int lua_cocos2dx_physics_PhysicsWorld_setGravity(lua_State* tolua_S) { int argc = 0; cocos2d::PhysicsWorld* cobj = nullptr; @@ -5455,26 +5455,28 @@ int lua_cocos2dx_physics_PhysicsWorld_getGravity(lua_State* tolua_S) #if COCOS2D_DEBUG >= 1 if (!cobj) { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getGravity'", nullptr); + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_setGravity'", nullptr); return 0; } #endif argc = lua_gettop(tolua_S)-1; - if (argc == 0) + if (argc == 1) { + cocos2d::Vec2 arg0; + + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsWorld:setGravity"); if(!ok) return 0; - cocos2d::Vec2 ret = cobj->getGravity(); - vec2_to_luaval(tolua_S, ret); - return 1; + cobj->setGravity(arg0); + return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:getGravity",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:setGravity",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getGravity'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_setGravity'.",&tolua_err); #endif return 0; @@ -5523,7 +5525,7 @@ int lua_cocos2dx_physics_PhysicsWorld_getAllBodies(lua_State* tolua_S) return 0; } -int lua_cocos2dx_physics_PhysicsWorld_setGravity(lua_State* tolua_S) +int lua_cocos2dx_physics_PhysicsWorld_getDebugDrawMask(lua_State* tolua_S) { int argc = 0; cocos2d::PhysicsWorld* cobj = nullptr; @@ -5543,53 +5545,7 @@ int lua_cocos2dx_physics_PhysicsWorld_setGravity(lua_State* tolua_S) #if COCOS2D_DEBUG >= 1 if (!cobj) { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_setGravity'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::Vec2 arg0; - - ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsWorld:setGravity"); - if(!ok) - return 0; - cobj->setGravity(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:setGravity",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_setGravity'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_getSpeed(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getSpeed'", nullptr); + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getDebugDrawMask'", nullptr); return 0; } #endif @@ -5599,16 +5555,205 @@ int lua_cocos2dx_physics_PhysicsWorld_getSpeed(lua_State* tolua_S) { if(!ok) return 0; - double ret = cobj->getSpeed(); + int ret = cobj->getDebugDrawMask(); tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:getSpeed",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:getDebugDrawMask",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getSpeed'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getDebugDrawMask'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_setAutoStep(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_setAutoStep'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + bool arg0; + + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.PhysicsWorld:setAutoStep"); + if(!ok) + return 0; + cobj->setAutoStep(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:setAutoStep",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_setAutoStep'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_addJoint(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_addJoint'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::PhysicsJoint* arg0; + + ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsJoint",&arg0); + if(!ok) + return 0; + cobj->addJoint(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:addJoint",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_addJoint'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_removeAllJoints(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_removeAllJoints'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->removeAllJoints(); + return 0; + } + if (argc == 1) + { + bool arg0; + + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.PhysicsWorld:removeAllJoints"); + if(!ok) + return 0; + cobj->removeAllJoints(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:removeAllJoints",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_removeAllJoints'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_isAutoStep(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_isAutoStep'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + bool ret = cobj->isAutoStep(); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:isAutoStep",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_isAutoStep'.",&tolua_err); #endif return 0; @@ -5725,96 +5870,6 @@ int lua_cocos2dx_physics_PhysicsWorld_removeJoint(lua_State* tolua_S) return 0; } -int lua_cocos2dx_physics_PhysicsWorld_getUpdateRate(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getUpdateRate'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - int ret = cobj->getUpdateRate(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:getUpdateRate",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getUpdateRate'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_setSpeed(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_setSpeed'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - double arg0; - - ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsWorld:setSpeed"); - if(!ok) - return 0; - cobj->setSpeed(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:setSpeed",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_setSpeed'.",&tolua_err); -#endif - - return 0; -} int lua_cocos2dx_physics_PhysicsWorld_getShapes(lua_State* tolua_S) { int argc = 0; @@ -5862,7 +5917,7 @@ int lua_cocos2dx_physics_PhysicsWorld_getShapes(lua_State* tolua_S) return 0; } -int lua_cocos2dx_physics_PhysicsWorld_removeAllJoints(lua_State* tolua_S) +int lua_cocos2dx_physics_PhysicsWorld_step(lua_State* tolua_S) { int argc = 0; cocos2d::PhysicsWorld* cobj = nullptr; @@ -5882,7 +5937,99 @@ int lua_cocos2dx_physics_PhysicsWorld_removeAllJoints(lua_State* tolua_S) #if COCOS2D_DEBUG >= 1 if (!cobj) { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_removeAllJoints'", nullptr); + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_step'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + double arg0; + + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsWorld:step"); + if(!ok) + return 0; + cobj->step(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:step",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_step'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_setDebugDrawMask(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_setDebugDrawMask'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + int arg0; + + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsWorld:setDebugDrawMask"); + if(!ok) + return 0; + cobj->setDebugDrawMask(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:setDebugDrawMask",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_setDebugDrawMask'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_getGravity(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getGravity'", nullptr); return 0; } #endif @@ -5892,25 +6039,239 @@ int lua_cocos2dx_physics_PhysicsWorld_removeAllJoints(lua_State* tolua_S) { if(!ok) return 0; - cobj->removeAllJoints(); - return 0; + cocos2d::Vec2 ret = cobj->getGravity(); + vec2_to_luaval(tolua_S, ret); + return 1; } - if (argc == 1) - { - bool arg0; - - ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.PhysicsWorld:removeAllJoints"); - if(!ok) - return 0; - cobj->removeAllJoints(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:removeAllJoints",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:getGravity",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_removeAllJoints'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getGravity'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_setUpdateRate(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_setUpdateRate'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + int arg0; + + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsWorld:setUpdateRate"); + if(!ok) + return 0; + cobj->setUpdateRate(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:setUpdateRate",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_setUpdateRate'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_getSpeed(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getSpeed'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + double ret = cobj->getSpeed(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:getSpeed",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getSpeed'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_getUpdateRate(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getUpdateRate'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + int ret = cobj->getUpdateRate(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:getUpdateRate",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getUpdateRate'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_removeAllBodies(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_removeAllBodies'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->removeAllBodies(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:removeAllBodies",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_removeAllBodies'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_setSpeed(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_setSpeed'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + double arg0; + + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsWorld:setSpeed"); + if(!ok) + return 0; + cobj->setSpeed(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:setSpeed",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_setSpeed'.",&tolua_err); #endif return 0; @@ -5962,139 +6323,6 @@ int lua_cocos2dx_physics_PhysicsWorld_getShape(lua_State* tolua_S) return 0; } -int lua_cocos2dx_physics_PhysicsWorld_removeAllBodies(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_removeAllBodies'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cobj->removeAllBodies(); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:removeAllBodies",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_removeAllBodies'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_getDebugDrawMask(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getDebugDrawMask'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - int ret = cobj->getDebugDrawMask(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:getDebugDrawMask",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getDebugDrawMask'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_setDebugDrawMask(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_setDebugDrawMask'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - int arg0; - - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsWorld:setDebugDrawMask"); - if(!ok) - return 0; - cobj->setDebugDrawMask(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:setDebugDrawMask",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_setDebugDrawMask'.",&tolua_err); -#endif - - return 0; -} int lua_cocos2dx_physics_PhysicsWorld_getBody(lua_State* tolua_S) { int argc = 0; @@ -6142,98 +6370,6 @@ int lua_cocos2dx_physics_PhysicsWorld_getBody(lua_State* tolua_S) return 0; } -int lua_cocos2dx_physics_PhysicsWorld_setUpdateRate(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_setUpdateRate'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - int arg0; - - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsWorld:setUpdateRate"); - if(!ok) - return 0; - cobj->setUpdateRate(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:setUpdateRate",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_setUpdateRate'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_addJoint(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_addJoint'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::PhysicsJoint* arg0; - - ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsJoint",&arg0); - if(!ok) - return 0; - cobj->addJoint(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:addJoint",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_addJoint'.",&tolua_err); -#endif - - return 0; -} static int lua_cocos2dx_physics_PhysicsWorld_finalize(lua_State* tolua_S) { printf("luabindings: finalizing LUA object (PhysicsWorld)"); @@ -6246,23 +6382,26 @@ int lua_register_cocos2dx_physics_PhysicsWorld(lua_State* tolua_S) tolua_cclass(tolua_S,"PhysicsWorld","cc.PhysicsWorld","",nullptr); tolua_beginmodule(tolua_S,"PhysicsWorld"); - tolua_function(tolua_S,"getGravity",lua_cocos2dx_physics_PhysicsWorld_getGravity); - tolua_function(tolua_S,"getAllBodies",lua_cocos2dx_physics_PhysicsWorld_getAllBodies); tolua_function(tolua_S,"setGravity",lua_cocos2dx_physics_PhysicsWorld_setGravity); - tolua_function(tolua_S,"getSpeed",lua_cocos2dx_physics_PhysicsWorld_getSpeed); + tolua_function(tolua_S,"getAllBodies",lua_cocos2dx_physics_PhysicsWorld_getAllBodies); + tolua_function(tolua_S,"getDebugDrawMask",lua_cocos2dx_physics_PhysicsWorld_getDebugDrawMask); + tolua_function(tolua_S,"setAutoStep",lua_cocos2dx_physics_PhysicsWorld_setAutoStep); + tolua_function(tolua_S,"addJoint",lua_cocos2dx_physics_PhysicsWorld_addJoint); + tolua_function(tolua_S,"removeAllJoints",lua_cocos2dx_physics_PhysicsWorld_removeAllJoints); + tolua_function(tolua_S,"isAutoStep",lua_cocos2dx_physics_PhysicsWorld_isAutoStep); tolua_function(tolua_S,"removeBody",lua_cocos2dx_physics_PhysicsWorld_removeBody); tolua_function(tolua_S,"removeJoint",lua_cocos2dx_physics_PhysicsWorld_removeJoint); - tolua_function(tolua_S,"getUpdateRate",lua_cocos2dx_physics_PhysicsWorld_getUpdateRate); - tolua_function(tolua_S,"setSpeed",lua_cocos2dx_physics_PhysicsWorld_setSpeed); tolua_function(tolua_S,"getShapes",lua_cocos2dx_physics_PhysicsWorld_getShapes); - tolua_function(tolua_S,"removeAllJoints",lua_cocos2dx_physics_PhysicsWorld_removeAllJoints); - tolua_function(tolua_S,"getShape",lua_cocos2dx_physics_PhysicsWorld_getShape); - tolua_function(tolua_S,"removeAllBodies",lua_cocos2dx_physics_PhysicsWorld_removeAllBodies); - tolua_function(tolua_S,"getDebugDrawMask",lua_cocos2dx_physics_PhysicsWorld_getDebugDrawMask); + tolua_function(tolua_S,"step",lua_cocos2dx_physics_PhysicsWorld_step); tolua_function(tolua_S,"setDebugDrawMask",lua_cocos2dx_physics_PhysicsWorld_setDebugDrawMask); - tolua_function(tolua_S,"getBody",lua_cocos2dx_physics_PhysicsWorld_getBody); + tolua_function(tolua_S,"getGravity",lua_cocos2dx_physics_PhysicsWorld_getGravity); tolua_function(tolua_S,"setUpdateRate",lua_cocos2dx_physics_PhysicsWorld_setUpdateRate); - tolua_function(tolua_S,"addJoint",lua_cocos2dx_physics_PhysicsWorld_addJoint); + tolua_function(tolua_S,"getSpeed",lua_cocos2dx_physics_PhysicsWorld_getSpeed); + tolua_function(tolua_S,"getUpdateRate",lua_cocos2dx_physics_PhysicsWorld_getUpdateRate); + tolua_function(tolua_S,"removeAllBodies",lua_cocos2dx_physics_PhysicsWorld_removeAllBodies); + tolua_function(tolua_S,"setSpeed",lua_cocos2dx_physics_PhysicsWorld_setSpeed); + tolua_function(tolua_S,"getShape",lua_cocos2dx_physics_PhysicsWorld_getShape); + tolua_function(tolua_S,"getBody",lua_cocos2dx_physics_PhysicsWorld_getBody); tolua_endmodule(tolua_S); std::string typeName = typeid(cocos2d::PhysicsWorld).name(); g_luaType[typeName] = "cc.PhysicsWorld"; diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.hpp index 6ef0ca4ab5..42884debc5 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.hpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.hpp @@ -259,6 +259,9 @@ int register_all_cocos2dx_physics(lua_State* tolua_S); + + + diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp index f4605cb5be..c4c11ce464 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp @@ -13233,6 +13233,52 @@ int lua_cocos2dx_ui_TextField_getStringValue(lua_State* tolua_S) return 0; } +int lua_cocos2dx_ui_TextField_setPasswordStyleText(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::TextField* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.TextField",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::TextField*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_TextField_setPasswordStyleText'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + const char* arg0; + + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccui.TextField:setPasswordStyleText"); arg0 = arg0_tmp.c_str(); + if(!ok) + return 0; + cobj->setPasswordStyleText(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setPasswordStyleText",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_TextField_setPasswordStyleText'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_ui_TextField_getDeleteBackward(lua_State* tolua_S) { int argc = 0; @@ -13907,6 +13953,50 @@ int lua_cocos2dx_ui_TextField_setPasswordEnabled(lua_State* tolua_S) return 0; } +int lua_cocos2dx_ui_TextField_getPlaceHolderColor(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::TextField* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.TextField",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::TextField*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_TextField_getPlaceHolderColor'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + const cocos2d::Color4B& ret = cobj->getPlaceHolderColor(); + color4b_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getPlaceHolderColor",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_TextField_getPlaceHolderColor'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_ui_TextField_getPasswordStyleText(lua_State* tolua_S) { int argc = 0; @@ -13997,7 +14087,7 @@ int lua_cocos2dx_ui_TextField_setMaxLengthEnabled(lua_State* tolua_S) return 0; } -int lua_cocos2dx_ui_TextField_setPasswordStyleText(lua_State* tolua_S) +int lua_cocos2dx_ui_TextField_isPasswordEnabled(lua_State* tolua_S) { int argc = 0; cocos2d::ui::TextField* cobj = nullptr; @@ -14017,28 +14107,26 @@ int lua_cocos2dx_ui_TextField_setPasswordStyleText(lua_State* tolua_S) #if COCOS2D_DEBUG >= 1 if (!cobj) { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_TextField_setPasswordStyleText'", nullptr); + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_TextField_isPasswordEnabled'", nullptr); return 0; } #endif argc = lua_gettop(tolua_S)-1; - if (argc == 1) + if (argc == 0) { - const char* arg0; - - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccui.TextField:setPasswordStyleText"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; - cobj->setPasswordStyleText(arg0); - return 0; + bool ret = cobj->isPasswordEnabled(); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setPasswordStyleText",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:isPasswordEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_TextField_setPasswordStyleText'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_TextField_isPasswordEnabled'.",&tolua_err); #endif return 0; @@ -14181,46 +14269,55 @@ int lua_cocos2dx_ui_TextField_setPlaceHolder(lua_State* tolua_S) return 0; } -int lua_cocos2dx_ui_TextField_isPasswordEnabled(lua_State* tolua_S) +int lua_cocos2dx_ui_TextField_setPlaceHolderColor(lua_State* tolua_S) { int argc = 0; cocos2d::ui::TextField* cobj = nullptr; bool ok = true; - #if COCOS2D_DEBUG >= 1 tolua_Error tolua_err; #endif - #if COCOS2D_DEBUG >= 1 if (!tolua_isusertype(tolua_S,1,"ccui.TextField",0,&tolua_err)) goto tolua_lerror; #endif - cobj = (cocos2d::ui::TextField*)tolua_tousertype(tolua_S,1,0); - #if COCOS2D_DEBUG >= 1 - if (!cobj) + if (!cobj) { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_TextField_isPasswordEnabled'", nullptr); + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_TextField_setPlaceHolderColor'", nullptr); return 0; } #endif - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) + do{ + if (argc == 1) { + cocos2d::Color4B arg0; + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "ccui.TextField:setPlaceHolderColor"); + + if (!ok) { break; } + cobj->setPlaceHolderColor(arg0); return 0; - bool ret = cobj->isPasswordEnabled(); - tolua_pushboolean(tolua_S,(bool)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:isPasswordEnabled",argc, 0); + } + }while(0); + ok = true; + do{ + if (argc == 1) { + cocos2d::Color3B arg0; + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "ccui.TextField:setPlaceHolderColor"); + + if (!ok) { break; } + cobj->setPlaceHolderColor(arg0); + return 0; + } + }while(0); + ok = true; + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setPlaceHolderColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_TextField_isPasswordEnabled'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_TextField_setPlaceHolderColor'.",&tolua_err); #endif return 0; @@ -14271,6 +14368,52 @@ int lua_cocos2dx_ui_TextField_setTextHorizontalAlignment(lua_State* tolua_S) return 0; } +int lua_cocos2dx_ui_TextField_setTextColor(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::TextField* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.TextField",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::TextField*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_TextField_setTextColor'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Color4B arg0; + + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "ccui.TextField:setTextColor"); + if(!ok) + return 0; + cobj->setTextColor(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setTextColor",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_TextField_setTextColor'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_ui_TextField_getMaxLength(lua_State* tolua_S) { int argc = 0; @@ -14812,6 +14955,7 @@ int lua_register_cocos2dx_ui_TextField(lua_State* tolua_S) tolua_function(tolua_S,"setAttachWithIME",lua_cocos2dx_ui_TextField_setAttachWithIME); tolua_function(tolua_S,"getFontSize",lua_cocos2dx_ui_TextField_getFontSize); tolua_function(tolua_S,"getStringValue",lua_cocos2dx_ui_TextField_getStringValue); + tolua_function(tolua_S,"setPasswordStyleText",lua_cocos2dx_ui_TextField_setPasswordStyleText); tolua_function(tolua_S,"getDeleteBackward",lua_cocos2dx_ui_TextField_getDeleteBackward); tolua_function(tolua_S,"getPlaceHolder",lua_cocos2dx_ui_TextField_getPlaceHolder); tolua_function(tolua_S,"getAttachWithIME",lua_cocos2dx_ui_TextField_getAttachWithIME); @@ -14827,14 +14971,16 @@ int lua_register_cocos2dx_ui_TextField(lua_State* tolua_S) tolua_function(tolua_S,"attachWithIME",lua_cocos2dx_ui_TextField_attachWithIME); tolua_function(tolua_S,"getStringLength",lua_cocos2dx_ui_TextField_getStringLength); tolua_function(tolua_S,"setPasswordEnabled",lua_cocos2dx_ui_TextField_setPasswordEnabled); + tolua_function(tolua_S,"getPlaceHolderColor",lua_cocos2dx_ui_TextField_getPlaceHolderColor); tolua_function(tolua_S,"getPasswordStyleText",lua_cocos2dx_ui_TextField_getPasswordStyleText); tolua_function(tolua_S,"setMaxLengthEnabled",lua_cocos2dx_ui_TextField_setMaxLengthEnabled); - tolua_function(tolua_S,"setPasswordStyleText",lua_cocos2dx_ui_TextField_setPasswordStyleText); + tolua_function(tolua_S,"isPasswordEnabled",lua_cocos2dx_ui_TextField_isPasswordEnabled); tolua_function(tolua_S,"setDeleteBackward",lua_cocos2dx_ui_TextField_setDeleteBackward); tolua_function(tolua_S,"setFontSize",lua_cocos2dx_ui_TextField_setFontSize); tolua_function(tolua_S,"setPlaceHolder",lua_cocos2dx_ui_TextField_setPlaceHolder); - tolua_function(tolua_S,"isPasswordEnabled",lua_cocos2dx_ui_TextField_isPasswordEnabled); + tolua_function(tolua_S,"setPlaceHolderColor",lua_cocos2dx_ui_TextField_setPlaceHolderColor); tolua_function(tolua_S,"setTextHorizontalAlignment",lua_cocos2dx_ui_TextField_setTextHorizontalAlignment); + tolua_function(tolua_S,"setTextColor",lua_cocos2dx_ui_TextField_setTextColor); tolua_function(tolua_S,"getMaxLength",lua_cocos2dx_ui_TextField_getMaxLength); tolua_function(tolua_S,"isMaxLengthEnabled",lua_cocos2dx_ui_TextField_isMaxLengthEnabled); tolua_function(tolua_S,"setDetachWithIME",lua_cocos2dx_ui_TextField_setDetachWithIME); diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp index bb7e8f9958..e733905e27 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp @@ -398,6 +398,9 @@ int register_all_cocos2dx_ui(lua_State* tolua_S); + + + diff --git a/cocos/scripting/lua-bindings/manual/CCLuaStack.cpp b/cocos/scripting/lua-bindings/manual/CCLuaStack.cpp index 1976b62672..c1f5def686 100644 --- a/cocos/scripting/lua-bindings/manual/CCLuaStack.cpp +++ b/cocos/scripting/lua-bindings/manual/CCLuaStack.cpp @@ -97,7 +97,49 @@ int lua_print(lua_State * luastate) return 0; } -} // namespace { + +int lua_release_print(lua_State * L) +{ + int nargs = lua_gettop(L); + + std::string t; + for (int i=1; i <= nargs; i++) + { + if (lua_istable(L, i)) + t += "table"; + else if (lua_isnone(L, i)) + t += "none"; + else if (lua_isnil(L, i)) + t += "nil"; + else if (lua_isboolean(L, i)) + { + if (lua_toboolean(L, i) != 0) + t += "true"; + else + t += "false"; + } + else if (lua_isfunction(L, i)) + t += "function"; + else if (lua_islightuserdata(L, i)) + t += "lightuserdata"; + else if (lua_isthread(L, i)) + t += "thread"; + else + { + const char * str = lua_tostring(L, i); + if (str) + t += lua_tostring(L, i); + else + t += lua_typename(L, lua_type(L, i)); + } + if (i!=nargs) + t += "\t"; + } + log("[LUA-print] %s", t.c_str()); + + return 0; +} +} NS_CC_BEGIN @@ -134,6 +176,7 @@ bool LuaStack::init(void) // Register our version of the global "print" function const luaL_reg global_functions [] = { {"print", lua_print}, + {"release_print",lua_release_print}, {NULL, NULL} }; luaL_register(_state, "_G", global_functions); diff --git a/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj b/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj index 0ba052872e..cb302380eb 100644 --- a/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj +++ b/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj @@ -6,6 +6,45 @@ objectVersion = 46; objects = { +/* Begin PBXAggregateTarget section */ + 15D1F2AC1994B2AD00302043 /* build all lualibs Mac */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 15D1F2AF1994B2AD00302043 /* Build configuration list for PBXAggregateTarget "build all lualibs Mac" */; + buildPhases = ( + ); + dependencies = ( + 15D1F2B11994B2C400302043 /* PBXTargetDependency */, + 15D1F2B31994B2C400302043 /* PBXTargetDependency */, + 15D1F2B51994B2C400302043 /* PBXTargetDependency */, + 15D1F2B71994B2C400302043 /* PBXTargetDependency */, + 15D1F2B91994B2C400302043 /* PBXTargetDependency */, + 15D1F2BB1994B2C400302043 /* PBXTargetDependency */, + 15D1F2BD1994B2C400302043 /* PBXTargetDependency */, + 15D1F2BF1994B2C400302043 /* PBXTargetDependency */, + ); + name = "build all lualibs Mac"; + productName = "build all lualibs Mac"; + }; + 15D1F2C01994B2DA00302043 /* build all lualibs iOS */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 15D1F2C11994B2DA00302043 /* Build configuration list for PBXAggregateTarget "build all lualibs iOS" */; + buildPhases = ( + ); + dependencies = ( + 15D1F2C51994B2ED00302043 /* PBXTargetDependency */, + 15D1F2C71994B2ED00302043 /* PBXTargetDependency */, + 15D1F2C91994B2ED00302043 /* PBXTargetDependency */, + 15D1F2CB1994B2ED00302043 /* PBXTargetDependency */, + 15D1F2CD1994B2ED00302043 /* PBXTargetDependency */, + 15D1F2CF1994B2ED00302043 /* PBXTargetDependency */, + 15D1F2D11994B2ED00302043 /* PBXTargetDependency */, + 15D1F2D31994B2ED00302043 /* PBXTargetDependency */, + ); + name = "build all lualibs iOS"; + productName = "build all lualibs iOS"; + }; +/* End PBXAggregateTarget section */ + /* Begin PBXBuildFile section */ 15427D44198F73F700DC375D /* lua_cocos2dx_cocosdenshion_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15427D42198F73F700DC375D /* lua_cocos2dx_cocosdenshion_manual.cpp */; }; 15427D45198F73F700DC375D /* lua_cocos2dx_cocosdenshion_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15427D42198F73F700DC375D /* lua_cocos2dx_cocosdenshion_manual.cpp */; }; @@ -250,6 +289,121 @@ 15EFA69B198B6B84000C57D3 /* lua_cocos2dx_experimental_video_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 156EADF21977A2BA00F53709 /* lua_cocos2dx_experimental_video_auto.hpp */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 15D1F2B01994B2C400302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 15C1BD5F1986538000A46ACC; + remoteInfo = "libluaextension Mac"; + }; + 15D1F2B21994B2C400302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 15C1C0801987328E00A46ACC; + remoteInfo = "libluaui Mac"; + }; + 15D1F2B41994B2C400302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 15C1BF7219865C2000A46ACC; + remoteInfo = "libluacocostudio Mac"; + }; + 15D1F2B61994B2C400302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 15C1BE66198654BE00A46ACC; + remoteInfo = "libluacocosbuilder Mac"; + }; + 15D1F2B81994B2C400302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 15C1BFF819865E5F00A46ACC; + remoteInfo = "libluaspine Mac"; + }; + 15D1F2BA1994B2C400302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 15C1C1061987340C00A46ACC; + remoteInfo = "libluanetwork Mac"; + }; + 15D1F2BC1994B2C400302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 15C1BEEE19865A0600A46ACC; + remoteInfo = "libluacocosdenshion Mac"; + }; + 15D1F2BE1994B2C400302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 15C1C255198748D200A46ACC; + remoteInfo = "libluacocos2d Mac"; + }; + 15D1F2C41994B2ED00302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 155CA2C71988C494006E0A08; + remoteInfo = "libluaextension iOS"; + }; + 15D1F2C61994B2ED00302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 15EFA300198B28A8000C57D3; + remoteInfo = "libluaui iOS"; + }; + 15D1F2C81994B2ED00302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 15EFA381198B2934000C57D3; + remoteInfo = "libluacocostudio iOS"; + }; + 15D1F2CA1994B2ED00302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 15EFA27F198B2791000C57D3; + remoteInfo = "libluacocosbuilder iOS"; + }; + 15D1F2CC1994B2ED00302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 15EFA407198B2AFD000C57D3; + remoteInfo = "libluaspine iOS"; + }; + 15D1F2CE1994B2ED00302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 15EFA486198B2B9B000C57D3; + remoteInfo = "libluanetwork iOS"; + }; + 15D1F2D01994B2ED00302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 15EFA523198B2D13000C57D3; + remoteInfo = "libluacocosdenshion iOS"; + }; + 15D1F2D21994B2ED00302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 15EFA59E198B2DAA000C57D3; + remoteInfo = "libluacocos2d iOS"; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXFileReference section */ 1503FA9D18DA8A1C00F6518C /* buffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = buffer.c; sourceTree = ""; }; 1503FA9E18DA8A1C00F6518C /* buffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = buffer.h; sourceTree = ""; }; @@ -1352,6 +1506,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( + 15D1F2AC1994B2AD00302043 /* build all lualibs Mac */, 15C1BD5F1986538000A46ACC /* libluaextension Mac */, 15C1C0801987328E00A46ACC /* libluaui Mac */, 15C1BF7219865C2000A46ACC /* libluacocostudio Mac */, @@ -1360,6 +1515,7 @@ 15C1C1061987340C00A46ACC /* libluanetwork Mac */, 15C1BEEE19865A0600A46ACC /* libluacocosdenshion Mac */, 15C1C255198748D200A46ACC /* libluacocos2d Mac */, + 15D1F2C01994B2DA00302043 /* build all lualibs iOS */, 155CA2C71988C494006E0A08 /* libluaextension iOS */, 15EFA300198B28A8000C57D3 /* libluaui iOS */, 15EFA381198B2934000C57D3 /* libluacocostudio iOS */, @@ -1605,6 +1761,89 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 15D1F2B11994B2C400302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 15C1BD5F1986538000A46ACC /* libluaextension Mac */; + targetProxy = 15D1F2B01994B2C400302043 /* PBXContainerItemProxy */; + }; + 15D1F2B31994B2C400302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 15C1C0801987328E00A46ACC /* libluaui Mac */; + targetProxy = 15D1F2B21994B2C400302043 /* PBXContainerItemProxy */; + }; + 15D1F2B51994B2C400302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 15C1BF7219865C2000A46ACC /* libluacocostudio Mac */; + targetProxy = 15D1F2B41994B2C400302043 /* PBXContainerItemProxy */; + }; + 15D1F2B71994B2C400302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 15C1BE66198654BE00A46ACC /* libluacocosbuilder Mac */; + targetProxy = 15D1F2B61994B2C400302043 /* PBXContainerItemProxy */; + }; + 15D1F2B91994B2C400302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 15C1BFF819865E5F00A46ACC /* libluaspine Mac */; + targetProxy = 15D1F2B81994B2C400302043 /* PBXContainerItemProxy */; + }; + 15D1F2BB1994B2C400302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 15C1C1061987340C00A46ACC /* libluanetwork Mac */; + targetProxy = 15D1F2BA1994B2C400302043 /* PBXContainerItemProxy */; + }; + 15D1F2BD1994B2C400302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 15C1BEEE19865A0600A46ACC /* libluacocosdenshion Mac */; + targetProxy = 15D1F2BC1994B2C400302043 /* PBXContainerItemProxy */; + }; + 15D1F2BF1994B2C400302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 15C1C255198748D200A46ACC /* libluacocos2d Mac */; + targetProxy = 15D1F2BE1994B2C400302043 /* PBXContainerItemProxy */; + }; + 15D1F2C51994B2ED00302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 155CA2C71988C494006E0A08 /* libluaextension iOS */; + targetProxy = 15D1F2C41994B2ED00302043 /* PBXContainerItemProxy */; + }; + 15D1F2C71994B2ED00302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 15EFA300198B28A8000C57D3 /* libluaui iOS */; + targetProxy = 15D1F2C61994B2ED00302043 /* PBXContainerItemProxy */; + }; + 15D1F2C91994B2ED00302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 15EFA381198B2934000C57D3 /* libluacocostudio iOS */; + targetProxy = 15D1F2C81994B2ED00302043 /* PBXContainerItemProxy */; + }; + 15D1F2CB1994B2ED00302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 15EFA27F198B2791000C57D3 /* libluacocosbuilder iOS */; + targetProxy = 15D1F2CA1994B2ED00302043 /* PBXContainerItemProxy */; + }; + 15D1F2CD1994B2ED00302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 15EFA407198B2AFD000C57D3 /* libluaspine iOS */; + targetProxy = 15D1F2CC1994B2ED00302043 /* PBXContainerItemProxy */; + }; + 15D1F2CF1994B2ED00302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 15EFA486198B2B9B000C57D3 /* libluanetwork iOS */; + targetProxy = 15D1F2CE1994B2ED00302043 /* PBXContainerItemProxy */; + }; + 15D1F2D11994B2ED00302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 15EFA523198B2D13000C57D3 /* libluacocosdenshion iOS */; + targetProxy = 15D1F2D01994B2ED00302043 /* PBXContainerItemProxy */; + }; + 15D1F2D31994B2ED00302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 15EFA59E198B2DAA000C57D3 /* libluacocos2d iOS */; + targetProxy = 15D1F2D21994B2ED00302043 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ 1551A34A158F2AB200E66CFE /* Debug */ = { isa = XCBuildConfiguration; @@ -2094,6 +2333,34 @@ }; name = Release; }; + 15D1F2AD1994B2AD00302043 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 15D1F2AE1994B2AD00302043 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; + 15D1F2C21994B2DA00302043 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 15D1F2C31994B2DA00302043 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; 15EFA2F7198B2791000C57D3 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -2498,6 +2765,22 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 15D1F2AF1994B2AD00302043 /* Build configuration list for PBXAggregateTarget "build all lualibs Mac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 15D1F2AD1994B2AD00302043 /* Debug */, + 15D1F2AE1994B2AD00302043 /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; + 15D1F2C11994B2DA00302043 /* Build configuration list for PBXAggregateTarget "build all lualibs iOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 15D1F2C21994B2DA00302043 /* Debug */, + 15D1F2C31994B2DA00302043 /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; 15EFA2F6198B2791000C57D3 /* Build configuration list for PBXNativeTarget "libluacocosbuilder iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/cocos/scripting/lua-bindings/script/Cocos2d.lua b/cocos/scripting/lua-bindings/script/cocos2d/Cocos2d.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/Cocos2d.lua rename to cocos/scripting/lua-bindings/script/cocos2d/Cocos2d.lua diff --git a/cocos/scripting/lua-bindings/script/Cocos2dConstants.lua b/cocos/scripting/lua-bindings/script/cocos2d/Cocos2dConstants.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/Cocos2dConstants.lua rename to cocos/scripting/lua-bindings/script/cocos2d/Cocos2dConstants.lua diff --git a/cocos/scripting/lua-bindings/script/DeprecatedCocos2dClass.lua b/cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dClass.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/DeprecatedCocos2dClass.lua rename to cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dClass.lua diff --git a/cocos/scripting/lua-bindings/script/DeprecatedCocos2dEnum.lua b/cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dEnum.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/DeprecatedCocos2dEnum.lua rename to cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dEnum.lua diff --git a/cocos/scripting/lua-bindings/script/DeprecatedCocos2dFunc.lua b/cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dFunc.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/DeprecatedCocos2dFunc.lua rename to cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dFunc.lua diff --git a/cocos/scripting/lua-bindings/script/DeprecatedOpenglEnum.lua b/cocos/scripting/lua-bindings/script/cocos2d/DeprecatedOpenglEnum.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/DeprecatedOpenglEnum.lua rename to cocos/scripting/lua-bindings/script/cocos2d/DeprecatedOpenglEnum.lua diff --git a/cocos/scripting/lua-bindings/script/DrawPrimitives.lua b/cocos/scripting/lua-bindings/script/cocos2d/DrawPrimitives.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/DrawPrimitives.lua rename to cocos/scripting/lua-bindings/script/cocos2d/DrawPrimitives.lua diff --git a/cocos/scripting/lua-bindings/script/Opengl.lua b/cocos/scripting/lua-bindings/script/cocos2d/Opengl.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/Opengl.lua rename to cocos/scripting/lua-bindings/script/cocos2d/Opengl.lua diff --git a/cocos/scripting/lua-bindings/script/OpenglConstants.lua b/cocos/scripting/lua-bindings/script/cocos2d/OpenglConstants.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/OpenglConstants.lua rename to cocos/scripting/lua-bindings/script/cocos2d/OpenglConstants.lua diff --git a/cocos/scripting/lua-bindings/script/bitExtend.lua b/cocos/scripting/lua-bindings/script/cocos2d/bitExtend.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/bitExtend.lua rename to cocos/scripting/lua-bindings/script/cocos2d/bitExtend.lua diff --git a/cocos/scripting/lua-bindings/script/extern.lua b/cocos/scripting/lua-bindings/script/cocos2d/extern.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/extern.lua rename to cocos/scripting/lua-bindings/script/cocos2d/extern.lua diff --git a/cocos/scripting/lua-bindings/script/json.lua b/cocos/scripting/lua-bindings/script/cocos2d/json.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/json.lua rename to cocos/scripting/lua-bindings/script/cocos2d/json.lua diff --git a/cocos/scripting/lua-bindings/script/luaj.lua b/cocos/scripting/lua-bindings/script/cocos2d/luaj.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/luaj.lua rename to cocos/scripting/lua-bindings/script/cocos2d/luaj.lua diff --git a/cocos/scripting/lua-bindings/script/luaoc.lua b/cocos/scripting/lua-bindings/script/cocos2d/luaoc.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/luaoc.lua rename to cocos/scripting/lua-bindings/script/cocos2d/luaoc.lua diff --git a/cocos/scripting/lua-bindings/script/CCBReaderLoad.lua b/cocos/scripting/lua-bindings/script/cocosbuilder/CCBReaderLoad.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/CCBReaderLoad.lua rename to cocos/scripting/lua-bindings/script/cocosbuilder/CCBReaderLoad.lua diff --git a/cocos/scripting/lua-bindings/script/DeprecatedCocosBuilderClass.lua b/cocos/scripting/lua-bindings/script/cocosbuilder/DeprecatedCocosBuilderClass.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/DeprecatedCocosBuilderClass.lua rename to cocos/scripting/lua-bindings/script/cocosbuilder/DeprecatedCocosBuilderClass.lua diff --git a/cocos/scripting/lua-bindings/script/AudioEngine.lua b/cocos/scripting/lua-bindings/script/cocosdenshion/AudioEngine.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/AudioEngine.lua rename to cocos/scripting/lua-bindings/script/cocosdenshion/AudioEngine.lua diff --git a/cocos/scripting/lua-bindings/script/DeprecatedCocosDenshionClass.lua b/cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionClass.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/DeprecatedCocosDenshionClass.lua rename to cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionClass.lua diff --git a/cocos/scripting/lua-bindings/script/DeprecatedCocosDenshionFunc.lua b/cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionFunc.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/DeprecatedCocosDenshionFunc.lua rename to cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionFunc.lua diff --git a/cocos/scripting/lua-bindings/script/CocoStudio.lua b/cocos/scripting/lua-bindings/script/cocostudio/CocoStudio.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/CocoStudio.lua rename to cocos/scripting/lua-bindings/script/cocostudio/CocoStudio.lua diff --git a/cocos/scripting/lua-bindings/script/DeprecatedCocoStudioClass.lua b/cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioClass.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/DeprecatedCocoStudioClass.lua rename to cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioClass.lua diff --git a/cocos/scripting/lua-bindings/script/DeprecatedCocoStudioFunc.lua b/cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioFunc.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/DeprecatedCocoStudioFunc.lua rename to cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioFunc.lua diff --git a/cocos/scripting/lua-bindings/script/StudioConstants.lua b/cocos/scripting/lua-bindings/script/cocostudio/StudioConstants.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/StudioConstants.lua rename to cocos/scripting/lua-bindings/script/cocostudio/StudioConstants.lua diff --git a/cocos/scripting/lua-bindings/script/ControllerConstants.lua b/cocos/scripting/lua-bindings/script/controller/ControllerConstants.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/ControllerConstants.lua rename to cocos/scripting/lua-bindings/script/controller/ControllerConstants.lua diff --git a/cocos/scripting/lua-bindings/script/DeprecatedExtensionClass.lua b/cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionClass.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/DeprecatedExtensionClass.lua rename to cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionClass.lua diff --git a/cocos/scripting/lua-bindings/script/DeprecatedExtensionEnum.lua b/cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionEnum.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/DeprecatedExtensionEnum.lua rename to cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionEnum.lua diff --git a/cocos/scripting/lua-bindings/script/DeprecatedExtensionFunc.lua b/cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionFunc.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/DeprecatedExtensionFunc.lua rename to cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionFunc.lua diff --git a/cocos/scripting/lua-bindings/script/ExtensionConstants.lua b/cocos/scripting/lua-bindings/script/extension/ExtensionConstants.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/ExtensionConstants.lua rename to cocos/scripting/lua-bindings/script/extension/ExtensionConstants.lua diff --git a/cocos/scripting/lua-bindings/script/DeprecatedNetworkClass.lua b/cocos/scripting/lua-bindings/script/network/DeprecatedNetworkClass.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/DeprecatedNetworkClass.lua rename to cocos/scripting/lua-bindings/script/network/DeprecatedNetworkClass.lua diff --git a/cocos/scripting/lua-bindings/script/DeprecatedNetworkEnum.lua b/cocos/scripting/lua-bindings/script/network/DeprecatedNetworkEnum.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/DeprecatedNetworkEnum.lua rename to cocos/scripting/lua-bindings/script/network/DeprecatedNetworkEnum.lua diff --git a/cocos/scripting/lua-bindings/script/DeprecatedNetworkFunc.lua b/cocos/scripting/lua-bindings/script/network/DeprecatedNetworkFunc.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/DeprecatedNetworkFunc.lua rename to cocos/scripting/lua-bindings/script/network/DeprecatedNetworkFunc.lua diff --git a/cocos/scripting/lua-bindings/script/NetworkConstants.lua b/cocos/scripting/lua-bindings/script/network/NetworkConstants.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/NetworkConstants.lua rename to cocos/scripting/lua-bindings/script/network/NetworkConstants.lua diff --git a/cocos/scripting/lua-bindings/script/DeprecatedUIEnum.lua b/cocos/scripting/lua-bindings/script/ui/DeprecatedUIEnum.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/DeprecatedUIEnum.lua rename to cocos/scripting/lua-bindings/script/ui/DeprecatedUIEnum.lua diff --git a/cocos/scripting/lua-bindings/script/DeprecatedUIFunc.lua b/cocos/scripting/lua-bindings/script/ui/DeprecatedUIFunc.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/DeprecatedUIFunc.lua rename to cocos/scripting/lua-bindings/script/ui/DeprecatedUIFunc.lua diff --git a/cocos/scripting/lua-bindings/script/GuiConstants.lua b/cocos/scripting/lua-bindings/script/ui/GuiConstants.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/GuiConstants.lua rename to cocos/scripting/lua-bindings/script/ui/GuiConstants.lua diff --git a/cocos/scripting/lua-bindings/script/experimentalConstants.lua b/cocos/scripting/lua-bindings/script/ui/experimentalUIConstants.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/experimentalConstants.lua rename to cocos/scripting/lua-bindings/script/ui/experimentalUIConstants.lua diff --git a/cocos/ui/UIButton.cpp b/cocos/ui/UIButton.cpp index bdd72c7b8a..25bc9dcd50 100644 --- a/cocos/ui/UIButton.cpp +++ b/cocos/ui/UIButton.cpp @@ -231,6 +231,7 @@ void Button::loadTextureNormal(const std::string& normal,TextureResType texType) _normalTextureSize = _buttonNormalRenderer->getContentSize(); updateFlippedX(); updateFlippedY(); + this->updateChildrenDisplayedRGBA(); updateContentSizeWithTextureSize(_normalTextureSize); _normalTextureLoaded = true; @@ -262,7 +263,8 @@ void Button::loadTexturePressed(const std::string& selected,TextureResType texTy //TODO: mark as dirty updateFlippedX(); updateFlippedY(); - + this->updateChildrenDisplayedRGBA(); + _pressedTextureLoaded = true; _pressedTextureAdaptDirty = true; } @@ -291,7 +293,8 @@ void Button::loadTextureDisabled(const std::string& disabled,TextureResType texT _disabledTextureSize = _buttonDisableRenderer->getContentSize(); updateFlippedX(); updateFlippedY(); - + this->updateChildrenDisplayedRGBA(); + _disabledTextureLoaded = true; _disabledTextureAdaptDirty = true; } diff --git a/cocos/ui/UICheckBox.cpp b/cocos/ui/UICheckBox.cpp index 4ddb8799ab..4854885df6 100644 --- a/cocos/ui/UICheckBox.cpp +++ b/cocos/ui/UICheckBox.cpp @@ -184,7 +184,8 @@ void CheckBox::loadTextureBackGround(const std::string& backGround,TextureResTyp } updateFlippedX(); updateFlippedY(); - + this->updateChildrenDisplayedRGBA(); + updateContentSizeWithTextureSize(_backGroundBoxRenderer->getContentSize()); _backGroundBoxRendererAdaptDirty = true; } @@ -210,7 +211,8 @@ void CheckBox::loadTextureBackGroundSelected(const std::string& backGroundSelect } updateFlippedX(); updateFlippedY(); - + this->updateChildrenDisplayedRGBA(); + _backGroundSelectedBoxRendererAdaptDirty = true; } @@ -235,7 +237,8 @@ void CheckBox::loadTextureFrontCross(const std::string& cross,TextureResType tex } updateFlippedX(); updateFlippedY(); - + this->updateChildrenDisplayedRGBA(); + _frontCrossRendererAdaptDirty = true; } @@ -260,7 +263,8 @@ void CheckBox::loadTextureBackGroundDisabled(const std::string& backGroundDisabl } updateFlippedX(); updateFlippedY(); - + this->updateChildrenDisplayedRGBA(); + _backGroundBoxDisabledRendererAdaptDirty = true; } @@ -285,7 +289,8 @@ void CheckBox::loadTextureFrontCrossDisabled(const std::string& frontCrossDisabl } updateFlippedX(); updateFlippedY(); - + this->updateChildrenDisplayedRGBA(); + _frontCrossDisabledRendererAdaptDirty = true; } @@ -351,6 +356,7 @@ bool CheckBox::getSelectedState()const void CheckBox::selectedEvent() { + this->retain(); if (_checkBoxEventCallback) { _checkBoxEventCallback(this, EventType::SELECTED); @@ -360,10 +366,12 @@ void CheckBox::selectedEvent() { (_checkBoxEventListener->*_checkBoxEventSelector)(this,CHECKBOX_STATE_EVENT_SELECTED); } + this->release(); } void CheckBox::unSelectedEvent() { + this->retain(); if (_checkBoxEventCallback) { _checkBoxEventCallback(this, EventType::UNSELECTED); } @@ -371,6 +379,7 @@ void CheckBox::unSelectedEvent() { (_checkBoxEventListener->*_checkBoxEventSelector)(this,CHECKBOX_STATE_EVENT_UNSELECTED); } + this->release(); } void CheckBox::addEventListenerCheckBox(Ref *target, SEL_SelectedStateEvent selector) diff --git a/cocos/ui/UIImageView.cpp b/cocos/ui/UIImageView.cpp index 1f048638a0..3df8706952 100644 --- a/cocos/ui/UIImageView.cpp +++ b/cocos/ui/UIImageView.cpp @@ -133,7 +133,8 @@ void ImageView::loadTexture(const std::string& fileName, TextureResType texType) _imageTextureSize = _imageRenderer->getContentSize(); updateFlippedX(); updateFlippedY(); - + this->updateChildrenDisplayedRGBA(); + updateContentSizeWithTextureSize(_imageTextureSize); _imageRendererAdaptDirty = true; } diff --git a/cocos/ui/UILayoutParameter.h b/cocos/ui/UILayoutParameter.h index 0fcdc98794..93f072081e 100644 --- a/cocos/ui/UILayoutParameter.h +++ b/cocos/ui/UILayoutParameter.h @@ -132,10 +132,10 @@ protected: Type _layoutParameterType; }; -class LayoutParameterProtocol +class CC_GUI_DLL LayoutParameterProtocol { public: - + virtual ~LayoutParameterProtocol(){} virtual LayoutParameter* getLayoutParameter() const= 0; }; diff --git a/cocos/ui/UILoadingBar.cpp b/cocos/ui/UILoadingBar.cpp index c4bd289b82..71f69ebea6 100644 --- a/cocos/ui/UILoadingBar.cpp +++ b/cocos/ui/UILoadingBar.cpp @@ -160,6 +160,7 @@ void LoadingBar::loadTexture(const std::string& texture,TextureResType texType) break; } _barRenderer->setCapInsets(_capInsets); + this->updateChildrenDisplayedRGBA(); barRendererScaleChangedWithSize(); updateContentSizeWithTextureSize(_barRendererTextureSize); diff --git a/cocos/ui/UISlider.cpp b/cocos/ui/UISlider.cpp index b393fa7102..08f06e293e 100644 --- a/cocos/ui/UISlider.cpp +++ b/cocos/ui/UISlider.cpp @@ -144,7 +144,7 @@ void Slider::loadBarTexture(const std::string& fileName, TextureResType texType) default: break; } - + this->updateChildrenDisplayedRGBA(); _barRendererAdaptDirty = true; _progressBarRendererDirty = true; updateContentSizeWithTextureSize(_barRenderer->getContentSize()); @@ -169,7 +169,7 @@ void Slider::loadProgressBarTexture(const std::string& fileName, TextureResType default: break; } - + this->updateChildrenDisplayedRGBA(); _progressBarRenderer->setAnchorPoint(Vec2(0.0f, 0.5f)); _progressBarTextureSize = _progressBarRenderer->getContentSize(); _progressBarRendererDirty = true; @@ -276,6 +276,7 @@ void Slider::loadSlidBallTextureNormal(const std::string& normal,TextureResType default: break; } + this->updateChildrenDisplayedRGBA(); } void Slider::loadSlidBallTexturePressed(const std::string& pressed,TextureResType texType) @@ -297,6 +298,7 @@ void Slider::loadSlidBallTexturePressed(const std::string& pressed,TextureResTyp default: break; } + this->updateChildrenDisplayedRGBA(); } void Slider::loadSlidBallTextureDisabled(const std::string& disabled,TextureResType texType) @@ -318,6 +320,7 @@ void Slider::loadSlidBallTexturePressed(const std::string& pressed,TextureResTyp default: break; } + this->updateChildrenDisplayedRGBA(); } void Slider::setPercent(int percent) diff --git a/cocos/ui/UITextField.cpp b/cocos/ui/UITextField.cpp index 6b79323e6b..4bac5b186d 100644 --- a/cocos/ui/UITextField.cpp +++ b/cocos/ui/UITextField.cpp @@ -445,6 +445,26 @@ const std::string& TextField::getPlaceHolder()const { return _textFieldRenderer->getPlaceHolder(); } + +const Color4B& TextField::getPlaceHolderColor()const +{ + return _textFieldRenderer->getColorSpaceHolder(); +} + +void TextField::setPlaceHolderColor(const cocos2d::Color3B &color) +{ + _textFieldRenderer->setColorSpaceHolder(color); +} + +void TextField::setPlaceHolderColor(const cocos2d::Color4B &color) +{ + _textFieldRenderer->setColorSpaceHolder(color); +} + +void TextField::setTextColor(const cocos2d::Color4B &textColor) +{ + _textFieldRenderer->setTextColor(textColor); +} void TextField::setFontSize(int size) { diff --git a/cocos/ui/UITextField.h b/cocos/ui/UITextField.h index eaea50d952..6738ef2685 100644 --- a/cocos/ui/UITextField.h +++ b/cocos/ui/UITextField.h @@ -135,6 +135,10 @@ public: void setPlaceHolder(const std::string& value); const std::string& getPlaceHolder()const; + const Color4B& getPlaceHolderColor()const; + void setPlaceHolderColor(const Color3B& color); + void setPlaceHolderColor(const Color4B& color); + void setTextColor(const Color4B& textColor); void setFontSize(int size); int getFontSize()const; diff --git a/cocos/ui/UIWidget.cpp b/cocos/ui/UIWidget.cpp index 57ed9331a7..b06f5367de 100644 --- a/cocos/ui/UIWidget.cpp +++ b/cocos/ui/UIWidget.cpp @@ -591,6 +591,12 @@ void Widget::onPressStateChangedToDisabled() { } + +void Widget::updateChildrenDisplayedRGBA() +{ + this->setColor(this->getColor()); + this->setOpacity(this->getOpacity()); +} Widget* Widget::getAncensterWidget(Node* node) diff --git a/cocos/ui/UIWidget.h b/cocos/ui/UIWidget.h index f22b9718c1..4deef2cef3 100644 --- a/cocos/ui/UIWidget.h +++ b/cocos/ui/UIWidget.h @@ -621,6 +621,7 @@ protected: virtual void updateFlippedX(){}; virtual void updateFlippedY(){}; virtual void adaptRenderers(){}; + void updateChildrenDisplayedRGBA(); void copyProperties(Widget* model); virtual Widget* createCloneInstance(); diff --git a/extensions/assets-manager/AssetsManager.cpp b/extensions/assets-manager/AssetsManager.cpp index 52073d2f07..06df43b5a2 100644 --- a/extensions/assets-manager/AssetsManager.cpp +++ b/extensions/assets-manager/AssetsManager.cpp @@ -159,6 +159,7 @@ bool AssetsManager::checkUpdate() curl_easy_setopt(_curl, CURLOPT_NOSIGNAL, 1L); curl_easy_setopt(_curl, CURLOPT_LOW_SPEED_LIMIT, LOW_SPEED_LIMIT); curl_easy_setopt(_curl, CURLOPT_LOW_SPEED_TIME, LOW_SPEED_TIME); + curl_easy_setopt(_curl, CURLOPT_FOLLOWLOCATION, 1 ); res = curl_easy_perform(_curl); if (res != 0) @@ -209,6 +210,8 @@ void AssetsManager::downloadAndUncompress() if (! uncompress()) { Director::getInstance()->getScheduler()->performFunctionInCocosThread([&, this]{ + UserDefault::getInstance()->setStringForKey(this->keyOfDownloadedVersion().c_str(),""); + UserDefault::getInstance()->flush(); if (this->_delegate) this->_delegate->onError(ErrorCode::UNCOMPRESS); }); @@ -525,6 +528,7 @@ bool AssetsManager::downLoad() curl_easy_setopt(_curl, CURLOPT_NOSIGNAL, 1L); curl_easy_setopt(_curl, CURLOPT_LOW_SPEED_LIMIT, LOW_SPEED_LIMIT); curl_easy_setopt(_curl, CURLOPT_LOW_SPEED_TIME, LOW_SPEED_TIME); + curl_easy_setopt(_curl, CURLOPT_FOLLOWLOCATION, 1 ); res = curl_easy_perform(_curl); curl_easy_cleanup(_curl); diff --git a/templates/cocos2dx_files.json b/templates/cocos2dx_files.json index e563e851e4..a48121500b 100644 --- a/templates/cocos2dx_files.json +++ b/templates/cocos2dx_files.json @@ -947,6 +947,10 @@ "cocos/renderer/CCGroupCommand.h", "cocos/renderer/CCMeshCommand.cpp", "cocos/renderer/CCMeshCommand.h", + "cocos/renderer/CCPrimitive.cpp", + "cocos/renderer/CCPrimitive.h", + "cocos/renderer/CCPrimitiveCommand.cpp", + "cocos/renderer/CCPrimitiveCommand.h", "cocos/renderer/CCQuadCommand.cpp", "cocos/renderer/CCQuadCommand.h", "cocos/renderer/CCRenderCommand.cpp", @@ -960,6 +964,10 @@ "cocos/renderer/CCTextureAtlas.h", "cocos/renderer/CCTextureCache.cpp", "cocos/renderer/CCTextureCache.h", + "cocos/renderer/CCVertexIndexBuffer.cpp", + "cocos/renderer/CCVertexIndexBuffer.h", + "cocos/renderer/CCVertexIndexData.cpp", + "cocos/renderer/CCVertexIndexData.h", "cocos/renderer/CMakeLists.txt", "cocos/renderer/ccGLStateCache.cpp", "cocos/renderer/ccGLStateCache.h", @@ -3871,6 +3879,7 @@ "cocos/scripting/lua-bindings/auto/api/ShuffleTiles.lua", "cocos/scripting/lua-bindings/auto/api/SimpleAudioEngine.lua", "cocos/scripting/lua-bindings/auto/api/Skeleton.lua", + "cocos/scripting/lua-bindings/auto/api/Skeleton3D.lua", "cocos/scripting/lua-bindings/auto/api/SkeletonAnimation.lua", "cocos/scripting/lua-bindings/auto/api/SkewBy.lua", "cocos/scripting/lua-bindings/auto/api/SkewFrame.lua", @@ -4079,42 +4088,42 @@ "cocos/scripting/lua-bindings/proj.win32/libluaspine.vcxproj.filters", "cocos/scripting/lua-bindings/proj.win32/libluaui.vcxproj", "cocos/scripting/lua-bindings/proj.win32/libluaui.vcxproj.filters", - "cocos/scripting/lua-bindings/script/AudioEngine.lua", - "cocos/scripting/lua-bindings/script/CCBReaderLoad.lua", - "cocos/scripting/lua-bindings/script/CocoStudio.lua", - "cocos/scripting/lua-bindings/script/Cocos2d.lua", - "cocos/scripting/lua-bindings/script/Cocos2dConstants.lua", - "cocos/scripting/lua-bindings/script/ControllerConstants.lua", - "cocos/scripting/lua-bindings/script/DeprecatedCocoStudioClass.lua", - "cocos/scripting/lua-bindings/script/DeprecatedCocoStudioFunc.lua", - "cocos/scripting/lua-bindings/script/DeprecatedCocos2dClass.lua", - "cocos/scripting/lua-bindings/script/DeprecatedCocos2dEnum.lua", - "cocos/scripting/lua-bindings/script/DeprecatedCocos2dFunc.lua", - "cocos/scripting/lua-bindings/script/DeprecatedCocosBuilderClass.lua", - "cocos/scripting/lua-bindings/script/DeprecatedCocosDenshionClass.lua", - "cocos/scripting/lua-bindings/script/DeprecatedCocosDenshionFunc.lua", - "cocos/scripting/lua-bindings/script/DeprecatedExtensionClass.lua", - "cocos/scripting/lua-bindings/script/DeprecatedExtensionEnum.lua", - "cocos/scripting/lua-bindings/script/DeprecatedExtensionFunc.lua", - "cocos/scripting/lua-bindings/script/DeprecatedNetworkClass.lua", - "cocos/scripting/lua-bindings/script/DeprecatedNetworkEnum.lua", - "cocos/scripting/lua-bindings/script/DeprecatedNetworkFunc.lua", - "cocos/scripting/lua-bindings/script/DeprecatedOpenglEnum.lua", - "cocos/scripting/lua-bindings/script/DeprecatedUIEnum.lua", - "cocos/scripting/lua-bindings/script/DeprecatedUIFunc.lua", - "cocos/scripting/lua-bindings/script/DrawPrimitives.lua", - "cocos/scripting/lua-bindings/script/ExtensionConstants.lua", - "cocos/scripting/lua-bindings/script/GuiConstants.lua", - "cocos/scripting/lua-bindings/script/NetworkConstants.lua", - "cocos/scripting/lua-bindings/script/Opengl.lua", - "cocos/scripting/lua-bindings/script/OpenglConstants.lua", - "cocos/scripting/lua-bindings/script/StudioConstants.lua", - "cocos/scripting/lua-bindings/script/bitExtend.lua", - "cocos/scripting/lua-bindings/script/experimentalConstants.lua", - "cocos/scripting/lua-bindings/script/extern.lua", - "cocos/scripting/lua-bindings/script/json.lua", - "cocos/scripting/lua-bindings/script/luaj.lua", - "cocos/scripting/lua-bindings/script/luaoc.lua", + "cocos/scripting/lua-bindings/script/cocos2d/Cocos2d.lua", + "cocos/scripting/lua-bindings/script/cocos2d/Cocos2dConstants.lua", + "cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dClass.lua", + "cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dEnum.lua", + "cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dFunc.lua", + "cocos/scripting/lua-bindings/script/cocos2d/DeprecatedOpenglEnum.lua", + "cocos/scripting/lua-bindings/script/cocos2d/DrawPrimitives.lua", + "cocos/scripting/lua-bindings/script/cocos2d/Opengl.lua", + "cocos/scripting/lua-bindings/script/cocos2d/OpenglConstants.lua", + "cocos/scripting/lua-bindings/script/cocos2d/bitExtend.lua", + "cocos/scripting/lua-bindings/script/cocos2d/extern.lua", + "cocos/scripting/lua-bindings/script/cocos2d/json.lua", + "cocos/scripting/lua-bindings/script/cocos2d/luaj.lua", + "cocos/scripting/lua-bindings/script/cocos2d/luaoc.lua", + "cocos/scripting/lua-bindings/script/cocosbuilder/CCBReaderLoad.lua", + "cocos/scripting/lua-bindings/script/cocosbuilder/DeprecatedCocosBuilderClass.lua", + "cocos/scripting/lua-bindings/script/cocosdenshion/AudioEngine.lua", + "cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionClass.lua", + "cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionFunc.lua", + "cocos/scripting/lua-bindings/script/cocostudio/CocoStudio.lua", + "cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioClass.lua", + "cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioFunc.lua", + "cocos/scripting/lua-bindings/script/cocostudio/StudioConstants.lua", + "cocos/scripting/lua-bindings/script/controller/ControllerConstants.lua", + "cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionClass.lua", + "cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionEnum.lua", + "cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionFunc.lua", + "cocos/scripting/lua-bindings/script/extension/ExtensionConstants.lua", + "cocos/scripting/lua-bindings/script/network/DeprecatedNetworkClass.lua", + "cocos/scripting/lua-bindings/script/network/DeprecatedNetworkEnum.lua", + "cocos/scripting/lua-bindings/script/network/DeprecatedNetworkFunc.lua", + "cocos/scripting/lua-bindings/script/network/NetworkConstants.lua", + "cocos/scripting/lua-bindings/script/ui/DeprecatedUIEnum.lua", + "cocos/scripting/lua-bindings/script/ui/DeprecatedUIFunc.lua", + "cocos/scripting/lua-bindings/script/ui/GuiConstants.lua", + "cocos/scripting/lua-bindings/script/ui/experimentalUIConstants.lua", "external/lua/lua/CMakeLists.txt", "external/lua/lua/lapi.c", "external/lua/lua/lapi.h", diff --git a/templates/cpp-template-default/CMakeLists.txt b/templates/cpp-template-default/CMakeLists.txt index cfc1fb578e..97c0813e94 100644 --- a/templates/cpp-template-default/CMakeLists.txt +++ b/templates/cpp-template-default/CMakeLists.txt @@ -189,6 +189,15 @@ add_subdirectory(${COCOS2D_ROOT}/external/xxhash) # cocos2d add_subdirectory(${COCOS2D_ROOT}/cocos) +# network library +add_subdirectory(${COCOS2D_ROOT}/cocos/network) + +# ui library +add_subdirectory(${COCOS2D_ROOT}/cocos/ui) + +# sqlite3 library +add_subdirectory(${COCOS2D_ROOT}/cocos/storage) + # extensions add_subdirectory(${COCOS2D_ROOT}/extensions) @@ -223,11 +232,6 @@ set(FMOD_LIB "fmodex") endif() target_link_libraries(${APP_NAME} - spine - cocostudio - cocosbuilder - extensions - audio cocos2d ) diff --git a/templates/cpp-template-default/proj.win32/HelloCpp.sln b/templates/cpp-template-default/proj.win32/HelloCpp.sln index a36c9b37cb..3bc2c2704e 100644 --- a/templates/cpp-template-default/proj.win32/HelloCpp.sln +++ b/templates/cpp-template-default/proj.win32/HelloCpp.sln @@ -5,15 +5,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloCpp", "HelloCpp.vcxpro ProjectSection(ProjectDependencies) = postProject {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} {207BC7A9-CCF1-4F2F-A04D-45F72242AE25} = {207BC7A9-CCF1-4F2F-A04D-45F72242AE25} - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} = {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos2d\cocos\2d\libcocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "..\cocos2d\external\chipmunk\proj.win32\chipmunk.vcxproj", "{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libAudio", "..\cocos2d\cocos\audio\proj.win32\libcocosdenshion.vcxproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -32,10 +29,6 @@ Global {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.Build.0 = Debug|Win32 {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.ActiveCfg = Release|Win32 {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.Build.0 = Release|Win32 - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.ActiveCfg = Debug|Win32 - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.Build.0 = Debug|Win32 - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.ActiveCfg = Release|Win32 - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj b/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj index 0b704a8960..022025afc8 100644 --- a/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj +++ b/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj @@ -151,9 +151,6 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)"{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} false - - {f8edd7fa-9a51-4e80-baeb-860825d2eac6} - {207bc7a9-ccf1-4f2f-a04d-45f72242ae25} diff --git a/templates/lua-template-default/frameworks/CMakeLists.txt b/templates/lua-template-default/frameworks/CMakeLists.txt index 555c36f3c8..14387ae6c6 100644 --- a/templates/lua-template-default/frameworks/CMakeLists.txt +++ b/templates/lua-template-default/frameworks/CMakeLists.txt @@ -109,6 +109,15 @@ add_subdirectory(${COCOS2D_ROOT}/external/xxhash) # cocos 2d library add_subdirectory(${COCOS2D_ROOT}/cocos) +# network library +add_subdirectory(${COCOS2D_ROOT}/cocos/network) + +# ui library +add_subdirectory(${COCOS2D_ROOT}/cocos/ui) + +# sqlite3 library +add_subdirectory(${COCOS2D_ROOT}/cocos/storage) + # extensions add_subdirectory(${COCOS2D_ROOT}/extensions) @@ -153,6 +162,7 @@ target_link_libraries(${APP_NAME} luanetwork audio cocos2d + network xxtea ) @@ -165,6 +175,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 ${COCOS2D_ROOT}/cocos/scripting/lua-bindings/script ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${COCOS2D_ROOT}/cocos/scripting/lua-bindings/script/cocos2d ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${COCOS2D_ROOT}/cocos/scripting/lua-bindings/script/cocosdenshion ${APP_BIN_DIR}/Resources ) diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android/build-cfg.json b/templates/lua-template-default/frameworks/runtime-src/proj.android/build-cfg.json index 6d0cbfc4fc..6ef87e7940 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.android/build-cfg.json +++ b/templates/lua-template-default/frameworks/runtime-src/proj.android/build-cfg.json @@ -15,7 +15,11 @@ "to": "res" }, { - "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script", + "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d", + "to": "" + }, + { + "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocosdenshion", "to": "" } ] diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj index 30aa39f910..4c33eff6ce 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj +++ b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj @@ -19,27 +19,43 @@ 15427C7B198F1FC100DC375D /* libluacocosdenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C47198F1DE400DC375D /* libluacocosdenshion Mac.a */; }; 15427C7C198F1FCB00DC375D /* libnetwork Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C1F198F1DE400DC375D /* libnetwork Mac.a */; }; 15427C7D198F1FD800DC375D /* libluanetwork Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C45198F1DE400DC375D /* libluanetwork Mac.a */; }; - 15427D71198F82DA00DC375D /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427D68198F82DA00DC375D /* DeprecatedCocos2dClass.lua */; }; - 15427D72198F82DA00DC375D /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427D68198F82DA00DC375D /* DeprecatedCocos2dClass.lua */; }; - 15427D73198F82DA00DC375D /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427D69198F82DA00DC375D /* DeprecatedCocos2dEnum.lua */; }; - 15427D74198F82DA00DC375D /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427D69198F82DA00DC375D /* DeprecatedCocos2dEnum.lua */; }; - 15427D75198F82DA00DC375D /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427D6A198F82DA00DC375D /* DeprecatedCocos2dFunc.lua */; }; - 15427D76198F82DA00DC375D /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427D6A198F82DA00DC375D /* DeprecatedCocos2dFunc.lua */; }; - 15427D77198F82DA00DC375D /* DeprecatedCocosDenshionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427D6B198F82DA00DC375D /* DeprecatedCocosDenshionClass.lua */; }; - 15427D78198F82DA00DC375D /* DeprecatedCocosDenshionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427D6B198F82DA00DC375D /* DeprecatedCocosDenshionClass.lua */; }; - 15427D79198F82DA00DC375D /* DeprecatedCocosDenshionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427D6C198F82DA00DC375D /* DeprecatedCocosDenshionFunc.lua */; }; - 15427D7A198F82DA00DC375D /* DeprecatedCocosDenshionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427D6C198F82DA00DC375D /* DeprecatedCocosDenshionFunc.lua */; }; - 15427D7B198F82DA00DC375D /* DeprecatedNetworkClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427D6D198F82DA00DC375D /* DeprecatedNetworkClass.lua */; }; - 15427D7C198F82DA00DC375D /* DeprecatedNetworkClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427D6D198F82DA00DC375D /* DeprecatedNetworkClass.lua */; }; - 15427D7D198F82DA00DC375D /* DeprecatedNetworkEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427D6E198F82DA00DC375D /* DeprecatedNetworkEnum.lua */; }; - 15427D7E198F82DA00DC375D /* DeprecatedNetworkEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427D6E198F82DA00DC375D /* DeprecatedNetworkEnum.lua */; }; - 15427D7F198F82DA00DC375D /* DeprecatedNetworkFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427D6F198F82DA00DC375D /* DeprecatedNetworkFunc.lua */; }; - 15427D80198F82DA00DC375D /* DeprecatedNetworkFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427D6F198F82DA00DC375D /* DeprecatedNetworkFunc.lua */; }; - 15427D81198F82DA00DC375D /* NetworkConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427D70198F82DA00DC375D /* NetworkConstants.lua */; }; - 15427D82198F82DA00DC375D /* NetworkConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427D70198F82DA00DC375D /* NetworkConstants.lua */; }; 15A8A4491834C64F00142BE0 /* Icon-114.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023810C17EBBCAC00990C9B /* Icon-114.png */; }; 15A8A4881834C90F00142BE0 /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4871834C90E00142BE0 /* libcurl.dylib */; }; 15AECE29195D482800907DB0 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15AECE28195D482800907DB0 /* MediaPlayer.framework */; }; + 15D1FE491998730800302043 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE3B1998730800302043 /* bitExtend.lua */; }; + 15D1FE4A1998730800302043 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE3B1998730800302043 /* bitExtend.lua */; }; + 15D1FE4B1998730800302043 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE3C1998730800302043 /* Cocos2d.lua */; }; + 15D1FE4C1998730800302043 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE3C1998730800302043 /* Cocos2d.lua */; }; + 15D1FE4D1998730800302043 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE3D1998730800302043 /* Cocos2dConstants.lua */; }; + 15D1FE4E1998730800302043 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE3D1998730800302043 /* Cocos2dConstants.lua */; }; + 15D1FE4F1998730800302043 /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE3E1998730800302043 /* DeprecatedCocos2dClass.lua */; }; + 15D1FE501998730800302043 /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE3E1998730800302043 /* DeprecatedCocos2dClass.lua */; }; + 15D1FE511998730800302043 /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE3F1998730800302043 /* DeprecatedCocos2dEnum.lua */; }; + 15D1FE521998730800302043 /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE3F1998730800302043 /* DeprecatedCocos2dEnum.lua */; }; + 15D1FE531998730800302043 /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE401998730800302043 /* DeprecatedCocos2dFunc.lua */; }; + 15D1FE541998730800302043 /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE401998730800302043 /* DeprecatedCocos2dFunc.lua */; }; + 15D1FE551998730800302043 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE411998730800302043 /* DeprecatedOpenglEnum.lua */; }; + 15D1FE561998730800302043 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE411998730800302043 /* DeprecatedOpenglEnum.lua */; }; + 15D1FE571998730800302043 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE421998730800302043 /* DrawPrimitives.lua */; }; + 15D1FE581998730800302043 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE421998730800302043 /* DrawPrimitives.lua */; }; + 15D1FE591998730800302043 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE431998730800302043 /* extern.lua */; }; + 15D1FE5A1998730800302043 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE431998730800302043 /* extern.lua */; }; + 15D1FE5B1998730800302043 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE441998730800302043 /* json.lua */; }; + 15D1FE5C1998730800302043 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE441998730800302043 /* json.lua */; }; + 15D1FE5D1998730800302043 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE451998730800302043 /* luaj.lua */; }; + 15D1FE5E1998730800302043 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE451998730800302043 /* luaj.lua */; }; + 15D1FE5F1998730800302043 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE461998730800302043 /* luaoc.lua */; }; + 15D1FE601998730800302043 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE461998730800302043 /* luaoc.lua */; }; + 15D1FE611998730800302043 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE471998730800302043 /* Opengl.lua */; }; + 15D1FE621998730800302043 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE471998730800302043 /* Opengl.lua */; }; + 15D1FE631998730800302043 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE481998730800302043 /* OpenglConstants.lua */; }; + 15D1FE641998730800302043 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE481998730800302043 /* OpenglConstants.lua */; }; + 15D1FE681998732700302043 /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE651998732700302043 /* AudioEngine.lua */; }; + 15D1FE691998732700302043 /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE651998732700302043 /* AudioEngine.lua */; }; + 15D1FE6A1998732700302043 /* DeprecatedCocosDenshionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE661998732700302043 /* DeprecatedCocosDenshionClass.lua */; }; + 15D1FE6B1998732700302043 /* DeprecatedCocosDenshionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE661998732700302043 /* DeprecatedCocosDenshionClass.lua */; }; + 15D1FE6C1998732700302043 /* DeprecatedCocosDenshionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE671998732700302043 /* DeprecatedCocosDenshionFunc.lua */; }; + 15D1FE6D1998732700302043 /* DeprecatedCocosDenshionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE671998732700302043 /* DeprecatedCocosDenshionFunc.lua */; }; 1AF4C403178663F200122817 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C402178663F200122817 /* libz.dylib */; }; 5023811817EBBCAC00990C9B /* AppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5023810817EBBCAC00990C9B /* AppController.mm */; }; 5023811917EBBCAC00990C9B /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023810917EBBCAC00990C9B /* Default-568h@2x.png */; }; @@ -77,28 +93,6 @@ C03781BA18BF655400FE4F13 /* res in Resources */ = {isa = PBXBuildFile; fileRef = C03781B718BF655400FE4F13 /* res */; }; C03781BB18BF655400FE4F13 /* src in Resources */ = {isa = PBXBuildFile; fileRef = C03781B818BF655400FE4F13 /* src */; }; C03781BC18BF655400FE4F13 /* src in Resources */ = {isa = PBXBuildFile; fileRef = C03781B818BF655400FE4F13 /* src */; }; - C03781CF18BF656A00FE4F13 /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781BD18BF656900FE4F13 /* AudioEngine.lua */; }; - C03781D018BF656A00FE4F13 /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781BD18BF656900FE4F13 /* AudioEngine.lua */; }; - C03781D318BF656A00FE4F13 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781BF18BF656900FE4F13 /* Cocos2d.lua */; }; - C03781D418BF656A00FE4F13 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781BF18BF656900FE4F13 /* Cocos2d.lua */; }; - C03781D518BF656A00FE4F13 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C018BF656900FE4F13 /* Cocos2dConstants.lua */; }; - C03781D618BF656A00FE4F13 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C018BF656900FE4F13 /* Cocos2dConstants.lua */; }; - C03781DF18BF656A00FE4F13 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C518BF656A00FE4F13 /* DeprecatedOpenglEnum.lua */; }; - C03781E018BF656A00FE4F13 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C518BF656A00FE4F13 /* DeprecatedOpenglEnum.lua */; }; - C03781E118BF656A00FE4F13 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C618BF656A00FE4F13 /* DrawPrimitives.lua */; }; - C03781E218BF656A00FE4F13 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C618BF656A00FE4F13 /* DrawPrimitives.lua */; }; - C03781E318BF656A00FE4F13 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C718BF656A00FE4F13 /* extern.lua */; }; - C03781E418BF656A00FE4F13 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C718BF656A00FE4F13 /* extern.lua */; }; - C03781E718BF656A00FE4F13 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C918BF656A00FE4F13 /* json.lua */; }; - C03781E818BF656A00FE4F13 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C918BF656A00FE4F13 /* json.lua */; }; - C03781E918BF656A00FE4F13 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CA18BF656A00FE4F13 /* luaj.lua */; }; - C03781EA18BF656A00FE4F13 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CA18BF656A00FE4F13 /* luaj.lua */; }; - C03781EB18BF656A00FE4F13 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CB18BF656A00FE4F13 /* luaoc.lua */; }; - C03781EC18BF656A00FE4F13 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CB18BF656A00FE4F13 /* luaoc.lua */; }; - C03781ED18BF656A00FE4F13 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CC18BF656A00FE4F13 /* Opengl.lua */; }; - C03781EE18BF656A00FE4F13 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CC18BF656A00FE4F13 /* Opengl.lua */; }; - C03781EF18BF656A00FE4F13 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CD18BF656A00FE4F13 /* OpenglConstants.lua */; }; - C03781F018BF656A00FE4F13 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CD18BF656A00FE4F13 /* OpenglConstants.lua */; }; C06E23C418CEF9740093C81A /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C06E23C318CEF9740093C81A /* main.cpp */; }; D6B061351803AC000077942B /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D6B061341803AC000077942B /* CoreMotion.framework */; }; F293B3CD15EB7BE500256477 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3CC15EB7BE500256477 /* QuartzCore.framework */; }; @@ -451,19 +445,27 @@ /* Begin PBXFileReference section */ 15427C7E198F201A00DC375D /* lua_module_register.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lua_module_register.h; path = ../Classes/lua_module_register.h; sourceTree = ""; }; - 15427D68198F82DA00DC375D /* DeprecatedCocos2dClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dClass.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DeprecatedCocos2dClass.lua"; sourceTree = ""; }; - 15427D69198F82DA00DC375D /* DeprecatedCocos2dEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dEnum.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DeprecatedCocos2dEnum.lua"; sourceTree = ""; }; - 15427D6A198F82DA00DC375D /* DeprecatedCocos2dFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dFunc.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DeprecatedCocos2dFunc.lua"; sourceTree = ""; }; - 15427D6B198F82DA00DC375D /* DeprecatedCocosDenshionClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosDenshionClass.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DeprecatedCocosDenshionClass.lua"; sourceTree = ""; }; - 15427D6C198F82DA00DC375D /* DeprecatedCocosDenshionFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosDenshionFunc.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DeprecatedCocosDenshionFunc.lua"; sourceTree = ""; }; - 15427D6D198F82DA00DC375D /* DeprecatedNetworkClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedNetworkClass.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DeprecatedNetworkClass.lua"; sourceTree = ""; }; - 15427D6E198F82DA00DC375D /* DeprecatedNetworkEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedNetworkEnum.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DeprecatedNetworkEnum.lua"; sourceTree = ""; }; - 15427D6F198F82DA00DC375D /* DeprecatedNetworkFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedNetworkFunc.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DeprecatedNetworkFunc.lua"; sourceTree = ""; }; - 15427D70198F82DA00DC375D /* NetworkConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = NetworkConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/NetworkConstants.lua"; sourceTree = ""; }; 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_libs.xcodeproj; path = "../../cocos2d-x/build/cocos2d_libs.xcodeproj"; sourceTree = ""; }; 15A8A4871834C90E00142BE0 /* libcurl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurl.dylib; path = usr/lib/libcurl.dylib; sourceTree = SDKROOT; }; 15AECE28195D482800907DB0 /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/MediaPlayer.framework; sourceTree = DEVELOPER_DIR; }; 15C1568D1683131500D239F2 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = "../../cocos2d-x/cocos2dx/platform/third_party/ios/libraries/libcurl.a"; sourceTree = ""; }; + 15D1FE3B1998730800302043 /* bitExtend.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = bitExtend.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/bitExtend.lua"; sourceTree = ""; }; + 15D1FE3C1998730800302043 /* Cocos2d.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2d.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/Cocos2d.lua"; sourceTree = ""; }; + 15D1FE3D1998730800302043 /* Cocos2dConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2dConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/Cocos2dConstants.lua"; sourceTree = ""; }; + 15D1FE3E1998730800302043 /* DeprecatedCocos2dClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dClass.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dClass.lua"; sourceTree = ""; }; + 15D1FE3F1998730800302043 /* DeprecatedCocos2dEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dEnum.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dEnum.lua"; sourceTree = ""; }; + 15D1FE401998730800302043 /* DeprecatedCocos2dFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dFunc.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dFunc.lua"; sourceTree = ""; }; + 15D1FE411998730800302043 /* DeprecatedOpenglEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedOpenglEnum.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/DeprecatedOpenglEnum.lua"; sourceTree = ""; }; + 15D1FE421998730800302043 /* DrawPrimitives.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DrawPrimitives.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/DrawPrimitives.lua"; sourceTree = ""; }; + 15D1FE431998730800302043 /* extern.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = extern.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/extern.lua"; sourceTree = ""; }; + 15D1FE441998730800302043 /* json.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/json.lua"; sourceTree = ""; }; + 15D1FE451998730800302043 /* luaj.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaj.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/luaj.lua"; sourceTree = ""; }; + 15D1FE461998730800302043 /* luaoc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaoc.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/luaoc.lua"; sourceTree = ""; }; + 15D1FE471998730800302043 /* Opengl.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Opengl.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/Opengl.lua"; sourceTree = ""; }; + 15D1FE481998730800302043 /* OpenglConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OpenglConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/OpenglConstants.lua"; sourceTree = ""; }; + 15D1FE651998732700302043 /* AudioEngine.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AudioEngine.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocosdenshion/AudioEngine.lua"; sourceTree = ""; }; + 15D1FE661998732700302043 /* DeprecatedCocosDenshionClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosDenshionClass.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionClass.lua"; sourceTree = ""; }; + 15D1FE671998732700302043 /* DeprecatedCocosDenshionFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosDenshionFunc.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionFunc.lua"; sourceTree = ""; }; 1AF4C402178663F200122817 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; 5023810717EBBCAC00990C9B /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = ""; }; 5023810817EBBCAC00990C9B /* AppController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppController.mm; sourceTree = ""; }; @@ -500,17 +502,6 @@ C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_lua_bindings.xcodeproj; path = "../../cocos2d-x/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj"; sourceTree = ""; }; C03781B718BF655400FE4F13 /* res */ = {isa = PBXFileReference; lastKnownFileType = folder; name = res; path = ../../../res; sourceTree = ""; }; C03781B818BF655400FE4F13 /* src */ = {isa = PBXFileReference; lastKnownFileType = folder; name = src; path = ../../../src; sourceTree = ""; }; - C03781BD18BF656900FE4F13 /* AudioEngine.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AudioEngine.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/AudioEngine.lua"; sourceTree = ""; }; - C03781BF18BF656900FE4F13 /* Cocos2d.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2d.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/Cocos2d.lua"; sourceTree = ""; }; - C03781C018BF656900FE4F13 /* Cocos2dConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2dConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/Cocos2dConstants.lua"; sourceTree = ""; }; - C03781C518BF656A00FE4F13 /* DeprecatedOpenglEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedOpenglEnum.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DeprecatedOpenglEnum.lua"; sourceTree = ""; }; - C03781C618BF656A00FE4F13 /* DrawPrimitives.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DrawPrimitives.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DrawPrimitives.lua"; sourceTree = ""; }; - C03781C718BF656A00FE4F13 /* extern.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = extern.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/extern.lua"; sourceTree = ""; }; - C03781C918BF656A00FE4F13 /* json.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/json.lua"; sourceTree = ""; }; - C03781CA18BF656A00FE4F13 /* luaj.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaj.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/luaj.lua"; sourceTree = ""; }; - C03781CB18BF656A00FE4F13 /* luaoc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaoc.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/luaoc.lua"; sourceTree = ""; }; - C03781CC18BF656A00FE4F13 /* Opengl.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Opengl.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/Opengl.lua"; sourceTree = ""; }; - C03781CD18BF656A00FE4F13 /* OpenglConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OpenglConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/OpenglConstants.lua"; sourceTree = ""; }; C06E23C318CEF9740093C81A /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = ""; }; D6B061341803AC000077942B /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/CoreMotion.framework; sourceTree = DEVELOPER_DIR; }; F293B3C815EB7BE500256477 /* HelloLua iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HelloLua iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -608,26 +599,23 @@ 1A0227A417A3AA1A00B867AD /* Lua Common */ = { isa = PBXGroup; children = ( - 15427D68198F82DA00DC375D /* DeprecatedCocos2dClass.lua */, - 15427D69198F82DA00DC375D /* DeprecatedCocos2dEnum.lua */, - 15427D6A198F82DA00DC375D /* DeprecatedCocos2dFunc.lua */, - 15427D6B198F82DA00DC375D /* DeprecatedCocosDenshionClass.lua */, - 15427D6C198F82DA00DC375D /* DeprecatedCocosDenshionFunc.lua */, - 15427D6D198F82DA00DC375D /* DeprecatedNetworkClass.lua */, - 15427D6E198F82DA00DC375D /* DeprecatedNetworkEnum.lua */, - 15427D6F198F82DA00DC375D /* DeprecatedNetworkFunc.lua */, - 15427D70198F82DA00DC375D /* NetworkConstants.lua */, - C03781BD18BF656900FE4F13 /* AudioEngine.lua */, - C03781BF18BF656900FE4F13 /* Cocos2d.lua */, - C03781C018BF656900FE4F13 /* Cocos2dConstants.lua */, - C03781C518BF656A00FE4F13 /* DeprecatedOpenglEnum.lua */, - C03781C618BF656A00FE4F13 /* DrawPrimitives.lua */, - C03781C718BF656A00FE4F13 /* extern.lua */, - C03781C918BF656A00FE4F13 /* json.lua */, - C03781CA18BF656A00FE4F13 /* luaj.lua */, - C03781CB18BF656A00FE4F13 /* luaoc.lua */, - C03781CC18BF656A00FE4F13 /* Opengl.lua */, - C03781CD18BF656A00FE4F13 /* OpenglConstants.lua */, + 15D1FE651998732700302043 /* AudioEngine.lua */, + 15D1FE661998732700302043 /* DeprecatedCocosDenshionClass.lua */, + 15D1FE671998732700302043 /* DeprecatedCocosDenshionFunc.lua */, + 15D1FE3B1998730800302043 /* bitExtend.lua */, + 15D1FE3C1998730800302043 /* Cocos2d.lua */, + 15D1FE3D1998730800302043 /* Cocos2dConstants.lua */, + 15D1FE3E1998730800302043 /* DeprecatedCocos2dClass.lua */, + 15D1FE3F1998730800302043 /* DeprecatedCocos2dEnum.lua */, + 15D1FE401998730800302043 /* DeprecatedCocos2dFunc.lua */, + 15D1FE411998730800302043 /* DeprecatedOpenglEnum.lua */, + 15D1FE421998730800302043 /* DrawPrimitives.lua */, + 15D1FE431998730800302043 /* extern.lua */, + 15D1FE441998730800302043 /* json.lua */, + 15D1FE451998730800302043 /* luaj.lua */, + 15D1FE461998730800302043 /* luaoc.lua */, + 15D1FE471998730800302043 /* Opengl.lua */, + 15D1FE481998730800302043 /* OpenglConstants.lua */, ); name = "Lua Common"; sourceTree = ""; @@ -1125,29 +1113,26 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - C03781EE18BF656A00FE4F13 /* Opengl.lua in Resources */, - 15427D7A198F82DA00DC375D /* DeprecatedCocosDenshionFunc.lua in Resources */, - C03781F018BF656A00FE4F13 /* OpenglConstants.lua in Resources */, - C03781E418BF656A00FE4F13 /* extern.lua in Resources */, - C03781D418BF656A00FE4F13 /* Cocos2d.lua in Resources */, + 15D1FE4A1998730800302043 /* bitExtend.lua in Resources */, + 15D1FE561998730800302043 /* DeprecatedOpenglEnum.lua in Resources */, + 15D1FE641998730800302043 /* OpenglConstants.lua in Resources */, + 15D1FE541998730800302043 /* DeprecatedCocos2dFunc.lua in Resources */, C03781BA18BF655400FE4F13 /* res in Resources */, + 15D1FE691998732700302043 /* AudioEngine.lua in Resources */, + 15D1FE601998730800302043 /* luaoc.lua in Resources */, + 15D1FE5E1998730800302043 /* luaj.lua in Resources */, + 15D1FE6B1998732700302043 /* DeprecatedCocosDenshionClass.lua in Resources */, + 15D1FE5A1998730800302043 /* extern.lua in Resources */, + 15D1FE501998730800302043 /* DeprecatedCocos2dClass.lua in Resources */, + 15D1FE581998730800302043 /* DrawPrimitives.lua in Resources */, + 15D1FE5C1998730800302043 /* json.lua in Resources */, + 15D1FE4E1998730800302043 /* Cocos2dConstants.lua in Resources */, + 15D1FE521998730800302043 /* DeprecatedCocos2dEnum.lua in Resources */, + 15D1FE6D1998732700302043 /* DeprecatedCocosDenshionFunc.lua in Resources */, + 15D1FE4C1998730800302043 /* Cocos2d.lua in Resources */, C03781BC18BF655400FE4F13 /* src in Resources */, - C03781E218BF656A00FE4F13 /* DrawPrimitives.lua in Resources */, - C03781E018BF656A00FE4F13 /* DeprecatedOpenglEnum.lua in Resources */, - C03781EC18BF656A00FE4F13 /* luaoc.lua in Resources */, - 15427D7C198F82DA00DC375D /* DeprecatedNetworkClass.lua in Resources */, 5023817617EBBE3400990C9B /* Icon.icns in Resources */, - C03781D018BF656A00FE4F13 /* AudioEngine.lua in Resources */, - 15427D76198F82DA00DC375D /* DeprecatedCocos2dFunc.lua in Resources */, - 15427D7E198F82DA00DC375D /* DeprecatedNetworkEnum.lua in Resources */, - 15427D80198F82DA00DC375D /* DeprecatedNetworkFunc.lua in Resources */, - C03781EA18BF656A00FE4F13 /* luaj.lua in Resources */, - 15427D74198F82DA00DC375D /* DeprecatedCocos2dEnum.lua in Resources */, - C03781E818BF656A00FE4F13 /* json.lua in Resources */, - 15427D82198F82DA00DC375D /* NetworkConstants.lua in Resources */, - 15427D72198F82DA00DC375D /* DeprecatedCocos2dClass.lua in Resources */, - 15427D78198F82DA00DC375D /* DeprecatedCocosDenshionClass.lua in Resources */, - C03781D618BF656A00FE4F13 /* Cocos2dConstants.lua in Resources */, + 15D1FE621998730800302043 /* Opengl.lua in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1156,43 +1141,40 @@ buildActionMask = 2147483647; files = ( 15A8A4491834C64F00142BE0 /* Icon-114.png in Resources */, - 15427D7D198F82DA00DC375D /* DeprecatedNetworkEnum.lua in Resources */, 5023811D17EBBCAC00990C9B /* Icon-120.png in Resources */, 5091733B17ECE17A00D62437 /* Icon-100.png in Resources */, - C03781E918BF656A00FE4F13 /* luaj.lua in Resources */, 5023811B17EBBCAC00990C9B /* Default@2x.png in Resources */, 5091733617ECE17A00D62437 /* Icon-29.png in Resources */, - C03781E718BF656A00FE4F13 /* json.lua in Resources */, + 15D1FE631998730800302043 /* OpenglConstants.lua in Resources */, + 15D1FE5D1998730800302043 /* luaj.lua in Resources */, 5023811917EBBCAC00990C9B /* Default-568h@2x.png in Resources */, - C03781D318BF656A00FE4F13 /* Cocos2d.lua in Resources */, 5091733917ECE17A00D62437 /* Icon-58.png in Resources */, - 15427D81198F82DA00DC375D /* NetworkConstants.lua in Resources */, - C03781ED18BF656A00FE4F13 /* Opengl.lua in Resources */, 5023811F17EBBCAC00990C9B /* Icon-152.png in Resources */, - 15427D7F198F82DA00DC375D /* DeprecatedNetworkFunc.lua in Resources */, - 15427D71198F82DA00DC375D /* DeprecatedCocos2dClass.lua in Resources */, 5023812017EBBCAC00990C9B /* Icon-57.png in Resources */, - 15427D73198F82DA00DC375D /* DeprecatedCocos2dEnum.lua in Resources */, - C03781CF18BF656A00FE4F13 /* AudioEngine.lua in Resources */, C03781B918BF655400FE4F13 /* res in Resources */, - 15427D75198F82DA00DC375D /* DeprecatedCocos2dFunc.lua in Resources */, - C03781EF18BF656A00FE4F13 /* OpenglConstants.lua in Resources */, + 15D1FE5B1998730800302043 /* json.lua in Resources */, 5023812217EBBCAC00990C9B /* Icon-76.png in Resources */, - C03781DF18BF656A00FE4F13 /* DeprecatedOpenglEnum.lua in Resources */, + 15D1FE681998732700302043 /* AudioEngine.lua in Resources */, + 15D1FE4D1998730800302043 /* Cocos2dConstants.lua in Resources */, + 15D1FE4F1998730800302043 /* DeprecatedCocos2dClass.lua in Resources */, 5091733A17ECE17A00D62437 /* Icon-80.png in Resources */, + 15D1FE6A1998732700302043 /* DeprecatedCocosDenshionClass.lua in Resources */, + 15D1FE571998730800302043 /* DrawPrimitives.lua in Resources */, + 15D1FE4B1998730800302043 /* Cocos2d.lua in Resources */, 5091733717ECE17A00D62437 /* Icon-40.png in Resources */, + 15D1FE5F1998730800302043 /* luaoc.lua in Resources */, 5023811E17EBBCAC00990C9B /* Icon-144.png in Resources */, 5023811A17EBBCAC00990C9B /* Default.png in Resources */, - C03781E118BF656A00FE4F13 /* DrawPrimitives.lua in Resources */, + 15D1FE511998730800302043 /* DeprecatedCocos2dEnum.lua in Resources */, + 15D1FE531998730800302043 /* DeprecatedCocos2dFunc.lua in Resources */, C03781BB18BF655400FE4F13 /* src in Resources */, - C03781EB18BF656A00FE4F13 /* luaoc.lua in Resources */, - 15427D77198F82DA00DC375D /* DeprecatedCocosDenshionClass.lua in Resources */, + 15D1FE591998730800302043 /* extern.lua in Resources */, + 15D1FE551998730800302043 /* DeprecatedOpenglEnum.lua in Resources */, + 15D1FE6C1998732700302043 /* DeprecatedCocosDenshionFunc.lua in Resources */, + 15D1FE611998730800302043 /* Opengl.lua in Resources */, 5091733817ECE17A00D62437 /* Icon-50.png in Resources */, - C03781D518BF656A00FE4F13 /* Cocos2dConstants.lua in Resources */, - 15427D79198F82DA00DC375D /* DeprecatedCocosDenshionFunc.lua in Resources */, + 15D1FE491998730800302043 /* bitExtend.lua in Resources */, 5023812117EBBCAC00990C9B /* Icon-72.png in Resources */, - C03781E318BF656A00FE4F13 /* extern.lua in Resources */, - 15427D7B198F82DA00DC375D /* DeprecatedNetworkClass.lua in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj index 9fdd055083..5762e3d1ec 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj +++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj @@ -104,12 +104,13 @@ - xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script" "$(ProjectDir)..\..\..\" /e /Y + xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocos2d" "$(ProjectDir)..\..\..\" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocosdenshion" "$(ProjectDir)..\..\..\" /e /Y copy files - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" + + @@ -151,12 +152,13 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" - xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script" "$(ProjectDir)..\..\..\" /e /Y + xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocos2d" "$(ProjectDir)..\..\..\" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocosdenshion" "$(ProjectDir)..\..\..\" /e /Y copy files - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" + + diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/build-cfg.json b/templates/lua-template-default/frameworks/runtime-src/proj.win32/build-cfg.json index 48d47e369f..051f1647e3 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/build-cfg.json +++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/build-cfg.json @@ -9,7 +9,11 @@ "to": "res" }, { - "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script", + "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d", + "to": "" + }, + { + "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocosdenshion", "to": "" } ] diff --git a/templates/lua-template-runtime/cocos-project-template.json b/templates/lua-template-runtime/cocos-project-template.json index fe5231abd3..bece211bc9 100644 --- a/templates/lua-template-runtime/cocos-project-template.json +++ b/templates/lua-template-runtime/cocos-project-template.json @@ -14,17 +14,32 @@ }, "append_dir": [ { - "from": "cocos/scripting/lua-bindings/script", + "from": "cocos/scripting/lua-bindings/script/cocos2d", "to": "runtime/mac/PrebuiltRuntimeLua.app/Contents/Resources", "exclude": [] }, { - "from": "cocos/scripting/lua-bindings/script", + "from": "cocos/scripting/lua-bindings/script/cocos2d", "to": "runtime/ios/PrebuiltRuntimeLua.app", "exclude": [] }, { - "from": "cocos/scripting/lua-bindings/script", + "from": "cocos/scripting/lua-bindings/script/cocos2d", + "to": "runtime/win32", + "exclude": [] + }, + { + "from": "cocos/scripting/lua-bindings/script/cocosdenshion", + "to": "runtime/mac/PrebuiltRuntimeLua.app/Contents/Resources", + "exclude": [] + }, + { + "from": "cocos/scripting/lua-bindings/script/cocosdenshion", + "to": "runtime/ios/PrebuiltRuntimeLua.app", + "exclude": [] + }, + { + "from": "cocos/scripting/lua-bindings/script/cocosdenshion", "to": "runtime/win32", "exclude": [] }, diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/build-cfg.json b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/build-cfg.json index ad111cc1f2..1d3aee4fa1 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/build-cfg.json +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/build-cfg.json @@ -23,19 +23,16 @@ ], "must_copy_resources": [ { - "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script", + "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d", + "to": "" + }, + { + "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocosdenshion", "to": "" }, { "from": "../../../config.json", "to": "" - }, - { - "from": "../../cocos2d-x/external/lua/luasocket", - "to": "", - "include": [ - "*.lua" - ] } ] } diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj index ab7357d759..95c3eb54e2 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj @@ -17,18 +17,42 @@ 15427CEE198F24AF00DC375D /* libcocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4171834BDA200142BE0 /* libcocos2d Mac.a */; }; 15427CEF198F24BD00DC375D /* libcocosdenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A41F1834BDA200142BE0 /* libcocosdenshion Mac.a */; }; 15427CF0198F24C400DC375D /* libnetwork Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C98198F220600DC375D /* libnetwork Mac.a */; }; - 15427DA8198F83E600DC375D /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427DA3198F83E600DC375D /* DeprecatedCocos2dClass.lua */; }; - 15427DA9198F83E600DC375D /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427DA3198F83E600DC375D /* DeprecatedCocos2dClass.lua */; }; - 15427DAA198F83E600DC375D /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427DA4198F83E600DC375D /* DeprecatedCocos2dEnum.lua */; }; - 15427DAB198F83E600DC375D /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427DA4198F83E600DC375D /* DeprecatedCocos2dEnum.lua */; }; - 15427DAC198F83E600DC375D /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427DA5198F83E600DC375D /* DeprecatedCocos2dFunc.lua */; }; - 15427DAD198F83E600DC375D /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427DA5198F83E600DC375D /* DeprecatedCocos2dFunc.lua */; }; - 15427DAE198F83E600DC375D /* DeprecatedCocosDenshionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427DA6198F83E600DC375D /* DeprecatedCocosDenshionClass.lua */; }; - 15427DAF198F83E600DC375D /* DeprecatedCocosDenshionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427DA6198F83E600DC375D /* DeprecatedCocosDenshionClass.lua */; }; - 15427DB0198F83E600DC375D /* DeprecatedCocosDenshionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427DA7198F83E600DC375D /* DeprecatedCocosDenshionFunc.lua */; }; - 15427DB1198F83E600DC375D /* DeprecatedCocosDenshionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15427DA7198F83E600DC375D /* DeprecatedCocosDenshionFunc.lua */; }; 15A8A4491834C64F00142BE0 /* Icon-114.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023810C17EBBCAC00990C9B /* Icon-114.png */; }; 15A8A4881834C90F00142BE0 /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4871834C90E00142BE0 /* libcurl.dylib */; }; + 15D1FDF81998714100302043 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDEA1998714100302043 /* bitExtend.lua */; }; + 15D1FDF91998714100302043 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDEA1998714100302043 /* bitExtend.lua */; }; + 15D1FDFA1998714100302043 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDEB1998714100302043 /* Cocos2d.lua */; }; + 15D1FDFB1998714100302043 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDEB1998714100302043 /* Cocos2d.lua */; }; + 15D1FDFC1998714100302043 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDEC1998714100302043 /* Cocos2dConstants.lua */; }; + 15D1FDFD1998714100302043 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDEC1998714100302043 /* Cocos2dConstants.lua */; }; + 15D1FDFE1998714100302043 /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDED1998714100302043 /* DeprecatedCocos2dClass.lua */; }; + 15D1FDFF1998714100302043 /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDED1998714100302043 /* DeprecatedCocos2dClass.lua */; }; + 15D1FE001998714100302043 /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDEE1998714100302043 /* DeprecatedCocos2dEnum.lua */; }; + 15D1FE011998714100302043 /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDEE1998714100302043 /* DeprecatedCocos2dEnum.lua */; }; + 15D1FE021998714100302043 /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDEF1998714100302043 /* DeprecatedCocos2dFunc.lua */; }; + 15D1FE031998714100302043 /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDEF1998714100302043 /* DeprecatedCocos2dFunc.lua */; }; + 15D1FE041998714100302043 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDF01998714100302043 /* DeprecatedOpenglEnum.lua */; }; + 15D1FE051998714100302043 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDF01998714100302043 /* DeprecatedOpenglEnum.lua */; }; + 15D1FE061998714100302043 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDF11998714100302043 /* DrawPrimitives.lua */; }; + 15D1FE071998714100302043 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDF11998714100302043 /* DrawPrimitives.lua */; }; + 15D1FE081998714100302043 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDF21998714100302043 /* extern.lua */; }; + 15D1FE091998714100302043 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDF21998714100302043 /* extern.lua */; }; + 15D1FE0A1998714100302043 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDF31998714100302043 /* json.lua */; }; + 15D1FE0B1998714100302043 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDF31998714100302043 /* json.lua */; }; + 15D1FE0C1998714100302043 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDF41998714100302043 /* luaj.lua */; }; + 15D1FE0D1998714100302043 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDF41998714100302043 /* luaj.lua */; }; + 15D1FE0E1998714100302043 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDF51998714100302043 /* luaoc.lua */; }; + 15D1FE0F1998714100302043 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDF51998714100302043 /* luaoc.lua */; }; + 15D1FE101998714100302043 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDF61998714100302043 /* Opengl.lua */; }; + 15D1FE111998714100302043 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDF61998714100302043 /* Opengl.lua */; }; + 15D1FE121998714100302043 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDF71998714100302043 /* OpenglConstants.lua */; }; + 15D1FE131998714100302043 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDF71998714100302043 /* OpenglConstants.lua */; }; + 15D1FE171998715500302043 /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE141998715500302043 /* AudioEngine.lua */; }; + 15D1FE181998715500302043 /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE141998715500302043 /* AudioEngine.lua */; }; + 15D1FE191998715500302043 /* DeprecatedCocosDenshionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE151998715500302043 /* DeprecatedCocosDenshionClass.lua */; }; + 15D1FE1A1998715500302043 /* DeprecatedCocosDenshionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE151998715500302043 /* DeprecatedCocosDenshionClass.lua */; }; + 15D1FE1B1998715500302043 /* DeprecatedCocosDenshionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE161998715500302043 /* DeprecatedCocosDenshionFunc.lua */; }; + 15D1FE1C1998715500302043 /* DeprecatedCocosDenshionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE161998715500302043 /* DeprecatedCocosDenshionFunc.lua */; }; 1AF4C403178663F200122817 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C402178663F200122817 /* libz.dylib */; }; 3EB5152C19528284006966AA /* Protos.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3EB5152A19528284006966AA /* Protos.pb.cc */; }; 3EB5152D19528284006966AA /* Protos.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3EB5152A19528284006966AA /* Protos.pb.cc */; }; @@ -107,28 +131,6 @@ C03781BA18BF655400FE4F13 /* res in Resources */ = {isa = PBXBuildFile; fileRef = C03781B718BF655400FE4F13 /* res */; }; C03781BB18BF655400FE4F13 /* src in Resources */ = {isa = PBXBuildFile; fileRef = C03781B818BF655400FE4F13 /* src */; }; C03781BC18BF655400FE4F13 /* src in Resources */ = {isa = PBXBuildFile; fileRef = C03781B818BF655400FE4F13 /* src */; }; - C03781CF18BF656A00FE4F13 /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781BD18BF656900FE4F13 /* AudioEngine.lua */; }; - C03781D018BF656A00FE4F13 /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781BD18BF656900FE4F13 /* AudioEngine.lua */; }; - C03781D318BF656A00FE4F13 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781BF18BF656900FE4F13 /* Cocos2d.lua */; }; - C03781D418BF656A00FE4F13 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781BF18BF656900FE4F13 /* Cocos2d.lua */; }; - C03781D518BF656A00FE4F13 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C018BF656900FE4F13 /* Cocos2dConstants.lua */; }; - C03781D618BF656A00FE4F13 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C018BF656900FE4F13 /* Cocos2dConstants.lua */; }; - C03781DF18BF656A00FE4F13 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C518BF656A00FE4F13 /* DeprecatedOpenglEnum.lua */; }; - C03781E018BF656A00FE4F13 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C518BF656A00FE4F13 /* DeprecatedOpenglEnum.lua */; }; - C03781E118BF656A00FE4F13 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C618BF656A00FE4F13 /* DrawPrimitives.lua */; }; - C03781E218BF656A00FE4F13 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C618BF656A00FE4F13 /* DrawPrimitives.lua */; }; - C03781E318BF656A00FE4F13 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C718BF656A00FE4F13 /* extern.lua */; }; - C03781E418BF656A00FE4F13 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C718BF656A00FE4F13 /* extern.lua */; }; - C03781E718BF656A00FE4F13 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C918BF656A00FE4F13 /* json.lua */; }; - C03781E818BF656A00FE4F13 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C918BF656A00FE4F13 /* json.lua */; }; - C03781E918BF656A00FE4F13 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CA18BF656A00FE4F13 /* luaj.lua */; }; - C03781EA18BF656A00FE4F13 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CA18BF656A00FE4F13 /* luaj.lua */; }; - C03781EB18BF656A00FE4F13 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CB18BF656A00FE4F13 /* luaoc.lua */; }; - C03781EC18BF656A00FE4F13 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CB18BF656A00FE4F13 /* luaoc.lua */; }; - C03781ED18BF656A00FE4F13 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CC18BF656A00FE4F13 /* Opengl.lua */; }; - C03781EE18BF656A00FE4F13 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CC18BF656A00FE4F13 /* Opengl.lua */; }; - C03781EF18BF656A00FE4F13 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CD18BF656A00FE4F13 /* OpenglConstants.lua */; }; - C03781F018BF656A00FE4F13 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CD18BF656A00FE4F13 /* OpenglConstants.lua */; }; C05D1C121923449100B808A4 /* config.json in Resources */ = {isa = PBXBuildFile; fileRef = C05D1C111923449100B808A4 /* config.json */; }; C05D1C131923449100B808A4 /* config.json in Resources */ = {isa = PBXBuildFile; fileRef = C05D1C111923449100B808A4 /* config.json */; }; C0619CD71896894800872C26 /* Runtime_ios-mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = C0619CD61896894800872C26 /* Runtime_ios-mac.mm */; }; @@ -331,20 +333,6 @@ remoteGlobalIDString = 15EFA616198B2DAA000C57D3; remoteInfo = "libluacocos2d iOS"; }; - 15427CD7198F223300DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 15C1BEEE19865A0600A46ACC; - remoteInfo = "libluacocosdenshion Mac"; - }; - 15427CD9198F223300DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 15C1C255198748D200A46ACC; - remoteInfo = "libluacocos2d Mac"; - }; 15427CDB198F223300DC375D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; @@ -457,6 +445,20 @@ remoteGlobalIDString = A07A4FB4178387730073F6A7; remoteInfo = "CocosDenshion iOS"; }; + 15D1F3081994BBCA00302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A07A4C241783777C0073F6A7; + remoteInfo = "libcocos2d iOS"; + }; + 15D1F30A1994BBE500302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A07A4F9F178387730073F6A7; + remoteInfo = "libcocosdenshion iOS"; + }; C0A2F03C18975FEB0072A7AB /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; @@ -475,14 +477,26 @@ /* Begin PBXFileReference section */ 15427CE2198F237300DC375D /* lua_module_register.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lua_module_register.h; path = ../Classes/lua_module_register.h; sourceTree = ""; }; - 15427DA3198F83E600DC375D /* DeprecatedCocos2dClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dClass.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DeprecatedCocos2dClass.lua"; sourceTree = ""; }; - 15427DA4198F83E600DC375D /* DeprecatedCocos2dEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dEnum.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DeprecatedCocos2dEnum.lua"; sourceTree = ""; }; - 15427DA5198F83E600DC375D /* DeprecatedCocos2dFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dFunc.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DeprecatedCocos2dFunc.lua"; sourceTree = ""; }; - 15427DA6198F83E600DC375D /* DeprecatedCocosDenshionClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosDenshionClass.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DeprecatedCocosDenshionClass.lua"; sourceTree = ""; }; - 15427DA7198F83E600DC375D /* DeprecatedCocosDenshionFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosDenshionFunc.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DeprecatedCocosDenshionFunc.lua"; sourceTree = ""; }; 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_libs.xcodeproj; path = "../../cocos2d-x/build/cocos2d_libs.xcodeproj"; sourceTree = ""; }; 15A8A4871834C90E00142BE0 /* libcurl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurl.dylib; path = usr/lib/libcurl.dylib; sourceTree = SDKROOT; }; 15C1568D1683131500D239F2 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = "../../cocos2d-x/cocos2dx/platform/third_party/ios/libraries/libcurl.a"; sourceTree = ""; }; + 15D1FDEA1998714100302043 /* bitExtend.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = bitExtend.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/bitExtend.lua"; sourceTree = ""; }; + 15D1FDEB1998714100302043 /* Cocos2d.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2d.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/Cocos2d.lua"; sourceTree = ""; }; + 15D1FDEC1998714100302043 /* Cocos2dConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2dConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/Cocos2dConstants.lua"; sourceTree = ""; }; + 15D1FDED1998714100302043 /* DeprecatedCocos2dClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dClass.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dClass.lua"; sourceTree = ""; }; + 15D1FDEE1998714100302043 /* DeprecatedCocos2dEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dEnum.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dEnum.lua"; sourceTree = ""; }; + 15D1FDEF1998714100302043 /* DeprecatedCocos2dFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dFunc.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dFunc.lua"; sourceTree = ""; }; + 15D1FDF01998714100302043 /* DeprecatedOpenglEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedOpenglEnum.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/DeprecatedOpenglEnum.lua"; sourceTree = ""; }; + 15D1FDF11998714100302043 /* DrawPrimitives.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DrawPrimitives.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/DrawPrimitives.lua"; sourceTree = ""; }; + 15D1FDF21998714100302043 /* extern.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = extern.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/extern.lua"; sourceTree = ""; }; + 15D1FDF31998714100302043 /* json.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/json.lua"; sourceTree = ""; }; + 15D1FDF41998714100302043 /* luaj.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaj.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/luaj.lua"; sourceTree = ""; }; + 15D1FDF51998714100302043 /* luaoc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaoc.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/luaoc.lua"; sourceTree = ""; }; + 15D1FDF61998714100302043 /* Opengl.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Opengl.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/Opengl.lua"; sourceTree = ""; }; + 15D1FDF71998714100302043 /* OpenglConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OpenglConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/OpenglConstants.lua"; sourceTree = ""; }; + 15D1FE141998715500302043 /* AudioEngine.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AudioEngine.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocosdenshion/AudioEngine.lua"; sourceTree = ""; }; + 15D1FE151998715500302043 /* DeprecatedCocosDenshionClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosDenshionClass.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionClass.lua"; sourceTree = ""; }; + 15D1FE161998715500302043 /* DeprecatedCocosDenshionFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosDenshionFunc.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionFunc.lua"; sourceTree = ""; }; 1AF4C402178663F200122817 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; 3EB51526195187AF006966AA /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; }; 3EB5152A19528284006966AA /* Protos.pb.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Protos.pb.cc; sourceTree = ""; }; @@ -570,17 +584,6 @@ C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_lua_bindings.xcodeproj; path = "../../cocos2d-x/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj"; sourceTree = ""; }; C03781B718BF655400FE4F13 /* res */ = {isa = PBXFileReference; lastKnownFileType = folder; name = res; path = ../../../res; sourceTree = ""; }; C03781B818BF655400FE4F13 /* src */ = {isa = PBXFileReference; lastKnownFileType = folder; name = src; path = ../../../src; sourceTree = ""; }; - C03781BD18BF656900FE4F13 /* AudioEngine.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AudioEngine.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/AudioEngine.lua"; sourceTree = ""; }; - C03781BF18BF656900FE4F13 /* Cocos2d.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2d.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/Cocos2d.lua"; sourceTree = ""; }; - C03781C018BF656900FE4F13 /* Cocos2dConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2dConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/Cocos2dConstants.lua"; sourceTree = ""; }; - C03781C518BF656A00FE4F13 /* DeprecatedOpenglEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedOpenglEnum.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DeprecatedOpenglEnum.lua"; sourceTree = ""; }; - C03781C618BF656A00FE4F13 /* DrawPrimitives.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DrawPrimitives.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DrawPrimitives.lua"; sourceTree = ""; }; - C03781C718BF656A00FE4F13 /* extern.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = extern.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/extern.lua"; sourceTree = ""; }; - C03781C918BF656A00FE4F13 /* json.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/json.lua"; sourceTree = ""; }; - C03781CA18BF656A00FE4F13 /* luaj.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaj.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/luaj.lua"; sourceTree = ""; }; - C03781CB18BF656A00FE4F13 /* luaoc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaoc.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/luaoc.lua"; sourceTree = ""; }; - C03781CC18BF656A00FE4F13 /* Opengl.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Opengl.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/Opengl.lua"; sourceTree = ""; }; - C03781CD18BF656A00FE4F13 /* OpenglConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OpenglConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/OpenglConstants.lua"; sourceTree = ""; }; C05D1C111923449100B808A4 /* config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = config.json; path = ../../../config.json; sourceTree = ""; }; C0619CD61896894800872C26 /* Runtime_ios-mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "Runtime_ios-mac.mm"; sourceTree = ""; }; C06C3794191A1D1E00617BED /* ConfigParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ConfigParser.cpp; path = ../Classes/ConfigParser.cpp; sourceTree = ""; }; @@ -683,22 +686,23 @@ 1A0227A417A3AA1A00B867AD /* Lua Common */ = { isa = PBXGroup; children = ( - 15427DA3198F83E600DC375D /* DeprecatedCocos2dClass.lua */, - 15427DA4198F83E600DC375D /* DeprecatedCocos2dEnum.lua */, - 15427DA5198F83E600DC375D /* DeprecatedCocos2dFunc.lua */, - 15427DA6198F83E600DC375D /* DeprecatedCocosDenshionClass.lua */, - 15427DA7198F83E600DC375D /* DeprecatedCocosDenshionFunc.lua */, - C03781BD18BF656900FE4F13 /* AudioEngine.lua */, - C03781BF18BF656900FE4F13 /* Cocos2d.lua */, - C03781C018BF656900FE4F13 /* Cocos2dConstants.lua */, - C03781C518BF656A00FE4F13 /* DeprecatedOpenglEnum.lua */, - C03781C618BF656A00FE4F13 /* DrawPrimitives.lua */, - C03781C718BF656A00FE4F13 /* extern.lua */, - C03781C918BF656A00FE4F13 /* json.lua */, - C03781CA18BF656A00FE4F13 /* luaj.lua */, - C03781CB18BF656A00FE4F13 /* luaoc.lua */, - C03781CC18BF656A00FE4F13 /* Opengl.lua */, - C03781CD18BF656A00FE4F13 /* OpenglConstants.lua */, + 15D1FE141998715500302043 /* AudioEngine.lua */, + 15D1FE151998715500302043 /* DeprecatedCocosDenshionClass.lua */, + 15D1FE161998715500302043 /* DeprecatedCocosDenshionFunc.lua */, + 15D1FDEA1998714100302043 /* bitExtend.lua */, + 15D1FDEB1998714100302043 /* Cocos2d.lua */, + 15D1FDEC1998714100302043 /* Cocos2dConstants.lua */, + 15D1FDED1998714100302043 /* DeprecatedCocos2dClass.lua */, + 15D1FDEE1998714100302043 /* DeprecatedCocos2dEnum.lua */, + 15D1FDEF1998714100302043 /* DeprecatedCocos2dFunc.lua */, + 15D1FDF01998714100302043 /* DeprecatedOpenglEnum.lua */, + 15D1FDF11998714100302043 /* DrawPrimitives.lua */, + 15D1FDF21998714100302043 /* extern.lua */, + 15D1FDF31998714100302043 /* json.lua */, + 15D1FDF41998714100302043 /* luaj.lua */, + 15D1FDF51998714100302043 /* luaoc.lua */, + 15D1FDF61998714100302043 /* Opengl.lua */, + 15D1FDF71998714100302043 /* OpenglConstants.lua */, ); name = "Lua Common"; sourceTree = ""; @@ -989,9 +993,9 @@ buildRules = ( ); dependencies = ( + 15D1F30B1994BBE500302043 /* PBXTargetDependency */, + 15D1F3091994BBCA00302043 /* PBXTargetDependency */, 15427CE5198F23B300DC375D /* PBXTargetDependency */, - 15427CD8198F223300DC375D /* PBXTargetDependency */, - 15427CDA198F223300DC375D /* PBXTargetDependency */, 15427CDC198F223300DC375D /* PBXTargetDependency */, 15427CDE198F223300DC375D /* PBXTargetDependency */, ); @@ -1301,27 +1305,28 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - C03781EE18BF656A00FE4F13 /* Opengl.lua in Resources */, - C03781F018BF656A00FE4F13 /* OpenglConstants.lua in Resources */, - C03781E418BF656A00FE4F13 /* extern.lua in Resources */, - 15427DA9198F83E600DC375D /* DeprecatedCocos2dClass.lua in Resources */, - C03781D418BF656A00FE4F13 /* Cocos2d.lua in Resources */, C03781BA18BF655400FE4F13 /* res in Resources */, + 15D1FE131998714100302043 /* OpenglConstants.lua in Resources */, + 15D1FE071998714100302043 /* DrawPrimitives.lua in Resources */, C03781BC18BF655400FE4F13 /* src in Resources */, - C03781E218BF656A00FE4F13 /* DrawPrimitives.lua in Resources */, - C03781E018BF656A00FE4F13 /* DeprecatedOpenglEnum.lua in Resources */, - 15427DAB198F83E600DC375D /* DeprecatedCocos2dEnum.lua in Resources */, - 15427DB1198F83E600DC375D /* DeprecatedCocosDenshionFunc.lua in Resources */, - C03781EC18BF656A00FE4F13 /* luaoc.lua in Resources */, - 15427DAF198F83E600DC375D /* DeprecatedCocosDenshionClass.lua in Resources */, + 15D1FE111998714100302043 /* Opengl.lua in Resources */, C07828F918B4D72E00BD2287 /* MainMenu.xib in Resources */, + 15D1FE0D1998714100302043 /* luaj.lua in Resources */, + 15D1FE051998714100302043 /* DeprecatedOpenglEnum.lua in Resources */, 5023817617EBBE3400990C9B /* Icon.icns in Resources */, - 15427DAD198F83E600DC375D /* DeprecatedCocos2dFunc.lua in Resources */, - C03781D018BF656A00FE4F13 /* AudioEngine.lua in Resources */, - C03781EA18BF656A00FE4F13 /* luaj.lua in Resources */, - C03781E818BF656A00FE4F13 /* json.lua in Resources */, - C03781D618BF656A00FE4F13 /* Cocos2dConstants.lua in Resources */, + 15D1FE031998714100302043 /* DeprecatedCocos2dFunc.lua in Resources */, + 15D1FDFF1998714100302043 /* DeprecatedCocos2dClass.lua in Resources */, + 15D1FE1C1998715500302043 /* DeprecatedCocosDenshionFunc.lua in Resources */, + 15D1FDF91998714100302043 /* bitExtend.lua in Resources */, + 15D1FE011998714100302043 /* DeprecatedCocos2dEnum.lua in Resources */, + 15D1FE0B1998714100302043 /* json.lua in Resources */, + 15D1FE091998714100302043 /* extern.lua in Resources */, + 15D1FE1A1998715500302043 /* DeprecatedCocosDenshionClass.lua in Resources */, C05D1C131923449100B808A4 /* config.json in Resources */, + 15D1FE0F1998714100302043 /* luaoc.lua in Resources */, + 15D1FDFD1998714100302043 /* Cocos2dConstants.lua in Resources */, + 15D1FDFB1998714100302043 /* Cocos2d.lua in Resources */, + 15D1FE181998715500302043 /* AudioEngine.lua in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1329,41 +1334,42 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 15D1FDF81998714100302043 /* bitExtend.lua in Resources */, 15A8A4491834C64F00142BE0 /* Icon-114.png in Resources */, 5023811D17EBBCAC00990C9B /* Icon-120.png in Resources */, 5091733B17ECE17A00D62437 /* Icon-100.png in Resources */, - C03781E918BF656A00FE4F13 /* luaj.lua in Resources */, 5023811B17EBBCAC00990C9B /* Default@2x.png in Resources */, + 15D1FDFE1998714100302043 /* DeprecatedCocos2dClass.lua in Resources */, 5091733617ECE17A00D62437 /* Icon-29.png in Resources */, - 15427DB0198F83E600DC375D /* DeprecatedCocosDenshionFunc.lua in Resources */, - C03781E718BF656A00FE4F13 /* json.lua in Resources */, + 15D1FE061998714100302043 /* DrawPrimitives.lua in Resources */, + 15D1FE191998715500302043 /* DeprecatedCocosDenshionClass.lua in Resources */, + 15D1FDFA1998714100302043 /* Cocos2d.lua in Resources */, 5023811917EBBCAC00990C9B /* Default-568h@2x.png in Resources */, - C03781D318BF656A00FE4F13 /* Cocos2d.lua in Resources */, + 15D1FE0C1998714100302043 /* luaj.lua in Resources */, 5091733917ECE17A00D62437 /* Icon-58.png in Resources */, - C03781ED18BF656A00FE4F13 /* Opengl.lua in Resources */, + 15D1FE121998714100302043 /* OpenglConstants.lua in Resources */, + 15D1FE021998714100302043 /* DeprecatedCocos2dFunc.lua in Resources */, 5023811F17EBBCAC00990C9B /* Icon-152.png in Resources */, 5023812017EBBCAC00990C9B /* Icon-57.png in Resources */, - C03781CF18BF656A00FE4F13 /* AudioEngine.lua in Resources */, - 15427DAE198F83E600DC375D /* DeprecatedCocosDenshionClass.lua in Resources */, + 15D1FE001998714100302043 /* DeprecatedCocos2dEnum.lua in Resources */, C03781B918BF655400FE4F13 /* res in Resources */, - C03781EF18BF656A00FE4F13 /* OpenglConstants.lua in Resources */, - 15427DAC198F83E600DC375D /* DeprecatedCocos2dFunc.lua in Resources */, + 15D1FE1B1998715500302043 /* DeprecatedCocosDenshionFunc.lua in Resources */, 5023812217EBBCAC00990C9B /* Icon-76.png in Resources */, - C03781DF18BF656A00FE4F13 /* DeprecatedOpenglEnum.lua in Resources */, 5091733A17ECE17A00D62437 /* Icon-80.png in Resources */, + 15D1FE0A1998714100302043 /* json.lua in Resources */, + 15D1FE041998714100302043 /* DeprecatedOpenglEnum.lua in Resources */, 5091733717ECE17A00D62437 /* Icon-40.png in Resources */, 5023811E17EBBCAC00990C9B /* Icon-144.png in Resources */, 5023811A17EBBCAC00990C9B /* Default.png in Resources */, - C03781E118BF656A00FE4F13 /* DrawPrimitives.lua in Resources */, - 15427DAA198F83E600DC375D /* DeprecatedCocos2dEnum.lua in Resources */, + 15D1FE171998715500302043 /* AudioEngine.lua in Resources */, C03781BB18BF655400FE4F13 /* src in Resources */, - C03781EB18BF656A00FE4F13 /* luaoc.lua in Resources */, 5091733817ECE17A00D62437 /* Icon-50.png in Resources */, - C03781D518BF656A00FE4F13 /* Cocos2dConstants.lua in Resources */, - 15427DA8198F83E600DC375D /* DeprecatedCocos2dClass.lua in Resources */, + 15D1FE081998714100302043 /* extern.lua in Resources */, 5023812117EBBCAC00990C9B /* Icon-72.png in Resources */, + 15D1FDFC1998714100302043 /* Cocos2dConstants.lua in Resources */, C05D1C121923449100B808A4 /* config.json in Resources */, - C03781E318BF656A00FE4F13 /* extern.lua in Resources */, + 15D1FE0E1998714100302043 /* luaoc.lua in Resources */, + 15D1FE101998714100302043 /* Opengl.lua in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1467,16 +1473,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 15427CD8198F223300DC375D /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluacocosdenshion Mac"; - targetProxy = 15427CD7198F223300DC375D /* PBXContainerItemProxy */; - }; - 15427CDA198F223300DC375D /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluacocos2d Mac"; - targetProxy = 15427CD9198F223300DC375D /* PBXContainerItemProxy */; - }; 15427CDC198F223300DC375D /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "libluacocosdenshion iOS"; @@ -1507,6 +1503,16 @@ name = "libluacocosdenshion Mac"; targetProxy = 15427CEA198F246A00DC375D /* PBXContainerItemProxy */; }; + 15D1F3091994BBCA00302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libcocos2d iOS"; + targetProxy = 15D1F3081994BBCA00302043 /* PBXContainerItemProxy */; + }; + 15D1F30B1994BBE500302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libcocosdenshion iOS"; + targetProxy = 15D1F30A1994BBE500302043 /* PBXContainerItemProxy */; + }; C0A2F03D18975FEB0072A7AB /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "CocosDenshion Mac"; diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj index 51db909ba1..6bdeabdb2a 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj @@ -108,14 +108,14 @@ - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script" "$(ProjectDir)..\..\..\runtime\win32\" /e /Y -xcopy "$(ProjectDir)..\..\cocos2d-x\external\lua\luasocket\*.lua" "$(ProjectDir)..\..\..\runtime\win32\" /e /Y + if not exist "$(LocalDebuggerWorkingDirectory)" mkdir "$(LocalDebuggerWorkingDirectory)" +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocos2d" "$(LocalDebuggerWorkingDirectory)" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocosdenshion" "$(LocalDebuggerWorkingDirectory)" /e /Y copy files - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" + + xcopy /Y /Q "$(OutDir)*.dll" "$(ProjectDir)..\..\..\runtime\win32\" @@ -162,21 +162,22 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" - if not exist "$(OutDir)" mkdir "$(OutDir)" -if exist "$(OutDir)\Resource" rd /s /q "$(OutDir)\Resource" -mkdir "$(OutDir)\Resource" -mkdir "$(OutDir)\Resource\src" -mkdir "$(OutDir)\Resource\res" -xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script" "$(OutDir)\Resource" /e /Y -xcopy "$(ProjectDir)..\..\..\src" "$(OutDir)\Resource\src" /e /Y -xcopy "$(ProjectDir)..\..\..\res" "$(OutDir)\Resource\res" /e /Y -copy "$(ProjectDir)..\..\..\config.json" "$(OutDir)\Resource\config.json" /Y -xcopy "$(ProjectDir)..\..\cocos2d-x\external\lua\luasocket\*.lua" "$(OutDir)\Resource" /e /Y + if exist "$(LocalDebuggerWorkingDirectory)" rd /s /q "$(LocalDebuggerWorkingDirectory)" +mkdir "$(LocalDebuggerWorkingDirectory)" +mkdir "$(LocalDebuggerWorkingDirectory)\src" +mkdir "$(LocalDebuggerWorkingDirectory)\res" +xcopy "$(ProjectDir)..\..\..\src" "$(LocalDebuggerWorkingDirectory)\src" /e /Y +xcopy "$(ProjectDir)..\..\..\res" "$(LocalDebuggerWorkingDirectory)\res" /e /Y +copy "$(ProjectDir)..\..\..\config.json" "$(LocalDebuggerWorkingDirectory)\config.json" /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\external\lua\luasocket\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocos2d" "$(LocalDebuggerWorkingDirectory)" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocosdenshion" "$(LocalDebuggerWorkingDirectory)" /e /Y + copy files - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" + + diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/build-cfg.json b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/build-cfg.json index 37fecf9b02..add6413e4f 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/build-cfg.json +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/build-cfg.json @@ -15,7 +15,11 @@ ], "must_copy_resources": [ { - "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script", + "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d", + "to": "" + }, + { + "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocosdenshion", "to": "" }, { diff --git a/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp b/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp index 7d41f27198..1f779c3d22 100644 --- a/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp +++ b/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp @@ -179,6 +179,8 @@ static Layer* restartSpriteTestAction() Camera3DTestDemo::Camera3DTestDemo(void) : BaseTest() , _camera(nullptr) +, _incRot(nullptr) +, _decRot(nullptr) { } Camera3DTestDemo::~Camera3DTestDemo(void) @@ -225,19 +227,25 @@ void Camera3DTestDemo::SwitchViewCallback(Ref* sender, CameraType cameraType) { _camera->setPosition3D(Vec3(0, 130, 130) + _sprite3D->getPosition3D()); _camera->lookAt(_sprite3D->getPosition3D(), Vec3(0,1,0)); + _incRot->setEnabled(true); + _decRot->setEnabled(true); } else if(_cameraType==CameraType::FirstCamera) { - Vec3 newFaceDir; - _sprite3D->getWorldToNodeTransform().getForwardVector(&newFaceDir); - newFaceDir.normalize(); - _camera->setPosition3D(Vec3(0,35,0) + _sprite3D->getPosition3D()); - _camera->lookAt(_sprite3D->getPosition3D() + newFaceDir*50, Vec3(0, 1, 0)); + Vec3 newFaceDir; + _sprite3D->getWorldToNodeTransform().getForwardVector(&newFaceDir); + newFaceDir.normalize(); + _camera->setPosition3D(Vec3(0,35,0) + _sprite3D->getPosition3D()); + _camera->lookAt(_sprite3D->getPosition3D() + newFaceDir*50, Vec3(0, 1, 0)); + _incRot->setEnabled(true); + _decRot->setEnabled(true); } else if(_cameraType==CameraType::ThirdCamera) { - _camera->setPosition3D(Vec3(0, 130, 130) + _sprite3D->getPosition3D()); - _camera->lookAt(_sprite3D->getPosition3D(), Vec3(0,1,0)); + _camera->setPosition3D(Vec3(0, 130, 130) + _sprite3D->getPosition3D()); + _camera->lookAt(_sprite3D->getPosition3D(), Vec3(0,1,0)); + _incRot->setEnabled(false); + _decRot->setEnabled(false); } } void Camera3DTestDemo::onEnter() @@ -262,8 +270,10 @@ void Camera3DTestDemo::onEnter() auto menuItem2 = MenuItemLabel::create(label2, CC_CALLBACK_1(Camera3DTestDemo::scaleCameraCallback,this,-1)); auto label3 = Label::createWithTTF(ttfConfig,"rotate+"); auto menuItem3 = MenuItemLabel::create(label3, CC_CALLBACK_1(Camera3DTestDemo::rotateCameraCallback,this,10)); + _incRot = menuItem3; auto label4 = Label::createWithTTF(ttfConfig,"rotate-"); auto menuItem4 = MenuItemLabel::create(label4, CC_CALLBACK_1(Camera3DTestDemo::rotateCameraCallback,this,-10)); + _decRot = menuItem4; auto label5 = Label::createWithTTF(ttfConfig,"free "); auto menuItem5 = MenuItemLabel::create(label5, CC_CALLBACK_1(Camera3DTestDemo::SwitchViewCallback,this,CameraType::FreeCamera)); auto label6 = Label::createWithTTF(ttfConfig,"third person"); diff --git a/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h b/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h index 2cdcb9611f..6c5a40099a 100644 --- a/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h +++ b/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h @@ -83,6 +83,8 @@ protected: Sprite3D* _sprite3D; Vec3 _targetPos; CameraType _cameraType; + MenuItem* _incRot; + MenuItem* _decRot; unsigned int _curState; Camera* _camera; MoveTo* _moveAction; diff --git a/tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp b/tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp index 5826130538..1cca83cd11 100644 --- a/tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp +++ b/tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp @@ -21,6 +21,7 @@ namespace CL(PhysicsPositionRotationTest), CL(PhysicsSetGravityEnableTest), CL(Bug5482), + CL(PhysicsFixedUpdate), CL(PhysicsTransformTest), #else CL(PhysicsDemoDisabled), @@ -941,7 +942,6 @@ void PhysicsDemoActions::onEnter() sp3->getPhysicsBody()->setTag(DRAG_BODYS_TAG); sp4->getPhysicsBody()->setTag(DRAG_BODYS_TAG); - auto actionTo = JumpTo::create(2, Vec2(100,100), 50, 4); auto actionBy = JumpBy::create(2, Vec2(300,0), 50, 4); auto actionUp = JumpBy::create(2, Vec2(0,50), 80, 4); @@ -1735,6 +1735,62 @@ std::string Bug5482::subtitle() const return "change physics body to the other."; } +void PhysicsFixedUpdate::onEnter() +{ + PhysicsDemo::onEnter(); + + _scene->getPhysicsWorld()->setDebugDrawMask(PhysicsWorld::DEBUGDRAW_ALL); + _scene->getPhysicsWorld()->setGravity(Point::ZERO); + + // wall + auto wall = Node::create(); + wall->setPhysicsBody(PhysicsBody::createEdgeBox(VisibleRect::getVisibleRect().size, PhysicsMaterial(0.1f, 1, 0.0f))); + wall->setPosition(VisibleRect::center()); + this->addChild(wall); + + addBall(); + + scheduleOnce(schedule_selector(PhysicsFixedUpdate::updateStart), 2); +} + +void PhysicsFixedUpdate::addBall() +{ + auto ball = Sprite::create("Images/ball.png"); + ball->setPosition(100, 100); + ball->setPhysicsBody(PhysicsBody::createCircle(ball->getContentSize().width/2, PhysicsMaterial(0.1f, 1, 0.0f))); + ball->getPhysicsBody()->setTag(DRAG_BODYS_TAG); + ball->getPhysicsBody()->setVelocity(Point(1000, 20)); + this->addChild(ball); +} + +void PhysicsFixedUpdate::updateStart(float delta) +{ + addBall(); + + _scene->getPhysicsWorld()->setAutoStep(false); + scheduleUpdate(); +} + +void PhysicsFixedUpdate::update(float delta) +{ + + // use fixed time and calculate 3 times per frame makes physics simulate more precisely. + for (int i = 0; i < 3; ++i) + { + _scene->getPhysicsWorld()->step(1/180.0f); + } +} + +std::string PhysicsFixedUpdate::title() const +{ + return "Fixed Update Test"; +} + +std::string PhysicsFixedUpdate::subtitle() const +{ + return "The secend ball should not run across the wall"; +} + bool PhysicsTransformTest::onTouchBegan(Touch *touch, Event *event) { Node* child = this->getChildByTag(1); diff --git a/tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.h b/tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.h index 3ff0ca0044..3eba820180 100644 --- a/tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.h +++ b/tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.h @@ -255,6 +255,18 @@ private: bool _bodyInA; }; +class PhysicsFixedUpdate : public PhysicsDemo +{ +public: + CREATE_FUNC(PhysicsFixedUpdate); + void onEnter() override; + void updateStart(float delta); + void addBall(); + virtual void update(float delta) override; + virtual std::string title() const override; + virtual std::string subtitle() const override; +}; + class PhysicsTransformTest : public PhysicsDemo { public: @@ -266,7 +278,5 @@ public: bool onTouchBegan(Touch* touch, Event* event); }; - - #endif #endif diff --git a/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.cpp b/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.cpp index 334d578b79..c75eb75cd3 100644 --- a/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.cpp +++ b/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.cpp @@ -135,25 +135,19 @@ void RenderTextureSave::saveImage(cocos2d::Ref *sender) char png[20]; sprintf(png, "image-%d.png", counter); - char jpg[20]; - sprintf(jpg, "image-%d.jpg", counter); - - _target->saveToFile(png, Image::Format::PNG); - _target->saveToFile(jpg, Image::Format::JPG); - std::string fileName = FileUtils::getInstance()->getWritablePath() + jpg; - auto action1 = DelayTime::create(1); - auto func = [&,fileName]() + auto callback = [&](RenderTexture* rt, const std::string& path) { - auto sprite = Sprite::create(fileName); + auto sprite = Sprite::create(path); addChild(sprite); sprite->setScale(0.3f); sprite->setPosition(Vec2(40, 40)); sprite->setRotation(counter * 3); }; - runAction(Sequence::create(action1, CallFunc::create(func), nullptr)); + + _target->saveToFile(png, Image::Format::PNG, true, callback); - CCLOG("Image saved %s and %s", png, jpg); + CCLOG("Image saved %s", png); counter++; } diff --git a/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp b/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp index 54100ba464..2410ffb068 100644 --- a/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp +++ b/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp @@ -53,9 +53,13 @@ static std::function createFunctions[] = CL(Sprite3DEffectTest), #endif CL(Sprite3DWithSkinTest), +#if (CC_TARGET_PLATFORM != CC_PLATFORM_WP8) && (CC_TARGET_PLATFORM != CC_PLATFORM_WINRT) + CL(Sprite3DWithSkinOutlineTest), +#endif CL(Animate3DTest), CL(AttachmentTest), - CL(Sprite3DWithOBBPerfromanceTest) + CL(Sprite3DWithOBBPerfromanceTest), + CL(Sprite3DMirrorTest) }; #define MAX_LAYER (sizeof(createFunctions) / sizeof(createFunctions[0])) @@ -319,7 +323,23 @@ EffectSprite3D* EffectSprite3D::createFromObjFileAndTexture(const std::string &o if (sprite && sprite->initWithFile(objFilePath)) { sprite->autorelease(); - sprite->setTexture(textureFilePath); + if(textureFilePath.size() > 0) + sprite->setTexture(textureFilePath); + return sprite; + } + CC_SAFE_DELETE(sprite); + return nullptr; +} + +EffectSprite3D* EffectSprite3D::create(const std::string &path) +{ + if (path.length() < 4) + CCASSERT(false, "improper name specified when creating Sprite3D"); + + auto sprite = new EffectSprite3D(); + if (sprite && sprite->initWithFile(path)) + { + sprite->autorelease(); return sprite; } CC_SAFE_DELETE(sprite); @@ -363,15 +383,33 @@ void EffectSprite3D::addEffect(Effect3DOutline* effect, ssize_t order) const std::string Effect3DOutline::_vertShaderFile = "Shaders3D/OutLine.vert"; const std::string Effect3DOutline::_fragShaderFile = "Shaders3D/OutLine.frag"; const std::string Effect3DOutline::_keyInGLProgramCache = "Effect3DLibrary_Outline"; -GLProgram* Effect3DOutline::getOrCreateProgram() + +const std::string Effect3DOutline::_vertSkinnedShaderFile = "Shaders3D/SkinnedOutline.vert"; +const std::string Effect3DOutline::_fragSkinnedShaderFile = "Shaders3D/OutLine.frag"; +const std::string Effect3DOutline::_keySkinnedInGLProgramCache = "Effect3DLibrary_Outline"; +GLProgram* Effect3DOutline::getOrCreateProgram(bool isSkinned /* = false */ ) { - auto program = GLProgramCache::getInstance()->getGLProgram(_keyInGLProgramCache); - if(program == nullptr) + if(isSkinned) { - program = GLProgram::createWithFilenames(_vertShaderFile, _fragShaderFile); - GLProgramCache::getInstance()->addGLProgram(program, _keyInGLProgramCache); + auto program = GLProgramCache::getInstance()->getGLProgram(_keySkinnedInGLProgramCache); + if(program == nullptr) + { + program = GLProgram::createWithFilenames(_vertSkinnedShaderFile, _fragSkinnedShaderFile); + GLProgramCache::getInstance()->addGLProgram(program, _keySkinnedInGLProgramCache); + } + return program; } - return program; + else + { + auto program = GLProgramCache::getInstance()->getGLProgram(_keyInGLProgramCache); + if(program == nullptr) + { + program = GLProgram::createWithFilenames(_vertShaderFile, _fragShaderFile); + GLProgramCache::getInstance()->addGLProgram(program, _keyInGLProgramCache); + } + return program; + } + } Effect3DOutline* Effect3DOutline::create() @@ -391,21 +429,6 @@ Effect3DOutline* Effect3DOutline::create() bool Effect3DOutline::init() { - - GLProgram* glprogram = GLProgram::createWithFilenames(_vertShaderFile, _fragShaderFile); - if(nullptr == glprogram) - { - CC_SAFE_DELETE(glprogram); - return false; - } - _glProgramState = GLProgramState::create(glprogram); - if(nullptr == _glProgramState) - { - return false; - } - _glProgramState->retain(); - _glProgramState->setUniformVec3("OutLineColor", _outlineColor); - _glProgramState->setUniformFloat("OutlineWidth", _outlineWidth); return true; } @@ -442,7 +465,8 @@ void Effect3DOutline::setOutlineColor(const Vec3& color) if(_outlineColor != color) { _outlineColor = color; - _glProgramState->setUniformVec3("OutLineColor", _outlineColor); + if(_glProgramState) + _glProgramState->setUniformVec3("OutLineColor", _outlineColor); } } @@ -451,7 +475,8 @@ void Effect3DOutline::setOutlineWidth(float width) if(_outlineWidth != width) { _outlineWidth = width; - _glProgramState->setUniformFloat("OutlineWidth", _outlineWidth); + if(_glProgramState) + _glProgramState->setUniformFloat("OutlineWidth", _outlineWidth); } } @@ -461,6 +486,19 @@ void Effect3DOutline::setTarget(EffectSprite3D *sprite) if(sprite != _sprite) { + GLProgram* glprogram; + if(!sprite->getSkin()) + glprogram = GLProgram::createWithFilenames(_vertShaderFile, _fragShaderFile); + else + glprogram = GLProgram::createWithFilenames(_vertSkinnedShaderFile, _fragSkinnedShaderFile); + + _glProgramState = GLProgramState::create(glprogram); + + _glProgramState->retain(); + _glProgramState->setUniformVec3("OutLineColor", _outlineColor); + _glProgramState->setUniformFloat("OutlineWidth", _outlineWidth); + + _sprite = sprite; auto mesh = sprite->getMesh(); @@ -485,6 +523,11 @@ void Effect3DOutline::setTarget(EffectSprite3D *sprite) } +static void MatrixPalleteCallBack( GLProgram* glProgram, Uniform* uniform, int paletteSize, const float* palette) +{ + glUniform4fv( uniform->location, (GLsizei)paletteSize, (const float*)palette ); +} + void Effect3DOutline::draw(const Mat4 &transform) { //draw @@ -499,7 +542,17 @@ void Effect3DOutline::draw(const Mat4 &transform) auto mesh = _sprite->getMesh(); glBindBuffer(GL_ARRAY_BUFFER, mesh->getVertexBuffer()); - _glProgramState->apply(transform); + + if(_sprite && _sprite->getSkin()) + { + auto function = std::bind(MatrixPalleteCallBack, std::placeholders::_1, std::placeholders::_2, + _sprite->getSkin()->getMatrixPaletteSize(), (float*)_sprite->getSkin()->getMatrixPalette()); + _glProgramState->setUniformCallback("u_matrixPalette", function); + } + + if(_sprite) + _glProgramState->apply(transform); + for (ssize_t i = 0; i < mesh->getSubMeshCount(); i++) { auto submesh = mesh->getSubMesh((int)i); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, submesh->getIndexBuffer()); @@ -572,13 +625,14 @@ void Sprite3DEffectTest::addNewSpriteWithCoords(Vec2 p) //option 2: load obj and assign the texture auto sprite = EffectSprite3D::createFromObjFileAndTexture("Sprite3DTest/boss1.obj", "Sprite3DTest/boss.png"); Effect3DOutline* effect = Effect3DOutline::create(); + sprite->addEffect(effect, -1); effect->setOutlineColor(Vec3(1,0,0)); effect->setOutlineWidth(0.01f); - sprite->addEffect(effect, -1); + Effect3DOutline* effect2 = Effect3DOutline::create(); + sprite->addEffect(effect2, -2); effect2->setOutlineWidth(0.02f); effect2->setOutlineColor(Vec3(1,1,0)); - sprite->addEffect(effect2, -2); //sprite->setEffect3D(effect); sprite->setScale(6.f); @@ -637,7 +691,7 @@ std::string Sprite3DWithSkinTest::subtitle() const void Sprite3DWithSkinTest::addNewSpriteWithCoords(Vec2 p) { std::string fileName = "Sprite3DTest/orc.c3b"; - auto sprite = Sprite3D::create(fileName); + auto sprite = EffectSprite3D::create(fileName); sprite->setScale(3); sprite->setRotation3D(Vec3(0,180,0)); addChild(sprite); @@ -675,6 +729,79 @@ void Sprite3DWithSkinTest::onTouchesEnded(const std::vector& touches, Ev } } +Sprite3DWithSkinOutlineTest::Sprite3DWithSkinOutlineTest() +{ + auto listener = EventListenerTouchAllAtOnce::create(); + listener->onTouchesEnded = CC_CALLBACK_2(Sprite3DWithSkinOutlineTest::onTouchesEnded, this); + _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this); + + auto s = Director::getInstance()->getWinSize(); + addNewSpriteWithCoords( Vec2(s.width/2, s.height/2) ); +} +std::string Sprite3DWithSkinOutlineTest::title() const +{ + return "Testing Sprite3D for skinned outline"; +} +std::string Sprite3DWithSkinOutlineTest::subtitle() const +{ + return "Tap screen to add more sprite3D"; +} + +void Sprite3DWithSkinOutlineTest::addNewSpriteWithCoords(Vec2 p) +{ + + std::string fileName = "Sprite3DTest/orc.c3b"; + auto sprite = EffectSprite3D::create(fileName); + + Effect3DOutline* effect = Effect3DOutline::create(); + effect->setOutlineColor(Vec3(1,0,0)); + effect->setOutlineWidth(0.01f); + sprite->addEffect(effect, -1); + + + Effect3DOutline* effect2 = Effect3DOutline::create(); + effect2->setOutlineWidth(0.02f); + effect2->setOutlineColor(Vec3(1,1,0)); + sprite->addEffect(effect2, -2); + + + sprite->setScale(3); + sprite->setRotation3D(Vec3(0,180,0)); + addChild(sprite); + sprite->setPosition( Vec2( p.x, p.y) ); + + auto animation = Animation3D::create(fileName); + if (animation) + { + auto animate = Animate3D::create(animation); + bool inverse = (std::rand() % 3 == 0); + + int rand2 = std::rand(); + float speed = 1.0f; + if(rand2 % 3 == 1) + { + speed = animate->getSpeed() + CCRANDOM_0_1(); + } + else if(rand2 % 3 == 2) + { + speed = animate->getSpeed() - 0.5 * CCRANDOM_0_1(); + } + animate->setSpeed(inverse ? -speed : speed); + + sprite->runAction(RepeatForever::create(animate)); + } +} + +void Sprite3DWithSkinOutlineTest::onTouchesEnded(const std::vector& touches, Event* event) +{ + for (auto touch: touches) + { + auto location = touch->getLocation(); + + addNewSpriteWithCoords( location ); + } +} + Animate3DTest::Animate3DTest() : _hurt(nullptr) , _swim(nullptr) @@ -1125,3 +1252,65 @@ void Sprite3DWithOBBPerfromanceTest::calculateRayByLocationInView(Ray* ray, cons ray->_origin = nearPoint; ray->_direction = direction; } + +Sprite3DMirrorTest::Sprite3DMirrorTest() +: _sprite(nullptr) +, _mirrorSprite(nullptr) +{ + auto s = Director::getInstance()->getWinSize(); + addNewSpriteWithCoords( Vec2(s.width/2, s.height/2) ); +} +std::string Sprite3DMirrorTest::title() const +{ + return "Sprite3D Mirror Test"; +} +std::string Sprite3DMirrorTest::subtitle() const +{ + return ""; +} + +void Sprite3DMirrorTest::addNewSpriteWithCoords(Vec2 p) +{ + std::string fileName = "Sprite3DTest/orc.c3b"; + auto sprite = Sprite3D::create(fileName); + sprite->setScale(5); + sprite->setRotation3D(Vec3(0,180,0)); + addChild(sprite); + sprite->setPosition( Vec2( p.x - 80, p.y) ); + + //test attach + auto sp = Sprite3D::create("Sprite3DTest/axe.c3b"); + sprite->getAttachNode("Bip001 R Hand")->addChild(sp); + + auto animation = Animation3D::create(fileName); + if (animation) + { + auto animate = Animate3D::create(animation); + + sprite->runAction(RepeatForever::create(animate)); + } + _sprite = sprite; + _hasWeapon = true; + + //create mirror Sprite3D + sprite = Sprite3D::create(fileName); + sprite->setScale(5); + sprite->setScaleX(-5); + sprite->setCullFace(GL_FRONT); + sprite->setRotation3D(Vec3(0,180,0)); + addChild(sprite); + sprite->setPosition( Vec2( p.x + 80, p.y) ); + + //test attach + sp = Sprite3D::create("Sprite3DTest/axe.c3b"); + sprite->getAttachNode("Bip001 R Hand")->addChild(sp); + + animation = Animation3D::create(fileName); + if (animation) + { + auto animate = Animate3D::create(animation); + + sprite->runAction(RepeatForever::create(animate)); + } + _mirrorSprite = sprite; +} diff --git a/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h b/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h index e82f5491e9..175c57f793 100644 --- a/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h +++ b/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h @@ -115,7 +115,12 @@ protected: static const std::string _vertShaderFile; static const std::string _fragShaderFile; static const std::string _keyInGLProgramCache; - static GLProgram* getOrCreateProgram(); + + static const std::string _vertSkinnedShaderFile; + static const std::string _fragSkinnedShaderFile; + static const std::string _keySkinnedInGLProgramCache; + + static GLProgram* getOrCreateProgram(bool isSkinned = false); }; class Sprite3DHitTest : public Sprite3DTestDemo @@ -131,6 +136,8 @@ class EffectSprite3D : public Sprite3D { public: static EffectSprite3D* createFromObjFileAndTexture(const std::string& objFilePath, const std::string& textureFilePath); + static EffectSprite3D* create(const std::string& path); + void setEffect3D(Effect3D* effect); void addEffect(Effect3DOutline* effect, ssize_t order); virtual void draw(Renderer *renderer, const Mat4 &transform, uint32_t flags) override; @@ -169,6 +176,19 @@ public: void onTouchesEnded(const std::vector& touches, Event* event); }; +class Sprite3DWithSkinOutlineTest : public Sprite3DTestDemo +{ +public: + CREATE_FUNC(Sprite3DWithSkinOutlineTest); + Sprite3DWithSkinOutlineTest(); + virtual std::string title() const override; + virtual std::string subtitle() const override; + + void addNewSpriteWithCoords(Vec2 p); + + void onTouchesEnded(const std::vector& touches, Event* event); +}; + class Animate3DTest : public Sprite3DTestDemo { public: @@ -260,6 +280,22 @@ protected: void calculateRayByLocationInView(Ray* ray, const Vec2& location); }; +class Sprite3DMirrorTest : public Sprite3DTestDemo +{ +public: + CREATE_FUNC(Sprite3DMirrorTest); + Sprite3DMirrorTest(); + virtual std::string title() const override; + virtual std::string subtitle() const override; + + void addNewSpriteWithCoords(Vec2 p); + +protected: + bool _hasWeapon; + cocos2d::Sprite3D* _sprite; + cocos2d::Sprite3D* _mirrorSprite; +}; + class Sprite3DTestScene : public TestScene { public: diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp index 003a4e1f61..c9edfef871 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp @@ -159,7 +159,7 @@ g_guisTests[] = UISceneManager* sceneManager = UISceneManager::sharedUISceneManager(); sceneManager->setCurrentUISceneId(kUITextFieldTest); sceneManager->setMinUISceneId(kUITextFieldTest); - sceneManager->setMaxUISceneId(kUITextFieldTest_TrueTypeFont); + sceneManager->setMaxUISceneId(kUITextFieldTest_PlaceHolderColor); Scene* scene = sceneManager->currentUIScene(); Director::getInstance()->replaceScene(scene); } diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.cpp index 2898a95f57..8724ddd8ce 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.cpp @@ -34,7 +34,7 @@ void CustomParticleWidgetLayer::onEnter() CustomParticleWidget* custom = CustomParticleWidget::create(); custom->setParticlePlist("Particles/BoilingFoam.plist"); - + custom->setPosition(Vec2(VisibleRect::center())); addChild(custom, 10, -1); } diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp index 810543e3cd..68307eed18 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp @@ -42,7 +42,8 @@ bool UIButtonTest::init() // button->addTouchEventListener(this, toucheventselector(UIButtonTest::touchEvent)); button->addTouchEventListener(CC_CALLBACK_2(UIButtonTest::touchEvent, this)); _uiLayer->addChild(button); - +// button->setColor(Color3B::RED); + button->setOpacity(100); // Create the imageview ImageView* imageView = ImageView::create(); @@ -80,6 +81,8 @@ void UIButtonTest::touchEvent(Ref *pSender, Widget::TouchEventType type) imageView->setOpacity(0); imageView->setVisible(true); imageView->runAction(Sequence::create(FadeIn::create(0.5),DelayTime::create(1.0),FadeOut::create(0.5), nullptr)); + Button *btn = (Button*)pSender; + btn->loadTextureNormal("cocosui/animationbuttonnormal.png"); } break; diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.cpp index 37031bf8af..939ae6586a 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.cpp @@ -59,6 +59,7 @@ static const char* s_testArray[] = "UITextFieldTest_Password", "UITextFieldTest_LineWrap", "UITextFieldTest_TrueTypeFont", + "UITextFieldTest_PlaceHolderColor", "UILayoutTest", "UILayoutTest_Color", "UILayoutTest_Gradient", @@ -241,7 +242,8 @@ Scene *UISceneManager::currentUIScene() return UITextFieldTest_LineWrap::sceneWithTitle(s_testArray[_currentUISceneId]); case kUITextFieldTest_TrueTypeFont: return UITextFieldTest_TrueTypeFont::sceneWithTitle(s_testArray[_currentUISceneId]); - + case kUITextFieldTest_PlaceHolderColor: + return UITextFieldTest_PlaceHolderColor::sceneWithTitle(s_testArray[_currentUISceneId]); case kUILayoutTest: return UILayoutTest::sceneWithTitle(s_testArray[_currentUISceneId]); diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.h index a730422203..4b9403172b 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.h @@ -59,6 +59,7 @@ enum kUITextFieldTest_Password, kUITextFieldTest_LineWrap, kUITextFieldTest_TrueTypeFont, + kUITextFieldTest_PlaceHolderColor, kUILayoutTest, kUILayoutTest_Color, kUILayoutTest_Gradient, diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp index 9f3b8485e6..7d3917246e 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp @@ -407,3 +407,80 @@ void UITextFieldTest_TrueTypeFont::textFieldEvent(Ref *pSender, TextField::Event break; } } + +// UITextFieldTest_PlaceHolderColor +UITextFieldTest_PlaceHolderColor::UITextFieldTest_PlaceHolderColor() +: _displayValueLabel(nullptr) +{ + +} + +UITextFieldTest_PlaceHolderColor::~UITextFieldTest_PlaceHolderColor() +{ +} + +bool UITextFieldTest_PlaceHolderColor::init() +{ + if (UIScene::init()) + { + Size widgetSize = _widget->getContentSize(); + + // Add a label in which the textfield events will be displayed + _displayValueLabel = Text::create("Set place hold color","fonts/Marker Felt.ttf",32); + _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f)); + _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f)); + _uiLayer->addChild(_displayValueLabel); + + // Add the alert + Text* alert = Text::create("TextField","fonts/Marker Felt.ttf",30); + alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f)); + _uiLayer->addChild(alert); + + // Create the textfield + TextField* textField = TextField::create("input words here","Arial",30); + textField->setPlaceHolder("input text here"); + textField->setPlaceHolderColor(Color4B::GREEN); + textField->setTextColor(Color4B::RED); + textField->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f)); + textField->addEventListener(CC_CALLBACK_2(UITextFieldTest_PlaceHolderColor::textFieldEvent, this)); + _uiLayer->addChild(textField); + return true; + } + return false; +} + +void UITextFieldTest_PlaceHolderColor::textFieldEvent(Ref *pSender, TextField::EventType type) +{ + switch (type) + { + case TextField::EventType::ATTACH_WITH_IME: + { + TextField* textField = dynamic_cast(pSender); + Size screenSize = CCDirector::getInstance()->getWinSize(); + textField->runAction(CCMoveTo::create(0.225f, + Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f + textField->getContentSize().height / 2.0f))); + _displayValueLabel->setString(String::createWithFormat("attach with IME")->getCString()); + } + break; + + case TextField::EventType::DETACH_WITH_IME: + { + TextField* textField = dynamic_cast(pSender); + Size screenSize = CCDirector::getInstance()->getWinSize(); + textField->runAction(CCMoveTo::create(0.175f, Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f))); + _displayValueLabel->setString(String::createWithFormat("detach with IME")->getCString()); + } + break; + + case TextField::EventType::INSERT_TEXT: + _displayValueLabel->setString(String::createWithFormat("insert words")->getCString()); + break; + + case TextField::EventType::DELETE_BACKWARD: + _displayValueLabel->setString(String::createWithFormat("delete word")->getCString()); + break; + + default: + break; + } +} diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h index e44798cb7f..6c62bc14d2 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h @@ -91,4 +91,17 @@ protected: UI_SCENE_CREATE_FUNC(UITextFieldTest_TrueTypeFont) Text* _displayValueLabel; }; + +class UITextFieldTest_PlaceHolderColor : public UIScene +{ +public: + UITextFieldTest_PlaceHolderColor(); + ~UITextFieldTest_PlaceHolderColor(); + bool init(); + void textFieldEvent(Ref* pSender, TextField::EventType type); + +protected: + UI_SCENE_CREATE_FUNC(UITextFieldTest_PlaceHolderColor) + Text* _displayValueLabel; +}; #endif /* defined(__TestCpp__UITextFieldTest__) */ diff --git a/tests/cpp-tests/Resources/Shaders3D/SkinnedOutline.vert b/tests/cpp-tests/Resources/Shaders3D/SkinnedOutline.vert new file mode 100644 index 0000000000..fdf40e7a45 --- /dev/null +++ b/tests/cpp-tests/Resources/Shaders3D/SkinnedOutline.vert @@ -0,0 +1,75 @@ +attribute vec3 a_position; +attribute vec3 a_normal; +attribute vec4 a_blendWeight; +attribute vec4 a_blendIndex; + +attribute vec2 a_texCoord; +uniform float OutlineWidth; + +const int SKINNING_JOINT_COUNT = 60; +// Uniforms +uniform vec4 u_matrixPalette[SKINNING_JOINT_COUNT * 3]; + +// Varyings +varying vec2 TextureCoordOut; + +vec4 SkinnedVec3(vec4 vec) +{ + float blendWeight = a_blendWeight[0]; + + int matrixIndex = int (a_blendIndex[0]) * 3; + vec4 matrixPalette1 = u_matrixPalette[matrixIndex] * blendWeight; + vec4 matrixPalette2 = u_matrixPalette[matrixIndex + 1] * blendWeight; + vec4 matrixPalette3 = u_matrixPalette[matrixIndex + 2] * blendWeight; + + + blendWeight = a_blendWeight[1]; + if (blendWeight > 0.0) + { + matrixIndex = int(a_blendIndex[1]) * 3; + matrixPalette1 += u_matrixPalette[matrixIndex] * blendWeight; + matrixPalette2 += u_matrixPalette[matrixIndex + 1] * blendWeight; + matrixPalette3 += u_matrixPalette[matrixIndex + 2] * blendWeight; + } + + + blendWeight = a_blendWeight[2]; + if (blendWeight > 0.0) + { + matrixIndex = int(a_blendIndex[2]) * 3; + matrixPalette1 += u_matrixPalette[matrixIndex] * blendWeight; + matrixPalette2 += u_matrixPalette[matrixIndex + 1] * blendWeight; + matrixPalette3 += u_matrixPalette[matrixIndex + 2] * blendWeight; + } + + + blendWeight = a_blendWeight[3]; + if (blendWeight > 0.0) + { + matrixIndex = int(a_blendIndex[3]) * 3; + matrixPalette1 += u_matrixPalette[matrixIndex] * blendWeight; + matrixPalette2 += u_matrixPalette[matrixIndex + 1] * blendWeight; + matrixPalette3 += u_matrixPalette[matrixIndex + 2] * blendWeight; + } + + + vec4 _skinnedPosition; + vec4 postion = vec; + _skinnedPosition.x = dot(postion, matrixPalette1); + _skinnedPosition.y = dot(postion, matrixPalette2); + _skinnedPosition.z = dot(postion, matrixPalette3); + _skinnedPosition.w = postion.w; + + return _skinnedPosition; +} + +void main() +{ + vec4 pos = CC_MVPMatrix * SkinnedVec3(vec4(a_position,1.0)); + + vec4 normalproj = CC_MVPMatrix * vec4(SkinnedVec3(vec4(a_normal,0.0)).xyz, 0); + normalproj = normalize(normalproj); + pos.xy += normalproj.xy * (OutlineWidth * (pos.z * 0.5 + 0.5)); + + gl_Position = pos; +} diff --git a/tests/lua-empty-test/project/CMakeLists.txt b/tests/lua-empty-test/project/CMakeLists.txt index f4115a1aa1..2b2db4e968 100644 --- a/tests/lua-empty-test/project/CMakeLists.txt +++ b/tests/lua-empty-test/project/CMakeLists.txt @@ -35,5 +35,7 @@ pre_build(${APP_NAME} COMMAND ${CMAKE_COMMAND} -E remove_directory ${APP_BIN_DIR}/Resources COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../res ${APP_BIN_DIR}/Resources/res COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../src ${APP_BIN_DIR}/Resources/src - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/cocos2d ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/cocosdenshion ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/network ${APP_BIN_DIR}/Resources ) diff --git a/tests/lua-empty-test/project/proj.android/build-cfg.json b/tests/lua-empty-test/project/proj.android/build-cfg.json index b83dd6533d..4ecffa65f0 100644 --- a/tests/lua-empty-test/project/proj.android/build-cfg.json +++ b/tests/lua-empty-test/project/proj.android/build-cfg.json @@ -14,7 +14,15 @@ "to": "res" }, { - "from": "../../../../cocos/scripting/lua-bindings/script", + "from": "../../../../cocos/scripting/lua-bindings/script/cocos2d", + "to": "" + }, + { + "from": "../../../../cocos/scripting/lua-bindings/script/network", + "to": "" + }, + { + "from": "../../../../cocos/scripting/lua-bindings/script/cocosdenshion", "to": "" }, { diff --git a/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj b/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj index 7b54ffcd7f..5f228d1567 100644 --- a/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj +++ b/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj @@ -108,7 +108,9 @@ MachineX86 - xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(ProjectDir)..\..\" /e /Y + xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocos2d" "$(ProjectDir)..\..\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocosdenshion" "$(ProjectDir)..\..\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\network" "$(ProjectDir)..\..\" /e /Y xcopy "$(ProjectDir)..\..\..\..\external\lua\luasocket\*.lua" "$(ProjectDir)..\..\" /e /Y @@ -162,7 +164,9 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$ - xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(ProjectDir)..\..\" /e /Y + xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocos2d" "$(ProjectDir)..\..\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocosdenshion" "$(ProjectDir)..\..\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\network" "$(ProjectDir)..\..\" /e /Y xcopy "$(ProjectDir)..\..\..\..\external\lua\luasocket\*.lua" "$(ProjectDir)..\..\" /e /Y diff --git a/tests/lua-game-controller-test/project/proj.android/build-cfg.json b/tests/lua-game-controller-test/project/proj.android/build-cfg.json index 3c8431066f..e379d249eb 100644 --- a/tests/lua-game-controller-test/project/proj.android/build-cfg.json +++ b/tests/lua-game-controller-test/project/proj.android/build-cfg.json @@ -14,15 +14,12 @@ "to": "res" }, { - "from": "../../../../cocos/scripting/lua-bindings/script", + "from": "../../../../cocos/scripting/lua-bindings/script/cocos2d", "to": "" }, { - "from": "../../../../external/lua/luasocket", - "to": "", - "include": [ - "*.lua" - ] + "from": "../../../../cocos/scripting/lua-bindings/script/controller", + "to": "" }, { "from": "../../../game-controller-test/Resources", diff --git a/tests/lua-tests/project/CMakeLists.txt b/tests/lua-tests/project/CMakeLists.txt index b90398a70f..1eba4feabc 100644 --- a/tests/lua-tests/project/CMakeLists.txt +++ b/tests/lua-tests/project/CMakeLists.txt @@ -46,7 +46,13 @@ pre_build(${APP_NAME} COMMAND ${CMAKE_COMMAND} -E remove_directory ${APP_BIN_DIR}/Resources COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../res ${APP_BIN_DIR}/Resources/res COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../src ${APP_BIN_DIR}/Resources/src - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/cocos2d ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/cocosdenshion ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/network ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/cocosbuilder ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/cocostudio ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/extension ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/ui ${APP_BIN_DIR}/Resources COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/tests/cpp-tests/Resources ${APP_BIN_DIR}/Resources/res ) diff --git a/tests/lua-tests/project/proj.android/build-cfg.json b/tests/lua-tests/project/proj.android/build-cfg.json index 59638fbd1e..797d851ebc 100644 --- a/tests/lua-tests/project/proj.android/build-cfg.json +++ b/tests/lua-tests/project/proj.android/build-cfg.json @@ -21,7 +21,31 @@ ] }, { - "from": "../../../../cocos/scripting/lua-bindings/script", + "from": "../../../../cocos/scripting/lua-bindings/script/cocos2d", + "to": "" + }, + { + "from": "../../../../cocos/scripting/lua-bindings/script/cocosbuilder", + "to": "" + }, + { + "from": "../../../../cocos/scripting/lua-bindings/script/cocosdenshion", + "to": "" + }, + { + "from": "../../../../cocos/scripting/lua-bindings/script/cocostudio", + "to": "" + }, + { + "from": "../../../../cocos/scripting/lua-bindings/script/extension", + "to": "" + }, + { + "from": "../../../../cocos/scripting/lua-bindings/script/network", + "to": "" + }, + { + "from": "../../../../cocos/scripting/lua-bindings/script/ui", "to": "" }, { diff --git a/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj b/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj index b80813c268..3390023fb2 100644 --- a/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj +++ b/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj @@ -108,7 +108,13 @@ - xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(ProjectDir)..\.." /e /Y + xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocos2d" "$(ProjectDir)..\..\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocosdenshion" "$(ProjectDir)..\..\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\network" "$(ProjectDir)..\..\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocosbuilder" "$(ProjectDir)..\..\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocostudio" "$(ProjectDir)..\..\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\extension" "$(ProjectDir)..\..\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\ui" "$(ProjectDir)..\..\" /e /Y xcopy "$(ProjectDir)..\..\..\..\external\lua\luasocket\*.lua" "$(ProjectDir)..\..\" /e /Y xcopy "$(ProjectDir)..\..\..\cpp-tests\Resources" "$(ProjectDir)..\..\res" /e /Y copy files @@ -157,7 +163,13 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" - xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(ProjectDir)..\.." /e /Y + xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocos2d" "$(ProjectDir)..\..\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocosdenshion" "$(ProjectDir)..\..\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\network" "$(ProjectDir)..\..\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocosbuilder" "$(ProjectDir)..\..\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocostudio" "$(ProjectDir)..\..\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\extension" "$(ProjectDir)..\..\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\ui" "$(ProjectDir)..\..\" /e /Y xcopy "$(ProjectDir)..\..\..\..\external\lua\luasocket\*.lua" "$(ProjectDir)..\..\" /e /Y xcopy "$(ProjectDir)..\..\..\cpp-tests\Resources" "$(ProjectDir)..\..\res" /e /Y copy files diff --git a/tests/lua-tests/src/VideoPlayerTest/VideoPlayerTest.lua b/tests/lua-tests/src/VideoPlayerTest/VideoPlayerTest.lua index 41ec6834eb..ad082ce774 100644 --- a/tests/lua-tests/src/VideoPlayerTest/VideoPlayerTest.lua +++ b/tests/lua-tests/src/VideoPlayerTest/VideoPlayerTest.lua @@ -1,4 +1,4 @@ -require("experimentalConstants") +require("experimentalUIConstants") local visibleRect = cc.Director:getInstance():getOpenGLView():getVisibleRect() diff --git a/tools/cocos2d-console b/tools/cocos2d-console index 5db5a4283a..4b020e4900 160000 --- a/tools/cocos2d-console +++ b/tools/cocos2d-console @@ -1 +1 @@ -Subproject commit 5db5a4283aa22e362901e2924146ad66c2e1484f +Subproject commit 4b020e4900e601a2d5845095f2e6970c13c59613 diff --git a/tools/gen-prebuilt/build_config.json b/tools/gen-prebuilt/build_config.json index e41969c1cd..0c250ef587 100644 --- a/tools/gen-prebuilt/build_config.json +++ b/tools/gen-prebuilt/build_config.json @@ -3,6 +3,10 @@ "build/cocos2d_libs.xcodeproj" : { "outputdir" : "prebuilt", "targets" :[ "build all libs" ] + }, + "cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj" : { + "outputdir" : "prebuilt", + "targets" : [ "build all lualibs" ] } }, "win32_proj_info" : { @@ -11,8 +15,10 @@ "targets" : [ "libcocosdenshion", "libbox2d", "libchipmunk", "libcocos2d", "libcocosbuilder", "libcocostudio", - "libextension", "libui", "liblua", - "libnetwork", "libspine" + "libextension", "libui", "libnetwork", "libspine", + "libluacocos2d", "libluacocosbuilder", "libluacocosdenshion", + "libluacocostudio", "libluaextension", "libluanetwork", + "libluaspine", "libluaui" ] } } diff --git a/tools/gen-prebuilt/gen_prebuilt_libs.py b/tools/gen-prebuilt/gen_prebuilt_libs.py index d8d3e06119..14d7f4ef4b 100644 --- a/tools/gen-prebuilt/gen_prebuilt_libs.py +++ b/tools/gen-prebuilt/gen_prebuilt_libs.py @@ -22,9 +22,10 @@ from argparse import ArgumentParser if sys.platform == 'win32': import _winreg -ANDROID_SO_PATH = "frameworks/runtime-src/proj.android/libs" -ANDROID_A_PATH = "frameworks/runtime-src/proj.android/obj/local" -MK_PATH = "frameworks/runtime-src/proj.android/jni/Application.mk" +TESTS_PROJ_PATH = "tests/lua-tests" +ANDROID_SO_PATH = "project/proj.android/libs" +ANDROID_A_PATH = "project/proj.android/obj/local" +MK_PATH = "project/proj.android/jni/Application.mk" CONSOLE_PATH = "tools/cocos2d-console/bin" def os_is_win32(): @@ -55,7 +56,7 @@ class Generator(object): def __init__(self, args): self.need_clean = args.need_clean - self.enable_strip = args.enable_strip + self.disable_strip = args.disable_strip self.use_incredibuild = args.use_incredibuild self.tool_dir = os.path.realpath(os.path.dirname(__file__)) self.no_android = args.no_android @@ -80,28 +81,27 @@ class Generator(object): file_obj.close() def build_android(self): - # build .so for android - language = "lua" - + # build .a for android console_dir = os.path.join(self.engine_dir, CONSOLE_PATH) cmd_path = os.path.join(console_dir, "cocos") - proj_name = "My%sGame" % language - proj_path = os.path.join(self.engine_dir, proj_name) - if os.path.exists(proj_path): - shutil.rmtree(proj_path) - - # create a runtime project - create_cmd = "%s new -l %s -t runtime -d %s %s" % (cmd_path, language, self.engine_dir, proj_name) - run_shell(create_cmd) + proj_path = os.path.join(self.engine_dir, TESTS_PROJ_PATH) # Add multi ABI in Application.mk mk_file = os.path.join(proj_path, MK_PATH) + f = open(mk_file) + file_content = f.read() + f.close() + self.modify_mk(mk_file) # build it build_cmd = "%s compile -s %s -p android --ndk-mode release -j 4" % (cmd_path, proj_path) run_shell(build_cmd) + f = open(mk_file, "w") + f.write(file_content) + f.close() + # copy .a to prebuilt dir obj_dir = os.path.join(proj_path, ANDROID_A_PATH) prebuilt_dir = os.path.join(self.tool_dir, "prebuilt", "android") @@ -114,16 +114,16 @@ class Generator(object): } excopy.copy_files_with_config(copy_cfg, obj_dir, prebuilt_dir) - if self.enable_strip: + if not self.disable_strip: # strip the android libs ndk_root = os.environ["NDK_ROOT"] if os_is_win32(): if self.is_32bit_windows(): - bit_str = "x86" + bit_str = "" else: - bit_str = "x86_64" + bit_str = "-x86_64" - sys_folder_name = "windows-%s" % bit_str + sys_folder_name = "windows%s" % bit_str elif os_is_mac(): sys_folder_name = "darwin-x86_64" @@ -132,9 +132,6 @@ class Generator(object): strip_cmd = "%s -S %s/armeabi*/*.a" % (strip_cmd_path, prebuilt_dir) run_shell(strip_cmd) - # remove the project - shutil.rmtree(proj_path) - def get_required_vs_version(self, proj_file): # get the VS version required by the project import re @@ -321,7 +318,7 @@ class Generator(object): shutil.rmtree(ios_sim_libs_dir) shutil.rmtree(ios_dev_libs_dir) - if self.enable_strip: + if not self.disable_strip: # strip the libs ios_strip_cmd = "xcrun -sdk iphoneos strip -S %s/*.a" % ios_out_dir run_shell(ios_strip_cmd) @@ -350,7 +347,7 @@ if __name__ == "__main__": parser = ArgumentParser(description="Generate prebuilt engine for Cocos Engine.") parser.add_argument('-c', dest='need_clean', action="store_true", help='Remove the \"prebuilt\" directory first.') parser.add_argument('-n', "--no-android", dest='no_android', action="store_true", help='Not build android libs.') - parser.add_argument('-s', "--strip", dest='enable_strip', action="store_true", help='Strip the generated libs.') + parser.add_argument('-d', "--disable-strip", dest='disable_strip', action="store_true", help='Disable the strip of the generated libs.') parser.add_argument('-i', "--incredibuild", dest='use_incredibuild', action="store_true", help='Use incredibuild to build win32 projects. Only available on windows.') (args, unknown) = parser.parse_known_args() diff --git a/tools/gen-prebuilt/module_config.json b/tools/gen-prebuilt/module_config.json index 3e787f9f8b..d9d7988c6a 100644 --- a/tools/gen-prebuilt/module_config.json +++ b/tools/gen-prebuilt/module_config.json @@ -1,6 +1,6 @@ { "cocos2d" : { - "module_type" : "compiled", + "is_compiled" : true, "target_dir" : "cocos", "win32_lib_file_name" : "libcocos2d", "ios_lib_file_name" : "libcocos2d iOS.a", @@ -15,12 +15,16 @@ "2d/*.h", "3d/*.h", "3d/*.inl", "base/*.h", "deprecated/*.h", "math/*.h", "math/*.inl", "physics/*.h", "platform/*.h", "renderer/*.h", - "storage/*.h", "cocos2d.h", "2d/*.props" + "storage/*.h", "cocos2d.h", "2d/cocos2d_headers.props", + "2d/cocos2dx.props" ] }, { "from": "cocos/platform/android/java", - "to": "cocos/include/platform/android/java" + "to": "cocos/include/platform/android/java", + "exclude": [ + "bin/*", "gen/*", "libs/*" + ] }, { "from": "external", @@ -32,6 +36,45 @@ "json/*.h", "win32-specific/*" ] + }, + { + "from": "external/lua/tolua", + "to": "cocos/lua-bindings/include", + "include": [ + "*.h" + ] + }, + { + "from": "cocos/scripting/lua-bindings/script/cocos2d", + "to": "cocos/lua-bindings/script", + "include": [ + "*.lua" + ] + }, + { + "from": "cocos/scripting/lua-bindings/auto", + "to": "cocos/lua-bindings/include", + "include": [ + "lua_cocos2dx_auto.hpp", + "lua_cocos2dx_experimental_auto.hpp", + "lua_cocos2dx_physics_auto.hpp" + ] + }, + { + "from": "cocos/scripting/lua-bindings/manual", + "to": "cocos/lua-bindings/include", + "include": [ + "CCLuaBridge.h", + "CCLuaStack.h", + "Cocos2dxLuaLoader.h", + "lua_debugger.h", + "CCLuaEngine.h", + "CCLuaValue.h", + "LuaBasicConversions.h", + "tolua_fix.h", + "cocos2d/*.h", + "cocos2d/*.hpp" + ] } ], "export_include" : [ @@ -58,57 +101,172 @@ ], "export_cppflags" : [ "-Wno-literal-suffix", "-Wno-deprecated-declarations" - ] + ], + "is_optional" : false, + "lua_bindings" : { + "lua_lib_name" : "libluacocos2d", + "android_lib_name" : "cocos2d_lua_static", + "depend_modules" : [ + "luajit" + ] + } }, "freetype" : { - "module_type" : "prebuilt", + "is_compiled" : false, "from_dir" : "external/freetype2", "target_dir" : "external/freetype2", - "android_lib_name" : "cocos_freetype2_static" + "android_lib_name" : "cocos_freetype2_static", + "is_optional" : false, + "exclude" : [ + "include/ios/*", + "include/linux/*", + "include/wp8/*", + "include/winrt/*", + "include/mac/*", + "prebuilt/ios/*", + "prebuilt/linux/*", + "prebuilt/wp8/*", + "prebuilt/winrt/*", + "prebuilt/mac/*" + ] }, "jpeg" : { - "module_type" : "prebuilt", + "is_compiled" : false, "from_dir" : "external/jpeg", "target_dir" : "external/jpeg", - "android_lib_name" : "cocos_jpeg_static" + "android_lib_name" : "cocos_jpeg_static", + "is_optional" : false, + "exclude" : [ + "include/ios/*", + "include/linux/*", + "include/wp8/*", + "include/winrt/*", + "include/mac/*", + "prebuilt/ios/*", + "prebuilt/linux/*", + "prebuilt/wp8/*", + "prebuilt/winrt/*", + "prebuilt/mac/*" + ] }, "png" : { - "module_type" : "prebuilt", + "is_compiled" : false, "from_dir" : "external/png", "target_dir" : "external/png", - "android_lib_name" : "cocos_png_static" + "android_lib_name" : "cocos_png_static", + "is_optional" : false, + "exclude" : [ + "include/ios/*", + "include/wp8/*", + "include/winrt/*", + "include/mac/*", + "prebuilt/ios/*", + "prebuilt/wp8/*", + "prebuilt/winrt/*", + "prebuilt/mac/*" + ] }, "webp" : { - "module_type" : "prebuilt", + "is_compiled" : false, "from_dir" : "external/webp", "target_dir" : "external/webp", - "android_lib_name" : "cocos_webp_static" + "android_lib_name" : "cocos_webp_static", + "is_optional" : false, + "exclude" : [ + "include/ios/*", + "include/linux/*", + "include/mac/*", + "prebuilt/ios/*", + "prebuilt/linux/*", + "prebuilt/mac/*" + ] }, "tiff" : { - "module_type" : "prebuilt", + "is_compiled" : false, "from_dir" : "external/tiff", "target_dir" : "external/tiff", - "android_lib_name" : "cocos_tiff_static" + "android_lib_name" : "cocos_tiff_static", + "is_optional" : false, + "exclude" : [ + "include/ios/*", + "include/linux/*", + "include/wp8/*", + "include/winrt/*", + "include/mac/*", + "prebuilt/ios/*", + "prebuilt/linux/*", + "prebuilt/wp8/*", + "prebuilt/winrt/*", + "prebuilt/mac/*" + ] }, "curl" : { - "module_type" : "prebuilt", + "is_compiled" : false, "from_dir" : "external/curl", "target_dir" : "external/curl", - "android_lib_name" : "cocos_curl_static" + "win32_lib_file_name" : "libcurl_imp", + "android_lib_name" : "cocos_curl_static", + "is_optional" : false, + "exclude" : [ + "include/ios/*", + "include/wp8/*", + "prebuilt/ios/*", + "prebuilt/wp8/*" + ], + "additional_link" : { + "mac": { + "libcurl.dylib": "usr/lib" + } + } }, "websockets" : { - "module_type" : "prebuilt", + "is_compiled" : false, "from_dir" : "external/websockets", "target_dir" : "external/websockets", - "android_lib_name" : "websockets_static" + "win32_lib_file_name" : "websockets", + "android_lib_name" : "websockets_static", + "is_optional" : false, + "exclude" : [ + "include/ios/*", + "include/linux/*", + "include/wp8/*", + "include/mac/*", + "prebuilt/ios/*", + "prebuilt/linux/*", + "prebuilt/wp8/*", + "prebuilt/mac/*" + ] }, "glfw3": { - "module_type" : "prebuilt", + "is_compiled" : false, "from_dir" : "external/glfw3", - "target_dir" : "external/glfw3" + "target_dir" : "external/glfw3", + "is_optional" : false + }, + "luajit": { + "is_compiled" : false, + "from_dir" : "external/lua/luajit", + "target_dir" : "external/lua/luajit", + "android_lib_name" : "luajit_static", + "is_optional" : false, + "include" : [ + "include/*", + "prebuilt/android/*", + "prebuilt/win32/*" + ] + }, + "lua": { + "is_compiled" : false, + "from_dir" : "external/lua/lua", + "target_dir" : "external/lua/lua", + "is_optional" : false, + "include" : [ + "*.h", + "prebuilt/ios/*" + ] }, "cocos_android" : { - "module_type" : "compiled", + "is_compiled" : true, "target_dir" : "cocos/include/platform/android", "android_lib_name" : "cocos2dxandroid_static", "android_lib_file_name" : "libcocos2dandroid", @@ -117,10 +275,11 @@ ], "export_ldlibs" : [ "GLESv1_CM", "GLESv2", "EGL", "log", "z", "android" - ] + ], + "is_optional" : false }, "chipmunk" : { - "module_type" : "compiled", + "is_compiled" : true, "target_dir" : "modules/chipmunk", "win32_lib_file_name" : "libchipmunk", "ios_lib_file_name" : "libchipmunk iOS.a", @@ -138,10 +297,11 @@ ], "export_include" : [ "../../include/chipmunk" - ] + ], + "is_optional" : true }, "box2d" : { - "module_type" : "compiled", + "is_compiled" : true, "target_dir" : "modules/Box2D", "win32_lib_file_name" : "libbox2d", "ios_lib_file_name" : "libbox2d iOS.a", @@ -159,10 +319,11 @@ ], "export_include" : [ "../../include" - ] + ], + "is_optional" : true }, "audio" : { - "module_type" : "compiled", + "is_compiled" : true, "target_dir" : "modules/audio", "win32_lib_file_name" : "libcocosdenshion", "ios_lib_file_name" : "libcocosdenshion iOS.a", @@ -176,14 +337,46 @@ "include" : [ "include/*.h" ] + }, + { + "from": "cocos/scripting/lua-bindings/script/cocosdenshion", + "to": "modules/audio/lua-bindings/script", + "include": [ + "*.lua" + ] + }, + { + "from": "cocos/scripting/lua-bindings/auto", + "to": "modules/audio/lua-bindings/include", + "include": [ + "lua_cocos2dx_cocosdenshion_auto.hpp" + ] + }, + { + "from": "cocos/scripting/lua-bindings/manual/cocosdenshion", + "to": "modules/audio/lua-bindings/include", + "include": [ + "*.hpp", "*.h" + ] } ], "export_include" : [ "../../include" - ] + ], + "is_optional" : true, + "lua_bindings" : { + "lua_lib_name" : "libluacocosdenshion", + "android_lib_name" : "cocosdenshion_lua_static", + "headers" : [ + "lua_cocos2dx_cocosdenshion_manual.h" + ], + "registers" : [ + "register_cocosdenshion_module" + ] + } }, "network" : { - "module_type" : "compiled", + "is_compiled" : true, "target_dir" : "modules/network", "win32_lib_file_name" : "libnetwork", "ios_lib_file_name" : "libnetwork iOS.a", @@ -197,6 +390,27 @@ "include" : [ "*.h" ] + }, + { + "from": "external/lua/luasocket", + "to": "modules/network/lua-bindings/script", + "include": [ + "*.lua" + ] + }, + { + "from": "cocos/scripting/lua-bindings/script/network", + "to": "modules/network/lua-bindings/script", + "include": [ + "*.lua" + ] + }, + { + "from": "cocos/scripting/lua-bindings/manual/network", + "to": "modules/network/lua-bindings/include", + "include": [ + "*.hpp", "*.h" + ] } ], "export_include" : [ @@ -204,10 +418,21 @@ ], "depend_modules" : [ "cocos2d", "curl", "websockets" - ] + ], + "is_optional" : true, + "lua_bindings" : { + "lua_lib_name" : "libluanetwork", + "android_lib_name" : "network_lua_static", + "headers" : [ + "lua_cocos2dx_network_manual.h" + ], + "registers" : [ + "register_network_module" + ] + } }, "ui" : { - "module_type" : "compiled", + "is_compiled" : true, "target_dir" : "modules/ui", "win32_lib_file_name" : "libui", "ios_lib_file_name" : "libui iOS.a", @@ -221,6 +446,28 @@ "include" : [ "*.h" ] + }, + { + "from": "cocos/scripting/lua-bindings/script/ui", + "to": "modules/ui/lua-bindings/script", + "include": [ + "*.lua" + ] + }, + { + "from": "cocos/scripting/lua-bindings/auto", + "to": "modules/ui/lua-bindings/include", + "include": [ + "lua_cocos2dx_ui_auto.hpp", + "lua_cocos2dx_experimental_video_auto.hpp" + ] + }, + { + "from": "cocos/scripting/lua-bindings/manual/ui", + "to": "modules/ui/lua-bindings/include", + "include": [ + "*.hpp", "*.h" + ] } ], "export_include" : [ @@ -228,10 +475,21 @@ ], "depend_modules" : [ "cocos2d", "extensions" - ] + ], + "is_optional" : true, + "lua_bindings" : { + "lua_lib_name" : "libluaui", + "android_lib_name" : "ui_lua_static", + "headers" : [ + "lua_cocos2dx_ui_manual.hpp" + ], + "registers" : [ + "register_ui_moudle" + ] + } }, "extensions" : { - "module_type" : "compiled", + "is_compiled" : true, "target_dir" : "modules/extensions", "win32_lib_file_name" : "libextension", "ios_lib_file_name" : "libextension iOS.a", @@ -245,6 +503,27 @@ "include" : [ "*.h" ] + }, + { + "from": "cocos/scripting/lua-bindings/script/extension", + "to": "modules/extensions/lua-bindings/script", + "include": [ + "*.lua" + ] + }, + { + "from": "cocos/scripting/lua-bindings/auto", + "to": "modules/extensions/lua-bindings/include", + "include": [ + "lua_cocos2dx_extension_auto.hpp" + ] + }, + { + "from": "cocos/scripting/lua-bindings/manual/extension", + "to": "modules/extensions/lua-bindings/include", + "include": [ + "*.hpp", "*.h" + ] } ], "export_include" : [ @@ -252,10 +531,21 @@ ], "depend_modules" : [ "cocos2d", "curl", "box2d" - ] + ], + "is_optional" : true, + "lua_bindings" : { + "lua_lib_name" : "libluaextension", + "android_lib_name" : "extension_lua_static", + "headers" : [ + "lua_cocos2dx_extension_manual.h" + ], + "registers" : [ + "register_extension_module" + ] + } }, "cocostudio" : { - "module_type" : "compiled", + "is_compiled" : true, "target_dir" : "modules/cocostudio", "win32_lib_file_name" : "libcocostudio", "ios_lib_file_name" : "libcocostudio iOS.a", @@ -269,6 +559,27 @@ "include" : [ "*.h" ] + }, + { + "from": "cocos/scripting/lua-bindings/script/cocostudio", + "to": "modules/cocostudio/lua-bindings/script", + "include": [ + "*.lua" + ] + }, + { + "from": "cocos/scripting/lua-bindings/auto", + "to": "modules/cocostudio/lua-bindings/include", + "include": [ + "lua_cocos2dx_studio_auto.hpp" + ] + }, + { + "from": "cocos/scripting/lua-bindings/manual/cocostudio", + "to": "modules/cocostudio/lua-bindings/include", + "include": [ + "*.hpp", "*.h" + ] } ], "export_include" : [ @@ -276,10 +587,21 @@ ], "depend_modules" : [ "ui", "audio" - ] + ], + "is_optional" : true, + "lua_bindings" : { + "lua_lib_name" : "libluacocostudio", + "android_lib_name" : "cocostudio_lua_static", + "headers" : [ + "lua_cocos2dx_coco_studio_manual.hpp" + ], + "registers" : [ + "register_cocostudio_module" + ] + } }, "spine" : { - "module_type" : "compiled", + "is_compiled" : true, "target_dir" : "modules/spine", "win32_lib_file_name" : "libspine", "ios_lib_file_name" : "libspine iOS.a", @@ -293,6 +615,20 @@ "include" : [ "*.h" ] + }, + { + "from": "cocos/scripting/lua-bindings/auto", + "to": "modules/spine/lua-bindings/include", + "include": [ + "lua_cocos2dx_spine_auto.hpp" + ] + }, + { + "from": "cocos/scripting/lua-bindings/manual/spine", + "to": "modules/spine/lua-bindings/include", + "include": [ + "*.hpp", "*.h" + ] } ], "export_include" : [ @@ -300,10 +636,21 @@ ], "depend_modules" : [ "cocos2d" - ] + ], + "is_optional" : true, + "lua_bindings" : { + "lua_lib_name" : "libluaspine", + "android_lib_name" : "spine_lua_static", + "headers" : [ + "lua_cocos2dx_spine_manual.hpp" + ], + "registers" : [ + "register_spine_module" + ] + } }, "cocosbuilder" : { - "module_type" : "compiled", + "is_compiled" : true, "target_dir" : "modules/cocosbuilder", "win32_lib_file_name" : "libcocosbuilder", "ios_lib_file_name" : "libcocosbuilder iOS.a", @@ -317,6 +664,27 @@ "include" : [ "*.h" ] + }, + { + "from": "cocos/scripting/lua-bindings/script/cocosbuilder", + "to": "modules/cocosbuilder/lua-bindings/script", + "include": [ + "*.lua" + ] + }, + { + "from": "cocos/scripting/lua-bindings/auto", + "to": "modules/cocosbuilder/lua-bindings/include", + "include": [ + "lua_cocos2dx_cocosbuilder_auto.hpp" + ] + }, + { + "from": "cocos/scripting/lua-bindings/manual/cocosbuilder", + "to": "modules/cocosbuilder/lua-bindings/include", + "include": [ + "*.hpp", "*.h" + ] } ], "export_include" : [ @@ -324,6 +692,17 @@ ], "depend_modules" : [ "extensions" - ] + ], + "is_optional" : true, + "lua_bindings" : { + "lua_lib_name" : "libluacocosbuilder", + "android_lib_name" : "cocosbuilder_lua_static", + "headers" : [ + "lua_cocos2dx_cocosbuilder_manual.h" + ], + "registers" : [ + "register_cocosbuilder_module" + ] + } } } diff --git a/tools/gen-prebuilt/module_organize.py b/tools/gen-prebuilt/module_organize.py index ee3f32514a..c6d5572f5b 100644 --- a/tools/gen-prebuilt/module_organize.py +++ b/tools/gen-prebuilt/module_organize.py @@ -9,10 +9,7 @@ class ModuleOrganizer(object): CFG_FILE = "module_config.json" - KEY_MODULE_TYPE = "module_type" - MODULE_TYPE_COMPILED = "compiled" - MODULE_TYPE_PREBUILT = "prebuilt" - + KEY_MODULE_IS_COMPILED = "is_compiled" KEY_MODULE_FROM_DIR = "from_dir" KEY_MODULE_TARGET_DIR = "target_dir" KEY_MODULE_INCLUDE = "include" @@ -26,6 +23,27 @@ class ModuleOrganizer(object): KEY_MODULE_WIN32_LIB_FILE_NAME = "win32_lib_file_name" KEY_MODULE_IOS_LIB_FILE_NAME = "ios_lib_file_name" KEY_MODULE_MAC_LIB_FILE_NAME = "mac_lib_file_name" + KEY_MODULE_IS_OPTIONAL = "is_optional" + KEY_MODULE_LUA_BINDINGS = "lua_bindings" + KEY_MODULE_LUA_LIB_NAME = "lua_lib_name" + KEY_MODULE_EXCLUDE = "exclude" + KEY_MODULE_ADDITIONAL_LINK = "additional_link" + + EXPORT_KEYS = [ + KEY_MODULE_IS_COMPILED, + KEY_MODULE_TARGET_DIR, + KEY_MODULE_ANDROID_LIB_NAME, + KEY_MODULE_ANDROID_LIB_FILE_NAME, + KEY_MODULE_DEPEND_MODULES, + KEY_MODULE_WIN32_LIB_FILE_NAME, + KEY_MODULE_IOS_LIB_FILE_NAME, + KEY_MODULE_MAC_LIB_FILE_NAME, + KEY_MODULE_IS_OPTIONAL, + KEY_MODULE_LUA_BINDINGS, + KEY_MODULE_ADDITIONAL_LINK + ] + + EXPORT_MODULE_INFO_FILE_NAME = "modules-info.json" # Parameter 5--9 means: # 5. LOCAL_EXPORT_LDLIBS @@ -46,6 +64,10 @@ class ModuleOrganizer(object): "include $(PREBUILT_STATIC_LIBRARY)\n\n" \ "%s\n" + PROPS_FILE_PATH = "cocos/include/2d/cocos2d_headers.props" + VERSION_SRC_FILE = "cocos/cocos2d.cpp" + VERSION_DST_FILE = "version" + def __init__(self, dst_root): self.local_path = os.path.realpath(os.path.dirname(__file__)) self.modules_info = self._parse_modules() @@ -53,6 +75,9 @@ class ModuleOrganizer(object): self.src_root = os.path.join(self.local_path, os.path.pardir, os.path.pardir) self.prebuilt_dir = os.path.join(self.local_path, "prebuilt") + if not os.path.exists(self.prebuilt_dir): + raise Exception("Prebuilt directory is not existed. PLZ run script 'gen_prebuilt_libs.py' first.") + if dst_root is None: dst = self.local_path else: @@ -190,13 +215,53 @@ class ModuleOrganizer(object): else: print("\t%s is not existed" % src_lib_file) + def handle_for_lua_bindings(self, module_name): + module_info = self.modules_info[module_name] + lua_binding_info = module_info[ModuleOrganizer.KEY_MODULE_LUA_BINDINGS] + lua_lib_name = lua_binding_info[ModuleOrganizer.KEY_MODULE_LUA_LIB_NAME] + platforms = { + "android" : "*/%s.a" % lua_lib_name, + "ios" : "%s iOS.a" % lua_lib_name, + "mac" : "%s Mac.a" % lua_lib_name, + "win32" : "%s.lib" % lua_lib_name + } + + target_dir = os.path.join(self.dst_root, module_info[ModuleOrganizer.KEY_MODULE_TARGET_DIR], "lua-bindings", "prebuilt") + for p in platforms.keys(): + cpy_info = { + "from" : p, + "to" : p, + "include" : [ + platforms[p] + ] + } + excopy.copy_files_with_config(cpy_info, self.prebuilt_dir, target_dir) + + # write the Android.mk for lua-bindings lib + android_lib_name = lua_binding_info[ModuleOrganizer.KEY_MODULE_ANDROID_LIB_NAME] + mk_file_path = os.path.join(target_dir, "android", "Android.mk") + + depends = [ module_name ] + if lua_binding_info.has_key(ModuleOrganizer.KEY_MODULE_DEPEND_MODULES): + depends += lua_binding_info[ModuleOrganizer.KEY_MODULE_DEPEND_MODULES] + whole_libs, call_libs = self.gen_android_depend_str(depends) + file_content = ModuleOrganizer.MK_FORMAT % \ + (android_lib_name, + lua_lib_name, + "./$(TARGET_ARCH_ABI)/%s.a" % lua_lib_name, + "${LOCAL_PATH}/../../include", + "", "", "", whole_libs, call_libs ) + f = open(mk_file_path, "w") + f.write(file_content) + f.close() + def gen_compiled_module(self, module_name): print("generate compiled module : %s" % module_name) module_info = self.modules_info[module_name] # copy the include files if module_info.has_key(ModuleOrganizer.KEY_MODULE_INCLUDE): - for inclue_cfg in module_info[ModuleOrganizer.KEY_MODULE_INCLUDE]: - excopy.copy_files_with_config(inclue_cfg, self.src_root, self.dst_root) + for include_cfg in module_info[ModuleOrganizer.KEY_MODULE_INCLUDE]: + excopy.copy_files_with_config(include_cfg, self.src_root, self.dst_root) # handle the process for android self.handle_for_android(module_info) @@ -207,26 +272,103 @@ class ModuleOrganizer(object): # handle the process for ios and mac self.handle_for_ios_mac(module_info) + # handle the lua-bindings + if module_info.has_key(ModuleOrganizer.KEY_MODULE_LUA_BINDINGS): + self.handle_for_lua_bindings(module_name) + def gen_prebuilt_module(self, module_name): print("generate prebuilt module : %s" % module_name) module_info = self.modules_info[module_name] + if module_info.has_key(ModuleOrganizer.KEY_MODULE_EXCLUDE): + exclude = module_info[ModuleOrganizer.KEY_MODULE_EXCLUDE] + else: + exclude = [] + + if module_info.has_key(ModuleOrganizer.KEY_MODULE_INCLUDE): + include = module_info[ModuleOrganizer.KEY_MODULE_INCLUDE] + else: + include = [] + copy_cfg = { "from" : module_info[ModuleOrganizer.KEY_MODULE_FROM_DIR], "to": module_info[ModuleOrganizer.KEY_MODULE_TARGET_DIR] } + + if len(include) > 0: + copy_cfg["include"] = include + elif len(exclude) > 0: + copy_cfg["exclude"] = exclude + excopy.copy_files_with_config(copy_cfg, self.src_root, self.dst_root) + def export_modules_info(self): + export_file_path = os.path.join(self.dst_root, ModuleOrganizer.EXPORT_MODULE_INFO_FILE_NAME) + export_info = {} + for module_name in self.modules_info.keys(): + module_info = self.modules_info[module_name] + dst_info = {} + for key in ModuleOrganizer.EXPORT_KEYS: + if module_info.has_key(key): + dst_info[key] = module_info[key] + + export_info[module_name] = dst_info + + outfile = open(export_file_path, "w") + json.dump(export_info, outfile, sort_keys = True, indent = 4) + outfile.close() + def gen_modules(self): if os.path.exists(self.dst_root): shutil.rmtree(self.dst_root) for module in self.modules_info.keys(): module_info = self.modules_info[module] - if module_info[ModuleOrganizer.KEY_MODULE_TYPE] == ModuleOrganizer.MODULE_TYPE_COMPILED: + if module_info[ModuleOrganizer.KEY_MODULE_IS_COMPILED]: self.gen_compiled_module(module) - elif module_info[ModuleOrganizer.KEY_MODULE_TYPE] == ModuleOrganizer.MODULE_TYPE_PREBUILT: + else: self.gen_prebuilt_module(module) + # copy the module config file to dst root + self.export_modules_info() + + # restore the version of engine + src_file = os.path.join(self.src_root, ModuleOrganizer.VERSION_SRC_FILE) + ver = "" + f = open(src_file) + import re + for line in f.readlines(): + match = re.match(r".*return[ \t]*\"(.*)\";", line) + if match: + ver = match.group(1) + break + f.close() + + if len(ver) <= 0: + raise Exception("Can't find version in %s" % src_file) + else: + dst_file = os.path.join(self.dst_root, ModuleOrganizer.VERSION_DST_FILE) + f = open(dst_file, "w") + f.write(ver) + f.close() + + # modify the cocos2dx.props + props_file = os.path.join(self.dst_root, ModuleOrganizer.PROPS_FILE_PATH) + if os.path.exists(props_file): + f = open(props_file) + file_content = f.read() + f.close() + + replace_str = { + "$(MSBuildThisFileDirectory)..\\..\\" : "$(MSBuildThisFileDirectory)..\\..\\..\\", + "$(EngineRoot)cocos" : "$(EngineRoot)cocos\\include" + } + for key in replace_str.keys(): + file_content = file_content.replace(key, replace_str[key]) + + f = open(props_file, "w") + f.write(file_content) + f.close() + if __name__ == '__main__': parser = ArgumentParser(description="Organize the modules of engine from prebuilt engine.") parser.add_argument('-d', "--dst-root", dest='dst_root', help='The path where to place the engine organized by modules.')