From e5f9c1b4888ec2533f54bb75e7c5f9470b899f70 Mon Sep 17 00:00:00 2001 From: samuele3hu Date: Mon, 4 Aug 2014 15:22:07 +0800 Subject: [PATCH] Adjust common script and related test cases --- build/cocos2d_tests.xcodeproj/project.pbxproj | 182 ++++++-- .../xcschemes/lua-tests Mac.xcscheme | 2 +- .../lua-bindings/script/CocoStudio.lua | 6 + .../scripting/lua-bindings/script/Cocos2d.lua | 17 - .../lua-bindings/script/Cocos2dConstants.lua | 125 +---- .../script/ControllerConstants.lua | 37 ++ .../script/DeprecatedCocoStudioClass.lua | 304 ++++++++++++ .../script/DeprecatedCocoStudioFunc.lua | 77 +++ ...edClass.lua => DeprecatedCocos2dClass.lua} | 441 ------------------ ...atedEnum.lua => DeprecatedCocos2dEnum.lua} | 126 ----- ...precated.lua => DeprecatedCocos2dFunc.lua} | 288 +----------- .../script/DeprecatedCocosBuilderClass.lua | 32 ++ .../script/DeprecatedCocosDenshionClass.lua | 16 + .../script/DeprecatedCocosDenshionFunc.lua | 19 + .../script/DeprecatedExtensionClass.lua | 113 +++++ .../script/DeprecatedExtensionEnum.lua | 23 + .../script/DeprecatedExtensionFunc.lua | 28 ++ .../script/DeprecatedNetworkClass.lua | 16 + .../script/DeprecatedNetworkEnum.lua | 9 + .../script/DeprecatedNetworkFunc.lua | 23 + .../lua-bindings/script/DeprecatedUIEnum.lua | 92 ++++ .../lua-bindings/script/DeprecatedUIFunc.lua | 154 ++++++ .../script/ExtensionConstants.lua | 58 +++ .../lua-bindings/script/NetworkConstants.lua | 18 + .../project/Classes/AppDelegate.cpp | 14 + .../project/Classes/AppDelegate.cpp | 4 + .../src/GameControllerTest.lua | 1 + .../lua-tests/project/Classes/AppDelegate.cpp | 33 +- tests/lua-tests/src/controller.lua | 2 - 29 files changed, 1227 insertions(+), 1033 deletions(-) create mode 100644 cocos/scripting/lua-bindings/script/ControllerConstants.lua create mode 100644 cocos/scripting/lua-bindings/script/DeprecatedCocoStudioClass.lua create mode 100644 cocos/scripting/lua-bindings/script/DeprecatedCocoStudioFunc.lua rename cocos/scripting/lua-bindings/script/{DeprecatedClass.lua => DeprecatedCocos2dClass.lua} (80%) rename cocos/scripting/lua-bindings/script/{DeprecatedEnum.lua => DeprecatedCocos2dEnum.lua} (71%) rename cocos/scripting/lua-bindings/script/{Deprecated.lua => DeprecatedCocos2dFunc.lua} (76%) create mode 100644 cocos/scripting/lua-bindings/script/DeprecatedCocosBuilderClass.lua create mode 100644 cocos/scripting/lua-bindings/script/DeprecatedCocosDenshionClass.lua create mode 100644 cocos/scripting/lua-bindings/script/DeprecatedCocosDenshionFunc.lua create mode 100644 cocos/scripting/lua-bindings/script/DeprecatedExtensionClass.lua create mode 100644 cocos/scripting/lua-bindings/script/DeprecatedExtensionEnum.lua create mode 100644 cocos/scripting/lua-bindings/script/DeprecatedExtensionFunc.lua create mode 100644 cocos/scripting/lua-bindings/script/DeprecatedNetworkClass.lua create mode 100644 cocos/scripting/lua-bindings/script/DeprecatedNetworkEnum.lua create mode 100644 cocos/scripting/lua-bindings/script/DeprecatedNetworkFunc.lua create mode 100644 cocos/scripting/lua-bindings/script/DeprecatedUIEnum.lua create mode 100644 cocos/scripting/lua-bindings/script/DeprecatedUIFunc.lua create mode 100644 cocos/scripting/lua-bindings/script/ExtensionConstants.lua create mode 100644 cocos/scripting/lua-bindings/script/NetworkConstants.lua diff --git a/build/cocos2d_tests.xcodeproj/project.pbxproj b/build/cocos2d_tests.xcodeproj/project.pbxproj index 432fa44828..d74701e079 100644 --- a/build/cocos2d_tests.xcodeproj/project.pbxproj +++ b/build/cocos2d_tests.xcodeproj/project.pbxproj @@ -62,6 +62,61 @@ 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 */; }; 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 */; }; @@ -103,9 +158,6 @@ 15CBA9A9196EE7FA005877BB /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36818CD9E180087CE3A /* Cocos2d.lua */; }; 15CBA9AA196EE7FA005877BB /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36918CD9E180087CE3A /* Cocos2dConstants.lua */; }; 15CBA9AB196EE7FA005877BB /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36A18CD9E180087CE3A /* CocoStudio.lua */; }; - 15CBA9AC196EE7FA005877BB /* Deprecated.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36B18CD9E180087CE3A /* Deprecated.lua */; }; - 15CBA9AD196EE7FA005877BB /* DeprecatedClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36C18CD9E180087CE3A /* DeprecatedClass.lua */; }; - 15CBA9AE196EE7FA005877BB /* DeprecatedEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36D18CD9E180087CE3A /* DeprecatedEnum.lua */; }; 15CBA9AF196EE80B005877BB /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = 3E6177F01960FEFE00DE83F5 /* fonts */; }; 15CBA9B0196EE80B005877BB /* ipad in Resources */ = {isa = PBXBuildFile; fileRef = 3E6177F11960FEFE00DE83F5 /* ipad */; }; 15CBA9B1196EE80B005877BB /* ipadhd in Resources */ = {isa = PBXBuildFile; fileRef = 3E6177F21960FEFE00DE83F5 /* ipadhd */; }; @@ -221,9 +273,6 @@ 1A0EE55E18CDFBBD004CD58F /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36818CD9E180087CE3A /* Cocos2d.lua */; }; 1A0EE55F18CDFBBD004CD58F /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36918CD9E180087CE3A /* Cocos2dConstants.lua */; }; 1A0EE56018CDFBBD004CD58F /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36A18CD9E180087CE3A /* CocoStudio.lua */; }; - 1A0EE56118CDFBBD004CD58F /* Deprecated.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36B18CD9E180087CE3A /* Deprecated.lua */; }; - 1A0EE56218CDFBBD004CD58F /* DeprecatedClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36C18CD9E180087CE3A /* DeprecatedClass.lua */; }; - 1A0EE56318CDFBBD004CD58F /* DeprecatedEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36D18CD9E180087CE3A /* DeprecatedEnum.lua */; }; 1A0EE56418CDFBBD004CD58F /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36E18CD9E180087CE3A /* DeprecatedOpenglEnum.lua */; }; 1A0EE56518CDFBBD004CD58F /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36F18CD9E180087CE3A /* DrawPrimitives.lua */; }; 1A0EE56618CDFBBD004CD58F /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37018CD9E180087CE3A /* extern.lua */; }; @@ -239,9 +288,6 @@ 1A0EE57018CDFBBE004CD58F /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36818CD9E180087CE3A /* Cocos2d.lua */; }; 1A0EE57118CDFBBE004CD58F /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36918CD9E180087CE3A /* Cocos2dConstants.lua */; }; 1A0EE57218CDFBBE004CD58F /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36A18CD9E180087CE3A /* CocoStudio.lua */; }; - 1A0EE57318CDFBBE004CD58F /* Deprecated.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36B18CD9E180087CE3A /* Deprecated.lua */; }; - 1A0EE57418CDFBBE004CD58F /* DeprecatedClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36C18CD9E180087CE3A /* DeprecatedClass.lua */; }; - 1A0EE57518CDFBBE004CD58F /* DeprecatedEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36D18CD9E180087CE3A /* DeprecatedEnum.lua */; }; 1A0EE57618CDFBBE004CD58F /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36E18CD9E180087CE3A /* DeprecatedOpenglEnum.lua */; }; 1A0EE57718CDFBBE004CD58F /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36F18CD9E180087CE3A /* DrawPrimitives.lua */; }; 1A0EE57818CDFBBE004CD58F /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37018CD9E180087CE3A /* extern.lua */; }; @@ -292,12 +338,6 @@ 1ABCA37F18CD9E180087CE3A /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36918CD9E180087CE3A /* Cocos2dConstants.lua */; }; 1ABCA38018CD9E180087CE3A /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36A18CD9E180087CE3A /* CocoStudio.lua */; }; 1ABCA38118CD9E180087CE3A /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36A18CD9E180087CE3A /* CocoStudio.lua */; }; - 1ABCA38218CD9E180087CE3A /* Deprecated.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36B18CD9E180087CE3A /* Deprecated.lua */; }; - 1ABCA38318CD9E180087CE3A /* Deprecated.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36B18CD9E180087CE3A /* Deprecated.lua */; }; - 1ABCA38418CD9E180087CE3A /* DeprecatedClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36C18CD9E180087CE3A /* DeprecatedClass.lua */; }; - 1ABCA38518CD9E180087CE3A /* DeprecatedClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36C18CD9E180087CE3A /* DeprecatedClass.lua */; }; - 1ABCA38618CD9E180087CE3A /* DeprecatedEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36D18CD9E180087CE3A /* DeprecatedEnum.lua */; }; - 1ABCA38718CD9E180087CE3A /* DeprecatedEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36D18CD9E180087CE3A /* DeprecatedEnum.lua */; }; 1ABCA38818CD9E180087CE3A /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36E18CD9E180087CE3A /* DeprecatedOpenglEnum.lua */; }; 1ABCA38918CD9E180087CE3A /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36E18CD9E180087CE3A /* DeprecatedOpenglEnum.lua */; }; 1ABCA38A18CD9E180087CE3A /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36F18CD9E180087CE3A /* DrawPrimitives.lua */; }; @@ -1828,6 +1868,24 @@ 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 = ""; }; 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; }; @@ -2977,9 +3035,6 @@ 1ABCA36818CD9E180087CE3A /* Cocos2d.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2d.lua; path = "../cocos/scripting/lua-bindings/script/Cocos2d.lua"; sourceTree = ""; }; 1ABCA36918CD9E180087CE3A /* Cocos2dConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2dConstants.lua; path = "../cocos/scripting/lua-bindings/script/Cocos2dConstants.lua"; sourceTree = ""; }; 1ABCA36A18CD9E180087CE3A /* CocoStudio.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CocoStudio.lua; path = "../cocos/scripting/lua-bindings/script/CocoStudio.lua"; sourceTree = ""; }; - 1ABCA36B18CD9E180087CE3A /* Deprecated.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Deprecated.lua; path = "../cocos/scripting/lua-bindings/script/Deprecated.lua"; sourceTree = ""; }; - 1ABCA36C18CD9E180087CE3A /* DeprecatedClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedClass.lua; path = "../cocos/scripting/lua-bindings/script/DeprecatedClass.lua"; sourceTree = ""; }; - 1ABCA36D18CD9E180087CE3A /* DeprecatedEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedEnum.lua; path = "../cocos/scripting/lua-bindings/script/DeprecatedEnum.lua"; sourceTree = ""; }; 1ABCA36E18CD9E180087CE3A /* DeprecatedOpenglEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedOpenglEnum.lua; path = "../cocos/scripting/lua-bindings/script/DeprecatedOpenglEnum.lua"; sourceTree = ""; }; 1ABCA36F18CD9E180087CE3A /* DrawPrimitives.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DrawPrimitives.lua; path = "../cocos/scripting/lua-bindings/script/DrawPrimitives.lua"; sourceTree = ""; }; 1ABCA37018CD9E180087CE3A /* extern.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = extern.lua; path = "../cocos/scripting/lua-bindings/script/extern.lua"; sourceTree = ""; }; @@ -6015,6 +6070,24 @@ 1ABCA36418CD9E060087CE3A /* Lua Common */ = { isa = PBXGroup; children = ( + 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 */, 1503FAA918DA8B6C00F6518C /* ftp.lua */, @@ -6032,9 +6105,6 @@ 1ABCA36818CD9E180087CE3A /* Cocos2d.lua */, 1ABCA36918CD9E180087CE3A /* Cocos2dConstants.lua */, 1ABCA36A18CD9E180087CE3A /* CocoStudio.lua */, - 1ABCA36B18CD9E180087CE3A /* Deprecated.lua */, - 1ABCA36C18CD9E180087CE3A /* DeprecatedClass.lua */, - 1ABCA36D18CD9E180087CE3A /* DeprecatedEnum.lua */, 1ABCA36E18CD9E180087CE3A /* DeprecatedOpenglEnum.lua */, 1ABCA36F18CD9E180087CE3A /* DrawPrimitives.lua */, 1ABCA37018CD9E180087CE3A /* extern.lua */, @@ -8415,9 +8485,12 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 15427D2E198F6B2D00DC375D /* DeprecatedCocos2dEnum.lua in Resources */, 15CBA9B3196EE824005877BB /* src in Resources */, + 15427D2B198F6B2600DC375D /* DeprecatedCocos2dClass.lua in Resources */, 15CBA9AF196EE80B005877BB /* fonts in Resources */, 15CBA9B0196EE80B005877BB /* ipad in Resources */, + 15427D31198F6B3500DC375D /* DeprecatedCocos2dFunc.lua in Resources */, 15CBA9B1196EE80B005877BB /* ipadhd in Resources */, 15CBA9B2196EE80B005877BB /* iphone in Resources */, 15CBA9F2196F8718005877BB /* extern.lua in Resources */, @@ -8425,9 +8498,6 @@ 15CBA9A9196EE7FA005877BB /* Cocos2d.lua in Resources */, 15CBA9AA196EE7FA005877BB /* Cocos2dConstants.lua in Resources */, 15CBA9AB196EE7FA005877BB /* CocoStudio.lua in Resources */, - 15CBA9AC196EE7FA005877BB /* Deprecated.lua in Resources */, - 15CBA9AD196EE7FA005877BB /* DeprecatedClass.lua in Resources */, - 15CBA9AE196EE7FA005877BB /* DeprecatedEnum.lua in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -8450,31 +8520,35 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 1A0EE57518CDFBBE004CD58F /* DeprecatedEnum.lua in Resources */, 1AC35D5C18CEDE9E00F37B72 /* InfoPlist.strings in Resources */, + 15427D39198F6B4E00DC375D /* DeprecatedNetworkEnum.lua in Resources */, 1A0EE57118CDFBBE004CD58F /* Cocos2dConstants.lua in Resources */, 1AC35D5D18CEDE9E00F37B72 /* MainMenu.xib 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 */, 1503FAC518DA8B6C00F6518C /* url.lua in Resources */, 1A0EE57E18CDFBBE004CD58F /* OpenglConstants.lua in Resources */, 1503FABF18DA8B6C00F6518C /* smtp.lua in Resources */, + 15427D37198F6B4A00DC375D /* DeprecatedNetworkClass.lua in Resources */, 1503FAB318DA8B6C00F6518C /* ftp.lua in Resources */, 1503FAB718DA8B6C00F6518C /* http.lua in Resources */, 1A0EE56E18CDFBBE004CD58F /* AudioEngine.lua in Resources */, 1A0EE57F18CDFBBE004CD58F /* StudioConstants.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 */, 1AC35D5E18CEDE9E00F37B72 /* Icon.icns in Resources */, - 1A0EE57318CDFBBE004CD58F /* Deprecated.lua in Resources */, 1503FABB18DA8B6C00F6518C /* mbox.lua in Resources */, - 1A0EE57418CDFBBE004CD58F /* DeprecatedClass.lua in Resources */, + 15427D2F198F6B3200DC375D /* DeprecatedCocos2dFunc.lua in Resources */, 1A0EE57818CDFBBE004CD58F /* extern.lua in Resources */, 1503FAB518DA8B6C00F6518C /* headers.lua in Resources */, 1A0EE57618CDFBBE004CD58F /* DeprecatedOpenglEnum.lua in Resources */, @@ -8483,6 +8557,7 @@ 1A0EE57C18CDFBBE004CD58F /* luaoc.lua in Resources */, 1A0EE57D18CDFBBE004CD58F /* Opengl.lua in Resources */, 1AC35D2918CEDE7200F37B72 /* res in Resources */, + 15427D29198F6B2100DC375D /* DeprecatedCocos2dClass.lua in Resources */, 1AC35D2B18CEDE7200F37B72 /* src in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -8517,6 +8592,7 @@ 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 */, @@ -8524,18 +8600,17 @@ 1503FAC018DA8B6C00F6518C /* smtp.lua in Resources */, 1AC35D4D18CEDE9400F37B72 /* Icon-57.png in Resources */, 1A0EE56018CDFBBD004CD58F /* CocoStudio.lua in Resources */, - 1A0EE56318CDFBBD004CD58F /* DeprecatedEnum.lua in Resources */, 1503FAB818DA8B6C00F6518C /* http.lua in Resources */, 15AECE22195D122400907DB0 /* experimentalConstants.lua in Resources */, 1AC35D4B18CEDE9400F37B72 /* Icon-144.png in Resources */, 1503FAC618DA8B6C00F6518C /* url.lua in Resources */, 1AC35D4618CEDE9400F37B72 /* Default-568h@2x.png in Resources */, 1AC35D4818CEDE9400F37B72 /* Default@2x.png in Resources */, - 1A0EE56118CDFBBD004CD58F /* Deprecated.lua in Resources */, 1503FAC418DA8B6C00F6518C /* tp.lua in Resources */, 1503FABA18DA8B6C00F6518C /* ltn12.lua in Resources */, + 15427D38198F6B4B00DC375D /* DeprecatedNetworkClass.lua in Resources */, + 15427D3A198F6B4F00DC375D /* DeprecatedNetworkEnum.lua in Resources */, 1A0EE56518CDFBBD004CD58F /* DrawPrimitives.lua in Resources */, - 1A0EE56218CDFBBD004CD58F /* DeprecatedClass.lua in Resources */, 1A0EE56418CDFBBD004CD58F /* DeprecatedOpenglEnum.lua in Resources */, 1503FABE18DA8B6C00F6518C /* mime.lua in Resources */, 1A0EE55F18CDFBBD004CD58F /* Cocos2dConstants.lua in Resources */, @@ -8543,6 +8618,7 @@ 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 */, @@ -8555,8 +8631,12 @@ 1A0EE55C18CDFBBD004CD58F /* AudioEngine.lua in Resources */, 1503FAB418DA8B6C00F6518C /* ftp.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 */, 1AC35D4718CEDE9400F37B72 /* Default.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -8569,6 +8649,7 @@ 15E66FD6192DC8C700C20A52 /* Sprite3DTest in Resources */, 1AC35DC318CEE65100F37B72 /* Misc in Resources */, 1AC35DC618CEE65100F37B72 /* Shaders in Resources */, + 15427D17198F55E000DC375D /* DeprecatedExtensionEnum.lua in Resources */, 1AC35DBB18CEE65100F37B72 /* components in Resources */, 1AC35DE218CEE65900F37B72 /* effect2.ogg in Resources */, 1ABCA39A18CD9E180087CE3A /* StudioConstants.lua in Resources */, @@ -8577,13 +8658,17 @@ 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 */, 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 */, 1AC35DDE18CEE65900F37B72 /* CocosBuilderExample.ccbresourcelog in Resources */, + 15427D1B198F55E000DC375D /* DeprecatedNetworkClass.lua in Resources */, 1AC35DBC18CEE65100F37B72 /* configs in Resources */, 1ABCA38818CD9E180087CE3A /* DeprecatedOpenglEnum.lua in Resources */, 1AC35DE118CEE65900F37B72 /* background.ogg in Resources */, @@ -8591,9 +8676,13 @@ 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 */, 15C90B4918E66C2A00D69802 /* tp.lua in Resources */, 1AC35DE918CEE65900F37B72 /* effect1.wav in Resources */, 1ABCA38E18CD9E180087CE3A /* GuiConstants.lua in Resources */, @@ -8601,33 +8690,39 @@ 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 */, 1AC35DE518CEE65900F37B72 /* Hello.png in Resources */, - 1ABCA38618CD9E180087CE3A /* DeprecatedEnum.lua in Resources */, 1AC35DEA18CEE65900F37B72 /* pew-pew-lei.wav in Resources */, + 15427D15198F55E000DC375D /* DeprecatedExtensionClass.lua in Resources */, 1AC35DC418CEE65100F37B72 /* Particles in Resources */, + 15427D0D198F55E000DC375D /* DeprecatedCocosDenshionClass.lua in Resources */, 1AC35DB918CEE65100F37B72 /* ccb in Resources */, 15C90B4118E66C1100D69802 /* mbox.lua in Resources */, 1ABCA38A18CD9E180087CE3A /* DrawPrimitives.lua in Resources */, 1AC35DB318CEE5DA00F37B72 /* Icon.icns in Resources */, + 15427D23198F55E000DC375D /* DeprecatedUIFunc.lua in Resources */, 1AC35DE318CEE65900F37B72 /* fileLookup.plist in Resources */, 15C90B3D18E66BF100D69802 /* http.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 */, 1AC35D7918CEE59900F37B72 /* cocosbuilderRes in Resources */, 15C90B3B18E66BEB00D69802 /* headers.lua in Resources */, - 1ABCA38218CD9E180087CE3A /* Deprecated.lua in Resources */, 1ABCA38C18CD9E180087CE3A /* extern.lua in Resources */, 1AC35DC918CEE65100F37B72 /* zwoptex in Resources */, 1AC35DBD18CEE65100F37B72 /* extensions in Resources */, 1AC35DC718CEE65100F37B72 /* spine in Resources */, 15C90B4518E66C1E00D69802 /* smtp.lua in Resources */, 1AC35DB718CEE65100F37B72 /* animations in Resources */, - 1ABCA38418CD9E180087CE3A /* DeprecatedClass.lua in Resources */, 1ABCA39618CD9E180087CE3A /* Opengl.lua in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -8638,14 +8733,19 @@ files = ( 15AECE0F195C1FDD00907DB0 /* cocosvideo.mp4 in Resources */, 15B0870D195AD52000D6F62B /* ActionTimeline in Resources */, + 15427D06198F55E000DC375D /* DeprecatedCocos2dClass.lua in Resources */, 15E66FC8192D957100C20A52 /* Sprite3DTest in Resources */, 15C90B4418E66C1800D69802 /* mime.lua in Resources */, + 15427D1A198F55E000DC375D /* DeprecatedExtensionFunc.lua in Resources */, 156229341973D400009C9067 /* bitExtend.lua in Resources */, 15C90B4C18E66C3100D69802 /* url.lua in Resources */, + 15427D20198F55E000DC375D /* DeprecatedNetworkFunc.lua in Resources */, 1AC35DD618CEE65200F37B72 /* Misc in Resources */, + 15427D12198F55E000DC375D /* DeprecatedCocoStudioClass.lua in Resources */, 1ABCA37B18CD9E180087CE3A /* CCBReaderLoad.lua in Resources */, 1AC35DF718CEE65B00F37B72 /* effect1.wav in Resources */, - 1ABCA38518CD9E180087CE3A /* DeprecatedClass.lua 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 */, @@ -8654,19 +8754,21 @@ 1AC35DD718CEE65200F37B72 /* Particles in Resources */, 1AC35D9D18CEE5D100F37B72 /* Icon-120.png 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 */, 1AC35DF818CEE65B00F37B72 /* pew-pew-lei.wav in Resources */, 1AC35D9918CEE5D100F37B72 /* Default-568h@2x.png in Resources */, 15C90B4218E66C1200D69802 /* mbox.lua in Resources */, 1AC35D9B18CEE5D100F37B72 /* Default@2x.png in Resources */, 15C90B3718E66BE000D69802 /* ftp.lua in Resources */, - 1ABCA38318CD9E180087CE3A /* Deprecated.lua in Resources */, 1AC35DCE18CEE65200F37B72 /* components in Resources */, 1AC35D7618CEE58500F37B72 /* src in Resources */, 15C90B4A18E66C2B00D69802 /* tp.lua in Resources */, @@ -8674,6 +8776,7 @@ 1ABCA38918CD9E180087CE3A /* DeprecatedOpenglEnum.lua in Resources */, 1AC35DEC18CEE65B00F37B72 /* CocosBuilderExample.ccbresourcelog in Resources */, 15C90B4618E66C1F00D69802 /* smtp.lua in Resources */, + 15427D22198F55E000DC375D /* DeprecatedUIEnum.lua in Resources */, 1AC35DED18CEE65B00F37B72 /* music.mid in Resources */, 1AC35DD018CEE65200F37B72 /* extensions in Resources */, 1AC35DD318CEE65200F37B72 /* Images in Resources */, @@ -8681,15 +8784,17 @@ 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 */, 1AC35DCA18CEE65200F37B72 /* animations in Resources */, 1A1645A9191B6283008C7C7F /* ccs-res in Resources */, 1AC35DA118CEE5D100F37B72 /* Icon-72.png in Resources */, + 15427D0C198F55E000DC375D /* DeprecatedCocosBuilderClass.lua in Resources */, 15C90B4018E66C0D00D69802 /* ltn12.lua in Resources */, 1AC35DA218CEE5D100F37B72 /* Icon-76.png in Resources */, 15C90B4818E66C2500D69802 /* socket.lua in Resources */, - 1ABCA38718CD9E180087CE3A /* DeprecatedEnum.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 */, @@ -8698,12 +8803,17 @@ 1AC35DDA18CEE65200F37B72 /* spine in Resources */, 1ABCA39718CD9E180087CE3A /* Opengl.lua in Resources */, 1AC35DDB18CEE65200F37B72 /* TileMaps in Resources */, + 15427D1C198F55E000DC375D /* DeprecatedNetworkClass.lua in Resources */, + 15427D1E198F55E000DC375D /* DeprecatedNetworkEnum.lua in Resources */, 1AC35DF318CEE65B00F37B72 /* Hello.png 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 */, 1AC35D9F18CEE5D100F37B72 /* Icon-152.png in Resources */, 1AC35DEE18CEE65B00F37B72 /* background.mp3 in Resources */, diff --git a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/lua-tests Mac.xcscheme b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/lua-tests Mac.xcscheme index 979bc05a86..121971847f 100644 --- a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/lua-tests Mac.xcscheme +++ b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/lua-tests Mac.xcscheme @@ -44,7 +44,7 @@ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle = "0" useCustomWorkingDirectory = "NO" - buildConfiguration = "Release" + buildConfiguration = "Debug" ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" allowLocationSimulation = "YES"> diff --git a/cocos/scripting/lua-bindings/script/CocoStudio.lua b/cocos/scripting/lua-bindings/script/CocoStudio.lua index 66eb80121f..e0df56a60d 100644 --- a/cocos/scripting/lua-bindings/script/CocoStudio.lua +++ b/cocos/scripting/lua-bindings/script/CocoStudio.lua @@ -371,3 +371,9 @@ end function ccs.TriggerMng:isEmpty() return (not (nil == self._eventTriggers)) or table.getn(self._eventTriggers) <= 0 end + +function __onParseConfig(configType,jasonStr) + if configType == cc.ConfigType.COCOSTUDIO then + ccs.TriggerMng.getInstance():parse(jasonStr) + end +end diff --git a/cocos/scripting/lua-bindings/script/Cocos2d.lua b/cocos/scripting/lua-bindings/script/Cocos2d.lua index 2c14f075e9..aa020eb804 100644 --- a/cocos/scripting/lua-bindings/script/Cocos2d.lua +++ b/cocos/scripting/lua-bindings/script/Cocos2d.lua @@ -1,10 +1,5 @@ -require "CocoStudio" - cc = cc or {} -cc.DIRECTOR_PROJECTION_2D = 0 -cc.DIRECTOR_PROJECTION_3D = 1 - function cc.clampf(value, min_inclusive, max_inclusive) -- body local temp = 0 @@ -367,15 +362,3 @@ end function cc.PhysicsMaterial(_density, _restitution, _friction) return { density = _density, restitution = _restitution, friction = _friction } end - -local ConfigType = -{ - NONE = 0, - COCOSTUDIO = 1, -} - -function __onParseConfig(configType,jasonStr) - if configType == ConfigType.COCOSTUDIO then - ccs.TriggerMng.getInstance():parse(jasonStr) - end -end diff --git a/cocos/scripting/lua-bindings/script/Cocos2dConstants.lua b/cocos/scripting/lua-bindings/script/Cocos2dConstants.lua index efcac61305..c66734c530 100644 --- a/cocos/scripting/lua-bindings/script/Cocos2dConstants.lua +++ b/cocos/scripting/lua-bindings/script/Cocos2dConstants.lua @@ -186,59 +186,6 @@ cc.PLATFORM_OS_NACL = 7 cc.PLATFORM_OS_EMSCRIPTEN = 8 cc.PLATFORM_OS_TIZEN = 9 -cc.SCROLLVIEW_SCRIPT_SCROLL = 0 -cc.SCROLLVIEW_SCRIPT_ZOOM = 1 -cc.TABLECELL_TOUCHED = 2 -cc.TABLECELL_HIGH_LIGHT = 3 -cc.TABLECELL_UNHIGH_LIGHT = 4 -cc.TABLECELL_WILL_RECYCLE = 5 -cc.TABLECELL_SIZE_FOR_INDEX = 6 -cc.TABLECELL_SIZE_AT_INDEX = 7 -cc.NUMBER_OF_CELLS_IN_TABLEVIEW = 8 - -cc.SCROLLVIEW_DIRECTION_NONE = -1 -cc.SCROLLVIEW_DIRECTION_HORIZONTAL = 0 -cc.SCROLLVIEW_DIRECTION_VERTICAL = 1 -cc.SCROLLVIEW_DIRECTION_BOTH = 2 - -cc.CONTROL_EVENTTYPE_TOUCH_DOWN = 1 -cc.CONTROL_EVENTTYPE_DRAG_INSIDE = 2 -cc.CONTROL_EVENTTYPE_DRAG_OUTSIDE = 4 -cc.CONTROL_EVENTTYPE_DRAG_ENTER = 8 -cc.CONTROL_EVENTTYPE_DRAG_EXIT = 16 -cc.CONTROL_EVENTTYPE_TOUCH_UP_INSIDE = 32 -cc.CONTROL_EVENTTYPE_TOUCH_UP_OUTSIDE = 64 -cc.CONTROL_EVENTTYPE_TOUCH_CANCEL = 128 -cc.CONTROL_EVENTTYPE_VALUE_CHANGED = 256 - -cc.CONTROL_STATE_NORMAL = 1 -cc.CONTROL_STATE_HIGH_LIGHTED = 2 -cc.CONTROL_STATE_DISABLED = 4 -cc.CONTROL_STATE_SELECTED = 8 - - -cc.KEYBOARD_RETURNTYPE_DEFAULT = 0 -cc.KEYBOARD_RETURNTYPE_DONE = 1 -cc.KEYBOARD_RETURNTYPE_SEND = 2 -cc.KEYBOARD_RETURNTYPE_SEARCH = 3 -cc.KEYBOARD_RETURNTYPE_GO = 4 - - -cc.EDITBOX_INPUT_MODE_ANY = 0 -cc.EDITBOX_INPUT_MODE_EMAILADDR = 1 -cc.EDITBOX_INPUT_MODE_NUMERIC = 2 -cc.EDITBOX_INPUT_MODE_PHONENUMBER = 3 -cc.EDITBOX_INPUT_MODE_URL = 4 -cc.EDITBOX_INPUT_MODE_DECIMAL = 5 -cc.EDITBOX_INPUT_MODE_SINGLELINE = 6 - - -cc.EDITBOX_INPUT_FLAG_PASSWORD = 0 -cc.EDITBOX_INPUT_FLAG_SENSITIVE = 1 -cc.EDITBOX_INPUT_FLAG_INITIAL_CAPS_WORD = 2 -cc.EDITBOX_INPUT_FLAG_INITIAL_CAPS_SENTENCE = 3 -cc.EDITBOX_INPUT_FLAG_INITIAL_CAPS_ALL_CHARACTERS = 4 - cc.LANGUAGE_ENGLISH = 0 cc.LANGUAGE_CHINESE = 1 cc.LANGUAGE_FRENCH = 2 @@ -258,39 +205,6 @@ cc.NODE_ON_ENTER_TRANSITION_DID_FINISH = 2 cc.NODE_ON_EXIT_TRANSITION_DID_START = 3 cc.NODE_ON_CLEAN_UP = 4 -cc.CONTROL_STEPPER_PART_MINUS = 0 -cc.CONTROL_STEPPER_PART_PLUS = 1 -cc.CONTROL_STEPPER_PART_NONE = 2 - -cc.TABLEVIEW_FILL_TOPDOWN = 0 -cc.TABLEVIEW_FILL_BOTTOMUP = 1 - -cc.WEBSOCKET_OPEN = 0 -cc.WEBSOCKET_MESSAGE = 1 -cc.WEBSOCKET_CLOSE = 2 -cc.WEBSOCKET_ERROR = 3 - -cc.WEBSOCKET_STATE_CONNECTING = 0 -cc.WEBSOCKET_STATE_OPEN = 1 -cc.WEBSOCKET_STATE_CLOSING = 2 -cc.WEBSOCKET_STATE_CLOSED = 3 - - -cc.XMLHTTPREQUEST_RESPONSE_STRING = 0 -cc.XMLHTTPREQUEST_RESPONSE_ARRAY_BUFFER = 1 -cc.XMLHTTPREQUEST_RESPONSE_BLOB = 2 -cc.XMLHTTPREQUEST_RESPONSE_DOCUMENT = 3 -cc.XMLHTTPREQUEST_RESPONSE_JSON = 4 - -cc.ASSETSMANAGER_CREATE_FILE = 0 -cc.ASSETSMANAGER_NETWORK = 1 -cc.ASSETSMANAGER_NO_NEW_VERSION = 2 -cc.ASSETSMANAGER_UNCOMPRESS = 3 - -cc.ASSETSMANAGER_PROTOCOL_PROGRESS = 0 -cc.ASSETSMANAGER_PROTOCOL_SUCCESS = 1 -cc.ASSETSMANAGER_PROTOCOL_ERROR = 2 - cc.Handler = cc.Handler or {} cc.Handler.NODE = 0 cc.Handler.MENU_CLICKED = 1 @@ -577,38 +491,11 @@ cc.EventCode = CANCELLED = 3, } -cc.ControllerKey = +cc.DIRECTOR_PROJECTION_2D = 0 +cc.DIRECTOR_PROJECTION_3D = 1 + +cc.ConfigType = { - JOYSTICK_LEFT_X = 1000, - JOYSTICK_LEFT_Y = 1001, - JOYSTICK_RIGHT_X = 1002, - JOYSTICK_RIGHT_Y = 1003, - - BUTTON_A = 1004, - BUTTON_B = 1005, - BUTTON_C = 1006, - BUTTON_X = 1007, - BUTTON_Y = 1008, - BUTTON_Z = 1009, - - BUTTON_DPAD_UP = 1010, - BUTTON_DPAD_DOWN = 1011, - BUTTON_DPAD_LEFT = 1012, - BUTTON_DPAD_RIGHT = 1013, - BUTTON_DPAD_CENTER = 1014, - - BUTTON_LEFT_SHOULDER = 1015, - BUTTON_RIGHT_SHOULDER = 1016, - - AXIS_LEFT_TRIGGER = 1017, - AXIS_RIGHT_TRIGGER = 1018, - - BUTTON_LEFT_THUMBSTICK = 1019, - BUTTON_RIGHT_THUMBSTICK = 1020, - - BUTTON_START = 1021, - BUTTON_SELECT = 1022, - - BUTTON_PAUSE = 1023, - KEY_MAX = 1024, + NONE = 0, + COCOSTUDIO = 1, } diff --git a/cocos/scripting/lua-bindings/script/ControllerConstants.lua b/cocos/scripting/lua-bindings/script/ControllerConstants.lua new file mode 100644 index 0000000000..074e254bfd --- /dev/null +++ b/cocos/scripting/lua-bindings/script/ControllerConstants.lua @@ -0,0 +1,37 @@ +cc = cc or {} + +cc.ControllerKey = +{ + JOYSTICK_LEFT_X = 1000, + JOYSTICK_LEFT_Y = 1001, + JOYSTICK_RIGHT_X = 1002, + JOYSTICK_RIGHT_Y = 1003, + + BUTTON_A = 1004, + BUTTON_B = 1005, + BUTTON_C = 1006, + BUTTON_X = 1007, + BUTTON_Y = 1008, + BUTTON_Z = 1009, + + BUTTON_DPAD_UP = 1010, + BUTTON_DPAD_DOWN = 1011, + BUTTON_DPAD_LEFT = 1012, + BUTTON_DPAD_RIGHT = 1013, + BUTTON_DPAD_CENTER = 1014, + + BUTTON_LEFT_SHOULDER = 1015, + BUTTON_RIGHT_SHOULDER = 1016, + + AXIS_LEFT_TRIGGER = 1017, + AXIS_RIGHT_TRIGGER = 1018, + + BUTTON_LEFT_THUMBSTICK = 1019, + BUTTON_RIGHT_THUMBSTICK = 1020, + + BUTTON_START = 1021, + BUTTON_SELECT = 1022, + + BUTTON_PAUSE = 1023, + KEY_MAX = 1024, +} diff --git a/cocos/scripting/lua-bindings/script/DeprecatedCocoStudioClass.lua b/cocos/scripting/lua-bindings/script/DeprecatedCocoStudioClass.lua new file mode 100644 index 0000000000..6dba789064 --- /dev/null +++ b/cocos/scripting/lua-bindings/script/DeprecatedCocoStudioClass.lua @@ -0,0 +1,304 @@ +-- This is the DeprecatedExtensionClass + +DeprecatedExtensionClass = {} or DeprecatedExtensionClass + +--tip +local function deprecatedTip(old_name,new_name) + print("\n********** \n"..old_name.." was deprecated please use ".. new_name .. " instead.\n**********") +end + +--CCArmature class will be Deprecated,begin +function DeprecatedExtensionClass.CCArmature() + deprecatedTip("CCArmature","ccs.Armature") + return ccs.Armature +end +_G["CCArmature"] = DeprecatedExtensionClass.CCArmature() +--CCArmature class will be Deprecated,end + +--CCArmatureAnimation class will be Deprecated,begin +function DeprecatedExtensionClass.CCArmatureAnimation() + deprecatedTip("CCArmatureAnimation","ccs.ArmatureAnimation") + return ccs.ArmatureAnimation +end +_G["CCArmatureAnimation"] = DeprecatedExtensionClass.CCArmatureAnimation() +--CCArmatureAnimation class will be Deprecated,end + +--CCSkin class will be Deprecated,begin +function DeprecatedExtensionClass.CCSkin() + deprecatedTip("CCSkin","ccs.Skin") + return ccs.Skin +end +_G["CCSkin"] = DeprecatedExtensionClass.CCSkin() +--CCSkin class will be Deprecated,end + +--CCBone class will be Deprecated,begin +function DeprecatedExtensionClass.CCBone() + deprecatedTip("CCBone","ccs.Bone") + return ccs.Bone +end +_G["CCBone"] = DeprecatedExtensionClass.CCBone() +--CCBone class will be Deprecated,end + +--CCArmatureDataManager class will be Deprecated,begin +function DeprecatedExtensionClass.CCArmatureDataManager() + deprecatedTip("CCArmatureDataManager","ccs.ArmatureDataManager") + return ccs.ArmatureDataManager +end +_G["CCArmatureDataManager"] = DeprecatedExtensionClass.CCArmatureDataManager() +--CCArmatureDataManager class will be Deprecated,end + +--CCBatchNode class will be Deprecated,begin +function DeprecatedExtensionClass.CCBatchNode() + deprecatedTip("CCBatchNode","ccs.BatchNode") + return ccs.BatchNode +end +_G["CCBatchNode"] = DeprecatedExtensionClass.CCBatchNode() +--CCBatchNode class will be Deprecated,end + +--CCTween class will be Deprecated,begin +function DeprecatedExtensionClass.CCTween() + deprecatedTip("CCTween","ccs.Tween") + return ccs.Tween +end +_G["CCTween"] = DeprecatedExtensionClass.CCTween() +--CCTween class will be Deprecated,end + +--CCBaseData class will be Deprecated,begin +function DeprecatedExtensionClass.CCBaseData() + deprecatedTip("CCBaseData","ccs.BaseData") + return ccs.BaseData +end +_G["CCBaseData"] = DeprecatedExtensionClass.CCBaseData() +--CCBaseData class will be Deprecated,end + +--CCDisplayManager class will be Deprecated,begin +function DeprecatedExtensionClass.CCDisplayManager() + deprecatedTip("CCDisplayManager","ccs.DisplayManager") + return ccs.DisplayManager +end +_G["CCDisplayManager"] = DeprecatedExtensionClass.CCDisplayManager() +--CCDisplayManager class will be Deprecated,end + +--UIHelper class will be Deprecated,begin +function DeprecatedExtensionClass.UIHelper() + deprecatedTip("UIHelper","ccs.UIHelper") + return ccs.UIHelper +end +_G["UIHelper"] = DeprecatedExtensionClass.UIHelper() +--UIHelper class will be Deprecated,end + +--UILayout class will be Deprecated,begin +function DeprecatedExtensionClass.UILayout() + deprecatedTip("UILayout","ccs.UILayout") + return ccs.UILayout +end +_G["UILayout"] = DeprecatedExtensionClass.UILayout() +--UILayout class will be Deprecated,end + +--UIWidget class will be Deprecated,begin +function DeprecatedExtensionClass.UIWidget() + deprecatedTip("UIWidget","ccs.UIWidget") + return ccs.UIWidget +end +_G["UIWidget"] = DeprecatedExtensionClass.UIWidget() +--UIWidget class will be Deprecated,end + +--UILayer class will be Deprecated,begin +function DeprecatedExtensionClass.UILayer() + deprecatedTip("UILayer","ccs.UILayer") + return ccs.UILayer +end +_G["UILayer"] = DeprecatedExtensionClass.UILayer() +--UILayer class will be Deprecated,end + +--UIButton class will be Deprecated,begin +function DeprecatedExtensionClass.UIButton() + deprecatedTip("UIButton","ccs.UIButton") + return ccs.UIButton +end +_G["UIButton"] = DeprecatedExtensionClass.UIButton() +--UIButton class will be Deprecated,end + +--UICheckBox class will be Deprecated,begin +function DeprecatedExtensionClass.UICheckBox() + deprecatedTip("UICheckBox","ccs.UICheckBox") + return ccs.UICheckBox +end +_G["UICheckBox"] = DeprecatedExtensionClass.UICheckBox() +--UICheckBox class will be Deprecated,end + +--UIImageView class will be Deprecated,begin +function DeprecatedExtensionClass.UIImageView() + deprecatedTip("UIImageView","ccs.UIImageView") + return ccs.UIImageView +end +_G["UIImageView"] = DeprecatedExtensionClass.UIImageView() +--UIImageView class will be Deprecated,end + +--UILabel class will be Deprecated,begin +function DeprecatedExtensionClass.UILabel() + deprecatedTip("UILabel","ccs.UILabel") + return ccs.UILabel +end +_G["UILabel"] = DeprecatedExtensionClass.UILabel() +--UILabel class will be Deprecated,end + +--UILabelAtlas class will be Deprecated,begin +function DeprecatedExtensionClass.UILabelAtlas() + deprecatedTip("UILabelAtlas","ccs.UILabelAtlas") + return ccs.UILabelAtlas +end +_G["UILabelAtlas"] = DeprecatedExtensionClass.UILabelAtlas() +--UILabelAtlas class will be Deprecated,end + +--UILabelBMFont class will be Deprecated,begin +function DeprecatedExtensionClass.UILabelBMFont() + deprecatedTip("UILabelBMFont","ccs.UILabelBMFont") + return ccs.UILabelBMFont +end +_G["UILabelBMFont"] = DeprecatedExtensionClass.UILabelBMFont() +--UILabelBMFont class will be Deprecated,end + +--UILoadingBar class will be Deprecated,begin +function DeprecatedExtensionClass.UILoadingBar() + deprecatedTip("UILoadingBar","ccs.UILoadingBar") + return ccs.UILoadingBar +end +_G["UILoadingBar"] = DeprecatedExtensionClass.UILoadingBar() +--UILoadingBar class will be Deprecated,end + +--UISlider class will be Deprecated,begin +function DeprecatedExtensionClass.UISlider() + deprecatedTip("UISlider","ccs.UISlider") + return ccs.UISlider +end +_G["UISlider"] = DeprecatedExtensionClass.UISlider() +--UISlider class will be Deprecated,end + +--UITextField class will be Deprecated,begin +function DeprecatedExtensionClass.UITextField() + deprecatedTip("UITextField","ccs.UITextField") + return ccs.UITextField +end +_G["UITextField"] = DeprecatedExtensionClass.UITextField() +--UITextField class will be Deprecated,end + +--UIScrollView class will be Deprecated,begin +function DeprecatedExtensionClass.UIScrollView() + deprecatedTip("UIScrollView","ccs.UIScrollView") + return ccs.UIScrollView +end +_G["UIScrollView"] = DeprecatedExtensionClass.UIScrollView() +--UIScrollView class will be Deprecated,end + +--UIPageView class will be Deprecated,begin +function DeprecatedExtensionClass.UIPageView() + deprecatedTip("UIPageView","ccs.UIPageView") + return ccs.UIPageView +end +_G["UIPageView"] = DeprecatedExtensionClass.UIPageView() +--UIPageView class will be Deprecated,end + +--UIListView class will be Deprecated,begin +function DeprecatedExtensionClass.UIListView() + deprecatedTip("UIListView","ccs.UIListView") + return ccs.UIListView +end +_G["UIListView"] = DeprecatedExtensionClass.UIListView() +--UIListView class will be Deprecated,end + +--UILayoutParameter class will be Deprecated,begin +function DeprecatedExtensionClass.UILayoutParameter() + deprecatedTip("UILayoutParameter","ccs.UILayoutParameter") + return ccs.UILayoutParameter +end +_G["UILayoutParameter"] = DeprecatedExtensionClass.UILayoutParameter() +--UILayoutParameter class will be Deprecated,end + +--UILinearLayoutParameter class will be Deprecated,begin +function DeprecatedExtensionClass.UILinearLayoutParameter() + deprecatedTip("UILinearLayoutParameter","ccs.UILinearLayoutParameter") + return ccs.UILinearLayoutParameter +end +_G["UILinearLayoutParameter"] = DeprecatedExtensionClass.UILinearLayoutParameter() +--UILinearLayoutParameter class will be Deprecated,end + +--UIRelativeLayoutParameter class will be Deprecated,begin +function DeprecatedExtensionClass.UIRelativeLayoutParameter() + deprecatedTip("UIRelativeLayoutParameter","ccs.UIRelativeLayoutParameter") + return ccs.UIRelativeLayoutParameter +end +_G["UIRelativeLayoutParameter"] = DeprecatedExtensionClass.UIRelativeLayoutParameter() +--UIRelativeLayoutParameter class will be Deprecated,end + +--CCComController class will be Deprecated,begin +function DeprecatedExtensionClass.CCComController() + deprecatedTip("CCComController","ccs.ComController") + return ccs.CCComController +end +_G["CCComController"] = DeprecatedExtensionClass.CCComController() +--CCComController class will be Deprecated,end + +--CCComAudio class will be Deprecated,begin +function DeprecatedExtensionClass.CCComAudio() + deprecatedTip("CCComAudio","ccs.ComAudio") + return ccs.ComAudio +end +_G["CCComAudio"] = DeprecatedExtensionClass.CCComAudio() +--CCComAudio class will be Deprecated,end + +--CCComAttribute class will be Deprecated,begin +function DeprecatedExtensionClass.CCComAttribute() + deprecatedTip("CCComAttribute","ccs.ComAttribute") + return ccs.ComAttribute +end +_G["CCComAttribute"] = DeprecatedExtensionClass.CCComAttribute() +--CCComAttribute class will be Deprecated,end + +--CCComRender class will be Deprecated,begin +function DeprecatedExtensionClass.CCComRender() + deprecatedTip("CCComRender","ccs.ComRender") + return ccs.ComRender +end +_G["CCComRender"] = DeprecatedExtensionClass.CCComRender() +--CCComRender class will be Deprecated,end + +--ActionManager class will be Deprecated,begin +function DeprecatedExtensionClass.ActionManager() + deprecatedTip("ActionManager","ccs.ActionManagerEx") + return ccs.ActionManagerEx +end +_G["ActionManager"] = DeprecatedExtensionClass.ActionManager() +--CCComRender class will be Deprecated,end + +--SceneReader class will be Deprecated,begin +function DeprecatedExtensionClass.SceneReader() + deprecatedTip("SceneReader","ccs.SceneReader") + return ccs.SceneReader +end +_G["SceneReader"] = DeprecatedExtensionClass.SceneReader() +--SceneReader class will be Deprecated,end + +--GUIReader class will be Deprecated,begin +function DeprecatedExtensionClass.GUIReader() + deprecatedTip("GUIReader","ccs.GUIReader") + return ccs.GUIReader +end +_G["GUIReader"] = DeprecatedExtensionClass.GUIReader() +--GUIReader class will be Deprecated,end + +--UIRootWidget class will be Deprecated,begin +function DeprecatedExtensionClass.UIRootWidget() + deprecatedTip("UIRootWidget","ccs.UIRootWidget") + return ccs.UIRootWidget +end +_G["UIRootWidget"] = DeprecatedExtensionClass.UIRootWidget() +--UIRootWidget class will be Deprecated,end + +--ActionObject class will be Deprecated,begin +function DeprecatedExtensionClass.ActionObject() + deprecatedTip("ActionObject","ccs.ActionObject") + return ccs.ActionObject +end +_G["ActionObject"] = DeprecatedExtensionClass.ActionObject() +--ActionObject class will be Deprecated,end \ No newline at end of file diff --git a/cocos/scripting/lua-bindings/script/DeprecatedCocoStudioFunc.lua b/cocos/scripting/lua-bindings/script/DeprecatedCocoStudioFunc.lua new file mode 100644 index 0000000000..72331f1b09 --- /dev/null +++ b/cocos/scripting/lua-bindings/script/DeprecatedCocoStudioFunc.lua @@ -0,0 +1,77 @@ +--tip +local function deprecatedTip(old_name,new_name) + print("\n********** \n"..old_name.." was deprecated please use ".. new_name .. " instead.\n**********") +end + +--functions of GUIReader will be deprecated begin +local GUIReaderDeprecated = { } +function GUIReaderDeprecated.shareReader() + deprecatedTip("GUIReader:shareReader","ccs.GUIReader:getInstance") + return ccs.GUIReader:getInstance() +end +rawset(GUIReader,"shareReader",GUIReaderDeprecated.shareReader) + +function GUIReaderDeprecated.purgeGUIReader() + deprecatedTip("GUIReader:purgeGUIReader","ccs.GUIReader:destroyInstance") + return ccs.GUIReader:destroyInstance() +end +rawset(GUIReader,"purgeGUIReader",GUIReaderDeprecated.purgeGUIReader) +--functions of GUIReader will be deprecated end + +--functions of SceneReader will be deprecated begin +local SceneReaderDeprecated = { } +function SceneReaderDeprecated.sharedSceneReader() + deprecatedTip("SceneReader:sharedSceneReader","ccs.SceneReader:getInstance") + return ccs.SceneReader:getInstance() +end +rawset(SceneReader,"sharedSceneReader",SceneReaderDeprecated.sharedSceneReader) + +function SceneReaderDeprecated.purgeSceneReader(self) + deprecatedTip("SceneReader:purgeSceneReader","ccs.SceneReader:destroyInstance") + return self:destroyInstance() +end +rawset(SceneReader,"purgeSceneReader",SceneReaderDeprecated.purgeSceneReader) +--functions of SceneReader will be deprecated end + + +--functions of ccs.GUIReader will be deprecated begin +local CCSGUIReaderDeprecated = { } +function CCSGUIReaderDeprecated.purgeGUIReader() + deprecatedTip("ccs.GUIReader:purgeGUIReader","ccs.GUIReader:destroyInstance") + return ccs.GUIReader:destroyInstance() +end +rawset(ccs.GUIReader,"purgeGUIReader",CCSGUIReaderDeprecated.purgeGUIReader) +--functions of ccs.GUIReader will be deprecated end + +--functions of ccs.ActionManagerEx will be deprecated begin +local CCSActionManagerExDeprecated = { } +function CCSActionManagerExDeprecated.destroyActionManager() + deprecatedTip("ccs.ActionManagerEx:destroyActionManager","ccs.ActionManagerEx:destroyInstance") + return ccs.ActionManagerEx:destroyInstance() +end +rawset(ccs.ActionManagerEx,"destroyActionManager",CCSActionManagerExDeprecated.destroyActionManager) +--functions of ccs.ActionManagerEx will be deprecated end + +--functions of ccs.SceneReader will be deprecated begin +local CCSSceneReaderDeprecated = { } +function CCSSceneReaderDeprecated.destroySceneReader(self) + deprecatedTip("ccs.SceneReader:destroySceneReader","ccs.SceneReader:destroyInstance") + return self:destroyInstance() +end +rawset(ccs.SceneReader,"destroySceneReader",CCSSceneReaderDeprecated.destroySceneReader) +--functions of ccs.SceneReader will be deprecated end + +--functions of CCArmatureDataManager will be deprecated begin +local CCArmatureDataManagerDeprecated = { } +function CCArmatureDataManagerDeprecated.sharedArmatureDataManager() + deprecatedTip("CCArmatureDataManager:sharedArmatureDataManager","ccs.ArmatureDataManager:getInstance") + return ccs.ArmatureDataManager:getInstance() +end +rawset(CCArmatureDataManager,"sharedArmatureDataManager",CCArmatureDataManagerDeprecated.sharedArmatureDataManager) + +function CCArmatureDataManagerDeprecated.purge() + deprecatedTip("CCArmatureDataManager:purge","ccs.ArmatureDataManager:destoryInstance") + return ccs.ArmatureDataManager:destoryInstance() +end +rawset(CCArmatureDataManager,"purge",CCArmatureDataManagerDeprecated.purge) +--functions of CCArmatureDataManager will be deprecated end diff --git a/cocos/scripting/lua-bindings/script/DeprecatedClass.lua b/cocos/scripting/lua-bindings/script/DeprecatedCocos2dClass.lua similarity index 80% rename from cocos/scripting/lua-bindings/script/DeprecatedClass.lua rename to cocos/scripting/lua-bindings/script/DeprecatedCocos2dClass.lua index 61cb41428b..3228789177 100644 --- a/cocos/scripting/lua-bindings/script/DeprecatedClass.lua +++ b/cocos/scripting/lua-bindings/script/DeprecatedCocos2dClass.lua @@ -55,14 +55,6 @@ end _G["CCEaseInOut"] = DeprecatedClass.CCEaseInOut() --CCEaseInOut class will be Deprecated,end ---SimpleAudioEngine class will be Deprecated,begin -function DeprecatedClass.SimpleAudioEngine() - deprecatedTip("SimpleAudioEngine","cc.SimpleAudioEngine") - return cc.SimpleAudioEngine -end -_G["SimpleAudioEngine"] = DeprecatedClass.SimpleAudioEngine() ---SimpleAudioEngine class will be Deprecated,end - --CCTransitionMoveInT class will be Deprecated,begin function DeprecatedClass.CCTransitionMoveInT() deprecatedTip("CCTransitionMoveInT","cc.TransitionMoveInT") @@ -79,14 +71,6 @@ end _G["CCTransitionMoveInR"] = DeprecatedClass.CCTransitionMoveInR() --CCTransitionMoveInR class will be Deprecated,end ---CCControlHuePicker class will be Deprecated,begin -function DeprecatedClass.CCControlHuePicker() - deprecatedTip("CCControlHuePicker","cc.ControlHuePicker") - return cc.ControlHuePicker -end -_G["CCControlHuePicker"] = DeprecatedClass.CCControlHuePicker() ---CCControlHuePicker class will be Deprecated,end - --CCParticleSnow class will be Deprecated,begin function DeprecatedClass.CCParticleSnow() deprecatedTip("CCParticleSnow","cc.ParticleSnow") @@ -143,14 +127,6 @@ end _G["CCTransitionRotoZoom"] = DeprecatedClass.CCTransitionRotoZoom() --CCTransitionRotoZoom class will be Deprecated,end ---CCControlColourPicker class will be Deprecated,begin -function DeprecatedClass.CCControlColourPicker() - deprecatedTip("CCControlColourPicker","cc.ControlColourPicker") - return cc.ControlColourPicker -end -_G["CCControlColourPicker"] = DeprecatedClass.CCControlColourPicker() ---CCControlColourPicker class will be Deprecated,end - --CCDirector class will be Deprecated,begin function DeprecatedClass.CCDirector() deprecatedTip("CCDirector","cc.Director") @@ -320,14 +296,6 @@ end _G["CCTransitionFlipAngular"] = DeprecatedClass.CCTransitionFlipAngular() --CCTransitionFlipAngular class will be Deprecated,end ---CCControl class will be Deprecated,begin -function DeprecatedClass.CCControl() - deprecatedTip("CCControl","cc.Control") - return cc.Control -end -_G["CCControl"] = DeprecatedClass.CCControl() ---CCControl class will be Deprecated,end - --CCEaseElasticInOut class will be Deprecated,begin function DeprecatedClass.CCEaseElasticInOut() deprecatedTip("CCEaseElasticInOut","cc.EaseElasticInOut") @@ -352,14 +320,6 @@ end _G["CCShow"] = DeprecatedClass.CCShow() --CCShow class will be Deprecated,end ---CCEditBox class will be Deprecated,begin -function DeprecatedClass.CCEditBox() - deprecatedTip("CCEditBox","cc.EditBox") - return cc.EditBox -end -_G["CCEditBox"] = DeprecatedClass.CCEditBox() ---CCEditBox class will be Deprecated,end - --CCFadeOut class will be Deprecated,begin function DeprecatedClass.CCFadeOut() deprecatedTip("CCFadeOut","cc.FadeOut") @@ -496,14 +456,6 @@ end _G["CCApplication"] = DeprecatedClass.CCApplication() --CCApplication class will be Deprecated,end ---CCControlSlider class will be Deprecated,begin -function DeprecatedClass.CCControlSlider() - deprecatedTip("CCControlSlider","cc.ControlSlider") - return cc.ControlSlider -end -_G["CCControlSlider"] = DeprecatedClass.CCControlSlider() ---CCControlSlider class will be Deprecated,end - --CCDelayTime class will be Deprecated,begin function DeprecatedClass.CCDelayTime() deprecatedTip("CCDelayTime","cc.DelayTime") @@ -528,14 +480,6 @@ end _G["CCLabelBMFont"] = DeprecatedClass.CCLabelBMFont() --CCLabelBMFont class will be Deprecated,end ---CCScale9Sprite class will be Deprecated,begin -function DeprecatedClass.CCScale9Sprite() - deprecatedTip("CCScale9Sprite","cc.Scale9Sprite") - return cc.Scale9Sprite -end -_G["CCScale9Sprite"] = DeprecatedClass.CCScale9Sprite() ---CCScale9Sprite class will be Deprecated,end - --CCFadeOutTRTiles class will be Deprecated,begin function DeprecatedClass.CCFadeOutTRTiles() deprecatedTip("CCFadeOutTRTiles","cc.FadeOutTRTiles") @@ -560,14 +504,6 @@ end _G["CCParticleSpiral"] = DeprecatedClass.CCParticleSpiral() --CCParticleSpiral class will be Deprecated,end ---CCBReader class will be Deprecated,begin -function DeprecatedClass.CCBReader() - deprecatedTip("CCBReader","cc.BReader") - return cc.BReader -end -_G["CCBReader"] = DeprecatedClass.CCBReader() ---CCBReader class will be Deprecated,end - --CCFiniteTimeAction class will be Deprecated,begin function DeprecatedClass.CCFiniteTimeAction() deprecatedTip("CCFiniteTimeAction","cc.FiniteTimeAction") @@ -704,14 +640,6 @@ end _G["CCFadeTo"] = DeprecatedClass.CCFadeTo() --CCFadeTo class will be Deprecated,end ---CCBAnimationManager class will be Deprecated,begin -function DeprecatedClass.CCBAnimationManager() - deprecatedTip("CCBAnimationManager","cc.BAnimationManager") - return cc.BAnimationManager -end -_G["CCBAnimationManager"] = DeprecatedClass.CCBAnimationManager() ---CCBAnimationManager class will be Deprecated,end - --CCRepeatForever class will be Deprecated,begin function DeprecatedClass.CCRepeatForever() deprecatedTip("CCRepeatForever","cc.RepeatForever") @@ -728,14 +656,6 @@ end _G["CCPlace"] = DeprecatedClass.CCPlace() --CCPlace class will be Deprecated,end ---CCScrollView class will be Deprecated,begin -function DeprecatedClass.CCScrollView() - deprecatedTip("CCScrollView","cc.ScrollView") - return cc.ScrollView -end -_G["CCScrollView"] = DeprecatedClass.CCScrollView() ---CCScrollView class will be Deprecated,end - --CCGLProgram class will be Deprecated,begin function DeprecatedClass.CCGLProgram() @@ -817,15 +737,6 @@ end _G["CCParticleFlower"] = DeprecatedClass.CCParticleFlower() --CCParticleFlower class will be Deprecated,end ---CCTableView class will be Deprecated,begin -function DeprecatedClass.CCTableView() - deprecatedTip("CCTableView","cc.TableView") - return cc.TableView -end -_G["CCTableView"] = DeprecatedClass.CCTableView() ---CCTableView class will be Deprecated,end - - --CCParticleSmoke class will be Deprecated,begin function DeprecatedClass.CCParticleSmoke() deprecatedTip("CCParticleSmoke","cc.ParticleSmoke") @@ -1194,14 +1105,6 @@ end _G["CCTransitionZoomFlipX"] = DeprecatedClass.CCTransitionZoomFlipX() --CCTransitionZoomFlipX class will be Deprecated,end ---CCControlPotentiometer class will be Deprecated,begin -function DeprecatedClass.CCControlPotentiometer() - deprecatedTip("CCControlPotentiometer","cc.ControlPotentiometer") - return cc.ControlPotentiometer -end -_G["CCControlPotentiometer"] = DeprecatedClass.CCControlPotentiometer() ---CCControlPotentiometer class will be Deprecated,end - --CCScaleBy class will be Deprecated,begin function DeprecatedClass.CCScaleBy() deprecatedTip("CCScaleBy","cc.ScaleBy") @@ -1338,14 +1241,6 @@ end _G["CCBezierTo"] = DeprecatedClass.CCBezierTo() --CCBezierTo class will be Deprecated,end ---CCControlButton class will be Deprecated,begin -function DeprecatedClass.CCControlButton() - deprecatedTip("CCControlButton","cc.ControlButton") - return cc.ControlButton -end -_G["CCControlButton"] = DeprecatedClass.CCControlButton() ---CCControlButton class will be Deprecated,end - --CCFollow class will be Deprecated,begin function DeprecatedClass.CCFollow() deprecatedTip("CCFollow","cc.Follow") @@ -1498,14 +1393,6 @@ end _G["CCSplitRows"] = DeprecatedClass.CCSplitRows() --CCSplitRows class will be Deprecated,end ---CCControlStepper class will be Deprecated,begin -function DeprecatedClass.CCControlStepper() - deprecatedTip("CCControlStepper","cc.ControlStepper") - return cc.ControlStepper -end -_G["CCControlStepper"] = DeprecatedClass.CCControlStepper() ---CCControlStepper class will be Deprecated,end - --CCSprite class will be Deprecated,begin function DeprecatedClass.CCSprite() deprecatedTip("CCSprite","cc.Sprite") @@ -1610,14 +1497,6 @@ end _G["CCRemoveSelf"] = DeprecatedClass.CCRemoveSelf() --CCRemoveSelf class will be Deprecated,end ---CCControlSaturationBrightnessPicker class will be Deprecated,begin -function DeprecatedClass.CCControlSaturationBrightnessPicker() - deprecatedTip("CCControlSaturationBrightnessPicker","cc.ControlSaturationBrightnessPicker") - return cc.ControlSaturationBrightnessPicker -end -_G["CCControlSaturationBrightnessPicker"] = DeprecatedClass.CCControlSaturationBrightnessPicker() ---CCControlSaturationBrightnessPicker class will be Deprecated,end - --CCLabelTTF class will be Deprecated,begin function DeprecatedClass.CCLabelTTF() deprecatedTip("CCLabelTTF","cc.LabelTTF") @@ -1786,14 +1665,6 @@ end _G["CCTransitionSlideInL"] = DeprecatedClass.CCTransitionSlideInL() --CCTransitionSlideInL class will be Deprecated,end ---CCControlSwitch class will be Deprecated,begin -function DeprecatedClass.CCControlSwitch() - deprecatedTip("CCControlSwitch","cc.ControlSwitch") - return cc.ControlSwitch -end -_G["CCControlSwitch"] = DeprecatedClass.CCControlSwitch() ---CCControlSwitch class will be Deprecated,end - --CCWavesTiles3D class will be Deprecated,begin function DeprecatedClass.CCWavesTiles3D() deprecatedTip("CCWavesTiles3D","cc.WavesTiles3D") @@ -1834,302 +1705,6 @@ end _G["CCCallFuncN"] = DeprecatedClass.CCCallFuncN() --CCCallFuncN class will be Deprecated,end ---CCArmature class will be Deprecated,begin -function DeprecatedClass.CCArmature() - deprecatedTip("CCArmature","ccs.Armature") - return ccs.Armature -end -_G["CCArmature"] = DeprecatedClass.CCArmature() ---CCArmature class will be Deprecated,end - ---CCArmatureAnimation class will be Deprecated,begin -function DeprecatedClass.CCArmatureAnimation() - deprecatedTip("CCArmatureAnimation","ccs.ArmatureAnimation") - return ccs.ArmatureAnimation -end -_G["CCArmatureAnimation"] = DeprecatedClass.CCArmatureAnimation() ---CCArmatureAnimation class will be Deprecated,end - ---CCSkin class will be Deprecated,begin -function DeprecatedClass.CCSkin() - deprecatedTip("CCSkin","ccs.Skin") - return ccs.Skin -end -_G["CCSkin"] = DeprecatedClass.CCSkin() ---CCSkin class will be Deprecated,end - ---CCBone class will be Deprecated,begin -function DeprecatedClass.CCBone() - deprecatedTip("CCBone","ccs.Bone") - return ccs.Bone -end -_G["CCBone"] = DeprecatedClass.CCBone() ---CCBone class will be Deprecated,end - ---CCArmatureDataManager class will be Deprecated,begin -function DeprecatedClass.CCArmatureDataManager() - deprecatedTip("CCArmatureDataManager","ccs.ArmatureDataManager") - return ccs.ArmatureDataManager -end -_G["CCArmatureDataManager"] = DeprecatedClass.CCArmatureDataManager() ---CCArmatureDataManager class will be Deprecated,end - ---CCBatchNode class will be Deprecated,begin -function DeprecatedClass.CCBatchNode() - deprecatedTip("CCBatchNode","ccs.BatchNode") - return ccs.BatchNode -end -_G["CCBatchNode"] = DeprecatedClass.CCBatchNode() ---CCBatchNode class will be Deprecated,end - ---CCTween class will be Deprecated,begin -function DeprecatedClass.CCTween() - deprecatedTip("CCTween","ccs.Tween") - return ccs.Tween -end -_G["CCTween"] = DeprecatedClass.CCTween() ---CCTween class will be Deprecated,end - ---CCBaseData class will be Deprecated,begin -function DeprecatedClass.CCBaseData() - deprecatedTip("CCBaseData","ccs.BaseData") - return ccs.BaseData -end -_G["CCBaseData"] = DeprecatedClass.CCBaseData() ---CCBaseData class will be Deprecated,end - ---CCDisplayManager class will be Deprecated,begin -function DeprecatedClass.CCDisplayManager() - deprecatedTip("CCDisplayManager","ccs.DisplayManager") - return ccs.DisplayManager -end -_G["CCDisplayManager"] = DeprecatedClass.CCDisplayManager() ---CCDisplayManager class will be Deprecated,end - ---UIHelper class will be Deprecated,begin -function DeprecatedClass.UIHelper() - deprecatedTip("UIHelper","ccs.UIHelper") - return ccs.UIHelper -end -_G["UIHelper"] = DeprecatedClass.UIHelper() ---UIHelper class will be Deprecated,end - ---UILayout class will be Deprecated,begin -function DeprecatedClass.UILayout() - deprecatedTip("UILayout","ccs.UILayout") - return ccs.UILayout -end -_G["UILayout"] = DeprecatedClass.UILayout() ---UILayout class will be Deprecated,end - ---UIWidget class will be Deprecated,begin -function DeprecatedClass.UIWidget() - deprecatedTip("UIWidget","ccs.UIWidget") - return ccs.UIWidget -end -_G["UIWidget"] = DeprecatedClass.UIWidget() ---UIWidget class will be Deprecated,end - ---UILayer class will be Deprecated,begin -function DeprecatedClass.UILayer() - deprecatedTip("UILayer","ccs.UILayer") - return ccs.UILayer -end -_G["UILayer"] = DeprecatedClass.UILayer() ---UILayer class will be Deprecated,end - ---UIButton class will be Deprecated,begin -function DeprecatedClass.UIButton() - deprecatedTip("UIButton","ccs.UIButton") - return ccs.UIButton -end -_G["UIButton"] = DeprecatedClass.UIButton() ---UIButton class will be Deprecated,end - ---UICheckBox class will be Deprecated,begin -function DeprecatedClass.UICheckBox() - deprecatedTip("UICheckBox","ccs.UICheckBox") - return ccs.UICheckBox -end -_G["UICheckBox"] = DeprecatedClass.UICheckBox() ---UICheckBox class will be Deprecated,end - ---UIImageView class will be Deprecated,begin -function DeprecatedClass.UIImageView() - deprecatedTip("UIImageView","ccs.UIImageView") - return ccs.UIImageView -end -_G["UIImageView"] = DeprecatedClass.UIImageView() ---UIImageView class will be Deprecated,end - ---UILabel class will be Deprecated,begin -function DeprecatedClass.UILabel() - deprecatedTip("UILabel","ccs.UILabel") - return ccs.UILabel -end -_G["UILabel"] = DeprecatedClass.UILabel() ---UILabel class will be Deprecated,end - ---UILabelAtlas class will be Deprecated,begin -function DeprecatedClass.UILabelAtlas() - deprecatedTip("UILabelAtlas","ccs.UILabelAtlas") - return ccs.UILabelAtlas -end -_G["UILabelAtlas"] = DeprecatedClass.UILabelAtlas() ---UILabelAtlas class will be Deprecated,end - ---UILabelBMFont class will be Deprecated,begin -function DeprecatedClass.UILabelBMFont() - deprecatedTip("UILabelBMFont","ccs.UILabelBMFont") - return ccs.UILabelBMFont -end -_G["UILabelBMFont"] = DeprecatedClass.UILabelBMFont() ---UILabelBMFont class will be Deprecated,end - ---UILoadingBar class will be Deprecated,begin -function DeprecatedClass.UILoadingBar() - deprecatedTip("UILoadingBar","ccs.UILoadingBar") - return ccs.UILoadingBar -end -_G["UILoadingBar"] = DeprecatedClass.UILoadingBar() ---UILoadingBar class will be Deprecated,end - ---UISlider class will be Deprecated,begin -function DeprecatedClass.UISlider() - deprecatedTip("UISlider","ccs.UISlider") - return ccs.UISlider -end -_G["UISlider"] = DeprecatedClass.UISlider() ---UISlider class will be Deprecated,end - ---UITextField class will be Deprecated,begin -function DeprecatedClass.UITextField() - deprecatedTip("UITextField","ccs.UITextField") - return ccs.UITextField -end -_G["UITextField"] = DeprecatedClass.UITextField() ---UITextField class will be Deprecated,end - ---UIScrollView class will be Deprecated,begin -function DeprecatedClass.UIScrollView() - deprecatedTip("UIScrollView","ccs.UIScrollView") - return ccs.UIScrollView -end -_G["UIScrollView"] = DeprecatedClass.UIScrollView() ---UIScrollView class will be Deprecated,end - ---UIPageView class will be Deprecated,begin -function DeprecatedClass.UIPageView() - deprecatedTip("UIPageView","ccs.UIPageView") - return ccs.UIPageView -end -_G["UIPageView"] = DeprecatedClass.UIPageView() ---UIPageView class will be Deprecated,end - ---UIListView class will be Deprecated,begin -function DeprecatedClass.UIListView() - deprecatedTip("UIListView","ccs.UIListView") - return ccs.UIListView -end -_G["UIListView"] = DeprecatedClass.UIListView() ---UIListView class will be Deprecated,end - ---UILayoutParameter class will be Deprecated,begin -function DeprecatedClass.UILayoutParameter() - deprecatedTip("UILayoutParameter","ccs.UILayoutParameter") - return ccs.UILayoutParameter -end -_G["UILayoutParameter"] = DeprecatedClass.UILayoutParameter() ---UILayoutParameter class will be Deprecated,end - ---UILinearLayoutParameter class will be Deprecated,begin -function DeprecatedClass.UILinearLayoutParameter() - deprecatedTip("UILinearLayoutParameter","ccs.UILinearLayoutParameter") - return ccs.UILinearLayoutParameter -end -_G["UILinearLayoutParameter"] = DeprecatedClass.UILinearLayoutParameter() ---UILinearLayoutParameter class will be Deprecated,end - ---UIRelativeLayoutParameter class will be Deprecated,begin -function DeprecatedClass.UIRelativeLayoutParameter() - deprecatedTip("UIRelativeLayoutParameter","ccs.UIRelativeLayoutParameter") - return ccs.UIRelativeLayoutParameter -end -_G["UIRelativeLayoutParameter"] = DeprecatedClass.UIRelativeLayoutParameter() ---UIRelativeLayoutParameter class will be Deprecated,end - ---CCComController class will be Deprecated,begin -function DeprecatedClass.CCComController() - deprecatedTip("CCComController","ccs.ComController") - return ccs.CCComController -end -_G["CCComController"] = DeprecatedClass.CCComController() ---CCComController class will be Deprecated,end - ---CCComAudio class will be Deprecated,begin -function DeprecatedClass.CCComAudio() - deprecatedTip("CCComAudio","ccs.ComAudio") - return ccs.ComAudio -end -_G["CCComAudio"] = DeprecatedClass.CCComAudio() ---CCComAudio class will be Deprecated,end - ---CCComAttribute class will be Deprecated,begin -function DeprecatedClass.CCComAttribute() - deprecatedTip("CCComAttribute","ccs.ComAttribute") - return ccs.ComAttribute -end -_G["CCComAttribute"] = DeprecatedClass.CCComAttribute() ---CCComAttribute class will be Deprecated,end - ---CCComRender class will be Deprecated,begin -function DeprecatedClass.CCComRender() - deprecatedTip("CCComRender","ccs.ComRender") - return ccs.ComRender -end -_G["CCComRender"] = DeprecatedClass.CCComRender() ---CCComRender class will be Deprecated,end - ---ActionManager class will be Deprecated,begin -function DeprecatedClass.ActionManager() - deprecatedTip("ActionManager","ccs.ActionManagerEx") - return ccs.ActionManagerEx -end -_G["ActionManager"] = DeprecatedClass.ActionManager() ---CCComRender class will be Deprecated,end - ---SceneReader class will be Deprecated,begin -function DeprecatedClass.SceneReader() - deprecatedTip("SceneReader","ccs.SceneReader") - return ccs.SceneReader -end -_G["SceneReader"] = DeprecatedClass.SceneReader() ---SceneReader class will be Deprecated,end - ---GUIReader class will be Deprecated,begin -function DeprecatedClass.GUIReader() - deprecatedTip("GUIReader","ccs.GUIReader") - return ccs.GUIReader -end -_G["GUIReader"] = DeprecatedClass.GUIReader() ---GUIReader class will be Deprecated,end - ---UIRootWidget class will be Deprecated,begin -function DeprecatedClass.UIRootWidget() - deprecatedTip("UIRootWidget","ccs.UIRootWidget") - return ccs.UIRootWidget -end -_G["UIRootWidget"] = DeprecatedClass.UIRootWidget() ---UIRootWidget class will be Deprecated,end - ---ActionObject class will be Deprecated,begin -function DeprecatedClass.ActionObject() - deprecatedTip("ActionObject","ccs.ActionObject") - return ccs.ActionObject -end -_G["ActionObject"] = DeprecatedClass.ActionObject() ---ActionObject class will be Deprecated,end - --CCEGLViewProtocol class will be Deprecated,begin function DeprecatedClass.CCEGLViewProtocol() deprecatedTip("CCEGLViewProtocol","cc.GLViewProtocol") @@ -2147,22 +1722,6 @@ end _G["CCEGLView"] = DeprecatedClass.CCEGLView() --CCEGLView class will be Deprecated,end ---CCBProxy class will be Deprecated,begin -function DeprecatedClass.CCBProxy() - deprecatedTip("CCBProxy","cc.CCBProxy") - return cc.CCBProxy -end -_G["CCBProxy"] = DeprecatedClass.CCBProxy() ---CCBProxy class will be Deprecated,end - ---WebSocket class will be Deprecated,begin -function DeprecatedClass.WebSocket() - deprecatedTip("WebSocket","cc.WebSocket") - return cc.WebSocket -end -_G["WebSocket"] = DeprecatedClass.WebSocket() ---WebSocket class will be Deprecated,end - --XMLHttpRequest class will be Deprecated,begin function DeprecatedClass.XMLHttpRequest() deprecatedTip("XMLHttpRequest","cc.XMLHttpRequest") diff --git a/cocos/scripting/lua-bindings/script/DeprecatedEnum.lua b/cocos/scripting/lua-bindings/script/DeprecatedCocos2dEnum.lua similarity index 71% rename from cocos/scripting/lua-bindings/script/DeprecatedEnum.lua rename to cocos/scripting/lua-bindings/script/DeprecatedCocos2dEnum.lua index fd21cc4ecb..58419c2d44 100644 --- a/cocos/scripting/lua-bindings/script/DeprecatedEnum.lua +++ b/cocos/scripting/lua-bindings/script/DeprecatedCocos2dEnum.lua @@ -1,7 +1,5 @@ require "Cocos2dConstants.lua" require "OpenglConstants.lua" -require "StudioConstants.lua" -require "GuiConstants.lua" --Enums will be deprecated,begin _G.kCCTextAlignmentLeft = cc.TEXT_ALIGNMENT_LEFT _G.kCCTextAlignmentRight = cc.TEXT_ALIGNMENT_RIGHT @@ -55,9 +53,6 @@ _G.kCCTMXTileVerticalFlag = cc.TMX_TILE_VERTICAL_FLAG _G.kCCTMXTileDiagonalFlag = cc.TMX_TILE_DIAGONAL_FLAG _G.kCCFlipedAll = cc.FLIPED_ALL _G.kCCFlippedMask = cc.FLIPPED_MASK -_G.kCCControlStepperPartMinus = cc.CONTROL_STEPPER_PART_MINUS -_G.kCCControlStepperPartPlus = cc.CONTROL_STEPPER_PART_PLUS -_G.kCCControlStepperPartNone = cc.CONTROL_STEPPER_PART_NONE _G.kLanguageEnglish = cc.LANGUAGE_ENGLISH _G.kLanguageChinese = cc.LANGUAGE_CHINESE @@ -373,124 +368,3 @@ _G.GL_ALPHA = gl.ALPHA _G.GL_CURRENT_VERTEX_ATTRIB = gl.CURRENT_VERTEX_ATTRIB _G.GL_SCISSOR_TEST = gl.SCISSOR_TEST _G.GL_TRIANGLES = gl.TRIANGLES - -_G.CCControlEventTouchDown = cc.CONTROL_EVENTTYPE_TOUCH_DOWN -_G.CCControlEventTouchDragInside = cc.CONTROL_EVENTTYPE_DRAG_INSIDE -_G.CCControlEventTouchDragOutside = cc.CONTROL_EVENTTYPE_DRAG_OUTSIDE -_G.CCControlEventTouchDragEnter = cc.CONTROL_EVENTTYPE_DRAG_ENTER -_G.CCControlEventTouchDragExit = cc.CONTROL_EVENTTYPE_DRAG_EXIT -_G.CCControlEventTouchUpInside = cc.CONTROL_EVENTTYPE_TOUCH_UP_INSIDE -_G.CCControlEventTouchUpOutside = cc.CONTROL_EVENTTYPE_TOUCH_UP_OUTSIDE -_G.CCControlEventTouchCancel = cc.CONTROL_EVENTTYPE_TOUCH_CANCEL -_G.CCControlEventValueChanged = cc.CONTROL_EVENTTYPE_VALUE_CHANGED -_G.CCControlStateNormal = cc.CONTROL_STATE_NORMAL -_G.CCControlStateHighlighted = cc.CONTROL_STATE_HIGH_LIGHTED -_G.CCControlStateDisabled = cc.CONTROL_STATE_DISABLED -_G.CCControlStateSelected = cc.CONTROL_STATE_SELECTED - -_G.kWebSocketScriptHandlerOpen = cc.WEBSOCKET_OPEN -_G.kWebSocketScriptHandlerMessage = cc.WEBSOCKET_MESSAGE -_G.kWebSocketScriptHandlerClose = cc.WEBSOCKET_CLOSE -_G.kWebSocketScriptHandlerError = cc.WEBSOCKET_ERROR - -_G.kStateConnecting = cc.WEBSOCKET_STATE_CONNECTING -_G.kStateOpen = cc.WEBSOCKET_STATE_OPEN -_G.kStateClosing = cc.WEBSOCKET_STATE_CLOSING -_G.kStateClosed = cc.WEBSOCKET_STATE_CLOSED - -_G.LAYOUT_COLOR_NONE = ccui.LayoutBackGroundColorType.none -_G.LAYOUT_COLOR_SOLID = ccui.LayoutBackGroundColorType.solid -_G.LAYOUT_COLOR_GRADIENT = ccui.LayoutBackGroundColorType.gradient - -_G.LAYOUT_ABSOLUTE = ccui.LayoutType.ABSOLUTE -_G.LAYOUT_LINEAR_VERTICAL = ccui.LayoutType.VERTICAL -_G.LAYOUT_LINEAR_HORIZONTAL = ccui.LayoutType.HORIZONTAL -_G.LAYOUT_RELATIVE = ccui.LayoutType.RELATIVE - -_G.BRIGHT_NONE = ccui.BrightStyle.none -_G.BRIGHT_NORMAL = ccui.BrightStyle.normal -_G.BRIGHT_HIGHLIGHT = ccui.BrightStyle.highlight - -_G.UI_TEX_TYPE_LOCAL = ccui.TextureResType.localType -_G.UI_TEX_TYPE_PLIST = ccui.TextureResType.plistType - -_G.TOUCH_EVENT_BEGAN = ccui.TouchEventType.began -_G.TOUCH_EVENT_MOVED = ccui.TouchEventType.moved -_G.TOUCH_EVENT_ENDED = ccui.TouchEventType.ended -_G.TOUCH_EVENT_CANCELED = ccui.TouchEventType.canceled - -_G.SIZE_ABSOLUTE = ccui.SizeType.absolute -_G.SIZE_PERCENT = ccui.SizeType.percent - -_G.POSITION_ABSOLUTE = ccui.PositionType.absolute -_G.POSITION_PERCENT = ccui.PositionType.percent - -_G.CHECKBOX_STATE_EVENT_SELECTED = ccui.CheckBoxEventType.selected -_G.CHECKBOX_STATE_EVENT_UNSELECTED = ccui.CheckBoxEventType.unselected - -_G.CHECKBOX_STATE_EVENT_SELECTED = ccui.CheckBoxEventType.selected -_G.CHECKBOX_STATE_EVENT_UNSELECTED = ccui.CheckBoxEventType.unselected - -_G.LoadingBarTypeLeft = ccui.LoadingBarDirection.LEFT -_G.LoadingBarTypeRight = ccui.LoadingBarDirection.RIGHT - -_G.LoadingBarTypeRight = ccui.SliderEventType.percent_changed - -_G.TEXTFIELD_EVENT_ATTACH_WITH_IME = ccui.TextFiledEventType.attach_with_ime -_G.TEXTFIELD_EVENT_DETACH_WITH_IME = ccui.TextFiledEventType.detach_with_ime -_G.TEXTFIELD_EVENT_INSERT_TEXT = ccui.TextFiledEventType.insert_text -_G.TEXTFIELD_EVENT_DELETE_BACKWARD = ccui.TextFiledEventType.delete_backward - -_G.SCROLLVIEW_EVENT_SCROLL_TO_TOP = ccui.ScrollViewDir.none -_G.SCROLLVIEW_DIR_VERTICAL = ccui.ScrollViewDir.vertical -_G.SCROLLVIEW_DIR_HORIZONTAL = ccui.ScrollViewDir.horizontal -_G.SCROLLVIEW_DIR_BOTH = ccui.ScrollViewDir.both - -_G.SCROLLVIEW_EVENT_SCROLL_TO_TOP = ccui.ScrollviewEventType.scrollToTop -_G.SCROLLVIEW_EVENT_SCROLL_TO_BOTTOM = ccui.ScrollviewEventType.scrollToBottom -_G.SCROLLVIEW_EVENT_SCROLL_TO_LEFT = ccui.ScrollviewEventType.scrollToLeft -_G.SCROLLVIEW_EVENT_SCROLL_TO_RIGHT = ccui.ScrollviewEventType.scrollToRight -_G.SCROLLVIEW_EVENT_SCROLLING = ccui.ScrollviewEventType.scrolling -_G.SCROLLVIEW_EVENT_BOUNCE_TOP = ccui.ScrollviewEventType.bounceTop -_G.SCROLLVIEW_EVENT_BOUNCE_BOTTOM = ccui.ScrollviewEventType.bounceBottom -_G.SCROLLVIEW_EVENT_BOUNCE_LEFT = ccui.ScrollviewEventType.bounceLeft -_G.SCROLLVIEW_EVENT_BOUNCE_RIGHT = ccui.ScrollviewEventType.bounceRight - -_G.PAGEVIEW_EVENT_TURNING = ccui.PageViewEventType.turning - -_G.PAGEVIEW_TOUCHLEFT = ccui.PVTouchDir.touch_left -_G.PAGEVIEW_TOUCHRIGHT = ccui.PVTouchDir.touch_right - -_G.LISTVIEW_DIR_NONE = ccui.ListViewDirection.none -_G.LISTVIEW_DIR_VERTICAL = ccui.ListViewDirection.vertical -_G.LISTVIEW_DIR_HORIZONTAL = ccui.ListViewDirection.horizontal - -_G.LISTVIEW_MOVE_DIR_NONE = ccui.ListViewMoveDirection.none -_G.LISTVIEW_MOVE_DIR_UP = ccui.ListViewMoveDirection.up -_G.LISTVIEW_MOVE_DIR_DOWN = ccui.ListViewMoveDirection.down -_G.LISTVIEW_MOVE_DIR_LEFT = ccui.ListViewMoveDirection.left -_G.LISTVIEW_MOVE_DIR_RIGHT = ccui.ListViewMoveDirection.right - -_G.LISTVIEW_EVENT_INIT_CHILD = ccui.ListViewEventType.init_child -_G.LISTVIEW_EVENT_UPDATE_CHILD = ccui.ListViewEventType.update_child - -_G.LAYOUT_PARAMETER_NONE = ccui.LayoutParameterType.none -_G.LAYOUT_PARAMETER_LINEAR = ccui.LayoutParameterType.linear -_G.LAYOUT_PARAMETER_RELATIVE = ccui.LayoutParameterType.relative - -_G.kCCScrollViewDirectionHorizontal = cc.SCROLLVIEW_DIRECTION_HORIZONTAL -_G.kCCScrollViewDirectionVertical = cc.SCROLLVIEW_DIRECTION_VERTICAL -_G.kCCTableViewFillTopDown = cc.TABLEVIEW_FILL_TOPDOWN -_G.kCCTableViewFillBottomUp = cc.TABLEVIEW_FILL_BOTTOMUP - -ccui.LoadingBarType = ccui.LoadingBarDirection -ccui.LoadingBarType.left = ccui.LoadingBarDirection.LEFT -ccui.LoadingBarType.right = ccui.LoadingBarDirection.RIGHT - -ccui.LayoutType.absolute = ccui.LayoutType.ABSOLUTE -ccui.LayoutType.linearVertical = ccui.LayoutType.VERTICAL -ccui.LayoutType.linearHorizontal = ccui.LayoutType.HORIZONTAL -ccui.LayoutType.relative = ccui.LayoutType.RELATIVE - -ccui.ListViewEventType.onsSelectedItem = ccui.ListViewEventType.ONSELECTEDITEM_START - diff --git a/cocos/scripting/lua-bindings/script/Deprecated.lua b/cocos/scripting/lua-bindings/script/DeprecatedCocos2dFunc.lua similarity index 76% rename from cocos/scripting/lua-bindings/script/Deprecated.lua rename to cocos/scripting/lua-bindings/script/DeprecatedCocos2dFunc.lua index bd2b0689bb..b0e065a8ee 100644 --- a/cocos/scripting/lua-bindings/script/Deprecated.lua +++ b/cocos/scripting/lua-bindings/script/DeprecatedCocos2dFunc.lua @@ -113,22 +113,6 @@ end rawset(CCFileUtils,"purgeFileUtils",CCFileUtilsDeprecated.purgeFileUtils) --functions of CCFileUtils will be deprecated end - ---functions of SimpleAudioEngine will be deprecated begin -local SimpleAudioEngineDeprecated = { } -function SimpleAudioEngineDeprecated.sharedEngine() - deprecatedTip("SimpleAudioEngine:sharedEngine","SimpleAudioEngine:getInstance") - return cc.SimpleAudioEngine:getInstance() -end -rawset(SimpleAudioEngine,"sharedEngine",SimpleAudioEngineDeprecated.sharedEngine) - -function SimpleAudioEngineDeprecated.playBackgroundMusic(self,...) - deprecatedTip("SimpleAudioEngine:playBackgroundMusic","SimpleAudioEngine:playMusic") - return self:playMusic(...) -end -rawset(SimpleAudioEngine,"playBackgroundMusic",SimpleAudioEngineDeprecated.playBackgroundMusic) ---functions of SimpleAudioEngine will be deprecated end - --functions of CCMenu will be deprecated begin local CCMenuDeprecated = { } function CCMenuDeprecated.createWithItem(self,...) @@ -690,32 +674,7 @@ local function tex2(u,v) deprecatedTip("tex2(u,v)","cc.tex2f(u,v)") return cc.tex2f(u,v) end -rawset(_G,"tex2",tex2) - ---functions of CCControl will be deprecated end -local CCControlDeprecated = { } -function CCControlDeprecated.addHandleOfControlEvent(self,func,controlEvent) - deprecatedTip("addHandleOfControlEvent","registerControlEventHandler") - print("come in addHandleOfControlEvent") - self:registerControlEventHandler(func,controlEvent) -end -rawset(CCControl,"addHandleOfControlEvent",CCControlDeprecated.addHandleOfControlEvent) ---functions of CCControl will be deprecated end - ---Enums of CCTableView will be deprecated begin -rawset(CCTableView, "kTableViewScroll",cc.SCROLLVIEW_SCRIPT_SCROLL) -rawset(CCTableView,"kTableViewZoom",cc.SCROLLVIEW_SCRIPT_ZOOM) -rawset(CCTableView,"kTableCellTouched",cc.TABLECELL_TOUCHED) -rawset(CCTableView,"kTableCellSizeForIndex",cc.TABLECELL_SIZE_FOR_INDEX) -rawset(CCTableView,"kTableCellSizeAtIndex",cc.TABLECELL_SIZE_AT_INDEX) -rawset(CCTableView,"kNumberOfCellsInTableView",cc.NUMBER_OF_CELLS_IN_TABLEVIEW) ---Enums of CCTableView will be deprecated end - ---Enums of CCScrollView will be deprecated begin -rawset(CCScrollView, "kScrollViewScroll",cc.SCROLLVIEW_SCRIPT_SCROLL) -rawset(CCScrollView,"kScrollViewZoom",cc.SCROLLVIEW_SCRIPT_ZOOM) ---Enums of CCScrollView will be deprecated end - +rawset(_G,"tex2",tex2) --functions of CCApplication will be deprecated end @@ -969,26 +928,6 @@ end rawset(CCTMXObjectGroup,"objectNamed", CCTMXObjectGroupDeprecated.objectNamed) --functions of CCTMXObject will be deprecated end - ---functions of WebSocket will be deprecated begin -local targetPlatform = CCApplication:getInstance():getTargetPlatform() -if (kTargetIphone == targetPlatform) or (kTargetIpad == targetPlatform) or (kTargetAndroid == targetPlatform) or (kTargetWindows == targetPlatform) then - local WebSocketDeprecated = { } - function WebSocketDeprecated.sendTextMsg(self, string) - deprecatedTip("WebSocket:sendTextMsg","WebSocket:sendString") - return self:sendString(string) - end - rawset(WebSocket,"sendTextMsg", WebSocketDeprecated.sendTextMsg) - - function WebSocketDeprecated.sendBinaryMsg(self, table,tablesize) - deprecatedTip("WebSocket:sendBinaryMsg","WebSocket:sendString") - string.char(unpack(table)) - return self:sendString(string.char(unpack(table))) - end - rawset(WebSocket,"sendBinaryMsg", WebSocketDeprecated.sendBinaryMsg) -end ---functions of WebSocket will be deprecated end - --functions of CCRenderTexture will be deprecated begin local CCRenderTextureDeprecated = { } function CCRenderTextureDeprecated.newCCImage(self) @@ -1027,78 +966,6 @@ end rawset(cc.Layer, "isKeypadEnabled", CCLayerDeprecated.isKeypadEnabled ) --functions of Layer will be deprecated end ---functions of ccs.GUIReader will be deprecated begin -local CCSGUIReaderDeprecated = { } -function CCSGUIReaderDeprecated.purgeGUIReader() - deprecatedTip("ccs.GUIReader:purgeGUIReader","ccs.GUIReader:destroyInstance") - return ccs.GUIReader:destroyInstance() -end -rawset(ccs.GUIReader,"purgeGUIReader",CCSGUIReaderDeprecated.purgeGUIReader) ---functions of ccs.GUIReader will be deprecated end - ---functions of ccs.ActionManagerEx will be deprecated begin -local CCSActionManagerExDeprecated = { } -function CCSActionManagerExDeprecated.destroyActionManager() - deprecatedTip("ccs.ActionManagerEx:destroyActionManager","ccs.ActionManagerEx:destroyInstance") - return ccs.ActionManagerEx:destroyInstance() -end -rawset(ccs.ActionManagerEx,"destroyActionManager",CCSActionManagerExDeprecated.destroyActionManager) ---functions of ccs.ActionManagerEx will be deprecated end - ---functions of ccs.SceneReader will be deprecated begin -local CCSSceneReaderDeprecated = { } -function CCSSceneReaderDeprecated.destroySceneReader(self) - deprecatedTip("ccs.SceneReader:destroySceneReader","ccs.SceneReader:destroyInstance") - return self:destroyInstance() -end -rawset(ccs.SceneReader,"destroySceneReader",CCSSceneReaderDeprecated.destroySceneReader) ---functions of ccs.SceneReader will be deprecated end - ---functions of CCArmatureDataManager will be deprecated begin -local CCArmatureDataManagerDeprecated = { } -function CCArmatureDataManagerDeprecated.sharedArmatureDataManager() - deprecatedTip("CCArmatureDataManager:sharedArmatureDataManager","ccs.ArmatureDataManager:getInstance") - return ccs.ArmatureDataManager:getInstance() -end -rawset(CCArmatureDataManager,"sharedArmatureDataManager",CCArmatureDataManagerDeprecated.sharedArmatureDataManager) - -function CCArmatureDataManagerDeprecated.purge() - deprecatedTip("CCArmatureDataManager:purge","ccs.ArmatureDataManager:destoryInstance") - return ccs.ArmatureDataManager:destoryInstance() -end -rawset(CCArmatureDataManager,"purge",CCArmatureDataManagerDeprecated.purge) ---functions of CCArmatureDataManager will be deprecated end - ---functions of GUIReader will be deprecated begin -local GUIReaderDeprecated = { } -function GUIReaderDeprecated.shareReader() - deprecatedTip("GUIReader:shareReader","ccs.GUIReader:getInstance") - return ccs.GUIReader:getInstance() -end -rawset(GUIReader,"shareReader",GUIReaderDeprecated.shareReader) - -function GUIReaderDeprecated.purgeGUIReader() - deprecatedTip("GUIReader:purgeGUIReader","ccs.GUIReader:destroyInstance") - return ccs.GUIReader:destroyInstance() -end -rawset(GUIReader,"purgeGUIReader",GUIReaderDeprecated.purgeGUIReader) ---functions of GUIReader will be deprecated end - ---functions of SceneReader will be deprecated begin -local SceneReaderDeprecated = { } -function SceneReaderDeprecated.sharedSceneReader() - deprecatedTip("SceneReader:sharedSceneReader","ccs.SceneReader:getInstance") - return ccs.SceneReader:getInstance() -end -rawset(SceneReader,"sharedSceneReader",SceneReaderDeprecated.sharedSceneReader) - -function SceneReaderDeprecated.purgeSceneReader(self) - deprecatedTip("SceneReader:purgeSceneReader","ccs.SceneReader:destroyInstance") - return self:destroyInstance() -end -rawset(SceneReader,"purgeSceneReader",SceneReaderDeprecated.purgeSceneReader) ---functions of SceneReader will be deprecated end - --functions of cc.Node will be deprecated begin local NodeDeprecated = { } function NodeDeprecated.setZOrder(self,zOrder) @@ -1146,156 +1013,3 @@ function GLProgram.addAttribute(self, attributeName, index) end rawset(cc.GLProgram,"addAttribute", GLProgram.addAttribute) --functions of cc.GLProgram will be deprecated end - ---functions of ccui.Text will be deprecated begin -local TextDeprecated = { } -function TextDeprecated.setText(self, str) - deprecatedTip("ccui.Text:setText","ccui.Text:setString") - return self:setString(str) -end -rawset(ccui.Text,"setText", TextDeprecated.setText) - -function TextDeprecated.getStringValue(self) - deprecatedTip("ccui.Text:getStringValue","ccui.Text:getString") - return self:getString() -end -rawset(ccui.Text,"getStringValue", TextDeprecated.getStringValue) - ---functions of ccui.Text will be deprecated begin - ---functions of ccui.TextAtlas will be deprecated begin -local TextAtlasDeprecated = { } -function TextAtlasDeprecated.setStringValue(self, str) - deprecatedTip("ccui.TextAtlas:setStringValue","ccui.TextAtlas:setString") - return self:setString(str) -end -rawset(ccui.TextAtlas,"setStringValue", TextAtlasDeprecated.setStringValue) - -function TextAtlasDeprecated.getStringValue(self) - deprecatedTip("ccui.TextAtlas:getStringValue","ccui.TextAtlas:getString") - return self:getString() -end -rawset(ccui.TextAtlas,"getStringValue", TextAtlasDeprecated.getStringValue) - ---functions of ccui.TextAtlas will be deprecated begin - - ---functions of ccui.TextBMFont will be deprecated begin -local TextBMFontDeprecated = { } -function TextBMFontDeprecated.setText(self, str) - deprecatedTip("ccui.TextBMFont:setText","ccui.TextBMFont:setString") - return self:setString(str) -end -rawset(ccui.TextBMFont,"setText", TextBMFontDeprecated.setText) - -function TextBMFontDeprecated.getStringValue(self) - deprecatedTip("ccui.Text:getStringValue","ccui.TextBMFont:getString") - return self:getString() -end -rawset(ccui.Text,"getStringValue", TextBMFontDeprecated.getStringValue) ---functions of ccui.TextBMFont will be deprecated begin - ---functions of cc.ShaderCache will be deprecated begin -local ShaderCacheDeprecated = { } -function ShaderCacheDeprecated.getProgram(self,strShader) - deprecatedTip("cc.ShaderCache:getProgram","cc.ShaderCache:getGLProgram") - return self:getGLProgram(strShader) -end -rawset(cc.ShaderCache,"getProgram", ShaderCacheDeprecated.getProgram) ---functions of ccui.TextBMFont will be deprecated begin - ---functions of ccui.Widget will be deprecated begin -local UIWidgetDeprecated = { } -function UIWidgetDeprecated.getLeftInParent(self) - deprecatedTip("ccui.Widget:getLeftInParent","ccui.Widget:getLeftBoundary") - return self:getLeftBoundary() -end -rawset(ccui.Widget,"getLeftInParent", UIWidgetDeprecated.getLeftInParent) - -function UIWidgetDeprecated.getBottomInParent(self) - deprecatedTip("ccui.Widget:getBottomInParent","ccui.Widget:getBottomBoundary") - return self:getBottomBoundary() -end -rawset(ccui.Widget,"getBottomInParent", UIWidgetDeprecated.getBottomInParent) - -function UIWidgetDeprecated.getRightInParent(self) - deprecatedTip("ccui.Widget:getRightInParent","ccui.Widget:getRightBoundary") - return self:getRightBoundary() -end -rawset(ccui.Widget,"getRightInParent", UIWidgetDeprecated.getRightInParent) - -function UIWidgetDeprecated.getTopInParent(self) - deprecatedTip("ccui.Widget:getTopInParent","ccui.Widget:getTopBoundary") - return self:getTopBoundary() -end -rawset(ccui.Widget,"getTopInParent", UIWidgetDeprecated.getTopInParent) - -function UIWidgetDeprecated.getSize(self) - deprecatedTip("ccui.Widget:getSize","ccui.Widget:getContentSize") - return self:getContentSize() -end -rawset(ccui.Widget,"getSize", UIWidgetDeprecated.getSize) - -function UIWidgetDeprecated.setSize(self, ...) - deprecatedTip("ccui.Widget:setSize","ccui.Widget:setContentSize") - return self:setContentSize(...) -end -rawset(ccui.Widget,"setSize", UIWidgetDeprecated.setSize) - ---functions of ccui.Widget will be deprecated end - ---functions of ccui.CheckBox will be deprecated begin -local UICheckBoxDeprecated = { } -function UICheckBoxDeprecated.addEventListenerCheckBox(self,handler) - deprecatedTip("ccui.CheckBox:addEventListenerCheckBox","ccui.CheckBox:addEventListener") - return self:addEventListener(handler) -end -rawset(ccui.CheckBox,"addEventListenerCheckBox", UICheckBoxDeprecated.addEventListenerCheckBox) ---functions of ccui.CheckBox will be deprecated end - ---functions of ccui.Slider will be deprecated begin -local UISliderDeprecated = { } -function UISliderDeprecated.addEventListenerSlider(self,handler) - deprecatedTip("ccui.Slider:addEventListenerSlider","ccui.Slider:addEventListener") - return self:addEventListener(handler) -end -rawset(ccui.Slider,"addEventListenerSlider", UISliderDeprecated.addEventListenerSlider) ---functions of ccui.Slider will be deprecated end - ---functions of ccui.TextField will be deprecated begin -local UITextFieldDeprecated = { } -function UITextFieldDeprecated.addEventListenerTextField(self,handler) - deprecatedTip("ccui.TextField:addEventListenerTextField","ccui.TextField:addEventListener") - return self:addEventListener(handler) -end -rawset(ccui.TextField,"addEventListenerTextField", UITextFieldDeprecated.addEventListenerTextField) ---functions of ccui.TextField will be deprecated end - ---functions of ccui.PageView will be deprecated begin -local UIPageViewDeprecated = { } -function UIPageViewDeprecated.addEventListenerPageView(self,handler) - deprecatedTip("ccui.PageView:addEventListenerPageView","ccui.PageView:addEventListener") - return self:addEventListener(handler) -end -rawset(ccui.PageView,"addEventListenerPageView", UIPageViewDeprecated.addEventListenerPageView) ---functions of ccui.PageView will be deprecated end - ---functions of ccui.ScrollView will be deprecated begin -local UIScrollViewDeprecated = { } -function UIScrollViewDeprecated.addEventListenerScrollView(self,handler) - deprecatedTip("ccui.ScrollView:addEventListenerScrollView","ccui.ScrollView:addEventListener") - return self:addEventListener(handler) -end -rawset(ccui.ScrollView,"addEventListenerScrollView", UIScrollViewDeprecated.addEventListenerScrollView) ---functions of ccui.ScrollView will be deprecated end - ---functions of ccui.ListView will be deprecated begin -local UIListViewDeprecated = { } -function UIListViewDeprecated.addEventListenerListView(self,handler) - deprecatedTip("ccui.ListView:addEventListenerListView","ccui.ListView:addEventListener") - return self:addEventListener(handler) -end -rawset(ccui.ListView,"addEventListenerListView", UIListViewDeprecated.addEventListenerListView) ---functions of ccui.ListView will be deprecated end - - diff --git a/cocos/scripting/lua-bindings/script/DeprecatedCocosBuilderClass.lua b/cocos/scripting/lua-bindings/script/DeprecatedCocosBuilderClass.lua new file mode 100644 index 0000000000..66f1f5affd --- /dev/null +++ b/cocos/scripting/lua-bindings/script/DeprecatedCocosBuilderClass.lua @@ -0,0 +1,32 @@ +-- This is the DeprecatedCocosBuilderClass + +DeprecatedCocosBuilderClass = {} or DeprecatedCocosBuilderClass + +--tip +local function deprecatedTip(old_name,new_name) + print("\n********** \n"..old_name.." was deprecated please use ".. new_name .. " instead.\n**********") +end + +--CCBReader class will be Deprecated,begin +function DeprecatedCocosBuilderClass.CCBReader() + deprecatedTip("CCBReader","cc.BReader") + return cc.BReader +end +_G["CCBReader"] = DeprecatedCocosBuilderClass.CCBReader() +--CCBReader class will be Deprecated,end + +--CCBAnimationManager class will be Deprecated,begin +function DeprecatedCocosBuilderClass.CCBAnimationManager() + deprecatedTip("CCBAnimationManager","cc.BAnimationManager") + return cc.BAnimationManager +end +_G["CCBAnimationManager"] = DeprecatedCocosBuilderClass.CCBAnimationManager() +--CCBAnimationManager class will be Deprecated,end + +--CCBProxy class will be Deprecated,begin +function DeprecatedCocosBuilderClass.CCBProxy() + deprecatedTip("CCBProxy","cc.CCBProxy") + return cc.CCBProxy +end +_G["CCBProxy"] = DeprecatedCocosBuilderClass.CCBProxy() +--CCBProxy class will be Deprecated,end diff --git a/cocos/scripting/lua-bindings/script/DeprecatedCocosDenshionClass.lua b/cocos/scripting/lua-bindings/script/DeprecatedCocosDenshionClass.lua new file mode 100644 index 0000000000..49e3cc3c3d --- /dev/null +++ b/cocos/scripting/lua-bindings/script/DeprecatedCocosDenshionClass.lua @@ -0,0 +1,16 @@ +-- This is the DeprecatedCocosDenshionClass + +DeprecatedCocosDenshionClass = {} or DeprecatedCocosDenshionClass + +--tip +local function deprecatedTip(old_name,new_name) + print("\n********** \n"..old_name.." was deprecated please use ".. new_name .. " instead.\n**********") +end + +--SimpleAudioEngine class will be Deprecated,begin +function DeprecatedCocosDenshionClass.SimpleAudioEngine() + deprecatedTip("SimpleAudioEngine","cc.SimpleAudioEngine") + return cc.SimpleAudioEngine +end +_G["SimpleAudioEngine"] = DeprecatedCocosDenshionClass.SimpleAudioEngine() +--SimpleAudioEngine class will be Deprecated,end diff --git a/cocos/scripting/lua-bindings/script/DeprecatedCocosDenshionFunc.lua b/cocos/scripting/lua-bindings/script/DeprecatedCocosDenshionFunc.lua new file mode 100644 index 0000000000..f6a5401ed2 --- /dev/null +++ b/cocos/scripting/lua-bindings/script/DeprecatedCocosDenshionFunc.lua @@ -0,0 +1,19 @@ +--tip +local function deprecatedTip(old_name,new_name) + print("\n********** \n"..old_name.." was deprecated please use ".. new_name .. " instead.\n**********") +end + +--functions of SimpleAudioEngine will be deprecated begin +local SimpleAudioEngineDeprecated = { } +function SimpleAudioEngineDeprecated.sharedEngine() + deprecatedTip("SimpleAudioEngine:sharedEngine","SimpleAudioEngine:getInstance") + return cc.SimpleAudioEngine:getInstance() +end +rawset(SimpleAudioEngine,"sharedEngine",SimpleAudioEngineDeprecated.sharedEngine) + +function SimpleAudioEngineDeprecated.playBackgroundMusic(self,...) + deprecatedTip("SimpleAudioEngine:playBackgroundMusic","SimpleAudioEngine:playMusic") + return self:playMusic(...) +end +rawset(SimpleAudioEngine,"playBackgroundMusic",SimpleAudioEngineDeprecated.playBackgroundMusic) +--functions of SimpleAudioEngine will be deprecated end diff --git a/cocos/scripting/lua-bindings/script/DeprecatedExtensionClass.lua b/cocos/scripting/lua-bindings/script/DeprecatedExtensionClass.lua new file mode 100644 index 0000000000..03cc96c49e --- /dev/null +++ b/cocos/scripting/lua-bindings/script/DeprecatedExtensionClass.lua @@ -0,0 +1,113 @@ +-- This is the DeprecatedExtensionClass + +DeprecatedExtensionClass = {} or DeprecatedExtensionClass + +--tip +local function deprecatedTip(old_name,new_name) + print("\n********** \n"..old_name.." was deprecated please use ".. new_name .. " instead.\n**********") +end + +--CCControl class will be Deprecated,begin +function DeprecatedExtensionClass.CCControl() + deprecatedTip("CCControl","cc.Control") + return cc.Control +end +_G["CCControl"] = DeprecatedExtensionClass.CCControl() +--CCControl class will be Deprecated,end + +--CCEditBox class will be Deprecated,begin +function DeprecatedExtensionClass.CCEditBox() + deprecatedTip("CCEditBox","cc.EditBox") + return cc.EditBox +end +_G["CCEditBox"] = DeprecatedExtensionClass.CCEditBox() +--CCEditBox class will be Deprecated,end + +--CCScrollView class will be Deprecated,begin +function DeprecatedExtensionClass.CCScrollView() + deprecatedTip("CCScrollView","cc.ScrollView") + return cc.ScrollView +end +_G["CCScrollView"] = DeprecatedExtensionClass.CCScrollView() +--CCScrollView class will be Deprecated,end + +--CCTableView class will be Deprecated,begin +function DeprecatedExtensionClass.CCTableView() + deprecatedTip("CCTableView","cc.TableView") + return cc.TableView +end +_G["CCTableView"] = DeprecatedExtensionClass.CCTableView() +--CCTableView class will be Deprecated,end + +--CCControlPotentiometer class will be Deprecated,begin +function DeprecatedExtensionClass.CCControlPotentiometer() + deprecatedTip("CCControlPotentiometer","cc.ControlPotentiometer") + return cc.ControlPotentiometer +end +_G["CCControlPotentiometer"] = DeprecatedExtensionClass.CCControlPotentiometer() +--CCControlPotentiometer class will be Deprecated,end + +--CCControlStepper class will be Deprecated,begin +function DeprecatedExtensionClass.CCControlStepper() + deprecatedTip("CCControlStepper","cc.ControlStepper") + return cc.ControlStepper +end +_G["CCControlStepper"] = DeprecatedExtensionClass.CCControlStepper() +--CCControlStepper class will be Deprecated,end + +--CCControlHuePicker class will be Deprecated,begin +function DeprecatedExtensionClass.CCControlHuePicker() + deprecatedTip("CCControlHuePicker","cc.ControlHuePicker") + return cc.ControlHuePicker +end +_G["CCControlHuePicker"] = DeprecatedExtensionClass.CCControlHuePicker() +--CCControlHuePicker class will be Deprecated,end + +--CCControlSlider class will be Deprecated,begin +function DeprecatedExtensionClass.CCControlSlider() + deprecatedTip("CCControlSlider","cc.ControlSlider") + return cc.ControlSlider +end +_G["CCControlSlider"] = DeprecatedExtensionClass.CCControlSlider() +--CCControlSlider class will be Deprecated,end + +--CCControlSaturationBrightnessPicker class will be Deprecated,begin +function DeprecatedExtensionClass.CCControlSaturationBrightnessPicker() + deprecatedTip("CCControlSaturationBrightnessPicker","cc.ControlSaturationBrightnessPicker") + return cc.ControlSaturationBrightnessPicker +end +_G["CCControlSaturationBrightnessPicker"] = DeprecatedExtensionClass.CCControlSaturationBrightnessPicker() +--CCControlSaturationBrightnessPicker class will be Deprecated,end + +--CCControlSwitch class will be Deprecated,begin +function DeprecatedExtensionClass.CCControlSwitch() + deprecatedTip("CCControlSwitch","cc.ControlSwitch") + return cc.ControlSwitch +end +_G["CCControlSwitch"] = DeprecatedExtensionClass.CCControlSwitch() +--CCControlSwitch class will be Deprecated,end + +--CCControlButton class will be Deprecated,begin +function DeprecatedExtensionClass.CCControlButton() + deprecatedTip("CCControlButton","cc.ControlButton") + return cc.ControlButton +end +_G["CCControlButton"] = DeprecatedExtensionClass.CCControlButton() +--CCControlButton class will be Deprecated,end + +--CCScale9Sprite class will be Deprecated,begin +function DeprecatedExtensionClass.CCScale9Sprite() + deprecatedTip("CCScale9Sprite","cc.Scale9Sprite") + return cc.Scale9Sprite +end +_G["CCScale9Sprite"] = DeprecatedExtensionClass.CCScale9Sprite() +--CCScale9Sprite class will be Deprecated,end + +--CCControlColourPicker class will be Deprecated,begin +function DeprecatedExtensionClass.CCControlColourPicker() + deprecatedTip("CCControlColourPicker","cc.ControlColourPicker") + return cc.ControlColourPicker +end +_G["CCControlColourPicker"] = DeprecatedExtensionClass.CCControlColourPicker() +--CCControlColourPicker class will be Deprecated,end + diff --git a/cocos/scripting/lua-bindings/script/DeprecatedExtensionEnum.lua b/cocos/scripting/lua-bindings/script/DeprecatedExtensionEnum.lua new file mode 100644 index 0000000000..aad58e5753 --- /dev/null +++ b/cocos/scripting/lua-bindings/script/DeprecatedExtensionEnum.lua @@ -0,0 +1,23 @@ + +_G.kCCControlStepperPartMinus = cc.CONTROL_STEPPER_PART_MINUS +_G.kCCControlStepperPartPlus = cc.CONTROL_STEPPER_PART_PLUS +_G.kCCControlStepperPartNone = cc.CONTROL_STEPPER_PART_NONE + +_G.CCControlEventTouchDown = cc.CONTROL_EVENTTYPE_TOUCH_DOWN +_G.CCControlEventTouchDragInside = cc.CONTROL_EVENTTYPE_DRAG_INSIDE +_G.CCControlEventTouchDragOutside = cc.CONTROL_EVENTTYPE_DRAG_OUTSIDE +_G.CCControlEventTouchDragEnter = cc.CONTROL_EVENTTYPE_DRAG_ENTER +_G.CCControlEventTouchDragExit = cc.CONTROL_EVENTTYPE_DRAG_EXIT +_G.CCControlEventTouchUpInside = cc.CONTROL_EVENTTYPE_TOUCH_UP_INSIDE +_G.CCControlEventTouchUpOutside = cc.CONTROL_EVENTTYPE_TOUCH_UP_OUTSIDE +_G.CCControlEventTouchCancel = cc.CONTROL_EVENTTYPE_TOUCH_CANCEL +_G.CCControlEventValueChanged = cc.CONTROL_EVENTTYPE_VALUE_CHANGED +_G.CCControlStateNormal = cc.CONTROL_STATE_NORMAL +_G.CCControlStateHighlighted = cc.CONTROL_STATE_HIGH_LIGHTED +_G.CCControlStateDisabled = cc.CONTROL_STATE_DISABLED +_G.CCControlStateSelected = cc.CONTROL_STATE_SELECTED + +_G.kCCScrollViewDirectionHorizontal = cc.SCROLLVIEW_DIRECTION_HORIZONTAL +_G.kCCScrollViewDirectionVertical = cc.SCROLLVIEW_DIRECTION_VERTICAL +_G.kCCTableViewFillTopDown = cc.TABLEVIEW_FILL_TOPDOWN +_G.kCCTableViewFillBottomUp = cc.TABLEVIEW_FILL_BOTTOMUP diff --git a/cocos/scripting/lua-bindings/script/DeprecatedExtensionFunc.lua b/cocos/scripting/lua-bindings/script/DeprecatedExtensionFunc.lua new file mode 100644 index 0000000000..513c2cbf85 --- /dev/null +++ b/cocos/scripting/lua-bindings/script/DeprecatedExtensionFunc.lua @@ -0,0 +1,28 @@ +--tip +local function deprecatedTip(old_name,new_name) + print("\n********** \n"..old_name.." was deprecated please use ".. new_name .. " instead.\n**********") +end + +--functions of CCControl will be deprecated end +local CCControlDeprecated = { } +function CCControlDeprecated.addHandleOfControlEvent(self,func,controlEvent) + deprecatedTip("addHandleOfControlEvent","registerControlEventHandler") + print("come in addHandleOfControlEvent") + self:registerControlEventHandler(func,controlEvent) +end +rawset(CCControl,"addHandleOfControlEvent",CCControlDeprecated.addHandleOfControlEvent) +--functions of CCControl will be deprecated end + +--Enums of CCTableView will be deprecated begin +rawset(CCTableView, "kTableViewScroll",cc.SCROLLVIEW_SCRIPT_SCROLL) +rawset(CCTableView,"kTableViewZoom",cc.SCROLLVIEW_SCRIPT_ZOOM) +rawset(CCTableView,"kTableCellTouched",cc.TABLECELL_TOUCHED) +rawset(CCTableView,"kTableCellSizeForIndex",cc.TABLECELL_SIZE_FOR_INDEX) +rawset(CCTableView,"kTableCellSizeAtIndex",cc.TABLECELL_SIZE_AT_INDEX) +rawset(CCTableView,"kNumberOfCellsInTableView",cc.NUMBER_OF_CELLS_IN_TABLEVIEW) +--Enums of CCTableView will be deprecated end + +--Enums of CCScrollView will be deprecated begin +rawset(CCScrollView, "kScrollViewScroll",cc.SCROLLVIEW_SCRIPT_SCROLL) +rawset(CCScrollView,"kScrollViewZoom",cc.SCROLLVIEW_SCRIPT_ZOOM) +--Enums of CCScrollView will be deprecated end diff --git a/cocos/scripting/lua-bindings/script/DeprecatedNetworkClass.lua b/cocos/scripting/lua-bindings/script/DeprecatedNetworkClass.lua new file mode 100644 index 0000000000..f465dc7bbd --- /dev/null +++ b/cocos/scripting/lua-bindings/script/DeprecatedNetworkClass.lua @@ -0,0 +1,16 @@ +-- This is the DeprecatedNetworkClass + +DeprecatedNetworkClass = {} or DeprecatedNetworkClass + +--tip +local function deprecatedTip(old_name,new_name) + print("\n********** \n"..old_name.." was deprecated please use ".. new_name .. " instead.\n**********") +end + +--WebSocket class will be Deprecated,begin +function DeprecatedNetworkClass.WebSocket() + deprecatedTip("WebSocket","cc.WebSocket") + return cc.WebSocket +end +_G["WebSocket"] = DeprecatedNetworkClass.WebSocket() +--WebSocket class will be Deprecated,end diff --git a/cocos/scripting/lua-bindings/script/DeprecatedNetworkEnum.lua b/cocos/scripting/lua-bindings/script/DeprecatedNetworkEnum.lua new file mode 100644 index 0000000000..da9051cd3e --- /dev/null +++ b/cocos/scripting/lua-bindings/script/DeprecatedNetworkEnum.lua @@ -0,0 +1,9 @@ +_G.kWebSocketScriptHandlerOpen = cc.WEBSOCKET_OPEN +_G.kWebSocketScriptHandlerMessage = cc.WEBSOCKET_MESSAGE +_G.kWebSocketScriptHandlerClose = cc.WEBSOCKET_CLOSE +_G.kWebSocketScriptHandlerError = cc.WEBSOCKET_ERROR + +_G.kStateConnecting = cc.WEBSOCKET_STATE_CONNECTING +_G.kStateOpen = cc.WEBSOCKET_STATE_OPEN +_G.kStateClosing = cc.WEBSOCKET_STATE_CLOSING +_G.kStateClosed = cc.WEBSOCKET_STATE_CLOSED diff --git a/cocos/scripting/lua-bindings/script/DeprecatedNetworkFunc.lua b/cocos/scripting/lua-bindings/script/DeprecatedNetworkFunc.lua new file mode 100644 index 0000000000..83869f7775 --- /dev/null +++ b/cocos/scripting/lua-bindings/script/DeprecatedNetworkFunc.lua @@ -0,0 +1,23 @@ +--tip +local function deprecatedTip(old_name,new_name) + print("\n********** \n"..old_name.." was deprecated please use ".. new_name .. " instead.\n**********") +end + +--functions of WebSocket will be deprecated begin +local targetPlatform = CCApplication:getInstance():getTargetPlatform() +if (kTargetIphone == targetPlatform) or (kTargetIpad == targetPlatform) or (kTargetAndroid == targetPlatform) or (kTargetWindows == targetPlatform) then + local WebSocketDeprecated = { } + function WebSocketDeprecated.sendTextMsg(self, string) + deprecatedTip("WebSocket:sendTextMsg","WebSocket:sendString") + return self:sendString(string) + end + rawset(WebSocket,"sendTextMsg", WebSocketDeprecated.sendTextMsg) + + function WebSocketDeprecated.sendBinaryMsg(self, table,tablesize) + deprecatedTip("WebSocket:sendBinaryMsg","WebSocket:sendString") + string.char(unpack(table)) + return self:sendString(string.char(unpack(table))) + end + rawset(WebSocket,"sendBinaryMsg", WebSocketDeprecated.sendBinaryMsg) +end +--functions of WebSocket will be deprecated end diff --git a/cocos/scripting/lua-bindings/script/DeprecatedUIEnum.lua b/cocos/scripting/lua-bindings/script/DeprecatedUIEnum.lua new file mode 100644 index 0000000000..bc3fc5a226 --- /dev/null +++ b/cocos/scripting/lua-bindings/script/DeprecatedUIEnum.lua @@ -0,0 +1,92 @@ +require("GuiConstants") + +_G.LAYOUT_COLOR_NONE = ccui.LayoutBackGroundColorType.none +_G.LAYOUT_COLOR_SOLID = ccui.LayoutBackGroundColorType.solid +_G.LAYOUT_COLOR_GRADIENT = ccui.LayoutBackGroundColorType.gradient + +_G.LAYOUT_ABSOLUTE = ccui.LayoutType.ABSOLUTE +_G.LAYOUT_LINEAR_VERTICAL = ccui.LayoutType.VERTICAL +_G.LAYOUT_LINEAR_HORIZONTAL = ccui.LayoutType.HORIZONTAL +_G.LAYOUT_RELATIVE = ccui.LayoutType.RELATIVE + +_G.BRIGHT_NONE = ccui.BrightStyle.none +_G.BRIGHT_NORMAL = ccui.BrightStyle.normal +_G.BRIGHT_HIGHLIGHT = ccui.BrightStyle.highlight + +_G.UI_TEX_TYPE_LOCAL = ccui.TextureResType.localType +_G.UI_TEX_TYPE_PLIST = ccui.TextureResType.plistType + +_G.TOUCH_EVENT_BEGAN = ccui.TouchEventType.began +_G.TOUCH_EVENT_MOVED = ccui.TouchEventType.moved +_G.TOUCH_EVENT_ENDED = ccui.TouchEventType.ended +_G.TOUCH_EVENT_CANCELED = ccui.TouchEventType.canceled + +_G.SIZE_ABSOLUTE = ccui.SizeType.absolute +_G.SIZE_PERCENT = ccui.SizeType.percent + +_G.POSITION_ABSOLUTE = ccui.PositionType.absolute +_G.POSITION_PERCENT = ccui.PositionType.percent + +_G.CHECKBOX_STATE_EVENT_SELECTED = ccui.CheckBoxEventType.selected +_G.CHECKBOX_STATE_EVENT_UNSELECTED = ccui.CheckBoxEventType.unselected + +_G.CHECKBOX_STATE_EVENT_SELECTED = ccui.CheckBoxEventType.selected +_G.CHECKBOX_STATE_EVENT_UNSELECTED = ccui.CheckBoxEventType.unselected + +_G.LoadingBarTypeLeft = ccui.LoadingBarDirection.LEFT +_G.LoadingBarTypeRight = ccui.LoadingBarDirection.RIGHT + +_G.LoadingBarTypeRight = ccui.SliderEventType.percent_changed + +_G.TEXTFIELD_EVENT_ATTACH_WITH_IME = ccui.TextFiledEventType.attach_with_ime +_G.TEXTFIELD_EVENT_DETACH_WITH_IME = ccui.TextFiledEventType.detach_with_ime +_G.TEXTFIELD_EVENT_INSERT_TEXT = ccui.TextFiledEventType.insert_text +_G.TEXTFIELD_EVENT_DELETE_BACKWARD = ccui.TextFiledEventType.delete_backward + +_G.SCROLLVIEW_EVENT_SCROLL_TO_TOP = ccui.ScrollViewDir.none +_G.SCROLLVIEW_DIR_VERTICAL = ccui.ScrollViewDir.vertical +_G.SCROLLVIEW_DIR_HORIZONTAL = ccui.ScrollViewDir.horizontal +_G.SCROLLVIEW_DIR_BOTH = ccui.ScrollViewDir.both + +_G.SCROLLVIEW_EVENT_SCROLL_TO_TOP = ccui.ScrollviewEventType.scrollToTop +_G.SCROLLVIEW_EVENT_SCROLL_TO_BOTTOM = ccui.ScrollviewEventType.scrollToBottom +_G.SCROLLVIEW_EVENT_SCROLL_TO_LEFT = ccui.ScrollviewEventType.scrollToLeft +_G.SCROLLVIEW_EVENT_SCROLL_TO_RIGHT = ccui.ScrollviewEventType.scrollToRight +_G.SCROLLVIEW_EVENT_SCROLLING = ccui.ScrollviewEventType.scrolling +_G.SCROLLVIEW_EVENT_BOUNCE_TOP = ccui.ScrollviewEventType.bounceTop +_G.SCROLLVIEW_EVENT_BOUNCE_BOTTOM = ccui.ScrollviewEventType.bounceBottom +_G.SCROLLVIEW_EVENT_BOUNCE_LEFT = ccui.ScrollviewEventType.bounceLeft +_G.SCROLLVIEW_EVENT_BOUNCE_RIGHT = ccui.ScrollviewEventType.bounceRight + +_G.PAGEVIEW_EVENT_TURNING = ccui.PageViewEventType.turning + +_G.PAGEVIEW_TOUCHLEFT = ccui.PVTouchDir.touch_left +_G.PAGEVIEW_TOUCHRIGHT = ccui.PVTouchDir.touch_right + +_G.LISTVIEW_DIR_NONE = ccui.ListViewDirection.none +_G.LISTVIEW_DIR_VERTICAL = ccui.ListViewDirection.vertical +_G.LISTVIEW_DIR_HORIZONTAL = ccui.ListViewDirection.horizontal + +_G.LISTVIEW_MOVE_DIR_NONE = ccui.ListViewMoveDirection.none +_G.LISTVIEW_MOVE_DIR_UP = ccui.ListViewMoveDirection.up +_G.LISTVIEW_MOVE_DIR_DOWN = ccui.ListViewMoveDirection.down +_G.LISTVIEW_MOVE_DIR_LEFT = ccui.ListViewMoveDirection.left +_G.LISTVIEW_MOVE_DIR_RIGHT = ccui.ListViewMoveDirection.right + +_G.LISTVIEW_EVENT_INIT_CHILD = ccui.ListViewEventType.init_child +_G.LISTVIEW_EVENT_UPDATE_CHILD = ccui.ListViewEventType.update_child + +_G.LAYOUT_PARAMETER_NONE = ccui.LayoutParameterType.none +_G.LAYOUT_PARAMETER_LINEAR = ccui.LayoutParameterType.linear +_G.LAYOUT_PARAMETER_RELATIVE = ccui.LayoutParameterType.relative + +ccui.LoadingBarType = ccui.LoadingBarDirection +ccui.LoadingBarType.left = ccui.LoadingBarDirection.LEFT +ccui.LoadingBarType.right = ccui.LoadingBarDirection.RIGHT + +ccui.LayoutType.absolute = ccui.LayoutType.ABSOLUTE +ccui.LayoutType.linearVertical = ccui.LayoutType.VERTICAL +ccui.LayoutType.linearHorizontal = ccui.LayoutType.HORIZONTAL +ccui.LayoutType.relative = ccui.LayoutType.RELATIVE + +ccui.ListViewEventType.onsSelectedItem = ccui.ListViewEventType.ONSELECTEDITEM_START \ No newline at end of file diff --git a/cocos/scripting/lua-bindings/script/DeprecatedUIFunc.lua b/cocos/scripting/lua-bindings/script/DeprecatedUIFunc.lua new file mode 100644 index 0000000000..b11bf1d161 --- /dev/null +++ b/cocos/scripting/lua-bindings/script/DeprecatedUIFunc.lua @@ -0,0 +1,154 @@ +--tip +local function deprecatedTip(old_name,new_name) + print("\n********** \n"..old_name.." was deprecated please use ".. new_name .. " instead.\n**********") +end + +--functions of ccui.Text will be deprecated begin +local TextDeprecated = { } +function TextDeprecated.setText(self, str) + deprecatedTip("ccui.Text:setText","ccui.Text:setString") + return self:setString(str) +end +rawset(ccui.Text,"setText", TextDeprecated.setText) + +function TextDeprecated.getStringValue(self) + deprecatedTip("ccui.Text:getStringValue","ccui.Text:getString") + return self:getString() +end +rawset(ccui.Text,"getStringValue", TextDeprecated.getStringValue) + +--functions of ccui.Text will be deprecated begin + +--functions of ccui.TextAtlas will be deprecated begin +local TextAtlasDeprecated = { } +function TextAtlasDeprecated.setStringValue(self, str) + deprecatedTip("ccui.TextAtlas:setStringValue","ccui.TextAtlas:setString") + return self:setString(str) +end +rawset(ccui.TextAtlas,"setStringValue", TextAtlasDeprecated.setStringValue) + +function TextAtlasDeprecated.getStringValue(self) + deprecatedTip("ccui.TextAtlas:getStringValue","ccui.TextAtlas:getString") + return self:getString() +end +rawset(ccui.TextAtlas,"getStringValue", TextAtlasDeprecated.getStringValue) +--functions of ccui.TextAtlas will be deprecated begin + + +--functions of ccui.TextBMFont will be deprecated begin +local TextBMFontDeprecated = { } +function TextBMFontDeprecated.setText(self, str) + deprecatedTip("ccui.TextBMFont:setText","ccui.TextBMFont:setString") + return self:setString(str) +end +rawset(ccui.TextBMFont,"setText", TextBMFontDeprecated.setText) + +function TextBMFontDeprecated.getStringValue(self) + deprecatedTip("ccui.Text:getStringValue","ccui.TextBMFont:getString") + return self:getString() +end +rawset(ccui.Text,"getStringValue", TextBMFontDeprecated.getStringValue) +--functions of ccui.TextBMFont will be deprecated begin + +--functions of cc.ShaderCache will be deprecated begin +local ShaderCacheDeprecated = { } +function ShaderCacheDeprecated.getProgram(self,strShader) + deprecatedTip("cc.ShaderCache:getProgram","cc.ShaderCache:getGLProgram") + return self:getGLProgram(strShader) +end +rawset(cc.ShaderCache,"getProgram", ShaderCacheDeprecated.getProgram) +--functions of ccui.TextBMFont will be deprecated begin + +--functions of ccui.Widget will be deprecated begin +local UIWidgetDeprecated = { } +function UIWidgetDeprecated.getLeftInParent(self) + deprecatedTip("ccui.Widget:getLeftInParent","ccui.Widget:getLeftBoundary") + return self:getLeftBoundary() +end +rawset(ccui.Widget,"getLeftInParent", UIWidgetDeprecated.getLeftInParent) + +function UIWidgetDeprecated.getBottomInParent(self) + deprecatedTip("ccui.Widget:getBottomInParent","ccui.Widget:getBottomBoundary") + return self:getBottomBoundary() +end +rawset(ccui.Widget,"getBottomInParent", UIWidgetDeprecated.getBottomInParent) + +function UIWidgetDeprecated.getRightInParent(self) + deprecatedTip("ccui.Widget:getRightInParent","ccui.Widget:getRightBoundary") + return self:getRightBoundary() +end +rawset(ccui.Widget,"getRightInParent", UIWidgetDeprecated.getRightInParent) + +function UIWidgetDeprecated.getTopInParent(self) + deprecatedTip("ccui.Widget:getTopInParent","ccui.Widget:getTopBoundary") + return self:getTopBoundary() +end +rawset(ccui.Widget,"getTopInParent", UIWidgetDeprecated.getTopInParent) + +function UIWidgetDeprecated.getSize(self) + deprecatedTip("ccui.Widget:getSize","ccui.Widget:getContentSize") + return self:getContentSize() +end +rawset(ccui.Widget,"getSize", UIWidgetDeprecated.getSize) + +function UIWidgetDeprecated.setSize(self, ...) + deprecatedTip("ccui.Widget:setSize","ccui.Widget:setContentSize") + return self:setContentSize(...) +end +rawset(ccui.Widget,"setSize", UIWidgetDeprecated.setSize) + +--functions of ccui.Widget will be deprecated end + +--functions of ccui.CheckBox will be deprecated begin +local UICheckBoxDeprecated = { } +function UICheckBoxDeprecated.addEventListenerCheckBox(self,handler) + deprecatedTip("ccui.CheckBox:addEventListenerCheckBox","ccui.CheckBox:addEventListener") + return self:addEventListener(handler) +end +rawset(ccui.CheckBox,"addEventListenerCheckBox", UICheckBoxDeprecated.addEventListenerCheckBox) +--functions of ccui.CheckBox will be deprecated end + +--functions of ccui.Slider will be deprecated begin +local UISliderDeprecated = { } +function UISliderDeprecated.addEventListenerSlider(self,handler) + deprecatedTip("ccui.Slider:addEventListenerSlider","ccui.Slider:addEventListener") + return self:addEventListener(handler) +end +rawset(ccui.Slider,"addEventListenerSlider", UISliderDeprecated.addEventListenerSlider) +--functions of ccui.Slider will be deprecated end + +--functions of ccui.TextField will be deprecated begin +local UITextFieldDeprecated = { } +function UITextFieldDeprecated.addEventListenerTextField(self,handler) + deprecatedTip("ccui.TextField:addEventListenerTextField","ccui.TextField:addEventListener") + return self:addEventListener(handler) +end +rawset(ccui.TextField,"addEventListenerTextField", UITextFieldDeprecated.addEventListenerTextField) +--functions of ccui.TextField will be deprecated end + +--functions of ccui.PageView will be deprecated begin +local UIPageViewDeprecated = { } +function UIPageViewDeprecated.addEventListenerPageView(self,handler) + deprecatedTip("ccui.PageView:addEventListenerPageView","ccui.PageView:addEventListener") + return self:addEventListener(handler) +end +rawset(ccui.PageView,"addEventListenerPageView", UIPageViewDeprecated.addEventListenerPageView) +--functions of ccui.PageView will be deprecated end + +--functions of ccui.ScrollView will be deprecated begin +local UIScrollViewDeprecated = { } +function UIScrollViewDeprecated.addEventListenerScrollView(self,handler) + deprecatedTip("ccui.ScrollView:addEventListenerScrollView","ccui.ScrollView:addEventListener") + return self:addEventListener(handler) +end +rawset(ccui.ScrollView,"addEventListenerScrollView", UIScrollViewDeprecated.addEventListenerScrollView) +--functions of ccui.ScrollView will be deprecated end + +--functions of ccui.ListView will be deprecated begin +local UIListViewDeprecated = { } +function UIListViewDeprecated.addEventListenerListView(self,handler) + deprecatedTip("ccui.ListView:addEventListenerListView","ccui.ListView:addEventListener") + return self:addEventListener(handler) +end +rawset(ccui.ListView,"addEventListenerListView", UIListViewDeprecated.addEventListenerListView) +--functions of ccui.ListView will be deprecated end diff --git a/cocos/scripting/lua-bindings/script/ExtensionConstants.lua b/cocos/scripting/lua-bindings/script/ExtensionConstants.lua new file mode 100644 index 0000000000..16065e1790 --- /dev/null +++ b/cocos/scripting/lua-bindings/script/ExtensionConstants.lua @@ -0,0 +1,58 @@ +cc = cc or {} + +cc.CONTROL_STATE_NORMAL = 1 +cc.CONTROL_STATE_HIGH_LIGHTED = 2 +cc.CONTROL_STATE_DISABLED = 4 +cc.CONTROL_STATE_SELECTED = 8 + +cc.CONTROL_STEPPER_PART_MINUS = 0 +cc.CONTROL_STEPPER_PART_PLUS = 1 +cc.CONTROL_STEPPER_PART_NONE = 2 + +cc.TABLEVIEW_FILL_TOPDOWN = 0 +cc.TABLEVIEW_FILL_BOTTOMUP = 1 + +cc.SCROLLVIEW_SCRIPT_SCROLL = 0 +cc.SCROLLVIEW_SCRIPT_ZOOM = 1 +cc.TABLECELL_TOUCHED = 2 +cc.TABLECELL_HIGH_LIGHT = 3 +cc.TABLECELL_UNHIGH_LIGHT = 4 +cc.TABLECELL_WILL_RECYCLE = 5 +cc.TABLECELL_SIZE_FOR_INDEX = 6 +cc.TABLECELL_SIZE_AT_INDEX = 7 +cc.NUMBER_OF_CELLS_IN_TABLEVIEW = 8 + +cc.SCROLLVIEW_DIRECTION_NONE = -1 +cc.SCROLLVIEW_DIRECTION_HORIZONTAL = 0 +cc.SCROLLVIEW_DIRECTION_VERTICAL = 1 +cc.SCROLLVIEW_DIRECTION_BOTH = 2 + +cc.CONTROL_EVENTTYPE_TOUCH_DOWN = 1 +cc.CONTROL_EVENTTYPE_DRAG_INSIDE = 2 +cc.CONTROL_EVENTTYPE_DRAG_OUTSIDE = 4 +cc.CONTROL_EVENTTYPE_DRAG_ENTER = 8 +cc.CONTROL_EVENTTYPE_DRAG_EXIT = 16 +cc.CONTROL_EVENTTYPE_TOUCH_UP_INSIDE = 32 +cc.CONTROL_EVENTTYPE_TOUCH_UP_OUTSIDE = 64 +cc.CONTROL_EVENTTYPE_TOUCH_CANCEL = 128 +cc.CONTROL_EVENTTYPE_VALUE_CHANGED = 256 + +cc.EDITBOX_INPUT_MODE_ANY = 0 +cc.EDITBOX_INPUT_MODE_EMAILADDR = 1 +cc.EDITBOX_INPUT_MODE_NUMERIC = 2 +cc.EDITBOX_INPUT_MODE_PHONENUMBER = 3 +cc.EDITBOX_INPUT_MODE_URL = 4 +cc.EDITBOX_INPUT_MODE_DECIMAL = 5 +cc.EDITBOX_INPUT_MODE_SINGLELINE = 6 + +cc.EDITBOX_INPUT_FLAG_PASSWORD = 0 +cc.EDITBOX_INPUT_FLAG_SENSITIVE = 1 +cc.EDITBOX_INPUT_FLAG_INITIAL_CAPS_WORD = 2 +cc.EDITBOX_INPUT_FLAG_INITIAL_CAPS_SENTENCE = 3 +cc.EDITBOX_INPUT_FLAG_INITIAL_CAPS_ALL_CHARACTERS = 4 + +cc.KEYBOARD_RETURNTYPE_DEFAULT = 0 +cc.KEYBOARD_RETURNTYPE_DONE = 1 +cc.KEYBOARD_RETURNTYPE_SEND = 2 +cc.KEYBOARD_RETURNTYPE_SEARCH = 3 +cc.KEYBOARD_RETURNTYPE_GO = 4 diff --git a/cocos/scripting/lua-bindings/script/NetworkConstants.lua b/cocos/scripting/lua-bindings/script/NetworkConstants.lua new file mode 100644 index 0000000000..0e7dd0004f --- /dev/null +++ b/cocos/scripting/lua-bindings/script/NetworkConstants.lua @@ -0,0 +1,18 @@ +cc = cc or {} + +cc.WEBSOCKET_OPEN = 0 +cc.WEBSOCKET_MESSAGE = 1 +cc.WEBSOCKET_CLOSE = 2 +cc.WEBSOCKET_ERROR = 3 + +cc.WEBSOCKET_STATE_CONNECTING = 0 +cc.WEBSOCKET_STATE_OPEN = 1 +cc.WEBSOCKET_STATE_CLOSING = 2 +cc.WEBSOCKET_STATE_CLOSED = 3 + + +cc.XMLHTTPREQUEST_RESPONSE_STRING = 0 +cc.XMLHTTPREQUEST_RESPONSE_ARRAY_BUFFER = 1 +cc.XMLHTTPREQUEST_RESPONSE_BLOB = 2 +cc.XMLHTTPREQUEST_RESPONSE_DOCUMENT = 3 +cc.XMLHTTPREQUEST_RESPONSE_JSON = 4 diff --git a/tests/lua-empty-test/project/Classes/AppDelegate.cpp b/tests/lua-empty-test/project/Classes/AppDelegate.cpp index 17051cff35..e7d3e8ba9f 100644 --- a/tests/lua-empty-test/project/Classes/AppDelegate.cpp +++ b/tests/lua-empty-test/project/Classes/AppDelegate.cpp @@ -34,6 +34,20 @@ bool AppDelegate::applicationDidFinishLaunching() } lua_pop(L, 1);//statck:... + engine->executeScriptFile("DeprecatedCocos2dClass"); + engine->executeScriptFile("DeprecatedCocos2dEnum"); + engine->executeScriptFile("DeprecatedCocos2dFunc"); + + engine->executeScriptFile("DeprecatedCocosDenshionClass"); + engine->executeScriptFile("DeprecatedCocosDenshionFunc"); + + engine->executeScriptFile("DeprecatedNetworkClass"); + engine->executeScriptFile("DeprecatedNetworkEnum"); + engine->executeScriptFile("DeprecatedNetworkFunc"); + + engine->executeScriptFile("DeprecatedOpenglEnum"); + + //The call was commented because it will lead to ZeroBrane Studio can't find correct context when debugging //engine->executeScriptFile("src/hello.lua"); engine->executeString("require 'src/hello.lua'"); diff --git a/tests/lua-game-controller-test/project/Classes/AppDelegate.cpp b/tests/lua-game-controller-test/project/Classes/AppDelegate.cpp index 30a501bd9e..8033c01aec 100644 --- a/tests/lua-game-controller-test/project/Classes/AppDelegate.cpp +++ b/tests/lua-game-controller-test/project/Classes/AppDelegate.cpp @@ -39,6 +39,10 @@ bool AppDelegate::applicationDidFinishLaunching() lua_pop(L, 1);//statck:... #endif + engine->executeScriptFile("DeprecatedCocos2dClass"); + engine->executeScriptFile("DeprecatedCocos2dEnum"); + engine->executeScriptFile("DeprecatedCocos2dFunc"); + engine->executeString("require 'src/main.lua'"); return true; diff --git a/tests/lua-game-controller-test/src/GameControllerTest.lua b/tests/lua-game-controller-test/src/GameControllerTest.lua index 9b186fb84b..6b8b723597 100644 --- a/tests/lua-game-controller-test/src/GameControllerTest.lua +++ b/tests/lua-game-controller-test/src/GameControllerTest.lua @@ -1,3 +1,4 @@ +require("extern") local ControllerHolder = class("ControllerHolder") diff --git a/tests/lua-tests/project/Classes/AppDelegate.cpp b/tests/lua-tests/project/Classes/AppDelegate.cpp index dbc1b1fff8..fc59a23c67 100644 --- a/tests/lua-tests/project/Classes/AppDelegate.cpp +++ b/tests/lua-tests/project/Classes/AppDelegate.cpp @@ -35,10 +35,35 @@ bool AppDelegate::applicationDidFinishLaunching() register_assetsmanager_test_sample(L); } lua_pop(L, 1); - - pEngine->executeScriptFile("DeprecatedEnum.lua"); - pEngine->executeScriptFile("DeprecatedClass.lua"); - pEngine->executeScriptFile("Deprecated.lua"); + + pEngine->executeScriptFile("DeprecatedCocos2dClass"); + pEngine->executeScriptFile("DeprecatedCocos2dEnum"); + pEngine->executeScriptFile("DeprecatedCocos2dFunc"); + + pEngine->executeScriptFile("DeprecatedCocosBuilderClass"); + + pEngine->executeScriptFile("DeprecatedCocosDenshionClass"); + pEngine->executeScriptFile("DeprecatedCocosDenshionFunc"); + + pEngine->executeScriptFile("DeprecatedCocoStudioClass"); + pEngine->executeScriptFile("DeprecatedCocoStudioFunc"); + + pEngine->executeScriptFile("DeprecatedExtensionClass"); + pEngine->executeScriptFile("DeprecatedExtensionEnum"); + pEngine->executeScriptFile("DeprecatedExtensionFunc"); + + pEngine->executeScriptFile("DeprecatedNetworkClass"); + pEngine->executeScriptFile("DeprecatedNetworkEnum"); + pEngine->executeScriptFile("DeprecatedNetworkFunc"); + + pEngine->executeScriptFile("DeprecatedNetworkClass"); + pEngine->executeScriptFile("DeprecatedNetworkEnum"); + pEngine->executeScriptFile("DeprecatedNetworkFunc"); + + pEngine->executeScriptFile("DeprecatedOpenglEnum"); + + pEngine->executeScriptFile("DeprecatedUIEnum"); + pEngine->executeScriptFile("DeprecatedUIFunc"); pEngine->executeScriptFile("src/controller.lua"); diff --git a/tests/lua-tests/src/controller.lua b/tests/lua-tests/src/controller.lua index 1e89841d68..deee8c062b 100644 --- a/tests/lua-tests/src/controller.lua +++ b/tests/lua-tests/src/controller.lua @@ -2,7 +2,6 @@ -- avoid memory leak collectgarbage("setpause", 100) collectgarbage("setstepmul", 5000) - ---------------- -- run @@ -72,7 +71,6 @@ end addSearchPath("res/", screenSize.height) addSearchPath("", screenSize.height) - require "src/mainMenu" local scene = cc.Scene:create()