diff --git a/.gitignore b/.gitignore index 0fe28724f7..9d95296627 100644 --- a/.gitignore +++ b/.gitignore @@ -136,4 +136,5 @@ project.properties /external/version.json /templates/lua-template-runtime/runtime /v*-deps-*.zip -/v*-lua-runtime-*.zip \ No newline at end of file +/v*-lua-runtime-*.zip +/tools/fbx-conv/ diff --git a/AUTHORS b/AUTHORS index 0db85c3f16..511b0e4e02 100644 --- a/AUTHORS +++ b/AUTHORS @@ -25,7 +25,7 @@ Developers: longlene Improve android project creation script - simpliplant + reneklacan Hardware keyboard support liuyq @@ -530,6 +530,7 @@ Developers: Casting variables to their own type, and print warning info if no corresponding lua callback function instead of crash. fix of WebSocket url parse error for 'ws://domain.com/websocket' pattern. Fixed a bug that Websocket doesn't support send/receive data which larger than 4096 bytes. + Show detail class & function name in error message of lua-binding musikov Fixing a bug that missing precision when getting strokeColor and fontFillColor @@ -658,6 +659,7 @@ Developers: Fixed a bug that Node's anchor point was changed after being added to ScrollView. Added HttpClient::sendImmediate() Added operator == != for Value + Replace dynamic_cast to std::is_base_of in object_to_luaval superrad Clear NoSuchMethodError Exception when JniHelper fails to find methodID @@ -797,6 +799,8 @@ Developers: Adds support for get response when Activity's onActivityResult is triggered Improve Android projects Android jni error clear & more readable log + Add support of software PVRTC v1 decompression + Fixed a bug that ttf font have not effect on Mac OS X youknowone Adds iOS-like elastic bounceback support for cocos2d::extension::ScrollView @@ -829,6 +833,7 @@ Developers: HttpRequest uses std::function as callback EditBox: mac secure input Fix a bug that can not get/set text in password mode on Mac OS X + Make sure TableView parents are visible before handling touch iSevenDays Fixed a bug that the result of 'malloc' is incompatible with type 'unsigned char *' in Image::saveImageToPNG @@ -888,6 +893,7 @@ Developers: Added TextField::getStringLength() Add shadow, outline, glow filter support for UIText Fix UITextField IME can't auto detach + Add getChildByName method for get a node that can be cast to Type T QiuleiWang Fix the bug that calculated height of multi-line string was incorrect on iOS @@ -903,6 +909,7 @@ Developers: gin0606 Add a new line at the end of a file Fix a bug that crash happened when try to remove videoView(STATE_PLAYBACK_COMPLETED) in android + Fix video scale issue in iOS billtt Fixed a bug that Node::setScale(float) may not work properly @@ -912,6 +919,32 @@ Developers: chareice Make `setup.py` work on zsh + + taug + Could add seach path and resolution order path in front. + + CaiCQ + Fix a but that LabelTTF may lost chinese characters on linux + + chenguangqi + Fixed a compiling error on Android + Fixed an error when importing project using Eclipse on Android + + uorbe001 + Allow setting bundle to use in file utils on iOS and Mac OS X + + yongkangchen + Fixed a bug that font size of EditBox is not scaled when glview is scaled on Mac OS X + Fixed a bug that Label::setTextColor does not have any effect on Mac OS X + + wagulu + Fixed a bug that particle effect is wrong when scaled + + reckhou + Optimize FPS control on Android + + dzl-ian + Added getter and setter for TextColor for UIText Retired Core Developers: WenSheng Yang diff --git a/CHANGELOG b/CHANGELOG index 673ca472de..f85dd330c3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,18 +1,54 @@ -cocos2d-x-3.2 ?? +cocos2d-x-3.3 ?? + [NEW] Added UIScale9Sprite + [NEW] FileUtils: add isDirectoryExist(), createDirectory(), removeDirectory(), removeFile(), renameFile() + getFileSize() + [NEW] FileUtilsApple: allow setting bundle to use in file utils on iOS and Mac OS X + [NEW] Image: support of software PVRTC v1 decompression + [NEW] UIText: added getter and setter for TextColor + [NEW] TextField: support utf8 + + [FIX] EditBox: font size is not scaled when glview is scaled on Mac OS X + [FIX] Label: can not set charmap after it is created + [FIX] Label: setTextColor does not have any effect on Mac OS X + [FIX] ParticleSystem: effect is wrong if scene scaled + [FIX] ParticleSystemQuad: setTotalParticles() can't set a value larger than initialized value + [FIX] Scale9Sprite: new added sprite will be hidden + [FIX] UIListView: can not insert an item in specific position, it is added at bottom + [FIX] TabelView: can handle touch event though its parents are invisible + [FIX] TextField: can not use backspace to delete a character + [FIX] UIVideoPlayer: video frame size is not calculated correctly on iOS + [FIX] UIWidget: may crash if remove itself in touch call back function + + [FIX] Others: can not import java library shift by engine correctly when using Eclispe on Android + [FIX] Others: optimize FPS contorl algorithm on Android + + [FIX] Lua-binding: replace dynamic_cast to std::is_base_of in object_to_luaval + +cocos2d-x-3.2 Jul.17 2014 + [NEW] Node: added getChildByName method for get a node that can be cast to Type T + [NEW] FileUtils: could add seach path and resolution order path in front + [FIX] Animation3D: getOrCreate is deprecated and replaced with Animation3D::create [FIX] Animate3D: setSpeed() accept negtive value, which means play reverse, getPlayback and setPlayBack are deprecated [FIX] EditBox: can not set/get text in password mode on Mac OS X + [FIX] Game Controller: joystick y value inversed on iOS [FIX] GLView: cursor position is not correct if design resolution is different from device resolution - [FIX] Label: color can not be set correctly if using system font + [FIX] Label: color can not be set correctly if using system font on iOS + [FIX] LabelTTF: may lost chinese characters on linux [FIX] Lua-binding: support UIVideoPlayer [FIX] Node: setRotation3D not work based on anchor point [FIX] Node: modify regular of enumerateChildren, now it just searchs its children - [FIX] Setup.py: not work if using zsh + [FIX] Physics integration: body shape will be wrong when using negative value to scale + [FIX] ScrollViewDelegate: make the scrollView delegate methods optional + [FIX] Setup.py: will crash on windows because of checking `zsh` [FIX] SpriteBatchNode: opacity can not work [FIX] Sprite3D: may crash on Android if playing animation and replace Scene after come from background - [FIX] UIdget: opacity is wrong when replace texture + [FIX] UIwidget: opacity is wrong when replace texture + [FIX] UIRichText: will crash when using utf8 string and the length exceed specified length [FIX] UIText: can not wrap words automatically [FIX] UITextField: keyboard can not hide if touching space outside of keyboard + [FIX] UITextField: can not wrap words automatically + [FIX] UIVideoPlayer: can not exit full screen mode on Android [FIX] Others: don't release singleton objects correctly that are needed in the whole game, which will be treated as memory leak when using VLD. diff --git a/build/cocos2d-win32.vc2012.sln b/build/cocos2d-win32.vc2012.sln index dc713f721a..74d3130b20 100644 --- a/build/cocos2d-win32.vc2012.sln +++ b/build/cocos2d-win32.vc2012.sln @@ -1,88 +1,54 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Express 2012 for Windows Desktop -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libAudio", "..\cocos\audio\proj.win32\CocosDenshion.vcxproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos\2d\cocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libBox2D", "..\external\Box2D\proj.win32\Box2D.vcxproj", "{929480E7-23C0-4DF6-8456-096D71547116}" -EndProject +# Visual Studio 2012 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "..\external\chipmunk\proj.win32\chipmunk.vcxproj", "{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libExtensions", "..\extensions\proj.win32\libExtensions.vcxproj", "{21B2C324-891F-48EA-AD1A-5AE13DE12E28}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-tests", "..\tests\cpp-tests\proj.win32\cpp-tests.vcxproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosBuilder", "..\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj", "{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosStudio", "..\cocos\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj", "{B57CF53F-2E49-4031-9822-047CC0E6BDE2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libNetwork", "..\cocos\network\proj.win32\libNetwork.vcxproj", "{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libLocalStorage", "..\cocos\storage\local-storage\proj.win32\libLocalStorage.vcxproj", "{632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnetwork", "..\cocos\network\proj.win32\libNetwork.vcxproj", "{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "..\cocos\scripting\lua-bindings\proj.win32\liblua.vcxproj", "{DDC3E27F-004D-4DD4-9DD3-931A013D2159}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-tests", "..\tests\lua-tests\project\proj.win32\lua-tests.win32.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGUI", "..\cocos\ui\proj.win32\libGUI.vcxproj", "{7E06E92C-537A-442B-9E4A-4761C84F8A1A}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-empty-test", "..\tests\cpp-empty-test\proj.win32\cpp-empty-test.vcxproj", "{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-empty-test", "..\tests\lua-empty-test\project\proj.win32\lua-empty-test.vcxproj", "{13E55395-94A2-4CD9-BFC2-1A051F80C17D}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbox2d", "..\external\Box2D\proj.win32\libbox2d.vcxproj", "{929480E7-23C0-4DF6-8456-096D71547116}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos\2d\libcocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocosdenshion", "..\cocos\audio\proj.win32\libcocosdenshion.vcxproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libui", "..\cocos\ui\proj.win32\libui.vcxproj", "{7E06E92C-537A-442B-9E4A-4761C84F8A1A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libextension", "..\extensions\proj.win32\libextension.vcxproj", "{21B2C324-891F-48EA-AD1A-5AE13DE12E28}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspine", "..\cocos\editor-support\spine\proj.win32\libspine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocosbuilder", "..\cocos\editor-support\cocosbuilder\proj.win32\libcocosbuilder.vcxproj", "{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocostudio", "..\cocos\editor-support\cocostudio\proj.win32\libcocostudio.vcxproj", "{B57CF53F-2E49-4031-9822-047CC0E6BDE2}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.ActiveCfg = Debug|Win32 - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.Build.0 = Debug|Win32 - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.ActiveCfg = Release|Win32 - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.Build.0 = Release|Win32 - {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.ActiveCfg = Debug|Win32 - {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32 - {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32 - {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.Build.0 = Release|Win32 - {929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.ActiveCfg = Debug|Win32 - {929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.Build.0 = Debug|Win32 - {929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.ActiveCfg = Release|Win32 - {929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.Build.0 = Release|Win32 {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.ActiveCfg = Debug|Win32 {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.Build.0 = Debug|Win32 {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.ActiveCfg = Release|Win32 {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.Build.0 = Release|Win32 - {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Debug|Win32.ActiveCfg = Debug|Win32 - {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Debug|Win32.Build.0 = Debug|Win32 - {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Release|Win32.ActiveCfg = Release|Win32 - {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Release|Win32.Build.0 = Release|Win32 {76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Debug|Win32.ActiveCfg = Debug|Win32 {76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Debug|Win32.Build.0 = Debug|Win32 {76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Release|Win32.ActiveCfg = Release|Win32 {76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Release|Win32.Build.0 = Release|Win32 - {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Debug|Win32.ActiveCfg = Debug|Win32 - {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Debug|Win32.Build.0 = Debug|Win32 - {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Release|Win32.ActiveCfg = Release|Win32 - {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Release|Win32.Build.0 = Release|Win32 - {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Debug|Win32.ActiveCfg = Debug|Win32 - {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Debug|Win32.Build.0 = Debug|Win32 - {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Release|Win32.ActiveCfg = Release|Win32 - {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Release|Win32.Build.0 = Release|Win32 {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Debug|Win32.ActiveCfg = Debug|Win32 {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Debug|Win32.Build.0 = Debug|Win32 {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Release|Win32.ActiveCfg = Release|Win32 {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Release|Win32.Build.0 = Release|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.ActiveCfg = Debug|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.Build.0 = Debug|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.ActiveCfg = Release|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.Build.0 = Release|Win32 - {632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}.Debug|Win32.ActiveCfg = Debug|Win32 - {632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}.Debug|Win32.Build.0 = Debug|Win32 - {632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}.Release|Win32.ActiveCfg = Release|Win32 - {632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}.Release|Win32.Build.0 = Release|Win32 {DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Debug|Win32.ActiveCfg = Debug|Win32 {DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Debug|Win32.Build.0 = Debug|Win32 {DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Release|Win32.ActiveCfg = Release|Win32 @@ -91,10 +57,6 @@ Global {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Debug|Win32.Build.0 = Debug|Win32 {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.ActiveCfg = Release|Win32 {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.Build.0 = Release|Win32 - {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.ActiveCfg = Debug|Win32 - {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.Build.0 = Debug|Win32 - {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.ActiveCfg = Release|Win32 - {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.Build.0 = Release|Win32 {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Debug|Win32.ActiveCfg = Debug|Win32 {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Debug|Win32.Build.0 = Debug|Win32 {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Release|Win32.ActiveCfg = Release|Win32 @@ -103,6 +65,38 @@ Global {13E55395-94A2-4CD9-BFC2-1A051F80C17D}.Debug|Win32.Build.0 = Debug|Win32 {13E55395-94A2-4CD9-BFC2-1A051F80C17D}.Release|Win32.ActiveCfg = Release|Win32 {13E55395-94A2-4CD9-BFC2-1A051F80C17D}.Release|Win32.Build.0 = Release|Win32 + {929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.ActiveCfg = Debug|Win32 + {929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.Build.0 = Debug|Win32 + {929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.ActiveCfg = Release|Win32 + {929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.Build.0 = Release|Win32 + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.ActiveCfg = Debug|Win32 + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32 + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32 + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.Build.0 = Release|Win32 + {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.ActiveCfg = Debug|Win32 + {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.Build.0 = Debug|Win32 + {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.ActiveCfg = Release|Win32 + {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.Build.0 = Release|Win32 + {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.ActiveCfg = Debug|Win32 + {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.Build.0 = Debug|Win32 + {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.ActiveCfg = Release|Win32 + {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.Build.0 = Release|Win32 + {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Debug|Win32.ActiveCfg = Debug|Win32 + {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Debug|Win32.Build.0 = Debug|Win32 + {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Release|Win32.ActiveCfg = Release|Win32 + {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Release|Win32.Build.0 = Release|Win32 + {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.ActiveCfg = Debug|Win32 + {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.Build.0 = Debug|Win32 + {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.ActiveCfg = Release|Win32 + {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.Build.0 = Release|Win32 + {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Debug|Win32.ActiveCfg = Debug|Win32 + {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Debug|Win32.Build.0 = Debug|Win32 + {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Release|Win32.ActiveCfg = Release|Win32 + {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Release|Win32.Build.0 = Release|Win32 + {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Debug|Win32.ActiveCfg = Debug|Win32 + {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Debug|Win32.Build.0 = Debug|Win32 + {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Release|Win32.ActiveCfg = Release|Win32 + {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj b/build/cocos2d_libs.xcodeproj/project.pbxproj index 08b4c96517..8bd41a21d2 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj @@ -13,6 +13,11 @@ buildPhases = ( ); dependencies = ( + B2F0AFEC198794EE002FE562 /* PBXTargetDependency */, + B2F0AFEE198794EE002FE562 /* PBXTargetDependency */, + B2F0AFF0198794EE002FE562 /* PBXTargetDependency */, + B2F0AFF2198794EE002FE562 /* PBXTargetDependency */, + B2F0AFF4198794EE002FE562 /* PBXTargetDependency */, A03F31FF178147CB006731B9 /* PBXTargetDependency */, A03F2FC01781458C006731B9 /* PBXTargetDependency */, A03F2E93178141D1006731B9 /* PBXTargetDependency */, @@ -28,6 +33,11 @@ buildPhases = ( ); dependencies = ( + B2F0AFF619879508002FE562 /* PBXTargetDependency */, + B2F0AFF819879508002FE562 /* PBXTargetDependency */, + B2F0AFFA19879508002FE562 /* PBXTargetDependency */, + B2F0AFFC19879508002FE562 /* PBXTargetDependency */, + B2F0AFFE19879508002FE562 /* PBXTargetDependency */, A07A4E10178386520073F6A7 /* PBXTargetDependency */, A07A5047178389710073F6A7 /* PBXTargetDependency */, A07A5049178389710073F6A7 /* PBXTargetDependency */, @@ -40,40 +50,10 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 0634A4D0194B19E400E608AF /* CCActionTimeline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4C5194B19E400E608AF /* CCActionTimeline.cpp */; }; - 0634A4D1194B19E400E608AF /* CCActionTimeline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4C5194B19E400E608AF /* CCActionTimeline.cpp */; }; - 0634A4D2194B19E400E608AF /* CCActionTimeline.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4C6194B19E400E608AF /* CCActionTimeline.h */; }; - 0634A4D3194B19E400E608AF /* CCActionTimeline.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4C6194B19E400E608AF /* CCActionTimeline.h */; }; - 0634A4D4194B19E400E608AF /* CCActionTimelineCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4C7194B19E400E608AF /* CCActionTimelineCache.cpp */; }; - 0634A4D5194B19E400E608AF /* CCActionTimelineCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4C7194B19E400E608AF /* CCActionTimelineCache.cpp */; }; - 0634A4D6194B19E400E608AF /* CCActionTimelineCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4C8194B19E400E608AF /* CCActionTimelineCache.h */; }; - 0634A4D7194B19E400E608AF /* CCActionTimelineCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4C8194B19E400E608AF /* CCActionTimelineCache.h */; }; - 0634A4D8194B19E400E608AF /* CCFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4C9194B19E400E608AF /* CCFrame.cpp */; }; - 0634A4D9194B19E400E608AF /* CCFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4C9194B19E400E608AF /* CCFrame.cpp */; }; - 0634A4DA194B19E400E608AF /* CCFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4CA194B19E400E608AF /* CCFrame.h */; }; - 0634A4DB194B19E400E608AF /* CCFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4CA194B19E400E608AF /* CCFrame.h */; }; - 0634A4DC194B19E400E608AF /* CCNodeReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4CB194B19E400E608AF /* CCNodeReader.cpp */; }; - 0634A4DD194B19E400E608AF /* CCNodeReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4CB194B19E400E608AF /* CCNodeReader.cpp */; }; - 0634A4DE194B19E400E608AF /* CCNodeReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4CC194B19E400E608AF /* CCNodeReader.h */; }; - 0634A4DF194B19E400E608AF /* CCNodeReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4CC194B19E400E608AF /* CCNodeReader.h */; }; - 0634A4E0194B19E400E608AF /* CCTimeLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4CD194B19E400E608AF /* CCTimeLine.cpp */; }; - 0634A4E1194B19E400E608AF /* CCTimeLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4CD194B19E400E608AF /* CCTimeLine.cpp */; }; - 0634A4E2194B19E400E608AF /* CCTimeLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4CE194B19E400E608AF /* CCTimeLine.h */; }; - 0634A4E3194B19E400E608AF /* CCTimeLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4CE194B19E400E608AF /* CCTimeLine.h */; }; - 0634A4E4194B19E400E608AF /* CCTimelineMacro.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4CF194B19E400E608AF /* CCTimelineMacro.h */; }; - 0634A4E5194B19E400E608AF /* CCTimelineMacro.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4CF194B19E400E608AF /* CCTimelineMacro.h */; }; - 06CAAAC5186AD7E50012A414 /* TriggerObj.h in Headers */ = {isa = PBXBuildFile; fileRef = 06CAAAC1186AD63B0012A414 /* TriggerObj.h */; }; - 06CAAAC6186AD7E60012A414 /* TriggerObj.h in Headers */ = {isa = PBXBuildFile; fileRef = 06CAAAC1186AD63B0012A414 /* TriggerObj.h */; }; - 06CAAAC7186AD7E90012A414 /* TriggerObj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06CAAAC0186AD63B0012A414 /* TriggerObj.cpp */; }; - 06CAAAC8186AD7EB0012A414 /* TriggerObj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06CAAAC0186AD63B0012A414 /* TriggerObj.cpp */; }; - 06CAAAC9186AD7EE0012A414 /* TriggerMng.h in Headers */ = {isa = PBXBuildFile; fileRef = 06CAAABF186AD63B0012A414 /* TriggerMng.h */; }; - 06CAAACA186AD7EF0012A414 /* TriggerMng.h in Headers */ = {isa = PBXBuildFile; fileRef = 06CAAABF186AD63B0012A414 /* TriggerMng.h */; }; - 06CAAACB186AD7F20012A414 /* TriggerMng.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06CAAABE186AD63B0012A414 /* TriggerMng.cpp */; }; - 06CAAACC186AD7F50012A414 /* TriggerMng.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06CAAABE186AD63B0012A414 /* TriggerMng.cpp */; }; - 06CAAACD186AD7F90012A414 /* TriggerBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 06CAAABD186AD63B0012A414 /* TriggerBase.h */; }; - 06CAAACE186AD7FA0012A414 /* TriggerBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 06CAAABD186AD63B0012A414 /* TriggerBase.h */; }; - 06CAAACF186AD7FC0012A414 /* TriggerBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06CAAABC186AD63B0012A414 /* TriggerBase.cpp */; }; - 06CAAAD0186AD7FE0012A414 /* TriggerBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06CAAABC186AD63B0012A414 /* TriggerBase.cpp */; }; + 15EFA211198A2BB5000C57D3 /* CCProtectedNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15EFA20F198A2BB5000C57D3 /* CCProtectedNode.cpp */; }; + 15EFA212198A2BB5000C57D3 /* CCProtectedNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15EFA20F198A2BB5000C57D3 /* CCProtectedNode.cpp */; }; + 15EFA213198A2BB5000C57D3 /* CCProtectedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 15EFA210198A2BB5000C57D3 /* CCProtectedNode.h */; }; + 15EFA214198A2BB5000C57D3 /* CCProtectedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 15EFA210198A2BB5000C57D3 /* CCProtectedNode.h */; }; 1A01C68418F57BE800EFE3A6 /* CCArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A01C67618F57BE800EFE3A6 /* CCArray.cpp */; }; 1A01C68518F57BE800EFE3A6 /* CCArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A01C67618F57BE800EFE3A6 /* CCArray.cpp */; }; 1A01C68618F57BE800EFE3A6 /* CCArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A01C67718F57BE800EFE3A6 /* CCArray.h */; }; @@ -376,133 +356,6 @@ 1A5703BB180BD2800088DEC7 /* libwebp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A5703BA180BD2800088DEC7 /* libwebp.a */; }; 1A57052B180BD31F0088DEC7 /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A57052A180BD31F0088DEC7 /* libfreetype.a */; }; 1A57052E180BD3280088DEC7 /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A57052D180BD3280088DEC7 /* libfreetype.a */; }; - 1A8C598B180E930E00EF57C3 /* CCActionFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5948180E930E00EF57C3 /* CCActionFrame.cpp */; }; - 1A8C598C180E930E00EF57C3 /* CCActionFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5948180E930E00EF57C3 /* CCActionFrame.cpp */; }; - 1A8C598D180E930E00EF57C3 /* CCActionFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5949180E930E00EF57C3 /* CCActionFrame.h */; }; - 1A8C598E180E930E00EF57C3 /* CCActionFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5949180E930E00EF57C3 /* CCActionFrame.h */; }; - 1A8C598F180E930E00EF57C3 /* CCActionFrameEasing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C594A180E930E00EF57C3 /* CCActionFrameEasing.cpp */; }; - 1A8C5990180E930E00EF57C3 /* CCActionFrameEasing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C594A180E930E00EF57C3 /* CCActionFrameEasing.cpp */; }; - 1A8C5991180E930E00EF57C3 /* CCActionFrameEasing.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C594B180E930E00EF57C3 /* CCActionFrameEasing.h */; }; - 1A8C5992180E930E00EF57C3 /* CCActionFrameEasing.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C594B180E930E00EF57C3 /* CCActionFrameEasing.h */; }; - 1A8C5993180E930E00EF57C3 /* CCActionManagerEx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C594C180E930E00EF57C3 /* CCActionManagerEx.cpp */; }; - 1A8C5994180E930E00EF57C3 /* CCActionManagerEx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C594C180E930E00EF57C3 /* CCActionManagerEx.cpp */; }; - 1A8C5995180E930E00EF57C3 /* CCActionManagerEx.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C594D180E930E00EF57C3 /* CCActionManagerEx.h */; }; - 1A8C5996180E930E00EF57C3 /* CCActionManagerEx.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C594D180E930E00EF57C3 /* CCActionManagerEx.h */; }; - 1A8C5997180E930E00EF57C3 /* CCActionNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C594E180E930E00EF57C3 /* CCActionNode.cpp */; }; - 1A8C5998180E930E00EF57C3 /* CCActionNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C594E180E930E00EF57C3 /* CCActionNode.cpp */; }; - 1A8C5999180E930E00EF57C3 /* CCActionNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C594F180E930E00EF57C3 /* CCActionNode.h */; }; - 1A8C599A180E930E00EF57C3 /* CCActionNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C594F180E930E00EF57C3 /* CCActionNode.h */; }; - 1A8C599B180E930E00EF57C3 /* CCActionObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5950180E930E00EF57C3 /* CCActionObject.cpp */; }; - 1A8C599C180E930E00EF57C3 /* CCActionObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5950180E930E00EF57C3 /* CCActionObject.cpp */; }; - 1A8C599D180E930E00EF57C3 /* CCActionObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5951180E930E00EF57C3 /* CCActionObject.h */; }; - 1A8C599E180E930E00EF57C3 /* CCActionObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5951180E930E00EF57C3 /* CCActionObject.h */; }; - 1A8C599F180E930E00EF57C3 /* CCArmature.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5952180E930E00EF57C3 /* CCArmature.cpp */; }; - 1A8C59A0180E930E00EF57C3 /* CCArmature.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5952180E930E00EF57C3 /* CCArmature.cpp */; }; - 1A8C59A1180E930E00EF57C3 /* CCArmature.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5953180E930E00EF57C3 /* CCArmature.h */; }; - 1A8C59A2180E930E00EF57C3 /* CCArmature.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5953180E930E00EF57C3 /* CCArmature.h */; }; - 1A8C59A3180E930E00EF57C3 /* CCArmatureAnimation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5954180E930E00EF57C3 /* CCArmatureAnimation.cpp */; }; - 1A8C59A4180E930E00EF57C3 /* CCArmatureAnimation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5954180E930E00EF57C3 /* CCArmatureAnimation.cpp */; }; - 1A8C59A5180E930E00EF57C3 /* CCArmatureAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5955180E930E00EF57C3 /* CCArmatureAnimation.h */; }; - 1A8C59A6180E930E00EF57C3 /* CCArmatureAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5955180E930E00EF57C3 /* CCArmatureAnimation.h */; }; - 1A8C59A7180E930E00EF57C3 /* CCArmatureDataManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5956180E930E00EF57C3 /* CCArmatureDataManager.cpp */; }; - 1A8C59A8180E930E00EF57C3 /* CCArmatureDataManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5956180E930E00EF57C3 /* CCArmatureDataManager.cpp */; }; - 1A8C59A9180E930E00EF57C3 /* CCArmatureDataManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5957180E930E00EF57C3 /* CCArmatureDataManager.h */; }; - 1A8C59AA180E930E00EF57C3 /* CCArmatureDataManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5957180E930E00EF57C3 /* CCArmatureDataManager.h */; }; - 1A8C59AB180E930E00EF57C3 /* CCArmatureDefine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5958180E930E00EF57C3 /* CCArmatureDefine.cpp */; }; - 1A8C59AC180E930E00EF57C3 /* CCArmatureDefine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5958180E930E00EF57C3 /* CCArmatureDefine.cpp */; }; - 1A8C59AD180E930E00EF57C3 /* CCArmatureDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5959180E930E00EF57C3 /* CCArmatureDefine.h */; }; - 1A8C59AE180E930E00EF57C3 /* CCArmatureDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5959180E930E00EF57C3 /* CCArmatureDefine.h */; }; - 1A8C59AF180E930E00EF57C3 /* CCBatchNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C595A180E930E00EF57C3 /* CCBatchNode.cpp */; }; - 1A8C59B0180E930E00EF57C3 /* CCBatchNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C595A180E930E00EF57C3 /* CCBatchNode.cpp */; }; - 1A8C59B1180E930E00EF57C3 /* CCBatchNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C595B180E930E00EF57C3 /* CCBatchNode.h */; }; - 1A8C59B2180E930E00EF57C3 /* CCBatchNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C595B180E930E00EF57C3 /* CCBatchNode.h */; }; - 1A8C59B3180E930E00EF57C3 /* CCBone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C595C180E930E00EF57C3 /* CCBone.cpp */; }; - 1A8C59B4180E930E00EF57C3 /* CCBone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C595C180E930E00EF57C3 /* CCBone.cpp */; }; - 1A8C59B5180E930E00EF57C3 /* CCBone.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C595D180E930E00EF57C3 /* CCBone.h */; }; - 1A8C59B6180E930E00EF57C3 /* CCBone.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C595D180E930E00EF57C3 /* CCBone.h */; }; - 1A8C59B7180E930E00EF57C3 /* CCColliderDetector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C595E180E930E00EF57C3 /* CCColliderDetector.cpp */; }; - 1A8C59B8180E930E00EF57C3 /* CCColliderDetector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C595E180E930E00EF57C3 /* CCColliderDetector.cpp */; }; - 1A8C59B9180E930E00EF57C3 /* CCColliderDetector.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C595F180E930E00EF57C3 /* CCColliderDetector.h */; }; - 1A8C59BA180E930E00EF57C3 /* CCColliderDetector.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C595F180E930E00EF57C3 /* CCColliderDetector.h */; }; - 1A8C59BB180E930E00EF57C3 /* CCComAttribute.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5960180E930E00EF57C3 /* CCComAttribute.cpp */; }; - 1A8C59BC180E930E00EF57C3 /* CCComAttribute.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5960180E930E00EF57C3 /* CCComAttribute.cpp */; }; - 1A8C59BD180E930E00EF57C3 /* CCComAttribute.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5961180E930E00EF57C3 /* CCComAttribute.h */; }; - 1A8C59BE180E930E00EF57C3 /* CCComAttribute.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5961180E930E00EF57C3 /* CCComAttribute.h */; }; - 1A8C59BF180E930E00EF57C3 /* CCComAudio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5962180E930E00EF57C3 /* CCComAudio.cpp */; }; - 1A8C59C0180E930E00EF57C3 /* CCComAudio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5962180E930E00EF57C3 /* CCComAudio.cpp */; }; - 1A8C59C1180E930E00EF57C3 /* CCComAudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5963180E930E00EF57C3 /* CCComAudio.h */; }; - 1A8C59C2180E930E00EF57C3 /* CCComAudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5963180E930E00EF57C3 /* CCComAudio.h */; }; - 1A8C59C3180E930E00EF57C3 /* CCComController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5964180E930E00EF57C3 /* CCComController.cpp */; }; - 1A8C59C4180E930E00EF57C3 /* CCComController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5964180E930E00EF57C3 /* CCComController.cpp */; }; - 1A8C59C5180E930E00EF57C3 /* CCComController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5965180E930E00EF57C3 /* CCComController.h */; }; - 1A8C59C6180E930E00EF57C3 /* CCComController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5965180E930E00EF57C3 /* CCComController.h */; }; - 1A8C59C7180E930E00EF57C3 /* CCComRender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5966180E930E00EF57C3 /* CCComRender.cpp */; }; - 1A8C59C8180E930E00EF57C3 /* CCComRender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5966180E930E00EF57C3 /* CCComRender.cpp */; }; - 1A8C59C9180E930E00EF57C3 /* CCComRender.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5967180E930E00EF57C3 /* CCComRender.h */; }; - 1A8C59CA180E930E00EF57C3 /* CCComRender.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5967180E930E00EF57C3 /* CCComRender.h */; }; - 1A8C59CB180E930E00EF57C3 /* CCDataReaderHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5968180E930E00EF57C3 /* CCDataReaderHelper.cpp */; }; - 1A8C59CC180E930E00EF57C3 /* CCDataReaderHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5968180E930E00EF57C3 /* CCDataReaderHelper.cpp */; }; - 1A8C59CD180E930E00EF57C3 /* CCDataReaderHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5969180E930E00EF57C3 /* CCDataReaderHelper.h */; }; - 1A8C59CE180E930E00EF57C3 /* CCDataReaderHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5969180E930E00EF57C3 /* CCDataReaderHelper.h */; }; - 1A8C59CF180E930E00EF57C3 /* CCDatas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C596A180E930E00EF57C3 /* CCDatas.cpp */; }; - 1A8C59D0180E930E00EF57C3 /* CCDatas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C596A180E930E00EF57C3 /* CCDatas.cpp */; }; - 1A8C59D1180E930E00EF57C3 /* CCDatas.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C596B180E930E00EF57C3 /* CCDatas.h */; }; - 1A8C59D2180E930E00EF57C3 /* CCDatas.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C596B180E930E00EF57C3 /* CCDatas.h */; }; - 1A8C59D3180E930E00EF57C3 /* CCDecorativeDisplay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C596C180E930E00EF57C3 /* CCDecorativeDisplay.cpp */; }; - 1A8C59D4180E930E00EF57C3 /* CCDecorativeDisplay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C596C180E930E00EF57C3 /* CCDecorativeDisplay.cpp */; }; - 1A8C59D5180E930E00EF57C3 /* CCDecorativeDisplay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C596D180E930E00EF57C3 /* CCDecorativeDisplay.h */; }; - 1A8C59D6180E930E00EF57C3 /* CCDecorativeDisplay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C596D180E930E00EF57C3 /* CCDecorativeDisplay.h */; }; - 1A8C59D7180E930E00EF57C3 /* CCDisplayFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C596E180E930E00EF57C3 /* CCDisplayFactory.cpp */; }; - 1A8C59D8180E930E00EF57C3 /* CCDisplayFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C596E180E930E00EF57C3 /* CCDisplayFactory.cpp */; }; - 1A8C59D9180E930E00EF57C3 /* CCDisplayFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C596F180E930E00EF57C3 /* CCDisplayFactory.h */; }; - 1A8C59DA180E930E00EF57C3 /* CCDisplayFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C596F180E930E00EF57C3 /* CCDisplayFactory.h */; }; - 1A8C59DB180E930E00EF57C3 /* CCDisplayManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5970180E930E00EF57C3 /* CCDisplayManager.cpp */; }; - 1A8C59DC180E930E00EF57C3 /* CCDisplayManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5970180E930E00EF57C3 /* CCDisplayManager.cpp */; }; - 1A8C59DD180E930E00EF57C3 /* CCDisplayManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5971180E930E00EF57C3 /* CCDisplayManager.h */; }; - 1A8C59DE180E930E00EF57C3 /* CCDisplayManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5971180E930E00EF57C3 /* CCDisplayManager.h */; }; - 1A8C59DF180E930E00EF57C3 /* CCInputDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5972180E930E00EF57C3 /* CCInputDelegate.cpp */; }; - 1A8C59E0180E930E00EF57C3 /* CCInputDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5972180E930E00EF57C3 /* CCInputDelegate.cpp */; }; - 1A8C59E1180E930E00EF57C3 /* CCInputDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5973180E930E00EF57C3 /* CCInputDelegate.h */; }; - 1A8C59E2180E930E00EF57C3 /* CCInputDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5973180E930E00EF57C3 /* CCInputDelegate.h */; }; - 1A8C59E3180E930E00EF57C3 /* CCProcessBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5974180E930E00EF57C3 /* CCProcessBase.cpp */; }; - 1A8C59E4180E930E00EF57C3 /* CCProcessBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5974180E930E00EF57C3 /* CCProcessBase.cpp */; }; - 1A8C59E5180E930E00EF57C3 /* CCProcessBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5975180E930E00EF57C3 /* CCProcessBase.h */; }; - 1A8C59E6180E930E00EF57C3 /* CCProcessBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5975180E930E00EF57C3 /* CCProcessBase.h */; }; - 1A8C59E7180E930E00EF57C3 /* CCSGUIReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5976180E930E00EF57C3 /* CCSGUIReader.cpp */; }; - 1A8C59E8180E930E00EF57C3 /* CCSGUIReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5976180E930E00EF57C3 /* CCSGUIReader.cpp */; }; - 1A8C59E9180E930E00EF57C3 /* CCSGUIReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5977180E930E00EF57C3 /* CCSGUIReader.h */; }; - 1A8C59EA180E930E00EF57C3 /* CCSGUIReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5977180E930E00EF57C3 /* CCSGUIReader.h */; }; - 1A8C59EB180E930E00EF57C3 /* CCSkin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5978180E930E00EF57C3 /* CCSkin.cpp */; }; - 1A8C59EC180E930E00EF57C3 /* CCSkin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5978180E930E00EF57C3 /* CCSkin.cpp */; }; - 1A8C59ED180E930E00EF57C3 /* CCSkin.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5979180E930E00EF57C3 /* CCSkin.h */; }; - 1A8C59EE180E930E00EF57C3 /* CCSkin.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5979180E930E00EF57C3 /* CCSkin.h */; }; - 1A8C59EF180E930E00EF57C3 /* CCSpriteFrameCacheHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C597A180E930E00EF57C3 /* CCSpriteFrameCacheHelper.cpp */; }; - 1A8C59F0180E930E00EF57C3 /* CCSpriteFrameCacheHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C597A180E930E00EF57C3 /* CCSpriteFrameCacheHelper.cpp */; }; - 1A8C59F1180E930E00EF57C3 /* CCSpriteFrameCacheHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C597B180E930E00EF57C3 /* CCSpriteFrameCacheHelper.h */; }; - 1A8C59F2180E930E00EF57C3 /* CCSpriteFrameCacheHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C597B180E930E00EF57C3 /* CCSpriteFrameCacheHelper.h */; }; - 1A8C59F3180E930E00EF57C3 /* CCSSceneReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C597C180E930E00EF57C3 /* CCSSceneReader.cpp */; }; - 1A8C59F4180E930E00EF57C3 /* CCSSceneReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C597C180E930E00EF57C3 /* CCSSceneReader.cpp */; }; - 1A8C59F5180E930E00EF57C3 /* CCSSceneReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C597D180E930E00EF57C3 /* CCSSceneReader.h */; }; - 1A8C59F6180E930E00EF57C3 /* CCSSceneReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C597D180E930E00EF57C3 /* CCSSceneReader.h */; }; - 1A8C59F7180E930E00EF57C3 /* CCTransformHelp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C597E180E930E00EF57C3 /* CCTransformHelp.cpp */; }; - 1A8C59F8180E930E00EF57C3 /* CCTransformHelp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C597E180E930E00EF57C3 /* CCTransformHelp.cpp */; }; - 1A8C59F9180E930E00EF57C3 /* CCTransformHelp.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C597F180E930E00EF57C3 /* CCTransformHelp.h */; }; - 1A8C59FA180E930E00EF57C3 /* CCTransformHelp.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C597F180E930E00EF57C3 /* CCTransformHelp.h */; }; - 1A8C59FB180E930E00EF57C3 /* CCTween.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5980180E930E00EF57C3 /* CCTween.cpp */; }; - 1A8C59FC180E930E00EF57C3 /* CCTween.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5980180E930E00EF57C3 /* CCTween.cpp */; }; - 1A8C59FD180E930E00EF57C3 /* CCTween.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5981180E930E00EF57C3 /* CCTween.h */; }; - 1A8C59FE180E930E00EF57C3 /* CCTween.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5981180E930E00EF57C3 /* CCTween.h */; }; - 1A8C5A03180E930E00EF57C3 /* CCUtilMath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5984180E930E00EF57C3 /* CCUtilMath.cpp */; }; - 1A8C5A04180E930E00EF57C3 /* CCUtilMath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5984180E930E00EF57C3 /* CCUtilMath.cpp */; }; - 1A8C5A05180E930E00EF57C3 /* CCUtilMath.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5985180E930E00EF57C3 /* CCUtilMath.h */; }; - 1A8C5A06180E930E00EF57C3 /* CCUtilMath.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5985180E930E00EF57C3 /* CCUtilMath.h */; }; - 1A8C5A07180E930E00EF57C3 /* CocoStudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5986180E930E00EF57C3 /* CocoStudio.h */; }; - 1A8C5A08180E930E00EF57C3 /* CocoStudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5986180E930E00EF57C3 /* CocoStudio.h */; }; - 1A8C5A0D180E930E00EF57C3 /* DictionaryHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5989180E930E00EF57C3 /* DictionaryHelper.cpp */; }; - 1A8C5A0E180E930E00EF57C3 /* DictionaryHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5989180E930E00EF57C3 /* DictionaryHelper.cpp */; }; - 1A8C5A0F180E930E00EF57C3 /* DictionaryHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C598A180E930E00EF57C3 /* DictionaryHelper.h */; }; - 1A8C5A10180E930E00EF57C3 /* DictionaryHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C598A180E930E00EF57C3 /* DictionaryHelper.h */; }; - 1A94D35116C2072800D79D09 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1551A342158F2AB200E66CFE /* Foundation.framework */; }; 1A9DCA27180E6955007A3AD4 /* CCGLBufferedNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A9DCA02180E6955007A3AD4 /* CCGLBufferedNode.cpp */; }; 1A9DCA28180E6955007A3AD4 /* CCGLBufferedNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A9DCA02180E6955007A3AD4 /* CCGLBufferedNode.cpp */; }; 1A9DCA29180E6955007A3AD4 /* CCGLBufferedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9DCA03180E6955007A3AD4 /* CCGLBufferedNode.h */; }; @@ -693,24 +546,6 @@ 1AAF5354180E3060000584C8 /* AssetsManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5351180E3060000584C8 /* AssetsManager.cpp */; }; 1AAF5355180E3060000584C8 /* AssetsManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5352180E3060000584C8 /* AssetsManager.h */; }; 1AAF5356180E3060000584C8 /* AssetsManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5352180E3060000584C8 /* AssetsManager.h */; }; - 1AAF536A180E3374000584C8 /* HttpClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5362180E3374000584C8 /* HttpClient.cpp */; }; - 1AAF536B180E3374000584C8 /* HttpClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5362180E3374000584C8 /* HttpClient.cpp */; }; - 1AAF536C180E3374000584C8 /* HttpClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5363180E3374000584C8 /* HttpClient.h */; }; - 1AAF536D180E3374000584C8 /* HttpClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5363180E3374000584C8 /* HttpClient.h */; }; - 1AAF536E180E3374000584C8 /* HttpRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5364180E3374000584C8 /* HttpRequest.h */; }; - 1AAF536F180E3374000584C8 /* HttpRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5364180E3374000584C8 /* HttpRequest.h */; }; - 1AAF5370180E3374000584C8 /* HttpResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5365180E3374000584C8 /* HttpResponse.h */; }; - 1AAF5371180E3374000584C8 /* HttpResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5365180E3374000584C8 /* HttpResponse.h */; }; - 1AAF5372180E3374000584C8 /* SocketIO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5366180E3374000584C8 /* SocketIO.cpp */; }; - 1AAF5373180E3374000584C8 /* SocketIO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5366180E3374000584C8 /* SocketIO.cpp */; }; - 1AAF5374180E3374000584C8 /* SocketIO.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5367180E3374000584C8 /* SocketIO.h */; }; - 1AAF5375180E3374000584C8 /* SocketIO.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5367180E3374000584C8 /* SocketIO.h */; }; - 1AAF5376180E3374000584C8 /* WebSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5368180E3374000584C8 /* WebSocket.cpp */; }; - 1AAF5377180E3374000584C8 /* WebSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5368180E3374000584C8 /* WebSocket.cpp */; }; - 1AAF5378180E3374000584C8 /* WebSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5369180E3374000584C8 /* WebSocket.h */; }; - 1AAF5379180E3374000584C8 /* WebSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5369180E3374000584C8 /* WebSocket.h */; }; - 1AAF5385180E35A3000584C8 /* libwebsockets.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AAF5384180E35A3000584C8 /* libwebsockets.a */; }; - 1AAF5388180E35AC000584C8 /* libwebsockets.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AAF5387180E35AC000584C8 /* libwebsockets.a */; }; 1AAF541D180E3B6A000584C8 /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AAF541C180E3B6A000584C8 /* libcurl.a */; }; 1AAF584F180E40B9000584C8 /* LocalStorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF584C180E40B9000584C8 /* LocalStorage.cpp */; }; 1AAF5850180E40B9000584C8 /* LocalStorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF584C180E40B9000584C8 /* LocalStorage.cpp */; }; @@ -724,190 +559,6 @@ 1ABA68B11888D700007D1BB4 /* CCFontCharMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABA68AD1888D700007D1BB4 /* CCFontCharMap.h */; }; 1AC0269C1914068200FA920D /* ConvertUTF.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC026991914068200FA920D /* ConvertUTF.h */; }; 1AC0269D1914068200FA920D /* ConvertUTF.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC026991914068200FA920D /* ConvertUTF.h */; }; - 1AD71DA9180E26E600808F54 /* CCBAnimationManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71CFA180E26E600808F54 /* CCBAnimationManager.cpp */; }; - 1AD71DAA180E26E600808F54 /* CCBAnimationManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71CFA180E26E600808F54 /* CCBAnimationManager.cpp */; }; - 1AD71DAB180E26E600808F54 /* CCBAnimationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71CFB180E26E600808F54 /* CCBAnimationManager.h */; }; - 1AD71DAC180E26E600808F54 /* CCBAnimationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71CFB180E26E600808F54 /* CCBAnimationManager.h */; }; - 1AD71DAD180E26E600808F54 /* CCBFileLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71CFC180E26E600808F54 /* CCBFileLoader.cpp */; }; - 1AD71DAE180E26E600808F54 /* CCBFileLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71CFC180E26E600808F54 /* CCBFileLoader.cpp */; }; - 1AD71DAF180E26E600808F54 /* CCBFileLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71CFD180E26E600808F54 /* CCBFileLoader.h */; }; - 1AD71DB0180E26E600808F54 /* CCBFileLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71CFD180E26E600808F54 /* CCBFileLoader.h */; }; - 1AD71DB1180E26E600808F54 /* CCBKeyframe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71CFE180E26E600808F54 /* CCBKeyframe.cpp */; }; - 1AD71DB2180E26E600808F54 /* CCBKeyframe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71CFE180E26E600808F54 /* CCBKeyframe.cpp */; }; - 1AD71DB3180E26E600808F54 /* CCBKeyframe.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71CFF180E26E600808F54 /* CCBKeyframe.h */; }; - 1AD71DB4180E26E600808F54 /* CCBKeyframe.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71CFF180E26E600808F54 /* CCBKeyframe.h */; }; - 1AD71DB5180E26E600808F54 /* CCBMemberVariableAssigner.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D00180E26E600808F54 /* CCBMemberVariableAssigner.h */; }; - 1AD71DB6180E26E600808F54 /* CCBMemberVariableAssigner.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D00180E26E600808F54 /* CCBMemberVariableAssigner.h */; }; - 1AD71DB7180E26E600808F54 /* CCBReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D01180E26E600808F54 /* CCBReader.cpp */; }; - 1AD71DB8180E26E600808F54 /* CCBReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D01180E26E600808F54 /* CCBReader.cpp */; }; - 1AD71DB9180E26E600808F54 /* CCBReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D02180E26E600808F54 /* CCBReader.h */; }; - 1AD71DBA180E26E600808F54 /* CCBReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D02180E26E600808F54 /* CCBReader.h */; }; - 1AD71DBB180E26E600808F54 /* CCBSelectorResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D03180E26E600808F54 /* CCBSelectorResolver.h */; }; - 1AD71DBC180E26E600808F54 /* CCBSelectorResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D03180E26E600808F54 /* CCBSelectorResolver.h */; }; - 1AD71DBD180E26E600808F54 /* CCBSequence.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D04180E26E600808F54 /* CCBSequence.cpp */; }; - 1AD71DBE180E26E600808F54 /* CCBSequence.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D04180E26E600808F54 /* CCBSequence.cpp */; }; - 1AD71DBF180E26E600808F54 /* CCBSequence.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D05180E26E600808F54 /* CCBSequence.h */; }; - 1AD71DC0180E26E600808F54 /* CCBSequence.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D05180E26E600808F54 /* CCBSequence.h */; }; - 1AD71DC1180E26E600808F54 /* CCBSequenceProperty.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D06180E26E600808F54 /* CCBSequenceProperty.cpp */; }; - 1AD71DC2180E26E600808F54 /* CCBSequenceProperty.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D06180E26E600808F54 /* CCBSequenceProperty.cpp */; }; - 1AD71DC3180E26E600808F54 /* CCBSequenceProperty.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D07180E26E600808F54 /* CCBSequenceProperty.h */; }; - 1AD71DC4180E26E600808F54 /* CCBSequenceProperty.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D07180E26E600808F54 /* CCBSequenceProperty.h */; }; - 1AD71DC9180E26E600808F54 /* CCControlButtonLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D0A180E26E600808F54 /* CCControlButtonLoader.cpp */; }; - 1AD71DCA180E26E600808F54 /* CCControlButtonLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D0A180E26E600808F54 /* CCControlButtonLoader.cpp */; }; - 1AD71DCB180E26E600808F54 /* CCControlButtonLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D0B180E26E600808F54 /* CCControlButtonLoader.h */; }; - 1AD71DCC180E26E600808F54 /* CCControlButtonLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D0B180E26E600808F54 /* CCControlButtonLoader.h */; }; - 1AD71DCD180E26E600808F54 /* CCControlLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D0C180E26E600808F54 /* CCControlLoader.cpp */; }; - 1AD71DCE180E26E600808F54 /* CCControlLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D0C180E26E600808F54 /* CCControlLoader.cpp */; }; - 1AD71DCF180E26E600808F54 /* CCControlLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D0D180E26E600808F54 /* CCControlLoader.h */; }; - 1AD71DD0180E26E600808F54 /* CCControlLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D0D180E26E600808F54 /* CCControlLoader.h */; }; - 1AD71DD1180E26E600808F54 /* CCLabelBMFontLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D0E180E26E600808F54 /* CCLabelBMFontLoader.cpp */; }; - 1AD71DD2180E26E600808F54 /* CCLabelBMFontLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D0E180E26E600808F54 /* CCLabelBMFontLoader.cpp */; }; - 1AD71DD3180E26E600808F54 /* CCLabelBMFontLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D0F180E26E600808F54 /* CCLabelBMFontLoader.h */; }; - 1AD71DD4180E26E600808F54 /* CCLabelBMFontLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D0F180E26E600808F54 /* CCLabelBMFontLoader.h */; }; - 1AD71DD5180E26E600808F54 /* CCLabelTTFLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D10180E26E600808F54 /* CCLabelTTFLoader.cpp */; }; - 1AD71DD6180E26E600808F54 /* CCLabelTTFLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D10180E26E600808F54 /* CCLabelTTFLoader.cpp */; }; - 1AD71DD7180E26E600808F54 /* CCLabelTTFLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D11180E26E600808F54 /* CCLabelTTFLoader.h */; }; - 1AD71DD8180E26E600808F54 /* CCLabelTTFLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D11180E26E600808F54 /* CCLabelTTFLoader.h */; }; - 1AD71DD9180E26E600808F54 /* CCLayerColorLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D12180E26E600808F54 /* CCLayerColorLoader.cpp */; }; - 1AD71DDA180E26E600808F54 /* CCLayerColorLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D12180E26E600808F54 /* CCLayerColorLoader.cpp */; }; - 1AD71DDB180E26E600808F54 /* CCLayerColorLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D13180E26E600808F54 /* CCLayerColorLoader.h */; }; - 1AD71DDC180E26E600808F54 /* CCLayerColorLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D13180E26E600808F54 /* CCLayerColorLoader.h */; }; - 1AD71DDD180E26E600808F54 /* CCLayerGradientLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D14180E26E600808F54 /* CCLayerGradientLoader.cpp */; }; - 1AD71DDE180E26E600808F54 /* CCLayerGradientLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D14180E26E600808F54 /* CCLayerGradientLoader.cpp */; }; - 1AD71DDF180E26E600808F54 /* CCLayerGradientLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D15180E26E600808F54 /* CCLayerGradientLoader.h */; }; - 1AD71DE0180E26E600808F54 /* CCLayerGradientLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D15180E26E600808F54 /* CCLayerGradientLoader.h */; }; - 1AD71DE1180E26E600808F54 /* CCLayerLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D16180E26E600808F54 /* CCLayerLoader.cpp */; }; - 1AD71DE2180E26E600808F54 /* CCLayerLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D16180E26E600808F54 /* CCLayerLoader.cpp */; }; - 1AD71DE3180E26E600808F54 /* CCLayerLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D17180E26E600808F54 /* CCLayerLoader.h */; }; - 1AD71DE4180E26E600808F54 /* CCLayerLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D17180E26E600808F54 /* CCLayerLoader.h */; }; - 1AD71DE5180E26E600808F54 /* CCMenuItemImageLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D18180E26E600808F54 /* CCMenuItemImageLoader.cpp */; }; - 1AD71DE6180E26E600808F54 /* CCMenuItemImageLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D18180E26E600808F54 /* CCMenuItemImageLoader.cpp */; }; - 1AD71DE7180E26E600808F54 /* CCMenuItemImageLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D19180E26E600808F54 /* CCMenuItemImageLoader.h */; }; - 1AD71DE8180E26E600808F54 /* CCMenuItemImageLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D19180E26E600808F54 /* CCMenuItemImageLoader.h */; }; - 1AD71DE9180E26E600808F54 /* CCMenuItemLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D1A180E26E600808F54 /* CCMenuItemLoader.cpp */; }; - 1AD71DEA180E26E600808F54 /* CCMenuItemLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D1A180E26E600808F54 /* CCMenuItemLoader.cpp */; }; - 1AD71DEB180E26E600808F54 /* CCMenuItemLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D1B180E26E600808F54 /* CCMenuItemLoader.h */; }; - 1AD71DEC180E26E600808F54 /* CCMenuItemLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D1B180E26E600808F54 /* CCMenuItemLoader.h */; }; - 1AD71DED180E26E600808F54 /* CCMenuLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D1C180E26E600808F54 /* CCMenuLoader.h */; }; - 1AD71DEE180E26E600808F54 /* CCMenuLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D1C180E26E600808F54 /* CCMenuLoader.h */; }; - 1AD71DEF180E26E600808F54 /* CCNode+CCBRelativePositioning.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D1D180E26E600808F54 /* CCNode+CCBRelativePositioning.cpp */; }; - 1AD71DF0180E26E600808F54 /* CCNode+CCBRelativePositioning.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D1D180E26E600808F54 /* CCNode+CCBRelativePositioning.cpp */; }; - 1AD71DF1180E26E600808F54 /* CCNode+CCBRelativePositioning.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D1E180E26E600808F54 /* CCNode+CCBRelativePositioning.h */; }; - 1AD71DF2180E26E600808F54 /* CCNode+CCBRelativePositioning.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D1E180E26E600808F54 /* CCNode+CCBRelativePositioning.h */; }; - 1AD71DF3180E26E600808F54 /* CCNodeLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D1F180E26E600808F54 /* CCNodeLoader.cpp */; }; - 1AD71DF4180E26E600808F54 /* CCNodeLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D1F180E26E600808F54 /* CCNodeLoader.cpp */; }; - 1AD71DF5180E26E600808F54 /* CCNodeLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D20180E26E600808F54 /* CCNodeLoader.h */; }; - 1AD71DF6180E26E600808F54 /* CCNodeLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D20180E26E600808F54 /* CCNodeLoader.h */; }; - 1AD71DF7180E26E600808F54 /* CCNodeLoaderLibrary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D21180E26E600808F54 /* CCNodeLoaderLibrary.cpp */; }; - 1AD71DF8180E26E600808F54 /* CCNodeLoaderLibrary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D21180E26E600808F54 /* CCNodeLoaderLibrary.cpp */; }; - 1AD71DF9180E26E600808F54 /* CCNodeLoaderLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D22180E26E600808F54 /* CCNodeLoaderLibrary.h */; }; - 1AD71DFA180E26E600808F54 /* CCNodeLoaderLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D22180E26E600808F54 /* CCNodeLoaderLibrary.h */; }; - 1AD71DFB180E26E600808F54 /* CCNodeLoaderListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D23180E26E600808F54 /* CCNodeLoaderListener.h */; }; - 1AD71DFC180E26E600808F54 /* CCNodeLoaderListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D23180E26E600808F54 /* CCNodeLoaderListener.h */; }; - 1AD71DFD180E26E600808F54 /* CCParticleSystemQuadLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D24180E26E600808F54 /* CCParticleSystemQuadLoader.cpp */; }; - 1AD71DFE180E26E600808F54 /* CCParticleSystemQuadLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D24180E26E600808F54 /* CCParticleSystemQuadLoader.cpp */; }; - 1AD71DFF180E26E600808F54 /* CCParticleSystemQuadLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D25180E26E600808F54 /* CCParticleSystemQuadLoader.h */; }; - 1AD71E00180E26E600808F54 /* CCParticleSystemQuadLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D25180E26E600808F54 /* CCParticleSystemQuadLoader.h */; }; - 1AD71E01180E26E600808F54 /* CCScale9SpriteLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D26180E26E600808F54 /* CCScale9SpriteLoader.cpp */; }; - 1AD71E02180E26E600808F54 /* CCScale9SpriteLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D26180E26E600808F54 /* CCScale9SpriteLoader.cpp */; }; - 1AD71E03180E26E600808F54 /* CCScale9SpriteLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D27180E26E600808F54 /* CCScale9SpriteLoader.h */; }; - 1AD71E04180E26E600808F54 /* CCScale9SpriteLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D27180E26E600808F54 /* CCScale9SpriteLoader.h */; }; - 1AD71E05180E26E600808F54 /* CCScrollViewLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D28180E26E600808F54 /* CCScrollViewLoader.cpp */; }; - 1AD71E06180E26E600808F54 /* CCScrollViewLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D28180E26E600808F54 /* CCScrollViewLoader.cpp */; }; - 1AD71E07180E26E600808F54 /* CCScrollViewLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D29180E26E600808F54 /* CCScrollViewLoader.h */; }; - 1AD71E08180E26E600808F54 /* CCScrollViewLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D29180E26E600808F54 /* CCScrollViewLoader.h */; }; - 1AD71E09180E26E600808F54 /* CCSpriteLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D2A180E26E600808F54 /* CCSpriteLoader.cpp */; }; - 1AD71E0A180E26E600808F54 /* CCSpriteLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D2A180E26E600808F54 /* CCSpriteLoader.cpp */; }; - 1AD71E0B180E26E600808F54 /* CCSpriteLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D2B180E26E600808F54 /* CCSpriteLoader.h */; }; - 1AD71E0C180E26E600808F54 /* CCSpriteLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D2B180E26E600808F54 /* CCSpriteLoader.h */; }; - 1AD71E0D180E26E600808F54 /* CocosBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D2C180E26E600808F54 /* CocosBuilder.h */; }; - 1AD71E0E180E26E600808F54 /* CocosBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D2C180E26E600808F54 /* CocosBuilder.h */; }; - 1AD71E95180E26E600808F54 /* Animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D7E180E26E600808F54 /* Animation.cpp */; }; - 1AD71E96180E26E600808F54 /* Animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D7E180E26E600808F54 /* Animation.cpp */; }; - 1AD71E97180E26E600808F54 /* Animation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D7F180E26E600808F54 /* Animation.h */; }; - 1AD71E98180E26E600808F54 /* Animation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D7F180E26E600808F54 /* Animation.h */; }; - 1AD71E99180E26E600808F54 /* AnimationState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D80180E26E600808F54 /* AnimationState.cpp */; }; - 1AD71E9A180E26E600808F54 /* AnimationState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D80180E26E600808F54 /* AnimationState.cpp */; }; - 1AD71E9B180E26E600808F54 /* AnimationState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D81180E26E600808F54 /* AnimationState.h */; }; - 1AD71E9C180E26E600808F54 /* AnimationState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D81180E26E600808F54 /* AnimationState.h */; }; - 1AD71E9D180E26E600808F54 /* AnimationStateData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D82180E26E600808F54 /* AnimationStateData.cpp */; }; - 1AD71E9E180E26E600808F54 /* AnimationStateData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D82180E26E600808F54 /* AnimationStateData.cpp */; }; - 1AD71E9F180E26E600808F54 /* AnimationStateData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D83180E26E600808F54 /* AnimationStateData.h */; }; - 1AD71EA0180E26E600808F54 /* AnimationStateData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D83180E26E600808F54 /* AnimationStateData.h */; }; - 1AD71EA1180E26E600808F54 /* Atlas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D84180E26E600808F54 /* Atlas.cpp */; }; - 1AD71EA2180E26E600808F54 /* Atlas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D84180E26E600808F54 /* Atlas.cpp */; }; - 1AD71EA3180E26E600808F54 /* Atlas.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D85180E26E600808F54 /* Atlas.h */; }; - 1AD71EA4180E26E600808F54 /* Atlas.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D85180E26E600808F54 /* Atlas.h */; }; - 1AD71EA5180E26E600808F54 /* AtlasAttachmentLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D86180E26E600808F54 /* AtlasAttachmentLoader.cpp */; }; - 1AD71EA6180E26E600808F54 /* AtlasAttachmentLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D86180E26E600808F54 /* AtlasAttachmentLoader.cpp */; }; - 1AD71EA7180E26E600808F54 /* AtlasAttachmentLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D87180E26E600808F54 /* AtlasAttachmentLoader.h */; }; - 1AD71EA8180E26E600808F54 /* AtlasAttachmentLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D87180E26E600808F54 /* AtlasAttachmentLoader.h */; }; - 1AD71EA9180E26E600808F54 /* Attachment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D88180E26E600808F54 /* Attachment.cpp */; }; - 1AD71EAA180E26E600808F54 /* Attachment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D88180E26E600808F54 /* Attachment.cpp */; }; - 1AD71EAB180E26E600808F54 /* Attachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D89180E26E600808F54 /* Attachment.h */; }; - 1AD71EAC180E26E600808F54 /* Attachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D89180E26E600808F54 /* Attachment.h */; }; - 1AD71EAD180E26E600808F54 /* AttachmentLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D8A180E26E600808F54 /* AttachmentLoader.cpp */; }; - 1AD71EAE180E26E600808F54 /* AttachmentLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D8A180E26E600808F54 /* AttachmentLoader.cpp */; }; - 1AD71EAF180E26E600808F54 /* AttachmentLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D8B180E26E600808F54 /* AttachmentLoader.h */; }; - 1AD71EB0180E26E600808F54 /* AttachmentLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D8B180E26E600808F54 /* AttachmentLoader.h */; }; - 1AD71EB1180E26E600808F54 /* Bone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D8C180E26E600808F54 /* Bone.cpp */; }; - 1AD71EB2180E26E600808F54 /* Bone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D8C180E26E600808F54 /* Bone.cpp */; }; - 1AD71EB3180E26E600808F54 /* Bone.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D8D180E26E600808F54 /* Bone.h */; }; - 1AD71EB4180E26E600808F54 /* Bone.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D8D180E26E600808F54 /* Bone.h */; }; - 1AD71EB5180E26E600808F54 /* BoneData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D8E180E26E600808F54 /* BoneData.cpp */; }; - 1AD71EB6180E26E600808F54 /* BoneData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D8E180E26E600808F54 /* BoneData.cpp */; }; - 1AD71EB7180E26E600808F54 /* BoneData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D8F180E26E600808F54 /* BoneData.h */; }; - 1AD71EB8180E26E600808F54 /* BoneData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D8F180E26E600808F54 /* BoneData.h */; }; - 1AD71EB9180E26E600808F54 /* CCSkeleton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D90180E26E600808F54 /* CCSkeleton.cpp */; }; - 1AD71EBA180E26E600808F54 /* CCSkeleton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D90180E26E600808F54 /* CCSkeleton.cpp */; }; - 1AD71EBB180E26E600808F54 /* CCSkeleton.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D91180E26E600808F54 /* CCSkeleton.h */; }; - 1AD71EBC180E26E600808F54 /* CCSkeleton.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D91180E26E600808F54 /* CCSkeleton.h */; }; - 1AD71EBD180E26E600808F54 /* CCSkeletonAnimation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D92180E26E600808F54 /* CCSkeletonAnimation.cpp */; }; - 1AD71EBE180E26E600808F54 /* CCSkeletonAnimation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D92180E26E600808F54 /* CCSkeletonAnimation.cpp */; }; - 1AD71EBF180E26E600808F54 /* CCSkeletonAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D93180E26E600808F54 /* CCSkeletonAnimation.h */; }; - 1AD71EC0180E26E600808F54 /* CCSkeletonAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D93180E26E600808F54 /* CCSkeletonAnimation.h */; }; - 1AD71EC1180E26E600808F54 /* extension.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D94180E26E600808F54 /* extension.cpp */; }; - 1AD71EC2180E26E600808F54 /* extension.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D94180E26E600808F54 /* extension.cpp */; }; - 1AD71EC3180E26E600808F54 /* extension.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D95180E26E600808F54 /* extension.h */; }; - 1AD71EC4180E26E600808F54 /* extension.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D95180E26E600808F54 /* extension.h */; }; - 1AD71EC5180E26E600808F54 /* Json.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D96180E26E600808F54 /* Json.cpp */; }; - 1AD71EC6180E26E600808F54 /* Json.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D96180E26E600808F54 /* Json.cpp */; }; - 1AD71EC7180E26E600808F54 /* Json.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D97180E26E600808F54 /* Json.h */; }; - 1AD71EC8180E26E600808F54 /* Json.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D97180E26E600808F54 /* Json.h */; }; - 1AD71EC9180E26E600808F54 /* RegionAttachment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D98180E26E600808F54 /* RegionAttachment.cpp */; }; - 1AD71ECA180E26E600808F54 /* RegionAttachment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D98180E26E600808F54 /* RegionAttachment.cpp */; }; - 1AD71ECB180E26E600808F54 /* RegionAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D99180E26E600808F54 /* RegionAttachment.h */; }; - 1AD71ECC180E26E600808F54 /* RegionAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D99180E26E600808F54 /* RegionAttachment.h */; }; - 1AD71ECD180E26E600808F54 /* Skeleton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D9A180E26E600808F54 /* Skeleton.cpp */; }; - 1AD71ECE180E26E600808F54 /* Skeleton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D9A180E26E600808F54 /* Skeleton.cpp */; }; - 1AD71ECF180E26E600808F54 /* Skeleton.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D9B180E26E600808F54 /* Skeleton.h */; }; - 1AD71ED0180E26E600808F54 /* Skeleton.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D9B180E26E600808F54 /* Skeleton.h */; }; - 1AD71ED1180E26E600808F54 /* SkeletonData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D9C180E26E600808F54 /* SkeletonData.cpp */; }; - 1AD71ED2180E26E600808F54 /* SkeletonData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D9C180E26E600808F54 /* SkeletonData.cpp */; }; - 1AD71ED3180E26E600808F54 /* SkeletonData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D9D180E26E600808F54 /* SkeletonData.h */; }; - 1AD71ED4180E26E600808F54 /* SkeletonData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D9D180E26E600808F54 /* SkeletonData.h */; }; - 1AD71ED5180E26E600808F54 /* SkeletonJson.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D9E180E26E600808F54 /* SkeletonJson.cpp */; }; - 1AD71ED6180E26E600808F54 /* SkeletonJson.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D9E180E26E600808F54 /* SkeletonJson.cpp */; }; - 1AD71ED7180E26E600808F54 /* SkeletonJson.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D9F180E26E600808F54 /* SkeletonJson.h */; }; - 1AD71ED8180E26E600808F54 /* SkeletonJson.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D9F180E26E600808F54 /* SkeletonJson.h */; }; - 1AD71ED9180E26E600808F54 /* Skin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA0180E26E600808F54 /* Skin.cpp */; }; - 1AD71EDA180E26E600808F54 /* Skin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA0180E26E600808F54 /* Skin.cpp */; }; - 1AD71EDB180E26E600808F54 /* Skin.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA1180E26E600808F54 /* Skin.h */; }; - 1AD71EDC180E26E600808F54 /* Skin.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA1180E26E600808F54 /* Skin.h */; }; - 1AD71EDD180E26E600808F54 /* Slot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA2180E26E600808F54 /* Slot.cpp */; }; - 1AD71EDE180E26E600808F54 /* Slot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA2180E26E600808F54 /* Slot.cpp */; }; - 1AD71EDF180E26E600808F54 /* Slot.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA3180E26E600808F54 /* Slot.h */; }; - 1AD71EE0180E26E600808F54 /* Slot.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA3180E26E600808F54 /* Slot.h */; }; - 1AD71EE1180E26E600808F54 /* SlotData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA4180E26E600808F54 /* SlotData.cpp */; }; - 1AD71EE2180E26E600808F54 /* SlotData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA4180E26E600808F54 /* SlotData.cpp */; }; - 1AD71EE3180E26E600808F54 /* SlotData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA5180E26E600808F54 /* SlotData.h */; }; - 1AD71EE4180E26E600808F54 /* SlotData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA5180E26E600808F54 /* SlotData.h */; }; - 1AD71EE5180E26E600808F54 /* spine-cocos2dx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA6180E26E600808F54 /* spine-cocos2dx.cpp */; }; - 1AD71EE6180E26E600808F54 /* spine-cocos2dx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA6180E26E600808F54 /* spine-cocos2dx.cpp */; }; - 1AD71EE7180E26E600808F54 /* spine-cocos2dx.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA7180E26E600808F54 /* spine-cocos2dx.h */; }; - 1AD71EE8180E26E600808F54 /* spine-cocos2dx.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA7180E26E600808F54 /* spine-cocos2dx.h */; }; - 1AD71EE9180E26E600808F54 /* spine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA8180E26E600808F54 /* spine.h */; }; - 1AD71EEA180E26E600808F54 /* spine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA8180E26E600808F54 /* spine.h */; }; 1AD71EF0180E27CF00808F54 /* CCPhysicsDebugNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71EEC180E27CF00808F54 /* CCPhysicsDebugNode.cpp */; }; 1AD71EF1180E27CF00808F54 /* CCPhysicsDebugNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71EEC180E27CF00808F54 /* CCPhysicsDebugNode.cpp */; }; 1AD71EF2180E27CF00808F54 /* CCPhysicsDebugNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71EED180E27CF00808F54 /* CCPhysicsDebugNode.h */; }; @@ -916,113 +567,15 @@ 1AD71EF5180E27CF00808F54 /* CCPhysicsSprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71EEE180E27CF00808F54 /* CCPhysicsSprite.cpp */; }; 1AD71EF6180E27CF00808F54 /* CCPhysicsSprite.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71EEF180E27CF00808F54 /* CCPhysicsSprite.h */; }; 1AD71EF7180E27CF00808F54 /* CCPhysicsSprite.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71EEF180E27CF00808F54 /* CCPhysicsSprite.h */; }; - 2905FA4018CF08D100240AA3 /* CocosGUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9E918CF08D000240AA3 /* CocosGUI.cpp */; }; - 2905FA4118CF08D100240AA3 /* CocosGUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9E918CF08D000240AA3 /* CocosGUI.cpp */; }; - 2905FA4218CF08D100240AA3 /* CocosGUI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9EA18CF08D000240AA3 /* CocosGUI.h */; }; - 2905FA4318CF08D100240AA3 /* CocosGUI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9EA18CF08D000240AA3 /* CocosGUI.h */; }; - 2905FA4418CF08D100240AA3 /* GUIDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9EB18CF08D000240AA3 /* GUIDefine.h */; }; - 2905FA4518CF08D100240AA3 /* GUIDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9EB18CF08D000240AA3 /* GUIDefine.h */; }; - 2905FA4618CF08D100240AA3 /* UIButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F018CF08D000240AA3 /* UIButton.cpp */; }; - 2905FA4718CF08D100240AA3 /* UIButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F018CF08D000240AA3 /* UIButton.cpp */; }; - 2905FA4818CF08D100240AA3 /* UIButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F118CF08D000240AA3 /* UIButton.h */; }; - 2905FA4918CF08D100240AA3 /* UIButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F118CF08D000240AA3 /* UIButton.h */; }; - 2905FA4A18CF08D100240AA3 /* UICheckBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F218CF08D000240AA3 /* UICheckBox.cpp */; }; - 2905FA4B18CF08D100240AA3 /* UICheckBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F218CF08D000240AA3 /* UICheckBox.cpp */; }; - 2905FA4C18CF08D100240AA3 /* UICheckBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F318CF08D000240AA3 /* UICheckBox.h */; }; - 2905FA4D18CF08D100240AA3 /* UICheckBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F318CF08D000240AA3 /* UICheckBox.h */; }; - 2905FA4E18CF08D100240AA3 /* UIHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F418CF08D000240AA3 /* UIHelper.cpp */; }; - 2905FA4F18CF08D100240AA3 /* UIHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F418CF08D000240AA3 /* UIHelper.cpp */; }; - 2905FA5018CF08D100240AA3 /* UIHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F518CF08D000240AA3 /* UIHelper.h */; }; - 2905FA5118CF08D100240AA3 /* UIHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F518CF08D000240AA3 /* UIHelper.h */; }; - 2905FA5218CF08D100240AA3 /* UIImageView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F618CF08D000240AA3 /* UIImageView.cpp */; }; - 2905FA5318CF08D100240AA3 /* UIImageView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F618CF08D000240AA3 /* UIImageView.cpp */; }; - 2905FA5418CF08D100240AA3 /* UIImageView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F718CF08D000240AA3 /* UIImageView.h */; }; - 2905FA5518CF08D100240AA3 /* UIImageView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F718CF08D000240AA3 /* UIImageView.h */; }; - 2905FA5618CF08D100240AA3 /* UILayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F818CF08D000240AA3 /* UILayout.cpp */; }; - 2905FA5718CF08D100240AA3 /* UILayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F818CF08D000240AA3 /* UILayout.cpp */; }; - 2905FA5818CF08D100240AA3 /* UILayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F918CF08D000240AA3 /* UILayout.h */; }; - 2905FA5918CF08D100240AA3 /* UILayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F918CF08D000240AA3 /* UILayout.h */; }; - 2905FA5E18CF08D100240AA3 /* UILayoutParameter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9FC18CF08D000240AA3 /* UILayoutParameter.cpp */; }; - 2905FA5F18CF08D100240AA3 /* UILayoutParameter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9FC18CF08D000240AA3 /* UILayoutParameter.cpp */; }; - 2905FA6018CF08D100240AA3 /* UILayoutParameter.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9FD18CF08D000240AA3 /* UILayoutParameter.h */; }; - 2905FA6118CF08D100240AA3 /* UILayoutParameter.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9FD18CF08D000240AA3 /* UILayoutParameter.h */; }; - 2905FA6218CF08D100240AA3 /* UIListView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9FE18CF08D000240AA3 /* UIListView.cpp */; }; - 2905FA6318CF08D100240AA3 /* UIListView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9FE18CF08D000240AA3 /* UIListView.cpp */; }; - 2905FA6418CF08D100240AA3 /* UIListView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9FF18CF08D000240AA3 /* UIListView.h */; }; - 2905FA6518CF08D100240AA3 /* UIListView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9FF18CF08D000240AA3 /* UIListView.h */; }; - 2905FA6618CF08D100240AA3 /* UILoadingBar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0018CF08D000240AA3 /* UILoadingBar.cpp */; }; - 2905FA6718CF08D100240AA3 /* UILoadingBar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0018CF08D000240AA3 /* UILoadingBar.cpp */; }; - 2905FA6818CF08D100240AA3 /* UILoadingBar.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0118CF08D000240AA3 /* UILoadingBar.h */; }; - 2905FA6918CF08D100240AA3 /* UILoadingBar.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0118CF08D000240AA3 /* UILoadingBar.h */; }; - 2905FA6A18CF08D100240AA3 /* UIPageView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0218CF08D000240AA3 /* UIPageView.cpp */; }; - 2905FA6B18CF08D100240AA3 /* UIPageView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0218CF08D000240AA3 /* UIPageView.cpp */; }; - 2905FA6C18CF08D100240AA3 /* UIPageView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0318CF08D000240AA3 /* UIPageView.h */; }; - 2905FA6D18CF08D100240AA3 /* UIPageView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0318CF08D000240AA3 /* UIPageView.h */; }; - 2905FA6E18CF08D100240AA3 /* UIRichText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0418CF08D000240AA3 /* UIRichText.cpp */; }; - 2905FA6F18CF08D100240AA3 /* UIRichText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0418CF08D000240AA3 /* UIRichText.cpp */; }; - 2905FA7018CF08D100240AA3 /* UIRichText.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0518CF08D000240AA3 /* UIRichText.h */; }; - 2905FA7118CF08D100240AA3 /* UIRichText.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0518CF08D000240AA3 /* UIRichText.h */; }; - 2905FA7418CF08D100240AA3 /* UIScrollView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0718CF08D000240AA3 /* UIScrollView.cpp */; }; - 2905FA7518CF08D100240AA3 /* UIScrollView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0718CF08D000240AA3 /* UIScrollView.cpp */; }; - 2905FA7618CF08D100240AA3 /* UIScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0818CF08D000240AA3 /* UIScrollView.h */; }; - 2905FA7718CF08D100240AA3 /* UIScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0818CF08D000240AA3 /* UIScrollView.h */; }; - 2905FA7818CF08D100240AA3 /* UISlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0918CF08D000240AA3 /* UISlider.cpp */; }; - 2905FA7918CF08D100240AA3 /* UISlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0918CF08D000240AA3 /* UISlider.cpp */; }; - 2905FA7A18CF08D100240AA3 /* UISlider.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0A18CF08D100240AA3 /* UISlider.h */; }; - 2905FA7B18CF08D100240AA3 /* UISlider.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0A18CF08D100240AA3 /* UISlider.h */; }; - 2905FA7C18CF08D100240AA3 /* UIText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0B18CF08D100240AA3 /* UIText.cpp */; }; - 2905FA7D18CF08D100240AA3 /* UIText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0B18CF08D100240AA3 /* UIText.cpp */; }; - 2905FA7E18CF08D100240AA3 /* UIText.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0C18CF08D100240AA3 /* UIText.h */; }; - 2905FA7F18CF08D100240AA3 /* UIText.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0C18CF08D100240AA3 /* UIText.h */; }; - 2905FA8018CF08D100240AA3 /* UITextAtlas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0D18CF08D100240AA3 /* UITextAtlas.cpp */; }; - 2905FA8118CF08D100240AA3 /* UITextAtlas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0D18CF08D100240AA3 /* UITextAtlas.cpp */; }; - 2905FA8218CF08D100240AA3 /* UITextAtlas.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0E18CF08D100240AA3 /* UITextAtlas.h */; }; - 2905FA8318CF08D100240AA3 /* UITextAtlas.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0E18CF08D100240AA3 /* UITextAtlas.h */; }; - 2905FA8418CF08D100240AA3 /* UITextBMFont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0F18CF08D100240AA3 /* UITextBMFont.cpp */; }; - 2905FA8518CF08D100240AA3 /* UITextBMFont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0F18CF08D100240AA3 /* UITextBMFont.cpp */; }; - 2905FA8618CF08D100240AA3 /* UITextBMFont.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA1018CF08D100240AA3 /* UITextBMFont.h */; }; - 2905FA8718CF08D100240AA3 /* UITextBMFont.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA1018CF08D100240AA3 /* UITextBMFont.h */; }; - 2905FA8818CF08D100240AA3 /* UITextField.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA1118CF08D100240AA3 /* UITextField.cpp */; }; - 2905FA8918CF08D100240AA3 /* UITextField.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA1118CF08D100240AA3 /* UITextField.cpp */; }; - 2905FA8A18CF08D100240AA3 /* UITextField.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA1218CF08D100240AA3 /* UITextField.h */; }; - 2905FA8B18CF08D100240AA3 /* UITextField.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA1218CF08D100240AA3 /* UITextField.h */; }; - 2905FA8C18CF08D100240AA3 /* UIWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA1318CF08D100240AA3 /* UIWidget.cpp */; }; - 2905FA8D18CF08D100240AA3 /* UIWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA1318CF08D100240AA3 /* UIWidget.cpp */; }; - 2905FA8E18CF08D100240AA3 /* UIWidget.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA1418CF08D100240AA3 /* UIWidget.h */; }; - 2905FA8F18CF08D100240AA3 /* UIWidget.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA1418CF08D100240AA3 /* UIWidget.h */; }; + 2958244B19873D8E00F9746D /* UIScale9Sprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2958244919873D8E00F9746D /* UIScale9Sprite.cpp */; }; + 2958244C19873D8E00F9746D /* UIScale9Sprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2958244919873D8E00F9746D /* UIScale9Sprite.cpp */; }; + 2958244D19873D8E00F9746D /* UIScale9Sprite.h in Headers */ = {isa = PBXBuildFile; fileRef = 2958244A19873D8E00F9746D /* UIScale9Sprite.h */; }; + 2958244E19873D8E00F9746D /* UIScale9Sprite.h in Headers */ = {isa = PBXBuildFile; fileRef = 2958244A19873D8E00F9746D /* UIScale9Sprite.h */; }; 2986667F18B1B246000E39CA /* CCTweenFunction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2986667818B1B079000E39CA /* CCTweenFunction.cpp */; }; 299754F4193EC95400A54AC3 /* ObjectFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 299754F2193EC95400A54AC3 /* ObjectFactory.cpp */; }; 299754F5193EC95400A54AC3 /* ObjectFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 299754F2193EC95400A54AC3 /* ObjectFactory.cpp */; }; 299754F6193EC95400A54AC3 /* ObjectFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 299754F3193EC95400A54AC3 /* ObjectFactory.h */; }; 299754F7193EC95400A54AC3 /* ObjectFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 299754F3193EC95400A54AC3 /* ObjectFactory.h */; }; - 29BDBA53195D597A003225C9 /* UIDeprecated.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29BDBA52195D597A003225C9 /* UIDeprecated.cpp */; }; - 29BDBA54195D597A003225C9 /* UIDeprecated.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29BDBA52195D597A003225C9 /* UIDeprecated.cpp */; }; - 29CB8F4C1929D1BB00C841D6 /* UILayoutManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29CB8F4A1929D1BB00C841D6 /* UILayoutManager.cpp */; }; - 29CB8F4D1929D1BB00C841D6 /* UILayoutManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29CB8F4A1929D1BB00C841D6 /* UILayoutManager.cpp */; }; - 29CB8F4E1929D1BB00C841D6 /* UILayoutManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 29CB8F4B1929D1BB00C841D6 /* UILayoutManager.h */; }; - 29CB8F4F1929D1BB00C841D6 /* UILayoutManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 29CB8F4B1929D1BB00C841D6 /* UILayoutManager.h */; }; - 29E99D1E1957BA7000046604 /* CocoLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29E99D1C1957BA7000046604 /* CocoLoader.cpp */; }; - 29E99D1F1957BA7000046604 /* CocoLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29E99D1C1957BA7000046604 /* CocoLoader.cpp */; }; - 29E99D201957BA7000046604 /* CocoLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 29E99D1D1957BA7000046604 /* CocoLoader.h */; }; - 29E99D211957BA7000046604 /* CocoLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 29E99D1D1957BA7000046604 /* CocoLoader.h */; }; - 2AC795DB1862870F005EC8E1 /* SkeletonBounds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D918628689005EC8E1 /* SkeletonBounds.cpp */; }; - 2AC795DC1862870F005EC8E1 /* Event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D51862867D005EC8E1 /* Event.cpp */; }; - 2AC795DD1862870F005EC8E1 /* EventData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D71862867D005EC8E1 /* EventData.cpp */; }; - 2AC795DE1862870F005EC8E1 /* BoundingBoxAttachment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D318628672005EC8E1 /* BoundingBoxAttachment.cpp */; }; - 2AC795DF18628723005EC8E1 /* SkeletonBounds.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795DA18628689005EC8E1 /* SkeletonBounds.h */; }; - 2AC795E018628723005EC8E1 /* Event.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D61862867D005EC8E1 /* Event.h */; }; - 2AC795E118628723005EC8E1 /* EventData.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D81862867D005EC8E1 /* EventData.h */; }; - 2AC795E218628723005EC8E1 /* BoundingBoxAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D418628672005EC8E1 /* BoundingBoxAttachment.h */; }; - 2AC795E318628746005EC8E1 /* SkeletonBounds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D918628689005EC8E1 /* SkeletonBounds.cpp */; }; - 2AC795E418628746005EC8E1 /* Event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D51862867D005EC8E1 /* Event.cpp */; }; - 2AC795E518628746005EC8E1 /* EventData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D71862867D005EC8E1 /* EventData.cpp */; }; - 2AC795E618628746005EC8E1 /* BoundingBoxAttachment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D318628672005EC8E1 /* BoundingBoxAttachment.cpp */; }; - 2AC795E71862875D005EC8E1 /* SkeletonBounds.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795DA18628689005EC8E1 /* SkeletonBounds.h */; }; - 2AC795E81862875D005EC8E1 /* Event.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D61862867D005EC8E1 /* Event.h */; }; - 2AC795E91862875D005EC8E1 /* EventData.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D81862867D005EC8E1 /* EventData.h */; }; - 2AC795EA1862875D005EC8E1 /* BoundingBoxAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D418628672005EC8E1 /* BoundingBoxAttachment.h */; }; - 373B9129187891F400198F86 /* CCComBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 373B910718787C0B00198F86 /* CCComBase.h */; }; - 373B912A187891FB00198F86 /* CCComBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 373B910718787C0B00198F86 /* CCComBase.h */; }; 3E6176681960F89B00DE83F5 /* CCController-iOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3E6176551960F89B00DE83F5 /* CCController-iOS.mm */; }; 3E6176691960F89B00DE83F5 /* CCController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E6176561960F89B00DE83F5 /* CCController.h */; }; 3E6176741960F89B00DE83F5 /* CCEventController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E6176611960F89B00DE83F5 /* CCEventController.cpp */; }; @@ -1031,8 +584,6 @@ 3E6176771960F89B00DE83F5 /* CCEventListenerController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E6176641960F89B00DE83F5 /* CCEventListenerController.h */; }; 3E6176781960F89B00DE83F5 /* CCGameController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E6176651960F89B00DE83F5 /* CCGameController.h */; }; 3E61781D1966A5A300DE83F5 /* CCController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E61781C1966A5A300DE83F5 /* CCController.cpp */; }; - 3EA0FB6B191C841D00B170C8 /* UIVideoPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA0FB69191C841D00B170C8 /* UIVideoPlayer.h */; }; - 3EA0FB6C191C841D00B170C8 /* UIVideoPlayerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3EA0FB6A191C841D00B170C8 /* UIVideoPlayerIOS.mm */; }; 3EA47870195478E00068D9D1 /* CCBundleReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EA4786E195478E00068D9D1 /* CCBundleReader.cpp */; }; 3EA47871195478E00068D9D1 /* CCBundleReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EA4786E195478E00068D9D1 /* CCBundleReader.cpp */; }; 3EA47872195478E00068D9D1 /* CCBundleReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA4786F195478E00068D9D1 /* CCBundleReader.h */; }; @@ -1094,15 +645,6 @@ 460E47AF1808090B000CDD6D /* CCEditBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A1684F1807AF4E005B8026 /* CCEditBox.cpp */; }; 460E47B01808090B000CDD6D /* CCEditBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168501807AF4E005B8026 /* CCEditBox.h */; }; 460E47B11808090B000CDD6D /* CCEditBoxImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168511807AF4E005B8026 /* CCEditBoxImpl.h */; }; - 460E47B21808090B000CDD6D /* CCEditBoxImplAndroid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A168521807AF4E005B8026 /* CCEditBoxImplAndroid.cpp */; }; - 460E47B31808090B000CDD6D /* CCEditBoxImplAndroid.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168531807AF4E005B8026 /* CCEditBoxImplAndroid.h */; }; - 460E47B41808090B000CDD6D /* CCEditBoxImplIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168541807AF4E005B8026 /* CCEditBoxImplIOS.h */; }; - 460E47B51808090B000CDD6D /* CCEditBoxImplIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A168551807AF4E005B8026 /* CCEditBoxImplIOS.mm */; }; - 460E47B61808090B000CDD6D /* CCEditBoxImplMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168561807AF4E005B8026 /* CCEditBoxImplMac.h */; }; - 460E47B71808090B000CDD6D /* CCEditBoxImplMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A168571807AF4E005B8026 /* CCEditBoxImplMac.mm */; }; - 460E47B81808090B000CDD6D /* CCEditBoxImplNone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A168581807AF4E005B8026 /* CCEditBoxImplNone.cpp */; }; - 460E47BB1808090B000CDD6D /* CCEditBoxImplWin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A1685B1807AF4E005B8026 /* CCEditBoxImplWin.cpp */; }; - 460E47BC1808090B000CDD6D /* CCEditBoxImplWin.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A1685C1807AF4E005B8026 /* CCEditBoxImplWin.h */; }; 460E47BD1808090D000CDD6D /* CCEditBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A1684F1807AF4E005B8026 /* CCEditBox.cpp */; }; 460E47BE1808090D000CDD6D /* CCEditBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168501807AF4E005B8026 /* CCEditBox.h */; }; 460E47BF1808090D000CDD6D /* CCEditBoxImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168511807AF4E005B8026 /* CCEditBoxImpl.h */; }; @@ -1110,8 +652,6 @@ 460E47C11808090D000CDD6D /* CCEditBoxImplAndroid.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168531807AF4E005B8026 /* CCEditBoxImplAndroid.h */; }; 460E47C21808090D000CDD6D /* CCEditBoxImplIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168541807AF4E005B8026 /* CCEditBoxImplIOS.h */; }; 460E47C31808090D000CDD6D /* CCEditBoxImplIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A168551807AF4E005B8026 /* CCEditBoxImplIOS.mm */; }; - 460E47C41808090D000CDD6D /* CCEditBoxImplMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168561807AF4E005B8026 /* CCEditBoxImplMac.h */; }; - 460E47C51808090D000CDD6D /* CCEditBoxImplMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A168571807AF4E005B8026 /* CCEditBoxImplMac.mm */; }; 460E47C61808090D000CDD6D /* CCEditBoxImplNone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A168581807AF4E005B8026 /* CCEditBoxImplNone.cpp */; }; 460E47C91808090D000CDD6D /* CCEditBoxImplWin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A1685B1807AF4E005B8026 /* CCEditBoxImplWin.cpp */; }; 460E47CA1808090D000CDD6D /* CCEditBoxImplWin.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A1685C1807AF4E005B8026 /* CCEditBoxImplWin.h */; }; @@ -1127,6 +667,10 @@ 460E47D818080914000CDD6D /* CCTableView.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168631807AF4E005B8026 /* CCTableView.h */; }; 460E47D918080914000CDD6D /* CCTableViewCell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A168641807AF4E005B8026 /* CCTableViewCell.cpp */; }; 460E47DA18080914000CDD6D /* CCTableViewCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168651807AF4E005B8026 /* CCTableViewCell.h */; }; + 464AD6E5197EBB1400E502D8 /* pvr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 464AD6E3197EBB1400E502D8 /* pvr.cpp */; }; + 464AD6E6197EBB1400E502D8 /* pvr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 464AD6E3197EBB1400E502D8 /* pvr.cpp */; }; + 464AD6E7197EBB1400E502D8 /* pvr.h in Headers */ = {isa = PBXBuildFile; fileRef = 464AD6E4197EBB1400E502D8 /* pvr.h */; }; + 464AD6E8197EBB1400E502D8 /* pvr.h in Headers */ = {isa = PBXBuildFile; fileRef = 464AD6E4197EBB1400E502D8 /* pvr.h */; }; 46A160421807A5D4005B8026 /* Export.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A15FE11807A56F005B8026 /* Export.h */; }; 46A160431807A5D4005B8026 /* SimpleAudioEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A15FE21807A56F005B8026 /* SimpleAudioEngine.h */; }; 46A160441807A5D4005B8026 /* CDAudioManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A15FF41807A56F005B8026 /* CDAudioManager.h */; }; @@ -1167,7 +711,6 @@ 46A170FD1807CECB005B8026 /* CCPhysicsBody.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A1706F1807CE7A005B8026 /* CCPhysicsBody.h */; }; 46A170FE1807CECB005B8026 /* CCPhysicsContact.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A170701807CE7A005B8026 /* CCPhysicsContact.cpp */; }; 46A170FF1807CECB005B8026 /* CCPhysicsContact.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A170711807CE7A005B8026 /* CCPhysicsContact.h */; }; - 46A171001807CECB005B8026 /* CCPhysicsJoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A170721807CE7A005B8026 /* CCPhysicsJoint.cpp */; }; 46A171011807CECB005B8026 /* CCPhysicsJoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A170731807CE7A005B8026 /* CCPhysicsJoint.h */; }; 46A171031807CECB005B8026 /* CCPhysicsShape.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A170751807CE7A005B8026 /* CCPhysicsShape.cpp */; }; 46A171041807CECB005B8026 /* CCPhysicsShape.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A170761807CE7A005B8026 /* CCPhysicsShape.h */; }; @@ -1300,7 +843,6 @@ 5034CA2F191D591100CE6051 /* ccShader_PositionTexture.vert in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA02191D591000CE6051 /* ccShader_PositionTexture.vert */; }; 5034CA30191D591100CE6051 /* ccShader_PositionTexture.vert in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA02191D591000CE6051 /* ccShader_PositionTexture.vert */; }; 5034CA31191D591100CE6051 /* ccShader_PositionTexture_uColor.vert in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA03191D591000CE6051 /* ccShader_PositionTexture_uColor.vert */; }; - 5034CA32191D591100CE6051 /* ccShader_PositionTexture_uColor.vert in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA03191D591000CE6051 /* ccShader_PositionTexture_uColor.vert */; }; 5034CA33191D591100CE6051 /* ccShader_PositionTexture_uColor.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA04191D591000CE6051 /* ccShader_PositionTexture_uColor.frag */; }; 5034CA34191D591100CE6051 /* ccShader_PositionTexture_uColor.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA04191D591000CE6051 /* ccShader_PositionTexture_uColor.frag */; }; 5034CA35191D591100CE6051 /* ccShader_PositionTexture.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA05191D591000CE6051 /* ccShader_PositionTexture.frag */; }; @@ -1339,8 +881,8 @@ 503DD8E91926736A00CD74DD /* CCES2Renderer.m in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8D71926736A00CD74DD /* CCES2Renderer.m */; }; 503DD8EA1926736A00CD74DD /* CCESRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8D81926736A00CD74DD /* CCESRenderer.h */; }; 503DD8EB1926736A00CD74DD /* CCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8D91926736A00CD74DD /* CCGL.h */; }; - 503DD8EC1926736A00CD74DD /* CCGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8DA1926736A00CD74DD /* CCGLView.h */; }; - 503DD8ED1926736A00CD74DD /* CCGLView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8DB1926736A00CD74DD /* CCGLView.mm */; }; + 503DD8EC1926736A00CD74DD /* CCGLViewImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8DA1926736A00CD74DD /* CCGLViewImpl.h */; }; + 503DD8ED1926736A00CD74DD /* CCGLViewImpl.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8DB1926736A00CD74DD /* CCGLViewImpl.mm */; }; 503DD8EE1926736A00CD74DD /* CCImage.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8DC1926736A00CD74DD /* CCImage.mm */; }; 503DD8EF1926736A00CD74DD /* CCPlatformDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8DD1926736A00CD74DD /* CCPlatformDefine.h */; }; 503DD8F01926736A00CD74DD /* CCStdC.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8DE1926736A00CD74DD /* CCStdC.h */; }; @@ -1665,10 +1207,10 @@ 50ABC00E1926664800A911A9 /* CCFileUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF231926664700A911A9 /* CCFileUtils.cpp */; }; 50ABC00F1926664800A911A9 /* CCFileUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF241926664700A911A9 /* CCFileUtils.h */; }; 50ABC0101926664800A911A9 /* CCFileUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF241926664700A911A9 /* CCFileUtils.h */; }; - 50ABC0111926664800A911A9 /* CCGLViewProtocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF251926664700A911A9 /* CCGLViewProtocol.cpp */; }; - 50ABC0121926664800A911A9 /* CCGLViewProtocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF251926664700A911A9 /* CCGLViewProtocol.cpp */; }; - 50ABC0131926664800A911A9 /* CCGLViewProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF261926664700A911A9 /* CCGLViewProtocol.h */; }; - 50ABC0141926664800A911A9 /* CCGLViewProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF261926664700A911A9 /* CCGLViewProtocol.h */; }; + 50ABC0111926664800A911A9 /* CCGLView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF251926664700A911A9 /* CCGLView.cpp */; }; + 50ABC0121926664800A911A9 /* CCGLView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF251926664700A911A9 /* CCGLView.cpp */; }; + 50ABC0131926664800A911A9 /* CCGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF261926664700A911A9 /* CCGLView.h */; }; + 50ABC0141926664800A911A9 /* CCGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF261926664700A911A9 /* CCGLView.h */; }; 50ABC0151926664800A911A9 /* CCImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF271926664700A911A9 /* CCImage.cpp */; }; 50ABC0161926664800A911A9 /* CCImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF271926664700A911A9 /* CCImage.cpp */; }; 50ABC0171926664800A911A9 /* CCImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF281926664700A911A9 /* CCImage.h */; }; @@ -1681,8 +1223,8 @@ 50ABC01E1926664800A911A9 /* CCThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF2B1926664700A911A9 /* CCThread.cpp */; }; 50ABC01F1926664800A911A9 /* CCThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF2C1926664700A911A9 /* CCThread.h */; }; 50ABC0201926664800A911A9 /* CCThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF2C1926664700A911A9 /* CCThread.h */; }; - 50ABC0211926664800A911A9 /* CCGLView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF2E1926664700A911A9 /* CCGLView.cpp */; }; - 50ABC0231926664800A911A9 /* CCGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF2F1926664700A911A9 /* CCGLView.h */; }; + 50ABC0211926664800A911A9 /* CCGLViewImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF2E1926664700A911A9 /* CCGLViewImpl.cpp */; }; + 50ABC0231926664800A911A9 /* CCGLViewImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF2F1926664700A911A9 /* CCGLViewImpl.h */; }; 50ABC05D1926664800A911A9 /* CCApplication.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF4F1926664700A911A9 /* CCApplication.h */; }; 50ABC05F1926664800A911A9 /* CCApplication.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF501926664700A911A9 /* CCApplication.mm */; }; 50ABC0611926664800A911A9 /* CCCommon.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF511926664700A911A9 /* CCCommon.mm */; }; @@ -1690,81 +1232,22 @@ 50ABC0651926664800A911A9 /* CCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF531926664700A911A9 /* CCGL.h */; }; 50ABC0671926664800A911A9 /* CCPlatformDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF541926664700A911A9 /* CCPlatformDefine.h */; }; 50ABC0691926664800A911A9 /* CCStdC.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF551926664700A911A9 /* CCStdC.h */; }; - 50E6D30E18DADB5D0051CA34 /* CCProtectedNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D30C18DADB5D0051CA34 /* CCProtectedNode.cpp */; }; - 50E6D30F18DADB5D0051CA34 /* CCProtectedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E6D30D18DADB5D0051CA34 /* CCProtectedNode.h */; }; - 50E6D31018DAF01A0051CA34 /* CCProtectedNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D30C18DADB5D0051CA34 /* CCProtectedNode.cpp */; }; - 50E6D31118DAF01E0051CA34 /* CCProtectedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E6D30D18DADB5D0051CA34 /* CCProtectedNode.h */; }; - 50E6D33418E174130051CA34 /* UIHBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D32E18E174130051CA34 /* UIHBox.cpp */; }; - 50E6D33518E174130051CA34 /* UIHBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D32E18E174130051CA34 /* UIHBox.cpp */; }; - 50E6D33618E174130051CA34 /* UIHBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E6D32F18E174130051CA34 /* UIHBox.h */; }; - 50E6D33718E174130051CA34 /* UIHBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E6D32F18E174130051CA34 /* UIHBox.h */; }; - 50E6D33818E174130051CA34 /* UIRelativeBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D33018E174130051CA34 /* UIRelativeBox.cpp */; }; - 50E6D33918E174130051CA34 /* UIRelativeBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D33018E174130051CA34 /* UIRelativeBox.cpp */; }; - 50E6D33A18E174130051CA34 /* UIRelativeBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E6D33118E174130051CA34 /* UIRelativeBox.h */; }; - 50E6D33B18E174130051CA34 /* UIRelativeBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E6D33118E174130051CA34 /* UIRelativeBox.h */; }; - 50E6D33C18E174130051CA34 /* UIVBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D33218E174130051CA34 /* UIVBox.cpp */; }; - 50E6D33D18E174130051CA34 /* UIVBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D33218E174130051CA34 /* UIVBox.cpp */; }; - 50E6D33E18E174130051CA34 /* UIVBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E6D33318E174130051CA34 /* UIVBox.h */; }; - 50E6D33F18E174130051CA34 /* UIVBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E6D33318E174130051CA34 /* UIVBox.h */; }; - 50FCEB9318C72017004AD434 /* ButtonReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB6A18C72017004AD434 /* ButtonReader.cpp */; }; - 50FCEB9418C72017004AD434 /* ButtonReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB6A18C72017004AD434 /* ButtonReader.cpp */; }; - 50FCEB9518C72017004AD434 /* ButtonReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB6B18C72017004AD434 /* ButtonReader.h */; }; - 50FCEB9618C72017004AD434 /* ButtonReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB6B18C72017004AD434 /* ButtonReader.h */; }; - 50FCEB9718C72017004AD434 /* CheckBoxReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB6D18C72017004AD434 /* CheckBoxReader.cpp */; }; - 50FCEB9818C72017004AD434 /* CheckBoxReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB6D18C72017004AD434 /* CheckBoxReader.cpp */; }; - 50FCEB9918C72017004AD434 /* CheckBoxReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB6E18C72017004AD434 /* CheckBoxReader.h */; }; - 50FCEB9A18C72017004AD434 /* CheckBoxReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB6E18C72017004AD434 /* CheckBoxReader.h */; }; - 50FCEB9B18C72017004AD434 /* ImageViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7018C72017004AD434 /* ImageViewReader.cpp */; }; - 50FCEB9C18C72017004AD434 /* ImageViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7018C72017004AD434 /* ImageViewReader.cpp */; }; - 50FCEB9D18C72017004AD434 /* ImageViewReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7118C72017004AD434 /* ImageViewReader.h */; }; - 50FCEB9E18C72017004AD434 /* ImageViewReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7118C72017004AD434 /* ImageViewReader.h */; }; - 50FCEB9F18C72017004AD434 /* LayoutReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7318C72017004AD434 /* LayoutReader.cpp */; }; - 50FCEBA018C72017004AD434 /* LayoutReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7318C72017004AD434 /* LayoutReader.cpp */; }; - 50FCEBA118C72017004AD434 /* LayoutReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7418C72017004AD434 /* LayoutReader.h */; }; - 50FCEBA218C72017004AD434 /* LayoutReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7418C72017004AD434 /* LayoutReader.h */; }; - 50FCEBA318C72017004AD434 /* ListViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7618C72017004AD434 /* ListViewReader.cpp */; }; - 50FCEBA418C72017004AD434 /* ListViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7618C72017004AD434 /* ListViewReader.cpp */; }; - 50FCEBA518C72017004AD434 /* ListViewReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7718C72017004AD434 /* ListViewReader.h */; }; - 50FCEBA618C72017004AD434 /* ListViewReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7718C72017004AD434 /* ListViewReader.h */; }; - 50FCEBA718C72017004AD434 /* LoadingBarReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7918C72017004AD434 /* LoadingBarReader.cpp */; }; - 50FCEBA818C72017004AD434 /* LoadingBarReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7918C72017004AD434 /* LoadingBarReader.cpp */; }; - 50FCEBA918C72017004AD434 /* LoadingBarReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7A18C72017004AD434 /* LoadingBarReader.h */; }; - 50FCEBAA18C72017004AD434 /* LoadingBarReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7A18C72017004AD434 /* LoadingBarReader.h */; }; - 50FCEBAB18C72017004AD434 /* PageViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7C18C72017004AD434 /* PageViewReader.cpp */; }; - 50FCEBAC18C72017004AD434 /* PageViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7C18C72017004AD434 /* PageViewReader.cpp */; }; - 50FCEBAD18C72017004AD434 /* PageViewReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7D18C72017004AD434 /* PageViewReader.h */; }; - 50FCEBAE18C72017004AD434 /* PageViewReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7D18C72017004AD434 /* PageViewReader.h */; }; - 50FCEBAF18C72017004AD434 /* ScrollViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7F18C72017004AD434 /* ScrollViewReader.cpp */; }; - 50FCEBB018C72017004AD434 /* ScrollViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7F18C72017004AD434 /* ScrollViewReader.cpp */; }; - 50FCEBB118C72017004AD434 /* ScrollViewReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8018C72017004AD434 /* ScrollViewReader.h */; }; - 50FCEBB218C72017004AD434 /* ScrollViewReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8018C72017004AD434 /* ScrollViewReader.h */; }; - 50FCEBB318C72017004AD434 /* SliderReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8218C72017004AD434 /* SliderReader.cpp */; }; - 50FCEBB418C72017004AD434 /* SliderReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8218C72017004AD434 /* SliderReader.cpp */; }; - 50FCEBB518C72017004AD434 /* SliderReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8318C72017004AD434 /* SliderReader.h */; }; - 50FCEBB618C72017004AD434 /* SliderReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8318C72017004AD434 /* SliderReader.h */; }; - 50FCEBB718C72017004AD434 /* TextAtlasReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8518C72017004AD434 /* TextAtlasReader.cpp */; }; - 50FCEBB818C72017004AD434 /* TextAtlasReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8518C72017004AD434 /* TextAtlasReader.cpp */; }; - 50FCEBB918C72017004AD434 /* TextAtlasReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8618C72017004AD434 /* TextAtlasReader.h */; }; - 50FCEBBA18C72017004AD434 /* TextAtlasReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8618C72017004AD434 /* TextAtlasReader.h */; }; - 50FCEBBB18C72017004AD434 /* TextBMFontReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8818C72017004AD434 /* TextBMFontReader.cpp */; }; - 50FCEBBC18C72017004AD434 /* TextBMFontReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8818C72017004AD434 /* TextBMFontReader.cpp */; }; - 50FCEBBD18C72017004AD434 /* TextBMFontReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8918C72017004AD434 /* TextBMFontReader.h */; }; - 50FCEBBE18C72017004AD434 /* TextBMFontReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8918C72017004AD434 /* TextBMFontReader.h */; }; - 50FCEBBF18C72017004AD434 /* TextFieldReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8B18C72017004AD434 /* TextFieldReader.cpp */; }; - 50FCEBC018C72017004AD434 /* TextFieldReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8B18C72017004AD434 /* TextFieldReader.cpp */; }; - 50FCEBC118C72017004AD434 /* TextFieldReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8C18C72017004AD434 /* TextFieldReader.h */; }; - 50FCEBC218C72017004AD434 /* TextFieldReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8C18C72017004AD434 /* TextFieldReader.h */; }; - 50FCEBC318C72017004AD434 /* TextReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8E18C72017004AD434 /* TextReader.cpp */; }; - 50FCEBC418C72017004AD434 /* TextReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8E18C72017004AD434 /* TextReader.cpp */; }; - 50FCEBC518C72017004AD434 /* TextReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8F18C72017004AD434 /* TextReader.h */; }; - 50FCEBC618C72017004AD434 /* TextReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8F18C72017004AD434 /* TextReader.h */; }; - 50FCEBC718C72017004AD434 /* WidgetReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB9018C72017004AD434 /* WidgetReader.cpp */; }; - 50FCEBC818C72017004AD434 /* WidgetReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB9018C72017004AD434 /* WidgetReader.cpp */; }; - 50FCEBC918C72017004AD434 /* WidgetReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB9118C72017004AD434 /* WidgetReader.h */; }; - 50FCEBCA18C72017004AD434 /* WidgetReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB9118C72017004AD434 /* WidgetReader.h */; }; - 50FCEBCB18C72017004AD434 /* WidgetReaderProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB9218C72017004AD434 /* WidgetReaderProtocol.h */; }; - 50FCEBCC18C72017004AD434 /* WidgetReaderProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB9218C72017004AD434 /* WidgetReaderProtocol.h */; }; A07A4CAF1783777C0073F6A7 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1551A342158F2AB200E66CFE /* Foundation.framework */; }; + B217703C1977ECB4009EE11B /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B217703B1977ECB4009EE11B /* IOKit.framework */; }; + B21770401977ECE6009EE11B /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B217703F1977ECE6009EE11B /* OpenGL.framework */; }; + B21770421977ECF8009EE11B /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B21770411977ECF8009EE11B /* ApplicationServices.framework */; }; + B21770451977ED14009EE11B /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B21770431977ED07009EE11B /* Cocoa.framework */; }; + B21770471977ED34009EE11B /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B21770461977ED34009EE11B /* QuartzCore.framework */; }; + B21770491977ED4C009EE11B /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B21770481977ED4C009EE11B /* libz.dylib */; }; + B217704E1977ED9F009EE11B /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B217704C1977ED8B009EE11B /* libsqlite3.dylib */; }; + B244F3071976871800ED1926 /* HttpClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5363180E3374000584C8 /* HttpClient.h */; }; + B244F3081976871C00ED1926 /* HttpResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5365180E3374000584C8 /* HttpResponse.h */; }; + B244F3091976871F00ED1926 /* SocketIO.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5367180E3374000584C8 /* SocketIO.h */; }; + B244F30A1976872C00ED1926 /* WebSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5369180E3374000584C8 /* WebSocket.h */; }; + B244F30B1976873300ED1926 /* HttpRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5364180E3374000584C8 /* HttpRequest.h */; }; + B244F30C1976874300ED1926 /* HttpClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5362180E3374000584C8 /* HttpClient.cpp */; }; + B244F30E1976875100ED1926 /* SocketIO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5366180E3374000584C8 /* SocketIO.cpp */; }; + B244F30F1976875300ED1926 /* WebSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5368180E3374000584C8 /* WebSocket.cpp */; }; B24AA985195A675C007B4522 /* CCFastTMXLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B24AA981195A675C007B4522 /* CCFastTMXLayer.cpp */; }; B24AA986195A675C007B4522 /* CCFastTMXLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B24AA981195A675C007B4522 /* CCFastTMXLayer.cpp */; }; B24AA987195A675C007B4522 /* CCFastTMXLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = B24AA982195A675C007B4522 /* CCFastTMXLayer.h */; }; @@ -1773,6 +1256,9 @@ B24AA98A195A675C007B4522 /* CCFastTMXTiledMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B24AA983195A675C007B4522 /* CCFastTMXTiledMap.cpp */; }; B24AA98B195A675C007B4522 /* CCFastTMXTiledMap.h in Headers */ = {isa = PBXBuildFile; fileRef = B24AA984195A675C007B4522 /* CCFastTMXTiledMap.h */; }; B24AA98C195A675C007B4522 /* CCFastTMXTiledMap.h in Headers */ = {isa = PBXBuildFile; fileRef = B24AA984195A675C007B4522 /* CCFastTMXTiledMap.h */; }; + B27AEE0219768934008BD575 /* libwebsockets.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AAF5384180E35A3000584C8 /* libwebsockets.a */; }; + B282B4801980E08F00666787 /* CCEditBoxImplMac.h in Headers */ = {isa = PBXBuildFile; fileRef = B282B47D1980E02B00666787 /* CCEditBoxImplMac.h */; }; + B282B4811980E0A300666787 /* CCEditBoxImplMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = B282B47C1980E02B00666787 /* CCEditBoxImplMac.mm */; }; B29594B41926D5EC003EEF37 /* CCMeshCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594B21926D5EC003EEF37 /* CCMeshCommand.cpp */; }; B29594B51926D5EC003EEF37 /* CCMeshCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594B21926D5EC003EEF37 /* CCMeshCommand.cpp */; }; B29594B61926D5EC003EEF37 /* CCMeshCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594B31926D5EC003EEF37 /* CCMeshCommand.h */; }; @@ -1793,8 +1279,536 @@ B29594CF1926D61F003EEF37 /* CCSprite3DMaterial.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594BF1926D61F003EEF37 /* CCSprite3DMaterial.cpp */; }; B29594D01926D61F003EEF37 /* CCSprite3DMaterial.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594C01926D61F003EEF37 /* CCSprite3DMaterial.h */; }; B29594D11926D61F003EEF37 /* CCSprite3DMaterial.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594C01926D61F003EEF37 /* CCSprite3DMaterial.h */; }; + B2C599BF1977703300B452DF /* CCBAnimationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71CFB180E26E600808F54 /* CCBAnimationManager.h */; }; + B2C599C01977703300B452DF /* CCBFileLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71CFD180E26E600808F54 /* CCBFileLoader.h */; }; + B2C599C11977703300B452DF /* CCBKeyframe.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71CFF180E26E600808F54 /* CCBKeyframe.h */; }; + B2C599C21977703300B452DF /* CCBMemberVariableAssigner.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D00180E26E600808F54 /* CCBMemberVariableAssigner.h */; }; + B2C599C31977703300B452DF /* CCBReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D02180E26E600808F54 /* CCBReader.h */; }; + B2C599C41977703300B452DF /* CCBSelectorResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D03180E26E600808F54 /* CCBSelectorResolver.h */; }; + B2C599C51977703300B452DF /* CCBSequence.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D05180E26E600808F54 /* CCBSequence.h */; }; + B2C599C61977703300B452DF /* CCBSequenceProperty.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D07180E26E600808F54 /* CCBSequenceProperty.h */; }; + B2C599C71977703300B452DF /* CCControlButtonLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D0B180E26E600808F54 /* CCControlButtonLoader.h */; }; + B2C599C81977703300B452DF /* CCControlLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D0D180E26E600808F54 /* CCControlLoader.h */; }; + B2C599C91977703300B452DF /* CCLabelBMFontLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D0F180E26E600808F54 /* CCLabelBMFontLoader.h */; }; + B2C599CA1977703300B452DF /* CCLabelTTFLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D11180E26E600808F54 /* CCLabelTTFLoader.h */; }; + B2C599CB1977703300B452DF /* CCLayerColorLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D13180E26E600808F54 /* CCLayerColorLoader.h */; }; + B2C599CC1977703300B452DF /* CCLayerGradientLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D15180E26E600808F54 /* CCLayerGradientLoader.h */; }; + B2C599CD1977703300B452DF /* CCLayerLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D17180E26E600808F54 /* CCLayerLoader.h */; }; + B2C599CE1977703300B452DF /* CCMenuItemImageLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D19180E26E600808F54 /* CCMenuItemImageLoader.h */; }; + B2C599CF1977703300B452DF /* CCMenuItemLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D1B180E26E600808F54 /* CCMenuItemLoader.h */; }; + B2C599D01977703300B452DF /* CCMenuLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D1C180E26E600808F54 /* CCMenuLoader.h */; }; + B2C599D11977703300B452DF /* CCNode+CCBRelativePositioning.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D1E180E26E600808F54 /* CCNode+CCBRelativePositioning.h */; }; + B2C599D21977703300B452DF /* CCNodeLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D20180E26E600808F54 /* CCNodeLoader.h */; }; + B2C599D31977703300B452DF /* CCNodeLoaderLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D22180E26E600808F54 /* CCNodeLoaderLibrary.h */; }; + B2C599D41977703300B452DF /* CCNodeLoaderListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D23180E26E600808F54 /* CCNodeLoaderListener.h */; }; + B2C599D51977703300B452DF /* CCParticleSystemQuadLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D25180E26E600808F54 /* CCParticleSystemQuadLoader.h */; }; + B2C599D61977703300B452DF /* CCScale9SpriteLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D27180E26E600808F54 /* CCScale9SpriteLoader.h */; }; + B2C599D71977703300B452DF /* CCScrollViewLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D29180E26E600808F54 /* CCScrollViewLoader.h */; }; + B2C599D81977703300B452DF /* CCSpriteLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D2B180E26E600808F54 /* CCSpriteLoader.h */; }; + B2C599D91977703300B452DF /* CocosBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D2C180E26E600808F54 /* CocosBuilder.h */; }; + B2C59A061977706500B452DF /* CCBAnimationManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71CFA180E26E600808F54 /* CCBAnimationManager.cpp */; }; + B2C59A071977706500B452DF /* CCBFileLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71CFC180E26E600808F54 /* CCBFileLoader.cpp */; }; + B2C59A081977706500B452DF /* CCBKeyframe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71CFE180E26E600808F54 /* CCBKeyframe.cpp */; }; + B2C59A091977706500B452DF /* CCBReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D01180E26E600808F54 /* CCBReader.cpp */; }; + B2C59A0A1977706500B452DF /* CCBSequence.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D04180E26E600808F54 /* CCBSequence.cpp */; }; + B2C59A0B1977706500B452DF /* CCBSequenceProperty.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D06180E26E600808F54 /* CCBSequenceProperty.cpp */; }; + B2C59A0C1977706500B452DF /* CCControlButtonLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D0A180E26E600808F54 /* CCControlButtonLoader.cpp */; }; + B2C59A0D1977706500B452DF /* CCControlLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D0C180E26E600808F54 /* CCControlLoader.cpp */; }; + B2C59A0E1977706500B452DF /* CCLabelBMFontLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D0E180E26E600808F54 /* CCLabelBMFontLoader.cpp */; }; + B2C59A0F1977706500B452DF /* CCLabelTTFLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D10180E26E600808F54 /* CCLabelTTFLoader.cpp */; }; + B2C59A101977706500B452DF /* CCLayerColorLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D12180E26E600808F54 /* CCLayerColorLoader.cpp */; }; + B2C59A111977706500B452DF /* CCLayerGradientLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D14180E26E600808F54 /* CCLayerGradientLoader.cpp */; }; + B2C59A121977706500B452DF /* CCLayerLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D16180E26E600808F54 /* CCLayerLoader.cpp */; }; + B2C59A131977706500B452DF /* CCMenuItemImageLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D18180E26E600808F54 /* CCMenuItemImageLoader.cpp */; }; + B2C59A141977706500B452DF /* CCMenuItemLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D1A180E26E600808F54 /* CCMenuItemLoader.cpp */; }; + B2C59A151977706500B452DF /* CCNode+CCBRelativePositioning.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D1D180E26E600808F54 /* CCNode+CCBRelativePositioning.cpp */; }; + B2C59A161977706500B452DF /* CCNodeLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D1F180E26E600808F54 /* CCNodeLoader.cpp */; }; + B2C59A171977706500B452DF /* CCNodeLoaderLibrary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D21180E26E600808F54 /* CCNodeLoaderLibrary.cpp */; }; + B2C59A181977706500B452DF /* CCParticleSystemQuadLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D24180E26E600808F54 /* CCParticleSystemQuadLoader.cpp */; }; + B2C59A191977706500B452DF /* CCScale9SpriteLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D26180E26E600808F54 /* CCScale9SpriteLoader.cpp */; }; + B2C59A1A1977706500B452DF /* CCScrollViewLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D28180E26E600808F54 /* CCScrollViewLoader.cpp */; }; + B2C59A1B1977706500B452DF /* CCSpriteLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D2A180E26E600808F54 /* CCSpriteLoader.cpp */; }; + B2C59A1C19777E7500B452DF /* UIListView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9FE18CF08D000240AA3 /* UIListView.cpp */; }; + B2C59A1D19777E7500B452DF /* UILoadingBar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0018CF08D000240AA3 /* UILoadingBar.cpp */; }; + B2C59A1E19777E7500B452DF /* UIPageView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0218CF08D000240AA3 /* UIPageView.cpp */; }; + B2C59A1F19777E7500B452DF /* UIRichText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0418CF08D000240AA3 /* UIRichText.cpp */; }; + B2C59A2019777E7500B452DF /* UIScrollView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0718CF08D000240AA3 /* UIScrollView.cpp */; }; + B2C59A2119777E7500B452DF /* UISlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0918CF08D000240AA3 /* UISlider.cpp */; }; + B2C59A2219777E7500B452DF /* UIText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0B18CF08D100240AA3 /* UIText.cpp */; }; + B2C59A2319777E7500B452DF /* UITextAtlas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0D18CF08D100240AA3 /* UITextAtlas.cpp */; }; + B2C59A2419777E7500B452DF /* UITextBMFont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0F18CF08D100240AA3 /* UITextBMFont.cpp */; }; + B2C59A2519777E7500B452DF /* UITextField.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA1118CF08D100240AA3 /* UITextField.cpp */; }; + B2C59A2619777E7500B452DF /* UIButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F018CF08D000240AA3 /* UIButton.cpp */; }; + B2C59A2719777E7500B452DF /* UICheckBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F218CF08D000240AA3 /* UICheckBox.cpp */; }; + B2C59A2819777E7500B452DF /* UIImageView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F618CF08D000240AA3 /* UIImageView.cpp */; }; + B2C59A2919777E7A00B452DF /* CocosGUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9E918CF08D000240AA3 /* CocosGUI.cpp */; }; + B2C59A2A19777E8300B452DF /* UIDeprecated.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29BDBA52195D597A003225C9 /* UIDeprecated.cpp */; }; + B2C59A2B19777E8300B452DF /* UIWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA1318CF08D100240AA3 /* UIWidget.cpp */; }; + B2C59A2D19777E8300B452DF /* UIHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F418CF08D000240AA3 /* UIHelper.cpp */; }; + B2C59A2E19777E8C00B452DF /* UIHBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D32E18E174130051CA34 /* UIHBox.cpp */; }; + B2C59A2F19777E8C00B452DF /* UIRelativeBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D33018E174130051CA34 /* UIRelativeBox.cpp */; }; + B2C59A3019777E8C00B452DF /* UIVBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D33218E174130051CA34 /* UIVBox.cpp */; }; + B2C59A3119777E8C00B452DF /* UILayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F818CF08D000240AA3 /* UILayout.cpp */; }; + B2C59A3219777E8C00B452DF /* UILayoutParameter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9FC18CF08D000240AA3 /* UILayoutParameter.cpp */; }; + B2C59A3319777E8C00B452DF /* UILayoutManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29CB8F4A1929D1BB00C841D6 /* UILayoutManager.cpp */; }; + B2C59A3419777EB600B452DF /* UIListView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9FF18CF08D000240AA3 /* UIListView.h */; }; + B2C59A3519777EB600B452DF /* UILoadingBar.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0118CF08D000240AA3 /* UILoadingBar.h */; }; + B2C59A3619777EB600B452DF /* UIPageView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0318CF08D000240AA3 /* UIPageView.h */; }; + B2C59A3719777EB600B452DF /* UIRichText.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0518CF08D000240AA3 /* UIRichText.h */; }; + B2C59A3819777EB600B452DF /* UIScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0818CF08D000240AA3 /* UIScrollView.h */; }; + B2C59A3919777EB600B452DF /* UISlider.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0A18CF08D100240AA3 /* UISlider.h */; }; + B2C59A3A19777EB600B452DF /* UIText.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0C18CF08D100240AA3 /* UIText.h */; }; + B2C59A3B19777EB600B452DF /* UITextAtlas.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0E18CF08D100240AA3 /* UITextAtlas.h */; }; + B2C59A3C19777EB600B452DF /* UITextBMFont.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA1018CF08D100240AA3 /* UITextBMFont.h */; }; + B2C59A3D19777EB600B452DF /* UITextField.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA1218CF08D100240AA3 /* UITextField.h */; }; + B2C59A3E19777EB600B452DF /* UIButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F118CF08D000240AA3 /* UIButton.h */; }; + B2C59A3F19777EB600B452DF /* UICheckBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F318CF08D000240AA3 /* UICheckBox.h */; }; + B2C59A4019777EB600B452DF /* UIImageView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F718CF08D000240AA3 /* UIImageView.h */; }; + B2C59A4119777EBC00B452DF /* UIVideoPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA0FB69191C841D00B170C8 /* UIVideoPlayer.h */; }; + B2C59A4219777EC700B452DF /* UIDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = 29080DEB191B82CE0066F8DF /* UIDeprecated.h */; }; + B2C59A4319777EC700B452DF /* UIWidget.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA1418CF08D100240AA3 /* UIWidget.h */; }; + B2C59A4519777EC700B452DF /* UIHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F518CF08D000240AA3 /* UIHelper.h */; }; + B2C59A4619777EC700B452DF /* GUIDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9EB18CF08D000240AA3 /* GUIDefine.h */; }; + B2C59A4719777ECF00B452DF /* UIHBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E6D32F18E174130051CA34 /* UIHBox.h */; }; + B2C59A4819777ECF00B452DF /* UIRelativeBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E6D33118E174130051CA34 /* UIRelativeBox.h */; }; + B2C59A4919777ECF00B452DF /* UIVBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E6D33318E174130051CA34 /* UIVBox.h */; }; + B2C59A4A19777ECF00B452DF /* UILayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F918CF08D000240AA3 /* UILayout.h */; }; + B2C59A4B19777ECF00B452DF /* UILayoutParameter.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9FD18CF08D000240AA3 /* UILayoutParameter.h */; }; + B2C59A4C19777ECF00B452DF /* UILayoutManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 29CB8F4B1929D1BB00C841D6 /* UILayoutManager.h */; }; + B2C59A4D19777F8A00B452DF /* CocoLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 29E99D1D1957BA7000046604 /* CocoLoader.h */; }; + B2C59A4E19777F9200B452DF /* CCActionTimeline.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4C6194B19E400E608AF /* CCActionTimeline.h */; }; + B2C59A4F19777F9200B452DF /* CCActionTimelineCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4C8194B19E400E608AF /* CCActionTimelineCache.h */; }; + B2C59A5019777F9200B452DF /* CCFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4CA194B19E400E608AF /* CCFrame.h */; }; + B2C59A5119777F9200B452DF /* CCNodeReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4CC194B19E400E608AF /* CCNodeReader.h */; }; + B2C59A5219777F9200B452DF /* CCTimeLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4CE194B19E400E608AF /* CCTimeLine.h */; }; + B2C59A5319777F9200B452DF /* CCTimelineMacro.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4CF194B19E400E608AF /* CCTimelineMacro.h */; }; + B2C59A5419777F9700B452DF /* ButtonReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB6B18C72017004AD434 /* ButtonReader.h */; }; + B2C59A5519777F9800B452DF /* CheckBoxReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB6E18C72017004AD434 /* CheckBoxReader.h */; }; + B2C59A5619777FC200B452DF /* ImageViewReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7118C72017004AD434 /* ImageViewReader.h */; }; + B2C59A5719777FC200B452DF /* LayoutReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7418C72017004AD434 /* LayoutReader.h */; }; + B2C59A5819777FC200B452DF /* ListViewReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7718C72017004AD434 /* ListViewReader.h */; }; + B2C59A5919777FC200B452DF /* LoadingBarReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7A18C72017004AD434 /* LoadingBarReader.h */; }; + B2C59A5A19777FC200B452DF /* PageViewReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7D18C72017004AD434 /* PageViewReader.h */; }; + B2C59A5B19777FC200B452DF /* ScrollViewReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8018C72017004AD434 /* ScrollViewReader.h */; }; + B2C59A5C19777FC200B452DF /* SliderReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8318C72017004AD434 /* SliderReader.h */; }; + B2C59A5D19777FC200B452DF /* TextAtlasReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8618C72017004AD434 /* TextAtlasReader.h */; }; + B2C59A5E19777FC200B452DF /* TextBMFontReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8918C72017004AD434 /* TextBMFontReader.h */; }; + B2C59A5F19777FC200B452DF /* TextFieldReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8C18C72017004AD434 /* TextFieldReader.h */; }; + B2C59A6019777FC200B452DF /* TextReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8F18C72017004AD434 /* TextReader.h */; }; + B2C59A6119777FC200B452DF /* WidgetReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB9118C72017004AD434 /* WidgetReader.h */; }; + B2C59A6219777FC200B452DF /* WidgetReaderProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB9218C72017004AD434 /* WidgetReaderProtocol.h */; }; + B2C59A6319777FD000B452DF /* TriggerObj.h in Headers */ = {isa = PBXBuildFile; fileRef = 06CAAAC1186AD63B0012A414 /* TriggerObj.h */; }; + B2C59A6419777FD000B452DF /* TriggerBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 06CAAABD186AD63B0012A414 /* TriggerBase.h */; }; + B2C59A6519777FD000B452DF /* TriggerMng.h in Headers */ = {isa = PBXBuildFile; fileRef = 06CAAABF186AD63B0012A414 /* TriggerMng.h */; }; + B2C59A6619777FD000B452DF /* CCActionFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5949180E930E00EF57C3 /* CCActionFrame.h */; }; + B2C59A6719777FD000B452DF /* CCActionFrameEasing.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C594B180E930E00EF57C3 /* CCActionFrameEasing.h */; }; + B2C59A6819777FD000B452DF /* CCActionManagerEx.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C594D180E930E00EF57C3 /* CCActionManagerEx.h */; }; + B2C59A6919777FD000B452DF /* CCActionNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C594F180E930E00EF57C3 /* CCActionNode.h */; }; + B2C59A6A19777FD000B452DF /* CCActionObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5951180E930E00EF57C3 /* CCActionObject.h */; }; + B2C59A6B19777FD000B452DF /* CCArmature.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5953180E930E00EF57C3 /* CCArmature.h */; }; + B2C59A6C19777FD000B452DF /* CCArmatureAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5955180E930E00EF57C3 /* CCArmatureAnimation.h */; }; + B2C59A6D19777FD000B452DF /* CCArmatureDataManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5957180E930E00EF57C3 /* CCArmatureDataManager.h */; }; + B2C59A6E19777FD000B452DF /* CCArmatureDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5959180E930E00EF57C3 /* CCArmatureDefine.h */; }; + B2C59A6F19777FD000B452DF /* CCBatchNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C595B180E930E00EF57C3 /* CCBatchNode.h */; }; + B2C59A7019777FD000B452DF /* CCBone.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C595D180E930E00EF57C3 /* CCBone.h */; }; + B2C59A7119777FD000B452DF /* CCColliderDetector.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C595F180E930E00EF57C3 /* CCColliderDetector.h */; }; + B2C59A7219777FD000B452DF /* CCComBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 373B910718787C0B00198F86 /* CCComBase.h */; }; + B2C59A7319777FD000B452DF /* CCComAttribute.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5961180E930E00EF57C3 /* CCComAttribute.h */; }; + B2C59A7419777FD000B452DF /* CCComAudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5963180E930E00EF57C3 /* CCComAudio.h */; }; + B2C59A7519777FD000B452DF /* CCComController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5965180E930E00EF57C3 /* CCComController.h */; }; + B2C59A7619777FD000B452DF /* CCComRender.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5967180E930E00EF57C3 /* CCComRender.h */; }; + B2C59A7719777FD000B452DF /* CCDataReaderHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5969180E930E00EF57C3 /* CCDataReaderHelper.h */; }; + B2C59A7819777FD000B452DF /* CCDatas.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C596B180E930E00EF57C3 /* CCDatas.h */; }; + B2C59A7919777FD000B452DF /* CCDecorativeDisplay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C596D180E930E00EF57C3 /* CCDecorativeDisplay.h */; }; + B2C59A7A19777FD000B452DF /* CCDisplayFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C596F180E930E00EF57C3 /* CCDisplayFactory.h */; }; + B2C59A7B19777FD000B452DF /* CCDisplayManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5971180E930E00EF57C3 /* CCDisplayManager.h */; }; + B2C59A7C19777FD000B452DF /* CCInputDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5973180E930E00EF57C3 /* CCInputDelegate.h */; }; + B2C59A7D19777FD000B452DF /* CCProcessBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5975180E930E00EF57C3 /* CCProcessBase.h */; }; + B2C59A7E19777FD100B452DF /* CCSGUIReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5977180E930E00EF57C3 /* CCSGUIReader.h */; }; + B2C59A7F19777FD100B452DF /* CCSkin.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5979180E930E00EF57C3 /* CCSkin.h */; }; + B2C59A8019777FD100B452DF /* CCSpriteFrameCacheHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C597B180E930E00EF57C3 /* CCSpriteFrameCacheHelper.h */; }; + B2C59A8119777FD100B452DF /* CCSSceneReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C597D180E930E00EF57C3 /* CCSSceneReader.h */; }; + B2C59A8219777FD100B452DF /* CCTransformHelp.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C597F180E930E00EF57C3 /* CCTransformHelp.h */; }; + B2C59A8319777FD100B452DF /* CCTween.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5981180E930E00EF57C3 /* CCTween.h */; }; + B2C59A8419777FD100B452DF /* CCUtilMath.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5985180E930E00EF57C3 /* CCUtilMath.h */; }; + B2C59A8519777FD100B452DF /* CocoStudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5986180E930E00EF57C3 /* CocoStudio.h */; }; + B2C59A8619777FD100B452DF /* DictionaryHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C598A180E930E00EF57C3 /* DictionaryHelper.h */; }; + B2C59A871977801A00B452DF /* CocoLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29E99D1C1957BA7000046604 /* CocoLoader.cpp */; }; + B2C59A881977802100B452DF /* CCActionTimeline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4C5194B19E400E608AF /* CCActionTimeline.cpp */; }; + B2C59A891977802100B452DF /* CCActionTimelineCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4C7194B19E400E608AF /* CCActionTimelineCache.cpp */; }; + B2C59A8A1977802100B452DF /* CCFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4C9194B19E400E608AF /* CCFrame.cpp */; }; + B2C59A8B1977802100B452DF /* CCNodeReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4CB194B19E400E608AF /* CCNodeReader.cpp */; }; + B2C59A8C1977802100B452DF /* CCTimeLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4CD194B19E400E608AF /* CCTimeLine.cpp */; }; + B2C59A8D1977803400B452DF /* ButtonReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB6A18C72017004AD434 /* ButtonReader.cpp */; }; + B2C59A8E1977803400B452DF /* CheckBoxReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB6D18C72017004AD434 /* CheckBoxReader.cpp */; }; + B2C59A8F1977803400B452DF /* ImageViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7018C72017004AD434 /* ImageViewReader.cpp */; }; + B2C59A901977803400B452DF /* LayoutReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7318C72017004AD434 /* LayoutReader.cpp */; }; + B2C59A911977803400B452DF /* ListViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7618C72017004AD434 /* ListViewReader.cpp */; }; + B2C59A921977803400B452DF /* LoadingBarReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7918C72017004AD434 /* LoadingBarReader.cpp */; }; + B2C59A931977803400B452DF /* PageViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7C18C72017004AD434 /* PageViewReader.cpp */; }; + B2C59A941977803400B452DF /* ScrollViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7F18C72017004AD434 /* ScrollViewReader.cpp */; }; + B2C59A951977803400B452DF /* SliderReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8218C72017004AD434 /* SliderReader.cpp */; }; + B2C59A961977803400B452DF /* TextAtlasReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8518C72017004AD434 /* TextAtlasReader.cpp */; }; + B2C59A971977803400B452DF /* TextBMFontReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8818C72017004AD434 /* TextBMFontReader.cpp */; }; + B2C59A981977803400B452DF /* TextFieldReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8B18C72017004AD434 /* TextFieldReader.cpp */; }; + B2C59A991977803400B452DF /* TextReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8E18C72017004AD434 /* TextReader.cpp */; }; + B2C59A9A1977803400B452DF /* WidgetReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB9018C72017004AD434 /* WidgetReader.cpp */; }; + B2C59A9B1977804700B452DF /* TriggerBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06CAAABC186AD63B0012A414 /* TriggerBase.cpp */; }; + B2C59A9C1977804700B452DF /* TriggerMng.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06CAAABE186AD63B0012A414 /* TriggerMng.cpp */; }; + B2C59A9D1977804700B452DF /* TriggerObj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06CAAAC0186AD63B0012A414 /* TriggerObj.cpp */; }; + B2C59A9E1977804700B452DF /* CCActionFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5948180E930E00EF57C3 /* CCActionFrame.cpp */; }; + B2C59A9F1977804700B452DF /* CCActionFrameEasing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C594A180E930E00EF57C3 /* CCActionFrameEasing.cpp */; }; + B2C59AA01977804700B452DF /* CCActionManagerEx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C594C180E930E00EF57C3 /* CCActionManagerEx.cpp */; }; + B2C59AA11977804800B452DF /* CCActionNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C594E180E930E00EF57C3 /* CCActionNode.cpp */; }; + B2C59AA21977804800B452DF /* CCActionObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5950180E930E00EF57C3 /* CCActionObject.cpp */; }; + B2C59AA31977804800B452DF /* CCArmature.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5952180E930E00EF57C3 /* CCArmature.cpp */; }; + B2C59AA41977804800B452DF /* CCArmatureAnimation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5954180E930E00EF57C3 /* CCArmatureAnimation.cpp */; }; + B2C59AA51977804800B452DF /* CCArmatureDataManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5956180E930E00EF57C3 /* CCArmatureDataManager.cpp */; }; + B2C59AA61977804800B452DF /* CCArmatureDefine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5958180E930E00EF57C3 /* CCArmatureDefine.cpp */; }; + B2C59AA71977804800B452DF /* CCBatchNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C595A180E930E00EF57C3 /* CCBatchNode.cpp */; }; + B2C59AA81977804800B452DF /* CCBone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C595C180E930E00EF57C3 /* CCBone.cpp */; }; + B2C59AA91977804800B452DF /* CCColliderDetector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C595E180E930E00EF57C3 /* CCColliderDetector.cpp */; }; + B2C59AAA1977804800B452DF /* CCComAttribute.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5960180E930E00EF57C3 /* CCComAttribute.cpp */; }; + B2C59AAB1977804800B452DF /* CCComAudio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5962180E930E00EF57C3 /* CCComAudio.cpp */; }; + B2C59AAC1977804800B452DF /* CCComController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5964180E930E00EF57C3 /* CCComController.cpp */; }; + B2C59AAD1977804800B452DF /* CCComRender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5966180E930E00EF57C3 /* CCComRender.cpp */; }; + B2C59AAE1977804800B452DF /* CCDataReaderHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5968180E930E00EF57C3 /* CCDataReaderHelper.cpp */; }; + B2C59AAF1977804800B452DF /* CCDatas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C596A180E930E00EF57C3 /* CCDatas.cpp */; }; + B2C59AB01977804800B452DF /* CCDecorativeDisplay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C596C180E930E00EF57C3 /* CCDecorativeDisplay.cpp */; }; + B2C59AB11977804800B452DF /* CCDisplayFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C596E180E930E00EF57C3 /* CCDisplayFactory.cpp */; }; + B2C59AB21977804800B452DF /* CCDisplayManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5970180E930E00EF57C3 /* CCDisplayManager.cpp */; }; + B2C59AB31977804800B452DF /* CCInputDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5972180E930E00EF57C3 /* CCInputDelegate.cpp */; }; + B2C59AB41977804800B452DF /* CCProcessBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5974180E930E00EF57C3 /* CCProcessBase.cpp */; }; + B2C59AB51977804800B452DF /* CCSGUIReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5976180E930E00EF57C3 /* CCSGUIReader.cpp */; }; + B2C59AB61977804800B452DF /* CCSkin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5978180E930E00EF57C3 /* CCSkin.cpp */; }; + B2C59AB71977804800B452DF /* CCSpriteFrameCacheHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C597A180E930E00EF57C3 /* CCSpriteFrameCacheHelper.cpp */; }; + B2C59AB81977804800B452DF /* CCSSceneReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C597C180E930E00EF57C3 /* CCSSceneReader.cpp */; }; + B2C59AB91977804800B452DF /* CCTransformHelp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C597E180E930E00EF57C3 /* CCTransformHelp.cpp */; }; + B2C59ABA1977804800B452DF /* CCTween.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5980180E930E00EF57C3 /* CCTween.cpp */; }; + B2C59ABB1977804800B452DF /* CCUtilMath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5984180E930E00EF57C3 /* CCUtilMath.cpp */; }; + B2C59ABC1977804800B452DF /* DictionaryHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5989180E930E00EF57C3 /* DictionaryHelper.cpp */; }; + B2C59ACB197782FF00B452DF /* UIVideoPlayerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3EA0FB6A191C841D00B170C8 /* UIVideoPlayerIOS.mm */; }; + B2CC5025197763350041958E /* HttpClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5363180E3374000584C8 /* HttpClient.h */; }; + B2CC50261977633B0041958E /* HttpRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5364180E3374000584C8 /* HttpRequest.h */; }; + B2CC50271977633D0041958E /* HttpResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5365180E3374000584C8 /* HttpResponse.h */; }; + B2CC50291977634A0041958E /* HttpClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5362180E3374000584C8 /* HttpClient.cpp */; }; + B2CC502A1977635D0041958E /* WebSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5369180E3374000584C8 /* WebSocket.h */; }; + B2CC502B1977635F0041958E /* SocketIO.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5367180E3374000584C8 /* SocketIO.h */; }; + B2CC502C197763620041958E /* WebSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5368180E3374000584C8 /* WebSocket.cpp */; }; + B2CC502D197763640041958E /* SocketIO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5366180E3374000584C8 /* SocketIO.cpp */; }; + B2CC502E1977638A0041958E /* libwebsockets.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AAF5387180E35AC000584C8 /* libwebsockets.a */; }; + B2CC504619776C0D0041958E /* SkeletonBounds.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795DA18628689005EC8E1 /* SkeletonBounds.h */; }; + B2CC504719776C0D0041958E /* Event.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D61862867D005EC8E1 /* Event.h */; }; + B2CC504819776C0D0041958E /* EventData.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D81862867D005EC8E1 /* EventData.h */; }; + B2CC504919776C0D0041958E /* BoundingBoxAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D418628672005EC8E1 /* BoundingBoxAttachment.h */; }; + B2CC504A19776C0D0041958E /* Animation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D7F180E26E600808F54 /* Animation.h */; }; + B2CC504B19776C0D0041958E /* AnimationState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D81180E26E600808F54 /* AnimationState.h */; }; + B2CC504C19776C0D0041958E /* AnimationStateData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D83180E26E600808F54 /* AnimationStateData.h */; }; + B2CC504D19776C0D0041958E /* Atlas.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D85180E26E600808F54 /* Atlas.h */; }; + B2CC504E19776C0D0041958E /* AtlasAttachmentLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D87180E26E600808F54 /* AtlasAttachmentLoader.h */; }; + B2CC504F19776C0D0041958E /* Attachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D89180E26E600808F54 /* Attachment.h */; }; + B2CC505019776C0D0041958E /* AttachmentLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D8B180E26E600808F54 /* AttachmentLoader.h */; }; + B2CC505119776C0D0041958E /* Bone.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D8D180E26E600808F54 /* Bone.h */; }; + B2CC505219776C0D0041958E /* BoneData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D8F180E26E600808F54 /* BoneData.h */; }; + B2CC505319776C0E0041958E /* CCSkeleton.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D91180E26E600808F54 /* CCSkeleton.h */; }; + B2CC505419776C0E0041958E /* CCSkeletonAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D93180E26E600808F54 /* CCSkeletonAnimation.h */; }; + B2CC505519776C0E0041958E /* extension.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D95180E26E600808F54 /* extension.h */; }; + B2CC505619776C0E0041958E /* Json.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D97180E26E600808F54 /* Json.h */; }; + B2CC505719776C0E0041958E /* RegionAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D99180E26E600808F54 /* RegionAttachment.h */; }; + B2CC505819776C0E0041958E /* Skeleton.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D9B180E26E600808F54 /* Skeleton.h */; }; + B2CC505919776C0E0041958E /* SkeletonData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D9D180E26E600808F54 /* SkeletonData.h */; }; + B2CC505A19776C0E0041958E /* SkeletonJson.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D9F180E26E600808F54 /* SkeletonJson.h */; }; + B2CC505B19776C0E0041958E /* Skin.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA1180E26E600808F54 /* Skin.h */; }; + B2CC505C19776C0E0041958E /* Slot.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA3180E26E600808F54 /* Slot.h */; }; + B2CC505D19776C0E0041958E /* SlotData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA5180E26E600808F54 /* SlotData.h */; }; + B2CC505E19776C0E0041958E /* spine-cocos2dx.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA7180E26E600808F54 /* spine-cocos2dx.h */; }; + B2CC505F19776C0E0041958E /* spine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA8180E26E600808F54 /* spine.h */; }; + B2CC506019776C340041958E /* SkeletonBounds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D918628689005EC8E1 /* SkeletonBounds.cpp */; }; + B2CC506119776C340041958E /* Event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D51862867D005EC8E1 /* Event.cpp */; }; + B2CC506219776C340041958E /* EventData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D71862867D005EC8E1 /* EventData.cpp */; }; + B2CC506319776C340041958E /* BoundingBoxAttachment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D318628672005EC8E1 /* BoundingBoxAttachment.cpp */; }; + B2CC506419776C340041958E /* Animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D7E180E26E600808F54 /* Animation.cpp */; }; + B2CC506519776C340041958E /* AnimationState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D80180E26E600808F54 /* AnimationState.cpp */; }; + B2CC506619776C340041958E /* AnimationStateData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D82180E26E600808F54 /* AnimationStateData.cpp */; }; + B2CC506719776C340041958E /* Atlas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D84180E26E600808F54 /* Atlas.cpp */; }; + B2CC506819776C340041958E /* AtlasAttachmentLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D86180E26E600808F54 /* AtlasAttachmentLoader.cpp */; }; + B2CC506919776C340041958E /* Attachment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D88180E26E600808F54 /* Attachment.cpp */; }; + B2CC506A19776C340041958E /* AttachmentLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D8A180E26E600808F54 /* AttachmentLoader.cpp */; }; + B2CC506B19776C340041958E /* Bone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D8C180E26E600808F54 /* Bone.cpp */; }; + B2CC506C19776C340041958E /* BoneData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D8E180E26E600808F54 /* BoneData.cpp */; }; + B2CC506D19776C340041958E /* CCSkeleton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D90180E26E600808F54 /* CCSkeleton.cpp */; }; + B2CC506E19776C340041958E /* CCSkeletonAnimation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D92180E26E600808F54 /* CCSkeletonAnimation.cpp */; }; + B2CC506F19776C340041958E /* extension.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D94180E26E600808F54 /* extension.cpp */; }; + B2CC507019776C340041958E /* Json.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D96180E26E600808F54 /* Json.cpp */; }; + B2CC507119776C340041958E /* RegionAttachment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D98180E26E600808F54 /* RegionAttachment.cpp */; }; + B2CC507219776C340041958E /* Skeleton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D9A180E26E600808F54 /* Skeleton.cpp */; }; + B2CC507319776C340041958E /* SkeletonData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D9C180E26E600808F54 /* SkeletonData.cpp */; }; + B2CC507419776C340041958E /* SkeletonJson.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D9E180E26E600808F54 /* SkeletonJson.cpp */; }; + B2CC507519776C340041958E /* Skin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA0180E26E600808F54 /* Skin.cpp */; }; + B2CC507619776C340041958E /* Slot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA2180E26E600808F54 /* Slot.cpp */; }; + B2CC507719776C340041958E /* SlotData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA4180E26E600808F54 /* SlotData.cpp */; }; + B2CC507819776C340041958E /* spine-cocos2dx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA6180E26E600808F54 /* spine-cocos2dx.cpp */; }; + B2CC507C19776DD10041958E /* CCPhysicsJoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A170721807CE7A005B8026 /* CCPhysicsJoint.cpp */; }; B2D3D3B91948613300BA4831 /* CCBundle3DData.h in Headers */ = {isa = PBXBuildFile; fileRef = B2D3D3B81948613300BA4831 /* CCBundle3DData.h */; }; B2D3D3BA1948613300BA4831 /* CCBundle3DData.h in Headers */ = {isa = PBXBuildFile; fileRef = B2D3D3B81948613300BA4831 /* CCBundle3DData.h */; }; + B2DB4764197661D500411E16 /* UIWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA1318CF08D100240AA3 /* UIWidget.cpp */; }; + B2DB4765197661E400411E16 /* UIHBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D32E18E174130051CA34 /* UIHBox.cpp */; }; + B2DB4766197661EE00411E16 /* UILayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F818CF08D000240AA3 /* UILayout.cpp */; }; + B2DB47681976650A00411E16 /* UIWidget.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA1418CF08D100240AA3 /* UIWidget.h */; }; + B2DB47691976651E00411E16 /* UIHBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E6D32F18E174130051CA34 /* UIHBox.h */; }; + B2DB476A1976653000411E16 /* UILayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F918CF08D000240AA3 /* UILayout.h */; }; + B2DB476B1976654800411E16 /* UILayoutManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29CB8F4A1929D1BB00C841D6 /* UILayoutManager.cpp */; }; + B2DB476C1976654D00411E16 /* UILayoutManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 29CB8F4B1929D1BB00C841D6 /* UILayoutManager.h */; }; + B2DB476D1976655700411E16 /* UILayoutParameter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9FC18CF08D000240AA3 /* UILayoutParameter.cpp */; }; + B2DB476E1976655C00411E16 /* UILayoutParameter.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9FD18CF08D000240AA3 /* UILayoutParameter.h */; }; + B2DB476F1976656D00411E16 /* UIRelativeBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D33018E174130051CA34 /* UIRelativeBox.cpp */; }; + B2DB47701976657000411E16 /* UIRelativeBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E6D33118E174130051CA34 /* UIRelativeBox.h */; }; + B2DB47711976657A00411E16 /* UIVBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D33218E174130051CA34 /* UIVBox.cpp */; }; + B2DB47721976658000411E16 /* UIVBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E6D33318E174130051CA34 /* UIVBox.h */; }; + B2DB47731976658E00411E16 /* CocosGUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9E918CF08D000240AA3 /* CocosGUI.cpp */; }; + B2DB47741976659800411E16 /* CocosGUI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9EA18CF08D000240AA3 /* CocosGUI.h */; }; + B2DB4775197665A500411E16 /* UIDeprecated.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29BDBA52195D597A003225C9 /* UIDeprecated.cpp */; }; + B2DB4776197665AA00411E16 /* UIDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = 29080DEB191B82CE0066F8DF /* UIDeprecated.h */; }; + B2DB4777197665B400411E16 /* UIHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F418CF08D000240AA3 /* UIHelper.cpp */; }; + B2DB4778197665BF00411E16 /* UIHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F518CF08D000240AA3 /* UIHelper.h */; }; + B2DB4779197665CD00411E16 /* UIListView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9FE18CF08D000240AA3 /* UIListView.cpp */; }; + B2DB477A197665D000411E16 /* UIListView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9FF18CF08D000240AA3 /* UIListView.h */; }; + B2DB477B197665D900411E16 /* UIPageView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0218CF08D000240AA3 /* UIPageView.cpp */; }; + B2DB477C197665DB00411E16 /* UIPageView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0318CF08D000240AA3 /* UIPageView.h */; }; + B2DB477D197665E500411E16 /* UIScrollView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0718CF08D000240AA3 /* UIScrollView.cpp */; }; + B2DB477E197665E700411E16 /* UIScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0818CF08D000240AA3 /* UIScrollView.h */; }; + B2DB477F1976660000411E16 /* UIButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F018CF08D000240AA3 /* UIButton.cpp */; }; + B2DB47801976660200411E16 /* UIButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F118CF08D000240AA3 /* UIButton.h */; }; + B2DB47811976660A00411E16 /* UICheckBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F218CF08D000240AA3 /* UICheckBox.cpp */; }; + B2DB47821976660C00411E16 /* UICheckBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F318CF08D000240AA3 /* UICheckBox.h */; }; + B2DB47831976661800411E16 /* UIImageView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F618CF08D000240AA3 /* UIImageView.cpp */; }; + B2DB47841976661A00411E16 /* UIImageView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F718CF08D000240AA3 /* UIImageView.h */; }; + B2DB47851976662B00411E16 /* UILoadingBar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0018CF08D000240AA3 /* UILoadingBar.cpp */; }; + B2DB47861976662D00411E16 /* UILoadingBar.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0118CF08D000240AA3 /* UILoadingBar.h */; }; + B2DB47871976663800411E16 /* UIRichText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0418CF08D000240AA3 /* UIRichText.cpp */; }; + B2DB47881976663A00411E16 /* UIRichText.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0518CF08D000240AA3 /* UIRichText.h */; }; + B2DB47891976664200411E16 /* UISlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0918CF08D000240AA3 /* UISlider.cpp */; }; + B2DB478A1976664400411E16 /* UISlider.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0A18CF08D100240AA3 /* UISlider.h */; }; + B2DB478B1976665700411E16 /* UIText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0B18CF08D100240AA3 /* UIText.cpp */; }; + B2DB478C1976665700411E16 /* UITextAtlas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0D18CF08D100240AA3 /* UITextAtlas.cpp */; }; + B2DB478D1976665700411E16 /* UITextBMFont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0F18CF08D100240AA3 /* UITextBMFont.cpp */; }; + B2DB478E1976665700411E16 /* UITextField.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA1118CF08D100240AA3 /* UITextField.cpp */; }; + B2DB478F1976666100411E16 /* UIText.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0C18CF08D100240AA3 /* UIText.h */; }; + B2DB47901976666100411E16 /* UITextAtlas.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0E18CF08D100240AA3 /* UITextAtlas.h */; }; + B2DB47911976666100411E16 /* UITextBMFont.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA1018CF08D100240AA3 /* UITextBMFont.h */; }; + B2DB47921976666100411E16 /* UITextField.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA1218CF08D100240AA3 /* UITextField.h */; }; + B2DB47D319766CD100411E16 /* CCBAnimationManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71CFA180E26E600808F54 /* CCBAnimationManager.cpp */; }; + B2DB47D419766CD300411E16 /* CCBFileLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71CFC180E26E600808F54 /* CCBFileLoader.cpp */; }; + B2DB47D519766CD600411E16 /* CCBKeyframe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71CFE180E26E600808F54 /* CCBKeyframe.cpp */; }; + B2DB47D619766CD900411E16 /* CCBReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D01180E26E600808F54 /* CCBReader.cpp */; }; + B2DB47D719766CE100411E16 /* CCBSequence.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D04180E26E600808F54 /* CCBSequence.cpp */; }; + B2DB47D819766CE500411E16 /* CCBSequenceProperty.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D06180E26E600808F54 /* CCBSequenceProperty.cpp */; }; + B2DB47D919766CEA00411E16 /* CCNode+CCBRelativePositioning.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D1D180E26E600808F54 /* CCNode+CCBRelativePositioning.cpp */; }; + B2DB47DA19766D4200411E16 /* CCControlButtonLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D0A180E26E600808F54 /* CCControlButtonLoader.cpp */; }; + B2DB47DB19766D4400411E16 /* CCControlLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D0C180E26E600808F54 /* CCControlLoader.cpp */; }; + B2DB47DC19766D5600411E16 /* CCLabelBMFontLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D0E180E26E600808F54 /* CCLabelBMFontLoader.cpp */; }; + B2DB47DD19766D5800411E16 /* CCLabelTTFLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D10180E26E600808F54 /* CCLabelTTFLoader.cpp */; }; + B2DB47DE19766D6700411E16 /* CCLayerColorLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D12180E26E600808F54 /* CCLayerColorLoader.cpp */; }; + B2DB47DF19766D6900411E16 /* CCLayerGradientLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D14180E26E600808F54 /* CCLayerGradientLoader.cpp */; }; + B2DB47E019766D6A00411E16 /* CCLayerLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D16180E26E600808F54 /* CCLayerLoader.cpp */; }; + B2DB47E119766D7600411E16 /* CCMenuItemImageLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D18180E26E600808F54 /* CCMenuItemImageLoader.cpp */; }; + B2DB47E219766D7800411E16 /* CCMenuItemLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D1A180E26E600808F54 /* CCMenuItemLoader.cpp */; }; + B2DB47E319766D8600411E16 /* CCNodeLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D1F180E26E600808F54 /* CCNodeLoader.cpp */; }; + B2DB47E419766D8700411E16 /* CCNodeLoaderLibrary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D21180E26E600808F54 /* CCNodeLoaderLibrary.cpp */; }; + B2DB47E519766D9400411E16 /* CCParticleSystemQuadLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D24180E26E600808F54 /* CCParticleSystemQuadLoader.cpp */; }; + B2DB47E619766D9E00411E16 /* CCScale9SpriteLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D26180E26E600808F54 /* CCScale9SpriteLoader.cpp */; }; + B2DB47E719766DAE00411E16 /* CCScrollViewLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D28180E26E600808F54 /* CCScrollViewLoader.cpp */; }; + B2DB47E819766DBB00411E16 /* CCSpriteLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D2A180E26E600808F54 /* CCSpriteLoader.cpp */; }; + B2DB47E919766E2A00411E16 /* CCBAnimationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71CFB180E26E600808F54 /* CCBAnimationManager.h */; }; + B2DB47EA19766E2A00411E16 /* CCBFileLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71CFD180E26E600808F54 /* CCBFileLoader.h */; }; + B2DB47EB19766E2A00411E16 /* CCBKeyframe.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71CFF180E26E600808F54 /* CCBKeyframe.h */; }; + B2DB47EC19766E2A00411E16 /* CCBMemberVariableAssigner.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D00180E26E600808F54 /* CCBMemberVariableAssigner.h */; }; + B2DB47ED19766E2A00411E16 /* CCBReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D02180E26E600808F54 /* CCBReader.h */; }; + B2DB47EE19766E2A00411E16 /* CCBSelectorResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D03180E26E600808F54 /* CCBSelectorResolver.h */; }; + B2DB47EF19766E2A00411E16 /* CCBSequence.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D05180E26E600808F54 /* CCBSequence.h */; }; + B2DB47F019766E2A00411E16 /* CCBSequenceProperty.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D07180E26E600808F54 /* CCBSequenceProperty.h */; }; + B2DB47F119766E2A00411E16 /* CCControlButtonLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D0B180E26E600808F54 /* CCControlButtonLoader.h */; }; + B2DB47F219766E2A00411E16 /* CCControlLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D0D180E26E600808F54 /* CCControlLoader.h */; }; + B2DB47F319766E2A00411E16 /* CCLabelBMFontLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D0F180E26E600808F54 /* CCLabelBMFontLoader.h */; }; + B2DB47F419766E2A00411E16 /* CCLabelTTFLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D11180E26E600808F54 /* CCLabelTTFLoader.h */; }; + B2DB47F519766E2A00411E16 /* CCLayerColorLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D13180E26E600808F54 /* CCLayerColorLoader.h */; }; + B2DB47F619766E2A00411E16 /* CCLayerGradientLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D15180E26E600808F54 /* CCLayerGradientLoader.h */; }; + B2DB47F719766E2A00411E16 /* CCLayerLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D17180E26E600808F54 /* CCLayerLoader.h */; }; + B2DB47F819766E2A00411E16 /* CCMenuItemImageLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D19180E26E600808F54 /* CCMenuItemImageLoader.h */; }; + B2DB47F919766E2A00411E16 /* CCMenuItemLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D1B180E26E600808F54 /* CCMenuItemLoader.h */; }; + B2DB47FA19766E2A00411E16 /* CCMenuLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D1C180E26E600808F54 /* CCMenuLoader.h */; }; + B2DB47FB19766E2A00411E16 /* CCNode+CCBRelativePositioning.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D1E180E26E600808F54 /* CCNode+CCBRelativePositioning.h */; }; + B2DB47FC19766E2A00411E16 /* CCNodeLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D20180E26E600808F54 /* CCNodeLoader.h */; }; + B2DB47FD19766E2A00411E16 /* CCNodeLoaderLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D22180E26E600808F54 /* CCNodeLoaderLibrary.h */; }; + B2DB47FE19766E2A00411E16 /* CCNodeLoaderListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D23180E26E600808F54 /* CCNodeLoaderListener.h */; }; + B2DB47FF19766E2A00411E16 /* CCParticleSystemQuadLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D25180E26E600808F54 /* CCParticleSystemQuadLoader.h */; }; + B2DB480019766E2A00411E16 /* CCScale9SpriteLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D27180E26E600808F54 /* CCScale9SpriteLoader.h */; }; + B2DB480119766E2A00411E16 /* CCScrollViewLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D29180E26E600808F54 /* CCScrollViewLoader.h */; }; + B2DB480219766E2A00411E16 /* CCSpriteLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D2B180E26E600808F54 /* CCSpriteLoader.h */; }; + B2DB480319766E2A00411E16 /* CocosBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D2C180E26E600808F54 /* CocosBuilder.h */; }; + B2DB484E19767C7000411E16 /* TriggerObj.h in Headers */ = {isa = PBXBuildFile; fileRef = 06CAAAC1186AD63B0012A414 /* TriggerObj.h */; }; + B2DB484F19767C7000411E16 /* TriggerBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 06CAAABD186AD63B0012A414 /* TriggerBase.h */; }; + B2DB485019767C7000411E16 /* TriggerMng.h in Headers */ = {isa = PBXBuildFile; fileRef = 06CAAABF186AD63B0012A414 /* TriggerMng.h */; }; + B2DB485119767C7000411E16 /* CCActionFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5949180E930E00EF57C3 /* CCActionFrame.h */; }; + B2DB485219767C7000411E16 /* CCActionFrameEasing.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C594B180E930E00EF57C3 /* CCActionFrameEasing.h */; }; + B2DB485319767C7000411E16 /* CCActionManagerEx.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C594D180E930E00EF57C3 /* CCActionManagerEx.h */; }; + B2DB485419767C7000411E16 /* CCActionNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C594F180E930E00EF57C3 /* CCActionNode.h */; }; + B2DB485519767C7000411E16 /* CCActionObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5951180E930E00EF57C3 /* CCActionObject.h */; }; + B2DB485619767C7000411E16 /* CCArmature.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5953180E930E00EF57C3 /* CCArmature.h */; }; + B2DB485719767C7000411E16 /* CCArmatureAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5955180E930E00EF57C3 /* CCArmatureAnimation.h */; }; + B2DB485819767C7000411E16 /* CCArmatureDataManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5957180E930E00EF57C3 /* CCArmatureDataManager.h */; }; + B2DB485919767C7000411E16 /* CCArmatureDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5959180E930E00EF57C3 /* CCArmatureDefine.h */; }; + B2DB485A19767C7000411E16 /* CCBatchNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C595B180E930E00EF57C3 /* CCBatchNode.h */; }; + B2DB485B19767C7000411E16 /* CCBone.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C595D180E930E00EF57C3 /* CCBone.h */; }; + B2DB485C19767C7000411E16 /* CCColliderDetector.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C595F180E930E00EF57C3 /* CCColliderDetector.h */; }; + B2DB485D19767C7000411E16 /* CCComBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 373B910718787C0B00198F86 /* CCComBase.h */; }; + B2DB485E19767C7000411E16 /* CCComAttribute.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5961180E930E00EF57C3 /* CCComAttribute.h */; }; + B2DB485F19767C7000411E16 /* CCComAudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5963180E930E00EF57C3 /* CCComAudio.h */; }; + B2DB486019767C7000411E16 /* CCComController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5965180E930E00EF57C3 /* CCComController.h */; }; + B2DB486119767C7000411E16 /* CCComRender.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5967180E930E00EF57C3 /* CCComRender.h */; }; + B2DB486219767C7000411E16 /* CCDataReaderHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5969180E930E00EF57C3 /* CCDataReaderHelper.h */; }; + B2DB486319767C7000411E16 /* CCDatas.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C596B180E930E00EF57C3 /* CCDatas.h */; }; + B2DB486419767C7000411E16 /* CCDecorativeDisplay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C596D180E930E00EF57C3 /* CCDecorativeDisplay.h */; }; + B2DB486519767C7000411E16 /* CCDisplayFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C596F180E930E00EF57C3 /* CCDisplayFactory.h */; }; + B2DB486619767C7000411E16 /* CCDisplayManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5971180E930E00EF57C3 /* CCDisplayManager.h */; }; + B2DB486719767C7000411E16 /* CCInputDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5973180E930E00EF57C3 /* CCInputDelegate.h */; }; + B2DB486819767C7000411E16 /* CCProcessBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5975180E930E00EF57C3 /* CCProcessBase.h */; }; + B2DB486919767C7000411E16 /* CCSGUIReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5977180E930E00EF57C3 /* CCSGUIReader.h */; }; + B2DB486A19767C7000411E16 /* CCSkin.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5979180E930E00EF57C3 /* CCSkin.h */; }; + B2DB486B19767C7000411E16 /* CCSpriteFrameCacheHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C597B180E930E00EF57C3 /* CCSpriteFrameCacheHelper.h */; }; + B2DB486C19767C7000411E16 /* CCSSceneReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C597D180E930E00EF57C3 /* CCSSceneReader.h */; }; + B2DB486D19767C7000411E16 /* CCTransformHelp.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C597F180E930E00EF57C3 /* CCTransformHelp.h */; }; + B2DB486E19767C7000411E16 /* CCTween.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5981180E930E00EF57C3 /* CCTween.h */; }; + B2DB486F19767C7000411E16 /* CCUtilMath.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5985180E930E00EF57C3 /* CCUtilMath.h */; }; + B2DB487019767C7000411E16 /* CocoStudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5986180E930E00EF57C3 /* CocoStudio.h */; }; + B2DB487119767C7000411E16 /* DictionaryHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C598A180E930E00EF57C3 /* DictionaryHelper.h */; }; + B2DB487219767C7C00411E16 /* CCActionTimeline.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4C6194B19E400E608AF /* CCActionTimeline.h */; }; + B2DB487319767C7C00411E16 /* CCActionTimelineCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4C8194B19E400E608AF /* CCActionTimelineCache.h */; }; + B2DB487419767C7C00411E16 /* CCFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4CA194B19E400E608AF /* CCFrame.h */; }; + B2DB487519767C7C00411E16 /* CCNodeReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4CC194B19E400E608AF /* CCNodeReader.h */; }; + B2DB487619767C7C00411E16 /* CCTimeLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4CE194B19E400E608AF /* CCTimeLine.h */; }; + B2DB487719767C7C00411E16 /* CCTimelineMacro.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4CF194B19E400E608AF /* CCTimelineMacro.h */; }; + B2DB487819767C7F00411E16 /* CocoLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 29E99D1D1957BA7000046604 /* CocoLoader.h */; }; + B2DB487919767C9D00411E16 /* WidgetReaderProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB9218C72017004AD434 /* WidgetReaderProtocol.h */; }; + B2DB487A19767C9E00411E16 /* WidgetReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB9118C72017004AD434 /* WidgetReader.h */; }; + B2DB487B19767CA100411E16 /* TextReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8F18C72017004AD434 /* TextReader.h */; }; + B2DB487C19767CA300411E16 /* TextFieldReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8C18C72017004AD434 /* TextFieldReader.h */; }; + B2DB487D19767CA500411E16 /* TextBMFontReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8918C72017004AD434 /* TextBMFontReader.h */; }; + B2DB487E19767CA800411E16 /* TextAtlasReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8618C72017004AD434 /* TextAtlasReader.h */; }; + B2DB487F19767CAA00411E16 /* SliderReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8318C72017004AD434 /* SliderReader.h */; }; + B2DB488019767CAD00411E16 /* ScrollViewReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8018C72017004AD434 /* ScrollViewReader.h */; }; + B2DB488119767CB000411E16 /* PageViewReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7D18C72017004AD434 /* PageViewReader.h */; }; + B2DB488219767CB300411E16 /* LoadingBarReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7A18C72017004AD434 /* LoadingBarReader.h */; }; + B2DB488319767CB500411E16 /* ListViewReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7718C72017004AD434 /* ListViewReader.h */; }; + B2DB488419767CB700411E16 /* LayoutReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7418C72017004AD434 /* LayoutReader.h */; }; + B2DB488519767CBA00411E16 /* ImageViewReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7118C72017004AD434 /* ImageViewReader.h */; }; + B2DB488619767CBD00411E16 /* CheckBoxReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB6E18C72017004AD434 /* CheckBoxReader.h */; }; + B2DB488719767CBF00411E16 /* ButtonReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB6B18C72017004AD434 /* ButtonReader.h */; }; + B2DB488819767CD900411E16 /* CocoLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29E99D1C1957BA7000046604 /* CocoLoader.cpp */; }; + B2DB488919767CDC00411E16 /* CCActionTimeline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4C5194B19E400E608AF /* CCActionTimeline.cpp */; }; + B2DB488A19767CDD00411E16 /* CCActionTimelineCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4C7194B19E400E608AF /* CCActionTimelineCache.cpp */; }; + B2DB488B19767CE000411E16 /* CCFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4C9194B19E400E608AF /* CCFrame.cpp */; }; + B2DB488C19767CE200411E16 /* CCNodeReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4CB194B19E400E608AF /* CCNodeReader.cpp */; }; + B2DB488D19767CE300411E16 /* CCTimeLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4CD194B19E400E608AF /* CCTimeLine.cpp */; }; + B2DB488E19767CEE00411E16 /* ButtonReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB6A18C72017004AD434 /* ButtonReader.cpp */; }; + B2DB488F19767CF200411E16 /* CheckBoxReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB6D18C72017004AD434 /* CheckBoxReader.cpp */; }; + B2DB489019767CF400411E16 /* ImageViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7018C72017004AD434 /* ImageViewReader.cpp */; }; + B2DB489119767CF700411E16 /* LayoutReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7318C72017004AD434 /* LayoutReader.cpp */; }; + B2DB489219767CFA00411E16 /* ListViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7618C72017004AD434 /* ListViewReader.cpp */; }; + B2DB489319767CFD00411E16 /* LoadingBarReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7918C72017004AD434 /* LoadingBarReader.cpp */; }; + B2DB489419767D0000411E16 /* PageViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7C18C72017004AD434 /* PageViewReader.cpp */; }; + B2DB489519767D0200411E16 /* ScrollViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7F18C72017004AD434 /* ScrollViewReader.cpp */; }; + B2DB489619767D0600411E16 /* SliderReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8218C72017004AD434 /* SliderReader.cpp */; }; + B2DB489719767D0800411E16 /* TextAtlasReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8518C72017004AD434 /* TextAtlasReader.cpp */; }; + B2DB489819767D0B00411E16 /* TextBMFontReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8818C72017004AD434 /* TextBMFontReader.cpp */; }; + B2DB489919767D0E00411E16 /* TextFieldReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8B18C72017004AD434 /* TextFieldReader.cpp */; }; + B2DB489A19767D1100411E16 /* TextReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8E18C72017004AD434 /* TextReader.cpp */; }; + B2DB489B19767D1400411E16 /* WidgetReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB9018C72017004AD434 /* WidgetReader.cpp */; }; + B2DB489C19767D2000411E16 /* TriggerBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06CAAABC186AD63B0012A414 /* TriggerBase.cpp */; }; + B2DB489D19767D2000411E16 /* TriggerMng.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06CAAABE186AD63B0012A414 /* TriggerMng.cpp */; }; + B2DB489E19767D2000411E16 /* TriggerObj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06CAAAC0186AD63B0012A414 /* TriggerObj.cpp */; }; + B2DB489F19767D2000411E16 /* CCActionFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5948180E930E00EF57C3 /* CCActionFrame.cpp */; }; + B2DB48A019767D2000411E16 /* CCActionFrameEasing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C594A180E930E00EF57C3 /* CCActionFrameEasing.cpp */; }; + B2DB48A119767D2000411E16 /* CCActionManagerEx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C594C180E930E00EF57C3 /* CCActionManagerEx.cpp */; }; + B2DB48A219767D2000411E16 /* CCActionNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C594E180E930E00EF57C3 /* CCActionNode.cpp */; }; + B2DB48A319767D2000411E16 /* CCActionObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5950180E930E00EF57C3 /* CCActionObject.cpp */; }; + B2DB48A419767D2000411E16 /* CCArmature.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5952180E930E00EF57C3 /* CCArmature.cpp */; }; + B2DB48A519767D2000411E16 /* CCArmatureAnimation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5954180E930E00EF57C3 /* CCArmatureAnimation.cpp */; }; + B2DB48A619767D2000411E16 /* CCArmatureDataManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5956180E930E00EF57C3 /* CCArmatureDataManager.cpp */; }; + B2DB48A719767D2000411E16 /* CCArmatureDefine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5958180E930E00EF57C3 /* CCArmatureDefine.cpp */; }; + B2DB48A819767D2000411E16 /* CCBatchNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C595A180E930E00EF57C3 /* CCBatchNode.cpp */; }; + B2DB48A919767D2000411E16 /* CCBone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C595C180E930E00EF57C3 /* CCBone.cpp */; }; + B2DB48AA19767D2000411E16 /* CCColliderDetector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C595E180E930E00EF57C3 /* CCColliderDetector.cpp */; }; + B2DB48AB19767D2000411E16 /* CCComAttribute.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5960180E930E00EF57C3 /* CCComAttribute.cpp */; }; + B2DB48AC19767D2000411E16 /* CCComAudio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5962180E930E00EF57C3 /* CCComAudio.cpp */; }; + B2DB48AD19767D2000411E16 /* CCComController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5964180E930E00EF57C3 /* CCComController.cpp */; }; + B2DB48AE19767D2000411E16 /* CCComRender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5966180E930E00EF57C3 /* CCComRender.cpp */; }; + B2DB48AF19767D2000411E16 /* CCDataReaderHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5968180E930E00EF57C3 /* CCDataReaderHelper.cpp */; }; + B2DB48B019767D2000411E16 /* CCDatas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C596A180E930E00EF57C3 /* CCDatas.cpp */; }; + B2DB48B119767D2000411E16 /* CCDecorativeDisplay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C596C180E930E00EF57C3 /* CCDecorativeDisplay.cpp */; }; + B2DB48B219767D2000411E16 /* CCDisplayFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C596E180E930E00EF57C3 /* CCDisplayFactory.cpp */; }; + B2DB48B319767D2000411E16 /* CCDisplayManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5970180E930E00EF57C3 /* CCDisplayManager.cpp */; }; + B2DB48B419767D2000411E16 /* CCInputDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5972180E930E00EF57C3 /* CCInputDelegate.cpp */; }; + B2DB48B519767D2000411E16 /* CCProcessBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5974180E930E00EF57C3 /* CCProcessBase.cpp */; }; + B2DB48B619767D2000411E16 /* CCSGUIReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5976180E930E00EF57C3 /* CCSGUIReader.cpp */; }; + B2DB48B719767D2000411E16 /* CCSkin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5978180E930E00EF57C3 /* CCSkin.cpp */; }; + B2DB48B819767D2000411E16 /* CCSpriteFrameCacheHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C597A180E930E00EF57C3 /* CCSpriteFrameCacheHelper.cpp */; }; + B2DB48B919767D2000411E16 /* CCSSceneReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C597C180E930E00EF57C3 /* CCSSceneReader.cpp */; }; + B2DB48BA19767D2000411E16 /* CCTransformHelp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C597E180E930E00EF57C3 /* CCTransformHelp.cpp */; }; + B2DB48BB19767D2000411E16 /* CCTween.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5980180E930E00EF57C3 /* CCTween.cpp */; }; + B2DB48BC19767D2000411E16 /* CCUtilMath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5984180E930E00EF57C3 /* CCUtilMath.cpp */; }; + B2DB48BD19767D2000411E16 /* DictionaryHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5989180E930E00EF57C3 /* DictionaryHelper.cpp */; }; + B2DB490219767F5300411E16 /* SkeletonBounds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D918628689005EC8E1 /* SkeletonBounds.cpp */; }; + B2DB490319767F5300411E16 /* Event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D51862867D005EC8E1 /* Event.cpp */; }; + B2DB490419767F5300411E16 /* EventData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D71862867D005EC8E1 /* EventData.cpp */; }; + B2DB490519767F5300411E16 /* BoundingBoxAttachment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D318628672005EC8E1 /* BoundingBoxAttachment.cpp */; }; + B2DB490619767F5300411E16 /* Animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D7E180E26E600808F54 /* Animation.cpp */; }; + B2DB490719767F5300411E16 /* AnimationState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D80180E26E600808F54 /* AnimationState.cpp */; }; + B2DB490819767F5300411E16 /* AnimationStateData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D82180E26E600808F54 /* AnimationStateData.cpp */; }; + B2DB490919767F5300411E16 /* Atlas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D84180E26E600808F54 /* Atlas.cpp */; }; + B2DB490A19767F5300411E16 /* AtlasAttachmentLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D86180E26E600808F54 /* AtlasAttachmentLoader.cpp */; }; + B2DB490B19767F5300411E16 /* Attachment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D88180E26E600808F54 /* Attachment.cpp */; }; + B2DB490C19767F5300411E16 /* AttachmentLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D8A180E26E600808F54 /* AttachmentLoader.cpp */; }; + B2DB490D19767F5300411E16 /* Bone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D8C180E26E600808F54 /* Bone.cpp */; }; + B2DB490E19767F5300411E16 /* BoneData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D8E180E26E600808F54 /* BoneData.cpp */; }; + B2DB490F19767F5300411E16 /* CCSkeleton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D90180E26E600808F54 /* CCSkeleton.cpp */; }; + B2DB491019767F5300411E16 /* CCSkeletonAnimation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D92180E26E600808F54 /* CCSkeletonAnimation.cpp */; }; + B2DB491119767F5300411E16 /* extension.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D94180E26E600808F54 /* extension.cpp */; }; + B2DB491219767F5300411E16 /* Json.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D96180E26E600808F54 /* Json.cpp */; }; + B2DB491319767F5300411E16 /* RegionAttachment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D98180E26E600808F54 /* RegionAttachment.cpp */; }; + B2DB491419767F5300411E16 /* Skeleton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D9A180E26E600808F54 /* Skeleton.cpp */; }; + B2DB491519767F5300411E16 /* SkeletonData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D9C180E26E600808F54 /* SkeletonData.cpp */; }; + B2DB491619767F5300411E16 /* SkeletonJson.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D9E180E26E600808F54 /* SkeletonJson.cpp */; }; + B2DB491719767F5300411E16 /* Skin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA0180E26E600808F54 /* Skin.cpp */; }; + B2DB491819767F5300411E16 /* Slot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA2180E26E600808F54 /* Slot.cpp */; }; + B2DB491919767F5300411E16 /* SlotData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA4180E26E600808F54 /* SlotData.cpp */; }; + B2DB491A19767F5300411E16 /* spine-cocos2dx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA6180E26E600808F54 /* spine-cocos2dx.cpp */; }; + B2DB491B19767F7700411E16 /* SkeletonBounds.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795DA18628689005EC8E1 /* SkeletonBounds.h */; }; + B2DB491C19767F7700411E16 /* Event.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D61862867D005EC8E1 /* Event.h */; }; + B2DB491D19767F7700411E16 /* EventData.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D81862867D005EC8E1 /* EventData.h */; }; + B2DB491E19767F7700411E16 /* BoundingBoxAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D418628672005EC8E1 /* BoundingBoxAttachment.h */; }; + B2DB491F19767F7700411E16 /* Animation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D7F180E26E600808F54 /* Animation.h */; }; + B2DB492019767F7700411E16 /* AnimationState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D81180E26E600808F54 /* AnimationState.h */; }; + B2DB492119767F7700411E16 /* AnimationStateData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D83180E26E600808F54 /* AnimationStateData.h */; }; + B2DB492219767F7700411E16 /* Atlas.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D85180E26E600808F54 /* Atlas.h */; }; + B2DB492319767F7700411E16 /* AtlasAttachmentLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D87180E26E600808F54 /* AtlasAttachmentLoader.h */; }; + B2DB492419767F7700411E16 /* Attachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D89180E26E600808F54 /* Attachment.h */; }; + B2DB492519767F7700411E16 /* AttachmentLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D8B180E26E600808F54 /* AttachmentLoader.h */; }; + B2DB492619767F7700411E16 /* Bone.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D8D180E26E600808F54 /* Bone.h */; }; + B2DB492719767F7700411E16 /* BoneData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D8F180E26E600808F54 /* BoneData.h */; }; + B2DB492819767F7700411E16 /* CCSkeleton.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D91180E26E600808F54 /* CCSkeleton.h */; }; + B2DB492919767F7700411E16 /* CCSkeletonAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D93180E26E600808F54 /* CCSkeletonAnimation.h */; }; + B2DB492A19767F7700411E16 /* extension.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D95180E26E600808F54 /* extension.h */; }; + B2DB492B19767F7700411E16 /* Json.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D97180E26E600808F54 /* Json.h */; }; + B2DB492C19767F7700411E16 /* RegionAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D99180E26E600808F54 /* RegionAttachment.h */; }; + B2DB492D19767F7700411E16 /* Skeleton.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D9B180E26E600808F54 /* Skeleton.h */; }; + B2DB492E19767F7700411E16 /* SkeletonData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D9D180E26E600808F54 /* SkeletonData.h */; }; + B2DB492F19767F7700411E16 /* SkeletonJson.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D9F180E26E600808F54 /* SkeletonJson.h */; }; + B2DB493019767F7700411E16 /* Skin.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA1180E26E600808F54 /* Skin.h */; }; + B2DB493119767F7700411E16 /* Slot.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA3180E26E600808F54 /* Slot.h */; }; + B2DB493219767F7700411E16 /* SlotData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA5180E26E600808F54 /* SlotData.h */; }; + B2DB493319767F7700411E16 /* spine-cocos2dx.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA7180E26E600808F54 /* spine-cocos2dx.h */; }; + B2DB493419767F7700411E16 /* spine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA8180E26E600808F54 /* spine.h */; }; B37510711823AC9F00B3BA6A /* CCPhysicsBodyInfo_chipmunk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B37510451823AC7B00B3BA6A /* CCPhysicsBodyInfo_chipmunk.cpp */; }; B37510721823AC9F00B3BA6A /* CCPhysicsBodyInfo_chipmunk.h in Headers */ = {isa = PBXBuildFile; fileRef = B37510461823AC7B00B3BA6A /* CCPhysicsBodyInfo_chipmunk.h */; }; B37510731823AC9F00B3BA6A /* CCPhysicsContactInfo_chipmunk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B37510471823AC7B00B3BA6A /* CCPhysicsContactInfo_chipmunk.cpp */; }; @@ -1932,6 +1946,76 @@ remoteGlobalIDString = A07A4F9F178387730073F6A7; remoteInfo = "CocosDenshion iOS"; }; + B2F0AFEB198794EE002FE562 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = B245F10019766132001920FD; + remoteInfo = "libui Mac"; + }; + B2F0AFED198794EE002FE562 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = B2DB48161976716E00411E16; + remoteInfo = "libcocostudio Mac"; + }; + B2F0AFEF198794EE002FE562 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = B2DB479B197669A100411E16; + remoteInfo = "libcocosbuilder Mac"; + }; + B2F0AFF1198794EE002FE562 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = B2DB48CA19767F1F00411E16; + remoteInfo = "libspine Mac"; + }; + B2F0AFF3198794EE002FE562 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = B2DB498D197686CB00411E16; + remoteInfo = "libnetwork Mac"; + }; + B2F0AFF519879508002FE562 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = B24EEA2C19775E92004493CC; + remoteInfo = "libui iOS"; + }; + B2F0AFF719879508002FE562 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = B24EEA6719775EBB004493CC; + remoteInfo = "libcocostudio iOS"; + }; + B2F0AFF919879508002FE562 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = B24EEA6F19775ECE004493CC; + remoteInfo = "libcocosbuilder iOS"; + }; + B2F0AFFB19879508002FE562 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = B24EEA7719775EE1004493CC; + remoteInfo = "libspine iOS"; + }; + B2F0AFFD19879508002FE562 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = B24EEA7F19775EF3004493CC; + remoteInfo = "libnetwork iOS"; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -1952,8 +2036,10 @@ 06CAAABF186AD63B0012A414 /* TriggerMng.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TriggerMng.h; sourceTree = ""; }; 06CAAAC0186AD63B0012A414 /* TriggerObj.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TriggerObj.cpp; sourceTree = ""; }; 06CAAAC1186AD63B0012A414 /* TriggerObj.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TriggerObj.h; sourceTree = ""; }; - 1551A33F158F2AB200E66CFE /* libcocos2dx Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos2dx Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 1551A33F158F2AB200E66CFE /* libcocos2d Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos2d Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 1551A342158F2AB200E66CFE /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; + 15EFA20F198A2BB5000C57D3 /* CCProtectedNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCProtectedNode.cpp; sourceTree = ""; }; + 15EFA210198A2BB5000C57D3 /* CCProtectedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCProtectedNode.h; sourceTree = ""; }; 1A01C67618F57BE800EFE3A6 /* CCArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCArray.cpp; sourceTree = ""; }; 1A01C67718F57BE800EFE3A6 /* CCArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCArray.h; sourceTree = ""; }; 1A01C67818F57BE800EFE3A6 /* CCBool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBool.h; sourceTree = ""; }; @@ -2329,6 +2415,8 @@ 2905FA1318CF08D100240AA3 /* UIWidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIWidget.cpp; sourceTree = ""; }; 2905FA1418CF08D100240AA3 /* UIWidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIWidget.h; sourceTree = ""; }; 29080DEB191B82CE0066F8DF /* UIDeprecated.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UIDeprecated.h; sourceTree = ""; }; + 2958244919873D8E00F9746D /* UIScale9Sprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIScale9Sprite.cpp; sourceTree = ""; }; + 2958244A19873D8E00F9746D /* UIScale9Sprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIScale9Sprite.h; sourceTree = ""; }; 2986667818B1B079000E39CA /* CCTweenFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTweenFunction.cpp; sourceTree = ""; }; 2986667918B1B079000E39CA /* CCTweenFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTweenFunction.h; sourceTree = ""; }; 299754F2193EC95400A54AC3 /* ObjectFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ObjectFactory.cpp; path = ../base/ObjectFactory.cpp; sourceTree = ""; }; @@ -2369,6 +2457,8 @@ 3EA0FB6A191C841D00B170C8 /* UIVideoPlayerIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UIVideoPlayerIOS.mm; sourceTree = ""; }; 3EA4786E195478E00068D9D1 /* CCBundleReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCBundleReader.cpp; sourceTree = ""; }; 3EA4786F195478E00068D9D1 /* CCBundleReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBundleReader.h; sourceTree = ""; }; + 464AD6E3197EBB1400E502D8 /* pvr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pvr.cpp; path = ../base/pvr.cpp; sourceTree = ""; }; + 464AD6E4197EBB1400E502D8 /* pvr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pvr.h; path = ../base/pvr.h; sourceTree = ""; }; 46A15FCC1807A544005B8026 /* AUTHORS */ = {isa = PBXFileReference; lastKnownFileType = text; name = AUTHORS; path = ../AUTHORS; sourceTree = ""; }; 46A15FCE1807A544005B8026 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = text; name = README.md; path = ../README.md; sourceTree = ""; }; 46A15FE11807A56F005B8026 /* Export.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Export.h; sourceTree = ""; }; @@ -2429,8 +2519,6 @@ 46A168531807AF4E005B8026 /* CCEditBoxImplAndroid.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCEditBoxImplAndroid.h; sourceTree = ""; }; 46A168541807AF4E005B8026 /* CCEditBoxImplIOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCEditBoxImplIOS.h; sourceTree = ""; }; 46A168551807AF4E005B8026 /* CCEditBoxImplIOS.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CCEditBoxImplIOS.mm; sourceTree = ""; }; - 46A168561807AF4E005B8026 /* CCEditBoxImplMac.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCEditBoxImplMac.h; sourceTree = ""; }; - 46A168571807AF4E005B8026 /* CCEditBoxImplMac.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = CCEditBoxImplMac.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 46A168581807AF4E005B8026 /* CCEditBoxImplNone.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCEditBoxImplNone.cpp; sourceTree = ""; }; 46A1685B1807AF4E005B8026 /* CCEditBoxImplWin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCEditBoxImplWin.cpp; sourceTree = ""; }; 46A1685C1807AF4E005B8026 /* CCEditBoxImplWin.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCEditBoxImplWin.h; sourceTree = ""; }; @@ -2636,8 +2724,8 @@ 503DD8D71926736A00CD74DD /* CCES2Renderer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCES2Renderer.m; sourceTree = ""; }; 503DD8D81926736A00CD74DD /* CCESRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCESRenderer.h; sourceTree = ""; }; 503DD8D91926736A00CD74DD /* CCGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGL.h; sourceTree = ""; }; - 503DD8DA1926736A00CD74DD /* CCGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLView.h; sourceTree = ""; }; - 503DD8DB1926736A00CD74DD /* CCGLView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCGLView.mm; sourceTree = ""; }; + 503DD8DA1926736A00CD74DD /* CCGLViewImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLViewImpl.h; sourceTree = ""; }; + 503DD8DB1926736A00CD74DD /* CCGLViewImpl.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCGLViewImpl.mm; sourceTree = ""; }; 503DD8DC1926736A00CD74DD /* CCImage.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCImage.mm; sourceTree = ""; }; 503DD8DD1926736A00CD74DD /* CCPlatformDefine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPlatformDefine.h; sourceTree = ""; }; 503DD8DE1926736A00CD74DD /* CCStdC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCStdC.h; sourceTree = ""; }; @@ -2809,16 +2897,16 @@ 50ABBF221926664700A911A9 /* CCDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCDevice.h; sourceTree = ""; }; 50ABBF231926664700A911A9 /* CCFileUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCFileUtils.cpp; sourceTree = ""; }; 50ABBF241926664700A911A9 /* CCFileUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCFileUtils.h; sourceTree = ""; }; - 50ABBF251926664700A911A9 /* CCGLViewProtocol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLViewProtocol.cpp; sourceTree = ""; }; - 50ABBF261926664700A911A9 /* CCGLViewProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLViewProtocol.h; sourceTree = ""; }; + 50ABBF251926664700A911A9 /* CCGLView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLView.cpp; sourceTree = ""; }; + 50ABBF261926664700A911A9 /* CCGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLView.h; sourceTree = ""; }; 50ABBF271926664700A911A9 /* CCImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCImage.cpp; sourceTree = ""; }; 50ABBF281926664700A911A9 /* CCImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCImage.h; sourceTree = ""; }; 50ABBF291926664700A911A9 /* CCSAXParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCSAXParser.cpp; sourceTree = ""; }; 50ABBF2A1926664700A911A9 /* CCSAXParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSAXParser.h; sourceTree = ""; }; 50ABBF2B1926664700A911A9 /* CCThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCThread.cpp; sourceTree = ""; }; 50ABBF2C1926664700A911A9 /* CCThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCThread.h; sourceTree = ""; }; - 50ABBF2E1926664700A911A9 /* CCGLView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLView.cpp; sourceTree = ""; }; - 50ABBF2F1926664700A911A9 /* CCGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLView.h; sourceTree = ""; }; + 50ABBF2E1926664700A911A9 /* CCGLViewImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLViewImpl.cpp; sourceTree = ""; }; + 50ABBF2F1926664700A911A9 /* CCGLViewImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLViewImpl.h; sourceTree = ""; }; 50ABBF4F1926664700A911A9 /* CCApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCApplication.h; sourceTree = ""; }; 50ABBF501926664700A911A9 /* CCApplication.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCApplication.mm; sourceTree = ""; }; 50ABBF511926664700A911A9 /* CCCommon.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCCommon.mm; sourceTree = ""; }; @@ -2827,8 +2915,6 @@ 50ABBF541926664700A911A9 /* CCPlatformDefine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPlatformDefine.h; sourceTree = ""; }; 50ABBF551926664700A911A9 /* CCStdC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCStdC.h; sourceTree = ""; }; 50DC5180187B817900A9C23F /* RELEASE_NOTES.md */ = {isa = PBXFileReference; lastKnownFileType = text; name = RELEASE_NOTES.md; path = ../docs/RELEASE_NOTES.md; sourceTree = ""; }; - 50E6D30C18DADB5D0051CA34 /* CCProtectedNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCProtectedNode.cpp; sourceTree = ""; }; - 50E6D30D18DADB5D0051CA34 /* CCProtectedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCProtectedNode.h; sourceTree = ""; }; 50E6D32E18E174130051CA34 /* UIHBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIHBox.cpp; sourceTree = ""; }; 50E6D32F18E174130051CA34 /* UIHBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIHBox.h; sourceTree = ""; }; 50E6D33018E174130051CA34 /* UIRelativeBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIRelativeBox.cpp; sourceTree = ""; }; @@ -2866,17 +2952,34 @@ 50FCEB9218C72017004AD434 /* WidgetReaderProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WidgetReaderProtocol.h; sourceTree = ""; }; A03F2CB81780BD04006731B9 /* libchipmunk Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libchipmunk Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; A03F2D9B1780BDF7006731B9 /* libbox2d Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libbox2d Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - A03F2ED617814268006731B9 /* libCocosDenshion Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libCocosDenshion Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - A03F2FD617814595006731B9 /* libcocos2dx-extensions Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos2dx-extensions Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - A07A4D641783777C0073F6A7 /* libcocos2dx iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos2dx iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - A07A4EFC1783867C0073F6A7 /* libcocos2dx-extensions iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos2dx-extensions iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + A03F2ED617814268006731B9 /* libcocosdenshion Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocosdenshion Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + A03F2FD617814595006731B9 /* libextension Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libextension Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + A07A4D641783777C0073F6A7 /* libcocos2d iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos2d iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + A07A4EFC1783867C0073F6A7 /* libextension iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libextension iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; A07A4F3B178387670073F6A7 /* libchipmunk iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libchipmunk iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; A07A4F9E1783876B0073F6A7 /* libbox2d iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libbox2d iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - A07A4FB4178387730073F6A7 /* libCocosDenshion iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libCocosDenshion iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + A07A4FB4178387730073F6A7 /* libcocosdenshion iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocosdenshion iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B217703B1977ECB4009EE11B /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; + B217703D1977ECC1009EE11B /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; + B217703F1977ECE6009EE11B /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; + B21770411977ECF8009EE11B /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; }; + B21770431977ED07009EE11B /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; + B21770461977ED34009EE11B /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; + B21770481977ED4C009EE11B /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; + B217704A1977ED55009EE11B /* libcurl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurl.dylib; path = usr/lib/libcurl.dylib; sourceTree = SDKROOT; }; + B217704C1977ED8B009EE11B /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; }; + B245F13A19766132001920FD /* libui Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libui Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; B24AA981195A675C007B4522 /* CCFastTMXLayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCFastTMXLayer.cpp; sourceTree = ""; }; B24AA982195A675C007B4522 /* CCFastTMXLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCFastTMXLayer.h; sourceTree = ""; }; B24AA983195A675C007B4522 /* CCFastTMXTiledMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCFastTMXTiledMap.cpp; sourceTree = ""; }; B24AA984195A675C007B4522 /* CCFastTMXTiledMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCFastTMXTiledMap.h; sourceTree = ""; }; + B24EEA6619775E92004493CC /* libui iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libui iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B24EEA6E19775EBB004493CC /* libcocostudio iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocostudio iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B24EEA7619775ECE004493CC /* libcocosbuilder iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocosbuilder iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B24EEA7E19775EE1004493CC /* libspine iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libspine iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B24EEA8619775EF3004493CC /* libnetwork iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libnetwork iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B282B47C1980E02B00666787 /* CCEditBoxImplMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCEditBoxImplMac.mm; sourceTree = ""; }; + B282B47D1980E02B00666787 /* CCEditBoxImplMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEditBoxImplMac.h; sourceTree = ""; }; B29594AF1926D5D9003EEF37 /* ccShader_3D_Color.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_3D_Color.frag; sourceTree = ""; }; B29594B01926D5D9003EEF37 /* ccShader_3D_ColorTex.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_3D_ColorTex.frag; sourceTree = ""; }; B29594B11926D5D9003EEF37 /* ccShader_3D_PositionTex.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_3D_PositionTex.vert; sourceTree = ""; }; @@ -2891,6 +2994,10 @@ B29594BF1926D61F003EEF37 /* CCSprite3DMaterial.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCSprite3DMaterial.cpp; sourceTree = ""; }; B29594C01926D61F003EEF37 /* CCSprite3DMaterial.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSprite3DMaterial.h; sourceTree = ""; }; B2D3D3B81948613300BA4831 /* CCBundle3DData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBundle3DData.h; sourceTree = ""; }; + B2DB47D2197669A100411E16 /* libcocosbuilder Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocosbuilder Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B2DB484D1976716E00411E16 /* libcocostudio Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocostudio Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B2DB490119767F1F00411E16 /* libspine Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libspine Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B2DB49C4197686CB00411E16 /* libnetwork Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libnetwork Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; B37510451823AC7B00B3BA6A /* CCPhysicsBodyInfo_chipmunk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCPhysicsBodyInfo_chipmunk.cpp; sourceTree = ""; }; B37510461823AC7B00B3BA6A /* CCPhysicsBodyInfo_chipmunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPhysicsBodyInfo_chipmunk.h; sourceTree = ""; }; B37510471823AC7B00B3BA6A /* CCPhysicsContactInfo_chipmunk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCPhysicsContactInfo_chipmunk.cpp; sourceTree = ""; }; @@ -2923,15 +3030,20 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + B217704E1977ED9F009EE11B /* libsqlite3.dylib in Frameworks */, + B21770491977ED4C009EE11B /* libz.dylib in Frameworks */, + B21770471977ED34009EE11B /* QuartzCore.framework in Frameworks */, + B21770451977ED14009EE11B /* Cocoa.framework in Frameworks */, + B21770421977ECF8009EE11B /* ApplicationServices.framework in Frameworks */, + B21770401977ECE6009EE11B /* OpenGL.framework in Frameworks */, + B217703C1977ECB4009EE11B /* IOKit.framework in Frameworks */, B3B12A5A17E7F44000026B4A /* libchipmunk Mac.a in Frameworks */, - 1A94D35116C2072800D79D09 /* Foundation.framework in Frameworks */, 1A570347180BD0850088DEC7 /* libglfw3.a in Frameworks */, 1A570361180BD1080088DEC7 /* libpng.a in Frameworks */, 1A57037B180BD1C90088DEC7 /* libjpeg.a in Frameworks */, 1A5703A1180BD22C0088DEC7 /* libtiff.a in Frameworks */, 1A5703B8180BD2780088DEC7 /* libwebp.a in Frameworks */, 1A57052B180BD31F0088DEC7 /* libfreetype.a in Frameworks */, - 1AAF5385180E35A3000584C8 /* libwebsockets.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2974,7 +3086,6 @@ 1A5703A4180BD2350088DEC7 /* libtiff.a in Frameworks */, 1A5703BB180BD2800088DEC7 /* libwebp.a in Frameworks */, 1A57052E180BD3280088DEC7 /* libfreetype.a in Frameworks */, - 1AAF5388180E35AC000584C8 /* libwebsockets.a in Frameworks */, 1AAF541D180E3B6A000584C8 /* libcurl.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -3007,6 +3118,78 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + B245F11A19766132001920FD /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B24EEA4619775E92004493CC /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B24EEA6919775EBB004493CC /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B24EEA7119775ECE004493CC /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B24EEA7919775EE1004493CC /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B24EEA8119775EF3004493CC /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + B2CC502E1977638A0041958E /* libwebsockets.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B2DB47B5197669A100411E16 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B2DB48301976716E00411E16 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B2DB48E419767F1F00411E16 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B2DB49A7197686CB00411E16 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + B27AEE0219768934008BD575 /* libwebsockets.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -3060,16 +3243,26 @@ 1551A340158F2AB200E66CFE /* Products */ = { isa = PBXGroup; children = ( - 1551A33F158F2AB200E66CFE /* libcocos2dx Mac.a */, + 1551A33F158F2AB200E66CFE /* libcocos2d Mac.a */, A03F2CB81780BD04006731B9 /* libchipmunk Mac.a */, A03F2D9B1780BDF7006731B9 /* libbox2d Mac.a */, - A03F2ED617814268006731B9 /* libCocosDenshion Mac.a */, - A03F2FD617814595006731B9 /* libcocos2dx-extensions Mac.a */, - A07A4D641783777C0073F6A7 /* libcocos2dx iOS.a */, - A07A4EFC1783867C0073F6A7 /* libcocos2dx-extensions iOS.a */, + A03F2ED617814268006731B9 /* libcocosdenshion Mac.a */, + A03F2FD617814595006731B9 /* libextension Mac.a */, + A07A4D641783777C0073F6A7 /* libcocos2d iOS.a */, + A07A4EFC1783867C0073F6A7 /* libextension iOS.a */, A07A4F3B178387670073F6A7 /* libchipmunk iOS.a */, A07A4F9E1783876B0073F6A7 /* libbox2d iOS.a */, - A07A4FB4178387730073F6A7 /* libCocosDenshion iOS.a */, + A07A4FB4178387730073F6A7 /* libcocosdenshion iOS.a */, + B245F13A19766132001920FD /* libui Mac.a */, + B2DB47D2197669A100411E16 /* libcocosbuilder Mac.a */, + B2DB484D1976716E00411E16 /* libcocostudio Mac.a */, + B2DB490119767F1F00411E16 /* libspine Mac.a */, + B2DB49C4197686CB00411E16 /* libnetwork Mac.a */, + B24EEA6619775E92004493CC /* libui iOS.a */, + B24EEA6E19775EBB004493CC /* libcocostudio iOS.a */, + B24EEA7619775ECE004493CC /* libcocosbuilder iOS.a */, + B24EEA7E19775EE1004493CC /* libspine iOS.a */, + B24EEA8619775EF3004493CC /* libnetwork iOS.a */, ); name = Products; sourceTree = ""; @@ -3077,6 +3270,15 @@ 1551A341158F2AB200E66CFE /* Frameworks */ = { isa = PBXGroup; children = ( + B217704C1977ED8B009EE11B /* libsqlite3.dylib */, + B217704A1977ED55009EE11B /* libcurl.dylib */, + B21770481977ED4C009EE11B /* libz.dylib */, + B21770461977ED34009EE11B /* QuartzCore.framework */, + B21770431977ED07009EE11B /* Cocoa.framework */, + B21770411977ECF8009EE11B /* ApplicationServices.framework */, + B217703F1977ECE6009EE11B /* OpenGL.framework */, + B217703D1977ECC1009EE11B /* AudioToolbox.framework */, + B217703B1977ECB4009EE11B /* IOKit.framework */, 1551A342158F2AB200E66CFE /* Foundation.framework */, ); name = Frameworks; @@ -3154,6 +3356,8 @@ 1A570095180BC5B00088DEC7 /* base-nodes */ = { isa = PBXGroup; children = ( + 15EFA20F198A2BB5000C57D3 /* CCProtectedNode.cpp */, + 15EFA210198A2BB5000C57D3 /* CCProtectedNode.h */, 1A57009C180BC5D20088DEC7 /* CCNode.cpp */, 1A57009D180BC5D20088DEC7 /* CCNode.h */, 1A570096180BC5C10088DEC7 /* CCAtlasNode.cpp */, @@ -3165,6 +3369,8 @@ 1A5700A2180BC5E60088DEC7 /* base */ = { isa = PBXGroup; children = ( + 464AD6E3197EBB1400E502D8 /* pvr.cpp */, + 464AD6E4197EBB1400E502D8 /* pvr.h */, 3E61781C1966A5A300DE83F5 /* CCController.cpp */, 3E6176551960F89B00DE83F5 /* CCController-iOS.mm */, 3E6176561960F89B00DE83F5 /* CCController.h */, @@ -4078,12 +4284,12 @@ 29CB8F511929D64500C841D6 /* base */ = { isa = PBXGroup; children = ( + 2958244919873D8E00F9746D /* UIScale9Sprite.cpp */, + 2958244A19873D8E00F9746D /* UIScale9Sprite.h */, 29080DEB191B82CE0066F8DF /* UIDeprecated.h */, 29BDBA52195D597A003225C9 /* UIDeprecated.cpp */, 2905FA1318CF08D100240AA3 /* UIWidget.cpp */, 2905FA1418CF08D100240AA3 /* UIWidget.h */, - 50E6D30C18DADB5D0051CA34 /* CCProtectedNode.cpp */, - 50E6D30D18DADB5D0051CA34 /* CCProtectedNode.h */, 2905F9F418CF08D000240AA3 /* UIHelper.cpp */, 2905F9F518CF08D000240AA3 /* UIHelper.h */, 2905F9EB18CF08D000240AA3 /* GUIDefine.h */, @@ -4257,6 +4463,8 @@ 46A1684E1807AF4E005B8026 /* CCEditBox */ = { isa = PBXGroup; children = ( + B282B47C1980E02B00666787 /* CCEditBoxImplMac.mm */, + B282B47D1980E02B00666787 /* CCEditBoxImplMac.h */, 46A1684F1807AF4E005B8026 /* CCEditBox.cpp */, 46A168501807AF4E005B8026 /* CCEditBox.h */, 46A168511807AF4E005B8026 /* CCEditBoxImpl.h */, @@ -4264,8 +4472,6 @@ 46A168531807AF4E005B8026 /* CCEditBoxImplAndroid.h */, 46A168541807AF4E005B8026 /* CCEditBoxImplIOS.h */, 46A168551807AF4E005B8026 /* CCEditBoxImplIOS.mm */, - 46A168561807AF4E005B8026 /* CCEditBoxImplMac.h */, - 46A168571807AF4E005B8026 /* CCEditBoxImplMac.mm */, 46A168581807AF4E005B8026 /* CCEditBoxImplNone.cpp */, 46A1685B1807AF4E005B8026 /* CCEditBoxImplWin.cpp */, 46A1685C1807AF4E005B8026 /* CCEditBoxImplWin.h */, @@ -4745,8 +4951,8 @@ 503DD8D71926736A00CD74DD /* CCES2Renderer.m */, 503DD8D81926736A00CD74DD /* CCESRenderer.h */, 503DD8D91926736A00CD74DD /* CCGL.h */, - 503DD8DA1926736A00CD74DD /* CCGLView.h */, - 503DD8DB1926736A00CD74DD /* CCGLView.mm */, + 503DD8DA1926736A00CD74DD /* CCGLViewImpl.h */, + 503DD8DB1926736A00CD74DD /* CCGLViewImpl.mm */, 503DD8DC1926736A00CD74DD /* CCImage.mm */, 503DD8DD1926736A00CD74DD /* CCPlatformDefine.h */, 503DD8DE1926736A00CD74DD /* CCStdC.h */, @@ -4767,8 +4973,8 @@ 50ABBF221926664700A911A9 /* CCDevice.h */, 50ABBF231926664700A911A9 /* CCFileUtils.cpp */, 50ABBF241926664700A911A9 /* CCFileUtils.h */, - 50ABBF251926664700A911A9 /* CCGLViewProtocol.cpp */, - 50ABBF261926664700A911A9 /* CCGLViewProtocol.h */, + 50ABBF251926664700A911A9 /* CCGLView.cpp */, + 50ABBF261926664700A911A9 /* CCGLView.h */, 50ABBF271926664700A911A9 /* CCImage.cpp */, 50ABBF281926664700A911A9 /* CCImage.h */, 50ABBF291926664700A911A9 /* CCSAXParser.cpp */, @@ -4795,8 +5001,8 @@ 50ABBF2D1926664700A911A9 /* desktop */ = { isa = PBXGroup; children = ( - 50ABBF2E1926664700A911A9 /* CCGLView.cpp */, - 50ABBF2F1926664700A911A9 /* CCGLView.h */, + 50ABBF2E1926664700A911A9 /* CCGLViewImpl.cpp */, + 50ABBF2F1926664700A911A9 /* CCGLViewImpl.h */, ); path = desktop; sourceTree = ""; @@ -4994,45 +5200,31 @@ 50ABBE9B1925AB6F00A911A9 /* CCRef.h in Headers */, 50ABBE851925AB6F00A911A9 /* ccFPSImages.h in Headers */, 5034CA39191D591100CE6051 /* ccShader_PositionColorLengthTexture.frag in Headers */, - 2AC795DF18628723005EC8E1 /* SkeletonBounds.h in Headers */, 50ABBE891925AB6F00A911A9 /* CCMap.h in Headers */, - 29CB8F4E1929D1BB00C841D6 /* UILayoutManager.h in Headers */, - 2AC795E018628723005EC8E1 /* Event.h in Headers */, - 2AC795E118628723005EC8E1 /* EventData.h in Headers */, - 50E6D33618E174130051CA34 /* UIHBox.h in Headers */, 50ABBE8D1925AB6F00A911A9 /* CCNS.h in Headers */, - 2AC795E218628723005EC8E1 /* BoundingBoxAttachment.h in Headers */, - 06CAAAC9186AD7EE0012A414 /* TriggerMng.h in Headers */, - 2905FA6018CF08D100240AA3 /* UILayoutParameter.h in Headers */, 50ABBEA51925AB6F00A911A9 /* CCScriptSupport.h in Headers */, B29594D01926D61F003EEF37 /* CCSprite3DMaterial.h in Headers */, 1ABA68B01888D700007D1BB4 /* CCFontCharMap.h in Headers */, 5034CA3F191D591100CE6051 /* ccShader_Position_uColor.vert in Headers */, 50ABBD461925AB0000A911A9 /* CCVertex.h in Headers */, 46A170E71807CECA005B8026 /* CCPhysicsBody.h in Headers */, - 2905FA4818CF08D100240AA3 /* UIButton.h in Headers */, 46A170EB1807CECA005B8026 /* CCPhysicsJoint.h in Headers */, 50ABBD3E1925AB0000A911A9 /* CCGeometry.h in Headers */, 50ABBE631925AB6F00A911A9 /* CCEventListenerAcceleration.h in Headers */, - 2905FA4418CF08D100240AA3 /* GUIDefine.h in Headers */, B37510771823AC9F00B3BA6A /* CCPhysicsJointInfo_chipmunk.h in Headers */, 46A170EE1807CECA005B8026 /* CCPhysicsShape.h in Headers */, - 2905FA5018CF08D100240AA3 /* UIHelper.h in Headers */, 50ABBED31925AB6F00A911A9 /* uthash.h in Headers */, 46A170E91807CECA005B8026 /* CCPhysicsContact.h in Headers */, B375107B1823AC9F00B3BA6A /* CCPhysicsWorldInfo_chipmunk.h in Headers */, - 2905FA6818CF08D100240AA3 /* UILoadingBar.h in Headers */, 46A170F01807CECA005B8026 /* CCPhysicsWorld.h in Headers */, 50ABBEC11925AB6F00A911A9 /* CCValue.h in Headers */, 50ABBE871925AB6F00A911A9 /* ccMacros.h in Headers */, 50ABBE731925AB6F00A911A9 /* CCEventListenerMouse.h in Headers */, 1A570063180BC5A10088DEC7 /* CCAction.h in Headers */, 1A570067180BC5A10088DEC7 /* CCActionCamera.h in Headers */, - 0634A4DA194B19E400E608AF /* CCFrame.h in Headers */, 1A57006B180BC5A10088DEC7 /* CCActionCatmullRom.h in Headers */, 1A57006F180BC5A10088DEC7 /* CCActionEase.h in Headers */, 1A570073180BC5A10088DEC7 /* CCActionGrid.h in Headers */, - 50FCEBB518C72017004AD434 /* SliderReader.h in Headers */, 5034CA3B191D591100CE6051 /* ccShader_PositionColor.vert in Headers */, 1A570077180BC5A10088DEC7 /* CCActionGrid3D.h in Headers */, 1A57007B180BC5A10088DEC7 /* CCActionInstant.h in Headers */, @@ -5048,8 +5240,6 @@ 50ABBEA11925AB6F00A911A9 /* CCScheduler.h in Headers */, 50ABBDB71925AB4100A911A9 /* CCTexture2D.h in Headers */, B2D3D3B91948613300BA4831 /* CCBundle3DData.h in Headers */, - 2905FA6C18CF08D100240AA3 /* UIPageView.h in Headers */, - 50FCEB9518C72017004AD434 /* ButtonReader.h in Headers */, 50ABBE811925AB6F00A911A9 /* CCEventType.h in Headers */, 1A57008F180BC5A10088DEC7 /* CCActionTiledGrid.h in Headers */, 1A570093180BC5A10088DEC7 /* CCActionTween.h in Headers */, @@ -5058,17 +5248,12 @@ 1A5700A0180BC5D20088DEC7 /* CCNode.h in Headers */, 50ABC0671926664800A911A9 /* CCPlatformDefine.h in Headers */, 46C02E0918E91123004B7456 /* xxhash.h in Headers */, - 06CAAAC6186AD7E60012A414 /* TriggerObj.h in Headers */, 1A570110180BC8EE0088DEC7 /* CCDrawingPrimitives.h in Headers */, B37510791823AC9F00B3BA6A /* CCPhysicsShapeInfo_chipmunk.h in Headers */, 1A570114180BC8EE0088DEC7 /* CCDrawNode.h in Headers */, 1A57011D180BC90D0088DEC7 /* CCGrabber.h in Headers */, 1A570121180BC90D0088DEC7 /* CCGrid.h in Headers */, 5034CA2D191D591100CE6051 /* ccShader_PositionTextureA8Color.frag in Headers */, - 50E6D33A18E174130051CA34 /* UIRelativeBox.h in Headers */, - 50E6D30F18DADB5D0051CA34 /* CCProtectedNode.h in Headers */, - 50FCEB9918C72017004AD434 /* CheckBoxReader.h in Headers */, - 50E6D33E18E174130051CA34 /* UIVBox.h in Headers */, 1AC0269C1914068200FA920D /* ConvertUTF.h in Headers */, 50ABBED11925AB6F00A911A9 /* TGAlib.h in Headers */, 1A57019F180BCB590088DEC7 /* CCFont.h in Headers */, @@ -5092,7 +5277,6 @@ 50ABBEAD1925AB6F00A911A9 /* ccTypes.h in Headers */, 1A087AEA1860400400196EF5 /* edtaa3func.h in Headers */, 1A5701E8180BCB8C0088DEC7 /* CCTransition.h in Headers */, - 2905FA4C18CF08D100240AA3 /* UICheckBox.h in Headers */, 1A5701EC180BCB8C0088DEC7 /* CCTransitionPageTurn.h in Headers */, 1A5701F0180BCB8C0088DEC7 /* CCTransitionProgress.h in Headers */, 1A5701F9180BCBAD0088DEC7 /* CCMenu.h in Headers */, @@ -5115,13 +5299,10 @@ 50ABBE4F1925AB6F00A911A9 /* CCEventCustom.h in Headers */, 50ABBD521925AB0000A911A9 /* Quaternion.h in Headers */, 1A57022F180BCC1A0088DEC7 /* CCParticleSystemQuad.h in Headers */, - 2905FA4218CF08D100240AA3 /* CocosGUI.h in Headers */, 5034CA49191D591100CE6051 /* ccShader_Label_df.frag in Headers */, 1A01C68C18F57BE800EFE3A6 /* CCDeprecated.h in Headers */, 50ABBD561925AB0000A911A9 /* TransformUtils.h in Headers */, - 2905FA6418CF08D100240AA3 /* UIListView.h in Headers */, 299754F6193EC95400A54AC3 /* ObjectFactory.h in Headers */, - 50FCEBB918C72017004AD434 /* TextAtlasReader.h in Headers */, 50ABBD991925AB4100A911A9 /* CCGLProgramStateCache.h in Headers */, 5034CA3D191D591100CE6051 /* ccShader_PositionColor.frag in Headers */, 1A570280180BCC900088DEC7 /* CCSprite.h in Headers */, @@ -5133,23 +5314,19 @@ 1A570294180BCCAB0088DEC7 /* CCAnimation.h in Headers */, 50ABBD421925AB0000A911A9 /* CCMathBase.h in Headers */, 1A570298180BCCAB0088DEC7 /* CCAnimationCache.h in Headers */, - 0634A4DE194B19E400E608AF /* CCNodeReader.h in Headers */, - 50FCEB9D18C72017004AD434 /* ImageViewReader.h in Headers */, B29594C81926D61F003EEF37 /* CCObjLoader.h in Headers */, 50ABBE911925AB6F00A911A9 /* CCPlatformMacros.h in Headers */, 50ABC05D1926664800A911A9 /* CCApplication.h in Headers */, 50ABC0071926664800A911A9 /* CCApplicationProtocol.h in Headers */, - 50FCEBA918C72017004AD434 /* LoadingBarReader.h in Headers */, 50ABBD4E1925AB0000A911A9 /* MathUtil.h in Headers */, - 2905FA7618CF08D100240AA3 /* UIScrollView.h in Headers */, 50ABBE431925AB6F00A911A9 /* CCDirector.h in Headers */, 1A12775B18DFCC540005F345 /* CCTweenFunction.h in Headers */, 1A5702CA180BCE370088DEC7 /* CCTextFieldTTF.h in Headers */, + 15EFA213198A2BB5000C57D3 /* CCProtectedNode.h in Headers */, 1A5702EC180BCE750088DEC7 /* CCTileMapAtlas.h in Headers */, 1A5702F0180BCE750088DEC7 /* CCTMXLayer.h in Headers */, 50ABC01B1926664800A911A9 /* CCSAXParser.h in Headers */, 50ABBED51925AB6F00A911A9 /* utlist.h in Headers */, - 50FCEBAD18C72017004AD434 /* PageViewReader.h in Headers */, 1A5702F4180BCE750088DEC7 /* CCTMXObjectGroup.h in Headers */, 50ABBDAF1925AB4100A911A9 /* CCRenderer.h in Headers */, 1A5702F8180BCE750088DEC7 /* CCTMXTiledMap.h in Headers */, @@ -5161,195 +5338,86 @@ 50ABBE4B1925AB6F00A911A9 /* CCEventAcceleration.h in Headers */, 1A57030E180BCF190088DEC7 /* CCComponent.h in Headers */, 1A570312180BCF190088DEC7 /* CCComponentContainer.h in Headers */, - 50FCEBC918C72017004AD434 /* WidgetReader.h in Headers */, 50ABBD851925AB4100A911A9 /* CCBatchCommand.h in Headers */, 50ABC0651926664800A911A9 /* CCGL.h in Headers */, B37510751823AC9F00B3BA6A /* CCPhysicsHelper_chipmunk.h in Headers */, 50ABBD621925AB0000A911A9 /* Vec4.h in Headers */, 1A01C69418F57BE800EFE3A6 /* CCFloat.h in Headers */, - 2905FA5818CF08D100240AA3 /* UILayout.h in Headers */, 1A57034D180BD09B0088DEC7 /* tinyxml2.h in Headers */, 1A570356180BD0B00088DEC7 /* ioapi.h in Headers */, B29594C41926D61F003EEF37 /* CCMesh.h in Headers */, 50ABBE331925AB6F00A911A9 /* CCConfiguration.h in Headers */, 50ABC01F1926664800A911A9 /* CCThread.h in Headers */, 1A57035A180BD0B00088DEC7 /* unzip.h in Headers */, - 1AD71DAB180E26E600808F54 /* CCBAnimationManager.h in Headers */, 50ABBDBF1925AB4100A911A9 /* CCTextureCache.h in Headers */, - 1AD71DAF180E26E600808F54 /* CCBFileLoader.h in Headers */, B37510741823AC9F00B3BA6A /* CCPhysicsContactInfo_chipmunk.h in Headers */, - 2905FA8E18CF08D100240AA3 /* UIWidget.h in Headers */, - 1AD71DB3180E26E600808F54 /* CCBKeyframe.h in Headers */, - 1AD71DB5180E26E600808F54 /* CCBMemberVariableAssigner.h in Headers */, - 1AD71DB9180E26E600808F54 /* CCBReader.h in Headers */, - 2905FA7E18CF08D100240AA3 /* UIText.h in Headers */, - 1AD71DBB180E26E600808F54 /* CCBSelectorResolver.h in Headers */, 5034CA35191D591100CE6051 /* ccShader_PositionTexture.frag in Headers */, 50ABBE6F1925AB6F00A911A9 /* CCEventListenerKeyboard.h in Headers */, 50ABBE9D1925AB6F00A911A9 /* CCRefPtr.h in Headers */, - 1AD71DBF180E26E600808F54 /* CCBSequence.h in Headers */, - 1AD71DC3180E26E600808F54 /* CCBSequenceProperty.h in Headers */, 5034CA31191D591100CE6051 /* ccShader_PositionTexture_uColor.vert in Headers */, - 1AD71DCB180E26E600808F54 /* CCControlButtonLoader.h in Headers */, - 1AD71DCF180E26E600808F54 /* CCControlLoader.h in Headers */, 50ABBE7B1925AB6F00A911A9 /* CCEventMouse.h in Headers */, - 1AD71DD3180E26E600808F54 /* CCLabelBMFontLoader.h in Headers */, - 0634A4D6194B19E400E608AF /* CCActionTimelineCache.h in Headers */, - 1AD71DD7180E26E600808F54 /* CCLabelTTFLoader.h in Headers */, - 1AD71DDB180E26E600808F54 /* CCLayerColorLoader.h in Headers */, 503DD8F91926B0DB00CD74DD /* CCIMEDispatcher.h in Headers */, - 1AD71DDF180E26E600808F54 /* CCLayerGradientLoader.h in Headers */, - 1AD71DE3180E26E600808F54 /* CCLayerLoader.h in Headers */, - 1AD71DE7180E26E600808F54 /* CCMenuItemImageLoader.h in Headers */, - 1AD71DEB180E26E600808F54 /* CCMenuItemLoader.h in Headers */, - 1AD71DED180E26E600808F54 /* CCMenuLoader.h in Headers */, 50ABBE8F1925AB6F00A911A9 /* CCPlatformConfig.h in Headers */, - 1AD71DF1180E26E600808F54 /* CCNode+CCBRelativePositioning.h in Headers */, - 1AD71DF5180E26E600808F54 /* CCNodeLoader.h in Headers */, - 1AD71DF9180E26E600808F54 /* CCNodeLoaderLibrary.h in Headers */, 50ABBE291925AB6F00A911A9 /* CCAutoreleasePool.h in Headers */, - 2905FA8A18CF08D100240AA3 /* UITextField.h in Headers */, 50ABBE471925AB6F00A911A9 /* CCEvent.h in Headers */, 50ABBE6B1925AB6F00A911A9 /* CCEventListenerFocus.h in Headers */, - 1AD71DFB180E26E600808F54 /* CCNodeLoaderListener.h in Headers */, 50ABBDA51925AB4100A911A9 /* CCQuadCommand.h in Headers */, - 1AD71DFF180E26E600808F54 /* CCParticleSystemQuadLoader.h in Headers */, 50ABBD3A1925AB0000A911A9 /* CCAffineTransform.h in Headers */, - 1AD71E03180E26E600808F54 /* CCScale9SpriteLoader.h in Headers */, - 1AD71E07180E26E600808F54 /* CCScrollViewLoader.h in Headers */, 50ABBE571925AB6F00A911A9 /* CCEventFocus.h in Headers */, - 1AD71E0B180E26E600808F54 /* CCSpriteLoader.h in Headers */, - 1AD71E0D180E26E600808F54 /* CocosBuilder.h in Headers */, - 1AD71E97180E26E600808F54 /* Animation.h in Headers */, - 1AD71E9B180E26E600808F54 /* AnimationState.h in Headers */, - 29E99D201957BA7000046604 /* CocoLoader.h in Headers */, 1A01C69218F57BE800EFE3A6 /* CCDouble.h in Headers */, 50ABBE251925AB6F00A911A9 /* base64.h in Headers */, 50ABBEC91925AB6F00A911A9 /* firePngData.h in Headers */, B29594CC1926D61F003EEF37 /* CCSprite3D.h in Headers */, - 1AD71E9F180E26E600808F54 /* AnimationStateData.h in Headers */, - 1AD71EA3180E26E600808F54 /* Atlas.h in Headers */, - 1AD71EA7180E26E600808F54 /* AtlasAttachmentLoader.h in Headers */, 503DD8F51926B0DB00CD74DD /* CCIMEDelegate.h in Headers */, - 1AD71EAB180E26E600808F54 /* Attachment.h in Headers */, - 50FCEBC118C72017004AD434 /* TextFieldReader.h in Headers */, - 1AD71EAF180E26E600808F54 /* AttachmentLoader.h in Headers */, - 1AD71EB3180E26E600808F54 /* Bone.h in Headers */, - 2905FA8218CF08D100240AA3 /* UITextAtlas.h in Headers */, - 1AD71EB7180E26E600808F54 /* BoneData.h in Headers */, 50ABBD5A1925AB0000A911A9 /* Vec2.h in Headers */, - 1AD71EBB180E26E600808F54 /* CCSkeleton.h in Headers */, B24AA987195A675C007B4522 /* CCFastTMXLayer.h in Headers */, - 50FCEBA118C72017004AD434 /* LayoutReader.h in Headers */, 50ABBEBD1925AB6F00A911A9 /* ccUtils.h in Headers */, - 1AD71EBF180E26E600808F54 /* CCSkeletonAnimation.h in Headers */, - 2905FA7018CF08D100240AA3 /* UIRichText.h in Headers */, - 1AD71EC3180E26E600808F54 /* extension.h in Headers */, - 50FCEBC518C72017004AD434 /* TextReader.h in Headers */, - 1AD71EC7180E26E600808F54 /* Json.h in Headers */, - 50ABC0231926664800A911A9 /* CCGLView.h in Headers */, - 06CAAACD186AD7F90012A414 /* TriggerBase.h in Headers */, - 1AD71ECB180E26E600808F54 /* RegionAttachment.h in Headers */, + 50ABC0231926664800A911A9 /* CCGLViewImpl.h in Headers */, 50ABBFFD1926664800A911A9 /* CCFileUtilsApple.h in Headers */, - 2905FA8618CF08D100240AA3 /* UITextBMFont.h in Headers */, - 1AD71ECF180E26E600808F54 /* Skeleton.h in Headers */, 5034CA41191D591100CE6051 /* ccShader_Position_uColor.frag in Headers */, 50ABBE7F1925AB6F00A911A9 /* CCEventTouch.h in Headers */, 50ABBE5B1925AB6F00A911A9 /* CCEventKeyboard.h in Headers */, 1A01C69E18F57BE800EFE3A6 /* CCString.h in Headers */, - 1AD71ED3180E26E600808F54 /* SkeletonData.h in Headers */, 50ABC00F1926664800A911A9 /* CCFileUtils.h in Headers */, 50ABBE3B1925AB6F00A911A9 /* CCData.h in Headers */, - 1AD71ED7180E26E600808F54 /* SkeletonJson.h in Headers */, - 1AD71EDB180E26E600808F54 /* Skin.h in Headers */, 50ABBE3F1925AB6F00A911A9 /* CCDataVisitor.h in Headers */, - 1AD71EDF180E26E600808F54 /* Slot.h in Headers */, - 1AD71EE3180E26E600808F54 /* SlotData.h in Headers */, - 0634A4E2194B19E400E608AF /* CCTimeLine.h in Headers */, - 1AD71EE7180E26E600808F54 /* spine-cocos2dx.h in Headers */, 3EA47872195478E00068D9D1 /* CCBundleReader.h in Headers */, - 1AD71EE9180E26E600808F54 /* spine.h in Headers */, - 1AAF536C180E3374000584C8 /* HttpClient.h in Headers */, 50ABBD9D1925AB4100A911A9 /* ccGLStateCache.h in Headers */, 50ABBEB91925AB6F00A911A9 /* ccUTF8.h in Headers */, - 1AAF536E180E3374000584C8 /* HttpRequest.h in Headers */, - 1AAF5370180E3374000584C8 /* HttpResponse.h in Headers */, 50ABBE671925AB6F00A911A9 /* CCEventListenerCustom.h in Headers */, - 1AAF5374180E3374000584C8 /* SocketIO.h in Headers */, 50ABBE2F1925AB6F00A911A9 /* ccConfig.h in Headers */, - 373B9129187891F400198F86 /* CCComBase.h in Headers */, - 1AAF5378180E3374000584C8 /* WebSocket.h in Headers */, 1AAF5851180E40B9000584C8 /* LocalStorage.h in Headers */, 1A01C69018F57BE800EFE3A6 /* CCDictionary.h in Headers */, 1A9DCA29180E6955007A3AD4 /* CCGLBufferedNode.h in Headers */, - 50FCEBB118C72017004AD434 /* ScrollViewReader.h in Headers */, 50ABC0031926664800A911A9 /* CCLock.h in Headers */, B37510721823AC9F00B3BA6A /* CCPhysicsBodyInfo_chipmunk.h in Headers */, 50ABBE2D1925AB6F00A911A9 /* ccCArray.h in Headers */, - 50FCEBA518C72017004AD434 /* ListViewReader.h in Headers */, 50ABBD5E1925AB0000A911A9 /* Vec3.h in Headers */, - 1A8C598D180E930E00EF57C3 /* CCActionFrame.h in Headers */, - 1A8C5991180E930E00EF57C3 /* CCActionFrameEasing.h in Headers */, - 1A8C5995180E930E00EF57C3 /* CCActionManagerEx.h in Headers */, 50ABBE211925AB6F00A911A9 /* atitc.h in Headers */, - 1A8C5999180E930E00EF57C3 /* CCActionNode.h in Headers */, - 1A8C599D180E930E00EF57C3 /* CCActionObject.h in Headers */, B24AA98B195A675C007B4522 /* CCFastTMXTiledMap.h in Headers */, B29594B61926D5EC003EEF37 /* CCMeshCommand.h in Headers */, 50ABBE371925AB6F00A911A9 /* CCConsole.h in Headers */, - 1A8C59A1180E930E00EF57C3 /* CCArmature.h in Headers */, - 1A8C59A5180E930E00EF57C3 /* CCArmatureAnimation.h in Headers */, - 0634A4D2194B19E400E608AF /* CCActionTimeline.h in Headers */, - 1A8C59A9180E930E00EF57C3 /* CCArmatureDataManager.h in Headers */, 50ABC00B1926664800A911A9 /* CCDevice.h in Headers */, - 2905FA7A18CF08D100240AA3 /* UISlider.h in Headers */, - 1A8C59AD180E930E00EF57C3 /* CCArmatureDefine.h in Headers */, - 50ABC0131926664800A911A9 /* CCGLViewProtocol.h in Headers */, - 1A8C59B1180E930E00EF57C3 /* CCBatchNode.h in Headers */, + 50ABC0131926664800A911A9 /* CCGLView.h in Headers */, 50ABBDB31925AB4100A911A9 /* ccShaders.h in Headers */, - 2905FA5418CF08D100240AA3 /* UIImageView.h in Headers */, - 1A8C59B5180E930E00EF57C3 /* CCBone.h in Headers */, 50ABBDAB1925AB4100A911A9 /* CCRenderCommandPool.h in Headers */, 5034CA45191D591100CE6051 /* ccShader_Label_outline.frag in Headers */, - 1A8C59B9180E930E00EF57C3 /* CCColliderDetector.h in Headers */, - 1A8C59BD180E930E00EF57C3 /* CCComAttribute.h in Headers */, - 1A8C59C1180E930E00EF57C3 /* CCComAudio.h in Headers */, - 1A8C59C5180E930E00EF57C3 /* CCComController.h in Headers */, - 1A8C59C9180E930E00EF57C3 /* CCComRender.h in Headers */, - 1A8C59CD180E930E00EF57C3 /* CCDataReaderHelper.h in Headers */, 50ABBEB11925AB6F00A911A9 /* CCUserDefault.h in Headers */, 50ABBEC71925AB6F00A911A9 /* etc1.h in Headers */, 50ABBEA91925AB6F00A911A9 /* CCTouch.h in Headers */, 50ABBE971925AB6F00A911A9 /* CCProtocols.h in Headers */, - 1A8C59D1180E930E00EF57C3 /* CCDatas.h in Headers */, - 1A8C59D5180E930E00EF57C3 /* CCDecorativeDisplay.h in Headers */, - 1A8C59D9180E930E00EF57C3 /* CCDisplayFactory.h in Headers */, 50ABC0691926664800A911A9 /* CCStdC.h in Headers */, 50ABBECD1925AB6F00A911A9 /* s3tc.h in Headers */, 50ABBE771925AB6F00A911A9 /* CCEventListenerTouch.h in Headers */, - 1A8C59DD180E930E00EF57C3 /* CCDisplayManager.h in Headers */, - 1A8C59E1180E930E00EF57C3 /* CCInputDelegate.h in Headers */, - 1A8C59E5180E930E00EF57C3 /* CCProcessBase.h in Headers */, - 1A8C59E9180E930E00EF57C3 /* CCSGUIReader.h in Headers */, 5034CA33191D591100CE6051 /* ccShader_PositionTexture_uColor.frag in Headers */, 50ABC0171926664800A911A9 /* CCImage.h in Headers */, - 1A8C59ED180E930E00EF57C3 /* CCSkin.h in Headers */, 50ABBDA91925AB4100A911A9 /* CCRenderCommand.h in Headers */, 50ABBD951925AB4100A911A9 /* CCGLProgramState.h in Headers */, - 1A8C59F1180E930E00EF57C3 /* CCSpriteFrameCacheHelper.h in Headers */, - 1A8C59F5180E930E00EF57C3 /* CCSSceneReader.h in Headers */, - 0634A4E4194B19E400E608AF /* CCTimelineMacro.h in Headers */, - 1A8C59F9180E930E00EF57C3 /* CCTransformHelp.h in Headers */, - 1A8C59FD180E930E00EF57C3 /* CCTween.h in Headers */, - 1A8C5A05180E930E00EF57C3 /* CCUtilMath.h in Headers */, 50ABC0091926664800A911A9 /* CCCommon.h in Headers */, 50ABBE531925AB6F00A911A9 /* CCEventDispatcher.h in Headers */, - 1A8C5A07180E930E00EF57C3 /* CocoStudio.h in Headers */, - 1A8C5A0F180E930E00EF57C3 /* DictionaryHelper.h in Headers */, - 50FCEBBD18C72017004AD434 /* TextBMFontReader.h in Headers */, - 50FCEBCB18C72017004AD434 /* WidgetReaderProtocol.h in Headers */, B6B2633F19381FBF0088FE25 /* CCAnimationCurve.h in Headers */, B6B26345193884D60088FE25 /* CCAnimation3D.h in Headers */, + 464AD6E7197EBB1400E502D8 /* pvr.h in Headers */, B6ACD899193D6693005E0B8A /* CCMeshSkin.h in Headers */, B6ACD8A0193DC0CC005E0B8A /* CCAnimate3D.h in Headers */, B6AAF84319404E0D0069DE01 /* CCBundle3D.h in Headers */, @@ -5462,15 +5530,13 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + B282B4801980E08F00666787 /* CCEditBoxImplMac.h in Headers */, 460E478318080902000CDD6D /* CCControlExtensions.h in Headers */, 460E477E18080902000CDD6D /* CCControl.h in Headers */, 460E47B11808090B000CDD6D /* CCEditBoxImpl.h in Headers */, - 460E47B31808090B000CDD6D /* CCEditBoxImplAndroid.h in Headers */, - 460E47B61808090B000CDD6D /* CCEditBoxImplMac.h in Headers */, 460E477B180808F5000CDD6D /* ExtensionMacros.h in Headers */, 460E479118080902000CDD6D /* CCControlUtils.h in Headers */, 460E468118080832000CDD6D /* cocos-ext.h in Headers */, - 460E47B41808090B000CDD6D /* CCEditBoxImplIOS.h in Headers */, 460E47CC18080913000CDD6D /* CCScrollView.h in Headers */, 460E47B01808090B000CDD6D /* CCEditBox.h in Headers */, 460E478918080902000CDD6D /* CCControlSaturationBrightnessPicker.h in Headers */, @@ -5478,7 +5544,6 @@ 460E478F18080902000CDD6D /* CCControlSwitch.h in Headers */, 460E479518080902000CDD6D /* CCScale9Sprite.h in Headers */, 460E478718080902000CDD6D /* CCControlPotentiometer.h in Headers */, - 460E47BC1808090B000CDD6D /* CCEditBoxImplWin.h in Headers */, 460E478B18080902000CDD6D /* CCControlSlider.h in Headers */, 460E478218080902000CDD6D /* CCControlColourPicker.h in Headers */, 460E478518080902000CDD6D /* CCControlHuePicker.h in Headers */, @@ -5496,26 +5561,18 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 2AC795E71862875D005EC8E1 /* SkeletonBounds.h in Headers */, - 2AC795E81862875D005EC8E1 /* Event.h in Headers */, - 2AC795E91862875D005EC8E1 /* EventData.h in Headers */, - 2AC795EA1862875D005EC8E1 /* BoundingBoxAttachment.h in Headers */, 503DD8F01926736A00CD74DD /* CCStdC.h in Headers */, 46A170FF1807CECB005B8026 /* CCPhysicsContact.h in Headers */, - 0634A4D3194B19E400E608AF /* CCActionTimeline.h in Headers */, 50ABBDA21925AB4100A911A9 /* CCGroupCommand.h in Headers */, 503DD8EF1926736A00CD74DD /* CCPlatformDefine.h in Headers */, 46A171041807CECB005B8026 /* CCPhysicsShape.h in Headers */, - 50FCEBAE18C72017004AD434 /* PageViewReader.h in Headers */, 50ABBD3B1925AB0000A911A9 /* CCAffineTransform.h in Headers */, 5034CA38191D591100CE6051 /* ccShader_PositionColorLengthTexture.vert in Headers */, 50ABBE7C1925AB6F00A911A9 /* CCEventMouse.h in Headers */, B29594D11926D61F003EEF37 /* CCSprite3DMaterial.h in Headers */, 46A171011807CECB005B8026 /* CCPhysicsJoint.h in Headers */, 46A170FD1807CECB005B8026 /* CCPhysicsBody.h in Headers */, - 2905FA6118CF08D100240AA3 /* UILayoutParameter.h in Headers */, B29594C51926D61F003EEF37 /* CCMesh.h in Headers */, - 0634A4DB194B19E400E608AF /* CCFrame.h in Headers */, 50ABBE9C1925AB6F00A911A9 /* CCRef.h in Headers */, 50ABBD961925AB4100A911A9 /* CCGLProgramState.h in Headers */, 46A171061807CECB005B8026 /* CCPhysicsWorld.h in Headers */, @@ -5525,15 +5582,10 @@ 50ABC0041926664800A911A9 /* CCLock.h in Headers */, 5034CA40191D591100CE6051 /* ccShader_Position_uColor.vert in Headers */, 50ABBEC21925AB6F00A911A9 /* CCValue.h in Headers */, - 2905FA5518CF08D100240AA3 /* UIImageView.h in Headers */, 50ABBECA1925AB6F00A911A9 /* firePngData.h in Headers */, - 0634A4E3194B19E400E608AF /* CCTimeLine.h in Headers */, 50ABBE401925AB6F00A911A9 /* CCDataVisitor.h in Headers */, 1A570064180BC5A10088DEC7 /* CCAction.h in Headers */, - 06CAAACE186AD7FA0012A414 /* TriggerBase.h in Headers */, - 503DD8EC1926736A00CD74DD /* CCGLView.h in Headers */, - 50FCEBC218C72017004AD434 /* TextFieldReader.h in Headers */, - 29E99D211957BA7000046604 /* CocoLoader.h in Headers */, + 503DD8EC1926736A00CD74DD /* CCGLViewImpl.h in Headers */, 50ABBEBA1925AB6F00A911A9 /* ccUTF8.h in Headers */, 1A570068180BC5A10088DEC7 /* CCActionCamera.h in Headers */, 1A57006C180BC5A10088DEC7 /* CCActionCatmullRom.h in Headers */, @@ -5554,40 +5606,29 @@ B37510861823ACA100B3BA6A /* CCPhysicsWorldInfo_chipmunk.h in Headers */, 1A570080180BC5A10088DEC7 /* CCActionInterval.h in Headers */, 1A570084180BC5A10088DEC7 /* CCActionManager.h in Headers */, - 50ABC0141926664800A911A9 /* CCGLViewProtocol.h in Headers */, + 50ABC0141926664800A911A9 /* CCGLView.h in Headers */, 1A570088180BC5A10088DEC7 /* CCActionPageTurn3D.h in Headers */, 50ABBD9E1925AB4100A911A9 /* ccGLStateCache.h in Headers */, 1A57008C180BC5A10088DEC7 /* CCActionProgressTimer.h in Headers */, - 2905FA8318CF08D100240AA3 /* UITextAtlas.h in Headers */, 1A570090180BC5A10088DEC7 /* CCActionTiledGrid.h in Headers */, 1A570094180BC5A10088DEC7 /* CCActionTween.h in Headers */, 1A57009B180BC5C10088DEC7 /* CCAtlasNode.h in Headers */, - 2905FA5118CF08D100240AA3 /* UIHelper.h in Headers */, 1A5700A1180BC5D20088DEC7 /* CCNode.h in Headers */, - 50FCEB9618C72017004AD434 /* ButtonReader.h in Headers */, - 2905FA7118CF08D100240AA3 /* UIRichText.h in Headers */, 503DD8E41926736A00CD74DD /* CCDirectorCaller.h in Headers */, 50ABBD8A1925AB4100A911A9 /* CCCustomCommand.h in Headers */, 299754F7193EC95400A54AC3 /* ObjectFactory.h in Headers */, - 2905FA6D18CF08D100240AA3 /* UIPageView.h in Headers */, 50ABBE881925AB6F00A911A9 /* ccMacros.h in Headers */, 50ABC0101926664800A911A9 /* CCFileUtils.h in Headers */, - 2905FA4318CF08D100240AA3 /* CocosGUI.h in Headers */, 5034CA30191D591100CE6051 /* ccShader_PositionTexture.vert in Headers */, - 50E6D33718E174130051CA34 /* UIHBox.h in Headers */, 1A570111180BC8EE0088DEC7 /* CCDrawingPrimitives.h in Headers */, - 50E6D33F18E174130051CA34 /* UIVBox.h in Headers */, 50ABBE381925AB6F00A911A9 /* CCConsole.h in Headers */, 50ABBE8A1925AB6F00A911A9 /* CCMap.h in Headers */, 503DD8E61926736A00CD74DD /* CCEAGLView.h in Headers */, 50ABBE4C1925AB6F00A911A9 /* CCEventAcceleration.h in Headers */, 50ABBD571925AB0000A911A9 /* TransformUtils.h in Headers */, 1A570115180BC8EE0088DEC7 /* CCDrawNode.h in Headers */, - 06CAAAC5186AD7E50012A414 /* TriggerObj.h in Headers */, 1A57011E180BC90D0088DEC7 /* CCGrabber.h in Headers */, 1A570122180BC90D0088DEC7 /* CCGrid.h in Headers */, - 50FCEBBA18C72017004AD434 /* TextAtlasReader.h in Headers */, - 0634A4D7194B19E400E608AF /* CCActionTimelineCache.h in Headers */, 5034CA2E191D591100CE6051 /* ccShader_PositionTextureA8Color.frag in Headers */, 50ABBD5B1925AB0000A911A9 /* Vec2.h in Headers */, 50ABBD411925AB0000A911A9 /* CCMath.h in Headers */, @@ -5608,12 +5649,10 @@ 50ABBE9E1925AB6F00A911A9 /* CCRefPtr.h in Headers */, 1A01C69518F57BE800EFE3A6 /* CCFloat.h in Headers */, 1A5701CA180BCB5A0088DEC7 /* CCLabelTextFormatter.h in Headers */, - 2905FA7B18CF08D100240AA3 /* UISlider.h in Headers */, 5034CA22191D591100CE6051 /* ccShader_PositionTextureColorAlphaTest.frag in Headers */, 50ABBECE1925AB6F00A911A9 /* s3tc.h in Headers */, 50ABBE901925AB6F00A911A9 /* CCPlatformConfig.h in Headers */, 1A5701CE180BCB5A0088DEC7 /* CCLabelTTF.h in Headers */, - 50FCEBCA18C72017004AD434 /* WidgetReader.h in Headers */, 1A5701E1180BCB8C0088DEC7 /* CCLayer.h in Headers */, 1A5701E5180BCB8C0088DEC7 /* CCScene.h in Headers */, 1A5701E9180BCB8C0088DEC7 /* CCTransition.h in Headers */, @@ -5621,7 +5660,6 @@ 1A5701ED180BCB8C0088DEC7 /* CCTransitionPageTurn.h in Headers */, 1A5701F1180BCB8C0088DEC7 /* CCTransitionProgress.h in Headers */, 1A5701FA180BCBAD0088DEC7 /* CCMenu.h in Headers */, - 50FCEBBE18C72017004AD434 /* TextBMFontReader.h in Headers */, 1A5701FE180BCBAD0088DEC7 /* CCMenuItem.h in Headers */, 50ABC00C1926664800A911A9 /* CCDevice.h in Headers */, 1A570205180BCBD40088DEC7 /* CCClippingNode.h in Headers */, @@ -5633,16 +5671,14 @@ 1A570217180BCBF40088DEC7 /* CCRenderTexture.h in Headers */, 1A570224180BCC1A0088DEC7 /* CCParticleBatchNode.h in Headers */, 503DD8F61926B0DB00CD74DD /* CCIMEDelegate.h in Headers */, - 373B912A187891FB00198F86 /* CCComBase.h in Headers */, 1A570228180BCC1A0088DEC7 /* CCParticleExamples.h in Headers */, 1A57022C180BCC1A0088DEC7 /* CCParticleSystem.h in Headers */, 1A570230180BCC1A0088DEC7 /* CCParticleSystemQuad.h in Headers */, B24AA988195A675C007B4522 /* CCFastTMXLayer.h in Headers */, 5034CA2C191D591100CE6051 /* ccShader_PositionTextureA8Color.vert in Headers */, 50ABBE981925AB6F00A911A9 /* CCProtocols.h in Headers */, - 2905FA8B18CF08D100240AA3 /* UITextField.h in Headers */, - 50FCEBA618C72017004AD434 /* ListViewReader.h in Headers */, 50ABBD431925AB0000A911A9 /* CCMathBase.h in Headers */, + 15EFA214198A2BB5000C57D3 /* CCProtectedNode.h in Headers */, 50ABBE441925AB6F00A911A9 /* CCDirector.h in Headers */, 5034CA4A191D591100CE6051 /* ccShader_Label_df.frag in Headers */, 1A570281180BCC900088DEC7 /* CCSprite.h in Headers */, @@ -5655,12 +5691,8 @@ 50ABBE341925AB6F00A911A9 /* CCConfiguration.h in Headers */, 1A570299180BCCAB0088DEC7 /* CCAnimationCache.h in Headers */, 50ABBEAA1925AB6F00A911A9 /* CCTouch.h in Headers */, - 2905FA6918CF08D100240AA3 /* UILoadingBar.h in Headers */, 50ABBE741925AB6F00A911A9 /* CCEventListenerMouse.h in Headers */, - 2905FA8F18CF08D100240AA3 /* UIWidget.h in Headers */, - 50FCEB9A18C72017004AD434 /* CheckBoxReader.h in Headers */, 1A5702CB180BCE370088DEC7 /* CCTextFieldTTF.h in Headers */, - 2905FA7F18CF08D100240AA3 /* UIText.h in Headers */, 1A5702ED180BCE750088DEC7 /* CCTileMapAtlas.h in Headers */, 1A5702F1180BCE750088DEC7 /* CCTMXLayer.h in Headers */, 5034CA44191D591100CE6051 /* ccShader_Label.vert in Headers */, @@ -5672,12 +5704,7 @@ 50ABBE2A1925AB6F00A911A9 /* CCAutoreleasePool.h in Headers */, 1A57030F180BCF190088DEC7 /* CCComponent.h in Headers */, 1A570313180BCF190088DEC7 /* CCComponentContainer.h in Headers */, - 0634A4DF194B19E400E608AF /* CCNodeReader.h in Headers */, 1A087AEB1860400400196EF5 /* edtaa3func.h in Headers */, - 2905FA6518CF08D100240AA3 /* UIListView.h in Headers */, - 50FCEBAA18C72017004AD434 /* LoadingBarReader.h in Headers */, - 50FCEBC618C72017004AD434 /* TextReader.h in Headers */, - 2905FA7718CF08D100240AA3 /* UIScrollView.h in Headers */, B375107F1823ACA100B3BA6A /* CCPhysicsContactInfo_chipmunk.h in Headers */, 1A57034E180BD09B0088DEC7 /* tinyxml2.h in Headers */, 1A570357180BD0B00088DEC7 /* ioapi.h in Headers */, @@ -5687,181 +5714,79 @@ 1A57035B180BD0B00088DEC7 /* unzip.h in Headers */, 5034CA48191D591100CE6051 /* ccShader_Label_normal.frag in Headers */, 50ABBD531925AB0000A911A9 /* Quaternion.h in Headers */, - 1AD71DAC180E26E600808F54 /* CCBAnimationManager.h in Headers */, 503DD8E81926736A00CD74DD /* CCES2Renderer.h in Headers */, - 1AD71DB0180E26E600808F54 /* CCBFileLoader.h in Headers */, 50ABBE6C1925AB6F00A911A9 /* CCEventListenerFocus.h in Headers */, - 1AD71DB4180E26E600808F54 /* CCBKeyframe.h in Headers */, 5034CA3E191D591100CE6051 /* ccShader_PositionColor.frag in Headers */, 50ABBE301925AB6F00A911A9 /* ccConfig.h in Headers */, 50ABBDAC1925AB4100A911A9 /* CCRenderCommandPool.h in Headers */, - 1AD71DB6180E26E600808F54 /* CCBMemberVariableAssigner.h in Headers */, - 1AD71DBA180E26E600808F54 /* CCBReader.h in Headers */, - 1AD71DBC180E26E600808F54 /* CCBSelectorResolver.h in Headers */, - 1AD71DC0180E26E600808F54 /* CCBSequence.h in Headers */, - 50FCEBCC18C72017004AD434 /* WidgetReaderProtocol.h in Headers */, - 1AD71DC4180E26E600808F54 /* CCBSequenceProperty.h in Headers */, - 1AD71DCC180E26E600808F54 /* CCControlButtonLoader.h in Headers */, - 1AD71DD0180E26E600808F54 /* CCControlLoader.h in Headers */, - 1AD71DD4180E26E600808F54 /* CCLabelBMFontLoader.h in Headers */, 5034CA3C191D591100CE6051 /* ccShader_PositionColor.vert in Headers */, 50ABC0181926664800A911A9 /* CCImage.h in Headers */, 50ABBE8E1925AB6F00A911A9 /* CCNS.h in Headers */, 50ABBEA61925AB6F00A911A9 /* CCScriptSupport.h in Headers */, 46C02E0A18E91123004B7456 /* xxhash.h in Headers */, 5034CA4C191D591100CE6051 /* ccShader_Label_df_glow.frag in Headers */, - 50E6D33B18E174130051CA34 /* UIRelativeBox.h in Headers */, 503DD8EB1926736A00CD74DD /* CCGL.h in Headers */, 50ABBE3C1925AB6F00A911A9 /* CCData.h in Headers */, - 1AD71DD8180E26E600808F54 /* CCLabelTTFLoader.h in Headers */, 503DD8FA1926B0DB00CD74DD /* CCIMEDispatcher.h in Headers */, - 1AD71DDC180E26E600808F54 /* CCLayerColorLoader.h in Headers */, - 1AD71DE0180E26E600808F54 /* CCLayerGradientLoader.h in Headers */, - 1AD71DE4180E26E600808F54 /* CCLayerLoader.h in Headers */, 50ABBEC81925AB6F00A911A9 /* etc1.h in Headers */, - 1AD71DE8180E26E600808F54 /* CCMenuItemImageLoader.h in Headers */, - 50E6D31118DAF01E0051CA34 /* CCProtectedNode.h in Headers */, - 1AD71DEC180E26E600808F54 /* CCMenuItemLoader.h in Headers */, - 1AD71DEE180E26E600808F54 /* CCMenuLoader.h in Headers */, - 1AD71DF2180E26E600808F54 /* CCNode+CCBRelativePositioning.h in Headers */, 50ABBDB01925AB4100A911A9 /* CCRenderer.h in Headers */, B29594B71926D5EC003EEF37 /* CCMeshCommand.h in Headers */, 3E6176771960F89B00DE83F5 /* CCEventListenerController.h in Headers */, - 1AD71DF6180E26E600808F54 /* CCNodeLoader.h in Headers */, 50ABBD861925AB4100A911A9 /* CCBatchCommand.h in Headers */, - 1AD71DFA180E26E600808F54 /* CCNodeLoaderLibrary.h in Headers */, 50ABBE481925AB6F00A911A9 /* CCEvent.h in Headers */, 5027253B190BF1B900AAF4ED /* cocos2d.h in Headers */, B29594CD1926D61F003EEF37 /* CCSprite3D.h in Headers */, 3E6176691960F89B00DE83F5 /* CCController.h in Headers */, - 1AD71DFC180E26E600808F54 /* CCNodeLoaderListener.h in Headers */, - 3EA0FB6B191C841D00B170C8 /* UIVideoPlayer.h in Headers */, 3E6176781960F89B00DE83F5 /* CCGameController.h in Headers */, 50ABBE641925AB6F00A911A9 /* CCEventListenerAcceleration.h in Headers */, - 1AD71E00180E26E600808F54 /* CCParticleSystemQuadLoader.h in Headers */, - 1AD71E04180E26E600808F54 /* CCScale9SpriteLoader.h in Headers */, - 1AD71E08180E26E600808F54 /* CCScrollViewLoader.h in Headers */, - 1AD71E0C180E26E600808F54 /* CCSpriteLoader.h in Headers */, 50ABBD921925AB4100A911A9 /* CCGLProgramCache.h in Headers */, - 1AD71E0E180E26E600808F54 /* CocosBuilder.h in Headers */, B29594C91926D61F003EEF37 /* CCObjLoader.h in Headers */, - 1AD71E98180E26E600808F54 /* Animation.h in Headers */, - 1AD71E9C180E26E600808F54 /* AnimationState.h in Headers */, 50ABBE961925AB6F00A911A9 /* CCProfiling.h in Headers */, 503DD8E01926736A00CD74DD /* CCApplication.h in Headers */, 50ABBD8E1925AB4100A911A9 /* CCGLProgram.h in Headers */, - 1AD71EA0180E26E600808F54 /* AnimationStateData.h in Headers */, - 50FCEB9E18C72017004AD434 /* ImageViewReader.h in Headers */, 50ABC0081926664800A911A9 /* CCApplicationProtocol.h in Headers */, - 1AD71EA4180E26E600808F54 /* Atlas.h in Headers */, - 1AD71EA8180E26E600808F54 /* AtlasAttachmentLoader.h in Headers */, 1ABA68B11888D700007D1BB4 /* CCFontCharMap.h in Headers */, 50ABBD4F1925AB0000A911A9 /* MathUtil.h in Headers */, - 1AD71EAC180E26E600808F54 /* Attachment.h in Headers */, - 2905FA4918CF08D100240AA3 /* UIButton.h in Headers */, - 1AD71EB0180E26E600808F54 /* AttachmentLoader.h in Headers */, - 5034CA32191D591100CE6051 /* ccShader_PositionTexture_uColor.vert in Headers */, - 1AD71EB4180E26E600808F54 /* Bone.h in Headers */, - 1AD71EB8180E26E600808F54 /* BoneData.h in Headers */, - 06CAAACA186AD7EF0012A414 /* TriggerMng.h in Headers */, - 1AD71EBC180E26E600808F54 /* CCSkeleton.h in Headers */, 1A01C69718F57BE800EFE3A6 /* CCInteger.h in Headers */, - 50FCEBB218C72017004AD434 /* ScrollViewReader.h in Headers */, 50ABBEBE1925AB6F00A911A9 /* ccUtils.h in Headers */, 50ABBE801925AB6F00A911A9 /* CCEventTouch.h in Headers */, - 1AD71EC0180E26E600808F54 /* CCSkeletonAnimation.h in Headers */, - 1AD71EC4180E26E600808F54 /* extension.h in Headers */, - 1AD71EC8180E26E600808F54 /* Json.h in Headers */, - 1AD71ECC180E26E600808F54 /* RegionAttachment.h in Headers */, 50ABBDBC1925AB4100A911A9 /* CCTextureAtlas.h in Headers */, - 1AD71ED0180E26E600808F54 /* Skeleton.h in Headers */, 50ABBE541925AB6F00A911A9 /* CCEventDispatcher.h in Headers */, - 1AD71ED4180E26E600808F54 /* SkeletonData.h in Headers */, - 1AD71ED8180E26E600808F54 /* SkeletonJson.h in Headers */, 1A12775A18DFCC4F0005F345 /* CCTweenFunction.h in Headers */, - 1AD71EDC180E26E600808F54 /* Skin.h in Headers */, 50ABBD5F1925AB0000A911A9 /* Vec3.h in Headers */, - 1AD71EE0180E26E600808F54 /* Slot.h in Headers */, - 1AD71EE4180E26E600808F54 /* SlotData.h in Headers */, - 1AD71EE8180E26E600808F54 /* spine-cocos2dx.h in Headers */, - 1AD71EEA180E26E600808F54 /* spine.h in Headers */, - 1AAF536D180E3374000584C8 /* HttpClient.h in Headers */, - 1AAF536F180E3374000584C8 /* HttpRequest.h in Headers */, - 1AAF5371180E3374000584C8 /* HttpResponse.h in Headers */, - 1AAF5375180E3374000584C8 /* SocketIO.h in Headers */, - 1AAF5379180E3374000584C8 /* WebSocket.h in Headers */, 50ABBE921925AB6F00A911A9 /* CCPlatformMacros.h in Headers */, 50ABBE821925AB6F00A911A9 /* CCEventType.h in Headers */, 1AAF5852180E40B9000584C8 /* LocalStorage.h in Headers */, 50ABBD471925AB0000A911A9 /* CCVertex.h in Headers */, 1A9DCA2A180E6955007A3AD4 /* CCGLBufferedNode.h in Headers */, 1A01C69F18F57BE800EFE3A6 /* CCString.h in Headers */, + 464AD6E8197EBB1400E502D8 /* pvr.h in Headers */, 1A01C69118F57BE800EFE3A6 /* CCDictionary.h in Headers */, - 0634A4E5194B19E400E608AF /* CCTimelineMacro.h in Headers */, - 1A8C598E180E930E00EF57C3 /* CCActionFrame.h in Headers */, - 1A8C5992180E930E00EF57C3 /* CCActionFrameEasing.h in Headers */, 5034CA36191D591100CE6051 /* ccShader_PositionTexture.frag in Headers */, - 1A8C5996180E930E00EF57C3 /* CCActionManagerEx.h in Headers */, - 2905FA4D18CF08D100240AA3 /* UICheckBox.h in Headers */, - 1A8C599A180E930E00EF57C3 /* CCActionNode.h in Headers */, - 1A8C599E180E930E00EF57C3 /* CCActionObject.h in Headers */, - 1A8C59A2180E930E00EF57C3 /* CCArmature.h in Headers */, - 1A8C59A6180E930E00EF57C3 /* CCArmatureAnimation.h in Headers */, - 2905FA8718CF08D100240AA3 /* UITextBMFont.h in Headers */, - 1A8C59AA180E930E00EF57C3 /* CCArmatureDataManager.h in Headers */, - 1A8C59AE180E930E00EF57C3 /* CCArmatureDefine.h in Headers */, - 1A8C59B2180E930E00EF57C3 /* CCBatchNode.h in Headers */, - 1A8C59B6180E930E00EF57C3 /* CCBone.h in Headers */, - 1A8C59BA180E930E00EF57C3 /* CCColliderDetector.h in Headers */, B24AA98C195A675C007B4522 /* CCFastTMXTiledMap.h in Headers */, 50ABBEAE1925AB6F00A911A9 /* ccTypes.h in Headers */, - 1A8C59BE180E930E00EF57C3 /* CCComAttribute.h in Headers */, 50ABBE261925AB6F00A911A9 /* base64.h in Headers */, - 1A8C59C2180E930E00EF57C3 /* CCComAudio.h in Headers */, 1A01C68718F57BE800EFE3A6 /* CCArray.h in Headers */, 1A01C6A718F58F7500EFE3A6 /* CCNotificationCenter.h in Headers */, - 1A8C59C6180E930E00EF57C3 /* CCComController.h in Headers */, 50ABBEDA1925AB6F00A911A9 /* ZipUtils.h in Headers */, - 1A8C59CA180E930E00EF57C3 /* CCComRender.h in Headers */, - 1A8C59CE180E930E00EF57C3 /* CCDataReaderHelper.h in Headers */, - 1A8C59D2180E930E00EF57C3 /* CCDatas.h in Headers */, 50ABBDC01925AB4100A911A9 /* CCTextureCache.h in Headers */, ED9C6A9718599AD8000A5232 /* CCNodeGrid.h in Headers */, - 1A8C59D6180E930E00EF57C3 /* CCDecorativeDisplay.h in Headers */, 50ABC0201926664800A911A9 /* CCThread.h in Headers */, 1A01C69318F57BE800EFE3A6 /* CCDouble.h in Headers */, 50ABBE221925AB6F00A911A9 /* atitc.h in Headers */, 3EA47873195478E00068D9D1 /* CCBundleReader.h in Headers */, - 1A8C59DA180E930E00EF57C3 /* CCDisplayFactory.h in Headers */, - 1A8C59DE180E930E00EF57C3 /* CCDisplayManager.h in Headers */, - 50FCEBB618C72017004AD434 /* SliderReader.h in Headers */, 50ABBED21925AB6F00A911A9 /* TGAlib.h in Headers */, 1A01C68D18F57BE800EFE3A6 /* CCDeprecated.h in Headers */, - 1A8C59E2180E930E00EF57C3 /* CCInputDelegate.h in Headers */, 503DD8EA1926736A00CD74DD /* CCESRenderer.h in Headers */, - 1A8C59E6180E930E00EF57C3 /* CCProcessBase.h in Headers */, - 29CB8F4F1929D1BB00C841D6 /* UILayoutManager.h in Headers */, 50ABBE581925AB6F00A911A9 /* CCEventFocus.h in Headers */, 50ABC00A1926664800A911A9 /* CCCommon.h in Headers */, - 2905FA5918CF08D100240AA3 /* UILayout.h in Headers */, 50ABBE5C1925AB6F00A911A9 /* CCEventKeyboard.h in Headers */, B375107D1823ACA100B3BA6A /* CCPhysicsBodyInfo_chipmunk.h in Headers */, 50ABC01C1926664800A911A9 /* CCSAXParser.h in Headers */, - 2905FA4518CF08D100240AA3 /* GUIDefine.h in Headers */, - 1A8C59EA180E930E00EF57C3 /* CCSGUIReader.h in Headers */, 503DD8F11926736A00CD74DD /* OpenGL_Internal.h in Headers */, - 1A8C59EE180E930E00EF57C3 /* CCSkin.h in Headers */, B37510801823ACA100B3BA6A /* CCPhysicsHelper_chipmunk.h in Headers */, - 50FCEBA218C72017004AD434 /* LayoutReader.h in Headers */, - 1A8C59F2180E930E00EF57C3 /* CCSpriteFrameCacheHelper.h in Headers */, - 1A8C59F6180E930E00EF57C3 /* CCSSceneReader.h in Headers */, - 1A8C59FA180E930E00EF57C3 /* CCTransformHelp.h in Headers */, 50ABBDAA1925AB4100A911A9 /* CCRenderCommand.h in Headers */, - 1A8C59FE180E930E00EF57C3 /* CCTween.h in Headers */, - 1A8C5A06180E930E00EF57C3 /* CCUtilMath.h in Headers */, 50ABBE601925AB6F00A911A9 /* CCEventListener.h in Headers */, - 1A8C5A08180E930E00EF57C3 /* CocoStudio.h in Headers */, - 1A8C5A10180E930E00EF57C3 /* DictionaryHelper.h in Headers */, 50ABBEB21925AB6F00A911A9 /* CCUserDefault.h in Headers */, B6B2634019381FBF0088FE25 /* CCAnimationCurve.h in Headers */, B6B26346193884D60088FE25 /* CCAnimation3D.h in Headers */, @@ -5881,7 +5806,6 @@ 460E47A418080904000CDD6D /* CCControlSlider.h in Headers */, 460E479E18080904000CDD6D /* CCControlHuePicker.h in Headers */, 460E468218080836000CDD6D /* cocos-ext.h in Headers */, - 460E47C41808090D000CDD6D /* CCEditBoxImplMac.h in Headers */, 460E47BF1808090D000CDD6D /* CCEditBoxImpl.h in Headers */, 460E47AE18080904000CDD6D /* CCScale9Sprite.h in Headers */, 460E477C180808F7000CDD6D /* ExtensionMacros.h in Headers */, @@ -6006,12 +5930,363 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + B245F11B19766132001920FD /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + B2DB4778197665BF00411E16 /* UIHelper.h in Headers */, + B2DB478A1976664400411E16 /* UISlider.h in Headers */, + B2DB47841976661A00411E16 /* UIImageView.h in Headers */, + B2DB47881976663A00411E16 /* UIRichText.h in Headers */, + B2DB47801976660200411E16 /* UIButton.h in Headers */, + B2DB47821976660C00411E16 /* UICheckBox.h in Headers */, + B2DB47861976662D00411E16 /* UILoadingBar.h in Headers */, + B2DB47681976650A00411E16 /* UIWidget.h in Headers */, + 2958244D19873D8E00F9746D /* UIScale9Sprite.h in Headers */, + B2DB47691976651E00411E16 /* UIHBox.h in Headers */, + B2DB478F1976666100411E16 /* UIText.h in Headers */, + B2DB47901976666100411E16 /* UITextAtlas.h in Headers */, + B2DB47911976666100411E16 /* UITextBMFont.h in Headers */, + B2DB47921976666100411E16 /* UITextField.h in Headers */, + B2DB476A1976653000411E16 /* UILayout.h in Headers */, + B2DB477A197665D000411E16 /* UIListView.h in Headers */, + B2DB477C197665DB00411E16 /* UIPageView.h in Headers */, + B2DB477E197665E700411E16 /* UIScrollView.h in Headers */, + B2DB476C1976654D00411E16 /* UILayoutManager.h in Headers */, + B2DB476E1976655C00411E16 /* UILayoutParameter.h in Headers */, + B2DB47701976657000411E16 /* UIRelativeBox.h in Headers */, + B2DB47721976658000411E16 /* UIVBox.h in Headers */, + B2DB47741976659800411E16 /* CocosGUI.h in Headers */, + B2DB4776197665AA00411E16 /* UIDeprecated.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B24EEA4719775E92004493CC /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + B2C59A3419777EB600B452DF /* UIListView.h in Headers */, + B2C59A3519777EB600B452DF /* UILoadingBar.h in Headers */, + B2C59A3619777EB600B452DF /* UIPageView.h in Headers */, + B2C59A3719777EB600B452DF /* UIRichText.h in Headers */, + B2C59A3819777EB600B452DF /* UIScrollView.h in Headers */, + B2C59A3919777EB600B452DF /* UISlider.h in Headers */, + B2C59A3A19777EB600B452DF /* UIText.h in Headers */, + B2C59A3B19777EB600B452DF /* UITextAtlas.h in Headers */, + B2C59A3C19777EB600B452DF /* UITextBMFont.h in Headers */, + B2C59A3D19777EB600B452DF /* UITextField.h in Headers */, + B2C59A3E19777EB600B452DF /* UIButton.h in Headers */, + B2C59A3F19777EB600B452DF /* UICheckBox.h in Headers */, + B2C59A4019777EB600B452DF /* UIImageView.h in Headers */, + B2C59A4119777EBC00B452DF /* UIVideoPlayer.h in Headers */, + B2C59A4219777EC700B452DF /* UIDeprecated.h in Headers */, + B2C59A4319777EC700B452DF /* UIWidget.h in Headers */, + B2C59A4519777EC700B452DF /* UIHelper.h in Headers */, + B2C59A4619777EC700B452DF /* GUIDefine.h in Headers */, + B2C59A4719777ECF00B452DF /* UIHBox.h in Headers */, + B2C59A4819777ECF00B452DF /* UIRelativeBox.h in Headers */, + B2C59A4919777ECF00B452DF /* UIVBox.h in Headers */, + 2958244E19873D8E00F9746D /* UIScale9Sprite.h in Headers */, + B2C59A4A19777ECF00B452DF /* UILayout.h in Headers */, + B2C59A4B19777ECF00B452DF /* UILayoutParameter.h in Headers */, + B2C59A4C19777ECF00B452DF /* UILayoutManager.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B24EEA6A19775EBB004493CC /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + B2C59A4D19777F8A00B452DF /* CocoLoader.h in Headers */, + B2C59A4E19777F9200B452DF /* CCActionTimeline.h in Headers */, + B2C59A4F19777F9200B452DF /* CCActionTimelineCache.h in Headers */, + B2C59A5019777F9200B452DF /* CCFrame.h in Headers */, + B2C59A5119777F9200B452DF /* CCNodeReader.h in Headers */, + B2C59A5319777F9200B452DF /* CCTimelineMacro.h in Headers */, + B2C59A5419777F9700B452DF /* ButtonReader.h in Headers */, + B2C59A5519777F9800B452DF /* CheckBoxReader.h in Headers */, + B2C59A5219777F9200B452DF /* CCTimeLine.h in Headers */, + B2C59A5619777FC200B452DF /* ImageViewReader.h in Headers */, + B2C59A5719777FC200B452DF /* LayoutReader.h in Headers */, + B2C59A5819777FC200B452DF /* ListViewReader.h in Headers */, + B2C59A5919777FC200B452DF /* LoadingBarReader.h in Headers */, + B2C59A5A19777FC200B452DF /* PageViewReader.h in Headers */, + B2C59A5B19777FC200B452DF /* ScrollViewReader.h in Headers */, + B2C59A5C19777FC200B452DF /* SliderReader.h in Headers */, + B2C59A5D19777FC200B452DF /* TextAtlasReader.h in Headers */, + B2C59A5E19777FC200B452DF /* TextBMFontReader.h in Headers */, + B2C59A5F19777FC200B452DF /* TextFieldReader.h in Headers */, + B2C59A6019777FC200B452DF /* TextReader.h in Headers */, + B2C59A6419777FD000B452DF /* TriggerBase.h in Headers */, + B2C59A6319777FD000B452DF /* TriggerObj.h in Headers */, + B2C59A6519777FD000B452DF /* TriggerMng.h in Headers */, + B2C59A6619777FD000B452DF /* CCActionFrame.h in Headers */, + B2C59A6719777FD000B452DF /* CCActionFrameEasing.h in Headers */, + B2C59A6819777FD000B452DF /* CCActionManagerEx.h in Headers */, + B2C59A6919777FD000B452DF /* CCActionNode.h in Headers */, + B2C59A6A19777FD000B452DF /* CCActionObject.h in Headers */, + B2C59A6B19777FD000B452DF /* CCArmature.h in Headers */, + B2C59A6C19777FD000B452DF /* CCArmatureAnimation.h in Headers */, + B2C59A6D19777FD000B452DF /* CCArmatureDataManager.h in Headers */, + B2C59A6E19777FD000B452DF /* CCArmatureDefine.h in Headers */, + B2C59A6F19777FD000B452DF /* CCBatchNode.h in Headers */, + B2C59A7019777FD000B452DF /* CCBone.h in Headers */, + B2C59A7119777FD000B452DF /* CCColliderDetector.h in Headers */, + B2C59A7219777FD000B452DF /* CCComBase.h in Headers */, + B2C59A7319777FD000B452DF /* CCComAttribute.h in Headers */, + B2C59A7419777FD000B452DF /* CCComAudio.h in Headers */, + B2C59A7519777FD000B452DF /* CCComController.h in Headers */, + B2C59A7619777FD000B452DF /* CCComRender.h in Headers */, + B2C59A7719777FD000B452DF /* CCDataReaderHelper.h in Headers */, + B2C59A7819777FD000B452DF /* CCDatas.h in Headers */, + B2C59A7919777FD000B452DF /* CCDecorativeDisplay.h in Headers */, + B2C59A7A19777FD000B452DF /* CCDisplayFactory.h in Headers */, + B2C59A7B19777FD000B452DF /* CCDisplayManager.h in Headers */, + B2C59A7C19777FD000B452DF /* CCInputDelegate.h in Headers */, + B2C59A7D19777FD000B452DF /* CCProcessBase.h in Headers */, + B2C59A7E19777FD100B452DF /* CCSGUIReader.h in Headers */, + B2C59A7F19777FD100B452DF /* CCSkin.h in Headers */, + B2C59A8019777FD100B452DF /* CCSpriteFrameCacheHelper.h in Headers */, + B2C59A8119777FD100B452DF /* CCSSceneReader.h in Headers */, + B2C59A8219777FD100B452DF /* CCTransformHelp.h in Headers */, + B2C59A8319777FD100B452DF /* CCTween.h in Headers */, + B2C59A8419777FD100B452DF /* CCUtilMath.h in Headers */, + B2C59A8519777FD100B452DF /* CocoStudio.h in Headers */, + B2C59A8619777FD100B452DF /* DictionaryHelper.h in Headers */, + B2C59A6119777FC200B452DF /* WidgetReader.h in Headers */, + B2C59A6219777FC200B452DF /* WidgetReaderProtocol.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B24EEA7219775ECE004493CC /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + B2C599BF1977703300B452DF /* CCBAnimationManager.h in Headers */, + B2C599C01977703300B452DF /* CCBFileLoader.h in Headers */, + B2C599C11977703300B452DF /* CCBKeyframe.h in Headers */, + B2C599C21977703300B452DF /* CCBMemberVariableAssigner.h in Headers */, + B2C599C31977703300B452DF /* CCBReader.h in Headers */, + B2C599C41977703300B452DF /* CCBSelectorResolver.h in Headers */, + B2C599C51977703300B452DF /* CCBSequence.h in Headers */, + B2C599C61977703300B452DF /* CCBSequenceProperty.h in Headers */, + B2C599C71977703300B452DF /* CCControlButtonLoader.h in Headers */, + B2C599C81977703300B452DF /* CCControlLoader.h in Headers */, + B2C599C91977703300B452DF /* CCLabelBMFontLoader.h in Headers */, + B2C599CA1977703300B452DF /* CCLabelTTFLoader.h in Headers */, + B2C599CB1977703300B452DF /* CCLayerColorLoader.h in Headers */, + B2C599CC1977703300B452DF /* CCLayerGradientLoader.h in Headers */, + B2C599CD1977703300B452DF /* CCLayerLoader.h in Headers */, + B2C599CE1977703300B452DF /* CCMenuItemImageLoader.h in Headers */, + B2C599CF1977703300B452DF /* CCMenuItemLoader.h in Headers */, + B2C599D01977703300B452DF /* CCMenuLoader.h in Headers */, + B2C599D11977703300B452DF /* CCNode+CCBRelativePositioning.h in Headers */, + B2C599D21977703300B452DF /* CCNodeLoader.h in Headers */, + B2C599D31977703300B452DF /* CCNodeLoaderLibrary.h in Headers */, + B2C599D41977703300B452DF /* CCNodeLoaderListener.h in Headers */, + B2C599D51977703300B452DF /* CCParticleSystemQuadLoader.h in Headers */, + B2C599D61977703300B452DF /* CCScale9SpriteLoader.h in Headers */, + B2C599D71977703300B452DF /* CCScrollViewLoader.h in Headers */, + B2C599D81977703300B452DF /* CCSpriteLoader.h in Headers */, + B2C599D91977703300B452DF /* CocosBuilder.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B24EEA7A19775EE1004493CC /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + B2CC504619776C0D0041958E /* SkeletonBounds.h in Headers */, + B2CC504719776C0D0041958E /* Event.h in Headers */, + B2CC504819776C0D0041958E /* EventData.h in Headers */, + B2CC504919776C0D0041958E /* BoundingBoxAttachment.h in Headers */, + B2CC504A19776C0D0041958E /* Animation.h in Headers */, + B2CC504B19776C0D0041958E /* AnimationState.h in Headers */, + B2CC504C19776C0D0041958E /* AnimationStateData.h in Headers */, + B2CC504D19776C0D0041958E /* Atlas.h in Headers */, + B2CC504E19776C0D0041958E /* AtlasAttachmentLoader.h in Headers */, + B2CC504F19776C0D0041958E /* Attachment.h in Headers */, + B2CC505019776C0D0041958E /* AttachmentLoader.h in Headers */, + B2CC505119776C0D0041958E /* Bone.h in Headers */, + B2CC505219776C0D0041958E /* BoneData.h in Headers */, + B2CC505319776C0E0041958E /* CCSkeleton.h in Headers */, + B2CC505419776C0E0041958E /* CCSkeletonAnimation.h in Headers */, + B2CC505519776C0E0041958E /* extension.h in Headers */, + B2CC505619776C0E0041958E /* Json.h in Headers */, + B2CC505719776C0E0041958E /* RegionAttachment.h in Headers */, + B2CC505819776C0E0041958E /* Skeleton.h in Headers */, + B2CC505919776C0E0041958E /* SkeletonData.h in Headers */, + B2CC505A19776C0E0041958E /* SkeletonJson.h in Headers */, + B2CC505B19776C0E0041958E /* Skin.h in Headers */, + B2CC505C19776C0E0041958E /* Slot.h in Headers */, + B2CC505D19776C0E0041958E /* SlotData.h in Headers */, + B2CC505E19776C0E0041958E /* spine-cocos2dx.h in Headers */, + B2CC505F19776C0E0041958E /* spine.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B24EEA8219775EF3004493CC /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + B2CC502A1977635D0041958E /* WebSocket.h in Headers */, + B2CC502B1977635F0041958E /* SocketIO.h in Headers */, + B2CC5025197763350041958E /* HttpClient.h in Headers */, + B2CC50261977633B0041958E /* HttpRequest.h in Headers */, + B2CC50271977633D0041958E /* HttpResponse.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B2DB47B6197669A100411E16 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + B2DB47E919766E2A00411E16 /* CCBAnimationManager.h in Headers */, + B2DB47EA19766E2A00411E16 /* CCBFileLoader.h in Headers */, + B2DB47EB19766E2A00411E16 /* CCBKeyframe.h in Headers */, + B2DB47EC19766E2A00411E16 /* CCBMemberVariableAssigner.h in Headers */, + B2DB47ED19766E2A00411E16 /* CCBReader.h in Headers */, + B2DB47EE19766E2A00411E16 /* CCBSelectorResolver.h in Headers */, + B2DB47EF19766E2A00411E16 /* CCBSequence.h in Headers */, + B2DB47F019766E2A00411E16 /* CCBSequenceProperty.h in Headers */, + B2DB47F119766E2A00411E16 /* CCControlButtonLoader.h in Headers */, + B2DB47F219766E2A00411E16 /* CCControlLoader.h in Headers */, + B2DB47F319766E2A00411E16 /* CCLabelBMFontLoader.h in Headers */, + B2DB47F419766E2A00411E16 /* CCLabelTTFLoader.h in Headers */, + B2DB47F519766E2A00411E16 /* CCLayerColorLoader.h in Headers */, + B2DB47F619766E2A00411E16 /* CCLayerGradientLoader.h in Headers */, + B2DB47F719766E2A00411E16 /* CCLayerLoader.h in Headers */, + B2DB47F819766E2A00411E16 /* CCMenuItemImageLoader.h in Headers */, + B2DB47F919766E2A00411E16 /* CCMenuItemLoader.h in Headers */, + B2DB47FA19766E2A00411E16 /* CCMenuLoader.h in Headers */, + B2DB47FB19766E2A00411E16 /* CCNode+CCBRelativePositioning.h in Headers */, + B2DB47FC19766E2A00411E16 /* CCNodeLoader.h in Headers */, + B2DB47FD19766E2A00411E16 /* CCNodeLoaderLibrary.h in Headers */, + B2DB47FE19766E2A00411E16 /* CCNodeLoaderListener.h in Headers */, + B2DB47FF19766E2A00411E16 /* CCParticleSystemQuadLoader.h in Headers */, + B2DB480019766E2A00411E16 /* CCScale9SpriteLoader.h in Headers */, + B2DB480119766E2A00411E16 /* CCScrollViewLoader.h in Headers */, + B2DB480219766E2A00411E16 /* CCSpriteLoader.h in Headers */, + B2DB480319766E2A00411E16 /* CocosBuilder.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B2DB48311976716E00411E16 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + B2DB484E19767C7000411E16 /* TriggerObj.h in Headers */, + B2DB484F19767C7000411E16 /* TriggerBase.h in Headers */, + B2DB485019767C7000411E16 /* TriggerMng.h in Headers */, + B2DB485119767C7000411E16 /* CCActionFrame.h in Headers */, + B2DB488619767CBD00411E16 /* CheckBoxReader.h in Headers */, + B2DB488719767CBF00411E16 /* ButtonReader.h in Headers */, + B2DB488519767CBA00411E16 /* ImageViewReader.h in Headers */, + B2DB485219767C7000411E16 /* CCActionFrameEasing.h in Headers */, + B2DB488419767CB700411E16 /* LayoutReader.h in Headers */, + B2DB488319767CB500411E16 /* ListViewReader.h in Headers */, + B2DB487819767C7F00411E16 /* CocoLoader.h in Headers */, + B2DB488219767CB300411E16 /* LoadingBarReader.h in Headers */, + B2DB488119767CB000411E16 /* PageViewReader.h in Headers */, + B2DB487D19767CA500411E16 /* TextBMFontReader.h in Headers */, + B2DB488019767CAD00411E16 /* ScrollViewReader.h in Headers */, + B2DB485319767C7000411E16 /* CCActionManagerEx.h in Headers */, + B2DB487E19767CA800411E16 /* TextAtlasReader.h in Headers */, + B2DB485419767C7000411E16 /* CCActionNode.h in Headers */, + B2DB487F19767CAA00411E16 /* SliderReader.h in Headers */, + B2DB487C19767CA300411E16 /* TextFieldReader.h in Headers */, + B2DB487A19767C9E00411E16 /* WidgetReader.h in Headers */, + B2DB485519767C7000411E16 /* CCActionObject.h in Headers */, + B2DB485619767C7000411E16 /* CCArmature.h in Headers */, + B2DB487B19767CA100411E16 /* TextReader.h in Headers */, + B2DB485719767C7000411E16 /* CCArmatureAnimation.h in Headers */, + B2DB485819767C7000411E16 /* CCArmatureDataManager.h in Headers */, + B2DB487919767C9D00411E16 /* WidgetReaderProtocol.h in Headers */, + B2DB485919767C7000411E16 /* CCArmatureDefine.h in Headers */, + B2DB485A19767C7000411E16 /* CCBatchNode.h in Headers */, + B2DB485B19767C7000411E16 /* CCBone.h in Headers */, + B2DB485C19767C7000411E16 /* CCColliderDetector.h in Headers */, + B2DB485D19767C7000411E16 /* CCComBase.h in Headers */, + B2DB485E19767C7000411E16 /* CCComAttribute.h in Headers */, + B2DB485F19767C7000411E16 /* CCComAudio.h in Headers */, + B2DB486019767C7000411E16 /* CCComController.h in Headers */, + B2DB487219767C7C00411E16 /* CCActionTimeline.h in Headers */, + B2DB487319767C7C00411E16 /* CCActionTimelineCache.h in Headers */, + B2DB487419767C7C00411E16 /* CCFrame.h in Headers */, + B2DB487519767C7C00411E16 /* CCNodeReader.h in Headers */, + B2DB487619767C7C00411E16 /* CCTimeLine.h in Headers */, + B2DB487719767C7C00411E16 /* CCTimelineMacro.h in Headers */, + B2DB486119767C7000411E16 /* CCComRender.h in Headers */, + B2DB486219767C7000411E16 /* CCDataReaderHelper.h in Headers */, + B2DB486319767C7000411E16 /* CCDatas.h in Headers */, + B2DB486419767C7000411E16 /* CCDecorativeDisplay.h in Headers */, + B2DB486519767C7000411E16 /* CCDisplayFactory.h in Headers */, + B2DB486619767C7000411E16 /* CCDisplayManager.h in Headers */, + B2DB486719767C7000411E16 /* CCInputDelegate.h in Headers */, + B2DB486819767C7000411E16 /* CCProcessBase.h in Headers */, + B2DB486919767C7000411E16 /* CCSGUIReader.h in Headers */, + B2DB486A19767C7000411E16 /* CCSkin.h in Headers */, + B2DB486B19767C7000411E16 /* CCSpriteFrameCacheHelper.h in Headers */, + B2DB486C19767C7000411E16 /* CCSSceneReader.h in Headers */, + B2DB486D19767C7000411E16 /* CCTransformHelp.h in Headers */, + B2DB486E19767C7000411E16 /* CCTween.h in Headers */, + B2DB486F19767C7000411E16 /* CCUtilMath.h in Headers */, + B2DB487019767C7000411E16 /* CocoStudio.h in Headers */, + B2DB487119767C7000411E16 /* DictionaryHelper.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B2DB48E519767F1F00411E16 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + B2DB491B19767F7700411E16 /* SkeletonBounds.h in Headers */, + B2DB491C19767F7700411E16 /* Event.h in Headers */, + B2DB491D19767F7700411E16 /* EventData.h in Headers */, + B2DB491E19767F7700411E16 /* BoundingBoxAttachment.h in Headers */, + B2DB491F19767F7700411E16 /* Animation.h in Headers */, + B2DB492019767F7700411E16 /* AnimationState.h in Headers */, + B2DB492119767F7700411E16 /* AnimationStateData.h in Headers */, + B2DB492219767F7700411E16 /* Atlas.h in Headers */, + B2DB492319767F7700411E16 /* AtlasAttachmentLoader.h in Headers */, + B2DB492419767F7700411E16 /* Attachment.h in Headers */, + B2DB492519767F7700411E16 /* AttachmentLoader.h in Headers */, + B2DB492619767F7700411E16 /* Bone.h in Headers */, + B2DB492719767F7700411E16 /* BoneData.h in Headers */, + B2DB492819767F7700411E16 /* CCSkeleton.h in Headers */, + B2DB492919767F7700411E16 /* CCSkeletonAnimation.h in Headers */, + B2DB492A19767F7700411E16 /* extension.h in Headers */, + B2DB492B19767F7700411E16 /* Json.h in Headers */, + B2DB492C19767F7700411E16 /* RegionAttachment.h in Headers */, + B2DB492D19767F7700411E16 /* Skeleton.h in Headers */, + B2DB492E19767F7700411E16 /* SkeletonData.h in Headers */, + B2DB492F19767F7700411E16 /* SkeletonJson.h in Headers */, + B2DB493019767F7700411E16 /* Skin.h in Headers */, + B2DB493119767F7700411E16 /* Slot.h in Headers */, + B2DB493219767F7700411E16 /* SlotData.h in Headers */, + B2DB493319767F7700411E16 /* spine-cocos2dx.h in Headers */, + B2DB493419767F7700411E16 /* spine.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B2DB49A8197686CB00411E16 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + B244F30B1976873300ED1926 /* HttpRequest.h in Headers */, + B244F3071976871800ED1926 /* HttpClient.h in Headers */, + B244F3081976871C00ED1926 /* HttpResponse.h in Headers */, + B244F3091976871F00ED1926 /* SocketIO.h in Headers */, + B244F30A1976872C00ED1926 /* WebSocket.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 1551A33E158F2AB200E66CFE /* cocos2dx Mac */ = { + 1551A33E158F2AB200E66CFE /* libcocos2d Mac */ = { isa = PBXNativeTarget; - buildConfigurationList = 1551A34C158F2AB200E66CFE /* Build configuration list for PBXNativeTarget "cocos2dx Mac" */; + buildConfigurationList = 1551A34C158F2AB200E66CFE /* Build configuration list for PBXNativeTarget "libcocos2d Mac" */; buildPhases = ( 1551A33B158F2AB200E66CFE /* Sources */, 1551A33C158F2AB200E66CFE /* Frameworks */, @@ -6022,14 +6297,14 @@ dependencies = ( 460E44F41807E241000CDD6D /* PBXTargetDependency */, ); - name = "cocos2dx Mac"; + name = "libcocos2d Mac"; productName = cocos2dx; - productReference = 1551A33F158F2AB200E66CFE /* libcocos2dx Mac.a */; + productReference = 1551A33F158F2AB200E66CFE /* libcocos2d Mac.a */; productType = "com.apple.product-type.library.static"; }; - A03F2B781780BD04006731B9 /* chipmunk Mac */ = { + A03F2B781780BD04006731B9 /* libchipmunk Mac */ = { isa = PBXNativeTarget; - buildConfigurationList = A03F2CB51780BD04006731B9 /* Build configuration list for PBXNativeTarget "chipmunk Mac" */; + buildConfigurationList = A03F2CB51780BD04006731B9 /* Build configuration list for PBXNativeTarget "libchipmunk Mac" */; buildPhases = ( A03F2B791780BD04006731B9 /* Sources */, A03F2C011780BD04006731B9 /* Frameworks */, @@ -6039,14 +6314,14 @@ ); dependencies = ( ); - name = "chipmunk Mac"; + name = "libchipmunk Mac"; productName = cocos2dx; productReference = A03F2CB81780BD04006731B9 /* libchipmunk Mac.a */; productType = "com.apple.product-type.library.static"; }; - A03F2D5D1780BDF7006731B9 /* box2d Mac */ = { + A03F2D5D1780BDF7006731B9 /* libbox2d Mac */ = { isa = PBXNativeTarget; - buildConfigurationList = A03F2D981780BDF7006731B9 /* Build configuration list for PBXNativeTarget "box2d Mac" */; + buildConfigurationList = A03F2D981780BDF7006731B9 /* Build configuration list for PBXNativeTarget "libbox2d Mac" */; buildPhases = ( A03F2D5E1780BDF7006731B9 /* Sources */, A03F2D7C1780BDF7006731B9 /* Frameworks */, @@ -6056,14 +6331,14 @@ ); dependencies = ( ); - name = "box2d Mac"; + name = "libbox2d Mac"; productName = cocos2dx; productReference = A03F2D9B1780BDF7006731B9 /* libbox2d Mac.a */; productType = "com.apple.product-type.library.static"; }; - A03F2E9817814268006731B9 /* CocosDenshion Mac */ = { + A03F2E9817814268006731B9 /* libcocosdenshion Mac */ = { isa = PBXNativeTarget; - buildConfigurationList = A03F2ED317814268006731B9 /* Build configuration list for PBXNativeTarget "CocosDenshion Mac" */; + buildConfigurationList = A03F2ED317814268006731B9 /* Build configuration list for PBXNativeTarget "libcocosdenshion Mac" */; buildPhases = ( A03F2E9917814268006731B9 /* Sources */, A03F2EB717814268006731B9 /* Frameworks */, @@ -6073,14 +6348,14 @@ ); dependencies = ( ); - name = "CocosDenshion Mac"; + name = "libcocosdenshion Mac"; productName = cocos2dx; - productReference = A03F2ED617814268006731B9 /* libCocosDenshion Mac.a */; + productReference = A03F2ED617814268006731B9 /* libcocosdenshion Mac.a */; productType = "com.apple.product-type.library.static"; }; - A03F2FC117814595006731B9 /* cocos2dx-extensions Mac */ = { + A03F2FC117814595006731B9 /* libextension Mac */ = { isa = PBXNativeTarget; - buildConfigurationList = A03F2FD317814595006731B9 /* Build configuration list for PBXNativeTarget "cocos2dx-extensions Mac" */; + buildConfigurationList = A03F2FD317814595006731B9 /* Build configuration list for PBXNativeTarget "libextension Mac" */; buildPhases = ( A03F2FC217814595006731B9 /* Sources */, A03F2FC917814595006731B9 /* Frameworks */, @@ -6090,14 +6365,14 @@ ); dependencies = ( ); - name = "cocos2dx-extensions Mac"; + name = "libextension Mac"; productName = cocos2dx; - productReference = A03F2FD617814595006731B9 /* libcocos2dx-extensions Mac.a */; + productReference = A03F2FD617814595006731B9 /* libextension Mac.a */; productType = "com.apple.product-type.library.static"; }; - A07A4C241783777C0073F6A7 /* cocos2dx iOS */ = { + A07A4C241783777C0073F6A7 /* libcocos2d iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = A07A4D611783777C0073F6A7 /* Build configuration list for PBXNativeTarget "cocos2dx iOS" */; + buildConfigurationList = A07A4D611783777C0073F6A7 /* Build configuration list for PBXNativeTarget "libcocos2d iOS" */; buildPhases = ( A07A4C251783777C0073F6A7 /* Sources */, A07A4CAD1783777C0073F6A7 /* Frameworks */, @@ -6108,14 +6383,14 @@ dependencies = ( 46A173D31807D330005B8026 /* PBXTargetDependency */, ); - name = "cocos2dx iOS"; + name = "libcocos2d iOS"; productName = cocos2dx; - productReference = A07A4D641783777C0073F6A7 /* libcocos2dx iOS.a */; + productReference = A07A4D641783777C0073F6A7 /* libcocos2d iOS.a */; productType = "com.apple.product-type.library.static"; }; - A07A4E111783867C0073F6A7 /* cocos2dx-extensions iOS */ = { + A07A4E111783867C0073F6A7 /* libextension iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = A07A4EF91783867C0073F6A7 /* Build configuration list for PBXNativeTarget "cocos2dx-extensions iOS" */; + buildConfigurationList = A07A4EF91783867C0073F6A7 /* Build configuration list for PBXNativeTarget "libextension iOS" */; buildPhases = ( A07A4E121783867C0073F6A7 /* Sources */, A07A4E7B1783867C0073F6A7 /* Frameworks */, @@ -6125,14 +6400,14 @@ ); dependencies = ( ); - name = "cocos2dx-extensions iOS"; + name = "libextension iOS"; productName = cocos2dx; - productReference = A07A4EFC1783867C0073F6A7 /* libcocos2dx-extensions iOS.a */; + productReference = A07A4EFC1783867C0073F6A7 /* libextension iOS.a */; productType = "com.apple.product-type.library.static"; }; - A07A4EFD178387670073F6A7 /* chipmunk iOS */ = { + A07A4EFD178387670073F6A7 /* libchipmunk iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = A07A4F38178387670073F6A7 /* Build configuration list for PBXNativeTarget "chipmunk iOS" */; + buildConfigurationList = A07A4F38178387670073F6A7 /* Build configuration list for PBXNativeTarget "libchipmunk iOS" */; buildPhases = ( A07A4EFE178387670073F6A7 /* Sources */, A07A4F1C178387670073F6A7 /* Frameworks */, @@ -6142,14 +6417,14 @@ ); dependencies = ( ); - name = "chipmunk iOS"; + name = "libchipmunk iOS"; productName = cocos2dx; productReference = A07A4F3B178387670073F6A7 /* libchipmunk iOS.a */; productType = "com.apple.product-type.library.static"; }; - A07A4F3C1783876B0073F6A7 /* box2d iOS */ = { + A07A4F3C1783876B0073F6A7 /* libbox2d iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = A07A4F9B1783876B0073F6A7 /* Build configuration list for PBXNativeTarget "box2d iOS" */; + buildConfigurationList = A07A4F9B1783876B0073F6A7 /* Build configuration list for PBXNativeTarget "libbox2d iOS" */; buildPhases = ( A07A4F3D1783876B0073F6A7 /* Sources */, A07A4F6B1783876B0073F6A7 /* Frameworks */, @@ -6159,14 +6434,14 @@ ); dependencies = ( ); - name = "box2d iOS"; + name = "libbox2d iOS"; productName = cocos2dx; productReference = A07A4F9E1783876B0073F6A7 /* libbox2d iOS.a */; productType = "com.apple.product-type.library.static"; }; - A07A4F9F178387730073F6A7 /* CocosDenshion iOS */ = { + A07A4F9F178387730073F6A7 /* libcocosdenshion iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = A07A4FB1178387730073F6A7 /* Build configuration list for PBXNativeTarget "CocosDenshion iOS" */; + buildConfigurationList = A07A4FB1178387730073F6A7 /* Build configuration list for PBXNativeTarget "libcocosdenshion iOS" */; buildPhases = ( A07A4FA0178387730073F6A7 /* Sources */, A07A4FA7178387730073F6A7 /* Frameworks */, @@ -6176,9 +6451,179 @@ ); dependencies = ( ); - name = "CocosDenshion iOS"; + name = "libcocosdenshion iOS"; productName = cocos2dx; - productReference = A07A4FB4178387730073F6A7 /* libCocosDenshion iOS.a */; + productReference = A07A4FB4178387730073F6A7 /* libcocosdenshion iOS.a */; + productType = "com.apple.product-type.library.static"; + }; + B245F10019766132001920FD /* libui Mac */ = { + isa = PBXNativeTarget; + buildConfigurationList = B245F13719766132001920FD /* Build configuration list for PBXNativeTarget "libui Mac" */; + buildPhases = ( + B245F10119766132001920FD /* Sources */, + B245F11A19766132001920FD /* Frameworks */, + B245F11B19766132001920FD /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libui Mac"; + productName = cocos2dx; + productReference = B245F13A19766132001920FD /* libui Mac.a */; + productType = "com.apple.product-type.library.static"; + }; + B24EEA2C19775E92004493CC /* libui iOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = B24EEA6319775E92004493CC /* Build configuration list for PBXNativeTarget "libui iOS" */; + buildPhases = ( + B24EEA2D19775E92004493CC /* Sources */, + B24EEA4619775E92004493CC /* Frameworks */, + B24EEA4719775E92004493CC /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libui iOS"; + productName = cocos2dx; + productReference = B24EEA6619775E92004493CC /* libui iOS.a */; + productType = "com.apple.product-type.library.static"; + }; + B24EEA6719775EBB004493CC /* libcocostudio iOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = B24EEA6B19775EBB004493CC /* Build configuration list for PBXNativeTarget "libcocostudio iOS" */; + buildPhases = ( + B24EEA6819775EBB004493CC /* Sources */, + B24EEA6919775EBB004493CC /* Frameworks */, + B24EEA6A19775EBB004493CC /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libcocostudio iOS"; + productName = cocos2dx; + productReference = B24EEA6E19775EBB004493CC /* libcocostudio iOS.a */; + productType = "com.apple.product-type.library.static"; + }; + B24EEA6F19775ECE004493CC /* libcocosbuilder iOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = B24EEA7319775ECE004493CC /* Build configuration list for PBXNativeTarget "libcocosbuilder iOS" */; + buildPhases = ( + B24EEA7019775ECE004493CC /* Sources */, + B24EEA7119775ECE004493CC /* Frameworks */, + B24EEA7219775ECE004493CC /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libcocosbuilder iOS"; + productName = cocos2dx; + productReference = B24EEA7619775ECE004493CC /* libcocosbuilder iOS.a */; + productType = "com.apple.product-type.library.static"; + }; + B24EEA7719775EE1004493CC /* libspine iOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = B24EEA7B19775EE1004493CC /* Build configuration list for PBXNativeTarget "libspine iOS" */; + buildPhases = ( + B24EEA7819775EE1004493CC /* Sources */, + B24EEA7919775EE1004493CC /* Frameworks */, + B24EEA7A19775EE1004493CC /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libspine iOS"; + productName = cocos2dx; + productReference = B24EEA7E19775EE1004493CC /* libspine iOS.a */; + productType = "com.apple.product-type.library.static"; + }; + B24EEA7F19775EF3004493CC /* libnetwork iOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = B24EEA8319775EF3004493CC /* Build configuration list for PBXNativeTarget "libnetwork iOS" */; + buildPhases = ( + B24EEA8019775EF3004493CC /* Sources */, + B24EEA8119775EF3004493CC /* Frameworks */, + B24EEA8219775EF3004493CC /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libnetwork iOS"; + productName = cocos2dx; + productReference = B24EEA8619775EF3004493CC /* libnetwork iOS.a */; + productType = "com.apple.product-type.library.static"; + }; + B2DB479B197669A100411E16 /* libcocosbuilder Mac */ = { + isa = PBXNativeTarget; + buildConfigurationList = B2DB47CF197669A100411E16 /* Build configuration list for PBXNativeTarget "libcocosbuilder Mac" */; + buildPhases = ( + B2DB479C197669A100411E16 /* Sources */, + B2DB47B5197669A100411E16 /* Frameworks */, + B2DB47B6197669A100411E16 /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libcocosbuilder Mac"; + productName = cocos2dx; + productReference = B2DB47D2197669A100411E16 /* libcocosbuilder Mac.a */; + productType = "com.apple.product-type.library.static"; + }; + B2DB48161976716E00411E16 /* libcocostudio Mac */ = { + isa = PBXNativeTarget; + buildConfigurationList = B2DB484A1976716E00411E16 /* Build configuration list for PBXNativeTarget "libcocostudio Mac" */; + buildPhases = ( + B2DB48171976716E00411E16 /* Sources */, + B2DB48301976716E00411E16 /* Frameworks */, + B2DB48311976716E00411E16 /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libcocostudio Mac"; + productName = cocos2dx; + productReference = B2DB484D1976716E00411E16 /* libcocostudio Mac.a */; + productType = "com.apple.product-type.library.static"; + }; + B2DB48CA19767F1F00411E16 /* libspine Mac */ = { + isa = PBXNativeTarget; + buildConfigurationList = B2DB48FE19767F1F00411E16 /* Build configuration list for PBXNativeTarget "libspine Mac" */; + buildPhases = ( + B2DB48CB19767F1F00411E16 /* Sources */, + B2DB48E419767F1F00411E16 /* Frameworks */, + B2DB48E519767F1F00411E16 /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libspine Mac"; + productName = cocos2dx; + productReference = B2DB490119767F1F00411E16 /* libspine Mac.a */; + productType = "com.apple.product-type.library.static"; + }; + B2DB498D197686CB00411E16 /* libnetwork Mac */ = { + isa = PBXNativeTarget; + buildConfigurationList = B2DB49C1197686CB00411E16 /* Build configuration list for PBXNativeTarget "libnetwork Mac" */; + buildPhases = ( + B2DB498E197686CB00411E16 /* Sources */, + B2DB49A7197686CB00411E16 /* Frameworks */, + B2DB49A8197686CB00411E16 /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libnetwork Mac"; + productName = cocos2dx; + productReference = B2DB49C4197686CB00411E16 /* libnetwork Mac.a */; productType = "com.apple.product-type.library.static"; }; /* End PBXNativeTarget section */ @@ -6203,17 +6648,27 @@ projectRoot = ""; targets = ( A03F2E8E178141C1006731B9 /* build all libs Mac */, - 1551A33E158F2AB200E66CFE /* cocos2dx Mac */, - A03F2FC117814595006731B9 /* cocos2dx-extensions Mac */, - A03F2B781780BD04006731B9 /* chipmunk Mac */, - A03F2D5D1780BDF7006731B9 /* box2d Mac */, - A03F2E9817814268006731B9 /* CocosDenshion Mac */, + 1551A33E158F2AB200E66CFE /* libcocos2d Mac */, + A03F2FC117814595006731B9 /* libextension Mac */, + B245F10019766132001920FD /* libui Mac */, + B2DB48161976716E00411E16 /* libcocostudio Mac */, + B2DB479B197669A100411E16 /* libcocosbuilder Mac */, + B2DB48CA19767F1F00411E16 /* libspine Mac */, + B2DB498D197686CB00411E16 /* libnetwork Mac */, + A03F2B781780BD04006731B9 /* libchipmunk Mac */, + A03F2D5D1780BDF7006731B9 /* libbox2d Mac */, + A03F2E9817814268006731B9 /* libcocosdenshion Mac */, A07A4E0B178386390073F6A7 /* build all libs iOS */, - A07A4C241783777C0073F6A7 /* cocos2dx iOS */, - A07A4E111783867C0073F6A7 /* cocos2dx-extensions iOS */, - A07A4EFD178387670073F6A7 /* chipmunk iOS */, - A07A4F3C1783876B0073F6A7 /* box2d iOS */, - A07A4F9F178387730073F6A7 /* CocosDenshion iOS */, + A07A4C241783777C0073F6A7 /* libcocos2d iOS */, + A07A4E111783867C0073F6A7 /* libextension iOS */, + A07A4EFD178387670073F6A7 /* libchipmunk iOS */, + A07A4F3C1783876B0073F6A7 /* libbox2d iOS */, + A07A4F9F178387730073F6A7 /* libcocosdenshion iOS */, + B24EEA2C19775E92004493CC /* libui iOS */, + B24EEA6719775EBB004493CC /* libcocostudio iOS */, + B24EEA6F19775ECE004493CC /* libcocosbuilder iOS */, + B24EEA7719775EE1004493CC /* libspine iOS */, + B24EEA7F19775EF3004493CC /* libnetwork iOS */, ); }; /* End PBXProject section */ @@ -6223,44 +6678,35 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 2AC795DB1862870F005EC8E1 /* SkeletonBounds.cpp in Sources */, 50ABBE2B1925AB6F00A911A9 /* ccCArray.cpp in Sources */, - 2AC795DC1862870F005EC8E1 /* Event.cpp in Sources */, 1A01C68A18F57BE800EFE3A6 /* CCDeprecated.cpp in Sources */, 1A1645B0191B726C008C7C7F /* ConvertUTF.c in Sources */, - 2905FA5618CF08D100240AA3 /* UILayout.cpp in Sources */, - 2AC795DD1862870F005EC8E1 /* EventData.cpp in Sources */, - 2AC795DE1862870F005EC8E1 /* BoundingBoxAttachment.cpp in Sources */, 50ABBD581925AB0000A911A9 /* Vec2.cpp in Sources */, 50ABBE311925AB6F00A911A9 /* CCConfiguration.cpp in Sources */, 1A01C6A418F58F7500EFE3A6 /* CCNotificationCenter.cpp in Sources */, 46A170EA1807CECA005B8026 /* CCPhysicsJoint.cpp in Sources */, 5027253C190BF1B900AAF4ED /* cocos2d.cpp in Sources */, - 0634A4D4194B19E400E608AF /* CCActionTimelineCache.cpp in Sources */, 50ABC0611926664800A911A9 /* CCCommon.mm in Sources */, 50ABBDB11925AB4100A911A9 /* ccShaders.cpp in Sources */, 46A170EF1807CECA005B8026 /* CCPhysicsWorld.cpp in Sources */, 46A170ED1807CECA005B8026 /* CCPhysicsShape.cpp in Sources */, 50ABBE991925AB6F00A911A9 /* CCRef.cpp in Sources */, ED9C6A9418599AD8000A5232 /* CCNodeGrid.cpp in Sources */, - 06CAAACB186AD7F20012A414 /* TriggerMng.cpp in Sources */, 46A170E61807CECA005B8026 /* CCPhysicsBody.cpp in Sources */, - 29E99D1E1957BA7000046604 /* CocoLoader.cpp in Sources */, 50ABBDA71925AB4100A911A9 /* CCRenderCommand.cpp in Sources */, 50ABBD501925AB0000A911A9 /* Quaternion.cpp in Sources */, 50ABBEBB1925AB6F00A911A9 /* ccUtils.cpp in Sources */, + 15EFA211198A2BB5000C57D3 /* CCProtectedNode.cpp in Sources */, 50ABBEB71925AB6F00A911A9 /* ccUTF8.cpp in Sources */, 50ABBE271925AB6F00A911A9 /* CCAutoreleasePool.cpp in Sources */, 50ABBE8B1925AB6F00A911A9 /* CCNS.cpp in Sources */, 46A170E81807CECA005B8026 /* CCPhysicsContact.cpp in Sources */, 1A570061180BC5A10088DEC7 /* CCAction.cpp in Sources */, 50ABBEC51925AB6F00A911A9 /* etc1.cpp in Sources */, - 50FCEB9718C72017004AD434 /* CheckBoxReader.cpp in Sources */, 1A570065180BC5A10088DEC7 /* CCActionCamera.cpp in Sources */, 50ABBEAB1925AB6F00A911A9 /* ccTypes.cpp in Sources */, 1A570069180BC5A10088DEC7 /* CCActionCatmullRom.cpp in Sources */, 1A57006D180BC5A10088DEC7 /* CCActionEase.cpp in Sources */, - 2905FA4E18CF08D100240AA3 /* UIHelper.cpp in Sources */, 1A570071180BC5A10088DEC7 /* CCActionGrid.cpp in Sources */, B37510761823AC9F00B3BA6A /* CCPhysicsJointInfo_chipmunk.cpp in Sources */, 50ABBFFF1926664800A911A9 /* CCFileUtilsApple.mm in Sources */, @@ -6277,20 +6723,15 @@ 50ABBEBF1925AB6F00A911A9 /* CCValue.cpp in Sources */, 1A570098180BC5C10088DEC7 /* CCAtlasNode.cpp in Sources */, 1A57009E180BC5D20088DEC7 /* CCNode.cpp in Sources */, - 2905FA7418CF08D100240AA3 /* UIScrollView.cpp in Sources */, 50ABBE651925AB6F00A911A9 /* CCEventListenerCustom.cpp in Sources */, B37510781823AC9F00B3BA6A /* CCPhysicsShapeInfo_chipmunk.cpp in Sources */, - 50FCEBB718C72017004AD434 /* TextAtlasReader.cpp in Sources */, 50ABBE391925AB6F00A911A9 /* CCData.cpp in Sources */, 1A57010E180BC8EE0088DEC7 /* CCDrawingPrimitives.cpp in Sources */, 50ABBED71925AB6F00A911A9 /* ZipUtils.cpp in Sources */, - 2905FA6618CF08D100240AA3 /* UILoadingBar.cpp in Sources */, - 50FCEBA318C72017004AD434 /* ListViewReader.cpp in Sources */, 1A01C68418F57BE800EFE3A6 /* CCArray.cpp in Sources */, 1A570112180BC8EE0088DEC7 /* CCDrawNode.cpp in Sources */, 1A57011B180BC90D0088DEC7 /* CCGrabber.cpp in Sources */, 1A57011F180BC90D0088DEC7 /* CCGrid.cpp in Sources */, - 50FCEBA718C72017004AD434 /* LoadingBarReader.cpp in Sources */, 1A57019D180BCB590088DEC7 /* CCFont.cpp in Sources */, 1A5701A1180BCB590088DEC7 /* CCFontAtlas.cpp in Sources */, 1A5701A5180BCB590088DEC7 /* CCFontAtlasCache.cpp in Sources */, @@ -6320,7 +6761,6 @@ 1A1645B2191B726C008C7C7F /* ConvertUTFWrapper.cpp in Sources */, 1A5701FB180BCBAD0088DEC7 /* CCMenuItem.cpp in Sources */, 1A570202180BCBD40088DEC7 /* CCClippingNode.cpp in Sources */, - 06CAAACF186AD7FC0012A414 /* TriggerBase.cpp in Sources */, 1A570208180BCBDF0088DEC7 /* CCMotionStreak.cpp in Sources */, 1A570210180BCBF40088DEC7 /* CCProgressTimer.cpp in Sources */, 50ABBDB51925AB4100A911A9 /* CCTexture2D.cpp in Sources */, @@ -6330,7 +6770,6 @@ 1A570225180BCC1A0088DEC7 /* CCParticleExamples.cpp in Sources */, 1A570229180BCC1A0088DEC7 /* CCParticleSystem.cpp in Sources */, 1A57022D180BCC1A0088DEC7 /* CCParticleSystemQuad.cpp in Sources */, - 50FCEB9B18C72017004AD434 /* ImageViewReader.cpp in Sources */, 1A57027E180BCC900088DEC7 /* CCSprite.cpp in Sources */, 1A570282180BCC900088DEC7 /* CCSpriteBatchNode.cpp in Sources */, 1A570286180BCC900088DEC7 /* CCSpriteFrame.cpp in Sources */, @@ -6339,26 +6778,19 @@ 1A57028A180BCC900088DEC7 /* CCSpriteFrameCache.cpp in Sources */, 1A570292180BCCAB0088DEC7 /* CCAnimation.cpp in Sources */, 1A570296180BCCAB0088DEC7 /* CCAnimationCache.cpp in Sources */, - 2905FA8C18CF08D100240AA3 /* UIWidget.cpp in Sources */, - 2905FA8018CF08D100240AA3 /* UITextAtlas.cpp in Sources */, 50ABBE351925AB6F00A911A9 /* CCConsole.cpp in Sources */, 50ABBEAF1925AB6F00A911A9 /* CCUserDefault.cpp in Sources */, - 50FCEBBB18C72017004AD434 /* TextBMFontReader.cpp in Sources */, 50ABBE791925AB6F00A911A9 /* CCEventMouse.cpp in Sources */, - 50FCEBBF18C72017004AD434 /* TextFieldReader.cpp in Sources */, - 50FCEBAF18C72017004AD434 /* ScrollViewReader.cpp in Sources */, - 50ABC0111926664800A911A9 /* CCGLViewProtocol.cpp in Sources */, + 50ABC0111926664800A911A9 /* CCGLView.cpp in Sources */, B29594C21926D61F003EEF37 /* CCMesh.cpp in Sources */, 50ABBE3D1925AB6F00A911A9 /* CCDataVisitor.cpp in Sources */, 1A5702C8180BCE370088DEC7 /* CCTextFieldTTF.cpp in Sources */, 50ABBE7D1925AB6F00A911A9 /* CCEventTouch.cpp in Sources */, - 50FCEBAB18C72017004AD434 /* PageViewReader.cpp in Sources */, 1A5702EA180BCE750088DEC7 /* CCTileMapAtlas.cpp in Sources */, 50ABBD971925AB4100A911A9 /* CCGLProgramStateCache.cpp in Sources */, 1A5702EE180BCE750088DEC7 /* CCTMXLayer.cpp in Sources */, 50ABBE691925AB6F00A911A9 /* CCEventListenerFocus.cpp in Sources */, 1A5702F2180BCE750088DEC7 /* CCTMXObjectGroup.cpp in Sources */, - 0634A4DC194B19E400E608AF /* CCNodeReader.cpp in Sources */, 1A5702F6180BCE750088DEC7 /* CCTMXTiledMap.cpp in Sources */, 1A5702FA180BCE750088DEC7 /* CCTMXXMLParser.cpp in Sources */, 50ABBD5C1925AB0000A911A9 /* Vec3.cpp in Sources */, @@ -6369,166 +6801,63 @@ 1A01C69C18F57BE800EFE3A6 /* CCString.cpp in Sources */, 50ABBD3C1925AB0000A911A9 /* CCGeometry.cpp in Sources */, 50ABC0011926664800A911A9 /* CCLock.cpp in Sources */, - 50E6D30E18DADB5D0051CA34 /* CCProtectedNode.cpp in Sources */, 50ABBD931925AB4100A911A9 /* CCGLProgramState.cpp in Sources */, 1A57034B180BD09B0088DEC7 /* tinyxml2.cpp in Sources */, 1A570354180BD0B00088DEC7 /* ioapi.cpp in Sources */, 1A570358180BD0B00088DEC7 /* unzip.cpp in Sources */, 3EA47870195478E00068D9D1 /* CCBundleReader.cpp in Sources */, - 1AD71DA9180E26E600808F54 /* CCBAnimationManager.cpp in Sources */, - 1AD71DAD180E26E600808F54 /* CCBFileLoader.cpp in Sources */, - 50E6D33418E174130051CA34 /* UIHBox.cpp in Sources */, 50ABBEB31925AB6F00A911A9 /* CCUserDefault.mm in Sources */, - 2905FA8418CF08D100240AA3 /* UITextBMFont.cpp in Sources */, - 1AD71DB1180E26E600808F54 /* CCBKeyframe.cpp in Sources */, - 1AD71DB7180E26E600808F54 /* CCBReader.cpp in Sources */, 50ABBEB51925AB6F00A911A9 /* CCUserDefaultAndroid.cpp in Sources */, - 1AD71DBD180E26E600808F54 /* CCBSequence.cpp in Sources */, - 1AD71DC1180E26E600808F54 /* CCBSequenceProperty.cpp in Sources */, - 1AD71DC9180E26E600808F54 /* CCControlButtonLoader.cpp in Sources */, - 1AD71DCD180E26E600808F54 /* CCControlLoader.cpp in Sources */, 50ABBE831925AB6F00A911A9 /* ccFPSImages.c in Sources */, - 50FCEBC718C72017004AD434 /* WidgetReader.cpp in Sources */, - 1AD71DD1180E26E600808F54 /* CCLabelBMFontLoader.cpp in Sources */, - 1AD71DD5180E26E600808F54 /* CCLabelTTFLoader.cpp in Sources */, 50ABBEA71925AB6F00A911A9 /* CCTouch.cpp in Sources */, - 1AD71DD9180E26E600808F54 /* CCLayerColorLoader.cpp in Sources */, - 1AD71DDD180E26E600808F54 /* CCLayerGradientLoader.cpp in Sources */, - 1AD71DE1180E26E600808F54 /* CCLayerLoader.cpp in Sources */, - 1AD71DE5180E26E600808F54 /* CCMenuItemImageLoader.cpp in Sources */, 50ABBD8B1925AB4100A911A9 /* CCGLProgram.cpp in Sources */, - 1AD71DE9180E26E600808F54 /* CCMenuItemLoader.cpp in Sources */, + 464AD6E5197EBB1400E502D8 /* pvr.cpp in Sources */, 50ABBDA31925AB4100A911A9 /* CCQuadCommand.cpp in Sources */, - 2905FA6A18CF08D100240AA3 /* UIPageView.cpp in Sources */, B29594C61926D61F003EEF37 /* CCObjLoader.cpp in Sources */, - 06CAAAC7186AD7E90012A414 /* TriggerObj.cpp in Sources */, - 1AD71DEF180E26E600808F54 /* CCNode+CCBRelativePositioning.cpp in Sources */, 50ABC01D1926664800A911A9 /* CCThread.cpp in Sources */, - 1AD71DF3180E26E600808F54 /* CCNodeLoader.cpp in Sources */, - 1AD71DF7180E26E600808F54 /* CCNodeLoaderLibrary.cpp in Sources */, 50ABBECB1925AB6F00A911A9 /* s3tc.cpp in Sources */, - 1AD71DFD180E26E600808F54 /* CCParticleSystemQuadLoader.cpp in Sources */, - 50FCEB9318C72017004AD434 /* ButtonReader.cpp in Sources */, - 1AD71E01180E26E600808F54 /* CCScale9SpriteLoader.cpp in Sources */, - 1AD71E05180E26E600808F54 /* CCScrollViewLoader.cpp in Sources */, - 1AD71E09180E26E600808F54 /* CCSpriteLoader.cpp in Sources */, 50ABBD481925AB0000A911A9 /* Mat4.cpp in Sources */, - 1AD71E95180E26E600808F54 /* Animation.cpp in Sources */, - 1AD71E99180E26E600808F54 /* AnimationState.cpp in Sources */, - 1AD71E9D180E26E600808F54 /* AnimationStateData.cpp in Sources */, - 1AD71EA1180E26E600808F54 /* Atlas.cpp in Sources */, - 1AD71EA5180E26E600808F54 /* AtlasAttachmentLoader.cpp in Sources */, 50ABBD8F1925AB4100A911A9 /* CCGLProgramCache.cpp in Sources */, 50ABBD441925AB0000A911A9 /* CCVertex.cpp in Sources */, - 1AD71EA9180E26E600808F54 /* Attachment.cpp in Sources */, - 1AD71EAD180E26E600808F54 /* AttachmentLoader.cpp in Sources */, 503DD8F71926B0DB00CD74DD /* CCIMEDispatcher.cpp in Sources */, - 1AD71EB1180E26E600808F54 /* Bone.cpp in Sources */, - 1AD71EB5180E26E600808F54 /* BoneData.cpp in Sources */, - 29BDBA53195D597A003225C9 /* UIDeprecated.cpp in Sources */, - 1AD71EB9180E26E600808F54 /* CCSkeleton.cpp in Sources */, 50ABBE751925AB6F00A911A9 /* CCEventListenerTouch.cpp in Sources */, - 1AD71EBD180E26E600808F54 /* CCSkeletonAnimation.cpp in Sources */, - 2905FA4018CF08D100240AA3 /* CocosGUI.cpp in Sources */, - 1AD71EC1180E26E600808F54 /* extension.cpp in Sources */, 50ABBE511925AB6F00A911A9 /* CCEventDispatcher.cpp in Sources */, - 29CB8F4C1929D1BB00C841D6 /* UILayoutManager.cpp in Sources */, 50ABC0051926664800A911A9 /* CCThread.mm in Sources */, - 1AD71EC5180E26E600808F54 /* Json.cpp in Sources */, - 50E6D33C18E174130051CA34 /* UIVBox.cpp in Sources */, - 1AD71EC9180E26E600808F54 /* RegionAttachment.cpp in Sources */, - 50E6D33818E174130051CA34 /* UIRelativeBox.cpp in Sources */, - 1AD71ECD180E26E600808F54 /* Skeleton.cpp in Sources */, - 1AD71ED1180E26E600808F54 /* SkeletonData.cpp in Sources */, - 1AD71ED5180E26E600808F54 /* SkeletonJson.cpp in Sources */, B29594CA1926D61F003EEF37 /* CCSprite3D.cpp in Sources */, - 1AD71ED9180E26E600808F54 /* Skin.cpp in Sources */, - 1AD71EDD180E26E600808F54 /* Slot.cpp in Sources */, - 1AD71EE1180E26E600808F54 /* SlotData.cpp in Sources */, - 2905FA7818CF08D100240AA3 /* UISlider.cpp in Sources */, - 1AD71EE5180E26E600808F54 /* spine-cocos2dx.cpp in Sources */, - 1AAF536A180E3374000584C8 /* HttpClient.cpp in Sources */, 50ABC0631926664800A911A9 /* CCDevice.mm in Sources */, - 0634A4E0194B19E400E608AF /* CCTimeLine.cpp in Sources */, - 1AAF5372180E3374000584C8 /* SocketIO.cpp in Sources */, 50ABBE1F1925AB6F00A911A9 /* atitc.cpp in Sources */, - 1AAF5376180E3374000584C8 /* WebSocket.cpp in Sources */, 1A01C69818F57BE800EFE3A6 /* CCSet.cpp in Sources */, 1AAF584F180E40B9000584C8 /* LocalStorage.cpp in Sources */, 50ABBEA31925AB6F00A911A9 /* CCScriptSupport.cpp in Sources */, 50ABBE6D1925AB6F00A911A9 /* CCEventListenerKeyboard.cpp in Sources */, 1AAF5853180E40B9000584C8 /* LocalStorageAndroid.cpp in Sources */, - 2905FA4A18CF08D100240AA3 /* UICheckBox.cpp in Sources */, 1A9DCA27180E6955007A3AD4 /* CCGLBufferedNode.cpp in Sources */, - 2905FA5E18CF08D100240AA3 /* UILayoutParameter.cpp in Sources */, 50ABBD541925AB0000A911A9 /* TransformUtils.cpp in Sources */, - 1A8C598B180E930E00EF57C3 /* CCActionFrame.cpp in Sources */, 50ABBD9B1925AB4100A911A9 /* ccGLStateCache.cpp in Sources */, - 1A8C598F180E930E00EF57C3 /* CCActionFrameEasing.cpp in Sources */, 50ABBDB91925AB4100A911A9 /* CCTextureAtlas.cpp in Sources */, - 1A8C5993180E930E00EF57C3 /* CCActionManagerEx.cpp in Sources */, - 1A8C5997180E930E00EF57C3 /* CCActionNode.cpp in Sources */, 50ABBECF1925AB6F00A911A9 /* TGAlib.cpp in Sources */, - 50FCEBC318C72017004AD434 /* TextReader.cpp in Sources */, - 1A8C599B180E930E00EF57C3 /* CCActionObject.cpp in Sources */, 50ABBE451925AB6F00A911A9 /* CCEvent.cpp in Sources */, - 1A8C599F180E930E00EF57C3 /* CCArmature.cpp in Sources */, - 1A8C59A3180E930E00EF57C3 /* CCArmatureAnimation.cpp in Sources */, - 1A8C59A7180E930E00EF57C3 /* CCArmatureDataManager.cpp in Sources */, - 1A8C59AB180E930E00EF57C3 /* CCArmatureDefine.cpp in Sources */, - 1A8C59AF180E930E00EF57C3 /* CCBatchNode.cpp in Sources */, 50ABBE611925AB6F00A911A9 /* CCEventListenerAcceleration.cpp in Sources */, 50ABBD9F1925AB4100A911A9 /* CCGroupCommand.cpp in Sources */, - 1A8C59B3180E930E00EF57C3 /* CCBone.cpp in Sources */, - 1A8C59B7180E930E00EF57C3 /* CCColliderDetector.cpp in Sources */, - 1A8C59BB180E930E00EF57C3 /* CCComAttribute.cpp in Sources */, 50ABBD871925AB4100A911A9 /* CCCustomCommand.cpp in Sources */, - 1A8C59BF180E930E00EF57C3 /* CCComAudio.cpp in Sources */, - 1A8C59C3180E930E00EF57C3 /* CCComController.cpp in Sources */, - 2905FA5218CF08D100240AA3 /* UIImageView.cpp in Sources */, 50ABBDBD1925AB4100A911A9 /* CCTextureCache.cpp in Sources */, B29594CE1926D61F003EEF37 /* CCSprite3DMaterial.cpp in Sources */, 299754F4193EC95400A54AC3 /* ObjectFactory.cpp in Sources */, - 2905FA7C18CF08D100240AA3 /* UIText.cpp in Sources */, - 50FCEB9F18C72017004AD434 /* LayoutReader.cpp in Sources */, - 50ABC0211926664800A911A9 /* CCGLView.cpp in Sources */, - 0634A4D8194B19E400E608AF /* CCFrame.cpp in Sources */, - 1A8C59C7180E930E00EF57C3 /* CCComRender.cpp in Sources */, + 50ABC0211926664800A911A9 /* CCGLViewImpl.cpp in Sources */, 50ABC00D1926664800A911A9 /* CCFileUtils.cpp in Sources */, - 1A8C59CB180E930E00EF57C3 /* CCDataReaderHelper.cpp in Sources */, - 1A8C59CF180E930E00EF57C3 /* CCDatas.cpp in Sources */, - 1A8C59D3180E930E00EF57C3 /* CCDecorativeDisplay.cpp in Sources */, - 50FCEBB318C72017004AD434 /* SliderReader.cpp in Sources */, 50ABBE4D1925AB6F00A911A9 /* CCEventCustom.cpp in Sources */, 50ABBE9F1925AB6F00A911A9 /* CCScheduler.cpp in Sources */, 50ABC0151926664800A911A9 /* CCImage.cpp in Sources */, 50ABBE231925AB6F00A911A9 /* base64.cpp in Sources */, 50ABBE5D1925AB6F00A911A9 /* CCEventListener.cpp in Sources */, - 1A8C59D7180E930E00EF57C3 /* CCDisplayFactory.cpp in Sources */, 50ABBD601925AB0000A911A9 /* Vec4.cpp in Sources */, - 1A8C59DB180E930E00EF57C3 /* CCDisplayManager.cpp in Sources */, - 0634A4D0194B19E400E608AF /* CCActionTimeline.cpp in Sources */, - 2905FA6218CF08D100240AA3 /* UIListView.cpp in Sources */, - 1A8C59DF180E930E00EF57C3 /* CCInputDelegate.cpp in Sources */, - 1A8C59E3180E930E00EF57C3 /* CCProcessBase.cpp in Sources */, - 1A8C59E7180E930E00EF57C3 /* CCSGUIReader.cpp in Sources */, 50ABC05F1926664800A911A9 /* CCApplication.mm in Sources */, - 1A8C59EB180E930E00EF57C3 /* CCSkin.cpp in Sources */, - 1A8C59EF180E930E00EF57C3 /* CCSpriteFrameCacheHelper.cpp in Sources */, - 1A8C59F3180E930E00EF57C3 /* CCSSceneReader.cpp in Sources */, - 2905FA6E18CF08D100240AA3 /* UIRichText.cpp in Sources */, B29594B41926D5EC003EEF37 /* CCMeshCommand.cpp in Sources */, 1A01C68E18F57BE800EFE3A6 /* CCDictionary.cpp in Sources */, - 1A8C59F7180E930E00EF57C3 /* CCTransformHelp.cpp in Sources */, 50ABBD381925AB0000A911A9 /* CCAffineTransform.cpp in Sources */, - 1A8C59FB180E930E00EF57C3 /* CCTween.cpp in Sources */, - 2905FA8818CF08D100240AA3 /* UITextField.cpp in Sources */, 46C02E0718E91123004B7456 /* xxhash.c in Sources */, - 1A8C5A03180E930E00EF57C3 /* CCUtilMath.cpp in Sources */, - 1A8C5A0D180E930E00EF57C3 /* DictionaryHelper.cpp in Sources */, 50ABBE931925AB6F00A911A9 /* CCProfiling.cpp in Sources */, 1ABA68AE1888D700007D1BB4 /* CCFontCharMap.cpp in Sources */, - 2905FA4618CF08D100240AA3 /* UIButton.cpp in Sources */, B6B26343193884D60088FE25 /* CCAnimation3D.cpp in Sources */, B6ACD897193D6693005E0B8A /* CCMeshSkin.cpp in Sources */, B6ACD89E193DC0CC005E0B8A /* CCAnimate3D.cpp in Sources */, @@ -6643,22 +6972,18 @@ buildActionMask = 2147483647; files = ( 460E477D18080902000CDD6D /* CCControl.cpp in Sources */, + B282B4811980E0A300666787 /* CCEditBoxImplMac.mm in Sources */, 460E47CB18080913000CDD6D /* CCScrollView.cpp in Sources */, 460E47D118080913000CDD6D /* CCTableViewCell.cpp in Sources */, 460E47CF18080913000CDD6D /* CCTableView.cpp in Sources */, 460E478618080902000CDD6D /* CCControlPotentiometer.cpp in Sources */, 460E478C18080902000CDD6D /* CCControlStepper.cpp in Sources */, - 460E47BB1808090B000CDD6D /* CCEditBoxImplWin.cpp in Sources */, - 460E47B21808090B000CDD6D /* CCEditBoxImplAndroid.cpp in Sources */, - 460E47B81808090B000CDD6D /* CCEditBoxImplNone.cpp in Sources */, 460E478418080902000CDD6D /* CCControlHuePicker.cpp in Sources */, 460E478A18080902000CDD6D /* CCControlSlider.cpp in Sources */, 460E478818080902000CDD6D /* CCControlSaturationBrightnessPicker.cpp in Sources */, - 460E47B51808090B000CDD6D /* CCEditBoxImplIOS.mm in Sources */, 460E478E18080902000CDD6D /* CCControlSwitch.cpp in Sources */, 460E479218080902000CDD6D /* CCInvocation.cpp in Sources */, 460E477F18080902000CDD6D /* CCControlButton.cpp in Sources */, - 460E47B71808090B000CDD6D /* CCEditBoxImplMac.mm in Sources */, 460E47AF1808090B000CDD6D /* CCEditBox.cpp in Sources */, 460E479418080902000CDD6D /* CCScale9Sprite.cpp in Sources */, 460E478118080902000CDD6D /* CCControlColourPicker.cpp in Sources */, @@ -6676,47 +7001,34 @@ 1A01C69918F57BE800EFE3A6 /* CCSet.cpp in Sources */, 1A01C69D18F57BE800EFE3A6 /* CCString.cpp in Sources */, 2986667F18B1B246000E39CA /* CCTweenFunction.cpp in Sources */, - 2AC795E318628746005EC8E1 /* SkeletonBounds.cpp in Sources */, - 2AC795E418628746005EC8E1 /* Event.cpp in Sources */, - 2AC795E518628746005EC8E1 /* EventData.cpp in Sources */, - 2AC795E618628746005EC8E1 /* BoundingBoxAttachment.cpp in Sources */, - 46A171001807CECB005B8026 /* CCPhysicsJoint.cpp in Sources */, 46A171051807CECB005B8026 /* CCPhysicsWorld.cpp in Sources */, 50ABBDA01925AB4100A911A9 /* CCGroupCommand.cpp in Sources */, 46A171031807CECB005B8026 /* CCPhysicsShape.cpp in Sources */, 50ABC0161926664800A911A9 /* CCImage.cpp in Sources */, 1A01C6A518F58F7500EFE3A6 /* CCNotificationCenter.cpp in Sources */, - 50E6D33918E174130051CA34 /* UIRelativeBox.cpp in Sources */, ED9C6A9518599AD8000A5232 /* CCNodeGrid.cpp in Sources */, 1A01C68F18F57BE800EFE3A6 /* CCDictionary.cpp in Sources */, 50ABBE561925AB6F00A911A9 /* CCEventFocus.cpp in Sources */, - 06CAAACC186AD7F50012A414 /* TriggerMng.cpp in Sources */, 503DD8E11926736A00CD74DD /* CCApplication.mm in Sources */, 50ABC01A1926664800A911A9 /* CCSAXParser.cpp in Sources */, + B2CC507C19776DD10041958E /* CCPhysicsJoint.cpp in Sources */, 503DD8EE1926736A00CD74DD /* CCImage.mm in Sources */, - 50FCEBC818C72017004AD434 /* WidgetReader.cpp in Sources */, 3EA47871195478E00068D9D1 /* CCBundleReader.cpp in Sources */, + B37510811823ACA100B3BA6A /* CCPhysicsJointInfo_chipmunk.cpp in Sources */, 46A170FC1807CECB005B8026 /* CCPhysicsBody.cpp in Sources */, 50ABBD941925AB4100A911A9 /* CCGLProgramState.cpp in Sources */, 50ABBE281925AB6F00A911A9 /* CCAutoreleasePool.cpp in Sources */, 46A170FE1807CECB005B8026 /* CCPhysicsContact.cpp in Sources */, - 3EA0FB6C191C841D00B170C8 /* UIVideoPlayerIOS.mm in Sources */, 1A570062180BC5A10088DEC7 /* CCAction.cpp in Sources */, 1A570066180BC5A10088DEC7 /* CCActionCamera.cpp in Sources */, - 0634A4D9194B19E400E608AF /* CCFrame.cpp in Sources */, 1A57006A180BC5A10088DEC7 /* CCActionCatmullRom.cpp in Sources */, 1A57006E180BC5A10088DEC7 /* CCActionEase.cpp in Sources */, 50ABBD8C1925AB4100A911A9 /* CCGLProgram.cpp in Sources */, 1A570072180BC5A10088DEC7 /* CCActionGrid.cpp in Sources */, 50ABBE621925AB6F00A911A9 /* CCEventListenerAcceleration.cpp in Sources */, - B37510811823ACA100B3BA6A /* CCPhysicsJointInfo_chipmunk.cpp in Sources */, 3E6176681960F89B00DE83F5 /* CCController-iOS.mm in Sources */, - 2905FA8D18CF08D100240AA3 /* UIWidget.cpp in Sources */, - 29E99D1F1957BA7000046604 /* CocoLoader.cpp in Sources */, B29594B51926D5EC003EEF37 /* CCMeshCommand.cpp in Sources */, - 0634A4D5194B19E400E608AF /* CCActionTimelineCache.cpp in Sources */, 50ABBE7E1925AB6F00A911A9 /* CCEventTouch.cpp in Sources */, - 50FCEB9818C72017004AD434 /* CheckBoxReader.cpp in Sources */, 50ABBE6E1925AB6F00A911A9 /* CCEventListenerKeyboard.cpp in Sources */, 50ABBE461925AB6F00A911A9 /* CCEvent.cpp in Sources */, 50ABBEA01925AB6F00A911A9 /* CCScheduler.cpp in Sources */, @@ -6735,7 +7047,6 @@ 1A570086180BC5A10088DEC7 /* CCActionPageTurn3D.cpp in Sources */, 1A57008A180BC5A10088DEC7 /* CCActionProgressTimer.cpp in Sources */, B29594CB1926D61F003EEF37 /* CCSprite3D.cpp in Sources */, - 2905FA6F18CF08D100240AA3 /* UIRichText.cpp in Sources */, 50ABBED81925AB6F00A911A9 /* ZipUtils.cpp in Sources */, 1A57008E180BC5A10088DEC7 /* CCActionTiledGrid.cpp in Sources */, 1A570092180BC5A10088DEC7 /* CCActionTween.cpp in Sources */, @@ -6760,7 +7071,6 @@ 1A5701B6180BCB590088DEC7 /* CCFontFreeType.cpp in Sources */, 50ABBEAC1925AB6F00A911A9 /* ccTypes.cpp in Sources */, 1A5701BA180BCB5A0088DEC7 /* CCLabel.cpp in Sources */, - 2905FA4B18CF08D100240AA3 /* UICheckBox.cpp in Sources */, 1A5701BE180BCB5A0088DEC7 /* CCLabelAtlas.cpp in Sources */, 1A5701C2180BCB5A0088DEC7 /* CCLabelBMFont.cpp in Sources */, 1A087AE91860400400196EF5 /* edtaa3func.cpp in Sources */, @@ -6775,20 +7085,16 @@ 50ABBD9C1925AB4100A911A9 /* ccGLStateCache.cpp in Sources */, 1A5701E7180BCB8C0088DEC7 /* CCTransition.cpp in Sources */, 50ABC01E1926664800A911A9 /* CCThread.cpp in Sources */, - 0634A4D1194B19E400E608AF /* CCActionTimeline.cpp in Sources */, 1A5701EB180BCB8C0088DEC7 /* CCTransitionPageTurn.cpp in Sources */, 1A5701EF180BCB8C0088DEC7 /* CCTransitionProgress.cpp in Sources */, 1A5701F8180BCBAD0088DEC7 /* CCMenu.cpp in Sources */, 50ABBD511925AB0000A911A9 /* Quaternion.cpp in Sources */, 1A5701FC180BCBAD0088DEC7 /* CCMenuItem.cpp in Sources */, - 06CAAAD0186AD7FE0012A414 /* TriggerBase.cpp in Sources */, - 2905FA4F18CF08D100240AA3 /* UIHelper.cpp in Sources */, 50ABBD491925AB0000A911A9 /* Mat4.cpp in Sources */, 1A570203180BCBD40088DEC7 /* CCClippingNode.cpp in Sources */, 1A570209180BCBDF0088DEC7 /* CCMotionStreak.cpp in Sources */, 1A570211180BCBF40088DEC7 /* CCProgressTimer.cpp in Sources */, - 503DD8ED1926736A00CD74DD /* CCGLView.mm in Sources */, - 50FCEBA818C72017004AD434 /* LoadingBarReader.cpp in Sources */, + 503DD8ED1926736A00CD74DD /* CCGLViewImpl.mm in Sources */, 1A570215180BCBF40088DEC7 /* CCRenderTexture.cpp in Sources */, 1A570222180BCC1A0088DEC7 /* CCParticleBatchNode.cpp in Sources */, 1A570226180BCC1A0088DEC7 /* CCParticleExamples.cpp in Sources */, @@ -6797,17 +7103,12 @@ B24AA986195A675C007B4522 /* CCFastTMXLayer.cpp in Sources */, 1A57022E180BCC1A0088DEC7 /* CCParticleSystemQuad.cpp in Sources */, 50ABBD901925AB4100A911A9 /* CCGLProgramCache.cpp in Sources */, - 2905FA5718CF08D100240AA3 /* UILayout.cpp in Sources */, - 2905FA7D18CF08D100240AA3 /* UIText.cpp in Sources */, - 50E6D33D18E174130051CA34 /* UIVBox.cpp in Sources */, 1A57027F180BCC900088DEC7 /* CCSprite.cpp in Sources */, 1A570283180BCC900088DEC7 /* CCSpriteBatchNode.cpp in Sources */, 1A570287180BCC900088DEC7 /* CCSpriteFrame.cpp in Sources */, 1A57028B180BCC900088DEC7 /* CCSpriteFrameCache.cpp in Sources */, 1A570293180BCCAB0088DEC7 /* CCAnimation.cpp in Sources */, 1A570297180BCCAB0088DEC7 /* CCAnimationCache.cpp in Sources */, - 50FCEBC418C72017004AD434 /* TextReader.cpp in Sources */, - 50FCEB9418C72017004AD434 /* ButtonReader.cpp in Sources */, 50ABBE321925AB6F00A911A9 /* CCConfiguration.cpp in Sources */, 1A5702C9180BCE370088DEC7 /* CCTextFieldTTF.cpp in Sources */, 1A5702EB180BCE750088DEC7 /* CCTileMapAtlas.cpp in Sources */, @@ -6815,178 +7116,75 @@ 1A5702F3180BCE750088DEC7 /* CCTMXObjectGroup.cpp in Sources */, 50ABBD3D1925AB0000A911A9 /* CCGeometry.cpp in Sources */, 50ABBECC1925AB6F00A911A9 /* s3tc.cpp in Sources */, - 50E6D31018DAF01A0051CA34 /* CCProtectedNode.cpp in Sources */, 1A5702F7180BCE750088DEC7 /* CCTMXTiledMap.cpp in Sources */, 50ABBEC61925AB6F00A911A9 /* etc1.cpp in Sources */, 50ABBE8C1925AB6F00A911A9 /* CCNS.cpp in Sources */, 50ABBDAE1925AB4100A911A9 /* CCRenderer.cpp in Sources */, 50ABBDBA1925AB4100A911A9 /* CCTextureAtlas.cpp in Sources */, 1A5702FB180BCE750088DEC7 /* CCTMXXMLParser.cpp in Sources */, - 2905FA6B18CF08D100240AA3 /* UIPageView.cpp in Sources */, 1A570301180BCE890088DEC7 /* CCParallaxNode.cpp in Sources */, 1A57030D180BCF190088DEC7 /* CCComponent.cpp in Sources */, + 464AD6E6197EBB1400E502D8 /* pvr.cpp in Sources */, 1A570311180BCF190088DEC7 /* CCComponentContainer.cpp in Sources */, 50ABBE2C1925AB6F00A911A9 /* ccCArray.cpp in Sources */, 50ABC0061926664800A911A9 /* CCThread.mm in Sources */, B375107C1823ACA100B3BA6A /* CCPhysicsBodyInfo_chipmunk.cpp in Sources */, - 50FCEBB418C72017004AD434 /* SliderReader.cpp in Sources */, 50ABBEB61925AB6F00A911A9 /* CCUserDefaultAndroid.cpp in Sources */, 1A57034C180BD09B0088DEC7 /* tinyxml2.cpp in Sources */, 50ABBDB61925AB4100A911A9 /* CCTexture2D.cpp in Sources */, 1A570355180BD0B00088DEC7 /* ioapi.cpp in Sources */, 1A570359180BD0B00088DEC7 /* unzip.cpp in Sources */, - 0634A4E1194B19E400E608AF /* CCTimeLine.cpp in Sources */, - 1AD71DAA180E26E600808F54 /* CCBAnimationManager.cpp in Sources */, 50ABBD881925AB4100A911A9 /* CCCustomCommand.cpp in Sources */, 50ABBE941925AB6F00A911A9 /* CCProfiling.cpp in Sources */, - 1AD71DAE180E26E600808F54 /* CCBFileLoader.cpp in Sources */, - 1AD71DB2180E26E600808F54 /* CCBKeyframe.cpp in Sources */, - 1AD71DB8180E26E600808F54 /* CCBReader.cpp in Sources */, - 1AD71DBE180E26E600808F54 /* CCBSequence.cpp in Sources */, - 1AD71DC2180E26E600808F54 /* CCBSequenceProperty.cpp in Sources */, - 1AD71DCA180E26E600808F54 /* CCControlButtonLoader.cpp in Sources */, - 1AD71DCE180E26E600808F54 /* CCControlLoader.cpp in Sources */, - 1AD71DD2180E26E600808F54 /* CCLabelBMFontLoader.cpp in Sources */, 50ABBE5E1925AB6F00A911A9 /* CCEventListener.cpp in Sources */, - 1AD71DD6180E26E600808F54 /* CCLabelTTFLoader.cpp in Sources */, - 1AD71DDA180E26E600808F54 /* CCLayerColorLoader.cpp in Sources */, - 50FCEBC018C72017004AD434 /* TextFieldReader.cpp in Sources */, - 1AD71DDE180E26E600808F54 /* CCLayerGradientLoader.cpp in Sources */, B29594C31926D61F003EEF37 /* CCMesh.cpp in Sources */, - 1AD71DE2180E26E600808F54 /* CCLayerLoader.cpp in Sources */, - 1AD71DE6180E26E600808F54 /* CCMenuItemImageLoader.cpp in Sources */, 50ABBEA81925AB6F00A911A9 /* CCTouch.cpp in Sources */, - 1AD71DEA180E26E600808F54 /* CCMenuItemLoader.cpp in Sources */, - 06CAAAC8186AD7EB0012A414 /* TriggerObj.cpp in Sources */, - 1AD71DF0180E26E600808F54 /* CCNode+CCBRelativePositioning.cpp in Sources */, 503DD8E91926736A00CD74DD /* CCES2Renderer.m in Sources */, 5027253D190BF1B900AAF4ED /* cocos2d.cpp in Sources */, 50ABBE6A1925AB6F00A911A9 /* CCEventListenerFocus.cpp in Sources */, 50ABBE661925AB6F00A911A9 /* CCEventListenerCustom.cpp in Sources */, - 1AD71DF4180E26E600808F54 /* CCNodeLoader.cpp in Sources */, 503DD8F81926B0DB00CD74DD /* CCIMEDispatcher.cpp in Sources */, - 1AD71DF8180E26E600808F54 /* CCNodeLoaderLibrary.cpp in Sources */, - 1AD71DFE180E26E600808F54 /* CCParticleSystemQuadLoader.cpp in Sources */, - 1AD71E02180E26E600808F54 /* CCScale9SpriteLoader.cpp in Sources */, - 1AD71E06180E26E600808F54 /* CCScrollViewLoader.cpp in Sources */, - 1AD71E0A180E26E600808F54 /* CCSpriteLoader.cpp in Sources */, - 1AD71E96180E26E600808F54 /* Animation.cpp in Sources */, - 1AD71E9A180E26E600808F54 /* AnimationState.cpp in Sources */, - 1AD71E9E180E26E600808F54 /* AnimationStateData.cpp in Sources */, 50ABBDB21925AB4100A911A9 /* ccShaders.cpp in Sources */, - 1AD71EA2180E26E600808F54 /* Atlas.cpp in Sources */, - 1AD71EA6180E26E600808F54 /* AtlasAttachmentLoader.cpp in Sources */, - 1AD71EAA180E26E600808F54 /* Attachment.cpp in Sources */, - 1AD71EAE180E26E600808F54 /* AttachmentLoader.cpp in Sources */, - 1AD71EB2180E26E600808F54 /* Bone.cpp in Sources */, 50ABBD451925AB0000A911A9 /* CCVertex.cpp in Sources */, - 2905FA8118CF08D100240AA3 /* UITextAtlas.cpp in Sources */, B29594C71926D61F003EEF37 /* CCObjLoader.cpp in Sources */, 50ABBEB01925AB6F00A911A9 /* CCUserDefault.cpp in Sources */, - 50FCEBB818C72017004AD434 /* TextAtlasReader.cpp in Sources */, - 1AD71EB6180E26E600808F54 /* BoneData.cpp in Sources */, - 50FCEB9C18C72017004AD434 /* ImageViewReader.cpp in Sources */, 50ABBE521925AB6F00A911A9 /* CCEventDispatcher.cpp in Sources */, - 1AD71EBA180E26E600808F54 /* CCSkeleton.cpp in Sources */, 1A01C68B18F57BE800EFE3A6 /* CCDeprecated.cpp in Sources */, - 1AD71EBE180E26E600808F54 /* CCSkeletonAnimation.cpp in Sources */, - 50FCEBBC18C72017004AD434 /* TextBMFontReader.cpp in Sources */, 50ABBD391925AB0000A911A9 /* CCAffineTransform.cpp in Sources */, 50ABBD841925AB4100A911A9 /* CCBatchCommand.cpp in Sources */, - 1AD71EC2180E26E600808F54 /* extension.cpp in Sources */, - 1AD71EC6180E26E600808F54 /* Json.cpp in Sources */, - 1AD71ECA180E26E600808F54 /* RegionAttachment.cpp in Sources */, - 1AD71ECE180E26E600808F54 /* Skeleton.cpp in Sources */, - 1AD71ED2180E26E600808F54 /* SkeletonData.cpp in Sources */, - 1AD71ED6180E26E600808F54 /* SkeletonJson.cpp in Sources */, 50ABBDA81925AB4100A911A9 /* CCRenderCommand.cpp in Sources */, - 2905FA6718CF08D100240AA3 /* UILoadingBar.cpp in Sources */, - 2905FA5F18CF08D100240AA3 /* UILayoutParameter.cpp in Sources */, - 1AD71EDA180E26E600808F54 /* Skin.cpp in Sources */, 50ABBEA41925AB6F00A911A9 /* CCScriptSupport.cpp in Sources */, - 1AD71EDE180E26E600808F54 /* Slot.cpp in Sources */, - 1AD71EE2180E26E600808F54 /* SlotData.cpp in Sources */, 3E6176761960F89B00DE83F5 /* CCEventListenerController.cpp in Sources */, 503DD8E71926736A00CD74DD /* CCEAGLView.mm in Sources */, - 1AD71EE6180E26E600808F54 /* spine-cocos2dx.cpp in Sources */, - 2905FA8518CF08D100240AA3 /* UITextBMFont.cpp in Sources */, - 1AAF536B180E3374000584C8 /* HttpClient.cpp in Sources */, - 1AAF5373180E3374000584C8 /* SocketIO.cpp in Sources */, - 1AAF5377180E3374000584C8 /* WebSocket.cpp in Sources */, 50ABBDA41925AB4100A911A9 /* CCQuadCommand.cpp in Sources */, 1AAF5850180E40B9000584C8 /* LocalStorage.cpp in Sources */, 1AAF5854180E40B9000584C8 /* LocalStorageAndroid.cpp in Sources */, 1A9DCA28180E6955007A3AD4 /* CCGLBufferedNode.cpp in Sources */, 50ABBE201925AB6F00A911A9 /* atitc.cpp in Sources */, - 50FCEBA018C72017004AD434 /* LayoutReader.cpp in Sources */, - 50E6D33518E174130051CA34 /* UIHBox.cpp in Sources */, - 50FCEBB018C72017004AD434 /* ScrollViewReader.cpp in Sources */, 50ABBE9A1925AB6F00A911A9 /* CCRef.cpp in Sources */, 3E6176741960F89B00DE83F5 /* CCEventController.cpp in Sources */, 50ABBE361925AB6F00A911A9 /* CCConsole.cpp in Sources */, 503DD8E51926736A00CD74DD /* CCDirectorCaller.mm in Sources */, 50ABBD5D1925AB0000A911A9 /* Vec3.cpp in Sources */, - 50ABC0121926664800A911A9 /* CCGLViewProtocol.cpp in Sources */, + 50ABC0121926664800A911A9 /* CCGLView.cpp in Sources */, 50ABC0021926664800A911A9 /* CCLock.cpp in Sources */, - 29BDBA54195D597A003225C9 /* UIDeprecated.cpp in Sources */, - 50FCEBAC18C72017004AD434 /* PageViewReader.cpp in Sources */, - 1A8C598C180E930E00EF57C3 /* CCActionFrame.cpp in Sources */, - 1A8C5990180E930E00EF57C3 /* CCActionFrameEasing.cpp in Sources */, - 29CB8F4D1929D1BB00C841D6 /* UILayoutManager.cpp in Sources */, - 50FCEBA418C72017004AD434 /* ListViewReader.cpp in Sources */, - 1A8C5994180E930E00EF57C3 /* CCActionManagerEx.cpp in Sources */, 50ABBEBC1925AB6F00A911A9 /* ccUtils.cpp in Sources */, 50ABBE721925AB6F00A911A9 /* CCEventListenerMouse.cpp in Sources */, - 1A8C5998180E930E00EF57C3 /* CCActionNode.cpp in Sources */, - 1A8C599C180E930E00EF57C3 /* CCActionObject.cpp in Sources */, - 2905FA6318CF08D100240AA3 /* UIListView.cpp in Sources */, - 1A8C59A0180E930E00EF57C3 /* CCArmature.cpp in Sources */, 50ABC0001926664800A911A9 /* CCFileUtilsApple.mm in Sources */, - 2905FA7918CF08D100240AA3 /* UISlider.cpp in Sources */, - 1A8C59A4180E930E00EF57C3 /* CCArmatureAnimation.cpp in Sources */, - 1A8C59A8180E930E00EF57C3 /* CCArmatureDataManager.cpp in Sources */, - 2905FA8918CF08D100240AA3 /* UITextField.cpp in Sources */, - 1A8C59AC180E930E00EF57C3 /* CCArmatureDefine.cpp in Sources */, 50ABBEB81925AB6F00A911A9 /* ccUTF8.cpp in Sources */, - 1A8C59B0180E930E00EF57C3 /* CCBatchNode.cpp in Sources */, 50ABBE841925AB6F00A911A9 /* ccFPSImages.c in Sources */, - 1A8C59B4180E930E00EF57C3 /* CCBone.cpp in Sources */, - 1A8C59B8180E930E00EF57C3 /* CCColliderDetector.cpp in Sources */, - 1A8C59BC180E930E00EF57C3 /* CCComAttribute.cpp in Sources */, 50ABBE4A1925AB6F00A911A9 /* CCEventAcceleration.cpp in Sources */, - 1A8C59C0180E930E00EF57C3 /* CCComAudio.cpp in Sources */, - 1A8C59C4180E930E00EF57C3 /* CCComController.cpp in Sources */, - 1A8C59C8180E930E00EF57C3 /* CCComRender.cpp in Sources */, - 1A8C59CC180E930E00EF57C3 /* CCDataReaderHelper.cpp in Sources */, - 1A8C59D0180E930E00EF57C3 /* CCDatas.cpp in Sources */, - 1A8C59D4180E930E00EF57C3 /* CCDecorativeDisplay.cpp in Sources */, - 1A8C59D8180E930E00EF57C3 /* CCDisplayFactory.cpp in Sources */, 46C02E0818E91123004B7456 /* xxhash.c in Sources */, 50ABBED01925AB6F00A911A9 /* TGAlib.cpp in Sources */, - 2905FA4118CF08D100240AA3 /* CocosGUI.cpp in Sources */, 1A01C68518F57BE800EFE3A6 /* CCArray.cpp in Sources */, - 1A8C59DC180E930E00EF57C3 /* CCDisplayManager.cpp in Sources */, - 1A8C59E0180E930E00EF57C3 /* CCInputDelegate.cpp in Sources */, - 1A8C59E4180E930E00EF57C3 /* CCProcessBase.cpp in Sources */, 503DD8E31926736A00CD74DD /* CCDevice.mm in Sources */, - 1A8C59E8180E930E00EF57C3 /* CCSGUIReader.cpp in Sources */, - 1A8C59EC180E930E00EF57C3 /* CCSkin.cpp in Sources */, - 2905FA4718CF08D100240AA3 /* UIButton.cpp in Sources */, - 1A8C59F0180E930E00EF57C3 /* CCSpriteFrameCacheHelper.cpp in Sources */, 50ABBEB41925AB6F00A911A9 /* CCUserDefault.mm in Sources */, 1A1645B1191B726C008C7C7F /* ConvertUTF.c in Sources */, - 1A8C59F4180E930E00EF57C3 /* CCSSceneReader.cpp in Sources */, - 1A8C59F8180E930E00EF57C3 /* CCTransformHelp.cpp in Sources */, 50ABBE3A1925AB6F00A911A9 /* CCData.cpp in Sources */, - 1A8C59FC180E930E00EF57C3 /* CCTween.cpp in Sources */, - 2905FA5318CF08D100240AA3 /* UIImageView.cpp in Sources */, 1A1645B3191B726C008C7C7F /* ConvertUTFWrapper.cpp in Sources */, - 1A8C5A04180E930E00EF57C3 /* CCUtilMath.cpp in Sources */, - 2905FA7518CF08D100240AA3 /* UIScrollView.cpp in Sources */, - 1A8C5A0E180E930E00EF57C3 /* DictionaryHelper.cpp in Sources */, 1ABA68AF1888D700007D1BB4 /* CCFontCharMap.cpp in Sources */, - 0634A4DD194B19E400E608AF /* CCNodeReader.cpp in Sources */, 50ABBE7A1925AB6F00A911A9 /* CCEventMouse.cpp in Sources */, + 15EFA212198A2BB5000C57D3 /* CCProtectedNode.cpp in Sources */, 50ABBD981925AB4100A911A9 /* CCGLProgramStateCache.cpp in Sources */, B6B26344193884D60088FE25 /* CCAnimation3D.cpp in Sources */, B6ACD898193D6693005E0B8A /* CCMeshSkin.cpp in Sources */, @@ -7010,7 +7208,6 @@ 460E47D718080914000CDD6D /* CCTableView.cpp in Sources */, 460E479F18080904000CDD6D /* CCControlPotentiometer.cpp in Sources */, 460E479818080904000CDD6D /* CCControlButton.cpp in Sources */, - 460E47C51808090D000CDD6D /* CCEditBoxImplMac.mm in Sources */, 460E479D18080904000CDD6D /* CCControlHuePicker.cpp in Sources */, 460E47A318080904000CDD6D /* CCControlSlider.cpp in Sources */, 460E47AB18080904000CDD6D /* CCInvocation.cpp in Sources */, @@ -7127,69 +7324,446 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + B245F10119766132001920FD /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + B2DB4764197661D500411E16 /* UIWidget.cpp in Sources */, + B2DB4765197661E400411E16 /* UIHBox.cpp in Sources */, + B2DB4766197661EE00411E16 /* UILayout.cpp in Sources */, + B2DB476B1976654800411E16 /* UILayoutManager.cpp in Sources */, + B2DB477F1976660000411E16 /* UIButton.cpp in Sources */, + B2DB476D1976655700411E16 /* UILayoutParameter.cpp in Sources */, + B2DB47811976660A00411E16 /* UICheckBox.cpp in Sources */, + B2DB476F1976656D00411E16 /* UIRelativeBox.cpp in Sources */, + B2DB47711976657A00411E16 /* UIVBox.cpp in Sources */, + B2DB47731976658E00411E16 /* CocosGUI.cpp in Sources */, + B2DB4775197665A500411E16 /* UIDeprecated.cpp in Sources */, + 2958244B19873D8E00F9746D /* UIScale9Sprite.cpp in Sources */, + B2DB47891976664200411E16 /* UISlider.cpp in Sources */, + B2DB4779197665CD00411E16 /* UIListView.cpp in Sources */, + B2DB47851976662B00411E16 /* UILoadingBar.cpp in Sources */, + B2DB478B1976665700411E16 /* UIText.cpp in Sources */, + B2DB478C1976665700411E16 /* UITextAtlas.cpp in Sources */, + B2DB478D1976665700411E16 /* UITextBMFont.cpp in Sources */, + B2DB478E1976665700411E16 /* UITextField.cpp in Sources */, + B2DB47871976663800411E16 /* UIRichText.cpp in Sources */, + B2DB47831976661800411E16 /* UIImageView.cpp in Sources */, + B2DB477B197665D900411E16 /* UIPageView.cpp in Sources */, + B2DB4777197665B400411E16 /* UIHelper.cpp in Sources */, + B2DB477D197665E500411E16 /* UIScrollView.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B24EEA2D19775E92004493CC /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + B2C59A1C19777E7500B452DF /* UIListView.cpp in Sources */, + 2958244C19873D8E00F9746D /* UIScale9Sprite.cpp in Sources */, + B2C59A1D19777E7500B452DF /* UILoadingBar.cpp in Sources */, + B2C59A1E19777E7500B452DF /* UIPageView.cpp in Sources */, + B2C59A1F19777E7500B452DF /* UIRichText.cpp in Sources */, + B2C59A2019777E7500B452DF /* UIScrollView.cpp in Sources */, + B2C59A2119777E7500B452DF /* UISlider.cpp in Sources */, + B2C59A2219777E7500B452DF /* UIText.cpp in Sources */, + B2C59A2319777E7500B452DF /* UITextAtlas.cpp in Sources */, + B2C59A2419777E7500B452DF /* UITextBMFont.cpp in Sources */, + B2C59A2519777E7500B452DF /* UITextField.cpp in Sources */, + B2C59A2619777E7500B452DF /* UIButton.cpp in Sources */, + B2C59ACB197782FF00B452DF /* UIVideoPlayerIOS.mm in Sources */, + B2C59A2719777E7500B452DF /* UICheckBox.cpp in Sources */, + B2C59A2819777E7500B452DF /* UIImageView.cpp in Sources */, + B2C59A2A19777E8300B452DF /* UIDeprecated.cpp in Sources */, + B2C59A2B19777E8300B452DF /* UIWidget.cpp in Sources */, + B2C59A2D19777E8300B452DF /* UIHelper.cpp in Sources */, + B2C59A2E19777E8C00B452DF /* UIHBox.cpp in Sources */, + B2C59A2F19777E8C00B452DF /* UIRelativeBox.cpp in Sources */, + B2C59A3019777E8C00B452DF /* UIVBox.cpp in Sources */, + B2C59A3119777E8C00B452DF /* UILayout.cpp in Sources */, + B2C59A3219777E8C00B452DF /* UILayoutParameter.cpp in Sources */, + B2C59A3319777E8C00B452DF /* UILayoutManager.cpp in Sources */, + B2C59A2919777E7A00B452DF /* CocosGUI.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B24EEA6819775EBB004493CC /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + B2C59A871977801A00B452DF /* CocoLoader.cpp in Sources */, + B2C59A881977802100B452DF /* CCActionTimeline.cpp in Sources */, + B2C59A891977802100B452DF /* CCActionTimelineCache.cpp in Sources */, + B2C59A8A1977802100B452DF /* CCFrame.cpp in Sources */, + B2C59A8B1977802100B452DF /* CCNodeReader.cpp in Sources */, + B2C59A8C1977802100B452DF /* CCTimeLine.cpp in Sources */, + B2C59A8D1977803400B452DF /* ButtonReader.cpp in Sources */, + B2C59A8E1977803400B452DF /* CheckBoxReader.cpp in Sources */, + B2C59A8F1977803400B452DF /* ImageViewReader.cpp in Sources */, + B2C59A901977803400B452DF /* LayoutReader.cpp in Sources */, + B2C59A911977803400B452DF /* ListViewReader.cpp in Sources */, + B2C59A921977803400B452DF /* LoadingBarReader.cpp in Sources */, + B2C59A931977803400B452DF /* PageViewReader.cpp in Sources */, + B2C59A941977803400B452DF /* ScrollViewReader.cpp in Sources */, + B2C59A951977803400B452DF /* SliderReader.cpp in Sources */, + B2C59A961977803400B452DF /* TextAtlasReader.cpp in Sources */, + B2C59A971977803400B452DF /* TextBMFontReader.cpp in Sources */, + B2C59A981977803400B452DF /* TextFieldReader.cpp in Sources */, + B2C59A991977803400B452DF /* TextReader.cpp in Sources */, + B2C59A9B1977804700B452DF /* TriggerBase.cpp in Sources */, + B2C59A9C1977804700B452DF /* TriggerMng.cpp in Sources */, + B2C59A9D1977804700B452DF /* TriggerObj.cpp in Sources */, + B2C59A9E1977804700B452DF /* CCActionFrame.cpp in Sources */, + B2C59A9F1977804700B452DF /* CCActionFrameEasing.cpp in Sources */, + B2C59AA01977804700B452DF /* CCActionManagerEx.cpp in Sources */, + B2C59AA11977804800B452DF /* CCActionNode.cpp in Sources */, + B2C59AA21977804800B452DF /* CCActionObject.cpp in Sources */, + B2C59AA31977804800B452DF /* CCArmature.cpp in Sources */, + B2C59AA41977804800B452DF /* CCArmatureAnimation.cpp in Sources */, + B2C59AA51977804800B452DF /* CCArmatureDataManager.cpp in Sources */, + B2C59AA61977804800B452DF /* CCArmatureDefine.cpp in Sources */, + B2C59AA71977804800B452DF /* CCBatchNode.cpp in Sources */, + B2C59AA81977804800B452DF /* CCBone.cpp in Sources */, + B2C59AA91977804800B452DF /* CCColliderDetector.cpp in Sources */, + B2C59AAA1977804800B452DF /* CCComAttribute.cpp in Sources */, + B2C59AAB1977804800B452DF /* CCComAudio.cpp in Sources */, + B2C59AAC1977804800B452DF /* CCComController.cpp in Sources */, + B2C59AAD1977804800B452DF /* CCComRender.cpp in Sources */, + B2C59AAE1977804800B452DF /* CCDataReaderHelper.cpp in Sources */, + B2C59AAF1977804800B452DF /* CCDatas.cpp in Sources */, + B2C59AB01977804800B452DF /* CCDecorativeDisplay.cpp in Sources */, + B2C59AB11977804800B452DF /* CCDisplayFactory.cpp in Sources */, + B2C59AB21977804800B452DF /* CCDisplayManager.cpp in Sources */, + B2C59AB31977804800B452DF /* CCInputDelegate.cpp in Sources */, + B2C59AB41977804800B452DF /* CCProcessBase.cpp in Sources */, + B2C59AB51977804800B452DF /* CCSGUIReader.cpp in Sources */, + B2C59AB61977804800B452DF /* CCSkin.cpp in Sources */, + B2C59AB71977804800B452DF /* CCSpriteFrameCacheHelper.cpp in Sources */, + B2C59AB81977804800B452DF /* CCSSceneReader.cpp in Sources */, + B2C59AB91977804800B452DF /* CCTransformHelp.cpp in Sources */, + B2C59ABA1977804800B452DF /* CCTween.cpp in Sources */, + B2C59ABB1977804800B452DF /* CCUtilMath.cpp in Sources */, + B2C59ABC1977804800B452DF /* DictionaryHelper.cpp in Sources */, + B2C59A9A1977803400B452DF /* WidgetReader.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B24EEA7019775ECE004493CC /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + B2C59A061977706500B452DF /* CCBAnimationManager.cpp in Sources */, + B2C59A071977706500B452DF /* CCBFileLoader.cpp in Sources */, + B2C59A081977706500B452DF /* CCBKeyframe.cpp in Sources */, + B2C59A091977706500B452DF /* CCBReader.cpp in Sources */, + B2C59A0A1977706500B452DF /* CCBSequence.cpp in Sources */, + B2C59A0B1977706500B452DF /* CCBSequenceProperty.cpp in Sources */, + B2C59A0C1977706500B452DF /* CCControlButtonLoader.cpp in Sources */, + B2C59A0D1977706500B452DF /* CCControlLoader.cpp in Sources */, + B2C59A0E1977706500B452DF /* CCLabelBMFontLoader.cpp in Sources */, + B2C59A0F1977706500B452DF /* CCLabelTTFLoader.cpp in Sources */, + B2C59A101977706500B452DF /* CCLayerColorLoader.cpp in Sources */, + B2C59A111977706500B452DF /* CCLayerGradientLoader.cpp in Sources */, + B2C59A121977706500B452DF /* CCLayerLoader.cpp in Sources */, + B2C59A131977706500B452DF /* CCMenuItemImageLoader.cpp in Sources */, + B2C59A141977706500B452DF /* CCMenuItemLoader.cpp in Sources */, + B2C59A151977706500B452DF /* CCNode+CCBRelativePositioning.cpp in Sources */, + B2C59A161977706500B452DF /* CCNodeLoader.cpp in Sources */, + B2C59A171977706500B452DF /* CCNodeLoaderLibrary.cpp in Sources */, + B2C59A181977706500B452DF /* CCParticleSystemQuadLoader.cpp in Sources */, + B2C59A191977706500B452DF /* CCScale9SpriteLoader.cpp in Sources */, + B2C59A1A1977706500B452DF /* CCScrollViewLoader.cpp in Sources */, + B2C59A1B1977706500B452DF /* CCSpriteLoader.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B24EEA7819775EE1004493CC /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + B2CC506019776C340041958E /* SkeletonBounds.cpp in Sources */, + B2CC506119776C340041958E /* Event.cpp in Sources */, + B2CC506219776C340041958E /* EventData.cpp in Sources */, + B2CC506319776C340041958E /* BoundingBoxAttachment.cpp in Sources */, + B2CC506419776C340041958E /* Animation.cpp in Sources */, + B2CC506519776C340041958E /* AnimationState.cpp in Sources */, + B2CC506619776C340041958E /* AnimationStateData.cpp in Sources */, + B2CC506719776C340041958E /* Atlas.cpp in Sources */, + B2CC506819776C340041958E /* AtlasAttachmentLoader.cpp in Sources */, + B2CC506919776C340041958E /* Attachment.cpp in Sources */, + B2CC506A19776C340041958E /* AttachmentLoader.cpp in Sources */, + B2CC506B19776C340041958E /* Bone.cpp in Sources */, + B2CC506C19776C340041958E /* BoneData.cpp in Sources */, + B2CC506D19776C340041958E /* CCSkeleton.cpp in Sources */, + B2CC506E19776C340041958E /* CCSkeletonAnimation.cpp in Sources */, + B2CC506F19776C340041958E /* extension.cpp in Sources */, + B2CC507019776C340041958E /* Json.cpp in Sources */, + B2CC507119776C340041958E /* RegionAttachment.cpp in Sources */, + B2CC507219776C340041958E /* Skeleton.cpp in Sources */, + B2CC507319776C340041958E /* SkeletonData.cpp in Sources */, + B2CC507419776C340041958E /* SkeletonJson.cpp in Sources */, + B2CC507519776C340041958E /* Skin.cpp in Sources */, + B2CC507619776C340041958E /* Slot.cpp in Sources */, + B2CC507719776C340041958E /* SlotData.cpp in Sources */, + B2CC507819776C340041958E /* spine-cocos2dx.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B24EEA8019775EF3004493CC /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + B2CC50291977634A0041958E /* HttpClient.cpp in Sources */, + B2CC502C197763620041958E /* WebSocket.cpp in Sources */, + B2CC502D197763640041958E /* SocketIO.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B2DB479C197669A100411E16 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + B2DB47D719766CE100411E16 /* CCBSequence.cpp in Sources */, + B2DB47D319766CD100411E16 /* CCBAnimationManager.cpp in Sources */, + B2DB47E719766DAE00411E16 /* CCScrollViewLoader.cpp in Sources */, + B2DB47E619766D9E00411E16 /* CCScale9SpriteLoader.cpp in Sources */, + B2DB47D419766CD300411E16 /* CCBFileLoader.cpp in Sources */, + B2DB47D519766CD600411E16 /* CCBKeyframe.cpp in Sources */, + B2DB47E119766D7600411E16 /* CCMenuItemImageLoader.cpp in Sources */, + B2DB47D619766CD900411E16 /* CCBReader.cpp in Sources */, + B2DB47E819766DBB00411E16 /* CCSpriteLoader.cpp in Sources */, + B2DB47DB19766D4400411E16 /* CCControlLoader.cpp in Sources */, + B2DB47E419766D8700411E16 /* CCNodeLoaderLibrary.cpp in Sources */, + B2DB47E219766D7800411E16 /* CCMenuItemLoader.cpp in Sources */, + B2DB47E319766D8600411E16 /* CCNodeLoader.cpp in Sources */, + B2DB47DA19766D4200411E16 /* CCControlButtonLoader.cpp in Sources */, + B2DB47DE19766D6700411E16 /* CCLayerColorLoader.cpp in Sources */, + B2DB47D819766CE500411E16 /* CCBSequenceProperty.cpp in Sources */, + B2DB47E519766D9400411E16 /* CCParticleSystemQuadLoader.cpp in Sources */, + B2DB47E019766D6A00411E16 /* CCLayerLoader.cpp in Sources */, + B2DB47DF19766D6900411E16 /* CCLayerGradientLoader.cpp in Sources */, + B2DB47DC19766D5600411E16 /* CCLabelBMFontLoader.cpp in Sources */, + B2DB47D919766CEA00411E16 /* CCNode+CCBRelativePositioning.cpp in Sources */, + B2DB47DD19766D5800411E16 /* CCLabelTTFLoader.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B2DB48171976716E00411E16 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + B2DB488B19767CE000411E16 /* CCFrame.cpp in Sources */, + B2DB488E19767CEE00411E16 /* ButtonReader.cpp in Sources */, + B2DB488F19767CF200411E16 /* CheckBoxReader.cpp in Sources */, + B2DB488A19767CDD00411E16 /* CCActionTimelineCache.cpp in Sources */, + B2DB488C19767CE200411E16 /* CCNodeReader.cpp in Sources */, + B2DB489119767CF700411E16 /* LayoutReader.cpp in Sources */, + B2DB489719767D0800411E16 /* TextAtlasReader.cpp in Sources */, + B2DB489519767D0200411E16 /* ScrollViewReader.cpp in Sources */, + B2DB489C19767D2000411E16 /* TriggerBase.cpp in Sources */, + B2DB489D19767D2000411E16 /* TriggerMng.cpp in Sources */, + B2DB489E19767D2000411E16 /* TriggerObj.cpp in Sources */, + B2DB489F19767D2000411E16 /* CCActionFrame.cpp in Sources */, + B2DB48A019767D2000411E16 /* CCActionFrameEasing.cpp in Sources */, + B2DB48A119767D2000411E16 /* CCActionManagerEx.cpp in Sources */, + B2DB48A219767D2000411E16 /* CCActionNode.cpp in Sources */, + B2DB48A319767D2000411E16 /* CCActionObject.cpp in Sources */, + B2DB48A419767D2000411E16 /* CCArmature.cpp in Sources */, + B2DB48A519767D2000411E16 /* CCArmatureAnimation.cpp in Sources */, + B2DB48A619767D2000411E16 /* CCArmatureDataManager.cpp in Sources */, + B2DB48A719767D2000411E16 /* CCArmatureDefine.cpp in Sources */, + B2DB48A819767D2000411E16 /* CCBatchNode.cpp in Sources */, + B2DB48A919767D2000411E16 /* CCBone.cpp in Sources */, + B2DB48AA19767D2000411E16 /* CCColliderDetector.cpp in Sources */, + B2DB48AB19767D2000411E16 /* CCComAttribute.cpp in Sources */, + B2DB48AC19767D2000411E16 /* CCComAudio.cpp in Sources */, + B2DB48AD19767D2000411E16 /* CCComController.cpp in Sources */, + B2DB48AE19767D2000411E16 /* CCComRender.cpp in Sources */, + B2DB48AF19767D2000411E16 /* CCDataReaderHelper.cpp in Sources */, + B2DB48B019767D2000411E16 /* CCDatas.cpp in Sources */, + B2DB48B119767D2000411E16 /* CCDecorativeDisplay.cpp in Sources */, + B2DB48B219767D2000411E16 /* CCDisplayFactory.cpp in Sources */, + B2DB48B319767D2000411E16 /* CCDisplayManager.cpp in Sources */, + B2DB48B419767D2000411E16 /* CCInputDelegate.cpp in Sources */, + B2DB48B519767D2000411E16 /* CCProcessBase.cpp in Sources */, + B2DB48B619767D2000411E16 /* CCSGUIReader.cpp in Sources */, + B2DB48B719767D2000411E16 /* CCSkin.cpp in Sources */, + B2DB48B819767D2000411E16 /* CCSpriteFrameCacheHelper.cpp in Sources */, + B2DB48B919767D2000411E16 /* CCSSceneReader.cpp in Sources */, + B2DB48BA19767D2000411E16 /* CCTransformHelp.cpp in Sources */, + B2DB48BB19767D2000411E16 /* CCTween.cpp in Sources */, + B2DB48BC19767D2000411E16 /* CCUtilMath.cpp in Sources */, + B2DB48BD19767D2000411E16 /* DictionaryHelper.cpp in Sources */, + B2DB489A19767D1100411E16 /* TextReader.cpp in Sources */, + B2DB489B19767D1400411E16 /* WidgetReader.cpp in Sources */, + B2DB489819767D0B00411E16 /* TextBMFontReader.cpp in Sources */, + B2DB489919767D0E00411E16 /* TextFieldReader.cpp in Sources */, + B2DB489619767D0600411E16 /* SliderReader.cpp in Sources */, + B2DB489319767CFD00411E16 /* LoadingBarReader.cpp in Sources */, + B2DB489419767D0000411E16 /* PageViewReader.cpp in Sources */, + B2DB489219767CFA00411E16 /* ListViewReader.cpp in Sources */, + B2DB489019767CF400411E16 /* ImageViewReader.cpp in Sources */, + B2DB488819767CD900411E16 /* CocoLoader.cpp in Sources */, + B2DB488D19767CE300411E16 /* CCTimeLine.cpp in Sources */, + B2DB488919767CDC00411E16 /* CCActionTimeline.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B2DB48CB19767F1F00411E16 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + B2DB490219767F5300411E16 /* SkeletonBounds.cpp in Sources */, + B2DB490319767F5300411E16 /* Event.cpp in Sources */, + B2DB490419767F5300411E16 /* EventData.cpp in Sources */, + B2DB490519767F5300411E16 /* BoundingBoxAttachment.cpp in Sources */, + B2DB490619767F5300411E16 /* Animation.cpp in Sources */, + B2DB490719767F5300411E16 /* AnimationState.cpp in Sources */, + B2DB490819767F5300411E16 /* AnimationStateData.cpp in Sources */, + B2DB490919767F5300411E16 /* Atlas.cpp in Sources */, + B2DB490A19767F5300411E16 /* AtlasAttachmentLoader.cpp in Sources */, + B2DB490B19767F5300411E16 /* Attachment.cpp in Sources */, + B2DB490C19767F5300411E16 /* AttachmentLoader.cpp in Sources */, + B2DB490D19767F5300411E16 /* Bone.cpp in Sources */, + B2DB490E19767F5300411E16 /* BoneData.cpp in Sources */, + B2DB490F19767F5300411E16 /* CCSkeleton.cpp in Sources */, + B2DB491019767F5300411E16 /* CCSkeletonAnimation.cpp in Sources */, + B2DB491119767F5300411E16 /* extension.cpp in Sources */, + B2DB491219767F5300411E16 /* Json.cpp in Sources */, + B2DB491319767F5300411E16 /* RegionAttachment.cpp in Sources */, + B2DB491419767F5300411E16 /* Skeleton.cpp in Sources */, + B2DB491519767F5300411E16 /* SkeletonData.cpp in Sources */, + B2DB491619767F5300411E16 /* SkeletonJson.cpp in Sources */, + B2DB491719767F5300411E16 /* Skin.cpp in Sources */, + B2DB491819767F5300411E16 /* Slot.cpp in Sources */, + B2DB491919767F5300411E16 /* SlotData.cpp in Sources */, + B2DB491A19767F5300411E16 /* spine-cocos2dx.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B2DB498E197686CB00411E16 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + B244F30C1976874300ED1926 /* HttpClient.cpp in Sources */, + B244F30E1976875100ED1926 /* SocketIO.cpp in Sources */, + B244F30F1976875300ED1926 /* WebSocket.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ 460E44F41807E241000CDD6D /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A03F2B781780BD04006731B9 /* chipmunk Mac */; + target = A03F2B781780BD04006731B9 /* libchipmunk Mac */; targetProxy = 460E44F31807E241000CDD6D /* PBXContainerItemProxy */; }; 46A173D31807D330005B8026 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A07A4EFD178387670073F6A7 /* chipmunk iOS */; + target = A07A4EFD178387670073F6A7 /* libchipmunk iOS */; targetProxy = 46A173D21807D330005B8026 /* PBXContainerItemProxy */; }; A03F2E93178141D1006731B9 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 1551A33E158F2AB200E66CFE /* cocos2dx Mac */; + target = 1551A33E158F2AB200E66CFE /* libcocos2d Mac */; targetProxy = A03F2E92178141D1006731B9 /* PBXContainerItemProxy */; }; A03F2E95178141D1006731B9 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A03F2B781780BD04006731B9 /* chipmunk Mac */; + target = A03F2B781780BD04006731B9 /* libchipmunk Mac */; targetProxy = A03F2E94178141D1006731B9 /* PBXContainerItemProxy */; }; A03F2E97178141D1006731B9 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A03F2D5D1780BDF7006731B9 /* box2d Mac */; + target = A03F2D5D1780BDF7006731B9 /* libbox2d Mac */; targetProxy = A03F2E96178141D1006731B9 /* PBXContainerItemProxy */; }; A03F2FC01781458C006731B9 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A03F2E9817814268006731B9 /* CocosDenshion Mac */; + target = A03F2E9817814268006731B9 /* libcocosdenshion Mac */; targetProxy = A03F2FBF1781458C006731B9 /* PBXContainerItemProxy */; }; A03F31FF178147CB006731B9 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A03F2FC117814595006731B9 /* cocos2dx-extensions Mac */; + target = A03F2FC117814595006731B9 /* libextension Mac */; targetProxy = A03F31FE178147CB006731B9 /* PBXContainerItemProxy */; }; A07A4E10178386520073F6A7 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A07A4C241783777C0073F6A7 /* cocos2dx iOS */; + target = A07A4C241783777C0073F6A7 /* libcocos2d iOS */; targetProxy = A07A4E0F178386520073F6A7 /* PBXContainerItemProxy */; }; A07A5047178389710073F6A7 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A07A4E111783867C0073F6A7 /* cocos2dx-extensions iOS */; + target = A07A4E111783867C0073F6A7 /* libextension iOS */; targetProxy = A07A5046178389710073F6A7 /* PBXContainerItemProxy */; }; A07A5049178389710073F6A7 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A07A4EFD178387670073F6A7 /* chipmunk iOS */; + target = A07A4EFD178387670073F6A7 /* libchipmunk iOS */; targetProxy = A07A5048178389710073F6A7 /* PBXContainerItemProxy */; }; A07A504B178389710073F6A7 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A07A4F3C1783876B0073F6A7 /* box2d iOS */; + target = A07A4F3C1783876B0073F6A7 /* libbox2d iOS */; targetProxy = A07A504A178389710073F6A7 /* PBXContainerItemProxy */; }; A07A504D178389710073F6A7 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A07A4F9F178387730073F6A7 /* CocosDenshion iOS */; + target = A07A4F9F178387730073F6A7 /* libcocosdenshion iOS */; targetProxy = A07A504C178389710073F6A7 /* PBXContainerItemProxy */; }; + B2F0AFEC198794EE002FE562 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = B245F10019766132001920FD /* libui Mac */; + targetProxy = B2F0AFEB198794EE002FE562 /* PBXContainerItemProxy */; + }; + B2F0AFEE198794EE002FE562 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = B2DB48161976716E00411E16 /* libcocostudio Mac */; + targetProxy = B2F0AFED198794EE002FE562 /* PBXContainerItemProxy */; + }; + B2F0AFF0198794EE002FE562 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = B2DB479B197669A100411E16 /* libcocosbuilder Mac */; + targetProxy = B2F0AFEF198794EE002FE562 /* PBXContainerItemProxy */; + }; + B2F0AFF2198794EE002FE562 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = B2DB48CA19767F1F00411E16 /* libspine Mac */; + targetProxy = B2F0AFF1198794EE002FE562 /* PBXContainerItemProxy */; + }; + B2F0AFF4198794EE002FE562 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = B2DB498D197686CB00411E16 /* libnetwork Mac */; + targetProxy = B2F0AFF3198794EE002FE562 /* PBXContainerItemProxy */; + }; + B2F0AFF619879508002FE562 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = B24EEA2C19775E92004493CC /* libui iOS */; + targetProxy = B2F0AFF519879508002FE562 /* PBXContainerItemProxy */; + }; + B2F0AFF819879508002FE562 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = B24EEA6719775EBB004493CC /* libcocostudio iOS */; + targetProxy = B2F0AFF719879508002FE562 /* PBXContainerItemProxy */; + }; + B2F0AFFA19879508002FE562 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = B24EEA6F19775ECE004493CC /* libcocosbuilder iOS */; + targetProxy = B2F0AFF919879508002FE562 /* PBXContainerItemProxy */; + }; + B2F0AFFC19879508002FE562 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = B24EEA7719775EE1004493CC /* libspine iOS */; + targetProxy = B2F0AFFB19879508002FE562 /* PBXContainerItemProxy */; + }; + B2F0AFFE19879508002FE562 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = B24EEA7F19775EF3004493CC /* libnetwork iOS */; + targetProxy = B2F0AFFD19879508002FE562 /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ @@ -7197,7 +7771,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_WARN_BOOL_CONVERSION = YES; @@ -7235,7 +7809,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_WARN_BOOL_CONVERSION = YES; @@ -7270,15 +7844,20 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_EXTENSION = a; + EXECUTABLE_PREFIX = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "../cocos/cocos2d-prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_MAC, CC_KEYBOARD_SUPPORT, + _USRDLL, ); GCC_TREAT_WARNINGS_AS_ERRORS = NO; HEADER_SEARCH_PATHS = ""; + LD_DYLIB_INSTALL_NAME = ""; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/../external/glfw3/prebuilt/mac\"", @@ -7289,7 +7868,8 @@ "\"$(SRCROOT)/../external/freetype2/prebuilt/mac\"", "\"$(SRCROOT)/../external/websockets/prebuilt/mac\"", ); - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/png/include/mac $(SRCROOT)/../external/tiff/include/mac $(SRCROOT)/../external/webp/include/mac $(SRCROOT)/../external/jpeg/include/mac $(SRCROOT)/../external/freetype2/include/mac $(SRCROOT)/../external/websockets/include/mac $(SRCROOT)/../external/glfw3/include/mac"; + MACH_O_TYPE = staticlib; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/png/include/mac $(SRCROOT)/../external/tiff/include/mac $(SRCROOT)/../external/webp/include/mac $(SRCROOT)/../external/jpeg/include/mac $(SRCROOT)/../external/freetype2/include/mac $(SRCROOT)/../external/glfw3/include/mac"; }; name = Debug; }; @@ -7297,6 +7877,9 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_EXTENSION = a; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "../cocos/cocos2d-prefix.pch"; @@ -7304,9 +7887,11 @@ "$(inherited)", CC_KEYBOARD_SUPPORT, CC_TARGET_OS_MAC, + _USRDLL, ); GCC_TREAT_WARNINGS_AS_ERRORS = NO; HEADER_SEARCH_PATHS = ""; + LD_DYLIB_INSTALL_NAME = ""; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/../external/glfw3/prebuilt/mac\"", @@ -7317,13 +7902,16 @@ "\"$(SRCROOT)/../external/freetype2/prebuilt/mac\"", "\"$(SRCROOT)/../external/websockets/prebuilt/mac\"", ); - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/png/include/mac $(SRCROOT)/../external/tiff/include/mac $(SRCROOT)/../external/webp/include/mac $(SRCROOT)/../external/jpeg/include/mac $(SRCROOT)/../external/freetype2/include/mac $(SRCROOT)/../external/websockets/include/mac $(SRCROOT)/../external/glfw3/include/mac"; + MACH_O_TYPE = staticlib; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/png/include/mac $(SRCROOT)/../external/tiff/include/mac $(SRCROOT)/../external/webp/include/mac $(SRCROOT)/../external/jpeg/include/mac $(SRCROOT)/../external/freetype2/include/mac $(SRCROOT)/../external/glfw3/include/mac"; }; name = Release; }; A03F2CB61780BD04006731B9 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; HEADER_SEARCH_PATHS = ""; USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../external/chipmunk/include/chipmunk/"; @@ -7333,6 +7921,8 @@ A03F2CB71780BD04006731B9 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; HEADER_SEARCH_PATHS = ""; @@ -7343,8 +7933,10 @@ A03F2D991780BDF7006731B9 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; CLANG_WARN_BOOL_CONVERSION = NO; CLANG_WARN_CONSTANT_CONVERSION = NO; + EXECUTABLE_PREFIX = ""; GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_SHADOW = NO; GCC_WARN_UNUSED_VALUE = NO; @@ -7357,8 +7949,10 @@ A03F2D9A1780BDF7006731B9 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; CLANG_WARN_BOOL_CONVERSION = NO; CLANG_WARN_CONSTANT_CONVERSION = NO; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_SHADOW = NO; @@ -7372,6 +7966,7 @@ A03F2E90178141C1006731B9 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "COCOS2D_DEBUG=1", @@ -7388,6 +7983,7 @@ A03F2E91178141C1006731B9 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; HEADER_SEARCH_PATHS = ( "$(inherited)", "/Applications/Xcode\\ 2.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include", @@ -7399,6 +7995,8 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_PREPROCESSOR_DEFINITIONS = CC_TARGET_OS_MAC; GCC_TREAT_WARNINGS_AS_ERRORS = NO; HEADER_SEARCH_PATHS = ""; @@ -7410,6 +8008,8 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PREPROCESSOR_DEFINITIONS = CC_TARGET_OS_MAC; GCC_TREAT_WARNINGS_AS_ERRORS = NO; @@ -7422,6 +8022,9 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + CODE_SIGN_IDENTITY = ""; + EXECUTABLE_PREFIX = ""; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_MAC, @@ -7438,6 +8041,9 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + CODE_SIGN_IDENTITY = ""; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -7456,6 +8062,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "../cocos/cocos2d-prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -7472,12 +8079,11 @@ "\"$(SRCROOT)/../external/tiff/prebuilt/ios\"", "\"$(SRCROOT)/../external/webp/prebuilt/ios\"", "\"$(SRCROOT)/../external/freetype2/prebuilt/ios\"", - "\"$(SRCROOT)/../external/websockets/prebuilt/ios\"", "\"$(SRCROOT)/../external/curl/prebuilt/ios\"", ); SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/websockets/include/ios $(SRCROOT)/../external/freetype2/include/ios $(SRCROOT)/../external/curl/include/ios $(SRCROOT)/../external/webp/include/ios $(SRCROOT)/../external/tiff/include/ios $(SRCROOT)/../external/jpeg/include/ios $(SRCROOT)/../external/png/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/freetype2/include/ios $(SRCROOT)/../external/curl/include/ios $(SRCROOT)/../external/webp/include/ios $(SRCROOT)/../external/tiff/include/ios $(SRCROOT)/../external/jpeg/include/ios $(SRCROOT)/../external/png/include/ios"; }; name = Debug; }; @@ -7486,6 +8092,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "../cocos/cocos2d-prefix.pch"; @@ -7503,12 +8110,11 @@ "\"$(SRCROOT)/../external/tiff/prebuilt/ios\"", "\"$(SRCROOT)/../external/webp/prebuilt/ios\"", "\"$(SRCROOT)/../external/freetype2/prebuilt/ios\"", - "\"$(SRCROOT)/../external/websockets/prebuilt/ios\"", "\"$(SRCROOT)/../external/curl/prebuilt/ios\"", ); SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/websockets/include/ios $(SRCROOT)/../external/freetype2/include/ios $(SRCROOT)/../external/curl/include/ios $(SRCROOT)/../external/webp/include/ios $(SRCROOT)/../external/tiff/include/ios $(SRCROOT)/../external/jpeg/include/ios $(SRCROOT)/../external/png/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/freetype2/include/ios $(SRCROOT)/../external/curl/include/ios $(SRCROOT)/../external/webp/include/ios $(SRCROOT)/../external/tiff/include/ios $(SRCROOT)/../external/jpeg/include/ios $(SRCROOT)/../external/png/include/ios"; }; name = Release; }; @@ -7537,6 +8143,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_IPHONE, @@ -7556,6 +8163,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -7575,6 +8183,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; SDKROOT = iphoneos; @@ -7587,6 +8196,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; @@ -7602,6 +8212,7 @@ ARCHS = "$(ARCHS_STANDARD)"; CLANG_WARN_BOOL_CONVERSION = NO; CLANG_WARN_CONSTANT_CONVERSION = NO; + EXECUTABLE_PREFIX = ""; GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_SHADOW = NO; GCC_WARN_UNUSED_VALUE = NO; @@ -7620,6 +8231,7 @@ ARCHS = "$(ARCHS_STANDARD)"; CLANG_WARN_BOOL_CONVERSION = NO; CLANG_WARN_CONSTANT_CONVERSION = NO; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_SHADOW = NO; @@ -7638,6 +8250,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_IPHONE, @@ -7656,6 +8269,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -7670,6 +8284,428 @@ }; name = Release; }; + B245F13819766132001920FD /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../cocos/platform/desktop $(SRCROOT)/../external/glfw3/include/mac"; + }; + name = Debug; + }; + B245F13919766132001920FD /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../cocos/platform/desktop $(SRCROOT)/../external/glfw3/include/mac"; + }; + name = Release; + }; + B24EEA6419775E92004493CC /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/curl/include/ios"; + }; + name = Debug; + }; + B24EEA6519775E92004493CC /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/curl/include/ios"; + }; + name = Release; + }; + B24EEA6C19775EBB004493CC /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/curl/include/ios"; + }; + name = Debug; + }; + B24EEA6D19775EBB004493CC /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/curl/include/ios"; + }; + name = Release; + }; + B24EEA7419775ECE004493CC /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/curl/include/ios"; + }; + name = Debug; + }; + B24EEA7519775ECE004493CC /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/curl/include/ios"; + }; + name = Release; + }; + B24EEA7C19775EE1004493CC /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/curl/include/ios"; + }; + name = Debug; + }; + B24EEA7D19775EE1004493CC /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/curl/include/ios"; + }; + name = Release; + }; + B24EEA8419775EF3004493CC /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/../external/websockets/prebuilt/ios\"", + ); + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/curl/include/ios $(SRCROOT)/../external/websockets/include/ios"; + }; + name = Debug; + }; + B24EEA8519775EF3004493CC /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/../external/websockets/prebuilt/ios\"", + ); + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/curl/include/ios $(SRCROOT)/../external/websockets/include/ios"; + }; + name = Release; + }; + B2DB47D0197669A100411E16 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../cocos/platform/desktop $(SRCROOT)/../external/glfw3/include/mac"; + }; + name = Debug; + }; + B2DB47D1197669A100411E16 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../cocos/platform/desktop $(SRCROOT)/../external/glfw3/include/mac"; + }; + name = Release; + }; + B2DB484B1976716E00411E16 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../cocos/platform/desktop $(SRCROOT)/../external/glfw3/include/mac"; + }; + name = Debug; + }; + B2DB484C1976716E00411E16 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../cocos/platform/desktop $(SRCROOT)/../external/glfw3/include/mac"; + }; + name = Release; + }; + B2DB48FF19767F1F00411E16 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../cocos/platform/desktop $(SRCROOT)/../external/glfw3/include/mac"; + }; + name = Debug; + }; + B2DB490019767F1F00411E16 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../cocos/platform/desktop $(SRCROOT)/../external/glfw3/include/mac"; + }; + name = Release; + }; + B2DB49C2197686CB00411E16 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)/../external/websockets/prebuilt/mac", + ); + PRODUCT_NAME = "$(TARGET_NAME)"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../cocos/platform/desktop $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external/websockets/include/mac"; + }; + name = Debug; + }; + B2DB49C3197686CB00411E16 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)/../external/websockets/prebuilt/mac", + ); + PRODUCT_NAME = "$(TARGET_NAME)"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../cocos/platform/desktop $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external/websockets/include/mac"; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -7682,7 +8718,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 1551A34C158F2AB200E66CFE /* Build configuration list for PBXNativeTarget "cocos2dx Mac" */ = { + 1551A34C158F2AB200E66CFE /* Build configuration list for PBXNativeTarget "libcocos2d Mac" */ = { isa = XCConfigurationList; buildConfigurations = ( 1551A34D158F2AB200E66CFE /* Debug */, @@ -7691,7 +8727,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A03F2CB51780BD04006731B9 /* Build configuration list for PBXNativeTarget "chipmunk Mac" */ = { + A03F2CB51780BD04006731B9 /* Build configuration list for PBXNativeTarget "libchipmunk Mac" */ = { isa = XCConfigurationList; buildConfigurations = ( A03F2CB61780BD04006731B9 /* Debug */, @@ -7700,7 +8736,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A03F2D981780BDF7006731B9 /* Build configuration list for PBXNativeTarget "box2d Mac" */ = { + A03F2D981780BDF7006731B9 /* Build configuration list for PBXNativeTarget "libbox2d Mac" */ = { isa = XCConfigurationList; buildConfigurations = ( A03F2D991780BDF7006731B9 /* Debug */, @@ -7718,7 +8754,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A03F2ED317814268006731B9 /* Build configuration list for PBXNativeTarget "CocosDenshion Mac" */ = { + A03F2ED317814268006731B9 /* Build configuration list for PBXNativeTarget "libcocosdenshion Mac" */ = { isa = XCConfigurationList; buildConfigurations = ( A03F2ED417814268006731B9 /* Debug */, @@ -7727,7 +8763,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A03F2FD317814595006731B9 /* Build configuration list for PBXNativeTarget "cocos2dx-extensions Mac" */ = { + A03F2FD317814595006731B9 /* Build configuration list for PBXNativeTarget "libextension Mac" */ = { isa = XCConfigurationList; buildConfigurations = ( A03F2FD417814595006731B9 /* Debug */, @@ -7736,7 +8772,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A07A4D611783777C0073F6A7 /* Build configuration list for PBXNativeTarget "cocos2dx iOS" */ = { + A07A4D611783777C0073F6A7 /* Build configuration list for PBXNativeTarget "libcocos2d iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( A07A4D621783777C0073F6A7 /* Debug */, @@ -7754,7 +8790,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A07A4EF91783867C0073F6A7 /* Build configuration list for PBXNativeTarget "cocos2dx-extensions iOS" */ = { + A07A4EF91783867C0073F6A7 /* Build configuration list for PBXNativeTarget "libextension iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( A07A4EFA1783867C0073F6A7 /* Debug */, @@ -7763,7 +8799,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A07A4F38178387670073F6A7 /* Build configuration list for PBXNativeTarget "chipmunk iOS" */ = { + A07A4F38178387670073F6A7 /* Build configuration list for PBXNativeTarget "libchipmunk iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( A07A4F39178387670073F6A7 /* Debug */, @@ -7772,7 +8808,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A07A4F9B1783876B0073F6A7 /* Build configuration list for PBXNativeTarget "box2d iOS" */ = { + A07A4F9B1783876B0073F6A7 /* Build configuration list for PBXNativeTarget "libbox2d iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( A07A4F9C1783876B0073F6A7 /* Debug */, @@ -7781,7 +8817,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A07A4FB1178387730073F6A7 /* Build configuration list for PBXNativeTarget "CocosDenshion iOS" */ = { + A07A4FB1178387730073F6A7 /* Build configuration list for PBXNativeTarget "libcocosdenshion iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( A07A4FB2178387730073F6A7 /* Debug */, @@ -7790,6 +8826,96 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + B245F13719766132001920FD /* Build configuration list for PBXNativeTarget "libui Mac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + B245F13819766132001920FD /* Debug */, + B245F13919766132001920FD /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + B24EEA6319775E92004493CC /* Build configuration list for PBXNativeTarget "libui iOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + B24EEA6419775E92004493CC /* Debug */, + B24EEA6519775E92004493CC /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + B24EEA6B19775EBB004493CC /* Build configuration list for PBXNativeTarget "libcocostudio iOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + B24EEA6C19775EBB004493CC /* Debug */, + B24EEA6D19775EBB004493CC /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + B24EEA7319775ECE004493CC /* Build configuration list for PBXNativeTarget "libcocosbuilder iOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + B24EEA7419775ECE004493CC /* Debug */, + B24EEA7519775ECE004493CC /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + B24EEA7B19775EE1004493CC /* Build configuration list for PBXNativeTarget "libspine iOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + B24EEA7C19775EE1004493CC /* Debug */, + B24EEA7D19775EE1004493CC /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + B24EEA8319775EF3004493CC /* Build configuration list for PBXNativeTarget "libnetwork iOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + B24EEA8419775EF3004493CC /* Debug */, + B24EEA8519775EF3004493CC /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + B2DB47CF197669A100411E16 /* Build configuration list for PBXNativeTarget "libcocosbuilder Mac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + B2DB47D0197669A100411E16 /* Debug */, + B2DB47D1197669A100411E16 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + B2DB484A1976716E00411E16 /* Build configuration list for PBXNativeTarget "libcocostudio Mac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + B2DB484B1976716E00411E16 /* Debug */, + B2DB484C1976716E00411E16 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + B2DB48FE19767F1F00411E16 /* Build configuration list for PBXNativeTarget "libspine Mac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + B2DB48FF19767F1F00411E16 /* Debug */, + B2DB490019767F1F00411E16 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + B2DB49C1197686CB00411E16 /* Build configuration list for PBXNativeTarget "libnetwork Mac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + B2DB49C2197686CB00411E16 /* Debug */, + B2DB49C3197686CB00411E16 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; /* End XCConfigurationList section */ }; rootObject = 1551A336158F2AB200E66CFE /* Project object */; diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/CocosDenshion Mac.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/CocosDenshion Mac.xcscheme deleted file mode 100644 index 8a9de3e3c5..0000000000 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/CocosDenshion Mac.xcscheme +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/CocosDenshion iOS.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/CocosDenshion iOS.xcscheme deleted file mode 100644 index cf3f3de3c1..0000000000 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/CocosDenshion iOS.xcscheme +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/box2d Mac.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/box2d Mac.xcscheme deleted file mode 100644 index 1d7292c24c..0000000000 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/box2d Mac.xcscheme +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/box2d iOS.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/box2d iOS.xcscheme deleted file mode 100644 index 4955632930..0000000000 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/box2d iOS.xcscheme +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/build all libs Mac.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/build all libs Mac.xcscheme deleted file mode 100644 index 25dbc11dbb..0000000000 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/build all libs Mac.xcscheme +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/build all libs iOS.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/build all libs iOS.xcscheme deleted file mode 100644 index 170dc164b6..0000000000 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/build all libs iOS.xcscheme +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/chipmunk Mac.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/chipmunk Mac.xcscheme deleted file mode 100644 index 47d4160634..0000000000 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/chipmunk Mac.xcscheme +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/chipmunk iOS.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/chipmunk iOS.xcscheme deleted file mode 100644 index 01693d09de..0000000000 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/chipmunk iOS.xcscheme +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx Mac.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx Mac.xcscheme deleted file mode 100644 index 4c1792021c..0000000000 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx Mac.xcscheme +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx iOS.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx iOS.xcscheme deleted file mode 100644 index b98e514fc3..0000000000 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx iOS.xcscheme +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx-extensions Mac.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx-extensions Mac.xcscheme deleted file mode 100644 index 3a52b29fbd..0000000000 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx-extensions Mac.xcscheme +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx-extensions iOS.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx-extensions iOS.xcscheme deleted file mode 100644 index c57c7ea425..0000000000 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx-extensions iOS.xcscheme +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_tests.xcodeproj/project.pbxproj b/build/cocos2d_tests.xcodeproj/project.pbxproj index 22be96797e..953553e7d1 100644 --- a/build/cocos2d_tests.xcodeproj/project.pbxproj +++ b/build/cocos2d_tests.xcodeproj/project.pbxproj @@ -60,6 +60,7 @@ 1503FAC618DA8B6C00F6518C /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB218DA8B6C00F6518C /* url.lua */; }; 156229331973D400009C9067 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 156229321973D400009C9067 /* bitExtend.lua */; }; 156229341973D400009C9067 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 156229321973D400009C9067 /* bitExtend.lua */; }; + 156EAE071977D0BD00F53709 /* ActionTimeline in Resources */ = {isa = PBXBuildFile; fileRef = 38FA2E75194AECF800FF2BE4 /* ActionTimeline */; }; 15AECE0B195C0F8A00907DB0 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EA0FB65191B933000B170C8 /* MediaPlayer.framework */; }; 15AECE0F195C1FDD00907DB0 /* cocosvideo.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 3EA0FB5D191B92F100B170C8 /* cocosvideo.mp4 */; }; 15AECE1F195D0EC500907DB0 /* experimentalConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AECE1E195D0EC500907DB0 /* experimentalConstants.lua */; }; @@ -111,8 +112,8 @@ 15CBA9B8196EE8D9005877BB /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 15CBA54C196EE671005877BB /* main.m */; }; 15CBA9B9196EE8D9005877BB /* RootViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 15CBA54E196EE671005877BB /* RootViewController.mm */; }; 15CBA9BB196EE910005877BB /* libchipmunk iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC21807A4F9005B8026 /* libchipmunk iOS.a */; }; - 15CBA9BD196EE910005877BB /* libcocos2dx-extensions iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC01807A4F9005B8026 /* libcocos2dx-extensions iOS.a */; }; - 15CBA9BE196EE910005877BB /* libCocosDenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC61807A4F9005B8026 /* libCocosDenshion iOS.a */; }; + 15CBA9BD196EE910005877BB /* libextension iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC01807A4F9005B8026 /* libextension iOS.a */; }; + 15CBA9BE196EE910005877BB /* libcocosdenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC61807A4F9005B8026 /* libcocosdenshion iOS.a */; }; 15CBA9BF196EE910005877BB /* libluabindings iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA28018CD90A50087CE3A /* libluabindings iOS.a */; }; 15CBA9CF196EE9FB005877BB /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15CBA9C2196EE951005877BB /* AVFoundation.framework */; }; 15CBA9D0196EEA05005877BB /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15CBA9C4196EE962005877BB /* UIKit.framework */; }; @@ -125,7 +126,7 @@ 15CBA9DB196EEA90005877BB /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15CBA9DA196EEA90005877BB /* CoreMotion.framework */; }; 15CBA9DD196EEAA6005877BB /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15CBA9DC196EEAA6005877BB /* libz.dylib */; }; 15CBA9DE196EEAF8005877BB /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E61773C1960FBD100DE83F5 /* GameController.framework */; }; - 15CBA9DF196EEBB3005877BB /* libcocos2dx iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2dx iOS.a */; }; + 15CBA9DF196EEBB3005877BB /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */; }; 15CBA9E0196EEBD4005877BB /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EA0FB65191B933000B170C8 /* MediaPlayer.framework */; }; 15CBA9ED196F7BD8005877BB /* lua_cocos2dx_controller_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15CBA9EB196F7BD8005877BB /* lua_cocos2dx_controller_auto.cpp */; }; 15CBA9F0196F7BEC005877BB /* lua_cocos2dx_controller_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15CBA9EE196F7BEC005877BB /* lua_cocos2dx_controller_manual.cpp */; }; @@ -134,8 +135,8 @@ 15E66FC8192D957100C20A52 /* Sprite3DTest in Resources */ = {isa = PBXBuildFile; fileRef = 3E92EA841921A7720094CD21 /* Sprite3DTest */; }; 15E66FD6192DC8C700C20A52 /* Sprite3DTest in Resources */ = {isa = PBXBuildFile; fileRef = 3E92EA841921A7720094CD21 /* Sprite3DTest */; }; 1A0EE2A118CDF6DA004CD58F /* libchipmunk Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB41807A4F9005B8026 /* libchipmunk Mac.a */; }; - 1A0EE2A218CDF6DA004CD58F /* libcocos2dx Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB01807A4F9005B8026 /* libcocos2dx Mac.a */; }; - 1A0EE2A418CDF6DA004CD58F /* libCocosDenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB81807A4F9005B8026 /* libCocosDenshion Mac.a */; }; + 1A0EE2A218CDF6DA004CD58F /* libcocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB01807A4F9005B8026 /* libcocos2d Mac.a */; }; + 1A0EE2A418CDF6DA004CD58F /* libcocosdenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB81807A4F9005B8026 /* libcocosdenshion Mac.a */; }; 1A0EE2A518CDF6DA004CD58F /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EDCC747E17C455FD007B692C /* IOKit.framework */; }; 1A0EE2A618CDF6DA004CD58F /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A9F808C177E98A600D9A1CB /* libcurl.dylib */; }; 1A0EE2A718CDF6DA004CD58F /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482E165F399D007D4F18 /* libz.dylib */; }; @@ -156,14 +157,14 @@ 1A0EE2D018CDF733004CD58F /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA35618CD9A890087CE3A /* QuartzCore.framework */; }; 1A0EE2D118CDF733004CD58F /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA35418CD9A820087CE3A /* OpenGL.framework */; }; 1A0EE2D218CDF733004CD58F /* libchipmunk Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB41807A4F9005B8026 /* libchipmunk Mac.a */; }; - 1A0EE2D318CDF733004CD58F /* libcocos2dx Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB01807A4F9005B8026 /* libcocos2dx Mac.a */; }; - 1A0EE2D418CDF733004CD58F /* libcocos2dx-extensions Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB21807A4F9005B8026 /* libcocos2dx-extensions Mac.a */; }; - 1A0EE2D518CDF733004CD58F /* libCocosDenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB81807A4F9005B8026 /* libCocosDenshion Mac.a */; }; + 1A0EE2D318CDF733004CD58F /* libcocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB01807A4F9005B8026 /* libcocos2d Mac.a */; }; + 1A0EE2D418CDF733004CD58F /* libextension Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB21807A4F9005B8026 /* libextension Mac.a */; }; + 1A0EE2D518CDF733004CD58F /* libcocosdenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB81807A4F9005B8026 /* libcocosdenshion Mac.a */; }; 1A0EE2D618CDF733004CD58F /* libluabindings Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA27E18CD90A50087CE3A /* libluabindings Mac.a */; }; 1A0EE2D718CDF733004CD58F /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64822165F391E007D4F18 /* Cocoa.framework */; }; 1A0EE40218CDF775004CD58F /* libchipmunk iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC21807A4F9005B8026 /* libchipmunk iOS.a */; }; - 1A0EE40318CDF775004CD58F /* libcocos2dx iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2dx iOS.a */; }; - 1A0EE40518CDF775004CD58F /* libCocosDenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC61807A4F9005B8026 /* libCocosDenshion iOS.a */; }; + 1A0EE40318CDF775004CD58F /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */; }; + 1A0EE40518CDF775004CD58F /* libcocosdenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC61807A4F9005B8026 /* libcocosdenshion iOS.a */; }; 1A0EE40618CDF775004CD58F /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D60AE43317F7FFE100757E4B /* CoreMotion.framework */; }; 1A0EE40718CDF775004CD58F /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482E165F399D007D4F18 /* libz.dylib */; }; 1A0EE40818CDF775004CD58F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64832165F3AFD007D4F18 /* Foundation.framework */; }; @@ -185,9 +186,9 @@ 1A0EE43418CDF799004CD58F /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA39C18CD9ED80087CE3A /* AVFoundation.framework */; }; 1A0EE43518CDF799004CD58F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64832165F3AFD007D4F18 /* Foundation.framework */; }; 1A0EE43618CDF799004CD58F /* libchipmunk iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC21807A4F9005B8026 /* libchipmunk iOS.a */; }; - 1A0EE43718CDF799004CD58F /* libcocos2dx iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2dx iOS.a */; }; - 1A0EE43818CDF799004CD58F /* libcocos2dx-extensions iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC01807A4F9005B8026 /* libcocos2dx-extensions iOS.a */; }; - 1A0EE43918CDF799004CD58F /* libCocosDenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC61807A4F9005B8026 /* libCocosDenshion iOS.a */; }; + 1A0EE43718CDF799004CD58F /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */; }; + 1A0EE43818CDF799004CD58F /* libextension iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC01807A4F9005B8026 /* libextension iOS.a */; }; + 1A0EE43918CDF799004CD58F /* libcocosdenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC61807A4F9005B8026 /* libcocosdenshion iOS.a */; }; 1A0EE43A18CDF799004CD58F /* libluabindings iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA28018CD90A50087CE3A /* libluabindings iOS.a */; }; 1A0EE55C18CDFBBD004CD58F /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36618CD9E180087CE3A /* AudioEngine.lua */; }; 1A0EE55D18CDFBBD004CD58F /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36718CD9E180087CE3A /* CCBReaderLoad.lua */; }; @@ -232,25 +233,25 @@ 1A9F808D177E98A600D9A1CB /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A9F808C177E98A600D9A1CB /* libcurl.dylib */; }; 1AAF534B180E2F4E000584C8 /* libbox2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB61807A4F9005B8026 /* libbox2d Mac.a */; }; 1AAF534C180E2F4E000584C8 /* libchipmunk Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB41807A4F9005B8026 /* libchipmunk Mac.a */; }; - 1AAF534D180E2F4E000584C8 /* libcocos2dx Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB01807A4F9005B8026 /* libcocos2dx Mac.a */; }; - 1AAF534E180E2F4E000584C8 /* libcocos2dx-extensions Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB21807A4F9005B8026 /* libcocos2dx-extensions Mac.a */; }; - 1AAF534F180E2F4E000584C8 /* libCocosDenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB81807A4F9005B8026 /* libCocosDenshion Mac.a */; }; + 1AAF534D180E2F4E000584C8 /* libcocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB01807A4F9005B8026 /* libcocos2d Mac.a */; }; + 1AAF534E180E2F4E000584C8 /* libextension Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB21807A4F9005B8026 /* libextension Mac.a */; }; + 1AAF534F180E2F4E000584C8 /* libcocosdenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB81807A4F9005B8026 /* libcocosdenshion Mac.a */; }; 1AAF53FE180E39D4000584C8 /* libbox2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC41807A4F9005B8026 /* libbox2d iOS.a */; }; 1AAF53FF180E39D4000584C8 /* libchipmunk iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC21807A4F9005B8026 /* libchipmunk iOS.a */; }; - 1AAF5400180E39D4000584C8 /* libcocos2dx iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2dx iOS.a */; }; - 1AAF5401180E39D4000584C8 /* libcocos2dx-extensions iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC01807A4F9005B8026 /* libcocos2dx-extensions iOS.a */; }; - 1AAF5402180E39D4000584C8 /* libCocosDenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC61807A4F9005B8026 /* libCocosDenshion iOS.a */; }; + 1AAF5400180E39D4000584C8 /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */; }; + 1AAF5401180E39D4000584C8 /* libextension iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC01807A4F9005B8026 /* libextension iOS.a */; }; + 1AAF5402180E39D4000584C8 /* libcocosdenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC61807A4F9005B8026 /* libcocosdenshion iOS.a */; }; 1ABCA28718CD91510087CE3A /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64822165F391E007D4F18 /* Cocoa.framework */; }; 1ABCA2C218CD92420087CE3A /* libchipmunk Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB41807A4F9005B8026 /* libchipmunk Mac.a */; }; - 1ABCA2C318CD92420087CE3A /* libcocos2dx Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB01807A4F9005B8026 /* libcocos2dx Mac.a */; }; - 1ABCA2C418CD92420087CE3A /* libcocos2dx-extensions Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB21807A4F9005B8026 /* libcocos2dx-extensions Mac.a */; }; - 1ABCA2C518CD92420087CE3A /* libCocosDenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB81807A4F9005B8026 /* libCocosDenshion Mac.a */; }; + 1ABCA2C318CD92420087CE3A /* libcocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB01807A4F9005B8026 /* libcocos2d Mac.a */; }; + 1ABCA2C418CD92420087CE3A /* libextension Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB21807A4F9005B8026 /* libextension Mac.a */; }; + 1ABCA2C518CD92420087CE3A /* libcocosdenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB81807A4F9005B8026 /* libcocosdenshion Mac.a */; }; 1ABCA2C618CD92420087CE3A /* libluabindings Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA27E18CD90A50087CE3A /* libluabindings Mac.a */; }; 1ABCA2CE18CD93580087CE3A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64832165F3AFD007D4F18 /* Foundation.framework */; }; 1ABCA30118CD93940087CE3A /* libchipmunk iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC21807A4F9005B8026 /* libchipmunk iOS.a */; }; - 1ABCA30218CD93940087CE3A /* libcocos2dx iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2dx iOS.a */; }; - 1ABCA30318CD93940087CE3A /* libcocos2dx-extensions iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC01807A4F9005B8026 /* libcocos2dx-extensions iOS.a */; }; - 1ABCA30418CD93940087CE3A /* libCocosDenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC61807A4F9005B8026 /* libCocosDenshion iOS.a */; }; + 1ABCA30218CD93940087CE3A /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */; }; + 1ABCA30318CD93940087CE3A /* libextension iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC01807A4F9005B8026 /* libextension iOS.a */; }; + 1ABCA30418CD93940087CE3A /* libcocosdenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC61807A4F9005B8026 /* libcocosdenshion iOS.a */; }; 1ABCA30518CD93940087CE3A /* libluabindings iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA28018CD90A50087CE3A /* libluabindings iOS.a */; }; 1ABCA35518CD9A820087CE3A /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA35418CD9A820087CE3A /* OpenGL.framework */; }; 1ABCA35718CD9A890087CE3A /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA35618CD9A890087CE3A /* QuartzCore.framework */; }; @@ -852,6 +853,8 @@ 29080DE6191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D8B191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp */; }; 290E94B5196FC16900694919 /* CocostudioParserTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 290E94B3196FC16900694919 /* CocostudioParserTest.cpp */; }; 290E94B6196FC16900694919 /* CocostudioParserTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 290E94B3196FC16900694919 /* CocostudioParserTest.cpp */; }; + 295824591987415900F9746D /* UIScale9SpriteTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 295824571987415900F9746D /* UIScale9SpriteTest.cpp */; }; + 2958245A1987415900F9746D /* UIScale9SpriteTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 295824571987415900F9746D /* UIScale9SpriteTest.cpp */; }; 29FBBBFE196A9ECD00E65826 /* CocostudioParserJsonTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29FBBBFC196A9ECD00E65826 /* CocostudioParserJsonTest.cpp */; }; 29FBBBFF196A9ECD00E65826 /* CocostudioParserJsonTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29FBBBFC196A9ECD00E65826 /* CocostudioParserJsonTest.cpp */; }; 38FA2E73194AEBE100FF2BE4 /* ActionTimelineTestScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E71194AEBE100FF2BE4 /* ActionTimelineTestScene.cpp */; }; @@ -859,8 +862,7 @@ 38FA2E76194AECF800FF2BE4 /* ActionTimeline in Resources */ = {isa = PBXBuildFile; fileRef = 38FA2E75194AECF800FF2BE4 /* ActionTimeline */; }; 38FA2E77194AECF800FF2BE4 /* ActionTimeline in Resources */ = {isa = PBXBuildFile; fileRef = 38FA2E75194AECF800FF2BE4 /* ActionTimeline */; }; 3E6177211960FAED00DE83F5 /* libchipmunk iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC21807A4F9005B8026 /* libchipmunk iOS.a */; }; - 3E6177221960FAED00DE83F5 /* libcocos2dx iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2dx iOS.a */; }; - 3E6177231960FAED00DE83F5 /* libCocosDenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC61807A4F9005B8026 /* libCocosDenshion iOS.a */; }; + 3E6177221960FAED00DE83F5 /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */; }; 3E6177241960FAED00DE83F5 /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D60AE43317F7FFE100757E4B /* CoreMotion.framework */; }; 3E6177251960FAED00DE83F5 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482E165F399D007D4F18 /* libz.dylib */; }; 3E6177261960FAED00DE83F5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64832165F3AFD007D4F18 /* Foundation.framework */; }; @@ -914,8 +916,43 @@ A07A52BF1783AF210073F6A7 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A07A52B91783AE900073F6A7 /* OpenGLES.framework */; }; A07A52C01783AF250073F6A7 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A07A52B71783AE6D0073F6A7 /* UIKit.framework */; }; A07A52C31783B02C0073F6A7 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A07A52C11783B01F0073F6A7 /* AVFoundation.framework */; }; + B2411C9E19822FBD00E093E2 /* libcocostudio iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC503B197763A20041958E /* libcocostudio iOS.a */; }; + B2411CA119822FDD00E093E2 /* libcocosbuilder iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC503D197763A20041958E /* libcocosbuilder iOS.a */; }; + B2411CA419822FF100E093E2 /* libspine iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC503F197763A20041958E /* libspine iOS.a */; }; + B2411CA71982301400E093E2 /* libui iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC5039197763A20041958E /* libui iOS.a */; }; + B2411CAA1982302700E093E2 /* libnetwork iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC5041197763A20041958E /* libnetwork iOS.a */; }; + B244F3171976878E00ED1926 /* libnetwork Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B244F3161976878700ED1926 /* libnetwork Mac.a */; }; B2507B6B192589AF00FA4972 /* Shaders3D in Resources */ = {isa = PBXBuildFile; fileRef = B2507B6A192589AF00FA4972 /* Shaders3D */; }; B2507B6C192589AF00FA4972 /* Shaders3D in Resources */ = {isa = PBXBuildFile; fileRef = B2507B6A192589AF00FA4972 /* Shaders3D */; }; + B27AEE0719768950008BD575 /* libnetwork Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B244F3161976878700ED1926 /* libnetwork Mac.a */; }; + B27AEE0A1976896B008BD575 /* libnetwork Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B244F3161976878700ED1926 /* libnetwork Mac.a */; }; + B2C59AC8197782B900B452DF /* libcocosbuilder iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC503D197763A20041958E /* libcocosbuilder iOS.a */; }; + B2C59AC9197782B900B452DF /* libui iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC5039197763A20041958E /* libui iOS.a */; }; + B2C59ACA197782B900B452DF /* libcocostudio iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC503B197763A20041958E /* libcocostudio iOS.a */; }; + B2C59AD619779CEB00B452DF /* libcocosbuilder iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC503D197763A20041958E /* libcocosbuilder iOS.a */; }; + B2C59AD719779CEB00B452DF /* libui iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC5039197763A20041958E /* libui iOS.a */; }; + B2C59AD819779CEB00B452DF /* libnetwork iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC5041197763A20041958E /* libnetwork iOS.a */; }; + B2C59AD919779CEB00B452DF /* libspine iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC503F197763A20041958E /* libspine iOS.a */; }; + B2C59ADA19779CEB00B452DF /* libcocostudio iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC503B197763A20041958E /* libcocostudio iOS.a */; }; + B2C59AE519779D5D00B452DF /* libcocosbuilder iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC503D197763A20041958E /* libcocosbuilder iOS.a */; }; + B2C59AE619779D5D00B452DF /* libui iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC5039197763A20041958E /* libui iOS.a */; }; + B2C59AE719779D5D00B452DF /* libnetwork iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC5041197763A20041958E /* libnetwork iOS.a */; }; + B2C59AE819779D5D00B452DF /* libspine iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC503F197763A20041958E /* libspine iOS.a */; }; + B2C59AE919779D5D00B452DF /* libcocostudio iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC503B197763A20041958E /* libcocostudio iOS.a */; }; + B2CC5045197766F70041958E /* libnetwork iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC5041197763A20041958E /* libnetwork iOS.a */; }; + B2CC507B19776D8B0041958E /* libspine iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC503F197763A20041958E /* libspine iOS.a */; }; + B2DB479A197668D500411E16 /* libui Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2DB4799197668CA00411E16 /* libui Mac.a */; }; + B2DB480919766E4800411E16 /* libcocosbuilder Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2DB480819766E3C00411E16 /* libcocosbuilder Mac.a */; }; + B2DB480E197670F500411E16 /* libcocosbuilder Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2DB480819766E3C00411E16 /* libcocosbuilder Mac.a */; }; + B2DB480F197670F500411E16 /* libui Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2DB4799197668CA00411E16 /* libui Mac.a */; }; + B2DB48141976711A00411E16 /* libcocosbuilder Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2DB480819766E3C00411E16 /* libcocosbuilder Mac.a */; }; + B2DB48151976711A00411E16 /* libui Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2DB4799197668CA00411E16 /* libui Mac.a */; }; + B2DB48C319767D3D00411E16 /* libcocostudio Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2DB48C219767D3600411E16 /* libcocostudio Mac.a */; }; + B2DB48C619767DAC00411E16 /* libcocostudio Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2DB48C219767D3600411E16 /* libcocostudio Mac.a */; }; + B2DB48C919767EB700411E16 /* libcocostudio Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2DB48C219767D3600411E16 /* libcocostudio Mac.a */; }; + B2DB493A197681E500411E16 /* libspine Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2DB49391976819900411E16 /* libspine Mac.a */; }; + B2DB49401976826000411E16 /* libspine Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2DB49391976819900411E16 /* libspine Mac.a */; }; + B2DB49431976826E00411E16 /* libspine Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2DB49391976819900411E16 /* libspine Mac.a */; }; C04F935A1941B05400E9FEAB /* TileMapTest2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C04F93581941B05400E9FEAB /* TileMapTest2.cpp */; }; C04F935B1941B05400E9FEAB /* TileMapTest2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C04F93581941B05400E9FEAB /* TileMapTest2.cpp */; }; C08689C118D370C90093E810 /* background.caf in Resources */ = {isa = PBXBuildFile; fileRef = C08689C018D370C90093E810 /* background.caf */; }; @@ -1284,20 +1321,6 @@ remoteGlobalIDString = A07A4EFD178387670073F6A7; remoteInfo = "chipmunk iOS"; }; - 3E6177051960FAED00DE83F5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A07A4F9F178387730073F6A7; - remoteInfo = "CocosDenshion iOS"; - }; - 3E6177441960FE1E00DE83F5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A07A4E111783867C0073F6A7; - remoteInfo = "cocos2dx-extensions iOS"; - }; 46A15FAF1807A4F9005B8026 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; @@ -1382,6 +1405,321 @@ remoteGlobalIDString = A07A517F1783A1D20073F6A7; remoteInfo = "Test cpp iOS"; }; + B2411C9C19822FB600E093E2 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA6719775EBB004493CC; + remoteInfo = "libcocostudio iOS"; + }; + B2411C9F19822FD300E093E2 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA6F19775ECE004493CC; + remoteInfo = "libcocosbuilder iOS"; + }; + B2411CA219822FEA00E093E2 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA7719775EE1004493CC; + remoteInfo = "libspine iOS"; + }; + B2411CA51982300F00E093E2 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA2C19775E92004493CC; + remoteInfo = "libui iOS"; + }; + B2411CA81982301E00E093E2 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA7F19775EF3004493CC; + remoteInfo = "libnetwork iOS"; + }; + B244F3101976878700ED1926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B2DB498D197686CB00411E16; + remoteInfo = "cocosNetwork Mac"; + }; + B244F3151976878700ED1926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B2DB49C4197686CB00411E16; + remoteInfo = "cocosNetwork Mac"; + }; + B27AEE031976894C008BD575 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B2DB498D197686CB00411E16; + remoteInfo = "cocosNetwork Mac"; + }; + B27AEE0819768965008BD575 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B2DB498D197686CB00411E16; + remoteInfo = "cocosNetwork Mac"; + }; + B2C59ABD197782AC00B452DF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA2C19775E92004493CC; + remoteInfo = "cocosGUI iOS"; + }; + B2C59ABF197782AC00B452DF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA6719775EBB004493CC; + remoteInfo = "cocosStudio iOS"; + }; + B2C59AC1197782AC00B452DF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA6F19775ECE004493CC; + remoteInfo = "cocosBuilder iOS"; + }; + B2C59ACC19779CDF00B452DF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA2C19775E92004493CC; + remoteInfo = "cocosGUI iOS"; + }; + B2C59ACE19779CDF00B452DF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA6719775EBB004493CC; + remoteInfo = "cocosStudio iOS"; + }; + B2C59AD019779CDF00B452DF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA6F19775ECE004493CC; + remoteInfo = "cocosBuilder iOS"; + }; + B2C59AD219779CDF00B452DF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA7719775EE1004493CC; + remoteInfo = "cocosSpine iOS"; + }; + B2C59AD419779CDF00B452DF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA7F19775EF3004493CC; + remoteInfo = "cocosNetwork iOS"; + }; + B2C59ADB19779D5400B452DF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA2C19775E92004493CC; + remoteInfo = "cocosGUI iOS"; + }; + B2C59ADD19779D5400B452DF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA6719775EBB004493CC; + remoteInfo = "cocosStudio iOS"; + }; + B2C59ADF19779D5400B452DF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA6F19775ECE004493CC; + remoteInfo = "cocosBuilder iOS"; + }; + B2C59AE119779D5400B452DF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA7719775EE1004493CC; + remoteInfo = "cocosSpine iOS"; + }; + B2C59AE319779D5400B452DF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA7F19775EF3004493CC; + remoteInfo = "cocosNetwork iOS"; + }; + B2CC5038197763A20041958E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B24EEA6619775E92004493CC; + remoteInfo = "cocosGUI iOS"; + }; + B2CC503A197763A20041958E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B24EEA6E19775EBB004493CC; + remoteInfo = "cocosStudio iOS"; + }; + B2CC503C197763A20041958E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B24EEA7619775ECE004493CC; + remoteInfo = "cocosBuilder iOS"; + }; + B2CC503E197763A20041958E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B24EEA7E19775EE1004493CC; + remoteInfo = "cocosSpine iOS"; + }; + B2CC5040197763A20041958E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B24EEA8619775EF3004493CC; + remoteInfo = "cocosNetwork iOS"; + }; + B2CC5043197766EB0041958E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA7F19775EF3004493CC; + remoteInfo = "cocosNetwork iOS"; + }; + B2CC507919776D830041958E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA7719775EE1004493CC; + remoteInfo = "cocosSpine iOS"; + }; + B2DB4793197668CA00411E16 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B245F10019766132001920FD; + remoteInfo = "cocosGUI Mac"; + }; + B2DB4798197668CA00411E16 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B245F13A19766132001920FD; + remoteInfo = "cocosGUI Mac"; + }; + B2DB480419766E3C00411E16 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B2DB479B197669A100411E16; + remoteInfo = "cocosBuilder Mac"; + }; + B2DB480719766E3C00411E16 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B2DB47D2197669A100411E16; + remoteInfo = "cocosBuilder Mac"; + }; + B2DB480A197670ED00411E16 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B245F10019766132001920FD; + remoteInfo = "cocosGUI Mac"; + }; + B2DB480C197670ED00411E16 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B2DB479B197669A100411E16; + remoteInfo = "cocosBuilder Mac"; + }; + B2DB48101976711200411E16 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B245F10019766132001920FD; + remoteInfo = "cocosGUI Mac"; + }; + B2DB48121976711200411E16 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B2DB479B197669A100411E16; + remoteInfo = "cocosBuilder Mac"; + }; + B2DB48BE19767D3600411E16 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B2DB48161976716E00411E16; + remoteInfo = "cocosStudio Mac"; + }; + B2DB48C119767D3600411E16 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B2DB484D1976716E00411E16; + remoteInfo = "cocosStudio Mac"; + }; + B2DB48C419767DA500411E16 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B2DB48161976716E00411E16; + remoteInfo = "cocosStudio Mac"; + }; + B2DB48C719767EAF00411E16 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B2DB48161976716E00411E16; + remoteInfo = "cocosStudio Mac"; + }; + B2DB49351976819900411E16 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B2DB48CA19767F1F00411E16; + remoteInfo = "cocosSpine Mac"; + }; + B2DB49381976819900411E16 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B2DB490119767F1F00411E16; + remoteInfo = "cocosSpine Mac"; + }; + B2DB493E1976825800411E16 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B2DB48CA19767F1F00411E16; + remoteInfo = "cocosSpine Mac"; + }; + B2DB49411976826900411E16 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B2DB48CA19767F1F00411E16; + remoteInfo = "cocosSpine Mac"; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -3117,6 +3455,8 @@ 29080D8C191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIWidgetAddNodeTest_Editor.h; sourceTree = ""; }; 290E94B3196FC16900694919 /* CocostudioParserTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CocostudioParserTest.cpp; path = ../CocostudioParserTest.cpp; sourceTree = ""; }; 290E94B4196FC16900694919 /* CocostudioParserTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CocostudioParserTest.h; path = ../CocostudioParserTest.h; sourceTree = ""; }; + 295824571987415900F9746D /* UIScale9SpriteTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIScale9SpriteTest.cpp; sourceTree = ""; }; + 295824581987415900F9746D /* UIScale9SpriteTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIScale9SpriteTest.h; sourceTree = ""; }; 29FBBBFC196A9ECD00E65826 /* CocostudioParserJsonTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CocostudioParserJsonTest.cpp; sourceTree = ""; }; 29FBBBFD196A9ECD00E65826 /* CocostudioParserJsonTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CocostudioParserJsonTest.h; sourceTree = ""; }; 38FA2E71194AEBE100FF2BE4 /* ActionTimelineTestScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ActionTimelineTestScene.cpp; sourceTree = ""; }; @@ -3186,6 +3526,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + B2411CAA1982302700E093E2 /* libnetwork iOS.a in Frameworks */, + B2411CA71982301400E093E2 /* libui iOS.a in Frameworks */, + B2411CA419822FF100E093E2 /* libspine iOS.a in Frameworks */, + B2411CA119822FDD00E093E2 /* libcocosbuilder iOS.a in Frameworks */, + B2411C9E19822FBD00E093E2 /* libcocostudio iOS.a in Frameworks */, 15CBA9E0196EEBD4005877BB /* MediaPlayer.framework in Frameworks */, 15CBA9DE196EEAF8005877BB /* GameController.framework in Frameworks */, 15CBA9DD196EEAA6005877BB /* libz.dylib in Frameworks */, @@ -3199,9 +3544,9 @@ 15CBA9CF196EE9FB005877BB /* AVFoundation.framework in Frameworks */, 15CBA9D1196EEA1D005877BB /* Foundation.framework in Frameworks */, 15CBA9BB196EE910005877BB /* libchipmunk iOS.a in Frameworks */, - 15CBA9DF196EEBB3005877BB /* libcocos2dx iOS.a in Frameworks */, - 15CBA9BD196EE910005877BB /* libcocos2dx-extensions iOS.a in Frameworks */, - 15CBA9BE196EE910005877BB /* libCocosDenshion iOS.a in Frameworks */, + 15CBA9DF196EEBB3005877BB /* libcocos2d iOS.a in Frameworks */, + 15CBA9BD196EE910005877BB /* libextension iOS.a in Frameworks */, + 15CBA9BE196EE910005877BB /* libcocosdenshion iOS.a in Frameworks */, 15CBA9BF196EE910005877BB /* libluabindings iOS.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -3211,8 +3556,8 @@ buildActionMask = 2147483647; files = ( 1A0EE2A118CDF6DA004CD58F /* libchipmunk Mac.a in Frameworks */, - 1A0EE2A218CDF6DA004CD58F /* libcocos2dx Mac.a in Frameworks */, - 1A0EE2A418CDF6DA004CD58F /* libCocosDenshion Mac.a in Frameworks */, + 1A0EE2A218CDF6DA004CD58F /* libcocos2d Mac.a in Frameworks */, + 1A0EE2A418CDF6DA004CD58F /* libcocosdenshion Mac.a in Frameworks */, 1A0EE2A518CDF6DA004CD58F /* IOKit.framework in Frameworks */, 1A0EE2A618CDF6DA004CD58F /* libcurl.dylib in Frameworks */, 1A0EE2A718CDF6DA004CD58F /* libz.dylib in Frameworks */, @@ -3230,6 +3575,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + B27AEE0A1976896B008BD575 /* libnetwork Mac.a in Frameworks */, + B2DB49431976826E00411E16 /* libspine Mac.a in Frameworks */, + B2DB48C919767EB700411E16 /* libcocostudio Mac.a in Frameworks */, + B2DB480E197670F500411E16 /* libcocosbuilder Mac.a in Frameworks */, + B2DB480F197670F500411E16 /* libui Mac.a in Frameworks */, 1A0EE2C918CDF733004CD58F /* libcurl.dylib in Frameworks */, 1A0EE2CA18CDF733004CD58F /* libz.dylib in Frameworks */, 1A0EE2CB18CDF733004CD58F /* IOKit.framework in Frameworks */, @@ -3240,9 +3590,9 @@ 1A0EE2D018CDF733004CD58F /* QuartzCore.framework in Frameworks */, 1A0EE2D118CDF733004CD58F /* OpenGL.framework in Frameworks */, 1A0EE2D218CDF733004CD58F /* libchipmunk Mac.a in Frameworks */, - 1A0EE2D318CDF733004CD58F /* libcocos2dx Mac.a in Frameworks */, - 1A0EE2D418CDF733004CD58F /* libcocos2dx-extensions Mac.a in Frameworks */, - 1A0EE2D518CDF733004CD58F /* libCocosDenshion Mac.a in Frameworks */, + 1A0EE2D318CDF733004CD58F /* libcocos2d Mac.a in Frameworks */, + 1A0EE2D418CDF733004CD58F /* libextension Mac.a in Frameworks */, + 1A0EE2D518CDF733004CD58F /* libcocosdenshion Mac.a in Frameworks */, 1A0EE2D618CDF733004CD58F /* libluabindings Mac.a in Frameworks */, 1A0EE2D718CDF733004CD58F /* Cocoa.framework in Frameworks */, ); @@ -3253,8 +3603,8 @@ buildActionMask = 2147483647; files = ( 1A0EE40218CDF775004CD58F /* libchipmunk iOS.a in Frameworks */, - 1A0EE40318CDF775004CD58F /* libcocos2dx iOS.a in Frameworks */, - 1A0EE40518CDF775004CD58F /* libCocosDenshion iOS.a in Frameworks */, + 1A0EE40318CDF775004CD58F /* libcocos2d iOS.a in Frameworks */, + 1A0EE40518CDF775004CD58F /* libcocosdenshion iOS.a in Frameworks */, 1A0EE40618CDF775004CD58F /* CoreMotion.framework in Frameworks */, 1A0EE40718CDF775004CD58F /* libz.dylib in Frameworks */, 1A0EE40818CDF775004CD58F /* Foundation.framework in Frameworks */, @@ -3272,6 +3622,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + B2C59AD619779CEB00B452DF /* libcocosbuilder iOS.a in Frameworks */, + B2C59AD719779CEB00B452DF /* libui iOS.a in Frameworks */, + B2C59AD819779CEB00B452DF /* libnetwork iOS.a in Frameworks */, + B2C59AD919779CEB00B452DF /* libspine iOS.a in Frameworks */, + B2C59ADA19779CEB00B452DF /* libcocostudio iOS.a in Frameworks */, 15AECE25195D467D00907DB0 /* MediaPlayer.framework in Frameworks */, 1A0EE42C18CDF799004CD58F /* libz.dylib in Frameworks */, 1A0EE42D18CDF799004CD58F /* CoreMotion.framework in Frameworks */, @@ -3284,9 +3639,9 @@ 1A0EE43418CDF799004CD58F /* AVFoundation.framework in Frameworks */, 1A0EE43518CDF799004CD58F /* Foundation.framework in Frameworks */, 1A0EE43618CDF799004CD58F /* libchipmunk iOS.a in Frameworks */, - 1A0EE43718CDF799004CD58F /* libcocos2dx iOS.a in Frameworks */, - 1A0EE43818CDF799004CD58F /* libcocos2dx-extensions iOS.a in Frameworks */, - 1A0EE43918CDF799004CD58F /* libCocosDenshion iOS.a in Frameworks */, + 1A0EE43718CDF799004CD58F /* libcocos2d iOS.a in Frameworks */, + 1A0EE43818CDF799004CD58F /* libextension iOS.a in Frameworks */, + 1A0EE43918CDF799004CD58F /* libcocosdenshion iOS.a in Frameworks */, 1A0EE43A18CDF799004CD58F /* libluabindings iOS.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -3295,6 +3650,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + B27AEE0719768950008BD575 /* libnetwork Mac.a in Frameworks */, + B2DB49401976826000411E16 /* libspine Mac.a in Frameworks */, + B2DB48C319767D3D00411E16 /* libcocostudio Mac.a in Frameworks */, + B2DB48141976711A00411E16 /* libcocosbuilder Mac.a in Frameworks */, + B2DB48151976711A00411E16 /* libui Mac.a in Frameworks */, 1ABCA36218CD9AC60087CE3A /* libcurl.dylib in Frameworks */, 1ABCA36118CD9AC00087CE3A /* libz.dylib in Frameworks */, 1ABCA35F18CD9AAE0087CE3A /* IOKit.framework in Frameworks */, @@ -3305,9 +3665,9 @@ 1ABCA35718CD9A890087CE3A /* QuartzCore.framework in Frameworks */, 1ABCA35518CD9A820087CE3A /* OpenGL.framework in Frameworks */, 1ABCA2C218CD92420087CE3A /* libchipmunk Mac.a in Frameworks */, - 1ABCA2C318CD92420087CE3A /* libcocos2dx Mac.a in Frameworks */, - 1ABCA2C418CD92420087CE3A /* libcocos2dx-extensions Mac.a in Frameworks */, - 1ABCA2C518CD92420087CE3A /* libCocosDenshion Mac.a in Frameworks */, + 1ABCA2C318CD92420087CE3A /* libcocos2d Mac.a in Frameworks */, + 1ABCA2C418CD92420087CE3A /* libextension Mac.a in Frameworks */, + 1ABCA2C518CD92420087CE3A /* libcocosdenshion Mac.a in Frameworks */, 1ABCA2C618CD92420087CE3A /* libluabindings Mac.a in Frameworks */, 1ABCA28718CD91510087CE3A /* Cocoa.framework in Frameworks */, ); @@ -3317,6 +3677,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + B2C59AE519779D5D00B452DF /* libcocosbuilder iOS.a in Frameworks */, + B2C59AE619779D5D00B452DF /* libui iOS.a in Frameworks */, + B2C59AE719779D5D00B452DF /* libnetwork iOS.a in Frameworks */, + B2C59AE819779D5D00B452DF /* libspine iOS.a in Frameworks */, + B2C59AE919779D5D00B452DF /* libcocostudio iOS.a in Frameworks */, 15AECE0B195C0F8A00907DB0 /* MediaPlayer.framework in Frameworks */, 1ABCA3B018CDA06D0087CE3A /* libz.dylib in Frameworks */, 1ABCA3AA18CD9F1A0087CE3A /* CoreMotion.framework in Frameworks */, @@ -3329,9 +3694,9 @@ 1ABCA39D18CD9ED80087CE3A /* AVFoundation.framework in Frameworks */, 1ABCA2CE18CD93580087CE3A /* Foundation.framework in Frameworks */, 1ABCA30118CD93940087CE3A /* libchipmunk iOS.a in Frameworks */, - 1ABCA30218CD93940087CE3A /* libcocos2dx iOS.a in Frameworks */, - 1ABCA30318CD93940087CE3A /* libcocos2dx-extensions iOS.a in Frameworks */, - 1ABCA30418CD93940087CE3A /* libCocosDenshion iOS.a in Frameworks */, + 1ABCA30218CD93940087CE3A /* libcocos2d iOS.a in Frameworks */, + 1ABCA30318CD93940087CE3A /* libextension iOS.a in Frameworks */, + 1ABCA30418CD93940087CE3A /* libcocosdenshion iOS.a in Frameworks */, 1ABCA30518CD93940087CE3A /* libluabindings iOS.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -3340,11 +3705,16 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + B244F3171976878E00ED1926 /* libnetwork Mac.a in Frameworks */, + B2DB493A197681E500411E16 /* libspine Mac.a in Frameworks */, + B2DB48C619767DAC00411E16 /* libcocostudio Mac.a in Frameworks */, + B2DB480919766E4800411E16 /* libcocosbuilder Mac.a in Frameworks */, + B2DB479A197668D500411E16 /* libui Mac.a in Frameworks */, 1AAF534B180E2F4E000584C8 /* libbox2d Mac.a in Frameworks */, 1AAF534C180E2F4E000584C8 /* libchipmunk Mac.a in Frameworks */, - 1AAF534D180E2F4E000584C8 /* libcocos2dx Mac.a in Frameworks */, - 1AAF534E180E2F4E000584C8 /* libcocos2dx-extensions Mac.a in Frameworks */, - 1AAF534F180E2F4E000584C8 /* libCocosDenshion Mac.a in Frameworks */, + 1AAF534D180E2F4E000584C8 /* libcocos2d Mac.a in Frameworks */, + 1AAF534E180E2F4E000584C8 /* libextension Mac.a in Frameworks */, + 1AAF534F180E2F4E000584C8 /* libcocosdenshion Mac.a in Frameworks */, EDCC747F17C455FD007B692C /* IOKit.framework in Frameworks */, 1A9F808D177E98A600D9A1CB /* libcurl.dylib in Frameworks */, 15C6482F165F399D007D4F18 /* libz.dylib in Frameworks */, @@ -3364,8 +3734,7 @@ files = ( 3E61773D1960FBD200DE83F5 /* GameController.framework in Frameworks */, 3E6177211960FAED00DE83F5 /* libchipmunk iOS.a in Frameworks */, - 3E6177221960FAED00DE83F5 /* libcocos2dx iOS.a in Frameworks */, - 3E6177231960FAED00DE83F5 /* libCocosDenshion iOS.a in Frameworks */, + 3E6177221960FAED00DE83F5 /* libcocos2d iOS.a in Frameworks */, 3E6177241960FAED00DE83F5 /* CoreMotion.framework in Frameworks */, 3E6177251960FAED00DE83F5 /* libz.dylib in Frameworks */, 3E6177261960FAED00DE83F5 /* Foundation.framework in Frameworks */, @@ -3383,12 +3752,17 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + B2C59AC8197782B900B452DF /* libcocosbuilder iOS.a in Frameworks */, + B2C59AC9197782B900B452DF /* libui iOS.a in Frameworks */, + B2C59ACA197782B900B452DF /* libcocostudio iOS.a in Frameworks */, + B2CC507B19776D8B0041958E /* libspine iOS.a in Frameworks */, + B2CC5045197766F70041958E /* libnetwork iOS.a in Frameworks */, 3EA0FB66191B933000B170C8 /* MediaPlayer.framework in Frameworks */, 1AAF53FE180E39D4000584C8 /* libbox2d iOS.a in Frameworks */, 1AAF53FF180E39D4000584C8 /* libchipmunk iOS.a in Frameworks */, - 1AAF5400180E39D4000584C8 /* libcocos2dx iOS.a in Frameworks */, - 1AAF5401180E39D4000584C8 /* libcocos2dx-extensions iOS.a in Frameworks */, - 1AAF5402180E39D4000584C8 /* libCocosDenshion iOS.a in Frameworks */, + 1AAF5400180E39D4000584C8 /* libcocos2d iOS.a in Frameworks */, + 1AAF5401180E39D4000584C8 /* libextension iOS.a in Frameworks */, + 1AAF5402180E39D4000584C8 /* libcocosdenshion iOS.a in Frameworks */, D60AE43417F7FFE100757E4B /* CoreMotion.framework in Frameworks */, A07A521E1783A1D20073F6A7 /* libz.dylib in Frameworks */, A07A521F1783A1D20073F6A7 /* Foundation.framework in Frameworks */, @@ -7222,6 +7596,8 @@ 29FBBC00196A9F0D00E65826 /* UIAndEditorTests */ = { isa = PBXGroup; children = ( + 295824571987415900F9746D /* UIScale9SpriteTest.cpp */, + 295824581987415900F9746D /* UIScale9SpriteTest.h */, 29080D1F191B595E0066F8DF /* CocosGUIScene.cpp */, 29080D20191B595E0066F8DF /* CocosGUIScene.h */, 29080D37191B595E0066F8DF /* GUIEditorTest.cpp */, @@ -7346,16 +7722,26 @@ 46A15F9D1807A4F8005B8026 /* Products */ = { isa = PBXGroup; children = ( - 46A15FB01807A4F9005B8026 /* libcocos2dx Mac.a */, - 46A15FB21807A4F9005B8026 /* libcocos2dx-extensions Mac.a */, + 46A15FB01807A4F9005B8026 /* libcocos2d Mac.a */, + 46A15FB21807A4F9005B8026 /* libextension Mac.a */, + B2DB4799197668CA00411E16 /* libui Mac.a */, + B2DB48C219767D3600411E16 /* libcocostudio Mac.a */, + B2DB480819766E3C00411E16 /* libcocosbuilder Mac.a */, + B2DB49391976819900411E16 /* libspine Mac.a */, + B244F3161976878700ED1926 /* libnetwork Mac.a */, 46A15FB41807A4F9005B8026 /* libchipmunk Mac.a */, 46A15FB61807A4F9005B8026 /* libbox2d Mac.a */, - 46A15FB81807A4F9005B8026 /* libCocosDenshion Mac.a */, - 46A15FBE1807A4F9005B8026 /* libcocos2dx iOS.a */, - 46A15FC01807A4F9005B8026 /* libcocos2dx-extensions iOS.a */, + 46A15FB81807A4F9005B8026 /* libcocosdenshion Mac.a */, + 46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */, + 46A15FC01807A4F9005B8026 /* libextension iOS.a */, 46A15FC21807A4F9005B8026 /* libchipmunk iOS.a */, 46A15FC41807A4F9005B8026 /* libbox2d iOS.a */, - 46A15FC61807A4F9005B8026 /* libCocosDenshion iOS.a */, + 46A15FC61807A4F9005B8026 /* libcocosdenshion iOS.a */, + B2CC5039197763A20041958E /* libui iOS.a */, + B2CC503B197763A20041958E /* libcocostudio iOS.a */, + B2CC503D197763A20041958E /* libcocosbuilder iOS.a */, + B2CC503F197763A20041958E /* libspine iOS.a */, + B2CC5041197763A20041958E /* libnetwork iOS.a */, ); name = Products; sourceTree = ""; @@ -7374,6 +7760,11 @@ buildRules = ( ); dependencies = ( + B2411CA91982301E00E093E2 /* PBXTargetDependency */, + B2411CA61982300F00E093E2 /* PBXTargetDependency */, + B2411CA319822FEA00E093E2 /* PBXTargetDependency */, + B2411CA019822FD300E093E2 /* PBXTargetDependency */, + B2411C9D19822FB600E093E2 /* PBXTargetDependency */, 15CBA016196EE56C005877BB /* PBXTargetDependency */, 15CBA018196EE56C005877BB /* PBXTargetDependency */, 15CBA01A196EE56C005877BB /* PBXTargetDependency */, @@ -7416,6 +7807,11 @@ buildRules = ( ); dependencies = ( + B27AEE0919768965008BD575 /* PBXTargetDependency */, + B2DB49421976826900411E16 /* PBXTargetDependency */, + B2DB48C819767EAF00411E16 /* PBXTargetDependency */, + B2DB480B197670ED00411E16 /* PBXTargetDependency */, + B2DB480D197670ED00411E16 /* PBXTargetDependency */, 1A0EE2B918CDF733004CD58F /* PBXTargetDependency */, 1A0EE2BB18CDF733004CD58F /* PBXTargetDependency */, 1A0EE2BD18CDF733004CD58F /* PBXTargetDependency */, @@ -7458,6 +7854,11 @@ buildRules = ( ); dependencies = ( + B2C59ACD19779CDF00B452DF /* PBXTargetDependency */, + B2C59ACF19779CDF00B452DF /* PBXTargetDependency */, + B2C59AD119779CDF00B452DF /* PBXTargetDependency */, + B2C59AD319779CDF00B452DF /* PBXTargetDependency */, + B2C59AD519779CDF00B452DF /* PBXTargetDependency */, 1A0EE41A18CDF799004CD58F /* PBXTargetDependency */, 1A0EE41C18CDF799004CD58F /* PBXTargetDependency */, 1A0EE41E18CDF799004CD58F /* PBXTargetDependency */, @@ -7480,6 +7881,11 @@ buildRules = ( ); dependencies = ( + B27AEE041976894C008BD575 /* PBXTargetDependency */, + B2DB493F1976825800411E16 /* PBXTargetDependency */, + B2DB48BF19767D3600411E16 /* PBXTargetDependency */, + B2DB48111976711200411E16 /* PBXTargetDependency */, + B2DB48131976711200411E16 /* PBXTargetDependency */, 1ABCA2C118CD92280087CE3A /* PBXTargetDependency */, 1ABCA2B918CD92230087CE3A /* PBXTargetDependency */, 1ABCA2BB18CD92230087CE3A /* PBXTargetDependency */, @@ -7502,6 +7908,11 @@ buildRules = ( ); dependencies = ( + B2C59ADC19779D5400B452DF /* PBXTargetDependency */, + B2C59ADE19779D5400B452DF /* PBXTargetDependency */, + B2C59AE019779D5400B452DF /* PBXTargetDependency */, + B2C59AE219779D5400B452DF /* PBXTargetDependency */, + B2C59AE419779D5400B452DF /* PBXTargetDependency */, 1ABCA2F818CD93850087CE3A /* PBXTargetDependency */, 1ABCA2FA18CD93850087CE3A /* PBXTargetDependency */, 1ABCA2FC18CD93850087CE3A /* PBXTargetDependency */, @@ -7524,6 +7935,11 @@ buildRules = ( ); dependencies = ( + B244F3111976878700ED1926 /* PBXTargetDependency */, + B2DB49361976819900411E16 /* PBXTargetDependency */, + B2DB48C519767DA500411E16 /* PBXTargetDependency */, + B2DB480519766E3C00411E16 /* PBXTargetDependency */, + B2DB4794197668CA00411E16 /* PBXTargetDependency */, 1AAF5342180E2F41000584C8 /* PBXTargetDependency */, 1AAF5344180E2F41000584C8 /* PBXTargetDependency */, 1AAF5346180E2F41000584C8 /* PBXTargetDependency */, @@ -7546,10 +7962,8 @@ buildRules = ( ); dependencies = ( - 3E6177451960FE1E00DE83F5 /* PBXTargetDependency */, 3E6177001960FAED00DE83F5 /* PBXTargetDependency */, 3E6177021960FAED00DE83F5 /* PBXTargetDependency */, - 3E6177041960FAED00DE83F5 /* PBXTargetDependency */, ); name = "game-controller-test IOS"; productName = iphone; @@ -7567,6 +7981,11 @@ buildRules = ( ); dependencies = ( + B2C59ABE197782AC00B452DF /* PBXTargetDependency */, + B2C59AC0197782AC00B452DF /* PBXTargetDependency */, + B2C59AC2197782AC00B452DF /* PBXTargetDependency */, + B2CC507A19776D830041958E /* PBXTargetDependency */, + B2CC5044197766EB0041958E /* PBXTargetDependency */, 1AAF53F5180E39C6000584C8 /* PBXTargetDependency */, 1AAF53F7180E39C6000584C8 /* PBXTargetDependency */, 1AAF53F9180E39C6000584C8 /* PBXTargetDependency */, @@ -7643,17 +8062,17 @@ remoteRef = 1ABCA27F18CD90A50087CE3A /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 46A15FB01807A4F9005B8026 /* libcocos2dx Mac.a */ = { + 46A15FB01807A4F9005B8026 /* libcocos2d Mac.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libcocos2dx Mac.a"; + path = "libcocos2d Mac.a"; remoteRef = 46A15FAF1807A4F9005B8026 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 46A15FB21807A4F9005B8026 /* libcocos2dx-extensions Mac.a */ = { + 46A15FB21807A4F9005B8026 /* libextension Mac.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libcocos2dx-extensions Mac.a"; + path = "libextension Mac.a"; remoteRef = 46A15FB11807A4F9005B8026 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -7671,24 +8090,24 @@ remoteRef = 46A15FB51807A4F9005B8026 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 46A15FB81807A4F9005B8026 /* libCocosDenshion Mac.a */ = { + 46A15FB81807A4F9005B8026 /* libcocosdenshion Mac.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libCocosDenshion Mac.a"; + path = "libcocosdenshion Mac.a"; remoteRef = 46A15FB71807A4F9005B8026 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 46A15FBE1807A4F9005B8026 /* libcocos2dx iOS.a */ = { + 46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libcocos2dx iOS.a"; + path = "libcocos2d iOS.a"; remoteRef = 46A15FBD1807A4F9005B8026 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 46A15FC01807A4F9005B8026 /* libcocos2dx-extensions iOS.a */ = { + 46A15FC01807A4F9005B8026 /* libextension iOS.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libcocos2dx-extensions iOS.a"; + path = "libextension iOS.a"; remoteRef = 46A15FBF1807A4F9005B8026 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -7706,13 +8125,83 @@ remoteRef = 46A15FC31807A4F9005B8026 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 46A15FC61807A4F9005B8026 /* libCocosDenshion iOS.a */ = { + 46A15FC61807A4F9005B8026 /* libcocosdenshion iOS.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libCocosDenshion iOS.a"; + path = "libcocosdenshion iOS.a"; remoteRef = 46A15FC51807A4F9005B8026 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + B244F3161976878700ED1926 /* libnetwork Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libnetwork Mac.a"; + remoteRef = B244F3151976878700ED1926 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + B2CC5039197763A20041958E /* libui iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libui iOS.a"; + remoteRef = B2CC5038197763A20041958E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + B2CC503B197763A20041958E /* libcocostudio iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocostudio iOS.a"; + remoteRef = B2CC503A197763A20041958E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + B2CC503D197763A20041958E /* libcocosbuilder iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocosbuilder iOS.a"; + remoteRef = B2CC503C197763A20041958E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + B2CC503F197763A20041958E /* libspine iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libspine iOS.a"; + remoteRef = B2CC503E197763A20041958E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + B2CC5041197763A20041958E /* libnetwork iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libnetwork iOS.a"; + remoteRef = B2CC5040197763A20041958E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + B2DB4799197668CA00411E16 /* libui Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libui Mac.a"; + remoteRef = B2DB4798197668CA00411E16 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + B2DB480819766E3C00411E16 /* libcocosbuilder Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocosbuilder Mac.a"; + remoteRef = B2DB480719766E3C00411E16 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + B2DB48C219767D3600411E16 /* libcocostudio Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocostudio Mac.a"; + remoteRef = B2DB48C119767D3600411E16 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + B2DB49391976819900411E16 /* libspine Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libspine Mac.a"; + remoteRef = B2DB49381976819900411E16 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -7870,6 +8359,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 156EAE071977D0BD00F53709 /* ActionTimeline in Resources */, 15E66FD6192DC8C700C20A52 /* Sprite3DTest in Resources */, 1AC35DC318CEE65100F37B72 /* Misc in Resources */, 1AC35DC618CEE65100F37B72 /* Shaders in Resources */, @@ -8345,6 +8835,7 @@ 1AC35B8118CECF0C00F37B72 /* SceneController.cpp in Sources */, 1AC35B3318CECF0C00F37B72 /* Test.cpp in Sources */, 1AC35C2318CECF0C00F37B72 /* ParticleTest.cpp in Sources */, + 295824591987415900F9746D /* UIScale9SpriteTest.cpp in Sources */, 1AC35C6118CECF0C00F37B72 /* TouchesTest.cpp in Sources */, 1AC35C6318CECF0C00F37B72 /* TransitionsTest.cpp in Sources */, 29080DB3191B595E0066F8DF /* UILayoutTest_Editor.cpp in Sources */, @@ -8427,6 +8918,7 @@ 1AC35BFA18CECF0C00F37B72 /* WebSocketTest.cpp in Sources */, 1AC35BF218CECF0C00F37B72 /* EditBoxTest.cpp in Sources */, 38FA2E74194AEBE100FF2BE4 /* ActionTimelineTestScene.cpp in Sources */, + 2958245A1987415900F9746D /* UIScale9SpriteTest.cpp in Sources */, 1AC35B3A18CECF0C00F37B72 /* Bug-1174.cpp in Sources */, 1AC35BE418CECF0C00F37B72 /* CCControlColourPickerTest.cpp in Sources */, 29080DD4191B595E0066F8DF /* UITextAtlasTest.cpp in Sources */, @@ -8843,16 +9335,6 @@ name = "chipmunk iOS"; targetProxy = 3E6177031960FAED00DE83F5 /* PBXContainerItemProxy */; }; - 3E6177041960FAED00DE83F5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "CocosDenshion iOS"; - targetProxy = 3E6177051960FAED00DE83F5 /* PBXContainerItemProxy */; - }; - 3E6177451960FE1E00DE83F5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "cocos2dx-extensions iOS"; - targetProxy = 3E6177441960FE1E00DE83F5 /* PBXContainerItemProxy */; - }; A035ACC0178246BD00987F6C /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 1D6058900D05DD3D006BFB54 /* cpp-tests Mac */; @@ -8863,6 +9345,181 @@ target = A07A517F1783A1D20073F6A7 /* cpp-tests iOS */; targetProxy = A07A526C1783AB980073F6A7 /* PBXContainerItemProxy */; }; + B2411C9D19822FB600E093E2 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libcocostudio iOS"; + targetProxy = B2411C9C19822FB600E093E2 /* PBXContainerItemProxy */; + }; + B2411CA019822FD300E093E2 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libcocosbuilder iOS"; + targetProxy = B2411C9F19822FD300E093E2 /* PBXContainerItemProxy */; + }; + B2411CA319822FEA00E093E2 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libspine iOS"; + targetProxy = B2411CA219822FEA00E093E2 /* PBXContainerItemProxy */; + }; + B2411CA61982300F00E093E2 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libui iOS"; + targetProxy = B2411CA51982300F00E093E2 /* PBXContainerItemProxy */; + }; + B2411CA91982301E00E093E2 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libnetwork iOS"; + targetProxy = B2411CA81982301E00E093E2 /* PBXContainerItemProxy */; + }; + B244F3111976878700ED1926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosNetwork Mac"; + targetProxy = B244F3101976878700ED1926 /* PBXContainerItemProxy */; + }; + B27AEE041976894C008BD575 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosNetwork Mac"; + targetProxy = B27AEE031976894C008BD575 /* PBXContainerItemProxy */; + }; + B27AEE0919768965008BD575 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosNetwork Mac"; + targetProxy = B27AEE0819768965008BD575 /* PBXContainerItemProxy */; + }; + B2C59ABE197782AC00B452DF /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosGUI iOS"; + targetProxy = B2C59ABD197782AC00B452DF /* PBXContainerItemProxy */; + }; + B2C59AC0197782AC00B452DF /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosStudio iOS"; + targetProxy = B2C59ABF197782AC00B452DF /* PBXContainerItemProxy */; + }; + B2C59AC2197782AC00B452DF /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosBuilder iOS"; + targetProxy = B2C59AC1197782AC00B452DF /* PBXContainerItemProxy */; + }; + B2C59ACD19779CDF00B452DF /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosGUI iOS"; + targetProxy = B2C59ACC19779CDF00B452DF /* PBXContainerItemProxy */; + }; + B2C59ACF19779CDF00B452DF /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosStudio iOS"; + targetProxy = B2C59ACE19779CDF00B452DF /* PBXContainerItemProxy */; + }; + B2C59AD119779CDF00B452DF /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosBuilder iOS"; + targetProxy = B2C59AD019779CDF00B452DF /* PBXContainerItemProxy */; + }; + B2C59AD319779CDF00B452DF /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosSpine iOS"; + targetProxy = B2C59AD219779CDF00B452DF /* PBXContainerItemProxy */; + }; + B2C59AD519779CDF00B452DF /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosNetwork iOS"; + targetProxy = B2C59AD419779CDF00B452DF /* PBXContainerItemProxy */; + }; + B2C59ADC19779D5400B452DF /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosGUI iOS"; + targetProxy = B2C59ADB19779D5400B452DF /* PBXContainerItemProxy */; + }; + B2C59ADE19779D5400B452DF /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosStudio iOS"; + targetProxy = B2C59ADD19779D5400B452DF /* PBXContainerItemProxy */; + }; + B2C59AE019779D5400B452DF /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosBuilder iOS"; + targetProxy = B2C59ADF19779D5400B452DF /* PBXContainerItemProxy */; + }; + B2C59AE219779D5400B452DF /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosSpine iOS"; + targetProxy = B2C59AE119779D5400B452DF /* PBXContainerItemProxy */; + }; + B2C59AE419779D5400B452DF /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosNetwork iOS"; + targetProxy = B2C59AE319779D5400B452DF /* PBXContainerItemProxy */; + }; + B2CC5044197766EB0041958E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosNetwork iOS"; + targetProxy = B2CC5043197766EB0041958E /* PBXContainerItemProxy */; + }; + B2CC507A19776D830041958E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosSpine iOS"; + targetProxy = B2CC507919776D830041958E /* PBXContainerItemProxy */; + }; + B2DB4794197668CA00411E16 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosGUI Mac"; + targetProxy = B2DB4793197668CA00411E16 /* PBXContainerItemProxy */; + }; + B2DB480519766E3C00411E16 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosBuilder Mac"; + targetProxy = B2DB480419766E3C00411E16 /* PBXContainerItemProxy */; + }; + B2DB480B197670ED00411E16 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosGUI Mac"; + targetProxy = B2DB480A197670ED00411E16 /* PBXContainerItemProxy */; + }; + B2DB480D197670ED00411E16 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosBuilder Mac"; + targetProxy = B2DB480C197670ED00411E16 /* PBXContainerItemProxy */; + }; + B2DB48111976711200411E16 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosGUI Mac"; + targetProxy = B2DB48101976711200411E16 /* PBXContainerItemProxy */; + }; + B2DB48131976711200411E16 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosBuilder Mac"; + targetProxy = B2DB48121976711200411E16 /* PBXContainerItemProxy */; + }; + B2DB48BF19767D3600411E16 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosStudio Mac"; + targetProxy = B2DB48BE19767D3600411E16 /* PBXContainerItemProxy */; + }; + B2DB48C519767DA500411E16 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosStudio Mac"; + targetProxy = B2DB48C419767DA500411E16 /* PBXContainerItemProxy */; + }; + B2DB48C819767EAF00411E16 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosStudio Mac"; + targetProxy = B2DB48C719767EAF00411E16 /* PBXContainerItemProxy */; + }; + B2DB49361976819900411E16 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosSpine Mac"; + targetProxy = B2DB49351976819900411E16 /* PBXContainerItemProxy */; + }; + B2DB493F1976825800411E16 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosSpine Mac"; + targetProxy = B2DB493E1976825800411E16 /* PBXContainerItemProxy */; + }; + B2DB49421976826900411E16 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosSpine Mac"; + targetProxy = B2DB49411976826900411E16 /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -8989,13 +9646,14 @@ 1A0EE2B018CDF6DA004CD58F /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD)"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_MAC, ); INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-empty-test/proj.mac/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; }; name = Debug; @@ -9003,13 +9661,14 @@ 1A0EE2B118CDF6DA004CD58F /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD)"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_MAC, ); INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-empty-test/proj.mac/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; VALIDATE_PRODUCT = YES; }; @@ -9018,12 +9677,13 @@ 1A0EE31218CDF733004CD58F /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD)"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_MAC, ); INFOPLIST_FILE = "$(SRCROOT)/../tests/lua-empty-test/project/proj.mac/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; OTHER_LDFLAGS = ( "-pagezero_size", 10000, @@ -9037,12 +9697,13 @@ 1A0EE31318CDF733004CD58F /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD)"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_MAC, ); INFOPLIST_FILE = "$(SRCROOT)/../tests/lua-empty-test/project/proj.mac/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; OTHER_LDFLAGS = ( "-pagezero_size", 10000, @@ -9123,12 +9784,13 @@ 1ABCA2B318CD91520087CE3A /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD)"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_MAC, ); INFOPLIST_FILE = "$(SRCROOT)/../tests/lua-tests/project/proj.ios_mac/mac/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; OTHER_LDFLAGS = ( "-pagezero_size", 10000, @@ -9142,12 +9804,13 @@ 1ABCA2B418CD91520087CE3A /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD)"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_MAC, ); INFOPLIST_FILE = "$(SRCROOT)/../tests/lua-tests/project/proj.ios_mac/mac/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; OTHER_LDFLAGS = ( "-pagezero_size", 10000, @@ -9195,12 +9858,13 @@ 1D6058940D05DD3E006BFB54 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD)"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_MAC, ); INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-tests/proj.mac/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; }; name = Debug; @@ -9208,12 +9872,13 @@ 1D6058950D05DD3E006BFB54 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD)"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_MAC, ); INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-tests/proj.mac/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; VALIDATE_PRODUCT = YES; }; diff --git a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/build all tests Mac.xcscheme b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/build all tests Mac.xcscheme index 2937783395..784723fab8 100644 --- a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/build all tests Mac.xcscheme +++ b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/build all tests Mac.xcscheme @@ -1,6 +1,6 @@ + + + + @@ -48,6 +57,15 @@ useCustomWorkingDirectory = "NO" buildConfiguration = "Release" debugDocumentVersioning = "YES"> + + + + diff --git a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/build all tests iOS.xcscheme b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/build all tests iOS.xcscheme index ecc2fd2528..ccac8c68e7 100644 --- a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/build all tests iOS.xcscheme +++ b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/build all tests iOS.xcscheme @@ -1,6 +1,6 @@ + + + + @@ -48,6 +57,15 @@ useCustomWorkingDirectory = "NO" buildConfiguration = "Release" debugDocumentVersioning = "YES"> + + + + diff --git a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/cpp-empty-test Mac.xcscheme b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/cpp-empty-test Mac.xcscheme index 17cd1fc940..2695cf3b5b 100644 --- a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/cpp-empty-test Mac.xcscheme +++ b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/cpp-empty-test Mac.xcscheme @@ -1,6 +1,6 @@ { public: - /** creates the action with the callback of type std::function. - This is the preferred way to create the callback. + /** creates the action with the callback of type std::function. + This is the preferred way to create the callback. * When this funtion bound in js or lua ,the input param will be changed * In js: var create(var func, var this, var [data]) or var create(var func) * In lua:local create(local funcID) - */ + */ static CallFunc * create(const std::function& func); /** creates the action with the callback typedef void (Ref::*SEL_CallFunc)(); - @deprecated Use the std::function API instead. + @deprecated Use the std::function API instead. * @js NA * @lua NA */ @@ -296,8 +306,8 @@ public: // Overrides // virtual void update(float time) override; - virtual CallFunc* reverse() const override; - virtual CallFunc* clone() const override; + virtual CallFunc* reverse() const override; + virtual CallFunc* clone() const override; CC_CONSTRUCTOR_ACCESS: CallFunc() @@ -308,16 +318,16 @@ CC_CONSTRUCTOR_ACCESS: } virtual ~CallFunc(); - /** initializes the action with the callback + /** initializes the action with the callback typedef void (Ref::*SEL_CallFunc)(); @deprecated Use the std::function API instead. */ CC_DEPRECATED_ATTRIBUTE bool initWithTarget(Ref* target); - /** initializes the action with the std::function + /** initializes the action with the std::function * @js NA * @lua NA - */ + */ bool initWithFunction(const std::function& func); protected: @@ -331,7 +341,7 @@ protected: }; /** function that will be called */ - std::function _function; + std::function _function; private: CC_DISALLOW_COPY_AND_ASSIGN(CallFunc); @@ -345,8 +355,8 @@ class CC_DLL CallFuncN : public CallFunc { public: /** creates the action with the callback of type std::function. - This is the preferred way to create the callback. - */ + This is the preferred way to create the callback. + */ static CallFuncN * create(const std::function& func); /** creates the action with the callback @@ -359,7 +369,7 @@ public: // // Overrides // - virtual CallFuncN* clone() const override; + virtual CallFuncN* clone() const override; virtual void execute() override; CC_CONSTRUCTOR_ACCESS: @@ -399,7 +409,7 @@ public: // // Overrides // - virtual __CCCallFuncND* clone() const override; + virtual __CCCallFuncND* clone() const override; virtual void execute() override; protected: @@ -435,7 +445,7 @@ public: // // Overrides // - virtual __CCCallFuncO* clone() const override; + virtual __CCCallFuncO* clone() const override; virtual void execute() override; Ref* getObject() const; diff --git a/cocos/2d/CCActionInterval.h b/cocos/2d/CCActionInterval.h index fa538483be..a2053d8d6d 100644 --- a/cocos/2d/CCActionInterval.h +++ b/cocos/2d/CCActionInterval.h @@ -77,8 +77,17 @@ public: virtual bool isDone(void) const override; virtual void step(float dt) override; virtual void startWithTarget(Node *target) override; - virtual ActionInterval* reverse() const override = 0; - virtual ActionInterval *clone() const override = 0; + virtual ActionInterval* reverse() const override + { + CC_ASSERT(0); + return nullptr; + } + + virtual ActionInterval *clone() const override + { + CC_ASSERT(0); + return nullptr; + } CC_CONSTRUCTOR_ACCESS: /** initializes the action */ @@ -132,7 +141,7 @@ public: // Overrides // virtual Sequence* clone() const override; - virtual Sequence* reverse() const override; + virtual Sequence* reverse() const override; virtual void startWithTarget(Node *target) override; virtual void stop(void) override; virtual void update(float t) override; @@ -181,7 +190,7 @@ public: // Overrides // virtual Repeat* clone() const override; - virtual Repeat* reverse() const override; + virtual Repeat* reverse() const override; virtual void startWithTarget(Node *target) override; virtual void stop(void) override; virtual void update(float dt) override; @@ -235,7 +244,7 @@ public: // Overrides // virtual RepeatForever* clone() const override; - virtual RepeatForever* reverse(void) const override; + virtual RepeatForever* reverse(void) const override; virtual void startWithTarget(Node* target) override; virtual void step(float dt) override; virtual bool isDone(void) const override; @@ -302,7 +311,7 @@ public: // Overrides // virtual Spawn* clone() const override; - virtual Spawn* reverse(void) const override; + virtual Spawn* reverse(void) const override; virtual void startWithTarget(Node *target) override; virtual void stop(void) override; virtual void update(float time) override; @@ -379,7 +388,7 @@ public: // Override // virtual RotateBy* clone() const override; - virtual RotateBy* reverse(void) const override; + virtual RotateBy* reverse(void) const override; virtual void startWithTarget(Node *target) override; virtual void update(float time) override; @@ -423,7 +432,7 @@ public: // Overrides // virtual MoveBy* clone() const override; - virtual MoveBy* reverse(void) const override; + virtual MoveBy* reverse(void) const override; virtual void startWithTarget(Node *target) override; virtual void update(float time) override; @@ -487,7 +496,7 @@ public: // Overrides // virtual SkewTo* clone() const override; - virtual SkewTo* reverse(void) const override; + virtual SkewTo* reverse(void) const override; virtual void startWithTarget(Node *target) override; virtual void update(float time) override; @@ -525,7 +534,7 @@ public: // virtual void startWithTarget(Node *target) override; virtual SkewBy* clone() const override; - virtual SkewBy* reverse(void) const override; + virtual SkewBy* reverse(void) const override; CC_CONSTRUCTOR_ACCESS: SkewBy() {} @@ -549,7 +558,7 @@ public: // Overrides // virtual JumpBy* clone() const override; - virtual JumpBy* reverse(void) const override; + virtual JumpBy* reverse(void) const override; virtual void startWithTarget(Node *target) override; virtual void update(float time) override; @@ -584,7 +593,7 @@ public: // virtual void startWithTarget(Node *target) override; virtual JumpTo* clone() const override; - virtual JumpTo* reverse(void) const override; + virtual JumpTo* reverse(void) const override; CC_CONSTRUCTOR_ACCESS: JumpTo() {} @@ -623,7 +632,7 @@ public: // Overrides // virtual BezierBy* clone() const override; - virtual BezierBy* reverse(void) const override; + virtual BezierBy* reverse(void) const override; virtual void startWithTarget(Node *target) override; virtual void update(float time) override; @@ -663,7 +672,7 @@ public: // virtual void startWithTarget(Node *target) override; virtual BezierTo* clone() const override; - virtual BezierTo* reverse(void) const override; + virtual BezierTo* reverse(void) const override; CC_CONSTRUCTOR_ACCESS: BezierTo() {} @@ -698,7 +707,7 @@ public: // Overrides // virtual ScaleTo* clone() const override; - virtual ScaleTo* reverse(void) const override; + virtual ScaleTo* reverse(void) const override; virtual void startWithTarget(Node *target) override; virtual void update(float time) override; @@ -751,7 +760,7 @@ public: // virtual void startWithTarget(Node *target) override; virtual ScaleBy* clone() const override; - virtual ScaleBy* reverse(void) const override; + virtual ScaleBy* reverse(void) const override; CC_CONSTRUCTOR_ACCESS: ScaleBy() {} @@ -773,7 +782,7 @@ public: // Overrides // virtual Blink* clone() const override; - virtual Blink* reverse() const override; + virtual Blink* reverse() const override; virtual void update(float time) override; virtual void startWithTarget(Node *target) override; virtual void stop() override; @@ -807,7 +816,7 @@ public: // Overrides // virtual FadeTo* clone() const override; - virtual FadeTo* reverse(void) const override; + virtual FadeTo* reverse(void) const override; virtual void startWithTarget(Node *target) override; virtual void update(float time) override; @@ -841,7 +850,7 @@ public: // virtual void startWithTarget(Node *target) override; virtual FadeIn* clone() const override; - virtual FadeTo* reverse(void) const override; + virtual FadeTo* reverse(void) const override; void setReverseAction(FadeTo* ac); @@ -868,7 +877,7 @@ public: // virtual void startWithTarget(Node *target) override; virtual FadeOut* clone() const override; - virtual FadeTo* reverse(void) const override; + virtual FadeTo* reverse(void) const override; void setReverseAction(FadeTo* ac); @@ -893,7 +902,7 @@ public: // Overrides // virtual TintTo* clone() const override; - virtual TintTo* reverse(void) const override; + virtual TintTo* reverse(void) const override; virtual void startWithTarget(Node *target) override; virtual void update(float time) override; @@ -925,7 +934,7 @@ public: // Overrides // virtual TintBy* clone() const override; - virtual TintBy* reverse() const override; + virtual TintBy* reverse() const override; virtual void startWithTarget(Node *target) override; virtual void update(float time) override; @@ -988,7 +997,7 @@ public: // // Overrides // - virtual ReverseTime* reverse() const override; + virtual ReverseTime* reverse() const override; virtual ReverseTime* clone() const override; virtual void startWithTarget(Node *target) override; virtual void stop(void) override; diff --git a/cocos/2d/CCAnimationCache.h b/cocos/2d/CCAnimationCache.h index 255e1ad8dc..1a8aba4c87 100644 --- a/cocos/2d/CCAnimationCache.h +++ b/cocos/2d/CCAnimationCache.h @@ -30,6 +30,7 @@ THE SOFTWARE. #include "base/CCRef.h" #include "base/CCMap.h" #include "base/CCValue.h" +#include "2d/CCAnimation.h" #include diff --git a/cocos/2d/CCComponentContainer.cpp b/cocos/2d/CCComponentContainer.cpp index 64b76aa915..a309329011 100644 --- a/cocos/2d/CCComponentContainer.cpp +++ b/cocos/2d/CCComponentContainer.cpp @@ -89,12 +89,33 @@ bool ComponentContainer::remove(const std::string& name) com->setOwner(nullptr); _components->erase(iter); - ret = true; } while(0); return ret; } +bool ComponentContainer::remove(Component *com) +{ + bool ret = false; + do + { + CC_BREAK_IF(!_components); + + for (auto iter = _components->begin(); iter != _components->end(); ++iter) + { + if (iter->second == com) + { + com->onExit(); + com->setOwner(nullptr); + _components->erase(iter); + break; + } + } + ret = true; + } while(0); + return ret; +} + void ComponentContainer::removeAll() { if (_components != nullptr) diff --git a/cocos/2d/CCComponentContainer.h b/cocos/2d/CCComponentContainer.h index e924c35f25..94677c73f0 100644 --- a/cocos/2d/CCComponentContainer.h +++ b/cocos/2d/CCComponentContainer.h @@ -50,6 +50,7 @@ public: virtual Component* get(const std::string& name) const; virtual bool add(Component *com); virtual bool remove(const std::string& name); + virtual bool remove(Component *com); virtual void removeAll(); virtual void visit(float delta); public: diff --git a/cocos/2d/CCDrawingPrimitives.h b/cocos/2d/CCDrawingPrimitives.h index deecf32f0f..c90b6b8a1c 100644 --- a/cocos/2d/CCDrawingPrimitives.h +++ b/cocos/2d/CCDrawingPrimitives.h @@ -79,85 +79,85 @@ class PointArray; namespace DrawPrimitives { /** Initializes the drawing primitives */ - void init(); + void CC_DLL init(); /** Frees allocated resources by the drawing primitives */ - void free(); + void CC_DLL free(); /** draws a point given x and y coordinate measured in points */ - void drawPoint(const Vec2& point); + void CC_DLL drawPoint(const Vec2& point); /** draws an array of points. @since v0.7.2 */ - void drawPoints(const Vec2 *points, unsigned int numberOfPoints); + void CC_DLL drawPoints(const Vec2 *points, unsigned int numberOfPoints); /** draws a line given the origin and destination point measured in points */ - void drawLine(const Vec2& origin, const Vec2& destination); + void CC_DLL drawLine(const Vec2& origin, const Vec2& destination); /** draws a rectangle given the origin and destination point measured in points. */ - void drawRect(Vec2 origin, Vec2 destination); + void CC_DLL drawRect(Vec2 origin, Vec2 destination); /** draws a solid rectangle given the origin and destination point measured in points. @since 1.1 */ - void drawSolidRect(Vec2 origin, Vec2 destination, Color4F color); + void CC_DLL drawSolidRect(Vec2 origin, Vec2 destination, Color4F color); /** draws a polygon given a pointer to point coordinates and the number of vertices measured in points. The polygon can be closed or open */ - void drawPoly(const Vec2 *vertices, unsigned int numOfVertices, bool closePolygon); + void CC_DLL drawPoly(const Vec2 *vertices, unsigned int numOfVertices, bool closePolygon); /** draws a solid polygon given a pointer to CGPoint coordinates, the number of vertices measured in points, and a color. */ - void drawSolidPoly(const Vec2 *poli, unsigned int numberOfPoints, Color4F color); + void CC_DLL drawSolidPoly(const Vec2 *poli, unsigned int numberOfPoints, Color4F color); /** draws a circle given the center, radius and number of segments. */ - void drawCircle(const Vec2& center, float radius, float angle, unsigned int segments, bool drawLineToCenter, float scaleX, float scaleY); - void drawCircle(const Vec2& center, float radius, float angle, unsigned int segments, bool drawLineToCenter); + void CC_DLL drawCircle(const Vec2& center, float radius, float angle, unsigned int segments, bool drawLineToCenter, float scaleX, float scaleY); + void CC_DLL drawCircle(const Vec2& center, float radius, float angle, unsigned int segments, bool drawLineToCenter); /** draws a solid circle given the center, radius and number of segments. */ - void drawSolidCircle(const Vec2& center, float radius, float angle, unsigned int segments, float scaleX, float scaleY); - void drawSolidCircle(const Vec2& center, float radius, float angle, unsigned int segments); + void CC_DLL drawSolidCircle(const Vec2& center, float radius, float angle, unsigned int segments, float scaleX, float scaleY); + void CC_DLL drawSolidCircle(const Vec2& center, float radius, float angle, unsigned int segments); /** draws a quad bezier path @warning This function could be pretty slow. Use it only for debugging purposes. @since v0.8 */ - void drawQuadBezier(const Vec2& origin, const Vec2& control, const Vec2& destination, unsigned int segments); + void CC_DLL drawQuadBezier(const Vec2& origin, const Vec2& control, const Vec2& destination, unsigned int segments); /** draws a cubic bezier path @warning This function could be pretty slow. Use it only for debugging purposes. @since v0.8 */ - void drawCubicBezier(const Vec2& origin, const Vec2& control1, const Vec2& control2, const Vec2& destination, unsigned int segments); + void CC_DLL drawCubicBezier(const Vec2& origin, const Vec2& control1, const Vec2& control2, const Vec2& destination, unsigned int segments); /** draws a Catmull Rom path. @warning This function could be pretty slow. Use it only for debugging purposes. @since v2.0 */ - void drawCatmullRom(PointArray *arrayOfControlPoints, unsigned int segments); + void CC_DLL drawCatmullRom(PointArray *arrayOfControlPoints, unsigned int segments); /** draws a Cardinal Spline path. @warning This function could be pretty slow. Use it only for debugging purposes. @since v2.0 */ - void drawCardinalSpline(PointArray *config, float tension, unsigned int segments); + void CC_DLL drawCardinalSpline(PointArray *config, float tension, unsigned int segments); /** set the drawing color with 4 unsigned bytes @since v2.0 */ - void setDrawColor4B(GLubyte r, GLubyte g, GLubyte b, GLubyte a); + void CC_DLL setDrawColor4B(GLubyte r, GLubyte g, GLubyte b, GLubyte a); /** set the drawing color with 4 floats @since v2.0 */ - void setDrawColor4F(GLfloat r, GLfloat g, GLfloat b, GLfloat a); + void CC_DLL setDrawColor4F(GLfloat r, GLfloat g, GLfloat b, GLfloat a); /** set the point size in points. Default 1. @since v2.0 */ - void setPointSize(GLfloat pointSize); + void CC_DLL setPointSize(GLfloat pointSize); }; diff --git a/cocos/2d/CCFastTMXLayer.cpp b/cocos/2d/CCFastTMXLayer.cpp index 15d5717330..7b422e766a 100644 --- a/cocos/2d/CCFastTMXLayer.cpp +++ b/cocos/2d/CCFastTMXLayer.cpp @@ -49,15 +49,16 @@ THE SOFTWARE. #include NS_CC_BEGIN +namespace experimental { -const int FastTMXLayer::FAST_TMX_ORIENTATION_ORTHO = 0; -const int FastTMXLayer::FAST_TMX_ORIENTATION_HEX = 1; -const int FastTMXLayer::FAST_TMX_ORIENTATION_ISO = 2; +const int TMXLayer::FAST_TMX_ORIENTATION_ORTHO = 0; +const int TMXLayer::FAST_TMX_ORIENTATION_HEX = 1; +const int TMXLayer::FAST_TMX_ORIENTATION_ISO = 2; // FastTMXLayer - init & alloc & dealloc -FastTMXLayer * FastTMXLayer::create(TMXTilesetInfo *tilesetInfo, TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo) +TMXLayer * TMXLayer::create(TMXTilesetInfo *tilesetInfo, TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo) { - FastTMXLayer *ret = new FastTMXLayer(); + TMXLayer *ret = new TMXLayer(); if (ret->initWithTilesetInfo(tilesetInfo, layerInfo, mapInfo)) { ret->autorelease(); @@ -66,7 +67,7 @@ FastTMXLayer * FastTMXLayer::create(TMXTilesetInfo *tilesetInfo, TMXLayerInfo *l return nullptr; } -bool FastTMXLayer::initWithTilesetInfo(TMXTilesetInfo *tilesetInfo, TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo) +bool TMXLayer::initWithTilesetInfo(TMXTilesetInfo *tilesetInfo, TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo) { if( tilesetInfo ) @@ -108,7 +109,7 @@ bool FastTMXLayer::initWithTilesetInfo(TMXTilesetInfo *tilesetInfo, TMXLayerInfo return true; } -FastTMXLayer::FastTMXLayer() +TMXLayer::TMXLayer() : _layerName("") , _layerSize(Size::ZERO) , _mapTileSize(Size::ZERO) @@ -124,7 +125,7 @@ FastTMXLayer::FastTMXLayer() _buffersVBO[0] = _buffersVBO[1] = 0; } -FastTMXLayer::~FastTMXLayer() +TMXLayer::~TMXLayer() { CC_SAFE_RELEASE(_tileSet); CC_SAFE_RELEASE(_texture); @@ -140,7 +141,7 @@ FastTMXLayer::~FastTMXLayer() } } -void FastTMXLayer::draw(Renderer *renderer, const Mat4& transform, uint32_t flags) +void TMXLayer::draw(Renderer *renderer, const Mat4& transform, uint32_t flags) { updateTotalQuads(); @@ -169,13 +170,13 @@ void FastTMXLayer::draw(Renderer *renderer, const Mat4& transform, uint32_t flag auto& cmd = _renderCommands[index++]; cmd.init(iter.first); - cmd.func = CC_CALLBACK_0(FastTMXLayer::onDraw, this, _indicesVertexZOffsets[iter.first], iter.second); + cmd.func = CC_CALLBACK_0(TMXLayer::onDraw, this, _indicesVertexZOffsets[iter.first], iter.second); renderer->addCommand(&cmd); } } -void FastTMXLayer::onDraw(int offset, int count) +void TMXLayer::onDraw(int offset, int count) { GL::bindTexture2D(_texture->getName()); getGLProgramState()->apply(_modelViewTransform); @@ -194,7 +195,7 @@ void FastTMXLayer::onDraw(int offset, int count) CC_INCREMENT_GL_DRAWN_BATCHES_AND_VERTICES(1, count * 4); } -void FastTMXLayer::updateTiles(const Rect& culledRect) +void TMXLayer::updateTiles(const Rect& culledRect) { Rect visibleTiles = culledRect; Size mapTileSize = CC_SIZE_PIXELS_TO_POINTS(_mapTileSize); @@ -287,7 +288,7 @@ void FastTMXLayer::updateTiles(const Rect& culledRect) } -void FastTMXLayer::updateVertexBuffer() +void TMXLayer::updateVertexBuffer() { GL::bindVAO(0); if(!glIsBuffer(_buffersVBO[0])) @@ -300,7 +301,7 @@ void FastTMXLayer::updateVertexBuffer() glBindBuffer(GL_ARRAY_BUFFER, 0); } -void FastTMXLayer::updateIndexBuffer() +void TMXLayer::updateIndexBuffer() { if(!glIsBuffer(_buffersVBO[1])) { @@ -312,7 +313,7 @@ void FastTMXLayer::updateIndexBuffer() } // FastTMXLayer - setup Tiles -void FastTMXLayer::setupTiles() +void TMXLayer::setupTiles() { // Optimization: quick hack that sets the image size on the tileset _tileSet->_imageSize = _texture->getContentSizeInPixels(); @@ -352,7 +353,7 @@ void FastTMXLayer::setupTiles() } -Mat4 FastTMXLayer::tileToNodeTransform() +Mat4 TMXLayer::tileToNodeTransform() { float w = _mapTileSize.width / CC_CONTENT_SCALE_FACTOR(); float h = _mapTileSize.height / CC_CONTENT_SCALE_FACTOR(); @@ -404,7 +405,7 @@ Mat4 FastTMXLayer::tileToNodeTransform() } -void FastTMXLayer::updateTotalQuads() +void TMXLayer::updateTotalQuads() { if(_quadsDirty) { @@ -536,7 +537,7 @@ void FastTMXLayer::updateTotalQuads() } // removing / getting tiles -Sprite* FastTMXLayer::getTileAt(const Vec2& tileCoordinate) +Sprite* TMXLayer::getTileAt(const Vec2& tileCoordinate) { CCASSERT( tileCoordinate.x < _layerSize.width && tileCoordinate.y < _layerSize.height && tileCoordinate.x >=0 && tileCoordinate.y >=0, "TMXLayer: invalid position"); CCASSERT( _tiles, "TMXLayer: the tiles map has been released"); @@ -576,7 +577,7 @@ Sprite* FastTMXLayer::getTileAt(const Vec2& tileCoordinate) return tile; } -int FastTMXLayer::getTileGIDAt(const Vec2& tileCoordinate, TMXTileFlags* flags/* = nullptr*/) +int TMXLayer::getTileGIDAt(const Vec2& tileCoordinate, TMXTileFlags* flags/* = nullptr*/) { CCASSERT(tileCoordinate.x < _layerSize.width && tileCoordinate.y < _layerSize.height && tileCoordinate.x >=0 && tileCoordinate.y >=0, "TMXLayer: invalid position"); CCASSERT(_tiles, "TMXLayer: the tiles map has been released"); @@ -602,12 +603,12 @@ int FastTMXLayer::getTileGIDAt(const Vec2& tileCoordinate, TMXTileFlags* flags/* return (tile & kTMXFlippedMask); } -Vec2 FastTMXLayer::getPositionAt(const Vec2& pos) +Vec2 TMXLayer::getPositionAt(const Vec2& pos) { return PointApplyTransform(pos, _tileToNodeTransform); } -int FastTMXLayer::getVertexZForPos(const Vec2& pos) +int TMXLayer::getVertexZForPos(const Vec2& pos) { int ret = 0; int maxVal = 0; @@ -638,7 +639,7 @@ int FastTMXLayer::getVertexZForPos(const Vec2& pos) return ret; } -void FastTMXLayer::removeTileAt(const Vec2& tileCoordinate) +void TMXLayer::removeTileAt(const Vec2& tileCoordinate) { CCASSERT( tileCoordinate.x < _layerSize.width && tileCoordinate.y < _layerSize.height && tileCoordinate.x >=0 && tileCoordinate.y >=0, "TMXLayer: invalid position"); @@ -661,7 +662,7 @@ void FastTMXLayer::removeTileAt(const Vec2& tileCoordinate) } } -void FastTMXLayer::setFlaggedTileGIDByIndex(int index, int gid) +void TMXLayer::setFlaggedTileGIDByIndex(int index, int gid) { if(gid == _tiles[index]) return; _tiles[index] = gid; @@ -669,7 +670,7 @@ void FastTMXLayer::setFlaggedTileGIDByIndex(int index, int gid) _dirty = true; } -void FastTMXLayer::removeChild(Node* node, bool cleanup) +void TMXLayer::removeChild(Node* node, bool cleanup) { int tag = node->getTag(); auto it = _spriteContainer.find(tag); @@ -680,8 +681,8 @@ void FastTMXLayer::removeChild(Node* node, bool cleanup) Node::removeChild(node, cleanup); } -// FastTMXLayer - Properties -Value FastTMXLayer::getProperty(const std::string& propertyName) const +// TMXLayer - Properties +Value TMXLayer::getProperty(const std::string& propertyName) const { if (_properties.find(propertyName) != _properties.end()) return _properties.at(propertyName); @@ -689,7 +690,7 @@ Value FastTMXLayer::getProperty(const std::string& propertyName) const return Value(); } -void FastTMXLayer::parseInternalProperties() +void TMXLayer::parseInternalProperties() { auto vertexz = getProperty("cc_vertexz"); if (vertexz.isNull()) return; @@ -719,7 +720,7 @@ void FastTMXLayer::parseInternalProperties() } //CCTMXLayer2 - obtaining positions, offset -Vec2 FastTMXLayer::calculateLayerOffset(const Vec2& pos) +Vec2 TMXLayer::calculateLayerOffset(const Vec2& pos) { Vec2 ret = Vec2::ZERO; switch (_layerOrientation) @@ -740,12 +741,12 @@ Vec2 FastTMXLayer::calculateLayerOffset(const Vec2& pos) } // TMXLayer - adding / remove tiles -void FastTMXLayer::setTileGID(int gid, const Vec2& tileCoordinate) +void TMXLayer::setTileGID(int gid, const Vec2& tileCoordinate) { setTileGID(gid, tileCoordinate, (TMXTileFlags)0); } -void FastTMXLayer::setTileGID(int gid, const Vec2& tileCoordinate, TMXTileFlags flags) +void TMXLayer::setTileGID(int gid, const Vec2& tileCoordinate, TMXTileFlags flags) { CCASSERT(tileCoordinate.x < _layerSize.width && tileCoordinate.y < _layerSize.height && tileCoordinate.x >=0 && tileCoordinate.y >=0, "TMXLayer: invalid position"); CCASSERT(_tiles, "TMXLayer: the tiles map has been released"); @@ -796,7 +797,7 @@ void FastTMXLayer::setTileGID(int gid, const Vec2& tileCoordinate, TMXTileFlags } } -void FastTMXLayer::setupTileSprite(Sprite* sprite, Vec2 pos, int gid) +void TMXLayer::setupTileSprite(Sprite* sprite, Vec2 pos, int gid) { sprite->setPosition(getPositionAt(pos)); sprite->setPositionZ((float)getVertexZForPos(pos)); @@ -852,9 +853,11 @@ void FastTMXLayer::setupTileSprite(Sprite* sprite, Vec2 pos, int gid) } } -std::string FastTMXLayer::getDescription() const +std::string TMXLayer::getDescription() const { return StringUtils::format("", _tag, (int)_mapTileSize.width, (int)_mapTileSize.height); } +} //end of namespace experimental + NS_CC_END diff --git a/cocos/2d/CCFastTMXLayer.h b/cocos/2d/CCFastTMXLayer.h index fa377bb0d0..f148eccc19 100644 --- a/cocos/2d/CCFastTMXLayer.h +++ b/cocos/2d/CCFastTMXLayer.h @@ -45,6 +45,8 @@ class Texture2D; class Sprite; struct _ccCArray; +namespace experimental{ + /** * @addtogroup tilemap_parallax_nodes * @{ @@ -76,20 +78,20 @@ http://www.cocos2d-iphone.org/wiki/doku.php/prog_guide:tiled_maps @since v3.2 */ -class CC_DLL FastTMXLayer : public Node +class CC_DLL TMXLayer : public Node { public: /** creates a FastTMXLayer with an tileset info, a layer info and a map info */ - static FastTMXLayer * create(TMXTilesetInfo *tilesetInfo, TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo); + static TMXLayer * create(TMXTilesetInfo *tilesetInfo, TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo); /** * @js ctor */ - FastTMXLayer(); + TMXLayer(); /** * @js NA * @lua NA */ - virtual ~FastTMXLayer(); + virtual ~TMXLayer(); /** returns the tile gid at a given tile coordinate. It also returns the tile flags. */ @@ -256,7 +258,7 @@ public: // end of tilemap_parallax_nodes group /// @} - +} //end of namespace experimental NS_CC_END #endif //__CCTMX_LAYER2_H__ diff --git a/cocos/2d/CCFastTMXTiledMap.cpp b/cocos/2d/CCFastTMXTiledMap.cpp index af81acc6e1..89bec47562 100644 --- a/cocos/2d/CCFastTMXTiledMap.cpp +++ b/cocos/2d/CCFastTMXTiledMap.cpp @@ -34,12 +34,13 @@ THE SOFTWARE. #include "deprecated/CCString.h" NS_CC_BEGIN +namespace experimental { // implementation FastTMXTiledMap -FastTMXTiledMap * FastTMXTiledMap::create(const std::string& tmxFile) +TMXTiledMap * TMXTiledMap::create(const std::string& tmxFile) { - FastTMXTiledMap *ret = new FastTMXTiledMap(); + TMXTiledMap *ret = new TMXTiledMap(); if (ret->initWithTMXFile(tmxFile)) { ret->autorelease(); @@ -49,9 +50,9 @@ FastTMXTiledMap * FastTMXTiledMap::create(const std::string& tmxFile) return nullptr; } -FastTMXTiledMap* FastTMXTiledMap::createWithXML(const std::string& tmxString, const std::string& resourcePath) +TMXTiledMap* TMXTiledMap::createWithXML(const std::string& tmxString, const std::string& resourcePath) { - FastTMXTiledMap *ret = new FastTMXTiledMap(); + TMXTiledMap *ret = new TMXTiledMap(); if (ret->initWithXML(tmxString, resourcePath)) { ret->autorelease(); @@ -61,7 +62,7 @@ FastTMXTiledMap* FastTMXTiledMap::createWithXML(const std::string& tmxString, co return nullptr; } -bool FastTMXTiledMap::initWithTMXFile(const std::string& tmxFile) +bool TMXTiledMap::initWithTMXFile(const std::string& tmxFile) { CCASSERT(tmxFile.size()>0, "FastTMXTiledMap: tmx file should not be empty"); @@ -79,7 +80,7 @@ bool FastTMXTiledMap::initWithTMXFile(const std::string& tmxFile) return true; } -bool FastTMXTiledMap::initWithXML(const std::string& tmxString, const std::string& resourcePath) +bool TMXTiledMap::initWithXML(const std::string& tmxString, const std::string& resourcePath) { setContentSize(Size::ZERO); @@ -91,21 +92,21 @@ bool FastTMXTiledMap::initWithXML(const std::string& tmxString, const std::strin return true; } -FastTMXTiledMap::FastTMXTiledMap() +TMXTiledMap::TMXTiledMap() :_mapSize(Size::ZERO) ,_tileSize(Size::ZERO) { } -FastTMXTiledMap::~FastTMXTiledMap() +TMXTiledMap::~TMXTiledMap() { } // private -FastTMXLayer * FastTMXTiledMap::parseLayer(TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo) +TMXLayer * TMXTiledMap::parseLayer(TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo) { TMXTilesetInfo *tileset = tilesetForLayer(layerInfo, mapInfo); - FastTMXLayer *layer = FastTMXLayer::create(tileset, layerInfo, mapInfo); + TMXLayer *layer = TMXLayer::create(tileset, layerInfo, mapInfo); // tell the layerinfo to release the ownership of the tiles map. layerInfo->_ownTiles = false; @@ -114,7 +115,7 @@ FastTMXLayer * FastTMXTiledMap::parseLayer(TMXLayerInfo *layerInfo, TMXMapInfo * return layer; } -TMXTilesetInfo * FastTMXTiledMap::tilesetForLayer(TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo) +TMXTilesetInfo * TMXTiledMap::tilesetForLayer(TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo) { Size size = layerInfo->_layerSize; auto& tilesets = mapInfo->getTilesets(); @@ -155,7 +156,7 @@ TMXTilesetInfo * FastTMXTiledMap::tilesetForLayer(TMXLayerInfo *layerInfo, TMXMa return nullptr; } -void FastTMXTiledMap::buildWithMapInfo(TMXMapInfo* mapInfo) +void TMXTiledMap::buildWithMapInfo(TMXMapInfo* mapInfo) { _mapSize = mapInfo->getMapSize(); _tileSize = mapInfo->getTileSize(); @@ -173,7 +174,7 @@ void FastTMXTiledMap::buildWithMapInfo(TMXMapInfo* mapInfo) for(const auto &layerInfo : layers) { if (layerInfo->_visible) { - FastTMXLayer *child = parseLayer(layerInfo, mapInfo); + TMXLayer *child = parseLayer(layerInfo, mapInfo); addChild(child, idx, idx); // update content size with the max size @@ -189,13 +190,13 @@ void FastTMXTiledMap::buildWithMapInfo(TMXMapInfo* mapInfo) } // public -FastTMXLayer * FastTMXTiledMap::getLayer(const std::string& layerName) const +TMXLayer * TMXTiledMap::getLayer(const std::string& layerName) const { CCASSERT(layerName.size() > 0, "Invalid layer name!"); for (auto& child : _children) { - FastTMXLayer* layer = dynamic_cast(child); + TMXLayer* layer = dynamic_cast(child); if(layer) { if(layerName.compare( layer->getLayerName()) == 0) @@ -209,7 +210,7 @@ FastTMXLayer * FastTMXTiledMap::getLayer(const std::string& layerName) const return nullptr; } -TMXObjectGroup * FastTMXTiledMap::getObjectGroup(const std::string& groupName) const +TMXObjectGroup * TMXTiledMap::getObjectGroup(const std::string& groupName) const { CCASSERT(groupName.size() > 0, "Invalid group name!"); @@ -230,7 +231,7 @@ TMXObjectGroup * FastTMXTiledMap::getObjectGroup(const std::string& groupName) c return nullptr; } -Value FastTMXTiledMap::getProperty(const std::string& propertyName) const +Value TMXTiledMap::getProperty(const std::string& propertyName) const { if (_properties.find(propertyName) != _properties.end()) return _properties.at(propertyName); @@ -238,7 +239,7 @@ Value FastTMXTiledMap::getProperty(const std::string& propertyName) const return Value(); } -Value FastTMXTiledMap::getPropertiesForGID(int GID) const +Value TMXTiledMap::getPropertiesForGID(int GID) const { if (_tileProperties.find(GID) != _tileProperties.end()) return _tileProperties.at(GID); @@ -246,11 +247,12 @@ Value FastTMXTiledMap::getPropertiesForGID(int GID) const return Value(); } -std::string FastTMXTiledMap::getDescription() const +std::string TMXTiledMap::getDescription() const { return StringUtils::format("(_children.size())); } +} //end of namespace experimental NS_CC_END diff --git a/cocos/2d/CCFastTMXTiledMap.h b/cocos/2d/CCFastTMXTiledMap.h index 9dfc098552..07a544a775 100644 --- a/cocos/2d/CCFastTMXTiledMap.h +++ b/cocos/2d/CCFastTMXTiledMap.h @@ -33,11 +33,14 @@ THE SOFTWARE. NS_CC_BEGIN class TMXObjectGroup; -class FastTMXLayer; class TMXLayerInfo; class TMXTilesetInfo; class TMXMapInfo; +namespace experimental { + +class TMXLayer; + /** @brief FastTMXTiledMap knows how to parse and render a TMX map. It adds support for the TMX tiled map format used by http://www.mapeditor.org @@ -89,17 +92,17 @@ object->getProperty(name_of_the_property); @since v3.2 */ -class CC_DLL FastTMXTiledMap : public Node +class CC_DLL TMXTiledMap : public Node { public: /** creates a TMX Tiled Map with a TMX file.*/ - static FastTMXTiledMap* create(const std::string& tmxFile); + static TMXTiledMap* create(const std::string& tmxFile); /** initializes a TMX Tiled Map with a TMX formatted XML string and a path to TMX resources */ - static FastTMXTiledMap* createWithXML(const std::string& tmxString, const std::string& resourcePath); + static TMXTiledMap* createWithXML(const std::string& tmxString, const std::string& resourcePath); /** return the FastTMXLayer for the specific layer */ - FastTMXLayer* getLayer(const std::string& layerName) const; + TMXLayer* getLayer(const std::string& layerName) const; /** return the TMXObjectGroup for the specific group */ TMXObjectGroup* getObjectGroup(const std::string& groupName) const; @@ -141,12 +144,12 @@ protected: /** * @js ctor */ - FastTMXTiledMap(); + TMXTiledMap(); /** * @js NA * @lua NA */ - virtual ~FastTMXTiledMap(); + virtual ~TMXTiledMap(); /** initializes a TMX Tiled Map with a TMX file */ bool initWithTMXFile(const std::string& tmxFile); @@ -154,7 +157,7 @@ protected: /** initializes a TMX Tiled Map with a TMX formatted XML string and a path to TMX resources */ bool initWithXML(const std::string& tmxString, const std::string& resourcePath); - FastTMXLayer * parseLayer(TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo); + TMXLayer * parseLayer(TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo); TMXTilesetInfo * tilesetForLayer(TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo); void buildWithMapInfo(TMXMapInfo* mapInfo); @@ -173,12 +176,14 @@ protected: ValueMapIntKey _tileProperties; private: - CC_DISALLOW_COPY_AND_ASSIGN(FastTMXTiledMap); + CC_DISALLOW_COPY_AND_ASSIGN(TMXTiledMap); }; // end of tilemap_parallax_nodes group /// @} + +} //end of namespace experimental NS_CC_END diff --git a/cocos/2d/CCFontAtlasCache.cpp b/cocos/2d/CCFontAtlasCache.cpp index f088da6319..4708744221 100644 --- a/cocos/2d/CCFontAtlasCache.cpp +++ b/cocos/2d/CCFontAtlasCache.cpp @@ -178,7 +178,10 @@ FontAtlas * FontAtlasCache::getFontAtlasCharMap(Texture2D* texture, int itemWidt FontAtlas * FontAtlasCache::getFontAtlasCharMap(const std::string& charMapFile, int itemWidth, int itemHeight, int startCharMap) { - std::string atlasName = generateFontName(charMapFile, 0, GlyphCollection::CUSTOM,false); + char tmp[255]; + snprintf(tmp,250,"name:%s_%d_%d_%d",charMapFile.c_str(),itemWidth,itemHeight,startCharMap); + + std::string atlasName = generateFontName(tmp, 0, GlyphCollection::CUSTOM,false); auto it = _atlasMap.find(atlasName); if ( it == _atlasMap.end() ) diff --git a/cocos/2d/CCLabel.cpp b/cocos/2d/CCLabel.cpp index 6071882ea9..ab0b98023c 100644 --- a/cocos/2d/CCLabel.cpp +++ b/cocos/2d/CCLabel.cpp @@ -881,11 +881,12 @@ void Label::drawShadowWithoutBlur() void Label::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags) { // Don't do calculate the culling if the transform was not updated - _insideBounds = (flags & FLAGS_TRANSFORM_DIRTY) ? renderer->checkVisibility(transform, _contentSize) : _insideBounds; + bool transformUpdated = flags & FLAGS_TRANSFORM_DIRTY; + _insideBounds = transformUpdated ? renderer->checkVisibility(transform, _contentSize) : _insideBounds; if(_insideBounds) { _customCommand.init(_globalZOrder); - _customCommand.func = CC_CALLBACK_0(Label::onDraw, this, transform, flags); + _customCommand.func = CC_CALLBACK_0(Label::onDraw, this, transform, transformUpdated); renderer->addCommand(&_customCommand); } } diff --git a/cocos/2d/CCLabelTextFormatter.cpp b/cocos/2d/CCLabelTextFormatter.cpp index a9658489dd..c1c0c8d386 100644 --- a/cocos/2d/CCLabelTextFormatter.cpp +++ b/cocos/2d/CCLabelTextFormatter.cpp @@ -186,7 +186,7 @@ bool LabelTextFormatter::alignText(Label *theLabel) int i = 0; int lineNumber = 0; - int strLen = static_cast(theLabel->_currentUTF16String.length()); + int strLen = theLabel->_limitShowCount; std::vector lastLine; auto strWhole = theLabel->_currentUTF16String; diff --git a/cocos/2d/CCLayer.h b/cocos/2d/CCLayer.h index b6f985aa72..faf9817137 100644 --- a/cocos/2d/CCLayer.h +++ b/cocos/2d/CCLayer.h @@ -173,9 +173,9 @@ CC_CONSTRUCTOR_ACCESS: protected: //add the api for avoid use deprecated api - void _addTouchListener(); + CC_DEPRECATED_ATTRIBUTE void _addTouchListener() {} - CC_DEPRECATED_ATTRIBUTE void addTouchListener() { _addTouchListener();}; + CC_DEPRECATED_ATTRIBUTE void addTouchListener() {} CC_DEPRECATED_ATTRIBUTE int executeScriptTouchHandler(EventTouch::EventCode eventType, Touch* touch, Event* event); CC_DEPRECATED_ATTRIBUTE int executeScriptTouchesHandler(EventTouch::EventCode eventType, const std::vector& touches, Event* event); diff --git a/cocos/2d/CCNode.cpp b/cocos/2d/CCNode.cpp index 2a52bd1a2d..f90c87b8e5 100644 --- a/cocos/2d/CCNode.cpp +++ b/cocos/2d/CCNode.cpp @@ -1850,6 +1850,11 @@ bool Node::removeComponent(const std::string& name) return false; } +bool Node::removeComponent(Component *component) +{ + return _componentContainer->remove(component); +} + void Node::removeAllComponents() { if( _componentContainer ) diff --git a/cocos/2d/CCNode.h b/cocos/2d/CCNode.h index e0b881e464..8b3354d65f 100644 --- a/cocos/2d/CCNode.h +++ b/cocos/2d/CCNode.h @@ -71,7 +71,7 @@ enum { kNodeOnCleanup }; -bool nodeComparisonLess(Node* n1, Node* n2); +bool CC_DLL nodeComparisonLess(Node* n1, Node* n2); class EventListener; @@ -1433,6 +1433,10 @@ public: */ virtual bool removeComponent(const std::string& name); + /** + * removes a component by its pointer + */ + virtual bool removeComponent(Component *component); /** * removes all components */ diff --git a/cocos/2d/CCNodeGrid.h b/cocos/2d/CCNodeGrid.h index 12266b1a41..36671ae7b0 100644 --- a/cocos/2d/CCNodeGrid.h +++ b/cocos/2d/CCNodeGrid.h @@ -33,7 +33,7 @@ NS_CC_BEGIN class GridBase; -class NodeGrid : public Node +class CC_DLL NodeGrid : public Node { public: static NodeGrid* create(); diff --git a/cocos/2d/CCParticleSystem.cpp b/cocos/2d/CCParticleSystem.cpp index 25c1066098..1dc57a04f2 100644 --- a/cocos/2d/CCParticleSystem.cpp +++ b/cocos/2d/CCParticleSystem.cpp @@ -771,7 +771,12 @@ void ParticleSystem::update(float dt) Vec2 newPos; - if (_positionType == PositionType::FREE || _positionType == PositionType::RELATIVE) + if (_positionType == PositionType::FREE) + { + Vec2 diff = convertToNodeSpace(currentPosition) - convertToNodeSpace(p-> startPos); + newPos = p->pos - diff; + } + else if(_positionType == PositionType::RELATIVE) { Vec2 diff = currentPosition - p->startPos; newPos = p->pos - diff; diff --git a/cocos/2d/CCParticleSystemQuad.cpp b/cocos/2d/CCParticleSystemQuad.cpp index 44f707a46f..3773ad668f 100644 --- a/cocos/2d/CCParticleSystemQuad.cpp +++ b/cocos/2d/CCParticleSystemQuad.cpp @@ -449,6 +449,10 @@ void ParticleSystemQuad::setTotalParticles(int tp) _totalParticles = tp; } + // fixed issue #5762 + // reset the emission rate + setEmissionRate(_totalParticles / _life); + resetSystem(); } diff --git a/cocos/ui/CCProtectedNode.cpp b/cocos/2d/CCProtectedNode.cpp similarity index 100% rename from cocos/ui/CCProtectedNode.cpp rename to cocos/2d/CCProtectedNode.cpp diff --git a/cocos/ui/CCProtectedNode.h b/cocos/2d/CCProtectedNode.h similarity index 99% rename from cocos/ui/CCProtectedNode.h rename to cocos/2d/CCProtectedNode.h index c950c5da2b..dcc3ff5463 100644 --- a/cocos/ui/CCProtectedNode.h +++ b/cocos/2d/CCProtectedNode.h @@ -33,8 +33,8 @@ #include "2d/CCNode.h" NS_CC_BEGIN - -class CC_DLL ProtectedNode : public Node + +class CC_DLL ProtectedNode : public Node { public: static ProtectedNode * create(void); diff --git a/cocos/2d/CCRenderTexture.cpp b/cocos/2d/CCRenderTexture.cpp index 341a333514..1f86f28885 100644 --- a/cocos/2d/CCRenderTexture.cpp +++ b/cocos/2d/CCRenderTexture.cpp @@ -94,6 +94,9 @@ RenderTexture::~RenderTexture() void RenderTexture::listenToBackground(EventCustom *event) { + // We have not found a way to dispatch the enter background message before the texture data are destroyed. + // So we disable this pair of message handler at present. +#if 0 #if CC_ENABLE_CACHE_TEXTURE_DATA CC_SAFE_DELETE(_UITextureImage); @@ -118,10 +121,12 @@ void RenderTexture::listenToBackground(EventCustom *event) glDeleteFramebuffers(1, &_FBO); _FBO = 0; #endif +#endif } void RenderTexture::listenToForeground(EventCustom *event) { +#if 0 #if CC_ENABLE_CACHE_TEXTURE_DATA // -- regenerate frame buffer object and attach the texture glGetIntegerv(GL_FRAMEBUFFER_BINDING, &_oldFBO); @@ -139,6 +144,7 @@ void RenderTexture::listenToForeground(EventCustom *event) glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, _texture->getName(), 0); glBindFramebuffer(GL_FRAMEBUFFER, _oldFBO); #endif +#endif } RenderTexture * RenderTexture::create(int w, int h, Texture2D::PixelFormat eFormat) @@ -564,6 +570,14 @@ void RenderTexture::onBegin() Mat4::createOrthographicOffCenter((float)-1.0 / widthRatio, (float)1.0 / widthRatio, (float)-1.0 / heightRatio, (float)1.0 / heightRatio, -1, 1, &orthoMatrix); director->multiplyMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION, orthoMatrix); } + else + { +#if CC_TARGET_PLATFORM == CC_PLATFORM_WP8 + Mat4 modifiedProjection = director->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION); + modifiedProjection = CCEGLView::sharedOpenGLView()->getReverseOrientationMatrix() * modifiedProjection; + director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION, modifiedProjection); +#endif + } //calculate viewport { diff --git a/cocos/2d/CCTextFieldTTF.cpp b/cocos/2d/CCTextFieldTTF.cpp index fb2b1171ac..5a0848d3a8 100644 --- a/cocos/2d/CCTextFieldTTF.cpp +++ b/cocos/2d/CCTextFieldTTF.cpp @@ -26,7 +26,6 @@ THE SOFTWARE. #include "CCTextFieldTTF.h" #include "base/CCDirector.h" -#include "CCGLView.h" NS_CC_BEGIN @@ -140,7 +139,7 @@ bool TextFieldTTF::attachWithIME() if (ret) { // open keyboard - GLView * pGlView = Director::getInstance()->getOpenGLView(); + auto pGlView = Director::getInstance()->getOpenGLView(); if (pGlView) { pGlView->setIMEKeyboardState(true); @@ -155,7 +154,7 @@ bool TextFieldTTF::detachWithIME() if (ret) { // close keyboard - GLView * glView = Director::getInstance()->getOpenGLView(); + auto glView = Director::getInstance()->getOpenGLView(); if (glView) { glView->setIMEKeyboardState(false); diff --git a/cocos/2d/CCTweenFunction.h b/cocos/2d/CCTweenFunction.h index acf8e17afb..e9bf6e21c5 100644 --- a/cocos/2d/CCTweenFunction.h +++ b/cocos/2d/CCTweenFunction.h @@ -84,63 +84,63 @@ namespace tweenfunc { //tween functions for CCActionEase - float easeIn(float time, float rate); - float easeOut(float time, float rate); - float easeInOut(float time, float rate); + float CC_DLL easeIn(float time, float rate); + float CC_DLL easeOut(float time, float rate); + float CC_DLL easeInOut(float time, float rate); - float bezieratFunction( float a, float b, float c, float d, float t ); + float CC_DLL bezieratFunction( float a, float b, float c, float d, float t ); - float quadraticIn(float time); - float quadraticOut(float time); - float quadraticInOut(float time); + float CC_DLL quadraticIn(float time); + float CC_DLL quadraticOut(float time); + float CC_DLL quadraticInOut(float time); - float tweenTo(float time, TweenType type, float *easingParam); + float CC_DLL tweenTo(float time, TweenType type, float *easingParam); - float linear(float time); + float CC_DLL linear(float time); - float sineEaseIn(float time); - float sineEaseOut(float time); - float sineEaseInOut(float time); + float CC_DLL sineEaseIn(float time); + float CC_DLL sineEaseOut(float time); + float CC_DLL sineEaseInOut(float time); - float quadEaseIn(float time); - float quadEaseOut(float time); - float quadEaseInOut(float time); + float CC_DLL quadEaseIn(float time); + float CC_DLL quadEaseOut(float time); + float CC_DLL quadEaseInOut(float time); - float cubicEaseIn(float time); - float cubicEaseOut(float time); - float cubicEaseInOut(float time); + float CC_DLL cubicEaseIn(float time); + float CC_DLL cubicEaseOut(float time); + float CC_DLL cubicEaseInOut(float time); - float quartEaseIn(float time); - float quartEaseOut(float time); - float quartEaseInOut(float time); + float CC_DLL quartEaseIn(float time); + float CC_DLL quartEaseOut(float time); + float CC_DLL quartEaseInOut(float time); - float quintEaseIn(float time); - float quintEaseOut(float time); - float quintEaseInOut(float time); + float CC_DLL quintEaseIn(float time); + float CC_DLL quintEaseOut(float time); + float CC_DLL quintEaseInOut(float time); - float expoEaseIn(float time); - float expoEaseOut(float time); - float expoEaseInOut(float time); + float CC_DLL expoEaseIn(float time); + float CC_DLL expoEaseOut(float time); + float CC_DLL expoEaseInOut(float time); - float circEaseIn(float time); - float circEaseOut(float time); - float circEaseInOut(float time); + float CC_DLL circEaseIn(float time); + float CC_DLL circEaseOut(float time); + float CC_DLL circEaseInOut(float time); - float elasticEaseIn(float time, float period); - float elasticEaseOut(float time, float period); - float elasticEaseInOut(float time, float period); + float CC_DLL elasticEaseIn(float time, float period); + float CC_DLL elasticEaseOut(float time, float period); + float CC_DLL elasticEaseInOut(float time, float period); - float backEaseIn(float time); - float backEaseOut(float time); - float backEaseInOut(float time); + float CC_DLL backEaseIn(float time); + float CC_DLL backEaseOut(float time); + float CC_DLL backEaseInOut(float time); - float bounceEaseIn(float time); - float bounceEaseOut(float time); - float bounceEaseInOut(float time); + float CC_DLL bounceEaseIn(float time); + float CC_DLL bounceEaseOut(float time); + float CC_DLL bounceEaseInOut(float time); - float customEase(float time, float *easingParam); + float CC_DLL customEase(float time, float *easingParam); } NS_CC_END diff --git a/cocos/2d/CMakeLists.txt b/cocos/2d/CMakeLists.txt index df2077e60e..2a7ac4d6e6 100644 --- a/cocos/2d/CMakeLists.txt +++ b/cocos/2d/CMakeLists.txt @@ -58,6 +58,7 @@ set(COCOS_2D_SRC 2d/CCParticleSystem.cpp 2d/CCParticleSystemQuad.cpp 2d/CCProgressTimer.cpp + 2d/CCProtectedNode.cpp 2d/CCRenderTexture.cpp 2d/CCScene.cpp 2d/CCSpriteBatchNode.cpp diff --git a/cocos/2d/cocos2d.def b/cocos/2d/cocos2d.def new file mode 100644 index 0000000000..3cad80013e --- /dev/null +++ b/cocos/2d/cocos2d.def @@ -0,0 +1,2 @@ + +LIBRARY diff --git a/cocos/2d/cocos2d_wp8.vcxproj b/cocos/2d/cocos2d_wp8.vcxproj index 35d96db5ed..6fa1a80f0e 100644 --- a/cocos/2d/cocos2d_wp8.vcxproj +++ b/cocos/2d/cocos2d_wp8.vcxproj @@ -406,6 +406,7 @@ + @@ -622,6 +623,7 @@ + diff --git a/cocos/2d/cocos2d_wp8.vcxproj.filters b/cocos/2d/cocos2d_wp8.vcxproj.filters index 2c801b3979..c5c33b21b7 100644 --- a/cocos/2d/cocos2d_wp8.vcxproj.filters +++ b/cocos/2d/cocos2d_wp8.vcxproj.filters @@ -613,6 +613,9 @@ platform\wp8 + + + 2d @@ -1250,11 +1253,16 @@ 2d +<<<<<<< HEAD platform platform\wp8 +======= + + 2d +>>>>>>> v3 diff --git a/cocos/2d/cocos2d.vcxproj b/cocos/2d/libcocos2d.vcxproj similarity index 93% rename from cocos/2d/cocos2d.vcxproj rename to cocos/2d/libcocos2d.vcxproj index 9e8280f3a4..b25edcb206 100644 --- a/cocos/2d/cocos2d.vcxproj +++ b/cocos/2d/libcocos2d.vcxproj @@ -18,7 +18,7 @@ - StaticLibrary + DynamicLibrary Unicode v100 v110 @@ -27,7 +27,7 @@ v120_xp - StaticLibrary + DynamicLibrary Unicode v100 v110 @@ -65,10 +65,10 @@ - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) + ../../external/sqlite3/libraries/win32;$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) + ../../external/sqlite3/libraries/win32;$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) @@ -78,7 +78,7 @@ Disabled $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_USRDLL;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -103,6 +103,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\websockets\prebuilt\win32\*.*" "$(OutDi xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\zlib\prebuilt\*.*" "$(OutDir)" xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\icon\prebuilt\*.*" "$(OutDir)" xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(OutDir)" +xcopy /Y /Q "$(ProjectDir)..\..\external\sqlite3\libraries\win32\*.*" "$(OutDir)" @@ -114,6 +115,8 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou Windows $(TargetDir)$(TargetName).lib MachineX86 + cocos2d.def + libchipmunk.lib;sqlite3.lib;%(AdditionalDependencies) @@ -127,7 +130,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_USRDLL;NDEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -155,7 +158,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - %(AdditionalDependencies) + libchipmunk.lib;sqlite3.lib;%(AdditionalDependencies) $(OutDir)$(ProjectName).dll $(OutDir);%(AdditionalLibraryDirectories) ;%(IgnoreSpecificDefaultLibraries) @@ -165,6 +168,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou true $(TargetDir)$(TargetName).lib MachineX86 + cocos2d.def @@ -226,6 +230,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + @@ -258,11 +263,11 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - + - + @@ -284,6 +289,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + @@ -333,6 +339,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + @@ -418,6 +425,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + @@ -461,11 +469,11 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - + - + @@ -489,6 +497,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + @@ -538,6 +547,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + @@ -564,6 +574,12 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + + + + {207bc7a9-ccf1-4f2f-a04d-45f72242ae25} + diff --git a/cocos/2d/cocos2d.vcxproj.filters b/cocos/2d/libcocos2d.vcxproj.filters similarity index 97% rename from cocos/2d/cocos2d.vcxproj.filters rename to cocos/2d/libcocos2d.vcxproj.filters index af367c9ab0..126d944be2 100644 --- a/cocos/2d/cocos2d.vcxproj.filters +++ b/cocos/2d/libcocos2d.vcxproj.filters @@ -55,6 +55,9 @@ {a20c4bdc-bd4c-40c1-a78a-fe31cd3ec76a} + + {44bdf58f-4af2-433c-b4af-58dc05ef96b5} + @@ -403,9 +406,6 @@ base - - base - base @@ -418,6 +418,9 @@ base + + platform + base @@ -472,9 +475,6 @@ renderer - - platform\desktop - platform\win32 @@ -523,9 +523,6 @@ platform - - platform - platform @@ -589,6 +586,18 @@ 2d + + storage + + + platform\desktop + + + platform + + + 2d + @@ -988,6 +997,9 @@ base + + platform + base @@ -1054,9 +1066,6 @@ renderer - - platform\desktop - platform\win32\compat @@ -1123,9 +1132,6 @@ platform - - platform - platform @@ -1198,6 +1204,18 @@ 2d + + storage + + + platform\desktop + + + platform + + + 2d + @@ -1224,5 +1242,6 @@ 3d + \ No newline at end of file diff --git a/cocos/3d/CCAnimate3D.h b/cocos/3d/CCAnimate3D.h index ba8ccee7ae..823221d74d 100644 --- a/cocos/3d/CCAnimate3D.h +++ b/cocos/3d/CCAnimate3D.h @@ -42,7 +42,7 @@ class Bone3D; /** * Animate3D, Animates a Sprite3D given with an Animation3D */ -class Animate3D: public ActionInterval +class CC_DLL Animate3D: public ActionInterval { public: diff --git a/cocos/3d/CCAnimation3D.h b/cocos/3d/CCAnimation3D.h index 1d18cf6b0a..27713d9b20 100644 --- a/cocos/3d/CCAnimation3D.h +++ b/cocos/3d/CCAnimation3D.h @@ -39,7 +39,7 @@ NS_CC_BEGIN /** * static animation data, shared */ -class Animation3D: public Ref +class CC_DLL Animation3D: public Ref { friend class Bundle3D; public: diff --git a/cocos/3d/CCBundleReader.h b/cocos/3d/CCBundleReader.h index 4efc71f368..d71e17f74d 100644 --- a/cocos/3d/CCBundleReader.h +++ b/cocos/3d/CCBundleReader.h @@ -87,7 +87,7 @@ public: /** * Returns the position of the file pointer. */ - long int tell(); + ssize_t tell(); /** * Sets the position of the file pointer. diff --git a/cocos/3d/CCMesh.h b/cocos/3d/CCMesh.h index eb6a959286..16a8a6d2fb 100644 --- a/cocos/3d/CCMesh.h +++ b/cocos/3d/CCMesh.h @@ -40,7 +40,7 @@ NS_CC_BEGIN class EventListenerCustom; class EventCustom; -class RenderMeshData +class CC_DLL RenderMeshData { friend class Mesh; public: @@ -66,7 +66,7 @@ protected: * Mesh: Geometry with a collection of vertex. * Supporting various vertex formats. */ -class Mesh : public Ref +class CC_DLL Mesh : public Ref { public: /** Defines supported index formats. */ diff --git a/cocos/3d/CCSprite3D.h b/cocos/3d/CCSprite3D.h index bec90631eb..fdab102c30 100644 --- a/cocos/3d/CCSprite3D.h +++ b/cocos/3d/CCSprite3D.h @@ -41,7 +41,7 @@ class Texture2D; class MeshSkin; /** Sprite3D: A sprite can be loaded from 3D model files, .obj, .c3t, .c3b, then can be drawed as sprite */ -class Sprite3D : public Node, public BlendProtocol +class CC_DLL Sprite3D : public Node, public BlendProtocol { public: /** creates a Sprite3D*/ @@ -94,7 +94,7 @@ protected: BlendFunc _blend; }; -extern std::string s_attributeNames[];//attribute names array +extern std::string CC_DLL s_attributeNames[];//attribute names array NS_CC_END #endif // __SPRITE3D_H_ diff --git a/cocos/Android.mk b/cocos/Android.mk index 92ff9a8b65..d13840e4d9 100644 --- a/cocos/Android.mk +++ b/cocos/Android.mk @@ -55,6 +55,7 @@ cocos2d.cpp \ 2d/CCParticleSystem.cpp \ 2d/CCParticleSystemQuad.cpp \ 2d/CCProgressTimer.cpp \ +2d/CCProtectedNode.cpp \ 2d/CCRenderTexture.cpp \ 2d/CCScene.cpp \ 2d/CCSprite.cpp \ @@ -82,7 +83,7 @@ cocos2d.cpp \ 3d/CCSprite3DMaterial.cpp \ 3d/CCObjLoader.cpp \ 3d/CCSprite3D.cpp \ -platform/CCGLViewProtocol.cpp \ +platform/CCGLView.cpp \ platform/CCFileUtils.cpp \ platform/CCSAXParser.cpp \ platform/CCThread.cpp \ @@ -140,6 +141,7 @@ base/ccTypes.cpp \ base/ccUTF8.cpp \ base/ccUtils.cpp \ base/etc1.cpp \ +base/pvr.cpp \ base/s3tc.cpp \ base/CCController.cpp \ base/CCController-android.cpp \ @@ -206,12 +208,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) \ $(LOCAL_PATH)/../external/ConvertUTF \ $(LOCAL_PATH)/../external/nslog - -LOCAL_LDLIBS := -lGLESv2 \ - -llog \ - -lz \ - -landroid - LOCAL_EXPORT_LDLIBS := -lGLESv2 \ -llog \ -lz \ @@ -220,6 +216,10 @@ LOCAL_EXPORT_LDLIBS := -lGLESv2 \ LOCAL_WHOLE_STATIC_LIBRARIES := cocos_freetype2_static LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static +LOCAL_WHOLE_STATIC_LIBRARIES += cocos_png_static +LOCAL_WHOLE_STATIC_LIBRARIES += cocos_jpeg_static +LOCAL_WHOLE_STATIC_LIBRARIES += cocos_tiff_static +LOCAL_WHOLE_STATIC_LIBRARIES += cocos_webp_static # define the macro to compile through support/zip_support/ioapi.c LOCAL_CFLAGS := -DUSE_FILE32API @@ -232,3 +232,7 @@ include $(BUILD_STATIC_LIBRARY) $(call import-module,freetype2/prebuilt/android) $(call import-module,chipmunk) $(call import-module,platform/android) +$(call import-module,jpeg/prebuilt/android) +$(call import-module,png/prebuilt/android) +$(call import-module,tiff/prebuilt/android) +$(call import-module,webp/prebuilt/android) diff --git a/cocos/audio/include/Export.h b/cocos/audio/include/Export.h index 86ca3b7845..bf6972ec1b 100644 --- a/cocos/audio/include/Export.h +++ b/cocos/audio/include/Export.h @@ -30,11 +30,11 @@ THE SOFTWARE. #define EXPORT_DLL _EXPORT_ #elif defined(_WIN32) #if defined(_EXPORT_DLL_) - #define EXPORT_DLL// __declspec(dllexport) + #define EXPORT_DLL __declspec(dllexport) #elif defined(IGNORE_EXPORT) #define EXPORT_DLL #else /* use a DLL library */ - #define EXPORT_DLL// __declspec(dllimport) + #define EXPORT_DLL __declspec(dllimport) #endif #else #if defined(_SHARED_) diff --git a/cocos/audio/proj.win32/CocosDenshion.vcxproj b/cocos/audio/proj.win32/libcocosdenshion.vcxproj similarity index 92% rename from cocos/audio/proj.win32/CocosDenshion.vcxproj rename to cocos/audio/proj.win32/libcocosdenshion.vcxproj index 836fc86ec5..ecb37bbc32 100644 --- a/cocos/audio/proj.win32/CocosDenshion.vcxproj +++ b/cocos/audio/proj.win32/libcocosdenshion.vcxproj @@ -11,14 +11,14 @@ - libAudio + libcocosdenshion {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} CocosDenshion.win32 Win32Proj - StaticLibrary + DynamicLibrary NotSet v100 v110 @@ -27,7 +27,7 @@ v120_xp - StaticLibrary + DynamicLibrary NotSet v100 v110 @@ -74,7 +74,7 @@ Disabled $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;..\Include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_EXPORT_DLL_;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -90,7 +90,7 @@ $(OutDir)$(ProjectName).dll true Windows - $(TargetDir)$(TargetName).lib + $(OutDir)$(TargetName).lib MachineX86 $(OutDir) @@ -98,7 +98,7 @@ $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;..\Include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_EXPORT_DLL_;%(PreprocessorDefinitions) MultiThreadedDLL @@ -116,7 +116,7 @@ Windows true true - $(TargetDir)$(TargetName).lib + $(OutDir)$(TargetName).lib MachineX86 $(OutDir) @@ -130,6 +130,11 @@ + + + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} + + diff --git a/cocos/audio/proj.win32/CocosDenshion.vcxproj.filters b/cocos/audio/proj.win32/libcocosdenshion.vcxproj.filters similarity index 100% rename from cocos/audio/proj.win32/CocosDenshion.vcxproj.filters rename to cocos/audio/proj.win32/libcocosdenshion.vcxproj.filters diff --git a/cocos/audio/proj.win32/CocosDenshion.vcxproj.user b/cocos/audio/proj.win32/libcocosdenshion.vcxproj.user similarity index 100% rename from cocos/audio/proj.win32/CocosDenshion.vcxproj.user rename to cocos/audio/proj.win32/libcocosdenshion.vcxproj.user diff --git a/cocos/base/CCConsole.cpp b/cocos/base/CCConsole.cpp index 8e149e76c1..3e02abbd2d 100644 --- a/cocos/base/CCConsole.cpp +++ b/cocos/base/CCConsole.cpp @@ -61,7 +61,6 @@ #include "2d/CCScene.h" #include "platform/CCFileUtils.h" #include "renderer/CCTextureCache.h" -#include "CCGLView.h" #include "base/base64.h" #include "base/ccUtils.h" NS_CC_BEGIN diff --git a/cocos/base/CCController-iOS.mm b/cocos/base/CCController-iOS.mm index e53f85bccf..2349224900 100644 --- a/cocos/base/CCController-iOS.mm +++ b/cocos/base/CCController-iOS.mm @@ -196,7 +196,7 @@ void Controller::registerListeners() }; _impl->_gcController.extendedGamepad.leftThumbstick.yAxis.valueChangedHandler = ^(GCControllerAxisInput *axis, float value){ - onAxisEvent(Key::JOYSTICK_LEFT_Y, value, axis.isAnalog); + onAxisEvent(Key::JOYSTICK_LEFT_Y, -value, axis.isAnalog); }; _impl->_gcController.extendedGamepad.rightThumbstick.xAxis.valueChangedHandler = ^(GCControllerAxisInput *axis, float value){ @@ -204,7 +204,7 @@ void Controller::registerListeners() }; _impl->_gcController.extendedGamepad.rightThumbstick.yAxis.valueChangedHandler = ^(GCControllerAxisInput *axis, float value){ - onAxisEvent(Key::JOYSTICK_RIGHT_Y, value, axis.isAnalog); + onAxisEvent(Key::JOYSTICK_RIGHT_Y, -value, axis.isAnalog); }; _impl->_gcController.extendedGamepad.valueChangedHandler = ^(GCExtendedGamepad *gamepad, GCControllerElement *element){ diff --git a/cocos/base/CCData.cpp b/cocos/base/CCData.cpp index fda70d44b7..3092202337 100644 --- a/cocos/base/CCData.cpp +++ b/cocos/base/CCData.cpp @@ -100,7 +100,7 @@ ssize_t Data::getSize() const return _size; } -void Data::copy(unsigned char* bytes, const ssize_t size) +void Data::copy(const unsigned char* bytes, const ssize_t size) { clear(); diff --git a/cocos/base/CCData.h b/cocos/base/CCData.h index 8a9ec870e2..7532093bae 100644 --- a/cocos/base/CCData.h +++ b/cocos/base/CCData.h @@ -63,7 +63,7 @@ public: * Developer should free the pointer after invoking this method. * @see Data::fastSet */ - void copy(unsigned char* bytes, const ssize_t size); + void copy(const unsigned char* bytes, const ssize_t size); /** Fast set the buffer pointer and its size. Please use it carefully. * @param bytes The buffer pointer, note that it have to be allocated by 'malloc' or 'calloc', diff --git a/cocos/base/CCDirector.cpp b/cocos/base/CCDirector.cpp index bfd8a5d983..b2594b2dc0 100644 --- a/cocos/base/CCDirector.cpp +++ b/cocos/base/CCDirector.cpp @@ -263,7 +263,7 @@ void Director::drawScene() if (_openGLView) { - _openGLView->pollInputEvents(); + _openGLView->pollEvents(); } //tick before glClear: issue #533 diff --git a/cocos/base/CCDirector.h b/cocos/base/CCDirector.h index cb07c4c2a6..deea08ca71 100644 --- a/cocos/base/CCDirector.h +++ b/cocos/base/CCDirector.h @@ -36,6 +36,7 @@ THE SOFTWARE. #include "base/CCVector.h" #include "CCGL.h" #include "2d/CCLabelAtlas.h" +#include "2d/CCScene.h" #include #include "math/CCMath.h" #include "platform/CCGLView.h" @@ -442,7 +443,8 @@ protected: /* delta time since last tick to main loop */ float _deltaTime; - /* The GLView, where everything is rendered */ + /* The _openGLView, where everything is rendered, GLView is a abstract class,cocos2d-x provide GLViewImpl + which inherit from it as default renderer context,you can have your own by inherit from it*/ GLView *_openGLView; //texture cache belongs to this director @@ -509,7 +511,7 @@ protected: Console *_console; #endif - // GLViewProtocol will recreate stats labels to fit visible rect + // GLView will recreate stats labels to fit visible rect friend class GLView; }; diff --git a/cocos/base/CCEvent.h b/cocos/base/CCEvent.h index 4bc129c052..32c7537c1e 100644 --- a/cocos/base/CCEvent.h +++ b/cocos/base/CCEvent.h @@ -39,7 +39,7 @@ class Node; /** * Base class of all kinds of events. */ -class Event : public Ref +class CC_DLL Event : public Ref { public: enum class Type diff --git a/cocos/base/CCEventAcceleration.h b/cocos/base/CCEventAcceleration.h index d03c3cae72..8aa7ecd589 100644 --- a/cocos/base/CCEventAcceleration.h +++ b/cocos/base/CCEventAcceleration.h @@ -30,7 +30,7 @@ NS_CC_BEGIN -class EventAcceleration : public Event +class CC_DLL EventAcceleration : public Event { public: EventAcceleration(const Acceleration& acc); diff --git a/cocos/base/CCEventCustom.h b/cocos/base/CCEventCustom.h index fce6a315c3..00ea4555ed 100644 --- a/cocos/base/CCEventCustom.h +++ b/cocos/base/CCEventCustom.h @@ -29,7 +29,7 @@ NS_CC_BEGIN -class EventCustom : public Event +class CC_DLL EventCustom : public Event { public: /** Constructor */ diff --git a/cocos/base/CCEventDispatcher.h b/cocos/base/CCEventDispatcher.h index 5fd9f80877..249e39d23e 100644 --- a/cocos/base/CCEventDispatcher.h +++ b/cocos/base/CCEventDispatcher.h @@ -53,7 +53,7 @@ event listeners can be added and removed even from within an EventListener, while events are being dispatched. */ -class EventDispatcher : public Ref +class CC_DLL EventDispatcher : public Ref { public: // Adds event listener diff --git a/cocos/base/CCEventFocus.h b/cocos/base/CCEventFocus.h index 83fc989143..c43399d446 100644 --- a/cocos/base/CCEventFocus.h +++ b/cocos/base/CCEventFocus.h @@ -35,7 +35,7 @@ namespace ui { class Widget; } -class EventFocus : public Event +class CC_DLL EventFocus : public Event { public: EventFocus(ui::Widget* widgetLoseFocus, ui::Widget* widgetGetFocus); diff --git a/cocos/base/CCEventKeyboard.h b/cocos/base/CCEventKeyboard.h index c043d67e45..392cb4c867 100644 --- a/cocos/base/CCEventKeyboard.h +++ b/cocos/base/CCEventKeyboard.h @@ -30,7 +30,7 @@ NS_CC_BEGIN -class EventKeyboard : public Event +class CC_DLL EventKeyboard : public Event { public: /** diff --git a/cocos/base/CCEventListener.h b/cocos/base/CCEventListener.h index d890c6938d..47dad7cd07 100644 --- a/cocos/base/CCEventListener.h +++ b/cocos/base/CCEventListener.h @@ -43,7 +43,7 @@ class Node; * If you need custom listener which with different callback, you need to inherit this class. * For instance, you could refer to EventListenerAcceleration, EventListenerKeyboard, EventListenerTouchOneByOne, EventListenerCustom. */ -class EventListener : public Ref +class CC_DLL EventListener : public Ref { public: enum class Type diff --git a/cocos/base/CCEventListenerAcceleration.h b/cocos/base/CCEventListenerAcceleration.h index 78e145c87a..daa4d6abe3 100644 --- a/cocos/base/CCEventListenerAcceleration.h +++ b/cocos/base/CCEventListenerAcceleration.h @@ -30,7 +30,7 @@ NS_CC_BEGIN -class EventListenerAcceleration : public EventListener +class CC_DLL EventListenerAcceleration : public EventListener { public: static const std::string LISTENER_ID; diff --git a/cocos/base/CCEventListenerCustom.h b/cocos/base/CCEventListenerCustom.h index 10e9643790..c602d626b5 100644 --- a/cocos/base/CCEventListenerCustom.h +++ b/cocos/base/CCEventListenerCustom.h @@ -49,7 +49,7 @@ class EventCustom; * * dispatcher->removeEventListener(listener); */ -class EventListenerCustom : public EventListener +class CC_DLL EventListenerCustom : public EventListener { public: /** Creates an event listener with type and callback. diff --git a/cocos/base/CCEventListenerFocus.h b/cocos/base/CCEventListenerFocus.h index dec59f774a..2b0f61eb31 100644 --- a/cocos/base/CCEventListenerFocus.h +++ b/cocos/base/CCEventListenerFocus.h @@ -35,7 +35,7 @@ namespace ui { class Widget; } -class EventListenerFocus : public EventListener +class CC_DLL EventListenerFocus : public EventListener { public: static const std::string LISTENER_ID; diff --git a/cocos/base/CCEventListenerKeyboard.h b/cocos/base/CCEventListenerKeyboard.h index 5f14abc2e9..decf898094 100644 --- a/cocos/base/CCEventListenerKeyboard.h +++ b/cocos/base/CCEventListenerKeyboard.h @@ -33,7 +33,7 @@ NS_CC_BEGIN class Event; -class EventListenerKeyboard : public EventListener +class CC_DLL EventListenerKeyboard : public EventListener { public: static const std::string LISTENER_ID; diff --git a/cocos/base/CCEventListenerMouse.h b/cocos/base/CCEventListenerMouse.h index 22708e137b..fb54c27bac 100644 --- a/cocos/base/CCEventListenerMouse.h +++ b/cocos/base/CCEventListenerMouse.h @@ -33,7 +33,7 @@ NS_CC_BEGIN class Event; -class EventListenerMouse : public EventListener +class CC_DLL EventListenerMouse : public EventListener { public: static const std::string LISTENER_ID; diff --git a/cocos/base/CCEventListenerTouch.h b/cocos/base/CCEventListenerTouch.h index c2fbace749..ff272511e9 100644 --- a/cocos/base/CCEventListenerTouch.h +++ b/cocos/base/CCEventListenerTouch.h @@ -33,7 +33,7 @@ NS_CC_BEGIN -class EventListenerTouchOneByOne : public EventListener +class CC_DLL EventListenerTouchOneByOne : public EventListener { public: static const std::string LISTENER_ID; @@ -67,7 +67,7 @@ private: }; -class EventListenerTouchAllAtOnce : public EventListener +class CC_DLL EventListenerTouchAllAtOnce : public EventListener { public: static const std::string LISTENER_ID; diff --git a/cocos/base/CCEventMouse.h b/cocos/base/CCEventMouse.h index f1cfc19a90..d5a9d2def3 100644 --- a/cocos/base/CCEventMouse.h +++ b/cocos/base/CCEventMouse.h @@ -39,7 +39,7 @@ NS_CC_BEGIN -class EventMouse : public Event +class CC_DLL EventMouse : public Event { public: /** diff --git a/cocos/base/CCEventTouch.h b/cocos/base/CCEventTouch.h index 87e42208d5..412db171a0 100644 --- a/cocos/base/CCEventTouch.h +++ b/cocos/base/CCEventTouch.h @@ -33,7 +33,7 @@ NS_CC_BEGIN #define TOUCH_PERF_DEBUG 1 -class EventTouch : public Event +class CC_DLL EventTouch : public Event { public: static const int MAX_TOUCHES = 5; diff --git a/cocos/base/CCIMEDelegate.h b/cocos/base/CCIMEDelegate.h index a4f0f65740..15988c6477 100644 --- a/cocos/base/CCIMEDelegate.h +++ b/cocos/base/CCIMEDelegate.h @@ -30,7 +30,7 @@ THE SOFTWARE. #include "math/CCGeometry.h" NS_CC_BEGIN -extern const std::string STD_STRING_EMPTY; +extern const std::string CC_DLL STD_STRING_EMPTY; /** * @addtogroup input diff --git a/cocos/base/CCMap.h b/cocos/base/CCMap.h index 11c0f02f27..18a00da257 100644 --- a/cocos/base/CCMap.h +++ b/cocos/base/CCMap.h @@ -45,7 +45,7 @@ NS_CC_BEGIN */ template -class CC_DLL Map +class Map { public: // ------------------------------------------ diff --git a/cocos/base/CCProfiling.h b/cocos/base/CCProfiling.h index 41f0d463be..63625f6702 100644 --- a/cocos/base/CCProfiling.h +++ b/cocos/base/CCProfiling.h @@ -143,9 +143,9 @@ public: long numberOfCalls; }; -extern void ProfilingBeginTimingBlock(const char *timerName); -extern void ProfilingEndTimingBlock(const char *timerName); -extern void ProfilingResetTimingBlock(const char *timerName); +extern void CC_DLL ProfilingBeginTimingBlock(const char *timerName); +extern void CC_DLL ProfilingEndTimingBlock(const char *timerName); +extern void CC_DLL ProfilingResetTimingBlock(const char *timerName); /* * cocos2d profiling categories diff --git a/cocos/base/CCValue.h b/cocos/base/CCValue.h index 0212e16b52..a3cf561ce0 100644 --- a/cocos/base/CCValue.h +++ b/cocos/base/CCValue.h @@ -43,7 +43,7 @@ extern const ValueVector ValueVectorNull; extern const ValueMap ValueMapNull; extern const ValueMapIntKey ValueMapIntKeyNull; -class Value +class CC_DLL Value { public: static const Value Null; diff --git a/cocos/base/CCVector.h b/cocos/base/CCVector.h index 5d4f2eaeec..dc16c5a568 100644 --- a/cocos/base/CCVector.h +++ b/cocos/base/CCVector.h @@ -35,7 +35,7 @@ THE SOFTWARE. NS_CC_BEGIN template -class CC_DLL Vector +class Vector { public: // ------------------------------------------ diff --git a/cocos/base/CMakeLists.txt b/cocos/base/CMakeLists.txt index 701c8ba5a6..e57058fd5a 100644 --- a/cocos/base/CMakeLists.txt +++ b/cocos/base/CMakeLists.txt @@ -40,6 +40,7 @@ set(COCOS_BASE_SRC base/ccUTF8.cpp base/ccUtils.cpp base/etc1.cpp + base/pvr.cpp base/s3tc.cpp base/ObjectFactory.cpp ) diff --git a/cocos/base/ObjectFactory.h b/cocos/base/ObjectFactory.h index 4d5e537e2f..658fc65352 100644 --- a/cocos/base/ObjectFactory.h +++ b/cocos/base/ObjectFactory.h @@ -32,11 +32,11 @@ THE SOFTWARE. NS_CC_BEGIN -class ObjectFactory +class CC_DLL ObjectFactory { public: typedef cocos2d::Ref* (*Instance)(void); - struct TInfo + struct CC_DLL TInfo { TInfo(void); TInfo(const std::string& type, Instance ins = NULL); diff --git a/cocos/base/base64.cpp b/cocos/base/base64.cpp index f697c1cb2f..5e7b7ef0de 100644 --- a/cocos/base/base64.cpp +++ b/cocos/base/base64.cpp @@ -68,7 +68,7 @@ int _base64Decode(const unsigned char *input, unsigned int input_len, unsigned c switch (char_count) { case 1: #if (CC_TARGET_PLATFORM != CC_PLATFORM_BADA) - std::fprintf(stderr, "base64Decode: encoding incomplete: at least 2 bits missing"); + fprintf(stderr, "base64Decode: encoding incomplete: at least 2 bits missing"); #endif errors++; break; @@ -83,7 +83,7 @@ int _base64Decode(const unsigned char *input, unsigned int input_len, unsigned c } else if ( input_idx < input_len ) { if (char_count) { #if (CC_TARGET_PLATFORM != CC_PLATFORM_BADA) - std::fprintf(stderr, "base64 encoding incomplete: at least %d bits truncated", + fprintf(stderr, "base64 encoding incomplete: at least %d bits truncated", ((4 - char_count) * 6)); #endif errors++; diff --git a/cocos/base/base64.h b/cocos/base/base64.h index 67149d78ed..1180c365ce 100644 --- a/cocos/base/base64.h +++ b/cocos/base/base64.h @@ -26,6 +26,8 @@ THE SOFTWARE. #ifndef __SUPPORT_BASE64_H__ #define __SUPPORT_BASE64_H__ +#include "base/CCPlatformMacros.h" + #ifdef __cplusplus extern "C" { #endif @@ -44,7 +46,7 @@ namespace cocos2d { * @since v0.8.1 */ -int base64Decode(const unsigned char *in, unsigned int inLength, unsigned char **out); +int CC_DLL base64Decode(const unsigned char *in, unsigned int inLength, unsigned char **out); /** * Encodes bytes into a 64base encoded memory with terminating '\0' character. @@ -54,7 +56,7 @@ int base64Decode(const unsigned char *in, unsigned int inLength, unsigned char * * @since v2.1.4 */ -int base64Encode(const unsigned char *in, unsigned int inLength, char **out); +int CC_DLL base64Encode(const unsigned char *in, unsigned int inLength, char **out); }//namespace cocos2d diff --git a/cocos/base/ccConfig.h b/cocos/base/ccConfig.h index 3e36c6c702..2225998746 100644 --- a/cocos/base/ccConfig.h +++ b/cocos/base/ccConfig.h @@ -283,5 +283,5 @@ To enable set it to a value different than 0. Disabled by default. #ifndef CC_CONSTRUCTOR_ACCESS #define CC_CONSTRUCTOR_ACCESS protected #endif - + #endif // __CCCONFIG_H__ diff --git a/cocos/base/ccTypes.h b/cocos/base/ccTypes.h index 0aa38f29bc..3a8e990b4e 100644 --- a/cocos/base/ccTypes.h +++ b/cocos/base/ccTypes.h @@ -43,7 +43,7 @@ struct Color4F; /** RGB color composed of bytes 3 bytes @since v3.0 */ -struct Color3B +struct CC_DLL Color3B { Color3B(); Color3B(GLubyte _r, GLubyte _g, GLubyte _b); @@ -80,7 +80,7 @@ struct Color3B /** RGBA color composed of 4 bytes @since v3.0 */ -struct Color4B +struct CC_DLL Color4B { Color4B(); Color4B(GLubyte _r, GLubyte _g, GLubyte _b, GLubyte _a); @@ -114,7 +114,7 @@ struct Color4B /** RGBA color composed of 4 floats @since v3.0 */ -struct Color4F +struct CC_DLL Color4F { Color4F(); Color4F(float _r, float _g, float _b, float _a); @@ -184,7 +184,7 @@ struct Color4F /** A texcoord composed of 2 floats: u, y @since v3.0 */ -struct Tex2F { +struct CC_DLL Tex2F { Tex2F(float _u, float _v): u(_u), v(_v) {} Tex2F(): u(0.f), v(0.f) {} @@ -195,7 +195,7 @@ struct Tex2F { //! Vec2 Sprite component -struct PointSprite +struct CC_DLL PointSprite { Vec2 pos; // 8 bytes Color4B color; // 4 bytes @@ -203,7 +203,7 @@ struct PointSprite }; //! A 2D Quad. 4 * 2 floats -struct Quad2 +struct CC_DLL Quad2 { Vec2 tl; Vec2 tr; @@ -213,7 +213,7 @@ struct Quad2 //! A 3D Quad. 4 * 3 floats -struct Quad3 { +struct CC_DLL Quad3 { Vec3 bl; Vec3 br; Vec3 tl; @@ -232,7 +232,7 @@ struct V2F_C4B_T2F }; //! a Vec2 with a vertex point, a tex coord point and a color 4F -struct V2F_C4F_T2F +struct CC_DLL V2F_C4F_T2F { //! vertices (2F) Vec2 vertices; @@ -243,7 +243,7 @@ struct V2F_C4F_T2F }; //! a Vec2 with a vertex point, a tex coord point and a color 4B -struct V3F_C4B_T2F +struct CC_DLL V3F_C4B_T2F { //! vertices (3F) Vec3 vertices; // 12 bytes @@ -256,7 +256,7 @@ struct V3F_C4B_T2F }; //! a Vec2 with a vertex point, a tex coord point -struct V3F_T2F +struct CC_DLL V3F_T2F { //! vertices (2F) Vec3 vertices; @@ -265,7 +265,7 @@ struct V3F_T2F }; //! A Triangle of V2F_C4B_T2F -struct V2F_C4B_T2F_Triangle +struct CC_DLL V2F_C4B_T2F_Triangle { //! Vec2 A V2F_C4B_T2F a; @@ -276,7 +276,7 @@ struct V2F_C4B_T2F_Triangle }; //! A Quad of V2F_C4B_T2F -struct V2F_C4B_T2F_Quad +struct CC_DLL V2F_C4B_T2F_Quad { //! bottom left V2F_C4B_T2F bl; @@ -289,7 +289,7 @@ struct V2F_C4B_T2F_Quad }; //! 4 Vertex3FTex2FColor4B -struct V3F_C4B_T2F_Quad +struct CC_DLL V3F_C4B_T2F_Quad { //! top left V3F_C4B_T2F tl; @@ -302,7 +302,7 @@ struct V3F_C4B_T2F_Quad }; //! 4 Vertex2FTex2FColor4F Quad -struct V2F_C4F_T2F_Quad +struct CC_DLL V2F_C4F_T2F_Quad { //! bottom left V2F_C4F_T2F bl; @@ -314,7 +314,7 @@ struct V2F_C4F_T2F_Quad V2F_C4F_T2F tr; }; -struct V3F_T2F_Quad +struct CC_DLL V3F_T2F_Quad { //! bottom left V3F_T2F bl; @@ -327,7 +327,7 @@ struct V3F_T2F_Quad }; //! Blend Function used for textures -struct BlendFunc +struct CC_DLL BlendFunc { //! source blend function GLenum src; @@ -359,7 +359,7 @@ struct BlendFunc // XXX: If any of these enums are edited and/or reordered, update Texture2D.m //! Vertical text alignment type -enum class TextVAlignment +enum class CC_DLL TextVAlignment { TOP, CENTER, @@ -368,7 +368,7 @@ enum class TextVAlignment // XXX: If any of these enums are edited and/or reordered, update Texture2D.m //! Horizontal text alignment type -enum class TextHAlignment +enum class CC_DLL TextHAlignment { LEFT, CENTER, @@ -378,7 +378,7 @@ enum class TextHAlignment // types for animation in particle systems // texture coordinates for a quad -struct T2F_Quad +struct CC_DLL T2F_Quad { //! bottom left Tex2F bl; @@ -391,7 +391,7 @@ struct T2F_Quad }; // struct that holds the size in pixels, texture coordinates and delays for animated ParticleSystemQuad -struct AnimationFrameData +struct CC_DLL AnimationFrameData { T2F_Quad texCoords; float delay; @@ -404,7 +404,7 @@ struct AnimationFrameData // shadow attributes -struct FontShadow +struct CC_DLL FontShadow { public: @@ -426,7 +426,7 @@ public: }; // stroke attributes -struct FontStroke +struct CC_DLL FontStroke { public: @@ -447,7 +447,7 @@ public: }; // font attributes -struct FontDefinition +struct CC_DLL FontDefinition { public: /** @@ -484,7 +484,7 @@ public: /** @brief The device accelerometer reports values for each axis in units of g-force */ -class Acceleration +class CC_DLL Acceleration : public Ref { public: @@ -497,8 +497,8 @@ public: Acceleration(): x(0), y(0), z(0), timestamp(0) {} }; -extern const std::string STD_STRING_EMPTY; -extern const ssize_t CC_INVALID_INDEX; +extern const std::string CC_DLL STD_STRING_EMPTY; +extern const ssize_t CC_DLL CC_INVALID_INDEX; NS_CC_END diff --git a/cocos/base/ccUTF8.h b/cocos/base/ccUTF8.h index 87760db047..f9561efa09 100644 --- a/cocos/base/ccUTF8.h +++ b/cocos/base/ccUTF8.h @@ -133,7 +133,7 @@ CC_DEPRECATED_ATTRIBUTE CC_DLL int cc_wcslen(const unsigned short* str); * @deprecated Please use `StringUtils::trimUTF16Vector` instead */ -CC_DEPRECATED_ATTRIBUTE void cc_utf8_trim_ws(std::vector* str); +CC_DEPRECATED_ATTRIBUTE CC_DLL void cc_utf8_trim_ws(std::vector* str); /** * Whether the character is a whitespace character. @@ -144,7 +144,7 @@ CC_DEPRECATED_ATTRIBUTE void cc_utf8_trim_ws(std::vector* str); * * @see http://en.wikipedia.org/wiki/Whitespace_character#Unicode * */ -CC_DEPRECATED_ATTRIBUTE bool isspace_unicode(unsigned short ch); +CC_DEPRECATED_ATTRIBUTE CC_DLL bool isspace_unicode(unsigned short ch); /** * Whether the character is a Chinese/Japanese/Korean character. @@ -156,7 +156,7 @@ CC_DEPRECATED_ATTRIBUTE bool isspace_unicode(unsigned short ch); * @see http://www.searchtb.com/2012/04/chinese_encode.html * @see http://tieba.baidu.com/p/748765987 * */ -CC_DEPRECATED_ATTRIBUTE bool iscjk_unicode(unsigned short ch); +CC_DEPRECATED_ATTRIBUTE CC_DLL bool iscjk_unicode(unsigned short ch); /** * Returns the length of the string in characters. @@ -166,7 +166,7 @@ CC_DEPRECATED_ATTRIBUTE bool iscjk_unicode(unsigned short ch); * @deprecated Please use `StringUtils::getCharacterCountInUTF8String` instead * @returns the length of the string in characters **/ -CC_DEPRECATED_ATTRIBUTE long cc_utf8_strlen (const char * p, int max = -1); +CC_DEPRECATED_ATTRIBUTE CC_DLL long cc_utf8_strlen (const char * p, int max = -1); /** * Find the last character that is not equal to the character given. @@ -176,13 +176,13 @@ CC_DEPRECATED_ATTRIBUTE long cc_utf8_strlen (const char * p, int max = -1); * @deprecated Please use `StringUtils::getIndexOfLastNotChar16` instead * @returns the index of the last character that is not \p c. * */ -CC_DEPRECATED_ATTRIBUTE unsigned int cc_utf8_find_last_not_char(const std::vector& str, unsigned short c); +CC_DEPRECATED_ATTRIBUTE CC_DLL unsigned int cc_utf8_find_last_not_char(const std::vector& str, unsigned short c); /** * @brief Gets `unsigned short` vector from a given utf16 string * @deprecated Please use `StringUtils::getChar16VectorFromUTF16String` instead */ -CC_DEPRECATED_ATTRIBUTE std::vector cc_utf16_vec_from_utf16_str(const unsigned short* str); +CC_DEPRECATED_ATTRIBUTE CC_DLL std::vector cc_utf16_vec_from_utf16_str(const unsigned short* str); /** * Creates an utf8 string from a c string. The result will be null terminated. @@ -194,7 +194,7 @@ CC_DEPRECATED_ATTRIBUTE std::vector cc_utf16_vec_from_utf16_str( * @returns the newly created utf16 string, it must be released with `delete[]`, * If an error occurs, %NULL will be returned. * */ -CC_DEPRECATED_ATTRIBUTE unsigned short* cc_utf8_to_utf16(const char* str_old, int length = -1, int* rUtf16Size = nullptr); +CC_DEPRECATED_ATTRIBUTE CC_DLL unsigned short* cc_utf8_to_utf16(const char* str_old, int length = -1, int* rUtf16Size = nullptr); /** * Converts a string from UTF-16 to UTF-8. The result will be null terminated. @@ -207,7 +207,7 @@ CC_DEPRECATED_ATTRIBUTE unsigned short* cc_utf8_to_utf16(const char* str_old, in * @returns a pointer to a newly allocated UTF-8 string. This value must be * released with `delete[]`. If an error occurs, %NULL will be returned. **/ -CC_DEPRECATED_ATTRIBUTE char * cc_utf16_to_utf8 (const unsigned short *str, +CC_DEPRECATED_ATTRIBUTE CC_DLL char * cc_utf16_to_utf8 (const unsigned short *str, int len = -1, long *items_read = nullptr, long *items_written = nullptr); diff --git a/cocos/base/ccUtils.cpp b/cocos/base/ccUtils.cpp index 36cafb1c20..0bee23ae17 100644 --- a/cocos/base/ccUtils.cpp +++ b/cocos/base/ccUtils.cpp @@ -32,7 +32,6 @@ THE SOFTWARE. #include "renderer/CCRenderer.h" #include "platform/CCImage.h" #include "platform/CCFileUtils.h" -#include "CCGLView.h" NS_CC_BEGIN diff --git a/cocos/base/ccUtils.h b/cocos/base/ccUtils.h index 1fba5b1b40..faf95cf4a0 100644 --- a/cocos/base/ccUtils.h +++ b/cocos/base/ccUtils.h @@ -61,7 +61,7 @@ namespace utils * base filename ("hello.png" etc.), don't use a relative path containing directory names.("mydir/hello.png" etc.) * @since v3.2 */ - void captureScreen(const std::function& afterCaptured, const std::string& filename); + void CC_DLL captureScreen(const std::function& afterCaptured, const std::string& filename); /** Find children by name, it will return all child that has the same name. * It supports c++ 11 regular expression. It is a helper function of `Node::enumerateChildren()`. @@ -72,12 +72,12 @@ namespace utils * @return Array of Nodes that matches the name * @since v3.2 */ - std::vector findChildren(const Node &node, const std::string &name); + std::vector CC_DLL findChildren(const Node &node, const std::string &name); - /** Same to ::atof, but strip the string, remain 7 numbers after '.' before call atof。 - * Why we need this? Because in android c++_static, atof ( and std::atof ) is unsupported for numbers have long decimal part and contain several numbers can approximate to 1 （ like 90.099998474121094 ), it will return inf. this function is used to fix this bug. + /** Same to ::atof, but strip the string, remain 7 numbers after '.' before call atof. + * Why we need this? Because in android c++_static, atof ( and std::atof ) is unsupported for numbers have long decimal part and contain several numbers can approximate to 1 ( like 90.099998474121094 ), it will return inf. this function is used to fix this bug. */ - double atof(const char* str); + double CC_DLL atof(const char* str); } NS_CC_END diff --git a/cocos/base/pvr.cpp b/cocos/base/pvr.cpp new file mode 100644 index 0000000000..3a59860c6f --- /dev/null +++ b/cocos/base/pvr.cpp @@ -0,0 +1,713 @@ +/****************************************************************************** + + @File PVRTDecompress.cpp + + @Title + + @Copyright Copyright (C) 2000 - 2008 by Imagination Technologies Limited. + + @Platform ANSI compatible + + @Description PVRTC Texture Decompression. + + ******************************************************************************/ +#include +#include +#include +#include +#include +#include +#include +#include "pvr.h" + +#define PVRT_MIN(a,b) (((a) < (b)) ? (a) : (b)) +#define PVRT_MAX(a,b) (((a) > (b)) ? (a) : (b)) +#define PVRT_CLAMP(x, l, h) (PVRT_MIN((h), PVRT_MAX((x), (l)))) + +/***************************************************************************** + * defines and consts + *****************************************************************************/ +#define PT_INDEX (2) // The Punch-through index + +#define BLK_Y_SIZE (4) // always 4 for all 2D block types + +#define BLK_X_MAX (8) // Max X dimension for blocks + +#define BLK_X_2BPP (8) // dimensions for the two formats +#define BLK_X_4BPP (4) + +#define WRAP_COORD(Val, Size) ((Val) & ((Size)-1)) + +#define POWER_OF_2(X) util_number_is_power_2(X) + +/* + Define an expression to either wrap or clamp large or small vals to the + legal coordinate range + */ +#define LIMIT_COORD(Val, Size, AssumeImageTiles) \ +((AssumeImageTiles)? WRAP_COORD((Val), (Size)): PVRT_CLAMP((Val), 0, (Size)-1)) + +/***************************************************************************** + * Useful typedefs + *****************************************************************************/ + +typedef uint32_t U32; +typedef uint8_t U8; + +/*********************************************************** + DECOMPRESSION ROUTINES + ************************************************************/ + +/*!*********************************************************************** + @Struct AMTC_BLOCK_STRUCT + @Brief + *************************************************************************/ +typedef struct +{ + // Uses 64 bits pre block + U32 PackedData[2]; +}AMTC_BLOCK_STRUCT; + + +static void PVRDecompress(AMTC_BLOCK_STRUCT *pCompressedData, + const bool Do2bitMode, + const int XDim, + const int YDim, + const int AssumeImageTiles, + unsigned char* pResultImage); + +/*!*********************************************************************** + @Function PVRTDecompressPVRTC + @Input pCompressedData The PVRTC texture data to decompress + @Input Do2bitMode Signifies whether the data is PVRTC2 or PVRTC4 + @Input XDim X dimension of the texture + @Input YDim Y dimension of the texture + @Modified pResultImage The decompressed texture data + @Description Decompresses PVRTC to RGBA 8888 + *************************************************************************/ +int PVRTDecompressPVRTC(const void * const pCompressedData,const int XDim,const int YDim, void *pDestData,const bool Do2bitMode) +{ + PVRDecompress((AMTC_BLOCK_STRUCT*)pCompressedData,Do2bitMode,XDim,YDim,1,(unsigned char*)pDestData); + + return XDim*YDim/2; +} + +/*!*********************************************************************** + @Function util_number_is_power_2 + @Input input A number + @Returns TRUE if the number is an integer power of two, else FALSE. + @Description Check that a number is an integer power of two, i.e. + 1, 2, 4, 8, ... etc. + Returns FALSE for zero. + *************************************************************************/ +int util_number_is_power_2( unsigned input ) +{ + unsigned minus1; + + if( !input ) return 0; + + minus1 = input - 1; + return ( (input | minus1) == (input ^ minus1) ) ? 1 : 0; +} + + +/*!*********************************************************************** + @Function Unpack5554Colour + @Input pBlock + @Input ABColours + @Description Given a block, extract the colour information and convert + to 5554 formats + *************************************************************************/ +static void Unpack5554Colour(const AMTC_BLOCK_STRUCT *pBlock, + int ABColours[2][4]) +{ + U32 RawBits[2]; + + int i; + + // Extract A and B + RawBits[0] = pBlock->PackedData[1] & (0xFFFE); // 15 bits (shifted up by one) + RawBits[1] = pBlock->PackedData[1] >> 16; // 16 bits + + // step through both colours + for(i = 0; i < 2; i++) + { + // If completely opaque + if(RawBits[i] & (1<<15)) + { + // Extract R and G (both 5 bit) + ABColours[i][0] = (RawBits[i] >> 10) & 0x1F; + ABColours[i][1] = (RawBits[i] >> 5) & 0x1F; + + /* + The precision of Blue depends on A or B. If A then we need to + replicate the top bit to get 5 bits in total + */ + ABColours[i][2] = RawBits[i] & 0x1F; + if(i==0) + { + ABColours[0][2] |= ABColours[0][2] >> 4; + } + + // set 4bit alpha fully on... + ABColours[i][3] = 0xF; + } + else // Else if colour has variable translucency + { + /* + Extract R and G (both 4 bit). + (Leave a space on the end for the replication of bits + */ + ABColours[i][0] = (RawBits[i] >> (8-1)) & 0x1E; + ABColours[i][1] = (RawBits[i] >> (4-1)) & 0x1E; + + // replicate bits to truly expand to 5 bits + ABColours[i][0] |= ABColours[i][0] >> 4; + ABColours[i][1] |= ABColours[i][1] >> 4; + + // grab the 3(+padding) or 4 bits of blue and add an extra padding bit + ABColours[i][2] = (RawBits[i] & 0xF) << 1; + + /* + expand from 3 to 5 bits if this is from colour A, or 4 to 5 bits if from + colour B + */ + if(i==0) + { + ABColours[0][2] |= ABColours[0][2] >> 3; + } + else + { + ABColours[0][2] |= ABColours[0][2] >> 4; + } + + // Set the alpha bits to be 3 + a zero on the end + ABColours[i][3] = (RawBits[i] >> 11) & 0xE; + } + } +} + +/*!*********************************************************************** + @Function UnpackModulations + @Input pBlock + @Input Do2bitMode + @Input ModulationVals + @Input ModulationModes + @Input StartX + @Input StartY + @Description Given the block and the texture type and it's relative + position in the 2x2 group of blocks, extract the bit + patterns for the fully defined pixels. + *************************************************************************/ +static void UnpackModulations(const AMTC_BLOCK_STRUCT *pBlock, + const int Do2bitMode, + int ModulationVals[8][16], + int ModulationModes[8][16], + int StartX, + int StartY) +{ + int BlockModMode; + U32 ModulationBits; + + int x, y; + + BlockModMode= pBlock->PackedData[1] & 1; + ModulationBits = pBlock->PackedData[0]; + + // if it's in an interpolated mode + if(Do2bitMode && BlockModMode) + { + /* + run through all the pixels in the block. Note we can now treat all the + "stored" values as if they have 2bits (even when they didn't!) + */ + for(y = 0; y < BLK_Y_SIZE; y++) + { + for(x = 0; x < BLK_X_2BPP; x++) + { + ModulationModes[y+StartY][x+StartX] = BlockModMode; + + // if this is a stored value... + if(((x^y)&1) == 0) + { + ModulationVals[y+StartY][x+StartX] = ModulationBits & 3; + ModulationBits >>= 2; + } + } + } + } + else if(Do2bitMode) // else if direct encoded 2bit mode - i.e. 1 mode bit per pixel + { + for(y = 0; y < BLK_Y_SIZE; y++) + { + for(x = 0; x < BLK_X_2BPP; x++) + { + ModulationModes[y+StartY][x+StartX] = BlockModMode; + + // double the bits so 0=> 00, and 1=>11 + if(ModulationBits & 1) + { + ModulationVals[y+StartY][x+StartX] = 0x3; + } + else + { + ModulationVals[y+StartY][x+StartX] = 0x0; + } + ModulationBits >>= 1; + } + } + } + else // else its the 4bpp mode so each value has 2 bits + { + for(y = 0; y < BLK_Y_SIZE; y++) + { + for(x = 0; x < BLK_X_4BPP; x++) + { + ModulationModes[y+StartY][x+StartX] = BlockModMode; + + ModulationVals[y+StartY][x+StartX] = ModulationBits & 3; + ModulationBits >>= 2; + } + } + } + + // make sure nothing is left over + assert(ModulationBits==0); +} + +/*!*********************************************************************** + @Function InterpolateColours + @Input ColourP + @Input ColourQ + @Input ColourR + @Input ColourS + @Input Do2bitMode + @Input x + @Input y + @Modified Result + @Description This performs a HW bit accurate interpolation of either the + A or B colours for a particular pixel. + + NOTE: It is assumed that the source colours are in ARGB 5554 + format - This means that some "preparation" of the values will + be necessary. + *************************************************************************/ +static void InterpolateColours(const int ColourP[4], + const int ColourQ[4], + const int ColourR[4], + const int ColourS[4], + const int Do2bitMode, + const int x, + const int y, + int Result[4]) +{ + int u, v, uscale; + int k; + + int tmp1, tmp2; + + int P[4], Q[4], R[4], S[4]; + + // Copy the colours + for(k = 0; k < 4; k++) + { + P[k] = ColourP[k]; + Q[k] = ColourQ[k]; + R[k] = ColourR[k]; + S[k] = ColourS[k]; + } + + // put the x and y values into the right range + v = (y & 0x3) | ((~y & 0x2) << 1); + + if(Do2bitMode) + u = (x & 0x7) | ((~x & 0x4) << 1); + else + u = (x & 0x3) | ((~x & 0x2) << 1); + + // get the u and v scale amounts + v = v - BLK_Y_SIZE/2; + + if(Do2bitMode) + { + u = u - BLK_X_2BPP/2; + uscale = 8; + } + else + { + u = u - BLK_X_4BPP/2; + uscale = 4; + } + + for(k = 0; k < 4; k++) + { + tmp1 = P[k] * uscale + u * (Q[k] - P[k]); + tmp2 = R[k] * uscale + u * (S[k] - R[k]); + + tmp1 = tmp1 * 4 + v * (tmp2 - tmp1); + + Result[k] = tmp1; + } + + // Lop off the appropriate number of bits to get us to 8 bit precision + if(Do2bitMode) + { + // do RGB + for(k = 0; k < 3; k++) + { + Result[k] >>= 2; + } + + Result[3] >>= 1; + } + else + { + // do RGB (A is ok) + for(k = 0; k < 3; k++) + { + Result[k] >>= 1; + } + } + + // sanity check + for(k = 0; k < 4; k++) + { + assert(Result[k] < 256); + } + + + /* + Convert from 5554 to 8888 + + do RGB 5.3 => 8 + */ + for(k = 0; k < 3; k++) + { + Result[k] += Result[k] >> 5; + } + + Result[3] += Result[3] >> 4; + + // 2nd sanity check + for(k = 0; k < 4; k++) + { + assert(Result[k] < 256); + } + +} + +/*!*********************************************************************** + @Function GetModulationValue + @Input x + @Input y + @Input Do2bitMode + @Input ModulationVals + @Input ModulationModes + @Input Mod + @Input DoPT + @Description Get the modulation value as a numerator of a fraction of 8ths + *************************************************************************/ +static void GetModulationValue(int x, + int y, + const int Do2bitMode, + const int ModulationVals[8][16], + const int ModulationModes[8][16], + int *Mod, + int *DoPT) +{ + static const int RepVals0[4] = {0, 3, 5, 8}; + static const int RepVals1[4] = {0, 4, 4, 8}; + + int ModVal; + + // Map X and Y into the local 2x2 block + y = (y & 0x3) | ((~y & 0x2) << 1); + + if(Do2bitMode) + x = (x & 0x7) | ((~x & 0x4) << 1); + else + x = (x & 0x3) | ((~x & 0x2) << 1); + + // assume no PT for now + *DoPT = 0; + + // extract the modulation value. If a simple encoding + if(ModulationModes[y][x]==0) + { + ModVal = RepVals0[ModulationVals[y][x]]; + } + else if(Do2bitMode) + { + // if this is a stored value + if(((x^y)&1)==0) + ModVal = RepVals0[ModulationVals[y][x]]; + else if(ModulationModes[y][x] == 1) // else average from the neighbours if H&V interpolation.. + { + ModVal = (RepVals0[ModulationVals[y-1][x]] + + RepVals0[ModulationVals[y+1][x]] + + RepVals0[ModulationVals[y][x-1]] + + RepVals0[ModulationVals[y][x+1]] + 2) / 4; + } + else if(ModulationModes[y][x] == 2) // else if H-Only + { + ModVal = (RepVals0[ModulationVals[y][x-1]] + + RepVals0[ModulationVals[y][x+1]] + 1) / 2; + } + else // else it's V-Only + { + ModVal = (RepVals0[ModulationVals[y-1][x]] + + RepVals0[ModulationVals[y+1][x]] + 1) / 2; + } + } + else // else it's 4BPP and PT encoding + { + ModVal = RepVals1[ModulationVals[y][x]]; + + *DoPT = ModulationVals[y][x] == PT_INDEX; + } + + *Mod =ModVal; +} + +/*!*********************************************************************** + @Function TwiddleUV + @Input YSize Y dimension of the texture in pixels + @Input XSize X dimension of the texture in pixels + @Input YPos Pixel Y position + @Input XPos Pixel X position + @Returns The twiddled offset of the pixel + @Description Given the Block (or pixel) coordinates and the dimension of + the texture in blocks (or pixels) this returns the twiddled + offset of the block (or pixel) from the start of the map. + + NOTE the dimensions of the texture must be a power of 2 + *************************************************************************/ +static int DisableTwiddlingRoutine = 0; + +static U32 TwiddleUV(U32 YSize, U32 XSize, U32 YPos, U32 XPos) +{ + U32 Twiddled; + + U32 MinDimension; + U32 MaxValue; + + U32 SrcBitPos; + U32 DstBitPos; + + int ShiftCount; + + assert(YPos < YSize); + assert(XPos < XSize); + + assert(POWER_OF_2(YSize)); + assert(POWER_OF_2(XSize)); + + if(YSize < XSize) + { + MinDimension = YSize; + MaxValue = XPos; + } + else + { + MinDimension = XSize; + MaxValue = YPos; + } + + // Nasty hack to disable twiddling + if(DisableTwiddlingRoutine) + return (YPos* XSize + XPos); + + // Step through all the bits in the "minimum" dimension + SrcBitPos = 1; + DstBitPos = 1; + Twiddled = 0; + ShiftCount = 0; + + while(SrcBitPos < MinDimension) + { + if(YPos & SrcBitPos) + { + Twiddled |= DstBitPos; + } + + if(XPos & SrcBitPos) + { + Twiddled |= (DstBitPos << 1); + } + + + SrcBitPos <<= 1; + DstBitPos <<= 2; + ShiftCount += 1; + + } + + // prepend any unused bits + MaxValue >>= ShiftCount; + + Twiddled |= (MaxValue << (2*ShiftCount)); + + return Twiddled; +} + +/*!*********************************************************************** + @Function Decompress + @Input pCompressedData The PVRTC texture data to decompress + @Input Do2BitMode Signifies whether the data is PVRTC2 or PVRTC4 + @Input XDim X dimension of the texture + @Input YDim Y dimension of the texture + @Input AssumeImageTiles Assume the texture data tiles + @Modified pResultImage The decompressed texture data + @Description Decompresses PVRTC to RGBA 8888 + *************************************************************************/ +static void PVRDecompress(AMTC_BLOCK_STRUCT *pCompressedData, + const bool Do2bitMode, + const int XDim, + const int YDim, + const int AssumeImageTiles, + unsigned char* pResultImage) +{ + int x, y; + int i, j; + + int BlkX, BlkY; + int BlkXp1, BlkYp1; + int XBlockSize; + int BlkXDim, BlkYDim; + + int StartX, StartY; + + int ModulationVals[8][16]; + int ModulationModes[8][16]; + + int Mod, DoPT; + + unsigned int uPosition; + + // local neighbourhood of blocks + AMTC_BLOCK_STRUCT *pBlocks[2][2]; + + AMTC_BLOCK_STRUCT *pPrevious[2][2] = {{NULL, NULL}, {NULL, NULL}}; + + // Low precision colours extracted from the blocks + struct + { + int Reps[2][4]; + }Colours5554[2][2]; + + // Interpolated A and B colours for the pixel + int ASig[4], BSig[4]; + + int Result[4]; + + if(Do2bitMode) + XBlockSize = BLK_X_2BPP; + else + XBlockSize = BLK_X_4BPP; + + // For MBX don't allow the sizes to get too small + BlkXDim = PVRT_MAX(2, XDim / XBlockSize); + BlkYDim = PVRT_MAX(2, YDim / BLK_Y_SIZE); + + /* + Step through the pixels of the image decompressing each one in turn + + Note that this is a hideously inefficient way to do this! + */ + for(y = 0; y < YDim; y++) + { + for(x = 0; x < XDim; x++) + { + // map this pixel to the top left neighbourhood of blocks + BlkX = (x - XBlockSize/2); + BlkY = (y - BLK_Y_SIZE/2); + + BlkX = LIMIT_COORD(BlkX, XDim, AssumeImageTiles); + BlkY = LIMIT_COORD(BlkY, YDim, AssumeImageTiles); + + + BlkX /= XBlockSize; + BlkY /= BLK_Y_SIZE; + + // compute the positions of the other 3 blocks + BlkXp1 = LIMIT_COORD(BlkX+1, BlkXDim, AssumeImageTiles); + BlkYp1 = LIMIT_COORD(BlkY+1, BlkYDim, AssumeImageTiles); + + // Map to block memory locations + pBlocks[0][0] = pCompressedData +TwiddleUV(BlkYDim, BlkXDim, BlkY, BlkX); + pBlocks[0][1] = pCompressedData +TwiddleUV(BlkYDim, BlkXDim, BlkY, BlkXp1); + pBlocks[1][0] = pCompressedData +TwiddleUV(BlkYDim, BlkXDim, BlkYp1, BlkX); + pBlocks[1][1] = pCompressedData +TwiddleUV(BlkYDim, BlkXDim, BlkYp1, BlkXp1); + + + /* + extract the colours and the modulation information IF the previous values + have changed. + */ + if(memcmp(pPrevious, pBlocks, 4*sizeof(void*)) != 0) + { + StartY = 0; + for(i = 0; i < 2; i++) + { + StartX = 0; + for(j = 0; j < 2; j++) + { + Unpack5554Colour(pBlocks[i][j], Colours5554[i][j].Reps); + + UnpackModulations(pBlocks[i][j], + Do2bitMode, + ModulationVals, + ModulationModes, + StartX, StartY); + + StartX += XBlockSize; + } + + StartY += BLK_Y_SIZE; + } + + // make a copy of the new pointers + memcpy(pPrevious, pBlocks, 4*sizeof(void*)); + } + + // decompress the pixel. First compute the interpolated A and B signals + InterpolateColours(Colours5554[0][0].Reps[0], + Colours5554[0][1].Reps[0], + Colours5554[1][0].Reps[0], + Colours5554[1][1].Reps[0], + Do2bitMode, x, y, + ASig); + + InterpolateColours(Colours5554[0][0].Reps[1], + Colours5554[0][1].Reps[1], + Colours5554[1][0].Reps[1], + Colours5554[1][1].Reps[1], + Do2bitMode, x, y, + BSig); + + GetModulationValue(x,y, Do2bitMode, (const int (*)[16])ModulationVals, (const int (*)[16])ModulationModes, + &Mod, &DoPT); + + // compute the modulated colour + for(i = 0; i < 4; i++) + { + Result[i] = ASig[i] * 8 + Mod * (BSig[i] - ASig[i]); + Result[i] >>= 3; + } + + if(DoPT) + Result[3] = 0; + + // Store the result in the output image + uPosition = (x+y*XDim)<<2; + pResultImage[uPosition+0] = (U8)Result[0]; + pResultImage[uPosition+1] = (U8)Result[1]; + pResultImage[uPosition+2] = (U8)Result[2]; + pResultImage[uPosition+3] = (U8)Result[3]; + } + } +} + +/***************************************************************************** + End of file (pvr.cpp) + *****************************************************************************/ \ No newline at end of file diff --git a/cocos/base/pvr.h b/cocos/base/pvr.h new file mode 100644 index 0000000000..33c14a4e06 --- /dev/null +++ b/cocos/base/pvr.h @@ -0,0 +1,22 @@ +/****************************************************************************** + + @File PVRTDecompress.h + + @Title + + @Copyright Copyright (C) 2000 - 2008 by Imagination Technologies Limited. + + @Platform ANSI compatible + + @Description PVRTC Texture Decompression. + + ******************************************************************************/ + +#ifndef __PVR_H__ +#define __PVR_H__ + + +int PVRTDecompressPVRTC(const void * const pCompressedData,const int XDim,const int YDim,void *pDestData,const bool Do2bitMode); + + +#endif //__PVR_H__ diff --git a/cocos/cocos2d.h b/cocos/cocos2d.h index dfbc2a1274..89dac2f48c 100644 --- a/cocos/cocos2d.h +++ b/cocos/cocos2d.h @@ -173,49 +173,49 @@ THE SOFTWARE. #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) #include "platform/ios/CCApplication.h" - #include "platform/ios/CCGLView.h" + #include "platform/ios/CCGLViewImpl.h" #include "platform/ios/CCGL.h" #include "platform/ios/CCStdC.h" #endif // CC_TARGET_PLATFORM == CC_PLATFORM_IOS #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) #include "platform/android/CCApplication.h" - #include "platform/android/CCGLView.h" + #include "platform/android/CCGLViewImpl.h" #include "platform/android/CCGL.h" #include "platform/android/CCStdC.h" #endif // CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID #if (CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY) #include "platform/blackberry/CCApplication.h" - #include "platform/blackberry/CCGLView.h" + #include "platform/blackberry/CCGLViewImpl.h" #include "platform/blackberry/CCGL.h" #include "platform/blackberry/CCStdC.h" #endif // CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) #include "platform/win32/CCApplication.h" - #include "platform/desktop/CCGLView.h" + #include "platform/desktop/CCGLViewImpl.h" #include "platform/win32/CCGL.h" #include "platform/win32/CCStdC.h" #endif // CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 #if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) #include "platform/mac/CCApplication.h" - #include "platform/desktop/CCGLView.h" + #include "platform/desktop/CCGLViewImpl.h" #include "platform/mac/CCGL.h" #include "platform/mac/CCStdC.h" #endif // CC_TARGET_PLATFORM == CC_PLATFORM_MAC #if (CC_TARGET_PLATFORM == CC_PLATFORM_LINUX) #include "platform/linux/CCApplication.h" - #include "platform/desktop/CCGLView.h" + #include "platform/desktop/CCGLViewImpl.h" #include "platform/linux/CCGL.h" #include "platform/linux/CCStdC.h" #endif // CC_TARGET_PLATFORM == CC_PLATFORM_LINUX #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) #include "platform/winrt/CCApplication.h" - #include "platform/winrt/CCGLView.h" + #include "platform/winrt/CCGLViewImpl.h" #include "platform/winrt/CCGL.h" #include "platform/winrt/CCStdC.h" #include "platform/winrt/CCPrecompiledShaders.h" @@ -268,9 +268,6 @@ THE SOFTWARE. #include "3d/CCAnimation3D.h" #include "3d/CCSprite3DMaterial.h" -// Audio -#include "audio/include/SimpleAudioEngine.h" - // Deprecated include #include "deprecated/CCDictionary.h" #include "deprecated/CCArray.h" diff --git a/cocos/deprecated/CCString.h b/cocos/deprecated/CCString.h index 0bf66dcf8e..18d2002a56 100644 --- a/cocos/deprecated/CCString.h +++ b/cocos/deprecated/CCString.h @@ -215,7 +215,7 @@ std::string toString(T arg) return ss.str(); } -std::string format(const char* format, ...) CC_FORMAT_PRINTF(1, 2); +std::string CC_DLL format(const char* format, ...) CC_FORMAT_PRINTF(1, 2); } // namespace StringUtils { diff --git a/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj b/cocos/editor-support/cocosbuilder/proj.win32/libcocosbuilder.vcxproj similarity index 95% rename from cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj rename to cocos/editor-support/cocosbuilder/proj.win32/libcocosbuilder.vcxproj index 1c4ac42ad3..c19e5572e8 100644 --- a/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj +++ b/cocos/editor-support/cocosbuilder/proj.win32/libcocosbuilder.vcxproj @@ -12,7 +12,7 @@ {811C0DAB-7B96-4BD3-A154-B7572B58E4AB} - libCocosBuilder + libcocosbuilder @@ -145,6 +145,14 @@ + + + {21b2c324-891f-48ea-ad1a-5ae13de12e28} + + + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} + + diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.cpp b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.cpp index 4c123c2f30..0eca4088a7 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.cpp +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.cpp @@ -215,13 +215,17 @@ void ActionTimeline::startWithTarget(Node *target) [this, target](Node* child) { ActionTimelineData* data = dynamic_cast(child->getUserObject()); - int actionTag = data->getActionTag(); - if(_timelineMap.find(actionTag) != _timelineMap.end()) + + if(data) { - auto timelines = this->_timelineMap[actionTag]; - for (auto timeline : timelines) + int actionTag = data->getActionTag(); + if(_timelineMap.find(actionTag) != _timelineMap.end()) { - timeline->setNode(child); + auto timelines = this->_timelineMap[actionTag]; + for (auto timeline : timelines) + { + timeline->setNode(child); + } } } }); diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.h b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.h index 211f1d290a..ae8427002b 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.h +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.h @@ -27,10 +27,11 @@ THE SOFTWARE. #include "CCTimeLine.h" #include "renderer/CCRenderer.h" +#include "cocostudio/CocosStudioExport.h" NS_TIMELINE_BEGIN -class ActionTimelineData : public cocos2d::Ref +class CC_STUDIO_DLL ActionTimelineData : public cocos2d::Ref { public: static ActionTimelineData* create(int actionTag); @@ -45,7 +46,7 @@ protected: }; -class ActionTimeline : public cocos2d::Action +class CC_STUDIO_DLL ActionTimeline : public cocos2d::Action { public: friend class Frame; diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.h b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.h index 3f9547e822..c2b2ec4fe0 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.h +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.h @@ -28,6 +28,7 @@ THE SOFTWARE. #include "cocos2d.h" #include "cocostudio/DictionaryHelper.h" #include "CCTimelineMacro.h" +#include "cocostudio/CocosStudioExport.h" NS_TIMELINE_BEGIN @@ -35,7 +36,7 @@ class ActionTimeline; class Timeline; class Frame; -class ActionTimelineCache +class CC_STUDIO_DLL ActionTimelineCache { public: /** Gets the singleton */ diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.h b/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.h index c049eebd66..c0e28ec1a7 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.h +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.h @@ -27,12 +27,13 @@ THE SOFTWARE. #include "cocos2d.h" #include "CCTimelineMacro.h" +#include "cocostudio/CocosStudioExport.h" NS_TIMELINE_BEGIN class Timeline; -class Frame : public cocos2d::Ref +class CC_STUDIO_DLL Frame : public cocos2d::Ref { public: @@ -68,7 +69,7 @@ protected: }; -class VisibleFrame : public Frame +class CC_STUDIO_DLL VisibleFrame : public Frame { public: static VisibleFrame* create(); @@ -86,7 +87,7 @@ protected: }; -class TextureFrame : public Frame +class CC_STUDIO_DLL TextureFrame : public Frame { public: static TextureFrame* create(); @@ -106,7 +107,7 @@ protected: std::string _textureName; }; -class RotationFrame : public Frame +class CC_STUDIO_DLL RotationFrame : public Frame { public: static RotationFrame* create(); @@ -125,7 +126,7 @@ protected: float _betwennRotation; }; -class SkewFrame : public Frame +class CC_STUDIO_DLL SkewFrame : public Frame { public: static SkewFrame* create(); @@ -150,7 +151,7 @@ protected: }; -class RotationSkewFrame : public SkewFrame +class CC_STUDIO_DLL RotationSkewFrame : public SkewFrame { public: static RotationSkewFrame* create(); @@ -163,7 +164,7 @@ public: }; -class PositionFrame : public Frame +class CC_STUDIO_DLL PositionFrame : public Frame { public: static PositionFrame* create(); @@ -189,7 +190,7 @@ protected: }; -class ScaleFrame : public Frame +class CC_STUDIO_DLL ScaleFrame : public Frame { public: static ScaleFrame* create(); @@ -216,7 +217,7 @@ protected: }; -class AnchorPointFrame : public Frame +class CC_STUDIO_DLL AnchorPointFrame : public Frame { public: static AnchorPointFrame* create(); @@ -242,7 +243,7 @@ enum InnerActionType SingleFrame }; -class InnerActionFrame : public Frame +class CC_STUDIO_DLL InnerActionFrame : public Frame { public: static InnerActionFrame* create(); @@ -263,7 +264,7 @@ protected: }; -class ColorFrame : public Frame +class CC_STUDIO_DLL ColorFrame : public Frame { public: static ColorFrame* create(); @@ -290,7 +291,7 @@ protected: }; -class EventFrame : public Frame +class CC_STUDIO_DLL EventFrame : public Frame { public: static EventFrame* create(); @@ -307,7 +308,7 @@ protected: std::string _event; }; -class ZOrderFrame : public Frame +class CC_STUDIO_DLL ZOrderFrame : public Frame { public: static ZOrderFrame* create(); diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCNodeReader.cpp b/cocos/editor-support/cocostudio/ActionTimeline/CCNodeReader.cpp index 6d180fc4e2..c90ea748dc 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCNodeReader.cpp +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCNodeReader.cpp @@ -236,8 +236,20 @@ Node* NodeReader::loadNode(const rapidjson::Value& json) { const rapidjson::Value &dic = DICTOOL->getSubDictionary_json(json, CHILDREN, i); Node* child = loadNode(dic); - if (child) + if (child) { + auto widgetChild = dynamic_cast(child); + if (widgetChild + && dynamic_cast(node) + && !dynamic_cast(node)) + { + if (widgetChild->getPositionType() == ui::Widget::PositionType::PERCENT) + { + widgetChild->setPositionPercent(Vec2(widgetChild->getPositionPercent().x + node->getAnchorPoint().x, widgetChild->getPositionPercent().y + node->getAnchorPoint().y)); + } + widgetChild->setPosition(Vec2(widgetChild->getPositionX() + node->getAnchorPointInPoints().x, widgetChild->getPositionY() + node->getAnchorPointInPoints().y)); + } + node->addChild(child); child->release(); } diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCNodeReader.h b/cocos/editor-support/cocostudio/ActionTimeline/CCNodeReader.h index 669a3123ed..c45b99638c 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCNodeReader.h +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCNodeReader.h @@ -26,6 +26,7 @@ THE SOFTWARE. #define __CC_NODE_CACHE_H__ #include "cocostudio/DictionaryHelper.h" +#include "cocostudio/CocosStudioExport.h" #include "cocos2d.h" namespace cocostudio { @@ -33,7 +34,7 @@ namespace cocostudio { namespace timeline{ -class NodeReader +class CC_STUDIO_DLL NodeReader { public: static NodeReader* getInstance(); diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.h b/cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.h index d81f44488f..8228baed89 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.h +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.h @@ -27,12 +27,13 @@ THE SOFTWARE. #include "CCFrame.h" #include "CCTimelineMacro.h" +#include "cocostudio/CocosStudioExport.h" NS_TIMELINE_BEGIN class ActionTimeline; -class Timeline : public cocos2d::Ref +class CC_STUDIO_DLL Timeline : public cocos2d::Ref { public: static Timeline* create(); diff --git a/cocos/editor-support/cocostudio/Android.mk b/cocos/editor-support/cocostudio/Android.mk index d5efa765b3..3ae4b7fe27 100644 --- a/cocos/editor-support/cocostudio/Android.mk +++ b/cocos/editor-support/cocostudio/Android.mk @@ -71,13 +71,10 @@ $(LOCAL_PATH)/../.. LOCAL_CFLAGS += -fexceptions -LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static +LOCAL_WHOLE_STATIC_LIBRARIES := cocos_ui_static LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static -LOCAL_WHOLE_STATIC_LIBRARIES += cocos_ui_static include $(BUILD_STATIC_LIBRARY) -$(call import-module,.) -$(call import-module,audio/android) $(call import-module,ui) - +$(call import-module,audio/android) diff --git a/cocos/editor-support/cocostudio/CCActionFrame.h b/cocos/editor-support/cocostudio/CCActionFrame.h index 367aeb59ba..a6f71c6172 100644 --- a/cocos/editor-support/cocostudio/CCActionFrame.h +++ b/cocos/editor-support/cocostudio/CCActionFrame.h @@ -27,6 +27,7 @@ THE SOFTWARE. #include "math/CCGeometry.h" #include "2d/CCActionInterval.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { @@ -92,7 +93,7 @@ enum class FrameEaseType * @js NA * @lua NA */ -class ActionFrame: public cocos2d::Ref +class CC_STUDIO_DLL ActionFrame: public cocos2d::Ref { public: @@ -210,7 +211,7 @@ protected: * @js NA * @lua NA */ -class ActionMoveFrame:public ActionFrame +class CC_STUDIO_DLL ActionMoveFrame:public ActionFrame { public: @@ -254,7 +255,7 @@ protected: * @js NA * @lua NA */ -class ActionScaleFrame:public ActionFrame +class CC_STUDIO_DLL ActionScaleFrame:public ActionFrame { public: @@ -312,7 +313,7 @@ protected: * @js NA * @lua NA */ -class ActionRotationFrame:public ActionFrame +class CC_STUDIO_DLL ActionRotationFrame:public ActionFrame { public: @@ -365,7 +366,7 @@ public: * @js NA * @lua NA */ -class ActionFadeFrame:public ActionFrame +class CC_STUDIO_DLL ActionFadeFrame:public ActionFrame { public: @@ -408,7 +409,7 @@ protected: * @js NA * @lua NA */ -class ActionTintFrame:public ActionFrame +class CC_STUDIO_DLL ActionTintFrame:public ActionFrame { public: diff --git a/cocos/editor-support/cocostudio/CCActionFrameEasing.h b/cocos/editor-support/cocostudio/CCActionFrameEasing.h index 122f2dd219..ea67bf0500 100644 --- a/cocos/editor-support/cocostudio/CCActionFrameEasing.h +++ b/cocos/editor-support/cocostudio/CCActionFrameEasing.h @@ -26,6 +26,7 @@ THE SOFTWARE. #define __ActionFrameEasing_H__ #include "base/CCRef.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { @@ -56,7 +57,7 @@ enum FrameEasingType * @js NA * @lua NA */ -class ActionFrameEasing:public cocos2d::Ref +class CC_STUDIO_DLL ActionFrameEasing:public cocos2d::Ref { protected: FrameEasingType _type; diff --git a/cocos/editor-support/cocostudio/CCActionManagerEx.cpp b/cocos/editor-support/cocostudio/CCActionManagerEx.cpp index cf650bc7e2..76a15e0bba 100644 --- a/cocos/editor-support/cocostudio/CCActionManagerEx.cpp +++ b/cocos/editor-support/cocostudio/CCActionManagerEx.cpp @@ -42,7 +42,12 @@ ActionManagerEx* ActionManagerEx::getInstance() void ActionManagerEx::destroyInstance() { - CC_SAFE_DELETE(sharedActionManager); + if(sharedActionManager != nullptr) + { + sharedActionManager->releaseActions(); + CC_SAFE_DELETE(sharedActionManager); + } + } ActionManagerEx::ActionManagerEx() @@ -154,6 +159,13 @@ void ActionManagerEx::releaseActions() for (iter = _actionDic.begin(); iter != _actionDic.end(); iter++) { cocos2d::Vector objList = iter->second; + int listCount = objList.size(); + for (int i = 0; i < listCount; i++) { + ActionObject* action = objList.at(i); + if (action != nullptr) { + action->stop(); + } + } objList.clear(); } diff --git a/cocos/editor-support/cocostudio/CCActionManagerEx.h b/cocos/editor-support/cocostudio/CCActionManagerEx.h index ebea434825..5b4622c6cd 100644 --- a/cocos/editor-support/cocostudio/CCActionManagerEx.h +++ b/cocos/editor-support/cocostudio/CCActionManagerEx.h @@ -27,13 +27,14 @@ THE SOFTWARE. #include "cocostudio/CCActionObject.h" #include "cocostudio/DictionaryHelper.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { class CocoLoader; struct stExpCocoNode; -class ActionManagerEx:public cocos2d::Ref +class CC_STUDIO_DLL ActionManagerEx:public cocos2d::Ref { public: diff --git a/cocos/editor-support/cocostudio/CCActionNode.h b/cocos/editor-support/cocostudio/CCActionNode.h index 5b6da79620..f862bed64e 100644 --- a/cocos/editor-support/cocostudio/CCActionNode.h +++ b/cocos/editor-support/cocostudio/CCActionNode.h @@ -27,6 +27,7 @@ THE SOFTWARE. #include "cocostudio/CCActionFrame.h" #include "cocostudio/DictionaryHelper.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { @@ -36,7 +37,7 @@ struct stExpCocoNode; * @js NA * @lua NA */ -class ActionNode : public cocos2d::Ref +class CC_STUDIO_DLL ActionNode : public cocos2d::Ref { public: diff --git a/cocos/editor-support/cocostudio/CCActionObject.h b/cocos/editor-support/cocostudio/CCActionObject.h index 401a18431d..045c5a403d 100644 --- a/cocos/editor-support/cocostudio/CCActionObject.h +++ b/cocos/editor-support/cocostudio/CCActionObject.h @@ -28,6 +28,7 @@ THE SOFTWARE. #include "cocostudio/CCActionNode.h" #include "2d/CCActionInstant.h" #include "cocostudio/DictionaryHelper.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { @@ -38,7 +39,7 @@ struct stExpCocoNode; * @js NA * @lua NA */ -class ActionObject : public cocos2d::Ref +class CC_STUDIO_DLL ActionObject : public cocos2d::Ref { public: diff --git a/cocos/editor-support/cocostudio/CCArmature.cpp b/cocos/editor-support/cocostudio/CCArmature.cpp index d385cc1f4c..5a35a80c27 100644 --- a/cocos/editor-support/cocostudio/CCArmature.cpp +++ b/cocos/editor-support/cocostudio/CCArmature.cpp @@ -122,7 +122,7 @@ bool Armature::init(const std::string& name) _boneDic.clear(); _topBoneList.clear(); - _blendFunc = BlendFunc::ALPHA_NON_PREMULTIPLIED; + _blendFunc = BlendFunc::ALPHA_PREMULTIPLIED; _name = name; @@ -404,13 +404,20 @@ void Armature::draw(cocos2d::Renderer *renderer, const Mat4 &transform, uint32_t BlendFunc func = bone->getBlendFunc(); - if (func.src != _blendFunc.src || func.dst != _blendFunc.dst) + if (func.src != BlendFunc::ALPHA_PREMULTIPLIED.src || func.dst != BlendFunc::ALPHA_PREMULTIPLIED.dst) { skin->setBlendFunc(bone->getBlendFunc()); } else { - skin->setBlendFunc(_blendFunc); + if (_blendFunc == BlendFunc::ALPHA_PREMULTIPLIED && !skin->getTexture()->hasPremultipliedAlpha()) + { + skin->setBlendFunc(_blendFunc.ALPHA_NON_PREMULTIPLIED); + } + else + { + skin->setBlendFunc(_blendFunc); + } } skin->draw(renderer, transform, flags); } diff --git a/cocos/editor-support/cocostudio/CCArmature.h b/cocos/editor-support/cocostudio/CCArmature.h index 09cd53da8e..3ce0a58ac7 100644 --- a/cocos/editor-support/cocostudio/CCArmature.h +++ b/cocos/editor-support/cocostudio/CCArmature.h @@ -31,6 +31,7 @@ THE SOFTWARE. #include "cocostudio/CCArmatureAnimation.h" #include "cocostudio/CCSpriteFrameCacheHelper.h" #include "cocostudio/CCArmatureDataManager.h" +#include "cocostudio/CocosStudioExport.h" #include "math/CCMath.h" class b2Body; @@ -67,7 +68,7 @@ CC_DEPRECATED_ATTRIBUTE typedef Armature CCArmature; CC_DEPRECATED_ATTRIBUTE typedef ArmatureDataManager CCArmatureDataManager; CC_DEPRECATED_ATTRIBUTE typedef cocos2d::tweenfunc::TweenType CCTweenType; -class Armature : public cocos2d::Node, public cocos2d::BlendProtocol +class CC_STUDIO_DLL Armature : public cocos2d::Node, public cocos2d::BlendProtocol { public: diff --git a/cocos/editor-support/cocostudio/CCArmatureAnimation.h b/cocos/editor-support/cocostudio/CCArmatureAnimation.h index 6514694419..04ab3af4f1 100644 --- a/cocos/editor-support/cocostudio/CCArmatureAnimation.h +++ b/cocos/editor-support/cocostudio/CCArmatureAnimation.h @@ -28,6 +28,7 @@ THE SOFTWARE. #include "cocostudio/CCProcessBase.h" #include "cocostudio/CCTween.h" +#include "cocostudio/CocosStudioExport.h" #include namespace cocostudio { @@ -65,7 +66,7 @@ struct MovementEvent std::string movementID; }; -class ArmatureAnimation : public ProcessBase +class CC_STUDIO_DLL ArmatureAnimation : public ProcessBase { public: /** diff --git a/cocos/editor-support/cocostudio/CCArmatureDataManager.h b/cocos/editor-support/cocostudio/CCArmatureDataManager.h index 0375890180..a42072528f 100644 --- a/cocos/editor-support/cocostudio/CCArmatureDataManager.h +++ b/cocos/editor-support/cocostudio/CCArmatureDataManager.h @@ -27,7 +27,7 @@ THE SOFTWARE. #include "cocostudio/CCArmatureDefine.h" #include "cocostudio/CCDatas.h" - +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { @@ -42,7 +42,7 @@ struct RelativeData /** * @brief format and manage armature configuration and armature animation */ -class ArmatureDataManager : public cocos2d::Ref +class CC_STUDIO_DLL ArmatureDataManager : public cocos2d::Ref { public: /** @deprecated Use getInstance() instead */ diff --git a/cocos/editor-support/cocostudio/CCBatchNode.h b/cocos/editor-support/cocostudio/CCBatchNode.h index 031a939f00..bb52eba815 100644 --- a/cocos/editor-support/cocostudio/CCBatchNode.h +++ b/cocos/editor-support/cocostudio/CCBatchNode.h @@ -27,6 +27,7 @@ THE SOFTWARE. #include "2d/CCNode.h" #include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CocosStudioExport.h" namespace cocos2d { class GroupCommand; @@ -34,7 +35,7 @@ namespace cocos2d { namespace cocostudio { -class BatchNode : public cocos2d::Node +class CC_STUDIO_DLL BatchNode : public cocos2d::Node { public: static BatchNode *create(); diff --git a/cocos/editor-support/cocostudio/CCBone.cpp b/cocos/editor-support/cocostudio/CCBone.cpp index 7a446d1521..2b110c9f94 100644 --- a/cocos/editor-support/cocostudio/CCBone.cpp +++ b/cocos/editor-support/cocostudio/CCBone.cpp @@ -74,7 +74,7 @@ Bone::Bone() // _worldTransform = AffineTransformMake(1, 0, 0, 1, 0, 0); _worldTransform = Mat4::IDENTITY; _boneTransformDirty = true; - _blendFunc = BlendFunc::ALPHA_NON_PREMULTIPLIED; + _blendFunc = BlendFunc::ALPHA_PREMULTIPLIED; _blendDirty = false; _worldInfo = nullptr; diff --git a/cocos/editor-support/cocostudio/CCBone.h b/cocos/editor-support/cocostudio/CCBone.h index bda4366fce..ec7661b380 100644 --- a/cocos/editor-support/cocostudio/CCBone.h +++ b/cocos/editor-support/cocostudio/CCBone.h @@ -30,6 +30,7 @@ THE SOFTWARE. #include "cocostudio/CCTween.h" #include "cocostudio/CCDecorativeDisplay.h" #include "cocostudio/CCDisplayManager.h" +#include "cocostudio/CocosStudioExport.h" #include "2d/CCNode.h" #include "math/CCMath.h" @@ -37,7 +38,7 @@ namespace cocostudio { class Armature; -class Bone : public cocos2d::Node +class CC_STUDIO_DLL Bone : public cocos2d::Node { public: /** diff --git a/cocos/editor-support/cocostudio/CCColliderDetector.h b/cocos/editor-support/cocostudio/CCColliderDetector.h index 91ed2dc26a..3ddc289a6e 100644 --- a/cocos/editor-support/cocostudio/CCColliderDetector.h +++ b/cocos/editor-support/cocostudio/CCColliderDetector.h @@ -27,6 +27,7 @@ THE SOFTWARE. #include "cocostudio/CCArmatureDefine.h" #include "cocostudio/CCDatas.h" +#include "cocostudio/CocosStudioExport.h" #ifndef PT_RATIO #define PT_RATIO 32 @@ -48,7 +49,7 @@ class Bone; * @js NA * @lua NA */ -class ColliderFilter +class CC_STUDIO_DLL ColliderFilter { public: virtual ~ColliderFilter() { } @@ -85,7 +86,7 @@ protected: #endif }; -class ColliderBody : public cocos2d::Ref +class CC_STUDIO_DLL ColliderBody : public cocos2d::Ref { public: ColliderBody(ContourData *contourData); @@ -130,7 +131,7 @@ private: * @js NA * @lua NA */ -class ColliderDetector : public cocos2d::Ref +class CC_STUDIO_DLL ColliderDetector : public cocos2d::Ref { public: static ColliderDetector *create(); diff --git a/cocos/editor-support/cocostudio/CCComAttribute.h b/cocos/editor-support/cocostudio/CCComAttribute.h index 5feecf2595..b97a000f73 100644 --- a/cocos/editor-support/cocostudio/CCComAttribute.h +++ b/cocos/editor-support/cocostudio/CCComAttribute.h @@ -28,13 +28,14 @@ THE SOFTWARE. #include "CCComBase.h" #include "2d/CCComponent.h" #include "base/CCValue.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { -class ComAttribute : public cocos2d::Component +class CC_STUDIO_DLL ComAttribute : public cocos2d::Component { DECLARE_CLASS_COMPONENT_INFO -protected: +public: /** * @js ctor */ diff --git a/cocos/editor-support/cocostudio/CCComAudio.h b/cocos/editor-support/cocostudio/CCComAudio.h index 1643082307..d91dbe7bee 100644 --- a/cocos/editor-support/cocostudio/CCComAudio.h +++ b/cocos/editor-support/cocostudio/CCComAudio.h @@ -27,14 +27,16 @@ THE SOFTWARE. #include "CCComBase.h" #include "2d/CCComponent.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { -class ComAudio : public cocos2d::Component +class CC_STUDIO_DLL ComAudio : public cocos2d::Component { DECLARE_CLASS_COMPONENT_INFO -protected: + +public: /** * @js ctor */ diff --git a/cocos/editor-support/cocostudio/CCComBase.h b/cocos/editor-support/cocostudio/CCComBase.h index 6d526b60ce..21750ab22b 100644 --- a/cocos/editor-support/cocostudio/CCComBase.h +++ b/cocos/editor-support/cocostudio/CCComBase.h @@ -27,6 +27,7 @@ THE SOFTWARE. #include #include "DictionaryHelper.h" +#include "cocostudio/CocosStudioExport.h" #include "base/ObjectFactory.h" #include "CocoLoader.h" @@ -46,7 +47,7 @@ THE SOFTWARE. #define CREATE_CLASS_COMPONENT_INFO(className) \ cocos2d::ObjectFactory::TInfo(#className, &className::createInstance) -struct SerData +struct CC_STUDIO_DLL SerData { const rapidjson::Value *_rData; cocostudio::stExpCocoNode *_cocoNode; diff --git a/cocos/editor-support/cocostudio/CCComController.h b/cocos/editor-support/cocostudio/CCComController.h index 4428d93f89..8a3ad4f32a 100644 --- a/cocos/editor-support/cocostudio/CCComController.h +++ b/cocos/editor-support/cocostudio/CCComController.h @@ -27,11 +27,12 @@ THE SOFTWARE. #include "CCComBase.h" #include "cocostudio/CCInputDelegate.h" +#include "cocostudio/CocosStudioExport.h" #include "2d/CCComponent.h" namespace cocostudio { -class ComController : public cocos2d::Component, public InputDelegate +class CC_STUDIO_DLL ComController : public cocos2d::Component, public InputDelegate { DECLARE_CLASS_COMPONENT_INFO diff --git a/cocos/editor-support/cocostudio/CCComRender.h b/cocos/editor-support/cocostudio/CCComRender.h index 9598ec57ab..0ff90d979c 100644 --- a/cocos/editor-support/cocostudio/CCComRender.h +++ b/cocos/editor-support/cocostudio/CCComRender.h @@ -27,10 +27,11 @@ THE SOFTWARE. #include "CCComBase.h" #include "2d/CCComponent.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { -class ComRender : public cocos2d::Component +class CC_STUDIO_DLL ComRender : public cocos2d::Component { DECLARE_CLASS_COMPONENT_INFO protected: diff --git a/cocos/editor-support/cocostudio/CCDataReaderHelper.cpp b/cocos/editor-support/cocostudio/CCDataReaderHelper.cpp index 22b076371c..729fdc95da 100644 --- a/cocos/editor-support/cocostudio/CCDataReaderHelper.cpp +++ b/cocos/editor-support/cocostudio/CCDataReaderHelper.cpp @@ -1050,7 +1050,7 @@ FrameData *DataReaderHelper::decodeFrame(tinyxml2::XMLElement *frameXML, tinyxm { case BLEND_NORMAL: { - frameData->blendFunc = BlendFunc::ALPHA_NON_PREMULTIPLIED; + frameData->blendFunc = BlendFunc::ALPHA_PREMULTIPLIED; } break; case BLEND_ADD: @@ -1614,8 +1614,8 @@ FrameData *DataReaderHelper::decodeFrame(const rapidjson::Value& json, DataInfo frameData->tweenEasing = (TweenType)(DICTOOL->getIntValue_json(json, A_TWEEN_EASING, cocos2d::tweenfunc::Linear)); frameData->displayIndex = DICTOOL->getIntValue_json(json, A_DISPLAY_INDEX); - frameData->blendFunc.src = (GLenum)(DICTOOL->getIntValue_json(json, A_BLEND_SRC, BlendFunc::ALPHA_NON_PREMULTIPLIED.src)); - frameData->blendFunc.dst = (GLenum)(DICTOOL->getIntValue_json(json, A_BLEND_DST, BlendFunc::ALPHA_NON_PREMULTIPLIED.dst)); + frameData->blendFunc.src = (GLenum)(DICTOOL->getIntValue_json(json, A_BLEND_SRC, BlendFunc::ALPHA_PREMULTIPLIED.src)); + frameData->blendFunc.dst = (GLenum)(DICTOOL->getIntValue_json(json, A_BLEND_DST, BlendFunc::ALPHA_PREMULTIPLIED.dst)); frameData->isTween = DICTOOL->getBooleanValue_json(json, A_TWEEN_FRAME, true); const char *event = DICTOOL->getStringValue_json(json, A_EVENT); diff --git a/cocos/editor-support/cocostudio/CCDataReaderHelper.h b/cocos/editor-support/cocostudio/CCDataReaderHelper.h index 2401d710d0..4e8b941f5a 100644 --- a/cocos/editor-support/cocostudio/CCDataReaderHelper.h +++ b/cocos/editor-support/cocostudio/CCDataReaderHelper.h @@ -29,6 +29,7 @@ THE SOFTWARE. #include "cocostudio/CCDatas.h" #include "cocostudio/CCArmature.h" #include "cocostudio/DictionaryHelper.h" +#include "cocostudio/CocosStudioExport.h" #include "json/document.h" #include "DictionaryHelper.h" @@ -52,7 +53,7 @@ namespace cocostudio { * @js NA * @lua NA */ -class DataReaderHelper : cocos2d::Ref +class CC_STUDIO_DLL DataReaderHelper : cocos2d::Ref { protected: diff --git a/cocos/editor-support/cocostudio/CCDatas.cpp b/cocos/editor-support/cocostudio/CCDatas.cpp index 94a35ca249..33fda0a4d3 100644 --- a/cocos/editor-support/cocostudio/CCDatas.cpp +++ b/cocos/editor-support/cocostudio/CCDatas.cpp @@ -254,7 +254,7 @@ FrameData::FrameData(void) , easingParams(nullptr) , isTween(true) , displayIndex(0) - , blendFunc(BlendFunc::ALPHA_NON_PREMULTIPLIED) + , blendFunc(BlendFunc::ALPHA_PREMULTIPLIED) , strEvent("") , strMovement("") diff --git a/cocos/editor-support/cocostudio/CCDatas.h b/cocos/editor-support/cocostudio/CCDatas.h index 84eb57679d..2eac5f9511 100644 --- a/cocos/editor-support/cocostudio/CCDatas.h +++ b/cocos/editor-support/cocostudio/CCDatas.h @@ -33,6 +33,7 @@ THE SOFTWARE. #include "cocostudio/CCArmatureDefine.h" #include "2d/CCTweenFunction.h" +#include "cocostudio/CocosStudioExport.h" #define CC_CREATE_NO_PARAM_NO_INIT(varType)\ @@ -68,7 +69,7 @@ namespace cocostudio { * @js NA * @lua NA */ -class BaseData : public cocos2d::Ref +class CC_STUDIO_DLL BaseData : public cocos2d::Ref { public: CC_CREATE_NO_PARAM_NO_INIT(BaseData) @@ -137,7 +138,7 @@ enum DisplayType * @js NA * @lua NA */ -class DisplayData : public cocos2d::Ref +class CC_STUDIO_DLL DisplayData : public cocos2d::Ref { public: CC_CREATE_NO_PARAM_NO_INIT(DisplayData) @@ -165,7 +166,7 @@ public: * @js NA * @lua NA */ -class SpriteDisplayData : public DisplayData +class CC_STUDIO_DLL SpriteDisplayData : public DisplayData { public: CC_CREATE_NO_PARAM_NO_INIT(SpriteDisplayData) @@ -189,7 +190,7 @@ public: * @js NA * @lua NA */ -class ArmatureDisplayData : public DisplayData +class CC_STUDIO_DLL ArmatureDisplayData : public DisplayData { public: CC_CREATE_NO_PARAM_NO_INIT(ArmatureDisplayData) @@ -209,7 +210,7 @@ public: * @js NA * @lua NA */ -class ParticleDisplayData : public DisplayData +class CC_STUDIO_DLL ParticleDisplayData : public DisplayData { public: CC_CREATE_NO_PARAM_NO_INIT(ParticleDisplayData) @@ -234,7 +235,7 @@ public: * @js NA * @lua NA */ -class BoneData : public BaseData +class CC_STUDIO_DLL BoneData : public BaseData { public: CC_CREATE_NO_PARAM(BoneData) @@ -268,7 +269,7 @@ public: * @js NA * @lua NA */ -class ArmatureData : public cocos2d::Ref +class CC_STUDIO_DLL ArmatureData : public cocos2d::Ref { public: CC_CREATE_NO_PARAM(ArmatureData) @@ -314,7 +315,7 @@ enum BlendType * @js NA * @lua NA */ -class FrameData : public BaseData +class CC_STUDIO_DLL FrameData : public BaseData { public: CC_CREATE_NO_PARAM_NO_INIT(FrameData) @@ -361,7 +362,7 @@ public: * @js NA * @lua NA */ -class MovementBoneData : public cocos2d::Ref +class CC_STUDIO_DLL MovementBoneData : public cocos2d::Ref { public: CC_CREATE_NO_PARAM(MovementBoneData) @@ -393,7 +394,7 @@ public: * @js NA * @lua NA */ -class MovementData : public cocos2d::Ref +class CC_STUDIO_DLL MovementData : public cocos2d::Ref { public: CC_CREATE_NO_PARAM_NO_INIT(MovementData) @@ -455,7 +456,7 @@ public: * @js NA * @lua NA */ -class AnimationData : public cocos2d::Ref +class CC_STUDIO_DLL AnimationData : public cocos2d::Ref { public: CC_CREATE_NO_PARAM_NO_INIT(AnimationData) @@ -486,7 +487,7 @@ public: * @js NA * @lua NA */ -class ContourData : public cocos2d::Ref +class CC_STUDIO_DLL ContourData : public cocos2d::Ref { public: CC_CREATE_NO_PARAM(ContourData) @@ -515,7 +516,7 @@ public: * @js NA * @lua NA */ -class TextureData : public cocos2d::Ref +class CC_STUDIO_DLL TextureData : public cocos2d::Ref { public: CC_CREATE_NO_PARAM(TextureData) diff --git a/cocos/editor-support/cocostudio/CCDecorativeDisplay.h b/cocos/editor-support/cocostudio/CCDecorativeDisplay.h index 1902565550..9a880b385f 100644 --- a/cocos/editor-support/cocostudio/CCDecorativeDisplay.h +++ b/cocos/editor-support/cocostudio/CCDecorativeDisplay.h @@ -28,6 +28,7 @@ THE SOFTWARE. #include "cocostudio/CCArmatureDefine.h" #include "cocostudio/CCDisplayFactory.h" #include "cocostudio/CCDatas.h" +#include "cocostudio/CocosStudioExport.h" #if ENABLE_PHYSICS_BOX2D_DETECT || ENABLE_PHYSICS_CHIPMUNK_DETECT || ENABLE_PHYSICS_SAVE_CALCULATED_VERTEX @@ -43,7 +44,7 @@ namespace cocostudio { * @js NA * @lua NA */ -class DecorativeDisplay: public cocos2d::Ref +class CC_STUDIO_DLL DecorativeDisplay: public cocos2d::Ref { public: static DecorativeDisplay *create(); diff --git a/cocos/editor-support/cocostudio/CCDisplayFactory.h b/cocos/editor-support/cocostudio/CCDisplayFactory.h index 3c94dc8d3b..037395bc31 100644 --- a/cocos/editor-support/cocostudio/CCDisplayFactory.h +++ b/cocos/editor-support/cocostudio/CCDisplayFactory.h @@ -27,6 +27,8 @@ THE SOFTWARE. #include "cocostudio/CCArmatureDefine.h" #include "cocostudio/CCDatas.h" +#include "cocostudio/CocosStudioExport.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { @@ -38,7 +40,7 @@ class DisplayData; * @js NA * @lua NA */ -class DisplayFactory +class CC_STUDIO_DLL DisplayFactory { public: static void addDisplay(Bone *bone, DecorativeDisplay *decoDisplay, DisplayData *displayData); diff --git a/cocos/editor-support/cocostudio/CCDisplayManager.h b/cocos/editor-support/cocostudio/CCDisplayManager.h index b4010c4eac..2f7b5e0f60 100644 --- a/cocos/editor-support/cocostudio/CCDisplayManager.h +++ b/cocos/editor-support/cocostudio/CCDisplayManager.h @@ -28,6 +28,7 @@ THE SOFTWARE. #include "cocostudio/CCArmatureDefine.h" #include "cocostudio/CCDecorativeDisplay.h" #include "cocostudio/CCDatas.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { @@ -37,7 +38,7 @@ class Bone; * @js NA * @lua NA */ -class DisplayManager : public cocos2d::Ref +class CC_STUDIO_DLL DisplayManager : public cocos2d::Ref { public: static DisplayManager *create(Bone *bone); diff --git a/cocos/editor-support/cocostudio/CCInputDelegate.h b/cocos/editor-support/cocostudio/CCInputDelegate.h index 89ef95b6c2..fb41d543d0 100644 --- a/cocos/editor-support/cocostudio/CCInputDelegate.h +++ b/cocos/editor-support/cocostudio/CCInputDelegate.h @@ -31,6 +31,7 @@ THE SOFTWARE. #include "base/ccTypes.h" #include "base/CCEventKeyboard.h" #include "base/CCEventListener.h" +#include "cocostudio/CocosStudioExport.h" namespace cocos2d { class __Set; @@ -41,7 +42,7 @@ namespace cocostudio { /** * @lua NA */ -class InputDelegate +class CC_STUDIO_DLL InputDelegate { protected: /** diff --git a/cocos/editor-support/cocostudio/CCProcessBase.h b/cocos/editor-support/cocostudio/CCProcessBase.h index 59f0824f6b..b2acabee6b 100644 --- a/cocos/editor-support/cocostudio/CCProcessBase.h +++ b/cocos/editor-support/cocostudio/CCProcessBase.h @@ -27,6 +27,7 @@ THE SOFTWARE. #include "cocostudio/CCArmatureDefine.h" #include "cocostudio/CCDatas.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { @@ -50,7 +51,7 @@ enum AnimationType * @js NA * @lua NA */ -class ProcessBase : public cocos2d::Ref +class CC_STUDIO_DLL ProcessBase : public cocos2d::Ref { public: ProcessBase(void); diff --git a/cocos/editor-support/cocostudio/CCSGUIReader.h b/cocos/editor-support/cocostudio/CCSGUIReader.h index c5a798a878..89f27a6a1b 100644 --- a/cocos/editor-support/cocostudio/CCSGUIReader.h +++ b/cocos/editor-support/cocostudio/CCSGUIReader.h @@ -25,10 +25,11 @@ THE SOFTWARE. #ifndef __CCSGUIREADER_H__ #define __CCSGUIREADER_H__ -#include "ui/UIWidget.h" +#include "ui/UILayout.h" #include "cocostudio/DictionaryHelper.h" #include "WidgetReader/WidgetReaderProtocol.h" #include "base/ObjectFactory.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { @@ -41,7 +42,7 @@ namespace cocostudio { typedef void (cocos2d::Ref::*SEL_ParseEvent)(const std::string&, cocos2d::Ref*, const rapidjson::Value&); #define parseselector(_SELECTOR) (SEL_ParseEvent)(&_SELECTOR) -class GUIReader : public cocos2d::Ref +class CC_STUDIO_DLL GUIReader : public cocos2d::Ref { public: CC_DEPRECATED_ATTRIBUTE static GUIReader* shareReader() { return GUIReader::getInstance(); }; @@ -89,7 +90,7 @@ public: }; -class WidgetPropertiesReader : public cocos2d::Ref +class CC_STUDIO_DLL WidgetPropertiesReader : public cocos2d::Ref { public: virtual cocos2d::ui::Widget* createWidget(const rapidjson::Value& dic, const char* fullPath, const char* fileName)=0; @@ -124,7 +125,7 @@ protected: }; -class WidgetPropertiesReader0250 : public WidgetPropertiesReader +class CC_STUDIO_DLL WidgetPropertiesReader0250 : public WidgetPropertiesReader { @@ -171,7 +172,7 @@ public: const rapidjson::Value& customOptions); }; -class WidgetPropertiesReader0300 : public WidgetPropertiesReader +class CC_STUDIO_DLL WidgetPropertiesReader0300 : public WidgetPropertiesReader { diff --git a/cocos/editor-support/cocostudio/CCSSceneReader.h b/cocos/editor-support/cocostudio/CCSSceneReader.h index 7d982858b2..e4fa36087d 100644 --- a/cocos/editor-support/cocostudio/CCSSceneReader.h +++ b/cocos/editor-support/cocostudio/CCSSceneReader.h @@ -26,12 +26,12 @@ THE SOFTWARE. #define __CCSSCENEREADER_H__ #include "cocostudio/DictionaryHelper.h" - +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { -class SceneReader +class CC_STUDIO_DLL SceneReader { public: diff --git a/cocos/editor-support/cocostudio/CCSkin.h b/cocos/editor-support/cocostudio/CCSkin.h index 67f409274c..1987eb968a 100644 --- a/cocos/editor-support/cocostudio/CCSkin.h +++ b/cocos/editor-support/cocostudio/CCSkin.h @@ -30,10 +30,11 @@ THE SOFTWARE. #include "cocostudio/CCArmatureDefine.h" #include "cocostudio/CCBone.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { -class Skin : public cocos2d::Sprite +class CC_STUDIO_DLL Skin : public cocos2d::Sprite { public: static Skin *create(); diff --git a/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.h b/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.h index 3c50ae7e4b..6a98a8ead5 100644 --- a/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.h +++ b/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.h @@ -26,6 +26,7 @@ THE SOFTWARE. #include "base/CCPlatformMacros.h" #include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CocosStudioExport.h" #include #include @@ -35,7 +36,7 @@ namespace cocostudio { * @js NA * @lua NA */ -class SpriteFrameCacheHelper +class CC_STUDIO_DLL SpriteFrameCacheHelper { public: /** @deprecated Use getInstance() instead */ diff --git a/cocos/editor-support/cocostudio/CCTransformHelp.h b/cocos/editor-support/cocostudio/CCTransformHelp.h index ec93a2ac55..452257fb3e 100644 --- a/cocos/editor-support/cocostudio/CCTransformHelp.h +++ b/cocos/editor-support/cocostudio/CCTransformHelp.h @@ -27,6 +27,7 @@ THE SOFTWARE. #include "cocostudio/CCArmatureDefine.h" #include "cocostudio/CCDatas.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { @@ -35,7 +36,7 @@ namespace cocostudio { * @js NA * @lua NA */ -class TransformHelp +class CC_STUDIO_DLL TransformHelp { public: TransformHelp(); diff --git a/cocos/editor-support/cocostudio/CCTween.h b/cocos/editor-support/cocostudio/CCTween.h index c12f9c7b46..1eeda5da47 100644 --- a/cocos/editor-support/cocostudio/CCTween.h +++ b/cocos/editor-support/cocostudio/CCTween.h @@ -28,6 +28,7 @@ THE SOFTWARE. #include "cocostudio/CCProcessBase.h" #include "2d/CCTweenFunction.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { @@ -39,7 +40,7 @@ using cocos2d::tweenfunc::TweenType; * @js NA * @lua NA */ -class Tween : public ProcessBase +class CC_STUDIO_DLL Tween : public ProcessBase { public: /** diff --git a/cocos/editor-support/cocostudio/CCUtilMath.h b/cocos/editor-support/cocostudio/CCUtilMath.h index 5a4827bf44..46868313b5 100644 --- a/cocos/editor-support/cocostudio/CCUtilMath.h +++ b/cocos/editor-support/cocostudio/CCUtilMath.h @@ -27,6 +27,7 @@ THE SOFTWARE. #include "2d/CCSprite.h" #include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CocosStudioExport.h" #include namespace cocostudio { @@ -37,18 +38,18 @@ namespace cocostudio { //! hit test function -bool isSpriteContainPoint(cocos2d::Sprite *sprite, cocos2d::Vec2 point); -bool isSpriteContainPoint(cocos2d::Sprite *sprite, cocos2d::Vec2 point, cocos2d::Vec2 &outPoint); +bool CC_STUDIO_DLL isSpriteContainPoint(cocos2d::Sprite *sprite, cocos2d::Vec2 point); +bool CC_STUDIO_DLL isSpriteContainPoint(cocos2d::Sprite *sprite, cocos2d::Vec2 point, cocos2d::Vec2 &outPoint); #define CC_SPRITE_CONTAIN_POINT(sprite, point) isSpriteContainPoint((sprite), (point)) #define CC_SPRITE_CONTAIN_POINT_WITH_RETURN(sprite, point, outPoint) isSpriteContainPoint((sprite), (point), outPoint) //! motion curve function -cocos2d::Vec2 bezierTo(float t, cocos2d::Vec2 &point1, cocos2d::Vec2 &point2, cocos2d::Vec2 &point3); -cocos2d::Vec2 bezierTo(float t, cocos2d::Vec2 &point1, cocos2d::Vec2 &point2, cocos2d::Vec2 &point3, cocos2d::Vec2 &point4); +cocos2d::Vec2 CC_STUDIO_DLL bezierTo(float t, cocos2d::Vec2 &point1, cocos2d::Vec2 &point2, cocos2d::Vec2 &point3); +cocos2d::Vec2 CC_STUDIO_DLL bezierTo(float t, cocos2d::Vec2 &point1, cocos2d::Vec2 &point2, cocos2d::Vec2 &point3, cocos2d::Vec2 &point4); -cocos2d::Vec2 circleTo(float t, cocos2d::Vec2 ¢er, float radius, float fromRadian, float radianDif); +cocos2d::Vec2 CC_STUDIO_DLL circleTo(float t, cocos2d::Vec2 ¢er, float radius, float fromRadian, float radianDif); } diff --git a/cocos/editor-support/cocostudio/CocoLoader.h b/cocos/editor-support/cocostudio/CocoLoader.h index b54681aaa6..29d0983e4d 100644 --- a/cocos/editor-support/cocostudio/CocoLoader.h +++ b/cocos/editor-support/cocostudio/CocoLoader.h @@ -31,6 +31,7 @@ #include #include "json/rapidjson.h" #include "json/document.h" +#include "cocostudio/CocosStudioExport.h" #pragma pack (4) @@ -38,7 +39,7 @@ namespace cocostudio{ class CocoLoader; -struct stExpCocoAttribDesc +struct CC_STUDIO_DLL stExpCocoAttribDesc { char m_cTypeName; uint32_t m_szName; @@ -46,7 +47,7 @@ public: char* GetName(CocoLoader* pCoco); }; -struct stExpCocoObjectDesc +struct CC_STUDIO_DLL stExpCocoObjectDesc { unsigned char m_cAttribNum; uint32_t m_szName; @@ -57,7 +58,7 @@ public: stExpCocoAttribDesc* GetAttribDescArray(CocoLoader* pCoco); }; -struct stExpCocoNode +struct CC_STUDIO_DLL stExpCocoNode { public: int16_t m_ObjIndex; @@ -75,7 +76,7 @@ public: void WriteJson(CocoLoader* pCoco,void* pFileName = nullptr, int vLayer = 0, bool bEndNode = false, bool bParentNodeIsArray = false); }; -struct stCocoFileHeader +struct CC_STUDIO_DLL stCocoFileHeader { char m_FileDesc[32]; char m_Version[32]; @@ -88,7 +89,7 @@ struct stCocoFileHeader }; -class CocoLoader +class CC_STUDIO_DLL CocoLoader { stCocoFileHeader* m_pFileHeader; stExpCocoNode* m_pRootNode; diff --git a/cocos/editor-support/cocostudio/CocoStudio.h b/cocos/editor-support/cocostudio/CocoStudio.h index 29d8319a38..ea49115db8 100644 --- a/cocos/editor-support/cocostudio/CocoStudio.h +++ b/cocos/editor-support/cocostudio/CocoStudio.h @@ -63,5 +63,6 @@ THE SOFTWARE. #include "cocostudio/ActionTimeline/CCFrame.h" #include "cocostudio/ActionTimeline/CCTimeLine.h" #include "cocostudio/ActionTimeline/CCActionTimeline.h" +#include "cocostudio/CocosStudioExport.h" #endif diff --git a/cocos/editor-support/cocostudio/CocosStudioExport.h b/cocos/editor-support/cocostudio/CocosStudioExport.h new file mode 100644 index 0000000000..552aad7519 --- /dev/null +++ b/cocos/editor-support/cocostudio/CocosStudioExport.h @@ -0,0 +1,28 @@ +#ifndef __CCCOCOSSTUDIO_H__ +#define __CCCOCOSSTUDIO_H__ + +#if defined(WIN32) && defined(_WINDOWS) + #ifdef __MINGW32__ + #include + #endif + + #if defined(_USRSTUDIODLL) + #define CC_STUDIO_DLL __declspec(dllexport) + #else /* use a DLL library */ + #define CC_STUDIO_DLL __declspec(dllimport) + #endif + + + /* Define NULL pointer value */ + #ifndef NULL + #ifdef __cplusplus + #define NULL 0 + #else + #define NULL ((void *)0) + #endif + #endif +#else + #define CC_STUDIO_DLL +#endif + +#endif /* __CCEXTENSIONEXPORT_H__*/ \ No newline at end of file diff --git a/cocos/editor-support/cocostudio/DictionaryHelper.h b/cocos/editor-support/cocostudio/DictionaryHelper.h index cefb9610ff..2107008818 100644 --- a/cocos/editor-support/cocostudio/DictionaryHelper.h +++ b/cocos/editor-support/cocostudio/DictionaryHelper.h @@ -26,6 +26,7 @@ THE SOFTWARE. #define __DICTIONARYHELPER_H__ #include "json/document.h" +#include "cocostudio/CocosStudioExport.h" #define DICTOOL DictionaryHelper::getInstance() @@ -34,7 +35,7 @@ namespace cocostudio { * @js NA * @lua NA */ -class DictionaryHelper +class CC_STUDIO_DLL DictionaryHelper { public: DictionaryHelper(); diff --git a/cocos/editor-support/cocostudio/TriggerBase.h b/cocos/editor-support/cocostudio/TriggerBase.h index c5c6fe5c6f..31dc0c0308 100755 --- a/cocos/editor-support/cocostudio/TriggerBase.h +++ b/cocos/editor-support/cocostudio/TriggerBase.h @@ -30,6 +30,7 @@ THE SOFTWARE. #include "base/ObjectFactory.h" #include "TriggerObj.h" #include "TriggerMng.h" +#include "cocostudio/CocosStudioExport.h" #define DECLARE_CLASS_INFO \ @@ -47,7 +48,7 @@ THE SOFTWARE. cocos2d::ObjectFactory::TInfo className::Type(#className, &className::createInstance); \ -void sendEvent(unsigned int event); +void CC_STUDIO_DLL sendEvent(unsigned int event); #endif diff --git a/cocos/editor-support/cocostudio/TriggerMng.h b/cocos/editor-support/cocostudio/TriggerMng.h index afae1d2eb5..7d43eb5e74 100755 --- a/cocos/editor-support/cocostudio/TriggerMng.h +++ b/cocos/editor-support/cocostudio/TriggerMng.h @@ -36,7 +36,7 @@ namespace cocostudio { class TriggerObj; -class ArmatureMovementDispatcher : public cocos2d::Ref +class CC_STUDIO_DLL ArmatureMovementDispatcher : public cocos2d::Ref { public: ArmatureMovementDispatcher(void); @@ -51,7 +51,7 @@ private: }; -class TriggerMng +class CC_STUDIO_DLL TriggerMng { public: TriggerMng(void); diff --git a/cocos/editor-support/cocostudio/TriggerObj.h b/cocos/editor-support/cocostudio/TriggerObj.h index e026cc738a..464c0d98f7 100755 --- a/cocos/editor-support/cocostudio/TriggerObj.h +++ b/cocos/editor-support/cocostudio/TriggerObj.h @@ -35,7 +35,7 @@ class EventListenerCustom; namespace cocostudio { -class BaseTriggerCondition : public cocos2d::Ref +class CC_STUDIO_DLL BaseTriggerCondition : public cocos2d::Ref { protected: BaseTriggerCondition(void); @@ -48,7 +48,7 @@ public: virtual void removeAll(); }; -class BaseTriggerAction : public cocos2d::Ref +class CC_STUDIO_DLL BaseTriggerAction : public cocos2d::Ref { protected: BaseTriggerAction(void); @@ -62,7 +62,7 @@ public: }; -class TriggerObj : public cocos2d::Ref +class CC_STUDIO_DLL TriggerObj : public cocos2d::Ref { public: TriggerObj(void); diff --git a/cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.h b/cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.h index d2ba76cbde..4b9bb4f91d 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.h @@ -26,10 +26,11 @@ #define __TestCpp__ButtonReader__ #include "../WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { - class ButtonReader : public WidgetReader + class CC_STUDIO_DLL ButtonReader : public WidgetReader { public: DECLARE_CLASS_WIDGET_READER_INFO diff --git a/cocos/editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.h b/cocos/editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.h index 1c934dfb99..f512b08b2d 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.h @@ -26,10 +26,11 @@ #define __TestCpp__CheckBoxReader__ #include "../WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { - class CheckBoxReader : public WidgetReader + class CC_STUDIO_DLL CheckBoxReader : public WidgetReader { public: DECLARE_CLASS_WIDGET_READER_INFO diff --git a/cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.h b/cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.h index 27dd31eab5..2d890eaf14 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.h @@ -26,10 +26,11 @@ #define __TestCpp__ImageViewReader__ #include "../WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { - class ImageViewReader : public WidgetReader + class CC_STUDIO_DLL ImageViewReader : public WidgetReader { public: DECLARE_CLASS_WIDGET_READER_INFO diff --git a/cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.h b/cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.h index 77518df738..3b39a6a106 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.h @@ -26,10 +26,11 @@ #define __TestCpp__LayoutReader__ #include "../WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { - class LayoutReader : public WidgetReader + class CC_STUDIO_DLL LayoutReader : public WidgetReader { public: DECLARE_CLASS_WIDGET_READER_INFO diff --git a/cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.h b/cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.h index 226ac4fac8..97564e614a 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.h @@ -26,10 +26,11 @@ #define __TestCpp__ListViewReader__ #include "../ScrollViewReader/ScrollViewReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { - class ListViewReader : public ScrollViewReader + class CC_STUDIO_DLL ListViewReader : public ScrollViewReader { public: DECLARE_CLASS_WIDGET_READER_INFO diff --git a/cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.h b/cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.h index 7a08aa7e04..e77beb22ab 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.h @@ -26,10 +26,11 @@ #define __TestCpp__LoadingBarReader__ #include "../WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { - class LoadingBarReader : public WidgetReader + class CC_STUDIO_DLL LoadingBarReader : public WidgetReader { public: DECLARE_CLASS_WIDGET_READER_INFO diff --git a/cocos/editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.h b/cocos/editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.h index 63f6f446ab..975049bd1a 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.h @@ -26,10 +26,11 @@ #define __TestCpp__PageViewReader__ #include "../LayoutReader/LayoutReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { - class PageViewReader : public LayoutReader + class CC_STUDIO_DLL PageViewReader : public LayoutReader { public: DECLARE_CLASS_WIDGET_READER_INFO diff --git a/cocos/editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h b/cocos/editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h index ce95c3b5f7..a50d45d8b2 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h @@ -26,10 +26,11 @@ #define __TestCpp__ScrollViewReader__ #include "../LayoutReader/LayoutReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { - class ScrollViewReader : public LayoutReader + class CC_STUDIO_DLL ScrollViewReader : public LayoutReader { public: DECLARE_CLASS_WIDGET_READER_INFO diff --git a/cocos/editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.h b/cocos/editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.h index 2ea5f002ff..ab025eb87d 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.h @@ -26,10 +26,11 @@ #define __TestCpp__SliderReader__ #include "../WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { - class SliderReader : public WidgetReader + class CC_STUDIO_DLL SliderReader : public WidgetReader { public: DECLARE_CLASS_WIDGET_READER_INFO diff --git a/cocos/editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.h b/cocos/editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.h index 99a00444c1..b104fb8af1 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.h @@ -26,10 +26,11 @@ #define __TestCpp__TextAtlasReader__ #include "../WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { - class TextAtlasReader : public WidgetReader + class CC_STUDIO_DLL TextAtlasReader : public WidgetReader { public: DECLARE_CLASS_WIDGET_READER_INFO diff --git a/cocos/editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.h b/cocos/editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.h index 4fdc193a40..a08f39876d 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.h @@ -26,10 +26,11 @@ #define __TestCpp__TextBMFontReader__ #include "../WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { - class TextBMFontReader : public WidgetReader + class CC_STUDIO_DLL TextBMFontReader : public WidgetReader { public: DECLARE_CLASS_WIDGET_READER_INFO diff --git a/cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.h b/cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.h index bcd01d0021..d8b96f5a8e 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.h @@ -26,10 +26,11 @@ #define __TestCpp__TextFieldReader__ #include "../WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { - class TextFieldReader : public WidgetReader + class CC_STUDIO_DLL TextFieldReader : public WidgetReader { public: DECLARE_CLASS_WIDGET_READER_INFO diff --git a/cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.h b/cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.h index 9482ecbe60..0f7337360a 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.h @@ -26,10 +26,11 @@ #define __TestCpp__TextReader__ #include "../WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { - class TextReader : public WidgetReader + class CC_STUDIO_DLL TextReader : public WidgetReader { public: DECLARE_CLASS_WIDGET_READER_INFO diff --git a/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.h b/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.h index ca62aab066..31dc939da2 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.h @@ -29,14 +29,14 @@ #include "cocostudio/CCSGUIReader.h" #include "ui/GUIDefine.h" #include "ui/UIWidget.h" - +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { class CocoLoader; struct stExpCocoNode; - class WidgetReader : public cocos2d::Ref, public WidgetReaderProtocol + class CC_STUDIO_DLL WidgetReader : public cocos2d::Ref, public WidgetReaderProtocol { public: DECLARE_CLASS_WIDGET_READER_INFO diff --git a/cocos/editor-support/cocostudio/WidgetReader/WidgetReaderProtocol.h b/cocos/editor-support/cocostudio/WidgetReader/WidgetReaderProtocol.h index 0461ca5cec..c663ae3535 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/WidgetReaderProtocol.h +++ b/cocos/editor-support/cocostudio/WidgetReader/WidgetReaderProtocol.h @@ -27,8 +27,7 @@ #include "cocos2d.h" #include "cocostudio/DictionaryHelper.h" - - +#include "cocostudio/CocosStudioExport.h" namespace cocos2d { @@ -43,7 +42,7 @@ namespace cocostudio class CocoLoader; struct stExpCocoNode; - class WidgetReaderProtocol + class CC_STUDIO_DLL WidgetReaderProtocol { public: virtual ~WidgetReaderProtocol() {}; diff --git a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj b/cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj similarity index 88% rename from cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj rename to cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj index 684f848d8d..53888d21ad 100644 --- a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj +++ b/cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj @@ -117,6 +117,7 @@ + @@ -136,13 +137,25 @@ + + + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} + + + {f8edd7fa-9a51-4e80-baeb-860825d2eac6} + + + {7e06e92c-537a-442b-9e4a-4761c84f8a1a} + + {B57CF53F-2E49-4031-9822-047CC0E6BDE2} - libCocosStudio + libcocostudio + libcocostudio - StaticLibrary + DynamicLibrary true v100 v110 @@ -152,7 +165,7 @@ Unicode - StaticLibrary + DynamicLibrary false v100 v110 @@ -189,7 +202,7 @@ $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot)external\win32-specific\zlib\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRSTUDIODLL;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;COCOS2DXWIN32_EXPORTS;%(PreprocessorDefinitions) true 4267;4251;4244;%(DisableSpecificWarnings) false @@ -197,6 +210,8 @@ true + $(OutDir);%(AdditionalLibraryDirectories) + libzlib.lib;%(AdditionalDependencies) @@ -207,7 +222,7 @@ true - WIN32;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USRSTUDIODLL;%(PreprocessorDefinitions) $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot)external\win32-specific\zlib\include;%(AdditionalIncludeDirectories) None false @@ -216,6 +231,8 @@ true true true + libzlib.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) diff --git a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters b/cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj.filters similarity index 99% rename from cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters rename to cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj.filters index 8e91fb082e..3102335bfe 100644 --- a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters +++ b/cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj.filters @@ -455,5 +455,6 @@ TimelineAction + \ No newline at end of file diff --git a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.user b/cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj.user similarity index 100% rename from cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.user rename to cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj.user diff --git a/cocos/editor-support/spine/proj.win32/libSpine.vcxproj b/cocos/editor-support/spine/proj.win32/libSpine.vcxproj index 2f033657b8..c5d85d8d2e 100644 --- a/cocos/editor-support/spine/proj.win32/libSpine.vcxproj +++ b/cocos/editor-support/spine/proj.win32/libSpine.vcxproj @@ -65,9 +65,14 @@ + + + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} + + {B7C2A162-DEC9-4418-972E-240AB3CBFCAE} - libSpine + libspine diff --git a/cocos/math/CCAffineTransform.h b/cocos/math/CCAffineTransform.h index e5a158a946..a055fa5bfd 100644 --- a/cocos/math/CCAffineTransform.h +++ b/cocos/math/CCAffineTransform.h @@ -33,7 +33,7 @@ THE SOFTWARE. NS_CC_BEGIN -struct AffineTransform { +struct CC_DLL AffineTransform { float a, b, c, d; float tx, ty; @@ -62,7 +62,7 @@ CC_DLL AffineTransform AffineTransformConcat(const AffineTransform& t1, const Af CC_DLL bool AffineTransformEqualToTransform(const AffineTransform& t1, const AffineTransform& t2); CC_DLL AffineTransform AffineTransformInvert(const AffineTransform& t); -Mat4 TransformConcat(const Mat4& t1, const Mat4& t2); +CC_DLL Mat4 TransformConcat(const Mat4& t1, const Mat4& t2); extern CC_DLL const AffineTransform AffineTransformIdentity; diff --git a/cocos/math/CCMathBase.h b/cocos/math/CCMathBase.h index cd02313b12..ee777d52e2 100644 --- a/cocos/math/CCMathBase.h +++ b/cocos/math/CCMathBase.h @@ -3,6 +3,7 @@ #include #include +#include "base/CCPlatformMacros.h" #define MATH_DEG_TO_RAD(x) ((x) * 0.0174532925f) #define MATH_RAD_TO_DEG(x) ((x)* 57.29577951f) diff --git a/cocos/math/Mat4.h b/cocos/math/Mat4.h index 077e5c0882..53b4b64da1 100644 --- a/cocos/math/Mat4.h +++ b/cocos/math/Mat4.h @@ -59,7 +59,7 @@ NS_CC_MATH_BEGIN * * @see Transform */ -class Mat4 +class CC_DLL Mat4 { public: // //temp add conversion diff --git a/cocos/math/MathUtil.h b/cocos/math/MathUtil.h index 7618650833..da5fe3c830 100644 --- a/cocos/math/MathUtil.h +++ b/cocos/math/MathUtil.h @@ -30,7 +30,7 @@ NS_CC_MATH_BEGIN * * This is primarily used for optimized internal math operations. */ -class MathUtil +class CC_DLL MathUtil { friend class Mat4; friend class Vec3; diff --git a/cocos/math/Quaternion.h b/cocos/math/Quaternion.h index bd8bc47db3..e1f5a019b4 100644 --- a/cocos/math/Quaternion.h +++ b/cocos/math/Quaternion.h @@ -57,7 +57,7 @@ class Mat4; * q4 = (-0.8, 0.0, -0.6, 0.0). * For the point p = (1.0, 1.0, 1.0), the following figures show the trajectories of p using lerp, slerp, and squad. */ -class Quaternion +class CC_DLL Quaternion { friend class Curve; friend class Transform; diff --git a/cocos/math/Vec2.h b/cocos/math/Vec2.h index 85a93e5815..78aac69b95 100644 --- a/cocos/math/Vec2.h +++ b/cocos/math/Vec2.h @@ -44,7 +44,7 @@ class Mat4; /** * Defines a 2-element floating point vector. */ -class Vec2 +class CC_DLL Vec2 { public: diff --git a/cocos/math/Vec3.h b/cocos/math/Vec3.h index 165af010f3..da567aa56c 100644 --- a/cocos/math/Vec3.h +++ b/cocos/math/Vec3.h @@ -37,7 +37,7 @@ class Quaternion; * the magnitude of the vector intact. When used as a point, * the elements of the vector represent a position in 3D space. */ -class Vec3 +class CC_DLL Vec3 { public: diff --git a/cocos/math/Vec4.h b/cocos/math/Vec4.h index 2523978ce4..d6399fb339 100644 --- a/cocos/math/Vec4.h +++ b/cocos/math/Vec4.h @@ -30,7 +30,7 @@ class Mat4; /** * Defines 4-element floating point vector. */ -class Vec4 +class CC_DLL Vec4 { public: diff --git a/cocos/network/proj.win32/libNetwork.vcxproj b/cocos/network/proj.win32/libnetwork.vcxproj similarity index 96% rename from cocos/network/proj.win32/libNetwork.vcxproj rename to cocos/network/proj.win32/libnetwork.vcxproj index 8a218e85ee..4716547e07 100644 --- a/cocos/network/proj.win32/libNetwork.vcxproj +++ b/cocos/network/proj.win32/libnetwork.vcxproj @@ -22,10 +22,15 @@ + + + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} + + - libNetwork + libnetwork {DF2638C0-8128-4847-867C-6EAFE3DEE7B5} - network.win32 + libnetwork.win32 Win32Proj diff --git a/cocos/network/proj.win32/libNetwork.vcxproj.filters b/cocos/network/proj.win32/libnetwork.vcxproj.filters similarity index 100% rename from cocos/network/proj.win32/libNetwork.vcxproj.filters rename to cocos/network/proj.win32/libnetwork.vcxproj.filters diff --git a/cocos/network/proj.win32/libNetwork.vcxproj.user b/cocos/network/proj.win32/libnetwork.vcxproj.user similarity index 100% rename from cocos/network/proj.win32/libNetwork.vcxproj.user rename to cocos/network/proj.win32/libnetwork.vcxproj.user diff --git a/cocos/physics/CCPhysicsBody.h b/cocos/physics/CCPhysicsBody.h index a9de180e0d..6ed512f1f2 100644 --- a/cocos/physics/CCPhysicsBody.h +++ b/cocos/physics/CCPhysicsBody.h @@ -53,7 +53,7 @@ const PhysicsMaterial PHYSICSBODY_MATERIAL_DEFAULT(0.1f, 0.5f, 0.5f); * if you create body with createEdgeXXX, the mass and moment will be PHYSICS_INFINITY by default. and it's a static body. * you can change mass and moment with setMass() and setMoment(). and you can change the body to be dynamic or static by use function setDynamic(). */ -class PhysicsBody : public Ref +class CC_DLL PhysicsBody : public Ref { public: /** create a body with defult mass and moment. */ diff --git a/cocos/physics/CCPhysicsContact.h b/cocos/physics/CCPhysicsContact.h index b67510cf9e..eee9727560 100644 --- a/cocos/physics/CCPhysicsContact.h +++ b/cocos/physics/CCPhysicsContact.h @@ -44,7 +44,7 @@ class PhysicsContactInfo; typedef Vec2 Vect; -typedef struct PhysicsContactData +typedef struct CC_DLL PhysicsContactData { static const int POINT_MAX = 4; Vec2 points[POINT_MAX]; @@ -59,7 +59,7 @@ typedef struct PhysicsContactData /** * @brief Contact infomation. it will created automatically when two shape contact with each other. and it will destoried automatically when two shape separated. */ -class PhysicsContact : public EventCustom +class CC_DLL PhysicsContact : public EventCustom { public: @@ -129,7 +129,7 @@ private: /* * @brief presolve value generated when onContactPreSolve called. */ -class PhysicsContactPreSolve +class CC_DLL PhysicsContactPreSolve { public: /** get restitution between two bodies*/ @@ -160,7 +160,7 @@ private: /* * @brief postsolve value generated when onContactPostSolve called. */ -class PhysicsContactPostSolve +class CC_DLL PhysicsContactPostSolve { public: /** get restitution between two bodies*/ @@ -181,7 +181,7 @@ private: }; /* contact listener. it will recive all the contact callbacks. */ -class EventListenerPhysicsContact : public EventListenerCustom +class CC_DLL EventListenerPhysicsContact : public EventListenerCustom { public: /** create the listener */ @@ -227,7 +227,7 @@ protected: }; /** this event listener only be called when bodyA and bodyB have contacts */ -class EventListenerPhysicsContactWithBodies : public EventListenerPhysicsContact +class CC_DLL EventListenerPhysicsContactWithBodies : public EventListenerPhysicsContact { public: static EventListenerPhysicsContactWithBodies* create(PhysicsBody* bodyA, PhysicsBody* bodyB); @@ -245,7 +245,7 @@ protected: }; /** this event listener only be called when shapeA and shapeB have contacts */ -class EventListenerPhysicsContactWithShapes : public EventListenerPhysicsContact +class CC_DLL EventListenerPhysicsContactWithShapes : public EventListenerPhysicsContact { public: static EventListenerPhysicsContactWithShapes* create(PhysicsShape* shapeA, PhysicsShape* shapeB); @@ -263,7 +263,7 @@ protected: }; /** this event listener only be called when shapeA or shapeB is in the group your specified */ -class EventListenerPhysicsContactWithGroup : public EventListenerPhysicsContact +class CC_DLL EventListenerPhysicsContactWithGroup : public EventListenerPhysicsContact { public: static EventListenerPhysicsContactWithGroup* create(int group); diff --git a/cocos/physics/CCPhysicsJoint.h b/cocos/physics/CCPhysicsJoint.h index e892b29032..9861bc9a63 100644 --- a/cocos/physics/CCPhysicsJoint.h +++ b/cocos/physics/CCPhysicsJoint.h @@ -42,7 +42,7 @@ class PhysicsBodyInfo; /* * @brief An PhysicsJoint object connects two physics bodies together. */ -class PhysicsJoint +class CC_DLL PhysicsJoint { protected: PhysicsJoint(); @@ -97,7 +97,7 @@ protected: /* * @brief A fixed joint fuses the two bodies together at a reference point. Fixed joints are useful for creating complex shapes that can be broken apart later. */ -class PhysicsJointFixed : public PhysicsJoint +class CC_DLL PhysicsJointFixed : public PhysicsJoint { public: static PhysicsJointFixed* construct(PhysicsBody* a, PhysicsBody* b, const Vec2& anchr); @@ -113,7 +113,7 @@ protected: /* * @brief A limit joint imposes a maximum distance between the two bodies, as if they were connected by a rope. */ -class PhysicsJointLimit : public PhysicsJoint +class CC_DLL PhysicsJointLimit : public PhysicsJoint { public: static PhysicsJointLimit* construct(PhysicsBody* a, PhysicsBody* b, const Vec2& anchr1, const Vec2& anchr2); @@ -139,7 +139,7 @@ protected: /* * @brief A pin joint allows the two bodies to independently rotate around the anchor point as if pinned together. */ -class PhysicsJointPin : public PhysicsJoint +class CC_DLL PhysicsJointPin : public PhysicsJoint { public: static PhysicsJointPin* construct(PhysicsBody* a, PhysicsBody* b, const Vec2& anchr); @@ -153,7 +153,7 @@ protected: }; /** Set the fixed distance with two bodies */ -class PhysicsJointDistance : public PhysicsJoint +class CC_DLL PhysicsJointDistance : public PhysicsJoint { public: static PhysicsJointDistance* construct(PhysicsBody* a, PhysicsBody* b, const Vec2& anchr1, const Vec2& anchr2); @@ -170,7 +170,7 @@ protected: }; /** Connecting two physics bodies together with a spring. */ -class PhysicsJointSpring : public PhysicsJoint +class CC_DLL PhysicsJointSpring : public PhysicsJoint { public: static PhysicsJointSpring* construct(PhysicsBody* a, PhysicsBody* b, const Vec2& anchr1, const Vec2& anchr2, float stiffness, float damping); @@ -194,7 +194,7 @@ protected: }; /** Attach body a to a line, and attach body b to a dot */ -class PhysicsJointGroove : public PhysicsJoint +class CC_DLL PhysicsJointGroove : public PhysicsJoint { public: static PhysicsJointGroove* construct(PhysicsBody* a, PhysicsBody* b, const Vec2& grooveA, const Vec2& grooveB, const Vec2& anchr2); @@ -215,7 +215,7 @@ protected: }; /** Likes a spring joint, but works with rotary */ -class PhysicsJointRotarySpring : public PhysicsJoint +class CC_DLL PhysicsJointRotarySpring : public PhysicsJoint { public: static PhysicsJointRotarySpring* construct(PhysicsBody* a, PhysicsBody* b, float stiffness, float damping); @@ -236,7 +236,7 @@ protected: }; /** Likes a limit joint, but works with rotary */ -class PhysicsJointRotaryLimit : public PhysicsJoint +class CC_DLL PhysicsJointRotaryLimit : public PhysicsJoint { public: static PhysicsJointRotaryLimit* construct(PhysicsBody* a, PhysicsBody* b, float min, float max); @@ -256,7 +256,7 @@ protected: }; /** Works like a socket wrench. */ -class PhysicsJointRatchet : public PhysicsJoint +class CC_DLL PhysicsJointRatchet : public PhysicsJoint { public: static PhysicsJointRatchet* construct(PhysicsBody* a, PhysicsBody* b, float phase, float ratchet); @@ -277,7 +277,7 @@ protected: }; /** Keeps the angular velocity ratio of a pair of bodies constant. */ -class PhysicsJointGear : public PhysicsJoint +class CC_DLL PhysicsJointGear : public PhysicsJoint { public: static PhysicsJointGear* construct(PhysicsBody* a, PhysicsBody* b, float phase, float ratio); @@ -296,7 +296,7 @@ protected: }; /** Keeps the relative angular velocity of a pair of bodies constant */ -class PhysicsJointMotor : public PhysicsJoint +class CC_DLL PhysicsJointMotor : public PhysicsJoint { public: static PhysicsJointMotor* construct(PhysicsBody* a, PhysicsBody* b, float rate); diff --git a/cocos/physics/CCPhysicsShape.cpp b/cocos/physics/CCPhysicsShape.cpp index 0fcfcfd820..c40caccd4a 100644 --- a/cocos/physics/CCPhysicsShape.cpp +++ b/cocos/physics/CCPhysicsShape.cpp @@ -453,7 +453,7 @@ void PhysicsShapeCircle::update(float delta) if (_dirty) { - cpFloat factor = PhysicsHelper::float2cpfloat( _newScaleX / _scaleX ); + cpFloat factor = std::abs(PhysicsHelper::float2cpfloat( _newScaleX / _scaleX )); cpShape* shape = _info->getShapes().front(); cpVect v = cpCircleShapeGetOffset(shape); @@ -710,6 +710,17 @@ void PhysicsShapePolygon::update(float delta) vects[i].y *= factorY; } + // convert hole to clockwise + if ( factorX * factorY < 0 ) + { + for (int i = 0; i < count / 2; ++i) + { + cpVect v = vects[i]; + vects[i] = vects[count - i - 1]; + vects[count - i - 1] = v; + } + } + for (int i = 0; i < count; ++i) { cpVect n = cpvnormalize(cpvperp(cpvsub(vects[i], vects[(i + 1) % count]))); diff --git a/cocos/physics/CCPhysicsShape.h b/cocos/physics/CCPhysicsShape.h index c8921b0430..7f14066595 100644 --- a/cocos/physics/CCPhysicsShape.h +++ b/cocos/physics/CCPhysicsShape.h @@ -38,7 +38,7 @@ class PhysicsBody; class PhysicsBodyInfo; -typedef struct PhysicsMaterial +typedef struct CC_DLL PhysicsMaterial { float density; ///< The density of the object. float restitution; ///< The bounciness of the physics body. @@ -62,7 +62,7 @@ const PhysicsMaterial PHYSICSSHAPE_MATERIAL_DEFAULT(0.0f, 0.5f, 0.5f); /** * @brief A shape for body. You do not create PhysicsWorld objects directly, instead, you can view PhysicsBody to see how to create it. */ -class PhysicsShape : public Ref +class CC_DLL PhysicsShape : public Ref { public: enum class Type @@ -192,7 +192,7 @@ protected: }; /** A circle shape */ -class PhysicsShapeCircle : public PhysicsShape +class CC_DLL PhysicsShapeCircle : public PhysicsShape { public: static PhysicsShapeCircle* create(float radius, const PhysicsMaterial& material = PHYSICSSHAPE_MATERIAL_DEFAULT, const Vec2& offset = Vec2(0, 0)); @@ -219,7 +219,7 @@ protected: }; /** A polygon shape */ -class PhysicsShapePolygon : public PhysicsShape +class CC_DLL PhysicsShapePolygon : public PhysicsShape { public: static PhysicsShapePolygon* create(const Vec2* points, int count, const PhysicsMaterial& material = PHYSICSSHAPE_MATERIAL_DEFAULT, const Vec2& offset = Vec2::ZERO); @@ -243,7 +243,7 @@ protected: }; /** A box shape */ -class PhysicsShapeBox : public PhysicsShapePolygon +class CC_DLL PhysicsShapeBox : public PhysicsShapePolygon { public: static PhysicsShapeBox* create(const Size& size, const PhysicsMaterial& material = PHYSICSSHAPE_MATERIAL_DEFAULT, const Vec2& offset = Vec2::ZERO); @@ -260,7 +260,7 @@ protected: }; /** A segment shape */ -class PhysicsShapeEdgeSegment : public PhysicsShape +class CC_DLL PhysicsShapeEdgeSegment : public PhysicsShape { public: static PhysicsShapeEdgeSegment* create(const Vec2& a, const Vec2& b, const PhysicsMaterial& material = PHYSICSSHAPE_MATERIAL_DEFAULT, float border = 1); @@ -281,7 +281,7 @@ protected: }; /** An edge polygon shape */ -class PhysicsShapeEdgePolygon : public PhysicsShape +class CC_DLL PhysicsShapeEdgePolygon : public PhysicsShape { public: static PhysicsShapeEdgePolygon* create(const Vec2* points, int count, const PhysicsMaterial& material = PHYSICSSHAPE_MATERIAL_DEFAULT, float border = 1); @@ -301,7 +301,7 @@ protected: }; /** An edge box shape */ -class PhysicsShapeEdgeBox : public PhysicsShapeEdgePolygon +class CC_DLL PhysicsShapeEdgeBox : public PhysicsShapeEdgePolygon { public: static PhysicsShapeEdgeBox* create(const Size& size, const PhysicsMaterial& material = PHYSICSSHAPE_MATERIAL_DEFAULT, float border = 0, const Vec2& offset = Vec2::ZERO); @@ -318,7 +318,7 @@ protected: }; /** a chain shape */ -class PhysicsShapeEdgeChain : public PhysicsShape +class CC_DLL PhysicsShapeEdgeChain : public PhysicsShape { public: static PhysicsShapeEdgeChain* create(const Vec2* points, int count, const PhysicsMaterial& material = PHYSICSSHAPE_MATERIAL_DEFAULT, float border = 1); diff --git a/cocos/physics/CCPhysicsWorld.h b/cocos/physics/CCPhysicsWorld.h index e091017426..c10ac3cc35 100644 --- a/cocos/physics/CCPhysicsWorld.h +++ b/cocos/physics/CCPhysicsWorld.h @@ -31,7 +31,7 @@ #include "base/CCVector.h" #include "base/CCRef.h" #include "math/CCGeometry.h" - +#include "physics/CCPhysicsBody.h" #include NS_CC_BEGIN @@ -80,7 +80,7 @@ typedef PhysicsQueryRectCallbackFunc PhysicsQueryPointCallbackFunc; /** * @brief An PhysicsWorld object simulates collisions and other physical properties. You do not create PhysicsWorld objects directly; instead, you can get it from an Scene object. */ -class PhysicsWorld +class CC_DLL PhysicsWorld { public: static const int DEBUGDRAW_NONE; ///< draw nothing @@ -207,7 +207,7 @@ protected: }; -class PhysicsDebugDraw +class CC_DLL PhysicsDebugDraw { protected: virtual bool begin(); @@ -226,7 +226,7 @@ protected: friend class PhysicsWorld; }; -extern const float PHYSICS_INFINITY; +extern const float CC_DLL PHYSICS_INFINITY; NS_CC_END diff --git a/cocos/platform/CCFileUtils.cpp b/cocos/platform/CCFileUtils.cpp index 5079035ce7..598b086bbd 100644 --- a/cocos/platform/CCFileUtils.cpp +++ b/cocos/platform/CCFileUtils.cpp @@ -35,9 +35,13 @@ THE SOFTWARE. #include "tinyxml2.h" #include "unzip.h" +#include - -using namespace std; +#if (CC_TARGET_PLATFORM != CC_PLATFORM_WIN32) && (CC_TARGET_PLATFORM != CC_PLATFORM_WP8) && (CC_TARGET_PLATFORM != CC_PLATFORM_WINRT) +#include +#include +#include +#endif #if (CC_TARGET_PLATFORM != CC_PLATFORM_IOS) && (CC_TARGET_PLATFORM != CC_PLATFORM_MAC) @@ -882,41 +886,37 @@ std::string FileUtils::getFullPathForDirectoryAndFilename(const std::string& dir return ret; } +std::string FileUtils::searchFullPathForFilename(const std::string& filename) const +{ + if (isAbsolutePath(filename)) + { + return filename; + } + std::string path = const_cast(this)->fullPathForFilename(filename); + if (0 == path.compare(filename)) + { + return ""; + } + else + { + return path; + } +} + bool FileUtils::isFileExist(const std::string& filename) const { - // If filename is absolute path, we don't need to consider 'search paths' and 'resolution orders'. if (isAbsolutePath(filename)) { return isFileExistInternal(filename); } - - // Already Cached ? - auto cacheIter = _fullPathCache.find(filename); - if( cacheIter != _fullPathCache.end() ) + else { - return true; + std::string fullpath = searchFullPathForFilename(filename); + if (fullpath.empty()) + return false; + else + return true; } - - // Get the new file name. - const std::string newFilename( getNewFilename(filename) ); - - std::string fullpath; - - for (auto searchIt = _searchPathArray.cbegin(); searchIt != _searchPathArray.cend(); ++searchIt) - { - for (auto resolutionIt = _searchResolutionsOrderArray.cbegin(); resolutionIt != _searchResolutionsOrderArray.cend(); ++resolutionIt) - { - fullpath = const_cast(this)->getPathForFilename(newFilename, *resolutionIt, *searchIt); - - if (!fullpath.empty()) - { - // Using the filename passed in as key. - const_cast(this)->_fullPathCache.insert(std::make_pair(filename, fullpath)); - return true; - } - } - } - return false; } bool FileUtils::isAbsolutePath(const std::string& path) const @@ -924,6 +924,233 @@ bool FileUtils::isAbsolutePath(const std::string& path) const return (path[0] == '/'); } +bool FileUtils::isDirectoryExistInternal(const std::string& dirPath) const +{ +#if (CC_TARGET_PLATFORM != CC_PLATFORM_WIN32) + struct stat st; + if (stat(dirPath.c_str(), &st) == 0) + { + return S_ISDIR(st.st_mode); + } + + return false; +#else + unsigned long fAttrib = GetFileAttributesA(dirPath.c_str()); + if (fAttrib != INVALID_FILE_ATTRIBUTES && + (fAttrib & FILE_ATTRIBUTE_DIRECTORY)) + { + return true; + } + return false; +#endif +} + +bool FileUtils::isDirectoryExist(const std::string& dirPath) +{ + CCASSERT(!dirPath.empty(), "Invalid path"); + + if (isAbsolutePath(dirPath)) + { + return isDirectoryExistInternal(dirPath); + } + + // Already Cached ? + auto cacheIter = _fullPathCache.find(dirPath); + if( cacheIter != _fullPathCache.end() ) + { + return isDirectoryExistInternal(cacheIter->second); + } + + std::string fullpath; + for (auto searchIt = _searchPathArray.cbegin(); searchIt != _searchPathArray.cend(); ++searchIt) + { + for (auto resolutionIt = _searchResolutionsOrderArray.cbegin(); resolutionIt != _searchResolutionsOrderArray.cend(); ++resolutionIt) + { + // searchPath + file_path + resourceDirectory + fullpath = *searchIt + dirPath + *resolutionIt; + if (isDirectoryExistInternal(fullpath)) + { + const_cast(this)->_fullPathCache.insert(std::make_pair(dirPath, fullpath)); + return true; + } + } + } + + return false; +} + +bool FileUtils::createDirectory(const std::string& path) +{ + CCASSERT(!path.empty(), "Invalid path"); + + if (isDirectoryExist(path)) + return true; + + // Split the path + size_t start = 0; + size_t found = path.find_first_of("/\\", start); + std::string subpath; + std::vector dirs; + + if (found != std::string::npos) + { + while (true) + { + subpath = path.substr(start, found - start + 1); + if (!subpath.empty()) + dirs.push_back(subpath); + start = found+1; + found = path.find_first_of("/\\", start); + if (found == std::string::npos) + { + if (start < path.length()) + { + dirs.push_back(path.substr(start)); + } + break; + } + } + } + +#if (CC_TARGET_PLATFORM != CC_PLATFORM_WIN32) + DIR *dir = NULL; + + // Create path recursively + subpath = ""; + for (int i = 0; i < dirs.size(); ++i) { + subpath += dirs[i]; + dir = opendir(subpath.c_str()); + if (!dir) + { + int ret = mkdir(subpath.c_str(), S_IRWXU | S_IRWXG | S_IRWXO); + if (ret != 0 && (errno != EEXIST)) + { + return false; + } + } + } + return true; +#else + if ((GetFileAttributesA(path.c_str())) == INVALID_FILE_ATTRIBUTES) + { + subpath = ""; + for(int i = 0 ; i < dirs.size() ; ++i) + { + subpath += dirs[i]; + BOOL ret = CreateDirectoryA(subpath.c_str(), NULL); + if (!ret && ERROR_ALREADY_EXISTS != GetLastError()) + { + return false; + } + } + } + return true; +#endif +} + +bool FileUtils::removeDirectory(const std::string& path) +{ + if (path.size() > 0 && path[path.size() - 1] != '/') + { + CCLOGERROR("Fail to remove directory, path must termniate with '/': %s", path.c_str()); + return false; + } + + // Remove downloaded files +#if (CC_TARGET_PLATFORM != CC_PLATFORM_WIN32) + std::string command = "rm -r "; + // Path may include space. + command += "\"" + path + "\""; + if (system(command.c_str()) >= 0) + return true; + else + return false; +#else + std::string command = "rd /s /q "; + // Path may include space. + command += "\"" + path + "\""; + if (WinExec(command.c_str(), SW_HIDE) > 31) + return true; + else + return false; +#endif +} + +bool FileUtils::removeFile(const std::string &path) +{ + // Remove downloaded file +#if (CC_TARGET_PLATFORM != CC_PLATFORM_WIN32) + std::string command = "rm -f "; + // Path may include space. + command += "\"" + path + "\""; + if (system(command.c_str()) >= 0) + return true; + else + return false; +#else + std::string command = "del /q "; + // Path may include space. + command += "\"" + path + "\""; + if (WinExec(command.c_str(), SW_HIDE) > 31) + return true; + else + return false; +#endif +} + +bool FileUtils::renameFile(const std::string &path, const std::string &oldname, const std::string &name) +{ + CCASSERT(!path.empty(), "Invalid path"); + + // Rename a file +#if (CC_TARGET_PLATFORM != CC_PLATFORM_WIN32) + std::string oldPath = path + oldname; + std::string newPath = path + name; + if (rename(oldPath.c_str(), newPath.c_str()) != 0) + { + CCLOGERROR("Fail to rename file %s to %s !", oldPath.c_str(), newPath.c_str()); + return false; + } + return true; +#else + std::string command = "ren "; + // Path may include space. + command += "\"" + path + oldname + "\" \"" + name + "\""; + if (WinExec(command.c_str(), SW_HIDE) > 31) + return true; + else + return false; +#endif +} + +long FileUtils::getFileSize(const std::string &filepath) +{ + CCASSERT(!filepath.empty(), "Invalid path"); + + std::string fullpath = filepath; + if (!isAbsolutePath(filepath)) + { + fullpath = searchFullPathForFilename(filepath); + if (fullpath.empty()) + return 0; + } + + struct stat info; + // Get data associated with "crt_stat.c": + int result = stat( fullpath.c_str(), &info ); + + // Check if statistics are valid: + if( result != 0 ) + { + // Failed + return -1; + } + else + { + return (long)(info.st_size); + } +} + ////////////////////////////////////////////////////////////////////////// // Notification support when getFileData from invalid file path. ////////////////////////////////////////////////////////////////////////// diff --git a/cocos/platform/CCFileUtils.h b/cocos/platform/CCFileUtils.h index 570b02fc50..9594b52d11 100644 --- a/cocos/platform/CCFileUtils.h +++ b/cocos/platform/CCFileUtils.h @@ -283,27 +283,6 @@ public: */ virtual std::string getWritablePath() const = 0; - /** - * Checks whether a file exists. - * - * @note If a relative path was passed in, it will be inserted a default root path at the beginning. - * @param strFilePath The path of the file, it could be a relative or absolute path. - * @return true if the file exists, otherwise it will return false. - */ - virtual bool isFileExist(const std::string& filename) const; - - /** - * Checks whether the path is an absolute path. - * - * @note On Android, if the parameter passed in is relative to "assets/", this method will treat it as an absolute path. - * Also on Blackberry, path starts with "app/native/Resources/" is treated as an absolute path. - * - * @param strPath The path that needs to be checked. - * @return true if it's an absolute path, otherwise it will return false. - */ - virtual bool isAbsolutePath(const std::string& path) const; - - /** * Sets/Gets whether to pop-up a message box when failed to load an image. */ @@ -327,6 +306,77 @@ public: * @note This method is used internally. */ virtual ValueVector getValueVectorFromFile(const std::string& filename); + + /** + * Checks whether a file exists. + * + * @note If a relative path was passed in, it will be inserted a default root path at the beginning. + * @param strFilePath The path of the file, it could be a relative or absolute path. + * @return true if the file exists, otherwise it will return false. + */ + virtual bool isFileExist(const std::string& filename) const; + + /** + * Checks whether the path is an absolute path. + * + * @note On Android, if the parameter passed in is relative to "assets/", this method will treat it as an absolute path. + * Also on Blackberry, path starts with "app/native/Resources/" is treated as an absolute path. + * + * @param strPath The path that needs to be checked. + * @return true if it's an absolute path, otherwise it will return false. + */ + virtual bool isAbsolutePath(const std::string& path) const; + + /** + * Checks whether the path is a directory + * + * @param dirPath The path of the directory, it could be a relative or an absolute path. + * @return true if the directory exists, otherwise it will return false. + */ + virtual bool isDirectoryExist(const std::string& dirPath); + + /** + * Creates a directory + * + * @param dirPath The path of the directory, it must be an absolute path. + * @return true if the directory have been created successfully, otherwise it will return false. + */ + virtual bool createDirectory(const std::string& dirPath); + + /** + * Remove a directory + * + * @param dirPath The full path of the directory, it must be an absolute path. + * @return true if the directory have been removed successfully, otherwise it will return false. + */ + virtual bool removeDirectory(const std::string& dirPath); + + /** + * Remove a file + * + * @param filepath The full path of the file, it must be an absolute path. + * @return true if the file have been removed successfully, otherwise it will return false. + */ + virtual bool removeFile(const std::string &filepath); + + /** + * Rename a file under the given directory + * + * @param path The parent directory path of the file, it must be an absolute path. + * @param oldname The current name of the file. + * @param name The new name of the file. + * @return true if the file have been renamed successfully, otherwise it will return false. + */ + virtual bool renameFile(const std::string &path, const std::string &oldname, const std::string &name); + + /** + * Retrieve the file size + * + * @note If a relative path was passed in, it will be inserted a default root path at the beginning. + * @param filepath The path of the file, it could be a relative or absolute path. + * @return The file size. + */ + virtual long getFileSize(const std::string &filepath); /** Returns the full path cache */ const std::unordered_map& getFullPathCache() const { return _fullPathCache; } @@ -357,10 +407,19 @@ protected: virtual std::string getNewFilename(const std::string &filename) const; /** - * Checks whether file exists without considering search paths and resolution orders. + * Checks whether a file exists without considering search paths and resolution orders. + * @param The file (with absolute path) to look up for + * @return Returns true if the file found at the given absolute path, otherwise returns false */ virtual bool isFileExistInternal(const std::string& filename) const = 0; + /** + * Checks whether a directory exists without considering search paths and resolution orders. + * @param The directory (with absolute path) to look up for + * @return Returns true if the directory found at the given absolute path, otherwise returns false + */ + virtual bool isDirectoryExistInternal(const std::string& dirPath) const; + /** * Gets full path for filename, resolution directory and search path. * @@ -383,6 +442,16 @@ protected: */ virtual std::string getFullPathForDirectoryAndFilename(const std::string& directory, const std::string& filename); + /** + * Returns the fullpath for a given filename. + * This is an alternative for fullPathForFilename, there are two main differences: + * First, it returns empty string instead of the original filename when no file found for the given name. + * Secondly, it's a const function. + * @param filename The file name to look up for + * @return The full path for the file, if not found, the return value will be an empty string + */ + virtual std::string searchFullPathForFilename(const std::string& filename) const; + /** Dictionary used to lookup filenames based on a key. * It is used internally by the following methods: diff --git a/cocos/platform/CCGLViewProtocol.cpp b/cocos/platform/CCGLViewProtocol.cpp deleted file mode 100644 index 1e8423a155..0000000000 --- a/cocos/platform/CCGLViewProtocol.cpp +++ /dev/null @@ -1,419 +0,0 @@ -/**************************************************************************** -Copyright (c) 2010-2012 cocos2d-x.org -Copyright (c) 2013-2014 Chukong Technologies Inc. - -http://www.cocos2d-x.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -****************************************************************************/ - -#include "platform/CCGLViewProtocol.h" - -#include "base/CCTouch.h" -#include "base/CCDirector.h" -#include "base/CCEventDispatcher.h" - -NS_CC_BEGIN - -namespace { - - static Touch* g_touches[EventTouch::MAX_TOUCHES] = { nullptr }; - static unsigned int g_indexBitsUsed = 0; - // System touch pointer ID (It may not be ascending order number) <-> Ascending order number from 0 - static std::map g_touchIdReorderMap; - - static int getUnUsedIndex() - { - int i; - int temp = g_indexBitsUsed; - - for (i = 0; i < EventTouch::MAX_TOUCHES; i++) { - if (! (temp & 0x00000001)) { - g_indexBitsUsed |= (1 << i); - return i; - } - - temp >>= 1; - } - - // all bits are used - return -1; - } - - static void removeUsedIndexBit(int index) - { - if (index < 0 || index >= EventTouch::MAX_TOUCHES) - { - return; - } - - unsigned int temp = 1 << index; - temp = ~temp; - g_indexBitsUsed &= temp; - } - -} - -GLViewProtocol::GLViewProtocol() -: _scaleX(1.0f) -, _scaleY(1.0f) -, _resolutionPolicy(ResolutionPolicy::UNKNOWN) -{ -} - -GLViewProtocol::~GLViewProtocol() -{ - -} - -void GLViewProtocol::pollInputEvents() -{ -} - - -void GLViewProtocol::updateDesignResolutionSize() -{ - if (_screenSize.width > 0 && _screenSize.height > 0 - && _designResolutionSize.width > 0 && _designResolutionSize.height > 0) - { - _scaleX = (float)_screenSize.width / _designResolutionSize.width; - _scaleY = (float)_screenSize.height / _designResolutionSize.height; - - if (_resolutionPolicy == ResolutionPolicy::NO_BORDER) - { - _scaleX = _scaleY = MAX(_scaleX, _scaleY); - } - - else if (_resolutionPolicy == ResolutionPolicy::SHOW_ALL) - { - _scaleX = _scaleY = MIN(_scaleX, _scaleY); - } - - else if ( _resolutionPolicy == ResolutionPolicy::FIXED_HEIGHT) { - _scaleX = _scaleY; - _designResolutionSize.width = ceilf(_screenSize.width/_scaleX); - } - - else if ( _resolutionPolicy == ResolutionPolicy::FIXED_WIDTH) { - _scaleY = _scaleX; - _designResolutionSize.height = ceilf(_screenSize.height/_scaleY); - } - - // calculate the rect of viewport - float viewPortW = _designResolutionSize.width * _scaleX; - float viewPortH = _designResolutionSize.height * _scaleY; - - _viewPortRect.setRect((_screenSize.width - viewPortW) / 2, (_screenSize.height - viewPortH) / 2, viewPortW, viewPortH); - - // reset director's member variables to fit visible rect - auto director = Director::getInstance(); - director->_winSizeInPoints = getDesignResolutionSize(); - director->createStatsLabel(); - director->setGLDefaultValues(); - } -} - -void GLViewProtocol::setDesignResolutionSize(float width, float height, ResolutionPolicy resolutionPolicy) -{ - CCASSERT(resolutionPolicy != ResolutionPolicy::UNKNOWN, "should set resolutionPolicy"); - - if (width == 0.0f || height == 0.0f) - { - return; - } - - _designResolutionSize.setSize(width, height); - _resolutionPolicy = resolutionPolicy; - - updateDesignResolutionSize(); - } - -const Size& GLViewProtocol::getDesignResolutionSize() const -{ - return _designResolutionSize; -} - -const Size& GLViewProtocol::getFrameSize() const -{ - return _screenSize; -} - -void GLViewProtocol::setFrameSize(float width, float height) -{ - _designResolutionSize = _screenSize = Size(width, height); -} - -Rect GLViewProtocol::getVisibleRect() const -{ - Rect ret; - ret.size = getVisibleSize(); - ret.origin = getVisibleOrigin(); - return ret; -} - -Size GLViewProtocol::getVisibleSize() const -{ - if (_resolutionPolicy == ResolutionPolicy::NO_BORDER) - { - return Size(_screenSize.width/_scaleX, _screenSize.height/_scaleY); - } - else - { - return _designResolutionSize; - } -} - -Vec2 GLViewProtocol::getVisibleOrigin() const -{ - if (_resolutionPolicy == ResolutionPolicy::NO_BORDER) - { - return Vec2((_designResolutionSize.width - _screenSize.width/_scaleX)/2, - (_designResolutionSize.height - _screenSize.height/_scaleY)/2); - } - else - { - return Vec2::ZERO; - } -} - -void GLViewProtocol::setViewPortInPoints(float x , float y , float w , float h) -{ - glViewport((GLint)(x * _scaleX + _viewPortRect.origin.x), - (GLint)(y * _scaleY + _viewPortRect.origin.y), - (GLsizei)(w * _scaleX), - (GLsizei)(h * _scaleY)); -} - -void GLViewProtocol::setScissorInPoints(float x , float y , float w , float h) -{ - glScissor((GLint)(x * _scaleX + _viewPortRect.origin.x), - (GLint)(y * _scaleY + _viewPortRect.origin.y), - (GLsizei)(w * _scaleX), - (GLsizei)(h * _scaleY)); -} - -bool GLViewProtocol::isScissorEnabled() -{ - return (GL_FALSE == glIsEnabled(GL_SCISSOR_TEST)) ? false : true; -} - -Rect GLViewProtocol::getScissorRect() const -{ - GLfloat params[4]; - glGetFloatv(GL_SCISSOR_BOX, params); - float x = (params[0] - _viewPortRect.origin.x) / _scaleX; - float y = (params[1] - _viewPortRect.origin.y) / _scaleY; - float w = params[2] / _scaleX; - float h = params[3] / _scaleY; - return Rect(x, y, w, h); -} - -void GLViewProtocol::setViewName(const std::string& viewname ) -{ - _viewName = viewname; -} - -const std::string& GLViewProtocol::getViewName() const -{ - return _viewName; -} - -void GLViewProtocol::handleTouchesBegin(int num, intptr_t ids[], float xs[], float ys[]) -{ - intptr_t id = 0; - float x = 0.0f; - float y = 0.0f; - int unusedIndex = 0; - EventTouch touchEvent; - - for (int i = 0; i < num; ++i) - { - id = ids[i]; - x = xs[i]; - y = ys[i]; - - auto iter = g_touchIdReorderMap.find(id); - - // it is a new touch - if (iter == g_touchIdReorderMap.end()) - { - unusedIndex = getUnUsedIndex(); - - // The touches is more than MAX_TOUCHES ? - if (unusedIndex == -1) { - CCLOG("The touches is more than MAX_TOUCHES, unusedIndex = %d", unusedIndex); - continue; - } - - Touch* touch = g_touches[unusedIndex] = new Touch(); - touch->setTouchInfo(unusedIndex, (x - _viewPortRect.origin.x) / _scaleX, - (y - _viewPortRect.origin.y) / _scaleY); - - CCLOGINFO("x = %f y = %f", touch->getLocationInView().x, touch->getLocationInView().y); - - g_touchIdReorderMap.insert(std::make_pair(id, unusedIndex)); - touchEvent._touches.push_back(touch); - } - } - - if (touchEvent._touches.size() == 0) - { - CCLOG("touchesBegan: size = 0"); - return; - } - - touchEvent._eventCode = EventTouch::EventCode::BEGAN; - auto dispatcher = Director::getInstance()->getEventDispatcher(); - dispatcher->dispatchEvent(&touchEvent); -} - -void GLViewProtocol::handleTouchesMove(int num, intptr_t ids[], float xs[], float ys[]) -{ - intptr_t id = 0; - float x = 0.0f; - float y = 0.0f; - EventTouch touchEvent; - - for (int i = 0; i < num; ++i) - { - id = ids[i]; - x = xs[i]; - y = ys[i]; - - auto iter = g_touchIdReorderMap.find(id); - if (iter == g_touchIdReorderMap.end()) - { - CCLOG("if the index doesn't exist, it is an error"); - continue; - } - - CCLOGINFO("Moving touches with id: %d, x=%f, y=%f", id, x, y); - Touch* touch = g_touches[iter->second]; - if (touch) - { - touch->setTouchInfo(iter->second, (x - _viewPortRect.origin.x) / _scaleX, - (y - _viewPortRect.origin.y) / _scaleY); - - touchEvent._touches.push_back(touch); - } - else - { - // It is error, should return. - CCLOG("Moving touches with id: %ld error", (long int)id); - return; - } - } - - if (touchEvent._touches.size() == 0) - { - CCLOG("touchesMoved: size = 0"); - return; - } - - touchEvent._eventCode = EventTouch::EventCode::MOVED; - auto dispatcher = Director::getInstance()->getEventDispatcher(); - dispatcher->dispatchEvent(&touchEvent); -} - -void GLViewProtocol::handleTouchesOfEndOrCancel(EventTouch::EventCode eventCode, int num, intptr_t ids[], float xs[], float ys[]) -{ - intptr_t id = 0; - float x = 0.0f; - float y = 0.0f; - EventTouch touchEvent; - - for (int i = 0; i < num; ++i) - { - id = ids[i]; - x = xs[i]; - y = ys[i]; - - auto iter = g_touchIdReorderMap.find(id); - if (iter == g_touchIdReorderMap.end()) - { - CCLOG("if the index doesn't exist, it is an error"); - continue; - } - - /* Add to the set to send to the director */ - Touch* touch = g_touches[iter->second]; - if (touch) - { - CCLOGINFO("Ending touches with id: %d, x=%f, y=%f", id, x, y); - touch->setTouchInfo(iter->second, (x - _viewPortRect.origin.x) / _scaleX, - (y - _viewPortRect.origin.y) / _scaleY); - - touchEvent._touches.push_back(touch); - - g_touches[iter->second] = nullptr; - removeUsedIndexBit(iter->second); - - g_touchIdReorderMap.erase(id); - } - else - { - CCLOG("Ending touches with id: %ld error", static_cast(id)); - return; - } - - } - - if (touchEvent._touches.size() == 0) - { - CCLOG("touchesEnded or touchesCancel: size = 0"); - return; - } - - touchEvent._eventCode = eventCode; - auto dispatcher = Director::getInstance()->getEventDispatcher(); - dispatcher->dispatchEvent(&touchEvent); - - for (auto& touch : touchEvent._touches) - { - // release the touch object. - touch->release(); - } -} - -void GLViewProtocol::handleTouchesEnd(int num, intptr_t ids[], float xs[], float ys[]) -{ - handleTouchesOfEndOrCancel(EventTouch::EventCode::ENDED, num, ids, xs, ys); -} - -void GLViewProtocol::handleTouchesCancel(int num, intptr_t ids[], float xs[], float ys[]) -{ - handleTouchesOfEndOrCancel(EventTouch::EventCode::CANCELLED, num, ids, xs, ys); -} - -const Rect& GLViewProtocol::getViewPortRect() const -{ - return _viewPortRect; -} - -float GLViewProtocol::getScaleX() const -{ - return _scaleX; -} - -float GLViewProtocol::getScaleY() const -{ - return _scaleY; -} - -NS_CC_END diff --git a/cocos/platform/CCGLViewProtocol.h b/cocos/platform/CCGLViewProtocol.h deleted file mode 100644 index 3b7404ecd0..0000000000 --- a/cocos/platform/CCGLViewProtocol.h +++ /dev/null @@ -1,210 +0,0 @@ -/**************************************************************************** -Copyright (c) 2010-2012 cocos2d-x.org -Copyright (c) 2013-2014 Chukong Technologies Inc. - -http://www.cocos2d-x.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -****************************************************************************/ - -#ifndef __CCGLVIEWPROTOCOL_H__ -#define __CCGLVIEWPROTOCOL_H__ - -#include "base/ccTypes.h" -#include "base/CCEventTouch.h" - -#include - -enum class ResolutionPolicy -{ - // The entire application is visible in the specified area without trying to preserve the original aspect ratio. - // Distortion can occur, and the application may appear stretched or compressed. - EXACT_FIT, - // The entire application fills the specified area, without distortion but possibly with some cropping, - // while maintaining the original aspect ratio of the application. - NO_BORDER, - // The entire application is visible in the specified area without distortion while maintaining the original - // aspect ratio of the application. Borders can appear on two sides of the application. - SHOW_ALL, - // The application takes the height of the design resolution size and modifies the width of the internal - // canvas so that it fits the aspect ratio of the device - // no distortion will occur however you must make sure your application works on different - // aspect ratios - FIXED_HEIGHT, - // The application takes the width of the design resolution size and modifies the height of the internal - // canvas so that it fits the aspect ratio of the device - // no distortion will occur however you must make sure your application works on different - // aspect ratios - FIXED_WIDTH, - - UNKNOWN, -}; - -NS_CC_BEGIN - -/** - * @addtogroup platform - * @{ - */ - -class CC_DLL GLViewProtocol -{ -public: - /** - * @js ctor - */ - GLViewProtocol(); - /** - * @js NA - * @lua NA - */ - virtual ~GLViewProtocol(); - - /** Force destroying EGL view, subclass must implement this method. */ - virtual void end() = 0; - - /** Get whether opengl render system is ready, subclass must implement this method. */ - virtual bool isOpenGLReady() = 0; - - /** Exchanges the front and back buffers, subclass must implement this method. */ - virtual void swapBuffers() = 0; - - /** Open or close IME keyboard , subclass must implement this method. */ - virtual void setIMEKeyboardState(bool open) = 0; - - /** - * Polls input events. Subclass must implement methods if platform - * does not provide event callbacks. - */ - virtual void pollInputEvents(); - - /** - * Get the frame size of EGL view. - * In general, it returns the screen size since the EGL view is a fullscreen view. - */ - virtual const Size& getFrameSize() const; - - /** - * Set the frame size of EGL view. - */ - virtual void setFrameSize(float width, float height); - - /** - * Get the visible area size of opengl viewport. - */ - virtual Size getVisibleSize() const; - - /** - * Get the visible origin point of opengl viewport. - */ - virtual Vec2 getVisibleOrigin() const; - - /** - * Get the visible rectangle of opengl viewport. - */ - virtual Rect getVisibleRect() const; - - /** - * Set the design resolution size. - * @param width Design resolution width. - * @param height Design resolution height. - * @param resolutionPolicy The resolution policy desired, you may choose: - * [1] EXACT_FIT Fill screen by stretch-to-fit: if the design resolution ratio of width to height is different from the screen resolution ratio, your game view will be stretched. - * [2] NO_BORDER Full screen without black border: if the design resolution ratio of width to height is different from the screen resolution ratio, two areas of your game view will be cut. - * [3] SHOW_ALL Full screen with black border: if the design resolution ratio of width to height is different from the screen resolution ratio, two black borders will be shown. - */ - virtual void setDesignResolutionSize(float width, float height, ResolutionPolicy resolutionPolicy); - - /** Get design resolution size. - * Default resolution size is the same as 'getFrameSize'. - */ - virtual const Size& getDesignResolutionSize() const; - - /** - * Set opengl view port rectangle with points. - */ - virtual void setViewPortInPoints(float x , float y , float w , float h); - - /** - * Set Scissor rectangle with points. - */ - virtual void setScissorInPoints(float x , float y , float w , float h); - - /** - * Get whether GL_SCISSOR_TEST is enable - */ - virtual bool isScissorEnabled(); - - /** - * Get the current scissor rectangle - */ - virtual Rect getScissorRect() const; - - virtual void setViewName(const std::string& viewname); - const std::string& getViewName() const; - - /** Touch events are handled by default; if you want to customize your handlers, please override these functions: */ - virtual void handleTouchesBegin(int num, intptr_t ids[], float xs[], float ys[]); - virtual void handleTouchesMove(int num, intptr_t ids[], float xs[], float ys[]); - virtual void handleTouchesEnd(int num, intptr_t ids[], float xs[], float ys[]); - virtual void handleTouchesCancel(int num, intptr_t ids[], float xs[], float ys[]); - - /** - * Get the opengl view port rectangle. - */ - const Rect& getViewPortRect() const; - - /** - * Get scale factor of the horizontal direction. - */ - float getScaleX() const; - - /** - * Get scale factor of the vertical direction. - */ - float getScaleY() const; - - /** returns the current Resolution policy */ - ResolutionPolicy getResolutionPolicy() const { return _resolutionPolicy; } - -protected: - void updateDesignResolutionSize(); - - void handleTouchesOfEndOrCancel(EventTouch::EventCode eventCode, int num, intptr_t ids[], float xs[], float ys[]); - - // real screen size - Size _screenSize; - // resolution size, it is the size appropriate for the app resources. - Size _designResolutionSize; - // the view port size - Rect _viewPortRect; - // the view name - std::string _viewName; - - float _scaleX; - float _scaleY; - ResolutionPolicy _resolutionPolicy; -}; - -// end of platform group -/// @} - -NS_CC_END - -#endif /* __CCGLVIEWPROTOCOL_H__ */ diff --git a/cocos/platform/CCImage.cpp b/cocos/platform/CCImage.cpp index f4c8604b3a..08cd3e5f10 100644 --- a/cocos/platform/CCImage.cpp +++ b/cocos/platform/CCImage.cpp @@ -41,7 +41,7 @@ extern "C" { // To resolve link error when building 32bits with Xcode 6. // More information please refer to the discussion in https://github.com/cocos2d/cocos2d-x/pull/6986 -#if defined(__APPLE__) || defined(__unix) +#if defined (__unix) || (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) #ifndef __ENABLE_COMPATIBILITY_WITH_UNIX_2003__ #define __ENABLE_COMPATIBILITY_WITH_UNIX_2003__ #include @@ -66,6 +66,7 @@ extern "C" } #include "base/s3tc.h" #include "base/atitc.h" +#include "base/pvr.h" #include "base/TGAlib.h" #if (CC_TARGET_PLATFORM != CC_PLATFORM_WP8) && (CC_TARGET_PLATFORM != CC_PLATFORM_WINRT) @@ -96,6 +97,8 @@ namespace { static const int PVR_TEXTURE_FLAG_TYPE_MASK = 0xff; + static bool _PVRHaveAlphaPremultiplied = false; + // Values taken from PVRTexture.h from http://www.imgtec.com enum class PVR2TextureFlag { @@ -141,6 +144,34 @@ namespace PVRTC2BPP_RGBA = 1ULL, PVRTC4BPP_RGB = 2ULL, PVRTC4BPP_RGBA = 3ULL, + PVRTC2_2BPP_RGBA = 4ULL, + PVRTC2_4BPP_RGBA = 5ULL, + ETC1 = 6ULL, + DXT1 = 7ULL, + DXT2 = 8ULL, + DXT3 = 9ULL, + DXT4 = 10ULL, + DXT5 = 11ULL, + BC1 = 7ULL, + BC2 = 9ULL, + BC3 = 11ULL, + BC4 = 12ULL, + BC5 = 13ULL, + BC6 = 14ULL, + BC7 = 15ULL, + UYVY = 16ULL, + YUY2 = 17ULL, + BW1bpp = 18ULL, + R9G9B9E5 = 19ULL, + RGBG8888 = 20ULL, + GRGB8888 = 21ULL, + ETC2_RGB = 22ULL, + ETC2_RGBA = 23ULL, + ETC2_RGBA1 = 24ULL, + EAC_R11_Unsigned = 25ULL, + EAC_R11_Signed = 26ULL, + EAC_RG11_Unsigned = 27ULL, + EAC_RG11_Signed = 28ULL, BGRA8888 = 0x0808080861726762ULL, RGBA8888 = 0x0808080861626772ULL, @@ -169,10 +200,8 @@ namespace _pixel2_formathash::value_type(PVR2TexturePixelFormat::I8, Texture2D::PixelFormat::I8), _pixel2_formathash::value_type(PVR2TexturePixelFormat::AI88, Texture2D::PixelFormat::AI88), -#ifdef GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG _pixel2_formathash::value_type(PVR2TexturePixelFormat::PVRTC2BPP_RGBA, Texture2D::PixelFormat::PVRTC2A), _pixel2_formathash::value_type(PVR2TexturePixelFormat::PVRTC4BPP_RGBA, Texture2D::PixelFormat::PVRTC4A), -#endif }; static const int PVR2_MAX_TABLE_ELEMENTS = sizeof(v2_pixel_formathash_value) / sizeof(v2_pixel_formathash_value[0]); @@ -192,12 +221,12 @@ namespace _pixel3_formathash::value_type(PVR3TexturePixelFormat::L8, Texture2D::PixelFormat::I8), _pixel3_formathash::value_type(PVR3TexturePixelFormat::LA88, Texture2D::PixelFormat::AI88), -#ifdef GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG _pixel3_formathash::value_type(PVR3TexturePixelFormat::PVRTC2BPP_RGB, Texture2D::PixelFormat::PVRTC2), _pixel3_formathash::value_type(PVR3TexturePixelFormat::PVRTC2BPP_RGBA, Texture2D::PixelFormat::PVRTC2A), _pixel3_formathash::value_type(PVR3TexturePixelFormat::PVRTC4BPP_RGB, Texture2D::PixelFormat::PVRTC4), _pixel3_formathash::value_type(PVR3TexturePixelFormat::PVRTC4BPP_RGBA, Texture2D::PixelFormat::PVRTC4A), -#endif + + _pixel3_formathash::value_type(PVR3TexturePixelFormat::ETC1, Texture2D::PixelFormat::ETC), }; static const int PVR3_MAX_TABLE_ELEMENTS = sizeof(v3_pixel_formathash_value) / sizeof(v3_pixel_formathash_value[0]); @@ -395,6 +424,27 @@ namespace } } +Texture2D::PixelFormat getDevicePixelFormat(Texture2D::PixelFormat format) +{ + switch (format) { + case Texture2D::PixelFormat::PVRTC4: + case Texture2D::PixelFormat::PVRTC4A: + case Texture2D::PixelFormat::PVRTC2: + case Texture2D::PixelFormat::PVRTC2A: + if(Configuration::getInstance()->supportsPVRTC()) + return format; + else + return Texture2D::PixelFormat::RGBA8888; + case Texture2D::PixelFormat::ETC: + if(Configuration::getInstance()->supportsETC()) + return format; + else + return Texture2D::PixelFormat::RGB888; + default: + return format; + } +} + ////////////////////////////////////////////////////////////////////////// // Implement Image ////////////////////////////////////////////////////////////////////////// @@ -404,9 +454,9 @@ Image::Image() , _dataLen(0) , _width(0) , _height(0) +, _unpack(false) , _fileType(Format::UNKOWN) , _renderFormat(Texture2D::PixelFormat::NONE) -, _preMulti(false) , _numberOfMipmaps(0) , _hasPremultipliedAlpha(true) { @@ -415,7 +465,13 @@ Image::Image() Image::~Image() { - CC_SAFE_FREE(_data); + if(_unpack) + { + for (unsigned int i = 0; i < _numberOfMipmaps; ++i) + CC_SAFE_DELETE_ARRAY(_mipmaps[i].address); + } + else + CC_SAFE_FREE(_data); } bool Image::initWithImageFile(const std::string& path) @@ -820,7 +876,7 @@ bool Image::initWithJpgData(const unsigned char * data, ssize_t dataLen) /* init image info */ _width = cinfo.output_width; _height = cinfo.output_height; - _preMulti = false; + _hasPremultipliedAlpha = false; row_pointer[0] = static_cast(malloc(cinfo.output_width*cinfo.output_components * sizeof(unsigned char))); CC_BREAK_IF(! row_pointer[0]); @@ -988,7 +1044,7 @@ bool Image::initWithPngData(const unsigned char * data, ssize_t dataLen) } else { - _preMulti = false; + _hasPremultipliedAlpha = false; } if (row_pointers != nullptr) @@ -1161,7 +1217,7 @@ bool Image::initWithTiffData(const unsigned char * data, ssize_t dataLen) { /* the raster data is pre-multiplied by the alpha component after invoking TIFFReadRGBAImageOriented*/ - _preMulti = true; + _hasPremultipliedAlpha = true; memcpy(_data, raster, npixels*sizeof (uint32)); } @@ -1181,32 +1237,38 @@ namespace { bool testFormatForPvr2TCSupport(PVR2TexturePixelFormat format) { - if (!Configuration::getInstance()->supportsPVRTC()) - { - if (format == PVR2TexturePixelFormat::PVRTC2BPP_RGBA || - format == PVR2TexturePixelFormat::PVRTC4BPP_RGBA) - { - return false; - } - } - return true; } bool testFormatForPvr3TCSupport(PVR3TexturePixelFormat format) { - if (!Configuration::getInstance()->supportsPVRTC()) - { - if (format == PVR3TexturePixelFormat::PVRTC2BPP_RGB || - format == PVR3TexturePixelFormat::PVRTC2BPP_RGBA || - format == PVR3TexturePixelFormat::PVRTC4BPP_RGB || - format == PVR3TexturePixelFormat::PVRTC4BPP_RGBA) - { + switch (format) { + case PVR3TexturePixelFormat::DXT1: + case PVR3TexturePixelFormat::DXT3: + case PVR3TexturePixelFormat::DXT5: + return Configuration::getInstance()->supportsS3TC(); + + case PVR3TexturePixelFormat::BGRA8888: + return Configuration::getInstance()->supportsBGRA8888(); + + case PVR3TexturePixelFormat::PVRTC2BPP_RGB: + case PVR3TexturePixelFormat::PVRTC2BPP_RGBA: + case PVR3TexturePixelFormat::PVRTC4BPP_RGB: + case PVR3TexturePixelFormat::PVRTC4BPP_RGBA: + case PVR3TexturePixelFormat::ETC1: + case PVR3TexturePixelFormat::RGBA8888: + case PVR3TexturePixelFormat::RGBA4444: + case PVR3TexturePixelFormat::RGBA5551: + case PVR3TexturePixelFormat::RGB565: + case PVR3TexturePixelFormat::RGB888: + case PVR3TexturePixelFormat::A8: + case PVR3TexturePixelFormat::L8: + case PVR3TexturePixelFormat::LA88: + return true; + + default: return false; - } } - - return true; } } @@ -1227,7 +1289,9 @@ bool Image::initWithPVRv2Data(const unsigned char * data, ssize_t dataLen) Configuration *configuration = Configuration::getInstance(); - _hasPremultipliedAlpha = false; + //can not detect the premultiplied alpha from pvr file, use _PVRHaveAlphaPremultiplied instead. + _hasPremultipliedAlpha = _PVRHaveAlphaPremultiplied; + unsigned int flags = CC_SWAP_INT32_LITTLE_TO_HOST(header->flags); PVR2TexturePixelFormat formatFlags = static_cast(flags & PVR_TEXTURE_FLAG_TYPE_MASK); bool flipped = (flags & (unsigned int)PVR2TextureFlag::VerticalFlip) ? true : false; @@ -1256,7 +1320,7 @@ bool Image::initWithPVRv2Data(const unsigned char * data, ssize_t dataLen) return false; } - auto it = Texture2D::getPixelFormatInfoMap().find(v2_pixel_formathash.at(formatFlags)); + auto it = Texture2D::getPixelFormatInfoMap().find(getDevicePixelFormat(v2_pixel_formathash.at(formatFlags))); if (it == Texture2D::getPixelFormatInfoMap().end()) { @@ -1265,6 +1329,7 @@ bool Image::initWithPVRv2Data(const unsigned char * data, ssize_t dataLen) } _renderFormat = it->first; + int bpp = it->second.bpp; //Reset num of mipmaps _numberOfMipmaps = 0; @@ -1285,29 +1350,47 @@ bool Image::initWithPVRv2Data(const unsigned char * data, ssize_t dataLen) while (dataOffset < dataLength) { switch (formatFlags) { - case PVR2TexturePixelFormat::PVRTC2BPP_RGBA: - blockSize = 8 * 4; // Pixel by pixel block size for 2bpp - widthBlocks = width / 8; - heightBlocks = height / 4; - break; - case PVR2TexturePixelFormat::PVRTC4BPP_RGBA: - blockSize = 4 * 4; // Pixel by pixel block size for 4bpp - widthBlocks = width / 4; - heightBlocks = height / 4; - break; - case PVR2TexturePixelFormat::BGRA8888: - if (Configuration::getInstance()->supportsBGRA8888() == false) - { - CCLOG("cocos2d: Image. BGRA8888 not supported on this device"); - return false; - } - default: - blockSize = 1; - widthBlocks = width; - heightBlocks = height; - break; + case PVR2TexturePixelFormat::PVRTC2BPP_RGBA: + if(!Configuration::getInstance()->supportsPVRTC()) + { + CCLOG("cocos2d: Hardware PVR decoder not present. Using software decoder"); + _unpack = true; + _mipmaps[_numberOfMipmaps].len = width*height*4; + _mipmaps[_numberOfMipmaps].address = new unsigned char[width*height*4]; + PVRTDecompressPVRTC(_data+dataOffset,width,height,_mipmaps[_numberOfMipmaps].address, true); + bpp = 2; + } + blockSize = 8 * 4; // Pixel by pixel block size for 2bpp + widthBlocks = width / 8; + heightBlocks = height / 4; + break; + case PVR2TexturePixelFormat::PVRTC4BPP_RGBA: + if(!Configuration::getInstance()->supportsPVRTC()) + { + CCLOG("cocos2d: Hardware PVR decoder not present. Using software decoder"); + _unpack = true; + _mipmaps[_numberOfMipmaps].len = width*height*4; + _mipmaps[_numberOfMipmaps].address = new unsigned char[width*height*4]; + PVRTDecompressPVRTC(_data+dataOffset,width,height,_mipmaps[_numberOfMipmaps].address, false); + bpp = 4; + } + blockSize = 4 * 4; // Pixel by pixel block size for 4bpp + widthBlocks = width / 4; + heightBlocks = height / 4; + break; + case PVR2TexturePixelFormat::BGRA8888: + if (Configuration::getInstance()->supportsBGRA8888() == false) + { + CCLOG("cocos2d: Image. BGRA8888 not supported on this device"); + return false; + } + default: + blockSize = 1; + widthBlocks = width; + heightBlocks = height; + break; } - + // Clamp to minimum number of blocks if (widthBlocks < 2) { @@ -1317,22 +1400,31 @@ bool Image::initWithPVRv2Data(const unsigned char * data, ssize_t dataLen) { heightBlocks = 2; } - - dataSize = widthBlocks * heightBlocks * ((blockSize * it->second.bpp) / 8); + + dataSize = widthBlocks * heightBlocks * ((blockSize * bpp) / 8); int packetLength = (dataLength - dataOffset); packetLength = packetLength > dataSize ? dataSize : packetLength; - + //Make record to the mipmaps array and increment counter - _mipmaps[_numberOfMipmaps].address = _data + dataOffset; - _mipmaps[_numberOfMipmaps].len = packetLength; + if(!_unpack) + { + _mipmaps[_numberOfMipmaps].address = _data + dataOffset; + _mipmaps[_numberOfMipmaps].len = packetLength; + } _numberOfMipmaps++; - + dataOffset += packetLength; - + //Update width and height to the next lower power of two width = MAX(width >> 1, 1); height = MAX(height >> 1, 1); } + + if(_unpack) + { + _data = _mipmaps[0].address; + _dataLen = _mipmaps[0].len; + } return true; } @@ -1371,7 +1463,7 @@ bool Image::initWithPVRv3Data(const unsigned char * data, ssize_t dataLen) return false; } - auto it = Texture2D::getPixelFormatInfoMap().find(v3_pixel_formathash.at(pixelFormat)); + auto it = Texture2D::getPixelFormatInfoMap().find(getDevicePixelFormat(v3_pixel_formathash.at(pixelFormat))); if (it == Texture2D::getPixelFormatInfoMap().end()) { @@ -1381,6 +1473,7 @@ bool Image::initWithPVRv3Data(const unsigned char * data, ssize_t dataLen) } _renderFormat = it->first; + int bpp = it->second.bpp; // flags int flags = CC_SWAP_INT32_LITTLE_TO_HOST(header->flags); @@ -1388,7 +1481,7 @@ bool Image::initWithPVRv3Data(const unsigned char * data, ssize_t dataLen) // PVRv3 specifies premultiply alpha in a flag -- should always respect this in PVRv3 files if (flags & (unsigned int)PVR3TextureFlag::PremultipliedAlpha) { - _preMulti = true; + _hasPremultipliedAlpha = true; } // sizing @@ -1410,29 +1503,65 @@ bool Image::initWithPVRv3Data(const unsigned char * data, ssize_t dataLen) { switch ((PVR3TexturePixelFormat)pixelFormat) { - case PVR3TexturePixelFormat::PVRTC2BPP_RGB : - case PVR3TexturePixelFormat::PVRTC2BPP_RGBA : - blockSize = 8 * 4; // Pixel by pixel block size for 2bpp - widthBlocks = width / 8; - heightBlocks = height / 4; - break; - case PVR3TexturePixelFormat::PVRTC4BPP_RGB : - case PVR3TexturePixelFormat::PVRTC4BPP_RGBA : - blockSize = 4 * 4; // Pixel by pixel block size for 4bpp - widthBlocks = width / 4; - heightBlocks = height / 4; - break; - case PVR3TexturePixelFormat::BGRA8888: - if( ! Configuration::getInstance()->supportsBGRA8888()) + case PVR3TexturePixelFormat::PVRTC2BPP_RGB : + case PVR3TexturePixelFormat::PVRTC2BPP_RGBA : + if(!Configuration::getInstance()->supportsPVRTC()) { - CCLOG("cocos2d: Image. BGRA8888 not supported on this device"); - return false; - } - default: - blockSize = 1; - widthBlocks = width; - heightBlocks = height; - break; + CCLOG("cocos2d: Hardware PVR decoder not present. Using software decoder"); + _unpack = true; + _mipmaps[i].len = width*height*4; + _mipmaps[i].address = new unsigned char[width*height*4]; + PVRTDecompressPVRTC(_data+dataOffset,width,height,_mipmaps[i].address, true); + bpp = 2; + } + blockSize = 8 * 4; // Pixel by pixel block size for 2bpp + widthBlocks = width / 8; + heightBlocks = height / 4; + break; + case PVR3TexturePixelFormat::PVRTC4BPP_RGB : + case PVR3TexturePixelFormat::PVRTC4BPP_RGBA : + if(!Configuration::getInstance()->supportsPVRTC()) + { + CCLOG("cocos2d: Hardware PVR decoder not present. Using software decoder"); + _unpack = true; + _mipmaps[i].len = width*height*4; + _mipmaps[i].address = new unsigned char[width*height*4]; + PVRTDecompressPVRTC(_data+dataOffset,width,height,_mipmaps[i].address, false); + bpp = 4; + } + blockSize = 4 * 4; // Pixel by pixel block size for 4bpp + widthBlocks = width / 4; + heightBlocks = height / 4; + break; + case PVR3TexturePixelFormat::ETC1: + if(!Configuration::getInstance()->supportsETC()) + { + CCLOG("cocos2d: Hardware ETC1 decoder not present. Using software decoder"); + int bytePerPixel = 3; + unsigned int stride = width * bytePerPixel; + _unpack = true; + _mipmaps[i].len = width*height*bytePerPixel; + _mipmaps[i].address = new unsigned char[width*height*bytePerPixel]; + if (etc1_decode_image(static_cast(_data+dataOffset), static_cast(_mipmaps[i].address), width, height, bytePerPixel, stride) != 0) + { + return false; + } + } + blockSize = 4 * 4; // Pixel by pixel block size for 4bpp + widthBlocks = width / 4; + heightBlocks = height / 4; + break; + case PVR3TexturePixelFormat::BGRA8888: + if( ! Configuration::getInstance()->supportsBGRA8888()) + { + CCLOG("cocos2d: Image. BGRA8888 not supported on this device"); + return false; + } + default: + blockSize = 1; + widthBlocks = width; + heightBlocks = height; + break; } // Clamp to minimum number of blocks @@ -1445,12 +1574,15 @@ bool Image::initWithPVRv3Data(const unsigned char * data, ssize_t dataLen) heightBlocks = 2; } - dataSize = widthBlocks * heightBlocks * ((blockSize * it->second.bpp) / 8); + dataSize = widthBlocks * heightBlocks * ((blockSize * bpp) / 8); auto packetLength = _dataLen - dataOffset; packetLength = packetLength > dataSize ? dataSize : packetLength; - _mipmaps[i].address = _data + dataOffset; - _mipmaps[i].len = static_cast(packetLength); + if(!_unpack) + { + _mipmaps[i].address = _data + dataOffset; + _mipmaps[i].len = static_cast(packetLength); + } dataOffset += packetLength; CCAssert(dataOffset <= _dataLen, "CCTexurePVR: Invalid lenght"); @@ -1459,6 +1591,12 @@ bool Image::initWithPVRv3Data(const unsigned char * data, ssize_t dataLen) width = MAX(width >> 1, 1); height = MAX(height >> 1, 1); } + + if(_unpack) + { + _data = _mipmaps[0].address; + _dataLen = _mipmaps[0].len; + } return true; } @@ -1571,7 +1709,7 @@ bool Image::initWithTGAData(tImageTGA* tgaData) _dataLen = _width * _height * tgaData->pixelDepth / 8; _fileType = Format::TGA; - _preMulti = false; + _hasPremultipliedAlpha = false; ret = true; @@ -1921,7 +2059,7 @@ bool Image::initWithRawData(const unsigned char * data, ssize_t dataLen, int wid _height = height; _width = width; - _preMulti = preMulti; + _hasPremultipliedAlpha = preMulti; _renderFormat = Texture2D::PixelFormat::RGBA8888; // only RGBA8888 supported @@ -2216,7 +2354,13 @@ void Image::premultipliedAlpha() fourBytes[i] = CC_RGB_PREMULTIPLY_ALPHA(p[0], p[1], p[2], p[3]); } - _preMulti = true; + _hasPremultipliedAlpha = true; +} + + +void Image::setPVRImagesHavePremultipliedAlpha(bool haveAlphaPremultiplied) +{ + _PVRHaveAlphaPremultiplied = haveAlphaPremultiplied; } NS_CC_END diff --git a/cocos/platform/CCImage.h b/cocos/platform/CCImage.h index 5c37da9436..483ea686ff 100644 --- a/cocos/platform/CCImage.h +++ b/cocos/platform/CCImage.h @@ -51,6 +51,7 @@ typedef struct _MipmapInfo { unsigned char* address; int len; + _MipmapInfo():address(NULL),len(0){} }MipmapInfo; class CC_DLL Image : public Ref @@ -121,10 +122,10 @@ public: inline Texture2D::PixelFormat getRenderFormat() { return _renderFormat; } inline int getWidth() { return _width; } inline int getHeight() { return _height; } - inline bool isPremultipliedAlpha() { return _preMulti; } inline int getNumberOfMipmaps() { return _numberOfMipmaps; } inline MipmapInfo* getMipmaps() { return _mipmaps; } inline bool hasPremultipliedAlpha() { return _hasPremultipliedAlpha; } + CC_DEPRECATED_ATTRIBUTE inline bool isPremultipliedAlpha() { return _hasPremultipliedAlpha; } int getBitPerPixel(); bool hasAlpha(); @@ -137,6 +138,15 @@ public: @param isToRGB whether the image is saved as RGB format. */ bool saveToFile(const std::string &filename, bool isToRGB = true); + + + /** treats (or not) PVR files as if they have alpha premultiplied. + Since it is impossible to know at runtime if the PVR images have the alpha channel premultiplied, it is + possible load them as if they have (or not) the alpha channel premultiplied. + + By default it is disabled. + */ + static void setPVRImagesHavePremultipliedAlpha(bool haveAlphaPremultiplied); protected: bool initWithJpgData(const unsigned char * data, ssize_t dataLen); @@ -167,9 +177,9 @@ protected: ssize_t _dataLen; int _width; int _height; + bool _unpack; Format _fileType; Texture2D::PixelFormat _renderFormat; - bool _preMulti; MipmapInfo _mipmaps[MIPMAP_MAX]; // pointer to mipmap images int _numberOfMipmaps; // false if we cann't auto detect the image is premultiplied or not. diff --git a/cocos/platform/CMakeLists.txt b/cocos/platform/CMakeLists.txt index c3ab0850e5..28200922fd 100644 --- a/cocos/platform/CMakeLists.txt +++ b/cocos/platform/CMakeLists.txt @@ -31,10 +31,10 @@ include_directories( set(COCOS_PLATFORM_SRC platform/CCSAXParser.cpp platform/CCThread.cpp - platform/CCGLViewProtocol.cpp + platform/CCGLView.cpp platform/CCFileUtils.cpp platform/CCImage.cpp - platform/desktop/CCGLView.cpp + platform/desktop/CCGLViewImpl.cpp ../external/edtaa3func/edtaa3func.cpp ../external/ConvertUTF/ConvertUTFWrapper.cpp ../external/ConvertUTF/ConvertUTF.c diff --git a/cocos/platform/android/Android.mk b/cocos/platform/android/Android.mk index 1c35aa7dfc..bfc2e61672 100644 --- a/cocos/platform/android/Android.mk +++ b/cocos/platform/android/Android.mk @@ -10,7 +10,7 @@ LOCAL_SRC_FILES := \ CCApplication.cpp \ CCCommon.cpp \ CCDevice.cpp \ -CCGLView.cpp \ +CCGLViewImpl.cpp \ CCFileUtilsAndroid.cpp \ javaactivity.cpp \ jni/DPIJni.cpp \ @@ -28,13 +28,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) \ $(LOCAL_PATH)/.. \ $(LOCAL_PATH)/../.. \ -LOCAL_LDLIBS := -lGLESv1_CM \ - -lGLESv2 \ - -lEGL \ - -llog \ - -lz \ - -landroid - LOCAL_EXPORT_LDLIBS := -lGLESv1_CM \ -lGLESv2 \ -lEGL \ @@ -42,12 +35,4 @@ LOCAL_EXPORT_LDLIBS := -lGLESv1_CM \ -lz \ -landroid -LOCAL_WHOLE_STATIC_LIBRARIES := cocos_png_static cocos_jpeg_static cocos_tiff_static cocos_webp_static - - include $(BUILD_STATIC_LIBRARY) - -$(call import-module,jpeg/prebuilt/android) -$(call import-module,png/prebuilt/android) -$(call import-module,tiff/prebuilt/android) -$(call import-module,webp/prebuilt/android) diff --git a/cocos/platform/android/CCApplication.cpp b/cocos/platform/android/CCApplication.cpp index 9cfaf5d8a8..b7ff8bb8db 100644 --- a/cocos/platform/android/CCApplication.cpp +++ b/cocos/platform/android/CCApplication.cpp @@ -30,7 +30,6 @@ THE SOFTWARE. #include "jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h" #include "CCApplication.h" #include "base/CCDirector.h" -#include "CCGLView.h" #include #include #include @@ -68,7 +67,16 @@ int Application::run() void Application::setAnimationInterval(double interval) { - // NYI + JniMethodInfo methodInfo; + if (! JniHelper::getStaticMethodInfo(methodInfo, "org/cocos2dx/lib/Cocos2dxRenderer", "setAnimationInterval", + "(D)V")) + { + CCLOG("%s %d: error to get methodInfo", __FILE__, __LINE__); + } + else + { + methodInfo.env->CallStaticVoidMethod(methodInfo.classID, methodInfo.methodID, interval); + } } ////////////////////////////////////////////////////////////////////////// diff --git a/cocos/platform/android/CCGLView.cpp b/cocos/platform/android/CCGLViewImpl.cpp similarity index 80% rename from cocos/platform/android/CCGLView.cpp rename to cocos/platform/android/CCGLViewImpl.cpp index 35e88bfa4d..90fdc30df7 100644 --- a/cocos/platform/android/CCGLView.cpp +++ b/cocos/platform/android/CCGLViewImpl.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID -#include "CCGLView.h" +#include "CCGLViewImpl.h" #include "base/CCDirector.h" #include "base/ccMacros.h" #include "jni/IMEJni.h" @@ -51,9 +51,9 @@ void initExtensions() { NS_CC_BEGIN -GLView* GLView::createWithRect(const std::string& viewName, Rect rect, float frameZoomFactor) +GLViewImpl* GLViewImpl::createWithRect(const std::string& viewName, Rect rect, float frameZoomFactor) { - auto ret = new GLView; + auto ret = new GLViewImpl; if(ret && ret->initWithRect(viewName, rect, frameZoomFactor)) { ret->autorelease(); return ret; @@ -62,9 +62,9 @@ GLView* GLView::createWithRect(const std::string& viewName, Rect rect, float fra return nullptr; } -GLView* GLView::create(const std::string& viewName) +GLViewImpl* GLViewImpl::create(const std::string& viewName) { - auto ret = new GLView; + auto ret = new GLViewImpl; if(ret && ret->initWithFullScreen(viewName)) { ret->autorelease(); return ret; @@ -73,9 +73,9 @@ GLView* GLView::create(const std::string& viewName) return nullptr; } -GLView* GLView::createWithFullScreen(const std::string& viewName) +GLViewImpl* GLViewImpl::createWithFullScreen(const std::string& viewName) { - auto ret = new GLView(); + auto ret = new GLViewImpl(); if(ret && ret->initWithFullScreen(viewName)) { ret->autorelease(); return ret; @@ -84,42 +84,42 @@ GLView* GLView::createWithFullScreen(const std::string& viewName) return nullptr; } -GLView::GLView() +GLViewImpl::GLViewImpl() { initExtensions(); } -GLView::~GLView() +GLViewImpl::~GLViewImpl() { } -bool GLView::initWithRect(const std::string& viewName, Rect rect, float frameZoomFactor) +bool GLViewImpl::initWithRect(const std::string& viewName, Rect rect, float frameZoomFactor) { return true; } -bool GLView::initWithFullScreen(const std::string& viewName) +bool GLViewImpl::initWithFullScreen(const std::string& viewName) { return true; } -bool GLView::isOpenGLReady() +bool GLViewImpl::isOpenGLReady() { return (_screenSize.width != 0 && _screenSize.height != 0); } -void GLView::end() +void GLViewImpl::end() { terminateProcessJNI(); } -void GLView::swapBuffers() +void GLViewImpl::swapBuffers() { } -void GLView::setIMEKeyboardState(bool bOpen) +void GLViewImpl::setIMEKeyboardState(bool bOpen) { setKeyboardStateJNI((int)bOpen); } diff --git a/cocos/platform/android/CCGLView.h b/cocos/platform/android/CCGLViewImpl.h similarity index 79% rename from cocos/platform/android/CCGLView.h rename to cocos/platform/android/CCGLViewImpl.h index 6423d7019d..820189e148 100644 --- a/cocos/platform/android/CCGLView.h +++ b/cocos/platform/android/CCGLViewImpl.h @@ -23,26 +23,26 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#ifndef __CC_EGLVIEW_ANDROID_H__ -#define __CC_EGLVIEW_ANDROID_H__ +#ifndef __CC_EGLVIEWIMPL_ANDROID_H__ +#define __CC_EGLVIEWIMPL_ANDROID_H__ #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID #include "base/CCRef.h" #include "math/CCGeometry.h" -#include "platform/CCGLViewProtocol.h" +#include "platform/CCGLView.h" NS_CC_BEGIN -class CC_DLL GLView : public GLViewProtocol, public Ref +class CC_DLL GLViewImpl : public GLView { public: // static function - static GLView* create(const std::string &viewname); - static GLView* createWithRect(const std::string& viewName, Rect rect, float frameZoomFactor = 1.0f); - static GLView* createWithFullScreen(const std::string& viewName); + static GLViewImpl* create(const std::string &viewname); + static GLViewImpl* createWithRect(const std::string& viewName, Rect rect, float frameZoomFactor = 1.0f); + static GLViewImpl* createWithFullScreen(const std::string& viewName); bool isOpenGLReady() override; void end() override; @@ -50,8 +50,8 @@ public: void setIMEKeyboardState(bool bOpen) override; protected: - GLView(); - virtual ~GLView(); + GLViewImpl(); + virtual ~GLViewImpl(); bool initWithRect(const std::string& viewName, Rect rect, float frameZoomFactor); bool initWithFullScreen(const std::string& viewName); @@ -61,5 +61,5 @@ NS_CC_END #endif // CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID -#endif // end of __CC_EGLVIEW_ANDROID_H__ +#endif // end of __CC_EGLVIEWIMPL_ANDROID_H__ diff --git a/cocos/platform/android/ControllerManualAdapter/src/org/cocos2dx/lib/GameControllerActivity.java b/cocos/platform/android/ControllerManualAdapter/src/org/cocos2dx/lib/GameControllerActivity.java index f5bc665c2b..b527751778 100644 --- a/cocos/platform/android/ControllerManualAdapter/src/org/cocos2dx/lib/GameControllerActivity.java +++ b/cocos/platform/android/ControllerManualAdapter/src/org/cocos2dx/lib/GameControllerActivity.java @@ -270,7 +270,7 @@ public abstract class GameControllerActivity extends Cocos2dxActivity implements mControllerOuya.onResume(); } - mControllerHelper.gatherControllers(); + GameControllerHelper.gatherControllers(mControllerHelper.mGameController); } @Override diff --git a/cocos/platform/android/ControllerManualAdapter/src/org/cocos2dx/lib/GameControllerHelper.java b/cocos/platform/android/ControllerManualAdapter/src/org/cocos2dx/lib/GameControllerHelper.java index e4c756e074..f1cec07d11 100644 --- a/cocos/platform/android/ControllerManualAdapter/src/org/cocos2dx/lib/GameControllerHelper.java +++ b/cocos/platform/android/ControllerManualAdapter/src/org/cocos2dx/lib/GameControllerHelper.java @@ -80,6 +80,7 @@ public class GameControllerHelper { int deviceId = event.getDeviceId(); String deviceName = event.getDevice().getName(); if(mGameController.get(deviceId) == null){ + gatherControllers(mGameController); mGameController.append(deviceId, deviceName); } @@ -167,6 +168,7 @@ public class GameControllerHelper { String deviceName = event.getDevice().getName(); if(mGameController.get(deviceId) == null){ + gatherControllers(mGameController); mGameController.append(deviceId, deviceName); } @@ -224,7 +226,7 @@ public class GameControllerHelper { } void onInputDeviceChanged(int deviceId){ - gatherControllers(); + gatherControllers(mGameController); } void onInputDeviceRemoved(int deviceId) { @@ -234,20 +236,20 @@ public class GameControllerHelper { } } - void gatherControllers(){ - int controllerCount = mGameController.size(); + static void gatherControllers(SparseArray controllers){ + int controllerCount = controllers.size(); for (int i = 0; i < controllerCount; i++) { try { - int controllerDeveceId = mGameController.keyAt(i); + int controllerDeveceId = controllers.keyAt(i); InputDevice device = InputDevice.getDevice(controllerDeveceId); if (device == null) { - GameControllerAdapter.onDisconnected(mGameController.get(controllerDeveceId), controllerDeveceId); - mGameController.delete(controllerDeveceId); + GameControllerAdapter.onDisconnected(controllers.get(controllerDeveceId), controllerDeveceId); + controllers.delete(controllerDeveceId); } } catch (Exception e) { - int controllerDeveceId = mGameController.keyAt(i); - GameControllerAdapter.onDisconnected(mGameController.get(controllerDeveceId), controllerDeveceId); - mGameController.delete(controllerDeveceId); + int controllerDeveceId = controllers.keyAt(i); + GameControllerAdapter.onDisconnected(controllers.get(controllerDeveceId), controllerDeveceId); + controllers.delete(controllerDeveceId); e.printStackTrace(); } } diff --git a/cocos/platform/android/ControllerManualAdapter/src/org/cocos2dx/lib/GameControllerOuya.java b/cocos/platform/android/ControllerManualAdapter/src/org/cocos2dx/lib/GameControllerOuya.java index ca6ccede4f..fab0fdc80a 100644 --- a/cocos/platform/android/ControllerManualAdapter/src/org/cocos2dx/lib/GameControllerOuya.java +++ b/cocos/platform/android/ControllerManualAdapter/src/org/cocos2dx/lib/GameControllerOuya.java @@ -5,6 +5,7 @@ import org.cocos2dx.lib.GameControllerDelegate; import tv.ouya.console.api.OuyaController; import android.content.Context; +import android.util.SparseArray; import android.util.SparseIntArray; import android.view.KeyEvent; import android.view.MotionEvent; @@ -13,6 +14,8 @@ public class GameControllerOuya implements GameControllerDelegate{ private SparseIntArray mKeyMap; + private SparseArray mGameController = new SparseArray(); + public GameControllerOuya(){ mKeyMap = new SparseIntArray(20); mKeyMap.put(OuyaController.BUTTON_A, GameControllerDelegate.BUTTON_B); @@ -25,13 +28,9 @@ public class GameControllerOuya implements GameControllerDelegate{ mKeyMap.put(OuyaController.BUTTON_DPAD_UP, GameControllerDelegate.BUTTON_DPAD_UP); mKeyMap.put(OuyaController.BUTTON_L1, GameControllerDelegate.BUTTON_LEFT_SHOULDER); mKeyMap.put(OuyaController.BUTTON_R1, GameControllerDelegate.BUTTON_RIGHT_SHOULDER); - mKeyMap.put(OuyaController.AXIS_L2, GameControllerDelegate.BUTTON_LEFT_TRIGGER); - mKeyMap.put(OuyaController.AXIS_R2, GameControllerDelegate.BUTTON_RIGHT_TRIGGER); - mKeyMap.put(OuyaController.AXIS_LS_X, GameControllerDelegate.BUTTON_LEFT_THUMBSTICK); - mKeyMap.put(OuyaController.AXIS_LS_Y, GameControllerDelegate.BUTTON_LEFT_THUMBSTICK); - mKeyMap.put(OuyaController.AXIS_RS_X, GameControllerDelegate.BUTTON_RIGHT_THUMBSTICK); - mKeyMap.put(OuyaController.AXIS_RS_Y, GameControllerDelegate.BUTTON_RIGHT_THUMBSTICK); + mKeyMap.put(OuyaController.BUTTON_L3, GameControllerDelegate.BUTTON_LEFT_THUMBSTICK); + mKeyMap.put(OuyaController.BUTTON_R3, GameControllerDelegate.BUTTON_RIGHT_THUMBSTICK); } public void onCreate(Context context) { @@ -61,7 +60,11 @@ public class GameControllerOuya implements GameControllerDelegate{ { int deviceId = event.getDeviceId(); String deviceName = event.getDevice().getName(); - OuyaController c = OuyaController.getControllerByDeviceId(deviceId); + OuyaController c = OuyaController.getControllerByDeviceId(deviceId); + if (mGameController.get(deviceId) == null) { + GameControllerHelper.gatherControllers(mGameController); + mGameController.append(deviceId, deviceName); + } float newLeftTrigger = c.getAxisValue(OuyaController.AXIS_L2); if (Float.compare(newLeftTrigger, mOldLeftTrigger) != 0) { @@ -125,10 +128,6 @@ public class GameControllerOuya implements GameControllerDelegate{ int action = event.getAction(); int keyCode = event.getKeyCode(); - if (keyCode == KeyEvent.KEYCODE_BUTTON_L2 || keyCode == KeyEvent.KEYCODE_BUTTON_R2) { - return true; - } - if (action == KeyEvent.ACTION_DOWN) { handled = OuyaController.onKeyDown(keyCode, event); } @@ -143,10 +142,17 @@ public class GameControllerOuya implements GameControllerDelegate{ isAnalog = true; } + int deviceId = event.getDeviceId(); + String deviceName = event.getDevice().getName(); + + if (mGameController.get(deviceId) == null) { + GameControllerHelper.gatherControllers(mGameController); + mGameController.append(deviceId, deviceName); + } if (action == KeyEvent.ACTION_DOWN) { - mControllerEventListener.onButtonEvent(event.getDevice().getName(), event.getDeviceId(), mKeyMap.get(keyCode), true, 1.0f, isAnalog); + mControllerEventListener.onButtonEvent(deviceName, deviceId, mKeyMap.get(keyCode), true, 1.0f, isAnalog); }else { - mControllerEventListener.onButtonEvent(event.getDevice().getName(), event.getDeviceId(), mKeyMap.get(keyCode), false, 0.0f, isAnalog); + mControllerEventListener.onButtonEvent(deviceName, deviceId, mKeyMap.get(keyCode), false, 0.0f, isAnalog); } } diff --git a/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java index a710f8a711..58ecf41465 100644 --- a/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java +++ b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java @@ -292,6 +292,7 @@ public class Cocos2dxGLSurfaceView extends GLSurfaceView { public boolean onKeyDown(final int pKeyCode, final KeyEvent pKeyEvent) { switch (pKeyCode) { case KeyEvent.KEYCODE_BACK: + Cocos2dxVideoHelper.mVideoHandler.sendEmptyMessage(Cocos2dxVideoHelper.KeyEventBack); case KeyEvent.KEYCODE_MENU: case KeyEvent.KEYCODE_DPAD_LEFT: case KeyEvent.KEYCODE_DPAD_RIGHT: diff --git a/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java index a40d06019e..14cb7739c6 100644 --- a/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java +++ b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java @@ -82,31 +82,30 @@ public class Cocos2dxRenderer implements GLSurfaceView.Renderer { @Override public void onDrawFrame(final GL10 gl) { /* - * FPS controlling algorithm is not accurate, and it will slow down FPS - * on some devices. So comment FPS controlling code. + * No need to use algorithm in default(60 FPS) situation, + * since onDrawFrame() was called by system 60 times per second by default. */ + if (sAnimationInterval <= 1.0 / 60 * Cocos2dxRenderer.NANOSECONDSPERSECOND) { + Cocos2dxRenderer.nativeRender(); + } else { + final long now = System.nanoTime(); + final long interval = now - this.mLastTickInNanoSeconds; - /* - final long nowInNanoSeconds = System.nanoTime(); - final long interval = nowInNanoSeconds - this.mLastTickInNanoSeconds; - */ - - // should render a frame when onDrawFrame() is called or there is a - // "ghost" - Cocos2dxRenderer.nativeRender(); - - /* - // fps controlling - if (interval < Cocos2dxRenderer.sAnimationInterval) { - try { - // because we render it before, so we should sleep twice time interval - Thread.sleep((Cocos2dxRenderer.sAnimationInterval - interval) / Cocos2dxRenderer.NANOSECONDSPERMICROSECOND); - } catch (final Exception e) { + if (interval < Cocos2dxRenderer.sAnimationInterval) { + try { + Thread.sleep((Cocos2dxRenderer.sAnimationInterval - interval) / Cocos2dxRenderer.NANOSECONDSPERMICROSECOND); + } catch (final Exception e) { + } } + /* + * Render time MUST be counted in, or the FPS will slower than appointed. + */ + final long renderStart = System.nanoTime(); + Cocos2dxRenderer.nativeRender(); + final long renderEnd = System.nanoTime(); + final long renderInterval = renderEnd - renderStart; + this.mLastTickInNanoSeconds = renderEnd - renderInterval; } - - this.mLastTickInNanoSeconds = nowInNanoSeconds; - */ } // =========================================================== diff --git a/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoHelper.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoHelper.java index 64d1cc0adf..5bd3910eac 100644 --- a/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoHelper.java +++ b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoHelper.java @@ -40,7 +40,7 @@ public class Cocos2dxVideoHelper { private FrameLayout mLayout = null; private Cocos2dxActivity mActivity = null; private SparseArray sVideoViews = null; - private static VideoHandler mVideoHandler = null; + static VideoHandler mVideoHandler = null; Cocos2dxVideoHelper(Cocos2dxActivity activity,FrameLayout layout) { @@ -64,6 +64,8 @@ public class Cocos2dxVideoHelper { private final static int VideoTaskSetVisible = 9; private final static int VideoTaskRestart = 10; private final static int VideoTaskKeepRatio = 11; + private final static int VideoTaskFullScreen = 12; + final static int KeyEventBack = 1000; static class VideoHandler extends Handler{ WeakReference mReference; @@ -101,6 +103,16 @@ public class Cocos2dxVideoHelper { helper._setVideoRect(msg.arg1, rect.left, rect.top, rect.right, rect.bottom); break; } + case VideoTaskFullScreen:{ + Cocos2dxVideoHelper helper = mReference.get(); + Rect rect = (Rect)msg.obj; + if (msg.arg2 == 1) { + helper._setFullScreenEnabled(msg.arg1, true, rect.right, rect.bottom); + } else { + helper._setFullScreenEnabled(msg.arg1, false, rect.right, rect.bottom); + } + break; + } case VideoTaskPause: { Cocos2dxVideoHelper helper = mReference.get(); helper._pauseVideo(msg.arg1); @@ -144,6 +156,11 @@ public class Cocos2dxVideoHelper { } break; } + case KeyEventBack: { + Cocos2dxVideoHelper helper = mReference.get(); + helper.onBackKeyEvent(); + break; + } default: break; } @@ -255,6 +272,38 @@ public class Cocos2dxVideoHelper { } } + public static void setFullScreenEnabled(int index,boolean enabled, int width,int height) { + Message msg = new Message(); + msg.what = VideoTaskFullScreen; + msg.arg1 = index; + if (enabled) { + msg.arg2 = 1; + } else { + msg.arg2 = 0; + } + msg.obj = new Rect(0, 0, width, height); + mVideoHandler.sendMessage(msg); + } + + private void _setFullScreenEnabled(int index, boolean enabled, int width,int height) { + Cocos2dxVideoView videoView = sVideoViews.get(index); + if (videoView != null) { + videoView.setFullScreenEnabled(enabled, width, height); + } + } + + private void onBackKeyEvent() { + int viewCount = sVideoViews.size(); + for (int i = 0; i < viewCount; i++) { + int key = sVideoViews.keyAt(i); + Cocos2dxVideoView videoView = sVideoViews.get(key); + if (videoView != null) { + videoView.setFullScreenEnabled(false, 0, 0); + mActivity.runOnGLThread(new VideoEventRunnable(key, KeyEventBack)); + } + } + } + public static void startVideo(int index) { Message msg = new Message(); msg.what = VideoTaskStart; diff --git a/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoView.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoView.java index f701f7b375..48dc5d8d67 100644 --- a/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoView.java +++ b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoView.java @@ -18,7 +18,6 @@ package org.cocos2dx.lib; import android.app.AlertDialog; -import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.res.AssetFileDescriptor; @@ -27,7 +26,6 @@ import android.media.AudioManager; import android.media.MediaPlayer; import android.media.MediaPlayer.OnErrorListener; import android.net.Uri; -import android.util.AttributeSet; import android.util.Log; import android.view.MotionEvent; import android.view.SurfaceHolder; @@ -75,7 +73,7 @@ public class Cocos2dxVideoView extends SurfaceView implements MediaPlayerControl // recording the seek position while preparing private int mSeekWhenPrepared; - protected Context mContext = null; + protected Cocos2dxActivity mCocos2dxActivity = null; protected int mViewLeft = 0; protected int mViewTop = 0; @@ -87,27 +85,17 @@ public class Cocos2dxVideoView extends SurfaceView implements MediaPlayerControl protected int mVisibleWidth = 0; protected int mVisibleHeight = 0; + protected boolean mFullScreenEnabled = false; + protected int mFullScreenWidth = 0; + protected int mFullScreenHeight = 0; + private int mViewTag = 0; - public Cocos2dxVideoView(Context context,int tag) { - super(context); + public Cocos2dxVideoView(Cocos2dxActivity activity,int tag) { + super(activity); mViewTag = tag; - mContext = context; - initVideoView(); - } - - public Cocos2dxVideoView(Context context, AttributeSet attrs) { - this(context, attrs, 0); - - mContext = context; - initVideoView(); - } - - public Cocos2dxVideoView(Context context, AttributeSet attrs, int defStyle) { - super(context, attrs, defStyle); - - mContext = context; + mCocos2dxActivity = activity; initVideoView(); } @@ -115,11 +103,11 @@ public class Cocos2dxVideoView extends SurfaceView implements MediaPlayerControl protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { if (mVideoWidth == 0 || mVideoHeight == 0) { setMeasuredDimension(mViewWidth, mViewHeight); - Log.e(TAG, ""+mViewWidth+ ":" +mViewHeight); + Log.i(TAG, ""+mViewWidth+ ":" +mViewHeight); } else { setMeasuredDimension(mVisibleWidth, mVisibleHeight); - Log.e(TAG, ""+mVisibleWidth+ ":" +mVisibleHeight); + Log.i(TAG, ""+mVisibleWidth+ ":" +mVisibleHeight); } } @@ -131,6 +119,18 @@ public class Cocos2dxVideoView extends SurfaceView implements MediaPlayerControl mViewHeight = maxHeight; if (mVideoWidth != 0 && mVideoHeight != 0) { + fixSize(mViewLeft, mViewTop, mViewWidth, mViewHeight); + } + } + + public void setFullScreenEnabled(boolean enabled, int width, int height) { + if (mFullScreenEnabled != enabled) { + mFullScreenEnabled = enabled; + if (width != 0 && height != 0) { + mFullScreenWidth = width; + mFullScreenHeight = height; + } + fixSize(); } } @@ -265,7 +265,7 @@ public class Cocos2dxVideoView extends SurfaceView implements MediaPlayerControl // TODO: these constants need to be published somewhere in the framework. Intent i = new Intent("com.android.music.musicservicecommand"); i.putExtra("command", "pause"); - mContext.sendBroadcast(i); + mCocos2dxActivity.sendBroadcast(i); // we shouldn't clear the target state, because somebody might have // called start() previously @@ -288,10 +288,10 @@ public class Cocos2dxVideoView extends SurfaceView implements MediaPlayerControl mDuration = -1; mCurrentBufferPercentage = 0; if (isAssetRouse) { - AssetFileDescriptor afd = mContext.getAssets().openFd(fileName); + AssetFileDescriptor afd = mCocos2dxActivity.getAssets().openFd(fileName); mMediaPlayer.setDataSource(afd.getFileDescriptor(),afd.getStartOffset(),afd.getLength()); } else { - mMediaPlayer.setDataSource(mContext, mUri); + mMediaPlayer.setDataSource(mCocos2dxActivity, mUri); } mMediaPlayer.prepareAsync(); @@ -321,27 +321,35 @@ public class Cocos2dxVideoView extends SurfaceView implements MediaPlayerControl } public void fixSize() { - if (mViewWidth != 0 && mViewHeight != 0) { + if (mFullScreenEnabled) { + fixSize(0, 0, mFullScreenWidth, mFullScreenHeight); + } else { + fixSize(mViewLeft, mViewTop, mViewWidth, mViewHeight); + } + } + + public void fixSize(int left,int top,int width,int height) { + if (width != 0 && height != 0) { if (mKeepRatio) { - if ( mVideoWidth * mViewHeight > mViewWidth * mVideoHeight ) { - mVisibleWidth = mViewWidth; - mVisibleHeight = mViewWidth * mVideoHeight / mVideoWidth; - } else if ( mVideoWidth * mViewHeight < mViewWidth * mVideoHeight ) { - mVisibleWidth = mViewHeight * mVideoWidth / mVideoHeight; - mVisibleHeight = mViewHeight; + if ( mVideoWidth * height > width * mVideoHeight ) { + mVisibleWidth = width; + mVisibleHeight = width * mVideoHeight / mVideoWidth; + } else if ( mVideoWidth * height < width * mVideoHeight ) { + mVisibleWidth = height * mVideoWidth / mVideoHeight; + mVisibleHeight = height; } - mVisibleLeft = mViewLeft + (mViewWidth - mVisibleWidth) / 2; - mVisibleTop = mViewTop + (mViewHeight - mVisibleHeight) / 2; + mVisibleLeft = left + (width - mVisibleWidth) / 2; + mVisibleTop = top + (height - mVisibleHeight) / 2; } else { - mVisibleLeft = mViewLeft; - mVisibleTop = mViewTop; - mVisibleWidth = mViewWidth; - mVisibleHeight = mViewHeight; + mVisibleLeft = left; + mVisibleTop = top; + mVisibleWidth = width; + mVisibleHeight = height; } } else { - mVisibleLeft = mViewLeft; - mVisibleTop = mViewTop; + mVisibleLeft = left; + mVisibleTop = top; mVisibleWidth = mVideoWidth; mVisibleHeight = mVideoHeight; } @@ -437,7 +445,7 @@ public class Cocos2dxVideoView extends SurfaceView implements MediaPlayerControl * longer have a window, don't bother showing the user an error. */ if (getWindowToken() != null) { - Resources r = mContext.getResources(); + Resources r = mCocos2dxActivity.getResources(); int messageId; if (framework_err == MediaPlayer.MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK) { @@ -451,7 +459,7 @@ public class Cocos2dxVideoView extends SurfaceView implements MediaPlayerControl int titleId = r.getIdentifier("VideoView_error_title", "string", "android"); int buttonStringId = r.getIdentifier("VideoView_error_button", "string", "android"); - new AlertDialog.Builder(mContext) + new AlertDialog.Builder(mCocos2dxActivity) .setTitle(r.getString(titleId)) .setMessage(messageId) .setPositiveButton(r.getString(buttonStringId), diff --git a/cocos/platform/android/javaactivity.cpp b/cocos/platform/android/javaactivity.cpp index 866318527f..b16482600e 100644 --- a/cocos/platform/android/javaactivity.cpp +++ b/cocos/platform/android/javaactivity.cpp @@ -32,7 +32,7 @@ THE SOFTWARE. #include "renderer/CCGLProgramCache.h" #include "renderer/CCTextureCache.h" #include "2d/CCDrawingPrimitives.h" -#include "CCGLView.h" +#include "CCGLViewImpl.h" #include "platform/android/jni/JniHelper.h" #include #include @@ -60,7 +60,7 @@ void Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeInit(JNIEnv* env, jobject thi auto glview = director->getOpenGLView(); if (!glview) { - glview = cocos2d::GLView::create("Android app"); + glview = cocos2d::GLViewImpl::create("Android app"); glview->setFrameSize(w, h); director->setOpenGLView(glview); diff --git a/cocos/platform/android/jni/TouchesJni.cpp b/cocos/platform/android/jni/TouchesJni.cpp index 023b7fba93..b54362280f 100644 --- a/cocos/platform/android/jni/TouchesJni.cpp +++ b/cocos/platform/android/jni/TouchesJni.cpp @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ #include "base/CCDirector.h" #include "base/CCEventKeyboard.h" -#include "CCGLView.h" +#include "CCGLViewImpl.h" #include #include diff --git a/cocos/platform/apple/CCFileUtilsApple.h b/cocos/platform/apple/CCFileUtilsApple.h index 57519eed9c..8c563176ab 100644 --- a/cocos/platform/apple/CCFileUtilsApple.h +++ b/cocos/platform/apple/CCFileUtilsApple.h @@ -2,19 +2,19 @@ Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2011 Zynga Inc. Copyright (c) 2013-2014 Chukong Technologies Inc. - + http://www.cocos2d-x.org - + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -43,16 +43,20 @@ NS_CC_BEGIN class CC_DLL FileUtilsApple : public FileUtils { public: + FileUtilsApple(); /* override funtions */ virtual std::string getWritablePath() const override; virtual std::string getFullPathForDirectoryAndFilename(const std::string& directory, const std::string& filename) override; - + virtual ValueMap getValueMapFromFile(const std::string& filename) override; virtual bool writeToFile(ValueMap& dict, const std::string& fullPath) override; - + virtual ValueVector getValueVectorFromFile(const std::string& filename) override; + void setBundle(NSBundle* bundle); private: virtual bool isFileExistInternal(const std::string& filePath) const override; + NSBundle* getBundle() const; + NSBundle* _bundle; }; // end of platform group diff --git a/cocos/platform/apple/CCFileUtilsApple.mm b/cocos/platform/apple/CCFileUtilsApple.mm index 1a10ace233..ae707b50f2 100644 --- a/cocos/platform/apple/CCFileUtilsApple.mm +++ b/cocos/platform/apple/CCFileUtilsApple.mm @@ -49,7 +49,7 @@ static void addItemToArray(id item, ValueVector& array) array.push_back(Value([item UTF8String])); return; } - + // add number value into array(such as int, float, bool and so on) // the value is a number if ([item isKindOfClass:[NSNumber class]]) @@ -74,7 +74,7 @@ static void addItemToArray(id item, ValueVector& array) return; } - + // add dictionary value into array if ([item isKindOfClass:[NSDictionary class]]) { @@ -84,11 +84,11 @@ static void addItemToArray(id item, ValueVector& array) id subValue = [item objectForKey:subKey]; addValueToDict(subKey, subValue, dict); } - + array.push_back(Value(dict)); return; } - + // add array value into array if ([item isKindOfClass:[NSArray class]]) { @@ -111,48 +111,48 @@ static void addObjectToNSArray(const Value& value, NSMutableArray *array) [array addObject:element]; return; } - + //add float into array if (value.getType() == Value::Type::FLOAT) { NSNumber *number = [NSNumber numberWithFloat:value.asFloat()]; [array addObject:number]; } - + //add double into array if (value.getType() == Value::Type::DOUBLE) { NSNumber *number = [NSNumber numberWithDouble:value.asDouble()]; [array addObject:number]; } - + //add boolean into array if (value.getType() == Value::Type::BOOLEAN) { NSNumber *element = [NSNumber numberWithBool:value.asBool()]; [array addObject:element]; } - + if (value.getType() == Value::Type::INTEGER) { NSNumber *element = [NSNumber numberWithInt:value.asInt()]; [array addObject:element]; } - + //todo: add date and data support - + // add array into array if (value.getType() == Value::Type::VECTOR) { NSMutableArray *element = [NSMutableArray array]; - + ValueVector valueArray = value.asValueVector(); - + for (const auto &e : valueArray) { addObjectToNSArray(e, element); } - + [array addObject:element]; return; } - + // add dictionary value into array if (value.getType() == Value::Type::MAP) { @@ -163,7 +163,7 @@ static void addObjectToNSArray(const Value& value, NSMutableArray *array) { addObjectToNSDict(iter->first, iter->second, element); } - + [array addObject:element]; } } @@ -173,14 +173,14 @@ static void addValueToDict(id nsKey, id nsValue, ValueMap& dict) // the key must be a string CCASSERT([nsKey isKindOfClass:[NSString class]], "The key should be a string!"); std::string key = [nsKey UTF8String]; - + // the value is a string if ([nsValue isKindOfClass:[NSString class]]) { dict[key] = Value([nsValue UTF8String]); return; } - + // the value is a number if ([nsValue isKindOfClass:[NSNumber class]]) { @@ -204,12 +204,12 @@ static void addValueToDict(id nsKey, id nsValue, ValueMap& dict) return; } - + // the value is a new dictionary if ([nsValue isKindOfClass:[NSDictionary class]]) { ValueMap subDict; - + for (id subKey in [nsValue allKeys]) { id subValue = [nsValue objectForKey:subKey]; @@ -218,7 +218,7 @@ static void addValueToDict(id nsKey, id nsValue, ValueMap& dict) dict[key] = Value(subDict); return; } - + // the value is a array if ([nsValue isKindOfClass:[NSArray class]]) { @@ -231,13 +231,13 @@ static void addValueToDict(id nsKey, id nsValue, ValueMap& dict) dict[key] = Value(valueArray); return; } - + } static void addObjectToNSDict(const std::string& key, const Value& value, NSMutableDictionary *dict) { NSString *NSkey = [NSString stringWithCString:key.c_str() encoding:NSUTF8StringEncoding]; - + // the object is a Dictionary if (value.getType() == Value::Type::MAP) { @@ -247,35 +247,35 @@ static void addObjectToNSDict(const std::string& key, const Value& value, NSMuta { addObjectToNSDict(iter->first, iter->second, dictElement); } - + [dict setObject:dictElement forKey:NSkey]; return; } - + //add float into dict if (value.getType() == Value::Type::FLOAT) { NSNumber *number = [NSNumber numberWithFloat:value.asFloat()]; [dict setObject:number forKey:NSkey]; } - + //add double into dict if (value.getType() == Value::Type::DOUBLE) { NSNumber *number = [NSNumber numberWithDouble:value.asDouble()]; [dict setObject:number forKey:NSkey]; } - + //add boolean into dict if (value.getType() == Value::Type::BOOLEAN) { NSNumber *element = [NSNumber numberWithBool:value.asBool()]; [dict setObject:element forKey:NSkey]; } - + //add integer into dict if (value.getType() == Value::Type::INTEGER) { NSNumber *element = [NSNumber numberWithInt:value.asInt()]; [dict setObject:element forKey:NSkey]; } - + // the object is a String if (value.getType() == Value::Type::STRING) { @@ -283,14 +283,14 @@ static void addObjectToNSDict(const std::string& key, const Value& value, NSMuta [dict setObject:strElement forKey:NSkey]; return; } - + // the object is a Array if (value.getType() == Value::Type::VECTOR) { NSMutableArray *arrElement = [NSMutableArray array]; - + ValueVector array = value.asValueVector(); - + for(const auto& v : array) { addObjectToNSArray(v, arrElement); @@ -301,6 +301,19 @@ static void addObjectToNSDict(const std::string& key, const Value& value, NSMuta } } +FileUtilsApple::FileUtilsApple() { + _bundle = [NSBundle mainBundle]; +} + + +void FileUtilsApple::setBundle(NSBundle* bundle) { + _bundle = bundle; +} + +NSBundle* FileUtilsApple::getBundle() const { + return _bundle; +} + #pragma mark - FileUtils @@ -340,7 +353,7 @@ bool FileUtilsApple::isFileExistInternal(const std::string& filePath) const } bool ret = false; - + if (filePath[0] != '/') { std::string path; @@ -355,8 +368,8 @@ bool FileUtilsApple::isFileExistInternal(const std::string& filePath) const { file = filePath; } - - NSString* fullpath = [[NSBundle mainBundle] pathForResource:[NSString stringWithUTF8String:file.c_str()] + + NSString* fullpath = [getBundle() pathForResource:[NSString stringWithUTF8String:file.c_str()] ofType:nil inDirectory:[NSString stringWithUTF8String:path.c_str()]]; if (fullpath != nil) { @@ -370,7 +383,7 @@ bool FileUtilsApple::isFileExistInternal(const std::string& filePath) const ret = true; } } - + return ret; } @@ -378,7 +391,7 @@ std::string FileUtilsApple::getFullPathForDirectoryAndFilename(const std::string { if (directory[0] != '/') { - NSString* fullpath = [[NSBundle mainBundle] pathForResource:[NSString stringWithUTF8String:filename.c_str()] + NSString* fullpath = [getBundle() pathForResource:[NSString stringWithUTF8String:filename.c_str()] ofType:nil inDirectory:[NSString stringWithUTF8String:directory.c_str()]]; if (fullpath != nil) { @@ -401,9 +414,9 @@ ValueMap FileUtilsApple::getValueMapFromFile(const std::string& filename) std::string fullPath = fullPathForFilename(filename); NSString* path = [NSString stringWithUTF8String:fullPath.c_str()]; NSDictionary* dict = [NSDictionary dictionaryWithContentsOfFile:path]; - + ValueMap ret; - + if (dict != nil) { for (id key in [dict allKeys]) @@ -419,16 +432,16 @@ bool FileUtilsApple::writeToFile(ValueMap& dict, const std::string &fullPath) { //CCLOG("iOS||Mac Dictionary %d write to file %s", dict->_ID, fullPath.c_str()); NSMutableDictionary *nsDict = [NSMutableDictionary dictionary]; - + for (auto iter = dict.begin(); iter != dict.end(); ++iter) { addObjectToNSDict(iter->first, iter->second, nsDict); } - + NSString *file = [NSString stringWithUTF8String:fullPath.c_str()]; // do it atomically [nsDict writeToFile:file atomically:YES]; - + return true; } @@ -442,14 +455,14 @@ ValueVector FileUtilsApple::getValueVectorFromFile(const std::string& filename) std::string fullPath = fullPathForFilename(filename); NSString* path = [NSString stringWithUTF8String:fullPath.c_str()]; NSArray* array = [NSArray arrayWithContentsOfFile:path]; - + ValueVector ret; - + for (id value in array) { addItemToArray(value, ret); } - + return ret; } diff --git a/cocos/platform/desktop/CCGLView.cpp b/cocos/platform/desktop/CCGLViewImpl.cpp similarity index 91% rename from cocos/platform/desktop/CCGLView.cpp rename to cocos/platform/desktop/CCGLViewImpl.cpp index 4c4fbd7072..c61a38f39b 100644 --- a/cocos/platform/desktop/CCGLView.cpp +++ b/cocos/platform/desktop/CCGLViewImpl.cpp @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCGLView.h" +#include "CCGLViewImpl.h" #include "base/CCDirector.h" #include "base/CCTouch.h" #include "base/CCEventDispatcher.h" @@ -95,16 +95,16 @@ public: _view->onGLFWWindowSizeFunCallback(window, width, height); } - static void setGLView(GLView* view) + static void setGLViewImpl(GLViewImpl* view) { _view = view; } private: - static GLView* _view; + static GLViewImpl* _view; }; -GLView* GLFWEventHandler::_view = nullptr; +GLViewImpl* GLFWEventHandler::_view = nullptr; //////////////////////////////////////////////////// @@ -247,11 +247,11 @@ static keyCodeItem g_keyCodeStructArray[] = { }; ////////////////////////////////////////////////////////////////////////// -// implement GLView +// implement GLViewImpl ////////////////////////////////////////////////////////////////////////// -GLView::GLView() +GLViewImpl::GLViewImpl() : _captured(false) , _supportTouch(false) , _isInRetinaMonitor(false) @@ -270,22 +270,22 @@ GLView::GLView() g_keyCodeMap[item.glfwKeyCode] = item.keyCode; } - GLFWEventHandler::setGLView(this); + GLFWEventHandler::setGLViewImpl(this); glfwSetErrorCallback(GLFWEventHandler::onGLFWError); glfwInit(); } -GLView::~GLView() +GLViewImpl::~GLViewImpl() { - CCLOGINFO("deallocing GLView: %p", this); - GLFWEventHandler::setGLView(nullptr); + CCLOGINFO("deallocing GLViewImpl: %p", this); + GLFWEventHandler::setGLViewImpl(nullptr); glfwTerminate(); } -GLView* GLView::create(const std::string& viewName) +GLViewImpl* GLViewImpl::create(const std::string& viewName) { - auto ret = new GLView; + auto ret = new GLViewImpl; if(ret && ret->initWithRect(viewName, Rect(0, 0, 960, 640), 1)) { ret->autorelease(); return ret; @@ -294,9 +294,9 @@ GLView* GLView::create(const std::string& viewName) return nullptr; } -GLView* GLView::createWithRect(const std::string& viewName, Rect rect, float frameZoomFactor) +GLViewImpl* GLViewImpl::createWithRect(const std::string& viewName, Rect rect, float frameZoomFactor) { - auto ret = new GLView; + auto ret = new GLViewImpl; if(ret && ret->initWithRect(viewName, rect, frameZoomFactor)) { ret->autorelease(); return ret; @@ -305,9 +305,9 @@ GLView* GLView::createWithRect(const std::string& viewName, Rect rect, float fra return nullptr; } -GLView* GLView::createWithFullScreen(const std::string& viewName) +GLViewImpl* GLViewImpl::createWithFullScreen(const std::string& viewName) { - auto ret = new GLView(); + auto ret = new GLViewImpl(); if(ret && ret->initWithFullScreen(viewName)) { ret->autorelease(); return ret; @@ -316,9 +316,9 @@ GLView* GLView::createWithFullScreen(const std::string& viewName) return nullptr; } -GLView* GLView::createWithFullScreen(const std::string& viewName, const GLFWvidmode &videoMode, GLFWmonitor *monitor) +GLViewImpl* GLViewImpl::createWithFullScreen(const std::string& viewName, const GLFWvidmode &videoMode, GLFWmonitor *monitor) { - auto ret = new GLView(); + auto ret = new GLViewImpl(); if(ret && ret->initWithFullscreen(viewName, videoMode, monitor)) { ret->autorelease(); return ret; @@ -328,7 +328,7 @@ GLView* GLView::createWithFullScreen(const std::string& viewName, const GLFWvidm } -bool GLView::initWithRect(const std::string& viewName, Rect rect, float frameZoomFactor) +bool GLViewImpl::initWithRect(const std::string& viewName, Rect rect, float frameZoomFactor) { setViewName(viewName); @@ -375,7 +375,7 @@ bool GLView::initWithRect(const std::string& viewName, Rect rect, float frameZoo return true; } -bool GLView::initWithFullScreen(const std::string& viewName) +bool GLViewImpl::initWithFullScreen(const std::string& viewName) { //Create fullscreen window on primary monitor at its current video mode. _monitor = glfwGetPrimaryMonitor(); @@ -386,7 +386,7 @@ bool GLView::initWithFullScreen(const std::string& viewName) return initWithRect(viewName, Rect(0, 0, videoMode->width, videoMode->height), 1.0f); } -bool GLView::initWithFullscreen(const std::string &viewname, const GLFWvidmode &videoMode, GLFWmonitor *monitor) +bool GLViewImpl::initWithFullscreen(const std::string &viewname, const GLFWvidmode &videoMode, GLFWmonitor *monitor) { //Create fullscreen on specified monitor at the specified video mode. _monitor = monitor; @@ -402,29 +402,29 @@ bool GLView::initWithFullscreen(const std::string &viewname, const GLFWvidmode & return initWithRect(viewname, Rect(0, 0, videoMode.width, videoMode.height), 1.0f); } -bool GLView::isOpenGLReady() +bool GLViewImpl::isOpenGLReady() { return nullptr != _mainWindow; } -void GLView::end() +void GLViewImpl::end() { if(_mainWindow) { glfwSetWindowShouldClose(_mainWindow,1); _mainWindow = nullptr; } - // Release self. Otherwise, GLView could not be freed. + // Release self. Otherwise, GLViewImpl could not be freed. release(); } -void GLView::swapBuffers() +void GLViewImpl::swapBuffers() { if(_mainWindow) glfwSwapBuffers(_mainWindow); } -bool GLView::windowShouldClose() +bool GLViewImpl::windowShouldClose() { if(_mainWindow) return glfwWindowShouldClose(_mainWindow) ? true : false; @@ -432,13 +432,12 @@ bool GLView::windowShouldClose() return true; } -void GLView::pollEvents() +void GLViewImpl::pollEvents() { glfwPollEvents(); } - -void GLView::enableRetina(bool enabled) +void GLViewImpl::enableRetina(bool enabled) { #if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) _isRetinaEnabled = enabled; @@ -455,12 +454,12 @@ void GLView::enableRetina(bool enabled) } -void GLView::setIMEKeyboardState(bool /*bOpen*/) +void GLViewImpl::setIMEKeyboardState(bool /*bOpen*/) { } -void GLView::setFrameZoomFactor(float zoomFactor) +void GLViewImpl::setFrameZoomFactor(float zoomFactor) { CCASSERT(zoomFactor > 0.0f, "zoomFactor must be larger than 0"); @@ -473,12 +472,12 @@ void GLView::setFrameZoomFactor(float zoomFactor) updateFrameSize(); } -float GLView::getFrameZoomFactor() +float GLViewImpl::getFrameZoomFactor() const { return _frameZoomFactor; } -void GLView::updateFrameSize() +void GLViewImpl::updateFrameSize() { if (_screenSize.width > 0 && _screenSize.height > 0) { @@ -515,13 +514,13 @@ void GLView::updateFrameSize() } } -void GLView::setFrameSize(float width, float height) +void GLViewImpl::setFrameSize(float width, float height) { - GLViewProtocol::setFrameSize(width, height); + GLView::setFrameSize(width, height); updateFrameSize(); } -void GLView::setViewPortInPoints(float x , float y , float w , float h) +void GLViewImpl::setViewPortInPoints(float x , float y , float w , float h) { glViewport((GLint)(x * _scaleX * _retinaFactor * _frameZoomFactor + _viewPortRect.origin.x * _retinaFactor * _frameZoomFactor), (GLint)(y * _scaleY * _retinaFactor * _frameZoomFactor + _viewPortRect.origin.y * _retinaFactor * _frameZoomFactor), @@ -529,7 +528,7 @@ void GLView::setViewPortInPoints(float x , float y , float w , float h) (GLsizei)(h * _scaleY * _retinaFactor * _frameZoomFactor)); } -void GLView::setScissorInPoints(float x , float y , float w , float h) +void GLViewImpl::setScissorInPoints(float x , float y , float w , float h) { glScissor((GLint)(x * _scaleX * _retinaFactor * _frameZoomFactor + _viewPortRect.origin.x * _retinaFactor * _frameZoomFactor), (GLint)(y * _scaleY * _retinaFactor * _frameZoomFactor + _viewPortRect.origin.y * _retinaFactor * _frameZoomFactor), @@ -537,12 +536,12 @@ void GLView::setScissorInPoints(float x , float y , float w , float h) (GLsizei)(h * _scaleY * _retinaFactor * _frameZoomFactor)); } -void GLView::onGLFWError(int errorID, const char* errorDesc) +void GLViewImpl::onGLFWError(int errorID, const char* errorDesc) { CCLOGERROR("GLFWError #%d Happen, %s\n", errorID, errorDesc); } -void GLView::onGLFWMouseCallBack(GLFWwindow* window, int button, int action, int modify) +void GLViewImpl::onGLFWMouseCallBack(GLFWwindow* window, int button, int action, int modify) { if(GLFW_MOUSE_BUTTON_LEFT == button) { @@ -586,7 +585,7 @@ void GLView::onGLFWMouseCallBack(GLFWwindow* window, int button, int action, int } } -void GLView::onGLFWMouseMoveCallBack(GLFWwindow* window, double x, double y) +void GLViewImpl::onGLFWMouseMoveCallBack(GLFWwindow* window, double x, double y) { _mouseX = (float)x; _mouseY = (float)y; @@ -631,7 +630,7 @@ void GLView::onGLFWMouseMoveCallBack(GLFWwindow* window, double x, double y) Director::getInstance()->getEventDispatcher()->dispatchEvent(&event); } -void GLView::onGLFWMouseScrollCallback(GLFWwindow* window, double x, double y) +void GLViewImpl::onGLFWMouseScrollCallback(GLFWwindow* window, double x, double y) { EventMouse event(EventMouse::MouseEventType::MOUSE_SCROLL); //Because OpenGL and cocos2d-x uses different Y axis, we need to convert the coordinate here @@ -640,27 +639,30 @@ void GLView::onGLFWMouseScrollCallback(GLFWwindow* window, double x, double y) Director::getInstance()->getEventDispatcher()->dispatchEvent(&event); } -void GLView::onGLFWKeyCallback(GLFWwindow *window, int key, int scancode, int action, int mods) +void GLViewImpl::onGLFWKeyCallback(GLFWwindow *window, int key, int scancode, int action, int mods) { if (GLFW_REPEAT != action) { EventKeyboard event(g_keyCodeMap[key], GLFW_PRESS == action); auto dispatcher = Director::getInstance()->getEventDispatcher(); dispatcher->dispatchEvent(&event); + if (key == GLFW_KEY_BACKSPACE && action == GLFW_PRESS) { + IMEDispatcher::sharedDispatcher()->dispatchDeleteBackward(); + } } } -void GLView::onGLFWCharCallback(GLFWwindow *window, unsigned int character) +void GLViewImpl::onGLFWCharCallback(GLFWwindow *window, unsigned int character) { IMEDispatcher::sharedDispatcher()->dispatchInsertText((const char*) &character, 1); } -void GLView::onGLFWWindowPosCallback(GLFWwindow *windows, int x, int y) +void GLViewImpl::onGLFWWindowPosCallback(GLFWwindow *windows, int x, int y) { Director::getInstance()->setViewport(); } -void GLView::onGLFWframebuffersize(GLFWwindow* window, int w, int h) +void GLViewImpl::onGLFWframebuffersize(GLFWwindow* window, int w, int h) { float frameSizeW = _screenSize.width; float frameSizeH = _screenSize.height; @@ -689,7 +691,7 @@ void GLView::onGLFWframebuffersize(GLFWwindow* window, int w, int h) } } -void GLView::onGLFWWindowSizeFunCallback(GLFWwindow *window, int width, int height) +void GLViewImpl::onGLFWWindowSizeFunCallback(GLFWwindow *window, int width, int height) { if (_resolutionPolicy != ResolutionPolicy::UNKNOWN) { @@ -763,7 +765,7 @@ static bool glew_dynamic_binding() #endif // helper -bool GLView::initGlew() +bool GLViewImpl::initGlew() { #if (CC_TARGET_PLATFORM != CC_PLATFORM_MAC) GLenum GlewInitResult = glewInit(); diff --git a/cocos/platform/desktop/CCGLView.h b/cocos/platform/desktop/CCGLViewImpl.h similarity index 71% rename from cocos/platform/desktop/CCGLView.h rename to cocos/platform/desktop/CCGLViewImpl.h index b49a2f49d9..a9befbbd51 100644 --- a/cocos/platform/desktop/CCGLView.h +++ b/cocos/platform/desktop/CCGLViewImpl.h @@ -23,23 +23,43 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#ifndef __CC_EGLVIEW_DESKTOP_H__ -#define __CC_EGLVIEW_DESKTOP_H__ +#ifndef __CC_EGLViewIMPL_DESKTOP_H__ +#define __CC_EGLViewIMPL_DESKTOP_H__ #include "base/CCRef.h" #include "platform/CCCommon.h" -#include "platform/CCGLViewProtocol.h" +#include "platform/CCGLView.h" #include "glfw3.h" +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) +#ifndef GLFW_EXPOSE_NATIVE_WIN32 +#define GLFW_EXPOSE_NATIVE_WIN32 +#endif +#ifndef GLFW_EXPOSE_NATIVE_WGL +#define GLFW_EXPOSE_NATIVE_WGL +#endif +#include "glfw3native.h" +#endif /* (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) */ + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) +#ifndef GLFW_EXPOSE_NATIVE_NSGL +#define GLFW_EXPOSE_NATIVE_NSGL +#endif +#ifndef GLFW_EXPOSE_NATIVE_COCOA +#define GLFW_EXPOSE_NATIVE_COCOA +#endif +#include "glfw3native.h" +#endif // #if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) + NS_CC_BEGIN -class CC_DLL GLView : public GLViewProtocol, public Ref +class CC_DLL GLViewImpl : public GLView { public: - static GLView* create(const std::string& viewName); - static GLView* createWithRect(const std::string& viewName, Rect size, float frameZoomFactor = 1.0f); - static GLView* createWithFullScreen(const std::string& viewName); - static GLView* createWithFullScreen(const std::string& viewName, const GLFWvidmode &videoMode, GLFWmonitor *monitor); + static GLViewImpl* create(const std::string& viewName); + static GLViewImpl* createWithRect(const std::string& viewName, Rect size, float frameZoomFactor = 1.0f); + static GLViewImpl* createWithFullScreen(const std::string& viewName); + static GLViewImpl* createWithFullScreen(const std::string& viewName, const GLFWvidmode &videoMode, GLFWmonitor *monitor); /* *frameZoomFactor for frame. This method is for debugging big resolution (e.g.new ipad) app on desktop. @@ -47,7 +67,7 @@ public: //void resize(int width, int height); - float getFrameZoomFactor(); + float getFrameZoomFactor() const; //void centerWindow(); virtual void setViewPortInPoints(float x , float y , float w , float h); @@ -79,10 +99,18 @@ public: /** Get retina factor */ int getRetinaFactor() const { return _retinaFactor; } + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) + HWND getWin32Window() { return glfwGetWin32Window(_mainWindow); } +#endif /* (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) */ + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) + id getCocoaWindow() { return glfwGetCocoaWindow(_mainWindow); } +#endif // #if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) protected: - GLView(); - virtual ~GLView(); + GLViewImpl(); + virtual ~GLViewImpl(); bool initWithRect(const std::string& viewName, Rect rect, float frameZoomFactor); bool initWithFullScreen(const std::string& viewName); @@ -120,9 +148,9 @@ protected: friend class GLFWEventHandler; private: - CC_DISALLOW_COPY_AND_ASSIGN(GLView); + CC_DISALLOW_COPY_AND_ASSIGN(GLViewImpl); }; NS_CC_END // end of namespace cocos2d -#endif // end of __CC_EGLVIEW_DESKTOP_H__ +#endif // end of __CC_EGLViewImpl_DESKTOP_H__ diff --git a/cocos/platform/ios/CCDirectorCaller.mm b/cocos/platform/ios/CCDirectorCaller.mm index 91ecfeab90..3250816d26 100644 --- a/cocos/platform/ios/CCDirectorCaller.mm +++ b/cocos/platform/ios/CCDirectorCaller.mm @@ -30,7 +30,6 @@ #import #import "CCDirectorCaller.h" #import "CCDirector.h" -#import "CCGLView.h" #import "CCEAGLView.h" static id s_sharedDirectorCaller; diff --git a/cocos/platform/ios/CCEAGLView.mm b/cocos/platform/ios/CCEAGLView.mm index fcbddd02e7..3c5c1c7b37 100644 --- a/cocos/platform/ios/CCEAGLView.mm +++ b/cocos/platform/ios/CCEAGLView.mm @@ -65,7 +65,7 @@ Copyright (C) 2008 Apple Inc. All Rights Reserved. #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #import -#import "CCGLView.h" +#import "CCGLViewImpl.h" #import "CCEAGLView.h" #import "CCES2Renderer.h" #import "CCDirector.h" @@ -73,7 +73,6 @@ Copyright (C) 2008 Apple Inc. All Rights Reserved. #import "CCTouch.h" #import "CCIMEDispatcher.h" #import "OpenGL_Internal.h" -#import "CCGLView.h" //CLASS IMPLEMENTATIONS: #define IOS_MAX_TOUCHES_COUNT 10 diff --git a/cocos/platform/ios/CCGLView.h b/cocos/platform/ios/CCGLViewImpl.h similarity index 73% rename from cocos/platform/ios/CCGLView.h rename to cocos/platform/ios/CCGLViewImpl.h index d5a62dd084..795e0077b9 100644 --- a/cocos/platform/ios/CCGLView.h +++ b/cocos/platform/ios/CCGLViewImpl.h @@ -23,35 +23,35 @@ THE SOFTWARE. ****************************************************************************/ -#ifndef __CC_EGLVIEW_IPHONE_H__ -#define __CC_EGLVIEW_IPHONE_H__ +#ifndef __CC_EGLVIEWIMPL_IPHONE_H__ +#define __CC_EGLVIEWIMPL_IPHONE_H__ #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #include "base/CCRef.h" #include "platform/CCCommon.h" -#include "platform/CCGLViewProtocol.h" +#include "platform/CCGLView.h" NS_CC_BEGIN /** Class that represent the OpenGL View */ -class CC_DLL GLView : public GLViewProtocol, public Ref +class CC_DLL GLViewImpl : public GLView { public: - /** creates a GLView with a objective-c CCEAGLView instance */ - static GLView* createWithEAGLView(void* eaglview); + /** creates a GLViewImpl with a objective-c CCEAGLViewImpl instance */ + static GLViewImpl* createWithEAGLView(void* eaGLView); - /** creates a GLView with a title name in fullscreen mode */ - static GLView* create(const std::string& viewName); + /** creates a GLViewImpl with a title name in fullscreen mode */ + static GLViewImpl* create(const std::string& viewName); - /** creates a GLView with a title name, a rect and the zoom factor */ - static GLView* createWithRect(const std::string& viewName, Rect rect, float frameZoomFactor = 1.0f); + /** creates a GLViewImpl with a title name, a rect and the zoom factor */ + static GLViewImpl* createWithRect(const std::string& viewName, Rect rect, float frameZoomFactor = 1.0f); - /** creates a GLView with a name in fullscreen mode */ - static GLView* createWithFullScreen(const std::string& viewName); + /** creates a GLViewImpl with a name in fullscreen mode */ + static GLViewImpl* createWithFullScreen(const std::string& viewName); /** sets the content scale factor */ bool setContentScaleFactor(float contentScaleFactor); @@ -72,10 +72,10 @@ public: virtual void setIMEKeyboardState(bool bOpen) override; protected: - GLView(); - virtual ~GLView(); + GLViewImpl(); + virtual ~GLViewImpl(); - bool initWithEAGLView(void* eaglview); + bool initWithEAGLView(void* eaGLView); bool initWithRect(const std::string& viewName, Rect rect, float frameZoomFactor); bool initWithFullScreen(const std::string& viewName); @@ -87,4 +87,4 @@ NS_CC_END #endif // CC_PLATFORM_IOS -#endif // end of __CC_EGLVIEW_IPHONE_H__ +#endif // end of __CC_EGLViewImpl_IPHONE_H__ diff --git a/cocos/platform/ios/CCGLView.mm b/cocos/platform/ios/CCGLViewImpl.mm similarity index 82% rename from cocos/platform/ios/CCGLView.mm rename to cocos/platform/ios/CCGLViewImpl.mm index fa7844a2fb..567d55bc43 100644 --- a/cocos/platform/ios/CCGLView.mm +++ b/cocos/platform/ios/CCGLViewImpl.mm @@ -30,15 +30,15 @@ #include "CCEAGLView.h" #include "CCDirectorCaller.h" -#include "CCGLView.h" +#include "CCGLViewImpl.h" #include "CCSet.h" #include "base/CCTouch.h" NS_CC_BEGIN -GLView* GLView::createWithEAGLView(void *eaglview) +GLViewImpl* GLViewImpl::createWithEAGLView(void *eaglview) { - auto ret = new GLView; + auto ret = new GLViewImpl; if(ret && ret->initWithEAGLView(eaglview)) { ret->autorelease(); return ret; @@ -47,9 +47,9 @@ GLView* GLView::createWithEAGLView(void *eaglview) return nullptr; } -GLView* GLView::create(const std::string& viewName) +GLViewImpl* GLViewImpl::create(const std::string& viewName) { - auto ret = new GLView; + auto ret = new GLViewImpl; if(ret && ret->initWithFullScreen(viewName)) { ret->autorelease(); return ret; @@ -58,9 +58,9 @@ GLView* GLView::create(const std::string& viewName) return nullptr; } -GLView* GLView::createWithRect(const std::string& viewName, Rect rect, float frameZoomFactor) +GLViewImpl* GLViewImpl::createWithRect(const std::string& viewName, Rect rect, float frameZoomFactor) { - auto ret = new GLView; + auto ret = new GLViewImpl; if(ret && ret->initWithRect(viewName, rect, frameZoomFactor)) { ret->autorelease(); return ret; @@ -69,9 +69,9 @@ GLView* GLView::createWithRect(const std::string& viewName, Rect rect, float fra return nullptr; } -GLView* GLView::createWithFullScreen(const std::string& viewName) +GLViewImpl* GLViewImpl::createWithFullScreen(const std::string& viewName) { - auto ret = new GLView(); + auto ret = new GLViewImpl(); if(ret && ret->initWithFullScreen(viewName)) { ret->autorelease(); return ret; @@ -80,17 +80,17 @@ GLView* GLView::createWithFullScreen(const std::string& viewName) return nullptr; } -GLView::GLView() +GLViewImpl::GLViewImpl() { } -GLView::~GLView() +GLViewImpl::~GLViewImpl() { CCEAGLView *glview = (CCEAGLView*) _eaglview; [glview release]; } -bool GLView::initWithEAGLView(void *eaglview) +bool GLViewImpl::initWithEAGLView(void *eaglview) { _eaglview = eaglview; CCEAGLView *glview = (CCEAGLView*) _eaglview; @@ -102,7 +102,7 @@ bool GLView::initWithEAGLView(void *eaglview) return true; } -bool GLView::initWithRect(const std::string& viewName, Rect rect, float frameZoomFactor) +bool GLViewImpl::initWithRect(const std::string& viewName, Rect rect, float frameZoomFactor) { CGRect r = CGRectMake(rect.origin.x, rect.origin.y, rect.size.width, rect.size.height); CCEAGLView *eaglview = [CCEAGLView viewWithFrame: r @@ -123,7 +123,7 @@ bool GLView::initWithRect(const std::string& viewName, Rect rect, float frameZoo return true; } -bool GLView::initWithFullScreen(const std::string& viewName) +bool GLViewImpl::initWithFullScreen(const std::string& viewName) { CGRect rect = [[UIScreen mainScreen] bounds]; Rect r; @@ -135,12 +135,12 @@ bool GLView::initWithFullScreen(const std::string& viewName) return initWithRect(viewName, r, 1); } -bool GLView::isOpenGLReady() +bool GLViewImpl::isOpenGLReady() { return _eaglview != nullptr; } -bool GLView::setContentScaleFactor(float contentScaleFactor) +bool GLViewImpl::setContentScaleFactor(float contentScaleFactor) { CC_ASSERT(_resolutionPolicy == ResolutionPolicy::UNKNOWN); // cannot enable retina mode _scaleX = _scaleY = contentScaleFactor; @@ -151,7 +151,7 @@ bool GLView::setContentScaleFactor(float contentScaleFactor) return true; } -float GLView::getContentScaleFactor() const +float GLViewImpl::getContentScaleFactor() const { CCEAGLView *eaglview = (CCEAGLView*) _eaglview; @@ -162,7 +162,7 @@ float GLView::getContentScaleFactor() const return scaleFactor; } -void GLView::end() +void GLViewImpl::end() { [CCDirectorCaller destroy]; @@ -174,13 +174,13 @@ void GLView::end() } -void GLView::swapBuffers() +void GLViewImpl::swapBuffers() { CCEAGLView *eaglview = (CCEAGLView*) _eaglview; [eaglview swapBuffers]; } -void GLView::setIMEKeyboardState(bool open) +void GLViewImpl::setIMEKeyboardState(bool open) { CCEAGLView *eaglview = (CCEAGLView*) _eaglview; diff --git a/cocos/platform/linux/CCApplication.cpp b/cocos/platform/linux/CCApplication.cpp index ad4e47bc0a..14391ea3db 100644 --- a/cocos/platform/linux/CCApplication.cpp +++ b/cocos/platform/linux/CCApplication.cpp @@ -32,7 +32,6 @@ THE SOFTWARE. #include #include "base/CCDirector.h" #include "platform/CCFileUtils.h" -#include "CCGLView.h" NS_CC_BEGIN diff --git a/cocos/platform/linux/CCDevice.cpp b/cocos/platform/linux/CCDevice.cpp index 5e007f7d28..5536c87d81 100644 --- a/cocos/platform/linux/CCDevice.cpp +++ b/cocos/platform/linux/CCDevice.cpp @@ -215,7 +215,7 @@ public: return false; } - if (isspace(unicode)) { + if (iswspace(unicode)) { currentPaintPosition += face->glyph->metrics.horiAdvance >> 6; prevGlyphIndex = glyphIndex; prevCharacter = unicode; diff --git a/cocos/platform/mac/CCApplication.mm b/cocos/platform/mac/CCApplication.mm index 2f352d57d5..c635d445b4 100644 --- a/cocos/platform/mac/CCApplication.mm +++ b/cocos/platform/mac/CCApplication.mm @@ -34,7 +34,6 @@ THE SOFTWARE. #include "platform/CCFileUtils.h" #include "math/CCGeometry.h" #include "base/CCDirector.h" -#include "CCGLView.h" NS_CC_BEGIN diff --git a/cocos/platform/mac/CCCommon.mm b/cocos/platform/mac/CCCommon.mm index 4e042bd14e..739628c873 100644 --- a/cocos/platform/mac/CCCommon.mm +++ b/cocos/platform/mac/CCCommon.mm @@ -29,11 +29,6 @@ THE SOFTWARE. #include "platform/CCCommon.h" #include "base/CCDirector.h" -#include "CCGLView.h" - -#define GLFW_EXPOSE_NATIVE_NSGL -#define GLFW_EXPOSE_NATIVE_COCOA -#include "glfw3native.h" #include #include @@ -58,8 +53,8 @@ void MessageBox(const char * msg, const char * title) [alert setInformativeText:tmpTitle]; [alert setAlertStyle:NSWarningAlertStyle]; - GLView* glview = Director::getInstance()->getOpenGLView(); - id window = glfwGetCocoaWindow(glview->getWindow()); + auto glview = Director::getInstance()->getOpenGLView(); + id window = glview->getCocoaWindow(); [alert beginSheetModalForWindow:window modalDelegate:[window delegate] didEndSelector:nil diff --git a/cocos/platform/mac/CCDevice.mm b/cocos/platform/mac/CCDevice.mm index 0d13a3a586..185dded81d 100644 --- a/cocos/platform/mac/CCDevice.mm +++ b/cocos/platform/mac/CCDevice.mm @@ -59,7 +59,7 @@ typedef struct unsigned char* data; } tImageInfo; -static bool _initWithString(const char * text, Device::TextAlign align, const char * fontName, int size, tImageInfo* info, Color3B* strokeColor) +static bool _initWithString(const char * text, Device::TextAlign align, const char * fontName, int size, tImageInfo* info, const Color3B* strokeColor) { bool ret = false; @@ -68,10 +68,13 @@ static bool _initWithString(const char * text, Device::TextAlign align, const ch do { NSString * string = [NSString stringWithUTF8String:text]; + NSString * fntName = [NSString stringWithUTF8String:fontName]; + + fntName = [[fntName lastPathComponent] stringByDeletingPathExtension]; // font NSFont *font = [[NSFontManager sharedFontManager] - fontWithFamily:[NSString stringWithUTF8String:fontName] + fontWithFamily:fntName traits:NSUnboldFontMask | NSUnitalicFontMask weight:0 size:size]; @@ -118,7 +121,7 @@ static bool _initWithString(const char * text, Device::TextAlign align, const ch NSMutableString *lineBreak = [[[NSMutableString alloc] init] autorelease]; NSUInteger length = [string length]; NSRange range = NSMakeRange(0, 1); - CGSize textSize; + NSSize textSize; NSUInteger lastBreakLocation = 0; NSUInteger insertCount = 0; for (NSUInteger i = 0; i < length; i++) { @@ -128,7 +131,7 @@ static bool _initWithString(const char * text, Device::TextAlign align, const ch if ([@"!?.,-= " rangeOfString:character].location != NSNotFound) { lastBreakLocation = i + insertCount; } - textSize = [lineBreak sizeWithAttributes:tokenAttributesDict]; + //textSize = [lineBreak sizeWithAttributes:tokenAttributesDict]; if(textSize.height > info->height) break; if (textSize.width > info->width) { @@ -232,7 +235,7 @@ Data Device::getTextureDataForText(const char * text, const FontDefinition& text info.width = textDefinition._dimensions.width; info.height = textDefinition._dimensions.height; - if (! _initWithString(text, align, textDefinition._fontName.c_str(), textDefinition._fontSize, &info, nullptr)) //pStrokeColor)) + if (! _initWithString(text, align, textDefinition._fontName.c_str(), textDefinition._fontSize, &info, &textDefinition._fontFillColor)) //pStrokeColor)) { break; } diff --git a/cocos/platform/mac/CCPlatformDefine.h b/cocos/platform/mac/CCPlatformDefine.h index bd33ec9361..cc87086f88 100644 --- a/cocos/platform/mac/CCPlatformDefine.h +++ b/cocos/platform/mac/CCPlatformDefine.h @@ -31,7 +31,11 @@ THE SOFTWARE. #include -#define CC_DLL +#ifdef _USRDLL +#define CC_DLL __attribute__ ((visibility("default"))) +#else +#define CC_DLL +#endif #if CC_DISABLE_ASSERT > 0 #define CC_ASSERT(cond) diff --git a/cocos/platform/win32/CCApplication.cpp b/cocos/platform/win32/CCApplication.cpp index 1192732492..01dd2d82f2 100644 --- a/cocos/platform/win32/CCApplication.cpp +++ b/cocos/platform/win32/CCApplication.cpp @@ -27,7 +27,6 @@ THE SOFTWARE. #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 #include "CCApplication.h" -#include "CCGLView.h" #include "base/CCDirector.h" #include #include "platform/CCFileUtils.h" diff --git a/cocos/platform/win32/CCGL.h b/cocos/platform/win32/CCGL.h index 4ec822b630..2ed38288bc 100644 --- a/cocos/platform/win32/CCGL.h +++ b/cocos/platform/win32/CCGL.h @@ -33,12 +33,6 @@ THE SOFTWARE. #define CC_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8 -// These macros are only for making TexturePVR.cpp complied without errors since they are not included in GLEW. -#define GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG 0x8C00 -#define GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG 0x8C01 -#define GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG 0x8C02 -#define GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG 0x8C03 - #endif // CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 #endif // __CCGL_H__ diff --git a/cocos/platform/win32/CCPlatformDefine.h b/cocos/platform/win32/CCPlatformDefine.h index f2cb37367f..354cbf80a7 100644 --- a/cocos/platform/win32/CCPlatformDefine.h +++ b/cocos/platform/win32/CCPlatformDefine.h @@ -32,13 +32,11 @@ THE SOFTWARE. #include #endif -//#if defined(_USRDLL) -// #define CC_DLL __declspec(dllexport) -//#else /* use a DLL library */ -// #define CC_DLL __declspec(dllimport) -//#endif - -#define CC_DLL +#if defined(_USRDLL) + #define CC_DLL __declspec(dllexport) +#else /* use a DLL library */ + #define CC_DLL __declspec(dllimport) +#endif #include diff --git a/cocos/platform/wp8/shaders/precompiledshaders.h b/cocos/platform/wp8/shaders/precompiledshaders.h index ee41e8243b..3a23edfe5d 100644 --- a/cocos/platform/wp8/shaders/precompiledshaders.h +++ b/cocos/platform/wp8/shaders/precompiledshaders.h @@ -86,7 +86,7 @@ const unsigned char s_133478C5A874C1E6F59B418CE6C7C39F1AE0F873[] = { 120, 116, 117, 114, 101, 48, 0, 0, 0, 0, 1, 0, 0, 0, 248, 3, 0, 0, 4, 5, 0, 0, 0, 0, - 0, 0, 212, 133, 0, 0, 0, 0, + 0, 0, 221, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 11, 95, 74, 206, 145, 124, 32, 219, 67, 19, @@ -456,7 +456,7 @@ const unsigned char s_13E33F532157A58EC77EDE3B3112560A89D272B2[] = { 116, 114, 105, 120, 0, 0, 0, 0, 0, 0, 0, 0, 204, 2, 0, 0, 164, 4, 0, 0, 0, 0, 0, 0, -212, 133, 0, 0, 0, 0, 0, 0, +221, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 127, 145, 81, 72, 216, 190, 16, 61, 245, 231, 235, 249, @@ -800,7 +800,7 @@ const unsigned char s_1A69A7CC77C7C8FC62799B0513816EA41FBF3BFE[] = { 116, 67, 111, 108, 111, 114, 0, 0, 0, 0, 3, 0, 0, 0, 208, 7, 0, 0, 4, 5, 0, 0, 0, 0, - 0, 0, 212, 133, 0, 0, 0, 0, + 0, 0, 221, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 65, 106, 69, 173, 111, 248, 97, 165, 186, 90, @@ -1301,7 +1301,7 @@ const unsigned char s_53938AB67AD93ABA0DDB87F3C9889304284E011E[] = { 120, 116, 117, 114, 101, 48, 0, 0, 0, 0, 1, 0, 0, 0, 24, 4, 0, 0, 4, 5, 0, 0, 0, 0, - 0, 0, 212, 133, 0, 0, 0, 0, + 0, 0, 221, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 200, 5, 103, 205, 248, 30, 69, 65, 32, 117, @@ -1675,7 +1675,7 @@ const unsigned char s_67837675F2BB48C0E926316F505FC1538228E0FA[] = { 86, 80, 77, 97, 116, 114, 105, 120, 0, 0, 0, 0, 0, 0, 0, 0, 16, 4, 0, 0, 48, 5, 0, 0, - 0, 0, 0, 0, 212, 133, 0, 0, + 0, 0, 0, 0, 221, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 79, 226, 72, 124, 94, 252, 37, 157, @@ -2070,7 +2070,7 @@ const unsigned char s_78250E25D1929D4A842050738140787BE42541C6[] = { 108, 112, 104, 97, 95, 118, 97, 108, 117, 101, 0, 0, 0, 0, 2, 0, 0, 0, 36, 5, 0, 0, 4, 5, - 0, 0, 0, 0, 0, 0, 212, 133, + 0, 0, 0, 0, 0, 0, 221, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 100, 113, 175, 29, 164, 71, @@ -2485,7 +2485,7 @@ const unsigned char s_7B67DD242152D35ACC079265FAD9D03DC98182DE[] = { 67, 95, 84, 101, 120, 116, 117, 114, 101, 48, 0, 0, 0, 0, 1, 0, 0, 0, 248, 3, 0, 0, 0, 5, - 0, 0, 0, 0, 0, 0, 212, 133, + 0, 0, 0, 0, 0, 0, 221, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 11, 95, 74, 206, 145, 124, @@ -2869,7 +2869,7 @@ const unsigned char s_7CE5EE84ACB6110F7FA29152ECE3344CB6D6620D[] = { 99, 111, 108, 111, 114, 0, 0, 0, 0, 2, 0, 0, 0, 96, 4, 0, 0, 192, 4, 0, 0, 0, 0, 0, - 0, 212, 133, 0, 0, 0, 0, 0, + 0, 221, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 157, 116, 105, 89, 118, 135, 249, 239, 42, 226, 184, @@ -3250,7 +3250,7 @@ const unsigned char s_7E1EEF397305D0BC2DCDBA4F2DAFBCBA1534E45C[] = { 117, 95, 99, 111, 108, 111, 114, 0, 0, 0, 0, 1, 0, 0, 0, 52, 3, 0, 0, 40, 4, 0, 0, 0, - 0, 0, 0, 212, 133, 0, 0, 0, + 0, 0, 0, 221, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 153, 8, 62, 201, 202, 170, 111, 182, 149, @@ -3584,7 +3584,7 @@ const unsigned char s_847DBFDDA6EC09C57E4ED43012AE2FB5CAC7D8D5[] = { 111, 108, 111, 114, 0, 0, 0, 0, 2, 0, 0, 0, 240, 4, 0, 0, 4, 5, 0, 0, 0, 0, 0, 0, -212, 133, 0, 0, 0, 0, 0, 0, +221, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 134, 66, 128, 226, 107, 172, 247, 161, 241, 207, 89, 240, @@ -4001,7 +4001,7 @@ const unsigned char s_92BE325B516F887D2C928EDE20ADF428DB01C038[] = { 95, 118, 97, 108, 117, 101, 0, 0, 0, 0, 2, 0, 0, 0, 36, 5, 0, 0, 0, 5, 0, 0, 0, 0, - 0, 0, 212, 133, 0, 0, 0, 0, + 0, 0, 221, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 100, 113, 175, 29, 164, 71, 177, 78, 120, 99, @@ -5038,7 +5038,7 @@ const unsigned char s_976D0E98457C40DFC2F0FBD00E30607C9E4CFDAE[] = { 99, 111, 108, 111, 114, 0, 0, 0, 0, 3, 0, 0, 0, 96, 4, 0, 0, 148, 13, 0, 0, 0, 0, 0, - 0, 212, 133, 0, 0, 0, 0, 0, + 0, 221, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 157, 116, 105, 89, 118, 135, 249, 239, 42, 226, 184, @@ -5709,7 +5709,7 @@ const unsigned char s_A2377A827972A5466DA8637681045D32DA8A817D[] = { 99, 111, 108, 111, 114, 0, 0, 0, 0, 2, 0, 0, 0, 96, 4, 0, 0, 144, 4, 0, 0, 0, 0, 0, - 0, 212, 133, 0, 0, 0, 0, 0, + 0, 221, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 157, 116, 105, 89, 118, 135, 249, 239, 42, 226, 184, @@ -6094,7 +6094,7 @@ const unsigned char s_B5E27B4F3CF7236633255B28CBA530D6EE5CED86[] = { 111, 108, 111, 114, 0, 0, 0, 0, 2, 0, 0, 0, 240, 5, 0, 0, 4, 5, 0, 0, 0, 0, 0, 0, -212, 133, 0, 0, 0, 0, 0, 0, +221, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 223, 173, 203, 80, 172, 13, 170, 215, 168, 128, 228, 5, @@ -6526,7 +6526,7 @@ const unsigned char s_E2C7CE1244DE9C76688EFA9463B2A130B6A08893[] = { 77, 97, 116, 114, 105, 120, 0, 0, 0, 0, 0, 0, 0, 0, 204, 2, 0, 0, 144, 4, 0, 0, 0, 0, - 0, 0, 212, 133, 0, 0, 0, 0, + 0, 0, 221, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 127, 145, 81, 72, 216, 190, 16, 61, 245, 231, @@ -6856,8 +6856,8 @@ const unsigned char s_E2D56227712263272BD5218FEA117CD06180F81B[] = { 117, 95, 112, 111, 105, 110, 116, 83, 105, 122, 101, 0, 0, 0, 0, 2, 0, 0, 0, 204, 2, 0, 0, 208, - 4, 0, 0, 0, 0, 0, 0, 212, -133, 0, 0, 0, 0, 0, 0, 0, + 4, 0, 0, 0, 0, 0, 0, 221, +144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 127, 145, 81, 72, 216, 190, 16, 61, 245, 231, 235, 249, 125, @@ -7207,7 +7207,7 @@ const unsigned char s_F46558C274182079784898CF4968CF431593D5E2[] = { 116, 67, 111, 108, 111, 114, 0, 0, 0, 0, 3, 0, 0, 0, 108, 6, 0, 0, 4, 5, 0, 0, 0, 0, - 0, 0, 212, 133, 0, 0, 0, 0, + 0, 0, 221, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 47, 220, 115, 183, 137, 174, 141, 96, 204, 60, @@ -7663,7 +7663,7 @@ const unsigned char s_F6BA4519AF2653A53D57FB5D5508F0D8617105D6[] = { 101, 120, 116, 117, 114, 101, 48, 0, 0, 0, 0, 1, 0, 0, 0, 156, 3, 0, 0, 144, 4, 0, 0, 0, - 0, 0, 0, 212, 133, 0, 0, 0, + 0, 0, 0, 221, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 203, 117, 183, 110, 154, 52, 220, 70, 125, diff --git a/cocos/renderer/CCBatchCommand.h b/cocos/renderer/CCBatchCommand.h index a91abdac22..05f94db160 100644 --- a/cocos/renderer/CCBatchCommand.h +++ b/cocos/renderer/CCBatchCommand.h @@ -33,7 +33,7 @@ NS_CC_BEGIN class TextureAtlas; -class BatchCommand : public RenderCommand +class CC_DLL BatchCommand : public RenderCommand { public: diff --git a/cocos/renderer/CCCustomCommand.h b/cocos/renderer/CCCustomCommand.h index a1f1ea04f2..f39dfd5331 100644 --- a/cocos/renderer/CCCustomCommand.h +++ b/cocos/renderer/CCCustomCommand.h @@ -31,7 +31,7 @@ NS_CC_BEGIN -class CustomCommand : public RenderCommand +class CC_DLL CustomCommand : public RenderCommand { public: CustomCommand(); diff --git a/cocos/renderer/CCGLProgramState.h b/cocos/renderer/CCGLProgramState.h index e0775e61be..cab3640e65 100644 --- a/cocos/renderer/CCGLProgramState.h +++ b/cocos/renderer/CCGLProgramState.h @@ -47,7 +47,7 @@ class EventCustom; // UniformValue // // -class UniformValue +class CC_DLL UniformValue { friend class GLProgram; friend class GLProgramState; @@ -99,7 +99,7 @@ protected: // VertexAttribValue // // -class VertexAttribValue +class CC_DLL VertexAttribValue { friend class GLProgram; friend class GLProgramState; @@ -143,7 +143,7 @@ protected: A GLProgram can be used by thousands of Nodes, but if different uniform values are going to be used, then each node will need its own GLProgramState */ -class GLProgramState : public Ref +class CC_DLL GLProgramState : public Ref { friend class GLProgramStateCache; public: diff --git a/cocos/renderer/CCGLProgramStateCache.h b/cocos/renderer/CCGLProgramStateCache.h index 88b6b41a9a..c2d4d44a3e 100644 --- a/cocos/renderer/CCGLProgramStateCache.h +++ b/cocos/renderer/CCGLProgramStateCache.h @@ -43,7 +43,7 @@ class GLProgramState; // GLProgramStateCache // // -class GLProgramStateCache +class CC_DLL GLProgramStateCache { public: static GLProgramStateCache* getInstance(); diff --git a/cocos/renderer/CCGroupCommand.h b/cocos/renderer/CCGroupCommand.h index 56748468f0..4d1c3732cc 100644 --- a/cocos/renderer/CCGroupCommand.h +++ b/cocos/renderer/CCGroupCommand.h @@ -48,7 +48,7 @@ protected: std::unordered_map _groupMapping; }; -class GroupCommand : public RenderCommand +class CC_DLL GroupCommand : public RenderCommand { public: GroupCommand(); diff --git a/cocos/renderer/CCMeshCommand.h b/cocos/renderer/CCMeshCommand.h index d1e995da7a..fcbf7881a9 100644 --- a/cocos/renderer/CCMeshCommand.h +++ b/cocos/renderer/CCMeshCommand.h @@ -40,7 +40,7 @@ class EventListenerCustom; class EventCustom; //it is a common mesh -class MeshCommand : public RenderCommand +class CC_DLL MeshCommand : public RenderCommand { public: diff --git a/cocos/renderer/CCQuadCommand.h b/cocos/renderer/CCQuadCommand.h index 094291d9a6..5c731b784b 100644 --- a/cocos/renderer/CCQuadCommand.h +++ b/cocos/renderer/CCQuadCommand.h @@ -32,7 +32,7 @@ NS_CC_BEGIN /** Command used to render one or more Quads */ -class QuadCommand : public RenderCommand +class CC_DLL QuadCommand : public RenderCommand { public: static const int MATERIAL_ID_DO_NOT_BATCH = 0; diff --git a/cocos/renderer/CCRenderCommand.h b/cocos/renderer/CCRenderCommand.h index 01611aea7b..22ebd6095f 100644 --- a/cocos/renderer/CCRenderCommand.h +++ b/cocos/renderer/CCRenderCommand.h @@ -37,7 +37,7 @@ NS_CC_BEGIN * The `Renderer` knows how to render `RenderCommands` objects. */ -class RenderCommand +class CC_DLL RenderCommand { public: diff --git a/cocos/renderer/CCRenderer.h b/cocos/renderer/CCRenderer.h index 7a1fd14253..0c56b989e0 100644 --- a/cocos/renderer/CCRenderer.h +++ b/cocos/renderer/CCRenderer.h @@ -72,7 +72,7 @@ class GroupCommandManager; Whenever possible prefer to use `QuadCommand` objects since the renderer will automatically batch them. */ -class Renderer +class CC_DLL Renderer { public: static const int VBO_SIZE = 65536 / 6; diff --git a/cocos/renderer/CCTexture2D.cpp b/cocos/renderer/CCTexture2D.cpp index e41a610dd5..1857c24d43 100644 --- a/cocos/renderer/CCTexture2D.cpp +++ b/cocos/renderer/CCTexture2D.cpp @@ -79,7 +79,7 @@ namespace { #endif #ifdef GL_ETC1_RGB8_OES - PixelFormatInfoMapValue(Texture2D::PixelFormat::ETC, Texture2D::PixelFormatInfo(GL_ETC1_RGB8_OES, 0xFFFFFFFF, 0xFFFFFFFF, 24, true, false)), + PixelFormatInfoMapValue(Texture2D::PixelFormat::ETC, Texture2D::PixelFormatInfo(GL_ETC1_RGB8_OES, 0xFFFFFFFF, 0xFFFFFFFF, 4, true, false)), #endif #ifdef GL_COMPRESSED_RGBA_S3TC_DXT1_EXT @@ -121,8 +121,6 @@ const Texture2D::PixelFormatInfoMap Texture2D::_pixelFormatInfoTables(TexturePix // Default is: RGBA8888 (32-bit textures) static Texture2D::PixelFormat g_defaultAlphaPixelFormat = Texture2D::PixelFormat::DEFAULT; -static bool _PVRHaveAlphaPremultiplied = false; - ////////////////////////////////////////////////////////////////////////// //conventer function @@ -779,20 +777,8 @@ bool Texture2D::initWithImage(Image *image, PixelFormat format) } // set the premultiplied tag - if (!image->hasPremultipliedAlpha()) - { - if (image->getFileType() == Image::Format::PVR) - { - _hasPremultipliedAlpha = _PVRHaveAlphaPremultiplied; - }else - { - CCLOG("wanning: We cann't find the data is premultiplied or not, we will assume it's false."); - _hasPremultipliedAlpha = false; - } - }else - { - _hasPremultipliedAlpha = image->isPremultipliedAlpha(); - } + _hasPremultipliedAlpha = image->hasPremultipliedAlpha(); + return true; } } @@ -1218,10 +1204,10 @@ void Texture2D::drawInRect(const Rect& rect) void Texture2D::PVRImagesHavePremultipliedAlpha(bool haveAlphaPremultiplied) { - _PVRHaveAlphaPremultiplied = haveAlphaPremultiplied; + Image::setPVRImagesHavePremultipliedAlpha(haveAlphaPremultiplied); } - + // // Use to apply MIN/MAG filter // diff --git a/cocos/renderer/CCTexture2D.h b/cocos/renderer/CCTexture2D.h index 97b515dc7e..9944c2b163 100644 --- a/cocos/renderer/CCTexture2D.h +++ b/cocos/renderer/CCTexture2D.h @@ -182,10 +182,12 @@ public: possible load them as if they have (or not) the alpha channel premultiplied. By default it is disabled. + + deprecated, please use Image::setPVRImagesHavePremultipliedAlpha() instead. @since v0.99.5 */ - static void PVRImagesHavePremultipliedAlpha(bool haveAlphaPremultiplied); + CC_DEPRECATED_ATTRIBUTE static void PVRImagesHavePremultipliedAlpha(bool haveAlphaPremultiplied); public: /** diff --git a/cocos/scripting/lua-bindings/Android.mk b/cocos/scripting/lua-bindings/Android.mk index c926b1d11c..470a281c8c 100644 --- a/cocos/scripting/lua-bindings/Android.mk +++ b/cocos/scripting/lua-bindings/Android.mk @@ -23,6 +23,7 @@ LOCAL_SRC_FILES := manual/CCLuaBridge.cpp \ manual/lua_cocos2dx_ui_manual.cpp \ manual/lua_cocos2dx_spine_manual.cpp \ manual/lua_cocos2dx_physics_manual.cpp \ + manual/lua_cocos2dx_experimental_manual.cpp \ manual/lua_cocos2dx_experimental_video_manual.cpp \ manual/lua_cocos2dx_deprecated.cpp \ manual/lua_xml_http_request.cpp \ @@ -36,6 +37,7 @@ LOCAL_SRC_FILES := manual/CCLuaBridge.cpp \ auto/lua_cocos2dx_ui_auto.cpp \ auto/lua_cocos2dx_spine_auto.cpp \ auto/lua_cocos2dx_physics_auto.cpp \ + auto/lua_cocos2dx_experimental_auto.cpp \ auto/lua_cocos2dx_experimental_video_auto.cpp \ ../../../external/lua/tolua/tolua_event.c \ ../../../external/lua/tolua/tolua_is.c \ @@ -92,6 +94,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocos_network_static LOCAL_WHOLE_STATIC_LIBRARIES += cocosbuilder_static LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_static LOCAL_WHOLE_STATIC_LIBRARIES += spine_static +LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static LOCAL_CFLAGS += -Wno-psabi LOCAL_EXPORT_CFLAGS += -Wno-psabi @@ -106,3 +109,4 @@ $(call import-module,network) $(call import-module,editor-support/cocostudio) $(call import-module,editor-support/cocosbuilder) $(call import-module,editor-support/spine) +$(call import-module,audio/android) diff --git a/cocos/scripting/lua-bindings/CMakeLists.txt b/cocos/scripting/lua-bindings/CMakeLists.txt index 9ac8d5f1ff..1f414b9005 100644 --- a/cocos/scripting/lua-bindings/CMakeLists.txt +++ b/cocos/scripting/lua-bindings/CMakeLists.txt @@ -5,6 +5,7 @@ set(LUABINDING_SRC auto/lua_cocos2dx_ui_auto.cpp auto/lua_cocos2dx_spine_auto.cpp auto/lua_cocos2dx_physics_auto.cpp + auto/lua_cocos2dx_experimental_auto.cpp manual/tolua_fix.cpp manual/CCLuaBridge.cpp manual/CCLuaEngine.cpp @@ -24,6 +25,7 @@ set(LUABINDING_SRC manual/lua_cocos2dx_deprecated.cpp manual/lua_xml_http_request.cpp manual/LuaSkeletonAnimation.cpp + manual/lua_cocos2dx_experimental_manual.cpp ) include_directories( diff --git a/cocos/scripting/lua-bindings/auto/api/Application.lua b/cocos/scripting/lua-bindings/auto/api/Application.lua index 898e3301c4..ed1bc8e3e4 100644 --- a/cocos/scripting/lua-bindings/auto/api/Application.lua +++ b/cocos/scripting/lua-bindings/auto/api/Application.lua @@ -6,7 +6,7 @@ -------------------------------- -- @function [parent=#Application] getTargetPlatform -- @param self --- @return ApplicationProtocol::Platform#ApplicationProtocol::Platform ret (return value: cc.ApplicationProtocol::Platform) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#Application] getCurrentLanguageCode @@ -16,7 +16,7 @@ -------------------------------- -- @function [parent=#Application] getCurrentLanguage -- @param self --- @return LanguageType#LanguageType ret (return value: cc.LanguageType) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#Application] setAnimationInterval diff --git a/cocos/scripting/lua-bindings/auto/api/Bone.lua b/cocos/scripting/lua-bindings/auto/api/Bone.lua index a3074d3114..9b646e61db 100644 --- a/cocos/scripting/lua-bindings/auto/api/Bone.lua +++ b/cocos/scripting/lua-bindings/auto/api/Bone.lua @@ -60,7 +60,7 @@ -------------------------------- -- @function [parent=#Bone] getDisplayRenderNodeType -- @param self --- @return DisplayType#DisplayType ret (return value: ccs.DisplayType) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#Bone] removeDisplay diff --git a/cocos/scripting/lua-bindings/auto/api/Button.lua b/cocos/scripting/lua-bindings/auto/api/Button.lua index 3e2c559e7d..01e2a2990d 100644 --- a/cocos/scripting/lua-bindings/auto/api/Button.lua +++ b/cocos/scripting/lua-bindings/auto/api/Button.lua @@ -43,7 +43,7 @@ -- @function [parent=#Button] loadTextureDisabled -- @param self -- @param #string str --- @param #ccui.Widget::TextureResType texturerestype +-- @param #int texturerestype -------------------------------- -- @function [parent=#Button] setTitleText @@ -59,7 +59,7 @@ -- @function [parent=#Button] loadTexturePressed -- @param self -- @param #string str --- @param #ccui.Widget::TextureResType texturerestype +-- @param #int texturerestype -------------------------------- -- @function [parent=#Button] setTitleFontName @@ -82,7 +82,7 @@ -- @param #string str -- @param #string str -- @param #string str --- @param #ccui.Widget::TextureResType texturerestype +-- @param #int texturerestype -------------------------------- -- @function [parent=#Button] isScale9Enabled @@ -93,7 +93,7 @@ -- @function [parent=#Button] loadTextureNormal -- @param self -- @param #string str --- @param #ccui.Widget::TextureResType texturerestype +-- @param #int texturerestype -------------------------------- -- @function [parent=#Button] setCapInsetsPressedRenderer @@ -121,14 +121,14 @@ -- @param #bool bool -------------------------------- --- @overload self, string, string, string, ccui.Widget::TextureResType +-- @overload self, string, string, string, int -- @overload self -- @function [parent=#Button] create -- @param self -- @param #string str -- @param #string str -- @param #string str --- @param #ccui.Widget::TextureResType texturerestype +-- @param #int texturerestype -- @return Button#Button ret (retunr value: ccui.Button) -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/CCBAnimationManager.lua b/cocos/scripting/lua-bindings/auto/api/CCBAnimationManager.lua index d84aabd278..1238d0c551 100644 --- a/cocos/scripting/lua-bindings/auto/api/CCBAnimationManager.lua +++ b/cocos/scripting/lua-bindings/auto/api/CCBAnimationManager.lua @@ -101,7 +101,7 @@ -------------------------------- -- @function [parent=#CCBAnimationManager] addDocumentCallbackControlEvents -- @param self --- @param #cc.Control::EventType eventtype +-- @param #int eventtype -------------------------------- -- @function [parent=#CCBAnimationManager] init diff --git a/cocos/scripting/lua-bindings/auto/api/CCBReader.lua b/cocos/scripting/lua-bindings/auto/api/CCBReader.lua index 6782f3bf49..b6fe92d042 100644 --- a/cocos/scripting/lua-bindings/auto/api/CCBReader.lua +++ b/cocos/scripting/lua-bindings/auto/api/CCBReader.lua @@ -17,7 +17,7 @@ -------------------------------- -- @function [parent=#CCBReader] addDocumentCallbackControlEvents -- @param self --- @param #cc.Control::EventType eventtype +-- @param #int eventtype -------------------------------- -- @function [parent=#CCBReader] setCCBRootPath @@ -63,7 +63,7 @@ -------------------------------- -- @function [parent=#CCBReader] addOwnerCallbackControlEvents -- @param self --- @param #cc.Control::EventType eventtype +-- @param #int eventtype -------------------------------- -- @function [parent=#CCBReader] getOwnerOutletNames diff --git a/cocos/scripting/lua-bindings/auto/api/CheckBox.lua b/cocos/scripting/lua-bindings/auto/api/CheckBox.lua index 8e1e054a6b..fe0f55b6f8 100644 --- a/cocos/scripting/lua-bindings/auto/api/CheckBox.lua +++ b/cocos/scripting/lua-bindings/auto/api/CheckBox.lua @@ -13,13 +13,13 @@ -- @function [parent=#CheckBox] loadTextureBackGroundSelected -- @param self -- @param #string str --- @param #ccui.Widget::TextureResType texturerestype +-- @param #int texturerestype -------------------------------- -- @function [parent=#CheckBox] loadTextureBackGroundDisabled -- @param self -- @param #string str --- @param #ccui.Widget::TextureResType texturerestype +-- @param #int texturerestype -------------------------------- -- @function [parent=#CheckBox] addEventListener @@ -30,7 +30,7 @@ -- @function [parent=#CheckBox] loadTextureFrontCross -- @param self -- @param #string str --- @param #ccui.Widget::TextureResType texturerestype +-- @param #int texturerestype -------------------------------- -- @function [parent=#CheckBox] loadTextures @@ -40,13 +40,13 @@ -- @param #string str -- @param #string str -- @param #string str --- @param #ccui.Widget::TextureResType texturerestype +-- @param #int texturerestype -------------------------------- -- @function [parent=#CheckBox] loadTextureBackGround -- @param self -- @param #string str --- @param #ccui.Widget::TextureResType texturerestype +-- @param #int texturerestype -------------------------------- -- @function [parent=#CheckBox] setSelectedState @@ -57,10 +57,10 @@ -- @function [parent=#CheckBox] loadTextureFrontCrossDisabled -- @param self -- @param #string str --- @param #ccui.Widget::TextureResType texturerestype +-- @param #int texturerestype -------------------------------- --- @overload self, string, string, string, string, string, ccui.Widget::TextureResType +-- @overload self, string, string, string, string, string, int -- @overload self -- @function [parent=#CheckBox] create -- @param self @@ -69,7 +69,7 @@ -- @param #string str -- @param #string str -- @param #string str --- @param #ccui.Widget::TextureResType texturerestype +-- @param #int texturerestype -- @return CheckBox#CheckBox ret (retunr value: ccui.CheckBox) -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/Control.lua b/cocos/scripting/lua-bindings/auto/api/Control.lua index 40bcd17e69..8e832134da 100644 --- a/cocos/scripting/lua-bindings/auto/api/Control.lua +++ b/cocos/scripting/lua-bindings/auto/api/Control.lua @@ -18,7 +18,7 @@ -------------------------------- -- @function [parent=#Control] getState -- @param self --- @return Control::State#Control::State ret (return value: cc.Control::State) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#Control] onTouchEnded @@ -29,7 +29,7 @@ -------------------------------- -- @function [parent=#Control] sendActionsForControlEvents -- @param self --- @param #cc.Control::EventType eventtype +-- @param #int eventtype -------------------------------- -- @function [parent=#Control] setSelected diff --git a/cocos/scripting/lua-bindings/auto/api/ControlButton.lua b/cocos/scripting/lua-bindings/auto/api/ControlButton.lua index 118d5fb0df..005e6b28da 100644 --- a/cocos/scripting/lua-bindings/auto/api/ControlButton.lua +++ b/cocos/scripting/lua-bindings/auto/api/ControlButton.lua @@ -18,7 +18,7 @@ -- @function [parent=#ControlButton] setTitleLabelForState -- @param self -- @param #cc.Node node --- @param #cc.Control::State state +-- @param #int state -------------------------------- -- @function [parent=#ControlButton] setAdjustBackgroundImage @@ -39,7 +39,7 @@ -- @function [parent=#ControlButton] setTitleForState -- @param self -- @param #string str --- @param #cc.Control::State state +-- @param #int state -------------------------------- -- @function [parent=#ControlButton] setLabelAnchorPoint @@ -54,20 +54,20 @@ -------------------------------- -- @function [parent=#ControlButton] getTitleTTFSizeForState -- @param self --- @param #cc.Control::State state +-- @param #int state -- @return float#float ret (return value: float) -------------------------------- -- @function [parent=#ControlButton] setTitleTTFForState -- @param self -- @param #string str --- @param #cc.Control::State state +-- @param #int state -------------------------------- -- @function [parent=#ControlButton] setTitleTTFSizeForState -- @param self -- @param #float float --- @param #cc.Control::State state +-- @param #int state -------------------------------- -- @function [parent=#ControlButton] setTitleLabel @@ -92,7 +92,7 @@ -------------------------------- -- @function [parent=#ControlButton] getBackgroundSpriteForState -- @param self --- @param #cc.Control::State state +-- @param #int state -- @return Scale9Sprite#Scale9Sprite ret (return value: cc.Scale9Sprite) -------------------------------- @@ -119,7 +119,7 @@ -------------------------------- -- @function [parent=#ControlButton] getTitleTTFForState -- @param self --- @param #cc.Control::State state +-- @param #int state -- @return string#string ret (return value: string) -------------------------------- @@ -130,14 +130,14 @@ -------------------------------- -- @function [parent=#ControlButton] getTitleColorForState -- @param self --- @param #cc.Control::State state +-- @param #int state -- @return color3b_table#color3b_table ret (return value: color3b_table) -------------------------------- -- @function [parent=#ControlButton] setTitleColorForState -- @param self -- @param #color3b_table color3b --- @param #cc.Control::State state +-- @param #int state -------------------------------- -- @function [parent=#ControlButton] doesAdjustBackgroundImage @@ -148,13 +148,13 @@ -- @function [parent=#ControlButton] setBackgroundSpriteFrameForState -- @param self -- @param #cc.SpriteFrame spriteframe --- @param #cc.Control::State state +-- @param #int state -------------------------------- -- @function [parent=#ControlButton] setBackgroundSpriteForState -- @param self -- @param #cc.Scale9Sprite scale9sprite --- @param #cc.Control::State state +-- @param #int state -------------------------------- -- @function [parent=#ControlButton] setScaleRatio @@ -184,7 +184,7 @@ -------------------------------- -- @function [parent=#ControlButton] getTitleLabelForState -- @param self --- @param #cc.Control::State state +-- @param #int state -- @return Node#Node ret (return value: cc.Node) -------------------------------- @@ -197,12 +197,12 @@ -- @function [parent=#ControlButton] setTitleBMFontForState -- @param self -- @param #string str --- @param #cc.Control::State state +-- @param #int state -------------------------------- -- @function [parent=#ControlButton] getTitleBMFontForState -- @param self --- @param #cc.Control::State state +-- @param #int state -- @return string#string ret (return value: string) -------------------------------- @@ -213,7 +213,7 @@ -------------------------------- -- @function [parent=#ControlButton] getTitleForState -- @param self --- @param #cc.Control::State state +-- @param #int state -- @return string#string ret (return value: string) -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/ControlColourPicker.lua b/cocos/scripting/lua-bindings/auto/api/ControlColourPicker.lua index 0f79c5fa2e..f7e3e3cbe2 100644 --- a/cocos/scripting/lua-bindings/auto/api/ControlColourPicker.lua +++ b/cocos/scripting/lua-bindings/auto/api/ControlColourPicker.lua @@ -23,7 +23,7 @@ -- @function [parent=#ControlColourPicker] hueSliderValueChanged -- @param self -- @param #cc.Ref ref --- @param #cc.Control::EventType eventtype +-- @param #int eventtype -------------------------------- -- @function [parent=#ControlColourPicker] getcolourPicker @@ -49,7 +49,7 @@ -- @function [parent=#ControlColourPicker] colourSliderValueChanged -- @param self -- @param #cc.Ref ref --- @param #cc.Control::EventType eventtype +-- @param #int eventtype -------------------------------- -- @function [parent=#ControlColourPicker] setHuePicker diff --git a/cocos/scripting/lua-bindings/auto/api/Director.lua b/cocos/scripting/lua-bindings/auto/api/Director.lua index 1215d9dd17..6d684c5988 100644 --- a/cocos/scripting/lua-bindings/auto/api/Director.lua +++ b/cocos/scripting/lua-bindings/auto/api/Director.lua @@ -40,7 +40,7 @@ -------------------------------- -- @function [parent=#Director] pushMatrix -- @param self --- @param #cc.MATRIX_STACK_TYPE matrix_stack_type +-- @param #int matrix_stack_type -------------------------------- -- @function [parent=#Director] setGLDefaultValues @@ -63,7 +63,7 @@ -------------------------------- -- @function [parent=#Director] loadMatrix -- @param self --- @param #cc.MATRIX_STACK_TYPE matrix_stack_type +-- @param #int matrix_stack_type -- @param #mat4_table mat4 -------------------------------- @@ -217,7 +217,7 @@ -------------------------------- -- @function [parent=#Director] getMatrix -- @param self --- @param #cc.MATRIX_STACK_TYPE matrix_stack_type +-- @param #int matrix_stack_type -- @return mat4_table#mat4_table ret (return value: mat4_table) -------------------------------- @@ -232,12 +232,12 @@ -------------------------------- -- @function [parent=#Director] setProjection -- @param self --- @param #cc.Director::Projection projection +-- @param #int projection -------------------------------- -- @function [parent=#Director] loadIdentityMatrix -- @param self --- @param #cc.MATRIX_STACK_TYPE matrix_stack_type +-- @param #int matrix_stack_type -------------------------------- -- @function [parent=#Director] setNextDeltaTimeZero @@ -251,7 +251,7 @@ -------------------------------- -- @function [parent=#Director] popMatrix -- @param self --- @param #cc.MATRIX_STACK_TYPE matrix_stack_type +-- @param #int matrix_stack_type -------------------------------- -- @function [parent=#Director] getVisibleSize @@ -296,7 +296,7 @@ -------------------------------- -- @function [parent=#Director] multiplyMatrix -- @param self --- @param #cc.MATRIX_STACK_TYPE matrix_stack_type +-- @param #int matrix_stack_type -- @param #mat4_table mat4 -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/DisplayManager.lua b/cocos/scripting/lua-bindings/auto/api/DisplayManager.lua index ca94a7c51d..0739f44691 100644 --- a/cocos/scripting/lua-bindings/auto/api/DisplayManager.lua +++ b/cocos/scripting/lua-bindings/auto/api/DisplayManager.lua @@ -17,7 +17,7 @@ -------------------------------- -- @function [parent=#DisplayManager] getDisplayRenderNodeType -- @param self --- @return DisplayType#DisplayType ret (return value: ccs.DisplayType) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#DisplayManager] removeDisplay diff --git a/cocos/scripting/lua-bindings/auto/api/EditBox.lua b/cocos/scripting/lua-bindings/auto/api/EditBox.lua index dd67151c56..35579ac4c8 100644 --- a/cocos/scripting/lua-bindings/auto/api/EditBox.lua +++ b/cocos/scripting/lua-bindings/auto/api/EditBox.lua @@ -32,7 +32,7 @@ -------------------------------- -- @function [parent=#EditBox] setInputMode -- @param self --- @param #cc.EditBox::InputMode inputmode +-- @param #int inputmode -------------------------------- -- @function [parent=#EditBox] setPlaceholderFontColor @@ -70,12 +70,12 @@ -------------------------------- -- @function [parent=#EditBox] setReturnType -- @param self --- @param #cc.EditBox::KeyboardReturnType keyboardreturntype +-- @param #int keyboardreturntype -------------------------------- -- @function [parent=#EditBox] setInputFlag -- @param self --- @param #cc.EditBox::InputFlag inputflag +-- @param #int inputflag -------------------------------- -- @function [parent=#EditBox] getMaxLength diff --git a/cocos/scripting/lua-bindings/auto/api/Event.lua b/cocos/scripting/lua-bindings/auto/api/Event.lua index 293ef68255..aebf35b831 100644 --- a/cocos/scripting/lua-bindings/auto/api/Event.lua +++ b/cocos/scripting/lua-bindings/auto/api/Event.lua @@ -12,7 +12,7 @@ -------------------------------- -- @function [parent=#Event] getType -- @param self --- @return Event::Type#Event::Type ret (return value: cc.Event::Type) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#Event] getCurrentTarget diff --git a/cocos/scripting/lua-bindings/auto/api/EventController.lua b/cocos/scripting/lua-bindings/auto/api/EventController.lua index f331f8dd2a..e727158d6f 100644 --- a/cocos/scripting/lua-bindings/auto/api/EventController.lua +++ b/cocos/scripting/lua-bindings/auto/api/EventController.lua @@ -7,7 +7,7 @@ -------------------------------- -- @function [parent=#EventController] getControllerEventType -- @param self --- @return EventController::ControllerEventType#EventController::ControllerEventType ret (return value: cc.EventController::ControllerEventType) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#EventController] setConnectStatus @@ -35,11 +35,11 @@ -- @return int#int ret (return value: int) -------------------------------- --- @overload self, cc.EventController::ControllerEventType, cc.Controller, bool --- @overload self, cc.EventController::ControllerEventType, cc.Controller, int +-- @overload self, int, cc.Controller, bool +-- @overload self, int, cc.Controller, int -- @function [parent=#EventController] EventController -- @param self --- @param #cc.EventController::ControllerEventType controllereventtype +-- @param #int controllereventtype -- @param #cc.Controller controller -- @param #int int diff --git a/cocos/scripting/lua-bindings/auto/api/EventDispatcher.lua b/cocos/scripting/lua-bindings/auto/api/EventDispatcher.lua index b0c8468789..84c8901a93 100644 --- a/cocos/scripting/lua-bindings/auto/api/EventDispatcher.lua +++ b/cocos/scripting/lua-bindings/auto/api/EventDispatcher.lua @@ -79,7 +79,7 @@ -------------------------------- -- @function [parent=#EventDispatcher] removeEventListenersForType -- @param self --- @param #cc.EventListener::Type type +-- @param #int type -------------------------------- -- @function [parent=#EventDispatcher] EventDispatcher diff --git a/cocos/scripting/lua-bindings/auto/api/EventKeyboard.lua b/cocos/scripting/lua-bindings/auto/api/EventKeyboard.lua index 638f0797ce..86f722ae6b 100644 --- a/cocos/scripting/lua-bindings/auto/api/EventKeyboard.lua +++ b/cocos/scripting/lua-bindings/auto/api/EventKeyboard.lua @@ -7,7 +7,7 @@ -------------------------------- -- @function [parent=#EventKeyboard] EventKeyboard -- @param self --- @param #cc.EventKeyboard::KeyCode keycode +-- @param #int keycode -- @param #bool bool return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EventMouse.lua b/cocos/scripting/lua-bindings/auto/api/EventMouse.lua index cb79459b55..b4327c9b51 100644 --- a/cocos/scripting/lua-bindings/auto/api/EventMouse.lua +++ b/cocos/scripting/lua-bindings/auto/api/EventMouse.lua @@ -49,6 +49,6 @@ -------------------------------- -- @function [parent=#EventMouse] EventMouse -- @param self --- @param #cc.EventMouse::MouseEventType mouseeventtype +-- @param #int mouseeventtype return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EventTouch.lua b/cocos/scripting/lua-bindings/auto/api/EventTouch.lua index ab36b3dabc..d32256fd93 100644 --- a/cocos/scripting/lua-bindings/auto/api/EventTouch.lua +++ b/cocos/scripting/lua-bindings/auto/api/EventTouch.lua @@ -7,12 +7,12 @@ -------------------------------- -- @function [parent=#EventTouch] getEventCode -- @param self --- @return EventTouch::EventCode#EventTouch::EventCode ret (return value: cc.EventTouch::EventCode) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#EventTouch] setEventCode -- @param self --- @param #cc.EventTouch::EventCode eventcode +-- @param #int eventcode -------------------------------- -- @function [parent=#EventTouch] EventTouch diff --git a/cocos/scripting/lua-bindings/auto/api/FastTMXLayer.lua b/cocos/scripting/lua-bindings/auto/api/FastTMXLayer.lua deleted file mode 100644 index a012c94d2a..0000000000 --- a/cocos/scripting/lua-bindings/auto/api/FastTMXLayer.lua +++ /dev/null @@ -1,142 +0,0 @@ - --------------------------------- --- @module FastTMXLayer --- @extend Node --- @parent_module cc - --------------------------------- --- @function [parent=#FastTMXLayer] getPositionAt --- @param self --- @param #vec2_table vec2 --- @return vec2_table#vec2_table ret (return value: vec2_table) - --------------------------------- --- @function [parent=#FastTMXLayer] setLayerOrientation --- @param self --- @param #int int - --------------------------------- --- @function [parent=#FastTMXLayer] getLayerSize --- @param self --- @return size_table#size_table ret (return value: size_table) - --------------------------------- --- @function [parent=#FastTMXLayer] setMapTileSize --- @param self --- @param #size_table size - --------------------------------- --- @function [parent=#FastTMXLayer] getLayerOrientation --- @param self --- @return int#int ret (return value: int) - --------------------------------- --- @function [parent=#FastTMXLayer] setProperties --- @param self --- @param #map_table map - --------------------------------- --- @function [parent=#FastTMXLayer] setLayerName --- @param self --- @param #string str - --------------------------------- --- @function [parent=#FastTMXLayer] removeTileAt --- @param self --- @param #vec2_table vec2 - --------------------------------- --- @overload self --- @overload self --- @function [parent=#FastTMXLayer] getProperties --- @param self --- @return map_table#map_table ret (retunr value: map_table) - --------------------------------- --- @function [parent=#FastTMXLayer] setupTiles --- @param self - --------------------------------- --- @function [parent=#FastTMXLayer] setupTileSprite --- @param self --- @param #cc.Sprite sprite --- @param #vec2_table vec2 --- @param #int int - --------------------------------- --- @overload self, int, vec2_table, cc.TMXTileFlags_ --- @overload self, int, vec2_table --- @function [parent=#FastTMXLayer] setTileGID --- @param self --- @param #int int --- @param #vec2_table vec2 --- @param #cc.TMXTileFlags_ tmxtileflags_ - --------------------------------- --- @function [parent=#FastTMXLayer] getMapTileSize --- @param self --- @return size_table#size_table ret (return value: size_table) - --------------------------------- --- @function [parent=#FastTMXLayer] getProperty --- @param self --- @param #string str --- @return Value#Value ret (return value: cc.Value) - --------------------------------- --- @function [parent=#FastTMXLayer] setLayerSize --- @param self --- @param #size_table size - --------------------------------- --- @function [parent=#FastTMXLayer] getLayerName --- @param self --- @return string#string ret (return value: string) - --------------------------------- --- @function [parent=#FastTMXLayer] setTileSet --- @param self --- @param #cc.TMXTilesetInfo tmxtilesetinfo - --------------------------------- --- @function [parent=#FastTMXLayer] getTileSet --- @param self --- @return TMXTilesetInfo#TMXTilesetInfo ret (return value: cc.TMXTilesetInfo) - --------------------------------- --- @function [parent=#FastTMXLayer] getTileAt --- @param self --- @param #vec2_table vec2 --- @return Sprite#Sprite ret (return value: cc.Sprite) - --------------------------------- --- @function [parent=#FastTMXLayer] create --- @param self --- @param #cc.TMXTilesetInfo tmxtilesetinfo --- @param #cc.TMXLayerInfo tmxlayerinfo --- @param #cc.TMXMapInfo map --- @return FastTMXLayer#FastTMXLayer ret (return value: cc.FastTMXLayer) - --------------------------------- --- @function [parent=#FastTMXLayer] removeChild --- @param self --- @param #cc.Node node --- @param #bool bool - --------------------------------- --- @function [parent=#FastTMXLayer] draw --- @param self --- @param #cc.Renderer renderer --- @param #mat4_table mat4 --- @param #unsigned int int - --------------------------------- --- @function [parent=#FastTMXLayer] getDescription --- @param self --- @return string#string ret (return value: string) - --------------------------------- --- @function [parent=#FastTMXLayer] FastTMXLayer --- @param self - -return nil diff --git a/cocos/scripting/lua-bindings/auto/api/FastTMXTiledMap.lua b/cocos/scripting/lua-bindings/auto/api/FastTMXTiledMap.lua deleted file mode 100644 index cc6a27c078..0000000000 --- a/cocos/scripting/lua-bindings/auto/api/FastTMXTiledMap.lua +++ /dev/null @@ -1,101 +0,0 @@ - --------------------------------- --- @module FastTMXTiledMap --- @extend Node --- @parent_module cc - --------------------------------- --- @function [parent=#FastTMXTiledMap] setObjectGroups --- @param self --- @param #array_table array - --------------------------------- --- @function [parent=#FastTMXTiledMap] getProperty --- @param self --- @param #string str --- @return Value#Value ret (return value: cc.Value) - --------------------------------- --- @function [parent=#FastTMXTiledMap] setMapSize --- @param self --- @param #size_table size - --------------------------------- --- @function [parent=#FastTMXTiledMap] getObjectGroup --- @param self --- @param #string str --- @return TMXObjectGroup#TMXObjectGroup ret (return value: cc.TMXObjectGroup) - --------------------------------- --- @overload self --- @overload self --- @function [parent=#FastTMXTiledMap] getObjectGroups --- @param self --- @return array_table#array_table ret (retunr value: array_table) - --------------------------------- --- @function [parent=#FastTMXTiledMap] getTileSize --- @param self --- @return size_table#size_table ret (return value: size_table) - --------------------------------- --- @function [parent=#FastTMXTiledMap] getMapSize --- @param self --- @return size_table#size_table ret (return value: size_table) - --------------------------------- --- @function [parent=#FastTMXTiledMap] getProperties --- @param self --- @return map_table#map_table ret (return value: map_table) - --------------------------------- --- @function [parent=#FastTMXTiledMap] getPropertiesForGID --- @param self --- @param #int int --- @return Value#Value ret (return value: cc.Value) - --------------------------------- --- @function [parent=#FastTMXTiledMap] setTileSize --- @param self --- @param #size_table size - --------------------------------- --- @function [parent=#FastTMXTiledMap] setProperties --- @param self --- @param #map_table map - --------------------------------- --- @function [parent=#FastTMXTiledMap] getLayer --- @param self --- @param #string str --- @return FastTMXLayer#FastTMXLayer ret (return value: cc.FastTMXLayer) - --------------------------------- --- @function [parent=#FastTMXTiledMap] getMapOrientation --- @param self --- @return int#int ret (return value: int) - --------------------------------- --- @function [parent=#FastTMXTiledMap] setMapOrientation --- @param self --- @param #int int - --------------------------------- --- @function [parent=#FastTMXTiledMap] create --- @param self --- @param #string str --- @return FastTMXTiledMap#FastTMXTiledMap ret (return value: cc.FastTMXTiledMap) - --------------------------------- --- @function [parent=#FastTMXTiledMap] createWithXML --- @param self --- @param #string str --- @param #string str --- @return FastTMXTiledMap#FastTMXTiledMap ret (return value: cc.FastTMXTiledMap) - --------------------------------- --- @function [parent=#FastTMXTiledMap] getDescription --- @param self --- @return string#string ret (return value: string) - -return nil diff --git a/cocos/scripting/lua-bindings/auto/api/FileUtils.lua b/cocos/scripting/lua-bindings/auto/api/FileUtils.lua index 015c13c8bb..e2563f35d0 100644 --- a/cocos/scripting/lua-bindings/auto/api/FileUtils.lua +++ b/cocos/scripting/lua-bindings/auto/api/FileUtils.lua @@ -20,12 +20,26 @@ -- @param self -- @param #map_table map +-------------------------------- +-- @function [parent=#FileUtils] removeFile +-- @param self +-- @param #string str +-- @return bool#bool ret (return value: bool) + -------------------------------- -- @function [parent=#FileUtils] isAbsolutePath -- @param self -- @param #string str -- @return bool#bool ret (return value: bool) +-------------------------------- +-- @function [parent=#FileUtils] renameFile +-- @param self +-- @param #string str +-- @param #string str +-- @param #string str +-- @return bool#bool ret (return value: bool) + -------------------------------- -- @function [parent=#FileUtils] loadFilenameLookupDictionaryFromFile -- @param self @@ -60,11 +74,23 @@ -- @param #string str -- @return map_table#map_table ret (return value: map_table) +-------------------------------- +-- @function [parent=#FileUtils] removeDirectory +-- @param self +-- @param #string str +-- @return bool#bool ret (return value: bool) + -------------------------------- -- @function [parent=#FileUtils] setSearchPaths -- @param self -- @param #array_table array +-------------------------------- +-- @function [parent=#FileUtils] getFileSize +-- @param self +-- @param #string str +-- @return long#long ret (return value: long) + -------------------------------- -- @function [parent=#FileUtils] setSearchResolutionsOrder -- @param self @@ -74,11 +100,13 @@ -- @function [parent=#FileUtils] addSearchResolutionsOrder -- @param self -- @param #string str +-- @param #bool bool -------------------------------- -- @function [parent=#FileUtils] addSearchPath -- @param self -- @param #string str +-- @param #bool bool -------------------------------- -- @function [parent=#FileUtils] isFileExist @@ -102,11 +130,23 @@ -- @param self -- @param #bool bool +-------------------------------- +-- @function [parent=#FileUtils] isDirectoryExist +-- @param self +-- @param #string str +-- @return bool#bool ret (return value: bool) + -------------------------------- -- @function [parent=#FileUtils] getSearchResolutionsOrder -- @param self -- @return array_table#array_table ret (return value: array_table) +-------------------------------- +-- @function [parent=#FileUtils] createDirectory +-- @param self +-- @param #string str +-- @return bool#bool ret (return value: bool) + -------------------------------- -- @function [parent=#FileUtils] getWritablePath -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/GLView.lua b/cocos/scripting/lua-bindings/auto/api/GLView.lua index d795962d0d..9471789098 100644 --- a/cocos/scripting/lua-bindings/auto/api/GLView.lua +++ b/cocos/scripting/lua-bindings/auto/api/GLView.lua @@ -1,37 +1,148 @@ -------------------------------- -- @module GLView --- @extend GLViewProtocol,Ref +-- @extend Ref -- @parent_module cc -------------------------------- --- @function [parent=#GLView] createWithRect +-- @function [parent=#GLView] setFrameSize -- @param self --- @param #string str --- @param #rect_table rect -- @param #float float --- @return GLView#GLView ret (return value: cc.GLView) +-- @param #float float -------------------------------- --- @function [parent=#GLView] create +-- @function [parent=#GLView] getViewPortRect -- @param self --- @param #string str --- @return GLView#GLView ret (return value: cc.GLView) +-- @return rect_table#rect_table ret (return value: rect_table) -------------------------------- --- @function [parent=#GLView] createWithFullScreen +-- @function [parent=#GLView] getContentScaleFactor -- @param self --- @param #string str --- @return GLView#GLView ret (return value: cc.GLView) +-- @return float#float ret (return value: float) -------------------------------- -- @function [parent=#GLView] setIMEKeyboardState -- @param self -- @param #bool bool +-------------------------------- +-- @function [parent=#GLView] setScissorInPoints +-- @param self +-- @param #float float +-- @param #float float +-- @param #float float +-- @param #float float + +-------------------------------- +-- @function [parent=#GLView] getViewName +-- @param self +-- @return string#string ret (return value: string) + -------------------------------- -- @function [parent=#GLView] isOpenGLReady -- @param self -- @return bool#bool ret (return value: bool) +-------------------------------- +-- @function [parent=#GLView] end +-- @param self + +-------------------------------- +-- @function [parent=#GLView] getScaleY +-- @param self +-- @return float#float ret (return value: float) + +-------------------------------- +-- @function [parent=#GLView] getScaleX +-- @param self +-- @return float#float ret (return value: float) + +-------------------------------- +-- @function [parent=#GLView] getVisibleOrigin +-- @param self +-- @return vec2_table#vec2_table ret (return value: vec2_table) + +-------------------------------- +-- @function [parent=#GLView] getFrameSize +-- @param self +-- @return size_table#size_table ret (return value: size_table) + +-------------------------------- +-- @function [parent=#GLView] getFrameZoomFactor +-- @param self +-- @return float#float ret (return value: float) + +-------------------------------- +-- @function [parent=#GLView] getDesignResolutionSize +-- @param self +-- @return size_table#size_table ret (return value: size_table) + +-------------------------------- +-- @function [parent=#GLView] windowShouldClose +-- @param self +-- @return bool#bool ret (return value: bool) + +-------------------------------- +-- @function [parent=#GLView] swapBuffers +-- @param self + +-------------------------------- +-- @function [parent=#GLView] setDesignResolutionSize +-- @param self +-- @param #float float +-- @param #float float +-- @param #int resolutionpolicy + +-------------------------------- +-- @function [parent=#GLView] getResolutionPolicy +-- @param self +-- @return int#int ret (return value: int) + +-------------------------------- +-- @function [parent=#GLView] isRetinaDisplay +-- @param self +-- @return bool#bool ret (return value: bool) + +-------------------------------- +-- @function [parent=#GLView] setViewPortInPoints +-- @param self +-- @param #float float +-- @param #float float +-- @param #float float +-- @param #float float + +-------------------------------- +-- @function [parent=#GLView] getScissorRect +-- @param self +-- @return rect_table#rect_table ret (return value: rect_table) + +-------------------------------- +-- @function [parent=#GLView] getRetinaFactor +-- @param self +-- @return int#int ret (return value: int) + +-------------------------------- +-- @function [parent=#GLView] setViewName +-- @param self +-- @param #string str + +-------------------------------- +-- @function [parent=#GLView] getVisibleRect +-- @param self +-- @return rect_table#rect_table ret (return value: rect_table) + +-------------------------------- +-- @function [parent=#GLView] getVisibleSize +-- @param self +-- @return size_table#size_table ret (return value: size_table) + +-------------------------------- +-- @function [parent=#GLView] isScissorEnabled +-- @param self +-- @return bool#bool ret (return value: bool) + +-------------------------------- +-- @function [parent=#GLView] pollEvents +-- @param self + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/GLViewImpl.lua b/cocos/scripting/lua-bindings/auto/api/GLViewImpl.lua new file mode 100644 index 0000000000..37b80b7f7e --- /dev/null +++ b/cocos/scripting/lua-bindings/auto/api/GLViewImpl.lua @@ -0,0 +1,37 @@ + +-------------------------------- +-- @module GLViewImpl +-- @extend GLView +-- @parent_module cc + +-------------------------------- +-- @function [parent=#GLViewImpl] createWithRect +-- @param self +-- @param #string str +-- @param #rect_table rect +-- @param #float float +-- @return GLViewImpl#GLViewImpl ret (return value: cc.GLViewImpl) + +-------------------------------- +-- @function [parent=#GLViewImpl] create +-- @param self +-- @param #string str +-- @return GLViewImpl#GLViewImpl ret (return value: cc.GLViewImpl) + +-------------------------------- +-- @function [parent=#GLViewImpl] createWithFullScreen +-- @param self +-- @param #string str +-- @return GLViewImpl#GLViewImpl ret (return value: cc.GLViewImpl) + +-------------------------------- +-- @function [parent=#GLViewImpl] setIMEKeyboardState +-- @param self +-- @param #bool bool + +-------------------------------- +-- @function [parent=#GLViewImpl] isOpenGLReady +-- @param self +-- @return bool#bool ret (return value: bool) + +return nil diff --git a/cocos/scripting/lua-bindings/auto/api/GLViewProtocol.lua b/cocos/scripting/lua-bindings/auto/api/GLViewProtocol.lua deleted file mode 100644 index b0b93132a7..0000000000 --- a/cocos/scripting/lua-bindings/auto/api/GLViewProtocol.lua +++ /dev/null @@ -1,122 +0,0 @@ - --------------------------------- --- @module GLViewProtocol --- @parent_module cc - --------------------------------- --- @function [parent=#GLViewProtocol] setFrameSize --- @param self --- @param #float float --- @param #float float - --------------------------------- --- @function [parent=#GLViewProtocol] getViewPortRect --- @param self --- @return rect_table#rect_table ret (return value: rect_table) - --------------------------------- --- @function [parent=#GLViewProtocol] setIMEKeyboardState --- @param self --- @param #bool bool - --------------------------------- --- @function [parent=#GLViewProtocol] setScissorInPoints --- @param self --- @param #float float --- @param #float float --- @param #float float --- @param #float float - --------------------------------- --- @function [parent=#GLViewProtocol] getViewName --- @param self --- @return string#string ret (return value: string) - --------------------------------- --- @function [parent=#GLViewProtocol] isOpenGLReady --- @param self --- @return bool#bool ret (return value: bool) - --------------------------------- --- @function [parent=#GLViewProtocol] end --- @param self - --------------------------------- --- @function [parent=#GLViewProtocol] getScaleY --- @param self --- @return float#float ret (return value: float) - --------------------------------- --- @function [parent=#GLViewProtocol] getScaleX --- @param self --- @return float#float ret (return value: float) - --------------------------------- --- @function [parent=#GLViewProtocol] getVisibleOrigin --- @param self --- @return vec2_table#vec2_table ret (return value: vec2_table) - --------------------------------- --- @function [parent=#GLViewProtocol] getFrameSize --- @param self --- @return size_table#size_table ret (return value: size_table) - --------------------------------- --- @function [parent=#GLViewProtocol] getDesignResolutionSize --- @param self --- @return size_table#size_table ret (return value: size_table) - --------------------------------- --- @function [parent=#GLViewProtocol] pollInputEvents --- @param self - --------------------------------- --- @function [parent=#GLViewProtocol] swapBuffers --- @param self - --------------------------------- --- @function [parent=#GLViewProtocol] setDesignResolutionSize --- @param self --- @param #float float --- @param #float float --- @param #ResolutionPolicy resolutionpolicy - --------------------------------- --- @function [parent=#GLViewProtocol] getResolutionPolicy --- @param self --- @return ResolutionPolicy#ResolutionPolicy ret (return value: ResolutionPolicy) - --------------------------------- --- @function [parent=#GLViewProtocol] setViewPortInPoints --- @param self --- @param #float float --- @param #float float --- @param #float float --- @param #float float - --------------------------------- --- @function [parent=#GLViewProtocol] getScissorRect --- @param self --- @return rect_table#rect_table ret (return value: rect_table) - --------------------------------- --- @function [parent=#GLViewProtocol] setViewName --- @param self --- @param #string str - --------------------------------- --- @function [parent=#GLViewProtocol] getVisibleRect --- @param self --- @return rect_table#rect_table ret (return value: rect_table) - --------------------------------- --- @function [parent=#GLViewProtocol] getVisibleSize --- @param self --- @return size_table#size_table ret (return value: size_table) - --------------------------------- --- @function [parent=#GLViewProtocol] isScissorEnabled --- @param self --- @return bool#bool ret (return value: bool) - -return nil diff --git a/cocos/scripting/lua-bindings/auto/api/Helper.lua b/cocos/scripting/lua-bindings/auto/api/Helper.lua index bc0337fd7b..f7d6579957 100644 --- a/cocos/scripting/lua-bindings/auto/api/Helper.lua +++ b/cocos/scripting/lua-bindings/auto/api/Helper.lua @@ -3,6 +3,14 @@ -- @module Helper -- @parent_module ccui +-------------------------------- +-- @function [parent=#Helper] getSubStringOfUTF8String +-- @param self +-- @param #string str +-- @param #unsigned long long +-- @param #unsigned long long +-- @return string#string ret (return value: string) + -------------------------------- -- @function [parent=#Helper] seekWidgetByTag -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Image.lua b/cocos/scripting/lua-bindings/auto/api/Image.lua index 9ef913ad02..4ce6cd8d50 100644 --- a/cocos/scripting/lua-bindings/auto/api/Image.lua +++ b/cocos/scripting/lua-bindings/auto/api/Image.lua @@ -16,11 +16,6 @@ -- @param #bool bool -- @return bool#bool ret (return value: bool) --------------------------------- --- @function [parent=#Image] getBitPerPixel --- @param self --- @return int#int ret (return value: int) - -------------------------------- -- @function [parent=#Image] hasAlpha -- @param self @@ -48,14 +43,14 @@ -- @return int#int ret (return value: int) -------------------------------- --- @function [parent=#Image] isPremultipliedAlpha +-- @function [parent=#Image] getBitPerPixel -- @param self --- @return bool#bool ret (return value: bool) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#Image] getFileType -- @param self --- @return Image::Format#Image::Format ret (return value: cc.Image::Format) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#Image] getNumberOfMipmaps @@ -65,7 +60,12 @@ -------------------------------- -- @function [parent=#Image] getRenderFormat -- @param self --- @return Texture2D::PixelFormat#Texture2D::PixelFormat ret (return value: cc.Texture2D::PixelFormat) +-- @return int#int ret (return value: int) + +-------------------------------- +-- @function [parent=#Image] setPVRImagesHavePremultipliedAlpha +-- @param self +-- @param #bool bool -------------------------------- -- @function [parent=#Image] Image diff --git a/cocos/scripting/lua-bindings/auto/api/ImageView.lua b/cocos/scripting/lua-bindings/auto/api/ImageView.lua index fe3f5d6446..395449e067 100644 --- a/cocos/scripting/lua-bindings/auto/api/ImageView.lua +++ b/cocos/scripting/lua-bindings/auto/api/ImageView.lua @@ -8,7 +8,7 @@ -- @function [parent=#ImageView] loadTexture -- @param self -- @param #string str --- @param #ccui.Widget::TextureResType texturerestype +-- @param #int texturerestype -------------------------------- -- @function [parent=#ImageView] setScale9Enabled @@ -36,12 +36,12 @@ -- @return bool#bool ret (return value: bool) -------------------------------- --- @overload self, string, ccui.Widget::TextureResType +-- @overload self, string, int -- @overload self -- @function [parent=#ImageView] create -- @param self -- @param #string str --- @param #ccui.Widget::TextureResType texturerestype +-- @param #int texturerestype -- @return ImageView#ImageView ret (retunr value: ccui.ImageView) -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/InnerActionFrame.lua b/cocos/scripting/lua-bindings/auto/api/InnerActionFrame.lua index c12d6e02bd..5de5259f53 100644 --- a/cocos/scripting/lua-bindings/auto/api/InnerActionFrame.lua +++ b/cocos/scripting/lua-bindings/auto/api/InnerActionFrame.lua @@ -7,7 +7,7 @@ -------------------------------- -- @function [parent=#InnerActionFrame] getInnerActionType -- @param self --- @return InnerActionType#InnerActionType ret (return value: ccs.InnerActionType) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#InnerActionFrame] setStartFrameIndex @@ -17,7 +17,7 @@ -------------------------------- -- @function [parent=#InnerActionFrame] setInnerActionType -- @param self --- @param #ccs.InnerActionType inneractiontype +-- @param #int inneractiontype -------------------------------- -- @function [parent=#InnerActionFrame] getStartFrameIndex diff --git a/cocos/scripting/lua-bindings/auto/api/Label.lua b/cocos/scripting/lua-bindings/auto/api/Label.lua index 36dee247ef..52319e86ec 100644 --- a/cocos/scripting/lua-bindings/auto/api/Label.lua +++ b/cocos/scripting/lua-bindings/auto/api/Label.lua @@ -57,7 +57,7 @@ -------------------------------- -- @function [parent=#Label] getHorizontalAlignment -- @param self --- @return TextHAlignment#TextHAlignment ret (return value: cc.TextHAlignment) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#Label] setClipMarginEnabled @@ -156,7 +156,7 @@ -------------------------------- -- @function [parent=#Label] setVerticalAlignment -- @param self --- @param #cc.TextVAlignment textvalignment +-- @param #int textvalignment -------------------------------- -- @function [parent=#Label] getLineHeight @@ -171,7 +171,7 @@ -------------------------------- -- @function [parent=#Label] getVerticalAlignment -- @param self --- @return TextVAlignment#TextVAlignment ret (return value: cc.TextVAlignment) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#Label] setTextColor @@ -212,7 +212,7 @@ -------------------------------- -- @function [parent=#Label] getTextAlignment -- @param self --- @return TextHAlignment#TextHAlignment ret (return value: cc.TextHAlignment) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#Label] getBMFontFilePath @@ -222,22 +222,22 @@ -------------------------------- -- @function [parent=#Label] setHorizontalAlignment -- @param self --- @param #cc.TextHAlignment texthalignment +-- @param #int texthalignment -------------------------------- --- @overload self, cc.TextHAlignment, cc.TextVAlignment --- @overload self, cc.TextHAlignment +-- @overload self, int, int +-- @overload self, int -- @function [parent=#Label] setAlignment -- @param self --- @param #cc.TextHAlignment texthalignment --- @param #cc.TextVAlignment textvalignment +-- @param #int texthalignment +-- @param #int textvalignment -------------------------------- -- @function [parent=#Label] createWithBMFont -- @param self -- @param #string str -- @param #string str --- @param #cc.TextHAlignment texthalignment +-- @param #int texthalignment -- @param #int int -- @param #vec2_table vec2 -- @return Label#Label ret (return value: cc.Label) @@ -266,8 +266,8 @@ -- @param #string str -- @param #float float -- @param #size_table size --- @param #cc.TextHAlignment texthalignment --- @param #cc.TextVAlignment textvalignment +-- @param #int texthalignment +-- @param #int textvalignment -- @return Label#Label ret (return value: cc.Label) -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/Layout.lua b/cocos/scripting/lua-bindings/auto/api/Layout.lua index f6991db815..fc0c574ce7 100644 --- a/cocos/scripting/lua-bindings/auto/api/Layout.lua +++ b/cocos/scripting/lua-bindings/auto/api/Layout.lua @@ -12,12 +12,12 @@ -------------------------------- -- @function [parent=#Layout] setClippingType -- @param self --- @param #ccui.Layout::ClippingType clippingtype +-- @param #int clippingtype -------------------------------- -- @function [parent=#Layout] setBackGroundColorType -- @param self --- @param #ccui.Layout::BackGroundColorType backgroundcolortype +-- @param #int backgroundcolortype -------------------------------- -- @function [parent=#Layout] setLoopFocus @@ -37,7 +37,7 @@ -------------------------------- -- @function [parent=#Layout] getClippingType -- @param self --- @return Layout::ClippingType#Layout::ClippingType ret (return value: ccui.Layout::ClippingType) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#Layout] isLoopFocus @@ -67,7 +67,7 @@ -- @function [parent=#Layout] setBackGroundImage -- @param self -- @param #string str --- @param #ccui.Widget::TextureResType texturerestype +-- @param #int texturerestype -------------------------------- -- @overload self, color3b_table, color3b_table @@ -109,7 +109,7 @@ -------------------------------- -- @function [parent=#Layout] getBackGroundColorType -- @param self --- @return Layout::BackGroundColorType#Layout::BackGroundColorType ret (return value: ccui.Layout::BackGroundColorType) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#Layout] getBackGroundEndColor @@ -141,10 +141,14 @@ -- @param self -- @return size_table#size_table ret (return value: size_table) +-------------------------------- +-- @function [parent=#Layout] forceDoLayout +-- @param self + -------------------------------- -- @function [parent=#Layout] getLayoutType -- @param self --- @return Layout::Type#Layout::Type ret (return value: ccui.Layout::Type) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#Layout] setPassFocusToChild @@ -164,7 +168,7 @@ -------------------------------- -- @function [parent=#Layout] setLayoutType -- @param self --- @param #ccui.Layout::Type type +-- @param #int type -------------------------------- -- @function [parent=#Layout] create @@ -204,7 +208,7 @@ -------------------------------- -- @function [parent=#Layout] findNextFocusedWidget -- @param self --- @param #ccui.Widget::FocusDirection focusdirection +-- @param #int focusdirection -- @param #ccui.Widget widget -- @return Widget#Widget ret (return value: ccui.Widget) diff --git a/cocos/scripting/lua-bindings/auto/api/LayoutParameter.lua b/cocos/scripting/lua-bindings/auto/api/LayoutParameter.lua index 4d1c68a03b..590f5ea26d 100644 --- a/cocos/scripting/lua-bindings/auto/api/LayoutParameter.lua +++ b/cocos/scripting/lua-bindings/auto/api/LayoutParameter.lua @@ -12,7 +12,7 @@ -------------------------------- -- @function [parent=#LayoutParameter] getLayoutType -- @param self --- @return LayoutParameter::Type#LayoutParameter::Type ret (return value: ccui.LayoutParameter::Type) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#LayoutParameter] createCloneInstance diff --git a/cocos/scripting/lua-bindings/auto/api/LinearLayoutParameter.lua b/cocos/scripting/lua-bindings/auto/api/LinearLayoutParameter.lua index 07d39ec85b..81db029efb 100644 --- a/cocos/scripting/lua-bindings/auto/api/LinearLayoutParameter.lua +++ b/cocos/scripting/lua-bindings/auto/api/LinearLayoutParameter.lua @@ -7,12 +7,12 @@ -------------------------------- -- @function [parent=#LinearLayoutParameter] setGravity -- @param self --- @param #ccui.LinearLayoutParameter::LinearGravity lineargravity +-- @param #int lineargravity -------------------------------- -- @function [parent=#LinearLayoutParameter] getGravity -- @param self --- @return LinearLayoutParameter::LinearGravity#LinearLayoutParameter::LinearGravity ret (return value: ccui.LinearLayoutParameter::LinearGravity) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#LinearLayoutParameter] create diff --git a/cocos/scripting/lua-bindings/auto/api/ListView.lua b/cocos/scripting/lua-bindings/auto/api/ListView.lua index 934000b12f..eb0b32815d 100644 --- a/cocos/scripting/lua-bindings/auto/api/ListView.lua +++ b/cocos/scripting/lua-bindings/auto/api/ListView.lua @@ -17,7 +17,7 @@ -------------------------------- -- @function [parent=#ListView] setGravity -- @param self --- @param #ccui.ListView::Gravity gravity +-- @param #int gravity -------------------------------- -- @function [parent=#ListView] pushBackCustomItem @@ -120,7 +120,7 @@ -------------------------------- -- @function [parent=#ListView] setDirection -- @param self --- @param #ccui.ScrollView::Direction direction +-- @param #int direction -------------------------------- -- @function [parent=#ListView] getDescription diff --git a/cocos/scripting/lua-bindings/auto/api/LoadingBar.lua b/cocos/scripting/lua-bindings/auto/api/LoadingBar.lua index ce7cc9cff1..132912332c 100644 --- a/cocos/scripting/lua-bindings/auto/api/LoadingBar.lua +++ b/cocos/scripting/lua-bindings/auto/api/LoadingBar.lua @@ -13,12 +13,12 @@ -- @function [parent=#LoadingBar] loadTexture -- @param self -- @param #string str --- @param #ccui.Widget::TextureResType texturerestype +-- @param #int texturerestype -------------------------------- -- @function [parent=#LoadingBar] setDirection -- @param self --- @param #ccui.LoadingBar::Direction direction +-- @param #int direction -------------------------------- -- @function [parent=#LoadingBar] setScale9Enabled @@ -33,7 +33,7 @@ -------------------------------- -- @function [parent=#LoadingBar] getDirection -- @param self --- @return LoadingBar::Direction#LoadingBar::Direction ret (return value: ccui.LoadingBar::Direction) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#LoadingBar] getCapInsets diff --git a/cocos/scripting/lua-bindings/auto/api/Mesh.lua b/cocos/scripting/lua-bindings/auto/api/Mesh.lua index 88935a52a7..42b24b5016 100644 --- a/cocos/scripting/lua-bindings/auto/api/Mesh.lua +++ b/cocos/scripting/lua-bindings/auto/api/Mesh.lua @@ -16,7 +16,7 @@ -------------------------------- -- @function [parent=#Mesh] getIndexFormat -- @param self --- @return Mesh::IndexFormat#Mesh::IndexFormat ret (return value: cc.Mesh::IndexFormat) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#Mesh] getVertexSizeInBytes @@ -26,7 +26,7 @@ -------------------------------- -- @function [parent=#Mesh] getPrimitiveType -- @param self --- @return Mesh::PrimitiveType#Mesh::PrimitiveType ret (return value: cc.Mesh::PrimitiveType) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#Mesh] getIndexCount diff --git a/cocos/scripting/lua-bindings/auto/api/Node.lua b/cocos/scripting/lua-bindings/auto/api/Node.lua index 33f956653b..f07a3b0682 100644 --- a/cocos/scripting/lua-bindings/auto/api/Node.lua +++ b/cocos/scripting/lua-bindings/auto/api/Node.lua @@ -16,11 +16,13 @@ -- @param #string str -------------------------------- --- @function [parent=#Node] removeComponent +-- @overload self, cc.Component +-- @overload self, string +-- @function [parent=#Node] removeComponent -- @param self -- @param #string str --- @return bool#bool ret (return value: bool) - +-- @return bool#bool ret (retunr value: bool) + -------------------------------- -- @function [parent=#Node] setPhysicsBody -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/PageView.lua b/cocos/scripting/lua-bindings/auto/api/PageView.lua index 7f2b8b76cf..2e660a0635 100644 --- a/cocos/scripting/lua-bindings/auto/api/PageView.lua +++ b/cocos/scripting/lua-bindings/auto/api/PageView.lua @@ -75,7 +75,7 @@ -------------------------------- -- @function [parent=#PageView] getLayoutType -- @param self --- @return Layout::Type#Layout::Type ret (return value: ccui.Layout::Type) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#PageView] getDescription @@ -90,7 +90,7 @@ -------------------------------- -- @function [parent=#PageView] setLayoutType -- @param self --- @param #ccui.Layout::Type type +-- @param #int type -------------------------------- -- @function [parent=#PageView] PageView diff --git a/cocos/scripting/lua-bindings/auto/api/ParticleSystem.lua b/cocos/scripting/lua-bindings/auto/api/ParticleSystem.lua index c53937b97d..3a36b92a5c 100644 --- a/cocos/scripting/lua-bindings/auto/api/ParticleSystem.lua +++ b/cocos/scripting/lua-bindings/auto/api/ParticleSystem.lua @@ -32,7 +32,7 @@ -------------------------------- -- @function [parent=#ParticleSystem] getPositionType -- @param self --- @return ParticleSystem::PositionType#ParticleSystem::PositionType ret (return value: cc.ParticleSystem::PositionType) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#ParticleSystem] setPosVar @@ -171,7 +171,7 @@ -------------------------------- -- @function [parent=#ParticleSystem] setPositionType -- @param self --- @param #cc.ParticleSystem::PositionType positiontype +-- @param #int positiontype -------------------------------- -- @function [parent=#ParticleSystem] stopSystem @@ -274,7 +274,7 @@ -------------------------------- -- @function [parent=#ParticleSystem] setEmitterMode -- @param self --- @param #cc.ParticleSystem::Mode mode +-- @param #int mode -------------------------------- -- @function [parent=#ParticleSystem] getDuration @@ -334,7 +334,7 @@ -------------------------------- -- @function [parent=#ParticleSystem] getEmitterMode -- @param self --- @return ParticleSystem::Mode#ParticleSystem::Mode ret (return value: cc.ParticleSystem::Mode) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#ParticleSystem] setEndSpinVar diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsContact.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsContact.lua index 235025d62e..30d6f985d3 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsContact.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsContact.lua @@ -12,7 +12,7 @@ -------------------------------- -- @function [parent=#PhysicsContact] getEventCode -- @param self --- @return PhysicsContact::EventCode#PhysicsContact::EventCode ret (return value: cc.PhysicsContact::EventCode) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#PhysicsContact] getPreContactData diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsShape.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsShape.lua index a4559f2f2b..56d5538836 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsShape.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsShape.lua @@ -68,7 +68,7 @@ -------------------------------- -- @function [parent=#PhysicsShape] getType -- @param self --- @return PhysicsShape::Type#PhysicsShape::Type ret (return value: cc.PhysicsShape::Type) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#PhysicsShape] getContactTestBitmask diff --git a/cocos/scripting/lua-bindings/auto/api/ProgressTimer.lua b/cocos/scripting/lua-bindings/auto/api/ProgressTimer.lua index 02c27984ee..d19cf74354 100644 --- a/cocos/scripting/lua-bindings/auto/api/ProgressTimer.lua +++ b/cocos/scripting/lua-bindings/auto/api/ProgressTimer.lua @@ -27,7 +27,7 @@ -------------------------------- -- @function [parent=#ProgressTimer] getType -- @param self --- @return ProgressTimer::Type#ProgressTimer::Type ret (return value: cc.ProgressTimer::Type) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#ProgressTimer] getSprite @@ -64,7 +64,7 @@ -------------------------------- -- @function [parent=#ProgressTimer] setType -- @param self --- @param #cc.ProgressTimer::Type type +-- @param #int type -------------------------------- -- @function [parent=#ProgressTimer] create diff --git a/cocos/scripting/lua-bindings/auto/api/RelativeLayoutParameter.lua b/cocos/scripting/lua-bindings/auto/api/RelativeLayoutParameter.lua index 9938baeeb4..ec81d4f44e 100644 --- a/cocos/scripting/lua-bindings/auto/api/RelativeLayoutParameter.lua +++ b/cocos/scripting/lua-bindings/auto/api/RelativeLayoutParameter.lua @@ -7,7 +7,7 @@ -------------------------------- -- @function [parent=#RelativeLayoutParameter] setAlign -- @param self --- @param #ccui.RelativeLayoutParameter::RelativeAlign relativealign +-- @param #int relativealign -------------------------------- -- @function [parent=#RelativeLayoutParameter] setRelativeToWidgetName @@ -32,7 +32,7 @@ -------------------------------- -- @function [parent=#RelativeLayoutParameter] getAlign -- @param self --- @return RelativeLayoutParameter::RelativeAlign#RelativeLayoutParameter::RelativeAlign ret (return value: ccui.RelativeLayoutParameter::RelativeAlign) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#RelativeLayoutParameter] create diff --git a/cocos/scripting/lua-bindings/auto/api/RenderTexture.lua b/cocos/scripting/lua-bindings/auto/api/RenderTexture.lua index 91fc61c210..4717d8015e 100644 --- a/cocos/scripting/lua-bindings/auto/api/RenderTexture.lua +++ b/cocos/scripting/lua-bindings/auto/api/RenderTexture.lua @@ -65,12 +65,12 @@ -- @param self -------------------------------- --- @overload self, string, cc.Image::Format, bool +-- @overload self, string, int, bool -- @overload self, string, bool -- @function [parent=#RenderTexture] saveToFile -- @param self -- @param #string str --- @param #cc.Image::Format format +-- @param #int format -- @param #bool bool -- @return bool#bool ret (retunr value: bool) @@ -135,25 +135,25 @@ -- @param #float float -------------------------------- --- @overload self, int, int, cc.Texture2D::PixelFormat, unsigned int --- @overload self, int, int, cc.Texture2D::PixelFormat +-- @overload self, int, int, int, unsigned int +-- @overload self, int, int, int -- @function [parent=#RenderTexture] initWithWidthAndHeight -- @param self -- @param #int int -- @param #int int --- @param #cc.Texture2D::PixelFormat pixelformat +-- @param #int pixelformat -- @param #unsigned int int -- @return bool#bool ret (retunr value: bool) -------------------------------- --- @overload self, int, int, cc.Texture2D::PixelFormat --- @overload self, int, int, cc.Texture2D::PixelFormat, unsigned int +-- @overload self, int, int, int +-- @overload self, int, int, int, unsigned int -- @overload self, int, int -- @function [parent=#RenderTexture] create -- @param self -- @param #int int -- @param #int int --- @param #cc.Texture2D::PixelFormat pixelformat +-- @param #int pixelformat -- @param #unsigned int int -- @return RenderTexture#RenderTexture ret (retunr value: cc.RenderTexture) diff --git a/cocos/scripting/lua-bindings/auto/api/SceneReader.lua b/cocos/scripting/lua-bindings/auto/api/SceneReader.lua index bf0b3f8a8b..7ea99e4d21 100644 --- a/cocos/scripting/lua-bindings/auto/api/SceneReader.lua +++ b/cocos/scripting/lua-bindings/auto/api/SceneReader.lua @@ -12,13 +12,13 @@ -- @function [parent=#SceneReader] createNodeWithSceneFile -- @param self -- @param #string str --- @param #ccs.SceneReader::AttachComponentType attachcomponenttype +-- @param #int attachcomponenttype -- @return Node#Node ret (return value: cc.Node) -------------------------------- -- @function [parent=#SceneReader] getAttachComponentType -- @param self --- @return SceneReader::AttachComponentType#SceneReader::AttachComponentType ret (return value: ccs.SceneReader::AttachComponentType) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#SceneReader] getNodeByTag diff --git a/cocos/scripting/lua-bindings/auto/api/ScrollView.lua b/cocos/scripting/lua-bindings/auto/api/ScrollView.lua index 6a6766fce1..f1a9bab896 100644 --- a/cocos/scripting/lua-bindings/auto/api/ScrollView.lua +++ b/cocos/scripting/lua-bindings/auto/api/ScrollView.lua @@ -32,7 +32,7 @@ -------------------------------- -- @function [parent=#ScrollView] getDirection -- @param self --- @return ScrollView::Direction#ScrollView::Direction ret (return value: ccui.ScrollView::Direction) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#ScrollView] scrollToBottomLeft @@ -52,7 +52,7 @@ -------------------------------- -- @function [parent=#ScrollView] setDirection -- @param self --- @param #ccui.ScrollView::Direction direction +-- @param #int direction -------------------------------- -- @function [parent=#ScrollView] scrollToTopLeft @@ -210,7 +210,7 @@ -------------------------------- -- @function [parent=#ScrollView] getLayoutType -- @param self --- @return Layout::Type#Layout::Type ret (return value: ccui.Layout::Type) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#ScrollView] removeAllChildrenWithCleanup @@ -224,7 +224,7 @@ -------------------------------- -- @function [parent=#ScrollView] findNextFocusedWidget -- @param self --- @param #ccui.Widget::FocusDirection focusdirection +-- @param #int focusdirection -- @param #ccui.Widget widget -- @return Widget#Widget ret (return value: ccui.Widget) @@ -255,7 +255,7 @@ -------------------------------- -- @function [parent=#ScrollView] setLayoutType -- @param self --- @param #ccui.Layout::Type type +-- @param #int type -------------------------------- -- @function [parent=#ScrollView] ScrollView diff --git a/cocos/scripting/lua-bindings/auto/api/Slider.lua b/cocos/scripting/lua-bindings/auto/api/Slider.lua index 3cbc1c0b83..ade0016d08 100644 --- a/cocos/scripting/lua-bindings/auto/api/Slider.lua +++ b/cocos/scripting/lua-bindings/auto/api/Slider.lua @@ -13,25 +13,25 @@ -- @function [parent=#Slider] loadSlidBallTextureDisabled -- @param self -- @param #string str --- @param #ccui.Widget::TextureResType texturerestype +-- @param #int texturerestype -------------------------------- -- @function [parent=#Slider] loadSlidBallTextureNormal -- @param self -- @param #string str --- @param #ccui.Widget::TextureResType texturerestype +-- @param #int texturerestype -------------------------------- -- @function [parent=#Slider] loadBarTexture -- @param self -- @param #string str --- @param #ccui.Widget::TextureResType texturerestype +-- @param #int texturerestype -------------------------------- -- @function [parent=#Slider] loadProgressBarTexture -- @param self -- @param #string str --- @param #ccui.Widget::TextureResType texturerestype +-- @param #int texturerestype -------------------------------- -- @function [parent=#Slider] loadSlidBallTextures @@ -39,7 +39,7 @@ -- @param #string str -- @param #string str -- @param #string str --- @param #ccui.Widget::TextureResType texturerestype +-- @param #int texturerestype -------------------------------- -- @function [parent=#Slider] setCapInsetProgressBarRebderer @@ -75,7 +75,7 @@ -- @function [parent=#Slider] loadSlidBallTexturePressed -- @param self -- @param #string str --- @param #ccui.Widget::TextureResType texturerestype +-- @param #int texturerestype -------------------------------- -- @function [parent=#Slider] isScale9Enabled diff --git a/cocos/scripting/lua-bindings/auto/api/TMXLayer.lua b/cocos/scripting/lua-bindings/auto/api/TMXLayer.lua index 2ac1d3be5a..315b1a4f20 100644 --- a/cocos/scripting/lua-bindings/auto/api/TMXLayer.lua +++ b/cocos/scripting/lua-bindings/auto/api/TMXLayer.lua @@ -1,8 +1,8 @@ -------------------------------- -- @module TMXLayer --- @extend SpriteBatchNode --- @parent_module cc +-- @extend Node +-- @parent_module ccexp -------------------------------- -- @function [parent=#TMXLayer] getPositionAt @@ -15,10 +15,6 @@ -- @param self -- @param #int int --------------------------------- --- @function [parent=#TMXLayer] releaseMap --- @param self - -------------------------------- -- @function [parent=#TMXLayer] getLayerSize -- @param self @@ -50,25 +46,31 @@ -- @param #vec2_table vec2 -------------------------------- --- @function [parent=#TMXLayer] initWithTilesetInfo +-- @overload self +-- @overload self +-- @function [parent=#TMXLayer] getProperties -- @param self --- @param #cc.TMXTilesetInfo tmxtilesetinfo --- @param #cc.TMXLayerInfo tmxlayerinfo --- @param #cc.TMXMapInfo map --- @return bool#bool ret (return value: bool) - +-- @return map_table#map_table ret (retunr value: map_table) + -------------------------------- -- @function [parent=#TMXLayer] setupTiles -- @param self -------------------------------- --- @overload self, unsigned int, vec2_table, cc.TMXTileFlags_ --- @overload self, unsigned int, vec2_table +-- @function [parent=#TMXLayer] setupTileSprite +-- @param self +-- @param #cc.Sprite sprite +-- @param #vec2_table vec2 +-- @param #int int + +-------------------------------- +-- @overload self, int, vec2_table, int +-- @overload self, int, vec2_table -- @function [parent=#TMXLayer] setTileGID -- @param self --- @param #unsigned int int +-- @param #int int -- @param #vec2_table vec2 --- @param #cc.TMXTileFlags_ tmxtileflags_ +-- @param #int tmxtileflags_ -------------------------------- -- @function [parent=#TMXLayer] getMapTileSize @@ -101,13 +103,6 @@ -- @param self -- @return TMXTilesetInfo#TMXTilesetInfo ret (return value: cc.TMXTilesetInfo) --------------------------------- --- @overload self --- @overload self --- @function [parent=#TMXLayer] getProperties --- @param self --- @return map_table#map_table ret (retunr value: map_table) - -------------------------------- -- @function [parent=#TMXLayer] getTileAt -- @param self @@ -120,19 +115,7 @@ -- @param #cc.TMXTilesetInfo tmxtilesetinfo -- @param #cc.TMXLayerInfo tmxlayerinfo -- @param #cc.TMXMapInfo map --- @return TMXLayer#TMXLayer ret (return value: cc.TMXLayer) - --------------------------------- --- @function [parent=#TMXLayer] addChild --- @param self --- @param #cc.Node node --- @param #int int --- @param #int int - --------------------------------- --- @function [parent=#TMXLayer] getDescription --- @param self --- @return string#string ret (return value: string) +-- @return experimental::TMXLayer#experimental::TMXLayer ret (return value: cc.experimental::TMXLayer) -------------------------------- -- @function [parent=#TMXLayer] removeChild @@ -140,6 +123,18 @@ -- @param #cc.Node node -- @param #bool bool +-------------------------------- +-- @function [parent=#TMXLayer] draw +-- @param self +-- @param #cc.Renderer renderer +-- @param #mat4_table mat4 +-- @param #unsigned int int + +-------------------------------- +-- @function [parent=#TMXLayer] getDescription +-- @param self +-- @return string#string ret (return value: string) + -------------------------------- -- @function [parent=#TMXLayer] TMXLayer -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TMXTiledMap.lua b/cocos/scripting/lua-bindings/auto/api/TMXTiledMap.lua index 667aa48c50..86175d51f4 100644 --- a/cocos/scripting/lua-bindings/auto/api/TMXTiledMap.lua +++ b/cocos/scripting/lua-bindings/auto/api/TMXTiledMap.lua @@ -2,7 +2,7 @@ -------------------------------- -- @module TMXTiledMap -- @extend Node --- @parent_module cc +-- @parent_module ccexp -------------------------------- -- @function [parent=#TMXTiledMap] setObjectGroups @@ -48,6 +48,12 @@ -- @param self -- @return map_table#map_table ret (return value: map_table) +-------------------------------- +-- @function [parent=#TMXTiledMap] getPropertiesForGID +-- @param self +-- @param #int int +-- @return Value#Value ret (return value: cc.Value) + -------------------------------- -- @function [parent=#TMXTiledMap] setTileSize -- @param self @@ -62,7 +68,7 @@ -- @function [parent=#TMXTiledMap] getLayer -- @param self -- @param #string str --- @return TMXLayer#TMXLayer ret (return value: cc.TMXLayer) +-- @return experimental::TMXLayer#experimental::TMXLayer ret (return value: cc.experimental::TMXLayer) -------------------------------- -- @function [parent=#TMXTiledMap] getMapOrientation @@ -78,14 +84,14 @@ -- @function [parent=#TMXTiledMap] create -- @param self -- @param #string str --- @return TMXTiledMap#TMXTiledMap ret (return value: cc.TMXTiledMap) +-- @return experimental::TMXTiledMap#experimental::TMXTiledMap ret (return value: cc.experimental::TMXTiledMap) -------------------------------- -- @function [parent=#TMXTiledMap] createWithXML -- @param self -- @param #string str -- @param #string str --- @return TMXTiledMap#TMXTiledMap ret (return value: cc.TMXTiledMap) +-- @return experimental::TMXTiledMap#experimental::TMXTiledMap ret (return value: cc.experimental::TMXTiledMap) -------------------------------- -- @function [parent=#TMXTiledMap] getDescription diff --git a/cocos/scripting/lua-bindings/auto/api/TableView.lua b/cocos/scripting/lua-bindings/auto/api/TableView.lua index 1dc639a3d7..2efa32f127 100644 --- a/cocos/scripting/lua-bindings/auto/api/TableView.lua +++ b/cocos/scripting/lua-bindings/auto/api/TableView.lua @@ -12,7 +12,7 @@ -------------------------------- -- @function [parent=#TableView] setVerticalFillOrder -- @param self --- @param #cc.TableView::VerticalFillOrder verticalfillorder +-- @param #int verticalfillorder -------------------------------- -- @function [parent=#TableView] scrollViewDidZoom @@ -26,7 +26,7 @@ -------------------------------- -- @function [parent=#TableView] getVerticalFillOrder -- @param self --- @return TableView::VerticalFillOrder#TableView::VerticalFillOrder ret (return value: cc.TableView::VerticalFillOrder) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#TableView] removeCellAtIndex diff --git a/cocos/scripting/lua-bindings/auto/api/Text.lua b/cocos/scripting/lua-bindings/auto/api/Text.lua index 95ebb07893..b6b97605b6 100644 --- a/cocos/scripting/lua-bindings/auto/api/Text.lua +++ b/cocos/scripting/lua-bindings/auto/api/Text.lua @@ -5,9 +5,32 @@ -- @parent_module ccui -------------------------------- --- @function [parent=#Text] getStringLength +-- @function [parent=#Text] enableShadow -- @param self --- @return long#long ret (return value: long) + +-------------------------------- +-- @function [parent=#Text] getFontSize +-- @param self +-- @return int#int ret (return value: int) + +-------------------------------- +-- @function [parent=#Text] getString +-- @param self +-- @return string#string ret (return value: string) + +-------------------------------- +-- @function [parent=#Text] disableEffect +-- @param self + +-------------------------------- +-- @function [parent=#Text] getTextColor +-- @param self +-- @return color4b_table#color4b_table ret (return value: color4b_table) + +-------------------------------- +-- @function [parent=#Text] setTextVerticalAlignment +-- @param self +-- @param #int textvalignment -------------------------------- -- @function [parent=#Text] setFontName @@ -19,80 +42,16 @@ -- @param self -- @param #bool bool --------------------------------- --- @function [parent=#Text] getFontSize --- @param self --- @return int#int ret (return value: int) - --------------------------------- --- @function [parent=#Text] enableOutline --- @param self --- @param #color4b_table color4b --- @param #int int - --------------------------------- --- @function [parent=#Text] getTextVerticalAlignment --- @param self --- @return TextVAlignment#TextVAlignment ret (return value: cc.TextVAlignment) - --------------------------------- --- @function [parent=#Text] getString --- @param self --- @return string#string ret (return value: string) - --------------------------------- --- @function [parent=#Text] enableShadow --- @param self - -------------------------------- -- @function [parent=#Text] setString -- @param self -- @param #string str --------------------------------- --- @function [parent=#Text] getTextHorizontalAlignment --- @param self --- @return TextHAlignment#TextHAlignment ret (return value: cc.TextHAlignment) - --------------------------------- --- @function [parent=#Text] setTextVerticalAlignment --- @param self --- @param #cc.TextVAlignment textvalignment - --------------------------------- --- @function [parent=#Text] enableGlow --- @param self --- @param #color4b_table color4b - --------------------------------- --- @function [parent=#Text] getTextAreaSize --- @param self --- @return size_table#size_table ret (return value: size_table) - --------------------------------- --- @function [parent=#Text] setTextHorizontalAlignment --- @param self --- @param #cc.TextHAlignment texthalignment - --------------------------------- --- @function [parent=#Text] setFontSize --- @param self --- @param #int int - -------------------------------- -- @function [parent=#Text] isTouchScaleChangeEnabled -- @param self -- @return bool#bool ret (return value: bool) --------------------------------- --- @function [parent=#Text] getType --- @param self --- @return Text::Type#Text::Type ret (return value: ccui.Text::Type) - --------------------------------- --- @function [parent=#Text] disableEffect --- @param self - -------------------------------- -- @function [parent=#Text] getFontName -- @param self @@ -103,6 +62,57 @@ -- @param self -- @param #size_table size +-------------------------------- +-- @function [parent=#Text] getStringLength +-- @param self +-- @return long#long ret (return value: long) + +-------------------------------- +-- @function [parent=#Text] enableOutline +-- @param self +-- @param #color4b_table color4b +-- @param #int int + +-------------------------------- +-- @function [parent=#Text] getType +-- @param self +-- @return int#int ret (return value: int) + +-------------------------------- +-- @function [parent=#Text] getTextHorizontalAlignment +-- @param self +-- @return int#int ret (return value: int) + +-------------------------------- +-- @function [parent=#Text] setFontSize +-- @param self +-- @param #int int + +-------------------------------- +-- @function [parent=#Text] setTextColor +-- @param self +-- @param #color4b_table color4b + +-------------------------------- +-- @function [parent=#Text] enableGlow +-- @param self +-- @param #color4b_table color4b + +-------------------------------- +-- @function [parent=#Text] getTextVerticalAlignment +-- @param self +-- @return int#int ret (return value: int) + +-------------------------------- +-- @function [parent=#Text] getTextAreaSize +-- @param self +-- @return size_table#size_table ret (return value: size_table) + +-------------------------------- +-- @function [parent=#Text] setTextHorizontalAlignment +-- @param self +-- @param #int texthalignment + -------------------------------- -- @overload self, string, string, int -- @overload self diff --git a/cocos/scripting/lua-bindings/auto/api/TextField.lua b/cocos/scripting/lua-bindings/auto/api/TextField.lua index bb9e42d2ac..b2c82a059d 100644 --- a/cocos/scripting/lua-bindings/auto/api/TextField.lua +++ b/cocos/scripting/lua-bindings/auto/api/TextField.lua @@ -57,7 +57,7 @@ -------------------------------- -- @function [parent=#TextField] setTextVerticalAlignment -- @param self --- @param #cc.TextVAlignment textvalignment +-- @param #int textvalignment -------------------------------- -- @function [parent=#TextField] addEventListener @@ -130,7 +130,7 @@ -------------------------------- -- @function [parent=#TextField] setTextHorizontalAlignment -- @param self --- @param #cc.TextHAlignment texthalignment +-- @param #int texthalignment -------------------------------- -- @function [parent=#TextField] getMaxLength diff --git a/cocos/scripting/lua-bindings/auto/api/Texture2D.lua b/cocos/scripting/lua-bindings/auto/api/Texture2D.lua index f09da19646..c7c1456291 100644 --- a/cocos/scripting/lua-bindings/auto/api/Texture2D.lua +++ b/cocos/scripting/lua-bindings/auto/api/Texture2D.lua @@ -15,12 +15,12 @@ -- @return char#char ret (return value: char) -------------------------------- --- @overload self, cc.Image, cc.Texture2D::PixelFormat +-- @overload self, cc.Image, int -- @overload self, cc.Image -- @function [parent=#Texture2D] initWithImage -- @param self -- @param #cc.Image image --- @param #cc.Texture2D::PixelFormat pixelformat +-- @param #int pixelformat -- @return bool#bool ret (retunr value: bool) -------------------------------- @@ -43,11 +43,11 @@ -- @return int#int ret (return value: int) -------------------------------- --- @overload self, cc.Texture2D::PixelFormat +-- @overload self, int -- @overload self -- @function [parent=#Texture2D] getBitsPerPixelForFormat -- @param self --- @param #cc.Texture2D::PixelFormat pixelformat +-- @param #int pixelformat -- @return unsigned int#unsigned int ret (retunr value: unsigned int) -------------------------------- @@ -57,15 +57,15 @@ -------------------------------- -- @overload self, char, cc.FontDefinition --- @overload self, char, string, float, size_table, cc.TextHAlignment, cc.TextVAlignment +-- @overload self, char, string, float, size_table, int, int -- @function [parent=#Texture2D] initWithString -- @param self -- @param #char char -- @param #string str -- @param #float float -- @param #size_table size --- @param #cc.TextHAlignment texthalignment --- @param #cc.TextVAlignment textvalignment +-- @param #int texthalignment +-- @param #int textvalignment -- @return bool#bool ret (retunr value: bool) -------------------------------- @@ -103,7 +103,7 @@ -------------------------------- -- @function [parent=#Texture2D] getPixelFormat -- @param self --- @return Texture2D::PixelFormat#Texture2D::PixelFormat ret (return value: cc.Texture2D::PixelFormat) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#Texture2D] setGLProgram @@ -143,17 +143,12 @@ -------------------------------- -- @function [parent=#Texture2D] setDefaultAlphaPixelFormat -- @param self --- @param #cc.Texture2D::PixelFormat pixelformat +-- @param #int pixelformat -------------------------------- -- @function [parent=#Texture2D] getDefaultAlphaPixelFormat -- @param self --- @return Texture2D::PixelFormat#Texture2D::PixelFormat ret (return value: cc.Texture2D::PixelFormat) - --------------------------------- --- @function [parent=#Texture2D] PVRImagesHavePremultipliedAlpha --- @param self --- @param #bool bool +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#Texture2D] Texture2D diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionFlipAngular.lua b/cocos/scripting/lua-bindings/auto/api/TransitionFlipAngular.lua index 85dc373a56..e8be2f3f92 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionFlipAngular.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionFlipAngular.lua @@ -6,12 +6,12 @@ -------------------------------- -- @overload self, float, cc.Scene --- @overload self, float, cc.Scene, cc.TransitionScene::Orientation +-- @overload self, float, cc.Scene, int -- @function [parent=#TransitionFlipAngular] create -- @param self -- @param #float float -- @param #cc.Scene scene --- @param #cc.TransitionScene::Orientation orientation +-- @param #int orientation -- @return TransitionFlipAngular#TransitionFlipAngular ret (retunr value: cc.TransitionFlipAngular) return nil diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionFlipX.lua b/cocos/scripting/lua-bindings/auto/api/TransitionFlipX.lua index b1c588d862..bd3d3d3660 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionFlipX.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionFlipX.lua @@ -6,12 +6,12 @@ -------------------------------- -- @overload self, float, cc.Scene --- @overload self, float, cc.Scene, cc.TransitionScene::Orientation +-- @overload self, float, cc.Scene, int -- @function [parent=#TransitionFlipX] create -- @param self -- @param #float float -- @param #cc.Scene scene --- @param #cc.TransitionScene::Orientation orientation +-- @param #int orientation -- @return TransitionFlipX#TransitionFlipX ret (retunr value: cc.TransitionFlipX) return nil diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionFlipY.lua b/cocos/scripting/lua-bindings/auto/api/TransitionFlipY.lua index a90378fc78..eebe6b56bc 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionFlipY.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionFlipY.lua @@ -6,12 +6,12 @@ -------------------------------- -- @overload self, float, cc.Scene --- @overload self, float, cc.Scene, cc.TransitionScene::Orientation +-- @overload self, float, cc.Scene, int -- @function [parent=#TransitionFlipY] create -- @param self -- @param #float float -- @param #cc.Scene scene --- @param #cc.TransitionScene::Orientation orientation +-- @param #int orientation -- @return TransitionFlipY#TransitionFlipY ret (retunr value: cc.TransitionFlipY) return nil diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionSceneOriented.lua b/cocos/scripting/lua-bindings/auto/api/TransitionSceneOriented.lua index b565055c4f..965126e682 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionSceneOriented.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionSceneOriented.lua @@ -9,7 +9,7 @@ -- @param self -- @param #float float -- @param #cc.Scene scene --- @param #cc.TransitionScene::Orientation orientation +-- @param #int orientation -- @return TransitionSceneOriented#TransitionSceneOriented ret (return value: cc.TransitionSceneOriented) return nil diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipAngular.lua b/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipAngular.lua index e9cdec7159..10360d5cf8 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipAngular.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipAngular.lua @@ -6,12 +6,12 @@ -------------------------------- -- @overload self, float, cc.Scene --- @overload self, float, cc.Scene, cc.TransitionScene::Orientation +-- @overload self, float, cc.Scene, int -- @function [parent=#TransitionZoomFlipAngular] create -- @param self -- @param #float float -- @param #cc.Scene scene --- @param #cc.TransitionScene::Orientation orientation +-- @param #int orientation -- @return TransitionZoomFlipAngular#TransitionZoomFlipAngular ret (retunr value: cc.TransitionZoomFlipAngular) return nil diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipX.lua b/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipX.lua index 8e06230a90..fa6ed5fd29 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipX.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipX.lua @@ -6,12 +6,12 @@ -------------------------------- -- @overload self, float, cc.Scene --- @overload self, float, cc.Scene, cc.TransitionScene::Orientation +-- @overload self, float, cc.Scene, int -- @function [parent=#TransitionZoomFlipX] create -- @param self -- @param #float float -- @param #cc.Scene scene --- @param #cc.TransitionScene::Orientation orientation +-- @param #int orientation -- @return TransitionZoomFlipX#TransitionZoomFlipX ret (retunr value: cc.TransitionZoomFlipX) return nil diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipY.lua b/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipY.lua index 461e6c1e51..d137a545e9 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipY.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipY.lua @@ -6,12 +6,12 @@ -------------------------------- -- @overload self, float, cc.Scene --- @overload self, float, cc.Scene, cc.TransitionScene::Orientation +-- @overload self, float, cc.Scene, int -- @function [parent=#TransitionZoomFlipY] create -- @param self -- @param #float float -- @param #cc.Scene scene --- @param #cc.TransitionScene::Orientation orientation +-- @param #int orientation -- @return TransitionZoomFlipY#TransitionZoomFlipY ret (retunr value: cc.TransitionZoomFlipY) return nil diff --git a/cocos/scripting/lua-bindings/auto/api/VideoPlayer.lua b/cocos/scripting/lua-bindings/auto/api/VideoPlayer.lua index 81ca7db206..36954f071d 100644 --- a/cocos/scripting/lua-bindings/auto/api/VideoPlayer.lua +++ b/cocos/scripting/lua-bindings/auto/api/VideoPlayer.lua @@ -2,7 +2,7 @@ -------------------------------- -- @module VideoPlayer -- @extend Widget --- @parent_module ccexprimental +-- @parent_module ccexp -------------------------------- -- @function [parent=#VideoPlayer] getFileName @@ -58,7 +58,7 @@ -------------------------------- -- @function [parent=#VideoPlayer] onPlayEvent -- @param self --- @param #cc.experimental::ui::VideoPlayer::EventType eventtype +-- @param #int int -------------------------------- -- @function [parent=#VideoPlayer] isFullScreenEnabled diff --git a/cocos/scripting/lua-bindings/auto/api/Widget.lua b/cocos/scripting/lua-bindings/auto/api/Widget.lua index e5933d173d..4cb3995919 100644 --- a/cocos/scripting/lua-bindings/auto/api/Widget.lua +++ b/cocos/scripting/lua-bindings/auto/api/Widget.lua @@ -52,7 +52,7 @@ -------------------------------- -- @function [parent=#Widget] setPositionType -- @param self --- @param #ccui.Widget::PositionType positiontype +-- @param #int positiontype -------------------------------- -- @function [parent=#Widget] isIgnoreContentAdaptWithSize @@ -77,14 +77,14 @@ -------------------------------- -- @function [parent=#Widget] findNextFocusedWidget -- @param self --- @param #ccui.Widget::FocusDirection focusdirection +-- @param #int focusdirection -- @param #ccui.Widget widget -- @return Widget#Widget ret (return value: ccui.Widget) -------------------------------- -- @function [parent=#Widget] getPositionType -- @param self --- @return Widget::PositionType#Widget::PositionType ret (return value: ccui.Widget::PositionType) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#Widget] getTopBoundary @@ -159,7 +159,7 @@ -------------------------------- -- @function [parent=#Widget] setBrightStyle -- @param self --- @param #ccui.Widget::BrightStyle brightstyle +-- @param #int brightstyle -------------------------------- -- @function [parent=#Widget] setLayoutParameter @@ -210,7 +210,7 @@ -------------------------------- -- @function [parent=#Widget] getSizeType -- @param self --- @return Widget::SizeType#Widget::SizeType ret (return value: ccui.Widget::SizeType) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#Widget] addTouchEventListener @@ -252,7 +252,7 @@ -------------------------------- -- @function [parent=#Widget] setSizeType -- @param self --- @param #ccui.Widget::SizeType sizetype +-- @param #int sizetype -------------------------------- -- @function [parent=#Widget] setBright diff --git a/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua b/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua index 2d798d773a..f161328252 100644 --- a/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua +++ b/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua @@ -66,6 +66,16 @@ -- @field [parent=#cc] LabelAtlas#LabelAtlas LabelAtlas preloaded module +-------------------------------------------------------- +-- the cc Scene +-- @field [parent=#cc] Scene#Scene Scene preloaded module + + +-------------------------------------------------------- +-- the cc GLView +-- @field [parent=#cc] GLView#GLView GLView preloaded module + + -------------------------------------------------------- -- the cc Director -- @field [parent=#cc] Director#Director Director preloaded module @@ -771,11 +781,6 @@ -- @field [parent=#cc] LayerMultiplex#LayerMultiplex LayerMultiplex preloaded module --------------------------------------------------------- --- the cc Scene --- @field [parent=#cc] Scene#Scene Scene preloaded module - - -------------------------------------------------------- -- the cc TransitionEaseScene -- @field [parent=#cc] TransitionEaseScene#TransitionEaseScene TransitionEaseScene preloaded module @@ -1137,13 +1142,8 @@ -------------------------------------------------------- --- the cc GLViewProtocol --- @field [parent=#cc] GLViewProtocol#GLViewProtocol GLViewProtocol preloaded module - - --------------------------------------------------------- --- the cc GLView --- @field [parent=#cc] GLView#GLView GLView preloaded module +-- the cc GLViewImpl +-- @field [parent=#cc] GLViewImpl#GLViewImpl GLViewImpl preloaded module -------------------------------------------------------- @@ -1196,16 +1196,6 @@ -- @field [parent=#cc] TileMapAtlas#TileMapAtlas TileMapAtlas preloaded module --------------------------------------------------------- --- the cc FastTMXTiledMap --- @field [parent=#cc] FastTMXTiledMap#FastTMXTiledMap FastTMXTiledMap preloaded module - - --------------------------------------------------------- --- the cc FastTMXLayer --- @field [parent=#cc] FastTMXLayer#FastTMXLayer FastTMXLayer preloaded module - - -------------------------------------------------------- -- the cc Component -- @field [parent=#cc] Component#Component Component preloaded module diff --git a/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_experimental_auto_api.lua b/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_experimental_auto_api.lua new file mode 100644 index 0000000000..56a40c50ac --- /dev/null +++ b/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_experimental_auto_api.lua @@ -0,0 +1,14 @@ +-------------------------------- +-- @module ccexp + +-------------------------------------------------------- +-- the ccexp TMXLayer +-- @field [parent=#ccexp] TMXLayer#TMXLayer TMXLayer preloaded module + + +-------------------------------------------------------- +-- the ccexp TMXTiledMap +-- @field [parent=#ccexp] TMXTiledMap#TMXTiledMap TMXTiledMap preloaded module + + +return nil diff --git a/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_experimental_video_auto_api.lua b/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_experimental_video_auto_api.lua index 515fad0841..b9de15b788 100644 --- a/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_experimental_video_auto_api.lua +++ b/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_experimental_video_auto_api.lua @@ -1,9 +1,9 @@ -------------------------------- --- @module ccexprimental +-- @module ccexp -------------------------------------------------------- --- the ccexprimental VideoPlayer --- @field [parent=#ccexprimental] VideoPlayer#VideoPlayer VideoPlayer preloaded module +-- the ccexp VideoPlayer +-- @field [parent=#ccexp] VideoPlayer#VideoPlayer VideoPlayer preloaded module return nil diff --git a/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_physics_auto_api.lua b/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_physics_auto_api.lua index 2d62955ee1..1776a12400 100644 --- a/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_physics_auto_api.lua +++ b/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_physics_auto_api.lua @@ -1,16 +1,6 @@ -------------------------------- -- @module cc --------------------------------------------------------- --- the cc PhysicsWorld --- @field [parent=#cc] PhysicsWorld#PhysicsWorld PhysicsWorld preloaded module - - --------------------------------------------------------- --- the cc PhysicsDebugDraw --- @field [parent=#cc] PhysicsDebugDraw#PhysicsDebugDraw PhysicsDebugDraw preloaded module - - -------------------------------------------------------- -- the cc PhysicsShape -- @field [parent=#cc] PhysicsShape#PhysicsShape PhysicsShape preloaded module @@ -56,6 +46,16 @@ -- @field [parent=#cc] PhysicsBody#PhysicsBody PhysicsBody preloaded module +-------------------------------------------------------- +-- the cc PhysicsWorld +-- @field [parent=#cc] PhysicsWorld#PhysicsWorld PhysicsWorld preloaded module + + +-------------------------------------------------------- +-- the cc PhysicsDebugDraw +-- @field [parent=#cc] PhysicsDebugDraw#PhysicsDebugDraw PhysicsDebugDraw preloaded module + + -------------------------------------------------------- -- the cc PhysicsContact -- @field [parent=#cc] PhysicsContact#PhysicsContact PhysicsContact preloaded module diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp index 5bacc30a91..2fb486341e 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp @@ -42,7 +42,7 @@ int lua_cocos2dx_Ref_release(lua_State* tolua_S) cobj->release(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "release",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Ref:release",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -85,7 +85,7 @@ int lua_cocos2dx_Ref_retain(lua_State* tolua_S) cobj->retain(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "retain",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Ref:retain",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -129,7 +129,7 @@ int lua_cocos2dx_Ref_getReferenceCount(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getReferenceCount",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Ref:getReferenceCount",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -194,7 +194,7 @@ int lua_cocos2dx_Console_stop(lua_State* tolua_S) cobj->stop(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stop",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Console:stop",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -234,14 +234,14 @@ int lua_cocos2dx_Console_listenOnTCP(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Console:listenOnTCP"); if(!ok) return 0; bool ret = cobj->listenOnTCP(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "listenOnTCP",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Console:listenOnTCP",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -281,14 +281,14 @@ int lua_cocos2dx_Console_listenOnFileDescriptor(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Console:listenOnFileDescriptor"); if(!ok) return 0; bool ret = cobj->listenOnFileDescriptor(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "listenOnFileDescriptor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Console:listenOnFileDescriptor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -328,13 +328,13 @@ int lua_cocos2dx_Console_log(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.Console:log"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->log(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "log",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Console:log",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -397,13 +397,13 @@ int lua_cocos2dx_EventListener_setEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.EventListener:setEnabled"); if(!ok) return 0; cobj->setEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventListener:setEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -447,7 +447,7 @@ int lua_cocos2dx_EventListener_clone(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EventListener",(cocos2d::EventListener*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "clone",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventListener:clone",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -491,7 +491,7 @@ int lua_cocos2dx_EventListener_isEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventListener:isEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -535,7 +535,7 @@ int lua_cocos2dx_EventListener_checkAvailable(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "checkAvailable",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventListener:checkAvailable",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -602,7 +602,7 @@ int lua_cocos2dx_Event_isStopped(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isStopped",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Event:isStopped",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -646,7 +646,7 @@ int lua_cocos2dx_Event_getType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Event:getType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -690,7 +690,7 @@ int lua_cocos2dx_Event_getCurrentTarget(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCurrentTarget",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Event:getCurrentTarget",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -733,7 +733,7 @@ int lua_cocos2dx_Event_stopPropagation(lua_State* tolua_S) cobj->stopPropagation(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stopPropagation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Event:stopPropagation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -809,13 +809,13 @@ int lua_cocos2dx_EventDispatcher_pauseEventListenersForTarget(lua_State* tolua_S ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.EventDispatcher:pauseEventListenersForTarget"); if(!ok) return 0; cobj->pauseEventListenersForTarget(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pauseEventListenersForTarget",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventDispatcher:pauseEventListenersForTarget",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -864,7 +864,7 @@ int lua_cocos2dx_EventDispatcher_addEventListenerWithSceneGraphPriority(lua_Stat cobj->addEventListenerWithSceneGraphPriority(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addEventListenerWithSceneGraphPriority",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventDispatcher:addEventListenerWithSceneGraphPriority",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -904,13 +904,13 @@ int lua_cocos2dx_EventDispatcher_setEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.EventDispatcher:setEnabled"); if(!ok) return 0; cobj->setEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventDispatcher:setEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -953,13 +953,13 @@ int lua_cocos2dx_EventDispatcher_addEventListenerWithFixedPriority(lua_State* to ok &= luaval_to_object(tolua_S, 2, "cc.EventListener",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.EventDispatcher:addEventListenerWithFixedPriority"); if(!ok) return 0; cobj->addEventListenerWithFixedPriority(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addEventListenerWithFixedPriority",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventDispatcher:addEventListenerWithFixedPriority",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -1005,7 +1005,7 @@ int lua_cocos2dx_EventDispatcher_removeEventListener(lua_State* tolua_S) cobj->removeEventListener(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeEventListener",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventDispatcher:removeEventListener",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1058,13 +1058,13 @@ int lua_cocos2dx_EventDispatcher_resumeEventListenersForTarget(lua_State* tolua_ ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.EventDispatcher:resumeEventListenersForTarget"); if(!ok) return 0; cobj->resumeEventListenersForTarget(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resumeEventListenersForTarget",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventDispatcher:resumeEventListenersForTarget",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1117,13 +1117,13 @@ int lua_cocos2dx_EventDispatcher_removeEventListenersForTarget(lua_State* tolua_ ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.EventDispatcher:removeEventListenersForTarget"); if(!ok) return 0; cobj->removeEventListenersForTarget(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeEventListenersForTarget",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventDispatcher:removeEventListenersForTarget",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1166,13 +1166,13 @@ int lua_cocos2dx_EventDispatcher_setPriority(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.EventListener",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.EventDispatcher:setPriority"); if(!ok) return 0; cobj->setPriority(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPriority",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventDispatcher:setPriority",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -1213,7 +1213,7 @@ int lua_cocos2dx_EventDispatcher_addCustomEventListener(lua_State* tolua_S) std::string arg0; std::function arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.EventDispatcher:addCustomEventListener"); do { // Lambda binding for lua is not supported. @@ -1226,7 +1226,7 @@ int lua_cocos2dx_EventDispatcher_addCustomEventListener(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EventListenerCustom",(cocos2d::EventListenerCustom*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addCustomEventListener",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventDispatcher:addCustomEventListener",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -1272,7 +1272,7 @@ int lua_cocos2dx_EventDispatcher_dispatchEvent(lua_State* tolua_S) cobj->dispatchEvent(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "dispatchEvent",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventDispatcher:dispatchEvent",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1315,7 +1315,7 @@ int lua_cocos2dx_EventDispatcher_removeAllEventListeners(lua_State* tolua_S) cobj->removeAllEventListeners(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllEventListeners",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventDispatcher:removeAllEventListeners",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1355,13 +1355,13 @@ int lua_cocos2dx_EventDispatcher_removeCustomEventListeners(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.EventDispatcher:removeCustomEventListeners"); if(!ok) return 0; cobj->removeCustomEventListeners(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeCustomEventListeners",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventDispatcher:removeCustomEventListeners",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1405,7 +1405,7 @@ int lua_cocos2dx_EventDispatcher_isEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventDispatcher:isEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1445,13 +1445,13 @@ int lua_cocos2dx_EventDispatcher_removeEventListenersForType(lua_State* tolua_S) { cocos2d::EventListener::Type arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.EventDispatcher:removeEventListenersForType"); if(!ok) return 0; cobj->removeEventListenersForType(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeEventListenersForType",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventDispatcher:removeEventListenersForType",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1485,7 +1485,7 @@ int lua_cocos2dx_EventDispatcher_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.EventDispatcher"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "EventDispatcher",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventDispatcher:EventDispatcher",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1563,7 +1563,7 @@ int lua_cocos2dx_Touch_getPreviousLocationInView(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPreviousLocationInView",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Touch:getPreviousLocationInView",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1607,7 +1607,7 @@ int lua_cocos2dx_Touch_getLocation(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLocation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Touch:getLocation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1651,7 +1651,7 @@ int lua_cocos2dx_Touch_getDelta(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDelta",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Touch:getDelta",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1695,7 +1695,7 @@ int lua_cocos2dx_Touch_getStartLocationInView(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartLocationInView",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Touch:getStartLocationInView",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1739,7 +1739,7 @@ int lua_cocos2dx_Touch_getStartLocation(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartLocation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Touch:getStartLocation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1783,7 +1783,7 @@ int lua_cocos2dx_Touch_getID(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getID",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Touch:getID",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1825,17 +1825,17 @@ int lua_cocos2dx_Touch_setTouchInfo(lua_State* tolua_S) double arg1; double arg2; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Touch:setTouchInfo"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.Touch:setTouchInfo"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Touch:setTouchInfo"); if(!ok) return 0; cobj->setTouchInfo(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTouchInfo",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Touch:setTouchInfo",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -1879,7 +1879,7 @@ int lua_cocos2dx_Touch_getLocationInView(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLocationInView",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Touch:getLocationInView",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1923,7 +1923,7 @@ int lua_cocos2dx_Touch_getPreviousLocation(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPreviousLocation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Touch:getPreviousLocation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1957,7 +1957,7 @@ int lua_cocos2dx_Touch_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.Touch"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "Touch",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Touch:Touch",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2030,7 +2030,7 @@ int lua_cocos2dx_EventTouch_getEventCode(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEventCode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventTouch:getEventCode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2070,13 +2070,13 @@ int lua_cocos2dx_EventTouch_setEventCode(lua_State* tolua_S) { cocos2d::EventTouch::EventCode arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.EventTouch:setEventCode"); if(!ok) return 0; cobj->setEventCode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEventCode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventTouch:setEventCode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2110,7 +2110,7 @@ int lua_cocos2dx_EventTouch_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.EventTouch"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "EventTouch",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventTouch:EventTouch",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2160,9 +2160,9 @@ int lua_cocos2dx_EventKeyboard_constructor(lua_State* tolua_S) cocos2d::EventKeyboard::KeyCode arg0; bool arg1; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.EventKeyboard:EventKeyboard"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.EventKeyboard:EventKeyboard"); if(!ok) return 0; cobj = new cocos2d::EventKeyboard(arg0, arg1); @@ -2172,7 +2172,7 @@ int lua_cocos2dx_EventKeyboard_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.EventKeyboard"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "EventKeyboard",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventKeyboard:EventKeyboard",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -2236,7 +2236,7 @@ int lua_cocos2dx_Texture2D_getMaxT(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMaxT",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:getMaxT",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2280,7 +2280,7 @@ int lua_cocos2dx_Texture2D_getStringForFormat(lua_State* tolua_S) tolua_pushstring(tolua_S,(const char*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStringForFormat",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:getStringForFormat",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2318,7 +2318,7 @@ int lua_cocos2dx_Texture2D_initWithImage(lua_State* tolua_S) if (!ok) { break; } cocos2d::Texture2D::PixelFormat arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.Texture2D:initWithImage"); if (!ok) { break; } bool ret = cobj->initWithImage(arg0, arg1); @@ -2339,7 +2339,7 @@ int lua_cocos2dx_Texture2D_initWithImage(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithImage",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:initWithImage",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2383,7 +2383,7 @@ int lua_cocos2dx_Texture2D_getMaxS(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMaxS",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:getMaxS",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2426,7 +2426,7 @@ int lua_cocos2dx_Texture2D_releaseGLTexture(lua_State* tolua_S) cobj->releaseGLTexture(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "releaseGLTexture",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:releaseGLTexture",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2470,7 +2470,7 @@ int lua_cocos2dx_Texture2D_hasPremultipliedAlpha(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "hasPremultipliedAlpha",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:hasPremultipliedAlpha",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2514,7 +2514,7 @@ int lua_cocos2dx_Texture2D_getPixelsHigh(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPixelsHigh",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:getPixelsHigh",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2548,7 +2548,7 @@ int lua_cocos2dx_Texture2D_getBitsPerPixelForFormat(lua_State* tolua_S) do{ if (argc == 1) { cocos2d::Texture2D::PixelFormat arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Texture2D:getBitsPerPixelForFormat"); if (!ok) { break; } unsigned int ret = cobj->getBitsPerPixelForFormat(arg0); @@ -2565,7 +2565,7 @@ int lua_cocos2dx_Texture2D_getBitsPerPixelForFormat(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBitsPerPixelForFormat",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:getBitsPerPixelForFormat",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2609,7 +2609,7 @@ int lua_cocos2dx_Texture2D_getName(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:getName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2643,11 +2643,11 @@ int lua_cocos2dx_Texture2D_initWithString(lua_State* tolua_S) do{ if (argc == 2) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.Texture2D:initWithString"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } cocos2d::FontDefinition arg1; - ok &= luaval_to_fontdefinition(tolua_S, 3, &arg1); + ok &= luaval_to_fontdefinition(tolua_S, 3, &arg1, "cc.Texture2D:initWithString"); if (!ok) { break; } bool ret = cobj->initWithString(arg0, arg1); @@ -2659,15 +2659,15 @@ int lua_cocos2dx_Texture2D_initWithString(lua_State* tolua_S) do{ if (argc == 3) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.Texture2D:initWithString"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Texture2D:initWithString"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Texture2D:initWithString"); if (!ok) { break; } bool ret = cobj->initWithString(arg0, arg1, arg2); @@ -2679,19 +2679,19 @@ int lua_cocos2dx_Texture2D_initWithString(lua_State* tolua_S) do{ if (argc == 4) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.Texture2D:initWithString"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Texture2D:initWithString"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Texture2D:initWithString"); if (!ok) { break; } cocos2d::Size arg3; - ok &= luaval_to_size(tolua_S, 5, &arg3); + ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.Texture2D:initWithString"); if (!ok) { break; } bool ret = cobj->initWithString(arg0, arg1, arg2, arg3); @@ -2703,23 +2703,23 @@ int lua_cocos2dx_Texture2D_initWithString(lua_State* tolua_S) do{ if (argc == 5) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.Texture2D:initWithString"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Texture2D:initWithString"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Texture2D:initWithString"); if (!ok) { break; } cocos2d::Size arg3; - ok &= luaval_to_size(tolua_S, 5, &arg3); + ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.Texture2D:initWithString"); if (!ok) { break; } cocos2d::TextHAlignment arg4; - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.Texture2D:initWithString"); if (!ok) { break; } bool ret = cobj->initWithString(arg0, arg1, arg2, arg3, arg4); @@ -2731,27 +2731,27 @@ int lua_cocos2dx_Texture2D_initWithString(lua_State* tolua_S) do{ if (argc == 6) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.Texture2D:initWithString"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Texture2D:initWithString"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Texture2D:initWithString"); if (!ok) { break; } cocos2d::Size arg3; - ok &= luaval_to_size(tolua_S, 5, &arg3); + ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.Texture2D:initWithString"); if (!ok) { break; } cocos2d::TextHAlignment arg4; - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.Texture2D:initWithString"); if (!ok) { break; } cocos2d::TextVAlignment arg5; - ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5); + ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5, "cc.Texture2D:initWithString"); if (!ok) { break; } bool ret = cobj->initWithString(arg0, arg1, arg2, arg3, arg4, arg5); @@ -2760,7 +2760,7 @@ int lua_cocos2dx_Texture2D_initWithString(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithString",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:initWithString",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -2800,13 +2800,13 @@ int lua_cocos2dx_Texture2D_setMaxT(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Texture2D:setMaxT"); if(!ok) return 0; cobj->setMaxT(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMaxT",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:setMaxT",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2846,13 +2846,13 @@ int lua_cocos2dx_Texture2D_drawInRect(lua_State* tolua_S) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "cc.Texture2D:drawInRect"); if(!ok) return 0; cobj->drawInRect(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "drawInRect",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:drawInRect",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2896,7 +2896,7 @@ int lua_cocos2dx_Texture2D_getContentSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getContentSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:getContentSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2939,7 +2939,7 @@ int lua_cocos2dx_Texture2D_setAliasTexParameters(lua_State* tolua_S) cobj->setAliasTexParameters(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAliasTexParameters",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:setAliasTexParameters",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2982,7 +2982,7 @@ int lua_cocos2dx_Texture2D_setAntiAliasTexParameters(lua_State* tolua_S) cobj->setAntiAliasTexParameters(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAntiAliasTexParameters",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:setAntiAliasTexParameters",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3025,7 +3025,7 @@ int lua_cocos2dx_Texture2D_generateMipmap(lua_State* tolua_S) cobj->generateMipmap(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "generateMipmap",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:generateMipmap",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3069,7 +3069,7 @@ int lua_cocos2dx_Texture2D_getDescription(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDescription",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:getDescription",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3113,7 +3113,7 @@ int lua_cocos2dx_Texture2D_getPixelFormat(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPixelFormat",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:getPixelFormat",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3159,7 +3159,7 @@ int lua_cocos2dx_Texture2D_setGLProgram(lua_State* tolua_S) cobj->setGLProgram(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGLProgram",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:setGLProgram",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3203,7 +3203,7 @@ int lua_cocos2dx_Texture2D_getContentSizeInPixels(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getContentSizeInPixels",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:getContentSizeInPixels",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3247,7 +3247,7 @@ int lua_cocos2dx_Texture2D_getPixelsWide(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPixelsWide",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:getPixelsWide",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3287,13 +3287,13 @@ int lua_cocos2dx_Texture2D_drawAtPoint(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.Texture2D:drawAtPoint"); if(!ok) return 0; cobj->drawAtPoint(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "drawAtPoint",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:drawAtPoint",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3337,7 +3337,7 @@ int lua_cocos2dx_Texture2D_getGLProgram(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.GLProgram",(cocos2d::GLProgram*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGLProgram",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:getGLProgram",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3381,7 +3381,7 @@ int lua_cocos2dx_Texture2D_hasMipmaps(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "hasMipmaps",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:hasMipmaps",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3421,13 +3421,13 @@ int lua_cocos2dx_Texture2D_setMaxS(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Texture2D:setMaxS"); if(!ok) return 0; cobj->setMaxS(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMaxS",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:setMaxS",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3455,13 +3455,13 @@ int lua_cocos2dx_Texture2D_setDefaultAlphaPixelFormat(lua_State* tolua_S) if (argc == 1) { cocos2d::Texture2D::PixelFormat arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Texture2D:setDefaultAlphaPixelFormat"); if(!ok) return 0; cocos2d::Texture2D::setDefaultAlphaPixelFormat(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "setDefaultAlphaPixelFormat",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Texture2D:setDefaultAlphaPixelFormat",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -3492,7 +3492,7 @@ int lua_cocos2dx_Texture2D_getDefaultAlphaPixelFormat(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getDefaultAlphaPixelFormat",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Texture2D:getDefaultAlphaPixelFormat",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -3500,38 +3500,6 @@ int lua_cocos2dx_Texture2D_getDefaultAlphaPixelFormat(lua_State* tolua_S) #endif return 0; } -int lua_cocos2dx_Texture2D_PVRImagesHavePremultipliedAlpha(lua_State* tolua_S) -{ - int argc = 0; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertable(tolua_S,1,"cc.Texture2D",0,&tolua_err)) goto tolua_lerror; -#endif - - argc = lua_gettop(tolua_S) - 1; - - if (argc == 1) - { - bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); - if(!ok) - return 0; - cocos2d::Texture2D::PVRImagesHavePremultipliedAlpha(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "PVRImagesHavePremultipliedAlpha",argc, 1); - return 0; -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Texture2D_PVRImagesHavePremultipliedAlpha'.",&tolua_err); -#endif - return 0; -} int lua_cocos2dx_Texture2D_constructor(lua_State* tolua_S) { int argc = 0; @@ -3556,7 +3524,7 @@ int lua_cocos2dx_Texture2D_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.Texture2D"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "Texture2D",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:Texture2D",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3606,7 +3574,6 @@ int lua_register_cocos2dx_Texture2D(lua_State* tolua_S) tolua_function(tolua_S,"setMaxS",lua_cocos2dx_Texture2D_setMaxS); tolua_function(tolua_S,"setDefaultAlphaPixelFormat", lua_cocos2dx_Texture2D_setDefaultAlphaPixelFormat); tolua_function(tolua_S,"getDefaultAlphaPixelFormat", lua_cocos2dx_Texture2D_getDefaultAlphaPixelFormat); - tolua_function(tolua_S,"PVRImagesHavePremultipliedAlpha", lua_cocos2dx_Texture2D_PVRImagesHavePremultipliedAlpha); tolua_endmodule(tolua_S); std::string typeName = typeid(cocos2d::Texture2D).name(); g_luaType[typeName] = "cc.Texture2D"; @@ -3642,7 +3609,7 @@ int lua_cocos2dx_Node_addChild(lua_State* tolua_S) if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.Node:addChild"); if (!ok) { break; } cobj->addChild(arg0, arg1); @@ -3668,11 +3635,11 @@ int lua_cocos2dx_Node_addChild(lua_State* tolua_S) if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.Node:addChild"); if (!ok) { break; } int arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.Node:addChild"); if (!ok) { break; } cobj->addChild(arg0, arg1, arg2); @@ -3687,11 +3654,11 @@ int lua_cocos2dx_Node_addChild(lua_State* tolua_S) if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.Node:addChild"); if (!ok) { break; } std::string arg2; - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "cc.Node:addChild"); if (!ok) { break; } cobj->addChild(arg0, arg1, arg2); @@ -3699,7 +3666,7 @@ int lua_cocos2dx_Node_addChild(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addChild",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:addChild",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -3714,39 +3681,47 @@ int lua_cocos2dx_Node_removeComponent(lua_State* tolua_S) int argc = 0; cocos2d::Node* cobj = nullptr; bool ok = true; - #if COCOS2D_DEBUG >= 1 tolua_Error tolua_err; #endif - #if COCOS2D_DEBUG >= 1 if (!tolua_isusertype(tolua_S,1,"cc.Node",0,&tolua_err)) goto tolua_lerror; #endif - cobj = (cocos2d::Node*)tolua_tousertype(tolua_S,1,0); - #if COCOS2D_DEBUG >= 1 - if (!cobj) + if (!cobj) { tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Node_removeComponent'", nullptr); return 0; } #endif - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - std::string arg0; + do{ + if (argc == 1) { + cocos2d::Component* arg0; + ok &= luaval_to_object(tolua_S, 2, "cc.Component",&arg0); - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - if(!ok) - return 0; - bool ret = cobj->removeComponent(arg0); - tolua_pushboolean(tolua_S,(bool)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeComponent",argc, 1); + if (!ok) { break; } + bool ret = cobj->removeComponent(arg0); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + }while(0); + ok = true; + do{ + if (argc == 1) { + std::string arg0; + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Node:removeComponent"); + + if (!ok) { break; } + bool ret = cobj->removeComponent(arg0); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + }while(0); + ok = true; + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:removeComponent",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3792,7 +3767,7 @@ int lua_cocos2dx_Node_setPhysicsBody(lua_State* tolua_S) cobj->setPhysicsBody(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPhysicsBody",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setPhysicsBody",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3836,7 +3811,7 @@ int lua_cocos2dx_Node_getDescription(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDescription",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getDescription",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3876,13 +3851,13 @@ int lua_cocos2dx_Node_setRotationSkewY(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Node:setRotationSkewY"); if(!ok) return 0; cobj->setRotationSkewY(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRotationSkewY",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setRotationSkewY",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3922,13 +3897,13 @@ int lua_cocos2dx_Node_setOpacityModifyRGB(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Node:setOpacityModifyRGB"); if(!ok) return 0; cobj->setOpacityModifyRGB(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOpacityModifyRGB",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setOpacityModifyRGB",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3968,13 +3943,13 @@ int lua_cocos2dx_Node_setCascadeOpacityEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Node:setCascadeOpacityEnabled"); if(!ok) return 0; cobj->setCascadeOpacityEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCascadeOpacityEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setCascadeOpacityEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4021,7 +3996,7 @@ int lua_cocos2dx_Node_getChildren(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getChildren",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getChildren",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4071,7 +4046,7 @@ int lua_cocos2dx_Node_setOnExitCallback(lua_State* tolua_S) cobj->setOnExitCallback(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOnExitCallback",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setOnExitCallback",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4114,7 +4089,7 @@ int lua_cocos2dx_Node_pause(lua_State* tolua_S) cobj->pause(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pause",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:pause",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4154,14 +4129,14 @@ int lua_cocos2dx_Node_convertToWorldSpaceAR(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.Node:convertToWorldSpaceAR"); if(!ok) return 0; cocos2d::Vec2 ret = cobj->convertToWorldSpaceAR(arg0); vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "convertToWorldSpaceAR",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:convertToWorldSpaceAR",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4205,7 +4180,7 @@ int lua_cocos2dx_Node_isIgnoreAnchorPointForPosition(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isIgnoreAnchorPointForPosition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:isIgnoreAnchorPointForPosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4245,14 +4220,14 @@ int lua_cocos2dx_Node_getChildByName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Node:getChildByName"); if(!ok) return 0; cocos2d::Node* ret = cobj->getChildByName(arg0); object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getChildByName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getChildByName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4292,13 +4267,13 @@ int lua_cocos2dx_Node_updateDisplayedOpacity(lua_State* tolua_S) { uint16_t arg0; - ok &= luaval_to_uint16(tolua_S, 2,&arg0); + ok &= luaval_to_uint16(tolua_S, 2,&arg0, "cc.Node:updateDisplayedOpacity"); if(!ok) return 0; cobj->updateDisplayedOpacity(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateDisplayedOpacity",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:updateDisplayedOpacity",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4338,13 +4313,13 @@ int lua_cocos2dx_Node_setRotation(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Node:setRotation"); if(!ok) return 0; cobj->setRotation(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRotation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setRotation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4384,13 +4359,13 @@ int lua_cocos2dx_Node_setScaleZ(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Node:setScaleZ"); if(!ok) return 0; cobj->setScaleZ(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScaleZ",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setScaleZ",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4430,13 +4405,13 @@ int lua_cocos2dx_Node_setScaleY(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Node:setScaleY"); if(!ok) return 0; cobj->setScaleY(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScaleY",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setScaleY",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4476,13 +4451,13 @@ int lua_cocos2dx_Node_setScaleX(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Node:setScaleX"); if(!ok) return 0; cobj->setScaleX(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScaleX",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setScaleX",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4522,13 +4497,13 @@ int lua_cocos2dx_Node_setRotationSkewX(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Node:setRotationSkewX"); if(!ok) return 0; cobj->setRotationSkewX(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRotationSkewX",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setRotationSkewX",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4578,7 +4553,7 @@ int lua_cocos2dx_Node_setonEnterTransitionDidFinishCallback(lua_State* tolua_S) cobj->setonEnterTransitionDidFinishCallback(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setonEnterTransitionDidFinishCallback",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setonEnterTransitionDidFinishCallback",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4621,7 +4596,7 @@ int lua_cocos2dx_Node_removeAllComponents(lua_State* tolua_S) cobj->removeAllComponents(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllComponents",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:removeAllComponents",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4661,13 +4636,13 @@ int lua_cocos2dx_Node__setLocalZOrder(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Node:_setLocalZOrder"); if(!ok) return 0; cobj->_setLocalZOrder(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "_setLocalZOrder",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:_setLocalZOrder",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4711,7 +4686,7 @@ int lua_cocos2dx_Node_getTag(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTag",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getTag",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4755,7 +4730,7 @@ int lua_cocos2dx_Node_getGLProgram(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.GLProgram",(cocos2d::GLProgram*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGLProgram",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getGLProgram",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4799,7 +4774,7 @@ int lua_cocos2dx_Node_getNodeToWorldTransform(lua_State* tolua_S) mat4_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNodeToWorldTransform",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getNodeToWorldTransform",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4843,7 +4818,7 @@ int lua_cocos2dx_Node_getPosition3D(lua_State* tolua_S) vec3_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPosition3D",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getPosition3D",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4896,13 +4871,13 @@ int lua_cocos2dx_Node_removeChild(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.Node:removeChild"); if(!ok) return 0; cobj->removeChild(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeChild",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:removeChild",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4942,14 +4917,14 @@ int lua_cocos2dx_Node_convertToWorldSpace(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.Node:convertToWorldSpace"); if(!ok) return 0; cocos2d::Vec2 ret = cobj->convertToWorldSpace(arg0); vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "convertToWorldSpace",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:convertToWorldSpace",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4993,7 +4968,7 @@ int lua_cocos2dx_Node_getScene(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Scene",(cocos2d::Scene*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScene",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getScene",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5037,7 +5012,7 @@ int lua_cocos2dx_Node_getEventDispatcher(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EventDispatcher",(cocos2d::EventDispatcher*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEventDispatcher",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getEventDispatcher",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5077,13 +5052,13 @@ int lua_cocos2dx_Node_setSkewX(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Node:setSkewX"); if(!ok) return 0; cobj->setSkewX(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSkewX",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setSkewX",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5129,7 +5104,7 @@ int lua_cocos2dx_Node_setGLProgramState(lua_State* tolua_S) cobj->setGLProgramState(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGLProgramState",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setGLProgramState",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5179,7 +5154,7 @@ int lua_cocos2dx_Node_setOnEnterCallback(lua_State* tolua_S) cobj->setOnEnterCallback(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOnEnterCallback",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setOnEnterCallback",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5223,7 +5198,7 @@ int lua_cocos2dx_Node_getOpacity(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOpacity",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getOpacity",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5263,13 +5238,13 @@ int lua_cocos2dx_Node_setNormalizedPosition(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.Node:setNormalizedPosition"); if(!ok) return 0; cobj->setNormalizedPosition(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setNormalizedPosition",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setNormalizedPosition",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5319,7 +5294,7 @@ int lua_cocos2dx_Node_setonExitTransitionDidStartCallback(lua_State* tolua_S) cobj->setonExitTransitionDidStartCallback(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setonExitTransitionDidStartCallback",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setonExitTransitionDidStartCallback",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5366,7 +5341,7 @@ int lua_cocos2dx_Node_convertTouchToNodeSpace(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "convertTouchToNodeSpace",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:convertTouchToNodeSpace",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5400,7 +5375,7 @@ int lua_cocos2dx_Node_removeAllChildrenWithCleanup(lua_State* tolua_S) do{ if (argc == 1) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Node:removeAllChildrenWithCleanup"); if (!ok) { break; } cobj->removeAllChildrenWithCleanup(arg0); @@ -5415,7 +5390,7 @@ int lua_cocos2dx_Node_removeAllChildrenWithCleanup(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllChildren",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:removeAllChildren",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5459,7 +5434,7 @@ int lua_cocos2dx_Node_getNodeToParentAffineTransform(lua_State* tolua_S) affinetransform_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNodeToParentAffineTransform",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getNodeToParentAffineTransform",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5503,7 +5478,7 @@ int lua_cocos2dx_Node_isCascadeOpacityEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isCascadeOpacityEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:isCascadeOpacityEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5549,7 +5524,7 @@ int lua_cocos2dx_Node_setParent(lua_State* tolua_S) cobj->setParent(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setParent",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setParent",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5593,7 +5568,7 @@ int lua_cocos2dx_Node_getName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5637,7 +5612,7 @@ int lua_cocos2dx_Node_getRotation3D(lua_State* tolua_S) vec3_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRotation3D",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getRotation3D",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5681,7 +5656,7 @@ int lua_cocos2dx_Node_getNodeToParentTransform(lua_State* tolua_S) mat4_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNodeToParentTransform",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getNodeToParentTransform",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5728,7 +5703,7 @@ int lua_cocos2dx_Node_convertTouchToNodeSpaceAR(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "convertTouchToNodeSpaceAR",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:convertTouchToNodeSpaceAR",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5768,14 +5743,14 @@ int lua_cocos2dx_Node_convertToNodeSpace(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.Node:convertToNodeSpace"); if(!ok) return 0; cocos2d::Vec2 ret = cobj->convertToNodeSpace(arg0); vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "convertToNodeSpace",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:convertToNodeSpace",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5818,7 +5793,7 @@ int lua_cocos2dx_Node_resume(lua_State* tolua_S) cobj->resume(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resume",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:resume",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5862,7 +5837,7 @@ int lua_cocos2dx_Node_getPhysicsBody(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.PhysicsBody",(cocos2d::PhysicsBody*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPhysicsBody",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getPhysicsBody",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5896,11 +5871,11 @@ int lua_cocos2dx_Node_setPosition(lua_State* tolua_S) do{ if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Node:setPosition"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.Node:setPosition"); if (!ok) { break; } cobj->setPosition(arg0, arg1); @@ -5911,7 +5886,7 @@ int lua_cocos2dx_Node_setPosition(lua_State* tolua_S) do{ if (argc == 1) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.Node:setPosition"); if (!ok) { break; } cobj->setPosition(arg0); @@ -5919,7 +5894,7 @@ int lua_cocos2dx_Node_setPosition(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPosition",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setPosition",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5959,13 +5934,13 @@ int lua_cocos2dx_Node_stopActionByTag(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Node:stopActionByTag"); if(!ok) return 0; cobj->stopActionByTag(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stopActionByTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:stopActionByTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6008,13 +5983,13 @@ int lua_cocos2dx_Node_reorderChild(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.Node:reorderChild"); if(!ok) return 0; cobj->reorderChild(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "reorderChild",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:reorderChild",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -6054,13 +6029,13 @@ int lua_cocos2dx_Node_ignoreAnchorPointForPosition(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Node:ignoreAnchorPointForPosition"); if(!ok) return 0; cobj->ignoreAnchorPointForPosition(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ignoreAnchorPointForPosition",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:ignoreAnchorPointForPosition",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6100,13 +6075,13 @@ int lua_cocos2dx_Node_setSkewY(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Node:setSkewY"); if(!ok) return 0; cobj->setSkewY(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSkewY",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setSkewY",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6146,13 +6121,13 @@ int lua_cocos2dx_Node_setPositionZ(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Node:setPositionZ"); if(!ok) return 0; cobj->setPositionZ(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPositionZ",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setPositionZ",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6192,13 +6167,13 @@ int lua_cocos2dx_Node_setRotation3D(lua_State* tolua_S) { cocos2d::Vec3 arg0; - ok &= luaval_to_vec3(tolua_S, 2, &arg0); + ok &= luaval_to_vec3(tolua_S, 2, &arg0, "cc.Node:setRotation3D"); if(!ok) return 0; cobj->setRotation3D(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRotation3D",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setRotation3D",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6238,13 +6213,13 @@ int lua_cocos2dx_Node_setPositionX(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Node:setPositionX"); if(!ok) return 0; cobj->setPositionX(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPositionX",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setPositionX",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6284,13 +6259,13 @@ int lua_cocos2dx_Node_setNodeToParentTransform(lua_State* tolua_S) { cocos2d::Mat4 arg0; - ok &= luaval_to_mat4(tolua_S, 2, &arg0); + ok &= luaval_to_mat4(tolua_S, 2, &arg0, "cc.Node:setNodeToParentTransform"); if(!ok) return 0; cobj->setNodeToParentTransform(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setNodeToParentTransform",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setNodeToParentTransform",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6334,7 +6309,7 @@ int lua_cocos2dx_Node_getAnchorPoint(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnchorPoint",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getAnchorPoint",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6378,7 +6353,7 @@ int lua_cocos2dx_Node_getNumberOfRunningActions(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNumberOfRunningActions",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getNumberOfRunningActions",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6421,7 +6396,7 @@ int lua_cocos2dx_Node_updateTransform(lua_State* tolua_S) cobj->updateTransform(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateTransform",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:updateTransform",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6467,7 +6442,7 @@ int lua_cocos2dx_Node_setGLProgram(lua_State* tolua_S) cobj->setGLProgram(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGLProgram",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setGLProgram",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6511,7 +6486,7 @@ int lua_cocos2dx_Node_isVisible(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isVisible",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:isVisible",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6555,7 +6530,7 @@ int lua_cocos2dx_Node_getChildrenCount(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getChildrenCount",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getChildrenCount",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6595,14 +6570,14 @@ int lua_cocos2dx_Node_convertToNodeSpaceAR(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.Node:convertToNodeSpaceAR"); if(!ok) return 0; cocos2d::Vec2 ret = cobj->convertToNodeSpaceAR(arg0); vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "convertToNodeSpaceAR",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:convertToNodeSpaceAR",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6649,7 +6624,7 @@ int lua_cocos2dx_Node_addComponent(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addComponent",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:addComponent",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6696,7 +6671,7 @@ int lua_cocos2dx_Node_runAction(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Action",(cocos2d::Action*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "runAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:runAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6740,7 +6715,7 @@ int lua_cocos2dx_Node_isOpacityModifyRGB(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isOpacityModifyRGB",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:isOpacityModifyRGB",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6784,7 +6759,7 @@ int lua_cocos2dx_Node_getRotation(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRotation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getRotation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6828,7 +6803,7 @@ int lua_cocos2dx_Node_getAnchorPointInPoints(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnchorPointInPoints",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getAnchorPointInPoints",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6873,11 +6848,11 @@ int lua_cocos2dx_Node_visit(lua_State* tolua_S) if (!ok) { break; } cocos2d::Mat4 arg1; - ok &= luaval_to_mat4(tolua_S, 3, &arg1); + ok &= luaval_to_mat4(tolua_S, 3, &arg1, "cc.Node:visit"); if (!ok) { break; } unsigned int arg2; - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.Node:visit"); if (!ok) { break; } cobj->visit(arg0, arg1, arg2); @@ -6885,7 +6860,7 @@ int lua_cocos2dx_Node_visit(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "visit",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:visit",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -6925,7 +6900,7 @@ int lua_cocos2dx_Node_removeChildByName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Node:removeChildByName"); if(!ok) return 0; cobj->removeChildByName(arg0); @@ -6936,15 +6911,15 @@ int lua_cocos2dx_Node_removeChildByName(lua_State* tolua_S) std::string arg0; bool arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Node:removeChildByName"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.Node:removeChildByName"); if(!ok) return 0; cobj->removeChildByName(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeChildByName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:removeChildByName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6988,7 +6963,7 @@ int lua_cocos2dx_Node_getGLProgramState(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.GLProgramState",(cocos2d::GLProgramState*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGLProgramState",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getGLProgramState",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7034,7 +7009,7 @@ int lua_cocos2dx_Node_setScheduler(lua_State* tolua_S) cobj->setScheduler(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScheduler",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setScheduler",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7077,7 +7052,7 @@ int lua_cocos2dx_Node_stopAllActions(lua_State* tolua_S) cobj->stopAllActions(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stopAllActions",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:stopAllActions",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7121,7 +7096,7 @@ int lua_cocos2dx_Node_getSkewX(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSkewX",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getSkewX",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7165,7 +7140,7 @@ int lua_cocos2dx_Node_getSkewY(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSkewY",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getSkewY",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7209,7 +7184,7 @@ int lua_cocos2dx_Node_getDisplayedColor(lua_State* tolua_S) color3b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDisplayedColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getDisplayedColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7249,14 +7224,14 @@ int lua_cocos2dx_Node_getActionByTag(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Node:getActionByTag"); if(!ok) return 0; cocos2d::Action* ret = cobj->getActionByTag(arg0); object_to_luaval(tolua_S, "cc.Action",(cocos2d::Action*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getActionByTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getActionByTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7296,13 +7271,13 @@ int lua_cocos2dx_Node_setName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Node:setName"); if(!ok) return 0; cobj->setName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7336,7 +7311,7 @@ int lua_cocos2dx_Node_setAdditionalTransform(lua_State* tolua_S) do{ if (argc == 1) { cocos2d::AffineTransform arg0; - ok &= luaval_to_affinetransform(tolua_S, 2, &arg0); + ok &= luaval_to_affinetransform(tolua_S, 2, &arg0, "cc.Node:setAdditionalTransform"); if (!ok) { break; } cobj->setAdditionalTransform(arg0); @@ -7355,7 +7330,7 @@ int lua_cocos2dx_Node_setAdditionalTransform(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAdditionalTransform",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setAdditionalTransform",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7399,7 +7374,7 @@ int lua_cocos2dx_Node_getDisplayedOpacity(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDisplayedOpacity",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getDisplayedOpacity",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7443,7 +7418,7 @@ int lua_cocos2dx_Node_getLocalZOrder(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLocalZOrder",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getLocalZOrder",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7490,7 +7465,7 @@ int lua_cocos2dx_Node_getScheduler(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScheduler",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getScheduler",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7534,7 +7509,7 @@ int lua_cocos2dx_Node_getParentToNodeAffineTransform(lua_State* tolua_S) affinetransform_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getParentToNodeAffineTransform",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getParentToNodeAffineTransform",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7578,7 +7553,7 @@ int lua_cocos2dx_Node_getOrderOfArrival(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOrderOfArrival",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getOrderOfArrival",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7624,7 +7599,7 @@ int lua_cocos2dx_Node_setActionManager(lua_State* tolua_S) cobj->setActionManager(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setActionManager",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setActionManager",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7664,13 +7639,13 @@ int lua_cocos2dx_Node_setColor(lua_State* tolua_S) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.Node:setColor"); if(!ok) return 0; cobj->setColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7714,7 +7689,7 @@ int lua_cocos2dx_Node_isRunning(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isRunning",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:isRunning",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7761,7 +7736,7 @@ int lua_cocos2dx_Node_getParent(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getParent",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getParent",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7805,7 +7780,7 @@ int lua_cocos2dx_Node_getPositionZ(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPositionZ",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getPositionZ",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7849,7 +7824,7 @@ int lua_cocos2dx_Node_getPositionY(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPositionY",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getPositionY",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7893,7 +7868,7 @@ int lua_cocos2dx_Node_getPositionX(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPositionX",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getPositionX",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7933,7 +7908,7 @@ int lua_cocos2dx_Node_removeChildByTag(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Node:removeChildByTag"); if(!ok) return 0; cobj->removeChildByTag(arg0); @@ -7944,15 +7919,15 @@ int lua_cocos2dx_Node_removeChildByTag(lua_State* tolua_S) int arg0; bool arg1; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Node:removeChildByTag"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.Node:removeChildByTag"); if(!ok) return 0; cobj->removeChildByTag(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeChildByTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:removeChildByTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7992,13 +7967,13 @@ int lua_cocos2dx_Node_setPositionY(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Node:setPositionY"); if(!ok) return 0; cobj->setPositionY(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPositionY",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setPositionY",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8042,7 +8017,7 @@ int lua_cocos2dx_Node_getNodeToWorldAffineTransform(lua_State* tolua_S) affinetransform_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNodeToWorldAffineTransform",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getNodeToWorldAffineTransform",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8082,13 +8057,13 @@ int lua_cocos2dx_Node_updateDisplayedColor(lua_State* tolua_S) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.Node:updateDisplayedColor"); if(!ok) return 0; cobj->updateDisplayedColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateDisplayedColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:updateDisplayedColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8128,13 +8103,13 @@ int lua_cocos2dx_Node_setVisible(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Node:setVisible"); if(!ok) return 0; cobj->setVisible(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVisible",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setVisible",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8178,7 +8153,7 @@ int lua_cocos2dx_Node_getParentToNodeTransform(lua_State* tolua_S) mat4_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getParentToNodeTransform",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getParentToNodeTransform",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8218,13 +8193,13 @@ int lua_cocos2dx_Node_setGlobalZOrder(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Node:setGlobalZOrder"); if(!ok) return 0; cobj->setGlobalZOrder(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGlobalZOrder",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setGlobalZOrder",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8258,11 +8233,11 @@ int lua_cocos2dx_Node_setScale(lua_State* tolua_S) do{ if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Node:setScale"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.Node:setScale"); if (!ok) { break; } cobj->setScale(arg0, arg1); @@ -8273,7 +8248,7 @@ int lua_cocos2dx_Node_setScale(lua_State* tolua_S) do{ if (argc == 1) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Node:setScale"); if (!ok) { break; } cobj->setScale(arg0); @@ -8281,7 +8256,7 @@ int lua_cocos2dx_Node_setScale(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScale",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setScale",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8321,14 +8296,14 @@ int lua_cocos2dx_Node_getChildByTag(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Node:getChildByTag"); if(!ok) return 0; cocos2d::Node* ret = cobj->getChildByTag(arg0); object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getChildByTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getChildByTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8368,13 +8343,13 @@ int lua_cocos2dx_Node_setOrderOfArrival(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Node:setOrderOfArrival"); if(!ok) return 0; cobj->setOrderOfArrival(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOrderOfArrival",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setOrderOfArrival",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8418,7 +8393,7 @@ int lua_cocos2dx_Node_getScaleZ(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScaleZ",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getScaleZ",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8462,7 +8437,7 @@ int lua_cocos2dx_Node_getScaleY(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScaleY",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getScaleY",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8506,7 +8481,7 @@ int lua_cocos2dx_Node_getScaleX(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScaleX",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getScaleX",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8546,13 +8521,13 @@ int lua_cocos2dx_Node_setLocalZOrder(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Node:setLocalZOrder"); if(!ok) return 0; cobj->setLocalZOrder(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLocalZOrder",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setLocalZOrder",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8596,7 +8571,7 @@ int lua_cocos2dx_Node_getWorldToNodeAffineTransform(lua_State* tolua_S) affinetransform_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getWorldToNodeAffineTransform",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getWorldToNodeAffineTransform",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8636,13 +8611,13 @@ int lua_cocos2dx_Node_setCascadeColorEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Node:setCascadeColorEnabled"); if(!ok) return 0; cobj->setCascadeColorEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCascadeColorEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setCascadeColorEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8682,13 +8657,13 @@ int lua_cocos2dx_Node_setOpacity(lua_State* tolua_S) { uint16_t arg0; - ok &= luaval_to_uint16(tolua_S, 2,&arg0); + ok &= luaval_to_uint16(tolua_S, 2,&arg0, "cc.Node:setOpacity"); if(!ok) return 0; cobj->setOpacity(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOpacity",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setOpacity",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8731,7 +8706,7 @@ int lua_cocos2dx_Node_cleanup(lua_State* tolua_S) cobj->cleanup(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cleanup",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:cleanup",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8771,14 +8746,14 @@ int lua_cocos2dx_Node_getComponent(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Node:getComponent"); if(!ok) return 0; cocos2d::Component* ret = cobj->getComponent(arg0); object_to_luaval(tolua_S, "cc.Component",(cocos2d::Component*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getComponent",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getComponent",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8822,7 +8797,7 @@ int lua_cocos2dx_Node_getContentSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getContentSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getContentSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8866,7 +8841,7 @@ int lua_cocos2dx_Node_getColor(lua_State* tolua_S) color3b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8910,7 +8885,7 @@ int lua_cocos2dx_Node_getBoundingBox(lua_State* tolua_S) rect_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBoundingBox",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getBoundingBox",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8956,7 +8931,7 @@ int lua_cocos2dx_Node_setEventDispatcher(lua_State* tolua_S) cobj->setEventDispatcher(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEventDispatcher",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setEventDispatcher",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9000,7 +8975,7 @@ int lua_cocos2dx_Node_getGlobalZOrder(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGlobalZOrder",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getGlobalZOrder",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9045,11 +9020,11 @@ int lua_cocos2dx_Node_draw(lua_State* tolua_S) if (!ok) { break; } cocos2d::Mat4 arg1; - ok &= luaval_to_mat4(tolua_S, 3, &arg1); + ok &= luaval_to_mat4(tolua_S, 3, &arg1, "cc.Node:draw"); if (!ok) { break; } unsigned int arg2; - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.Node:draw"); if (!ok) { break; } cobj->draw(arg0, arg1, arg2); @@ -9057,7 +9032,7 @@ int lua_cocos2dx_Node_draw(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "draw",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:draw",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -9103,7 +9078,7 @@ int lua_cocos2dx_Node_setUserObject(lua_State* tolua_S) cobj->setUserObject(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUserObject",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setUserObject",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9137,7 +9112,7 @@ int lua_cocos2dx_Node_removeFromParentAndCleanup(lua_State* tolua_S) do{ if (argc == 1) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Node:removeFromParentAndCleanup"); if (!ok) { break; } cobj->removeFromParentAndCleanup(arg0); @@ -9152,7 +9127,7 @@ int lua_cocos2dx_Node_removeFromParentAndCleanup(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeFromParent",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:removeFromParent",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9192,13 +9167,13 @@ int lua_cocos2dx_Node_setPosition3D(lua_State* tolua_S) { cocos2d::Vec3 arg0; - ok &= luaval_to_vec3(tolua_S, 2, &arg0); + ok &= luaval_to_vec3(tolua_S, 2, &arg0, "cc.Node:setPosition3D"); if(!ok) return 0; cobj->setPosition3D(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPosition3D",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setPosition3D",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9238,13 +9213,13 @@ int lua_cocos2dx_Node_update(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Node:update"); if(!ok) return 0; cobj->update(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "update",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:update",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9287,7 +9262,7 @@ int lua_cocos2dx_Node_sortAllChildren(lua_State* tolua_S) cobj->sortAllChildren(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "sortAllChildren",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:sortAllChildren",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9331,7 +9306,7 @@ int lua_cocos2dx_Node_getWorldToNodeTransform(lua_State* tolua_S) mat4_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getWorldToNodeTransform",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getWorldToNodeTransform",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9375,7 +9350,7 @@ int lua_cocos2dx_Node_getScale(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScale",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getScale",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9419,7 +9394,7 @@ int lua_cocos2dx_Node_getNormalizedPosition(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNormalizedPosition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getNormalizedPosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9463,7 +9438,7 @@ int lua_cocos2dx_Node_getRotationSkewX(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRotationSkewX",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getRotationSkewX",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9507,7 +9482,7 @@ int lua_cocos2dx_Node_getRotationSkewY(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRotationSkewY",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getRotationSkewY",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9547,13 +9522,13 @@ int lua_cocos2dx_Node_setTag(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Node:setTag"); if(!ok) return 0; cobj->setTag(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9597,7 +9572,7 @@ int lua_cocos2dx_Node_isCascadeColorEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isCascadeColorEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:isCascadeColorEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9643,7 +9618,7 @@ int lua_cocos2dx_Node_stopAction(lua_State* tolua_S) cobj->stopAction(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stopAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:stopAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9690,7 +9665,7 @@ int lua_cocos2dx_Node_getActionManager(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getActionManager",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getActionManager",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9723,7 +9698,7 @@ int lua_cocos2dx_Node_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Node:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -9906,11 +9881,11 @@ int lua_cocos2dx_GLProgramState_setUniformTexture(lua_State* tolua_S) do{ if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgramState:setUniformTexture"); if (!ok) { break; } unsigned int arg1; - ok &= luaval_to_uint32(tolua_S, 3,&arg1); + ok &= luaval_to_uint32(tolua_S, 3,&arg1, "cc.GLProgramState:setUniformTexture"); if (!ok) { break; } cobj->setUniformTexture(arg0, arg1); @@ -9921,7 +9896,7 @@ int lua_cocos2dx_GLProgramState_setUniformTexture(lua_State* tolua_S) do{ if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgramState:setUniformTexture"); if (!ok) { break; } cocos2d::Texture2D* arg1; @@ -9936,7 +9911,7 @@ int lua_cocos2dx_GLProgramState_setUniformTexture(lua_State* tolua_S) do{ if (argc == 2) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgramState:setUniformTexture"); if (!ok) { break; } cocos2d::Texture2D* arg1; @@ -9951,11 +9926,11 @@ int lua_cocos2dx_GLProgramState_setUniformTexture(lua_State* tolua_S) do{ if (argc == 2) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgramState:setUniformTexture"); if (!ok) { break; } unsigned int arg1; - ok &= luaval_to_uint32(tolua_S, 3,&arg1); + ok &= luaval_to_uint32(tolua_S, 3,&arg1, "cc.GLProgramState:setUniformTexture"); if (!ok) { break; } cobj->setUniformTexture(arg0, arg1); @@ -9963,7 +9938,7 @@ int lua_cocos2dx_GLProgramState_setUniformTexture(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformTexture",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:setUniformTexture",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -9997,11 +9972,11 @@ int lua_cocos2dx_GLProgramState_setUniformMat4(lua_State* tolua_S) do{ if (argc == 2) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgramState:setUniformMat4"); if (!ok) { break; } cocos2d::Mat4 arg1; - ok &= luaval_to_mat4(tolua_S, 3, &arg1); + ok &= luaval_to_mat4(tolua_S, 3, &arg1, "cc.GLProgramState:setUniformMat4"); if (!ok) { break; } cobj->setUniformMat4(arg0, arg1); @@ -10012,11 +9987,11 @@ int lua_cocos2dx_GLProgramState_setUniformMat4(lua_State* tolua_S) do{ if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgramState:setUniformMat4"); if (!ok) { break; } cocos2d::Mat4 arg1; - ok &= luaval_to_mat4(tolua_S, 3, &arg1); + ok &= luaval_to_mat4(tolua_S, 3, &arg1, "cc.GLProgramState:setUniformMat4"); if (!ok) { break; } cobj->setUniformMat4(arg0, arg1); @@ -10024,7 +9999,7 @@ int lua_cocos2dx_GLProgramState_setUniformMat4(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformMat4",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:setUniformMat4",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10067,7 +10042,7 @@ int lua_cocos2dx_GLProgramState_applyUniforms(lua_State* tolua_S) cobj->applyUniforms(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "applyUniforms",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:applyUniforms",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10107,13 +10082,13 @@ int lua_cocos2dx_GLProgramState_applyGLProgram(lua_State* tolua_S) { cocos2d::Mat4 arg0; - ok &= luaval_to_mat4(tolua_S, 2, &arg0); + ok &= luaval_to_mat4(tolua_S, 2, &arg0, "cc.GLProgramState:applyGLProgram"); if(!ok) return 0; cobj->applyGLProgram(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "applyGLProgram",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:applyGLProgram",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10157,7 +10132,7 @@ int lua_cocos2dx_GLProgramState_getUniformCount(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getUniformCount",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:getUniformCount",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10204,13 +10179,13 @@ int lua_cocos2dx_GLProgramState_applyAttributes(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.GLProgramState:applyAttributes"); if(!ok) return 0; cobj->applyAttributes(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "applyAttributes",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:applyAttributes",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10244,11 +10219,11 @@ int lua_cocos2dx_GLProgramState_setUniformFloat(lua_State* tolua_S) do{ if (argc == 2) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgramState:setUniformFloat"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.GLProgramState:setUniformFloat"); if (!ok) { break; } cobj->setUniformFloat(arg0, arg1); @@ -10259,11 +10234,11 @@ int lua_cocos2dx_GLProgramState_setUniformFloat(lua_State* tolua_S) do{ if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgramState:setUniformFloat"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.GLProgramState:setUniformFloat"); if (!ok) { break; } cobj->setUniformFloat(arg0, arg1); @@ -10271,7 +10246,7 @@ int lua_cocos2dx_GLProgramState_setUniformFloat(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformFloat",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:setUniformFloat",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10305,11 +10280,11 @@ int lua_cocos2dx_GLProgramState_setUniformVec3(lua_State* tolua_S) do{ if (argc == 2) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgramState:setUniformVec3"); if (!ok) { break; } cocos2d::Vec3 arg1; - ok &= luaval_to_vec3(tolua_S, 3, &arg1); + ok &= luaval_to_vec3(tolua_S, 3, &arg1, "cc.GLProgramState:setUniformVec3"); if (!ok) { break; } cobj->setUniformVec3(arg0, arg1); @@ -10320,11 +10295,11 @@ int lua_cocos2dx_GLProgramState_setUniformVec3(lua_State* tolua_S) do{ if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgramState:setUniformVec3"); if (!ok) { break; } cocos2d::Vec3 arg1; - ok &= luaval_to_vec3(tolua_S, 3, &arg1); + ok &= luaval_to_vec3(tolua_S, 3, &arg1, "cc.GLProgramState:setUniformVec3"); if (!ok) { break; } cobj->setUniformVec3(arg0, arg1); @@ -10332,7 +10307,7 @@ int lua_cocos2dx_GLProgramState_setUniformVec3(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformVec3",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:setUniformVec3",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10366,11 +10341,11 @@ int lua_cocos2dx_GLProgramState_setUniformInt(lua_State* tolua_S) do{ if (argc == 2) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgramState:setUniformInt"); if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.GLProgramState:setUniformInt"); if (!ok) { break; } cobj->setUniformInt(arg0, arg1); @@ -10381,11 +10356,11 @@ int lua_cocos2dx_GLProgramState_setUniformInt(lua_State* tolua_S) do{ if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgramState:setUniformInt"); if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.GLProgramState:setUniformInt"); if (!ok) { break; } cobj->setUniformInt(arg0, arg1); @@ -10393,7 +10368,7 @@ int lua_cocos2dx_GLProgramState_setUniformInt(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformInt",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:setUniformInt",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10437,7 +10412,7 @@ int lua_cocos2dx_GLProgramState_getVertexAttribCount(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVertexAttribCount",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:getVertexAttribCount",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10471,11 +10446,11 @@ int lua_cocos2dx_GLProgramState_setUniformVec4(lua_State* tolua_S) do{ if (argc == 2) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgramState:setUniformVec4"); if (!ok) { break; } cocos2d::Vec4 arg1; - ok &= luaval_to_vec4(tolua_S, 3, &arg1); + ok &= luaval_to_vec4(tolua_S, 3, &arg1, "cc.GLProgramState:setUniformVec4"); if (!ok) { break; } cobj->setUniformVec4(arg0, arg1); @@ -10486,11 +10461,11 @@ int lua_cocos2dx_GLProgramState_setUniformVec4(lua_State* tolua_S) do{ if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgramState:setUniformVec4"); if (!ok) { break; } cocos2d::Vec4 arg1; - ok &= luaval_to_vec4(tolua_S, 3, &arg1); + ok &= luaval_to_vec4(tolua_S, 3, &arg1, "cc.GLProgramState:setUniformVec4"); if (!ok) { break; } cobj->setUniformVec4(arg0, arg1); @@ -10498,7 +10473,7 @@ int lua_cocos2dx_GLProgramState_setUniformVec4(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformVec4",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:setUniformVec4",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10544,7 +10519,7 @@ int lua_cocos2dx_GLProgramState_setGLProgram(lua_State* tolua_S) cobj->setGLProgram(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGLProgram",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:setGLProgram",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10578,11 +10553,11 @@ int lua_cocos2dx_GLProgramState_setUniformVec2(lua_State* tolua_S) do{ if (argc == 2) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgramState:setUniformVec2"); if (!ok) { break; } cocos2d::Vec2 arg1; - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.GLProgramState:setUniformVec2"); if (!ok) { break; } cobj->setUniformVec2(arg0, arg1); @@ -10593,11 +10568,11 @@ int lua_cocos2dx_GLProgramState_setUniformVec2(lua_State* tolua_S) do{ if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgramState:setUniformVec2"); if (!ok) { break; } cocos2d::Vec2 arg1; - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.GLProgramState:setUniformVec2"); if (!ok) { break; } cobj->setUniformVec2(arg0, arg1); @@ -10605,7 +10580,7 @@ int lua_cocos2dx_GLProgramState_setUniformVec2(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformVec2",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:setUniformVec2",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10649,7 +10624,7 @@ int lua_cocos2dx_GLProgramState_getVertexAttribsFlags(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVertexAttribsFlags",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:getVertexAttribsFlags",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10689,13 +10664,13 @@ int lua_cocos2dx_GLProgramState_apply(lua_State* tolua_S) { cocos2d::Mat4 arg0; - ok &= luaval_to_mat4(tolua_S, 2, &arg0); + ok &= luaval_to_mat4(tolua_S, 2, &arg0, "cc.GLProgramState:apply"); if(!ok) return 0; cobj->apply(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "apply",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:apply",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10739,7 +10714,7 @@ int lua_cocos2dx_GLProgramState_getGLProgram(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.GLProgram",(cocos2d::GLProgram*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGLProgram",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:getGLProgram",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10774,7 +10749,7 @@ int lua_cocos2dx_GLProgramState_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.GLProgramState",(cocos2d::GLProgramState*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.GLProgramState:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -10800,14 +10775,14 @@ int lua_cocos2dx_GLProgramState_getOrCreateWithGLProgramName(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgramState:getOrCreateWithGLProgramName"); if(!ok) return 0; cocos2d::GLProgramState* ret = cocos2d::GLProgramState::getOrCreateWithGLProgramName(arg0); object_to_luaval(tolua_S, "cc.GLProgramState",(cocos2d::GLProgramState*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getOrCreateWithGLProgramName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.GLProgramState:getOrCreateWithGLProgramName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -10840,7 +10815,7 @@ int lua_cocos2dx_GLProgramState_getOrCreateWithGLProgram(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.GLProgramState",(cocos2d::GLProgramState*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getOrCreateWithGLProgram",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.GLProgramState:getOrCreateWithGLProgram",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -10919,7 +10894,7 @@ int lua_cocos2dx_AtlasNode_updateAtlasValues(lua_State* tolua_S) cobj->updateAtlasValues(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateAtlasValues",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AtlasNode:updateAtlasValues",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10963,7 +10938,7 @@ int lua_cocos2dx_AtlasNode_getTexture(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Texture2D",(cocos2d::Texture2D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTexture",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AtlasNode:getTexture",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11009,7 +10984,7 @@ int lua_cocos2dx_AtlasNode_setTextureAtlas(lua_State* tolua_S) cobj->setTextureAtlas(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextureAtlas",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AtlasNode:setTextureAtlas",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11053,7 +11028,7 @@ int lua_cocos2dx_AtlasNode_getTextureAtlas(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TextureAtlas",(cocos2d::TextureAtlas*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextureAtlas",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AtlasNode:getTextureAtlas",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11097,7 +11072,7 @@ int lua_cocos2dx_AtlasNode_getQuadsToDraw(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getQuadsToDraw",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AtlasNode:getQuadsToDraw",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11143,7 +11118,7 @@ int lua_cocos2dx_AtlasNode_setTexture(lua_State* tolua_S) cobj->setTexture(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AtlasNode:setTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11183,13 +11158,13 @@ int lua_cocos2dx_AtlasNode_setQuadsToDraw(lua_State* tolua_S) { ssize_t arg0; - ok &= luaval_to_ssize(tolua_S, 2, &arg0); + ok &= luaval_to_ssize(tolua_S, 2, &arg0, "cc.AtlasNode:setQuadsToDraw"); if(!ok) return 0; cobj->setQuadsToDraw(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setQuadsToDraw",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AtlasNode:setQuadsToDraw",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11220,17 +11195,17 @@ int lua_cocos2dx_AtlasNode_create(lua_State* tolua_S) int arg1; int arg2; int arg3; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.AtlasNode:create"); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.AtlasNode:create"); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.AtlasNode:create"); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.AtlasNode:create"); if(!ok) return 0; cocos2d::AtlasNode* ret = cocos2d::AtlasNode::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.AtlasNode",(cocos2d::AtlasNode*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.AtlasNode:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -11295,13 +11270,13 @@ int lua_cocos2dx_LabelAtlas_setString(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelAtlas:setString"); if(!ok) return 0; cobj->setString(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setString",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelAtlas:setString",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11335,11 +11310,11 @@ int lua_cocos2dx_LabelAtlas_initWithString(lua_State* tolua_S) do{ if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelAtlas:initWithString"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelAtlas:initWithString"); if (!ok) { break; } bool ret = cobj->initWithString(arg0, arg1); @@ -11351,23 +11326,23 @@ int lua_cocos2dx_LabelAtlas_initWithString(lua_State* tolua_S) do{ if (argc == 5) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelAtlas:initWithString"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelAtlas:initWithString"); if (!ok) { break; } int arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.LabelAtlas:initWithString"); if (!ok) { break; } int arg3; - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.LabelAtlas:initWithString"); if (!ok) { break; } int arg4; - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.LabelAtlas:initWithString"); if (!ok) { break; } bool ret = cobj->initWithString(arg0, arg1, arg2, arg3, arg4); @@ -11379,7 +11354,7 @@ int lua_cocos2dx_LabelAtlas_initWithString(lua_State* tolua_S) do{ if (argc == 5) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelAtlas:initWithString"); if (!ok) { break; } cocos2d::Texture2D* arg1; @@ -11387,15 +11362,15 @@ int lua_cocos2dx_LabelAtlas_initWithString(lua_State* tolua_S) if (!ok) { break; } int arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.LabelAtlas:initWithString"); if (!ok) { break; } int arg3; - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.LabelAtlas:initWithString"); if (!ok) { break; } int arg4; - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.LabelAtlas:initWithString"); if (!ok) { break; } bool ret = cobj->initWithString(arg0, arg1, arg2, arg3, arg4); @@ -11404,7 +11379,7 @@ int lua_cocos2dx_LabelAtlas_initWithString(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithString",argc, 5); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelAtlas:initWithString",argc, 5); return 0; #if COCOS2D_DEBUG >= 1 @@ -11447,7 +11422,7 @@ int lua_cocos2dx_LabelAtlas_updateAtlasValues(lua_State* tolua_S) cobj->updateAtlasValues(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateAtlasValues",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelAtlas:updateAtlasValues",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11491,7 +11466,7 @@ int lua_cocos2dx_LabelAtlas_getString(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getString",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelAtlas:getString",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11520,19 +11495,19 @@ int lua_cocos2dx_LabelAtlas_create(lua_State* tolua_S) if (argc == 5) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelAtlas:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelAtlas:create"); if (!ok) { break; } int arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.LabelAtlas:create"); if (!ok) { break; } int arg3; - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.LabelAtlas:create"); if (!ok) { break; } int arg4; - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.LabelAtlas:create"); if (!ok) { break; } cocos2d::LabelAtlas* ret = cocos2d::LabelAtlas::create(arg0, arg1, arg2, arg3, arg4); object_to_luaval(tolua_S, "cc.LabelAtlas",(cocos2d::LabelAtlas*)ret); @@ -11555,10 +11530,10 @@ int lua_cocos2dx_LabelAtlas_create(lua_State* tolua_S) if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelAtlas:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelAtlas:create"); if (!ok) { break; } cocos2d::LabelAtlas* ret = cocos2d::LabelAtlas::create(arg0, arg1); object_to_luaval(tolua_S, "cc.LabelAtlas",(cocos2d::LabelAtlas*)ret); @@ -11566,7 +11541,7 @@ int lua_cocos2dx_LabelAtlas_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.LabelAtlas:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -11598,6 +11573,1438 @@ int lua_register_cocos2dx_LabelAtlas(lua_State* tolua_S) return 1; } +int lua_cocos2dx_Scene_getPhysicsWorld(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Scene* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.Scene",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Scene*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Scene_getPhysicsWorld'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::PhysicsWorld* ret = cobj->getPhysicsWorld(); + object_to_luaval(tolua_S, "cc.PhysicsWorld",(cocos2d::PhysicsWorld*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scene:getPhysicsWorld",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Scene_getPhysicsWorld'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_Scene_createWithSize(lua_State* tolua_S) +{ + int argc = 0; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertable(tolua_S,1,"cc.Scene",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 1) + { + cocos2d::Size arg0; + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.Scene:createWithSize"); + if(!ok) + return 0; + cocos2d::Scene* ret = cocos2d::Scene::createWithSize(arg0); + object_to_luaval(tolua_S, "cc.Scene",(cocos2d::Scene*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Scene:createWithSize",argc, 1); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Scene_createWithSize'.",&tolua_err); +#endif + return 0; +} +int lua_cocos2dx_Scene_create(lua_State* tolua_S) +{ + int argc = 0; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertable(tolua_S,1,"cc.Scene",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Scene* ret = cocos2d::Scene::create(); + object_to_luaval(tolua_S, "cc.Scene",(cocos2d::Scene*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Scene:create",argc, 0); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Scene_create'.",&tolua_err); +#endif + return 0; +} +int lua_cocos2dx_Scene_createWithPhysics(lua_State* tolua_S) +{ + int argc = 0; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertable(tolua_S,1,"cc.Scene",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Scene* ret = cocos2d::Scene::createWithPhysics(); + object_to_luaval(tolua_S, "cc.Scene",(cocos2d::Scene*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Scene:createWithPhysics",argc, 0); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Scene_createWithPhysics'.",&tolua_err); +#endif + return 0; +} +static int lua_cocos2dx_Scene_finalize(lua_State* tolua_S) +{ + printf("luabindings: finalizing LUA object (Scene)"); + return 0; +} + +int lua_register_cocos2dx_Scene(lua_State* tolua_S) +{ + tolua_usertype(tolua_S,"cc.Scene"); + tolua_cclass(tolua_S,"Scene","cc.Scene","cc.Node",nullptr); + + tolua_beginmodule(tolua_S,"Scene"); + tolua_function(tolua_S,"getPhysicsWorld",lua_cocos2dx_Scene_getPhysicsWorld); + tolua_function(tolua_S,"createWithSize", lua_cocos2dx_Scene_createWithSize); + tolua_function(tolua_S,"create", lua_cocos2dx_Scene_create); + tolua_function(tolua_S,"createWithPhysics", lua_cocos2dx_Scene_createWithPhysics); + tolua_endmodule(tolua_S); + std::string typeName = typeid(cocos2d::Scene).name(); + g_luaType[typeName] = "cc.Scene"; + g_typeCast["Scene"] = "cc.Scene"; + return 1; +} + +int lua_cocos2dx_GLView_setFrameSize(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_setFrameSize'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 2) + { + double arg0; + double arg1; + + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.GLView:setFrameSize"); + + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.GLView:setFrameSize"); + if(!ok) + return 0; + cobj->setFrameSize(arg0, arg1); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:setFrameSize",argc, 2); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_setFrameSize'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_getViewPortRect(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_getViewPortRect'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + const cocos2d::Rect& ret = cobj->getViewPortRect(); + rect_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getViewPortRect",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_getViewPortRect'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_getContentScaleFactor(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_getContentScaleFactor'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + double ret = cobj->getContentScaleFactor(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getContentScaleFactor",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_getContentScaleFactor'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_setIMEKeyboardState(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_setIMEKeyboardState'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + bool arg0; + + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.GLView:setIMEKeyboardState"); + if(!ok) + return 0; + cobj->setIMEKeyboardState(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:setIMEKeyboardState",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_setIMEKeyboardState'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_setScissorInPoints(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_setScissorInPoints'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 4) + { + double arg0; + double arg1; + double arg2; + double arg3; + + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.GLView:setScissorInPoints"); + + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.GLView:setScissorInPoints"); + + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.GLView:setScissorInPoints"); + + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.GLView:setScissorInPoints"); + if(!ok) + return 0; + cobj->setScissorInPoints(arg0, arg1, arg2, arg3); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:setScissorInPoints",argc, 4); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_setScissorInPoints'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_getViewName(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_getViewName'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + const std::string& ret = cobj->getViewName(); + tolua_pushcppstring(tolua_S,ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getViewName",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_getViewName'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_isOpenGLReady(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_isOpenGLReady'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + bool ret = cobj->isOpenGLReady(); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:isOpenGLReady",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_isOpenGLReady'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_end(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_end'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->end(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:end",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_end'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_getScaleY(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_getScaleY'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + double ret = cobj->getScaleY(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getScaleY",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_getScaleY'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_getScaleX(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_getScaleX'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + double ret = cobj->getScaleX(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getScaleX",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_getScaleX'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_getVisibleOrigin(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_getVisibleOrigin'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Vec2 ret = cobj->getVisibleOrigin(); + vec2_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getVisibleOrigin",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_getVisibleOrigin'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_getFrameSize(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_getFrameSize'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + const cocos2d::Size& ret = cobj->getFrameSize(); + size_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getFrameSize",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_getFrameSize'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_getFrameZoomFactor(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_getFrameZoomFactor'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + double ret = cobj->getFrameZoomFactor(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getFrameZoomFactor",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_getFrameZoomFactor'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_getDesignResolutionSize(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_getDesignResolutionSize'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + const cocos2d::Size& ret = cobj->getDesignResolutionSize(); + size_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getDesignResolutionSize",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_getDesignResolutionSize'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_windowShouldClose(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_windowShouldClose'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + bool ret = cobj->windowShouldClose(); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:windowShouldClose",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_windowShouldClose'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_swapBuffers(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_swapBuffers'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->swapBuffers(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:swapBuffers",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_swapBuffers'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_setDesignResolutionSize(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_setDesignResolutionSize'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 3) + { + double arg0; + double arg1; + ResolutionPolicy arg2; + + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.GLView:setDesignResolutionSize"); + + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.GLView:setDesignResolutionSize"); + + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.GLView:setDesignResolutionSize"); + if(!ok) + return 0; + cobj->setDesignResolutionSize(arg0, arg1, arg2); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:setDesignResolutionSize",argc, 3); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_setDesignResolutionSize'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_getResolutionPolicy(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_getResolutionPolicy'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + int ret = (int)cobj->getResolutionPolicy(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getResolutionPolicy",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_getResolutionPolicy'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_isRetinaDisplay(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_isRetinaDisplay'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + bool ret = cobj->isRetinaDisplay(); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:isRetinaDisplay",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_isRetinaDisplay'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_setViewPortInPoints(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_setViewPortInPoints'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 4) + { + double arg0; + double arg1; + double arg2; + double arg3; + + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.GLView:setViewPortInPoints"); + + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.GLView:setViewPortInPoints"); + + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.GLView:setViewPortInPoints"); + + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.GLView:setViewPortInPoints"); + if(!ok) + return 0; + cobj->setViewPortInPoints(arg0, arg1, arg2, arg3); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:setViewPortInPoints",argc, 4); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_setViewPortInPoints'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_getScissorRect(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_getScissorRect'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Rect ret = cobj->getScissorRect(); + rect_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getScissorRect",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_getScissorRect'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_getRetinaFactor(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_getRetinaFactor'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + int ret = cobj->getRetinaFactor(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getRetinaFactor",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_getRetinaFactor'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_setViewName(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_setViewName'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + std::string arg0; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLView:setViewName"); + if(!ok) + return 0; + cobj->setViewName(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:setViewName",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_setViewName'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_getVisibleRect(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_getVisibleRect'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Rect ret = cobj->getVisibleRect(); + rect_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getVisibleRect",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_getVisibleRect'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_getVisibleSize(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_getVisibleSize'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Size ret = cobj->getVisibleSize(); + size_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getVisibleSize",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_getVisibleSize'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_isScissorEnabled(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_isScissorEnabled'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + bool ret = cobj->isScissorEnabled(); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:isScissorEnabled",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_isScissorEnabled'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_pollEvents(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_pollEvents'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->pollEvents(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:pollEvents",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_pollEvents'.",&tolua_err); +#endif + + return 0; +} +static int lua_cocos2dx_GLView_finalize(lua_State* tolua_S) +{ + printf("luabindings: finalizing LUA object (GLView)"); + return 0; +} + +int lua_register_cocos2dx_GLView(lua_State* tolua_S) +{ + tolua_usertype(tolua_S,"cc.GLView"); + tolua_cclass(tolua_S,"GLView","cc.GLView","cc.Ref",nullptr); + + tolua_beginmodule(tolua_S,"GLView"); + tolua_function(tolua_S,"setFrameSize",lua_cocos2dx_GLView_setFrameSize); + tolua_function(tolua_S,"getViewPortRect",lua_cocos2dx_GLView_getViewPortRect); + tolua_function(tolua_S,"getContentScaleFactor",lua_cocos2dx_GLView_getContentScaleFactor); + tolua_function(tolua_S,"setIMEKeyboardState",lua_cocos2dx_GLView_setIMEKeyboardState); + tolua_function(tolua_S,"setScissorInPoints",lua_cocos2dx_GLView_setScissorInPoints); + tolua_function(tolua_S,"getViewName",lua_cocos2dx_GLView_getViewName); + tolua_function(tolua_S,"isOpenGLReady",lua_cocos2dx_GLView_isOpenGLReady); + tolua_function(tolua_S,"end",lua_cocos2dx_GLView_end); + tolua_function(tolua_S,"getScaleY",lua_cocos2dx_GLView_getScaleY); + tolua_function(tolua_S,"getScaleX",lua_cocos2dx_GLView_getScaleX); + tolua_function(tolua_S,"getVisibleOrigin",lua_cocos2dx_GLView_getVisibleOrigin); + tolua_function(tolua_S,"getFrameSize",lua_cocos2dx_GLView_getFrameSize); + tolua_function(tolua_S,"getFrameZoomFactor",lua_cocos2dx_GLView_getFrameZoomFactor); + tolua_function(tolua_S,"getDesignResolutionSize",lua_cocos2dx_GLView_getDesignResolutionSize); + tolua_function(tolua_S,"windowShouldClose",lua_cocos2dx_GLView_windowShouldClose); + tolua_function(tolua_S,"swapBuffers",lua_cocos2dx_GLView_swapBuffers); + tolua_function(tolua_S,"setDesignResolutionSize",lua_cocos2dx_GLView_setDesignResolutionSize); + tolua_function(tolua_S,"getResolutionPolicy",lua_cocos2dx_GLView_getResolutionPolicy); + tolua_function(tolua_S,"isRetinaDisplay",lua_cocos2dx_GLView_isRetinaDisplay); + tolua_function(tolua_S,"setViewPortInPoints",lua_cocos2dx_GLView_setViewPortInPoints); + tolua_function(tolua_S,"getScissorRect",lua_cocos2dx_GLView_getScissorRect); + tolua_function(tolua_S,"getRetinaFactor",lua_cocos2dx_GLView_getRetinaFactor); + tolua_function(tolua_S,"setViewName",lua_cocos2dx_GLView_setViewName); + tolua_function(tolua_S,"getVisibleRect",lua_cocos2dx_GLView_getVisibleRect); + tolua_function(tolua_S,"getVisibleSize",lua_cocos2dx_GLView_getVisibleSize); + tolua_function(tolua_S,"isScissorEnabled",lua_cocos2dx_GLView_isScissorEnabled); + tolua_function(tolua_S,"pollEvents",lua_cocos2dx_GLView_pollEvents); + tolua_endmodule(tolua_S); + std::string typeName = typeid(cocos2d::GLView).name(); + g_luaType[typeName] = "cc.GLView"; + g_typeCast["GLView"] = "cc.GLView"; + return 1; +} + int lua_cocos2dx_Director_pause(lua_State* tolua_S) { int argc = 0; @@ -11631,7 +13038,7 @@ int lua_cocos2dx_Director_pause(lua_State* tolua_S) cobj->pause(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pause",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:pause",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11677,7 +13084,7 @@ int lua_cocos2dx_Director_setEventDispatcher(lua_State* tolua_S) cobj->setEventDispatcher(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEventDispatcher",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:setEventDispatcher",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11723,7 +13130,7 @@ int lua_cocos2dx_Director_pushScene(lua_State* tolua_S) cobj->pushScene(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pushScene",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:pushScene",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11767,7 +13174,7 @@ int lua_cocos2dx_Director_getDeltaTime(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDeltaTime",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getDeltaTime",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11811,7 +13218,7 @@ int lua_cocos2dx_Director_getContentScaleFactor(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getContentScaleFactor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getContentScaleFactor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11855,7 +13262,7 @@ int lua_cocos2dx_Director_getWinSizeInPixels(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getWinSizeInPixels",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getWinSizeInPixels",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11899,7 +13306,7 @@ int lua_cocos2dx_Director_getConsole(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Console",(cocos2d::Console*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getConsole",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getConsole",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11939,13 +13346,13 @@ int lua_cocos2dx_Director_pushMatrix(lua_State* tolua_S) { cocos2d::MATRIX_STACK_TYPE arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Director:pushMatrix"); if(!ok) return 0; cobj->pushMatrix(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pushMatrix",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:pushMatrix",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11988,7 +13395,7 @@ int lua_cocos2dx_Director_setGLDefaultValues(lua_State* tolua_S) cobj->setGLDefaultValues(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGLDefaultValues",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:setGLDefaultValues",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12034,7 +13441,7 @@ int lua_cocos2dx_Director_setActionManager(lua_State* tolua_S) cobj->setActionManager(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setActionManager",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:setActionManager",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12074,13 +13481,13 @@ int lua_cocos2dx_Director_setAlphaBlending(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Director:setAlphaBlending"); if(!ok) return 0; cobj->setAlphaBlending(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAlphaBlending",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:setAlphaBlending",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12123,7 +13530,7 @@ int lua_cocos2dx_Director_popToRootScene(lua_State* tolua_S) cobj->popToRootScene(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "popToRootScene",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:popToRootScene",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12164,15 +13571,15 @@ int lua_cocos2dx_Director_loadMatrix(lua_State* tolua_S) cocos2d::MATRIX_STACK_TYPE arg0; cocos2d::Mat4 arg1; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Director:loadMatrix"); - ok &= luaval_to_mat4(tolua_S, 3, &arg1); + ok &= luaval_to_mat4(tolua_S, 3, &arg1, "cc.Director:loadMatrix"); if(!ok) return 0; cobj->loadMatrix(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadMatrix",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:loadMatrix",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -12216,7 +13623,7 @@ int lua_cocos2dx_Director_getNotificationNode(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNotificationNode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getNotificationNode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12260,7 +13667,7 @@ int lua_cocos2dx_Director_getWinSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getWinSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getWinSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12304,7 +13711,7 @@ int lua_cocos2dx_Director_getTextureCache(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TextureCache",(cocos2d::TextureCache*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextureCache",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getTextureCache",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12348,7 +13755,7 @@ int lua_cocos2dx_Director_isSendCleanupToScene(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isSendCleanupToScene",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:isSendCleanupToScene",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12392,7 +13799,7 @@ int lua_cocos2dx_Director_getVisibleOrigin(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVisibleOrigin",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getVisibleOrigin",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12435,7 +13842,7 @@ int lua_cocos2dx_Director_mainLoop(lua_State* tolua_S) cobj->mainLoop(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "mainLoop",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:mainLoop",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12475,13 +13882,13 @@ int lua_cocos2dx_Director_setDepthTest(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Director:setDepthTest"); if(!ok) return 0; cobj->setDepthTest(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDepthTest",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:setDepthTest",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12525,7 +13932,7 @@ int lua_cocos2dx_Director_getFrameRate(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFrameRate",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getFrameRate",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12569,7 +13976,7 @@ int lua_cocos2dx_Director_getSecondsPerFrame(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSecondsPerFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getSecondsPerFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12609,14 +14016,14 @@ int lua_cocos2dx_Director_convertToUI(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.Director:convertToUI"); if(!ok) return 0; cocos2d::Vec2 ret = cobj->convertToUI(arg0); vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "convertToUI",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:convertToUI",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12659,7 +14066,7 @@ int lua_cocos2dx_Director_setDefaultValues(lua_State* tolua_S) cobj->setDefaultValues(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDefaultValues",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:setDefaultValues",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12703,7 +14110,7 @@ int lua_cocos2dx_Director_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12749,7 +14156,7 @@ int lua_cocos2dx_Director_setScheduler(lua_State* tolua_S) cobj->setScheduler(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScheduler",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:setScheduler",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12792,7 +14199,7 @@ int lua_cocos2dx_Director_startAnimation(lua_State* tolua_S) cobj->startAnimation(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "startAnimation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:startAnimation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12836,7 +14243,7 @@ int lua_cocos2dx_Director_getOpenGLView(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.GLView",(cocos2d::GLView*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOpenGLView",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getOpenGLView",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12880,7 +14287,7 @@ int lua_cocos2dx_Director_getRunningScene(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Scene",(cocos2d::Scene*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRunningScene",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getRunningScene",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12923,7 +14330,7 @@ int lua_cocos2dx_Director_setViewport(lua_State* tolua_S) cobj->setViewport(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setViewport",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:setViewport",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12966,7 +14373,7 @@ int lua_cocos2dx_Director_stopAnimation(lua_State* tolua_S) cobj->stopAnimation(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stopAnimation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:stopAnimation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13006,13 +14413,13 @@ int lua_cocos2dx_Director_setContentScaleFactor(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Director:setContentScaleFactor"); if(!ok) return 0; cobj->setContentScaleFactor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setContentScaleFactor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:setContentScaleFactor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13052,13 +14459,13 @@ int lua_cocos2dx_Director_popToSceneStackLevel(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Director:popToSceneStackLevel"); if(!ok) return 0; cobj->popToSceneStackLevel(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "popToSceneStackLevel",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:popToSceneStackLevel",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13101,7 +14508,7 @@ int lua_cocos2dx_Director_resume(lua_State* tolua_S) cobj->resume(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resume",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:resume",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13145,7 +14552,7 @@ int lua_cocos2dx_Director_isNextDeltaTimeZero(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isNextDeltaTimeZero",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:isNextDeltaTimeZero",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13188,7 +14595,7 @@ int lua_cocos2dx_Director_end(lua_State* tolua_S) cobj->end(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "end",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:end",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13234,7 +14641,7 @@ int lua_cocos2dx_Director_setOpenGLView(lua_State* tolua_S) cobj->setOpenGLView(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOpenGLView",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:setOpenGLView",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13274,14 +14681,14 @@ int lua_cocos2dx_Director_convertToGL(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.Director:convertToGL"); if(!ok) return 0; cocos2d::Vec2 ret = cobj->convertToGL(arg0); vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "convertToGL",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:convertToGL",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13324,7 +14731,7 @@ int lua_cocos2dx_Director_purgeCachedData(lua_State* tolua_S) cobj->purgeCachedData(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "purgeCachedData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:purgeCachedData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13368,7 +14775,7 @@ int lua_cocos2dx_Director_getTotalFrames(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTotalFrames",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getTotalFrames",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13414,7 +14821,7 @@ int lua_cocos2dx_Director_runWithScene(lua_State* tolua_S) cobj->runWithScene(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "runWithScene",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:runWithScene",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13460,7 +14867,7 @@ int lua_cocos2dx_Director_setNotificationNode(lua_State* tolua_S) cobj->setNotificationNode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setNotificationNode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:setNotificationNode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13503,7 +14910,7 @@ int lua_cocos2dx_Director_drawScene(lua_State* tolua_S) cobj->drawScene(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "drawScene",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:drawScene",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13547,7 +14954,7 @@ int lua_cocos2dx_Director_getZEye(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getZEye",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getZEye",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13587,14 +14994,14 @@ int lua_cocos2dx_Director_getMatrix(lua_State* tolua_S) { cocos2d::MATRIX_STACK_TYPE arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Director:getMatrix"); if(!ok) return 0; cocos2d::Mat4 ret = cobj->getMatrix(arg0); mat4_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMatrix",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getMatrix",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13637,7 +15044,7 @@ int lua_cocos2dx_Director_popScene(lua_State* tolua_S) cobj->popScene(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "popScene",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:popScene",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13681,7 +15088,7 @@ int lua_cocos2dx_Director_isDisplayStats(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isDisplayStats",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:isDisplayStats",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13721,13 +15128,13 @@ int lua_cocos2dx_Director_setProjection(lua_State* tolua_S) { cocos2d::Director::Projection arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Director:setProjection"); if(!ok) return 0; cobj->setProjection(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setProjection",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:setProjection",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13767,13 +15174,13 @@ int lua_cocos2dx_Director_loadIdentityMatrix(lua_State* tolua_S) { cocos2d::MATRIX_STACK_TYPE arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Director:loadIdentityMatrix"); if(!ok) return 0; cobj->loadIdentityMatrix(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadIdentityMatrix",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:loadIdentityMatrix",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13813,13 +15220,13 @@ int lua_cocos2dx_Director_setNextDeltaTimeZero(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Director:setNextDeltaTimeZero"); if(!ok) return 0; cobj->setNextDeltaTimeZero(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setNextDeltaTimeZero",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:setNextDeltaTimeZero",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13862,7 +15269,7 @@ int lua_cocos2dx_Director_resetMatrixStack(lua_State* tolua_S) cobj->resetMatrixStack(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resetMatrixStack",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:resetMatrixStack",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13902,13 +15309,13 @@ int lua_cocos2dx_Director_popMatrix(lua_State* tolua_S) { cocos2d::MATRIX_STACK_TYPE arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Director:popMatrix"); if(!ok) return 0; cobj->popMatrix(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "popMatrix",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:popMatrix",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13952,7 +15359,7 @@ int lua_cocos2dx_Director_getVisibleSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVisibleSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getVisibleSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13996,7 +15403,7 @@ int lua_cocos2dx_Director_getScheduler(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Scheduler",(cocos2d::Scheduler*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScheduler",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getScheduler",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14036,13 +15443,13 @@ int lua_cocos2dx_Director_setAnimationInterval(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Director:setAnimationInterval"); if(!ok) return 0; cobj->setAnimationInterval(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAnimationInterval",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:setAnimationInterval",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14086,7 +15493,7 @@ int lua_cocos2dx_Director_getAnimationInterval(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnimationInterval",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getAnimationInterval",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14130,7 +15537,7 @@ int lua_cocos2dx_Director_isPaused(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isPaused",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:isPaused",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14170,13 +15577,13 @@ int lua_cocos2dx_Director_setDisplayStats(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Director:setDisplayStats"); if(!ok) return 0; cobj->setDisplayStats(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDisplayStats",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:setDisplayStats",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14220,7 +15627,7 @@ int lua_cocos2dx_Director_getEventDispatcher(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EventDispatcher",(cocos2d::EventDispatcher*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEventDispatcher",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getEventDispatcher",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14266,7 +15673,7 @@ int lua_cocos2dx_Director_replaceScene(lua_State* tolua_S) cobj->replaceScene(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "replaceScene",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:replaceScene",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14307,15 +15714,15 @@ int lua_cocos2dx_Director_multiplyMatrix(lua_State* tolua_S) cocos2d::MATRIX_STACK_TYPE arg0; cocos2d::Mat4 arg1; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Director:multiplyMatrix"); - ok &= luaval_to_mat4(tolua_S, 3, &arg1); + ok &= luaval_to_mat4(tolua_S, 3, &arg1, "cc.Director:multiplyMatrix"); if(!ok) return 0; cobj->multiplyMatrix(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "multiplyMatrix",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:multiplyMatrix",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -14359,7 +15766,7 @@ int lua_cocos2dx_Director_getActionManager(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionManager",(cocos2d::ActionManager*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getActionManager",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getActionManager",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14392,7 +15799,7 @@ int lua_cocos2dx_Director_getInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Director",(cocos2d::Director*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Director:getInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -14516,7 +15923,7 @@ int lua_cocos2dx_Timer_getInterval(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getInterval",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Timer:getInterval",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14558,17 +15965,17 @@ int lua_cocos2dx_Timer_setupTimerWithInterval(lua_State* tolua_S) unsigned int arg1; double arg2; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Timer:setupTimerWithInterval"); - ok &= luaval_to_uint32(tolua_S, 3,&arg1); + ok &= luaval_to_uint32(tolua_S, 3,&arg1, "cc.Timer:setupTimerWithInterval"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Timer:setupTimerWithInterval"); if(!ok) return 0; cobj->setupTimerWithInterval(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setupTimerWithInterval",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Timer:setupTimerWithInterval",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -14608,13 +16015,13 @@ int lua_cocos2dx_Timer_setInterval(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Timer:setInterval"); if(!ok) return 0; cobj->setInterval(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setInterval",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Timer:setInterval",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14654,13 +16061,13 @@ int lua_cocos2dx_Timer_update(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Timer:update"); if(!ok) return 0; cobj->update(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "update",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Timer:update",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14703,7 +16110,7 @@ int lua_cocos2dx_Timer_trigger(lua_State* tolua_S) cobj->trigger(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "trigger",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Timer:trigger",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14746,7 +16153,7 @@ int lua_cocos2dx_Timer_cancel(lua_State* tolua_S) cobj->cancel(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cancel",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Timer:cancel",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14811,13 +16218,13 @@ int lua_cocos2dx_Scheduler_setTimeScale(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Scheduler:setTimeScale"); if(!ok) return 0; cobj->setTimeScale(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTimeScale",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scheduler:setTimeScale",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14861,7 +16268,7 @@ int lua_cocos2dx_Scheduler_getTimeScale(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTimeScale",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scheduler:getTimeScale",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14895,7 +16302,7 @@ int lua_cocos2dx_Scheduler_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.Scheduler"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "Scheduler",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scheduler:Scheduler",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14957,14 +16364,14 @@ int lua_cocos2dx_FileUtils_fullPathForFilename(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:fullPathForFilename"); if(!ok) return 0; std::string ret = cobj->fullPathForFilename(arg0); tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "fullPathForFilename",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:fullPathForFilename",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15004,14 +16411,14 @@ int lua_cocos2dx_FileUtils_getStringFromFile(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:getStringFromFile"); if(!ok) return 0; std::string ret = cobj->getStringFromFile(arg0); tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStringFromFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:getStringFromFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15051,13 +16458,13 @@ int lua_cocos2dx_FileUtils_setFilenameLookupDictionary(lua_State* tolua_S) { cocos2d::ValueMap arg0; - ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0); + ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0, "cc.FileUtils:setFilenameLookupDictionary"); if(!ok) return 0; cobj->setFilenameLookupDictionary(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFilenameLookupDictionary",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:setFilenameLookupDictionary",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15067,6 +16474,53 @@ int lua_cocos2dx_FileUtils_setFilenameLookupDictionary(lua_State* tolua_S) return 0; } +int lua_cocos2dx_FileUtils_removeFile(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::FileUtils* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.FileUtils",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::FileUtils*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FileUtils_removeFile'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + std::string arg0; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:removeFile"); + if(!ok) + return 0; + bool ret = cobj->removeFile(arg0); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:removeFile",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FileUtils_removeFile'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_FileUtils_isAbsolutePath(lua_State* tolua_S) { int argc = 0; @@ -15097,14 +16551,14 @@ int lua_cocos2dx_FileUtils_isAbsolutePath(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:isAbsolutePath"); if(!ok) return 0; bool ret = cobj->isAbsolutePath(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isAbsolutePath",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:isAbsolutePath",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15114,6 +16568,59 @@ int lua_cocos2dx_FileUtils_isAbsolutePath(lua_State* tolua_S) return 0; } +int lua_cocos2dx_FileUtils_renameFile(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::FileUtils* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.FileUtils",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::FileUtils*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FileUtils_renameFile'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 3) + { + std::string arg0; + std::string arg1; + std::string arg2; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:renameFile"); + + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.FileUtils:renameFile"); + + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "cc.FileUtils:renameFile"); + if(!ok) + return 0; + bool ret = cobj->renameFile(arg0, arg1, arg2); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:renameFile",argc, 3); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FileUtils_renameFile'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_FileUtils_loadFilenameLookupDictionaryFromFile(lua_State* tolua_S) { int argc = 0; @@ -15144,13 +16651,13 @@ int lua_cocos2dx_FileUtils_loadFilenameLookupDictionaryFromFile(lua_State* tolua { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:loadFilenameLookupDictionaryFromFile"); if(!ok) return 0; cobj->loadFilenameLookupDictionaryFromFile(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadFilenameLookupDictionaryFromFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:loadFilenameLookupDictionaryFromFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15194,7 +16701,7 @@ int lua_cocos2dx_FileUtils_isPopupNotify(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isPopupNotify",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:isPopupNotify",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15234,14 +16741,14 @@ int lua_cocos2dx_FileUtils_getValueVectorFromFile(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:getValueVectorFromFile"); if(!ok) return 0; cocos2d::ValueVector ret = cobj->getValueVectorFromFile(arg0); ccvaluevector_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getValueVectorFromFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:getValueVectorFromFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15285,7 +16792,7 @@ int lua_cocos2dx_FileUtils_getSearchPaths(lua_State* tolua_S) ccvector_std_string_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSearchPaths",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:getSearchPaths",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15326,16 +16833,16 @@ int lua_cocos2dx_FileUtils_writeToFile(lua_State* tolua_S) cocos2d::ValueMap arg0; std::string arg1; - ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0); + ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0, "cc.FileUtils:writeToFile"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.FileUtils:writeToFile"); if(!ok) return 0; bool ret = cobj->writeToFile(arg0, arg1); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "writeToFile",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:writeToFile",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -15375,14 +16882,14 @@ int lua_cocos2dx_FileUtils_getValueMapFromFile(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:getValueMapFromFile"); if(!ok) return 0; cocos2d::ValueMap ret = cobj->getValueMapFromFile(arg0); ccvaluemap_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getValueMapFromFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:getValueMapFromFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15392,6 +16899,53 @@ int lua_cocos2dx_FileUtils_getValueMapFromFile(lua_State* tolua_S) return 0; } +int lua_cocos2dx_FileUtils_removeDirectory(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::FileUtils* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.FileUtils",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::FileUtils*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FileUtils_removeDirectory'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + std::string arg0; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:removeDirectory"); + if(!ok) + return 0; + bool ret = cobj->removeDirectory(arg0); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:removeDirectory",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FileUtils_removeDirectory'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_FileUtils_setSearchPaths(lua_State* tolua_S) { int argc = 0; @@ -15422,13 +16976,13 @@ int lua_cocos2dx_FileUtils_setSearchPaths(lua_State* tolua_S) { std::vector arg0; - ok &= luaval_to_std_vector_string(tolua_S, 2, &arg0); + ok &= luaval_to_std_vector_string(tolua_S, 2, &arg0, "cc.FileUtils:setSearchPaths"); if(!ok) return 0; cobj->setSearchPaths(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSearchPaths",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:setSearchPaths",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15438,6 +16992,53 @@ int lua_cocos2dx_FileUtils_setSearchPaths(lua_State* tolua_S) return 0; } +int lua_cocos2dx_FileUtils_getFileSize(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::FileUtils* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.FileUtils",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::FileUtils*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FileUtils_getFileSize'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + std::string arg0; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:getFileSize"); + if(!ok) + return 0; + long ret = cobj->getFileSize(arg0); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:getFileSize",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FileUtils_getFileSize'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_FileUtils_setSearchResolutionsOrder(lua_State* tolua_S) { int argc = 0; @@ -15468,13 +17069,13 @@ int lua_cocos2dx_FileUtils_setSearchResolutionsOrder(lua_State* tolua_S) { std::vector arg0; - ok &= luaval_to_std_vector_string(tolua_S, 2, &arg0); + ok &= luaval_to_std_vector_string(tolua_S, 2, &arg0, "cc.FileUtils:setSearchResolutionsOrder"); if(!ok) return 0; cobj->setSearchResolutionsOrder(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSearchResolutionsOrder",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:setSearchResolutionsOrder",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15514,13 +17115,26 @@ int lua_cocos2dx_FileUtils_addSearchResolutionsOrder(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:addSearchResolutionsOrder"); if(!ok) return 0; cobj->addSearchResolutionsOrder(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addSearchResolutionsOrder",argc, 1); + if (argc == 2) + { + std::string arg0; + bool arg1; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:addSearchResolutionsOrder"); + + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.FileUtils:addSearchResolutionsOrder"); + if(!ok) + return 0; + cobj->addSearchResolutionsOrder(arg0, arg1); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:addSearchResolutionsOrder",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15560,13 +17174,26 @@ int lua_cocos2dx_FileUtils_addSearchPath(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:addSearchPath"); if(!ok) return 0; cobj->addSearchPath(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addSearchPath",argc, 1); + if (argc == 2) + { + std::string arg0; + bool arg1; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:addSearchPath"); + + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.FileUtils:addSearchPath"); + if(!ok) + return 0; + cobj->addSearchPath(arg0, arg1); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:addSearchPath",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15606,14 +17233,14 @@ int lua_cocos2dx_FileUtils_isFileExist(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:isFileExist"); if(!ok) return 0; bool ret = cobj->isFileExist(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isFileExist",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:isFileExist",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15656,7 +17283,7 @@ int lua_cocos2dx_FileUtils_purgeCachedEntries(lua_State* tolua_S) cobj->purgeCachedEntries(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "purgeCachedEntries",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:purgeCachedEntries",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15697,16 +17324,16 @@ int lua_cocos2dx_FileUtils_fullPathFromRelativeFile(lua_State* tolua_S) std::string arg0; std::string arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:fullPathFromRelativeFile"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.FileUtils:fullPathFromRelativeFile"); if(!ok) return 0; std::string ret = cobj->fullPathFromRelativeFile(arg0, arg1); tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "fullPathFromRelativeFile",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:fullPathFromRelativeFile",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -15746,13 +17373,13 @@ int lua_cocos2dx_FileUtils_setPopupNotify(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.FileUtils:setPopupNotify"); if(!ok) return 0; cobj->setPopupNotify(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPopupNotify",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:setPopupNotify",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15762,6 +17389,53 @@ int lua_cocos2dx_FileUtils_setPopupNotify(lua_State* tolua_S) return 0; } +int lua_cocos2dx_FileUtils_isDirectoryExist(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::FileUtils* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.FileUtils",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::FileUtils*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FileUtils_isDirectoryExist'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + std::string arg0; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:isDirectoryExist"); + if(!ok) + return 0; + bool ret = cobj->isDirectoryExist(arg0); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:isDirectoryExist",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FileUtils_isDirectoryExist'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_FileUtils_getSearchResolutionsOrder(lua_State* tolua_S) { int argc = 0; @@ -15796,7 +17470,7 @@ int lua_cocos2dx_FileUtils_getSearchResolutionsOrder(lua_State* tolua_S) ccvector_std_string_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSearchResolutionsOrder",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:getSearchResolutionsOrder",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15806,6 +17480,53 @@ int lua_cocos2dx_FileUtils_getSearchResolutionsOrder(lua_State* tolua_S) return 0; } +int lua_cocos2dx_FileUtils_createDirectory(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::FileUtils* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.FileUtils",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::FileUtils*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FileUtils_createDirectory'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + std::string arg0; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:createDirectory"); + if(!ok) + return 0; + bool ret = cobj->createDirectory(arg0); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:createDirectory",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FileUtils_createDirectory'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_FileUtils_getWritablePath(lua_State* tolua_S) { int argc = 0; @@ -15840,7 +17561,7 @@ int lua_cocos2dx_FileUtils_getWritablePath(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getWritablePath",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:getWritablePath",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15872,7 +17593,7 @@ int lua_cocos2dx_FileUtils_destroyInstance(lua_State* tolua_S) cocos2d::FileUtils::destroyInstance(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "destroyInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FileUtils:destroyInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -15903,7 +17624,7 @@ int lua_cocos2dx_FileUtils_getInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.FileUtils",(cocos2d::FileUtils*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FileUtils:getInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -15926,14 +17647,18 @@ int lua_register_cocos2dx_FileUtils(lua_State* tolua_S) tolua_function(tolua_S,"fullPathForFilename",lua_cocos2dx_FileUtils_fullPathForFilename); tolua_function(tolua_S,"getStringFromFile",lua_cocos2dx_FileUtils_getStringFromFile); tolua_function(tolua_S,"setFilenameLookupDictionary",lua_cocos2dx_FileUtils_setFilenameLookupDictionary); + tolua_function(tolua_S,"removeFile",lua_cocos2dx_FileUtils_removeFile); tolua_function(tolua_S,"isAbsolutePath",lua_cocos2dx_FileUtils_isAbsolutePath); + tolua_function(tolua_S,"renameFile",lua_cocos2dx_FileUtils_renameFile); tolua_function(tolua_S,"loadFilenameLookup",lua_cocos2dx_FileUtils_loadFilenameLookupDictionaryFromFile); tolua_function(tolua_S,"isPopupNotify",lua_cocos2dx_FileUtils_isPopupNotify); tolua_function(tolua_S,"getValueVectorFromFile",lua_cocos2dx_FileUtils_getValueVectorFromFile); tolua_function(tolua_S,"getSearchPaths",lua_cocos2dx_FileUtils_getSearchPaths); tolua_function(tolua_S,"writeToFile",lua_cocos2dx_FileUtils_writeToFile); tolua_function(tolua_S,"getValueMapFromFile",lua_cocos2dx_FileUtils_getValueMapFromFile); + tolua_function(tolua_S,"removeDirectory",lua_cocos2dx_FileUtils_removeDirectory); tolua_function(tolua_S,"setSearchPaths",lua_cocos2dx_FileUtils_setSearchPaths); + tolua_function(tolua_S,"getFileSize",lua_cocos2dx_FileUtils_getFileSize); tolua_function(tolua_S,"setSearchResolutionsOrder",lua_cocos2dx_FileUtils_setSearchResolutionsOrder); tolua_function(tolua_S,"addSearchResolutionsOrder",lua_cocos2dx_FileUtils_addSearchResolutionsOrder); tolua_function(tolua_S,"addSearchPath",lua_cocos2dx_FileUtils_addSearchPath); @@ -15941,7 +17666,9 @@ int lua_register_cocos2dx_FileUtils(lua_State* tolua_S) tolua_function(tolua_S,"purgeCachedEntries",lua_cocos2dx_FileUtils_purgeCachedEntries); tolua_function(tolua_S,"fullPathFromRelativeFile",lua_cocos2dx_FileUtils_fullPathFromRelativeFile); tolua_function(tolua_S,"setPopupNotify",lua_cocos2dx_FileUtils_setPopupNotify); + tolua_function(tolua_S,"isDirectoryExist",lua_cocos2dx_FileUtils_isDirectoryExist); tolua_function(tolua_S,"getSearchResolutionsOrder",lua_cocos2dx_FileUtils_getSearchResolutionsOrder); + tolua_function(tolua_S,"createDirectory",lua_cocos2dx_FileUtils_createDirectory); tolua_function(tolua_S,"getWritablePath",lua_cocos2dx_FileUtils_getWritablePath); tolua_function(tolua_S,"destroyInstance", lua_cocos2dx_FileUtils_destroyInstance); tolua_function(tolua_S,"getInstance", lua_cocos2dx_FileUtils_getInstance); @@ -15983,15 +17710,15 @@ int lua_cocos2dx_UserDefault_setIntegerForKey(lua_State* tolua_S) const char* arg0; int arg1; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:setIntegerForKey"); arg0 = arg0_tmp.c_str(); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.UserDefault:setIntegerForKey"); if(!ok) return 0; cobj->setIntegerForKey(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setIntegerForKey",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.UserDefault:setIntegerForKey",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -16025,11 +17752,11 @@ int lua_cocos2dx_UserDefault_getFloatForKey(lua_State* tolua_S) do{ if (argc == 2) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:getFloatForKey"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.UserDefault:getFloatForKey"); if (!ok) { break; } double ret = cobj->getFloatForKey(arg0, arg1); @@ -16041,7 +17768,7 @@ int lua_cocos2dx_UserDefault_getFloatForKey(lua_State* tolua_S) do{ if (argc == 1) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:getFloatForKey"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } double ret = cobj->getFloatForKey(arg0); @@ -16050,7 +17777,7 @@ int lua_cocos2dx_UserDefault_getFloatForKey(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFloatForKey",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.UserDefault:getFloatForKey",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16084,11 +17811,11 @@ int lua_cocos2dx_UserDefault_getBoolForKey(lua_State* tolua_S) do{ if (argc == 2) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:getBoolForKey"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } bool arg1; - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.UserDefault:getBoolForKey"); if (!ok) { break; } bool ret = cobj->getBoolForKey(arg0, arg1); @@ -16100,7 +17827,7 @@ int lua_cocos2dx_UserDefault_getBoolForKey(lua_State* tolua_S) do{ if (argc == 1) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:getBoolForKey"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } bool ret = cobj->getBoolForKey(arg0); @@ -16109,7 +17836,7 @@ int lua_cocos2dx_UserDefault_getBoolForKey(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBoolForKey",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.UserDefault:getBoolForKey",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16150,15 +17877,15 @@ int lua_cocos2dx_UserDefault_setDoubleForKey(lua_State* tolua_S) const char* arg0; double arg1; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:setDoubleForKey"); arg0 = arg0_tmp.c_str(); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.UserDefault:setDoubleForKey"); if(!ok) return 0; cobj->setDoubleForKey(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDoubleForKey",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.UserDefault:setDoubleForKey",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -16199,15 +17926,15 @@ int lua_cocos2dx_UserDefault_setFloatForKey(lua_State* tolua_S) const char* arg0; double arg1; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:setFloatForKey"); arg0 = arg0_tmp.c_str(); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.UserDefault:setFloatForKey"); if(!ok) return 0; cobj->setFloatForKey(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFloatForKey",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.UserDefault:setFloatForKey",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -16241,11 +17968,11 @@ int lua_cocos2dx_UserDefault_getStringForKey(lua_State* tolua_S) do{ if (argc == 2) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:getStringForKey"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.UserDefault:getStringForKey"); if (!ok) { break; } std::string ret = cobj->getStringForKey(arg0, arg1); @@ -16257,7 +17984,7 @@ int lua_cocos2dx_UserDefault_getStringForKey(lua_State* tolua_S) do{ if (argc == 1) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:getStringForKey"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } std::string ret = cobj->getStringForKey(arg0); @@ -16266,7 +17993,7 @@ int lua_cocos2dx_UserDefault_getStringForKey(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStringForKey",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.UserDefault:getStringForKey",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16307,15 +18034,15 @@ int lua_cocos2dx_UserDefault_setStringForKey(lua_State* tolua_S) const char* arg0; std::string arg1; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:setStringForKey"); arg0 = arg0_tmp.c_str(); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.UserDefault:setStringForKey"); if(!ok) return 0; cobj->setStringForKey(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStringForKey",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.UserDefault:setStringForKey",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -16358,7 +18085,7 @@ int lua_cocos2dx_UserDefault_flush(lua_State* tolua_S) cobj->flush(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "flush",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.UserDefault:flush",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16392,11 +18119,11 @@ int lua_cocos2dx_UserDefault_getIntegerForKey(lua_State* tolua_S) do{ if (argc == 2) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:getIntegerForKey"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.UserDefault:getIntegerForKey"); if (!ok) { break; } int ret = cobj->getIntegerForKey(arg0, arg1); @@ -16408,7 +18135,7 @@ int lua_cocos2dx_UserDefault_getIntegerForKey(lua_State* tolua_S) do{ if (argc == 1) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:getIntegerForKey"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } int ret = cobj->getIntegerForKey(arg0); @@ -16417,7 +18144,7 @@ int lua_cocos2dx_UserDefault_getIntegerForKey(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getIntegerForKey",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.UserDefault:getIntegerForKey",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16451,11 +18178,11 @@ int lua_cocos2dx_UserDefault_getDoubleForKey(lua_State* tolua_S) do{ if (argc == 2) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:getDoubleForKey"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.UserDefault:getDoubleForKey"); if (!ok) { break; } double ret = cobj->getDoubleForKey(arg0, arg1); @@ -16467,7 +18194,7 @@ int lua_cocos2dx_UserDefault_getDoubleForKey(lua_State* tolua_S) do{ if (argc == 1) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:getDoubleForKey"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } double ret = cobj->getDoubleForKey(arg0); @@ -16476,7 +18203,7 @@ int lua_cocos2dx_UserDefault_getDoubleForKey(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDoubleForKey",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.UserDefault:getDoubleForKey",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16517,15 +18244,15 @@ int lua_cocos2dx_UserDefault_setBoolForKey(lua_State* tolua_S) const char* arg0; bool arg1; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:setBoolForKey"); arg0 = arg0_tmp.c_str(); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.UserDefault:setBoolForKey"); if(!ok) return 0; cobj->setBoolForKey(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBoolForKey",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.UserDefault:setBoolForKey",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -16557,7 +18284,7 @@ int lua_cocos2dx_UserDefault_destroyInstance(lua_State* tolua_S) cocos2d::UserDefault::destroyInstance(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "destroyInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.UserDefault:destroyInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -16588,7 +18315,7 @@ int lua_cocos2dx_UserDefault_getXMLFilePath(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getXMLFilePath",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.UserDefault:getXMLFilePath",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -16619,7 +18346,7 @@ int lua_cocos2dx_UserDefault_isXMLFileExist(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "isXMLFileExist",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.UserDefault:isXMLFileExist",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -16694,7 +18421,7 @@ int lua_cocos2dx_EventListenerTouchOneByOne_isSwallowTouches(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isSwallowTouches",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventListenerTouchOneByOne:isSwallowTouches",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16734,13 +18461,13 @@ int lua_cocos2dx_EventListenerTouchOneByOne_setSwallowTouches(lua_State* tolua_S { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.EventListenerTouchOneByOne:setSwallowTouches"); if(!ok) return 0; cobj->setSwallowTouches(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSwallowTouches",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventListenerTouchOneByOne:setSwallowTouches",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16843,7 +18570,7 @@ int lua_cocos2dx_EventMouse_getMouseButton(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMouseButton",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventMouse:getMouseButton",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16884,15 +18611,15 @@ int lua_cocos2dx_EventMouse_setScrollData(lua_State* tolua_S) double arg0; double arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.EventMouse:setScrollData"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.EventMouse:setScrollData"); if(!ok) return 0; cobj->setScrollData(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScrollData",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventMouse:setScrollData",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -16932,13 +18659,13 @@ int lua_cocos2dx_EventMouse_setMouseButton(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.EventMouse:setMouseButton"); if(!ok) return 0; cobj->setMouseButton(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMouseButton",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventMouse:setMouseButton",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16982,7 +18709,7 @@ int lua_cocos2dx_EventMouse_getScrollY(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScrollY",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventMouse:getScrollY",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17026,7 +18753,7 @@ int lua_cocos2dx_EventMouse_getScrollX(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScrollX",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventMouse:getScrollX",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17070,7 +18797,7 @@ int lua_cocos2dx_EventMouse_getCursorX(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCursorX",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventMouse:getCursorX",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17114,7 +18841,7 @@ int lua_cocos2dx_EventMouse_getCursorY(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCursorY",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventMouse:getCursorY",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17155,15 +18882,15 @@ int lua_cocos2dx_EventMouse_setCursorPosition(lua_State* tolua_S) double arg0; double arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.EventMouse:setCursorPosition"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.EventMouse:setCursorPosition"); if(!ok) return 0; cobj->setCursorPosition(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCursorPosition",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventMouse:setCursorPosition",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -17190,7 +18917,7 @@ int lua_cocos2dx_EventMouse_constructor(lua_State* tolua_S) { cocos2d::EventMouse::MouseEventType arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.EventMouse:EventMouse"); if(!ok) return 0; cobj = new cocos2d::EventMouse(arg0); @@ -17200,7 +18927,7 @@ int lua_cocos2dx_EventMouse_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.EventMouse"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "EventMouse",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventMouse:EventMouse",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -17329,7 +19056,7 @@ int lua_cocos2dx_EventCustom_getEventName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEventName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventCustom:getEventName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17356,7 +19083,7 @@ int lua_cocos2dx_EventCustom_constructor(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.EventCustom:EventCustom"); if(!ok) return 0; cobj = new cocos2d::EventCustom(arg0); @@ -17366,7 +19093,7 @@ int lua_cocos2dx_EventCustom_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.EventCustom"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "EventCustom",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventCustom:EventCustom",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -17446,7 +19173,7 @@ int lua_cocos2dx_EventFocus_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.EventFocus"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "EventFocus",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventFocus:EventFocus",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -17531,7 +19258,7 @@ int lua_cocos2dx_Action_startWithTarget(lua_State* tolua_S) cobj->startWithTarget(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "startWithTarget",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Action:startWithTarget",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -17577,7 +19304,7 @@ int lua_cocos2dx_Action_setOriginalTarget(lua_State* tolua_S) cobj->setOriginalTarget(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOriginalTarget",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Action:setOriginalTarget",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -17621,7 +19348,7 @@ int lua_cocos2dx_Action_clone(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Action",(cocos2d::Action*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "clone",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Action:clone",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17665,7 +19392,7 @@ int lua_cocos2dx_Action_getOriginalTarget(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOriginalTarget",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Action:getOriginalTarget",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17708,7 +19435,7 @@ int lua_cocos2dx_Action_stop(lua_State* tolua_S) cobj->stop(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stop",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Action:stop",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17748,13 +19475,13 @@ int lua_cocos2dx_Action_update(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Action:update"); if(!ok) return 0; cobj->update(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "update",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Action:update",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -17798,7 +19525,7 @@ int lua_cocos2dx_Action_getTarget(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTarget",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Action:getTarget",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17838,13 +19565,13 @@ int lua_cocos2dx_Action_step(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Action:step"); if(!ok) return 0; cobj->step(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "step",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Action:step",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -17884,13 +19611,13 @@ int lua_cocos2dx_Action_setTag(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Action:setTag"); if(!ok) return 0; cobj->setTag(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Action:setTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -17934,7 +19661,7 @@ int lua_cocos2dx_Action_getTag(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTag",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Action:getTag",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17980,7 +19707,7 @@ int lua_cocos2dx_Action_setTarget(lua_State* tolua_S) cobj->setTarget(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTarget",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Action:setTarget",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -18024,7 +19751,7 @@ int lua_cocos2dx_Action_isDone(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isDone",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Action:isDone",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18068,7 +19795,7 @@ int lua_cocos2dx_Action_reverse(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Action",(cocos2d::Action*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "reverse",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Action:reverse",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18140,13 +19867,13 @@ int lua_cocos2dx_FiniteTimeAction_setDuration(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.FiniteTimeAction:setDuration"); if(!ok) return 0; cobj->setDuration(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDuration",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FiniteTimeAction:setDuration",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -18190,7 +19917,7 @@ int lua_cocos2dx_FiniteTimeAction_getDuration(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDuration",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FiniteTimeAction:getDuration",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18257,7 +19984,7 @@ int lua_cocos2dx_Speed_setInnerAction(lua_State* tolua_S) cobj->setInnerAction(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setInnerAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Speed:setInnerAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -18297,13 +20024,13 @@ int lua_cocos2dx_Speed_setSpeed(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Speed:setSpeed"); if(!ok) return 0; cobj->setSpeed(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSpeed",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Speed:setSpeed",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -18347,7 +20074,7 @@ int lua_cocos2dx_Speed_getInnerAction(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getInnerAction",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Speed:getInnerAction",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18391,7 +20118,7 @@ int lua_cocos2dx_Speed_getSpeed(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSpeed",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Speed:getSpeed",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18421,14 +20148,14 @@ int lua_cocos2dx_Speed_create(lua_State* tolua_S) cocos2d::ActionInterval* arg0; double arg1; ok &= luaval_to_object(tolua_S, 2, "cc.ActionInterval",&arg0); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.Speed:create"); if(!ok) return 0; cocos2d::Speed* ret = cocos2d::Speed::create(arg0, arg1); object_to_luaval(tolua_S, "cc.Speed",(cocos2d::Speed*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Speed:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -18490,13 +20217,13 @@ int lua_cocos2dx_Follow_setBoudarySet(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Follow:setBoudarySet"); if(!ok) return 0; cobj->setBoudarySet(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBoudarySet",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Follow:setBoudarySet",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -18540,7 +20267,7 @@ int lua_cocos2dx_Follow_isBoundarySet(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isBoundarySet",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Follow:isBoundarySet",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18580,14 +20307,14 @@ int lua_cocos2dx_Follow_create(lua_State* tolua_S) cocos2d::Node* arg0; cocos2d::Rect arg1; ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Follow:create"); if(!ok) return 0; cocos2d::Follow* ret = cocos2d::Follow::create(arg0, arg1); object_to_luaval(tolua_S, "cc.Follow",(cocos2d::Follow*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Follow:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -18651,7 +20378,7 @@ int lua_cocos2dx_SpriteFrame_clone(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.SpriteFrame",(cocos2d::SpriteFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "clone",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:clone",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18691,13 +20418,13 @@ int lua_cocos2dx_SpriteFrame_setRotated(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.SpriteFrame:setRotated"); if(!ok) return 0; cobj->setRotated(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRotated",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:setRotated",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -18743,7 +20470,7 @@ int lua_cocos2dx_SpriteFrame_setTexture(lua_State* tolua_S) cobj->setTexture(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:setTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -18787,7 +20514,7 @@ int lua_cocos2dx_SpriteFrame_getOffset(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOffset",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:getOffset",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18827,13 +20554,13 @@ int lua_cocos2dx_SpriteFrame_setRectInPixels(lua_State* tolua_S) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "cc.SpriteFrame:setRectInPixels"); if(!ok) return 0; cobj->setRectInPixels(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRectInPixels",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:setRectInPixels",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -18877,7 +20604,7 @@ int lua_cocos2dx_SpriteFrame_getTexture(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Texture2D",(cocos2d::Texture2D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTexture",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:getTexture",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18921,7 +20648,7 @@ int lua_cocos2dx_SpriteFrame_getRect(lua_State* tolua_S) rect_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRect",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:getRect",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18961,13 +20688,13 @@ int lua_cocos2dx_SpriteFrame_setOffsetInPixels(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.SpriteFrame:setOffsetInPixels"); if(!ok) return 0; cobj->setOffsetInPixels(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOffsetInPixels",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:setOffsetInPixels",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -19011,7 +20738,7 @@ int lua_cocos2dx_SpriteFrame_getRectInPixels(lua_State* tolua_S) rect_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRectInPixels",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:getRectInPixels",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19051,13 +20778,13 @@ int lua_cocos2dx_SpriteFrame_setOriginalSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.SpriteFrame:setOriginalSize"); if(!ok) return 0; cobj->setOriginalSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOriginalSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:setOriginalSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -19101,7 +20828,7 @@ int lua_cocos2dx_SpriteFrame_getOriginalSizeInPixels(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOriginalSizeInPixels",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:getOriginalSizeInPixels",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19141,13 +20868,13 @@ int lua_cocos2dx_SpriteFrame_setOriginalSizeInPixels(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.SpriteFrame:setOriginalSizeInPixels"); if(!ok) return 0; cobj->setOriginalSizeInPixels(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOriginalSizeInPixels",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:setOriginalSizeInPixels",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -19187,13 +20914,13 @@ int lua_cocos2dx_SpriteFrame_setOffset(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.SpriteFrame:setOffset"); if(!ok) return 0; cobj->setOffset(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOffset",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:setOffset",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -19237,7 +20964,7 @@ int lua_cocos2dx_SpriteFrame_isRotated(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isRotated",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:isRotated",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19277,13 +21004,13 @@ int lua_cocos2dx_SpriteFrame_setRect(lua_State* tolua_S) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "cc.SpriteFrame:setRect"); if(!ok) return 0; cobj->setRect(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRect",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:setRect",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -19327,7 +21054,7 @@ int lua_cocos2dx_SpriteFrame_getOffsetInPixels(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOffsetInPixels",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:getOffsetInPixels",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19371,7 +21098,7 @@ int lua_cocos2dx_SpriteFrame_getOriginalSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOriginalSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:getOriginalSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19400,19 +21127,19 @@ int lua_cocos2dx_SpriteFrame_create(lua_State* tolua_S) if (argc == 5) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrame:create"); if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.SpriteFrame:create"); if (!ok) { break; } bool arg2; - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.SpriteFrame:create"); if (!ok) { break; } cocos2d::Vec2 arg3; - ok &= luaval_to_vec2(tolua_S, 5, &arg3); + ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.SpriteFrame:create"); if (!ok) { break; } cocos2d::Size arg4; - ok &= luaval_to_size(tolua_S, 6, &arg4); + ok &= luaval_to_size(tolua_S, 6, &arg4, "cc.SpriteFrame:create"); if (!ok) { break; } cocos2d::SpriteFrame* ret = cocos2d::SpriteFrame::create(arg0, arg1, arg2, arg3, arg4); object_to_luaval(tolua_S, "cc.SpriteFrame",(cocos2d::SpriteFrame*)ret); @@ -19425,10 +21152,10 @@ int lua_cocos2dx_SpriteFrame_create(lua_State* tolua_S) if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrame:create"); if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.SpriteFrame:create"); if (!ok) { break; } cocos2d::SpriteFrame* ret = cocos2d::SpriteFrame::create(arg0, arg1); object_to_luaval(tolua_S, "cc.SpriteFrame",(cocos2d::SpriteFrame*)ret); @@ -19436,7 +21163,7 @@ int lua_cocos2dx_SpriteFrame_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.SpriteFrame:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -19466,16 +21193,16 @@ int lua_cocos2dx_SpriteFrame_createWithTexture(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Texture2D",&arg0); if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.SpriteFrame:createWithTexture"); if (!ok) { break; } bool arg2; - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.SpriteFrame:createWithTexture"); if (!ok) { break; } cocos2d::Vec2 arg3; - ok &= luaval_to_vec2(tolua_S, 5, &arg3); + ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.SpriteFrame:createWithTexture"); if (!ok) { break; } cocos2d::Size arg4; - ok &= luaval_to_size(tolua_S, 6, &arg4); + ok &= luaval_to_size(tolua_S, 6, &arg4, "cc.SpriteFrame:createWithTexture"); if (!ok) { break; } cocos2d::SpriteFrame* ret = cocos2d::SpriteFrame::createWithTexture(arg0, arg1, arg2, arg3, arg4); object_to_luaval(tolua_S, "cc.SpriteFrame",(cocos2d::SpriteFrame*)ret); @@ -19491,7 +21218,7 @@ int lua_cocos2dx_SpriteFrame_createWithTexture(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Texture2D",&arg0); if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.SpriteFrame:createWithTexture"); if (!ok) { break; } cocos2d::SpriteFrame* ret = cocos2d::SpriteFrame::createWithTexture(arg0, arg1); object_to_luaval(tolua_S, "cc.SpriteFrame",(cocos2d::SpriteFrame*)ret); @@ -19499,7 +21226,7 @@ int lua_cocos2dx_SpriteFrame_createWithTexture(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "createWithTexture",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.SpriteFrame:createWithTexture",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -19581,7 +21308,7 @@ int lua_cocos2dx_AnimationFrame_setSpriteFrame(lua_State* tolua_S) cobj->setSpriteFrame(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSpriteFrame",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AnimationFrame:setSpriteFrame",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -19628,7 +21355,7 @@ int lua_cocos2dx_AnimationFrame_getUserInfo(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getUserInfo",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AnimationFrame:getUserInfo",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19668,13 +21395,13 @@ int lua_cocos2dx_AnimationFrame_setDelayUnits(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.AnimationFrame:setDelayUnits"); if(!ok) return 0; cobj->setDelayUnits(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDelayUnits",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AnimationFrame:setDelayUnits",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -19718,7 +21445,7 @@ int lua_cocos2dx_AnimationFrame_clone(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.AnimationFrame",(cocos2d::AnimationFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "clone",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AnimationFrame:clone",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19762,7 +21489,7 @@ int lua_cocos2dx_AnimationFrame_getSpriteFrame(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.SpriteFrame",(cocos2d::SpriteFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSpriteFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AnimationFrame:getSpriteFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19806,7 +21533,7 @@ int lua_cocos2dx_AnimationFrame_getDelayUnits(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDelayUnits",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AnimationFrame:getDelayUnits",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19846,13 +21573,13 @@ int lua_cocos2dx_AnimationFrame_setUserInfo(lua_State* tolua_S) { cocos2d::ValueMap arg0; - ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0); + ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0, "cc.AnimationFrame:setUserInfo"); if(!ok) return 0; cobj->setUserInfo(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUserInfo",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AnimationFrame:setUserInfo",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -19883,15 +21610,15 @@ int lua_cocos2dx_AnimationFrame_create(lua_State* tolua_S) double arg1; cocos2d::ValueMap arg2; ok &= luaval_to_object(tolua_S, 2, "cc.SpriteFrame",&arg0); - ok &= luaval_to_number(tolua_S, 3,&arg1); - ok &= luaval_to_ccvaluemap(tolua_S, 4, &arg2); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.AnimationFrame:create"); + ok &= luaval_to_ccvaluemap(tolua_S, 4, &arg2, "cc.AnimationFrame:create"); if(!ok) return 0; cocos2d::AnimationFrame* ret = cocos2d::AnimationFrame::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.AnimationFrame",(cocos2d::AnimationFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.AnimationFrame:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -19960,7 +21687,7 @@ int lua_cocos2dx_Animation_getLoops(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLoops",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animation:getLoops",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -20006,7 +21733,7 @@ int lua_cocos2dx_Animation_addSpriteFrame(lua_State* tolua_S) cobj->addSpriteFrame(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addSpriteFrame",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animation:addSpriteFrame",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -20046,13 +21773,13 @@ int lua_cocos2dx_Animation_setRestoreOriginalFrame(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Animation:setRestoreOriginalFrame"); if(!ok) return 0; cobj->setRestoreOriginalFrame(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRestoreOriginalFrame",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animation:setRestoreOriginalFrame",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -20096,7 +21823,7 @@ int lua_cocos2dx_Animation_clone(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Animation",(cocos2d::Animation*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "clone",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animation:clone",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -20140,7 +21867,7 @@ int lua_cocos2dx_Animation_getDuration(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDuration",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animation:getDuration",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -20180,13 +21907,13 @@ int lua_cocos2dx_Animation_setFrames(lua_State* tolua_S) { cocos2d::Vector arg0; - ok &= luaval_to_ccvector(tolua_S, 2, &arg0); + ok &= luaval_to_ccvector(tolua_S, 2, &arg0, "cc.Animation:setFrames"); if(!ok) return 0; cobj->setFrames(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFrames",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animation:setFrames",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -20230,7 +21957,7 @@ int lua_cocos2dx_Animation_getFrames(lua_State* tolua_S) ccvector_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFrames",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animation:getFrames",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -20270,13 +21997,13 @@ int lua_cocos2dx_Animation_setLoops(lua_State* tolua_S) { unsigned int arg0; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.Animation:setLoops"); if(!ok) return 0; cobj->setLoops(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLoops",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animation:setLoops",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -20316,13 +22043,13 @@ int lua_cocos2dx_Animation_setDelayPerUnit(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Animation:setDelayPerUnit"); if(!ok) return 0; cobj->setDelayPerUnit(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDelayPerUnit",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animation:setDelayPerUnit",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -20362,13 +22089,13 @@ int lua_cocos2dx_Animation_addSpriteFrameWithFile(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Animation:addSpriteFrameWithFile"); if(!ok) return 0; cobj->addSpriteFrameWithFile(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addSpriteFrameWithFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animation:addSpriteFrameWithFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -20412,7 +22139,7 @@ int lua_cocos2dx_Animation_getTotalDelayUnits(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTotalDelayUnits",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animation:getTotalDelayUnits",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -20456,7 +22183,7 @@ int lua_cocos2dx_Animation_getDelayPerUnit(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDelayPerUnit",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animation:getDelayPerUnit",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -20500,7 +22227,7 @@ int lua_cocos2dx_Animation_getRestoreOriginalFrame(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRestoreOriginalFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animation:getRestoreOriginalFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -20543,13 +22270,13 @@ int lua_cocos2dx_Animation_addSpriteFrameWithTexture(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Texture2D",&arg0); - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Animation:addSpriteFrameWithTexture"); if(!ok) return 0; cobj->addSpriteFrameWithTexture(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addSpriteFrameWithTexture",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animation:addSpriteFrameWithTexture",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -20578,10 +22305,10 @@ int lua_cocos2dx_Animation_create(lua_State* tolua_S) if (argc == 2) { cocos2d::Vector arg0; - ok &= luaval_to_ccvector(tolua_S, 2, &arg0); + ok &= luaval_to_ccvector(tolua_S, 2, &arg0, "cc.Animation:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.Animation:create"); if (!ok) { break; } cocos2d::Animation* ret = cocos2d::Animation::create(arg0, arg1); object_to_luaval(tolua_S, "cc.Animation",(cocos2d::Animation*)ret); @@ -20594,13 +22321,13 @@ int lua_cocos2dx_Animation_create(lua_State* tolua_S) if (argc == 3) { cocos2d::Vector arg0; - ok &= luaval_to_ccvector(tolua_S, 2, &arg0); + ok &= luaval_to_ccvector(tolua_S, 2, &arg0, "cc.Animation:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.Animation:create"); if (!ok) { break; } unsigned int arg2; - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.Animation:create"); if (!ok) { break; } cocos2d::Animation* ret = cocos2d::Animation::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.Animation",(cocos2d::Animation*)ret); @@ -20618,7 +22345,7 @@ int lua_cocos2dx_Animation_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.Animation:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -20644,7 +22371,7 @@ int lua_cocos2dx_Animation_createWithSpriteFrames(lua_State* tolua_S) if (argc == 1) { cocos2d::Vector arg0; - ok &= luaval_to_ccvector(tolua_S, 2, &arg0); + ok &= luaval_to_ccvector(tolua_S, 2, &arg0, "cc.Animation:createWithSpriteFrames"); if(!ok) return 0; cocos2d::Animation* ret = cocos2d::Animation::createWithSpriteFrames(arg0); @@ -20655,8 +22382,8 @@ int lua_cocos2dx_Animation_createWithSpriteFrames(lua_State* tolua_S) { cocos2d::Vector arg0; double arg1; - ok &= luaval_to_ccvector(tolua_S, 2, &arg0); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_ccvector(tolua_S, 2, &arg0, "cc.Animation:createWithSpriteFrames"); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.Animation:createWithSpriteFrames"); if(!ok) return 0; cocos2d::Animation* ret = cocos2d::Animation::createWithSpriteFrames(arg0, arg1); @@ -20668,16 +22395,16 @@ int lua_cocos2dx_Animation_createWithSpriteFrames(lua_State* tolua_S) cocos2d::Vector arg0; double arg1; unsigned int arg2; - ok &= luaval_to_ccvector(tolua_S, 2, &arg0); - ok &= luaval_to_number(tolua_S, 3,&arg1); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_ccvector(tolua_S, 2, &arg0, "cc.Animation:createWithSpriteFrames"); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.Animation:createWithSpriteFrames"); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.Animation:createWithSpriteFrames"); if(!ok) return 0; cocos2d::Animation* ret = cocos2d::Animation::createWithSpriteFrames(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.Animation",(cocos2d::Animation*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithSpriteFrames",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Animation:createWithSpriteFrames",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -20754,7 +22481,7 @@ int lua_cocos2dx_ActionInterval_getAmplitudeRate(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAmplitudeRate",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionInterval:getAmplitudeRate",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -20794,13 +22521,13 @@ int lua_cocos2dx_ActionInterval_setAmplitudeRate(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ActionInterval:setAmplitudeRate"); if(!ok) return 0; cobj->setAmplitudeRate(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAmplitudeRate",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionInterval:setAmplitudeRate",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -20844,7 +22571,7 @@ int lua_cocos2dx_ActionInterval_getElapsed(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getElapsed",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionInterval:getElapsed",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -20931,7 +22658,7 @@ int lua_cocos2dx_Repeat_setInnerAction(lua_State* tolua_S) cobj->setInnerAction(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setInnerAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Repeat:setInnerAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -20975,7 +22702,7 @@ int lua_cocos2dx_Repeat_getInnerAction(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.FiniteTimeAction",(cocos2d::FiniteTimeAction*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getInnerAction",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Repeat:getInnerAction",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -21005,14 +22732,14 @@ int lua_cocos2dx_Repeat_create(lua_State* tolua_S) cocos2d::FiniteTimeAction* arg0; unsigned int arg1; ok &= luaval_to_object(tolua_S, 2, "cc.FiniteTimeAction",&arg0); - ok &= luaval_to_uint32(tolua_S, 3,&arg1); + ok &= luaval_to_uint32(tolua_S, 3,&arg1, "cc.Repeat:create"); if(!ok) return 0; cocos2d::Repeat* ret = cocos2d::Repeat::create(arg0, arg1); object_to_luaval(tolua_S, "cc.Repeat",(cocos2d::Repeat*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Repeat:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -21078,7 +22805,7 @@ int lua_cocos2dx_RepeatForever_setInnerAction(lua_State* tolua_S) cobj->setInnerAction(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setInnerAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RepeatForever:setInnerAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -21122,7 +22849,7 @@ int lua_cocos2dx_RepeatForever_getInnerAction(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getInnerAction",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RepeatForever:getInnerAction",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -21157,7 +22884,7 @@ int lua_cocos2dx_RepeatForever_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.RepeatForever",(cocos2d::RepeatForever*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.RepeatForever:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -21225,10 +22952,10 @@ int lua_cocos2dx_RotateTo_create(lua_State* tolua_S) if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.RotateTo:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.RotateTo:create"); if (!ok) { break; } cocos2d::RotateTo* ret = cocos2d::RotateTo::create(arg0, arg1); object_to_luaval(tolua_S, "cc.RotateTo",(cocos2d::RotateTo*)ret); @@ -21241,13 +22968,13 @@ int lua_cocos2dx_RotateTo_create(lua_State* tolua_S) if (argc == 3) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.RotateTo:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.RotateTo:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.RotateTo:create"); if (!ok) { break; } cocos2d::RotateTo* ret = cocos2d::RotateTo::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.RotateTo",(cocos2d::RotateTo*)ret); @@ -21255,7 +22982,7 @@ int lua_cocos2dx_RotateTo_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.RotateTo:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -21302,13 +23029,13 @@ int lua_cocos2dx_RotateBy_create(lua_State* tolua_S) if (argc == 3) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.RotateBy:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.RotateBy:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.RotateBy:create"); if (!ok) { break; } cocos2d::RotateBy* ret = cocos2d::RotateBy::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.RotateBy",(cocos2d::RotateBy*)ret); @@ -21321,10 +23048,10 @@ int lua_cocos2dx_RotateBy_create(lua_State* tolua_S) if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.RotateBy:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.RotateBy:create"); if (!ok) { break; } cocos2d::RotateBy* ret = cocos2d::RotateBy::create(arg0, arg1); object_to_luaval(tolua_S, "cc.RotateBy",(cocos2d::RotateBy*)ret); @@ -21337,10 +23064,10 @@ int lua_cocos2dx_RotateBy_create(lua_State* tolua_S) if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.RotateBy:create"); if (!ok) { break; } cocos2d::Vec3 arg1; - ok &= luaval_to_vec3(tolua_S, 3, &arg1); + ok &= luaval_to_vec3(tolua_S, 3, &arg1, "cc.RotateBy:create"); if (!ok) { break; } cocos2d::RotateBy* ret = cocos2d::RotateBy::create(arg0, arg1); object_to_luaval(tolua_S, "cc.RotateBy",(cocos2d::RotateBy*)ret); @@ -21348,7 +23075,7 @@ int lua_cocos2dx_RotateBy_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.RotateBy:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -21395,15 +23122,15 @@ int lua_cocos2dx_MoveBy_create(lua_State* tolua_S) { double arg0; cocos2d::Vec2 arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.MoveBy:create"); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.MoveBy:create"); if(!ok) return 0; cocos2d::MoveBy* ret = cocos2d::MoveBy::create(arg0, arg1); object_to_luaval(tolua_S, "cc.MoveBy",(cocos2d::MoveBy*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.MoveBy:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -21450,15 +23177,15 @@ int lua_cocos2dx_MoveTo_create(lua_State* tolua_S) { double arg0; cocos2d::Vec2 arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.MoveTo:create"); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.MoveTo:create"); if(!ok) return 0; cocos2d::MoveTo* ret = cocos2d::MoveTo::create(arg0, arg1); object_to_luaval(tolua_S, "cc.MoveTo",(cocos2d::MoveTo*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.MoveTo:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -21506,16 +23233,16 @@ int lua_cocos2dx_SkewTo_create(lua_State* tolua_S) double arg0; double arg1; double arg2; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_number(tolua_S, 3,&arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.SkewTo:create"); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.SkewTo:create"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.SkewTo:create"); if(!ok) return 0; cocos2d::SkewTo* ret = cocos2d::SkewTo::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.SkewTo",(cocos2d::SkewTo*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.SkewTo:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -21563,16 +23290,16 @@ int lua_cocos2dx_SkewBy_create(lua_State* tolua_S) double arg0; double arg1; double arg2; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_number(tolua_S, 3,&arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.SkewBy:create"); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.SkewBy:create"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.SkewBy:create"); if(!ok) return 0; cocos2d::SkewBy* ret = cocos2d::SkewBy::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.SkewBy",(cocos2d::SkewBy*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.SkewBy:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -21621,17 +23348,17 @@ int lua_cocos2dx_JumpBy_create(lua_State* tolua_S) cocos2d::Vec2 arg1; double arg2; int arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.JumpBy:create"); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.JumpBy:create"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.JumpBy:create"); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.JumpBy:create"); if(!ok) return 0; cocos2d::JumpBy* ret = cocos2d::JumpBy::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.JumpBy",(cocos2d::JumpBy*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.JumpBy:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -21680,17 +23407,17 @@ int lua_cocos2dx_JumpTo_create(lua_State* tolua_S) cocos2d::Vec2 arg1; double arg2; int arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.JumpTo:create"); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.JumpTo:create"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.JumpTo:create"); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.JumpTo:create"); if(!ok) return 0; cocos2d::JumpTo* ret = cocos2d::JumpTo::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.JumpTo",(cocos2d::JumpTo*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.JumpTo:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -21775,13 +23502,13 @@ int lua_cocos2dx_ScaleTo_create(lua_State* tolua_S) if (argc == 3) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ScaleTo:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.ScaleTo:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.ScaleTo:create"); if (!ok) { break; } cocos2d::ScaleTo* ret = cocos2d::ScaleTo::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.ScaleTo",(cocos2d::ScaleTo*)ret); @@ -21794,10 +23521,10 @@ int lua_cocos2dx_ScaleTo_create(lua_State* tolua_S) if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ScaleTo:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.ScaleTo:create"); if (!ok) { break; } cocos2d::ScaleTo* ret = cocos2d::ScaleTo::create(arg0, arg1); object_to_luaval(tolua_S, "cc.ScaleTo",(cocos2d::ScaleTo*)ret); @@ -21810,16 +23537,16 @@ int lua_cocos2dx_ScaleTo_create(lua_State* tolua_S) if (argc == 4) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ScaleTo:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.ScaleTo:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.ScaleTo:create"); if (!ok) { break; } double arg3; - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.ScaleTo:create"); if (!ok) { break; } cocos2d::ScaleTo* ret = cocos2d::ScaleTo::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.ScaleTo",(cocos2d::ScaleTo*)ret); @@ -21827,7 +23554,7 @@ int lua_cocos2dx_ScaleTo_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.ScaleTo:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -21874,13 +23601,13 @@ int lua_cocos2dx_ScaleBy_create(lua_State* tolua_S) if (argc == 3) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ScaleBy:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.ScaleBy:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.ScaleBy:create"); if (!ok) { break; } cocos2d::ScaleBy* ret = cocos2d::ScaleBy::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.ScaleBy",(cocos2d::ScaleBy*)ret); @@ -21893,10 +23620,10 @@ int lua_cocos2dx_ScaleBy_create(lua_State* tolua_S) if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ScaleBy:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.ScaleBy:create"); if (!ok) { break; } cocos2d::ScaleBy* ret = cocos2d::ScaleBy::create(arg0, arg1); object_to_luaval(tolua_S, "cc.ScaleBy",(cocos2d::ScaleBy*)ret); @@ -21909,16 +23636,16 @@ int lua_cocos2dx_ScaleBy_create(lua_State* tolua_S) if (argc == 4) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ScaleBy:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.ScaleBy:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.ScaleBy:create"); if (!ok) { break; } double arg3; - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.ScaleBy:create"); if (!ok) { break; } cocos2d::ScaleBy* ret = cocos2d::ScaleBy::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.ScaleBy",(cocos2d::ScaleBy*)ret); @@ -21926,7 +23653,7 @@ int lua_cocos2dx_ScaleBy_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.ScaleBy:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -21973,15 +23700,15 @@ int lua_cocos2dx_Blink_create(lua_State* tolua_S) { double arg0; int arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Blink:create"); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.Blink:create"); if(!ok) return 0; cocos2d::Blink* ret = cocos2d::Blink::create(arg0, arg1); object_to_luaval(tolua_S, "cc.Blink",(cocos2d::Blink*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Blink:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -22028,15 +23755,15 @@ int lua_cocos2dx_FadeTo_create(lua_State* tolua_S) { double arg0; uint16_t arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_uint16(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.FadeTo:create"); + ok &= luaval_to_uint16(tolua_S, 3,&arg1, "cc.FadeTo:create"); if(!ok) return 0; cocos2d::FadeTo* ret = cocos2d::FadeTo::create(arg0, arg1); object_to_luaval(tolua_S, "cc.FadeTo",(cocos2d::FadeTo*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FadeTo:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -22100,7 +23827,7 @@ int lua_cocos2dx_FadeIn_setReverseAction(lua_State* tolua_S) cobj->setReverseAction(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setReverseAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FadeIn:setReverseAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -22128,14 +23855,14 @@ int lua_cocos2dx_FadeIn_create(lua_State* tolua_S) if (argc == 1) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.FadeIn:create"); if(!ok) return 0; cocos2d::FadeIn* ret = cocos2d::FadeIn::create(arg0); object_to_luaval(tolua_S, "cc.FadeIn",(cocos2d::FadeIn*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FadeIn:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -22200,7 +23927,7 @@ int lua_cocos2dx_FadeOut_setReverseAction(lua_State* tolua_S) cobj->setReverseAction(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setReverseAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FadeOut:setReverseAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -22228,14 +23955,14 @@ int lua_cocos2dx_FadeOut_create(lua_State* tolua_S) if (argc == 1) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.FadeOut:create"); if(!ok) return 0; cocos2d::FadeOut* ret = cocos2d::FadeOut::create(arg0); object_to_luaval(tolua_S, "cc.FadeOut",(cocos2d::FadeOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FadeOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -22285,17 +24012,17 @@ int lua_cocos2dx_TintTo_create(lua_State* tolua_S) uint16_t arg1; uint16_t arg2; uint16_t arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_uint16(tolua_S, 3,&arg1); - ok &= luaval_to_uint16(tolua_S, 4,&arg2); - ok &= luaval_to_uint16(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TintTo:create"); + ok &= luaval_to_uint16(tolua_S, 3,&arg1, "cc.TintTo:create"); + ok &= luaval_to_uint16(tolua_S, 4,&arg2, "cc.TintTo:create"); + ok &= luaval_to_uint16(tolua_S, 5,&arg3, "cc.TintTo:create"); if(!ok) return 0; cocos2d::TintTo* ret = cocos2d::TintTo::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.TintTo",(cocos2d::TintTo*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TintTo:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -22344,17 +24071,17 @@ int lua_cocos2dx_TintBy_create(lua_State* tolua_S) int32_t arg1; int32_t arg2; int32_t arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_int32(tolua_S, 3,&arg1); - ok &= luaval_to_int32(tolua_S, 4,&arg2); - ok &= luaval_to_int32(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TintBy:create"); + ok &= luaval_to_int32(tolua_S, 3,&arg1, "cc.TintBy:create"); + ok &= luaval_to_int32(tolua_S, 4,&arg2, "cc.TintBy:create"); + ok &= luaval_to_int32(tolua_S, 5,&arg3, "cc.TintBy:create"); if(!ok) return 0; cocos2d::TintBy* ret = cocos2d::TintBy::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.TintBy",(cocos2d::TintBy*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TintBy:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -22400,14 +24127,14 @@ int lua_cocos2dx_DelayTime_create(lua_State* tolua_S) if (argc == 1) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.DelayTime:create"); if(!ok) return 0; cocos2d::DelayTime* ret = cocos2d::DelayTime::create(arg0); object_to_luaval(tolua_S, "cc.DelayTime",(cocos2d::DelayTime*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.DelayTime:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -22472,7 +24199,7 @@ int lua_cocos2dx_Animate_getAnimation(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnimation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animate:getAnimation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -22518,7 +24245,7 @@ int lua_cocos2dx_Animate_setAnimation(lua_State* tolua_S) cobj->setAnimation(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAnimation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animate:setAnimation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -22553,7 +24280,7 @@ int lua_cocos2dx_Animate_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Animate",(cocos2d::Animate*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Animate:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -22620,7 +24347,7 @@ int lua_cocos2dx_TargetedAction_getForcedTarget(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getForcedTarget",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TargetedAction:getForcedTarget",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -22666,7 +24393,7 @@ int lua_cocos2dx_TargetedAction_setForcedTarget(lua_State* tolua_S) cobj->setForcedTarget(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setForcedTarget",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TargetedAction:setForcedTarget",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -22703,7 +24430,7 @@ int lua_cocos2dx_TargetedAction_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TargetedAction",(cocos2d::TargetedAction*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TargetedAction:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -22757,15 +24484,15 @@ int lua_cocos2dx_ActionCamera_setEye(lua_State* tolua_S) do{ if (argc == 3) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ActionCamera:setEye"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.ActionCamera:setEye"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.ActionCamera:setEye"); if (!ok) { break; } cobj->setEye(arg0, arg1, arg2); @@ -22776,7 +24503,7 @@ int lua_cocos2dx_ActionCamera_setEye(lua_State* tolua_S) do{ if (argc == 1) { cocos2d::Vec3 arg0; - ok &= luaval_to_vec3(tolua_S, 2, &arg0); + ok &= luaval_to_vec3(tolua_S, 2, &arg0, "cc.ActionCamera:setEye"); if (!ok) { break; } cobj->setEye(arg0); @@ -22784,7 +24511,7 @@ int lua_cocos2dx_ActionCamera_setEye(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEye",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionCamera:setEye",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -22828,7 +24555,7 @@ int lua_cocos2dx_ActionCamera_getEye(lua_State* tolua_S) vec3_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEye",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionCamera:getEye",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -22868,13 +24595,13 @@ int lua_cocos2dx_ActionCamera_setUp(lua_State* tolua_S) { cocos2d::Vec3 arg0; - ok &= luaval_to_vec3(tolua_S, 2, &arg0); + ok &= luaval_to_vec3(tolua_S, 2, &arg0, "cc.ActionCamera:setUp"); if(!ok) return 0; cobj->setUp(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUp",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionCamera:setUp",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -22918,7 +24645,7 @@ int lua_cocos2dx_ActionCamera_getCenter(lua_State* tolua_S) vec3_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCenter",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionCamera:getCenter",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -22958,13 +24685,13 @@ int lua_cocos2dx_ActionCamera_setCenter(lua_State* tolua_S) { cocos2d::Vec3 arg0; - ok &= luaval_to_vec3(tolua_S, 2, &arg0); + ok &= luaval_to_vec3(tolua_S, 2, &arg0, "cc.ActionCamera:setCenter"); if(!ok) return 0; cobj->setCenter(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCenter",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionCamera:setCenter",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -23008,7 +24735,7 @@ int lua_cocos2dx_ActionCamera_getUp(lua_State* tolua_S) vec3_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getUp",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionCamera:getUp",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -23042,7 +24769,7 @@ int lua_cocos2dx_ActionCamera_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.ActionCamera"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ActionCamera",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionCamera:ActionCamera",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -23102,20 +24829,20 @@ int lua_cocos2dx_OrbitCamera_create(lua_State* tolua_S) double arg4; double arg5; double arg6; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_number(tolua_S, 3,&arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); - ok &= luaval_to_number(tolua_S, 5,&arg3); - ok &= luaval_to_number(tolua_S, 6,&arg4); - ok &= luaval_to_number(tolua_S, 7,&arg5); - ok &= luaval_to_number(tolua_S, 8,&arg6); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.OrbitCamera:create"); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.OrbitCamera:create"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.OrbitCamera:create"); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.OrbitCamera:create"); + ok &= luaval_to_number(tolua_S, 6,&arg4, "cc.OrbitCamera:create"); + ok &= luaval_to_number(tolua_S, 7,&arg5, "cc.OrbitCamera:create"); + ok &= luaval_to_number(tolua_S, 8,&arg6, "cc.OrbitCamera:create"); if(!ok) return 0; cocos2d::OrbitCamera* ret = cocos2d::OrbitCamera::create(arg0, arg1, arg2, arg3, arg4, arg5, arg6); object_to_luaval(tolua_S, "cc.OrbitCamera",(cocos2d::OrbitCamera*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 7); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.OrbitCamera:create",argc, 7); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -23174,7 +24901,7 @@ int lua_cocos2dx_ActionManager_getActionByTag(lua_State* tolua_S) int arg0; const cocos2d::Node* arg1; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ActionManager:getActionByTag"); ok &= luaval_to_object(tolua_S, 3, "cc.Node",&arg1); if(!ok) @@ -23183,7 +24910,7 @@ int lua_cocos2dx_ActionManager_getActionByTag(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Action",(cocos2d::Action*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getActionByTag",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionManager:getActionByTag",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -23224,7 +24951,7 @@ int lua_cocos2dx_ActionManager_removeActionByTag(lua_State* tolua_S) int arg0; cocos2d::Node* arg1; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ActionManager:removeActionByTag"); ok &= luaval_to_object(tolua_S, 3, "cc.Node",&arg1); if(!ok) @@ -23232,7 +24959,7 @@ int lua_cocos2dx_ActionManager_removeActionByTag(lua_State* tolua_S) cobj->removeActionByTag(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeActionByTag",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionManager:removeActionByTag",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -23275,7 +25002,7 @@ int lua_cocos2dx_ActionManager_removeAllActions(lua_State* tolua_S) cobj->removeAllActions(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllActions",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionManager:removeAllActions",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -23321,13 +25048,13 @@ int lua_cocos2dx_ActionManager_addAction(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 3, "cc.Node",&arg1); - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.ActionManager:addAction"); if(!ok) return 0; cobj->addAction(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addAction",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionManager:addAction",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -23373,7 +25100,7 @@ int lua_cocos2dx_ActionManager_resumeTarget(lua_State* tolua_S) cobj->resumeTarget(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resumeTarget",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionManager:resumeTarget",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -23413,13 +25140,13 @@ int lua_cocos2dx_ActionManager_update(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ActionManager:update"); if(!ok) return 0; cobj->update(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "update",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionManager:update",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -23466,7 +25193,7 @@ int lua_cocos2dx_ActionManager_getNumberOfRunningActionsInTarget(lua_State* tolu tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNumberOfRunningActionsInTarget",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionManager:getNumberOfRunningActionsInTarget",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -23512,7 +25239,7 @@ int lua_cocos2dx_ActionManager_removeAllActionsFromTarget(lua_State* tolua_S) cobj->removeAllActionsFromTarget(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllActionsFromTarget",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionManager:removeAllActionsFromTarget",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -23552,13 +25279,13 @@ int lua_cocos2dx_ActionManager_resumeTargets(lua_State* tolua_S) { cocos2d::Vector arg0; - ok &= luaval_to_ccvector(tolua_S, 2, &arg0); + ok &= luaval_to_ccvector(tolua_S, 2, &arg0, "cc.ActionManager:resumeTargets"); if(!ok) return 0; cobj->resumeTargets(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resumeTargets",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionManager:resumeTargets",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -23604,7 +25331,7 @@ int lua_cocos2dx_ActionManager_removeAction(lua_State* tolua_S) cobj->removeAction(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionManager:removeAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -23650,7 +25377,7 @@ int lua_cocos2dx_ActionManager_pauseTarget(lua_State* tolua_S) cobj->pauseTarget(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pauseTarget",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionManager:pauseTarget",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -23694,7 +25421,7 @@ int lua_cocos2dx_ActionManager_pauseAllRunningActions(lua_State* tolua_S) ccvector_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pauseAllRunningActions",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionManager:pauseAllRunningActions",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -23728,7 +25455,7 @@ int lua_cocos2dx_ActionManager_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.ActionManager"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ActionManager",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionManager:ActionManager",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -23804,7 +25531,7 @@ int lua_cocos2dx_ActionEase_getInnerAction(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getInnerAction",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionEase:getInnerAction",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -23864,13 +25591,13 @@ int lua_cocos2dx_EaseRateAction_setRate(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.EaseRateAction:setRate"); if(!ok) return 0; cobj->setRate(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRate",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EaseRateAction:setRate",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -23914,7 +25641,7 @@ int lua_cocos2dx_EaseRateAction_getRate(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRate",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EaseRateAction:getRate",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -23965,14 +25692,14 @@ int lua_cocos2dx_EaseIn_create(lua_State* tolua_S) cocos2d::ActionInterval* arg0; double arg1; ok &= luaval_to_object(tolua_S, 2, "cc.ActionInterval",&arg0); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.EaseIn:create"); if(!ok) return 0; cocos2d::EaseIn* ret = cocos2d::EaseIn::create(arg0, arg1); object_to_luaval(tolua_S, "cc.EaseIn",(cocos2d::EaseIn*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseIn:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -24020,14 +25747,14 @@ int lua_cocos2dx_EaseOut_create(lua_State* tolua_S) cocos2d::ActionInterval* arg0; double arg1; ok &= luaval_to_object(tolua_S, 2, "cc.ActionInterval",&arg0); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.EaseOut:create"); if(!ok) return 0; cocos2d::EaseOut* ret = cocos2d::EaseOut::create(arg0, arg1); object_to_luaval(tolua_S, "cc.EaseOut",(cocos2d::EaseOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseOut:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -24075,14 +25802,14 @@ int lua_cocos2dx_EaseInOut_create(lua_State* tolua_S) cocos2d::ActionInterval* arg0; double arg1; ok &= luaval_to_object(tolua_S, 2, "cc.ActionInterval",&arg0); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.EaseInOut:create"); if(!ok) return 0; cocos2d::EaseInOut* ret = cocos2d::EaseInOut::create(arg0, arg1); object_to_luaval(tolua_S, "cc.EaseInOut",(cocos2d::EaseInOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseInOut:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -24135,7 +25862,7 @@ int lua_cocos2dx_EaseExponentialIn_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseExponentialIn",(cocos2d::EaseExponentialIn*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseExponentialIn:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -24188,7 +25915,7 @@ int lua_cocos2dx_EaseExponentialOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseExponentialOut",(cocos2d::EaseExponentialOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseExponentialOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -24241,7 +25968,7 @@ int lua_cocos2dx_EaseExponentialInOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseExponentialInOut",(cocos2d::EaseExponentialInOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseExponentialInOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -24294,7 +26021,7 @@ int lua_cocos2dx_EaseSineIn_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseSineIn",(cocos2d::EaseSineIn*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseSineIn:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -24347,7 +26074,7 @@ int lua_cocos2dx_EaseSineOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseSineOut",(cocos2d::EaseSineOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseSineOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -24400,7 +26127,7 @@ int lua_cocos2dx_EaseSineInOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseSineInOut",(cocos2d::EaseSineInOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseSineInOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -24458,13 +26185,13 @@ int lua_cocos2dx_EaseElastic_setPeriod(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.EaseElastic:setPeriod"); if(!ok) return 0; cobj->setPeriod(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPeriod",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EaseElastic:setPeriod",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -24508,7 +26235,7 @@ int lua_cocos2dx_EaseElastic_getPeriod(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPeriod",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EaseElastic:getPeriod",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -24574,7 +26301,7 @@ int lua_cocos2dx_EaseElasticIn_create(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.ActionInterval",&arg0); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.EaseElasticIn:create"); if (!ok) { break; } cocos2d::EaseElasticIn* ret = cocos2d::EaseElasticIn::create(arg0, arg1); object_to_luaval(tolua_S, "cc.EaseElasticIn",(cocos2d::EaseElasticIn*)ret); @@ -24582,7 +26309,7 @@ int lua_cocos2dx_EaseElasticIn_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.EaseElasticIn:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -24645,7 +26372,7 @@ int lua_cocos2dx_EaseElasticOut_create(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.ActionInterval",&arg0); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.EaseElasticOut:create"); if (!ok) { break; } cocos2d::EaseElasticOut* ret = cocos2d::EaseElasticOut::create(arg0, arg1); object_to_luaval(tolua_S, "cc.EaseElasticOut",(cocos2d::EaseElasticOut*)ret); @@ -24653,7 +26380,7 @@ int lua_cocos2dx_EaseElasticOut_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.EaseElasticOut:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -24716,7 +26443,7 @@ int lua_cocos2dx_EaseElasticInOut_create(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.ActionInterval",&arg0); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.EaseElasticInOut:create"); if (!ok) { break; } cocos2d::EaseElasticInOut* ret = cocos2d::EaseElasticInOut::create(arg0, arg1); object_to_luaval(tolua_S, "cc.EaseElasticInOut",(cocos2d::EaseElasticInOut*)ret); @@ -24724,7 +26451,7 @@ int lua_cocos2dx_EaseElasticInOut_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.EaseElasticInOut:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -24796,7 +26523,7 @@ int lua_cocos2dx_EaseBounceIn_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseBounceIn",(cocos2d::EaseBounceIn*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseBounceIn:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -24849,7 +26576,7 @@ int lua_cocos2dx_EaseBounceOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseBounceOut",(cocos2d::EaseBounceOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseBounceOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -24902,7 +26629,7 @@ int lua_cocos2dx_EaseBounceInOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseBounceInOut",(cocos2d::EaseBounceInOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseBounceInOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -24955,7 +26682,7 @@ int lua_cocos2dx_EaseBackIn_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseBackIn",(cocos2d::EaseBackIn*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseBackIn:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25008,7 +26735,7 @@ int lua_cocos2dx_EaseBackOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseBackOut",(cocos2d::EaseBackOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseBackOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25061,7 +26788,7 @@ int lua_cocos2dx_EaseBackInOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseBackInOut",(cocos2d::EaseBackInOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseBackInOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25122,19 +26849,19 @@ int lua_cocos2dx_EaseBezierAction_setBezierParamer(lua_State* tolua_S) double arg2; double arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.EaseBezierAction:setBezierParamer"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.EaseBezierAction:setBezierParamer"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.EaseBezierAction:setBezierParamer"); - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.EaseBezierAction:setBezierParamer"); if(!ok) return 0; cobj->setBezierParamer(arg0, arg1, arg2, arg3); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBezierParamer",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EaseBezierAction:setBezierParamer",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 @@ -25169,7 +26896,7 @@ int lua_cocos2dx_EaseBezierAction_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseBezierAction",(cocos2d::EaseBezierAction*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseBezierAction:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25223,7 +26950,7 @@ int lua_cocos2dx_EaseQuadraticActionIn_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseQuadraticActionIn",(cocos2d::EaseQuadraticActionIn*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseQuadraticActionIn:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25276,7 +27003,7 @@ int lua_cocos2dx_EaseQuadraticActionOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseQuadraticActionOut",(cocos2d::EaseQuadraticActionOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseQuadraticActionOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25329,7 +27056,7 @@ int lua_cocos2dx_EaseQuadraticActionInOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseQuadraticActionInOut",(cocos2d::EaseQuadraticActionInOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseQuadraticActionInOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25382,7 +27109,7 @@ int lua_cocos2dx_EaseQuarticActionIn_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseQuarticActionIn",(cocos2d::EaseQuarticActionIn*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseQuarticActionIn:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25435,7 +27162,7 @@ int lua_cocos2dx_EaseQuarticActionOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseQuarticActionOut",(cocos2d::EaseQuarticActionOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseQuarticActionOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25488,7 +27215,7 @@ int lua_cocos2dx_EaseQuarticActionInOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseQuarticActionInOut",(cocos2d::EaseQuarticActionInOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseQuarticActionInOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25541,7 +27268,7 @@ int lua_cocos2dx_EaseQuinticActionIn_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseQuinticActionIn",(cocos2d::EaseQuinticActionIn*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseQuinticActionIn:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25594,7 +27321,7 @@ int lua_cocos2dx_EaseQuinticActionOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseQuinticActionOut",(cocos2d::EaseQuinticActionOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseQuinticActionOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25647,7 +27374,7 @@ int lua_cocos2dx_EaseQuinticActionInOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseQuinticActionInOut",(cocos2d::EaseQuinticActionInOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseQuinticActionInOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25700,7 +27427,7 @@ int lua_cocos2dx_EaseCircleActionIn_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseCircleActionIn",(cocos2d::EaseCircleActionIn*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseCircleActionIn:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25753,7 +27480,7 @@ int lua_cocos2dx_EaseCircleActionOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseCircleActionOut",(cocos2d::EaseCircleActionOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseCircleActionOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25806,7 +27533,7 @@ int lua_cocos2dx_EaseCircleActionInOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseCircleActionInOut",(cocos2d::EaseCircleActionInOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseCircleActionInOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25859,7 +27586,7 @@ int lua_cocos2dx_EaseCubicActionIn_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseCubicActionIn",(cocos2d::EaseCubicActionIn*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseCubicActionIn:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25912,7 +27639,7 @@ int lua_cocos2dx_EaseCubicActionOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseCubicActionOut",(cocos2d::EaseCubicActionOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseCubicActionOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25965,7 +27692,7 @@ int lua_cocos2dx_EaseCubicActionInOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseCubicActionInOut",(cocos2d::EaseCubicActionInOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseCubicActionInOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -26035,7 +27762,7 @@ int lua_cocos2dx_Show_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Show",(cocos2d::Show*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Show:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -26086,7 +27813,7 @@ int lua_cocos2dx_Hide_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Hide",(cocos2d::Hide*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Hide:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -26137,7 +27864,7 @@ int lua_cocos2dx_ToggleVisibility_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ToggleVisibility",(cocos2d::ToggleVisibility*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ToggleVisibility:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -26191,14 +27918,14 @@ int lua_cocos2dx_RemoveSelf_create(lua_State* tolua_S) if (argc == 1) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.RemoveSelf:create"); if(!ok) return 0; cocos2d::RemoveSelf* ret = cocos2d::RemoveSelf::create(arg0); object_to_luaval(tolua_S, "cc.RemoveSelf",(cocos2d::RemoveSelf*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.RemoveSelf:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -26244,14 +27971,14 @@ int lua_cocos2dx_FlipX_create(lua_State* tolua_S) if (argc == 1) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.FlipX:create"); if(!ok) return 0; cocos2d::FlipX* ret = cocos2d::FlipX::create(arg0); object_to_luaval(tolua_S, "cc.FlipX",(cocos2d::FlipX*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FlipX:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -26297,14 +28024,14 @@ int lua_cocos2dx_FlipY_create(lua_State* tolua_S) if (argc == 1) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.FlipY:create"); if(!ok) return 0; cocos2d::FlipY* ret = cocos2d::FlipY::create(arg0); object_to_luaval(tolua_S, "cc.FlipY",(cocos2d::FlipY*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FlipY:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -26350,14 +28077,14 @@ int lua_cocos2dx_Place_create(lua_State* tolua_S) if (argc == 1) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.Place:create"); if(!ok) return 0; cocos2d::Place* ret = cocos2d::Place::create(arg0); object_to_luaval(tolua_S, "cc.Place",(cocos2d::Place*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Place:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -26418,7 +28145,7 @@ int lua_cocos2dx_CallFunc_execute(lua_State* tolua_S) cobj->execute(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "execute",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CallFunc:execute",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -26462,7 +28189,7 @@ int lua_cocos2dx_CallFunc_getTargetCallback(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTargetCallback",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CallFunc:getTargetCallback",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -26508,7 +28235,7 @@ int lua_cocos2dx_CallFunc_setTargetCallback(lua_State* tolua_S) cobj->setTargetCallback(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTargetCallback",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CallFunc:setTargetCallback",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -26574,7 +28301,7 @@ int lua_cocos2dx_GridAction_getGrid(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.GridBase",(cocos2d::GridBase*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGrid",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridAction:getGrid",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -26638,7 +28365,7 @@ int lua_cocos2dx_Grid3DAction_getGrid(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.GridBase",(cocos2d::GridBase*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGrid",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Grid3DAction:getGrid",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -26702,7 +28429,7 @@ int lua_cocos2dx_TiledGrid3DAction_getGrid(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.GridBase",(cocos2d::GridBase*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGrid",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TiledGrid3DAction:getGrid",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -26755,7 +28482,7 @@ int lua_cocos2dx_StopGrid_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.StopGrid",(cocos2d::StopGrid*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.StopGrid:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -26801,14 +28528,14 @@ int lua_cocos2dx_ReuseGrid_create(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ReuseGrid:create"); if(!ok) return 0; cocos2d::ReuseGrid* ret = cocos2d::ReuseGrid::create(arg0); object_to_luaval(tolua_S, "cc.ReuseGrid",(cocos2d::ReuseGrid*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ReuseGrid:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -26870,7 +28597,7 @@ int lua_cocos2dx_Waves3D_getAmplitudeRate(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAmplitudeRate",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Waves3D:getAmplitudeRate",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -26910,13 +28637,13 @@ int lua_cocos2dx_Waves3D_setAmplitude(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Waves3D:setAmplitude"); if(!ok) return 0; cobj->setAmplitude(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAmplitude",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Waves3D:setAmplitude",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -26956,13 +28683,13 @@ int lua_cocos2dx_Waves3D_setAmplitudeRate(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Waves3D:setAmplitudeRate"); if(!ok) return 0; cobj->setAmplitudeRate(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAmplitudeRate",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Waves3D:setAmplitudeRate",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -27006,7 +28733,7 @@ int lua_cocos2dx_Waves3D_getAmplitude(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAmplitude",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Waves3D:getAmplitude",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -27037,17 +28764,17 @@ int lua_cocos2dx_Waves3D_create(lua_State* tolua_S) cocos2d::Size arg1; unsigned int arg2; double arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Waves3D:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Waves3D:create"); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.Waves3D:create"); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.Waves3D:create"); if(!ok) return 0; cocos2d::Waves3D* ret = cocos2d::Waves3D::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.Waves3D",(cocos2d::Waves3D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Waves3D:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -27097,14 +28824,14 @@ int lua_cocos2dx_FlipX3D_create(lua_State* tolua_S) if (argc == 1) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.FlipX3D:create"); if(!ok) return 0; cocos2d::FlipX3D* ret = cocos2d::FlipX3D::create(arg0); object_to_luaval(tolua_S, "cc.FlipX3D",(cocos2d::FlipX3D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FlipX3D:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -27150,14 +28877,14 @@ int lua_cocos2dx_FlipY3D_create(lua_State* tolua_S) if (argc == 1) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.FlipY3D:create"); if(!ok) return 0; cocos2d::FlipY3D* ret = cocos2d::FlipY3D::create(arg0); object_to_luaval(tolua_S, "cc.FlipY3D",(cocos2d::FlipY3D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FlipY3D:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -27215,13 +28942,13 @@ int lua_cocos2dx_Lens3D_setPosition(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.Lens3D:setPosition"); if(!ok) return 0; cobj->setPosition(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPosition",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Lens3D:setPosition",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -27261,13 +28988,13 @@ int lua_cocos2dx_Lens3D_setConcave(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Lens3D:setConcave"); if(!ok) return 0; cobj->setConcave(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setConcave",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Lens3D:setConcave",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -27307,13 +29034,13 @@ int lua_cocos2dx_Lens3D_setLensEffect(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Lens3D:setLensEffect"); if(!ok) return 0; cobj->setLensEffect(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLensEffect",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Lens3D:setLensEffect",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -27357,7 +29084,7 @@ int lua_cocos2dx_Lens3D_getPosition(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPosition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Lens3D:getPosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -27401,7 +29128,7 @@ int lua_cocos2dx_Lens3D_getLensEffect(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLensEffect",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Lens3D:getLensEffect",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -27432,17 +29159,17 @@ int lua_cocos2dx_Lens3D_create(lua_State* tolua_S) cocos2d::Size arg1; cocos2d::Vec2 arg2; double arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Lens3D:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Lens3D:create"); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.Lens3D:create"); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.Lens3D:create"); if(!ok) return 0; cocos2d::Lens3D* ret = cocos2d::Lens3D::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.Lens3D",(cocos2d::Lens3D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Lens3D:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -27505,13 +29232,13 @@ int lua_cocos2dx_Ripple3D_setAmplitudeRate(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Ripple3D:setAmplitudeRate"); if(!ok) return 0; cobj->setAmplitudeRate(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAmplitudeRate",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Ripple3D:setAmplitudeRate",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -27555,7 +29282,7 @@ int lua_cocos2dx_Ripple3D_getAmplitudeRate(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAmplitudeRate",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Ripple3D:getAmplitudeRate",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -27595,13 +29322,13 @@ int lua_cocos2dx_Ripple3D_setAmplitude(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Ripple3D:setAmplitude"); if(!ok) return 0; cobj->setAmplitude(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAmplitude",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Ripple3D:setAmplitude",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -27645,7 +29372,7 @@ int lua_cocos2dx_Ripple3D_getAmplitude(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAmplitude",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Ripple3D:getAmplitude",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -27685,13 +29412,13 @@ int lua_cocos2dx_Ripple3D_setPosition(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.Ripple3D:setPosition"); if(!ok) return 0; cobj->setPosition(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPosition",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Ripple3D:setPosition",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -27735,7 +29462,7 @@ int lua_cocos2dx_Ripple3D_getPosition(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPosition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Ripple3D:getPosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -27768,19 +29495,19 @@ int lua_cocos2dx_Ripple3D_create(lua_State* tolua_S) double arg3; unsigned int arg4; double arg5; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); - ok &= luaval_to_number(tolua_S, 5,&arg3); - ok &= luaval_to_uint32(tolua_S, 6,&arg4); - ok &= luaval_to_number(tolua_S, 7,&arg5); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Ripple3D:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Ripple3D:create"); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.Ripple3D:create"); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.Ripple3D:create"); + ok &= luaval_to_uint32(tolua_S, 6,&arg4, "cc.Ripple3D:create"); + ok &= luaval_to_number(tolua_S, 7,&arg5, "cc.Ripple3D:create"); if(!ok) return 0; cocos2d::Ripple3D* ret = cocos2d::Ripple3D::create(arg0, arg1, arg2, arg3, arg4, arg5); object_to_luaval(tolua_S, "cc.Ripple3D",(cocos2d::Ripple3D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 6); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Ripple3D:create",argc, 6); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -27835,17 +29562,17 @@ int lua_cocos2dx_Shaky3D_create(lua_State* tolua_S) cocos2d::Size arg1; int arg2; bool arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); - ok &= luaval_to_boolean(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Shaky3D:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Shaky3D:create"); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.Shaky3D:create"); + ok &= luaval_to_boolean(tolua_S, 5,&arg3, "cc.Shaky3D:create"); if(!ok) return 0; cocos2d::Shaky3D* ret = cocos2d::Shaky3D::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.Shaky3D",(cocos2d::Shaky3D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Shaky3D:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -27907,7 +29634,7 @@ int lua_cocos2dx_Liquid_getAmplitudeRate(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAmplitudeRate",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Liquid:getAmplitudeRate",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -27947,13 +29674,13 @@ int lua_cocos2dx_Liquid_setAmplitude(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Liquid:setAmplitude"); if(!ok) return 0; cobj->setAmplitude(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAmplitude",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Liquid:setAmplitude",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -27993,13 +29720,13 @@ int lua_cocos2dx_Liquid_setAmplitudeRate(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Liquid:setAmplitudeRate"); if(!ok) return 0; cobj->setAmplitudeRate(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAmplitudeRate",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Liquid:setAmplitudeRate",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -28043,7 +29770,7 @@ int lua_cocos2dx_Liquid_getAmplitude(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAmplitude",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Liquid:getAmplitude",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -28074,17 +29801,17 @@ int lua_cocos2dx_Liquid_create(lua_State* tolua_S) cocos2d::Size arg1; unsigned int arg2; double arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Liquid:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Liquid:create"); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.Liquid:create"); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.Liquid:create"); if(!ok) return 0; cocos2d::Liquid* ret = cocos2d::Liquid::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.Liquid",(cocos2d::Liquid*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Liquid:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -28150,7 +29877,7 @@ int lua_cocos2dx_Waves_getAmplitudeRate(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAmplitudeRate",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Waves:getAmplitudeRate",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -28190,13 +29917,13 @@ int lua_cocos2dx_Waves_setAmplitude(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Waves:setAmplitude"); if(!ok) return 0; cobj->setAmplitude(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAmplitude",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Waves:setAmplitude",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -28236,13 +29963,13 @@ int lua_cocos2dx_Waves_setAmplitudeRate(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Waves:setAmplitudeRate"); if(!ok) return 0; cobj->setAmplitudeRate(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAmplitudeRate",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Waves:setAmplitudeRate",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -28286,7 +30013,7 @@ int lua_cocos2dx_Waves_getAmplitude(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAmplitude",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Waves:getAmplitude",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -28319,19 +30046,19 @@ int lua_cocos2dx_Waves_create(lua_State* tolua_S) double arg3; bool arg4; bool arg5; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); - ok &= luaval_to_number(tolua_S, 5,&arg3); - ok &= luaval_to_boolean(tolua_S, 6,&arg4); - ok &= luaval_to_boolean(tolua_S, 7,&arg5); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Waves:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Waves:create"); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.Waves:create"); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.Waves:create"); + ok &= luaval_to_boolean(tolua_S, 6,&arg4, "cc.Waves:create"); + ok &= luaval_to_boolean(tolua_S, 7,&arg5, "cc.Waves:create"); if(!ok) return 0; cocos2d::Waves* ret = cocos2d::Waves::create(arg0, arg1, arg2, arg3, arg4, arg5); object_to_luaval(tolua_S, "cc.Waves",(cocos2d::Waves*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 6); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Waves:create",argc, 6); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -28393,13 +30120,13 @@ int lua_cocos2dx_Twirl_setAmplitudeRate(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Twirl:setAmplitudeRate"); if(!ok) return 0; cobj->setAmplitudeRate(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAmplitudeRate",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Twirl:setAmplitudeRate",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -28443,7 +30170,7 @@ int lua_cocos2dx_Twirl_getAmplitudeRate(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAmplitudeRate",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Twirl:getAmplitudeRate",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -28483,13 +30210,13 @@ int lua_cocos2dx_Twirl_setAmplitude(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Twirl:setAmplitude"); if(!ok) return 0; cobj->setAmplitude(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAmplitude",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Twirl:setAmplitude",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -28533,7 +30260,7 @@ int lua_cocos2dx_Twirl_getAmplitude(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAmplitude",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Twirl:getAmplitude",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -28573,13 +30300,13 @@ int lua_cocos2dx_Twirl_setPosition(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.Twirl:setPosition"); if(!ok) return 0; cobj->setPosition(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPosition",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Twirl:setPosition",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -28623,7 +30350,7 @@ int lua_cocos2dx_Twirl_getPosition(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPosition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Twirl:getPosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -28655,18 +30382,18 @@ int lua_cocos2dx_Twirl_create(lua_State* tolua_S) cocos2d::Vec2 arg2; unsigned int arg3; double arg4; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); - ok &= luaval_to_uint32(tolua_S, 5,&arg3); - ok &= luaval_to_number(tolua_S, 6,&arg4); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Twirl:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Twirl:create"); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.Twirl:create"); + ok &= luaval_to_uint32(tolua_S, 5,&arg3, "cc.Twirl:create"); + ok &= luaval_to_number(tolua_S, 6,&arg4, "cc.Twirl:create"); if(!ok) return 0; cocos2d::Twirl* ret = cocos2d::Twirl::create(arg0, arg1, arg2, arg3, arg4); object_to_luaval(tolua_S, "cc.Twirl",(cocos2d::Twirl*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 5); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Twirl:create",argc, 5); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -28719,15 +30446,15 @@ int lua_cocos2dx_PageTurn3D_create(lua_State* tolua_S) { double arg0; cocos2d::Size arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PageTurn3D:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.PageTurn3D:create"); if(!ok) return 0; cocos2d::PageTurn3D* ret = cocos2d::PageTurn3D::create(arg0, arg1); object_to_luaval(tolua_S, "cc.PageTurn3D",(cocos2d::PageTurn3D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PageTurn3D:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -28774,15 +30501,15 @@ int lua_cocos2dx_ProgressTo_create(lua_State* tolua_S) { double arg0; double arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ProgressTo:create"); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.ProgressTo:create"); if(!ok) return 0; cocos2d::ProgressTo* ret = cocos2d::ProgressTo::create(arg0, arg1); object_to_luaval(tolua_S, "cc.ProgressTo",(cocos2d::ProgressTo*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ProgressTo:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -28830,16 +30557,16 @@ int lua_cocos2dx_ProgressFromTo_create(lua_State* tolua_S) double arg0; double arg1; double arg2; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_number(tolua_S, 3,&arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ProgressFromTo:create"); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.ProgressFromTo:create"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.ProgressFromTo:create"); if(!ok) return 0; cocos2d::ProgressFromTo* ret = cocos2d::ProgressFromTo::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.ProgressFromTo",(cocos2d::ProgressFromTo*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ProgressFromTo:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -28888,17 +30615,17 @@ int lua_cocos2dx_ShakyTiles3D_create(lua_State* tolua_S) cocos2d::Size arg1; int arg2; bool arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); - ok &= luaval_to_boolean(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ShakyTiles3D:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.ShakyTiles3D:create"); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.ShakyTiles3D:create"); + ok &= luaval_to_boolean(tolua_S, 5,&arg3, "cc.ShakyTiles3D:create"); if(!ok) return 0; cocos2d::ShakyTiles3D* ret = cocos2d::ShakyTiles3D::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.ShakyTiles3D",(cocos2d::ShakyTiles3D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ShakyTiles3D:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -28947,17 +30674,17 @@ int lua_cocos2dx_ShatteredTiles3D_create(lua_State* tolua_S) cocos2d::Size arg1; int arg2; bool arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); - ok &= luaval_to_boolean(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ShatteredTiles3D:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.ShatteredTiles3D:create"); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.ShatteredTiles3D:create"); + ok &= luaval_to_boolean(tolua_S, 5,&arg3, "cc.ShatteredTiles3D:create"); if(!ok) return 0; cocos2d::ShatteredTiles3D* ret = cocos2d::ShatteredTiles3D::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.ShatteredTiles3D",(cocos2d::ShatteredTiles3D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ShatteredTiles3D:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -29015,14 +30742,14 @@ int lua_cocos2dx_ShuffleTiles_getDelta(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.ShuffleTiles:getDelta"); if(!ok) return 0; cocos2d::Size ret = cobj->getDelta(arg0); size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDelta",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ShuffleTiles:getDelta",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -29052,16 +30779,16 @@ int lua_cocos2dx_ShuffleTiles_create(lua_State* tolua_S) double arg0; cocos2d::Size arg1; unsigned int arg2; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ShuffleTiles:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.ShuffleTiles:create"); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.ShuffleTiles:create"); if(!ok) return 0; cocos2d::ShuffleTiles* ret = cocos2d::ShuffleTiles::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.ShuffleTiles",(cocos2d::ShuffleTiles*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ShuffleTiles:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -29120,13 +30847,13 @@ int lua_cocos2dx_FadeOutTRTiles_turnOnTile(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.FadeOutTRTiles:turnOnTile"); if(!ok) return 0; cobj->turnOnTile(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "turnOnTile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FadeOutTRTiles:turnOnTile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -29166,13 +30893,13 @@ int lua_cocos2dx_FadeOutTRTiles_turnOffTile(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.FadeOutTRTiles:turnOffTile"); if(!ok) return 0; cobj->turnOffTile(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "turnOffTile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FadeOutTRTiles:turnOffTile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -29213,15 +30940,15 @@ int lua_cocos2dx_FadeOutTRTiles_transformTile(lua_State* tolua_S) cocos2d::Vec2 arg0; double arg1; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.FadeOutTRTiles:transformTile"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.FadeOutTRTiles:transformTile"); if(!ok) return 0; cobj->transformTile(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "transformTile",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FadeOutTRTiles:transformTile",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -29262,16 +30989,16 @@ int lua_cocos2dx_FadeOutTRTiles_testFunc(lua_State* tolua_S) cocos2d::Size arg0; double arg1; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.FadeOutTRTiles:testFunc"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.FadeOutTRTiles:testFunc"); if(!ok) return 0; double ret = cobj->testFunc(arg0, arg1); tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "testFunc",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FadeOutTRTiles:testFunc",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -29300,15 +31027,15 @@ int lua_cocos2dx_FadeOutTRTiles_create(lua_State* tolua_S) { double arg0; cocos2d::Size arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.FadeOutTRTiles:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.FadeOutTRTiles:create"); if(!ok) return 0; cocos2d::FadeOutTRTiles* ret = cocos2d::FadeOutTRTiles::create(arg0, arg1); object_to_luaval(tolua_S, "cc.FadeOutTRTiles",(cocos2d::FadeOutTRTiles*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FadeOutTRTiles:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -29359,15 +31086,15 @@ int lua_cocos2dx_FadeOutBLTiles_create(lua_State* tolua_S) { double arg0; cocos2d::Size arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.FadeOutBLTiles:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.FadeOutBLTiles:create"); if(!ok) return 0; cocos2d::FadeOutBLTiles* ret = cocos2d::FadeOutBLTiles::create(arg0, arg1); object_to_luaval(tolua_S, "cc.FadeOutBLTiles",(cocos2d::FadeOutBLTiles*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FadeOutBLTiles:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -29426,15 +31153,15 @@ int lua_cocos2dx_FadeOutUpTiles_transformTile(lua_State* tolua_S) cocos2d::Vec2 arg0; double arg1; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.FadeOutUpTiles:transformTile"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.FadeOutUpTiles:transformTile"); if(!ok) return 0; cobj->transformTile(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "transformTile",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FadeOutUpTiles:transformTile",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -29463,15 +31190,15 @@ int lua_cocos2dx_FadeOutUpTiles_create(lua_State* tolua_S) { double arg0; cocos2d::Size arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.FadeOutUpTiles:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.FadeOutUpTiles:create"); if(!ok) return 0; cocos2d::FadeOutUpTiles* ret = cocos2d::FadeOutUpTiles::create(arg0, arg1); object_to_luaval(tolua_S, "cc.FadeOutUpTiles",(cocos2d::FadeOutUpTiles*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FadeOutUpTiles:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -29519,15 +31246,15 @@ int lua_cocos2dx_FadeOutDownTiles_create(lua_State* tolua_S) { double arg0; cocos2d::Size arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.FadeOutDownTiles:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.FadeOutDownTiles:create"); if(!ok) return 0; cocos2d::FadeOutDownTiles* ret = cocos2d::FadeOutDownTiles::create(arg0, arg1); object_to_luaval(tolua_S, "cc.FadeOutDownTiles",(cocos2d::FadeOutDownTiles*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FadeOutDownTiles:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -29585,13 +31312,13 @@ int lua_cocos2dx_TurnOffTiles_turnOnTile(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.TurnOffTiles:turnOnTile"); if(!ok) return 0; cobj->turnOnTile(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "turnOnTile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TurnOffTiles:turnOnTile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -29631,13 +31358,13 @@ int lua_cocos2dx_TurnOffTiles_turnOffTile(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.TurnOffTiles:turnOffTile"); if(!ok) return 0; cobj->turnOffTile(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "turnOffTile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TurnOffTiles:turnOffTile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -29666,13 +31393,13 @@ int lua_cocos2dx_TurnOffTiles_create(lua_State* tolua_S) if (argc == 3) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TurnOffTiles:create"); if (!ok) { break; } cocos2d::Size arg1; - ok &= luaval_to_size(tolua_S, 3, &arg1); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.TurnOffTiles:create"); if (!ok) { break; } unsigned int arg2; - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.TurnOffTiles:create"); if (!ok) { break; } cocos2d::TurnOffTiles* ret = cocos2d::TurnOffTiles::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.TurnOffTiles",(cocos2d::TurnOffTiles*)ret); @@ -29685,10 +31412,10 @@ int lua_cocos2dx_TurnOffTiles_create(lua_State* tolua_S) if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TurnOffTiles:create"); if (!ok) { break; } cocos2d::Size arg1; - ok &= luaval_to_size(tolua_S, 3, &arg1); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.TurnOffTiles:create"); if (!ok) { break; } cocos2d::TurnOffTiles* ret = cocos2d::TurnOffTiles::create(arg0, arg1); object_to_luaval(tolua_S, "cc.TurnOffTiles",(cocos2d::TurnOffTiles*)ret); @@ -29696,7 +31423,7 @@ int lua_cocos2dx_TurnOffTiles_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.TurnOffTiles:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -29760,7 +31487,7 @@ int lua_cocos2dx_WavesTiles3D_getAmplitudeRate(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAmplitudeRate",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.WavesTiles3D:getAmplitudeRate",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -29800,13 +31527,13 @@ int lua_cocos2dx_WavesTiles3D_setAmplitude(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.WavesTiles3D:setAmplitude"); if(!ok) return 0; cobj->setAmplitude(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAmplitude",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.WavesTiles3D:setAmplitude",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -29846,13 +31573,13 @@ int lua_cocos2dx_WavesTiles3D_setAmplitudeRate(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.WavesTiles3D:setAmplitudeRate"); if(!ok) return 0; cobj->setAmplitudeRate(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAmplitudeRate",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.WavesTiles3D:setAmplitudeRate",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -29896,7 +31623,7 @@ int lua_cocos2dx_WavesTiles3D_getAmplitude(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAmplitude",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.WavesTiles3D:getAmplitude",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -29927,17 +31654,17 @@ int lua_cocos2dx_WavesTiles3D_create(lua_State* tolua_S) cocos2d::Size arg1; unsigned int arg2; double arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.WavesTiles3D:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.WavesTiles3D:create"); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.WavesTiles3D:create"); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.WavesTiles3D:create"); if(!ok) return 0; cocos2d::WavesTiles3D* ret = cocos2d::WavesTiles3D::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.WavesTiles3D",(cocos2d::WavesTiles3D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.WavesTiles3D:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -30003,7 +31730,7 @@ int lua_cocos2dx_JumpTiles3D_getAmplitudeRate(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAmplitudeRate",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.JumpTiles3D:getAmplitudeRate",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -30043,13 +31770,13 @@ int lua_cocos2dx_JumpTiles3D_setAmplitude(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.JumpTiles3D:setAmplitude"); if(!ok) return 0; cobj->setAmplitude(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAmplitude",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.JumpTiles3D:setAmplitude",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -30089,13 +31816,13 @@ int lua_cocos2dx_JumpTiles3D_setAmplitudeRate(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.JumpTiles3D:setAmplitudeRate"); if(!ok) return 0; cobj->setAmplitudeRate(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAmplitudeRate",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.JumpTiles3D:setAmplitudeRate",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -30139,7 +31866,7 @@ int lua_cocos2dx_JumpTiles3D_getAmplitude(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAmplitude",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.JumpTiles3D:getAmplitude",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -30170,17 +31897,17 @@ int lua_cocos2dx_JumpTiles3D_create(lua_State* tolua_S) cocos2d::Size arg1; unsigned int arg2; double arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.JumpTiles3D:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.JumpTiles3D:create"); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.JumpTiles3D:create"); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.JumpTiles3D:create"); if(!ok) return 0; cocos2d::JumpTiles3D* ret = cocos2d::JumpTiles3D::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.JumpTiles3D",(cocos2d::JumpTiles3D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.JumpTiles3D:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -30231,15 +31958,15 @@ int lua_cocos2dx_SplitRows_create(lua_State* tolua_S) { double arg0; unsigned int arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_uint32(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.SplitRows:create"); + ok &= luaval_to_uint32(tolua_S, 3,&arg1, "cc.SplitRows:create"); if(!ok) return 0; cocos2d::SplitRows* ret = cocos2d::SplitRows::create(arg0, arg1); object_to_luaval(tolua_S, "cc.SplitRows",(cocos2d::SplitRows*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.SplitRows:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -30286,15 +32013,15 @@ int lua_cocos2dx_SplitCols_create(lua_State* tolua_S) { double arg0; unsigned int arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_uint32(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.SplitCols:create"); + ok &= luaval_to_uint32(tolua_S, 3,&arg1, "cc.SplitCols:create"); if(!ok) return 0; cocos2d::SplitCols* ret = cocos2d::SplitCols::create(arg0, arg1); object_to_luaval(tolua_S, "cc.SplitCols",(cocos2d::SplitCols*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.SplitCols:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -30343,17 +32070,17 @@ int lua_cocos2dx_ActionTween_create(lua_State* tolua_S) std::string arg1; double arg2; double arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ActionTween:create"); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.ActionTween:create"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.ActionTween:create"); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.ActionTween:create"); if(!ok) return 0; cocos2d::ActionTween* ret = cocos2d::ActionTween::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.ActionTween",(cocos2d::ActionTween*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ActionTween:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -30415,7 +32142,7 @@ int lua_cocos2dx_CardinalSplineTo_getPoints(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.PointArray",(cocos2d::PointArray*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPoints",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CardinalSplineTo:getPoints",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -30455,13 +32182,13 @@ int lua_cocos2dx_CardinalSplineTo_updatePosition(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.CardinalSplineTo:updatePosition"); if(!ok) return 0; cobj->updatePosition(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updatePosition",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CardinalSplineTo:updatePosition",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -30503,18 +32230,18 @@ int lua_cocos2dx_CardinalSplineTo_initWithDuration(lua_State* tolua_S) cocos2d::PointArray* arg1; double arg2; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.CardinalSplineTo:initWithDuration"); ok &= luaval_to_object(tolua_S, 3, "cc.PointArray",&arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.CardinalSplineTo:initWithDuration"); if(!ok) return 0; bool ret = cobj->initWithDuration(arg0, arg1, arg2); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithDuration",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CardinalSplineTo:initWithDuration",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -30548,7 +32275,7 @@ int lua_cocos2dx_CardinalSplineTo_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.CardinalSplineTo"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "CardinalSplineTo",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CardinalSplineTo:CardinalSplineTo",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -30605,7 +32332,7 @@ int lua_cocos2dx_CardinalSplineBy_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.CardinalSplineBy"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "CardinalSplineBy",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CardinalSplineBy:CardinalSplineBy",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -30666,7 +32393,7 @@ int lua_cocos2dx_CatmullRomTo_initWithDuration(lua_State* tolua_S) double arg0; cocos2d::PointArray* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.CatmullRomTo:initWithDuration"); ok &= luaval_to_object(tolua_S, 3, "cc.PointArray",&arg1); if(!ok) @@ -30675,7 +32402,7 @@ int lua_cocos2dx_CatmullRomTo_initWithDuration(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithDuration",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CatmullRomTo:initWithDuration",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -30736,7 +32463,7 @@ int lua_cocos2dx_CatmullRomBy_initWithDuration(lua_State* tolua_S) double arg0; cocos2d::PointArray* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.CatmullRomBy:initWithDuration"); ok &= luaval_to_object(tolua_S, 3, "cc.PointArray",&arg1); if(!ok) @@ -30745,7 +32472,7 @@ int lua_cocos2dx_CatmullRomBy_initWithDuration(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithDuration",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CatmullRomBy:initWithDuration",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -30809,21 +32536,21 @@ int lua_cocos2dx_DrawNode_drawQuadraticBezier(lua_State* tolua_S) unsigned int arg3; cocos2d::Color4F arg4; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.DrawNode:drawQuadraticBezier"); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.DrawNode:drawQuadraticBezier"); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.DrawNode:drawQuadraticBezier"); - ok &= luaval_to_uint32(tolua_S, 5,&arg3); + ok &= luaval_to_uint32(tolua_S, 5,&arg3, "cc.DrawNode:drawQuadraticBezier"); - ok &=luaval_to_color4f(tolua_S, 6, &arg4); + ok &=luaval_to_color4f(tolua_S, 6, &arg4, "cc.DrawNode:drawQuadraticBezier"); if(!ok) return 0; cobj->drawQuadraticBezier(arg0, arg1, arg2, arg3, arg4); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "drawQuadraticBezier",argc, 5); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.DrawNode:drawQuadraticBezier",argc, 5); return 0; #if COCOS2D_DEBUG >= 1 @@ -30864,15 +32591,15 @@ int lua_cocos2dx_DrawNode_onDraw(lua_State* tolua_S) cocos2d::Mat4 arg0; unsigned int arg1; - ok &= luaval_to_mat4(tolua_S, 2, &arg0); + ok &= luaval_to_mat4(tolua_S, 2, &arg0, "cc.DrawNode:onDraw"); - ok &= luaval_to_uint32(tolua_S, 3,&arg1); + ok &= luaval_to_uint32(tolua_S, 3,&arg1, "cc.DrawNode:onDraw"); if(!ok) return 0; cobj->onDraw(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "onDraw",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.DrawNode:onDraw",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -30915,7 +32642,7 @@ int lua_cocos2dx_DrawNode_clear(lua_State* tolua_S) cobj->clear(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "clear",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.DrawNode:clear",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -30958,19 +32685,19 @@ int lua_cocos2dx_DrawNode_drawTriangle(lua_State* tolua_S) cocos2d::Vec2 arg2; cocos2d::Color4F arg3; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.DrawNode:drawTriangle"); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.DrawNode:drawTriangle"); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.DrawNode:drawTriangle"); - ok &=luaval_to_color4f(tolua_S, 5, &arg3); + ok &=luaval_to_color4f(tolua_S, 5, &arg3, "cc.DrawNode:drawTriangle"); if(!ok) return 0; cobj->drawTriangle(arg0, arg1, arg2, arg3); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "drawTriangle",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.DrawNode:drawTriangle",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 @@ -31012,17 +32739,17 @@ int lua_cocos2dx_DrawNode_drawDot(lua_State* tolua_S) double arg1; cocos2d::Color4F arg2; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.DrawNode:drawDot"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.DrawNode:drawDot"); - ok &=luaval_to_color4f(tolua_S, 4, &arg2); + ok &=luaval_to_color4f(tolua_S, 4, &arg2, "cc.DrawNode:drawDot"); if(!ok) return 0; cobj->drawDot(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "drawDot",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.DrawNode:drawDot",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -31067,23 +32794,23 @@ int lua_cocos2dx_DrawNode_drawCubicBezier(lua_State* tolua_S) unsigned int arg4; cocos2d::Color4F arg5; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.DrawNode:drawCubicBezier"); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.DrawNode:drawCubicBezier"); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.DrawNode:drawCubicBezier"); - ok &= luaval_to_vec2(tolua_S, 5, &arg3); + ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.DrawNode:drawCubicBezier"); - ok &= luaval_to_uint32(tolua_S, 6,&arg4); + ok &= luaval_to_uint32(tolua_S, 6,&arg4, "cc.DrawNode:drawCubicBezier"); - ok &=luaval_to_color4f(tolua_S, 7, &arg5); + ok &=luaval_to_color4f(tolua_S, 7, &arg5, "cc.DrawNode:drawCubicBezier"); if(!ok) return 0; cobj->drawCubicBezier(arg0, arg1, arg2, arg3, arg4, arg5); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "drawCubicBezier",argc, 6); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.DrawNode:drawCubicBezier",argc, 6); return 0; #if COCOS2D_DEBUG >= 1 @@ -31126,19 +32853,19 @@ int lua_cocos2dx_DrawNode_drawSegment(lua_State* tolua_S) double arg2; cocos2d::Color4F arg3; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.DrawNode:drawSegment"); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.DrawNode:drawSegment"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.DrawNode:drawSegment"); - ok &=luaval_to_color4f(tolua_S, 5, &arg3); + ok &=luaval_to_color4f(tolua_S, 5, &arg3, "cc.DrawNode:drawSegment"); if(!ok) return 0; cobj->drawSegment(arg0, arg1, arg2, arg3); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "drawSegment",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.DrawNode:drawSegment",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 @@ -31171,7 +32898,7 @@ int lua_cocos2dx_DrawNode_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.DrawNode",(cocos2d::DrawNode*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.DrawNode:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -31240,7 +32967,7 @@ int lua_cocos2dx_GLProgram_getFragmentShaderLog(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFragmentShaderLog",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:getFragmentShaderLog",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -31281,16 +33008,16 @@ int lua_cocos2dx_GLProgram_initWithByteArrays(lua_State* tolua_S) const char* arg0; const char* arg1; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.GLProgram:initWithByteArrays"); arg0 = arg0_tmp.c_str(); - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "cc.GLProgram:initWithByteArrays"); arg1 = arg1_tmp.c_str(); if(!ok) return 0; bool ret = cobj->initWithByteArrays(arg0, arg1); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithByteArrays",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:initWithByteArrays",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -31331,16 +33058,16 @@ int lua_cocos2dx_GLProgram_initWithFilenames(lua_State* tolua_S) std::string arg0; std::string arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgram:initWithFilenames"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.GLProgram:initWithFilenames"); if(!ok) return 0; bool ret = cobj->initWithFilenames(arg0, arg1); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithFilenames",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:initWithFilenames",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -31383,7 +33110,7 @@ int lua_cocos2dx_GLProgram_use(lua_State* tolua_S) cobj->use(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "use",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:use",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -31427,7 +33154,7 @@ int lua_cocos2dx_GLProgram_getVertexShaderLog(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVertexShaderLog",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:getVertexShaderLog",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -31461,7 +33188,7 @@ int lua_cocos2dx_GLProgram_setUniformsForBuiltins(lua_State* tolua_S) do{ if (argc == 1) { cocos2d::Mat4 arg0; - ok &= luaval_to_mat4(tolua_S, 2, &arg0); + ok &= luaval_to_mat4(tolua_S, 2, &arg0, "cc.GLProgram:setUniformsForBuiltins"); if (!ok) { break; } cobj->setUniformsForBuiltins(arg0); @@ -31476,7 +33203,7 @@ int lua_cocos2dx_GLProgram_setUniformsForBuiltins(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformsForBuiltins",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:setUniformsForBuiltins",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -31519,7 +33246,7 @@ int lua_cocos2dx_GLProgram_updateUniforms(lua_State* tolua_S) cobj->updateUniforms(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateUniforms",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:updateUniforms",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -31560,15 +33287,15 @@ int lua_cocos2dx_GLProgram_setUniformLocationWith1i(lua_State* tolua_S) int arg0; int arg1; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgram:setUniformLocationWith1i"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.GLProgram:setUniformLocationWith1i"); if(!ok) return 0; cobj->setUniformLocationWith1i(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformLocationWith1i",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:setUniformLocationWith1i",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -31611,7 +33338,7 @@ int lua_cocos2dx_GLProgram_reset(lua_State* tolua_S) cobj->reset(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "reset",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:reset",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -31652,15 +33379,15 @@ int lua_cocos2dx_GLProgram_bindAttribLocation(lua_State* tolua_S) std::string arg0; unsigned int arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgram:bindAttribLocation"); - ok &= luaval_to_uint32(tolua_S, 3,&arg1); + ok &= luaval_to_uint32(tolua_S, 3,&arg1, "cc.GLProgram:bindAttribLocation"); if(!ok) return 0; cobj->bindAttribLocation(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "bindAttribLocation",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:bindAttribLocation",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -31700,14 +33427,14 @@ int lua_cocos2dx_GLProgram_getAttribLocation(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgram:getAttribLocation"); if(!ok) return 0; int ret = cobj->getAttribLocation(arg0); tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAttribLocation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:getAttribLocation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -31751,7 +33478,7 @@ int lua_cocos2dx_GLProgram_link(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "link",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:link",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -31780,15 +33507,15 @@ int lua_cocos2dx_GLProgram_createWithByteArrays(lua_State* tolua_S) { const char* arg0; const char* arg1; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.GLProgram:createWithByteArrays"); arg0 = arg0_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "cc.GLProgram:createWithByteArrays"); arg1 = arg1_tmp.c_str(); if(!ok) return 0; cocos2d::GLProgram* ret = cocos2d::GLProgram::createWithByteArrays(arg0, arg1); object_to_luaval(tolua_S, "cc.GLProgram",(cocos2d::GLProgram*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithByteArrays",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.GLProgram:createWithByteArrays",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -31815,15 +33542,15 @@ int lua_cocos2dx_GLProgram_createWithFilenames(lua_State* tolua_S) { std::string arg0; std::string arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgram:createWithFilenames"); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.GLProgram:createWithFilenames"); if(!ok) return 0; cocos2d::GLProgram* ret = cocos2d::GLProgram::createWithFilenames(arg0, arg1); object_to_luaval(tolua_S, "cc.GLProgram",(cocos2d::GLProgram*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithFilenames",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.GLProgram:createWithFilenames",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -31855,7 +33582,7 @@ int lua_cocos2dx_GLProgram_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.GLProgram"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "GLProgram",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:GLProgram",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -31935,7 +33662,7 @@ int lua_cocos2dx_SpriteBatchNode_appendChild(lua_State* tolua_S) cobj->appendChild(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "appendChild",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:appendChild",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -31979,16 +33706,16 @@ int lua_cocos2dx_SpriteBatchNode_addSpriteWithoutQuad(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Sprite",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.SpriteBatchNode:addSpriteWithoutQuad"); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.SpriteBatchNode:addSpriteWithoutQuad"); if(!ok) return 0; cocos2d::SpriteBatchNode* ret = cobj->addSpriteWithoutQuad(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.SpriteBatchNode",(cocos2d::SpriteBatchNode*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addSpriteWithoutQuad",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:addSpriteWithoutQuad",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -32028,13 +33755,13 @@ int lua_cocos2dx_SpriteBatchNode_reorderBatch(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.SpriteBatchNode:reorderBatch"); if(!ok) return 0; cobj->reorderBatch(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "reorderBatch",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:reorderBatch",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -32074,13 +33801,13 @@ int lua_cocos2dx_SpriteBatchNode_removeAllChildrenWithCleanup(lua_State* tolua_S { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.SpriteBatchNode:removeAllChildrenWithCleanup"); if(!ok) return 0; cobj->removeAllChildrenWithCleanup(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllChildrenWithCleanup",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:removeAllChildrenWithCleanup",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -32127,7 +33854,7 @@ int lua_cocos2dx_SpriteBatchNode_lowestAtlasIndexInChild(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "lowestAtlasIndexInChild",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:lowestAtlasIndexInChild",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -32170,14 +33897,14 @@ int lua_cocos2dx_SpriteBatchNode_atlasIndexForChild(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Sprite",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.SpriteBatchNode:atlasIndexForChild"); if(!ok) return 0; ssize_t ret = cobj->atlasIndexForChild(arg0, arg1); tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "atlasIndexForChild",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:atlasIndexForChild",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -32223,7 +33950,7 @@ int lua_cocos2dx_SpriteBatchNode_setTextureAtlas(lua_State* tolua_S) cobj->setTextureAtlas(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextureAtlas",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:setTextureAtlas",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -32267,7 +33994,7 @@ int lua_cocos2dx_SpriteBatchNode_getTexture(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Texture2D",(cocos2d::Texture2D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTexture",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:getTexture",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -32310,7 +34037,7 @@ int lua_cocos2dx_SpriteBatchNode_increaseAtlasCapacity(lua_State* tolua_S) cobj->increaseAtlasCapacity(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "increaseAtlasCapacity",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:increaseAtlasCapacity",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -32354,7 +34081,7 @@ int lua_cocos2dx_SpriteBatchNode_getTextureAtlas(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TextureAtlas",(cocos2d::TextureAtlas*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextureAtlas",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:getTextureAtlas",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -32397,13 +34124,13 @@ int lua_cocos2dx_SpriteBatchNode_insertQuadFromSprite(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Sprite",&arg0); - ok &= luaval_to_ssize(tolua_S, 3, &arg1); + ok &= luaval_to_ssize(tolua_S, 3, &arg1, "cc.SpriteBatchNode:insertQuadFromSprite"); if(!ok) return 0; cobj->insertQuadFromSprite(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "insertQuadFromSprite",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:insertQuadFromSprite",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -32449,7 +34176,7 @@ int lua_cocos2dx_SpriteBatchNode_setTexture(lua_State* tolua_S) cobj->setTexture(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:setTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -32492,14 +34219,14 @@ int lua_cocos2dx_SpriteBatchNode_rebuildIndexInOrder(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Sprite",&arg0); - ok &= luaval_to_ssize(tolua_S, 3, &arg1); + ok &= luaval_to_ssize(tolua_S, 3, &arg1, "cc.SpriteBatchNode:rebuildIndexInOrder"); if(!ok) return 0; ssize_t ret = cobj->rebuildIndexInOrder(arg0, arg1); tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "rebuildIndexInOrder",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:rebuildIndexInOrder",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -32546,7 +34273,7 @@ int lua_cocos2dx_SpriteBatchNode_highestAtlasIndexInChild(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "highestAtlasIndexInChild",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:highestAtlasIndexInChild",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -32587,15 +34314,15 @@ int lua_cocos2dx_SpriteBatchNode_removeChildAtIndex(lua_State* tolua_S) ssize_t arg0; bool arg1; - ok &= luaval_to_ssize(tolua_S, 2, &arg0); + ok &= luaval_to_ssize(tolua_S, 2, &arg0, "cc.SpriteBatchNode:removeChildAtIndex"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.SpriteBatchNode:removeChildAtIndex"); if(!ok) return 0; cobj->removeChildAtIndex(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeChildAtIndex",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:removeChildAtIndex",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -32641,7 +34368,7 @@ int lua_cocos2dx_SpriteBatchNode_removeSpriteFromAtlas(lua_State* tolua_S) cobj->removeSpriteFromAtlas(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeSpriteFromAtlas",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:removeSpriteFromAtlas",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -32669,7 +34396,7 @@ int lua_cocos2dx_SpriteBatchNode_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteBatchNode:create"); if(!ok) return 0; cocos2d::SpriteBatchNode* ret = cocos2d::SpriteBatchNode::create(arg0); @@ -32680,15 +34407,15 @@ int lua_cocos2dx_SpriteBatchNode_create(lua_State* tolua_S) { std::string arg0; ssize_t arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_ssize(tolua_S, 3, &arg1); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteBatchNode:create"); + ok &= luaval_to_ssize(tolua_S, 3, &arg1, "cc.SpriteBatchNode:create"); if(!ok) return 0; cocos2d::SpriteBatchNode* ret = cocos2d::SpriteBatchNode::create(arg0, arg1); object_to_luaval(tolua_S, "cc.SpriteBatchNode",(cocos2d::SpriteBatchNode*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.SpriteBatchNode:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -32726,14 +34453,14 @@ int lua_cocos2dx_SpriteBatchNode_createWithTexture(lua_State* tolua_S) cocos2d::Texture2D* arg0; ssize_t arg1; ok &= luaval_to_object(tolua_S, 2, "cc.Texture2D",&arg0); - ok &= luaval_to_ssize(tolua_S, 3, &arg1); + ok &= luaval_to_ssize(tolua_S, 3, &arg1, "cc.SpriteBatchNode:createWithTexture"); if(!ok) return 0; cocos2d::SpriteBatchNode* ret = cocos2d::SpriteBatchNode::createWithTexture(arg0, arg1); object_to_luaval(tolua_S, "cc.SpriteBatchNode",(cocos2d::SpriteBatchNode*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.SpriteBatchNode:createWithTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -32812,7 +34539,7 @@ int lua_cocos2dx_Label_isClipMarginEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isClipMarginEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:isClipMarginEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -32859,7 +34586,7 @@ int lua_cocos2dx_Label_enableShadow(lua_State* tolua_S) { cocos2d::Color4B arg0; - ok &=luaval_to_color4b(tolua_S, 2, &arg0); + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "cc.Label:enableShadow"); if(!ok) return 0; cobj->enableShadow(arg0); @@ -32870,9 +34597,9 @@ int lua_cocos2dx_Label_enableShadow(lua_State* tolua_S) cocos2d::Color4B arg0; cocos2d::Size arg1; - ok &=luaval_to_color4b(tolua_S, 2, &arg0); + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "cc.Label:enableShadow"); - ok &= luaval_to_size(tolua_S, 3, &arg1); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Label:enableShadow"); if(!ok) return 0; cobj->enableShadow(arg0, arg1); @@ -32884,17 +34611,17 @@ int lua_cocos2dx_Label_enableShadow(lua_State* tolua_S) cocos2d::Size arg1; int arg2; - ok &=luaval_to_color4b(tolua_S, 2, &arg0); + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "cc.Label:enableShadow"); - ok &= luaval_to_size(tolua_S, 3, &arg1); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Label:enableShadow"); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.Label:enableShadow"); if(!ok) return 0; cobj->enableShadow(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "enableShadow",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:enableShadow",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -32935,15 +34662,15 @@ int lua_cocos2dx_Label_setDimensions(lua_State* tolua_S) unsigned int arg0; unsigned int arg1; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.Label:setDimensions"); - ok &= luaval_to_uint32(tolua_S, 3,&arg1); + ok &= luaval_to_uint32(tolua_S, 3,&arg1, "cc.Label:setDimensions"); if(!ok) return 0; cobj->setDimensions(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDimensions",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setDimensions",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -32987,7 +34714,7 @@ int lua_cocos2dx_Label_getString(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getString",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getString",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -33031,7 +34758,7 @@ int lua_cocos2dx_Label_getHeight(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getHeight",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getHeight",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -33074,7 +34801,7 @@ int lua_cocos2dx_Label_disableEffect(lua_State* tolua_S) cobj->disableEffect(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "disableEffect",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:disableEffect",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -33114,14 +34841,14 @@ int lua_cocos2dx_Label_setTTFConfig(lua_State* tolua_S) { cocos2d::_ttfConfig arg0; - ok &= luaval_to_ttfconfig(tolua_S, 2, &arg0); + ok &= luaval_to_ttfconfig(tolua_S, 2, &arg0, "cc.Label:setTTFConfig"); if(!ok) return 0; bool ret = cobj->setTTFConfig(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTTFConfig",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setTTFConfig",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -33165,7 +34892,7 @@ int lua_cocos2dx_Label_getTextColor(lua_State* tolua_S) color4b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getTextColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -33205,13 +34932,13 @@ int lua_cocos2dx_Label_setWidth(lua_State* tolua_S) { unsigned int arg0; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.Label:setWidth"); if(!ok) return 0; cobj->setWidth(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setWidth",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setWidth",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -33255,7 +34982,7 @@ int lua_cocos2dx_Label_getMaxLineWidth(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMaxLineWidth",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getMaxLineWidth",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -33299,7 +35026,7 @@ int lua_cocos2dx_Label_getHorizontalAlignment(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getHorizontalAlignment",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getHorizontalAlignment",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -33339,13 +35066,13 @@ int lua_cocos2dx_Label_setClipMarginEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Label:setClipMarginEnabled"); if(!ok) return 0; cobj->setClipMarginEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setClipMarginEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setClipMarginEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -33385,13 +35112,13 @@ int lua_cocos2dx_Label_setString(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:setString"); if(!ok) return 0; cobj->setString(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setString",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setString",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -33431,13 +35158,13 @@ int lua_cocos2dx_Label_setSystemFontName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:setSystemFontName"); if(!ok) return 0; cobj->setSystemFontName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSystemFontName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setSystemFontName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -33477,7 +35204,7 @@ int lua_cocos2dx_Label_setBMFontFilePath(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:setBMFontFilePath"); if(!ok) return 0; bool ret = cobj->setBMFontFilePath(arg0); @@ -33489,16 +35216,16 @@ int lua_cocos2dx_Label_setBMFontFilePath(lua_State* tolua_S) std::string arg0; cocos2d::Vec2 arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:setBMFontFilePath"); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.Label:setBMFontFilePath"); if(!ok) return 0; bool ret = cobj->setBMFontFilePath(arg0, arg1); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBMFontFilePath",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setBMFontFilePath",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -33542,7 +35269,7 @@ int lua_cocos2dx_Label_getFontAtlas(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.FontAtlas",(cocos2d::FontAtlas*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFontAtlas",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getFontAtlas",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -33582,13 +35309,13 @@ int lua_cocos2dx_Label_setLineHeight(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Label:setLineHeight"); if(!ok) return 0; cobj->setLineHeight(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLineHeight",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setLineHeight",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -33628,13 +35355,13 @@ int lua_cocos2dx_Label_setSystemFontSize(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Label:setSystemFontSize"); if(!ok) return 0; cobj->setSystemFontSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSystemFontSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setSystemFontSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -33677,7 +35404,7 @@ int lua_cocos2dx_Label_updateContent(lua_State* tolua_S) cobj->updateContent(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateContent",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:updateContent",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -33721,7 +35448,7 @@ int lua_cocos2dx_Label_getStringLength(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStringLength",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getStringLength",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -33761,13 +35488,13 @@ int lua_cocos2dx_Label_setLineBreakWithoutSpace(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Label:setLineBreakWithoutSpace"); if(!ok) return 0; cobj->setLineBreakWithoutSpace(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLineBreakWithoutSpace",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setLineBreakWithoutSpace",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -33811,7 +35538,7 @@ int lua_cocos2dx_Label_getStringNumLines(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStringNumLines",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getStringNumLines",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -33851,7 +35578,7 @@ int lua_cocos2dx_Label_enableOutline(lua_State* tolua_S) { cocos2d::Color4B arg0; - ok &=luaval_to_color4b(tolua_S, 2, &arg0); + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "cc.Label:enableOutline"); if(!ok) return 0; cobj->enableOutline(arg0); @@ -33862,15 +35589,15 @@ int lua_cocos2dx_Label_enableOutline(lua_State* tolua_S) cocos2d::Color4B arg0; int arg1; - ok &=luaval_to_color4b(tolua_S, 2, &arg0); + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "cc.Label:enableOutline"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.Label:enableOutline"); if(!ok) return 0; cobj->enableOutline(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "enableOutline",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:enableOutline",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -33914,7 +35641,7 @@ int lua_cocos2dx_Label_getAdditionalKerning(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAdditionalKerning",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getAdditionalKerning",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -33952,15 +35679,15 @@ int lua_cocos2dx_Label_setCharMap(lua_State* tolua_S) if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.Label:setCharMap"); if (!ok) { break; } int arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.Label:setCharMap"); if (!ok) { break; } int arg3; - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.Label:setCharMap"); if (!ok) { break; } bool ret = cobj->setCharMap(arg0, arg1, arg2, arg3); @@ -33972,19 +35699,19 @@ int lua_cocos2dx_Label_setCharMap(lua_State* tolua_S) do{ if (argc == 4) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:setCharMap"); if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.Label:setCharMap"); if (!ok) { break; } int arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.Label:setCharMap"); if (!ok) { break; } int arg3; - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.Label:setCharMap"); if (!ok) { break; } bool ret = cobj->setCharMap(arg0, arg1, arg2, arg3); @@ -33996,7 +35723,7 @@ int lua_cocos2dx_Label_setCharMap(lua_State* tolua_S) do{ if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:setCharMap"); if (!ok) { break; } bool ret = cobj->setCharMap(arg0); @@ -34005,7 +35732,7 @@ int lua_cocos2dx_Label_setCharMap(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCharMap",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setCharMap",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -34049,7 +35776,7 @@ int lua_cocos2dx_Label_getDimensions(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDimensions",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getDimensions",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -34089,13 +35816,13 @@ int lua_cocos2dx_Label_setMaxLineWidth(lua_State* tolua_S) { unsigned int arg0; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.Label:setMaxLineWidth"); if(!ok) return 0; cobj->setMaxLineWidth(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMaxLineWidth",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setMaxLineWidth",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -34139,7 +35866,7 @@ int lua_cocos2dx_Label_getSystemFontName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSystemFontName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getSystemFontName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -34179,13 +35906,13 @@ int lua_cocos2dx_Label_setVerticalAlignment(lua_State* tolua_S) { cocos2d::TextVAlignment arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Label:setVerticalAlignment"); if(!ok) return 0; cobj->setVerticalAlignment(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVerticalAlignment",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setVerticalAlignment",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -34229,7 +35956,7 @@ int lua_cocos2dx_Label_getLineHeight(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLineHeight",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getLineHeight",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -34273,7 +36000,7 @@ int lua_cocos2dx_Label_getTTFConfig(lua_State* tolua_S) ttfconfig_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTTFConfig",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getTTFConfig",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -34317,7 +36044,7 @@ int lua_cocos2dx_Label_getVerticalAlignment(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVerticalAlignment",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getVerticalAlignment",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -34357,13 +36084,13 @@ int lua_cocos2dx_Label_setTextColor(lua_State* tolua_S) { cocos2d::Color4B arg0; - ok &=luaval_to_color4b(tolua_S, 2, &arg0); + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "cc.Label:setTextColor"); if(!ok) return 0; cobj->setTextColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setTextColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -34403,13 +36130,13 @@ int lua_cocos2dx_Label_setHeight(lua_State* tolua_S) { unsigned int arg0; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.Label:setHeight"); if(!ok) return 0; cobj->setHeight(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setHeight",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setHeight",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -34453,7 +36180,7 @@ int lua_cocos2dx_Label_getWidth(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getWidth",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getWidth",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -34493,13 +36220,13 @@ int lua_cocos2dx_Label_enableGlow(lua_State* tolua_S) { cocos2d::Color4B arg0; - ok &=luaval_to_color4b(tolua_S, 2, &arg0); + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "cc.Label:enableGlow"); if(!ok) return 0; cobj->enableGlow(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "enableGlow",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:enableGlow",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -34539,14 +36266,14 @@ int lua_cocos2dx_Label_getLetter(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Label:getLetter"); if(!ok) return 0; cocos2d::Sprite* ret = cobj->getLetter(arg0); object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLetter",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getLetter",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -34586,13 +36313,13 @@ int lua_cocos2dx_Label_setAdditionalKerning(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Label:setAdditionalKerning"); if(!ok) return 0; cobj->setAdditionalKerning(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAdditionalKerning",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setAdditionalKerning",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -34636,7 +36363,7 @@ int lua_cocos2dx_Label_getSystemFontSize(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSystemFontSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getSystemFontSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -34680,7 +36407,7 @@ int lua_cocos2dx_Label_getTextAlignment(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextAlignment",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getTextAlignment",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -34724,7 +36451,7 @@ int lua_cocos2dx_Label_getBMFontFilePath(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBMFontFilePath",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getBMFontFilePath",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -34764,13 +36491,13 @@ int lua_cocos2dx_Label_setHorizontalAlignment(lua_State* tolua_S) { cocos2d::TextHAlignment arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Label:setHorizontalAlignment"); if(!ok) return 0; cobj->setHorizontalAlignment(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setHorizontalAlignment",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setHorizontalAlignment",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -34804,11 +36531,11 @@ int lua_cocos2dx_Label_setAlignment(lua_State* tolua_S) do{ if (argc == 2) { cocos2d::TextHAlignment arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Label:setAlignment"); if (!ok) { break; } cocos2d::TextVAlignment arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.Label:setAlignment"); if (!ok) { break; } cobj->setAlignment(arg0, arg1); @@ -34819,7 +36546,7 @@ int lua_cocos2dx_Label_setAlignment(lua_State* tolua_S) do{ if (argc == 1) { cocos2d::TextHAlignment arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Label:setAlignment"); if (!ok) { break; } cobj->setAlignment(arg0); @@ -34827,7 +36554,7 @@ int lua_cocos2dx_Label_setAlignment(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAlignment",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setAlignment",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -34856,8 +36583,8 @@ int lua_cocos2dx_Label_createWithBMFont(lua_State* tolua_S) { std::string arg0; std::string arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:createWithBMFont"); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:createWithBMFont"); if(!ok) return 0; cocos2d::Label* ret = cocos2d::Label::createWithBMFont(arg0, arg1); @@ -34869,9 +36596,9 @@ int lua_cocos2dx_Label_createWithBMFont(lua_State* tolua_S) std::string arg0; std::string arg1; cocos2d::TextHAlignment arg2; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:createWithBMFont"); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:createWithBMFont"); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.Label:createWithBMFont"); if(!ok) return 0; cocos2d::Label* ret = cocos2d::Label::createWithBMFont(arg0, arg1, arg2); @@ -34884,10 +36611,10 @@ int lua_cocos2dx_Label_createWithBMFont(lua_State* tolua_S) std::string arg1; cocos2d::TextHAlignment arg2; int arg3; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:createWithBMFont"); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:createWithBMFont"); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.Label:createWithBMFont"); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.Label:createWithBMFont"); if(!ok) return 0; cocos2d::Label* ret = cocos2d::Label::createWithBMFont(arg0, arg1, arg2, arg3); @@ -34901,18 +36628,18 @@ int lua_cocos2dx_Label_createWithBMFont(lua_State* tolua_S) cocos2d::TextHAlignment arg2; int arg3; cocos2d::Vec2 arg4; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); - ok &= luaval_to_vec2(tolua_S, 6, &arg4); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:createWithBMFont"); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:createWithBMFont"); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.Label:createWithBMFont"); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.Label:createWithBMFont"); + ok &= luaval_to_vec2(tolua_S, 6, &arg4, "cc.Label:createWithBMFont"); if(!ok) return 0; cocos2d::Label* ret = cocos2d::Label::createWithBMFont(arg0, arg1, arg2, arg3, arg4); object_to_luaval(tolua_S, "cc.Label",(cocos2d::Label*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithBMFont",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Label:createWithBMFont",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -34943,7 +36670,7 @@ int lua_cocos2dx_Label_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Label",(cocos2d::Label*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Label:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -34973,13 +36700,13 @@ int lua_cocos2dx_Label_createWithCharMap(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Texture2D",&arg0); if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.Label:createWithCharMap"); if (!ok) { break; } int arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.Label:createWithCharMap"); if (!ok) { break; } int arg3; - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.Label:createWithCharMap"); if (!ok) { break; } cocos2d::Label* ret = cocos2d::Label::createWithCharMap(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.Label",(cocos2d::Label*)ret); @@ -34992,16 +36719,16 @@ int lua_cocos2dx_Label_createWithCharMap(lua_State* tolua_S) if (argc == 4) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:createWithCharMap"); if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.Label:createWithCharMap"); if (!ok) { break; } int arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.Label:createWithCharMap"); if (!ok) { break; } int arg3; - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.Label:createWithCharMap"); if (!ok) { break; } cocos2d::Label* ret = cocos2d::Label::createWithCharMap(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.Label",(cocos2d::Label*)ret); @@ -35014,7 +36741,7 @@ int lua_cocos2dx_Label_createWithCharMap(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:createWithCharMap"); if (!ok) { break; } cocos2d::Label* ret = cocos2d::Label::createWithCharMap(arg0); object_to_luaval(tolua_S, "cc.Label",(cocos2d::Label*)ret); @@ -35022,7 +36749,7 @@ int lua_cocos2dx_Label_createWithCharMap(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "createWithCharMap",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.Label:createWithCharMap",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -35050,9 +36777,9 @@ int lua_cocos2dx_Label_createWithSystemFont(lua_State* tolua_S) std::string arg0; std::string arg1; double arg2; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:createWithSystemFont"); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:createWithSystemFont"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Label:createWithSystemFont"); if(!ok) return 0; cocos2d::Label* ret = cocos2d::Label::createWithSystemFont(arg0, arg1, arg2); @@ -35065,10 +36792,10 @@ int lua_cocos2dx_Label_createWithSystemFont(lua_State* tolua_S) std::string arg1; double arg2; cocos2d::Size arg3; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); - ok &= luaval_to_size(tolua_S, 5, &arg3); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:createWithSystemFont"); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:createWithSystemFont"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Label:createWithSystemFont"); + ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.Label:createWithSystemFont"); if(!ok) return 0; cocos2d::Label* ret = cocos2d::Label::createWithSystemFont(arg0, arg1, arg2, arg3); @@ -35082,11 +36809,11 @@ int lua_cocos2dx_Label_createWithSystemFont(lua_State* tolua_S) double arg2; cocos2d::Size arg3; cocos2d::TextHAlignment arg4; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); - ok &= luaval_to_size(tolua_S, 5, &arg3); - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:createWithSystemFont"); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:createWithSystemFont"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Label:createWithSystemFont"); + ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.Label:createWithSystemFont"); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.Label:createWithSystemFont"); if(!ok) return 0; cocos2d::Label* ret = cocos2d::Label::createWithSystemFont(arg0, arg1, arg2, arg3, arg4); @@ -35101,19 +36828,19 @@ int lua_cocos2dx_Label_createWithSystemFont(lua_State* tolua_S) cocos2d::Size arg3; cocos2d::TextHAlignment arg4; cocos2d::TextVAlignment arg5; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); - ok &= luaval_to_size(tolua_S, 5, &arg3); - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); - ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:createWithSystemFont"); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:createWithSystemFont"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Label:createWithSystemFont"); + ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.Label:createWithSystemFont"); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.Label:createWithSystemFont"); + ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5, "cc.Label:createWithSystemFont"); if(!ok) return 0; cocos2d::Label* ret = cocos2d::Label::createWithSystemFont(arg0, arg1, arg2, arg3, arg4, arg5); object_to_luaval(tolua_S, "cc.Label",(cocos2d::Label*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithSystemFont",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Label:createWithSystemFont",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -35210,7 +36937,7 @@ int lua_cocos2dx_Layer_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Layer",(cocos2d::Layer*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Layer:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -35269,15 +36996,15 @@ int lua_cocos2dx_LayerColor_changeWidthAndHeight(lua_State* tolua_S) double arg0; double arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.LayerColor:changeWidthAndHeight"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.LayerColor:changeWidthAndHeight"); if(!ok) return 0; cobj->changeWidthAndHeight(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "changeWidthAndHeight",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerColor:changeWidthAndHeight",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -35317,13 +37044,13 @@ int lua_cocos2dx_LayerColor_changeHeight(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.LayerColor:changeHeight"); if(!ok) return 0; cobj->changeHeight(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "changeHeight",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerColor:changeHeight",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -35363,13 +37090,13 @@ int lua_cocos2dx_LayerColor_changeWidth(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.LayerColor:changeWidth"); if(!ok) return 0; cobj->changeWidth(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "changeWidth",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerColor:changeWidth",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -35398,13 +37125,13 @@ int lua_cocos2dx_LayerColor_create(lua_State* tolua_S) if (argc == 3) { cocos2d::Color4B arg0; - ok &=luaval_to_color4b(tolua_S, 2, &arg0); + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "cc.LayerColor:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.LayerColor:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LayerColor:create"); if (!ok) { break; } cocos2d::LayerColor* ret = cocos2d::LayerColor::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.LayerColor",(cocos2d::LayerColor*)ret); @@ -35427,7 +37154,7 @@ int lua_cocos2dx_LayerColor_create(lua_State* tolua_S) if (argc == 1) { cocos2d::Color4B arg0; - ok &=luaval_to_color4b(tolua_S, 2, &arg0); + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "cc.LayerColor:create"); if (!ok) { break; } cocos2d::LayerColor* ret = cocos2d::LayerColor::create(arg0); object_to_luaval(tolua_S, "cc.LayerColor",(cocos2d::LayerColor*)ret); @@ -35435,7 +37162,7 @@ int lua_cocos2dx_LayerColor_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.LayerColor:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -35500,7 +37227,7 @@ int lua_cocos2dx_LayerGradient_getStartColor(lua_State* tolua_S) color3b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerGradient:getStartColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -35544,7 +37271,7 @@ int lua_cocos2dx_LayerGradient_isCompressedInterpolation(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isCompressedInterpolation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerGradient:isCompressedInterpolation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -35588,7 +37315,7 @@ int lua_cocos2dx_LayerGradient_getStartOpacity(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartOpacity",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerGradient:getStartOpacity",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -35628,13 +37355,13 @@ int lua_cocos2dx_LayerGradient_setVector(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.LayerGradient:setVector"); if(!ok) return 0; cobj->setVector(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVector",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerGradient:setVector",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -35674,13 +37401,13 @@ int lua_cocos2dx_LayerGradient_setStartOpacity(lua_State* tolua_S) { uint16_t arg0; - ok &= luaval_to_uint16(tolua_S, 2,&arg0); + ok &= luaval_to_uint16(tolua_S, 2,&arg0, "cc.LayerGradient:setStartOpacity"); if(!ok) return 0; cobj->setStartOpacity(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStartOpacity",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerGradient:setStartOpacity",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -35720,13 +37447,13 @@ int lua_cocos2dx_LayerGradient_setCompressedInterpolation(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.LayerGradient:setCompressedInterpolation"); if(!ok) return 0; cobj->setCompressedInterpolation(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCompressedInterpolation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerGradient:setCompressedInterpolation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -35766,13 +37493,13 @@ int lua_cocos2dx_LayerGradient_setEndOpacity(lua_State* tolua_S) { uint16_t arg0; - ok &= luaval_to_uint16(tolua_S, 2,&arg0); + ok &= luaval_to_uint16(tolua_S, 2,&arg0, "cc.LayerGradient:setEndOpacity"); if(!ok) return 0; cobj->setEndOpacity(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEndOpacity",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerGradient:setEndOpacity",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -35816,7 +37543,7 @@ int lua_cocos2dx_LayerGradient_getVector(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVector",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerGradient:getVector",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -35856,13 +37583,13 @@ int lua_cocos2dx_LayerGradient_setEndColor(lua_State* tolua_S) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.LayerGradient:setEndColor"); if(!ok) return 0; cobj->setEndColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEndColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerGradient:setEndColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -35906,7 +37633,7 @@ int lua_cocos2dx_LayerGradient_getEndColor(lua_State* tolua_S) color3b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEndColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerGradient:getEndColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -35950,7 +37677,7 @@ int lua_cocos2dx_LayerGradient_getEndOpacity(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEndOpacity",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerGradient:getEndOpacity",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -35990,13 +37717,13 @@ int lua_cocos2dx_LayerGradient_setStartColor(lua_State* tolua_S) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.LayerGradient:setStartColor"); if(!ok) return 0; cobj->setStartColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStartColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerGradient:setStartColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -36025,10 +37752,10 @@ int lua_cocos2dx_LayerGradient_create(lua_State* tolua_S) if (argc == 2) { cocos2d::Color4B arg0; - ok &=luaval_to_color4b(tolua_S, 2, &arg0); + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "cc.LayerGradient:create"); if (!ok) { break; } cocos2d::Color4B arg1; - ok &=luaval_to_color4b(tolua_S, 3, &arg1); + ok &=luaval_to_color4b(tolua_S, 3, &arg1, "cc.LayerGradient:create"); if (!ok) { break; } cocos2d::LayerGradient* ret = cocos2d::LayerGradient::create(arg0, arg1); object_to_luaval(tolua_S, "cc.LayerGradient",(cocos2d::LayerGradient*)ret); @@ -36051,13 +37778,13 @@ int lua_cocos2dx_LayerGradient_create(lua_State* tolua_S) if (argc == 3) { cocos2d::Color4B arg0; - ok &=luaval_to_color4b(tolua_S, 2, &arg0); + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "cc.LayerGradient:create"); if (!ok) { break; } cocos2d::Color4B arg1; - ok &=luaval_to_color4b(tolua_S, 3, &arg1); + ok &=luaval_to_color4b(tolua_S, 3, &arg1, "cc.LayerGradient:create"); if (!ok) { break; } cocos2d::Vec2 arg2; - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.LayerGradient:create"); if (!ok) { break; } cocos2d::LayerGradient* ret = cocos2d::LayerGradient::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.LayerGradient",(cocos2d::LayerGradient*)ret); @@ -36065,7 +37792,7 @@ int lua_cocos2dx_LayerGradient_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.LayerGradient:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -36135,13 +37862,13 @@ int lua_cocos2dx_LayerMultiplex_switchToAndReleaseMe(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.LayerMultiplex:switchToAndReleaseMe"); if(!ok) return 0; cobj->switchToAndReleaseMe(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "switchToAndReleaseMe",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerMultiplex:switchToAndReleaseMe",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -36187,7 +37914,7 @@ int lua_cocos2dx_LayerMultiplex_addLayer(lua_State* tolua_S) cobj->addLayer(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addLayer",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerMultiplex:addLayer",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -36227,13 +37954,13 @@ int lua_cocos2dx_LayerMultiplex_switchTo(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.LayerMultiplex:switchTo"); if(!ok) return 0; cobj->switchTo(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "switchTo",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerMultiplex:switchTo",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -36265,168 +37992,6 @@ int lua_register_cocos2dx_LayerMultiplex(lua_State* tolua_S) return 1; } -int lua_cocos2dx_Scene_getPhysicsWorld(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::Scene* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.Scene",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::Scene*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Scene_getPhysicsWorld'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::PhysicsWorld* ret = cobj->getPhysicsWorld(); - object_to_luaval(tolua_S, "cc.PhysicsWorld",(cocos2d::PhysicsWorld*)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPhysicsWorld",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Scene_getPhysicsWorld'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_Scene_createWithSize(lua_State* tolua_S) -{ - int argc = 0; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertable(tolua_S,1,"cc.Scene",0,&tolua_err)) goto tolua_lerror; -#endif - - argc = lua_gettop(tolua_S) - 1; - - if (argc == 1) - { - cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); - if(!ok) - return 0; - cocos2d::Scene* ret = cocos2d::Scene::createWithSize(arg0); - object_to_luaval(tolua_S, "cc.Scene",(cocos2d::Scene*)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithSize",argc, 1); - return 0; -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Scene_createWithSize'.",&tolua_err); -#endif - return 0; -} -int lua_cocos2dx_Scene_create(lua_State* tolua_S) -{ - int argc = 0; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertable(tolua_S,1,"cc.Scene",0,&tolua_err)) goto tolua_lerror; -#endif - - argc = lua_gettop(tolua_S) - 1; - - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::Scene* ret = cocos2d::Scene::create(); - object_to_luaval(tolua_S, "cc.Scene",(cocos2d::Scene*)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); - return 0; -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Scene_create'.",&tolua_err); -#endif - return 0; -} -int lua_cocos2dx_Scene_createWithPhysics(lua_State* tolua_S) -{ - int argc = 0; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertable(tolua_S,1,"cc.Scene",0,&tolua_err)) goto tolua_lerror; -#endif - - argc = lua_gettop(tolua_S) - 1; - - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::Scene* ret = cocos2d::Scene::createWithPhysics(); - object_to_luaval(tolua_S, "cc.Scene",(cocos2d::Scene*)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithPhysics",argc, 0); - return 0; -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Scene_createWithPhysics'.",&tolua_err); -#endif - return 0; -} -static int lua_cocos2dx_Scene_finalize(lua_State* tolua_S) -{ - printf("luabindings: finalizing LUA object (Scene)"); - return 0; -} - -int lua_register_cocos2dx_Scene(lua_State* tolua_S) -{ - tolua_usertype(tolua_S,"cc.Scene"); - tolua_cclass(tolua_S,"Scene","cc.Scene","cc.Node",nullptr); - - tolua_beginmodule(tolua_S,"Scene"); - tolua_function(tolua_S,"getPhysicsWorld",lua_cocos2dx_Scene_getPhysicsWorld); - tolua_function(tolua_S,"createWithSize", lua_cocos2dx_Scene_createWithSize); - tolua_function(tolua_S,"create", lua_cocos2dx_Scene_create); - tolua_function(tolua_S,"createWithPhysics", lua_cocos2dx_Scene_createWithPhysics); - tolua_endmodule(tolua_S); - std::string typeName = typeid(cocos2d::Scene).name(); - g_luaType[typeName] = "cc.Scene"; - g_typeCast["Scene"] = "cc.Scene"; - return 1; -} - int lua_cocos2dx_TransitionEaseScene_easeActionWithAction(lua_State* tolua_S) { int argc = 0; @@ -36464,7 +38029,7 @@ int lua_cocos2dx_TransitionEaseScene_easeActionWithAction(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "easeActionWithAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionEaseScene:easeActionWithAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -36527,7 +38092,7 @@ int lua_cocos2dx_TransitionScene_finish(lua_State* tolua_S) cobj->finish(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "finish",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionScene:finish",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -36570,7 +38135,7 @@ int lua_cocos2dx_TransitionScene_hideOutShowIn(lua_State* tolua_S) cobj->hideOutShowIn(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "hideOutShowIn",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionScene:hideOutShowIn",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -36599,7 +38164,7 @@ int lua_cocos2dx_TransitionScene_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionScene:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -36607,7 +38172,7 @@ int lua_cocos2dx_TransitionScene_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionScene",(cocos2d::TransitionScene*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionScene:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -36657,16 +38222,16 @@ int lua_cocos2dx_TransitionSceneOriented_create(lua_State* tolua_S) double arg0; cocos2d::Scene* arg1; cocos2d::TransitionScene::Orientation arg2; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionSceneOriented:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.TransitionSceneOriented:create"); if(!ok) return 0; cocos2d::TransitionSceneOriented* ret = cocos2d::TransitionSceneOriented::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.TransitionSceneOriented",(cocos2d::TransitionSceneOriented*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionSceneOriented:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -36713,7 +38278,7 @@ int lua_cocos2dx_TransitionRotoZoom_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionRotoZoom:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -36721,7 +38286,7 @@ int lua_cocos2dx_TransitionRotoZoom_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionRotoZoom",(cocos2d::TransitionRotoZoom*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionRotoZoom:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -36768,7 +38333,7 @@ int lua_cocos2dx_TransitionJumpZoom_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionJumpZoom:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -36776,7 +38341,7 @@ int lua_cocos2dx_TransitionJumpZoom_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionJumpZoom",(cocos2d::TransitionJumpZoom*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionJumpZoom:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -36838,7 +38403,7 @@ int lua_cocos2dx_TransitionMoveInL_action(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "action",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionMoveInL:action",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -36885,7 +38450,7 @@ int lua_cocos2dx_TransitionMoveInL_easeActionWithAction(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "easeActionWithAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionMoveInL:easeActionWithAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -36914,7 +38479,7 @@ int lua_cocos2dx_TransitionMoveInL_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionMoveInL:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -36922,7 +38487,7 @@ int lua_cocos2dx_TransitionMoveInL_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionMoveInL",(cocos2d::TransitionMoveInL*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionMoveInL:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -36971,7 +38536,7 @@ int lua_cocos2dx_TransitionMoveInR_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionMoveInR:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -36979,7 +38544,7 @@ int lua_cocos2dx_TransitionMoveInR_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionMoveInR",(cocos2d::TransitionMoveInR*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionMoveInR:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -37026,7 +38591,7 @@ int lua_cocos2dx_TransitionMoveInT_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionMoveInT:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -37034,7 +38599,7 @@ int lua_cocos2dx_TransitionMoveInT_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionMoveInT",(cocos2d::TransitionMoveInT*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionMoveInT:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -37081,7 +38646,7 @@ int lua_cocos2dx_TransitionMoveInB_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionMoveInB:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -37089,7 +38654,7 @@ int lua_cocos2dx_TransitionMoveInB_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionMoveInB",(cocos2d::TransitionMoveInB*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionMoveInB:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -37151,7 +38716,7 @@ int lua_cocos2dx_TransitionSlideInL_action(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "action",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionSlideInL:action",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -37198,7 +38763,7 @@ int lua_cocos2dx_TransitionSlideInL_easeActionWithAction(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "easeActionWithAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionSlideInL:easeActionWithAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -37227,7 +38792,7 @@ int lua_cocos2dx_TransitionSlideInL_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionSlideInL:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -37235,7 +38800,7 @@ int lua_cocos2dx_TransitionSlideInL_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionSlideInL",(cocos2d::TransitionSlideInL*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionSlideInL:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -37299,7 +38864,7 @@ int lua_cocos2dx_TransitionSlideInR_action(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "action",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionSlideInR:action",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -37328,7 +38893,7 @@ int lua_cocos2dx_TransitionSlideInR_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionSlideInR:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -37336,7 +38901,7 @@ int lua_cocos2dx_TransitionSlideInR_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionSlideInR",(cocos2d::TransitionSlideInR*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionSlideInR:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -37399,7 +38964,7 @@ int lua_cocos2dx_TransitionSlideInB_action(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "action",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionSlideInB:action",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -37428,7 +38993,7 @@ int lua_cocos2dx_TransitionSlideInB_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionSlideInB:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -37436,7 +39001,7 @@ int lua_cocos2dx_TransitionSlideInB_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionSlideInB",(cocos2d::TransitionSlideInB*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionSlideInB:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -37499,7 +39064,7 @@ int lua_cocos2dx_TransitionSlideInT_action(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "action",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionSlideInT:action",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -37528,7 +39093,7 @@ int lua_cocos2dx_TransitionSlideInT_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionSlideInT:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -37536,7 +39101,7 @@ int lua_cocos2dx_TransitionSlideInT_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionSlideInT",(cocos2d::TransitionSlideInT*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionSlideInT:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -37602,7 +39167,7 @@ int lua_cocos2dx_TransitionShrinkGrow_easeActionWithAction(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "easeActionWithAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionShrinkGrow:easeActionWithAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -37631,7 +39196,7 @@ int lua_cocos2dx_TransitionShrinkGrow_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionShrinkGrow:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -37639,7 +39204,7 @@ int lua_cocos2dx_TransitionShrinkGrow_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionShrinkGrow",(cocos2d::TransitionShrinkGrow*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionShrinkGrow:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -37687,7 +39252,7 @@ int lua_cocos2dx_TransitionFlipX_create(lua_State* tolua_S) if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionFlipX:create"); if (!ok) { break; } cocos2d::Scene* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); @@ -37703,13 +39268,13 @@ int lua_cocos2dx_TransitionFlipX_create(lua_State* tolua_S) if (argc == 3) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionFlipX:create"); if (!ok) { break; } cocos2d::Scene* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if (!ok) { break; } cocos2d::TransitionScene::Orientation arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.TransitionFlipX:create"); if (!ok) { break; } cocos2d::TransitionFlipX* ret = cocos2d::TransitionFlipX::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.TransitionFlipX",(cocos2d::TransitionFlipX*)ret); @@ -37717,7 +39282,7 @@ int lua_cocos2dx_TransitionFlipX_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.TransitionFlipX:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -37764,7 +39329,7 @@ int lua_cocos2dx_TransitionFlipY_create(lua_State* tolua_S) if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionFlipY:create"); if (!ok) { break; } cocos2d::Scene* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); @@ -37780,13 +39345,13 @@ int lua_cocos2dx_TransitionFlipY_create(lua_State* tolua_S) if (argc == 3) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionFlipY:create"); if (!ok) { break; } cocos2d::Scene* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if (!ok) { break; } cocos2d::TransitionScene::Orientation arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.TransitionFlipY:create"); if (!ok) { break; } cocos2d::TransitionFlipY* ret = cocos2d::TransitionFlipY::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.TransitionFlipY",(cocos2d::TransitionFlipY*)ret); @@ -37794,7 +39359,7 @@ int lua_cocos2dx_TransitionFlipY_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.TransitionFlipY:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -37841,7 +39406,7 @@ int lua_cocos2dx_TransitionFlipAngular_create(lua_State* tolua_S) if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionFlipAngular:create"); if (!ok) { break; } cocos2d::Scene* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); @@ -37857,13 +39422,13 @@ int lua_cocos2dx_TransitionFlipAngular_create(lua_State* tolua_S) if (argc == 3) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionFlipAngular:create"); if (!ok) { break; } cocos2d::Scene* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if (!ok) { break; } cocos2d::TransitionScene::Orientation arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.TransitionFlipAngular:create"); if (!ok) { break; } cocos2d::TransitionFlipAngular* ret = cocos2d::TransitionFlipAngular::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.TransitionFlipAngular",(cocos2d::TransitionFlipAngular*)ret); @@ -37871,7 +39436,7 @@ int lua_cocos2dx_TransitionFlipAngular_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.TransitionFlipAngular:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -37918,7 +39483,7 @@ int lua_cocos2dx_TransitionZoomFlipX_create(lua_State* tolua_S) if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionZoomFlipX:create"); if (!ok) { break; } cocos2d::Scene* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); @@ -37934,13 +39499,13 @@ int lua_cocos2dx_TransitionZoomFlipX_create(lua_State* tolua_S) if (argc == 3) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionZoomFlipX:create"); if (!ok) { break; } cocos2d::Scene* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if (!ok) { break; } cocos2d::TransitionScene::Orientation arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.TransitionZoomFlipX:create"); if (!ok) { break; } cocos2d::TransitionZoomFlipX* ret = cocos2d::TransitionZoomFlipX::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.TransitionZoomFlipX",(cocos2d::TransitionZoomFlipX*)ret); @@ -37948,7 +39513,7 @@ int lua_cocos2dx_TransitionZoomFlipX_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.TransitionZoomFlipX:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -37995,7 +39560,7 @@ int lua_cocos2dx_TransitionZoomFlipY_create(lua_State* tolua_S) if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionZoomFlipY:create"); if (!ok) { break; } cocos2d::Scene* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); @@ -38011,13 +39576,13 @@ int lua_cocos2dx_TransitionZoomFlipY_create(lua_State* tolua_S) if (argc == 3) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionZoomFlipY:create"); if (!ok) { break; } cocos2d::Scene* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if (!ok) { break; } cocos2d::TransitionScene::Orientation arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.TransitionZoomFlipY:create"); if (!ok) { break; } cocos2d::TransitionZoomFlipY* ret = cocos2d::TransitionZoomFlipY::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.TransitionZoomFlipY",(cocos2d::TransitionZoomFlipY*)ret); @@ -38025,7 +39590,7 @@ int lua_cocos2dx_TransitionZoomFlipY_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.TransitionZoomFlipY:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -38072,7 +39637,7 @@ int lua_cocos2dx_TransitionZoomFlipAngular_create(lua_State* tolua_S) if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionZoomFlipAngular:create"); if (!ok) { break; } cocos2d::Scene* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); @@ -38088,13 +39653,13 @@ int lua_cocos2dx_TransitionZoomFlipAngular_create(lua_State* tolua_S) if (argc == 3) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionZoomFlipAngular:create"); if (!ok) { break; } cocos2d::Scene* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if (!ok) { break; } cocos2d::TransitionScene::Orientation arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.TransitionZoomFlipAngular:create"); if (!ok) { break; } cocos2d::TransitionZoomFlipAngular* ret = cocos2d::TransitionZoomFlipAngular::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.TransitionZoomFlipAngular",(cocos2d::TransitionZoomFlipAngular*)ret); @@ -38102,7 +39667,7 @@ int lua_cocos2dx_TransitionZoomFlipAngular_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.TransitionZoomFlipAngular:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -38149,7 +39714,7 @@ int lua_cocos2dx_TransitionFade_create(lua_State* tolua_S) if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionFade:create"); if (!ok) { break; } cocos2d::Scene* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); @@ -38165,13 +39730,13 @@ int lua_cocos2dx_TransitionFade_create(lua_State* tolua_S) if (argc == 3) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionFade:create"); if (!ok) { break; } cocos2d::Scene* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if (!ok) { break; } cocos2d::Color3B arg2; - ok &= luaval_to_color3b(tolua_S, 4, &arg2); + ok &= luaval_to_color3b(tolua_S, 4, &arg2, "cc.TransitionFade:create"); if (!ok) { break; } cocos2d::TransitionFade* ret = cocos2d::TransitionFade::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.TransitionFade",(cocos2d::TransitionFade*)ret); @@ -38179,7 +39744,7 @@ int lua_cocos2dx_TransitionFade_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.TransitionFade:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -38226,7 +39791,7 @@ int lua_cocos2dx_TransitionCrossFade_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionCrossFade:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -38234,7 +39799,7 @@ int lua_cocos2dx_TransitionCrossFade_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionCrossFade",(cocos2d::TransitionCrossFade*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionCrossFade:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -38299,7 +39864,7 @@ int lua_cocos2dx_TransitionTurnOffTiles_easeActionWithAction(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "easeActionWithAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionTurnOffTiles:easeActionWithAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -38328,7 +39893,7 @@ int lua_cocos2dx_TransitionTurnOffTiles_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionTurnOffTiles:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -38336,7 +39901,7 @@ int lua_cocos2dx_TransitionTurnOffTiles_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionTurnOffTiles",(cocos2d::TransitionTurnOffTiles*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionTurnOffTiles:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -38399,7 +39964,7 @@ int lua_cocos2dx_TransitionSplitCols_action(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "action",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionSplitCols:action",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -38446,7 +40011,7 @@ int lua_cocos2dx_TransitionSplitCols_easeActionWithAction(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "easeActionWithAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionSplitCols:easeActionWithAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -38475,7 +40040,7 @@ int lua_cocos2dx_TransitionSplitCols_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionSplitCols:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -38483,7 +40048,7 @@ int lua_cocos2dx_TransitionSplitCols_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionSplitCols",(cocos2d::TransitionSplitCols*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionSplitCols:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -38532,7 +40097,7 @@ int lua_cocos2dx_TransitionSplitRows_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionSplitRows:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -38540,7 +40105,7 @@ int lua_cocos2dx_TransitionSplitRows_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionSplitRows",(cocos2d::TransitionSplitRows*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionSplitRows:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -38605,7 +40170,7 @@ int lua_cocos2dx_TransitionFadeTR_easeActionWithAction(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "easeActionWithAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionFadeTR:easeActionWithAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -38645,14 +40210,14 @@ int lua_cocos2dx_TransitionFadeTR_actionWithSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.TransitionFadeTR:actionWithSize"); if(!ok) return 0; cocos2d::ActionInterval* ret = cobj->actionWithSize(arg0); object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "actionWithSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionFadeTR:actionWithSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -38681,7 +40246,7 @@ int lua_cocos2dx_TransitionFadeTR_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionFadeTR:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -38689,7 +40254,7 @@ int lua_cocos2dx_TransitionFadeTR_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionFadeTR",(cocos2d::TransitionFadeTR*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionFadeTR:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -38738,7 +40303,7 @@ int lua_cocos2dx_TransitionFadeBL_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionFadeBL:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -38746,7 +40311,7 @@ int lua_cocos2dx_TransitionFadeBL_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionFadeBL",(cocos2d::TransitionFadeBL*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionFadeBL:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -38793,7 +40358,7 @@ int lua_cocos2dx_TransitionFadeUp_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionFadeUp:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -38801,7 +40366,7 @@ int lua_cocos2dx_TransitionFadeUp_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionFadeUp",(cocos2d::TransitionFadeUp*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionFadeUp:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -38848,7 +40413,7 @@ int lua_cocos2dx_TransitionFadeDown_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionFadeDown:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -38856,7 +40421,7 @@ int lua_cocos2dx_TransitionFadeDown_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionFadeDown",(cocos2d::TransitionFadeDown*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionFadeDown:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -38914,14 +40479,14 @@ int lua_cocos2dx_TransitionPageTurn_actionWithSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.TransitionPageTurn:actionWithSize"); if(!ok) return 0; cocos2d::ActionInterval* ret = cobj->actionWithSize(arg0); object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "actionWithSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionPageTurn:actionWithSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -38963,18 +40528,18 @@ int lua_cocos2dx_TransitionPageTurn_initWithDuration(lua_State* tolua_S) cocos2d::Scene* arg1; bool arg2; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionPageTurn:initWithDuration"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.TransitionPageTurn:initWithDuration"); if(!ok) return 0; bool ret = cobj->initWithDuration(arg0, arg1, arg2); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithDuration",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionPageTurn:initWithDuration",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -39004,16 +40569,16 @@ int lua_cocos2dx_TransitionPageTurn_create(lua_State* tolua_S) double arg0; cocos2d::Scene* arg1; bool arg2; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionPageTurn:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.TransitionPageTurn:create"); if(!ok) return 0; cocos2d::TransitionPageTurn* ret = cocos2d::TransitionPageTurn::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.TransitionPageTurn",(cocos2d::TransitionPageTurn*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionPageTurn:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -39062,7 +40627,7 @@ int lua_cocos2dx_TransitionProgress_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionProgress:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -39070,7 +40635,7 @@ int lua_cocos2dx_TransitionProgress_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionProgress",(cocos2d::TransitionProgress*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionProgress:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -39117,7 +40682,7 @@ int lua_cocos2dx_TransitionProgressRadialCCW_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionProgressRadialCCW:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -39125,7 +40690,7 @@ int lua_cocos2dx_TransitionProgressRadialCCW_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionProgressRadialCCW",(cocos2d::TransitionProgressRadialCCW*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionProgressRadialCCW:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -39172,7 +40737,7 @@ int lua_cocos2dx_TransitionProgressRadialCW_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionProgressRadialCW:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -39180,7 +40745,7 @@ int lua_cocos2dx_TransitionProgressRadialCW_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionProgressRadialCW",(cocos2d::TransitionProgressRadialCW*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionProgressRadialCW:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -39227,7 +40792,7 @@ int lua_cocos2dx_TransitionProgressHorizontal_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionProgressHorizontal:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -39235,7 +40800,7 @@ int lua_cocos2dx_TransitionProgressHorizontal_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionProgressHorizontal",(cocos2d::TransitionProgressHorizontal*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionProgressHorizontal:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -39282,7 +40847,7 @@ int lua_cocos2dx_TransitionProgressVertical_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionProgressVertical:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -39290,7 +40855,7 @@ int lua_cocos2dx_TransitionProgressVertical_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionProgressVertical",(cocos2d::TransitionProgressVertical*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionProgressVertical:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -39337,7 +40902,7 @@ int lua_cocos2dx_TransitionProgressInOut_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionProgressInOut:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -39345,7 +40910,7 @@ int lua_cocos2dx_TransitionProgressInOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionProgressInOut",(cocos2d::TransitionProgressInOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionProgressInOut:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -39392,7 +40957,7 @@ int lua_cocos2dx_TransitionProgressOutIn_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionProgressOutIn:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -39400,7 +40965,7 @@ int lua_cocos2dx_TransitionProgressOutIn_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionProgressOutIn",(cocos2d::TransitionProgressOutIn*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionProgressOutIn:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -39458,13 +41023,13 @@ int lua_cocos2dx_MenuItem_setEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.MenuItem:setEnabled"); if(!ok) return 0; cobj->setEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItem:setEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -39507,7 +41072,7 @@ int lua_cocos2dx_MenuItem_activate(lua_State* tolua_S) cobj->activate(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "activate",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItem:activate",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -39551,7 +41116,7 @@ int lua_cocos2dx_MenuItem_isEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItem:isEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -39594,7 +41159,7 @@ int lua_cocos2dx_MenuItem_selected(lua_State* tolua_S) cobj->selected(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "selected",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItem:selected",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -39638,7 +41203,7 @@ int lua_cocos2dx_MenuItem_isSelected(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isSelected",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItem:isSelected",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -39681,7 +41246,7 @@ int lua_cocos2dx_MenuItem_unselected(lua_State* tolua_S) cobj->unselected(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "unselected",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItem:unselected",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -39725,7 +41290,7 @@ int lua_cocos2dx_MenuItem_rect(lua_State* tolua_S) rect_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "rect",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItem:rect",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -39795,7 +41360,7 @@ int lua_cocos2dx_MenuItemLabel_getDisabledColor(lua_State* tolua_S) color3b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDisabledColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemLabel:getDisabledColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -39835,13 +41400,13 @@ int lua_cocos2dx_MenuItemLabel_setString(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.MenuItemLabel:setString"); if(!ok) return 0; cobj->setString(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setString",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemLabel:setString",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -39887,7 +41452,7 @@ int lua_cocos2dx_MenuItemLabel_setLabel(lua_State* tolua_S) cobj->setLabel(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLabel",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemLabel:setLabel",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -39927,13 +41492,13 @@ int lua_cocos2dx_MenuItemLabel_setDisabledColor(lua_State* tolua_S) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.MenuItemLabel:setDisabledColor"); if(!ok) return 0; cobj->setDisabledColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDisabledColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemLabel:setDisabledColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -39977,7 +41542,7 @@ int lua_cocos2dx_MenuItemLabel_getLabel(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLabel",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemLabel:getLabel",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -40064,7 +41629,7 @@ int lua_cocos2dx_MenuItemFont_getFontSizeObj(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFontSizeObj",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemFont:getFontSizeObj",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -40108,7 +41673,7 @@ int lua_cocos2dx_MenuItemFont_getFontNameObj(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFontNameObj",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemFont:getFontNameObj",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -40148,13 +41713,13 @@ int lua_cocos2dx_MenuItemFont_setFontSizeObj(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.MenuItemFont:setFontSizeObj"); if(!ok) return 0; cobj->setFontSizeObj(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFontSizeObj",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemFont:setFontSizeObj",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -40194,13 +41759,13 @@ int lua_cocos2dx_MenuItemFont_setFontNameObj(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.MenuItemFont:setFontNameObj"); if(!ok) return 0; cobj->setFontNameObj(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFontNameObj",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemFont:setFontNameObj",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -40228,13 +41793,13 @@ int lua_cocos2dx_MenuItemFont_setFontName(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.MenuItemFont:setFontName"); if(!ok) return 0; cocos2d::MenuItemFont::setFontName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "setFontName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.MenuItemFont:setFontName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -40265,7 +41830,7 @@ int lua_cocos2dx_MenuItemFont_getFontSize(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getFontSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.MenuItemFont:getFontSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -40296,7 +41861,7 @@ int lua_cocos2dx_MenuItemFont_getFontName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getFontName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.MenuItemFont:getFontName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -40322,13 +41887,13 @@ int lua_cocos2dx_MenuItemFont_setFontSize(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.MenuItemFont:setFontSize"); if(!ok) return 0; cocos2d::MenuItemFont::setFontSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "setFontSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.MenuItemFont:setFontSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -40393,13 +41958,13 @@ int lua_cocos2dx_MenuItemSprite_setEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.MenuItemSprite:setEnabled"); if(!ok) return 0; cobj->setEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemSprite:setEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -40442,7 +42007,7 @@ int lua_cocos2dx_MenuItemSprite_selected(lua_State* tolua_S) cobj->selected(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "selected",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemSprite:selected",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -40488,7 +42053,7 @@ int lua_cocos2dx_MenuItemSprite_setNormalImage(lua_State* tolua_S) cobj->setNormalImage(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setNormalImage",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemSprite:setNormalImage",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -40534,7 +42099,7 @@ int lua_cocos2dx_MenuItemSprite_setDisabledImage(lua_State* tolua_S) cobj->setDisabledImage(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDisabledImage",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemSprite:setDisabledImage",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -40580,7 +42145,7 @@ int lua_cocos2dx_MenuItemSprite_setSelectedImage(lua_State* tolua_S) cobj->setSelectedImage(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSelectedImage",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemSprite:setSelectedImage",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -40624,7 +42189,7 @@ int lua_cocos2dx_MenuItemSprite_getDisabledImage(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDisabledImage",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemSprite:getDisabledImage",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -40668,7 +42233,7 @@ int lua_cocos2dx_MenuItemSprite_getSelectedImage(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSelectedImage",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemSprite:getSelectedImage",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -40712,7 +42277,7 @@ int lua_cocos2dx_MenuItemSprite_getNormalImage(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNormalImage",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemSprite:getNormalImage",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -40755,7 +42320,7 @@ int lua_cocos2dx_MenuItemSprite_unselected(lua_State* tolua_S) cobj->unselected(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "unselected",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemSprite:unselected",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -40829,7 +42394,7 @@ int lua_cocos2dx_MenuItemImage_setDisabledSpriteFrame(lua_State* tolua_S) cobj->setDisabledSpriteFrame(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDisabledSpriteFrame",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemImage:setDisabledSpriteFrame",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -40875,7 +42440,7 @@ int lua_cocos2dx_MenuItemImage_setSelectedSpriteFrame(lua_State* tolua_S) cobj->setSelectedSpriteFrame(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSelectedSpriteFrame",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemImage:setSelectedSpriteFrame",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -40921,7 +42486,7 @@ int lua_cocos2dx_MenuItemImage_setNormalSpriteFrame(lua_State* tolua_S) cobj->setNormalSpriteFrame(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setNormalSpriteFrame",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemImage:setNormalSpriteFrame",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -40983,13 +42548,13 @@ int lua_cocos2dx_MenuItemToggle_setSubItems(lua_State* tolua_S) { cocos2d::Vector arg0; - ok &= luaval_to_ccvector(tolua_S, 2, &arg0); + ok &= luaval_to_ccvector(tolua_S, 2, &arg0, "cc.MenuItemToggle:setSubItems"); if(!ok) return 0; cobj->setSubItems(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSubItems",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemToggle:setSubItems",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -41033,7 +42598,7 @@ int lua_cocos2dx_MenuItemToggle_getSelectedIndex(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSelectedIndex",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemToggle:getSelectedIndex",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -41079,7 +42644,7 @@ int lua_cocos2dx_MenuItemToggle_addSubItem(lua_State* tolua_S) cobj->addSubItem(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addSubItem",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemToggle:addSubItem",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -41123,7 +42688,7 @@ int lua_cocos2dx_MenuItemToggle_getSelectedItem(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.MenuItem",(cocos2d::MenuItem*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSelectedItem",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemToggle:getSelectedItem",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -41163,13 +42728,13 @@ int lua_cocos2dx_MenuItemToggle_setSelectedIndex(lua_State* tolua_S) { unsigned int arg0; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.MenuItemToggle:setSelectedIndex"); if(!ok) return 0; cobj->setSelectedIndex(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSelectedIndex",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemToggle:setSelectedIndex",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -41233,13 +42798,13 @@ int lua_cocos2dx_Menu_setEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Menu:setEnabled"); if(!ok) return 0; cobj->setEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Menu:setEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -41282,7 +42847,7 @@ int lua_cocos2dx_Menu_alignItemsVertically(lua_State* tolua_S) cobj->alignItemsVertically(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "alignItemsVertically",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Menu:alignItemsVertically",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -41326,7 +42891,7 @@ int lua_cocos2dx_Menu_isEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Menu:isEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -41366,13 +42931,13 @@ int lua_cocos2dx_Menu_alignItemsHorizontallyWithPadding(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Menu:alignItemsHorizontallyWithPadding"); if(!ok) return 0; cobj->alignItemsHorizontallyWithPadding(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "alignItemsHorizontallyWithPadding",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Menu:alignItemsHorizontallyWithPadding",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -41412,13 +42977,13 @@ int lua_cocos2dx_Menu_alignItemsVerticallyWithPadding(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Menu:alignItemsVerticallyWithPadding"); if(!ok) return 0; cobj->alignItemsVerticallyWithPadding(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "alignItemsVerticallyWithPadding",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Menu:alignItemsVerticallyWithPadding",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -41461,7 +43026,7 @@ int lua_cocos2dx_Menu_alignItemsHorizontally(lua_State* tolua_S) cobj->alignItemsHorizontally(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "alignItemsHorizontally",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Menu:alignItemsHorizontally",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -41530,7 +43095,7 @@ int lua_cocos2dx_ClippingNode_isInverted(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isInverted",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ClippingNode:isInverted",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -41570,13 +43135,13 @@ int lua_cocos2dx_ClippingNode_setInverted(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ClippingNode:setInverted"); if(!ok) return 0; cobj->setInverted(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setInverted",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ClippingNode:setInverted",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -41622,7 +43187,7 @@ int lua_cocos2dx_ClippingNode_setStencil(lua_State* tolua_S) cobj->setStencil(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStencil",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ClippingNode:setStencil",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -41666,7 +43231,7 @@ int lua_cocos2dx_ClippingNode_getAlphaThreshold(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAlphaThreshold",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ClippingNode:getAlphaThreshold",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -41710,7 +43275,7 @@ int lua_cocos2dx_ClippingNode_getStencil(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStencil",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ClippingNode:getStencil",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -41750,13 +43315,13 @@ int lua_cocos2dx_ClippingNode_setAlphaThreshold(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ClippingNode:setAlphaThreshold"); if(!ok) return 0; cobj->setAlphaThreshold(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAlphaThreshold",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ClippingNode:setAlphaThreshold",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -41803,7 +43368,7 @@ int lua_cocos2dx_ClippingNode_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.ClippingNode:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -41870,7 +43435,7 @@ int lua_cocos2dx_MotionStreak_reset(lua_State* tolua_S) cobj->reset(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "reset",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MotionStreak:reset",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -41916,7 +43481,7 @@ int lua_cocos2dx_MotionStreak_setTexture(lua_State* tolua_S) cobj->setTexture(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MotionStreak:setTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -41960,7 +43525,7 @@ int lua_cocos2dx_MotionStreak_getTexture(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Texture2D",(cocos2d::Texture2D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTexture",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MotionStreak:getTexture",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -42000,13 +43565,13 @@ int lua_cocos2dx_MotionStreak_tintWithColor(lua_State* tolua_S) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.MotionStreak:tintWithColor"); if(!ok) return 0; cobj->tintWithColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "tintWithColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MotionStreak:tintWithColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -42046,13 +43611,13 @@ int lua_cocos2dx_MotionStreak_setStartingPositionInitialized(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.MotionStreak:setStartingPositionInitialized"); if(!ok) return 0; cobj->setStartingPositionInitialized(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStartingPositionInitialized",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MotionStreak:setStartingPositionInitialized",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -42096,7 +43661,7 @@ int lua_cocos2dx_MotionStreak_isStartingPositionInitialized(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isStartingPositionInitialized",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MotionStreak:isStartingPositionInitialized",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -42140,7 +43705,7 @@ int lua_cocos2dx_MotionStreak_isFastMode(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isFastMode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MotionStreak:isFastMode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -42180,13 +43745,13 @@ int lua_cocos2dx_MotionStreak_setFastMode(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.MotionStreak:setFastMode"); if(!ok) return 0; cobj->setFastMode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFastMode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MotionStreak:setFastMode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -42215,16 +43780,16 @@ int lua_cocos2dx_MotionStreak_create(lua_State* tolua_S) if (argc == 5) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.MotionStreak:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.MotionStreak:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.MotionStreak:create"); if (!ok) { break; } cocos2d::Color3B arg3; - ok &= luaval_to_color3b(tolua_S, 5, &arg3); + ok &= luaval_to_color3b(tolua_S, 5, &arg3, "cc.MotionStreak:create"); if (!ok) { break; } cocos2d::Texture2D* arg4; ok &= luaval_to_object(tolua_S, 6, "cc.Texture2D",&arg4); @@ -42240,19 +43805,19 @@ int lua_cocos2dx_MotionStreak_create(lua_State* tolua_S) if (argc == 5) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.MotionStreak:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.MotionStreak:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.MotionStreak:create"); if (!ok) { break; } cocos2d::Color3B arg3; - ok &= luaval_to_color3b(tolua_S, 5, &arg3); + ok &= luaval_to_color3b(tolua_S, 5, &arg3, "cc.MotionStreak:create"); if (!ok) { break; } std::string arg4; - ok &= luaval_to_std_string(tolua_S, 6,&arg4); + ok &= luaval_to_std_string(tolua_S, 6,&arg4, "cc.MotionStreak:create"); if (!ok) { break; } cocos2d::MotionStreak* ret = cocos2d::MotionStreak::create(arg0, arg1, arg2, arg3, arg4); object_to_luaval(tolua_S, "cc.MotionStreak",(cocos2d::MotionStreak*)ret); @@ -42260,7 +43825,7 @@ int lua_cocos2dx_MotionStreak_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 5); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.MotionStreak:create",argc, 5); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -42331,7 +43896,7 @@ int lua_cocos2dx_Sprite_setSpriteFrame(lua_State* tolua_S) do{ if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite:setSpriteFrame"); if (!ok) { break; } cobj->setSpriteFrame(arg0); @@ -42339,7 +43904,7 @@ int lua_cocos2dx_Sprite_setSpriteFrame(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSpriteFrame",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:setSpriteFrame",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -42384,7 +43949,7 @@ int lua_cocos2dx_Sprite_setTexture(lua_State* tolua_S) do{ if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite:setTexture"); if (!ok) { break; } cobj->setTexture(arg0); @@ -42392,7 +43957,7 @@ int lua_cocos2dx_Sprite_setTexture(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:setTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -42436,7 +44001,7 @@ int lua_cocos2dx_Sprite_getTexture(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Texture2D",(cocos2d::Texture2D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTexture",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:getTexture",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -42476,13 +44041,13 @@ int lua_cocos2dx_Sprite_setFlippedY(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Sprite:setFlippedY"); if(!ok) return 0; cobj->setFlippedY(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFlippedY",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:setFlippedY",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -42522,13 +44087,13 @@ int lua_cocos2dx_Sprite_setFlippedX(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Sprite:setFlippedX"); if(!ok) return 0; cobj->setFlippedX(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFlippedX",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:setFlippedX",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -42572,7 +44137,7 @@ int lua_cocos2dx_Sprite_getBatchNode(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.SpriteBatchNode",(cocos2d::SpriteBatchNode*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBatchNode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:getBatchNode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -42616,7 +44181,7 @@ int lua_cocos2dx_Sprite_getOffsetPosition(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOffsetPosition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:getOffsetPosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -42656,13 +44221,13 @@ int lua_cocos2dx_Sprite_removeAllChildrenWithCleanup(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Sprite:removeAllChildrenWithCleanup"); if(!ok) return 0; cobj->removeAllChildrenWithCleanup(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllChildrenWithCleanup",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:removeAllChildrenWithCleanup",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -42705,7 +44270,7 @@ int lua_cocos2dx_Sprite_updateTransform(lua_State* tolua_S) cobj->updateTransform(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateTransform",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:updateTransform",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -42739,15 +44304,15 @@ int lua_cocos2dx_Sprite_setTextureRect(lua_State* tolua_S) do{ if (argc == 3) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "cc.Sprite:setTextureRect"); if (!ok) { break; } bool arg1; - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.Sprite:setTextureRect"); if (!ok) { break; } cocos2d::Size arg2; - ok &= luaval_to_size(tolua_S, 4, &arg2); + ok &= luaval_to_size(tolua_S, 4, &arg2, "cc.Sprite:setTextureRect"); if (!ok) { break; } cobj->setTextureRect(arg0, arg1, arg2); @@ -42758,7 +44323,7 @@ int lua_cocos2dx_Sprite_setTextureRect(lua_State* tolua_S) do{ if (argc == 1) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "cc.Sprite:setTextureRect"); if (!ok) { break; } cobj->setTextureRect(arg0); @@ -42766,7 +44331,7 @@ int lua_cocos2dx_Sprite_setTextureRect(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextureRect",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:setTextureRect",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -42813,7 +44378,7 @@ int lua_cocos2dx_Sprite_isFrameDisplayed(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isFrameDisplayed",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:isFrameDisplayed",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -42857,7 +44422,7 @@ int lua_cocos2dx_Sprite_getAtlasIndex(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAtlasIndex",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:getAtlasIndex",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -42903,7 +44468,7 @@ int lua_cocos2dx_Sprite_setBatchNode(lua_State* tolua_S) cobj->setBatchNode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBatchNode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:setBatchNode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -42944,15 +44509,15 @@ int lua_cocos2dx_Sprite_setDisplayFrameWithAnimationName(lua_State* tolua_S) std::string arg0; ssize_t arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite:setDisplayFrameWithAnimationName"); - ok &= luaval_to_ssize(tolua_S, 3, &arg1); + ok &= luaval_to_ssize(tolua_S, 3, &arg1, "cc.Sprite:setDisplayFrameWithAnimationName"); if(!ok) return 0; cobj->setDisplayFrameWithAnimationName(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDisplayFrameWithAnimationName",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:setDisplayFrameWithAnimationName",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -42998,7 +44563,7 @@ int lua_cocos2dx_Sprite_setTextureAtlas(lua_State* tolua_S) cobj->setTextureAtlas(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextureAtlas",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:setTextureAtlas",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -43042,7 +44607,7 @@ int lua_cocos2dx_Sprite_getSpriteFrame(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.SpriteFrame",(cocos2d::SpriteFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSpriteFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:getSpriteFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -43086,7 +44651,7 @@ int lua_cocos2dx_Sprite_isDirty(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isDirty",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:isDirty",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -43126,13 +44691,13 @@ int lua_cocos2dx_Sprite_setAtlasIndex(lua_State* tolua_S) { ssize_t arg0; - ok &= luaval_to_ssize(tolua_S, 2, &arg0); + ok &= luaval_to_ssize(tolua_S, 2, &arg0, "cc.Sprite:setAtlasIndex"); if(!ok) return 0; cobj->setAtlasIndex(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAtlasIndex",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:setAtlasIndex",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -43172,13 +44737,13 @@ int lua_cocos2dx_Sprite_setDirty(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Sprite:setDirty"); if(!ok) return 0; cobj->setDirty(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDirty",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:setDirty",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -43222,7 +44787,7 @@ int lua_cocos2dx_Sprite_isTextureRectRotated(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isTextureRectRotated",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:isTextureRectRotated",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -43266,7 +44831,7 @@ int lua_cocos2dx_Sprite_getTextureRect(lua_State* tolua_S) rect_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextureRect",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:getTextureRect",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -43310,7 +44875,7 @@ int lua_cocos2dx_Sprite_getTextureAtlas(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TextureAtlas",(cocos2d::TextureAtlas*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextureAtlas",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:getTextureAtlas",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -43354,7 +44919,7 @@ int lua_cocos2dx_Sprite_isFlippedX(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isFlippedX",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:isFlippedX",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -43398,7 +44963,7 @@ int lua_cocos2dx_Sprite_isFlippedY(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isFlippedY",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:isFlippedY",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -43438,13 +45003,13 @@ int lua_cocos2dx_Sprite_setVertexRect(lua_State* tolua_S) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "cc.Sprite:setVertexRect"); if(!ok) return 0; cobj->setVertexRect(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVertexRect",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:setVertexRect",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -43473,7 +45038,7 @@ int lua_cocos2dx_Sprite_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite:create"); if (!ok) { break; } cocos2d::Sprite* ret = cocos2d::Sprite::create(arg0); object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); @@ -43496,10 +45061,10 @@ int lua_cocos2dx_Sprite_create(lua_State* tolua_S) if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite:create"); if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Sprite:create"); if (!ok) { break; } cocos2d::Sprite* ret = cocos2d::Sprite::create(arg0, arg1); object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); @@ -43507,7 +45072,7 @@ int lua_cocos2dx_Sprite_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.Sprite:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -43537,7 +45102,7 @@ int lua_cocos2dx_Sprite_createWithTexture(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Texture2D",&arg0); if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Sprite:createWithTexture"); if (!ok) { break; } cocos2d::Sprite* ret = cocos2d::Sprite::createWithTexture(arg0, arg1); object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); @@ -43553,10 +45118,10 @@ int lua_cocos2dx_Sprite_createWithTexture(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Texture2D",&arg0); if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Sprite:createWithTexture"); if (!ok) { break; } bool arg2; - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.Sprite:createWithTexture"); if (!ok) { break; } cocos2d::Sprite* ret = cocos2d::Sprite::createWithTexture(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); @@ -43577,7 +45142,7 @@ int lua_cocos2dx_Sprite_createWithTexture(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "createWithTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.Sprite:createWithTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -43603,14 +45168,14 @@ int lua_cocos2dx_Sprite_createWithSpriteFrameName(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite:createWithSpriteFrameName"); if(!ok) return 0; cocos2d::Sprite* ret = cocos2d::Sprite::createWithSpriteFrameName(arg0); object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithSpriteFrameName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Sprite:createWithSpriteFrameName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -43643,7 +45208,7 @@ int lua_cocos2dx_Sprite_createWithSpriteFrame(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithSpriteFrame",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Sprite:createWithSpriteFrame",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -43733,7 +45298,7 @@ int lua_cocos2dx_ProgressTimer_isReverseDirection(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isReverseDirection",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProgressTimer:isReverseDirection",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -43773,13 +45338,13 @@ int lua_cocos2dx_ProgressTimer_setBarChangeRate(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ProgressTimer:setBarChangeRate"); if(!ok) return 0; cobj->setBarChangeRate(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBarChangeRate",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProgressTimer:setBarChangeRate",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -43823,7 +45388,7 @@ int lua_cocos2dx_ProgressTimer_getPercentage(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPercentage",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProgressTimer:getPercentage",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -43869,7 +45434,7 @@ int lua_cocos2dx_ProgressTimer_setSprite(lua_State* tolua_S) cobj->setSprite(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSprite",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProgressTimer:setSprite",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -43913,7 +45478,7 @@ int lua_cocos2dx_ProgressTimer_getType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProgressTimer:getType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -43957,7 +45522,7 @@ int lua_cocos2dx_ProgressTimer_getSprite(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSprite",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProgressTimer:getSprite",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -43997,13 +45562,13 @@ int lua_cocos2dx_ProgressTimer_setMidpoint(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ProgressTimer:setMidpoint"); if(!ok) return 0; cobj->setMidpoint(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMidpoint",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProgressTimer:setMidpoint",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -44047,7 +45612,7 @@ int lua_cocos2dx_ProgressTimer_getBarChangeRate(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBarChangeRate",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProgressTimer:getBarChangeRate",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -44081,7 +45646,7 @@ int lua_cocos2dx_ProgressTimer_setReverseDirection(lua_State* tolua_S) do{ if (argc == 1) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ProgressTimer:setReverseDirection"); if (!ok) { break; } cobj->setReverseDirection(arg0); @@ -44092,7 +45657,7 @@ int lua_cocos2dx_ProgressTimer_setReverseDirection(lua_State* tolua_S) do{ if (argc == 1) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ProgressTimer:setReverseDirection"); if (!ok) { break; } cobj->setReverseProgress(arg0); @@ -44100,7 +45665,7 @@ int lua_cocos2dx_ProgressTimer_setReverseDirection(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setReverseProgress",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProgressTimer:setReverseProgress",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -44144,7 +45709,7 @@ int lua_cocos2dx_ProgressTimer_getMidpoint(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMidpoint",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProgressTimer:getMidpoint",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -44184,13 +45749,13 @@ int lua_cocos2dx_ProgressTimer_setPercentage(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ProgressTimer:setPercentage"); if(!ok) return 0; cobj->setPercentage(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPercentage",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProgressTimer:setPercentage",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -44230,13 +45795,13 @@ int lua_cocos2dx_ProgressTimer_setType(lua_State* tolua_S) { cocos2d::ProgressTimer::Type arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ProgressTimer:setType"); if(!ok) return 0; cobj->setType(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setType",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProgressTimer:setType",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -44271,7 +45836,7 @@ int lua_cocos2dx_ProgressTimer_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ProgressTimer",(cocos2d::ProgressTimer*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ProgressTimer:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -44345,7 +45910,7 @@ int lua_cocos2dx_Image_hasPremultipliedAlpha(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "hasPremultipliedAlpha",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Image:hasPremultipliedAlpha",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -44385,7 +45950,7 @@ int lua_cocos2dx_Image_saveToFile(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Image:saveToFile"); if(!ok) return 0; bool ret = cobj->saveToFile(arg0); @@ -44397,16 +45962,16 @@ int lua_cocos2dx_Image_saveToFile(lua_State* tolua_S) std::string arg0; bool arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Image:saveToFile"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.Image:saveToFile"); if(!ok) return 0; bool ret = cobj->saveToFile(arg0, arg1); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "saveToFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Image:saveToFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -44416,50 +45981,6 @@ int lua_cocos2dx_Image_saveToFile(lua_State* tolua_S) return 0; } -int lua_cocos2dx_Image_getBitPerPixel(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::Image* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.Image",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::Image*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Image_getBitPerPixel'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - int ret = cobj->getBitPerPixel(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBitPerPixel",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Image_getBitPerPixel'.",&tolua_err); -#endif - - return 0; -} int lua_cocos2dx_Image_hasAlpha(lua_State* tolua_S) { int argc = 0; @@ -44494,7 +46015,7 @@ int lua_cocos2dx_Image_hasAlpha(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "hasAlpha",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Image:hasAlpha",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -44538,7 +46059,7 @@ int lua_cocos2dx_Image_isCompressed(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isCompressed",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Image:isCompressed",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -44582,7 +46103,7 @@ int lua_cocos2dx_Image_getHeight(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getHeight",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Image:getHeight",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -44622,14 +46143,14 @@ int lua_cocos2dx_Image_initWithImageFile(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Image:initWithImageFile"); if(!ok) return 0; bool ret = cobj->initWithImageFile(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithImageFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Image:initWithImageFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -44673,7 +46194,7 @@ int lua_cocos2dx_Image_getWidth(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getWidth",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Image:getWidth",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -44683,7 +46204,7 @@ int lua_cocos2dx_Image_getWidth(lua_State* tolua_S) return 0; } -int lua_cocos2dx_Image_isPremultipliedAlpha(lua_State* tolua_S) +int lua_cocos2dx_Image_getBitPerPixel(lua_State* tolua_S) { int argc = 0; cocos2d::Image* cobj = nullptr; @@ -44703,7 +46224,7 @@ int lua_cocos2dx_Image_isPremultipliedAlpha(lua_State* tolua_S) #if COCOS2D_DEBUG >= 1 if (!cobj) { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Image_isPremultipliedAlpha'", nullptr); + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Image_getBitPerPixel'", nullptr); return 0; } #endif @@ -44713,16 +46234,16 @@ int lua_cocos2dx_Image_isPremultipliedAlpha(lua_State* tolua_S) { if(!ok) return 0; - bool ret = cobj->isPremultipliedAlpha(); - tolua_pushboolean(tolua_S,(bool)ret); + int ret = cobj->getBitPerPixel(); + tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isPremultipliedAlpha",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Image:getBitPerPixel",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Image_isPremultipliedAlpha'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Image_getBitPerPixel'.",&tolua_err); #endif return 0; @@ -44761,7 +46282,7 @@ int lua_cocos2dx_Image_getFileType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFileType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Image:getFileType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -44805,7 +46326,7 @@ int lua_cocos2dx_Image_getNumberOfMipmaps(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNumberOfMipmaps",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Image:getNumberOfMipmaps",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -44849,7 +46370,7 @@ int lua_cocos2dx_Image_getRenderFormat(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRenderFormat",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Image:getRenderFormat",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -44859,6 +46380,38 @@ int lua_cocos2dx_Image_getRenderFormat(lua_State* tolua_S) return 0; } +int lua_cocos2dx_Image_setPVRImagesHavePremultipliedAlpha(lua_State* tolua_S) +{ + int argc = 0; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertable(tolua_S,1,"cc.Image",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 1) + { + bool arg0; + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Image:setPVRImagesHavePremultipliedAlpha"); + if(!ok) + return 0; + cocos2d::Image::setPVRImagesHavePremultipliedAlpha(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Image:setPVRImagesHavePremultipliedAlpha",argc, 1); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Image_setPVRImagesHavePremultipliedAlpha'.",&tolua_err); +#endif + return 0; +} int lua_cocos2dx_Image_constructor(lua_State* tolua_S) { int argc = 0; @@ -44883,7 +46436,7 @@ int lua_cocos2dx_Image_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.Image"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "Image",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Image:Image",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -44908,16 +46461,16 @@ int lua_register_cocos2dx_Image(lua_State* tolua_S) tolua_function(tolua_S,"new",lua_cocos2dx_Image_constructor); tolua_function(tolua_S,"hasPremultipliedAlpha",lua_cocos2dx_Image_hasPremultipliedAlpha); tolua_function(tolua_S,"saveToFile",lua_cocos2dx_Image_saveToFile); - tolua_function(tolua_S,"getBitPerPixel",lua_cocos2dx_Image_getBitPerPixel); tolua_function(tolua_S,"hasAlpha",lua_cocos2dx_Image_hasAlpha); tolua_function(tolua_S,"isCompressed",lua_cocos2dx_Image_isCompressed); tolua_function(tolua_S,"getHeight",lua_cocos2dx_Image_getHeight); tolua_function(tolua_S,"initWithImageFile",lua_cocos2dx_Image_initWithImageFile); tolua_function(tolua_S,"getWidth",lua_cocos2dx_Image_getWidth); - tolua_function(tolua_S,"isPremultipliedAlpha",lua_cocos2dx_Image_isPremultipliedAlpha); + tolua_function(tolua_S,"getBitPerPixel",lua_cocos2dx_Image_getBitPerPixel); tolua_function(tolua_S,"getFileType",lua_cocos2dx_Image_getFileType); tolua_function(tolua_S,"getNumberOfMipmaps",lua_cocos2dx_Image_getNumberOfMipmaps); tolua_function(tolua_S,"getRenderFormat",lua_cocos2dx_Image_getRenderFormat); + tolua_function(tolua_S,"setPVRImagesHavePremultipliedAlpha", lua_cocos2dx_Image_setPVRImagesHavePremultipliedAlpha); tolua_endmodule(tolua_S); std::string typeName = typeid(cocos2d::Image).name(); g_luaType[typeName] = "cc.Image"; @@ -44957,17 +46510,17 @@ int lua_cocos2dx_RenderTexture_setVirtualViewport(lua_State* tolua_S) cocos2d::Rect arg1; cocos2d::Rect arg2; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.RenderTexture:setVirtualViewport"); - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.RenderTexture:setVirtualViewport"); - ok &= luaval_to_rect(tolua_S, 4, &arg2); + ok &= luaval_to_rect(tolua_S, 4, &arg2, "cc.RenderTexture:setVirtualViewport"); if(!ok) return 0; cobj->setVirtualViewport(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVirtualViewport",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:setVirtualViewport",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -45007,13 +46560,13 @@ int lua_cocos2dx_RenderTexture_clearStencil(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.RenderTexture:clearStencil"); if(!ok) return 0; cobj->clearStencil(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "clearStencil",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:clearStencil",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -45057,7 +46610,7 @@ int lua_cocos2dx_RenderTexture_getClearDepth(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getClearDepth",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:getClearDepth",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -45101,7 +46654,7 @@ int lua_cocos2dx_RenderTexture_getClearStencil(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getClearStencil",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:getClearStencil",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -45144,7 +46697,7 @@ int lua_cocos2dx_RenderTexture_end(lua_State* tolua_S) cobj->end(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "end",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:end",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -45184,13 +46737,13 @@ int lua_cocos2dx_RenderTexture_setClearStencil(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.RenderTexture:setClearStencil"); if(!ok) return 0; cobj->setClearStencil(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setClearStencil",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:setClearStencil",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -45236,7 +46789,7 @@ int lua_cocos2dx_RenderTexture_setSprite(lua_State* tolua_S) cobj->setSprite(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSprite",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:setSprite",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -45280,7 +46833,7 @@ int lua_cocos2dx_RenderTexture_getSprite(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSprite",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:getSprite",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -45324,7 +46877,7 @@ int lua_cocos2dx_RenderTexture_isAutoDraw(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isAutoDraw",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:isAutoDraw",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -45364,13 +46917,13 @@ int lua_cocos2dx_RenderTexture_setKeepMatrix(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.RenderTexture:setKeepMatrix"); if(!ok) return 0; cobj->setKeepMatrix(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setKeepMatrix",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:setKeepMatrix",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -45410,13 +46963,13 @@ int lua_cocos2dx_RenderTexture_setClearFlags(lua_State* tolua_S) { unsigned int arg0; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.RenderTexture:setClearFlags"); if(!ok) return 0; cobj->setClearFlags(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setClearFlags",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:setClearFlags",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -45459,7 +47012,7 @@ int lua_cocos2dx_RenderTexture_begin(lua_State* tolua_S) cobj->begin(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "begin",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:begin",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -45493,11 +47046,11 @@ int lua_cocos2dx_RenderTexture_saveToFile(lua_State* tolua_S) do{ if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.RenderTexture:saveToFile"); if (!ok) { break; } cocos2d::Image::Format arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.RenderTexture:saveToFile"); if (!ok) { break; } bool ret = cobj->saveToFile(arg0, arg1); @@ -45509,15 +47062,15 @@ int lua_cocos2dx_RenderTexture_saveToFile(lua_State* tolua_S) do{ if (argc == 3) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.RenderTexture:saveToFile"); if (!ok) { break; } cocos2d::Image::Format arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.RenderTexture:saveToFile"); if (!ok) { break; } bool arg2; - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.RenderTexture:saveToFile"); if (!ok) { break; } bool ret = cobj->saveToFile(arg0, arg1, arg2); @@ -45529,7 +47082,7 @@ int lua_cocos2dx_RenderTexture_saveToFile(lua_State* tolua_S) do{ if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.RenderTexture:saveToFile"); if (!ok) { break; } bool ret = cobj->saveToFile(arg0); @@ -45541,11 +47094,11 @@ int lua_cocos2dx_RenderTexture_saveToFile(lua_State* tolua_S) do{ if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.RenderTexture:saveToFile"); if (!ok) { break; } bool arg1; - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.RenderTexture:saveToFile"); if (!ok) { break; } bool ret = cobj->saveToFile(arg0, arg1); @@ -45554,7 +47107,7 @@ int lua_cocos2dx_RenderTexture_saveToFile(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "saveToFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:saveToFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -45594,13 +47147,13 @@ int lua_cocos2dx_RenderTexture_setAutoDraw(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.RenderTexture:setAutoDraw"); if(!ok) return 0; cobj->setAutoDraw(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAutoDraw",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:setAutoDraw",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -45640,13 +47193,13 @@ int lua_cocos2dx_RenderTexture_setClearColor(lua_State* tolua_S) { cocos2d::Color4F arg0; - ok &=luaval_to_color4f(tolua_S, 2, &arg0); + ok &=luaval_to_color4f(tolua_S, 2, &arg0, "cc.RenderTexture:setClearColor"); if(!ok) return 0; cobj->setClearColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setClearColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:setClearColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -45689,7 +47242,7 @@ int lua_cocos2dx_RenderTexture_endToLua(lua_State* tolua_S) cobj->endToLua(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "endToLua",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:endToLua",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -45723,23 +47276,23 @@ int lua_cocos2dx_RenderTexture_beginWithClear(lua_State* tolua_S) do{ if (argc == 5) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.RenderTexture:beginWithClear"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.RenderTexture:beginWithClear"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.RenderTexture:beginWithClear"); if (!ok) { break; } double arg3; - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.RenderTexture:beginWithClear"); if (!ok) { break; } double arg4; - ok &= luaval_to_number(tolua_S, 6,&arg4); + ok &= luaval_to_number(tolua_S, 6,&arg4, "cc.RenderTexture:beginWithClear"); if (!ok) { break; } cobj->beginWithClear(arg0, arg1, arg2, arg3, arg4); @@ -45750,19 +47303,19 @@ int lua_cocos2dx_RenderTexture_beginWithClear(lua_State* tolua_S) do{ if (argc == 4) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.RenderTexture:beginWithClear"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.RenderTexture:beginWithClear"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.RenderTexture:beginWithClear"); if (!ok) { break; } double arg3; - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.RenderTexture:beginWithClear"); if (!ok) { break; } cobj->beginWithClear(arg0, arg1, arg2, arg3); @@ -45773,27 +47326,27 @@ int lua_cocos2dx_RenderTexture_beginWithClear(lua_State* tolua_S) do{ if (argc == 6) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.RenderTexture:beginWithClear"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.RenderTexture:beginWithClear"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.RenderTexture:beginWithClear"); if (!ok) { break; } double arg3; - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.RenderTexture:beginWithClear"); if (!ok) { break; } double arg4; - ok &= luaval_to_number(tolua_S, 6,&arg4); + ok &= luaval_to_number(tolua_S, 6,&arg4, "cc.RenderTexture:beginWithClear"); if (!ok) { break; } int arg5; - ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5); + ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5, "cc.RenderTexture:beginWithClear"); if (!ok) { break; } cobj->beginWithClear(arg0, arg1, arg2, arg3, arg4, arg5); @@ -45801,7 +47354,7 @@ int lua_cocos2dx_RenderTexture_beginWithClear(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "beginWithClear",argc, 6); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:beginWithClear",argc, 6); return 0; #if COCOS2D_DEBUG >= 1 @@ -45841,13 +47394,13 @@ int lua_cocos2dx_RenderTexture_clearDepth(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.RenderTexture:clearDepth"); if(!ok) return 0; cobj->clearDepth(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "clearDepth",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:clearDepth",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -45891,7 +47444,7 @@ int lua_cocos2dx_RenderTexture_getClearColor(lua_State* tolua_S) color4f_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getClearColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:getClearColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -45934,19 +47487,19 @@ int lua_cocos2dx_RenderTexture_clear(lua_State* tolua_S) double arg2; double arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.RenderTexture:clear"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.RenderTexture:clear"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.RenderTexture:clear"); - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.RenderTexture:clear"); if(!ok) return 0; cobj->clear(arg0, arg1, arg2, arg3); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "clear",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:clear",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 @@ -45990,7 +47543,7 @@ int lua_cocos2dx_RenderTexture_getClearFlags(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getClearFlags",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:getClearFlags",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -46038,14 +47591,14 @@ int lua_cocos2dx_RenderTexture_newImage(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.RenderTexture:newImage"); if(!ok) return 0; cocos2d::Image* ret = cobj->newImage(arg0); object_to_luaval(tolua_S, "cc.Image",(cocos2d::Image*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "newImage",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:newImage",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -46085,13 +47638,13 @@ int lua_cocos2dx_RenderTexture_setClearDepth(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.RenderTexture:setClearDepth"); if(!ok) return 0; cobj->setClearDepth(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setClearDepth",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:setClearDepth",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -46125,19 +47678,19 @@ int lua_cocos2dx_RenderTexture_initWithWidthAndHeight(lua_State* tolua_S) do{ if (argc == 4) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.RenderTexture:initWithWidthAndHeight"); if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.RenderTexture:initWithWidthAndHeight"); if (!ok) { break; } cocos2d::Texture2D::PixelFormat arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.RenderTexture:initWithWidthAndHeight"); if (!ok) { break; } unsigned int arg3; - ok &= luaval_to_uint32(tolua_S, 5,&arg3); + ok &= luaval_to_uint32(tolua_S, 5,&arg3, "cc.RenderTexture:initWithWidthAndHeight"); if (!ok) { break; } bool ret = cobj->initWithWidthAndHeight(arg0, arg1, arg2, arg3); @@ -46149,15 +47702,15 @@ int lua_cocos2dx_RenderTexture_initWithWidthAndHeight(lua_State* tolua_S) do{ if (argc == 3) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.RenderTexture:initWithWidthAndHeight"); if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.RenderTexture:initWithWidthAndHeight"); if (!ok) { break; } cocos2d::Texture2D::PixelFormat arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.RenderTexture:initWithWidthAndHeight"); if (!ok) { break; } bool ret = cobj->initWithWidthAndHeight(arg0, arg1, arg2); @@ -46166,7 +47719,7 @@ int lua_cocos2dx_RenderTexture_initWithWidthAndHeight(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithWidthAndHeight",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:initWithWidthAndHeight",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -46195,13 +47748,13 @@ int lua_cocos2dx_RenderTexture_create(lua_State* tolua_S) if (argc == 3) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.RenderTexture:create"); if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.RenderTexture:create"); if (!ok) { break; } cocos2d::Texture2D::PixelFormat arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.RenderTexture:create"); if (!ok) { break; } cocos2d::RenderTexture* ret = cocos2d::RenderTexture::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.RenderTexture",(cocos2d::RenderTexture*)ret); @@ -46214,16 +47767,16 @@ int lua_cocos2dx_RenderTexture_create(lua_State* tolua_S) if (argc == 4) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.RenderTexture:create"); if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.RenderTexture:create"); if (!ok) { break; } cocos2d::Texture2D::PixelFormat arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.RenderTexture:create"); if (!ok) { break; } unsigned int arg3; - ok &= luaval_to_uint32(tolua_S, 5,&arg3); + ok &= luaval_to_uint32(tolua_S, 5,&arg3, "cc.RenderTexture:create"); if (!ok) { break; } cocos2d::RenderTexture* ret = cocos2d::RenderTexture::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.RenderTexture",(cocos2d::RenderTexture*)ret); @@ -46236,10 +47789,10 @@ int lua_cocos2dx_RenderTexture_create(lua_State* tolua_S) if (argc == 2) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.RenderTexture:create"); if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.RenderTexture:create"); if (!ok) { break; } cocos2d::RenderTexture* ret = cocos2d::RenderTexture::create(arg0, arg1); object_to_luaval(tolua_S, "cc.RenderTexture",(cocos2d::RenderTexture*)ret); @@ -46247,7 +47800,7 @@ int lua_cocos2dx_RenderTexture_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.RenderTexture:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -46279,7 +47832,7 @@ int lua_cocos2dx_RenderTexture_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.RenderTexture"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "RenderTexture",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:RenderTexture",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -46370,7 +47923,7 @@ int lua_cocos2dx_NodeGrid_setTarget(lua_State* tolua_S) cobj->setTarget(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTarget",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.NodeGrid:setTarget",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -46417,7 +47970,7 @@ int lua_cocos2dx_NodeGrid_getGrid(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGrid",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.NodeGrid:getGrid",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -46463,7 +48016,7 @@ int lua_cocos2dx_NodeGrid_setGrid(lua_State* tolua_S) cobj->setGrid(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGrid",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.NodeGrid:setGrid",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -46496,7 +48049,7 @@ int lua_cocos2dx_NodeGrid_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.NodeGrid",(cocos2d::NodeGrid*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.NodeGrid:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -46563,7 +48116,7 @@ int lua_cocos2dx_ParticleBatchNode_setTexture(lua_State* tolua_S) cobj->setTexture(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleBatchNode:setTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -46603,13 +48156,13 @@ int lua_cocos2dx_ParticleBatchNode_disableParticle(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleBatchNode:disableParticle"); if(!ok) return 0; cobj->disableParticle(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "disableParticle",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleBatchNode:disableParticle",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -46653,7 +48206,7 @@ int lua_cocos2dx_ParticleBatchNode_getTexture(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Texture2D",(cocos2d::Texture2D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTexture",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleBatchNode:getTexture",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -46699,7 +48252,7 @@ int lua_cocos2dx_ParticleBatchNode_setTextureAtlas(lua_State* tolua_S) cobj->setTextureAtlas(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextureAtlas",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleBatchNode:setTextureAtlas",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -46739,13 +48292,13 @@ int lua_cocos2dx_ParticleBatchNode_removeAllChildrenWithCleanup(lua_State* tolua { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ParticleBatchNode:removeAllChildrenWithCleanup"); if(!ok) return 0; cobj->removeAllChildrenWithCleanup(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllChildrenWithCleanup",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleBatchNode:removeAllChildrenWithCleanup",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -46789,7 +48342,7 @@ int lua_cocos2dx_ParticleBatchNode_getTextureAtlas(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TextureAtlas",(cocos2d::TextureAtlas*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextureAtlas",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleBatchNode:getTextureAtlas",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -46832,13 +48385,13 @@ int lua_cocos2dx_ParticleBatchNode_insertChild(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.ParticleSystem",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ParticleBatchNode:insertChild"); if(!ok) return 0; cobj->insertChild(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "insertChild",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleBatchNode:insertChild",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -46879,15 +48432,15 @@ int lua_cocos2dx_ParticleBatchNode_removeChildAtIndex(lua_State* tolua_S) int arg0; bool arg1; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleBatchNode:removeChildAtIndex"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.ParticleBatchNode:removeChildAtIndex"); if(!ok) return 0; cobj->removeChildAtIndex(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeChildAtIndex",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleBatchNode:removeChildAtIndex",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -46915,7 +48468,7 @@ int lua_cocos2dx_ParticleBatchNode_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.ParticleBatchNode:create"); if(!ok) return 0; cocos2d::ParticleBatchNode* ret = cocos2d::ParticleBatchNode::create(arg0); @@ -46926,15 +48479,15 @@ int lua_cocos2dx_ParticleBatchNode_create(lua_State* tolua_S) { std::string arg0; int arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.ParticleBatchNode:create"); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ParticleBatchNode:create"); if(!ok) return 0; cocos2d::ParticleBatchNode* ret = cocos2d::ParticleBatchNode::create(arg0, arg1); object_to_luaval(tolua_S, "cc.ParticleBatchNode",(cocos2d::ParticleBatchNode*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleBatchNode:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -46972,14 +48525,14 @@ int lua_cocos2dx_ParticleBatchNode_createWithTexture(lua_State* tolua_S) cocos2d::Texture2D* arg0; int arg1; ok &= luaval_to_object(tolua_S, 2, "cc.Texture2D",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ParticleBatchNode:createWithTexture"); if(!ok) return 0; cocos2d::ParticleBatchNode* ret = cocos2d::ParticleBatchNode::createWithTexture(arg0, arg1); object_to_luaval(tolua_S, "cc.ParticleBatchNode",(cocos2d::ParticleBatchNode*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleBatchNode:createWithTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -47050,7 +48603,7 @@ int lua_cocos2dx_ParticleSystem_getStartSizeVar(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartSizeVar",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getStartSizeVar",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -47094,7 +48647,7 @@ int lua_cocos2dx_ParticleSystem_getTexture(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Texture2D",(cocos2d::Texture2D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTexture",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getTexture",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -47138,7 +48691,7 @@ int lua_cocos2dx_ParticleSystem_isFull(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isFull",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:isFull",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -47182,7 +48735,7 @@ int lua_cocos2dx_ParticleSystem_getBatchNode(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ParticleBatchNode",(cocos2d::ParticleBatchNode*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBatchNode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getBatchNode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -47226,7 +48779,7 @@ int lua_cocos2dx_ParticleSystem_getStartColor(lua_State* tolua_S) color4f_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getStartColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -47270,7 +48823,7 @@ int lua_cocos2dx_ParticleSystem_getPositionType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPositionType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getPositionType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -47310,13 +48863,13 @@ int lua_cocos2dx_ParticleSystem_setPosVar(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ParticleSystem:setPosVar"); if(!ok) return 0; cobj->setPosVar(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPosVar",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setPosVar",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -47360,7 +48913,7 @@ int lua_cocos2dx_ParticleSystem_getEndSpin(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEndSpin",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getEndSpin",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -47400,13 +48953,13 @@ int lua_cocos2dx_ParticleSystem_setRotatePerSecondVar(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setRotatePerSecondVar"); if(!ok) return 0; cobj->setRotatePerSecondVar(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRotatePerSecondVar",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setRotatePerSecondVar",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -47450,7 +49003,7 @@ int lua_cocos2dx_ParticleSystem_getStartSpinVar(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartSpinVar",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getStartSpinVar",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -47494,7 +49047,7 @@ int lua_cocos2dx_ParticleSystem_getRadialAccelVar(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRadialAccelVar",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getRadialAccelVar",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -47538,7 +49091,7 @@ int lua_cocos2dx_ParticleSystem_getEndSizeVar(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEndSizeVar",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getEndSizeVar",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -47578,13 +49131,13 @@ int lua_cocos2dx_ParticleSystem_setRotation(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setRotation"); if(!ok) return 0; cobj->setRotation(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRotation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setRotation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -47624,13 +49177,13 @@ int lua_cocos2dx_ParticleSystem_setTangentialAccel(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setTangentialAccel"); if(!ok) return 0; cobj->setTangentialAccel(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTangentialAccel",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setTangentialAccel",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -47670,13 +49223,13 @@ int lua_cocos2dx_ParticleSystem_setScaleY(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setScaleY"); if(!ok) return 0; cobj->setScaleY(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScaleY",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setScaleY",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -47716,13 +49269,13 @@ int lua_cocos2dx_ParticleSystem_setScaleX(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setScaleX"); if(!ok) return 0; cobj->setScaleX(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScaleX",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setScaleX",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -47766,7 +49319,7 @@ int lua_cocos2dx_ParticleSystem_getRadialAccel(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRadialAccel",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getRadialAccel",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -47806,13 +49359,13 @@ int lua_cocos2dx_ParticleSystem_setStartRadius(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setStartRadius"); if(!ok) return 0; cobj->setStartRadius(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStartRadius",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setStartRadius",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -47852,13 +49405,13 @@ int lua_cocos2dx_ParticleSystem_setRotatePerSecond(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setRotatePerSecond"); if(!ok) return 0; cobj->setRotatePerSecond(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRotatePerSecond",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setRotatePerSecond",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -47898,13 +49451,13 @@ int lua_cocos2dx_ParticleSystem_setEndSize(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setEndSize"); if(!ok) return 0; cobj->setEndSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEndSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setEndSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -47948,7 +49501,7 @@ int lua_cocos2dx_ParticleSystem_getGravity(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGravity",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getGravity",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -47992,7 +49545,7 @@ int lua_cocos2dx_ParticleSystem_getTangentialAccel(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTangentialAccel",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getTangentialAccel",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -48032,13 +49585,13 @@ int lua_cocos2dx_ParticleSystem_setEndRadius(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setEndRadius"); if(!ok) return 0; cobj->setEndRadius(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEndRadius",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setEndRadius",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -48082,7 +49635,7 @@ int lua_cocos2dx_ParticleSystem_getSpeed(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSpeed",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getSpeed",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -48126,7 +49679,7 @@ int lua_cocos2dx_ParticleSystem_getAngle(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAngle",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getAngle",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -48166,13 +49719,13 @@ int lua_cocos2dx_ParticleSystem_setEndColor(lua_State* tolua_S) { cocos2d::Color4F arg0; - ok &=luaval_to_color4f(tolua_S, 2, &arg0); + ok &=luaval_to_color4f(tolua_S, 2, &arg0, "cc.ParticleSystem:setEndColor"); if(!ok) return 0; cobj->setEndColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEndColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setEndColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -48212,13 +49765,13 @@ int lua_cocos2dx_ParticleSystem_setStartSpin(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setStartSpin"); if(!ok) return 0; cobj->setStartSpin(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStartSpin",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setStartSpin",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -48258,13 +49811,13 @@ int lua_cocos2dx_ParticleSystem_setDuration(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setDuration"); if(!ok) return 0; cobj->setDuration(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDuration",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setDuration",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -48310,7 +49863,7 @@ int lua_cocos2dx_ParticleSystem_setTexture(lua_State* tolua_S) cobj->setTexture(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -48354,7 +49907,7 @@ int lua_cocos2dx_ParticleSystem_getPosVar(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPosVar",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getPosVar",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -48397,7 +49950,7 @@ int lua_cocos2dx_ParticleSystem_updateWithNoTime(lua_State* tolua_S) cobj->updateWithNoTime(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateWithNoTime",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:updateWithNoTime",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -48441,7 +49994,7 @@ int lua_cocos2dx_ParticleSystem_isBlendAdditive(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isBlendAdditive",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:isBlendAdditive",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -48485,7 +50038,7 @@ int lua_cocos2dx_ParticleSystem_getSpeedVar(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSpeedVar",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getSpeedVar",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -48525,13 +50078,13 @@ int lua_cocos2dx_ParticleSystem_setPositionType(lua_State* tolua_S) { cocos2d::ParticleSystem::PositionType arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleSystem:setPositionType"); if(!ok) return 0; cobj->setPositionType(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPositionType",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setPositionType",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -48574,7 +50127,7 @@ int lua_cocos2dx_ParticleSystem_stopSystem(lua_State* tolua_S) cobj->stopSystem(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stopSystem",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:stopSystem",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -48618,7 +50171,7 @@ int lua_cocos2dx_ParticleSystem_getSourcePosition(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSourcePosition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getSourcePosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -48658,13 +50211,13 @@ int lua_cocos2dx_ParticleSystem_setLifeVar(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setLifeVar"); if(!ok) return 0; cobj->setLifeVar(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLifeVar",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setLifeVar",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -48704,13 +50257,13 @@ int lua_cocos2dx_ParticleSystem_setTotalParticles(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleSystem:setTotalParticles"); if(!ok) return 0; cobj->setTotalParticles(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTotalParticles",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setTotalParticles",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -48750,13 +50303,13 @@ int lua_cocos2dx_ParticleSystem_setEndColorVar(lua_State* tolua_S) { cocos2d::Color4F arg0; - ok &=luaval_to_color4f(tolua_S, 2, &arg0); + ok &=luaval_to_color4f(tolua_S, 2, &arg0, "cc.ParticleSystem:setEndColorVar"); if(!ok) return 0; cobj->setEndColorVar(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEndColorVar",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setEndColorVar",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -48800,7 +50353,7 @@ int lua_cocos2dx_ParticleSystem_getAtlasIndex(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAtlasIndex",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getAtlasIndex",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -48844,7 +50397,7 @@ int lua_cocos2dx_ParticleSystem_getStartSize(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getStartSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -48884,13 +50437,13 @@ int lua_cocos2dx_ParticleSystem_setStartSpinVar(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setStartSpinVar"); if(!ok) return 0; cobj->setStartSpinVar(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStartSpinVar",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setStartSpinVar",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -48933,7 +50486,7 @@ int lua_cocos2dx_ParticleSystem_resetSystem(lua_State* tolua_S) cobj->resetSystem(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resetSystem",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:resetSystem",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -48973,13 +50526,13 @@ int lua_cocos2dx_ParticleSystem_setAtlasIndex(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleSystem:setAtlasIndex"); if(!ok) return 0; cobj->setAtlasIndex(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAtlasIndex",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setAtlasIndex",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -49019,13 +50572,13 @@ int lua_cocos2dx_ParticleSystem_setTangentialAccelVar(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setTangentialAccelVar"); if(!ok) return 0; cobj->setTangentialAccelVar(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTangentialAccelVar",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setTangentialAccelVar",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -49065,13 +50618,13 @@ int lua_cocos2dx_ParticleSystem_setEndRadiusVar(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setEndRadiusVar"); if(!ok) return 0; cobj->setEndRadiusVar(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEndRadiusVar",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setEndRadiusVar",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -49115,7 +50668,7 @@ int lua_cocos2dx_ParticleSystem_getEndRadius(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEndRadius",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getEndRadius",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -49159,7 +50712,7 @@ int lua_cocos2dx_ParticleSystem_isOpacityModifyRGB(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isOpacityModifyRGB",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:isOpacityModifyRGB",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -49203,7 +50756,7 @@ int lua_cocos2dx_ParticleSystem_isActive(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isActive",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:isActive",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -49243,13 +50796,13 @@ int lua_cocos2dx_ParticleSystem_setRadialAccelVar(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setRadialAccelVar"); if(!ok) return 0; cobj->setRadialAccelVar(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRadialAccelVar",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setRadialAccelVar",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -49289,13 +50842,13 @@ int lua_cocos2dx_ParticleSystem_setStartSize(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setStartSize"); if(!ok) return 0; cobj->setStartSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStartSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setStartSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -49335,13 +50888,13 @@ int lua_cocos2dx_ParticleSystem_setSpeed(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setSpeed"); if(!ok) return 0; cobj->setSpeed(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSpeed",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setSpeed",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -49385,7 +50938,7 @@ int lua_cocos2dx_ParticleSystem_getStartSpin(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartSpin",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getStartSpin",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -49429,7 +50982,7 @@ int lua_cocos2dx_ParticleSystem_getRotatePerSecond(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRotatePerSecond",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getRotatePerSecond",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -49469,13 +51022,13 @@ int lua_cocos2dx_ParticleSystem_setEmitterMode(lua_State* tolua_S) { cocos2d::ParticleSystem::Mode arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleSystem:setEmitterMode"); if(!ok) return 0; cobj->setEmitterMode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEmitterMode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setEmitterMode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -49519,7 +51072,7 @@ int lua_cocos2dx_ParticleSystem_getDuration(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDuration",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getDuration",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -49559,13 +51112,13 @@ int lua_cocos2dx_ParticleSystem_setSourcePosition(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ParticleSystem:setSourcePosition"); if(!ok) return 0; cobj->setSourcePosition(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSourcePosition",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setSourcePosition",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -49609,7 +51162,7 @@ int lua_cocos2dx_ParticleSystem_getEndSpinVar(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEndSpinVar",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getEndSpinVar",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -49649,13 +51202,13 @@ int lua_cocos2dx_ParticleSystem_setBlendAdditive(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ParticleSystem:setBlendAdditive"); if(!ok) return 0; cobj->setBlendAdditive(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBlendAdditive",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setBlendAdditive",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -49695,13 +51248,13 @@ int lua_cocos2dx_ParticleSystem_setLife(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setLife"); if(!ok) return 0; cobj->setLife(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLife",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setLife",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -49741,13 +51294,13 @@ int lua_cocos2dx_ParticleSystem_setAngleVar(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setAngleVar"); if(!ok) return 0; cobj->setAngleVar(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAngleVar",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setAngleVar",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -49787,13 +51340,13 @@ int lua_cocos2dx_ParticleSystem_setRotationIsDir(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ParticleSystem:setRotationIsDir"); if(!ok) return 0; cobj->setRotationIsDir(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRotationIsDir",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setRotationIsDir",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -49833,13 +51386,13 @@ int lua_cocos2dx_ParticleSystem_setEndSizeVar(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setEndSizeVar"); if(!ok) return 0; cobj->setEndSizeVar(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEndSizeVar",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setEndSizeVar",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -49879,13 +51432,13 @@ int lua_cocos2dx_ParticleSystem_setAngle(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setAngle"); if(!ok) return 0; cobj->setAngle(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAngle",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setAngle",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -49931,7 +51484,7 @@ int lua_cocos2dx_ParticleSystem_setBatchNode(lua_State* tolua_S) cobj->setBatchNode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBatchNode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setBatchNode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -49975,7 +51528,7 @@ int lua_cocos2dx_ParticleSystem_getTangentialAccelVar(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTangentialAccelVar",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getTangentialAccelVar",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -50019,7 +51572,7 @@ int lua_cocos2dx_ParticleSystem_getEmitterMode(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEmitterMode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getEmitterMode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -50059,13 +51612,13 @@ int lua_cocos2dx_ParticleSystem_setEndSpinVar(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setEndSpinVar"); if(!ok) return 0; cobj->setEndSpinVar(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEndSpinVar",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setEndSpinVar",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -50109,7 +51662,7 @@ int lua_cocos2dx_ParticleSystem_getAngleVar(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAngleVar",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getAngleVar",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -50149,13 +51702,13 @@ int lua_cocos2dx_ParticleSystem_setStartColor(lua_State* tolua_S) { cocos2d::Color4F arg0; - ok &=luaval_to_color4f(tolua_S, 2, &arg0); + ok &=luaval_to_color4f(tolua_S, 2, &arg0, "cc.ParticleSystem:setStartColor"); if(!ok) return 0; cobj->setStartColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStartColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setStartColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -50199,7 +51752,7 @@ int lua_cocos2dx_ParticleSystem_getRotatePerSecondVar(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRotatePerSecondVar",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getRotatePerSecondVar",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -50243,7 +51796,7 @@ int lua_cocos2dx_ParticleSystem_getEndSize(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEndSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getEndSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -50287,7 +51840,7 @@ int lua_cocos2dx_ParticleSystem_getLife(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLife",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getLife",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -50327,13 +51880,13 @@ int lua_cocos2dx_ParticleSystem_setSpeedVar(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setSpeedVar"); if(!ok) return 0; cobj->setSpeedVar(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSpeedVar",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setSpeedVar",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -50373,13 +51926,13 @@ int lua_cocos2dx_ParticleSystem_setAutoRemoveOnFinish(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ParticleSystem:setAutoRemoveOnFinish"); if(!ok) return 0; cobj->setAutoRemoveOnFinish(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAutoRemoveOnFinish",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setAutoRemoveOnFinish",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -50419,13 +51972,13 @@ int lua_cocos2dx_ParticleSystem_setGravity(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ParticleSystem:setGravity"); if(!ok) return 0; cobj->setGravity(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGravity",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setGravity",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -50468,7 +52021,7 @@ int lua_cocos2dx_ParticleSystem_postStep(lua_State* tolua_S) cobj->postStep(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "postStep",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:postStep",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -50508,13 +52061,13 @@ int lua_cocos2dx_ParticleSystem_setEmissionRate(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setEmissionRate"); if(!ok) return 0; cobj->setEmissionRate(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEmissionRate",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setEmissionRate",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -50558,7 +52111,7 @@ int lua_cocos2dx_ParticleSystem_getEndColorVar(lua_State* tolua_S) color4f_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEndColorVar",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getEndColorVar",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -50602,7 +52155,7 @@ int lua_cocos2dx_ParticleSystem_getRotationIsDir(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRotationIsDir",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getRotationIsDir",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -50642,13 +52195,13 @@ int lua_cocos2dx_ParticleSystem_setScale(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setScale"); if(!ok) return 0; cobj->setScale(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScale",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setScale",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -50692,7 +52245,7 @@ int lua_cocos2dx_ParticleSystem_getEmissionRate(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEmissionRate",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getEmissionRate",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -50736,7 +52289,7 @@ int lua_cocos2dx_ParticleSystem_getEndColor(lua_State* tolua_S) color4f_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEndColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getEndColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -50780,7 +52333,7 @@ int lua_cocos2dx_ParticleSystem_getLifeVar(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLifeVar",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getLifeVar",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -50820,13 +52373,13 @@ int lua_cocos2dx_ParticleSystem_setStartSizeVar(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setStartSizeVar"); if(!ok) return 0; cobj->setStartSizeVar(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStartSizeVar",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setStartSizeVar",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -50866,13 +52419,13 @@ int lua_cocos2dx_ParticleSystem_setOpacityModifyRGB(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ParticleSystem:setOpacityModifyRGB"); if(!ok) return 0; cobj->setOpacityModifyRGB(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOpacityModifyRGB",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setOpacityModifyRGB",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -50916,7 +52469,7 @@ int lua_cocos2dx_ParticleSystem_addParticle(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addParticle",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:addParticle",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -50960,7 +52513,7 @@ int lua_cocos2dx_ParticleSystem_getStartRadius(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartRadius",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getStartRadius",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -51004,7 +52557,7 @@ int lua_cocos2dx_ParticleSystem_getParticleCount(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getParticleCount",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getParticleCount",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -51048,7 +52601,7 @@ int lua_cocos2dx_ParticleSystem_getStartRadiusVar(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartRadiusVar",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getStartRadiusVar",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -51088,13 +52641,13 @@ int lua_cocos2dx_ParticleSystem_setStartColorVar(lua_State* tolua_S) { cocos2d::Color4F arg0; - ok &=luaval_to_color4f(tolua_S, 2, &arg0); + ok &=luaval_to_color4f(tolua_S, 2, &arg0, "cc.ParticleSystem:setStartColorVar"); if(!ok) return 0; cobj->setStartColorVar(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStartColorVar",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setStartColorVar",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -51134,13 +52687,13 @@ int lua_cocos2dx_ParticleSystem_setEndSpin(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setEndSpin"); if(!ok) return 0; cobj->setEndSpin(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEndSpin",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setEndSpin",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -51180,13 +52733,13 @@ int lua_cocos2dx_ParticleSystem_setRadialAccel(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setRadialAccel"); if(!ok) return 0; cobj->setRadialAccel(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRadialAccel",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setRadialAccel",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -51230,7 +52783,7 @@ int lua_cocos2dx_ParticleSystem_isAutoRemoveOnFinish(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isAutoRemoveOnFinish",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:isAutoRemoveOnFinish",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -51274,7 +52827,7 @@ int lua_cocos2dx_ParticleSystem_getTotalParticles(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTotalParticles",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getTotalParticles",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -51314,13 +52867,13 @@ int lua_cocos2dx_ParticleSystem_setStartRadiusVar(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setStartRadiusVar"); if(!ok) return 0; cobj->setStartRadiusVar(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStartRadiusVar",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setStartRadiusVar",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -51364,7 +52917,7 @@ int lua_cocos2dx_ParticleSystem_getEndRadiusVar(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEndRadiusVar",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getEndRadiusVar",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -51408,7 +52961,7 @@ int lua_cocos2dx_ParticleSystem_getStartColorVar(lua_State* tolua_S) color4f_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartColorVar",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getStartColorVar",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -51436,14 +52989,14 @@ int lua_cocos2dx_ParticleSystem_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.ParticleSystem:create"); if(!ok) return 0; cocos2d::ParticleSystem* ret = cocos2d::ParticleSystem::create(arg0); object_to_luaval(tolua_S, "cc.ParticleSystem",(cocos2d::ParticleSystem*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleSystem:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -51469,14 +53022,14 @@ int lua_cocos2dx_ParticleSystem_createWithTotalParticles(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleSystem:createWithTotalParticles"); if(!ok) return 0; cocos2d::ParticleSystem* ret = cocos2d::ParticleSystem::createWithTotalParticles(arg0); object_to_luaval(tolua_S, "cc.ParticleSystem",(cocos2d::ParticleSystem*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithTotalParticles",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleSystem:createWithTotalParticles",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -51639,7 +53192,7 @@ int lua_cocos2dx_ParticleSystemQuad_setDisplayFrame(lua_State* tolua_S) cobj->setDisplayFrame(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDisplayFrame",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystemQuad:setDisplayFrame",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -51682,13 +53235,13 @@ int lua_cocos2dx_ParticleSystemQuad_setTextureWithRect(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Texture2D",&arg0); - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.ParticleSystemQuad:setTextureWithRect"); if(!ok) return 0; cobj->setTextureWithRect(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextureWithRect",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystemQuad:setTextureWithRect",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -51734,7 +53287,7 @@ int lua_cocos2dx_ParticleSystemQuad_listenRendererRecreated(lua_State* tolua_S) cobj->listenRendererRecreated(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "listenRendererRecreated",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystemQuad:listenRendererRecreated",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -51763,7 +53316,7 @@ int lua_cocos2dx_ParticleSystemQuad_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.ParticleSystemQuad:create"); if (!ok) { break; } cocos2d::ParticleSystemQuad* ret = cocos2d::ParticleSystemQuad::create(arg0); object_to_luaval(tolua_S, "cc.ParticleSystemQuad",(cocos2d::ParticleSystemQuad*)ret); @@ -51786,7 +53339,7 @@ int lua_cocos2dx_ParticleSystemQuad_create(lua_State* tolua_S) if (argc == 1) { cocos2d::ValueMap arg0; - ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0); + ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0, "cc.ParticleSystemQuad:create"); if (!ok) { break; } cocos2d::ParticleSystemQuad* ret = cocos2d::ParticleSystemQuad::create(arg0); object_to_luaval(tolua_S, "cc.ParticleSystemQuad",(cocos2d::ParticleSystemQuad*)ret); @@ -51794,7 +53347,7 @@ int lua_cocos2dx_ParticleSystemQuad_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.ParticleSystemQuad:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -51820,14 +53373,14 @@ int lua_cocos2dx_ParticleSystemQuad_createWithTotalParticles(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleSystemQuad:createWithTotalParticles"); if(!ok) return 0; cocos2d::ParticleSystemQuad* ret = cocos2d::ParticleSystemQuad::createWithTotalParticles(arg0); object_to_luaval(tolua_S, "cc.ParticleSystemQuad",(cocos2d::ParticleSystemQuad*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithTotalParticles",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleSystemQuad:createWithTotalParticles",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -51882,7 +53435,7 @@ int lua_cocos2dx_ParticleFire_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ParticleFire",(cocos2d::ParticleFire*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleFire:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -51908,14 +53461,14 @@ int lua_cocos2dx_ParticleFire_createWithTotalParticles(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleFire:createWithTotalParticles"); if(!ok) return 0; cocos2d::ParticleFire* ret = cocos2d::ParticleFire::createWithTotalParticles(arg0); object_to_luaval(tolua_S, "cc.ParticleFire",(cocos2d::ParticleFire*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithTotalParticles",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleFire:createWithTotalParticles",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -51967,7 +53520,7 @@ int lua_cocos2dx_ParticleFireworks_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ParticleFireworks",(cocos2d::ParticleFireworks*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleFireworks:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -51993,14 +53546,14 @@ int lua_cocos2dx_ParticleFireworks_createWithTotalParticles(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleFireworks:createWithTotalParticles"); if(!ok) return 0; cocos2d::ParticleFireworks* ret = cocos2d::ParticleFireworks::createWithTotalParticles(arg0); object_to_luaval(tolua_S, "cc.ParticleFireworks",(cocos2d::ParticleFireworks*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithTotalParticles",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleFireworks:createWithTotalParticles",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52052,7 +53605,7 @@ int lua_cocos2dx_ParticleSun_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ParticleSun",(cocos2d::ParticleSun*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleSun:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52078,14 +53631,14 @@ int lua_cocos2dx_ParticleSun_createWithTotalParticles(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleSun:createWithTotalParticles"); if(!ok) return 0; cocos2d::ParticleSun* ret = cocos2d::ParticleSun::createWithTotalParticles(arg0); object_to_luaval(tolua_S, "cc.ParticleSun",(cocos2d::ParticleSun*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithTotalParticles",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleSun:createWithTotalParticles",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52137,7 +53690,7 @@ int lua_cocos2dx_ParticleGalaxy_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ParticleGalaxy",(cocos2d::ParticleGalaxy*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleGalaxy:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52163,14 +53716,14 @@ int lua_cocos2dx_ParticleGalaxy_createWithTotalParticles(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleGalaxy:createWithTotalParticles"); if(!ok) return 0; cocos2d::ParticleGalaxy* ret = cocos2d::ParticleGalaxy::createWithTotalParticles(arg0); object_to_luaval(tolua_S, "cc.ParticleGalaxy",(cocos2d::ParticleGalaxy*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithTotalParticles",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleGalaxy:createWithTotalParticles",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52222,7 +53775,7 @@ int lua_cocos2dx_ParticleFlower_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ParticleFlower",(cocos2d::ParticleFlower*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleFlower:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52248,14 +53801,14 @@ int lua_cocos2dx_ParticleFlower_createWithTotalParticles(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleFlower:createWithTotalParticles"); if(!ok) return 0; cocos2d::ParticleFlower* ret = cocos2d::ParticleFlower::createWithTotalParticles(arg0); object_to_luaval(tolua_S, "cc.ParticleFlower",(cocos2d::ParticleFlower*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithTotalParticles",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleFlower:createWithTotalParticles",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52307,7 +53860,7 @@ int lua_cocos2dx_ParticleMeteor_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ParticleMeteor",(cocos2d::ParticleMeteor*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleMeteor:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52333,14 +53886,14 @@ int lua_cocos2dx_ParticleMeteor_createWithTotalParticles(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleMeteor:createWithTotalParticles"); if(!ok) return 0; cocos2d::ParticleMeteor* ret = cocos2d::ParticleMeteor::createWithTotalParticles(arg0); object_to_luaval(tolua_S, "cc.ParticleMeteor",(cocos2d::ParticleMeteor*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithTotalParticles",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleMeteor:createWithTotalParticles",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52392,7 +53945,7 @@ int lua_cocos2dx_ParticleSpiral_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ParticleSpiral",(cocos2d::ParticleSpiral*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleSpiral:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52418,14 +53971,14 @@ int lua_cocos2dx_ParticleSpiral_createWithTotalParticles(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleSpiral:createWithTotalParticles"); if(!ok) return 0; cocos2d::ParticleSpiral* ret = cocos2d::ParticleSpiral::createWithTotalParticles(arg0); object_to_luaval(tolua_S, "cc.ParticleSpiral",(cocos2d::ParticleSpiral*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithTotalParticles",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleSpiral:createWithTotalParticles",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52477,7 +54030,7 @@ int lua_cocos2dx_ParticleExplosion_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ParticleExplosion",(cocos2d::ParticleExplosion*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleExplosion:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52503,14 +54056,14 @@ int lua_cocos2dx_ParticleExplosion_createWithTotalParticles(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleExplosion:createWithTotalParticles"); if(!ok) return 0; cocos2d::ParticleExplosion* ret = cocos2d::ParticleExplosion::createWithTotalParticles(arg0); object_to_luaval(tolua_S, "cc.ParticleExplosion",(cocos2d::ParticleExplosion*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithTotalParticles",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleExplosion:createWithTotalParticles",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52562,7 +54115,7 @@ int lua_cocos2dx_ParticleSmoke_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ParticleSmoke",(cocos2d::ParticleSmoke*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleSmoke:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52588,14 +54141,14 @@ int lua_cocos2dx_ParticleSmoke_createWithTotalParticles(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleSmoke:createWithTotalParticles"); if(!ok) return 0; cocos2d::ParticleSmoke* ret = cocos2d::ParticleSmoke::createWithTotalParticles(arg0); object_to_luaval(tolua_S, "cc.ParticleSmoke",(cocos2d::ParticleSmoke*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithTotalParticles",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleSmoke:createWithTotalParticles",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52647,7 +54200,7 @@ int lua_cocos2dx_ParticleSnow_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ParticleSnow",(cocos2d::ParticleSnow*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleSnow:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52673,14 +54226,14 @@ int lua_cocos2dx_ParticleSnow_createWithTotalParticles(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleSnow:createWithTotalParticles"); if(!ok) return 0; cocos2d::ParticleSnow* ret = cocos2d::ParticleSnow::createWithTotalParticles(arg0); object_to_luaval(tolua_S, "cc.ParticleSnow",(cocos2d::ParticleSnow*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithTotalParticles",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleSnow:createWithTotalParticles",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52732,7 +54285,7 @@ int lua_cocos2dx_ParticleRain_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ParticleRain",(cocos2d::ParticleRain*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleRain:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52758,14 +54311,14 @@ int lua_cocos2dx_ParticleRain_createWithTotalParticles(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleRain:createWithTotalParticles"); if(!ok) return 0; cocos2d::ParticleRain* ret = cocos2d::ParticleRain::createWithTotalParticles(arg0); object_to_luaval(tolua_S, "cc.ParticleRain",(cocos2d::ParticleRain*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithTotalParticles",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleRain:createWithTotalParticles",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52824,13 +54377,13 @@ int lua_cocos2dx_GridBase_setGridSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.GridBase:setGridSize"); if(!ok) return 0; cobj->setGridSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGridSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:setGridSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -52873,7 +54426,7 @@ int lua_cocos2dx_GridBase_calculateVertexPoints(lua_State* tolua_S) cobj->calculateVertexPoints(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "calculateVertexPoints",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:calculateVertexPoints",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -52919,7 +54472,7 @@ int lua_cocos2dx_GridBase_afterDraw(lua_State* tolua_S) cobj->afterDraw(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "afterDraw",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:afterDraw",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -52962,7 +54515,7 @@ int lua_cocos2dx_GridBase_beforeDraw(lua_State* tolua_S) cobj->beforeDraw(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "beforeDraw",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:beforeDraw",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -53006,7 +54559,7 @@ int lua_cocos2dx_GridBase_isTextureFlipped(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isTextureFlipped",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:isTextureFlipped",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -53050,7 +54603,7 @@ int lua_cocos2dx_GridBase_getGridSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGridSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:getGridSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -53094,7 +54647,7 @@ int lua_cocos2dx_GridBase_getStep(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStep",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:getStep",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -53137,7 +54690,7 @@ int lua_cocos2dx_GridBase_set2DProjection(lua_State* tolua_S) cobj->set2DProjection(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "set2DProjection",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:set2DProjection",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -53177,13 +54730,13 @@ int lua_cocos2dx_GridBase_setStep(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.GridBase:setStep"); if(!ok) return 0; cobj->setStep(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStep",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:setStep",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -53223,13 +54776,13 @@ int lua_cocos2dx_GridBase_setTextureFlipped(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.GridBase:setTextureFlipped"); if(!ok) return 0; cobj->setTextureFlipped(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextureFlipped",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:setTextureFlipped",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -53272,7 +54825,7 @@ int lua_cocos2dx_GridBase_blit(lua_State* tolua_S) cobj->blit(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "blit",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:blit",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -53312,13 +54865,13 @@ int lua_cocos2dx_GridBase_setActive(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.GridBase:setActive"); if(!ok) return 0; cobj->setActive(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setActive",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:setActive",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -53362,7 +54915,7 @@ int lua_cocos2dx_GridBase_getReuseGrid(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getReuseGrid",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:getReuseGrid",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -53396,7 +54949,7 @@ int lua_cocos2dx_GridBase_initWithSize(lua_State* tolua_S) do{ if (argc == 1) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.GridBase:initWithSize"); if (!ok) { break; } bool ret = cobj->initWithSize(arg0); @@ -53408,7 +54961,7 @@ int lua_cocos2dx_GridBase_initWithSize(lua_State* tolua_S) do{ if (argc == 3) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.GridBase:initWithSize"); if (!ok) { break; } cocos2d::Texture2D* arg1; @@ -53416,7 +54969,7 @@ int lua_cocos2dx_GridBase_initWithSize(lua_State* tolua_S) if (!ok) { break; } bool arg2; - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.GridBase:initWithSize"); if (!ok) { break; } bool ret = cobj->initWithSize(arg0, arg1, arg2); @@ -53425,7 +54978,7 @@ int lua_cocos2dx_GridBase_initWithSize(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithSize",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:initWithSize",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -53465,13 +55018,13 @@ int lua_cocos2dx_GridBase_setReuseGrid(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GridBase:setReuseGrid"); if(!ok) return 0; cobj->setReuseGrid(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setReuseGrid",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:setReuseGrid",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -53515,7 +55068,7 @@ int lua_cocos2dx_GridBase_isActive(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isActive",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:isActive",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -53558,7 +55111,7 @@ int lua_cocos2dx_GridBase_reuse(lua_State* tolua_S) cobj->reuse(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "reuse",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:reuse",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -53587,7 +55140,7 @@ int lua_cocos2dx_GridBase_create(lua_State* tolua_S) if (argc == 1) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.GridBase:create"); if (!ok) { break; } cocos2d::GridBase* ret = cocos2d::GridBase::create(arg0); object_to_luaval(tolua_S, "cc.GridBase",(cocos2d::GridBase*)ret); @@ -53600,13 +55153,13 @@ int lua_cocos2dx_GridBase_create(lua_State* tolua_S) if (argc == 3) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.GridBase:create"); if (!ok) { break; } cocos2d::Texture2D* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Texture2D",&arg1); if (!ok) { break; } bool arg2; - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.GridBase:create"); if (!ok) { break; } cocos2d::GridBase* ret = cocos2d::GridBase::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.GridBase",(cocos2d::GridBase*)ret); @@ -53614,7 +55167,7 @@ int lua_cocos2dx_GridBase_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.GridBase:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -53678,7 +55231,7 @@ int lua_cocos2dx_Grid3D_create(lua_State* tolua_S) if (argc == 1) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.Grid3D:create"); if (!ok) { break; } cocos2d::Grid3D* ret = cocos2d::Grid3D::create(arg0); object_to_luaval(tolua_S, "cc.Grid3D",(cocos2d::Grid3D*)ret); @@ -53691,13 +55244,13 @@ int lua_cocos2dx_Grid3D_create(lua_State* tolua_S) if (argc == 3) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.Grid3D:create"); if (!ok) { break; } cocos2d::Texture2D* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Texture2D",&arg1); if (!ok) { break; } bool arg2; - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.Grid3D:create"); if (!ok) { break; } cocos2d::Grid3D* ret = cocos2d::Grid3D::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.Grid3D",(cocos2d::Grid3D*)ret); @@ -53705,7 +55258,7 @@ int lua_cocos2dx_Grid3D_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.Grid3D:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -53737,7 +55290,7 @@ int lua_cocos2dx_Grid3D_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.Grid3D"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "Grid3D",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Grid3D:Grid3D",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -53787,7 +55340,7 @@ int lua_cocos2dx_TiledGrid3D_create(lua_State* tolua_S) if (argc == 1) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.TiledGrid3D:create"); if (!ok) { break; } cocos2d::TiledGrid3D* ret = cocos2d::TiledGrid3D::create(arg0); object_to_luaval(tolua_S, "cc.TiledGrid3D",(cocos2d::TiledGrid3D*)ret); @@ -53800,13 +55353,13 @@ int lua_cocos2dx_TiledGrid3D_create(lua_State* tolua_S) if (argc == 3) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.TiledGrid3D:create"); if (!ok) { break; } cocos2d::Texture2D* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Texture2D",&arg1); if (!ok) { break; } bool arg2; - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.TiledGrid3D:create"); if (!ok) { break; } cocos2d::TiledGrid3D* ret = cocos2d::TiledGrid3D::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.TiledGrid3D",(cocos2d::TiledGrid3D*)ret); @@ -53814,7 +55367,7 @@ int lua_cocos2dx_TiledGrid3D_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.TiledGrid3D:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -53846,7 +55399,7 @@ int lua_cocos2dx_TiledGrid3D_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.TiledGrid3D"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TiledGrid3D",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TiledGrid3D:TiledGrid3D",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -53910,13 +55463,13 @@ int lua_cocos2dx_GLProgramCache_addGLProgram(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.GLProgram",&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.GLProgramCache:addGLProgram"); if(!ok) return 0; cobj->addGLProgram(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addGLProgram",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramCache:addGLProgram",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -53956,14 +55509,14 @@ int lua_cocos2dx_GLProgramCache_getGLProgram(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgramCache:getGLProgram"); if(!ok) return 0; cocos2d::GLProgram* ret = cobj->getGLProgram(arg0); object_to_luaval(tolua_S, "cc.GLProgram",(cocos2d::GLProgram*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGLProgram",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramCache:getGLProgram",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -54006,7 +55559,7 @@ int lua_cocos2dx_GLProgramCache_reloadDefaultGLPrograms(lua_State* tolua_S) cobj->reloadDefaultGLPrograms(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "reloadDefaultGLPrograms",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramCache:reloadDefaultGLPrograms",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -54049,7 +55602,7 @@ int lua_cocos2dx_GLProgramCache_loadDefaultGLPrograms(lua_State* tolua_S) cobj->loadDefaultGLPrograms(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadDefaultGLPrograms",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramCache:loadDefaultGLPrograms",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -54081,7 +55634,7 @@ int lua_cocos2dx_GLProgramCache_destroyInstance(lua_State* tolua_S) cocos2d::GLProgramCache::destroyInstance(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "destroyInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.GLProgramCache:destroyInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -54112,7 +55665,7 @@ int lua_cocos2dx_GLProgramCache_getInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.GLProgramCache",(cocos2d::GLProgramCache*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.GLProgramCache:getInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -54144,7 +55697,7 @@ int lua_cocos2dx_GLProgramCache_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.GLProgramCache"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "GLProgramCache",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramCache:GLProgramCache",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -54210,14 +55763,14 @@ int lua_cocos2dx_TextureCache_reloadTexture(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TextureCache:reloadTexture"); if(!ok) return 0; bool ret = cobj->reloadTexture(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "reloadTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TextureCache:reloadTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -54260,7 +55813,7 @@ int lua_cocos2dx_TextureCache_unbindAllImageAsync(lua_State* tolua_S) cobj->unbindAllImageAsync(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "unbindAllImageAsync",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TextureCache:unbindAllImageAsync",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -54300,13 +55853,13 @@ int lua_cocos2dx_TextureCache_removeTextureForKey(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TextureCache:removeTextureForKey"); if(!ok) return 0; cobj->removeTextureForKey(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeTextureForKey",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TextureCache:removeTextureForKey",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -54349,7 +55902,7 @@ int lua_cocos2dx_TextureCache_removeAllTextures(lua_State* tolua_S) cobj->removeAllTextures(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllTextures",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TextureCache:removeAllTextures",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -54393,7 +55946,7 @@ int lua_cocos2dx_TextureCache_getDescription(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDescription",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TextureCache:getDescription",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -54437,7 +55990,7 @@ int lua_cocos2dx_TextureCache_getCachedTextureInfo(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCachedTextureInfo",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TextureCache:getCachedTextureInfo",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -54475,7 +56028,7 @@ int lua_cocos2dx_TextureCache_addImage(lua_State* tolua_S) if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.TextureCache:addImage"); if (!ok) { break; } cocos2d::Texture2D* ret = cobj->addImage(arg0, arg1); @@ -54487,7 +56040,7 @@ int lua_cocos2dx_TextureCache_addImage(lua_State* tolua_S) do{ if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TextureCache:addImage"); if (!ok) { break; } cocos2d::Texture2D* ret = cobj->addImage(arg0); @@ -54496,7 +56049,7 @@ int lua_cocos2dx_TextureCache_addImage(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addImage",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TextureCache:addImage",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -54536,13 +56089,13 @@ int lua_cocos2dx_TextureCache_unbindImageAsync(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TextureCache:unbindImageAsync"); if(!ok) return 0; cobj->unbindImageAsync(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "unbindImageAsync",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TextureCache:unbindImageAsync",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -54582,14 +56135,14 @@ int lua_cocos2dx_TextureCache_getTextureForKey(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TextureCache:getTextureForKey"); if(!ok) return 0; cocos2d::Texture2D* ret = cobj->getTextureForKey(arg0); object_to_luaval(tolua_S, "cc.Texture2D",(cocos2d::Texture2D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextureForKey",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TextureCache:getTextureForKey",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -54632,7 +56185,7 @@ int lua_cocos2dx_TextureCache_removeUnusedTextures(lua_State* tolua_S) cobj->removeUnusedTextures(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeUnusedTextures",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TextureCache:removeUnusedTextures",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -54678,7 +56231,7 @@ int lua_cocos2dx_TextureCache_removeTexture(lua_State* tolua_S) cobj->removeTexture(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TextureCache:removeTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -54721,7 +56274,7 @@ int lua_cocos2dx_TextureCache_waitForQuit(lua_State* tolua_S) cobj->waitForQuit(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "waitForQuit",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TextureCache:waitForQuit",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -54755,7 +56308,7 @@ int lua_cocos2dx_TextureCache_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.TextureCache"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TextureCache",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TextureCache:TextureCache",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -54831,7 +56384,7 @@ int lua_cocos2dx_Application_getTargetPlatform(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTargetPlatform",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Application:getTargetPlatform",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -54875,7 +56428,7 @@ int lua_cocos2dx_Application_getCurrentLanguageCode(lua_State* tolua_S) tolua_pushstring(tolua_S,(const char*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCurrentLanguageCode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Application:getCurrentLanguageCode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -54919,7 +56472,7 @@ int lua_cocos2dx_Application_getCurrentLanguage(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCurrentLanguage",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Application:getCurrentLanguage",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -54959,13 +56512,13 @@ int lua_cocos2dx_Application_setAnimationInterval(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Application:setAnimationInterval"); if(!ok) return 0; cobj->setAnimationInterval(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAnimationInterval",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Application:setAnimationInterval",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -54998,7 +56551,7 @@ int lua_cocos2dx_Application_getInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Application",(cocos2d::Application*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Application:getInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -55030,1052 +56583,7 @@ int lua_register_cocos2dx_Application(lua_State* tolua_S) return 1; } -int lua_cocos2dx_GLViewProtocol_setFrameSize(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_setFrameSize'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 2) - { - double arg0; - double arg1; - - ok &= luaval_to_number(tolua_S, 2,&arg0); - - ok &= luaval_to_number(tolua_S, 3,&arg1); - if(!ok) - return 0; - cobj->setFrameSize(arg0, arg1); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFrameSize",argc, 2); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_setFrameSize'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_getViewPortRect(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_getViewPortRect'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - const cocos2d::Rect& ret = cobj->getViewPortRect(); - rect_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getViewPortRect",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_getViewPortRect'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_setIMEKeyboardState(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_setIMEKeyboardState'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - bool arg0; - - ok &= luaval_to_boolean(tolua_S, 2,&arg0); - if(!ok) - return 0; - cobj->setIMEKeyboardState(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setIMEKeyboardState",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_setIMEKeyboardState'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_setScissorInPoints(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_setScissorInPoints'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 4) - { - double arg0; - double arg1; - double arg2; - double arg3; - - ok &= luaval_to_number(tolua_S, 2,&arg0); - - ok &= luaval_to_number(tolua_S, 3,&arg1); - - ok &= luaval_to_number(tolua_S, 4,&arg2); - - ok &= luaval_to_number(tolua_S, 5,&arg3); - if(!ok) - return 0; - cobj->setScissorInPoints(arg0, arg1, arg2, arg3); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScissorInPoints",argc, 4); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_setScissorInPoints'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_getViewName(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_getViewName'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - const std::string& ret = cobj->getViewName(); - tolua_pushcppstring(tolua_S,ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getViewName",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_getViewName'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_isOpenGLReady(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_isOpenGLReady'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - bool ret = cobj->isOpenGLReady(); - tolua_pushboolean(tolua_S,(bool)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isOpenGLReady",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_isOpenGLReady'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_end(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_end'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cobj->end(); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "end",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_end'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_getScaleY(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_getScaleY'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - double ret = cobj->getScaleY(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScaleY",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_getScaleY'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_getScaleX(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_getScaleX'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - double ret = cobj->getScaleX(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScaleX",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_getScaleX'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_getVisibleOrigin(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_getVisibleOrigin'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::Vec2 ret = cobj->getVisibleOrigin(); - vec2_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVisibleOrigin",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_getVisibleOrigin'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_getFrameSize(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_getFrameSize'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - const cocos2d::Size& ret = cobj->getFrameSize(); - size_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFrameSize",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_getFrameSize'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_getDesignResolutionSize(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_getDesignResolutionSize'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - const cocos2d::Size& ret = cobj->getDesignResolutionSize(); - size_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDesignResolutionSize",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_getDesignResolutionSize'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_pollInputEvents(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_pollInputEvents'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cobj->pollInputEvents(); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pollInputEvents",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_pollInputEvents'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_swapBuffers(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_swapBuffers'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cobj->swapBuffers(); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "swapBuffers",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_swapBuffers'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_setDesignResolutionSize(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_setDesignResolutionSize'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 3) - { - double arg0; - double arg1; - ResolutionPolicy arg2; - - ok &= luaval_to_number(tolua_S, 2,&arg0); - - ok &= luaval_to_number(tolua_S, 3,&arg1); - - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); - if(!ok) - return 0; - cobj->setDesignResolutionSize(arg0, arg1, arg2); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDesignResolutionSize",argc, 3); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_setDesignResolutionSize'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_getResolutionPolicy(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_getResolutionPolicy'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - int ret = (int)cobj->getResolutionPolicy(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getResolutionPolicy",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_getResolutionPolicy'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_setViewPortInPoints(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_setViewPortInPoints'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 4) - { - double arg0; - double arg1; - double arg2; - double arg3; - - ok &= luaval_to_number(tolua_S, 2,&arg0); - - ok &= luaval_to_number(tolua_S, 3,&arg1); - - ok &= luaval_to_number(tolua_S, 4,&arg2); - - ok &= luaval_to_number(tolua_S, 5,&arg3); - if(!ok) - return 0; - cobj->setViewPortInPoints(arg0, arg1, arg2, arg3); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setViewPortInPoints",argc, 4); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_setViewPortInPoints'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_getScissorRect(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_getScissorRect'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::Rect ret = cobj->getScissorRect(); - rect_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScissorRect",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_getScissorRect'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_setViewName(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_setViewName'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - std::string arg0; - - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - if(!ok) - return 0; - cobj->setViewName(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setViewName",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_setViewName'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_getVisibleRect(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_getVisibleRect'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::Rect ret = cobj->getVisibleRect(); - rect_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVisibleRect",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_getVisibleRect'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_getVisibleSize(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_getVisibleSize'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::Size ret = cobj->getVisibleSize(); - size_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVisibleSize",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_getVisibleSize'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_isScissorEnabled(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_isScissorEnabled'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - bool ret = cobj->isScissorEnabled(); - tolua_pushboolean(tolua_S,(bool)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isScissorEnabled",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_isScissorEnabled'.",&tolua_err); -#endif - - return 0; -} -static int lua_cocos2dx_GLViewProtocol_finalize(lua_State* tolua_S) -{ - printf("luabindings: finalizing LUA object (GLViewProtocol)"); - return 0; -} - -int lua_register_cocos2dx_GLViewProtocol(lua_State* tolua_S) -{ - tolua_usertype(tolua_S,"cc.GLViewProtocol"); - tolua_cclass(tolua_S,"GLViewProtocol","cc.GLViewProtocol","",nullptr); - - tolua_beginmodule(tolua_S,"GLViewProtocol"); - tolua_function(tolua_S,"setFrameSize",lua_cocos2dx_GLViewProtocol_setFrameSize); - tolua_function(tolua_S,"getViewPortRect",lua_cocos2dx_GLViewProtocol_getViewPortRect); - tolua_function(tolua_S,"setIMEKeyboardState",lua_cocos2dx_GLViewProtocol_setIMEKeyboardState); - tolua_function(tolua_S,"setScissorInPoints",lua_cocos2dx_GLViewProtocol_setScissorInPoints); - tolua_function(tolua_S,"getViewName",lua_cocos2dx_GLViewProtocol_getViewName); - tolua_function(tolua_S,"isOpenGLReady",lua_cocos2dx_GLViewProtocol_isOpenGLReady); - tolua_function(tolua_S,"end",lua_cocos2dx_GLViewProtocol_end); - tolua_function(tolua_S,"getScaleY",lua_cocos2dx_GLViewProtocol_getScaleY); - tolua_function(tolua_S,"getScaleX",lua_cocos2dx_GLViewProtocol_getScaleX); - tolua_function(tolua_S,"getVisibleOrigin",lua_cocos2dx_GLViewProtocol_getVisibleOrigin); - tolua_function(tolua_S,"getFrameSize",lua_cocos2dx_GLViewProtocol_getFrameSize); - tolua_function(tolua_S,"getDesignResolutionSize",lua_cocos2dx_GLViewProtocol_getDesignResolutionSize); - tolua_function(tolua_S,"pollInputEvents",lua_cocos2dx_GLViewProtocol_pollInputEvents); - tolua_function(tolua_S,"swapBuffers",lua_cocos2dx_GLViewProtocol_swapBuffers); - tolua_function(tolua_S,"setDesignResolutionSize",lua_cocos2dx_GLViewProtocol_setDesignResolutionSize); - tolua_function(tolua_S,"getResolutionPolicy",lua_cocos2dx_GLViewProtocol_getResolutionPolicy); - tolua_function(tolua_S,"setViewPortInPoints",lua_cocos2dx_GLViewProtocol_setViewPortInPoints); - tolua_function(tolua_S,"getScissorRect",lua_cocos2dx_GLViewProtocol_getScissorRect); - tolua_function(tolua_S,"setViewName",lua_cocos2dx_GLViewProtocol_setViewName); - tolua_function(tolua_S,"getVisibleRect",lua_cocos2dx_GLViewProtocol_getVisibleRect); - tolua_function(tolua_S,"getVisibleSize",lua_cocos2dx_GLViewProtocol_getVisibleSize); - tolua_function(tolua_S,"isScissorEnabled",lua_cocos2dx_GLViewProtocol_isScissorEnabled); - tolua_endmodule(tolua_S); - std::string typeName = typeid(cocos2d::GLViewProtocol).name(); - g_luaType[typeName] = "cc.GLViewProtocol"; - g_typeCast["GLViewProtocol"] = "cc.GLViewProtocol"; - return 1; -} - -int lua_cocos2dx_GLView_createWithRect(lua_State* tolua_S) +int lua_cocos2dx_GLViewImpl_createWithRect(lua_State* tolua_S) { int argc = 0; bool ok = true; @@ -56085,7 +56593,7 @@ int lua_cocos2dx_GLView_createWithRect(lua_State* tolua_S) #endif #if COCOS2D_DEBUG >= 1 - if (!tolua_isusertable(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; + if (!tolua_isusertable(tolua_S,1,"cc.GLViewImpl",0,&tolua_err)) goto tolua_lerror; #endif argc = lua_gettop(tolua_S) - 1; @@ -56094,12 +56602,12 @@ int lua_cocos2dx_GLView_createWithRect(lua_State* tolua_S) { std::string arg0; cocos2d::Rect arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLViewImpl:createWithRect"); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.GLViewImpl:createWithRect"); if(!ok) return 0; - cocos2d::GLView* ret = cocos2d::GLView::createWithRect(arg0, arg1); - object_to_luaval(tolua_S, "cc.GLView",(cocos2d::GLView*)ret); + cocos2d::GLViewImpl* ret = cocos2d::GLViewImpl::createWithRect(arg0, arg1); + object_to_luaval(tolua_S, "cc.GLViewImpl",(cocos2d::GLViewImpl*)ret); return 1; } if (argc == 3) @@ -56107,24 +56615,24 @@ int lua_cocos2dx_GLView_createWithRect(lua_State* tolua_S) std::string arg0; cocos2d::Rect arg1; double arg2; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_rect(tolua_S, 3, &arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLViewImpl:createWithRect"); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.GLViewImpl:createWithRect"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.GLViewImpl:createWithRect"); if(!ok) return 0; - cocos2d::GLView* ret = cocos2d::GLView::createWithRect(arg0, arg1, arg2); - object_to_luaval(tolua_S, "cc.GLView",(cocos2d::GLView*)ret); + cocos2d::GLViewImpl* ret = cocos2d::GLViewImpl::createWithRect(arg0, arg1, arg2); + object_to_luaval(tolua_S, "cc.GLViewImpl",(cocos2d::GLViewImpl*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithRect",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.GLViewImpl:createWithRect",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_createWithRect'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewImpl_createWithRect'.",&tolua_err); #endif return 0; } -int lua_cocos2dx_GLView_create(lua_State* tolua_S) +int lua_cocos2dx_GLViewImpl_create(lua_State* tolua_S) { int argc = 0; bool ok = true; @@ -56134,7 +56642,7 @@ int lua_cocos2dx_GLView_create(lua_State* tolua_S) #endif #if COCOS2D_DEBUG >= 1 - if (!tolua_isusertable(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; + if (!tolua_isusertable(tolua_S,1,"cc.GLViewImpl",0,&tolua_err)) goto tolua_lerror; #endif argc = lua_gettop(tolua_S) - 1; @@ -56142,22 +56650,22 @@ int lua_cocos2dx_GLView_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLViewImpl:create"); if(!ok) return 0; - cocos2d::GLView* ret = cocos2d::GLView::create(arg0); - object_to_luaval(tolua_S, "cc.GLView",(cocos2d::GLView*)ret); + cocos2d::GLViewImpl* ret = cocos2d::GLViewImpl::create(arg0); + object_to_luaval(tolua_S, "cc.GLViewImpl",(cocos2d::GLViewImpl*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.GLViewImpl:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewImpl_create'.",&tolua_err); #endif return 0; } -int lua_cocos2dx_GLView_createWithFullScreen(lua_State* tolua_S) +int lua_cocos2dx_GLViewImpl_createWithFullScreen(lua_State* tolua_S) { int argc = 0; bool ok = true; @@ -56167,7 +56675,7 @@ int lua_cocos2dx_GLView_createWithFullScreen(lua_State* tolua_S) #endif #if COCOS2D_DEBUG >= 1 - if (!tolua_isusertable(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; + if (!tolua_isusertable(tolua_S,1,"cc.GLViewImpl",0,&tolua_err)) goto tolua_lerror; #endif argc = lua_gettop(tolua_S) - 1; @@ -56175,40 +56683,40 @@ int lua_cocos2dx_GLView_createWithFullScreen(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLViewImpl:createWithFullScreen"); if(!ok) return 0; - cocos2d::GLView* ret = cocos2d::GLView::createWithFullScreen(arg0); - object_to_luaval(tolua_S, "cc.GLView",(cocos2d::GLView*)ret); + cocos2d::GLViewImpl* ret = cocos2d::GLViewImpl::createWithFullScreen(arg0); + object_to_luaval(tolua_S, "cc.GLViewImpl",(cocos2d::GLViewImpl*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithFullScreen",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.GLViewImpl:createWithFullScreen",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_createWithFullScreen'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewImpl_createWithFullScreen'.",&tolua_err); #endif return 0; } -static int lua_cocos2dx_GLView_finalize(lua_State* tolua_S) +static int lua_cocos2dx_GLViewImpl_finalize(lua_State* tolua_S) { - printf("luabindings: finalizing LUA object (GLView)"); + printf("luabindings: finalizing LUA object (GLViewImpl)"); return 0; } -int lua_register_cocos2dx_GLView(lua_State* tolua_S) +int lua_register_cocos2dx_GLViewImpl(lua_State* tolua_S) { - tolua_usertype(tolua_S,"cc.GLView"); - tolua_cclass(tolua_S,"GLView","cc.GLView","cc.GLViewProtocol",nullptr); + tolua_usertype(tolua_S,"cc.GLViewImpl"); + tolua_cclass(tolua_S,"GLViewImpl","cc.GLViewImpl","cc.GLView",nullptr); - tolua_beginmodule(tolua_S,"GLView"); - tolua_function(tolua_S,"createWithRect", lua_cocos2dx_GLView_createWithRect); - tolua_function(tolua_S,"create", lua_cocos2dx_GLView_create); - tolua_function(tolua_S,"createWithFullScreen", lua_cocos2dx_GLView_createWithFullScreen); + tolua_beginmodule(tolua_S,"GLViewImpl"); + tolua_function(tolua_S,"createWithRect", lua_cocos2dx_GLViewImpl_createWithRect); + tolua_function(tolua_S,"create", lua_cocos2dx_GLViewImpl_create); + tolua_function(tolua_S,"createWithFullScreen", lua_cocos2dx_GLViewImpl_createWithFullScreen); tolua_endmodule(tolua_S); - std::string typeName = typeid(cocos2d::GLView).name(); - g_luaType[typeName] = "cc.GLView"; - g_typeCast["GLView"] = "cc.GLView"; + std::string typeName = typeid(cocos2d::GLViewImpl).name(); + g_luaType[typeName] = "cc.GLViewImpl"; + g_typeCast["GLViewImpl"] = "cc.GLViewImpl"; return 1; } @@ -56242,14 +56750,14 @@ int lua_cocos2dx_AnimationCache_getAnimation(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.AnimationCache:getAnimation"); if(!ok) return 0; cocos2d::Animation* ret = cobj->getAnimation(arg0); object_to_luaval(tolua_S, "cc.Animation",(cocos2d::Animation*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnimation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AnimationCache:getAnimation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -56292,13 +56800,13 @@ int lua_cocos2dx_AnimationCache_addAnimation(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Animation",&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.AnimationCache:addAnimation"); if(!ok) return 0; cobj->addAnimation(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addAnimation",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AnimationCache:addAnimation",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -56342,7 +56850,7 @@ int lua_cocos2dx_AnimationCache_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AnimationCache:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -56383,15 +56891,15 @@ int lua_cocos2dx_AnimationCache_addAnimationsWithDictionary(lua_State* tolua_S) cocos2d::ValueMap arg0; std::string arg1; - ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0); + ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0, "cc.AnimationCache:addAnimationsWithDictionary"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.AnimationCache:addAnimationsWithDictionary"); if(!ok) return 0; cobj->addAnimationsWithDictionary(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addAnimationsWithDictionary",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AnimationCache:addAnimationsWithDictionary",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -56431,13 +56939,13 @@ int lua_cocos2dx_AnimationCache_removeAnimation(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.AnimationCache:removeAnimation"); if(!ok) return 0; cobj->removeAnimation(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAnimation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AnimationCache:removeAnimation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -56477,13 +56985,13 @@ int lua_cocos2dx_AnimationCache_addAnimationsWithFile(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.AnimationCache:addAnimationsWithFile"); if(!ok) return 0; cobj->addAnimationsWithFile(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addAnimationsWithFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AnimationCache:addAnimationsWithFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -56515,7 +57023,7 @@ int lua_cocos2dx_AnimationCache_destroyInstance(lua_State* tolua_S) cocos2d::AnimationCache::destroyInstance(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "destroyInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.AnimationCache:destroyInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -56546,7 +57054,7 @@ int lua_cocos2dx_AnimationCache_getInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.AnimationCache",(cocos2d::AnimationCache*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.AnimationCache:getInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -56578,7 +57086,7 @@ int lua_cocos2dx_AnimationCache_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.AnimationCache"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "AnimationCache",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AnimationCache:AnimationCache",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -56640,11 +57148,11 @@ int lua_cocos2dx_SpriteFrameCache_addSpriteFramesWithFile(lua_State* tolua_S) do{ if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrameCache:addSpriteFramesWithFile"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.SpriteFrameCache:addSpriteFramesWithFile"); if (!ok) { break; } cobj->addSpriteFramesWithFile(arg0, arg1); @@ -56655,7 +57163,7 @@ int lua_cocos2dx_SpriteFrameCache_addSpriteFramesWithFile(lua_State* tolua_S) do{ if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrameCache:addSpriteFramesWithFile"); if (!ok) { break; } cobj->addSpriteFramesWithFile(arg0); @@ -56666,7 +57174,7 @@ int lua_cocos2dx_SpriteFrameCache_addSpriteFramesWithFile(lua_State* tolua_S) do{ if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrameCache:addSpriteFramesWithFile"); if (!ok) { break; } cocos2d::Texture2D* arg1; @@ -56678,7 +57186,7 @@ int lua_cocos2dx_SpriteFrameCache_addSpriteFramesWithFile(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addSpriteFramesWithFile",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrameCache:addSpriteFramesWithFile",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -56721,13 +57229,13 @@ int lua_cocos2dx_SpriteFrameCache_addSpriteFrame(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.SpriteFrame",&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.SpriteFrameCache:addSpriteFrame"); if(!ok) return 0; cobj->addSpriteFrame(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addSpriteFrame",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrameCache:addSpriteFrame",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -56770,7 +57278,7 @@ int lua_cocos2dx_SpriteFrameCache_removeUnusedSpriteFrames(lua_State* tolua_S) cobj->removeUnusedSpriteFrames(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeUnusedSpriteFrames",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrameCache:removeUnusedSpriteFrames",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -56810,14 +57318,14 @@ int lua_cocos2dx_SpriteFrameCache_getSpriteFrameByName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrameCache:getSpriteFrameByName"); if(!ok) return 0; cocos2d::SpriteFrame* ret = cobj->getSpriteFrameByName(arg0); object_to_luaval(tolua_S, "cc.SpriteFrame",(cocos2d::SpriteFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSpriteFrameByName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrameCache:getSpriteFrameByName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -56857,13 +57365,13 @@ int lua_cocos2dx_SpriteFrameCache_removeSpriteFramesFromFile(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrameCache:removeSpriteFramesFromFile"); if(!ok) return 0; cobj->removeSpriteFramesFromFile(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeSpriteFramesFromFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrameCache:removeSpriteFramesFromFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -56907,7 +57415,7 @@ int lua_cocos2dx_SpriteFrameCache_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrameCache:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -56950,7 +57458,7 @@ int lua_cocos2dx_SpriteFrameCache_removeSpriteFrames(lua_State* tolua_S) cobj->removeSpriteFrames(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeSpriteFrames",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrameCache:removeSpriteFrames",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -56996,7 +57504,7 @@ int lua_cocos2dx_SpriteFrameCache_removeSpriteFramesFromTexture(lua_State* tolua cobj->removeSpriteFramesFromTexture(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeSpriteFramesFromTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrameCache:removeSpriteFramesFromTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -57036,13 +57544,13 @@ int lua_cocos2dx_SpriteFrameCache_removeSpriteFrameByName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrameCache:removeSpriteFrameByName"); if(!ok) return 0; cobj->removeSpriteFrameByName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeSpriteFrameByName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrameCache:removeSpriteFrameByName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -57074,7 +57582,7 @@ int lua_cocos2dx_SpriteFrameCache_destroyInstance(lua_State* tolua_S) cocos2d::SpriteFrameCache::destroyInstance(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "destroyInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.SpriteFrameCache:destroyInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -57105,7 +57613,7 @@ int lua_cocos2dx_SpriteFrameCache_getInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.SpriteFrameCache",(cocos2d::SpriteFrameCache*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.SpriteFrameCache:getInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -57178,17 +57686,17 @@ int lua_cocos2dx_ParallaxNode_addChild(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ParallaxNode:addChild"); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.ParallaxNode:addChild"); - ok &= luaval_to_vec2(tolua_S, 5, &arg3); + ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.ParallaxNode:addChild"); if(!ok) return 0; cobj->addChild(arg0, arg1, arg2, arg3); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addChild",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParallaxNode:addChild",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 @@ -57228,13 +57736,13 @@ int lua_cocos2dx_ParallaxNode_removeAllChildrenWithCleanup(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ParallaxNode:removeAllChildrenWithCleanup"); if(!ok) return 0; cobj->removeAllChildrenWithCleanup(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllChildrenWithCleanup",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParallaxNode:removeAllChildrenWithCleanup",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -57267,7 +57775,7 @@ int lua_cocos2dx_ParallaxNode_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ParallaxNode",(cocos2d::ParallaxNode*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParallaxNode:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -57327,13 +57835,13 @@ int lua_cocos2dx_TMXObjectGroup_setPositionOffset(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.TMXObjectGroup:setPositionOffset"); if(!ok) return 0; cobj->setPositionOffset(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPositionOffset",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXObjectGroup:setPositionOffset",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -57373,14 +57881,14 @@ int lua_cocos2dx_TMXObjectGroup_getProperty(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXObjectGroup:getProperty"); if(!ok) return 0; cocos2d::Value ret = cobj->getProperty(arg0); ccvalue_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getProperty",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXObjectGroup:getProperty",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -57424,7 +57932,7 @@ int lua_cocos2dx_TMXObjectGroup_getPositionOffset(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPositionOffset",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXObjectGroup:getPositionOffset",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -57464,14 +57972,14 @@ int lua_cocos2dx_TMXObjectGroup_getObject(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXObjectGroup:getObject"); if(!ok) return 0; cocos2d::ValueMap ret = cobj->getObject(arg0); ccvaluemap_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getObject",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXObjectGroup:getObject",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -57518,7 +58026,7 @@ int lua_cocos2dx_TMXObjectGroup_getObjects(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getObjects",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXObjectGroup:getObjects",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -57558,13 +58066,13 @@ int lua_cocos2dx_TMXObjectGroup_setGroupName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXObjectGroup:setGroupName"); if(!ok) return 0; cobj->setGroupName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGroupName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXObjectGroup:setGroupName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -57611,7 +58119,7 @@ int lua_cocos2dx_TMXObjectGroup_getProperties(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getProperties",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXObjectGroup:getProperties",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -57655,7 +58163,7 @@ int lua_cocos2dx_TMXObjectGroup_getGroupName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGroupName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXObjectGroup:getGroupName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -57695,13 +58203,13 @@ int lua_cocos2dx_TMXObjectGroup_setProperties(lua_State* tolua_S) { cocos2d::ValueMap arg0; - ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0); + ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0, "cc.TMXObjectGroup:setProperties"); if(!ok) return 0; cobj->setProperties(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setProperties",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXObjectGroup:setProperties",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -57741,13 +58249,13 @@ int lua_cocos2dx_TMXObjectGroup_setObjects(lua_State* tolua_S) { cocos2d::ValueVector arg0; - ok &= luaval_to_ccvaluevector(tolua_S, 2, &arg0); + ok &= luaval_to_ccvaluevector(tolua_S, 2, &arg0, "cc.TMXObjectGroup:setObjects"); if(!ok) return 0; cobj->setObjects(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setObjects",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXObjectGroup:setObjects",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -57781,7 +58289,7 @@ int lua_cocos2dx_TMXObjectGroup_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.TMXObjectGroup"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TMXObjectGroup",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXObjectGroup:TMXObjectGroup",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -57851,13 +58359,13 @@ int lua_cocos2dx_TMXLayerInfo_setProperties(lua_State* tolua_S) { cocos2d::ValueMap arg0; - ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0); + ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0, "cc.TMXLayerInfo:setProperties"); if(!ok) return 0; cobj->setProperties(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setProperties",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayerInfo:setProperties",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -57901,7 +58409,7 @@ int lua_cocos2dx_TMXLayerInfo_getProperties(lua_State* tolua_S) ccvaluemap_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getProperties",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayerInfo:getProperties",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -57935,7 +58443,7 @@ int lua_cocos2dx_TMXLayerInfo_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.TMXLayerInfo"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TMXLayerInfo",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayerInfo:TMXLayerInfo",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -57997,14 +58505,14 @@ int lua_cocos2dx_TMXTilesetInfo_getRectForGID(lua_State* tolua_S) { unsigned int arg0; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.TMXTilesetInfo:getRectForGID"); if(!ok) return 0; cocos2d::Rect ret = cobj->getRectForGID(arg0); rect_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRectForGID",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTilesetInfo:getRectForGID",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -58038,7 +58546,7 @@ int lua_cocos2dx_TMXTilesetInfo_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.TMXTilesetInfo"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TMXTilesetInfo",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTilesetInfo:TMXTilesetInfo",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -58099,13 +58607,13 @@ int lua_cocos2dx_TMXMapInfo_setObjectGroups(lua_State* tolua_S) { cocos2d::Vector arg0; - ok &= luaval_to_ccvector(tolua_S, 2, &arg0); + ok &= luaval_to_ccvector(tolua_S, 2, &arg0, "cc.TMXMapInfo:setObjectGroups"); if(!ok) return 0; cobj->setObjectGroups(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setObjectGroups",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:setObjectGroups",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -58145,13 +58653,13 @@ int lua_cocos2dx_TMXMapInfo_setTileSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.TMXMapInfo:setTileSize"); if(!ok) return 0; cobj->setTileSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTileSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:setTileSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -58191,14 +58699,14 @@ int lua_cocos2dx_TMXMapInfo_initWithTMXFile(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXMapInfo:initWithTMXFile"); if(!ok) return 0; bool ret = cobj->initWithTMXFile(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithTMXFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:initWithTMXFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -58242,7 +58750,7 @@ int lua_cocos2dx_TMXMapInfo_getOrientation(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOrientation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:getOrientation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -58286,7 +58794,7 @@ int lua_cocos2dx_TMXMapInfo_isStoringCharacters(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isStoringCharacters",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:isStoringCharacters",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -58326,13 +58834,13 @@ int lua_cocos2dx_TMXMapInfo_setLayers(lua_State* tolua_S) { cocos2d::Vector arg0; - ok &= luaval_to_ccvector(tolua_S, 2, &arg0); + ok &= luaval_to_ccvector(tolua_S, 2, &arg0, "cc.TMXMapInfo:setLayers"); if(!ok) return 0; cobj->setLayers(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLayers",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:setLayers",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -58372,14 +58880,14 @@ int lua_cocos2dx_TMXMapInfo_parseXMLFile(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXMapInfo:parseXMLFile"); if(!ok) return 0; bool ret = cobj->parseXMLFile(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "parseXMLFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:parseXMLFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -58423,7 +58931,7 @@ int lua_cocos2dx_TMXMapInfo_getParentElement(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getParentElement",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:getParentElement",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -58463,13 +58971,13 @@ int lua_cocos2dx_TMXMapInfo_setTMXFileName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXMapInfo:setTMXFileName"); if(!ok) return 0; cobj->setTMXFileName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTMXFileName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:setTMXFileName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -58509,14 +59017,14 @@ int lua_cocos2dx_TMXMapInfo_parseXMLString(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXMapInfo:parseXMLString"); if(!ok) return 0; bool ret = cobj->parseXMLString(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "parseXMLString",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:parseXMLString",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -58563,7 +59071,7 @@ int lua_cocos2dx_TMXMapInfo_getLayers(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLayers",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:getLayers",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -58610,7 +59118,7 @@ int lua_cocos2dx_TMXMapInfo_getTilesets(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTilesets",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:getTilesets",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -58654,7 +59162,7 @@ int lua_cocos2dx_TMXMapInfo_getParentGID(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getParentGID",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:getParentGID",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -58694,13 +59202,13 @@ int lua_cocos2dx_TMXMapInfo_setParentElement(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.TMXMapInfo:setParentElement"); if(!ok) return 0; cobj->setParentElement(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setParentElement",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:setParentElement",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -58741,16 +59249,16 @@ int lua_cocos2dx_TMXMapInfo_initWithXML(lua_State* tolua_S) std::string arg0; std::string arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXMapInfo:initWithXML"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.TMXMapInfo:initWithXML"); if(!ok) return 0; bool ret = cobj->initWithXML(arg0, arg1); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithXML",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:initWithXML",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -58790,13 +59298,13 @@ int lua_cocos2dx_TMXMapInfo_setParentGID(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.TMXMapInfo:setParentGID"); if(!ok) return 0; cobj->setParentGID(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setParentGID",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:setParentGID",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -58840,7 +59348,7 @@ int lua_cocos2dx_TMXMapInfo_getLayerAttribs(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLayerAttribs",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:getLayerAttribs",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -58884,7 +59392,7 @@ int lua_cocos2dx_TMXMapInfo_getTileSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTileSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:getTileSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -58928,7 +59436,7 @@ int lua_cocos2dx_TMXMapInfo_getTileProperties(lua_State* tolua_S) ccvaluemapintkey_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTileProperties",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:getTileProperties",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -58975,7 +59483,7 @@ int lua_cocos2dx_TMXMapInfo_getObjectGroups(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getObjectGroups",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:getObjectGroups",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -59019,7 +59527,7 @@ int lua_cocos2dx_TMXMapInfo_getTMXFileName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTMXFileName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:getTMXFileName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -59059,13 +59567,13 @@ int lua_cocos2dx_TMXMapInfo_setCurrentString(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXMapInfo:setCurrentString"); if(!ok) return 0; cobj->setCurrentString(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCurrentString",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:setCurrentString",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -59105,13 +59613,13 @@ int lua_cocos2dx_TMXMapInfo_setProperties(lua_State* tolua_S) { cocos2d::ValueMap arg0; - ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0); + ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0, "cc.TMXMapInfo:setProperties"); if(!ok) return 0; cobj->setProperties(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setProperties",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:setProperties",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -59151,13 +59659,13 @@ int lua_cocos2dx_TMXMapInfo_setOrientation(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.TMXMapInfo:setOrientation"); if(!ok) return 0; cobj->setOrientation(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOrientation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:setOrientation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -59197,13 +59705,13 @@ int lua_cocos2dx_TMXMapInfo_setTileProperties(lua_State* tolua_S) { cocos2d::ValueMapIntKey arg0; - ok &= luaval_to_ccvaluemapintkey(tolua_S, 2, &arg0); + ok &= luaval_to_ccvaluemapintkey(tolua_S, 2, &arg0, "cc.TMXMapInfo:setTileProperties"); if(!ok) return 0; cobj->setTileProperties(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTileProperties",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:setTileProperties",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -59243,13 +59751,13 @@ int lua_cocos2dx_TMXMapInfo_setMapSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.TMXMapInfo:setMapSize"); if(!ok) return 0; cobj->setMapSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMapSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:setMapSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -59289,13 +59797,13 @@ int lua_cocos2dx_TMXMapInfo_setStoringCharacters(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.TMXMapInfo:setStoringCharacters"); if(!ok) return 0; cobj->setStoringCharacters(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStoringCharacters",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:setStoringCharacters",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -59339,7 +59847,7 @@ int lua_cocos2dx_TMXMapInfo_getMapSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMapSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:getMapSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -59379,13 +59887,13 @@ int lua_cocos2dx_TMXMapInfo_setTilesets(lua_State* tolua_S) { cocos2d::Vector arg0; - ok &= luaval_to_ccvector(tolua_S, 2, &arg0); + ok &= luaval_to_ccvector(tolua_S, 2, &arg0, "cc.TMXMapInfo:setTilesets"); if(!ok) return 0; cobj->setTilesets(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTilesets",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:setTilesets",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -59432,7 +59940,7 @@ int lua_cocos2dx_TMXMapInfo_getProperties(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getProperties",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:getProperties",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -59476,7 +59984,7 @@ int lua_cocos2dx_TMXMapInfo_getCurrentString(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCurrentString",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:getCurrentString",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -59516,13 +60024,13 @@ int lua_cocos2dx_TMXMapInfo_setLayerAttribs(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.TMXMapInfo:setLayerAttribs"); if(!ok) return 0; cobj->setLayerAttribs(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLayerAttribs",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:setLayerAttribs",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -59550,14 +60058,14 @@ int lua_cocos2dx_TMXMapInfo_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXMapInfo:create"); if(!ok) return 0; cocos2d::TMXMapInfo* ret = cocos2d::TMXMapInfo::create(arg0); object_to_luaval(tolua_S, "cc.TMXMapInfo",(cocos2d::TMXMapInfo*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TMXMapInfo:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -59584,15 +60092,15 @@ int lua_cocos2dx_TMXMapInfo_createWithXML(lua_State* tolua_S) { std::string arg0; std::string arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXMapInfo:createWithXML"); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.TMXMapInfo:createWithXML"); if(!ok) return 0; cocos2d::TMXMapInfo* ret = cocos2d::TMXMapInfo::createWithXML(arg0, arg1); object_to_luaval(tolua_S, "cc.TMXMapInfo",(cocos2d::TMXMapInfo*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithXML",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TMXMapInfo:createWithXML",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -59624,7 +60132,7 @@ int lua_cocos2dx_TMXMapInfo_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.TMXMapInfo"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TMXMapInfo",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:TMXMapInfo",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -59718,14 +60226,14 @@ int lua_cocos2dx_TMXLayer_getPositionAt(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.TMXLayer:getPositionAt"); if(!ok) return 0; cocos2d::Vec2 ret = cobj->getPositionAt(arg0); vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPositionAt",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:getPositionAt",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -59765,13 +60273,13 @@ int lua_cocos2dx_TMXLayer_setLayerOrientation(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.TMXLayer:setLayerOrientation"); if(!ok) return 0; cobj->setLayerOrientation(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLayerOrientation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:setLayerOrientation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -59814,7 +60322,7 @@ int lua_cocos2dx_TMXLayer_releaseMap(lua_State* tolua_S) cobj->releaseMap(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "releaseMap",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:releaseMap",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -59858,7 +60366,7 @@ int lua_cocos2dx_TMXLayer_getLayerSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLayerSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:getLayerSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -59898,13 +60406,13 @@ int lua_cocos2dx_TMXLayer_setMapTileSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.TMXLayer:setMapTileSize"); if(!ok) return 0; cobj->setMapTileSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMapTileSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:setMapTileSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -59948,7 +60456,7 @@ int lua_cocos2dx_TMXLayer_getLayerOrientation(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLayerOrientation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:getLayerOrientation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -59988,13 +60496,13 @@ int lua_cocos2dx_TMXLayer_setProperties(lua_State* tolua_S) { cocos2d::ValueMap arg0; - ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0); + ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0, "cc.TMXLayer:setProperties"); if(!ok) return 0; cobj->setProperties(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setProperties",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:setProperties",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -60034,13 +60542,13 @@ int lua_cocos2dx_TMXLayer_setLayerName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXLayer:setLayerName"); if(!ok) return 0; cobj->setLayerName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLayerName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:setLayerName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -60080,13 +60588,13 @@ int lua_cocos2dx_TMXLayer_removeTileAt(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.TMXLayer:removeTileAt"); if(!ok) return 0; cobj->removeTileAt(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeTileAt",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:removeTileAt",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -60139,7 +60647,7 @@ int lua_cocos2dx_TMXLayer_initWithTilesetInfo(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithTilesetInfo",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:initWithTilesetInfo",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -60182,7 +60690,7 @@ int lua_cocos2dx_TMXLayer_setupTiles(lua_State* tolua_S) cobj->setupTiles(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setupTiles",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:setupTiles",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -60216,15 +60724,15 @@ int lua_cocos2dx_TMXLayer_setTileGID(lua_State* tolua_S) do{ if (argc == 3) { unsigned int arg0; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.TMXLayer:setTileGID"); if (!ok) { break; } cocos2d::Vec2 arg1; - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.TMXLayer:setTileGID"); if (!ok) { break; } cocos2d::TMXTileFlags_ arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.TMXLayer:setTileGID"); if (!ok) { break; } cobj->setTileGID(arg0, arg1, arg2); @@ -60235,11 +60743,11 @@ int lua_cocos2dx_TMXLayer_setTileGID(lua_State* tolua_S) do{ if (argc == 2) { unsigned int arg0; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.TMXLayer:setTileGID"); if (!ok) { break; } cocos2d::Vec2 arg1; - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.TMXLayer:setTileGID"); if (!ok) { break; } cobj->setTileGID(arg0, arg1); @@ -60247,7 +60755,7 @@ int lua_cocos2dx_TMXLayer_setTileGID(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTileGID",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:setTileGID",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -60291,7 +60799,7 @@ int lua_cocos2dx_TMXLayer_getMapTileSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMapTileSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:getMapTileSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -60331,14 +60839,14 @@ int lua_cocos2dx_TMXLayer_getProperty(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXLayer:getProperty"); if(!ok) return 0; cocos2d::Value ret = cobj->getProperty(arg0); ccvalue_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getProperty",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:getProperty",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -60378,13 +60886,13 @@ int lua_cocos2dx_TMXLayer_setLayerSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.TMXLayer:setLayerSize"); if(!ok) return 0; cobj->setLayerSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLayerSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:setLayerSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -60428,7 +60936,7 @@ int lua_cocos2dx_TMXLayer_getLayerName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLayerName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:getLayerName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -60474,7 +60982,7 @@ int lua_cocos2dx_TMXLayer_setTileSet(lua_State* tolua_S) cobj->setTileSet(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTileSet",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:setTileSet",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -60518,7 +61026,7 @@ int lua_cocos2dx_TMXLayer_getTileSet(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TMXTilesetInfo",(cocos2d::TMXTilesetInfo*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTileSet",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:getTileSet",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -60565,7 +61073,7 @@ int lua_cocos2dx_TMXLayer_getProperties(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getProperties",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:getProperties",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -60605,14 +61113,14 @@ int lua_cocos2dx_TMXLayer_getTileAt(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.TMXLayer:getTileAt"); if(!ok) return 0; cocos2d::Sprite* ret = cobj->getTileAt(arg0); object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTileAt",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:getTileAt",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -60651,7 +61159,7 @@ int lua_cocos2dx_TMXLayer_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TMXLayer",(cocos2d::TMXLayer*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TMXLayer:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -60683,7 +61191,7 @@ int lua_cocos2dx_TMXLayer_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.TMXLayer"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TMXLayer",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:TMXLayer",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -60764,13 +61272,13 @@ int lua_cocos2dx_TMXTiledMap_setObjectGroups(lua_State* tolua_S) { cocos2d::Vector arg0; - ok &= luaval_to_ccvector(tolua_S, 2, &arg0); + ok &= luaval_to_ccvector(tolua_S, 2, &arg0, "cc.TMXTiledMap:setObjectGroups"); if(!ok) return 0; cobj->setObjectGroups(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setObjectGroups",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTiledMap:setObjectGroups",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -60810,14 +61318,14 @@ int lua_cocos2dx_TMXTiledMap_getProperty(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXTiledMap:getProperty"); if(!ok) return 0; cocos2d::Value ret = cobj->getProperty(arg0); ccvalue_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getProperty",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTiledMap:getProperty",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -60857,13 +61365,13 @@ int lua_cocos2dx_TMXTiledMap_setMapSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.TMXTiledMap:setMapSize"); if(!ok) return 0; cobj->setMapSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMapSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTiledMap:setMapSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -60903,14 +61411,14 @@ int lua_cocos2dx_TMXTiledMap_getObjectGroup(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXTiledMap:getObjectGroup"); if(!ok) return 0; cocos2d::TMXObjectGroup* ret = cobj->getObjectGroup(arg0); object_to_luaval(tolua_S, "cc.TMXObjectGroup",(cocos2d::TMXObjectGroup*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getObjectGroup",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTiledMap:getObjectGroup",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -60957,7 +61465,7 @@ int lua_cocos2dx_TMXTiledMap_getObjectGroups(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getObjectGroups",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTiledMap:getObjectGroups",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -61001,7 +61509,7 @@ int lua_cocos2dx_TMXTiledMap_getTileSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTileSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTiledMap:getTileSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -61045,7 +61553,7 @@ int lua_cocos2dx_TMXTiledMap_getMapSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMapSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTiledMap:getMapSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -61089,7 +61597,7 @@ int lua_cocos2dx_TMXTiledMap_getProperties(lua_State* tolua_S) ccvaluemap_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getProperties",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTiledMap:getProperties",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -61129,13 +61637,13 @@ int lua_cocos2dx_TMXTiledMap_setTileSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.TMXTiledMap:setTileSize"); if(!ok) return 0; cobj->setTileSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTileSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTiledMap:setTileSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -61175,13 +61683,13 @@ int lua_cocos2dx_TMXTiledMap_setProperties(lua_State* tolua_S) { cocos2d::ValueMap arg0; - ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0); + ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0, "cc.TMXTiledMap:setProperties"); if(!ok) return 0; cobj->setProperties(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setProperties",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTiledMap:setProperties",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -61221,14 +61729,14 @@ int lua_cocos2dx_TMXTiledMap_getLayer(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXTiledMap:getLayer"); if(!ok) return 0; cocos2d::TMXLayer* ret = cobj->getLayer(arg0); object_to_luaval(tolua_S, "cc.TMXLayer",(cocos2d::TMXLayer*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLayer",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTiledMap:getLayer",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -61272,7 +61780,7 @@ int lua_cocos2dx_TMXTiledMap_getMapOrientation(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMapOrientation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTiledMap:getMapOrientation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -61312,13 +61820,13 @@ int lua_cocos2dx_TMXTiledMap_setMapOrientation(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.TMXTiledMap:setMapOrientation"); if(!ok) return 0; cobj->setMapOrientation(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMapOrientation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTiledMap:setMapOrientation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -61346,14 +61854,14 @@ int lua_cocos2dx_TMXTiledMap_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXTiledMap:create"); if(!ok) return 0; cocos2d::TMXTiledMap* ret = cocos2d::TMXTiledMap::create(arg0); object_to_luaval(tolua_S, "cc.TMXTiledMap",(cocos2d::TMXTiledMap*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TMXTiledMap:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -61380,15 +61888,15 @@ int lua_cocos2dx_TMXTiledMap_createWithXML(lua_State* tolua_S) { std::string arg0; std::string arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXTiledMap:createWithXML"); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.TMXTiledMap:createWithXML"); if(!ok) return 0; cocos2d::TMXTiledMap* ret = cocos2d::TMXTiledMap::createWithXML(arg0, arg1); object_to_luaval(tolua_S, "cc.TMXTiledMap",(cocos2d::TMXTiledMap*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithXML",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TMXTiledMap:createWithXML",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -61463,20 +61971,20 @@ int lua_cocos2dx_TileMapAtlas_initWithTileFile(lua_State* tolua_S) int arg2; int arg3; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TileMapAtlas:initWithTileFile"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.TileMapAtlas:initWithTileFile"); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.TileMapAtlas:initWithTileFile"); - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.TileMapAtlas:initWithTileFile"); if(!ok) return 0; bool ret = cobj->initWithTileFile(arg0, arg1, arg2, arg3); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithTileFile",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TileMapAtlas:initWithTileFile",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 @@ -61519,7 +62027,7 @@ int lua_cocos2dx_TileMapAtlas_releaseMap(lua_State* tolua_S) cobj->releaseMap(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "releaseMap",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TileMapAtlas:releaseMap",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -61559,14 +62067,14 @@ int lua_cocos2dx_TileMapAtlas_getTileAt(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.TileMapAtlas:getTileAt"); if(!ok) return 0; cocos2d::Color3B ret = cobj->getTileAt(arg0); color3b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTileAt",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TileMapAtlas:getTileAt",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -61607,15 +62115,15 @@ int lua_cocos2dx_TileMapAtlas_setTile(lua_State* tolua_S) cocos2d::Color3B arg0; cocos2d::Vec2 arg1; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.TileMapAtlas:setTile"); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.TileMapAtlas:setTile"); if(!ok) return 0; cobj->setTile(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTile",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TileMapAtlas:setTile",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -61646,17 +62154,17 @@ int lua_cocos2dx_TileMapAtlas_create(lua_State* tolua_S) std::string arg1; int arg2; int arg3; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TileMapAtlas:create"); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.TileMapAtlas:create"); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.TileMapAtlas:create"); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.TileMapAtlas:create"); if(!ok) return 0; cocos2d::TileMapAtlas* ret = cocos2d::TileMapAtlas::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.TileMapAtlas",(cocos2d::TileMapAtlas*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TileMapAtlas:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -61688,7 +62196,7 @@ int lua_cocos2dx_TileMapAtlas_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.TileMapAtlas"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TileMapAtlas",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TileMapAtlas:TileMapAtlas",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -61723,1751 +62231,6 @@ int lua_register_cocos2dx_TileMapAtlas(lua_State* tolua_S) return 1; } -int lua_cocos2dx_FastTMXTiledMap_setObjectGroups(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXTiledMap* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXTiledMap",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::FastTMXTiledMap*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXTiledMap_setObjectGroups'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::Vector arg0; - - ok &= luaval_to_ccvector(tolua_S, 2, &arg0); - if(!ok) - return 0; - cobj->setObjectGroups(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setObjectGroups",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXTiledMap_setObjectGroups'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXTiledMap_getProperty(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXTiledMap* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXTiledMap",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::FastTMXTiledMap*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXTiledMap_getProperty'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - std::string arg0; - - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - if(!ok) - return 0; - cocos2d::Value ret = cobj->getProperty(arg0); - ccvalue_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getProperty",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXTiledMap_getProperty'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXTiledMap_setMapSize(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXTiledMap* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXTiledMap",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::FastTMXTiledMap*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXTiledMap_setMapSize'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::Size arg0; - - ok &= luaval_to_size(tolua_S, 2, &arg0); - if(!ok) - return 0; - cobj->setMapSize(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMapSize",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXTiledMap_setMapSize'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXTiledMap_getObjectGroup(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXTiledMap* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXTiledMap",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::FastTMXTiledMap*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXTiledMap_getObjectGroup'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - std::string arg0; - - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - if(!ok) - return 0; - cocos2d::TMXObjectGroup* ret = cobj->getObjectGroup(arg0); - object_to_luaval(tolua_S, "cc.TMXObjectGroup",(cocos2d::TMXObjectGroup*)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getObjectGroup",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXTiledMap_getObjectGroup'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXTiledMap_getObjectGroups(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXTiledMap* cobj = nullptr; - bool ok = true; -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXTiledMap",0,&tolua_err)) goto tolua_lerror; -#endif - cobj = (cocos2d::FastTMXTiledMap*)tolua_tousertype(tolua_S,1,0); -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXTiledMap_getObjectGroups'", nullptr); - return 0; - } -#endif - argc = lua_gettop(tolua_S)-1; - do{ - if (argc == 0) { - cocos2d::Vector& ret = cobj->getObjectGroups(); - ccvector_to_luaval(tolua_S, ret); - return 1; - } - }while(0); - ok = true; - do{ - if (argc == 0) { - const cocos2d::Vector& ret = cobj->getObjectGroups(); - ccvector_to_luaval(tolua_S, ret); - return 1; - } - }while(0); - ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getObjectGroups",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXTiledMap_getObjectGroups'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXTiledMap_getTileSize(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXTiledMap* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXTiledMap",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::FastTMXTiledMap*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXTiledMap_getTileSize'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - const cocos2d::Size& ret = cobj->getTileSize(); - size_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTileSize",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXTiledMap_getTileSize'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXTiledMap_getMapSize(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXTiledMap* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXTiledMap",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::FastTMXTiledMap*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXTiledMap_getMapSize'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - const cocos2d::Size& ret = cobj->getMapSize(); - size_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMapSize",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXTiledMap_getMapSize'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXTiledMap_getProperties(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXTiledMap* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXTiledMap",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::FastTMXTiledMap*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXTiledMap_getProperties'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - const cocos2d::ValueMap& ret = cobj->getProperties(); - ccvaluemap_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getProperties",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXTiledMap_getProperties'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXTiledMap_getPropertiesForGID(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXTiledMap* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXTiledMap",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::FastTMXTiledMap*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXTiledMap_getPropertiesForGID'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - int arg0; - - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - if(!ok) - return 0; - cocos2d::Value ret = cobj->getPropertiesForGID(arg0); - ccvalue_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPropertiesForGID",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXTiledMap_getPropertiesForGID'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXTiledMap_setTileSize(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXTiledMap* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXTiledMap",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::FastTMXTiledMap*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXTiledMap_setTileSize'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::Size arg0; - - ok &= luaval_to_size(tolua_S, 2, &arg0); - if(!ok) - return 0; - cobj->setTileSize(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTileSize",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXTiledMap_setTileSize'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXTiledMap_setProperties(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXTiledMap* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXTiledMap",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::FastTMXTiledMap*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXTiledMap_setProperties'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::ValueMap arg0; - - ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0); - if(!ok) - return 0; - cobj->setProperties(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setProperties",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXTiledMap_setProperties'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXTiledMap_getLayer(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXTiledMap* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXTiledMap",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::FastTMXTiledMap*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXTiledMap_getLayer'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - std::string arg0; - - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - if(!ok) - return 0; - cocos2d::FastTMXLayer* ret = cobj->getLayer(arg0); - object_to_luaval(tolua_S, "cc.FastTMXLayer",(cocos2d::FastTMXLayer*)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLayer",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXTiledMap_getLayer'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXTiledMap_getMapOrientation(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXTiledMap* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXTiledMap",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::FastTMXTiledMap*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXTiledMap_getMapOrientation'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - int ret = cobj->getMapOrientation(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMapOrientation",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXTiledMap_getMapOrientation'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXTiledMap_setMapOrientation(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXTiledMap* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXTiledMap",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::FastTMXTiledMap*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXTiledMap_setMapOrientation'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - int arg0; - - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - if(!ok) - return 0; - cobj->setMapOrientation(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMapOrientation",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXTiledMap_setMapOrientation'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXTiledMap_create(lua_State* tolua_S) -{ - int argc = 0; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertable(tolua_S,1,"cc.FastTMXTiledMap",0,&tolua_err)) goto tolua_lerror; -#endif - - argc = lua_gettop(tolua_S) - 1; - - if (argc == 1) - { - std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - if(!ok) - return 0; - cocos2d::FastTMXTiledMap* ret = cocos2d::FastTMXTiledMap::create(arg0); - object_to_luaval(tolua_S, "cc.FastTMXTiledMap",(cocos2d::FastTMXTiledMap*)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); - return 0; -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXTiledMap_create'.",&tolua_err); -#endif - return 0; -} -int lua_cocos2dx_FastTMXTiledMap_createWithXML(lua_State* tolua_S) -{ - int argc = 0; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertable(tolua_S,1,"cc.FastTMXTiledMap",0,&tolua_err)) goto tolua_lerror; -#endif - - argc = lua_gettop(tolua_S) - 1; - - if (argc == 2) - { - std::string arg0; - std::string arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); - if(!ok) - return 0; - cocos2d::FastTMXTiledMap* ret = cocos2d::FastTMXTiledMap::createWithXML(arg0, arg1); - object_to_luaval(tolua_S, "cc.FastTMXTiledMap",(cocos2d::FastTMXTiledMap*)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithXML",argc, 2); - return 0; -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXTiledMap_createWithXML'.",&tolua_err); -#endif - return 0; -} -static int lua_cocos2dx_FastTMXTiledMap_finalize(lua_State* tolua_S) -{ - printf("luabindings: finalizing LUA object (FastTMXTiledMap)"); - return 0; -} - -int lua_register_cocos2dx_FastTMXTiledMap(lua_State* tolua_S) -{ - tolua_usertype(tolua_S,"cc.FastTMXTiledMap"); - tolua_cclass(tolua_S,"FastTMXTiledMap","cc.FastTMXTiledMap","cc.Node",nullptr); - - tolua_beginmodule(tolua_S,"FastTMXTiledMap"); - tolua_function(tolua_S,"setObjectGroups",lua_cocos2dx_FastTMXTiledMap_setObjectGroups); - tolua_function(tolua_S,"getProperty",lua_cocos2dx_FastTMXTiledMap_getProperty); - tolua_function(tolua_S,"setMapSize",lua_cocos2dx_FastTMXTiledMap_setMapSize); - tolua_function(tolua_S,"getObjectGroup",lua_cocos2dx_FastTMXTiledMap_getObjectGroup); - tolua_function(tolua_S,"getObjectGroups",lua_cocos2dx_FastTMXTiledMap_getObjectGroups); - tolua_function(tolua_S,"getTileSize",lua_cocos2dx_FastTMXTiledMap_getTileSize); - tolua_function(tolua_S,"getMapSize",lua_cocos2dx_FastTMXTiledMap_getMapSize); - tolua_function(tolua_S,"getProperties",lua_cocos2dx_FastTMXTiledMap_getProperties); - tolua_function(tolua_S,"getPropertiesForGID",lua_cocos2dx_FastTMXTiledMap_getPropertiesForGID); - tolua_function(tolua_S,"setTileSize",lua_cocos2dx_FastTMXTiledMap_setTileSize); - tolua_function(tolua_S,"setProperties",lua_cocos2dx_FastTMXTiledMap_setProperties); - tolua_function(tolua_S,"getLayer",lua_cocos2dx_FastTMXTiledMap_getLayer); - tolua_function(tolua_S,"getMapOrientation",lua_cocos2dx_FastTMXTiledMap_getMapOrientation); - tolua_function(tolua_S,"setMapOrientation",lua_cocos2dx_FastTMXTiledMap_setMapOrientation); - tolua_function(tolua_S,"create", lua_cocos2dx_FastTMXTiledMap_create); - tolua_function(tolua_S,"createWithXML", lua_cocos2dx_FastTMXTiledMap_createWithXML); - tolua_endmodule(tolua_S); - std::string typeName = typeid(cocos2d::FastTMXTiledMap).name(); - g_luaType[typeName] = "cc.FastTMXTiledMap"; - g_typeCast["FastTMXTiledMap"] = "cc.FastTMXTiledMap"; - return 1; -} - -int lua_cocos2dx_FastTMXLayer_getPositionAt(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXLayer* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXLayer",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::FastTMXLayer*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXLayer_getPositionAt'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::Vec2 arg0; - - ok &= luaval_to_vec2(tolua_S, 2, &arg0); - if(!ok) - return 0; - cocos2d::Vec2 ret = cobj->getPositionAt(arg0); - vec2_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPositionAt",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXLayer_getPositionAt'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXLayer_setLayerOrientation(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXLayer* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXLayer",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::FastTMXLayer*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXLayer_setLayerOrientation'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - int arg0; - - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - if(!ok) - return 0; - cobj->setLayerOrientation(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLayerOrientation",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXLayer_setLayerOrientation'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXLayer_getLayerSize(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXLayer* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXLayer",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::FastTMXLayer*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXLayer_getLayerSize'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - const cocos2d::Size& ret = cobj->getLayerSize(); - size_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLayerSize",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXLayer_getLayerSize'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXLayer_setMapTileSize(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXLayer* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXLayer",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::FastTMXLayer*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXLayer_setMapTileSize'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::Size arg0; - - ok &= luaval_to_size(tolua_S, 2, &arg0); - if(!ok) - return 0; - cobj->setMapTileSize(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMapTileSize",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXLayer_setMapTileSize'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXLayer_getLayerOrientation(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXLayer* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXLayer",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::FastTMXLayer*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXLayer_getLayerOrientation'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - int ret = cobj->getLayerOrientation(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLayerOrientation",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXLayer_getLayerOrientation'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXLayer_setProperties(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXLayer* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXLayer",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::FastTMXLayer*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXLayer_setProperties'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::ValueMap arg0; - - ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0); - if(!ok) - return 0; - cobj->setProperties(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setProperties",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXLayer_setProperties'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXLayer_setLayerName(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXLayer* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXLayer",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::FastTMXLayer*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXLayer_setLayerName'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - std::string arg0; - - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - if(!ok) - return 0; - cobj->setLayerName(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLayerName",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXLayer_setLayerName'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXLayer_removeTileAt(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXLayer* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXLayer",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::FastTMXLayer*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXLayer_removeTileAt'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::Vec2 arg0; - - ok &= luaval_to_vec2(tolua_S, 2, &arg0); - if(!ok) - return 0; - cobj->removeTileAt(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeTileAt",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXLayer_removeTileAt'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXLayer_getProperties(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXLayer* cobj = nullptr; - bool ok = true; -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXLayer",0,&tolua_err)) goto tolua_lerror; -#endif - cobj = (cocos2d::FastTMXLayer*)tolua_tousertype(tolua_S,1,0); -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXLayer_getProperties'", nullptr); - return 0; - } -#endif - argc = lua_gettop(tolua_S)-1; - do{ - if (argc == 0) { - cocos2d::ValueMap& ret = cobj->getProperties(); - ccvaluemap_to_luaval(tolua_S, ret); - return 1; - } - }while(0); - ok = true; - do{ - if (argc == 0) { - const cocos2d::ValueMap& ret = cobj->getProperties(); - ccvaluemap_to_luaval(tolua_S, ret); - return 1; - } - }while(0); - ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getProperties",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXLayer_getProperties'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXLayer_setupTiles(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXLayer* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXLayer",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::FastTMXLayer*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXLayer_setupTiles'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cobj->setupTiles(); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setupTiles",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXLayer_setupTiles'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXLayer_setupTileSprite(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXLayer* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXLayer",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::FastTMXLayer*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXLayer_setupTileSprite'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 3) - { - cocos2d::Sprite* arg0; - cocos2d::Vec2 arg1; - int arg2; - - ok &= luaval_to_object(tolua_S, 2, "cc.Sprite",&arg0); - - ok &= luaval_to_vec2(tolua_S, 3, &arg1); - - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); - if(!ok) - return 0; - cobj->setupTileSprite(arg0, arg1, arg2); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setupTileSprite",argc, 3); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXLayer_setupTileSprite'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXLayer_setTileGID(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXLayer* cobj = nullptr; - bool ok = true; -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXLayer",0,&tolua_err)) goto tolua_lerror; -#endif - cobj = (cocos2d::FastTMXLayer*)tolua_tousertype(tolua_S,1,0); -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXLayer_setTileGID'", nullptr); - return 0; - } -#endif - argc = lua_gettop(tolua_S)-1; - do{ - if (argc == 3) { - int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - - if (!ok) { break; } - cocos2d::Vec2 arg1; - ok &= luaval_to_vec2(tolua_S, 3, &arg1); - - if (!ok) { break; } - cocos2d::TMXTileFlags_ arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); - - if (!ok) { break; } - cobj->setTileGID(arg0, arg1, arg2); - return 0; - } - }while(0); - ok = true; - do{ - if (argc == 2) { - int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - - if (!ok) { break; } - cocos2d::Vec2 arg1; - ok &= luaval_to_vec2(tolua_S, 3, &arg1); - - if (!ok) { break; } - cobj->setTileGID(arg0, arg1); - return 0; - } - }while(0); - ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTileGID",argc, 2); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXLayer_setTileGID'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXLayer_getMapTileSize(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXLayer* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXLayer",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::FastTMXLayer*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXLayer_getMapTileSize'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - const cocos2d::Size& ret = cobj->getMapTileSize(); - size_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMapTileSize",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXLayer_getMapTileSize'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXLayer_getProperty(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXLayer* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXLayer",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::FastTMXLayer*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXLayer_getProperty'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - std::string arg0; - - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - if(!ok) - return 0; - cocos2d::Value ret = cobj->getProperty(arg0); - ccvalue_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getProperty",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXLayer_getProperty'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXLayer_setLayerSize(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXLayer* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXLayer",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::FastTMXLayer*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXLayer_setLayerSize'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::Size arg0; - - ok &= luaval_to_size(tolua_S, 2, &arg0); - if(!ok) - return 0; - cobj->setLayerSize(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLayerSize",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXLayer_setLayerSize'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXLayer_getLayerName(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXLayer* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXLayer",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::FastTMXLayer*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXLayer_getLayerName'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - const std::string& ret = cobj->getLayerName(); - tolua_pushcppstring(tolua_S,ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLayerName",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXLayer_getLayerName'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXLayer_setTileSet(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXLayer* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXLayer",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::FastTMXLayer*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXLayer_setTileSet'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::TMXTilesetInfo* arg0; - - ok &= luaval_to_object(tolua_S, 2, "cc.TMXTilesetInfo",&arg0); - if(!ok) - return 0; - cobj->setTileSet(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTileSet",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXLayer_setTileSet'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXLayer_getTileSet(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXLayer* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXLayer",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::FastTMXLayer*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXLayer_getTileSet'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::TMXTilesetInfo* ret = cobj->getTileSet(); - object_to_luaval(tolua_S, "cc.TMXTilesetInfo",(cocos2d::TMXTilesetInfo*)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTileSet",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXLayer_getTileSet'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXLayer_getTileAt(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXLayer* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXLayer",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::FastTMXLayer*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXLayer_getTileAt'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::Vec2 arg0; - - ok &= luaval_to_vec2(tolua_S, 2, &arg0); - if(!ok) - return 0; - cocos2d::Sprite* ret = cobj->getTileAt(arg0); - object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTileAt",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXLayer_getTileAt'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_FastTMXLayer_create(lua_State* tolua_S) -{ - int argc = 0; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertable(tolua_S,1,"cc.FastTMXLayer",0,&tolua_err)) goto tolua_lerror; -#endif - - argc = lua_gettop(tolua_S) - 1; - - if (argc == 3) - { - cocos2d::TMXTilesetInfo* arg0; - cocos2d::TMXLayerInfo* arg1; - cocos2d::TMXMapInfo* arg2; - ok &= luaval_to_object(tolua_S, 2, "cc.TMXTilesetInfo",&arg0); - ok &= luaval_to_object(tolua_S, 3, "cc.TMXLayerInfo",&arg1); - ok &= luaval_to_object(tolua_S, 4, "cc.TMXMapInfo",&arg2); - if(!ok) - return 0; - cocos2d::FastTMXLayer* ret = cocos2d::FastTMXLayer::create(arg0, arg1, arg2); - object_to_luaval(tolua_S, "cc.FastTMXLayer",(cocos2d::FastTMXLayer*)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 3); - return 0; -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXLayer_create'.",&tolua_err); -#endif - return 0; -} -int lua_cocos2dx_FastTMXLayer_constructor(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXLayer* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cobj = new cocos2d::FastTMXLayer(); - cobj->autorelease(); - int ID = (int)cobj->_ID ; - int* luaID = &cobj->_luaID ; - toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.FastTMXLayer"); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "FastTMXLayer",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXLayer_constructor'.",&tolua_err); -#endif - - return 0; -} - -static int lua_cocos2dx_FastTMXLayer_finalize(lua_State* tolua_S) -{ - printf("luabindings: finalizing LUA object (FastTMXLayer)"); - return 0; -} - -int lua_register_cocos2dx_FastTMXLayer(lua_State* tolua_S) -{ - tolua_usertype(tolua_S,"cc.FastTMXLayer"); - tolua_cclass(tolua_S,"FastTMXLayer","cc.FastTMXLayer","cc.Node",nullptr); - - tolua_beginmodule(tolua_S,"FastTMXLayer"); - tolua_function(tolua_S,"new",lua_cocos2dx_FastTMXLayer_constructor); - tolua_function(tolua_S,"getPositionAt",lua_cocos2dx_FastTMXLayer_getPositionAt); - tolua_function(tolua_S,"setLayerOrientation",lua_cocos2dx_FastTMXLayer_setLayerOrientation); - tolua_function(tolua_S,"getLayerSize",lua_cocos2dx_FastTMXLayer_getLayerSize); - tolua_function(tolua_S,"setMapTileSize",lua_cocos2dx_FastTMXLayer_setMapTileSize); - tolua_function(tolua_S,"getLayerOrientation",lua_cocos2dx_FastTMXLayer_getLayerOrientation); - tolua_function(tolua_S,"setProperties",lua_cocos2dx_FastTMXLayer_setProperties); - tolua_function(tolua_S,"setLayerName",lua_cocos2dx_FastTMXLayer_setLayerName); - tolua_function(tolua_S,"removeTileAt",lua_cocos2dx_FastTMXLayer_removeTileAt); - tolua_function(tolua_S,"getProperties",lua_cocos2dx_FastTMXLayer_getProperties); - tolua_function(tolua_S,"setupTiles",lua_cocos2dx_FastTMXLayer_setupTiles); - tolua_function(tolua_S,"setupTileSprite",lua_cocos2dx_FastTMXLayer_setupTileSprite); - tolua_function(tolua_S,"setTileGID",lua_cocos2dx_FastTMXLayer_setTileGID); - tolua_function(tolua_S,"getMapTileSize",lua_cocos2dx_FastTMXLayer_getMapTileSize); - tolua_function(tolua_S,"getProperty",lua_cocos2dx_FastTMXLayer_getProperty); - tolua_function(tolua_S,"setLayerSize",lua_cocos2dx_FastTMXLayer_setLayerSize); - tolua_function(tolua_S,"getLayerName",lua_cocos2dx_FastTMXLayer_getLayerName); - tolua_function(tolua_S,"setTileSet",lua_cocos2dx_FastTMXLayer_setTileSet); - tolua_function(tolua_S,"getTileSet",lua_cocos2dx_FastTMXLayer_getTileSet); - tolua_function(tolua_S,"getTileAt",lua_cocos2dx_FastTMXLayer_getTileAt); - tolua_function(tolua_S,"create", lua_cocos2dx_FastTMXLayer_create); - tolua_endmodule(tolua_S); - std::string typeName = typeid(cocos2d::FastTMXLayer).name(); - g_luaType[typeName] = "cc.FastTMXLayer"; - g_typeCast["FastTMXLayer"] = "cc.FastTMXLayer"; - return 1; -} - int lua_cocos2dx_Component_setEnabled(lua_State* tolua_S) { int argc = 0; @@ -63498,13 +62261,13 @@ int lua_cocos2dx_Component_setEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Component:setEnabled"); if(!ok) return 0; cobj->setEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Component:setEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -63544,13 +62307,13 @@ int lua_cocos2dx_Component_setName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Component:setName"); if(!ok) return 0; cobj->setName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Component:setName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -63594,7 +62357,7 @@ int lua_cocos2dx_Component_isEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Component:isEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -63634,13 +62397,13 @@ int lua_cocos2dx_Component_update(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Component:update"); if(!ok) return 0; cobj->update(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "update",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Component:update",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -63684,7 +62447,7 @@ int lua_cocos2dx_Component_getOwner(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOwner",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Component:getOwner",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -63728,7 +62491,7 @@ int lua_cocos2dx_Component_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Component:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -63774,7 +62537,7 @@ int lua_cocos2dx_Component_setOwner(lua_State* tolua_S) cobj->setOwner(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOwner",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Component:setOwner",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -63818,7 +62581,7 @@ int lua_cocos2dx_Component_getName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Component:getName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -63851,7 +62614,7 @@ int lua_cocos2dx_Component_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Component",(cocos2d::Component*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Component:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -63922,7 +62685,7 @@ int lua_cocos2dx_Sprite3D_setTexture(lua_State* tolua_S) do{ if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite3D:setTexture"); if (!ok) { break; } cobj->setTexture(arg0); @@ -63930,7 +62693,7 @@ int lua_cocos2dx_Sprite3D_setTexture(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite3D:setTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -63974,7 +62737,7 @@ int lua_cocos2dx_Sprite3D_getMesh(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Mesh",(cocos2d::Mesh*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMesh",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite3D:getMesh",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -64018,7 +62781,7 @@ int lua_cocos2dx_Sprite3D_getBlendFunc(lua_State* tolua_S) blendfunc_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBlendFunc",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite3D:getBlendFunc",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -64064,7 +62827,7 @@ int lua_cocos2dx_Sprite3D_setBlendFunc(lua_State* tolua_S) cobj->setBlendFunc(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBlendFunc",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite3D:setBlendFunc",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -64093,10 +62856,10 @@ int lua_cocos2dx_Sprite3D_create(lua_State* tolua_S) if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite3D:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Sprite3D:create"); if (!ok) { break; } cocos2d::Sprite3D* ret = cocos2d::Sprite3D::create(arg0, arg1); object_to_luaval(tolua_S, "cc.Sprite3D",(cocos2d::Sprite3D*)ret); @@ -64109,7 +62872,7 @@ int lua_cocos2dx_Sprite3D_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite3D:create"); if (!ok) { break; } cocos2d::Sprite3D* ret = cocos2d::Sprite3D::create(arg0); object_to_luaval(tolua_S, "cc.Sprite3D",(cocos2d::Sprite3D*)ret); @@ -64117,7 +62880,7 @@ int lua_cocos2dx_Sprite3D_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.Sprite3D:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -64182,7 +62945,7 @@ int lua_cocos2dx_Mesh_restore(lua_State* tolua_S) cobj->restore(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "restore",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Mesh:restore",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -64226,7 +62989,7 @@ int lua_cocos2dx_Mesh_getMeshVertexAttribCount(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMeshVertexAttribCount",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Mesh:getMeshVertexAttribCount",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -64270,7 +63033,7 @@ int lua_cocos2dx_Mesh_getIndexFormat(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getIndexFormat",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Mesh:getIndexFormat",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -64314,7 +63077,7 @@ int lua_cocos2dx_Mesh_getVertexSizeInBytes(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVertexSizeInBytes",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Mesh:getVertexSizeInBytes",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -64358,7 +63121,7 @@ int lua_cocos2dx_Mesh_getPrimitiveType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPrimitiveType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Mesh:getPrimitiveType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -64402,7 +63165,7 @@ int lua_cocos2dx_Mesh_getIndexCount(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getIndexCount",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Mesh:getIndexCount",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -64446,7 +63209,7 @@ int lua_cocos2dx_Mesh_getVertexBuffer(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVertexBuffer",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Mesh:getVertexBuffer",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -64486,14 +63249,14 @@ int lua_cocos2dx_Mesh_getMeshVertexAttribute(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Mesh:getMeshVertexAttribute"); if(!ok) return 0; const cocos2d::MeshVertexAttrib& ret = cobj->getMeshVertexAttribute(arg0); mesh_vertex_attrib_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMeshVertexAttribute",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Mesh:getMeshVertexAttribute",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -64537,7 +63300,7 @@ int lua_cocos2dx_Mesh_getIndexBuffer(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getIndexBuffer",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Mesh:getIndexBuffer",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -64577,14 +63340,14 @@ int lua_cocos2dx_Mesh_hasVertexAttrib(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Mesh:hasVertexAttrib"); if(!ok) return 0; bool ret = cobj->hasVertexAttrib(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "hasVertexAttrib",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Mesh:hasVertexAttrib",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -64657,7 +63420,7 @@ int lua_cocos2dx_Animation3D_getDuration(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDuration",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animation3D:getDuration",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -64685,7 +63448,7 @@ int lua_cocos2dx_Animation3D_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Animation3D:create"); if(!ok) return 0; cocos2d::Animation3D* ret = cocos2d::Animation3D::create(arg0); @@ -64696,15 +63459,15 @@ int lua_cocos2dx_Animation3D_create(lua_State* tolua_S) { std::string arg0; std::string arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Animation3D:create"); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Animation3D:create"); if(!ok) return 0; cocos2d::Animation3D* ret = cocos2d::Animation3D::create(arg0, arg1); object_to_luaval(tolua_S, "cc.Animation3D",(cocos2d::Animation3D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Animation3D:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -64763,13 +63526,13 @@ int lua_cocos2dx_Animate3D_setSpeed(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Animate3D:setSpeed"); if(!ok) return 0; cobj->setSpeed(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSpeed",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animate3D:setSpeed",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -64809,13 +63572,13 @@ int lua_cocos2dx_Animate3D_setWeight(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Animate3D:setWeight"); if(!ok) return 0; cobj->setWeight(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setWeight",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animate3D:setWeight",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -64859,7 +63622,7 @@ int lua_cocos2dx_Animate3D_getSpeed(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSpeed",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animate3D:getSpeed",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -64903,7 +63666,7 @@ int lua_cocos2dx_Animate3D_getWeight(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getWeight",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animate3D:getWeight",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -64935,10 +63698,10 @@ int lua_cocos2dx_Animate3D_create(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Animation3D",&arg0); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.Animate3D:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Animate3D:create"); if (!ok) { break; } cocos2d::Animate3D* ret = cocos2d::Animate3D::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.Animate3D",(cocos2d::Animate3D*)ret); @@ -64959,7 +63722,7 @@ int lua_cocos2dx_Animate3D_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.Animate3D:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -65021,13 +63784,13 @@ int lua_cocos2dx_SimpleAudioEngine_preloadBackgroundMusic(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.SimpleAudioEngine:preloadBackgroundMusic"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->preloadBackgroundMusic(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "preloadBackgroundMusic",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:preloadBackgroundMusic",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -65074,13 +63837,13 @@ int lua_cocos2dx_SimpleAudioEngine_stopBackgroundMusic(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.SimpleAudioEngine:stopBackgroundMusic"); if(!ok) return 0; cobj->stopBackgroundMusic(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stopBackgroundMusic",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:stopBackgroundMusic",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -65123,7 +63886,7 @@ int lua_cocos2dx_SimpleAudioEngine_stopAllEffects(lua_State* tolua_S) cobj->stopAllEffects(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stopAllEffects",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:stopAllEffects",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -65167,7 +63930,7 @@ int lua_cocos2dx_SimpleAudioEngine_getBackgroundMusicVolume(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackgroundMusicVolume",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:getBackgroundMusicVolume",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -65210,7 +63973,7 @@ int lua_cocos2dx_SimpleAudioEngine_resumeBackgroundMusic(lua_State* tolua_S) cobj->resumeBackgroundMusic(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resumeBackgroundMusic",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:resumeBackgroundMusic",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -65250,13 +64013,13 @@ int lua_cocos2dx_SimpleAudioEngine_setBackgroundMusicVolume(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.SimpleAudioEngine:setBackgroundMusicVolume"); if(!ok) return 0; cobj->setBackgroundMusicVolume(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackgroundMusicVolume",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:setBackgroundMusicVolume",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -65296,13 +64059,13 @@ int lua_cocos2dx_SimpleAudioEngine_preloadEffect(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.SimpleAudioEngine:preloadEffect"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->preloadEffect(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "preloadEffect",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:preloadEffect",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -65346,7 +64109,7 @@ int lua_cocos2dx_SimpleAudioEngine_isBackgroundMusicPlaying(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isBackgroundMusicPlaying",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:isBackgroundMusicPlaying",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -65390,7 +64153,7 @@ int lua_cocos2dx_SimpleAudioEngine_getEffectsVolume(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEffectsVolume",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:getEffectsVolume",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -65434,7 +64197,7 @@ int lua_cocos2dx_SimpleAudioEngine_willPlayBackgroundMusic(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "willPlayBackgroundMusic",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:willPlayBackgroundMusic",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -65474,13 +64237,13 @@ int lua_cocos2dx_SimpleAudioEngine_pauseEffect(lua_State* tolua_S) { unsigned int arg0; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.SimpleAudioEngine:pauseEffect"); if(!ok) return 0; cobj->pauseEffect(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pauseEffect",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:pauseEffect",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -65520,7 +64283,7 @@ int lua_cocos2dx_SimpleAudioEngine_playEffect(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.SimpleAudioEngine:playEffect"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; unsigned int ret = cobj->playEffect(arg0); @@ -65532,9 +64295,9 @@ int lua_cocos2dx_SimpleAudioEngine_playEffect(lua_State* tolua_S) const char* arg0; bool arg1; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.SimpleAudioEngine:playEffect"); arg0 = arg0_tmp.c_str(); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.SimpleAudioEngine:playEffect"); if(!ok) return 0; unsigned int ret = cobj->playEffect(arg0, arg1); @@ -65547,11 +64310,11 @@ int lua_cocos2dx_SimpleAudioEngine_playEffect(lua_State* tolua_S) bool arg1; double arg2; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.SimpleAudioEngine:playEffect"); arg0 = arg0_tmp.c_str(); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.SimpleAudioEngine:playEffect"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.SimpleAudioEngine:playEffect"); if(!ok) return 0; unsigned int ret = cobj->playEffect(arg0, arg1, arg2); @@ -65565,13 +64328,13 @@ int lua_cocos2dx_SimpleAudioEngine_playEffect(lua_State* tolua_S) double arg2; double arg3; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.SimpleAudioEngine:playEffect"); arg0 = arg0_tmp.c_str(); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.SimpleAudioEngine:playEffect"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.SimpleAudioEngine:playEffect"); - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.SimpleAudioEngine:playEffect"); if(!ok) return 0; unsigned int ret = cobj->playEffect(arg0, arg1, arg2, arg3); @@ -65586,22 +64349,22 @@ int lua_cocos2dx_SimpleAudioEngine_playEffect(lua_State* tolua_S) double arg3; double arg4; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.SimpleAudioEngine:playEffect"); arg0 = arg0_tmp.c_str(); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.SimpleAudioEngine:playEffect"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.SimpleAudioEngine:playEffect"); - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.SimpleAudioEngine:playEffect"); - ok &= luaval_to_number(tolua_S, 6,&arg4); + ok &= luaval_to_number(tolua_S, 6,&arg4, "cc.SimpleAudioEngine:playEffect"); if(!ok) return 0; unsigned int ret = cobj->playEffect(arg0, arg1, arg2, arg3, arg4); tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "playEffect",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:playEffect",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -65644,7 +64407,7 @@ int lua_cocos2dx_SimpleAudioEngine_rewindBackgroundMusic(lua_State* tolua_S) cobj->rewindBackgroundMusic(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "rewindBackgroundMusic",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:rewindBackgroundMusic",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -65684,7 +64447,7 @@ int lua_cocos2dx_SimpleAudioEngine_playBackgroundMusic(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.SimpleAudioEngine:playBackgroundMusic"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->playBackgroundMusic(arg0); @@ -65695,15 +64458,15 @@ int lua_cocos2dx_SimpleAudioEngine_playBackgroundMusic(lua_State* tolua_S) const char* arg0; bool arg1; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.SimpleAudioEngine:playBackgroundMusic"); arg0 = arg0_tmp.c_str(); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.SimpleAudioEngine:playBackgroundMusic"); if(!ok) return 0; cobj->playBackgroundMusic(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "playBackgroundMusic",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:playBackgroundMusic",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -65746,7 +64509,7 @@ int lua_cocos2dx_SimpleAudioEngine_resumeAllEffects(lua_State* tolua_S) cobj->resumeAllEffects(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resumeAllEffects",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:resumeAllEffects",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -65786,13 +64549,13 @@ int lua_cocos2dx_SimpleAudioEngine_setEffectsVolume(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.SimpleAudioEngine:setEffectsVolume"); if(!ok) return 0; cobj->setEffectsVolume(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEffectsVolume",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:setEffectsVolume",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -65832,13 +64595,13 @@ int lua_cocos2dx_SimpleAudioEngine_stopEffect(lua_State* tolua_S) { unsigned int arg0; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.SimpleAudioEngine:stopEffect"); if(!ok) return 0; cobj->stopEffect(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stopEffect",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:stopEffect",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -65881,7 +64644,7 @@ int lua_cocos2dx_SimpleAudioEngine_pauseBackgroundMusic(lua_State* tolua_S) cobj->pauseBackgroundMusic(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pauseBackgroundMusic",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:pauseBackgroundMusic",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -65924,7 +64687,7 @@ int lua_cocos2dx_SimpleAudioEngine_pauseAllEffects(lua_State* tolua_S) cobj->pauseAllEffects(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pauseAllEffects",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:pauseAllEffects",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -65964,13 +64727,13 @@ int lua_cocos2dx_SimpleAudioEngine_unloadEffect(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.SimpleAudioEngine:unloadEffect"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->unloadEffect(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "unloadEffect",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:unloadEffect",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -66010,13 +64773,13 @@ int lua_cocos2dx_SimpleAudioEngine_resumeEffect(lua_State* tolua_S) { unsigned int arg0; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.SimpleAudioEngine:resumeEffect"); if(!ok) return 0; cobj->resumeEffect(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resumeEffect",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:resumeEffect",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -66048,7 +64811,7 @@ int lua_cocos2dx_SimpleAudioEngine_end(lua_State* tolua_S) CocosDenshion::SimpleAudioEngine::end(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "end",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.SimpleAudioEngine:end",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -66079,7 +64842,7 @@ int lua_cocos2dx_SimpleAudioEngine_getInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.SimpleAudioEngine",(CocosDenshion::SimpleAudioEngine*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.SimpleAudioEngine:getInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -66157,7 +64920,7 @@ int lua_cocos2dx_ProtectedNode_addProtectedChild(lua_State* tolua_S) if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ProtectedNode:addProtectedChild"); if (!ok) { break; } cobj->addProtectedChild(arg0, arg1); @@ -66183,11 +64946,11 @@ int lua_cocos2dx_ProtectedNode_addProtectedChild(lua_State* tolua_S) if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ProtectedNode:addProtectedChild"); if (!ok) { break; } int arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.ProtectedNode:addProtectedChild"); if (!ok) { break; } cobj->addProtectedChild(arg0, arg1, arg2); @@ -66195,7 +64958,7 @@ int lua_cocos2dx_ProtectedNode_addProtectedChild(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addProtectedChild",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProtectedNode:addProtectedChild",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -66238,7 +65001,7 @@ int lua_cocos2dx_ProtectedNode_disableCascadeColor(lua_State* tolua_S) cobj->disableCascadeColor(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "disableCascadeColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProtectedNode:disableCascadeColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -66278,7 +65041,7 @@ int lua_cocos2dx_ProtectedNode_removeProtectedChildByTag(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ProtectedNode:removeProtectedChildByTag"); if(!ok) return 0; cobj->removeProtectedChildByTag(arg0); @@ -66289,15 +65052,15 @@ int lua_cocos2dx_ProtectedNode_removeProtectedChildByTag(lua_State* tolua_S) int arg0; bool arg1; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ProtectedNode:removeProtectedChildByTag"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.ProtectedNode:removeProtectedChildByTag"); if(!ok) return 0; cobj->removeProtectedChildByTag(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeProtectedChildByTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProtectedNode:removeProtectedChildByTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -66340,13 +65103,13 @@ int lua_cocos2dx_ProtectedNode_reorderProtectedChild(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ProtectedNode:reorderProtectedChild"); if(!ok) return 0; cobj->reorderProtectedChild(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "reorderProtectedChild",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProtectedNode:reorderProtectedChild",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -66386,13 +65149,13 @@ int lua_cocos2dx_ProtectedNode_removeAllProtectedChildrenWithCleanup(lua_State* { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ProtectedNode:removeAllProtectedChildrenWithCleanup"); if(!ok) return 0; cobj->removeAllProtectedChildrenWithCleanup(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllProtectedChildrenWithCleanup",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProtectedNode:removeAllProtectedChildrenWithCleanup",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -66435,7 +65198,7 @@ int lua_cocos2dx_ProtectedNode_sortAllProtectedChildren(lua_State* tolua_S) cobj->sortAllProtectedChildren(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "sortAllProtectedChildren",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProtectedNode:sortAllProtectedChildren",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -66475,14 +65238,14 @@ int lua_cocos2dx_ProtectedNode_getProtectedChildByTag(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ProtectedNode:getProtectedChildByTag"); if(!ok) return 0; cocos2d::Node* ret = cobj->getProtectedChildByTag(arg0); object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getProtectedChildByTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProtectedNode:getProtectedChildByTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -66535,13 +65298,13 @@ int lua_cocos2dx_ProtectedNode_removeProtectedChild(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.ProtectedNode:removeProtectedChild"); if(!ok) return 0; cobj->removeProtectedChild(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeProtectedChild",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProtectedNode:removeProtectedChild",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -66584,7 +65347,7 @@ int lua_cocos2dx_ProtectedNode_removeAllProtectedChildren(lua_State* tolua_S) cobj->removeAllProtectedChildren(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllProtectedChildren",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProtectedNode:removeAllProtectedChildren",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -66617,7 +65380,7 @@ int lua_cocos2dx_ProtectedNode_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ProtectedNode",(cocos2d::ProtectedNode*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ProtectedNode:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -66670,7 +65433,6 @@ TOLUA_API int register_all_cocos2dx(lua_State* tolua_S) lua_register_cocos2dx_TransitionMoveInB(tolua_S); lua_register_cocos2dx_AtlasNode(tolua_S); lua_register_cocos2dx_TileMapAtlas(tolua_S); - lua_register_cocos2dx_GLViewProtocol(tolua_S); lua_register_cocos2dx_TransitionMoveInT(tolua_S); lua_register_cocos2dx_TMXTilesetInfo(tolua_S); lua_register_cocos2dx_TransitionMoveInR(tolua_S); @@ -66691,12 +65453,11 @@ TOLUA_API int register_all_cocos2dx(lua_State* tolua_S) lua_register_cocos2dx_JumpBy(tolua_S); lua_register_cocos2dx_EventListener(tolua_S); lua_register_cocos2dx_EventListenerKeyboard(tolua_S); - lua_register_cocos2dx_ActionEase(tolua_S); - lua_register_cocos2dx_EaseBounce(tolua_S); - lua_register_cocos2dx_EaseBounceIn(tolua_S); + lua_register_cocos2dx_EventListenerMouse(tolua_S); lua_register_cocos2dx_TransitionRotoZoom(tolua_S); lua_register_cocos2dx_Director(tolua_S); lua_register_cocos2dx_Scheduler(tolua_S); + lua_register_cocos2dx_ActionEase(tolua_S); lua_register_cocos2dx_EaseElastic(tolua_S); lua_register_cocos2dx_EaseElasticOut(tolua_S); lua_register_cocos2dx_EaseQuadraticActionInOut(tolua_S); @@ -66728,12 +65489,13 @@ TOLUA_API int register_all_cocos2dx(lua_State* tolua_S) lua_register_cocos2dx_EaseSineInOut(tolua_S); lua_register_cocos2dx_TransitionFlipAngular(tolua_S); lua_register_cocos2dx_EaseElasticInOut(tolua_S); + lua_register_cocos2dx_EaseBounce(tolua_S); lua_register_cocos2dx_Show(tolua_S); lua_register_cocos2dx_FadeOut(tolua_S); lua_register_cocos2dx_CallFunc(tolua_S); lua_register_cocos2dx_Event(tolua_S); lua_register_cocos2dx_EventMouse(tolua_S); - lua_register_cocos2dx_Waves3D(tolua_S); + lua_register_cocos2dx_GLView(tolua_S); lua_register_cocos2dx_EaseBezierAction(tolua_S); lua_register_cocos2dx_ParticleFireworks(tolua_S); lua_register_cocos2dx_MenuItem(tolua_S); @@ -66745,7 +65507,7 @@ TOLUA_API int register_all_cocos2dx(lua_State* tolua_S) lua_register_cocos2dx_EaseIn(tolua_S); lua_register_cocos2dx_EaseExponentialInOut(tolua_S); lua_register_cocos2dx_EaseBackInOut(tolua_S); - lua_register_cocos2dx_GLView(tolua_S); + lua_register_cocos2dx_Waves3D(tolua_S); lua_register_cocos2dx_EaseExponentialOut(tolua_S); lua_register_cocos2dx_SpriteBatchNode(tolua_S); lua_register_cocos2dx_Label(tolua_S); @@ -66795,9 +65557,8 @@ TOLUA_API int register_all_cocos2dx(lua_State* tolua_S) lua_register_cocos2dx_TMXLayerInfo(tolua_S); lua_register_cocos2dx_EaseSineIn(tolua_S); lua_register_cocos2dx_Sprite3D(tolua_S); - lua_register_cocos2dx_EventListenerMouse(tolua_S); + lua_register_cocos2dx_EaseBounceIn(tolua_S); lua_register_cocos2dx_TiledGrid3D(tolua_S); - lua_register_cocos2dx_FastTMXTiledMap(tolua_S); lua_register_cocos2dx_ParticleGalaxy(tolua_S); lua_register_cocos2dx_Twirl(tolua_S); lua_register_cocos2dx_MenuItemLabel(tolua_S); @@ -66806,6 +65567,7 @@ TOLUA_API int register_all_cocos2dx(lua_State* tolua_S) lua_register_cocos2dx_FadeOutBLTiles(tolua_S); lua_register_cocos2dx_LayerGradient(tolua_S); lua_register_cocos2dx_EventListenerTouchAllAtOnce(tolua_S); + lua_register_cocos2dx_GLViewImpl(tolua_S); lua_register_cocos2dx_ToggleVisibility(tolua_S); lua_register_cocos2dx_Repeat(tolua_S); lua_register_cocos2dx_CardinalSplineTo(tolua_S); @@ -66830,7 +65592,6 @@ TOLUA_API int register_all_cocos2dx(lua_State* tolua_S) lua_register_cocos2dx_SpriteFrame(tolua_S); lua_register_cocos2dx_ActionManager(tolua_S); lua_register_cocos2dx_UserDefault(tolua_S); - lua_register_cocos2dx_FastTMXLayer(tolua_S); lua_register_cocos2dx_TransitionZoomFlipX(tolua_S); lua_register_cocos2dx_EventFocus(tolua_S); lua_register_cocos2dx_EaseQuinticActionInOut(tolua_S); diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp index 557a4a1f5c..758bdf6e07 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp @@ -1560,35 +1560,6 @@ int register_all_cocos2dx(lua_State* tolua_S); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.cpp index 160c684a1d..30a5370bd9 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.cpp @@ -37,15 +37,15 @@ int lua_cocos2dx_controller_Controller_receiveExternalKeyEvent(lua_State* tolua_ int arg0; bool arg1; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Controller:receiveExternalKeyEvent"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.Controller:receiveExternalKeyEvent"); if(!ok) return 0; cobj->receiveExternalKeyEvent(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "receiveExternalKeyEvent",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Controller:receiveExternalKeyEvent",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -89,7 +89,7 @@ int lua_cocos2dx_controller_Controller_getDeviceName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDeviceName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Controller:getDeviceName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -133,7 +133,7 @@ int lua_cocos2dx_controller_Controller_isConnected(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isConnected",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Controller:isConnected",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -177,7 +177,7 @@ int lua_cocos2dx_controller_Controller_getDeviceId(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDeviceId",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Controller:getDeviceId",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -217,13 +217,13 @@ int lua_cocos2dx_controller_Controller_setTag(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Controller:setTag"); if(!ok) return 0; cobj->setTag(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Controller:setTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -267,7 +267,7 @@ int lua_cocos2dx_controller_Controller_getTag(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTag",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Controller:getTag",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -299,7 +299,7 @@ int lua_cocos2dx_controller_Controller_startDiscoveryController(lua_State* tolua cocos2d::Controller::startDiscoveryController(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "startDiscoveryController",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Controller:startDiscoveryController",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -329,7 +329,7 @@ int lua_cocos2dx_controller_Controller_stopDiscoveryController(lua_State* tolua_ cocos2d::Controller::stopDiscoveryController(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "stopDiscoveryController",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Controller:stopDiscoveryController",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -355,14 +355,14 @@ int lua_cocos2dx_controller_Controller_getControllerByTag(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Controller:getControllerByTag"); if(!ok) return 0; cocos2d::Controller* ret = cocos2d::Controller::getControllerByTag(arg0); object_to_luaval(tolua_S, "cc.Controller",(cocos2d::Controller*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getControllerByTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Controller:getControllerByTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -432,7 +432,7 @@ int lua_cocos2dx_controller_EventController_getControllerEventType(lua_State* to tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getControllerEventType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventController:getControllerEventType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -472,13 +472,13 @@ int lua_cocos2dx_controller_EventController_setConnectStatus(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.EventController:setConnectStatus"); if(!ok) return 0; cobj->setConnectStatus(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setConnectStatus",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventController:setConnectStatus",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -522,7 +522,7 @@ int lua_cocos2dx_controller_EventController_isConnected(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isConnected",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventController:isConnected",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -562,13 +562,13 @@ int lua_cocos2dx_controller_EventController_setKeyCode(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.EventController:setKeyCode"); if(!ok) return 0; cobj->setKeyCode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setKeyCode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventController:setKeyCode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -612,7 +612,7 @@ int lua_cocos2dx_controller_EventController_getController(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Controller",(cocos2d::Controller*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getController",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventController:getController",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -656,7 +656,7 @@ int lua_cocos2dx_controller_EventController_getKeyCode(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getKeyCode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventController:getKeyCode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -679,7 +679,7 @@ int lua_cocos2dx_controller_EventController_constructor(lua_State* tolua_S) do{ if (argc == 3) { cocos2d::EventController::ControllerEventType arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.EventController:EventController"); if (!ok) { break; } cocos2d::Controller* arg1; @@ -687,7 +687,7 @@ int lua_cocos2dx_controller_EventController_constructor(lua_State* tolua_S) if (!ok) { break; } bool arg2; - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.EventController:EventController"); if (!ok) { break; } cobj = new cocos2d::EventController(arg0, arg1, arg2); @@ -702,7 +702,7 @@ int lua_cocos2dx_controller_EventController_constructor(lua_State* tolua_S) do{ if (argc == 3) { cocos2d::EventController::ControllerEventType arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.EventController:EventController"); if (!ok) { break; } cocos2d::Controller* arg1; @@ -710,7 +710,7 @@ int lua_cocos2dx_controller_EventController_constructor(lua_State* tolua_S) if (!ok) { break; } int arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.EventController:EventController"); if (!ok) { break; } cobj = new cocos2d::EventController(arg0, arg1, arg2); @@ -722,7 +722,7 @@ int lua_cocos2dx_controller_EventController_constructor(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "EventController",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventController:EventController",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -781,7 +781,7 @@ int lua_cocos2dx_controller_EventListenerController_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EventListenerController",(cocos2d::EventListenerController*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EventListenerController:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_auto.cpp new file mode 100644 index 0000000000..8094a81b01 --- /dev/null +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_auto.cpp @@ -0,0 +1,1766 @@ +#include "lua_cocos2dx_experimental_auto.hpp" +#include "CCFastTMXLayer.h" +#include "CCFastTMXTiledMap.h" +#include "tolua_fix.h" +#include "LuaBasicConversions.h" + + + +int lua_cocos2dx_experimental_TMXLayer_getPositionAt(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXLayer* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXLayer",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::experimental::TMXLayer*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXLayer_getPositionAt'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Vec2 arg0; + + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccexp.TMXLayer:getPositionAt"); + if(!ok) + return 0; + cocos2d::Vec2 ret = cobj->getPositionAt(arg0); + vec2_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:getPositionAt",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXLayer_getPositionAt'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXLayer_setLayerOrientation(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXLayer* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXLayer",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::experimental::TMXLayer*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXLayer_setLayerOrientation'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + int arg0; + + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccexp.TMXLayer:setLayerOrientation"); + if(!ok) + return 0; + cobj->setLayerOrientation(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:setLayerOrientation",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXLayer_setLayerOrientation'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXLayer_getLayerSize(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXLayer* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXLayer",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::experimental::TMXLayer*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXLayer_getLayerSize'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + const cocos2d::Size& ret = cobj->getLayerSize(); + size_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:getLayerSize",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXLayer_getLayerSize'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXLayer_setMapTileSize(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXLayer* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXLayer",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::experimental::TMXLayer*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXLayer_setMapTileSize'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Size arg0; + + ok &= luaval_to_size(tolua_S, 2, &arg0, "ccexp.TMXLayer:setMapTileSize"); + if(!ok) + return 0; + cobj->setMapTileSize(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:setMapTileSize",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXLayer_setMapTileSize'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXLayer_getLayerOrientation(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXLayer* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXLayer",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::experimental::TMXLayer*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXLayer_getLayerOrientation'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + int ret = cobj->getLayerOrientation(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:getLayerOrientation",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXLayer_getLayerOrientation'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXLayer_setProperties(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXLayer* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXLayer",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::experimental::TMXLayer*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXLayer_setProperties'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::ValueMap arg0; + + ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0, "ccexp.TMXLayer:setProperties"); + if(!ok) + return 0; + cobj->setProperties(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:setProperties",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXLayer_setProperties'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXLayer_setLayerName(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXLayer* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXLayer",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::experimental::TMXLayer*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXLayer_setLayerName'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + std::string arg0; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccexp.TMXLayer:setLayerName"); + if(!ok) + return 0; + cobj->setLayerName(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:setLayerName",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXLayer_setLayerName'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXLayer_removeTileAt(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXLayer* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXLayer",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::experimental::TMXLayer*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXLayer_removeTileAt'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Vec2 arg0; + + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccexp.TMXLayer:removeTileAt"); + if(!ok) + return 0; + cobj->removeTileAt(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:removeTileAt",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXLayer_removeTileAt'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXLayer_getProperties(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXLayer* cobj = nullptr; + bool ok = true; +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXLayer",0,&tolua_err)) goto tolua_lerror; +#endif + cobj = (cocos2d::experimental::TMXLayer*)tolua_tousertype(tolua_S,1,0); +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXLayer_getProperties'", nullptr); + return 0; + } +#endif + argc = lua_gettop(tolua_S)-1; + do{ + if (argc == 0) { + cocos2d::ValueMap& ret = cobj->getProperties(); + ccvaluemap_to_luaval(tolua_S, ret); + return 1; + } + }while(0); + ok = true; + do{ + if (argc == 0) { + const cocos2d::ValueMap& ret = cobj->getProperties(); + ccvaluemap_to_luaval(tolua_S, ret); + return 1; + } + }while(0); + ok = true; + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:getProperties",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXLayer_getProperties'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXLayer_setupTiles(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXLayer* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXLayer",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::experimental::TMXLayer*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXLayer_setupTiles'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->setupTiles(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:setupTiles",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXLayer_setupTiles'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXLayer_setupTileSprite(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXLayer* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXLayer",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::experimental::TMXLayer*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXLayer_setupTileSprite'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 3) + { + cocos2d::Sprite* arg0; + cocos2d::Vec2 arg1; + int arg2; + + ok &= luaval_to_object(tolua_S, 2, "cc.Sprite",&arg0); + + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "ccexp.TMXLayer:setupTileSprite"); + + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "ccexp.TMXLayer:setupTileSprite"); + if(!ok) + return 0; + cobj->setupTileSprite(arg0, arg1, arg2); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:setupTileSprite",argc, 3); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXLayer_setupTileSprite'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXLayer_setTileGID(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXLayer* cobj = nullptr; + bool ok = true; +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXLayer",0,&tolua_err)) goto tolua_lerror; +#endif + cobj = (cocos2d::experimental::TMXLayer*)tolua_tousertype(tolua_S,1,0); +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXLayer_setTileGID'", nullptr); + return 0; + } +#endif + argc = lua_gettop(tolua_S)-1; + do{ + if (argc == 3) { + int arg0; + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccexp.TMXLayer:setTileGID"); + + if (!ok) { break; } + cocos2d::Vec2 arg1; + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "ccexp.TMXLayer:setTileGID"); + + if (!ok) { break; } + cocos2d::TMXTileFlags_ arg2; + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "ccexp.TMXLayer:setTileGID"); + + if (!ok) { break; } + cobj->setTileGID(arg0, arg1, arg2); + return 0; + } + }while(0); + ok = true; + do{ + if (argc == 2) { + int arg0; + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccexp.TMXLayer:setTileGID"); + + if (!ok) { break; } + cocos2d::Vec2 arg1; + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "ccexp.TMXLayer:setTileGID"); + + if (!ok) { break; } + cobj->setTileGID(arg0, arg1); + return 0; + } + }while(0); + ok = true; + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:setTileGID",argc, 2); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXLayer_setTileGID'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXLayer_getMapTileSize(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXLayer* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXLayer",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::experimental::TMXLayer*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXLayer_getMapTileSize'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + const cocos2d::Size& ret = cobj->getMapTileSize(); + size_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:getMapTileSize",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXLayer_getMapTileSize'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXLayer_getProperty(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXLayer* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXLayer",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::experimental::TMXLayer*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXLayer_getProperty'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + std::string arg0; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccexp.TMXLayer:getProperty"); + if(!ok) + return 0; + cocos2d::Value ret = cobj->getProperty(arg0); + ccvalue_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:getProperty",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXLayer_getProperty'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXLayer_setLayerSize(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXLayer* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXLayer",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::experimental::TMXLayer*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXLayer_setLayerSize'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Size arg0; + + ok &= luaval_to_size(tolua_S, 2, &arg0, "ccexp.TMXLayer:setLayerSize"); + if(!ok) + return 0; + cobj->setLayerSize(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:setLayerSize",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXLayer_setLayerSize'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXLayer_getLayerName(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXLayer* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXLayer",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::experimental::TMXLayer*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXLayer_getLayerName'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + const std::string& ret = cobj->getLayerName(); + tolua_pushcppstring(tolua_S,ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:getLayerName",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXLayer_getLayerName'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXLayer_setTileSet(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXLayer* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXLayer",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::experimental::TMXLayer*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXLayer_setTileSet'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::TMXTilesetInfo* arg0; + + ok &= luaval_to_object(tolua_S, 2, "cc.TMXTilesetInfo",&arg0); + if(!ok) + return 0; + cobj->setTileSet(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:setTileSet",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXLayer_setTileSet'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXLayer_getTileSet(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXLayer* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXLayer",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::experimental::TMXLayer*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXLayer_getTileSet'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::TMXTilesetInfo* ret = cobj->getTileSet(); + object_to_luaval(tolua_S, "cc.TMXTilesetInfo",(cocos2d::TMXTilesetInfo*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:getTileSet",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXLayer_getTileSet'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXLayer_getTileAt(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXLayer* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXLayer",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::experimental::TMXLayer*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXLayer_getTileAt'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Vec2 arg0; + + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccexp.TMXLayer:getTileAt"); + if(!ok) + return 0; + cocos2d::Sprite* ret = cobj->getTileAt(arg0); + object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:getTileAt",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXLayer_getTileAt'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXLayer_create(lua_State* tolua_S) +{ + int argc = 0; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertable(tolua_S,1,"ccexp.TMXLayer",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 3) + { + cocos2d::TMXTilesetInfo* arg0; + cocos2d::TMXLayerInfo* arg1; + cocos2d::TMXMapInfo* arg2; + ok &= luaval_to_object(tolua_S, 2, "cc.TMXTilesetInfo",&arg0); + ok &= luaval_to_object(tolua_S, 3, "cc.TMXLayerInfo",&arg1); + ok &= luaval_to_object(tolua_S, 4, "cc.TMXMapInfo",&arg2); + if(!ok) + return 0; + cocos2d::experimental::TMXLayer* ret = cocos2d::experimental::TMXLayer::create(arg0, arg1, arg2); + object_to_luaval(tolua_S, "ccexp.TMXLayer",(cocos2d::experimental::TMXLayer*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccexp.TMXLayer:create",argc, 3); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXLayer_create'.",&tolua_err); +#endif + return 0; +} +int lua_cocos2dx_experimental_TMXLayer_constructor(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXLayer* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj = new cocos2d::experimental::TMXLayer(); + cobj->autorelease(); + int ID = (int)cobj->_ID ; + int* luaID = &cobj->_luaID ; + toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccexp.TMXLayer"); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:TMXLayer",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXLayer_constructor'.",&tolua_err); +#endif + + return 0; +} + +static int lua_cocos2dx_experimental_TMXLayer_finalize(lua_State* tolua_S) +{ + printf("luabindings: finalizing LUA object (TMXLayer)"); + return 0; +} + +int lua_register_cocos2dx_experimental_TMXLayer(lua_State* tolua_S) +{ + tolua_usertype(tolua_S,"ccexp.TMXLayer"); + tolua_cclass(tolua_S,"TMXLayer","ccexp.TMXLayer","cc.Node",nullptr); + + tolua_beginmodule(tolua_S,"TMXLayer"); + tolua_function(tolua_S,"new",lua_cocos2dx_experimental_TMXLayer_constructor); + tolua_function(tolua_S,"getPositionAt",lua_cocos2dx_experimental_TMXLayer_getPositionAt); + tolua_function(tolua_S,"setLayerOrientation",lua_cocos2dx_experimental_TMXLayer_setLayerOrientation); + tolua_function(tolua_S,"getLayerSize",lua_cocos2dx_experimental_TMXLayer_getLayerSize); + tolua_function(tolua_S,"setMapTileSize",lua_cocos2dx_experimental_TMXLayer_setMapTileSize); + tolua_function(tolua_S,"getLayerOrientation",lua_cocos2dx_experimental_TMXLayer_getLayerOrientation); + tolua_function(tolua_S,"setProperties",lua_cocos2dx_experimental_TMXLayer_setProperties); + tolua_function(tolua_S,"setLayerName",lua_cocos2dx_experimental_TMXLayer_setLayerName); + tolua_function(tolua_S,"removeTileAt",lua_cocos2dx_experimental_TMXLayer_removeTileAt); + tolua_function(tolua_S,"getProperties",lua_cocos2dx_experimental_TMXLayer_getProperties); + tolua_function(tolua_S,"setupTiles",lua_cocos2dx_experimental_TMXLayer_setupTiles); + tolua_function(tolua_S,"setupTileSprite",lua_cocos2dx_experimental_TMXLayer_setupTileSprite); + tolua_function(tolua_S,"setTileGID",lua_cocos2dx_experimental_TMXLayer_setTileGID); + tolua_function(tolua_S,"getMapTileSize",lua_cocos2dx_experimental_TMXLayer_getMapTileSize); + tolua_function(tolua_S,"getProperty",lua_cocos2dx_experimental_TMXLayer_getProperty); + tolua_function(tolua_S,"setLayerSize",lua_cocos2dx_experimental_TMXLayer_setLayerSize); + tolua_function(tolua_S,"getLayerName",lua_cocos2dx_experimental_TMXLayer_getLayerName); + tolua_function(tolua_S,"setTileSet",lua_cocos2dx_experimental_TMXLayer_setTileSet); + tolua_function(tolua_S,"getTileSet",lua_cocos2dx_experimental_TMXLayer_getTileSet); + tolua_function(tolua_S,"getTileAt",lua_cocos2dx_experimental_TMXLayer_getTileAt); + tolua_function(tolua_S,"create", lua_cocos2dx_experimental_TMXLayer_create); + tolua_endmodule(tolua_S); + std::string typeName = typeid(cocos2d::experimental::TMXLayer).name(); + g_luaType[typeName] = "ccexp.TMXLayer"; + g_typeCast["TMXLayer"] = "ccexp.TMXLayer"; + return 1; +} + +int lua_cocos2dx_experimental_TMXTiledMap_setObjectGroups(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXTiledMap* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXTiledMap",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::experimental::TMXTiledMap*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXTiledMap_setObjectGroups'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Vector arg0; + + ok &= luaval_to_ccvector(tolua_S, 2, &arg0, "ccexp.TMXTiledMap:setObjectGroups"); + if(!ok) + return 0; + cobj->setObjectGroups(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXTiledMap:setObjectGroups",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXTiledMap_setObjectGroups'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXTiledMap_getProperty(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXTiledMap* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXTiledMap",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::experimental::TMXTiledMap*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXTiledMap_getProperty'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + std::string arg0; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccexp.TMXTiledMap:getProperty"); + if(!ok) + return 0; + cocos2d::Value ret = cobj->getProperty(arg0); + ccvalue_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXTiledMap:getProperty",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXTiledMap_getProperty'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXTiledMap_setMapSize(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXTiledMap* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXTiledMap",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::experimental::TMXTiledMap*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXTiledMap_setMapSize'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Size arg0; + + ok &= luaval_to_size(tolua_S, 2, &arg0, "ccexp.TMXTiledMap:setMapSize"); + if(!ok) + return 0; + cobj->setMapSize(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXTiledMap:setMapSize",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXTiledMap_setMapSize'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXTiledMap_getObjectGroup(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXTiledMap* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXTiledMap",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::experimental::TMXTiledMap*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXTiledMap_getObjectGroup'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + std::string arg0; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccexp.TMXTiledMap:getObjectGroup"); + if(!ok) + return 0; + cocos2d::TMXObjectGroup* ret = cobj->getObjectGroup(arg0); + object_to_luaval(tolua_S, "cc.TMXObjectGroup",(cocos2d::TMXObjectGroup*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXTiledMap:getObjectGroup",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXTiledMap_getObjectGroup'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXTiledMap_getObjectGroups(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXTiledMap* cobj = nullptr; + bool ok = true; +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXTiledMap",0,&tolua_err)) goto tolua_lerror; +#endif + cobj = (cocos2d::experimental::TMXTiledMap*)tolua_tousertype(tolua_S,1,0); +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXTiledMap_getObjectGroups'", nullptr); + return 0; + } +#endif + argc = lua_gettop(tolua_S)-1; + do{ + if (argc == 0) { + cocos2d::Vector& ret = cobj->getObjectGroups(); + ccvector_to_luaval(tolua_S, ret); + return 1; + } + }while(0); + ok = true; + do{ + if (argc == 0) { + const cocos2d::Vector& ret = cobj->getObjectGroups(); + ccvector_to_luaval(tolua_S, ret); + return 1; + } + }while(0); + ok = true; + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXTiledMap:getObjectGroups",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXTiledMap_getObjectGroups'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXTiledMap_getTileSize(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXTiledMap* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXTiledMap",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::experimental::TMXTiledMap*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXTiledMap_getTileSize'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + const cocos2d::Size& ret = cobj->getTileSize(); + size_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXTiledMap:getTileSize",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXTiledMap_getTileSize'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXTiledMap_getMapSize(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXTiledMap* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXTiledMap",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::experimental::TMXTiledMap*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXTiledMap_getMapSize'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + const cocos2d::Size& ret = cobj->getMapSize(); + size_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXTiledMap:getMapSize",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXTiledMap_getMapSize'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXTiledMap_getProperties(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXTiledMap* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXTiledMap",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::experimental::TMXTiledMap*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXTiledMap_getProperties'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + const cocos2d::ValueMap& ret = cobj->getProperties(); + ccvaluemap_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXTiledMap:getProperties",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXTiledMap_getProperties'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXTiledMap_getPropertiesForGID(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXTiledMap* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXTiledMap",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::experimental::TMXTiledMap*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXTiledMap_getPropertiesForGID'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + int arg0; + + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccexp.TMXTiledMap:getPropertiesForGID"); + if(!ok) + return 0; + cocos2d::Value ret = cobj->getPropertiesForGID(arg0); + ccvalue_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXTiledMap:getPropertiesForGID",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXTiledMap_getPropertiesForGID'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXTiledMap_setTileSize(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXTiledMap* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXTiledMap",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::experimental::TMXTiledMap*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXTiledMap_setTileSize'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Size arg0; + + ok &= luaval_to_size(tolua_S, 2, &arg0, "ccexp.TMXTiledMap:setTileSize"); + if(!ok) + return 0; + cobj->setTileSize(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXTiledMap:setTileSize",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXTiledMap_setTileSize'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXTiledMap_setProperties(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXTiledMap* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXTiledMap",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::experimental::TMXTiledMap*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXTiledMap_setProperties'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::ValueMap arg0; + + ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0, "ccexp.TMXTiledMap:setProperties"); + if(!ok) + return 0; + cobj->setProperties(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXTiledMap:setProperties",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXTiledMap_setProperties'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXTiledMap_getLayer(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXTiledMap* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXTiledMap",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::experimental::TMXTiledMap*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXTiledMap_getLayer'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + std::string arg0; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccexp.TMXTiledMap:getLayer"); + if(!ok) + return 0; + cocos2d::experimental::TMXLayer* ret = cobj->getLayer(arg0); + object_to_luaval(tolua_S, "ccexp.TMXLayer",(cocos2d::experimental::TMXLayer*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXTiledMap:getLayer",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXTiledMap_getLayer'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXTiledMap_getMapOrientation(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXTiledMap* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXTiledMap",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::experimental::TMXTiledMap*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXTiledMap_getMapOrientation'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + int ret = cobj->getMapOrientation(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXTiledMap:getMapOrientation",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXTiledMap_getMapOrientation'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXTiledMap_setMapOrientation(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXTiledMap* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXTiledMap",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::experimental::TMXTiledMap*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXTiledMap_setMapOrientation'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + int arg0; + + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccexp.TMXTiledMap:setMapOrientation"); + if(!ok) + return 0; + cobj->setMapOrientation(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXTiledMap:setMapOrientation",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXTiledMap_setMapOrientation'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_experimental_TMXTiledMap_create(lua_State* tolua_S) +{ + int argc = 0; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertable(tolua_S,1,"ccexp.TMXTiledMap",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 1) + { + std::string arg0; + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccexp.TMXTiledMap:create"); + if(!ok) + return 0; + cocos2d::experimental::TMXTiledMap* ret = cocos2d::experimental::TMXTiledMap::create(arg0); + object_to_luaval(tolua_S, "ccexp.TMXTiledMap",(cocos2d::experimental::TMXTiledMap*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccexp.TMXTiledMap:create",argc, 1); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXTiledMap_create'.",&tolua_err); +#endif + return 0; +} +int lua_cocos2dx_experimental_TMXTiledMap_createWithXML(lua_State* tolua_S) +{ + int argc = 0; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertable(tolua_S,1,"ccexp.TMXTiledMap",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 2) + { + std::string arg0; + std::string arg1; + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccexp.TMXTiledMap:createWithXML"); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccexp.TMXTiledMap:createWithXML"); + if(!ok) + return 0; + cocos2d::experimental::TMXTiledMap* ret = cocos2d::experimental::TMXTiledMap::createWithXML(arg0, arg1); + object_to_luaval(tolua_S, "ccexp.TMXTiledMap",(cocos2d::experimental::TMXTiledMap*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccexp.TMXTiledMap:createWithXML",argc, 2); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXTiledMap_createWithXML'.",&tolua_err); +#endif + return 0; +} +static int lua_cocos2dx_experimental_TMXTiledMap_finalize(lua_State* tolua_S) +{ + printf("luabindings: finalizing LUA object (TMXTiledMap)"); + return 0; +} + +int lua_register_cocos2dx_experimental_TMXTiledMap(lua_State* tolua_S) +{ + tolua_usertype(tolua_S,"ccexp.TMXTiledMap"); + tolua_cclass(tolua_S,"TMXTiledMap","ccexp.TMXTiledMap","cc.Node",nullptr); + + tolua_beginmodule(tolua_S,"TMXTiledMap"); + tolua_function(tolua_S,"setObjectGroups",lua_cocos2dx_experimental_TMXTiledMap_setObjectGroups); + tolua_function(tolua_S,"getProperty",lua_cocos2dx_experimental_TMXTiledMap_getProperty); + tolua_function(tolua_S,"setMapSize",lua_cocos2dx_experimental_TMXTiledMap_setMapSize); + tolua_function(tolua_S,"getObjectGroup",lua_cocos2dx_experimental_TMXTiledMap_getObjectGroup); + tolua_function(tolua_S,"getObjectGroups",lua_cocos2dx_experimental_TMXTiledMap_getObjectGroups); + tolua_function(tolua_S,"getTileSize",lua_cocos2dx_experimental_TMXTiledMap_getTileSize); + tolua_function(tolua_S,"getMapSize",lua_cocos2dx_experimental_TMXTiledMap_getMapSize); + tolua_function(tolua_S,"getProperties",lua_cocos2dx_experimental_TMXTiledMap_getProperties); + tolua_function(tolua_S,"getPropertiesForGID",lua_cocos2dx_experimental_TMXTiledMap_getPropertiesForGID); + tolua_function(tolua_S,"setTileSize",lua_cocos2dx_experimental_TMXTiledMap_setTileSize); + tolua_function(tolua_S,"setProperties",lua_cocos2dx_experimental_TMXTiledMap_setProperties); + tolua_function(tolua_S,"getLayer",lua_cocos2dx_experimental_TMXTiledMap_getLayer); + tolua_function(tolua_S,"getMapOrientation",lua_cocos2dx_experimental_TMXTiledMap_getMapOrientation); + tolua_function(tolua_S,"setMapOrientation",lua_cocos2dx_experimental_TMXTiledMap_setMapOrientation); + tolua_function(tolua_S,"create", lua_cocos2dx_experimental_TMXTiledMap_create); + tolua_function(tolua_S,"createWithXML", lua_cocos2dx_experimental_TMXTiledMap_createWithXML); + tolua_endmodule(tolua_S); + std::string typeName = typeid(cocos2d::experimental::TMXTiledMap).name(); + g_luaType[typeName] = "ccexp.TMXTiledMap"; + g_typeCast["TMXTiledMap"] = "ccexp.TMXTiledMap"; + return 1; +} +TOLUA_API int register_all_cocos2dx_experimental(lua_State* tolua_S) +{ + tolua_open(tolua_S); + + tolua_module(tolua_S,"ccexp",0); + tolua_beginmodule(tolua_S,"ccexp"); + + lua_register_cocos2dx_experimental_TMXTiledMap(tolua_S); + lua_register_cocos2dx_experimental_TMXLayer(tolua_S); + + tolua_endmodule(tolua_S); + return 1; +} + diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_auto.hpp new file mode 100644 index 0000000000..1510f395f7 --- /dev/null +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_auto.hpp @@ -0,0 +1,54 @@ +#include "base/ccConfig.h" +#ifndef __cocos2dx_experimental_h__ +#define __cocos2dx_experimental_h__ + +#ifdef __cplusplus +extern "C" { +#endif +#include "tolua++.h" +#ifdef __cplusplus +} +#endif + +int register_all_cocos2dx_experimental(lua_State* tolua_S); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#endif // __cocos2dx_experimental_h__ diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_video_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_video_auto.cpp index 408da55ffc..6b6a43244b 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_video_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_video_auto.cpp @@ -40,7 +40,7 @@ int lua_cocos2dx_experimental_video_VideoPlayer_getFileName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFileName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.VideoPlayer:getFileName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -84,7 +84,7 @@ int lua_cocos2dx_experimental_video_VideoPlayer_getURL(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getURL",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.VideoPlayer:getURL",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -127,7 +127,7 @@ int lua_cocos2dx_experimental_video_VideoPlayer_play(lua_State* tolua_S) cobj->play(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "play",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.VideoPlayer:play",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -170,7 +170,7 @@ int lua_cocos2dx_experimental_video_VideoPlayer_pause(lua_State* tolua_S) cobj->pause(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pause",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.VideoPlayer:pause",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -210,13 +210,13 @@ int lua_cocos2dx_experimental_video_VideoPlayer_setKeepAspectRatioEnabled(lua_St { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccexp.VideoPlayer:setKeepAspectRatioEnabled"); if(!ok) return 0; cobj->setKeepAspectRatioEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setKeepAspectRatioEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.VideoPlayer:setKeepAspectRatioEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -259,7 +259,7 @@ int lua_cocos2dx_experimental_video_VideoPlayer_resume(lua_State* tolua_S) cobj->resume(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resume",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.VideoPlayer:resume",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -302,7 +302,7 @@ int lua_cocos2dx_experimental_video_VideoPlayer_stop(lua_State* tolua_S) cobj->stop(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stop",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.VideoPlayer:stop",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -342,13 +342,13 @@ int lua_cocos2dx_experimental_video_VideoPlayer_setFullScreenEnabled(lua_State* { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccexp.VideoPlayer:setFullScreenEnabled"); if(!ok) return 0; cobj->setFullScreenEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFullScreenEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.VideoPlayer:setFullScreenEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -388,13 +388,13 @@ int lua_cocos2dx_experimental_video_VideoPlayer_setFileName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccexp.VideoPlayer:setFileName"); if(!ok) return 0; cobj->setFileName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFileName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.VideoPlayer:setFileName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -434,13 +434,13 @@ int lua_cocos2dx_experimental_video_VideoPlayer_setURL(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccexp.VideoPlayer:setURL"); if(!ok) return 0; cobj->setURL(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setURL",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.VideoPlayer:setURL",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -484,7 +484,7 @@ int lua_cocos2dx_experimental_video_VideoPlayer_isKeepAspectRatioEnabled(lua_Sta tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isKeepAspectRatioEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.VideoPlayer:isKeepAspectRatioEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -522,15 +522,15 @@ int lua_cocos2dx_experimental_video_VideoPlayer_onPlayEvent(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::experimental::ui::VideoPlayer::EventType arg0; + int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccexp.VideoPlayer:onPlayEvent"); if(!ok) return 0; cobj->onPlayEvent(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "onPlayEvent",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.VideoPlayer:onPlayEvent",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -574,7 +574,7 @@ int lua_cocos2dx_experimental_video_VideoPlayer_isFullScreenEnabled(lua_State* t tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isFullScreenEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.VideoPlayer:isFullScreenEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -618,7 +618,7 @@ int lua_cocos2dx_experimental_video_VideoPlayer_isPlaying(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isPlaying",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.VideoPlayer:isPlaying",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -658,13 +658,13 @@ int lua_cocos2dx_experimental_video_VideoPlayer_seekTo(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccexp.VideoPlayer:seekTo"); if(!ok) return 0; cobj->seekTo(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "seekTo",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.VideoPlayer:seekTo",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -697,7 +697,7 @@ int lua_cocos2dx_experimental_video_VideoPlayer_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccexp.VideoPlayer",(cocos2d::experimental::ui::VideoPlayer*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccexp.VideoPlayer:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -743,8 +743,8 @@ TOLUA_API int register_all_cocos2dx_experimental_video(lua_State* tolua_S) { tolua_open(tolua_S); - tolua_module(tolua_S,"ccexprimental",0); - tolua_beginmodule(tolua_S,"ccexprimental"); + tolua_module(tolua_S,"ccexp",0); + tolua_beginmodule(tolua_S,"ccexp"); lua_register_cocos2dx_experimental_video_VideoPlayer(tolua_S); diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.cpp index 6a66e82f68..8387dbdc8b 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.cpp @@ -36,14 +36,14 @@ int lua_cocos2dx_extension_Scale9Sprite_resizableSpriteWithCapInsets(lua_State* { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "cc.Scale9Sprite:resizableSpriteWithCapInsets"); if(!ok) return 0; cocos2d::extension::Scale9Sprite* ret = cobj->resizableSpriteWithCapInsets(arg0); object_to_luaval(tolua_S, "cc.Scale9Sprite",(cocos2d::extension::Scale9Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resizableSpriteWithCapInsets",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:resizableSpriteWithCapInsets",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -83,13 +83,13 @@ int lua_cocos2dx_extension_Scale9Sprite_setInsetBottom(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Scale9Sprite:setInsetBottom"); if(!ok) return 0; cobj->setInsetBottom(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setInsetBottom",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:setInsetBottom",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -123,7 +123,7 @@ int lua_cocos2dx_extension_Scale9Sprite_initWithSpriteFrameName(lua_State* tolua do{ if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Scale9Sprite:initWithSpriteFrameName"); if (!ok) { break; } bool ret = cobj->initWithSpriteFrameName(arg0); @@ -135,11 +135,11 @@ int lua_cocos2dx_extension_Scale9Sprite_initWithSpriteFrameName(lua_State* tolua do{ if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Scale9Sprite:initWithSpriteFrameName"); if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Scale9Sprite:initWithSpriteFrameName"); if (!ok) { break; } bool ret = cobj->initWithSpriteFrameName(arg0, arg1); @@ -148,7 +148,7 @@ int lua_cocos2dx_extension_Scale9Sprite_initWithSpriteFrameName(lua_State* tolua } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithSpriteFrameName",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:initWithSpriteFrameName",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -188,13 +188,13 @@ int lua_cocos2dx_extension_Scale9Sprite_setInsetTop(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Scale9Sprite:setInsetTop"); if(!ok) return 0; cobj->setInsetTop(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setInsetTop",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:setInsetTop",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -238,7 +238,7 @@ int lua_cocos2dx_extension_Scale9Sprite_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -278,13 +278,13 @@ int lua_cocos2dx_extension_Scale9Sprite_setPreferredSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.Scale9Sprite:setPreferredSize"); if(!ok) return 0; cobj->setPreferredSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPreferredSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:setPreferredSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -330,7 +330,7 @@ int lua_cocos2dx_extension_Scale9Sprite_setSpriteFrame(lua_State* tolua_S) cobj->setSpriteFrame(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSpriteFrame",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:setSpriteFrame",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -368,11 +368,11 @@ int lua_cocos2dx_extension_Scale9Sprite_initWithBatchNode(lua_State* tolua_S) if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Scale9Sprite:initWithBatchNode"); if (!ok) { break; } cocos2d::Rect arg2; - ok &= luaval_to_rect(tolua_S, 4, &arg2); + ok &= luaval_to_rect(tolua_S, 4, &arg2, "cc.Scale9Sprite:initWithBatchNode"); if (!ok) { break; } bool ret = cobj->initWithBatchNode(arg0, arg1, arg2); @@ -388,15 +388,15 @@ int lua_cocos2dx_extension_Scale9Sprite_initWithBatchNode(lua_State* tolua_S) if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Scale9Sprite:initWithBatchNode"); if (!ok) { break; } bool arg2; - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.Scale9Sprite:initWithBatchNode"); if (!ok) { break; } cocos2d::Rect arg3; - ok &= luaval_to_rect(tolua_S, 5, &arg3); + ok &= luaval_to_rect(tolua_S, 5, &arg3, "cc.Scale9Sprite:initWithBatchNode"); if (!ok) { break; } bool ret = cobj->initWithBatchNode(arg0, arg1, arg2, arg3); @@ -405,7 +405,7 @@ int lua_cocos2dx_extension_Scale9Sprite_initWithBatchNode(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithBatchNode",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:initWithBatchNode",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 @@ -449,7 +449,7 @@ int lua_cocos2dx_extension_Scale9Sprite_getInsetBottom(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getInsetBottom",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:getInsetBottom",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -493,7 +493,7 @@ int lua_cocos2dx_extension_Scale9Sprite_getCapInsets(lua_State* tolua_S) rect_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCapInsets",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:getCapInsets",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -538,18 +538,18 @@ int lua_cocos2dx_extension_Scale9Sprite_updateWithBatchNode(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.SpriteBatchNode",&arg0); - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Scale9Sprite:updateWithBatchNode"); - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.Scale9Sprite:updateWithBatchNode"); - ok &= luaval_to_rect(tolua_S, 5, &arg3); + ok &= luaval_to_rect(tolua_S, 5, &arg3, "cc.Scale9Sprite:updateWithBatchNode"); if(!ok) return 0; bool ret = cobj->updateWithBatchNode(arg0, arg1, arg2, arg3); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateWithBatchNode",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:updateWithBatchNode",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 @@ -593,7 +593,7 @@ int lua_cocos2dx_extension_Scale9Sprite_getInsetRight(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getInsetRight",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:getInsetRight",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -637,7 +637,7 @@ int lua_cocos2dx_extension_Scale9Sprite_getOriginalSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOriginalSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:getOriginalSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -671,11 +671,11 @@ int lua_cocos2dx_extension_Scale9Sprite_initWithFile(lua_State* tolua_S) do{ if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Scale9Sprite:initWithFile"); if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Scale9Sprite:initWithFile"); if (!ok) { break; } bool ret = cobj->initWithFile(arg0, arg1); @@ -687,15 +687,15 @@ int lua_cocos2dx_extension_Scale9Sprite_initWithFile(lua_State* tolua_S) do{ if (argc == 3) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Scale9Sprite:initWithFile"); if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Scale9Sprite:initWithFile"); if (!ok) { break; } cocos2d::Rect arg2; - ok &= luaval_to_rect(tolua_S, 4, &arg2); + ok &= luaval_to_rect(tolua_S, 4, &arg2, "cc.Scale9Sprite:initWithFile"); if (!ok) { break; } bool ret = cobj->initWithFile(arg0, arg1, arg2); @@ -707,11 +707,11 @@ int lua_cocos2dx_extension_Scale9Sprite_initWithFile(lua_State* tolua_S) do{ if (argc == 2) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "cc.Scale9Sprite:initWithFile"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Scale9Sprite:initWithFile"); if (!ok) { break; } bool ret = cobj->initWithFile(arg0, arg1); @@ -723,7 +723,7 @@ int lua_cocos2dx_extension_Scale9Sprite_initWithFile(lua_State* tolua_S) do{ if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Scale9Sprite:initWithFile"); if (!ok) { break; } bool ret = cobj->initWithFile(arg0); @@ -732,7 +732,7 @@ int lua_cocos2dx_extension_Scale9Sprite_initWithFile(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:initWithFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -776,7 +776,7 @@ int lua_cocos2dx_extension_Scale9Sprite_getInsetTop(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getInsetTop",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:getInsetTop",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -816,13 +816,13 @@ int lua_cocos2dx_extension_Scale9Sprite_setInsetLeft(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Scale9Sprite:setInsetLeft"); if(!ok) return 0; cobj->setInsetLeft(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setInsetLeft",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:setInsetLeft",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -872,7 +872,7 @@ int lua_cocos2dx_extension_Scale9Sprite_initWithSpriteFrame(lua_State* tolua_S) if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Scale9Sprite:initWithSpriteFrame"); if (!ok) { break; } bool ret = cobj->initWithSpriteFrame(arg0, arg1); @@ -881,7 +881,7 @@ int lua_cocos2dx_extension_Scale9Sprite_initWithSpriteFrame(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithSpriteFrame",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:initWithSpriteFrame",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -925,7 +925,7 @@ int lua_cocos2dx_extension_Scale9Sprite_getPreferredSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPreferredSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:getPreferredSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -965,13 +965,13 @@ int lua_cocos2dx_extension_Scale9Sprite_setCapInsets(lua_State* tolua_S) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "cc.Scale9Sprite:setCapInsets"); if(!ok) return 0; cobj->setCapInsets(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCapInsets",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:setCapInsets",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1015,7 +1015,7 @@ int lua_cocos2dx_extension_Scale9Sprite_getInsetLeft(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getInsetLeft",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:getInsetLeft",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1055,13 +1055,13 @@ int lua_cocos2dx_extension_Scale9Sprite_setInsetRight(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Scale9Sprite:setInsetRight"); if(!ok) return 0; cobj->setInsetRight(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setInsetRight",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:setInsetRight",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1090,13 +1090,13 @@ int lua_cocos2dx_extension_Scale9Sprite_create(lua_State* tolua_S) if (argc == 3) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Scale9Sprite:create"); if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Scale9Sprite:create"); if (!ok) { break; } cocos2d::Rect arg2; - ok &= luaval_to_rect(tolua_S, 4, &arg2); + ok &= luaval_to_rect(tolua_S, 4, &arg2, "cc.Scale9Sprite:create"); if (!ok) { break; } cocos2d::extension::Scale9Sprite* ret = cocos2d::extension::Scale9Sprite::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.Scale9Sprite",(cocos2d::extension::Scale9Sprite*)ret); @@ -1119,10 +1119,10 @@ int lua_cocos2dx_extension_Scale9Sprite_create(lua_State* tolua_S) if (argc == 2) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "cc.Scale9Sprite:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Scale9Sprite:create"); if (!ok) { break; } cocos2d::extension::Scale9Sprite* ret = cocos2d::extension::Scale9Sprite::create(arg0, arg1); object_to_luaval(tolua_S, "cc.Scale9Sprite",(cocos2d::extension::Scale9Sprite*)ret); @@ -1135,10 +1135,10 @@ int lua_cocos2dx_extension_Scale9Sprite_create(lua_State* tolua_S) if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Scale9Sprite:create"); if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Scale9Sprite:create"); if (!ok) { break; } cocos2d::extension::Scale9Sprite* ret = cocos2d::extension::Scale9Sprite::create(arg0, arg1); object_to_luaval(tolua_S, "cc.Scale9Sprite",(cocos2d::extension::Scale9Sprite*)ret); @@ -1151,7 +1151,7 @@ int lua_cocos2dx_extension_Scale9Sprite_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Scale9Sprite:create"); if (!ok) { break; } cocos2d::extension::Scale9Sprite* ret = cocos2d::extension::Scale9Sprite::create(arg0); object_to_luaval(tolua_S, "cc.Scale9Sprite",(cocos2d::extension::Scale9Sprite*)ret); @@ -1159,7 +1159,7 @@ int lua_cocos2dx_extension_Scale9Sprite_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.Scale9Sprite:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -1186,10 +1186,10 @@ int lua_cocos2dx_extension_Scale9Sprite_createWithSpriteFrameName(lua_State* tol if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Scale9Sprite:createWithSpriteFrameName"); if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Scale9Sprite:createWithSpriteFrameName"); if (!ok) { break; } cocos2d::extension::Scale9Sprite* ret = cocos2d::extension::Scale9Sprite::createWithSpriteFrameName(arg0, arg1); object_to_luaval(tolua_S, "cc.Scale9Sprite",(cocos2d::extension::Scale9Sprite*)ret); @@ -1202,7 +1202,7 @@ int lua_cocos2dx_extension_Scale9Sprite_createWithSpriteFrameName(lua_State* tol if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Scale9Sprite:createWithSpriteFrameName"); if (!ok) { break; } cocos2d::extension::Scale9Sprite* ret = cocos2d::extension::Scale9Sprite::createWithSpriteFrameName(arg0); object_to_luaval(tolua_S, "cc.Scale9Sprite",(cocos2d::extension::Scale9Sprite*)ret); @@ -1210,7 +1210,7 @@ int lua_cocos2dx_extension_Scale9Sprite_createWithSpriteFrameName(lua_State* tol } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "createWithSpriteFrameName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.Scale9Sprite:createWithSpriteFrameName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -1240,7 +1240,7 @@ int lua_cocos2dx_extension_Scale9Sprite_createWithSpriteFrame(lua_State* tolua_S ok &= luaval_to_object(tolua_S, 2, "cc.SpriteFrame",&arg0); if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Scale9Sprite:createWithSpriteFrame"); if (!ok) { break; } cocos2d::extension::Scale9Sprite* ret = cocos2d::extension::Scale9Sprite::createWithSpriteFrame(arg0, arg1); object_to_luaval(tolua_S, "cc.Scale9Sprite",(cocos2d::extension::Scale9Sprite*)ret); @@ -1261,7 +1261,7 @@ int lua_cocos2dx_extension_Scale9Sprite_createWithSpriteFrame(lua_State* tolua_S } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "createWithSpriteFrame",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.Scale9Sprite:createWithSpriteFrame",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -1293,7 +1293,7 @@ int lua_cocos2dx_extension_Scale9Sprite_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.Scale9Sprite"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "Scale9Sprite",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:Scale9Sprite",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1377,13 +1377,13 @@ int lua_cocos2dx_extension_Control_setEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Control:setEnabled"); if(!ok) return 0; cobj->setEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Control:setEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1432,7 +1432,7 @@ int lua_cocos2dx_extension_Control_onTouchMoved(lua_State* tolua_S) cobj->onTouchMoved(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "onTouchMoved",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Control:onTouchMoved",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -1476,7 +1476,7 @@ int lua_cocos2dx_extension_Control_getState(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getState",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Control:getState",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1525,7 +1525,7 @@ int lua_cocos2dx_extension_Control_onTouchEnded(lua_State* tolua_S) cobj->onTouchEnded(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "onTouchEnded",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Control:onTouchEnded",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -1565,13 +1565,13 @@ int lua_cocos2dx_extension_Control_sendActionsForControlEvents(lua_State* tolua_ { cocos2d::extension::Control::EventType arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Control:sendActionsForControlEvents"); if(!ok) return 0; cobj->sendActionsForControlEvents(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "sendActionsForControlEvents",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Control:sendActionsForControlEvents",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1611,13 +1611,13 @@ int lua_cocos2dx_extension_Control_setSelected(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Control:setSelected"); if(!ok) return 0; cobj->setSelected(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSelected",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Control:setSelected",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1661,7 +1661,7 @@ int lua_cocos2dx_extension_Control_isEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Control:isEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1710,7 +1710,7 @@ int lua_cocos2dx_extension_Control_onTouchCancelled(lua_State* tolua_S) cobj->onTouchCancelled(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "onTouchCancelled",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Control:onTouchCancelled",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -1753,7 +1753,7 @@ int lua_cocos2dx_extension_Control_needsLayout(lua_State* tolua_S) cobj->needsLayout(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "needsLayout",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Control:needsLayout",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1803,7 +1803,7 @@ int lua_cocos2dx_extension_Control_onTouchBegan(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "onTouchBegan",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Control:onTouchBegan",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -1847,7 +1847,7 @@ int lua_cocos2dx_extension_Control_hasVisibleParents(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "hasVisibleParents",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Control:hasVisibleParents",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1891,7 +1891,7 @@ int lua_cocos2dx_extension_Control_isSelected(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isSelected",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Control:isSelected",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1938,7 +1938,7 @@ int lua_cocos2dx_extension_Control_isTouchInside(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isTouchInside",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Control:isTouchInside",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1978,13 +1978,13 @@ int lua_cocos2dx_extension_Control_setHighlighted(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Control:setHighlighted"); if(!ok) return 0; cobj->setHighlighted(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setHighlighted",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Control:setHighlighted",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2031,7 +2031,7 @@ int lua_cocos2dx_extension_Control_getTouchLocation(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTouchLocation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Control:getTouchLocation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2075,7 +2075,7 @@ int lua_cocos2dx_extension_Control_isHighlighted(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isHighlighted",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Control:isHighlighted",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2108,7 +2108,7 @@ int lua_cocos2dx_extension_Control_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Control",(cocos2d::extension::Control*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Control:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -2186,7 +2186,7 @@ int lua_cocos2dx_extension_ControlButton_isPushed(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isPushed",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:isPushed",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2226,13 +2226,13 @@ int lua_cocos2dx_extension_ControlButton_setSelected(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ControlButton:setSelected"); if(!ok) return 0; cobj->setSelected(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSelected",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setSelected",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2275,13 +2275,13 @@ int lua_cocos2dx_extension_ControlButton_setTitleLabelForState(lua_State* tolua_ ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ControlButton:setTitleLabelForState"); if(!ok) return 0; cobj->setTitleLabelForState(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTitleLabelForState",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setTitleLabelForState",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -2321,13 +2321,13 @@ int lua_cocos2dx_extension_ControlButton_setAdjustBackgroundImage(lua_State* tol { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ControlButton:setAdjustBackgroundImage"); if(!ok) return 0; cobj->setAdjustBackgroundImage(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAdjustBackgroundImage",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setAdjustBackgroundImage",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2367,13 +2367,13 @@ int lua_cocos2dx_extension_ControlButton_setHighlighted(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ControlButton:setHighlighted"); if(!ok) return 0; cobj->setHighlighted(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setHighlighted",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setHighlighted",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2413,13 +2413,13 @@ int lua_cocos2dx_extension_ControlButton_setZoomOnTouchDown(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ControlButton:setZoomOnTouchDown"); if(!ok) return 0; cobj->setZoomOnTouchDown(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setZoomOnTouchDown",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setZoomOnTouchDown",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2460,15 +2460,15 @@ int lua_cocos2dx_extension_ControlButton_setTitleForState(lua_State* tolua_S) std::string arg0; cocos2d::extension::Control::State arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.ControlButton:setTitleForState"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ControlButton:setTitleForState"); if(!ok) return 0; cobj->setTitleForState(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTitleForState",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setTitleForState",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -2508,13 +2508,13 @@ int lua_cocos2dx_extension_ControlButton_setLabelAnchorPoint(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ControlButton:setLabelAnchorPoint"); if(!ok) return 0; cobj->setLabelAnchorPoint(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLabelAnchorPoint",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setLabelAnchorPoint",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2558,7 +2558,7 @@ int lua_cocos2dx_extension_ControlButton_getLabelAnchorPoint(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLabelAnchorPoint",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getLabelAnchorPoint",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2598,14 +2598,14 @@ int lua_cocos2dx_extension_ControlButton_getTitleTTFSizeForState(lua_State* tolu { cocos2d::extension::Control::State arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ControlButton:getTitleTTFSizeForState"); if(!ok) return 0; double ret = cobj->getTitleTTFSizeForState(arg0); tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTitleTTFSizeForState",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getTitleTTFSizeForState",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2646,15 +2646,15 @@ int lua_cocos2dx_extension_ControlButton_setTitleTTFForState(lua_State* tolua_S) std::string arg0; cocos2d::extension::Control::State arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.ControlButton:setTitleTTFForState"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ControlButton:setTitleTTFForState"); if(!ok) return 0; cobj->setTitleTTFForState(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTitleTTFForState",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setTitleTTFForState",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -2695,15 +2695,15 @@ int lua_cocos2dx_extension_ControlButton_setTitleTTFSizeForState(lua_State* tolu double arg0; cocos2d::extension::Control::State arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlButton:setTitleTTFSizeForState"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ControlButton:setTitleTTFSizeForState"); if(!ok) return 0; cobj->setTitleTTFSizeForState(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTitleTTFSizeForState",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setTitleTTFSizeForState",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -2749,7 +2749,7 @@ int lua_cocos2dx_extension_ControlButton_setTitleLabel(lua_State* tolua_S) cobj->setTitleLabel(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTitleLabel",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setTitleLabel",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2789,13 +2789,13 @@ int lua_cocos2dx_extension_ControlButton_setPreferredSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.ControlButton:setPreferredSize"); if(!ok) return 0; cobj->setPreferredSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPreferredSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setPreferredSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2839,7 +2839,7 @@ int lua_cocos2dx_extension_ControlButton_getCurrentTitleColor(lua_State* tolua_S color3b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCurrentTitleColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getCurrentTitleColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2879,13 +2879,13 @@ int lua_cocos2dx_extension_ControlButton_setEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ControlButton:setEnabled"); if(!ok) return 0; cobj->setEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2925,14 +2925,14 @@ int lua_cocos2dx_extension_ControlButton_getBackgroundSpriteForState(lua_State* { cocos2d::extension::Control::State arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ControlButton:getBackgroundSpriteForState"); if(!ok) return 0; cocos2d::extension::Scale9Sprite* ret = cobj->getBackgroundSpriteForState(arg0); object_to_luaval(tolua_S, "cc.Scale9Sprite",(cocos2d::extension::Scale9Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackgroundSpriteForState",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getBackgroundSpriteForState",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2976,7 +2976,7 @@ int lua_cocos2dx_extension_ControlButton_getHorizontalOrigin(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getHorizontalOrigin",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getHorizontalOrigin",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3019,7 +3019,7 @@ int lua_cocos2dx_extension_ControlButton_needsLayout(lua_State* tolua_S) cobj->needsLayout(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "needsLayout",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:needsLayout",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3066,7 +3066,7 @@ int lua_cocos2dx_extension_ControlButton_getCurrentTitle(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCurrentTitle",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getCurrentTitle",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3110,7 +3110,7 @@ int lua_cocos2dx_extension_ControlButton_getScaleRatio(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScaleRatio",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getScaleRatio",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3150,14 +3150,14 @@ int lua_cocos2dx_extension_ControlButton_getTitleTTFForState(lua_State* tolua_S) { cocos2d::extension::Control::State arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ControlButton:getTitleTTFForState"); if(!ok) return 0; const std::string& ret = cobj->getTitleTTFForState(arg0); tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTitleTTFForState",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getTitleTTFForState",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3201,7 +3201,7 @@ int lua_cocos2dx_extension_ControlButton_getBackgroundSprite(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Scale9Sprite",(cocos2d::extension::Scale9Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackgroundSprite",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getBackgroundSprite",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3241,14 +3241,14 @@ int lua_cocos2dx_extension_ControlButton_getTitleColorForState(lua_State* tolua_ { cocos2d::extension::Control::State arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ControlButton:getTitleColorForState"); if(!ok) return 0; cocos2d::Color3B ret = cobj->getTitleColorForState(arg0); color3b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTitleColorForState",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getTitleColorForState",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3289,15 +3289,15 @@ int lua_cocos2dx_extension_ControlButton_setTitleColorForState(lua_State* tolua_ cocos2d::Color3B arg0; cocos2d::extension::Control::State arg1; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.ControlButton:setTitleColorForState"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ControlButton:setTitleColorForState"); if(!ok) return 0; cobj->setTitleColorForState(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTitleColorForState",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setTitleColorForState",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -3341,7 +3341,7 @@ int lua_cocos2dx_extension_ControlButton_doesAdjustBackgroundImage(lua_State* to tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "doesAdjustBackgroundImage",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:doesAdjustBackgroundImage",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3384,13 +3384,13 @@ int lua_cocos2dx_extension_ControlButton_setBackgroundSpriteFrameForState(lua_St ok &= luaval_to_object(tolua_S, 2, "cc.SpriteFrame",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ControlButton:setBackgroundSpriteFrameForState"); if(!ok) return 0; cobj->setBackgroundSpriteFrameForState(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackgroundSpriteFrameForState",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setBackgroundSpriteFrameForState",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -3433,13 +3433,13 @@ int lua_cocos2dx_extension_ControlButton_setBackgroundSpriteForState(lua_State* ok &= luaval_to_object(tolua_S, 2, "cc.Scale9Sprite",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ControlButton:setBackgroundSpriteForState"); if(!ok) return 0; cobj->setBackgroundSpriteForState(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackgroundSpriteForState",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setBackgroundSpriteForState",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -3479,13 +3479,13 @@ int lua_cocos2dx_extension_ControlButton_setScaleRatio(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlButton:setScaleRatio"); if(!ok) return 0; cobj->setScaleRatio(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScaleRatio",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setScaleRatio",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3531,7 +3531,7 @@ int lua_cocos2dx_extension_ControlButton_setBackgroundSprite(lua_State* tolua_S) cobj->setBackgroundSprite(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackgroundSprite",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setBackgroundSprite",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3575,7 +3575,7 @@ int lua_cocos2dx_extension_ControlButton_getTitleLabel(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTitleLabel",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getTitleLabel",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3619,7 +3619,7 @@ int lua_cocos2dx_extension_ControlButton_getPreferredSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPreferredSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getPreferredSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3663,7 +3663,7 @@ int lua_cocos2dx_extension_ControlButton_getVerticalMargin(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVerticalMargin",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getVerticalMargin",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3703,14 +3703,14 @@ int lua_cocos2dx_extension_ControlButton_getTitleLabelForState(lua_State* tolua_ { cocos2d::extension::Control::State arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ControlButton:getTitleLabelForState"); if(!ok) return 0; cocos2d::Node* ret = cobj->getTitleLabelForState(arg0); object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTitleLabelForState",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getTitleLabelForState",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3751,15 +3751,15 @@ int lua_cocos2dx_extension_ControlButton_setMargins(lua_State* tolua_S) int arg0; int arg1; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ControlButton:setMargins"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ControlButton:setMargins"); if(!ok) return 0; cobj->setMargins(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMargins",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setMargins",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -3800,15 +3800,15 @@ int lua_cocos2dx_extension_ControlButton_setTitleBMFontForState(lua_State* tolua std::string arg0; cocos2d::extension::Control::State arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.ControlButton:setTitleBMFontForState"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ControlButton:setTitleBMFontForState"); if(!ok) return 0; cobj->setTitleBMFontForState(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTitleBMFontForState",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setTitleBMFontForState",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -3848,14 +3848,14 @@ int lua_cocos2dx_extension_ControlButton_getTitleBMFontForState(lua_State* tolua { cocos2d::extension::Control::State arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ControlButton:getTitleBMFontForState"); if(!ok) return 0; const std::string& ret = cobj->getTitleBMFontForState(arg0); tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTitleBMFontForState",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getTitleBMFontForState",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3899,7 +3899,7 @@ int lua_cocos2dx_extension_ControlButton_getZoomOnTouchDown(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getZoomOnTouchDown",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getZoomOnTouchDown",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3939,14 +3939,14 @@ int lua_cocos2dx_extension_ControlButton_getTitleForState(lua_State* tolua_S) { cocos2d::extension::Control::State arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ControlButton:getTitleForState"); if(!ok) return 0; std::string ret = cobj->getTitleForState(arg0); tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTitleForState",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getTitleForState",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4014,13 +4014,13 @@ int lua_cocos2dx_extension_ControlButton_create(lua_State* tolua_S) if (argc == 3) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.ControlButton:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.ControlButton:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.ControlButton:create"); if (!ok) { break; } cocos2d::extension::ControlButton* ret = cocos2d::extension::ControlButton::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.ControlButton",(cocos2d::extension::ControlButton*)ret); @@ -4028,7 +4028,7 @@ int lua_cocos2dx_extension_ControlButton_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.ControlButton:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -4125,13 +4125,13 @@ int lua_cocos2dx_extension_ControlHuePicker_setEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ControlHuePicker:setEnabled"); if(!ok) return 0; cobj->setEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlHuePicker:setEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4174,14 +4174,14 @@ int lua_cocos2dx_extension_ControlHuePicker_initWithTargetAndPos(lua_State* tolu ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.ControlHuePicker:initWithTargetAndPos"); if(!ok) return 0; bool ret = cobj->initWithTargetAndPos(arg0, arg1); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithTargetAndPos",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlHuePicker:initWithTargetAndPos",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -4221,13 +4221,13 @@ int lua_cocos2dx_extension_ControlHuePicker_setHue(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlHuePicker:setHue"); if(!ok) return 0; cobj->setHue(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setHue",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlHuePicker:setHue",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4271,7 +4271,7 @@ int lua_cocos2dx_extension_ControlHuePicker_getStartPos(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartPos",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlHuePicker:getStartPos",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4315,7 +4315,7 @@ int lua_cocos2dx_extension_ControlHuePicker_getHue(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getHue",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlHuePicker:getHue",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4359,7 +4359,7 @@ int lua_cocos2dx_extension_ControlHuePicker_getSlider(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSlider",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlHuePicker:getSlider",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4405,7 +4405,7 @@ int lua_cocos2dx_extension_ControlHuePicker_setBackground(lua_State* tolua_S) cobj->setBackground(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackground",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlHuePicker:setBackground",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4445,13 +4445,13 @@ int lua_cocos2dx_extension_ControlHuePicker_setHuePercentage(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlHuePicker:setHuePercentage"); if(!ok) return 0; cobj->setHuePercentage(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setHuePercentage",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlHuePicker:setHuePercentage",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4495,7 +4495,7 @@ int lua_cocos2dx_extension_ControlHuePicker_getBackground(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackground",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlHuePicker:getBackground",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4539,7 +4539,7 @@ int lua_cocos2dx_extension_ControlHuePicker_getHuePercentage(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getHuePercentage",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlHuePicker:getHuePercentage",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4585,7 +4585,7 @@ int lua_cocos2dx_extension_ControlHuePicker_setSlider(lua_State* tolua_S) cobj->setSlider(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSlider",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlHuePicker:setSlider",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4615,14 +4615,14 @@ int lua_cocos2dx_extension_ControlHuePicker_create(lua_State* tolua_S) cocos2d::Node* arg0; cocos2d::Vec2 arg1; ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.ControlHuePicker:create"); if(!ok) return 0; cocos2d::extension::ControlHuePicker* ret = cocos2d::extension::ControlHuePicker::create(arg0, arg1); object_to_luaval(tolua_S, "cc.ControlHuePicker",(cocos2d::extension::ControlHuePicker*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ControlHuePicker:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -4654,7 +4654,7 @@ int lua_cocos2dx_extension_ControlHuePicker_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.ControlHuePicker"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ControlHuePicker",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlHuePicker:ControlHuePicker",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4730,7 +4730,7 @@ int lua_cocos2dx_extension_ControlSaturationBrightnessPicker_getShadow(lua_State object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getShadow",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSaturationBrightnessPicker:getShadow",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4773,14 +4773,14 @@ int lua_cocos2dx_extension_ControlSaturationBrightnessPicker_initWithTargetAndPo ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.ControlSaturationBrightnessPicker:initWithTargetAndPos"); if(!ok) return 0; bool ret = cobj->initWithTargetAndPos(arg0, arg1); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithTargetAndPos",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSaturationBrightnessPicker:initWithTargetAndPos",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -4824,7 +4824,7 @@ int lua_cocos2dx_extension_ControlSaturationBrightnessPicker_getStartPos(lua_Sta vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartPos",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSaturationBrightnessPicker:getStartPos",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4868,7 +4868,7 @@ int lua_cocos2dx_extension_ControlSaturationBrightnessPicker_getOverlay(lua_Stat object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOverlay",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSaturationBrightnessPicker:getOverlay",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4908,13 +4908,13 @@ int lua_cocos2dx_extension_ControlSaturationBrightnessPicker_setEnabled(lua_Stat { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ControlSaturationBrightnessPicker:setEnabled"); if(!ok) return 0; cobj->setEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSaturationBrightnessPicker:setEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4958,7 +4958,7 @@ int lua_cocos2dx_extension_ControlSaturationBrightnessPicker_getSlider(lua_State object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSlider",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSaturationBrightnessPicker:getSlider",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5002,7 +5002,7 @@ int lua_cocos2dx_extension_ControlSaturationBrightnessPicker_getBackground(lua_S object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackground",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSaturationBrightnessPicker:getBackground",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5046,7 +5046,7 @@ int lua_cocos2dx_extension_ControlSaturationBrightnessPicker_getSaturation(lua_S tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSaturation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSaturationBrightnessPicker:getSaturation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5090,7 +5090,7 @@ int lua_cocos2dx_extension_ControlSaturationBrightnessPicker_getBrightness(lua_S tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBrightness",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSaturationBrightnessPicker:getBrightness",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5120,14 +5120,14 @@ int lua_cocos2dx_extension_ControlSaturationBrightnessPicker_create(lua_State* t cocos2d::Node* arg0; cocos2d::Vec2 arg1; ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.ControlSaturationBrightnessPicker:create"); if(!ok) return 0; cocos2d::extension::ControlSaturationBrightnessPicker* ret = cocos2d::extension::ControlSaturationBrightnessPicker::create(arg0, arg1); object_to_luaval(tolua_S, "cc.ControlSaturationBrightnessPicker",(cocos2d::extension::ControlSaturationBrightnessPicker*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ControlSaturationBrightnessPicker:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -5159,7 +5159,7 @@ int lua_cocos2dx_extension_ControlSaturationBrightnessPicker_constructor(lua_Sta toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.ControlSaturationBrightnessPicker"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ControlSaturationBrightnessPicker",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSaturationBrightnessPicker:ControlSaturationBrightnessPicker",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5229,13 +5229,13 @@ int lua_cocos2dx_extension_ControlColourPicker_setEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ControlColourPicker:setEnabled"); if(!ok) return 0; cobj->setEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlColourPicker:setEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5279,7 +5279,7 @@ int lua_cocos2dx_extension_ControlColourPicker_getHuePicker(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ControlHuePicker",(cocos2d::extension::ControlHuePicker*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getHuePicker",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlColourPicker:getHuePicker",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5319,13 +5319,13 @@ int lua_cocos2dx_extension_ControlColourPicker_setColor(lua_State* tolua_S) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.ControlColourPicker:setColor"); if(!ok) return 0; cobj->setColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlColourPicker:setColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5368,13 +5368,13 @@ int lua_cocos2dx_extension_ControlColourPicker_hueSliderValueChanged(lua_State* ok &= luaval_to_object(tolua_S, 2, "cc.Ref",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ControlColourPicker:hueSliderValueChanged"); if(!ok) return 0; cobj->hueSliderValueChanged(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "hueSliderValueChanged",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlColourPicker:hueSliderValueChanged",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -5418,7 +5418,7 @@ int lua_cocos2dx_extension_ControlColourPicker_getcolourPicker(lua_State* tolua_ object_to_luaval(tolua_S, "cc.ControlSaturationBrightnessPicker",(cocos2d::extension::ControlSaturationBrightnessPicker*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getcolourPicker",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlColourPicker:getcolourPicker",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5464,7 +5464,7 @@ int lua_cocos2dx_extension_ControlColourPicker_setBackground(lua_State* tolua_S) cobj->setBackground(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackground",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlColourPicker:setBackground",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5508,7 +5508,7 @@ int lua_cocos2dx_extension_ControlColourPicker_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlColourPicker:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5554,7 +5554,7 @@ int lua_cocos2dx_extension_ControlColourPicker_setcolourPicker(lua_State* tolua_ cobj->setcolourPicker(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setcolourPicker",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlColourPicker:setcolourPicker",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5597,13 +5597,13 @@ int lua_cocos2dx_extension_ControlColourPicker_colourSliderValueChanged(lua_Stat ok &= luaval_to_object(tolua_S, 2, "cc.Ref",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ControlColourPicker:colourSliderValueChanged"); if(!ok) return 0; cobj->colourSliderValueChanged(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "colourSliderValueChanged",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlColourPicker:colourSliderValueChanged",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -5649,7 +5649,7 @@ int lua_cocos2dx_extension_ControlColourPicker_setHuePicker(lua_State* tolua_S) cobj->setHuePicker(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setHuePicker",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlColourPicker:setHuePicker",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5693,7 +5693,7 @@ int lua_cocos2dx_extension_ControlColourPicker_getBackground(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackground",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlColourPicker:getBackground",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5726,7 +5726,7 @@ int lua_cocos2dx_extension_ControlColourPicker_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ControlColourPicker",(cocos2d::extension::ControlColourPicker*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ControlColourPicker:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -5758,7 +5758,7 @@ int lua_cocos2dx_extension_ControlColourPicker_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.ControlColourPicker"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ControlColourPicker",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlColourPicker:ControlColourPicker",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5830,13 +5830,13 @@ int lua_cocos2dx_extension_ControlPotentiometer_setPreviousLocation(lua_State* t { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ControlPotentiometer:setPreviousLocation"); if(!ok) return 0; cobj->setPreviousLocation(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPreviousLocation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:setPreviousLocation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5876,13 +5876,13 @@ int lua_cocos2dx_extension_ControlPotentiometer_setValue(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlPotentiometer:setValue"); if(!ok) return 0; cobj->setValue(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setValue",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:setValue",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5926,7 +5926,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_getProgressTimer(lua_State* tolu object_to_luaval(tolua_S, "cc.ProgressTimer",(cocos2d::ProgressTimer*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getProgressTimer",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:getProgressTimer",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5970,7 +5970,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_getMaximumValue(lua_State* tolua tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMaximumValue",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:getMaximumValue",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6013,20 +6013,20 @@ int lua_cocos2dx_extension_ControlPotentiometer_angleInDegreesBetweenLineFromPoi cocos2d::Vec2 arg2; cocos2d::Vec2 arg3; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ControlPotentiometer:angleInDegreesBetweenLineFromPoint_toPoint_toLineFromPoint_toPoint"); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.ControlPotentiometer:angleInDegreesBetweenLineFromPoint_toPoint_toLineFromPoint_toPoint"); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.ControlPotentiometer:angleInDegreesBetweenLineFromPoint_toPoint_toLineFromPoint_toPoint"); - ok &= luaval_to_vec2(tolua_S, 5, &arg3); + ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.ControlPotentiometer:angleInDegreesBetweenLineFromPoint_toPoint_toLineFromPoint_toPoint"); if(!ok) return 0; double ret = cobj->angleInDegreesBetweenLineFromPoint_toPoint_toLineFromPoint_toPoint(arg0, arg1, arg2, arg3); tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "angleInDegreesBetweenLineFromPoint_toPoint_toLineFromPoint_toPoint",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:angleInDegreesBetweenLineFromPoint_toPoint_toLineFromPoint_toPoint",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 @@ -6066,13 +6066,13 @@ int lua_cocos2dx_extension_ControlPotentiometer_potentiometerBegan(lua_State* to { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ControlPotentiometer:potentiometerBegan"); if(!ok) return 0; cobj->potentiometerBegan(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "potentiometerBegan",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:potentiometerBegan",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6112,13 +6112,13 @@ int lua_cocos2dx_extension_ControlPotentiometer_setMaximumValue(lua_State* tolua { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlPotentiometer:setMaximumValue"); if(!ok) return 0; cobj->setMaximumValue(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMaximumValue",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:setMaximumValue",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6162,7 +6162,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_getMinimumValue(lua_State* tolua tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMinimumValue",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:getMinimumValue",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6208,7 +6208,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_setThumbSprite(lua_State* tolua_ cobj->setThumbSprite(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setThumbSprite",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:setThumbSprite",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6252,7 +6252,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_getValue(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getValue",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:getValue",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6296,7 +6296,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_getPreviousLocation(lua_State* t vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPreviousLocation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:getPreviousLocation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6337,16 +6337,16 @@ int lua_cocos2dx_extension_ControlPotentiometer_distanceBetweenPointAndPoint(lua cocos2d::Vec2 arg0; cocos2d::Vec2 arg1; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ControlPotentiometer:distanceBetweenPointAndPoint"); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.ControlPotentiometer:distanceBetweenPointAndPoint"); if(!ok) return 0; double ret = cobj->distanceBetweenPointAndPoint(arg0, arg1); tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "distanceBetweenPointAndPoint",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:distanceBetweenPointAndPoint",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -6386,13 +6386,13 @@ int lua_cocos2dx_extension_ControlPotentiometer_potentiometerEnded(lua_State* to { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ControlPotentiometer:potentiometerEnded"); if(!ok) return 0; cobj->potentiometerEnded(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "potentiometerEnded",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:potentiometerEnded",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6438,7 +6438,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_setProgressTimer(lua_State* tolu cobj->setProgressTimer(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setProgressTimer",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:setProgressTimer",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6478,13 +6478,13 @@ int lua_cocos2dx_extension_ControlPotentiometer_setMinimumValue(lua_State* tolua { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlPotentiometer:setMinimumValue"); if(!ok) return 0; cobj->setMinimumValue(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMinimumValue",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:setMinimumValue",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6528,7 +6528,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_getThumbSprite(lua_State* tolua_ object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getThumbSprite",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:getThumbSprite",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6581,7 +6581,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_initWithTrackSprite_ProgressTime tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithTrackSprite_ProgressTimer_ThumbSprite",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:initWithTrackSprite_ProgressTimer_ThumbSprite",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -6621,13 +6621,13 @@ int lua_cocos2dx_extension_ControlPotentiometer_potentiometerMoved(lua_State* to { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ControlPotentiometer:potentiometerMoved"); if(!ok) return 0; cobj->potentiometerMoved(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "potentiometerMoved",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:potentiometerMoved",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6657,16 +6657,16 @@ int lua_cocos2dx_extension_ControlPotentiometer_create(lua_State* tolua_S) const char* arg0; const char* arg1; const char* arg2; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); - std::string arg2_tmp; ok &= luaval_to_std_string(tolua_S, 4, &arg2_tmp); arg2 = arg2_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.ControlPotentiometer:create"); arg0 = arg0_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "cc.ControlPotentiometer:create"); arg1 = arg1_tmp.c_str(); + std::string arg2_tmp; ok &= luaval_to_std_string(tolua_S, 4, &arg2_tmp, "cc.ControlPotentiometer:create"); arg2 = arg2_tmp.c_str(); if(!ok) return 0; cocos2d::extension::ControlPotentiometer* ret = cocos2d::extension::ControlPotentiometer::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.ControlPotentiometer",(cocos2d::extension::ControlPotentiometer*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ControlPotentiometer:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -6698,7 +6698,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.ControlPotentiometer"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ControlPotentiometer",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:ControlPotentiometer",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6781,7 +6781,7 @@ int lua_cocos2dx_extension_ControlSlider_getSelectedThumbSprite(lua_State* tolua object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSelectedThumbSprite",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:getSelectedThumbSprite",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6828,7 +6828,7 @@ int lua_cocos2dx_extension_ControlSlider_locationFromTouch(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "locationFromTouch",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:locationFromTouch",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6874,7 +6874,7 @@ int lua_cocos2dx_extension_ControlSlider_setSelectedThumbSprite(lua_State* tolua cobj->setSelectedThumbSprite(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSelectedThumbSprite",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:setSelectedThumbSprite",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6920,7 +6920,7 @@ int lua_cocos2dx_extension_ControlSlider_setProgressSprite(lua_State* tolua_S) cobj->setProgressSprite(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setProgressSprite",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:setProgressSprite",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6964,7 +6964,7 @@ int lua_cocos2dx_extension_ControlSlider_getMaximumAllowedValue(lua_State* tolua tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMaximumAllowedValue",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:getMaximumAllowedValue",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7008,7 +7008,7 @@ int lua_cocos2dx_extension_ControlSlider_getMinimumAllowedValue(lua_State* tolua tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMinimumAllowedValue",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:getMinimumAllowedValue",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7052,7 +7052,7 @@ int lua_cocos2dx_extension_ControlSlider_getMinimumValue(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMinimumValue",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:getMinimumValue",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7098,7 +7098,7 @@ int lua_cocos2dx_extension_ControlSlider_setThumbSprite(lua_State* tolua_S) cobj->setThumbSprite(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setThumbSprite",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:setThumbSprite",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7138,13 +7138,13 @@ int lua_cocos2dx_extension_ControlSlider_setMinimumValue(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlSlider:setMinimumValue"); if(!ok) return 0; cobj->setMinimumValue(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMinimumValue",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:setMinimumValue",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7184,13 +7184,13 @@ int lua_cocos2dx_extension_ControlSlider_setMinimumAllowedValue(lua_State* tolua { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlSlider:setMinimumAllowedValue"); if(!ok) return 0; cobj->setMinimumAllowedValue(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMinimumAllowedValue",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:setMinimumAllowedValue",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7230,13 +7230,13 @@ int lua_cocos2dx_extension_ControlSlider_setEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ControlSlider:setEnabled"); if(!ok) return 0; cobj->setEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:setEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7276,13 +7276,13 @@ int lua_cocos2dx_extension_ControlSlider_setValue(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlSlider:setValue"); if(!ok) return 0; cobj->setValue(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setValue",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:setValue",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7322,13 +7322,13 @@ int lua_cocos2dx_extension_ControlSlider_setMaximumValue(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlSlider:setMaximumValue"); if(!ok) return 0; cobj->setMaximumValue(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMaximumValue",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:setMaximumValue",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7371,7 +7371,7 @@ int lua_cocos2dx_extension_ControlSlider_needsLayout(lua_State* tolua_S) cobj->needsLayout(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "needsLayout",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:needsLayout",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7415,7 +7415,7 @@ int lua_cocos2dx_extension_ControlSlider_getBackgroundSprite(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackgroundSprite",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:getBackgroundSprite",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7490,7 +7490,7 @@ int lua_cocos2dx_extension_ControlSlider_initWithSprites(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithSprites",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:initWithSprites",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -7534,7 +7534,7 @@ int lua_cocos2dx_extension_ControlSlider_getMaximumValue(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMaximumValue",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:getMaximumValue",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7581,7 +7581,7 @@ int lua_cocos2dx_extension_ControlSlider_isTouchInside(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isTouchInside",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:isTouchInside",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7625,7 +7625,7 @@ int lua_cocos2dx_extension_ControlSlider_getValue(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getValue",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:getValue",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7669,7 +7669,7 @@ int lua_cocos2dx_extension_ControlSlider_getThumbSprite(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getThumbSprite",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:getThumbSprite",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7713,7 +7713,7 @@ int lua_cocos2dx_extension_ControlSlider_getProgressSprite(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getProgressSprite",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:getProgressSprite",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7759,7 +7759,7 @@ int lua_cocos2dx_extension_ControlSlider_setBackgroundSprite(lua_State* tolua_S) cobj->setBackgroundSprite(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackgroundSprite",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:setBackgroundSprite",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7799,13 +7799,13 @@ int lua_cocos2dx_extension_ControlSlider_setMaximumAllowedValue(lua_State* tolua { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlSlider:setMaximumAllowedValue"); if(!ok) return 0; cobj->setMaximumAllowedValue(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMaximumAllowedValue",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:setMaximumAllowedValue",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7853,13 +7853,13 @@ int lua_cocos2dx_extension_ControlSlider_create(lua_State* tolua_S) if (argc == 3) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.ControlSlider:create"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } const char* arg1; - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "cc.ControlSlider:create"); arg1 = arg1_tmp.c_str(); if (!ok) { break; } const char* arg2; - std::string arg2_tmp; ok &= luaval_to_std_string(tolua_S, 4, &arg2_tmp); arg2 = arg2_tmp.c_str(); + std::string arg2_tmp; ok &= luaval_to_std_string(tolua_S, 4, &arg2_tmp, "cc.ControlSlider:create"); arg2 = arg2_tmp.c_str(); if (!ok) { break; } cocos2d::extension::ControlSlider* ret = cocos2d::extension::ControlSlider::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.ControlSlider",(cocos2d::extension::ControlSlider*)ret); @@ -7872,16 +7872,16 @@ int lua_cocos2dx_extension_ControlSlider_create(lua_State* tolua_S) if (argc == 4) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.ControlSlider:create"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } const char* arg1; - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "cc.ControlSlider:create"); arg1 = arg1_tmp.c_str(); if (!ok) { break; } const char* arg2; - std::string arg2_tmp; ok &= luaval_to_std_string(tolua_S, 4, &arg2_tmp); arg2 = arg2_tmp.c_str(); + std::string arg2_tmp; ok &= luaval_to_std_string(tolua_S, 4, &arg2_tmp, "cc.ControlSlider:create"); arg2 = arg2_tmp.c_str(); if (!ok) { break; } const char* arg3; - std::string arg3_tmp; ok &= luaval_to_std_string(tolua_S, 5, &arg3_tmp); arg3 = arg3_tmp.c_str(); + std::string arg3_tmp; ok &= luaval_to_std_string(tolua_S, 5, &arg3_tmp, "cc.ControlSlider:create"); arg3 = arg3_tmp.c_str(); if (!ok) { break; } cocos2d::extension::ControlSlider* ret = cocos2d::extension::ControlSlider::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.ControlSlider",(cocos2d::extension::ControlSlider*)ret); @@ -7911,7 +7911,7 @@ int lua_cocos2dx_extension_ControlSlider_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.ControlSlider:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -7943,7 +7943,7 @@ int lua_cocos2dx_extension_ControlSlider_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.ControlSlider"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ControlSlider",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:ControlSlider",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8033,7 +8033,7 @@ int lua_cocos2dx_extension_ControlStepper_setMinusSprite(lua_State* tolua_S) cobj->setMinusSprite(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMinusSprite",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:setMinusSprite",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8077,7 +8077,7 @@ int lua_cocos2dx_extension_ControlStepper_getMinusLabel(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Label",(cocos2d::Label*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMinusLabel",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:getMinusLabel",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8117,13 +8117,13 @@ int lua_cocos2dx_extension_ControlStepper_setWraps(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ControlStepper:setWraps"); if(!ok) return 0; cobj->setWraps(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setWraps",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:setWraps",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8167,7 +8167,7 @@ int lua_cocos2dx_extension_ControlStepper_isContinuous(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isContinuous",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:isContinuous",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8211,7 +8211,7 @@ int lua_cocos2dx_extension_ControlStepper_getMinusSprite(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMinusSprite",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:getMinusSprite",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8251,13 +8251,13 @@ int lua_cocos2dx_extension_ControlStepper_updateLayoutUsingTouchLocation(lua_Sta { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ControlStepper:updateLayoutUsingTouchLocation"); if(!ok) return 0; cobj->updateLayoutUsingTouchLocation(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateLayoutUsingTouchLocation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:updateLayoutUsingTouchLocation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8298,15 +8298,15 @@ int lua_cocos2dx_extension_ControlStepper_setValueWithSendingEvent(lua_State* to double arg0; bool arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlStepper:setValueWithSendingEvent"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.ControlStepper:setValueWithSendingEvent"); if(!ok) return 0; cobj->setValueWithSendingEvent(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setValueWithSendingEvent",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:setValueWithSendingEvent",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -8350,7 +8350,7 @@ int lua_cocos2dx_extension_ControlStepper_getPlusLabel(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Label",(cocos2d::Label*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPlusLabel",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:getPlusLabel",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8393,7 +8393,7 @@ int lua_cocos2dx_extension_ControlStepper_stopAutorepeat(lua_State* tolua_S) cobj->stopAutorepeat(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stopAutorepeat",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:stopAutorepeat",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8433,13 +8433,13 @@ int lua_cocos2dx_extension_ControlStepper_setMinimumValue(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlStepper:setMinimumValue"); if(!ok) return 0; cobj->setMinimumValue(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMinimumValue",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:setMinimumValue",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8483,7 +8483,7 @@ int lua_cocos2dx_extension_ControlStepper_getPlusSprite(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPlusSprite",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:getPlusSprite",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8529,7 +8529,7 @@ int lua_cocos2dx_extension_ControlStepper_setPlusSprite(lua_State* tolua_S) cobj->setPlusSprite(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPlusSprite",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:setPlusSprite",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8575,7 +8575,7 @@ int lua_cocos2dx_extension_ControlStepper_setMinusLabel(lua_State* tolua_S) cobj->setMinusLabel(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMinusLabel",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:setMinusLabel",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8615,13 +8615,13 @@ int lua_cocos2dx_extension_ControlStepper_setValue(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlStepper:setValue"); if(!ok) return 0; cobj->setValue(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setValue",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:setValue",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8661,13 +8661,13 @@ int lua_cocos2dx_extension_ControlStepper_setStepValue(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlStepper:setStepValue"); if(!ok) return 0; cobj->setStepValue(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStepValue",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:setStepValue",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8707,13 +8707,13 @@ int lua_cocos2dx_extension_ControlStepper_setMaximumValue(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlStepper:setMaximumValue"); if(!ok) return 0; cobj->setMaximumValue(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMaximumValue",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:setMaximumValue",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8753,13 +8753,13 @@ int lua_cocos2dx_extension_ControlStepper_update(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlStepper:update"); if(!ok) return 0; cobj->update(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "update",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:update",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8802,7 +8802,7 @@ int lua_cocos2dx_extension_ControlStepper_startAutorepeat(lua_State* tolua_S) cobj->startAutorepeat(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "startAutorepeat",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:startAutorepeat",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8852,7 +8852,7 @@ int lua_cocos2dx_extension_ControlStepper_initWithMinusSpriteAndPlusSprite(lua_S tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithMinusSpriteAndPlusSprite",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:initWithMinusSpriteAndPlusSprite",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -8896,7 +8896,7 @@ int lua_cocos2dx_extension_ControlStepper_getValue(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getValue",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:getValue",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8942,7 +8942,7 @@ int lua_cocos2dx_extension_ControlStepper_setPlusLabel(lua_State* tolua_S) cobj->setPlusLabel(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPlusLabel",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:setPlusLabel",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8979,7 +8979,7 @@ int lua_cocos2dx_extension_ControlStepper_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ControlStepper",(cocos2d::extension::ControlStepper*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ControlStepper:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -9011,7 +9011,7 @@ int lua_cocos2dx_extension_ControlStepper_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.ControlStepper"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ControlStepper",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:ControlStepper",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9093,13 +9093,13 @@ int lua_cocos2dx_extension_ControlSwitch_setEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ControlSwitch:setEnabled"); if(!ok) return 0; cobj->setEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSwitch:setEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9133,7 +9133,7 @@ int lua_cocos2dx_extension_ControlSwitch_setOn(lua_State* tolua_S) do{ if (argc == 1) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ControlSwitch:setOn"); if (!ok) { break; } cobj->setOn(arg0); @@ -9144,11 +9144,11 @@ int lua_cocos2dx_extension_ControlSwitch_setOn(lua_State* tolua_S) do{ if (argc == 2) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ControlSwitch:setOn"); if (!ok) { break; } bool arg1; - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.ControlSwitch:setOn"); if (!ok) { break; } cobj->setOn(arg0, arg1); @@ -9156,7 +9156,7 @@ int lua_cocos2dx_extension_ControlSwitch_setOn(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOn",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSwitch:setOn",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -9200,7 +9200,7 @@ int lua_cocos2dx_extension_ControlSwitch_isOn(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isOn",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSwitch:isOn",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9287,7 +9287,7 @@ int lua_cocos2dx_extension_ControlSwitch_initWithMaskSprite(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithMaskSprite",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSwitch:initWithMaskSprite",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 @@ -9331,7 +9331,7 @@ int lua_cocos2dx_extension_ControlSwitch_hasMoved(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "hasMoved",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSwitch:hasMoved",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9378,7 +9378,7 @@ int lua_cocos2dx_extension_ControlSwitch_locationFromTouch(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "locationFromTouch",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSwitch:locationFromTouch",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9452,7 +9452,7 @@ int lua_cocos2dx_extension_ControlSwitch_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 6); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.ControlSwitch:create",argc, 6); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -9484,7 +9484,7 @@ int lua_cocos2dx_extension_ControlSwitch_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.ControlSwitch"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ControlSwitch",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSwitch:ControlSwitch",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9555,7 +9555,7 @@ int lua_cocos2dx_extension_ScrollView_isClippingToBounds(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isClippingToBounds",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:isClippingToBounds",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9601,7 +9601,7 @@ int lua_cocos2dx_extension_ScrollView_setContainer(lua_State* tolua_S) cobj->setContainer(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setContainer",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:setContainer",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9650,7 +9650,7 @@ int lua_cocos2dx_extension_ScrollView_onTouchEnded(lua_State* tolua_S) cobj->onTouchEnded(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "onTouchEnded",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:onTouchEnded",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -9691,15 +9691,15 @@ int lua_cocos2dx_extension_ScrollView_setContentOffsetInDuration(lua_State* tolu cocos2d::Vec2 arg0; double arg1; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ScrollView:setContentOffsetInDuration"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.ScrollView:setContentOffsetInDuration"); if(!ok) return 0; cobj->setContentOffsetInDuration(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setContentOffsetInDuration",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:setContentOffsetInDuration",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -9740,15 +9740,15 @@ int lua_cocos2dx_extension_ScrollView_setZoomScaleInDuration(lua_State* tolua_S) double arg0; double arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ScrollView:setZoomScaleInDuration"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.ScrollView:setZoomScaleInDuration"); if(!ok) return 0; cobj->setZoomScaleInDuration(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setZoomScaleInDuration",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:setZoomScaleInDuration",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -9788,13 +9788,13 @@ int lua_cocos2dx_extension_ScrollView_setBounceable(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ScrollView:setBounceable"); if(!ok) return 0; cobj->setBounceable(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBounceable",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:setBounceable",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9838,7 +9838,7 @@ int lua_cocos2dx_extension_ScrollView_getDirection(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDirection",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:getDirection",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9882,7 +9882,7 @@ int lua_cocos2dx_extension_ScrollView_getContainer(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getContainer",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:getContainer",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9923,15 +9923,15 @@ int lua_cocos2dx_extension_ScrollView_updateTweenAction(lua_State* tolua_S) double arg0; std::string arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ScrollView:updateTweenAction"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.ScrollView:updateTweenAction"); if(!ok) return 0; cobj->updateTweenAction(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateTweenAction",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:updateTweenAction",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -9975,7 +9975,7 @@ int lua_cocos2dx_extension_ScrollView_getZoomScale(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getZoomScale",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:getZoomScale",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10018,7 +10018,7 @@ int lua_cocos2dx_extension_ScrollView_updateInset(lua_State* tolua_S) cobj->updateInset(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateInset",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:updateInset",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10058,7 +10058,7 @@ int lua_cocos2dx_extension_ScrollView_initWithViewSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.ScrollView:initWithViewSize"); if(!ok) return 0; bool ret = cobj->initWithViewSize(arg0); @@ -10070,7 +10070,7 @@ int lua_cocos2dx_extension_ScrollView_initWithViewSize(lua_State* tolua_S) cocos2d::Size arg0; cocos2d::Node* arg1; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.ScrollView:initWithViewSize"); ok &= luaval_to_object(tolua_S, 3, "cc.Node",&arg1); if(!ok) @@ -10079,7 +10079,7 @@ int lua_cocos2dx_extension_ScrollView_initWithViewSize(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithViewSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:initWithViewSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10125,7 +10125,7 @@ int lua_cocos2dx_extension_ScrollView_pause(lua_State* tolua_S) cobj->pause(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pause",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:pause",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10165,13 +10165,13 @@ int lua_cocos2dx_extension_ScrollView_setDirection(lua_State* tolua_S) { cocos2d::extension::ScrollView::Direction arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ScrollView:setDirection"); if(!ok) return 0; cobj->setDirection(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDirection",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:setDirection",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10215,7 +10215,7 @@ int lua_cocos2dx_extension_ScrollView_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10255,7 +10255,7 @@ int lua_cocos2dx_extension_ScrollView_setContentOffset(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ScrollView:setContentOffset"); if(!ok) return 0; cobj->setContentOffset(arg0); @@ -10266,15 +10266,15 @@ int lua_cocos2dx_extension_ScrollView_setContentOffset(lua_State* tolua_S) cocos2d::Vec2 arg0; bool arg1; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ScrollView:setContentOffset"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.ScrollView:setContentOffset"); if(!ok) return 0; cobj->setContentOffset(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setContentOffset",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:setContentOffset",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10318,7 +10318,7 @@ int lua_cocos2dx_extension_ScrollView_isDragging(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isDragging",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:isDragging",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10362,7 +10362,7 @@ int lua_cocos2dx_extension_ScrollView_isTouchEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isTouchEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:isTouchEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10406,7 +10406,7 @@ int lua_cocos2dx_extension_ScrollView_isBounceable(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isBounceable",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:isBounceable",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10446,13 +10446,13 @@ int lua_cocos2dx_extension_ScrollView_setTouchEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ScrollView:setTouchEnabled"); if(!ok) return 0; cobj->setTouchEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTouchEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:setTouchEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10501,7 +10501,7 @@ int lua_cocos2dx_extension_ScrollView_onTouchMoved(lua_State* tolua_S) cobj->onTouchMoved(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "onTouchMoved",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:onTouchMoved",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10545,7 +10545,7 @@ int lua_cocos2dx_extension_ScrollView_getContentOffset(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getContentOffset",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:getContentOffset",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10591,7 +10591,7 @@ int lua_cocos2dx_extension_ScrollView_resume(lua_State* tolua_S) cobj->resume(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resume",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:resume",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10631,13 +10631,13 @@ int lua_cocos2dx_extension_ScrollView_setClippingToBounds(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ScrollView:setClippingToBounds"); if(!ok) return 0; cobj->setClippingToBounds(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setClippingToBounds",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:setClippingToBounds",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10677,13 +10677,13 @@ int lua_cocos2dx_extension_ScrollView_setViewSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.ScrollView:setViewSize"); if(!ok) return 0; cobj->setViewSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setViewSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:setViewSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10732,7 +10732,7 @@ int lua_cocos2dx_extension_ScrollView_onTouchCancelled(lua_State* tolua_S) cobj->onTouchCancelled(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "onTouchCancelled",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:onTouchCancelled",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10776,7 +10776,7 @@ int lua_cocos2dx_extension_ScrollView_getViewSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getViewSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:getViewSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10820,7 +10820,7 @@ int lua_cocos2dx_extension_ScrollView_maxContainerOffset(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "maxContainerOffset",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:maxContainerOffset",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10870,7 +10870,7 @@ int lua_cocos2dx_extension_ScrollView_onTouchBegan(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "onTouchBegan",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:onTouchBegan",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10914,7 +10914,7 @@ int lua_cocos2dx_extension_ScrollView_isTouchMoved(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isTouchMoved",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:isTouchMoved",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10961,7 +10961,7 @@ int lua_cocos2dx_extension_ScrollView_isNodeVisible(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isNodeVisible",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:isNodeVisible",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11005,7 +11005,7 @@ int lua_cocos2dx_extension_ScrollView_minContainerOffset(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "minContainerOffset",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:minContainerOffset",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11039,11 +11039,11 @@ int lua_cocos2dx_extension_ScrollView_setZoomScale(lua_State* tolua_S) do{ if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ScrollView:setZoomScale"); if (!ok) { break; } bool arg1; - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.ScrollView:setZoomScale"); if (!ok) { break; } cobj->setZoomScale(arg0, arg1); @@ -11054,7 +11054,7 @@ int lua_cocos2dx_extension_ScrollView_setZoomScale(lua_State* tolua_S) do{ if (argc == 1) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ScrollView:setZoomScale"); if (!ok) { break; } cobj->setZoomScale(arg0); @@ -11062,7 +11062,7 @@ int lua_cocos2dx_extension_ScrollView_setZoomScale(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setZoomScale",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:setZoomScale",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11101,7 +11101,7 @@ int lua_cocos2dx_extension_ScrollView_create(lua_State* tolua_S) if (argc == 1) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.ScrollView:create"); if (!ok) { break; } cocos2d::extension::ScrollView* ret = cocos2d::extension::ScrollView::create(arg0); object_to_luaval(tolua_S, "cc.ScrollView",(cocos2d::extension::ScrollView*)ret); @@ -11114,7 +11114,7 @@ int lua_cocos2dx_extension_ScrollView_create(lua_State* tolua_S) if (argc == 2) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.ScrollView:create"); if (!ok) { break; } cocos2d::Node* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Node",&arg1); @@ -11125,7 +11125,7 @@ int lua_cocos2dx_extension_ScrollView_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.ScrollView:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -11157,7 +11157,7 @@ int lua_cocos2dx_extension_ScrollView_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.ScrollView"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ScrollView",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:ScrollView",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11254,7 +11254,7 @@ int lua_cocos2dx_extension_TableViewCell_reset(lua_State* tolua_S) cobj->reset(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "reset",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableViewCell:reset",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11298,7 +11298,7 @@ int lua_cocos2dx_extension_TableViewCell_getIdx(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getIdx",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableViewCell:getIdx",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11338,13 +11338,13 @@ int lua_cocos2dx_extension_TableViewCell_setIdx(lua_State* tolua_S) { ssize_t arg0; - ok &= luaval_to_ssize(tolua_S, 2, &arg0); + ok &= luaval_to_ssize(tolua_S, 2, &arg0, "cc.TableViewCell:setIdx"); if(!ok) return 0; cobj->setIdx(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setIdx",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableViewCell:setIdx",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11377,7 +11377,7 @@ int lua_cocos2dx_extension_TableViewCell_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TableViewCell",(cocos2d::extension::TableViewCell*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TableViewCell:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -11409,7 +11409,7 @@ int lua_cocos2dx_extension_TableViewCell_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.TableViewCell"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TableViewCell",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableViewCell:TableViewCell",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11473,13 +11473,13 @@ int lua_cocos2dx_extension_TableView_updateCellAtIndex(lua_State* tolua_S) { ssize_t arg0; - ok &= luaval_to_ssize(tolua_S, 2, &arg0); + ok &= luaval_to_ssize(tolua_S, 2, &arg0, "cc.TableView:updateCellAtIndex"); if(!ok) return 0; cobj->updateCellAtIndex(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateCellAtIndex",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableView:updateCellAtIndex",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11519,13 +11519,13 @@ int lua_cocos2dx_extension_TableView_setVerticalFillOrder(lua_State* tolua_S) { cocos2d::extension::TableView::VerticalFillOrder arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.TableView:setVerticalFillOrder"); if(!ok) return 0; cobj->setVerticalFillOrder(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVerticalFillOrder",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableView:setVerticalFillOrder",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11571,7 +11571,7 @@ int lua_cocos2dx_extension_TableView_scrollViewDidZoom(lua_State* tolua_S) cobj->scrollViewDidZoom(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "scrollViewDidZoom",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableView:scrollViewDidZoom",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11614,7 +11614,7 @@ int lua_cocos2dx_extension_TableView__updateContentSize(lua_State* tolua_S) cobj->_updateContentSize(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "_updateContentSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableView:_updateContentSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11658,7 +11658,7 @@ int lua_cocos2dx_extension_TableView_getVerticalFillOrder(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVerticalFillOrder",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableView:getVerticalFillOrder",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11698,13 +11698,13 @@ int lua_cocos2dx_extension_TableView_removeCellAtIndex(lua_State* tolua_S) { ssize_t arg0; - ok &= luaval_to_ssize(tolua_S, 2, &arg0); + ok &= luaval_to_ssize(tolua_S, 2, &arg0, "cc.TableView:removeCellAtIndex"); if(!ok) return 0; cobj->removeCellAtIndex(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeCellAtIndex",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableView:removeCellAtIndex",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11744,7 +11744,7 @@ int lua_cocos2dx_extension_TableView_initWithViewSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.TableView:initWithViewSize"); if(!ok) return 0; bool ret = cobj->initWithViewSize(arg0); @@ -11756,7 +11756,7 @@ int lua_cocos2dx_extension_TableView_initWithViewSize(lua_State* tolua_S) cocos2d::Size arg0; cocos2d::Node* arg1; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.TableView:initWithViewSize"); ok &= luaval_to_object(tolua_S, 3, "cc.Node",&arg1); if(!ok) @@ -11765,7 +11765,7 @@ int lua_cocos2dx_extension_TableView_initWithViewSize(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithViewSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableView:initWithViewSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11811,7 +11811,7 @@ int lua_cocos2dx_extension_TableView_scrollViewDidScroll(lua_State* tolua_S) cobj->scrollViewDidScroll(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "scrollViewDidScroll",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableView:scrollViewDidScroll",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11854,7 +11854,7 @@ int lua_cocos2dx_extension_TableView_reloadData(lua_State* tolua_S) cobj->reloadData(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "reloadData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableView:reloadData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11894,13 +11894,13 @@ int lua_cocos2dx_extension_TableView_insertCellAtIndex(lua_State* tolua_S) { ssize_t arg0; - ok &= luaval_to_ssize(tolua_S, 2, &arg0); + ok &= luaval_to_ssize(tolua_S, 2, &arg0, "cc.TableView:insertCellAtIndex"); if(!ok) return 0; cobj->insertCellAtIndex(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "insertCellAtIndex",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableView:insertCellAtIndex",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11940,14 +11940,14 @@ int lua_cocos2dx_extension_TableView_cellAtIndex(lua_State* tolua_S) { ssize_t arg0; - ok &= luaval_to_ssize(tolua_S, 2, &arg0); + ok &= luaval_to_ssize(tolua_S, 2, &arg0, "cc.TableView:cellAtIndex"); if(!ok) return 0; cocos2d::extension::TableViewCell* ret = cobj->cellAtIndex(arg0); object_to_luaval(tolua_S, "cc.TableViewCell",(cocos2d::extension::TableViewCell*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cellAtIndex",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableView:cellAtIndex",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11991,7 +11991,7 @@ int lua_cocos2dx_extension_TableView_dequeueCell(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TableViewCell",(cocos2d::extension::TableViewCell*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "dequeueCell",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableView:dequeueCell",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12025,7 +12025,7 @@ int lua_cocos2dx_extension_TableView_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.TableView"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TableView",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableView:TableView",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12101,7 +12101,7 @@ int lua_cocos2dx_extension_EditBox_getText(lua_State* tolua_S) tolua_pushstring(tolua_S,(const char*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getText",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:getText",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12141,13 +12141,13 @@ int lua_cocos2dx_extension_EditBox_setPlaceholderFontName(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.EditBox:setPlaceholderFontName"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->setPlaceholderFontName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPlaceholderFontName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:setPlaceholderFontName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12191,7 +12191,7 @@ int lua_cocos2dx_extension_EditBox_getPlaceHolder(lua_State* tolua_S) tolua_pushstring(tolua_S,(const char*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPlaceHolder",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:getPlaceHolder",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12231,13 +12231,13 @@ int lua_cocos2dx_extension_EditBox_setFontName(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.EditBox:setFontName"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->setFontName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFontName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:setFontName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12277,13 +12277,13 @@ int lua_cocos2dx_extension_EditBox_setPlaceholderFontSize(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.EditBox:setPlaceholderFontSize"); if(!ok) return 0; cobj->setPlaceholderFontSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPlaceholderFontSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:setPlaceholderFontSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12323,13 +12323,13 @@ int lua_cocos2dx_extension_EditBox_setInputMode(lua_State* tolua_S) { cocos2d::extension::EditBox::InputMode arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.EditBox:setInputMode"); if(!ok) return 0; cobj->setInputMode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setInputMode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:setInputMode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12369,13 +12369,13 @@ int lua_cocos2dx_extension_EditBox_setPlaceholderFontColor(lua_State* tolua_S) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.EditBox:setPlaceholderFontColor"); if(!ok) return 0; cobj->setPlaceholderFontColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPlaceholderFontColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:setPlaceholderFontColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12415,13 +12415,13 @@ int lua_cocos2dx_extension_EditBox_setFontColor(lua_State* tolua_S) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.EditBox:setFontColor"); if(!ok) return 0; cobj->setFontColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFontColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:setFontColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12462,15 +12462,15 @@ int lua_cocos2dx_extension_EditBox_setPlaceholderFont(lua_State* tolua_S) const char* arg0; int arg1; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.EditBox:setPlaceholderFont"); arg0 = arg0_tmp.c_str(); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.EditBox:setPlaceholderFont"); if(!ok) return 0; cobj->setPlaceholderFont(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPlaceholderFont",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:setPlaceholderFont",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -12510,13 +12510,13 @@ int lua_cocos2dx_extension_EditBox_setFontSize(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.EditBox:setFontSize"); if(!ok) return 0; cobj->setFontSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFontSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:setFontSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12557,7 +12557,7 @@ int lua_cocos2dx_extension_EditBox_initWithSizeAndBackgroundSprite(lua_State* to cocos2d::Size arg0; cocos2d::extension::Scale9Sprite* arg1; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.EditBox:initWithSizeAndBackgroundSprite"); ok &= luaval_to_object(tolua_S, 3, "cc.Scale9Sprite",&arg1); if(!ok) @@ -12566,7 +12566,7 @@ int lua_cocos2dx_extension_EditBox_initWithSizeAndBackgroundSprite(lua_State* to tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithSizeAndBackgroundSprite",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:initWithSizeAndBackgroundSprite",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -12606,13 +12606,13 @@ int lua_cocos2dx_extension_EditBox_setPlaceHolder(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.EditBox:setPlaceHolder"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->setPlaceHolder(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPlaceHolder",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:setPlaceHolder",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12652,13 +12652,13 @@ int lua_cocos2dx_extension_EditBox_setReturnType(lua_State* tolua_S) { cocos2d::extension::EditBox::KeyboardReturnType arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.EditBox:setReturnType"); if(!ok) return 0; cobj->setReturnType(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setReturnType",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:setReturnType",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12698,13 +12698,13 @@ int lua_cocos2dx_extension_EditBox_setInputFlag(lua_State* tolua_S) { cocos2d::extension::EditBox::InputFlag arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.EditBox:setInputFlag"); if(!ok) return 0; cobj->setInputFlag(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setInputFlag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:setInputFlag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12748,7 +12748,7 @@ int lua_cocos2dx_extension_EditBox_getMaxLength(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMaxLength",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:getMaxLength",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12788,13 +12788,13 @@ int lua_cocos2dx_extension_EditBox_setText(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.EditBox:setText"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->setText(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setText",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:setText",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12834,13 +12834,13 @@ int lua_cocos2dx_extension_EditBox_setMaxLength(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.EditBox:setMaxLength"); if(!ok) return 0; cobj->setMaxLength(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMaxLength",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:setMaxLength",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12881,15 +12881,15 @@ int lua_cocos2dx_extension_EditBox_setFont(lua_State* tolua_S) const char* arg0; int arg1; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.EditBox:setFont"); arg0 = arg0_tmp.c_str(); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.EditBox:setFont"); if(!ok) return 0; cobj->setFont(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFont",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:setFont",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -12918,7 +12918,7 @@ int lua_cocos2dx_extension_EditBox_create(lua_State* tolua_S) { cocos2d::Size arg0; cocos2d::extension::Scale9Sprite* arg1; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.EditBox:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scale9Sprite",&arg1); if(!ok) return 0; @@ -12931,7 +12931,7 @@ int lua_cocos2dx_extension_EditBox_create(lua_State* tolua_S) cocos2d::Size arg0; cocos2d::extension::Scale9Sprite* arg1; cocos2d::extension::Scale9Sprite* arg2; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.EditBox:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scale9Sprite",&arg1); ok &= luaval_to_object(tolua_S, 4, "cc.Scale9Sprite",&arg2); if(!ok) @@ -12946,7 +12946,7 @@ int lua_cocos2dx_extension_EditBox_create(lua_State* tolua_S) cocos2d::extension::Scale9Sprite* arg1; cocos2d::extension::Scale9Sprite* arg2; cocos2d::extension::Scale9Sprite* arg3; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.EditBox:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scale9Sprite",&arg1); ok &= luaval_to_object(tolua_S, 4, "cc.Scale9Sprite",&arg2); ok &= luaval_to_object(tolua_S, 5, "cc.Scale9Sprite",&arg3); @@ -12956,7 +12956,7 @@ int lua_cocos2dx_extension_EditBox_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EditBox",(cocos2d::extension::EditBox*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EditBox:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -12988,7 +12988,7 @@ int lua_cocos2dx_extension_EditBox_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.EditBox"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "EditBox",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:EditBox",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13067,13 +13067,13 @@ int lua_cocos2dx_extension_AssetsManager_setStoragePath(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.AssetsManager:setStoragePath"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->setStoragePath(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStoragePath",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AssetsManager:setStoragePath",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13113,13 +13113,13 @@ int lua_cocos2dx_extension_AssetsManager_setPackageUrl(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.AssetsManager:setPackageUrl"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->setPackageUrl(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPackageUrl",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AssetsManager:setPackageUrl",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13163,7 +13163,7 @@ int lua_cocos2dx_extension_AssetsManager_checkUpdate(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "checkUpdate",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AssetsManager:checkUpdate",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13207,7 +13207,7 @@ int lua_cocos2dx_extension_AssetsManager_getStoragePath(lua_State* tolua_S) tolua_pushstring(tolua_S,(const char*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStoragePath",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AssetsManager:getStoragePath",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13250,7 +13250,7 @@ int lua_cocos2dx_extension_AssetsManager_update(lua_State* tolua_S) cobj->update(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "update",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AssetsManager:update",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13290,13 +13290,13 @@ int lua_cocos2dx_extension_AssetsManager_setConnectionTimeout(lua_State* tolua_S { unsigned int arg0; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.AssetsManager:setConnectionTimeout"); if(!ok) return 0; cobj->setConnectionTimeout(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setConnectionTimeout",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AssetsManager:setConnectionTimeout",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13336,13 +13336,13 @@ int lua_cocos2dx_extension_AssetsManager_setVersionFileUrl(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.AssetsManager:setVersionFileUrl"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->setVersionFileUrl(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVersionFileUrl",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AssetsManager:setVersionFileUrl",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13386,7 +13386,7 @@ int lua_cocos2dx_extension_AssetsManager_getPackageUrl(lua_State* tolua_S) tolua_pushstring(tolua_S,(const char*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPackageUrl",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AssetsManager:getPackageUrl",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13430,7 +13430,7 @@ int lua_cocos2dx_extension_AssetsManager_getConnectionTimeout(lua_State* tolua_S tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getConnectionTimeout",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AssetsManager:getConnectionTimeout",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13474,7 +13474,7 @@ int lua_cocos2dx_extension_AssetsManager_getVersion(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVersion",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AssetsManager:getVersion",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13518,7 +13518,7 @@ int lua_cocos2dx_extension_AssetsManager_getVersionFileUrl(lua_State* tolua_S) tolua_pushstring(tolua_S,(const char*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVersionFileUrl",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AssetsManager:getVersionFileUrl",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13561,7 +13561,7 @@ int lua_cocos2dx_extension_AssetsManager_deleteVersion(lua_State* tolua_S) cobj->deleteVersion(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "deleteVersion",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AssetsManager:deleteVersion",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13594,9 +13594,9 @@ int lua_cocos2dx_extension_AssetsManager_create(lua_State* tolua_S) std::function arg3; std::function arg4; std::function arg5; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); - std::string arg2_tmp; ok &= luaval_to_std_string(tolua_S, 4, &arg2_tmp); arg2 = arg2_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.AssetsManager:create"); arg0 = arg0_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "cc.AssetsManager:create"); arg1 = arg1_tmp.c_str(); + std::string arg2_tmp; ok &= luaval_to_std_string(tolua_S, 4, &arg2_tmp, "cc.AssetsManager:create"); arg2 = arg2_tmp.c_str(); do { // Lambda binding for lua is not supported. assert(false); @@ -13618,7 +13618,7 @@ int lua_cocos2dx_extension_AssetsManager_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.AssetsManager",(cocos2d::extension::AssetsManager*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 6); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.AssetsManager:create",argc, 6); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -13654,7 +13654,7 @@ int lua_cocos2dx_extension_AssetsManager_constructor(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.AssetsManager:AssetsManager"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj = new cocos2d::extension::AssetsManager(arg0); @@ -13669,9 +13669,9 @@ int lua_cocos2dx_extension_AssetsManager_constructor(lua_State* tolua_S) const char* arg0; const char* arg1; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.AssetsManager:AssetsManager"); arg0 = arg0_tmp.c_str(); - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "cc.AssetsManager:AssetsManager"); arg1 = arg1_tmp.c_str(); if(!ok) return 0; cobj = new cocos2d::extension::AssetsManager(arg0, arg1); @@ -13687,11 +13687,11 @@ int lua_cocos2dx_extension_AssetsManager_constructor(lua_State* tolua_S) const char* arg1; const char* arg2; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.AssetsManager:AssetsManager"); arg0 = arg0_tmp.c_str(); - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "cc.AssetsManager:AssetsManager"); arg1 = arg1_tmp.c_str(); - std::string arg2_tmp; ok &= luaval_to_std_string(tolua_S, 4, &arg2_tmp); arg2 = arg2_tmp.c_str(); + std::string arg2_tmp; ok &= luaval_to_std_string(tolua_S, 4, &arg2_tmp, "cc.AssetsManager:AssetsManager"); arg2 = arg2_tmp.c_str(); if(!ok) return 0; cobj = new cocos2d::extension::AssetsManager(arg0, arg1, arg2); @@ -13701,7 +13701,7 @@ int lua_cocos2dx_extension_AssetsManager_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.AssetsManager"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "AssetsManager",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AssetsManager:AssetsManager",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13783,7 +13783,7 @@ int lua_cocos2dx_extension_CCBAnimationManager_moveAnimationsFromNode(lua_State* cobj->moveAnimationsFromNode(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "moveAnimationsFromNode",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:moveAnimationsFromNode",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -13823,13 +13823,13 @@ int lua_cocos2dx_extension_CCBAnimationManager_setAutoPlaySequenceId(lua_State* { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.CCBAnimationManager:setAutoPlaySequenceId"); if(!ok) return 0; cobj->setAutoPlaySequenceId(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAutoPlaySequenceId",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:setAutoPlaySequenceId",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13873,7 +13873,7 @@ int lua_cocos2dx_extension_CCBAnimationManager_getDocumentCallbackNames(lua_Stat ccvaluevector_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDocumentCallbackNames",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:getDocumentCallbackNames",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13920,7 +13920,7 @@ int lua_cocos2dx_extension_CCBAnimationManager_actionForSoundChannel(lua_State* object_to_luaval(tolua_S, "cc.Sequence",(cocos2d::Sequence*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "actionForSoundChannel",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:actionForSoundChannel",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13962,17 +13962,17 @@ int lua_cocos2dx_extension_CCBAnimationManager_setBaseValue(lua_State* tolua_S) cocos2d::Node* arg1; std::string arg2; - ok &= luaval_to_ccvalue(tolua_S, 2, &arg0); + ok &= luaval_to_ccvalue(tolua_S, 2, &arg0, "cc.CCBAnimationManager:setBaseValue"); ok &= luaval_to_object(tolua_S, 3, "cc.Node",&arg1); - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "cc.CCBAnimationManager:setBaseValue"); if(!ok) return 0; cobj->setBaseValue(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBaseValue",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:setBaseValue",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -14016,7 +14016,7 @@ int lua_cocos2dx_extension_CCBAnimationManager_getDocumentOutletNodes(lua_State* ccvector_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDocumentOutletNodes",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:getDocumentOutletNodes",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14060,7 +14060,7 @@ int lua_cocos2dx_extension_CCBAnimationManager_getLastCompletedSequenceName(lua_ tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLastCompletedSequenceName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:getLastCompletedSequenceName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14106,7 +14106,7 @@ int lua_cocos2dx_extension_CCBAnimationManager_setRootNode(lua_State* tolua_S) cobj->setRootNode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRootNode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:setRootNode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14147,15 +14147,15 @@ int lua_cocos2dx_extension_CCBAnimationManager_runAnimationsForSequenceNamedTwee const char* arg0; double arg1; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.CCBAnimationManager:runAnimationsForSequenceNamedTweenDuration"); arg0 = arg0_tmp.c_str(); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.CCBAnimationManager:runAnimationsForSequenceNamedTweenDuration"); if(!ok) return 0; cobj->runAnimationsForSequenceNamedTweenDuration(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "runAnimationsForSequenceNamedTweenDuration",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:runAnimationsForSequenceNamedTweenDuration",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -14195,13 +14195,13 @@ int lua_cocos2dx_extension_CCBAnimationManager_addDocumentOutletName(lua_State* { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.CCBAnimationManager:addDocumentOutletName"); if(!ok) return 0; cobj->addDocumentOutletName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addDocumentOutletName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:addDocumentOutletName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14245,7 +14245,7 @@ int lua_cocos2dx_extension_CCBAnimationManager_getSequences(lua_State* tolua_S) ccvector_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSequences",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:getSequences",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14289,7 +14289,7 @@ int lua_cocos2dx_extension_CCBAnimationManager_getRootContainerSize(lua_State* t size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRootContainerSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:getRootContainerSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14329,13 +14329,13 @@ int lua_cocos2dx_extension_CCBAnimationManager_setDocumentControllerName(lua_Sta { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.CCBAnimationManager:setDocumentControllerName"); if(!ok) return 0; cobj->setDocumentControllerName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDocumentControllerName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:setDocumentControllerName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14381,13 +14381,13 @@ int lua_cocos2dx_extension_CCBAnimationManager_setObject(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 3, "cc.Node",&arg1); - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "cc.CCBAnimationManager:setObject"); if(!ok) return 0; cobj->setObject(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setObject",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:setObject",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -14434,7 +14434,7 @@ int lua_cocos2dx_extension_CCBAnimationManager_getContainerSize(lua_State* tolua size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getContainerSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:getContainerSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14481,7 +14481,7 @@ int lua_cocos2dx_extension_CCBAnimationManager_actionForCallbackChannel(lua_Stat object_to_luaval(tolua_S, "cc.Sequence",(cocos2d::Sequence*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "actionForCallbackChannel",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:actionForCallbackChannel",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14525,7 +14525,7 @@ int lua_cocos2dx_extension_CCBAnimationManager_getDocumentOutletNames(lua_State* ccvaluevector_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDocumentOutletNames",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:getDocumentOutletNames",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14565,13 +14565,13 @@ int lua_cocos2dx_extension_CCBAnimationManager_addDocumentCallbackControlEvents( { cocos2d::extension::Control::EventType arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.CCBAnimationManager:addDocumentCallbackControlEvents"); if(!ok) return 0; cobj->addDocumentCallbackControlEvents(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addDocumentCallbackControlEvents",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:addDocumentCallbackControlEvents",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14615,7 +14615,7 @@ int lua_cocos2dx_extension_CCBAnimationManager_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14659,7 +14659,7 @@ int lua_cocos2dx_extension_CCBAnimationManager_getKeyframeCallbacks(lua_State* t ccvaluevector_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getKeyframeCallbacks",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:getKeyframeCallbacks",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14703,7 +14703,7 @@ int lua_cocos2dx_extension_CCBAnimationManager_getDocumentCallbackControlEvents( ccvaluevector_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDocumentCallbackControlEvents",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:getDocumentCallbackControlEvents",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14743,13 +14743,13 @@ int lua_cocos2dx_extension_CCBAnimationManager_setRootContainerSize(lua_State* t { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.CCBAnimationManager:setRootContainerSize"); if(!ok) return 0; cobj->setRootContainerSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRootContainerSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:setRootContainerSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14790,15 +14790,15 @@ int lua_cocos2dx_extension_CCBAnimationManager_runAnimationsForSequenceIdTweenDu int arg0; double arg1; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.CCBAnimationManager:runAnimationsForSequenceIdTweenDuration"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.CCBAnimationManager:runAnimationsForSequenceIdTweenDuration"); if(!ok) return 0; cobj->runAnimationsForSequenceIdTweenDuration(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "runAnimationsForSequenceIdTweenDuration",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:runAnimationsForSequenceIdTweenDuration",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -14842,7 +14842,7 @@ int lua_cocos2dx_extension_CCBAnimationManager_getRunningSequenceName(lua_State* tolua_pushstring(tolua_S,(const char*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRunningSequenceName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:getRunningSequenceName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14886,7 +14886,7 @@ int lua_cocos2dx_extension_CCBAnimationManager_getAutoPlaySequenceId(lua_State* tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAutoPlaySequenceId",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:getAutoPlaySequenceId",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14926,13 +14926,13 @@ int lua_cocos2dx_extension_CCBAnimationManager_addDocumentCallbackName(lua_State { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.CCBAnimationManager:addDocumentCallbackName"); if(!ok) return 0; cobj->addDocumentCallbackName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addDocumentCallbackName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:addDocumentCallbackName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14976,7 +14976,7 @@ int lua_cocos2dx_extension_CCBAnimationManager_getRootNode(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRootNode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:getRootNode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15022,7 +15022,7 @@ int lua_cocos2dx_extension_CCBAnimationManager_addDocumentOutletNode(lua_State* cobj->addDocumentOutletNode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addDocumentOutletNode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:addDocumentOutletNode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15062,14 +15062,14 @@ int lua_cocos2dx_extension_CCBAnimationManager_getSequenceDuration(lua_State* to { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.CCBAnimationManager:getSequenceDuration"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; double ret = cobj->getSequenceDuration(arg0); tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSequenceDuration",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:getSequenceDuration",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15115,7 +15115,7 @@ int lua_cocos2dx_extension_CCBAnimationManager_addDocumentCallbackNode(lua_State cobj->addDocumentCallbackNode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addDocumentCallbackNode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:addDocumentCallbackNode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15155,13 +15155,13 @@ int lua_cocos2dx_extension_CCBAnimationManager_runAnimationsForSequenceNamed(lua { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.CCBAnimationManager:runAnimationsForSequenceNamed"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->runAnimationsForSequenceNamed(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "runAnimationsForSequenceNamed",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:runAnimationsForSequenceNamed",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15201,14 +15201,14 @@ int lua_cocos2dx_extension_CCBAnimationManager_getSequenceId(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.CCBAnimationManager:getSequenceId"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; int ret = cobj->getSequenceId(arg0); tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSequenceId",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:getSequenceId",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15252,7 +15252,7 @@ int lua_cocos2dx_extension_CCBAnimationManager_getDocumentCallbackNodes(lua_Stat ccvector_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDocumentCallbackNodes",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:getDocumentCallbackNodes",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15292,13 +15292,13 @@ int lua_cocos2dx_extension_CCBAnimationManager_setSequences(lua_State* tolua_S) { cocos2d::Vector arg0; - ok &= luaval_to_ccvector(tolua_S, 2, &arg0); + ok &= luaval_to_ccvector(tolua_S, 2, &arg0, "cc.CCBAnimationManager:setSequences"); if(!ok) return 0; cobj->setSequences(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSequences",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:setSequences",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15341,7 +15341,7 @@ int lua_cocos2dx_extension_CCBAnimationManager_debug(lua_State* tolua_S) cobj->debug(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "debug",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:debug",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15385,7 +15385,7 @@ int lua_cocos2dx_extension_CCBAnimationManager_getDocumentControllerName(lua_Sta tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDocumentControllerName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:getDocumentControllerName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15419,7 +15419,7 @@ int lua_cocos2dx_extension_CCBAnimationManager_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.CCBAnimationManager"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "CCBAnimationManager",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:CCBAnimationManager",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15515,13 +15515,13 @@ int lua_cocos2dx_extension_CCBReader_addOwnerOutletName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.CCBReader:addOwnerOutletName"); if(!ok) return 0; cobj->addOwnerOutletName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addOwnerOutletName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:addOwnerOutletName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15565,7 +15565,7 @@ int lua_cocos2dx_extension_CCBReader_getOwnerCallbackNames(lua_State* tolua_S) ccvaluevector_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOwnerCallbackNames",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:getOwnerCallbackNames",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15605,13 +15605,13 @@ int lua_cocos2dx_extension_CCBReader_addDocumentCallbackControlEvents(lua_State* { cocos2d::extension::Control::EventType arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.CCBReader:addDocumentCallbackControlEvents"); if(!ok) return 0; cobj->addDocumentCallbackControlEvents(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addDocumentCallbackControlEvents",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:addDocumentCallbackControlEvents",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15651,13 +15651,13 @@ int lua_cocos2dx_extension_CCBReader_setCCBRootPath(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.CCBReader:setCCBRootPath"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->setCCBRootPath(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCCBRootPath",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:setCCBRootPath",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15703,7 +15703,7 @@ int lua_cocos2dx_extension_CCBReader_addOwnerOutletNode(lua_State* tolua_S) cobj->addOwnerOutletNode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addOwnerOutletNode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:addOwnerOutletNode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15747,7 +15747,7 @@ int lua_cocos2dx_extension_CCBReader_getOwnerCallbackNodes(lua_State* tolua_S) ccvector_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOwnerCallbackNodes",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:getOwnerCallbackNodes",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15794,7 +15794,7 @@ int lua_cocos2dx_extension_CCBReader_readSoundKeyframesForSeq(lua_State* tolua_S tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "readSoundKeyframesForSeq",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:readSoundKeyframesForSeq",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15838,7 +15838,7 @@ int lua_cocos2dx_extension_CCBReader_getCCBRootPath(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCCBRootPath",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:getCCBRootPath",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15882,7 +15882,7 @@ int lua_cocos2dx_extension_CCBReader_getOwnerCallbackControlEvents(lua_State* to ccvaluevector_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOwnerCallbackControlEvents",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:getOwnerCallbackControlEvents",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15926,7 +15926,7 @@ int lua_cocos2dx_extension_CCBReader_getOwnerOutletNodes(lua_State* tolua_S) ccvector_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOwnerOutletNodes",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:getOwnerOutletNodes",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15970,7 +15970,7 @@ int lua_cocos2dx_extension_CCBReader_readUTF8(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "readUTF8",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:readUTF8",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16010,13 +16010,13 @@ int lua_cocos2dx_extension_CCBReader_addOwnerCallbackControlEvents(lua_State* to { cocos2d::extension::Control::EventType arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.CCBReader:addOwnerCallbackControlEvents"); if(!ok) return 0; cobj->addOwnerCallbackControlEvents(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addOwnerCallbackControlEvents",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:addOwnerCallbackControlEvents",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16060,7 +16060,7 @@ int lua_cocos2dx_extension_CCBReader_getOwnerOutletNames(lua_State* tolua_S) ccvaluevector_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOwnerOutletNames",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:getOwnerOutletNames",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16106,7 +16106,7 @@ int lua_cocos2dx_extension_CCBReader_setAnimationManager(lua_State* tolua_S) cobj->setAnimationManager(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAnimationManager",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:setAnimationManager",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16153,7 +16153,7 @@ int lua_cocos2dx_extension_CCBReader_readCallbackKeyframesForSeq(lua_State* tolu tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "readCallbackKeyframesForSeq",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:readCallbackKeyframesForSeq",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16197,7 +16197,7 @@ int lua_cocos2dx_extension_CCBReader_getAnimationManagersForNodes(lua_State* tol ccvector_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnimationManagersForNodes",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:getAnimationManagersForNodes",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16241,7 +16241,7 @@ int lua_cocos2dx_extension_CCBReader_getNodesWithAnimationManagers(lua_State* to ccvector_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNodesWithAnimationManagers",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:getNodesWithAnimationManagers",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16285,7 +16285,7 @@ int lua_cocos2dx_extension_CCBReader_getAnimationManager(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.CCBAnimationManager",(cocosbuilder::CCBAnimationManager*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnimationManager",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:getAnimationManager",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16313,13 +16313,13 @@ int lua_cocos2dx_extension_CCBReader_setResolutionScale(lua_State* tolua_S) if (argc == 1) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.CCBReader:setResolutionScale"); if(!ok) return 0; cocosbuilder::CCBReader::setResolutionScale(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "setResolutionScale",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.CCBReader:setResolutionScale",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -16447,7 +16447,7 @@ int lua_cocos2dx_extension_CCBReader_constructor(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "CCBReader",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:CCBReader",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.cpp index e6a4da2f3c..c4b13b740f 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.cpp @@ -6,860 +6,6 @@ -int lua_cocos2dx_physics_PhysicsWorld_getGravity(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getGravity'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::Vec2 ret = cobj->getGravity(); - vec2_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGravity",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getGravity'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_getAllBodies(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getAllBodies'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - const cocos2d::Vector& ret = cobj->getAllBodies(); - ccvector_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAllBodies",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getAllBodies'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_setGravity(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_setGravity'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::Vec2 arg0; - - ok &= luaval_to_vec2(tolua_S, 2, &arg0); - if(!ok) - return 0; - cobj->setGravity(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGravity",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_setGravity'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_getSpeed(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getSpeed'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - double ret = cobj->getSpeed(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSpeed",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getSpeed'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_removeBody(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* cobj = nullptr; - bool ok = true; -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_removeBody'", nullptr); - return 0; - } -#endif - argc = lua_gettop(tolua_S)-1; - do{ - if (argc == 1) { - int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - - if (!ok) { break; } - cobj->removeBody(arg0); - return 0; - } - }while(0); - ok = true; - do{ - if (argc == 1) { - cocos2d::PhysicsBody* arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsBody",&arg0); - - if (!ok) { break; } - cobj->removeBody(arg0); - return 0; - } - }while(0); - ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeBody",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_removeBody'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_removeJoint(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_removeJoint'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::PhysicsJoint* arg0; - - ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsJoint",&arg0); - if(!ok) - return 0; - cobj->removeJoint(arg0); - return 0; - } - if (argc == 2) - { - cocos2d::PhysicsJoint* arg0; - bool arg1; - - ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsJoint",&arg0); - - ok &= luaval_to_boolean(tolua_S, 3,&arg1); - if(!ok) - return 0; - cobj->removeJoint(arg0, arg1); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeJoint",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_removeJoint'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_getUpdateRate(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getUpdateRate'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - int ret = cobj->getUpdateRate(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getUpdateRate",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getUpdateRate'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_setSpeed(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_setSpeed'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - double arg0; - - ok &= luaval_to_number(tolua_S, 2,&arg0); - if(!ok) - return 0; - cobj->setSpeed(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSpeed",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_setSpeed'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_getShapes(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getShapes'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::Vec2 arg0; - - ok &= luaval_to_vec2(tolua_S, 2, &arg0); - if(!ok) - return 0; - cocos2d::Vector ret = cobj->getShapes(arg0); - ccvector_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getShapes",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getShapes'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_removeAllJoints(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_removeAllJoints'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cobj->removeAllJoints(); - return 0; - } - if (argc == 1) - { - bool arg0; - - ok &= luaval_to_boolean(tolua_S, 2,&arg0); - if(!ok) - return 0; - cobj->removeAllJoints(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllJoints",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_removeAllJoints'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_getShape(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getShape'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::Vec2 arg0; - - ok &= luaval_to_vec2(tolua_S, 2, &arg0); - if(!ok) - return 0; - cocos2d::PhysicsShape* ret = cobj->getShape(arg0); - object_to_luaval(tolua_S, "cc.PhysicsShape",(cocos2d::PhysicsShape*)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getShape",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getShape'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_removeAllBodies(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_removeAllBodies'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cobj->removeAllBodies(); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllBodies",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_removeAllBodies'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_getDebugDrawMask(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getDebugDrawMask'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - int ret = cobj->getDebugDrawMask(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDebugDrawMask",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getDebugDrawMask'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_setDebugDrawMask(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_setDebugDrawMask'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - int arg0; - - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - if(!ok) - return 0; - cobj->setDebugDrawMask(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDebugDrawMask",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_setDebugDrawMask'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_getBody(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getBody'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - int arg0; - - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - if(!ok) - return 0; - cocos2d::PhysicsBody* ret = cobj->getBody(arg0); - object_to_luaval(tolua_S, "cc.PhysicsBody",(cocos2d::PhysicsBody*)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBody",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getBody'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_setUpdateRate(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_setUpdateRate'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - int arg0; - - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - if(!ok) - return 0; - cobj->setUpdateRate(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUpdateRate",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_setUpdateRate'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_addJoint(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_addJoint'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::PhysicsJoint* arg0; - - ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsJoint",&arg0); - if(!ok) - return 0; - cobj->addJoint(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addJoint",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_addJoint'.",&tolua_err); -#endif - - return 0; -} -static int lua_cocos2dx_physics_PhysicsWorld_finalize(lua_State* tolua_S) -{ - printf("luabindings: finalizing LUA object (PhysicsWorld)"); - return 0; -} - -int lua_register_cocos2dx_physics_PhysicsWorld(lua_State* tolua_S) -{ - tolua_usertype(tolua_S,"cc.PhysicsWorld"); - tolua_cclass(tolua_S,"PhysicsWorld","cc.PhysicsWorld","",nullptr); - - tolua_beginmodule(tolua_S,"PhysicsWorld"); - tolua_function(tolua_S,"getGravity",lua_cocos2dx_physics_PhysicsWorld_getGravity); - tolua_function(tolua_S,"getAllBodies",lua_cocos2dx_physics_PhysicsWorld_getAllBodies); - tolua_function(tolua_S,"setGravity",lua_cocos2dx_physics_PhysicsWorld_setGravity); - tolua_function(tolua_S,"getSpeed",lua_cocos2dx_physics_PhysicsWorld_getSpeed); - tolua_function(tolua_S,"removeBody",lua_cocos2dx_physics_PhysicsWorld_removeBody); - tolua_function(tolua_S,"removeJoint",lua_cocos2dx_physics_PhysicsWorld_removeJoint); - tolua_function(tolua_S,"getUpdateRate",lua_cocos2dx_physics_PhysicsWorld_getUpdateRate); - tolua_function(tolua_S,"setSpeed",lua_cocos2dx_physics_PhysicsWorld_setSpeed); - tolua_function(tolua_S,"getShapes",lua_cocos2dx_physics_PhysicsWorld_getShapes); - tolua_function(tolua_S,"removeAllJoints",lua_cocos2dx_physics_PhysicsWorld_removeAllJoints); - tolua_function(tolua_S,"getShape",lua_cocos2dx_physics_PhysicsWorld_getShape); - tolua_function(tolua_S,"removeAllBodies",lua_cocos2dx_physics_PhysicsWorld_removeAllBodies); - tolua_function(tolua_S,"getDebugDrawMask",lua_cocos2dx_physics_PhysicsWorld_getDebugDrawMask); - tolua_function(tolua_S,"setDebugDrawMask",lua_cocos2dx_physics_PhysicsWorld_setDebugDrawMask); - tolua_function(tolua_S,"getBody",lua_cocos2dx_physics_PhysicsWorld_getBody); - tolua_function(tolua_S,"setUpdateRate",lua_cocos2dx_physics_PhysicsWorld_setUpdateRate); - tolua_function(tolua_S,"addJoint",lua_cocos2dx_physics_PhysicsWorld_addJoint); - tolua_endmodule(tolua_S); - std::string typeName = typeid(cocos2d::PhysicsWorld).name(); - g_luaType[typeName] = "cc.PhysicsWorld"; - g_typeCast["PhysicsWorld"] = "cc.PhysicsWorld"; - return 1; -} - -static int lua_cocos2dx_physics_PhysicsDebugDraw_finalize(lua_State* tolua_S) -{ - printf("luabindings: finalizing LUA object (PhysicsDebugDraw)"); - return 0; -} - -int lua_register_cocos2dx_physics_PhysicsDebugDraw(lua_State* tolua_S) -{ - tolua_usertype(tolua_S,"cc.PhysicsDebugDraw"); - tolua_cclass(tolua_S,"PhysicsDebugDraw","cc.PhysicsDebugDraw","",nullptr); - - tolua_beginmodule(tolua_S,"PhysicsDebugDraw"); - tolua_endmodule(tolua_S); - std::string typeName = typeid(cocos2d::PhysicsDebugDraw).name(); - g_luaType[typeName] = "cc.PhysicsDebugDraw"; - g_typeCast["PhysicsDebugDraw"] = "cc.PhysicsDebugDraw"; - return 1; -} - int lua_cocos2dx_physics_PhysicsShape_getFriction(lua_State* tolua_S) { int argc = 0; @@ -894,7 +40,7 @@ int lua_cocos2dx_physics_PhysicsShape_getFriction(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFriction",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:getFriction",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -934,13 +80,13 @@ int lua_cocos2dx_physics_PhysicsShape_setGroup(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsShape:setGroup"); if(!ok) return 0; cobj->setGroup(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGroup",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:setGroup",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -980,13 +126,13 @@ int lua_cocos2dx_physics_PhysicsShape_setDensity(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsShape:setDensity"); if(!ok) return 0; cobj->setDensity(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDensity",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:setDensity",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1030,7 +176,7 @@ int lua_cocos2dx_physics_PhysicsShape_getMass(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMass",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:getMass",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1074,7 +220,7 @@ int lua_cocos2dx_physics_PhysicsShape_getMaterial(lua_State* tolua_S) physics_material_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMaterial",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:getMaterial",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1118,7 +264,7 @@ int lua_cocos2dx_physics_PhysicsShape_getCollisionBitmask(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCollisionBitmask",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:getCollisionBitmask",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1162,7 +308,7 @@ int lua_cocos2dx_physics_PhysicsShape_getArea(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getArea",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:getArea",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1202,13 +348,13 @@ int lua_cocos2dx_physics_PhysicsShape_setCategoryBitmask(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsShape:setCategoryBitmask"); if(!ok) return 0; cobj->setCategoryBitmask(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCategoryBitmask",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:setCategoryBitmask",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1252,7 +398,7 @@ int lua_cocos2dx_physics_PhysicsShape_getGroup(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGroup",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:getGroup",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1292,13 +438,13 @@ int lua_cocos2dx_physics_PhysicsShape_setMoment(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsShape:setMoment"); if(!ok) return 0; cobj->setMoment(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMoment",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:setMoment",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1338,14 +484,14 @@ int lua_cocos2dx_physics_PhysicsShape_containsPoint(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsShape:containsPoint"); if(!ok) return 0; bool ret = cobj->containsPoint(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "containsPoint",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:containsPoint",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1389,7 +535,7 @@ int lua_cocos2dx_physics_PhysicsShape_getCategoryBitmask(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCategoryBitmask",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:getCategoryBitmask",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1433,7 +579,7 @@ int lua_cocos2dx_physics_PhysicsShape_getType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:getType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1477,7 +623,7 @@ int lua_cocos2dx_physics_PhysicsShape_getContactTestBitmask(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getContactTestBitmask",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:getContactTestBitmask",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1521,7 +667,7 @@ int lua_cocos2dx_physics_PhysicsShape_getCenter(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCenter",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:getCenter",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1565,7 +711,7 @@ int lua_cocos2dx_physics_PhysicsShape_getDensity(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDensity",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:getDensity",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1605,13 +751,13 @@ int lua_cocos2dx_physics_PhysicsShape_setMass(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsShape:setMass"); if(!ok) return 0; cobj->setMass(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMass",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:setMass",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1655,7 +801,7 @@ int lua_cocos2dx_physics_PhysicsShape_getTag(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTag",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:getTag",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1699,7 +845,7 @@ int lua_cocos2dx_physics_PhysicsShape_calculateDefaultMoment(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "calculateDefaultMoment",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:calculateDefaultMoment",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1739,13 +885,13 @@ int lua_cocos2dx_physics_PhysicsShape_setCollisionBitmask(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsShape:setCollisionBitmask"); if(!ok) return 0; cobj->setCollisionBitmask(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCollisionBitmask",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:setCollisionBitmask",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1789,7 +935,7 @@ int lua_cocos2dx_physics_PhysicsShape_getMoment(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMoment",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:getMoment",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1833,7 +979,7 @@ int lua_cocos2dx_physics_PhysicsShape_getOffset(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOffset",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:getOffset",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1877,7 +1023,7 @@ int lua_cocos2dx_physics_PhysicsShape_getRestitution(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRestitution",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:getRestitution",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1917,13 +1063,13 @@ int lua_cocos2dx_physics_PhysicsShape_setFriction(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsShape:setFriction"); if(!ok) return 0; cobj->setFriction(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFriction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:setFriction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1963,13 +1109,13 @@ int lua_cocos2dx_physics_PhysicsShape_setMaterial(lua_State* tolua_S) { cocos2d::PhysicsMaterial arg0; - ok &= luaval_to_physics_material(tolua_S, 2, &arg0); + ok &= luaval_to_physics_material(tolua_S, 2, &arg0, "cc.PhysicsShape:setMaterial"); if(!ok) return 0; cobj->setMaterial(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMaterial",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:setMaterial",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2009,13 +1155,13 @@ int lua_cocos2dx_physics_PhysicsShape_setTag(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsShape:setTag"); if(!ok) return 0; cobj->setTag(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:setTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2055,13 +1201,13 @@ int lua_cocos2dx_physics_PhysicsShape_setContactTestBitmask(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsShape:setContactTestBitmask"); if(!ok) return 0; cobj->setContactTestBitmask(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setContactTestBitmask",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:setContactTestBitmask",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2101,13 +1247,13 @@ int lua_cocos2dx_physics_PhysicsShape_setRestitution(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsShape:setRestitution"); if(!ok) return 0; cobj->setRestitution(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRestitution",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:setRestitution",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2151,7 +1297,7 @@ int lua_cocos2dx_physics_PhysicsShape_getBody(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.PhysicsBody",(cocos2d::PhysicsBody*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBody",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:getBody",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2243,7 +1389,7 @@ int lua_cocos2dx_physics_PhysicsShapeCircle_getRadius(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRadius",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShapeCircle:getRadius",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2271,7 +1417,7 @@ int lua_cocos2dx_physics_PhysicsShapeCircle_create(lua_State* tolua_S) if (argc == 1) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsShapeCircle:create"); if(!ok) return 0; cocos2d::PhysicsShapeCircle* ret = cocos2d::PhysicsShapeCircle::create(arg0); @@ -2282,8 +1428,8 @@ int lua_cocos2dx_physics_PhysicsShapeCircle_create(lua_State* tolua_S) { double arg0; cocos2d::PhysicsMaterial arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg1); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsShapeCircle:create"); + ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsShapeCircle:create"); if(!ok) return 0; cocos2d::PhysicsShapeCircle* ret = cocos2d::PhysicsShapeCircle::create(arg0, arg1); @@ -2295,16 +1441,16 @@ int lua_cocos2dx_physics_PhysicsShapeCircle_create(lua_State* tolua_S) double arg0; cocos2d::PhysicsMaterial arg1; cocos2d::Vec2 arg2; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg1); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsShapeCircle:create"); + ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsShapeCircle:create"); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.PhysicsShapeCircle:create"); if(!ok) return 0; cocos2d::PhysicsShapeCircle* ret = cocos2d::PhysicsShapeCircle::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.PhysicsShapeCircle",(cocos2d::PhysicsShapeCircle*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsShapeCircle:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -2330,14 +1476,14 @@ int lua_cocos2dx_physics_PhysicsShapeCircle_calculateArea(lua_State* tolua_S) if (argc == 1) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsShapeCircle:calculateArea"); if(!ok) return 0; double ret = cocos2d::PhysicsShapeCircle::calculateArea(arg0); tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "calculateArea",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsShapeCircle:calculateArea",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -2364,8 +1510,8 @@ int lua_cocos2dx_physics_PhysicsShapeCircle_calculateMoment(lua_State* tolua_S) { double arg0; double arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsShapeCircle:calculateMoment"); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.PhysicsShapeCircle:calculateMoment"); if(!ok) return 0; double ret = cocos2d::PhysicsShapeCircle::calculateMoment(arg0, arg1); @@ -2377,16 +1523,16 @@ int lua_cocos2dx_physics_PhysicsShapeCircle_calculateMoment(lua_State* tolua_S) double arg0; double arg1; cocos2d::Vec2 arg2; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_number(tolua_S, 3,&arg1); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsShapeCircle:calculateMoment"); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.PhysicsShapeCircle:calculateMoment"); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.PhysicsShapeCircle:calculateMoment"); if(!ok) return 0; double ret = cocos2d::PhysicsShapeCircle::calculateMoment(arg0, arg1, arg2); tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "calculateMoment",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsShapeCircle:calculateMoment",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -2451,7 +1597,7 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_getPointsCount(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPointsCount",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShapePolygon:getPointsCount",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2491,14 +1637,14 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_getPoint(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsShapePolygon:getPoint"); if(!ok) return 0; cocos2d::Vec2 ret = cobj->getPoint(arg0); vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPoint",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShapePolygon:getPoint",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2563,7 +1709,7 @@ int lua_cocos2dx_physics_PhysicsShapeBox_getSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShapeBox:getSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2591,7 +1737,7 @@ int lua_cocos2dx_physics_PhysicsShapeBox_create(lua_State* tolua_S) if (argc == 1) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsShapeBox:create"); if(!ok) return 0; cocos2d::PhysicsShapeBox* ret = cocos2d::PhysicsShapeBox::create(arg0); @@ -2602,8 +1748,8 @@ int lua_cocos2dx_physics_PhysicsShapeBox_create(lua_State* tolua_S) { cocos2d::Size arg0; cocos2d::PhysicsMaterial arg1; - ok &= luaval_to_size(tolua_S, 2, &arg0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg1); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsShapeBox:create"); + ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsShapeBox:create"); if(!ok) return 0; cocos2d::PhysicsShapeBox* ret = cocos2d::PhysicsShapeBox::create(arg0, arg1); @@ -2615,16 +1761,16 @@ int lua_cocos2dx_physics_PhysicsShapeBox_create(lua_State* tolua_S) cocos2d::Size arg0; cocos2d::PhysicsMaterial arg1; cocos2d::Vec2 arg2; - ok &= luaval_to_size(tolua_S, 2, &arg0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg1); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsShapeBox:create"); + ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsShapeBox:create"); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.PhysicsShapeBox:create"); if(!ok) return 0; cocos2d::PhysicsShapeBox* ret = cocos2d::PhysicsShapeBox::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.PhysicsShapeBox",(cocos2d::PhysicsShapeBox*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsShapeBox:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -2687,7 +1833,7 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeSegment_getPointB(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPointB",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShapeEdgeSegment:getPointB",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2731,7 +1877,7 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeSegment_getPointA(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPointA",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShapeEdgeSegment:getPointA",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2760,8 +1906,8 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeSegment_create(lua_State* tolua_S) { cocos2d::Vec2 arg0; cocos2d::Vec2 arg1; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsShapeEdgeSegment:create"); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.PhysicsShapeEdgeSegment:create"); if(!ok) return 0; cocos2d::PhysicsShapeEdgeSegment* ret = cocos2d::PhysicsShapeEdgeSegment::create(arg0, arg1); @@ -2773,9 +1919,9 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeSegment_create(lua_State* tolua_S) cocos2d::Vec2 arg0; cocos2d::Vec2 arg1; cocos2d::PhysicsMaterial arg2; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); - ok &= luaval_to_physics_material(tolua_S, 4, &arg2); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsShapeEdgeSegment:create"); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.PhysicsShapeEdgeSegment:create"); + ok &= luaval_to_physics_material(tolua_S, 4, &arg2, "cc.PhysicsShapeEdgeSegment:create"); if(!ok) return 0; cocos2d::PhysicsShapeEdgeSegment* ret = cocos2d::PhysicsShapeEdgeSegment::create(arg0, arg1, arg2); @@ -2788,17 +1934,17 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeSegment_create(lua_State* tolua_S) cocos2d::Vec2 arg1; cocos2d::PhysicsMaterial arg2; double arg3; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); - ok &= luaval_to_physics_material(tolua_S, 4, &arg2); - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsShapeEdgeSegment:create"); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.PhysicsShapeEdgeSegment:create"); + ok &= luaval_to_physics_material(tolua_S, 4, &arg2, "cc.PhysicsShapeEdgeSegment:create"); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.PhysicsShapeEdgeSegment:create"); if(!ok) return 0; cocos2d::PhysicsShapeEdgeSegment* ret = cocos2d::PhysicsShapeEdgeSegment::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.PhysicsShapeEdgeSegment",(cocos2d::PhysicsShapeEdgeSegment*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsShapeEdgeSegment:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -2862,7 +2008,7 @@ int lua_cocos2dx_physics_PhysicsShapeEdgePolygon_getPointsCount(lua_State* tolua tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPointsCount",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShapeEdgePolygon:getPointsCount",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2910,7 +2056,7 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeBox_create(lua_State* tolua_S) if (argc == 1) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsShapeEdgeBox:create"); if(!ok) return 0; cocos2d::PhysicsShapeEdgeBox* ret = cocos2d::PhysicsShapeEdgeBox::create(arg0); @@ -2921,8 +2067,8 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeBox_create(lua_State* tolua_S) { cocos2d::Size arg0; cocos2d::PhysicsMaterial arg1; - ok &= luaval_to_size(tolua_S, 2, &arg0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg1); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsShapeEdgeBox:create"); + ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsShapeEdgeBox:create"); if(!ok) return 0; cocos2d::PhysicsShapeEdgeBox* ret = cocos2d::PhysicsShapeEdgeBox::create(arg0, arg1); @@ -2934,9 +2080,9 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeBox_create(lua_State* tolua_S) cocos2d::Size arg0; cocos2d::PhysicsMaterial arg1; double arg2; - ok &= luaval_to_size(tolua_S, 2, &arg0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsShapeEdgeBox:create"); + ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsShapeEdgeBox:create"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.PhysicsShapeEdgeBox:create"); if(!ok) return 0; cocos2d::PhysicsShapeEdgeBox* ret = cocos2d::PhysicsShapeEdgeBox::create(arg0, arg1, arg2); @@ -2949,17 +2095,17 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeBox_create(lua_State* tolua_S) cocos2d::PhysicsMaterial arg1; double arg2; cocos2d::Vec2 arg3; - ok &= luaval_to_size(tolua_S, 2, &arg0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); - ok &= luaval_to_vec2(tolua_S, 5, &arg3); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsShapeEdgeBox:create"); + ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsShapeEdgeBox:create"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.PhysicsShapeEdgeBox:create"); + ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.PhysicsShapeEdgeBox:create"); if(!ok) return 0; cocos2d::PhysicsShapeEdgeBox* ret = cocos2d::PhysicsShapeEdgeBox::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.PhysicsShapeEdgeBox",(cocos2d::PhysicsShapeEdgeBox*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsShapeEdgeBox:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -3021,7 +2167,7 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeChain_getPointsCount(lua_State* tolua_S tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPointsCount",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShapeEdgeChain:getPointsCount",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3085,7 +2231,7 @@ int lua_cocos2dx_physics_PhysicsBody_isGravityEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isGravityEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:isGravityEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3128,7 +2274,7 @@ int lua_cocos2dx_physics_PhysicsBody_resetForces(lua_State* tolua_S) cobj->resetForces(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resetForces",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:resetForces",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3172,7 +2318,7 @@ int lua_cocos2dx_physics_PhysicsBody_getVelocityLimit(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVelocityLimit",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getVelocityLimit",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3212,13 +2358,13 @@ int lua_cocos2dx_physics_PhysicsBody_setGroup(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsBody:setGroup"); if(!ok) return 0; cobj->setGroup(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGroup",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setGroup",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3262,7 +2408,7 @@ int lua_cocos2dx_physics_PhysicsBody_getMass(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMass",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getMass",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3306,7 +2452,7 @@ int lua_cocos2dx_physics_PhysicsBody_getCollisionBitmask(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCollisionBitmask",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getCollisionBitmask",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3350,7 +2496,7 @@ int lua_cocos2dx_physics_PhysicsBody_getRotationOffset(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRotationOffset",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getRotationOffset",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3394,7 +2540,7 @@ int lua_cocos2dx_physics_PhysicsBody_getRotation(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRotation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getRotation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3438,7 +2584,7 @@ int lua_cocos2dx_physics_PhysicsBody_getMoment(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMoment",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getMoment",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3472,11 +2618,11 @@ int lua_cocos2dx_physics_PhysicsBody_applyImpulse(lua_State* tolua_S) do{ if (argc == 2) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:applyImpulse"); if (!ok) { break; } cocos2d::Vec2 arg1; - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.PhysicsBody:applyImpulse"); if (!ok) { break; } cobj->applyImpulse(arg0, arg1); @@ -3487,7 +2633,7 @@ int lua_cocos2dx_physics_PhysicsBody_applyImpulse(lua_State* tolua_S) do{ if (argc == 1) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:applyImpulse"); if (!ok) { break; } cobj->applyImpulse(arg0); @@ -3495,7 +2641,7 @@ int lua_cocos2dx_physics_PhysicsBody_applyImpulse(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "applyImpulse",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:applyImpulse",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3535,13 +2681,13 @@ int lua_cocos2dx_physics_PhysicsBody_setRotationOffset(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsBody:setRotationOffset"); if(!ok) return 0; cobj->setRotationOffset(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRotationOffset",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setRotationOffset",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3575,11 +2721,11 @@ int lua_cocos2dx_physics_PhysicsBody_applyForce(lua_State* tolua_S) do{ if (argc == 2) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:applyForce"); if (!ok) { break; } cocos2d::Vec2 arg1; - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.PhysicsBody:applyForce"); if (!ok) { break; } cobj->applyForce(arg0, arg1); @@ -3590,7 +2736,7 @@ int lua_cocos2dx_physics_PhysicsBody_applyForce(lua_State* tolua_S) do{ if (argc == 1) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:applyForce"); if (!ok) { break; } cobj->applyForce(arg0); @@ -3598,7 +2744,7 @@ int lua_cocos2dx_physics_PhysicsBody_applyForce(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "applyForce",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:applyForce",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3652,14 +2798,14 @@ int lua_cocos2dx_physics_PhysicsBody_addShape(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsShape",&arg0); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.PhysicsBody:addShape"); if(!ok) return 0; cocos2d::PhysicsShape* ret = cobj->addShape(arg0, arg1); object_to_luaval(tolua_S, "cc.PhysicsShape",(cocos2d::PhysicsShape*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addShape",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:addShape",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3699,13 +2845,13 @@ int lua_cocos2dx_physics_PhysicsBody_applyTorque(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsBody:applyTorque"); if(!ok) return 0; cobj->applyTorque(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "applyTorque",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:applyTorque",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3749,7 +2895,7 @@ int lua_cocos2dx_physics_PhysicsBody_getAngularVelocityLimit(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAngularVelocityLimit",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getAngularVelocityLimit",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3789,13 +2935,13 @@ int lua_cocos2dx_physics_PhysicsBody_setAngularVelocityLimit(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsBody:setAngularVelocityLimit"); if(!ok) return 0; cobj->setAngularVelocityLimit(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAngularVelocityLimit",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setAngularVelocityLimit",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3839,7 +2985,7 @@ int lua_cocos2dx_physics_PhysicsBody_getVelocity(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVelocity",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getVelocity",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3883,7 +3029,7 @@ int lua_cocos2dx_physics_PhysicsBody_getLinearDamping(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLinearDamping",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getLinearDamping",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3930,13 +3076,13 @@ int lua_cocos2dx_physics_PhysicsBody_removeAllShapes(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.PhysicsBody:removeAllShapes"); if(!ok) return 0; cobj->removeAllShapes(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllShapes",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:removeAllShapes",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3976,13 +3122,13 @@ int lua_cocos2dx_physics_PhysicsBody_setAngularDamping(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsBody:setAngularDamping"); if(!ok) return 0; cobj->setAngularDamping(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAngularDamping",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setAngularDamping",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4022,13 +3168,13 @@ int lua_cocos2dx_physics_PhysicsBody_setVelocityLimit(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsBody:setVelocityLimit"); if(!ok) return 0; cobj->setVelocityLimit(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVelocityLimit",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setVelocityLimit",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4068,13 +3214,13 @@ int lua_cocos2dx_physics_PhysicsBody_setResting(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.PhysicsBody:setResting"); if(!ok) return 0; cobj->setResting(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setResting",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setResting",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4118,7 +3264,7 @@ int lua_cocos2dx_physics_PhysicsBody_getPositionOffset(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPositionOffset",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getPositionOffset",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4158,13 +3304,13 @@ int lua_cocos2dx_physics_PhysicsBody_setCategoryBitmask(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsBody:setCategoryBitmask"); if(!ok) return 0; cobj->setCategoryBitmask(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCategoryBitmask",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setCategoryBitmask",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4208,7 +3354,7 @@ int lua_cocos2dx_physics_PhysicsBody_getWorld(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.PhysicsWorld",(cocos2d::PhysicsWorld*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getWorld",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getWorld",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4252,7 +3398,7 @@ int lua_cocos2dx_physics_PhysicsBody_getAngularVelocity(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAngularVelocity",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getAngularVelocity",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4296,7 +3442,7 @@ int lua_cocos2dx_physics_PhysicsBody_getPosition(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPosition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getPosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4336,13 +3482,13 @@ int lua_cocos2dx_physics_PhysicsBody_setEnable(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.PhysicsBody:setEnable"); if(!ok) return 0; cobj->setEnable(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEnable",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setEnable",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4382,13 +3528,13 @@ int lua_cocos2dx_physics_PhysicsBody_setGravityEnable(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.PhysicsBody:setGravityEnable"); if(!ok) return 0; cobj->setGravityEnable(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGravityEnable",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setGravityEnable",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4432,7 +3578,7 @@ int lua_cocos2dx_physics_PhysicsBody_getGroup(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGroup",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getGroup",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4472,13 +3618,13 @@ int lua_cocos2dx_physics_PhysicsBody_setMoment(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsBody:setMoment"); if(!ok) return 0; cobj->setMoment(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMoment",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setMoment",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4522,7 +3668,7 @@ int lua_cocos2dx_physics_PhysicsBody_getTag(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTag",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getTag",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4562,14 +3708,14 @@ int lua_cocos2dx_physics_PhysicsBody_local2World(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:local2World"); if(!ok) return 0; cocos2d::Vec2 ret = cobj->local2World(arg0); vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "local2World",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:local2World",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4613,7 +3759,7 @@ int lua_cocos2dx_physics_PhysicsBody_getCategoryBitmask(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCategoryBitmask",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getCategoryBitmask",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4653,13 +3799,13 @@ int lua_cocos2dx_physics_PhysicsBody_setDynamic(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.PhysicsBody:setDynamic"); if(!ok) return 0; cobj->setDynamic(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDynamic",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setDynamic",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4703,7 +3849,7 @@ int lua_cocos2dx_physics_PhysicsBody_getFirstShape(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.PhysicsShape",(cocos2d::PhysicsShape*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFirstShape",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getFirstShape",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4747,7 +3893,7 @@ int lua_cocos2dx_physics_PhysicsBody_getShapes(lua_State* tolua_S) ccvector_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getShapes",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getShapes",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4791,7 +3937,7 @@ int lua_cocos2dx_physics_PhysicsBody_getContactTestBitmask(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getContactTestBitmask",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getContactTestBitmask",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4831,13 +3977,13 @@ int lua_cocos2dx_physics_PhysicsBody_setAngularVelocity(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsBody:setAngularVelocity"); if(!ok) return 0; cobj->setAngularVelocity(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAngularVelocity",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setAngularVelocity",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4877,14 +4023,14 @@ int lua_cocos2dx_physics_PhysicsBody_world2Local(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:world2Local"); if(!ok) return 0; cocos2d::Vec2 ret = cobj->world2Local(arg0); vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "world2Local",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:world2Local",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4928,7 +4074,7 @@ int lua_cocos2dx_physics_PhysicsBody_isEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:isEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4962,7 +4108,7 @@ int lua_cocos2dx_physics_PhysicsBody_removeShape(lua_State* tolua_S) do{ if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsBody:removeShape"); if (!ok) { break; } cobj->removeShape(arg0); @@ -4973,11 +4119,11 @@ int lua_cocos2dx_physics_PhysicsBody_removeShape(lua_State* tolua_S) do{ if (argc == 2) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsBody:removeShape"); if (!ok) { break; } bool arg1; - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.PhysicsBody:removeShape"); if (!ok) { break; } cobj->removeShape(arg0, arg1); @@ -5003,7 +4149,7 @@ int lua_cocos2dx_physics_PhysicsBody_removeShape(lua_State* tolua_S) if (!ok) { break; } bool arg1; - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.PhysicsBody:removeShape"); if (!ok) { break; } cobj->removeShape(arg0, arg1); @@ -5011,7 +4157,7 @@ int lua_cocos2dx_physics_PhysicsBody_removeShape(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeShape",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:removeShape",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5051,13 +4197,13 @@ int lua_cocos2dx_physics_PhysicsBody_setMass(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsBody:setMass"); if(!ok) return 0; cobj->setMass(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMass",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setMass",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5097,13 +4243,13 @@ int lua_cocos2dx_physics_PhysicsBody_addMoment(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsBody:addMoment"); if(!ok) return 0; cobj->addMoment(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addMoment",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:addMoment",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5143,13 +4289,13 @@ int lua_cocos2dx_physics_PhysicsBody_setVelocity(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:setVelocity"); if(!ok) return 0; cobj->setVelocity(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVelocity",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setVelocity",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5189,13 +4335,13 @@ int lua_cocos2dx_physics_PhysicsBody_setLinearDamping(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsBody:setLinearDamping"); if(!ok) return 0; cobj->setLinearDamping(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLinearDamping",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setLinearDamping",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5235,13 +4381,13 @@ int lua_cocos2dx_physics_PhysicsBody_setCollisionBitmask(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsBody:setCollisionBitmask"); if(!ok) return 0; cobj->setCollisionBitmask(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCollisionBitmask",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setCollisionBitmask",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5281,13 +4427,13 @@ int lua_cocos2dx_physics_PhysicsBody_setPositionOffset(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:setPositionOffset"); if(!ok) return 0; cobj->setPositionOffset(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPositionOffset",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setPositionOffset",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5327,13 +4473,13 @@ int lua_cocos2dx_physics_PhysicsBody_setRotationEnable(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.PhysicsBody:setRotationEnable"); if(!ok) return 0; cobj->setRotationEnable(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRotationEnable",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setRotationEnable",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5377,7 +4523,7 @@ int lua_cocos2dx_physics_PhysicsBody_isRotationEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isRotationEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:isRotationEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5421,7 +4567,7 @@ int lua_cocos2dx_physics_PhysicsBody_getAngularDamping(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAngularDamping",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getAngularDamping",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5461,14 +4607,14 @@ int lua_cocos2dx_physics_PhysicsBody_getVelocityAtLocalPoint(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:getVelocityAtLocalPoint"); if(!ok) return 0; cocos2d::Vec2 ret = cobj->getVelocityAtLocalPoint(arg0); vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVelocityAtLocalPoint",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getVelocityAtLocalPoint",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5512,7 +4658,7 @@ int lua_cocos2dx_physics_PhysicsBody_isResting(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isResting",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:isResting",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5552,13 +4698,13 @@ int lua_cocos2dx_physics_PhysicsBody_addMass(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsBody:addMass"); if(!ok) return 0; cobj->addMass(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addMass",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:addMass",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5598,14 +4744,14 @@ int lua_cocos2dx_physics_PhysicsBody_getShape(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsBody:getShape"); if(!ok) return 0; cocos2d::PhysicsShape* ret = cobj->getShape(arg0); object_to_luaval(tolua_S, "cc.PhysicsShape",(cocos2d::PhysicsShape*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getShape",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getShape",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5645,13 +4791,13 @@ int lua_cocos2dx_physics_PhysicsBody_setTag(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsBody:setTag"); if(!ok) return 0; cobj->setTag(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5691,14 +4837,14 @@ int lua_cocos2dx_physics_PhysicsBody_getVelocityAtWorldPoint(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:getVelocityAtWorldPoint"); if(!ok) return 0; cocos2d::Vec2 ret = cobj->getVelocityAtWorldPoint(arg0); vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVelocityAtWorldPoint",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getVelocityAtWorldPoint",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5738,13 +4884,13 @@ int lua_cocos2dx_physics_PhysicsBody_setContactTestBitmask(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsBody:setContactTestBitmask"); if(!ok) return 0; cobj->setContactTestBitmask(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setContactTestBitmask",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setContactTestBitmask",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5787,7 +4933,7 @@ int lua_cocos2dx_physics_PhysicsBody_removeFromWorld(lua_State* tolua_S) cobj->removeFromWorld(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeFromWorld",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:removeFromWorld",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5831,7 +4977,7 @@ int lua_cocos2dx_physics_PhysicsBody_isDynamic(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isDynamic",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:isDynamic",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5875,7 +5021,7 @@ int lua_cocos2dx_physics_PhysicsBody_getNode(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getNode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5903,7 +5049,7 @@ int lua_cocos2dx_physics_PhysicsBody_createBox(lua_State* tolua_S) if (argc == 1) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsBody:createBox"); if(!ok) return 0; cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createBox(arg0); @@ -5914,8 +5060,8 @@ int lua_cocos2dx_physics_PhysicsBody_createBox(lua_State* tolua_S) { cocos2d::Size arg0; cocos2d::PhysicsMaterial arg1; - ok &= luaval_to_size(tolua_S, 2, &arg0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg1); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsBody:createBox"); + ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsBody:createBox"); if(!ok) return 0; cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createBox(arg0, arg1); @@ -5927,16 +5073,16 @@ int lua_cocos2dx_physics_PhysicsBody_createBox(lua_State* tolua_S) cocos2d::Size arg0; cocos2d::PhysicsMaterial arg1; cocos2d::Vec2 arg2; - ok &= luaval_to_size(tolua_S, 2, &arg0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg1); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsBody:createBox"); + ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsBody:createBox"); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.PhysicsBody:createBox"); if(!ok) return 0; cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createBox(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.PhysicsBody",(cocos2d::PhysicsBody*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createBox",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsBody:createBox",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -5963,8 +5109,8 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeSegment(lua_State* tolua_S) { cocos2d::Vec2 arg0; cocos2d::Vec2 arg1; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:createEdgeSegment"); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.PhysicsBody:createEdgeSegment"); if(!ok) return 0; cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createEdgeSegment(arg0, arg1); @@ -5976,9 +5122,9 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeSegment(lua_State* tolua_S) cocos2d::Vec2 arg0; cocos2d::Vec2 arg1; cocos2d::PhysicsMaterial arg2; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); - ok &= luaval_to_physics_material(tolua_S, 4, &arg2); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:createEdgeSegment"); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.PhysicsBody:createEdgeSegment"); + ok &= luaval_to_physics_material(tolua_S, 4, &arg2, "cc.PhysicsBody:createEdgeSegment"); if(!ok) return 0; cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createEdgeSegment(arg0, arg1, arg2); @@ -5991,17 +5137,17 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeSegment(lua_State* tolua_S) cocos2d::Vec2 arg1; cocos2d::PhysicsMaterial arg2; double arg3; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); - ok &= luaval_to_physics_material(tolua_S, 4, &arg2); - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:createEdgeSegment"); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.PhysicsBody:createEdgeSegment"); + ok &= luaval_to_physics_material(tolua_S, 4, &arg2, "cc.PhysicsBody:createEdgeSegment"); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.PhysicsBody:createEdgeSegment"); if(!ok) return 0; cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createEdgeSegment(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.PhysicsBody",(cocos2d::PhysicsBody*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createEdgeSegment",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsBody:createEdgeSegment",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -6028,7 +5174,7 @@ int lua_cocos2dx_physics_PhysicsBody_create(lua_State* tolua_S) if (argc == 1) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsBody:create"); if (!ok) { break; } cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::create(arg0); object_to_luaval(tolua_S, "cc.PhysicsBody",(cocos2d::PhysicsBody*)ret); @@ -6051,10 +5197,10 @@ int lua_cocos2dx_physics_PhysicsBody_create(lua_State* tolua_S) if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsBody:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.PhysicsBody:create"); if (!ok) { break; } cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::create(arg0, arg1); object_to_luaval(tolua_S, "cc.PhysicsBody",(cocos2d::PhysicsBody*)ret); @@ -6062,7 +5208,7 @@ int lua_cocos2dx_physics_PhysicsBody_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.PhysicsBody:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -6088,7 +5234,7 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeBox(lua_State* tolua_S) if (argc == 1) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsBody:createEdgeBox"); if(!ok) return 0; cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createEdgeBox(arg0); @@ -6099,8 +5245,8 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeBox(lua_State* tolua_S) { cocos2d::Size arg0; cocos2d::PhysicsMaterial arg1; - ok &= luaval_to_size(tolua_S, 2, &arg0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg1); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsBody:createEdgeBox"); + ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsBody:createEdgeBox"); if(!ok) return 0; cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createEdgeBox(arg0, arg1); @@ -6112,9 +5258,9 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeBox(lua_State* tolua_S) cocos2d::Size arg0; cocos2d::PhysicsMaterial arg1; double arg2; - ok &= luaval_to_size(tolua_S, 2, &arg0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsBody:createEdgeBox"); + ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsBody:createEdgeBox"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.PhysicsBody:createEdgeBox"); if(!ok) return 0; cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createEdgeBox(arg0, arg1, arg2); @@ -6127,17 +5273,17 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeBox(lua_State* tolua_S) cocos2d::PhysicsMaterial arg1; double arg2; cocos2d::Vec2 arg3; - ok &= luaval_to_size(tolua_S, 2, &arg0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); - ok &= luaval_to_vec2(tolua_S, 5, &arg3); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsBody:createEdgeBox"); + ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsBody:createEdgeBox"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.PhysicsBody:createEdgeBox"); + ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.PhysicsBody:createEdgeBox"); if(!ok) return 0; cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createEdgeBox(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.PhysicsBody",(cocos2d::PhysicsBody*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createEdgeBox",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsBody:createEdgeBox",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -6163,7 +5309,7 @@ int lua_cocos2dx_physics_PhysicsBody_createCircle(lua_State* tolua_S) if (argc == 1) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsBody:createCircle"); if(!ok) return 0; cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createCircle(arg0); @@ -6174,8 +5320,8 @@ int lua_cocos2dx_physics_PhysicsBody_createCircle(lua_State* tolua_S) { double arg0; cocos2d::PhysicsMaterial arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg1); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsBody:createCircle"); + ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsBody:createCircle"); if(!ok) return 0; cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createCircle(arg0, arg1); @@ -6187,16 +5333,16 @@ int lua_cocos2dx_physics_PhysicsBody_createCircle(lua_State* tolua_S) double arg0; cocos2d::PhysicsMaterial arg1; cocos2d::Vec2 arg2; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg1); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsBody:createCircle"); + ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsBody:createCircle"); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.PhysicsBody:createCircle"); if(!ok) return 0; cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createCircle(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.PhysicsBody",(cocos2d::PhysicsBody*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createCircle",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsBody:createCircle",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -6289,6 +5435,860 @@ int lua_register_cocos2dx_physics_PhysicsBody(lua_State* tolua_S) return 1; } +int lua_cocos2dx_physics_PhysicsWorld_getGravity(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getGravity'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Vec2 ret = cobj->getGravity(); + vec2_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:getGravity",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getGravity'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_getAllBodies(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getAllBodies'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + const cocos2d::Vector& ret = cobj->getAllBodies(); + ccvector_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:getAllBodies",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getAllBodies'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_setGravity(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_setGravity'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Vec2 arg0; + + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsWorld:setGravity"); + if(!ok) + return 0; + cobj->setGravity(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:setGravity",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_setGravity'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_getSpeed(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getSpeed'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + double ret = cobj->getSpeed(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:getSpeed",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getSpeed'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_removeBody(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* cobj = nullptr; + bool ok = true; +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_removeBody'", nullptr); + return 0; + } +#endif + argc = lua_gettop(tolua_S)-1; + do{ + if (argc == 1) { + int arg0; + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsWorld:removeBody"); + + if (!ok) { break; } + cobj->removeBody(arg0); + return 0; + } + }while(0); + ok = true; + do{ + if (argc == 1) { + cocos2d::PhysicsBody* arg0; + ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsBody",&arg0); + + if (!ok) { break; } + cobj->removeBody(arg0); + return 0; + } + }while(0); + ok = true; + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:removeBody",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_removeBody'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_removeJoint(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_removeJoint'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::PhysicsJoint* arg0; + + ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsJoint",&arg0); + if(!ok) + return 0; + cobj->removeJoint(arg0); + return 0; + } + if (argc == 2) + { + cocos2d::PhysicsJoint* arg0; + bool arg1; + + ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsJoint",&arg0); + + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.PhysicsWorld:removeJoint"); + if(!ok) + return 0; + cobj->removeJoint(arg0, arg1); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:removeJoint",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_removeJoint'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_getUpdateRate(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getUpdateRate'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + int ret = cobj->getUpdateRate(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:getUpdateRate",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getUpdateRate'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_setSpeed(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_setSpeed'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + double arg0; + + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsWorld:setSpeed"); + if(!ok) + return 0; + cobj->setSpeed(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:setSpeed",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_setSpeed'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_getShapes(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getShapes'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Vec2 arg0; + + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsWorld:getShapes"); + if(!ok) + return 0; + cocos2d::Vector ret = cobj->getShapes(arg0); + ccvector_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:getShapes",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getShapes'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_removeAllJoints(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_removeAllJoints'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->removeAllJoints(); + return 0; + } + if (argc == 1) + { + bool arg0; + + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.PhysicsWorld:removeAllJoints"); + if(!ok) + return 0; + cobj->removeAllJoints(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:removeAllJoints",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_removeAllJoints'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_getShape(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getShape'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Vec2 arg0; + + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsWorld:getShape"); + if(!ok) + return 0; + cocos2d::PhysicsShape* ret = cobj->getShape(arg0); + object_to_luaval(tolua_S, "cc.PhysicsShape",(cocos2d::PhysicsShape*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:getShape",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getShape'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_removeAllBodies(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_removeAllBodies'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->removeAllBodies(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:removeAllBodies",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_removeAllBodies'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_getDebugDrawMask(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getDebugDrawMask'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + int ret = cobj->getDebugDrawMask(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:getDebugDrawMask",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getDebugDrawMask'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_setDebugDrawMask(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_setDebugDrawMask'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + int arg0; + + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsWorld:setDebugDrawMask"); + if(!ok) + return 0; + cobj->setDebugDrawMask(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:setDebugDrawMask",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_setDebugDrawMask'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_getBody(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getBody'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + int arg0; + + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsWorld:getBody"); + if(!ok) + return 0; + cocos2d::PhysicsBody* ret = cobj->getBody(arg0); + object_to_luaval(tolua_S, "cc.PhysicsBody",(cocos2d::PhysicsBody*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:getBody",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getBody'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_setUpdateRate(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_setUpdateRate'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + int arg0; + + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsWorld:setUpdateRate"); + if(!ok) + return 0; + cobj->setUpdateRate(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:setUpdateRate",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_setUpdateRate'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_addJoint(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_addJoint'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::PhysicsJoint* arg0; + + ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsJoint",&arg0); + if(!ok) + return 0; + cobj->addJoint(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:addJoint",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_addJoint'.",&tolua_err); +#endif + + return 0; +} +static int lua_cocos2dx_physics_PhysicsWorld_finalize(lua_State* tolua_S) +{ + printf("luabindings: finalizing LUA object (PhysicsWorld)"); + return 0; +} + +int lua_register_cocos2dx_physics_PhysicsWorld(lua_State* tolua_S) +{ + tolua_usertype(tolua_S,"cc.PhysicsWorld"); + tolua_cclass(tolua_S,"PhysicsWorld","cc.PhysicsWorld","",nullptr); + + tolua_beginmodule(tolua_S,"PhysicsWorld"); + tolua_function(tolua_S,"getGravity",lua_cocos2dx_physics_PhysicsWorld_getGravity); + tolua_function(tolua_S,"getAllBodies",lua_cocos2dx_physics_PhysicsWorld_getAllBodies); + tolua_function(tolua_S,"setGravity",lua_cocos2dx_physics_PhysicsWorld_setGravity); + tolua_function(tolua_S,"getSpeed",lua_cocos2dx_physics_PhysicsWorld_getSpeed); + tolua_function(tolua_S,"removeBody",lua_cocos2dx_physics_PhysicsWorld_removeBody); + tolua_function(tolua_S,"removeJoint",lua_cocos2dx_physics_PhysicsWorld_removeJoint); + tolua_function(tolua_S,"getUpdateRate",lua_cocos2dx_physics_PhysicsWorld_getUpdateRate); + tolua_function(tolua_S,"setSpeed",lua_cocos2dx_physics_PhysicsWorld_setSpeed); + tolua_function(tolua_S,"getShapes",lua_cocos2dx_physics_PhysicsWorld_getShapes); + tolua_function(tolua_S,"removeAllJoints",lua_cocos2dx_physics_PhysicsWorld_removeAllJoints); + tolua_function(tolua_S,"getShape",lua_cocos2dx_physics_PhysicsWorld_getShape); + tolua_function(tolua_S,"removeAllBodies",lua_cocos2dx_physics_PhysicsWorld_removeAllBodies); + tolua_function(tolua_S,"getDebugDrawMask",lua_cocos2dx_physics_PhysicsWorld_getDebugDrawMask); + tolua_function(tolua_S,"setDebugDrawMask",lua_cocos2dx_physics_PhysicsWorld_setDebugDrawMask); + tolua_function(tolua_S,"getBody",lua_cocos2dx_physics_PhysicsWorld_getBody); + tolua_function(tolua_S,"setUpdateRate",lua_cocos2dx_physics_PhysicsWorld_setUpdateRate); + tolua_function(tolua_S,"addJoint",lua_cocos2dx_physics_PhysicsWorld_addJoint); + tolua_endmodule(tolua_S); + std::string typeName = typeid(cocos2d::PhysicsWorld).name(); + g_luaType[typeName] = "cc.PhysicsWorld"; + g_typeCast["PhysicsWorld"] = "cc.PhysicsWorld"; + return 1; +} + +static int lua_cocos2dx_physics_PhysicsDebugDraw_finalize(lua_State* tolua_S) +{ + printf("luabindings: finalizing LUA object (PhysicsDebugDraw)"); + return 0; +} + +int lua_register_cocos2dx_physics_PhysicsDebugDraw(lua_State* tolua_S) +{ + tolua_usertype(tolua_S,"cc.PhysicsDebugDraw"); + tolua_cclass(tolua_S,"PhysicsDebugDraw","cc.PhysicsDebugDraw","",nullptr); + + tolua_beginmodule(tolua_S,"PhysicsDebugDraw"); + tolua_endmodule(tolua_S); + std::string typeName = typeid(cocos2d::PhysicsDebugDraw).name(); + g_luaType[typeName] = "cc.PhysicsDebugDraw"; + g_typeCast["PhysicsDebugDraw"] = "cc.PhysicsDebugDraw"; + return 1; +} + int lua_cocos2dx_physics_PhysicsContact_getContactData(lua_State* tolua_S) { int argc = 0; @@ -6323,7 +6323,7 @@ int lua_cocos2dx_physics_PhysicsContact_getContactData(lua_State* tolua_S) physics_contactdata_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getContactData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsContact:getContactData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6367,7 +6367,7 @@ int lua_cocos2dx_physics_PhysicsContact_getEventCode(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEventCode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsContact:getEventCode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6411,7 +6411,7 @@ int lua_cocos2dx_physics_PhysicsContact_getPreContactData(lua_State* tolua_S) physics_contactdata_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPreContactData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsContact:getPreContactData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6455,7 +6455,7 @@ int lua_cocos2dx_physics_PhysicsContact_getShapeA(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.PhysicsShape",(cocos2d::PhysicsShape*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getShapeA",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsContact:getShapeA",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6499,7 +6499,7 @@ int lua_cocos2dx_physics_PhysicsContact_getShapeB(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.PhysicsShape",(cocos2d::PhysicsShape*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getShapeB",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsContact:getShapeB",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6567,7 +6567,7 @@ int lua_cocos2dx_physics_PhysicsContactPreSolve_getFriction(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFriction",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsContactPreSolve:getFriction",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6611,7 +6611,7 @@ int lua_cocos2dx_physics_PhysicsContactPreSolve_getRestitution(lua_State* tolua_ tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRestitution",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsContactPreSolve:getRestitution",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6651,13 +6651,13 @@ int lua_cocos2dx_physics_PhysicsContactPreSolve_setFriction(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsContactPreSolve:setFriction"); if(!ok) return 0; cobj->setFriction(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFriction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsContactPreSolve:setFriction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6700,7 +6700,7 @@ int lua_cocos2dx_physics_PhysicsContactPreSolve_ignore(lua_State* tolua_S) cobj->ignore(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ignore",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsContactPreSolve:ignore",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6744,7 +6744,7 @@ int lua_cocos2dx_physics_PhysicsContactPreSolve_getSurfaceVelocity(lua_State* to vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSurfaceVelocity",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsContactPreSolve:getSurfaceVelocity",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6784,13 +6784,13 @@ int lua_cocos2dx_physics_PhysicsContactPreSolve_setSurfaceVelocity(lua_State* to { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsContactPreSolve:setSurfaceVelocity"); if(!ok) return 0; cobj->setSurfaceVelocity(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSurfaceVelocity",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsContactPreSolve:setSurfaceVelocity",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6830,13 +6830,13 @@ int lua_cocos2dx_physics_PhysicsContactPreSolve_setRestitution(lua_State* tolua_ { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsContactPreSolve:setRestitution"); if(!ok) return 0; cobj->setRestitution(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRestitution",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsContactPreSolve:setRestitution",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6906,7 +6906,7 @@ int lua_cocos2dx_physics_PhysicsContactPostSolve_getFriction(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFriction",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsContactPostSolve:getFriction",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6950,7 +6950,7 @@ int lua_cocos2dx_physics_PhysicsContactPostSolve_getSurfaceVelocity(lua_State* t vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSurfaceVelocity",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsContactPostSolve:getSurfaceVelocity",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6994,7 +6994,7 @@ int lua_cocos2dx_physics_PhysicsContactPostSolve_getRestitution(lua_State* tolua tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRestitution",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsContactPostSolve:getRestitution",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7049,7 +7049,7 @@ int lua_cocos2dx_physics_EventListenerPhysicsContact_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EventListenerPhysicsContact",(cocos2d::EventListenerPhysicsContact*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EventListenerPhysicsContact:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -7117,7 +7117,7 @@ int lua_cocos2dx_physics_EventListenerPhysicsContactWithBodies_hitTest(lua_State tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "hitTest",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventListenerPhysicsContactWithBodies:hitTest",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -7154,7 +7154,7 @@ int lua_cocos2dx_physics_EventListenerPhysicsContactWithBodies_create(lua_State* object_to_luaval(tolua_S, "cc.EventListenerPhysicsContactWithBodies",(cocos2d::EventListenerPhysicsContactWithBodies*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EventListenerPhysicsContactWithBodies:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -7223,7 +7223,7 @@ int lua_cocos2dx_physics_EventListenerPhysicsContactWithShapes_hitTest(lua_State tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "hitTest",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventListenerPhysicsContactWithShapes:hitTest",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -7260,7 +7260,7 @@ int lua_cocos2dx_physics_EventListenerPhysicsContactWithShapes_create(lua_State* object_to_luaval(tolua_S, "cc.EventListenerPhysicsContactWithShapes",(cocos2d::EventListenerPhysicsContactWithShapes*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EventListenerPhysicsContactWithShapes:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -7329,7 +7329,7 @@ int lua_cocos2dx_physics_EventListenerPhysicsContactWithGroup_hitTest(lua_State* tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "hitTest",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventListenerPhysicsContactWithGroup:hitTest",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -7357,14 +7357,14 @@ int lua_cocos2dx_physics_EventListenerPhysicsContactWithGroup_create(lua_State* if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.EventListenerPhysicsContactWithGroup:create"); if(!ok) return 0; cocos2d::EventListenerPhysicsContactWithGroup* ret = cocos2d::EventListenerPhysicsContactWithGroup::create(arg0); object_to_luaval(tolua_S, "cc.EventListenerPhysicsContactWithGroup",(cocos2d::EventListenerPhysicsContactWithGroup*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EventListenerPhysicsContactWithGroup:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -7427,7 +7427,7 @@ int lua_cocos2dx_physics_PhysicsJoint_getBodyA(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.PhysicsBody",(cocos2d::PhysicsBody*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBodyA",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJoint:getBodyA",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7471,7 +7471,7 @@ int lua_cocos2dx_physics_PhysicsJoint_getBodyB(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.PhysicsBody",(cocos2d::PhysicsBody*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBodyB",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJoint:getBodyB",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7515,7 +7515,7 @@ int lua_cocos2dx_physics_PhysicsJoint_getMaxForce(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMaxForce",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJoint:getMaxForce",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7555,13 +7555,13 @@ int lua_cocos2dx_physics_PhysicsJoint_setMaxForce(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJoint:setMaxForce"); if(!ok) return 0; cobj->setMaxForce(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMaxForce",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJoint:setMaxForce",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7605,7 +7605,7 @@ int lua_cocos2dx_physics_PhysicsJoint_isEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJoint:isEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7645,13 +7645,13 @@ int lua_cocos2dx_physics_PhysicsJoint_setEnable(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.PhysicsJoint:setEnable"); if(!ok) return 0; cobj->setEnable(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEnable",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJoint:setEnable",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7691,13 +7691,13 @@ int lua_cocos2dx_physics_PhysicsJoint_setCollisionEnable(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.PhysicsJoint:setCollisionEnable"); if(!ok) return 0; cobj->setCollisionEnable(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCollisionEnable",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJoint:setCollisionEnable",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7741,7 +7741,7 @@ int lua_cocos2dx_physics_PhysicsJoint_getWorld(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.PhysicsWorld",(cocos2d::PhysicsWorld*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getWorld",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJoint:getWorld",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7781,13 +7781,13 @@ int lua_cocos2dx_physics_PhysicsJoint_setTag(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsJoint:setTag"); if(!ok) return 0; cobj->setTag(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJoint:setTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7830,7 +7830,7 @@ int lua_cocos2dx_physics_PhysicsJoint_removeFormWorld(lua_State* tolua_S) cobj->removeFormWorld(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeFormWorld",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJoint:removeFormWorld",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7874,7 +7874,7 @@ int lua_cocos2dx_physics_PhysicsJoint_isCollisionEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isCollisionEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJoint:isCollisionEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7918,7 +7918,7 @@ int lua_cocos2dx_physics_PhysicsJoint_getTag(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTag",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJoint:getTag",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7952,7 +7952,7 @@ int lua_cocos2dx_physics_PhysicsJoint_destroy(lua_State* tolua_S) cocos2d::PhysicsJoint::destroy(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "destroy",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsJoint:destroy",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -8014,14 +8014,14 @@ int lua_cocos2dx_physics_PhysicsJointFixed_construct(lua_State* tolua_S) cocos2d::Vec2 arg2; ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsBody",&arg0); ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.PhysicsJointFixed:construct"); if(!ok) return 0; cocos2d::PhysicsJointFixed* ret = cocos2d::PhysicsJointFixed::construct(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.PhysicsJointFixed",(cocos2d::PhysicsJointFixed*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "construct",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsJointFixed:construct",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -8079,13 +8079,13 @@ int lua_cocos2dx_physics_PhysicsJointLimit_setAnchr2(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsJointLimit:setAnchr2"); if(!ok) return 0; cobj->setAnchr2(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAnchr2",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointLimit:setAnchr2",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8125,13 +8125,13 @@ int lua_cocos2dx_physics_PhysicsJointLimit_setAnchr1(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsJointLimit:setAnchr1"); if(!ok) return 0; cobj->setAnchr1(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAnchr1",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointLimit:setAnchr1",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8171,13 +8171,13 @@ int lua_cocos2dx_physics_PhysicsJointLimit_setMax(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointLimit:setMax"); if(!ok) return 0; cobj->setMax(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMax",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointLimit:setMax",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8221,7 +8221,7 @@ int lua_cocos2dx_physics_PhysicsJointLimit_getAnchr2(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnchr2",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointLimit:getAnchr2",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8265,7 +8265,7 @@ int lua_cocos2dx_physics_PhysicsJointLimit_getAnchr1(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnchr1",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointLimit:getAnchr1",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8309,7 +8309,7 @@ int lua_cocos2dx_physics_PhysicsJointLimit_getMin(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMin",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointLimit:getMin",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8353,7 +8353,7 @@ int lua_cocos2dx_physics_PhysicsJointLimit_getMax(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMax",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointLimit:getMax",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8393,13 +8393,13 @@ int lua_cocos2dx_physics_PhysicsJointLimit_setMin(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointLimit:setMin"); if(!ok) return 0; cobj->setMin(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMin",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointLimit:setMin",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8434,16 +8434,16 @@ int lua_cocos2dx_physics_PhysicsJointLimit_construct(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); if (!ok) { break; } cocos2d::Vec2 arg2; - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.PhysicsJointLimit:construct"); if (!ok) { break; } cocos2d::Vec2 arg3; - ok &= luaval_to_vec2(tolua_S, 5, &arg3); + ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.PhysicsJointLimit:construct"); if (!ok) { break; } double arg4; - ok &= luaval_to_number(tolua_S, 6,&arg4); + ok &= luaval_to_number(tolua_S, 6,&arg4, "cc.PhysicsJointLimit:construct"); if (!ok) { break; } double arg5; - ok &= luaval_to_number(tolua_S, 7,&arg5); + ok &= luaval_to_number(tolua_S, 7,&arg5, "cc.PhysicsJointLimit:construct"); if (!ok) { break; } cocos2d::PhysicsJointLimit* ret = cocos2d::PhysicsJointLimit::construct(arg0, arg1, arg2, arg3, arg4, arg5); object_to_luaval(tolua_S, "cc.PhysicsJointLimit",(cocos2d::PhysicsJointLimit*)ret); @@ -8462,10 +8462,10 @@ int lua_cocos2dx_physics_PhysicsJointLimit_construct(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); if (!ok) { break; } cocos2d::Vec2 arg2; - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.PhysicsJointLimit:construct"); if (!ok) { break; } cocos2d::Vec2 arg3; - ok &= luaval_to_vec2(tolua_S, 5, &arg3); + ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.PhysicsJointLimit:construct"); if (!ok) { break; } cocos2d::PhysicsJointLimit* ret = cocos2d::PhysicsJointLimit::construct(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.PhysicsJointLimit",(cocos2d::PhysicsJointLimit*)ret); @@ -8473,7 +8473,7 @@ int lua_cocos2dx_physics_PhysicsJointLimit_construct(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "construct",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.PhysicsJointLimit:construct",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -8531,14 +8531,14 @@ int lua_cocos2dx_physics_PhysicsJointPin_construct(lua_State* tolua_S) cocos2d::Vec2 arg2; ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsBody",&arg0); ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.PhysicsJointPin:construct"); if(!ok) return 0; cocos2d::PhysicsJointPin* ret = cocos2d::PhysicsJointPin::construct(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.PhysicsJointPin",(cocos2d::PhysicsJointPin*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "construct",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsJointPin:construct",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -8596,13 +8596,13 @@ int lua_cocos2dx_physics_PhysicsJointDistance_setDistance(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointDistance:setDistance"); if(!ok) return 0; cobj->setDistance(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDistance",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointDistance:setDistance",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8646,7 +8646,7 @@ int lua_cocos2dx_physics_PhysicsJointDistance_getDistance(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDistance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointDistance:getDistance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8679,15 +8679,15 @@ int lua_cocos2dx_physics_PhysicsJointDistance_construct(lua_State* tolua_S) cocos2d::Vec2 arg3; ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsBody",&arg0); ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); - ok &= luaval_to_vec2(tolua_S, 5, &arg3); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.PhysicsJointDistance:construct"); + ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.PhysicsJointDistance:construct"); if(!ok) return 0; cocos2d::PhysicsJointDistance* ret = cocos2d::PhysicsJointDistance::construct(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.PhysicsJointDistance",(cocos2d::PhysicsJointDistance*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "construct",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsJointDistance:construct",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -8747,13 +8747,13 @@ int lua_cocos2dx_physics_PhysicsJointSpring_setAnchr2(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsJointSpring:setAnchr2"); if(!ok) return 0; cobj->setAnchr2(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAnchr2",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointSpring:setAnchr2",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8793,13 +8793,13 @@ int lua_cocos2dx_physics_PhysicsJointSpring_setAnchr1(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsJointSpring:setAnchr1"); if(!ok) return 0; cobj->setAnchr1(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAnchr1",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointSpring:setAnchr1",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8843,7 +8843,7 @@ int lua_cocos2dx_physics_PhysicsJointSpring_getDamping(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDamping",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointSpring:getDamping",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8883,13 +8883,13 @@ int lua_cocos2dx_physics_PhysicsJointSpring_setStiffness(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointSpring:setStiffness"); if(!ok) return 0; cobj->setStiffness(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStiffness",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointSpring:setStiffness",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8933,7 +8933,7 @@ int lua_cocos2dx_physics_PhysicsJointSpring_getRestLength(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRestLength",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointSpring:getRestLength",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8977,7 +8977,7 @@ int lua_cocos2dx_physics_PhysicsJointSpring_getAnchr2(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnchr2",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointSpring:getAnchr2",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9021,7 +9021,7 @@ int lua_cocos2dx_physics_PhysicsJointSpring_getAnchr1(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnchr1",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointSpring:getAnchr1",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9065,7 +9065,7 @@ int lua_cocos2dx_physics_PhysicsJointSpring_getStiffness(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStiffness",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointSpring:getStiffness",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9105,13 +9105,13 @@ int lua_cocos2dx_physics_PhysicsJointSpring_setRestLength(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointSpring:setRestLength"); if(!ok) return 0; cobj->setRestLength(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRestLength",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointSpring:setRestLength",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9151,13 +9151,13 @@ int lua_cocos2dx_physics_PhysicsJointSpring_setDamping(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointSpring:setDamping"); if(!ok) return 0; cobj->setDamping(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDamping",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointSpring:setDamping",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9192,17 +9192,17 @@ int lua_cocos2dx_physics_PhysicsJointSpring_construct(lua_State* tolua_S) double arg5; ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsBody",&arg0); ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); - ok &= luaval_to_vec2(tolua_S, 5, &arg3); - ok &= luaval_to_number(tolua_S, 6,&arg4); - ok &= luaval_to_number(tolua_S, 7,&arg5); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.PhysicsJointSpring:construct"); + ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.PhysicsJointSpring:construct"); + ok &= luaval_to_number(tolua_S, 6,&arg4, "cc.PhysicsJointSpring:construct"); + ok &= luaval_to_number(tolua_S, 7,&arg5, "cc.PhysicsJointSpring:construct"); if(!ok) return 0; cocos2d::PhysicsJointSpring* ret = cocos2d::PhysicsJointSpring::construct(arg0, arg1, arg2, arg3, arg4, arg5); object_to_luaval(tolua_S, "cc.PhysicsJointSpring",(cocos2d::PhysicsJointSpring*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "construct",argc, 6); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsJointSpring:construct",argc, 6); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -9270,13 +9270,13 @@ int lua_cocos2dx_physics_PhysicsJointGroove_setAnchr2(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsJointGroove:setAnchr2"); if(!ok) return 0; cobj->setAnchr2(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAnchr2",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointGroove:setAnchr2",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9316,13 +9316,13 @@ int lua_cocos2dx_physics_PhysicsJointGroove_setGrooveA(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsJointGroove:setGrooveA"); if(!ok) return 0; cobj->setGrooveA(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGrooveA",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointGroove:setGrooveA",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9362,13 +9362,13 @@ int lua_cocos2dx_physics_PhysicsJointGroove_setGrooveB(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsJointGroove:setGrooveB"); if(!ok) return 0; cobj->setGrooveB(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGrooveB",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointGroove:setGrooveB",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9412,7 +9412,7 @@ int lua_cocos2dx_physics_PhysicsJointGroove_getGrooveA(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGrooveA",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointGroove:getGrooveA",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9456,7 +9456,7 @@ int lua_cocos2dx_physics_PhysicsJointGroove_getGrooveB(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGrooveB",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointGroove:getGrooveB",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9500,7 +9500,7 @@ int lua_cocos2dx_physics_PhysicsJointGroove_getAnchr2(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnchr2",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointGroove:getAnchr2",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9534,16 +9534,16 @@ int lua_cocos2dx_physics_PhysicsJointGroove_construct(lua_State* tolua_S) cocos2d::Vec2 arg4; ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsBody",&arg0); ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); - ok &= luaval_to_vec2(tolua_S, 5, &arg3); - ok &= luaval_to_vec2(tolua_S, 6, &arg4); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.PhysicsJointGroove:construct"); + ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.PhysicsJointGroove:construct"); + ok &= luaval_to_vec2(tolua_S, 6, &arg4, "cc.PhysicsJointGroove:construct"); if(!ok) return 0; cocos2d::PhysicsJointGroove* ret = cocos2d::PhysicsJointGroove::construct(arg0, arg1, arg2, arg3, arg4); object_to_luaval(tolua_S, "cc.PhysicsJointGroove",(cocos2d::PhysicsJointGroove*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "construct",argc, 5); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsJointGroove:construct",argc, 5); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -9611,7 +9611,7 @@ int lua_cocos2dx_physics_PhysicsJointRotarySpring_getDamping(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDamping",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointRotarySpring:getDamping",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9651,13 +9651,13 @@ int lua_cocos2dx_physics_PhysicsJointRotarySpring_setRestAngle(lua_State* tolua_ { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointRotarySpring:setRestAngle"); if(!ok) return 0; cobj->setRestAngle(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRestAngle",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointRotarySpring:setRestAngle",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9701,7 +9701,7 @@ int lua_cocos2dx_physics_PhysicsJointRotarySpring_getStiffness(lua_State* tolua_ tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStiffness",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointRotarySpring:getStiffness",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9741,13 +9741,13 @@ int lua_cocos2dx_physics_PhysicsJointRotarySpring_setStiffness(lua_State* tolua_ { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointRotarySpring:setStiffness"); if(!ok) return 0; cobj->setStiffness(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStiffness",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointRotarySpring:setStiffness",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9787,13 +9787,13 @@ int lua_cocos2dx_physics_PhysicsJointRotarySpring_setDamping(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointRotarySpring:setDamping"); if(!ok) return 0; cobj->setDamping(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDamping",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointRotarySpring:setDamping",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9837,7 +9837,7 @@ int lua_cocos2dx_physics_PhysicsJointRotarySpring_getRestAngle(lua_State* tolua_ tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRestAngle",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointRotarySpring:getRestAngle",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9870,15 +9870,15 @@ int lua_cocos2dx_physics_PhysicsJointRotarySpring_construct(lua_State* tolua_S) double arg3; ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsBody",&arg0); ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.PhysicsJointRotarySpring:construct"); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.PhysicsJointRotarySpring:construct"); if(!ok) return 0; cocos2d::PhysicsJointRotarySpring* ret = cocos2d::PhysicsJointRotarySpring::construct(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.PhysicsJointRotarySpring",(cocos2d::PhysicsJointRotarySpring*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "construct",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsJointRotarySpring:construct",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -9946,7 +9946,7 @@ int lua_cocos2dx_physics_PhysicsJointRotaryLimit_getMax(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMax",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointRotaryLimit:getMax",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9986,13 +9986,13 @@ int lua_cocos2dx_physics_PhysicsJointRotaryLimit_setMin(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointRotaryLimit:setMin"); if(!ok) return 0; cobj->setMin(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMin",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointRotaryLimit:setMin",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10032,13 +10032,13 @@ int lua_cocos2dx_physics_PhysicsJointRotaryLimit_setMax(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointRotaryLimit:setMax"); if(!ok) return 0; cobj->setMax(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMax",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointRotaryLimit:setMax",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10082,7 +10082,7 @@ int lua_cocos2dx_physics_PhysicsJointRotaryLimit_getMin(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMin",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointRotaryLimit:getMin",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10133,10 +10133,10 @@ int lua_cocos2dx_physics_PhysicsJointRotaryLimit_construct(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.PhysicsJointRotaryLimit:construct"); if (!ok) { break; } double arg3; - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.PhysicsJointRotaryLimit:construct"); if (!ok) { break; } cocos2d::PhysicsJointRotaryLimit* ret = cocos2d::PhysicsJointRotaryLimit::construct(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.PhysicsJointRotaryLimit",(cocos2d::PhysicsJointRotaryLimit*)ret); @@ -10144,7 +10144,7 @@ int lua_cocos2dx_physics_PhysicsJointRotaryLimit_construct(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "construct",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.PhysicsJointRotaryLimit:construct",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -10210,7 +10210,7 @@ int lua_cocos2dx_physics_PhysicsJointRatchet_getAngle(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAngle",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointRatchet:getAngle",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10250,13 +10250,13 @@ int lua_cocos2dx_physics_PhysicsJointRatchet_setAngle(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointRatchet:setAngle"); if(!ok) return 0; cobj->setAngle(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAngle",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointRatchet:setAngle",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10296,13 +10296,13 @@ int lua_cocos2dx_physics_PhysicsJointRatchet_setPhase(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointRatchet:setPhase"); if(!ok) return 0; cobj->setPhase(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPhase",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointRatchet:setPhase",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10346,7 +10346,7 @@ int lua_cocos2dx_physics_PhysicsJointRatchet_getPhase(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPhase",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointRatchet:getPhase",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10386,13 +10386,13 @@ int lua_cocos2dx_physics_PhysicsJointRatchet_setRatchet(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointRatchet:setRatchet"); if(!ok) return 0; cobj->setRatchet(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRatchet",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointRatchet:setRatchet",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10436,7 +10436,7 @@ int lua_cocos2dx_physics_PhysicsJointRatchet_getRatchet(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRatchet",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointRatchet:getRatchet",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10469,15 +10469,15 @@ int lua_cocos2dx_physics_PhysicsJointRatchet_construct(lua_State* tolua_S) double arg3; ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsBody",&arg0); ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.PhysicsJointRatchet:construct"); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.PhysicsJointRatchet:construct"); if(!ok) return 0; cocos2d::PhysicsJointRatchet* ret = cocos2d::PhysicsJointRatchet::construct(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.PhysicsJointRatchet",(cocos2d::PhysicsJointRatchet*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "construct",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsJointRatchet:construct",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -10541,13 +10541,13 @@ int lua_cocos2dx_physics_PhysicsJointGear_setRatio(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointGear:setRatio"); if(!ok) return 0; cobj->setRatio(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRatio",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointGear:setRatio",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10591,7 +10591,7 @@ int lua_cocos2dx_physics_PhysicsJointGear_getPhase(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPhase",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointGear:getPhase",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10631,13 +10631,13 @@ int lua_cocos2dx_physics_PhysicsJointGear_setPhase(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointGear:setPhase"); if(!ok) return 0; cobj->setPhase(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPhase",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointGear:setPhase",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10681,7 +10681,7 @@ int lua_cocos2dx_physics_PhysicsJointGear_getRatio(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRatio",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointGear:getRatio",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10714,15 +10714,15 @@ int lua_cocos2dx_physics_PhysicsJointGear_construct(lua_State* tolua_S) double arg3; ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsBody",&arg0); ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.PhysicsJointGear:construct"); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.PhysicsJointGear:construct"); if(!ok) return 0; cocos2d::PhysicsJointGear* ret = cocos2d::PhysicsJointGear::construct(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.PhysicsJointGear",(cocos2d::PhysicsJointGear*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "construct",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsJointGear:construct",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -10784,13 +10784,13 @@ int lua_cocos2dx_physics_PhysicsJointMotor_setRate(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointMotor:setRate"); if(!ok) return 0; cobj->setRate(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRate",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointMotor:setRate",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10834,7 +10834,7 @@ int lua_cocos2dx_physics_PhysicsJointMotor_getRate(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRate",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointMotor:getRate",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10866,14 +10866,14 @@ int lua_cocos2dx_physics_PhysicsJointMotor_construct(lua_State* tolua_S) double arg2; ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsBody",&arg0); ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.PhysicsJointMotor:construct"); if(!ok) return 0; cocos2d::PhysicsJointMotor* ret = cocos2d::PhysicsJointMotor::construct(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.PhysicsJointMotor",(cocos2d::PhysicsJointMotor*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "construct",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsJointMotor:construct",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_spine_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_spine_auto.cpp index fb68e466e2..e9a0cc19d0 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_spine_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_spine_auto.cpp @@ -38,7 +38,7 @@ int lua_cocos2dx_spine_Skeleton_setToSetupPose(lua_State* tolua_S) cobj->setToSetupPose(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setToSetupPose",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "sp.Skeleton:setToSetupPose",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -84,7 +84,7 @@ int lua_cocos2dx_spine_Skeleton_setBlendFunc(lua_State* tolua_S) cobj->setBlendFunc(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBlendFunc",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "sp.Skeleton:setBlendFunc",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -125,15 +125,15 @@ int lua_cocos2dx_spine_Skeleton_onDraw(lua_State* tolua_S) cocos2d::Mat4 arg0; unsigned int arg1; - ok &= luaval_to_mat4(tolua_S, 2, &arg0); + ok &= luaval_to_mat4(tolua_S, 2, &arg0, "sp.Skeleton:onDraw"); - ok &= luaval_to_uint32(tolua_S, 3,&arg1); + ok &= luaval_to_uint32(tolua_S, 3,&arg1, "sp.Skeleton:onDraw"); if(!ok) return 0; cobj->onDraw(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "onDraw",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "sp.Skeleton:onDraw",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -176,7 +176,7 @@ int lua_cocos2dx_spine_Skeleton_setSlotsToSetupPose(lua_State* tolua_S) cobj->setSlotsToSetupPose(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSlotsToSetupPose",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "sp.Skeleton:setSlotsToSetupPose",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -220,7 +220,7 @@ int lua_cocos2dx_spine_Skeleton_getBlendFunc(lua_State* tolua_S) blendfunc_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBlendFunc",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "sp.Skeleton:getBlendFunc",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -260,14 +260,14 @@ int lua_cocos2dx_spine_Skeleton_setSkin(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "sp.Skeleton:setSkin"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; bool ret = cobj->setSkin(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSkin",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "sp.Skeleton:setSkin",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -310,7 +310,7 @@ int lua_cocos2dx_spine_Skeleton_setBonesToSetupPose(lua_State* tolua_S) cobj->setBonesToSetupPose(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBonesToSetupPose",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "sp.Skeleton:setBonesToSetupPose",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -378,17 +378,17 @@ int lua_cocos2dx_spine_SkeletonAnimation_setMix(lua_State* tolua_S) const char* arg1; double arg2; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "sp.SkeletonAnimation:setMix"); arg0 = arg0_tmp.c_str(); - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "sp.SkeletonAnimation:setMix"); arg1 = arg1_tmp.c_str(); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "sp.SkeletonAnimation:setMix"); if(!ok) return 0; cobj->setMix(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMix",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "sp.SkeletonAnimation:setMix",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -431,7 +431,7 @@ int lua_cocos2dx_spine_SkeletonAnimation_clearTracks(lua_State* tolua_S) cobj->clearTracks(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "clearTracks",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "sp.SkeletonAnimation:clearTracks",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -478,13 +478,13 @@ int lua_cocos2dx_spine_SkeletonAnimation_clearTrack(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "sp.SkeletonAnimation:clearTrack"); if(!ok) return 0; cobj->clearTrack(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "clearTrack",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "sp.SkeletonAnimation:clearTrack",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp index b4352556a9..37d5766763 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp @@ -29,7 +29,7 @@ int lua_cocos2dx_studio_ActionFrame_getAction(lua_State* tolua_S) do{ if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionFrame:getAction"); if (!ok) { break; } cocostudio::ActionFrame* arg1; @@ -45,7 +45,7 @@ int lua_cocos2dx_studio_ActionFrame_getAction(lua_State* tolua_S) do{ if (argc == 1) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionFrame:getAction"); if (!ok) { break; } cocos2d::ActionInterval* ret = cobj->getAction(arg0); @@ -54,7 +54,7 @@ int lua_cocos2dx_studio_ActionFrame_getAction(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionFrame:getAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -98,7 +98,7 @@ int lua_cocos2dx_studio_ActionFrame_getFrameType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFrameType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionFrame:getFrameType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -138,13 +138,13 @@ int lua_cocos2dx_studio_ActionFrame_setFrameTime(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionFrame:setFrameTime"); if(!ok) return 0; cobj->setFrameTime(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFrameTime",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionFrame:setFrameTime",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -184,13 +184,13 @@ int lua_cocos2dx_studio_ActionFrame_setEasingType(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ActionFrame:setEasingType"); if(!ok) return 0; cobj->setEasingType(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEasingType",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionFrame:setEasingType",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -234,7 +234,7 @@ int lua_cocos2dx_studio_ActionFrame_getFrameTime(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFrameTime",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionFrame:getFrameTime",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -278,7 +278,7 @@ int lua_cocos2dx_studio_ActionFrame_getFrameIndex(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFrameIndex",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionFrame:getFrameIndex",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -318,13 +318,13 @@ int lua_cocos2dx_studio_ActionFrame_setFrameType(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ActionFrame:setFrameType"); if(!ok) return 0; cobj->setFrameType(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFrameType",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionFrame:setFrameType",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -364,13 +364,13 @@ int lua_cocos2dx_studio_ActionFrame_setFrameIndex(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ActionFrame:setFrameIndex"); if(!ok) return 0; cobj->setFrameIndex(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFrameIndex",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionFrame:setFrameIndex",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -410,13 +410,13 @@ int lua_cocos2dx_studio_ActionFrame_setEasingParameter(lua_State* tolua_S) { std::vector > arg0; - ok &= luaval_to_std_vector_float(tolua_S, 2, &arg0); + ok &= luaval_to_std_vector_float(tolua_S, 2, &arg0, "ccs.ActionFrame:setEasingParameter"); if(!ok) return 0; cobj->setEasingParameter(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEasingParameter",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionFrame:setEasingParameter",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -460,7 +460,7 @@ int lua_cocos2dx_studio_ActionFrame_getEasingType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEasingType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionFrame:getEasingType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -494,7 +494,7 @@ int lua_cocos2dx_studio_ActionFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ActionFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ActionFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionFrame:ActionFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -564,13 +564,13 @@ int lua_cocos2dx_studio_ActionMoveFrame_setPosition(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccs.ActionMoveFrame:setPosition"); if(!ok) return 0; cobj->setPosition(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPosition",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionMoveFrame:setPosition",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -610,14 +610,14 @@ int lua_cocos2dx_studio_ActionMoveFrame_getAction(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionMoveFrame:getAction"); if(!ok) return 0; cocos2d::ActionInterval* ret = cobj->getAction(arg0); object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionMoveFrame:getAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -661,7 +661,7 @@ int lua_cocos2dx_studio_ActionMoveFrame_getPosition(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPosition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionMoveFrame:getPosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -695,7 +695,7 @@ int lua_cocos2dx_studio_ActionMoveFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ActionMoveFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ActionMoveFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionMoveFrame:ActionMoveFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -758,13 +758,13 @@ int lua_cocos2dx_studio_ActionScaleFrame_setScaleY(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionScaleFrame:setScaleY"); if(!ok) return 0; cobj->setScaleY(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScaleY",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionScaleFrame:setScaleY",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -804,13 +804,13 @@ int lua_cocos2dx_studio_ActionScaleFrame_setScaleX(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionScaleFrame:setScaleX"); if(!ok) return 0; cobj->setScaleX(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScaleX",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionScaleFrame:setScaleX",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -854,7 +854,7 @@ int lua_cocos2dx_studio_ActionScaleFrame_getScaleY(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScaleY",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionScaleFrame:getScaleY",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -898,7 +898,7 @@ int lua_cocos2dx_studio_ActionScaleFrame_getScaleX(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScaleX",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionScaleFrame:getScaleX",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -938,14 +938,14 @@ int lua_cocos2dx_studio_ActionScaleFrame_getAction(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionScaleFrame:getAction"); if(!ok) return 0; cocos2d::ActionInterval* ret = cobj->getAction(arg0); object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionScaleFrame:getAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -979,7 +979,7 @@ int lua_cocos2dx_studio_ActionScaleFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ActionScaleFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ActionScaleFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionScaleFrame:ActionScaleFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1044,13 +1044,13 @@ int lua_cocos2dx_studio_ActionRotationFrame_setRotation(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionRotationFrame:setRotation"); if(!ok) return 0; cobj->setRotation(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRotation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionRotationFrame:setRotation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1084,7 +1084,7 @@ int lua_cocos2dx_studio_ActionRotationFrame_getAction(lua_State* tolua_S) do{ if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionRotationFrame:getAction"); if (!ok) { break; } cocostudio::ActionFrame* arg1; @@ -1100,7 +1100,7 @@ int lua_cocos2dx_studio_ActionRotationFrame_getAction(lua_State* tolua_S) do{ if (argc == 1) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionRotationFrame:getAction"); if (!ok) { break; } cocos2d::ActionInterval* ret = cobj->getAction(arg0); @@ -1109,7 +1109,7 @@ int lua_cocos2dx_studio_ActionRotationFrame_getAction(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionRotationFrame:getAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1153,7 +1153,7 @@ int lua_cocos2dx_studio_ActionRotationFrame_getRotation(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRotation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionRotationFrame:getRotation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1187,7 +1187,7 @@ int lua_cocos2dx_studio_ActionRotationFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ActionRotationFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ActionRotationFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionRotationFrame:ActionRotationFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1254,7 +1254,7 @@ int lua_cocos2dx_studio_ActionFadeFrame_getOpacity(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOpacity",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionFadeFrame:getOpacity",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1294,14 +1294,14 @@ int lua_cocos2dx_studio_ActionFadeFrame_getAction(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionFadeFrame:getAction"); if(!ok) return 0; cocos2d::ActionInterval* ret = cobj->getAction(arg0); object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionFadeFrame:getAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1341,13 +1341,13 @@ int lua_cocos2dx_studio_ActionFadeFrame_setOpacity(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ActionFadeFrame:setOpacity"); if(!ok) return 0; cobj->setOpacity(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOpacity",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionFadeFrame:setOpacity",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1381,7 +1381,7 @@ int lua_cocos2dx_studio_ActionFadeFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ActionFadeFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ActionFadeFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionFadeFrame:ActionFadeFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1448,7 +1448,7 @@ int lua_cocos2dx_studio_ActionTintFrame_getColor(lua_State* tolua_S) color3b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTintFrame:getColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1488,14 +1488,14 @@ int lua_cocos2dx_studio_ActionTintFrame_getAction(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionTintFrame:getAction"); if(!ok) return 0; cocos2d::ActionInterval* ret = cobj->getAction(arg0); object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTintFrame:getAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1535,13 +1535,13 @@ int lua_cocos2dx_studio_ActionTintFrame_setColor(lua_State* tolua_S) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "ccs.ActionTintFrame:setColor"); if(!ok) return 0; cobj->setColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTintFrame:setColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1575,7 +1575,7 @@ int lua_cocos2dx_studio_ActionTintFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ActionTintFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ActionTintFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTintFrame:ActionTintFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1638,13 +1638,13 @@ int lua_cocos2dx_studio_ActionObject_setCurrentTime(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionObject:setCurrentTime"); if(!ok) return 0; cobj->setCurrentTime(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCurrentTime",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:setCurrentTime",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1687,7 +1687,7 @@ int lua_cocos2dx_studio_ActionObject_pause(lua_State* tolua_S) cobj->pause(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pause",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:pause",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1727,13 +1727,13 @@ int lua_cocos2dx_studio_ActionObject_setName(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccs.ActionObject:setName"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->setName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:setName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1773,13 +1773,13 @@ int lua_cocos2dx_studio_ActionObject_setUnitTime(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionObject:setUnitTime"); if(!ok) return 0; cobj->setUnitTime(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUnitTime",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:setUnitTime",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1823,7 +1823,7 @@ int lua_cocos2dx_studio_ActionObject_getTotalTime(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTotalTime",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:getTotalTime",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1867,7 +1867,7 @@ int lua_cocos2dx_studio_ActionObject_getName(lua_State* tolua_S) tolua_pushstring(tolua_S,(const char*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:getName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1910,7 +1910,7 @@ int lua_cocos2dx_studio_ActionObject_stop(lua_State* tolua_S) cobj->stop(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stop",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:stop",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1959,7 +1959,7 @@ int lua_cocos2dx_studio_ActionObject_play(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "play",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:play",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2003,7 +2003,7 @@ int lua_cocos2dx_studio_ActionObject_getCurrentTime(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCurrentTime",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:getCurrentTime",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2049,7 +2049,7 @@ int lua_cocos2dx_studio_ActionObject_removeActionNode(lua_State* tolua_S) cobj->removeActionNode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeActionNode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:removeActionNode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2093,7 +2093,7 @@ int lua_cocos2dx_studio_ActionObject_getLoop(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLoop",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:getLoop",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2139,7 +2139,7 @@ int lua_cocos2dx_studio_ActionObject_addActionNode(lua_State* tolua_S) cobj->addActionNode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addActionNode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:addActionNode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2183,7 +2183,7 @@ int lua_cocos2dx_studio_ActionObject_getUnitTime(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getUnitTime",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:getUnitTime",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2227,7 +2227,7 @@ int lua_cocos2dx_studio_ActionObject_isPlaying(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isPlaying",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:isPlaying",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2267,13 +2267,13 @@ int lua_cocos2dx_studio_ActionObject_updateToFrameByTime(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionObject:updateToFrameByTime"); if(!ok) return 0; cobj->updateToFrameByTime(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateToFrameByTime",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:updateToFrameByTime",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2313,13 +2313,13 @@ int lua_cocos2dx_studio_ActionObject_setLoop(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccs.ActionObject:setLoop"); if(!ok) return 0; cobj->setLoop(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLoop",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:setLoop",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2359,13 +2359,13 @@ int lua_cocos2dx_studio_ActionObject_simulationActionUpdate(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionObject:simulationActionUpdate"); if(!ok) return 0; cobj->simulationActionUpdate(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "simulationActionUpdate",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:simulationActionUpdate",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2399,7 +2399,7 @@ int lua_cocos2dx_studio_ActionObject_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ActionObject"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ActionObject",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:ActionObject",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2470,11 +2470,11 @@ int lua_cocos2dx_studio_ActionManagerEx_playActionByName(lua_State* tolua_S) do{ if (argc == 3) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccs.ActionManagerEx:playActionByName"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } const char* arg1; - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "ccs.ActionManagerEx:playActionByName"); arg1 = arg1_tmp.c_str(); if (!ok) { break; } cocos2d::CallFunc* arg2; @@ -2490,11 +2490,11 @@ int lua_cocos2dx_studio_ActionManagerEx_playActionByName(lua_State* tolua_S) do{ if (argc == 2) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccs.ActionManagerEx:playActionByName"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } const char* arg1; - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "ccs.ActionManagerEx:playActionByName"); arg1 = arg1_tmp.c_str(); if (!ok) { break; } cocostudio::ActionObject* ret = cobj->playActionByName(arg0, arg1); @@ -2503,7 +2503,7 @@ int lua_cocos2dx_studio_ActionManagerEx_playActionByName(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "playActionByName",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionManagerEx:playActionByName",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -2544,16 +2544,16 @@ int lua_cocos2dx_studio_ActionManagerEx_getActionByName(lua_State* tolua_S) const char* arg0; const char* arg1; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccs.ActionManagerEx:getActionByName"); arg0 = arg0_tmp.c_str(); - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "ccs.ActionManagerEx:getActionByName"); arg1 = arg1_tmp.c_str(); if(!ok) return 0; cocostudio::ActionObject* ret = cobj->getActionByName(arg0, arg1); object_to_luaval(tolua_S, "ccs.ActionObject",(cocostudio::ActionObject*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getActionByName",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionManagerEx:getActionByName",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -2596,7 +2596,7 @@ int lua_cocos2dx_studio_ActionManagerEx_releaseActions(lua_State* tolua_S) cobj->releaseActions(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "releaseActions",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionManagerEx:releaseActions",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2628,7 +2628,7 @@ int lua_cocos2dx_studio_ActionManagerEx_destroyInstance(lua_State* tolua_S) cocostudio::ActionManagerEx::destroyInstance(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "destroyInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ActionManagerEx:destroyInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -2659,7 +2659,7 @@ int lua_cocos2dx_studio_ActionManagerEx_getInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ActionManagerEx",(cocostudio::ActionManagerEx*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ActionManagerEx:getInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -2725,7 +2725,7 @@ int lua_cocos2dx_studio_BaseData_getColor(lua_State* tolua_S) color4b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.BaseData:getColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2765,13 +2765,13 @@ int lua_cocos2dx_studio_BaseData_setColor(lua_State* tolua_S) { cocos2d::Color4B arg0; - ok &=luaval_to_color4b(tolua_S, 2, &arg0); + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "ccs.BaseData:setColor"); if(!ok) return 0; cobj->setColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.BaseData:setColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2804,7 +2804,7 @@ int lua_cocos2dx_studio_BaseData_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.BaseData",(cocostudio::BaseData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.BaseData:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -2836,7 +2836,7 @@ int lua_cocos2dx_studio_BaseData_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.BaseData"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "BaseData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.BaseData:BaseData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2905,7 +2905,7 @@ int lua_cocos2dx_studio_DisplayData_copy(lua_State* tolua_S) cobj->copy(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "copy",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayData:copy",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2933,14 +2933,14 @@ int lua_cocos2dx_studio_DisplayData_changeDisplayToTexture(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.DisplayData:changeDisplayToTexture"); if(!ok) return 0; const std::string ret = cocostudio::DisplayData::changeDisplayToTexture(arg0); tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "changeDisplayToTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.DisplayData:changeDisplayToTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -2971,7 +2971,7 @@ int lua_cocos2dx_studio_DisplayData_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.DisplayData",(cocostudio::DisplayData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.DisplayData:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -3003,7 +3003,7 @@ int lua_cocos2dx_studio_DisplayData_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.DisplayData"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "DisplayData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayData:DisplayData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3072,7 +3072,7 @@ int lua_cocos2dx_studio_SpriteDisplayData_copy(lua_State* tolua_S) cobj->copy(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "copy",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.SpriteDisplayData:copy",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3105,7 +3105,7 @@ int lua_cocos2dx_studio_SpriteDisplayData_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.SpriteDisplayData",(cocostudio::SpriteDisplayData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.SpriteDisplayData:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -3137,7 +3137,7 @@ int lua_cocos2dx_studio_SpriteDisplayData_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.SpriteDisplayData"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "SpriteDisplayData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.SpriteDisplayData:SpriteDisplayData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3192,7 +3192,7 @@ int lua_cocos2dx_studio_ArmatureDisplayData_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ArmatureDisplayData",(cocostudio::ArmatureDisplayData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ArmatureDisplayData:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -3224,7 +3224,7 @@ int lua_cocos2dx_studio_ArmatureDisplayData_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ArmatureDisplayData"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ArmatureDisplayData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDisplayData:ArmatureDisplayData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3278,7 +3278,7 @@ int lua_cocos2dx_studio_ParticleDisplayData_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ParticleDisplayData",(cocostudio::ParticleDisplayData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ParticleDisplayData:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -3310,7 +3310,7 @@ int lua_cocos2dx_studio_ParticleDisplayData_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ParticleDisplayData"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ParticleDisplayData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ParticleDisplayData:ParticleDisplayData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3371,14 +3371,14 @@ int lua_cocos2dx_studio_BoneData_getDisplayData(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.BoneData:getDisplayData"); if(!ok) return 0; cocostudio::DisplayData* ret = cobj->getDisplayData(arg0); object_to_luaval(tolua_S, "ccs.DisplayData",(cocostudio::DisplayData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDisplayData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.BoneData:getDisplayData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3422,7 +3422,7 @@ int lua_cocos2dx_studio_BoneData_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.BoneData:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3468,7 +3468,7 @@ int lua_cocos2dx_studio_BoneData_addDisplayData(lua_State* tolua_S) cobj->addDisplayData(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addDisplayData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.BoneData:addDisplayData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3501,7 +3501,7 @@ int lua_cocos2dx_studio_BoneData_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.BoneData",(cocostudio::BoneData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.BoneData:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -3533,7 +3533,7 @@ int lua_cocos2dx_studio_BoneData_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.BoneData"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "BoneData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.BoneData:BoneData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3603,7 +3603,7 @@ int lua_cocos2dx_studio_ArmatureData_addBoneData(lua_State* tolua_S) cobj->addBoneData(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addBoneData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureData:addBoneData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3647,7 +3647,7 @@ int lua_cocos2dx_studio_ArmatureData_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureData:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3687,14 +3687,14 @@ int lua_cocos2dx_studio_ArmatureData_getBoneData(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureData:getBoneData"); if(!ok) return 0; cocostudio::BoneData* ret = cobj->getBoneData(arg0); object_to_luaval(tolua_S, "ccs.BoneData",(cocostudio::BoneData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBoneData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureData:getBoneData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3727,7 +3727,7 @@ int lua_cocos2dx_studio_ArmatureData_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ArmatureData",(cocostudio::ArmatureData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ArmatureData:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -3759,7 +3759,7 @@ int lua_cocos2dx_studio_ArmatureData_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ArmatureData"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ArmatureData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureData:ArmatureData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3829,7 +3829,7 @@ int lua_cocos2dx_studio_FrameData_copy(lua_State* tolua_S) cobj->copy(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "copy",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.FrameData:copy",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3862,7 +3862,7 @@ int lua_cocos2dx_studio_FrameData_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.FrameData",(cocostudio::FrameData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.FrameData:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -3894,7 +3894,7 @@ int lua_cocos2dx_studio_FrameData_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.FrameData"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "FrameData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.FrameData:FrameData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3960,7 +3960,7 @@ int lua_cocos2dx_studio_MovementBoneData_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.MovementBoneData:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4000,14 +4000,14 @@ int lua_cocos2dx_studio_MovementBoneData_getFrameData(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.MovementBoneData:getFrameData"); if(!ok) return 0; cocostudio::FrameData* ret = cobj->getFrameData(arg0); object_to_luaval(tolua_S, "ccs.FrameData",(cocostudio::FrameData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFrameData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.MovementBoneData:getFrameData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4053,7 +4053,7 @@ int lua_cocos2dx_studio_MovementBoneData_addFrameData(lua_State* tolua_S) cobj->addFrameData(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addFrameData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.MovementBoneData:addFrameData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4086,7 +4086,7 @@ int lua_cocos2dx_studio_MovementBoneData_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.MovementBoneData",(cocostudio::MovementBoneData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.MovementBoneData:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -4118,7 +4118,7 @@ int lua_cocos2dx_studio_MovementBoneData_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.MovementBoneData"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "MovementBoneData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.MovementBoneData:MovementBoneData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4182,14 +4182,14 @@ int lua_cocos2dx_studio_MovementData_getMovementBoneData(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.MovementData:getMovementBoneData"); if(!ok) return 0; cocostudio::MovementBoneData* ret = cobj->getMovementBoneData(arg0); object_to_luaval(tolua_S, "ccs.MovementBoneData",(cocostudio::MovementBoneData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMovementBoneData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.MovementData:getMovementBoneData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4235,7 +4235,7 @@ int lua_cocos2dx_studio_MovementData_addMovementBoneData(lua_State* tolua_S) cobj->addMovementBoneData(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addMovementBoneData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.MovementData:addMovementBoneData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4268,7 +4268,7 @@ int lua_cocos2dx_studio_MovementData_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.MovementData",(cocostudio::MovementData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.MovementData:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -4300,7 +4300,7 @@ int lua_cocos2dx_studio_MovementData_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.MovementData"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "MovementData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.MovementData:MovementData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4363,14 +4363,14 @@ int lua_cocos2dx_studio_AnimationData_getMovement(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.AnimationData:getMovement"); if(!ok) return 0; cocostudio::MovementData* ret = cobj->getMovement(arg0); object_to_luaval(tolua_S, "ccs.MovementData",(cocostudio::MovementData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMovement",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.AnimationData:getMovement",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4414,7 +4414,7 @@ int lua_cocos2dx_studio_AnimationData_getMovementCount(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMovementCount",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.AnimationData:getMovementCount",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4460,7 +4460,7 @@ int lua_cocos2dx_studio_AnimationData_addMovement(lua_State* tolua_S) cobj->addMovement(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addMovement",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.AnimationData:addMovement",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4493,7 +4493,7 @@ int lua_cocos2dx_studio_AnimationData_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.AnimationData",(cocostudio::AnimationData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.AnimationData:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -4525,7 +4525,7 @@ int lua_cocos2dx_studio_AnimationData_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.AnimationData"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "AnimationData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.AnimationData:AnimationData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4593,7 +4593,7 @@ int lua_cocos2dx_studio_ContourData_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ContourData:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4633,13 +4633,13 @@ int lua_cocos2dx_studio_ContourData_addVertex(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccs.ContourData:addVertex"); if(!ok) return 0; cobj->addVertex(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addVertex",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ContourData:addVertex",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4672,7 +4672,7 @@ int lua_cocos2dx_studio_ContourData_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ContourData",(cocostudio::ContourData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ContourData:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -4704,7 +4704,7 @@ int lua_cocos2dx_studio_ContourData_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ContourData"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ContourData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ContourData:ContourData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4767,14 +4767,14 @@ int lua_cocos2dx_studio_TextureData_getContourData(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.TextureData:getContourData"); if(!ok) return 0; cocostudio::ContourData* ret = cobj->getContourData(arg0); object_to_luaval(tolua_S, "ccs.ContourData",(cocostudio::ContourData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getContourData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.TextureData:getContourData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4818,7 +4818,7 @@ int lua_cocos2dx_studio_TextureData_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.TextureData:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4864,7 +4864,7 @@ int lua_cocos2dx_studio_TextureData_addContourData(lua_State* tolua_S) cobj->addContourData(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addContourData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.TextureData:addContourData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4897,7 +4897,7 @@ int lua_cocos2dx_studio_TextureData_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.TextureData",(cocostudio::TextureData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.TextureData:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -4929,7 +4929,7 @@ int lua_cocos2dx_studio_TextureData_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.TextureData"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TextureData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.TextureData:TextureData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4997,7 +4997,7 @@ int lua_cocos2dx_studio_Tween_getAnimation(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ArmatureAnimation",(cocostudio::ArmatureAnimation*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnimation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Tween:getAnimation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5037,13 +5037,13 @@ int lua_cocos2dx_studio_Tween_gotoAndPause(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.Tween:gotoAndPause"); if(!ok) return 0; cobj->gotoAndPause(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "gotoAndPause",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Tween:gotoAndPause",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5089,19 +5089,19 @@ int lua_cocos2dx_studio_Tween_play(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "ccs.MovementBoneData",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.Tween:play"); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "ccs.Tween:play"); - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "ccs.Tween:play"); - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "ccs.Tween:play"); if(!ok) return 0; cobj->play(arg0, arg1, arg2, arg3, arg4); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "play",argc, 5); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Tween:play",argc, 5); return 0; #if COCOS2D_DEBUG >= 1 @@ -5141,13 +5141,13 @@ int lua_cocos2dx_studio_Tween_gotoAndPlay(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.Tween:gotoAndPlay"); if(!ok) return 0; cobj->gotoAndPlay(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "gotoAndPlay",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Tween:gotoAndPlay",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5194,7 +5194,7 @@ int lua_cocos2dx_studio_Tween_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Tween:init",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5240,7 +5240,7 @@ int lua_cocos2dx_studio_Tween_setAnimation(lua_State* tolua_S) cobj->setAnimation(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAnimation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Tween:setAnimation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5275,7 +5275,7 @@ int lua_cocos2dx_studio_Tween_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.Tween",(cocostudio::Tween*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.Tween:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -5307,7 +5307,7 @@ int lua_cocos2dx_studio_Tween_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.Tween"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "Tween",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Tween:Tween",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5378,7 +5378,7 @@ int lua_cocos2dx_studio_DisplayManager_getDisplayRenderNode(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDisplayRenderNode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:getDisplayRenderNode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5422,7 +5422,7 @@ int lua_cocos2dx_studio_DisplayManager_getAnchorPointInPoints(lua_State* tolua_S vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnchorPointInPoints",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:getAnchorPointInPoints",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5466,7 +5466,7 @@ int lua_cocos2dx_studio_DisplayManager_getDisplayRenderNodeType(lua_State* tolua tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDisplayRenderNodeType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:getDisplayRenderNodeType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5506,13 +5506,13 @@ int lua_cocos2dx_studio_DisplayManager_removeDisplay(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.DisplayManager:removeDisplay"); if(!ok) return 0; cobj->removeDisplay(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeDisplay",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:removeDisplay",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5552,13 +5552,13 @@ int lua_cocos2dx_studio_DisplayManager_setForceChangeDisplay(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccs.DisplayManager:setForceChangeDisplay"); if(!ok) return 0; cobj->setForceChangeDisplay(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setForceChangeDisplay",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:setForceChangeDisplay",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5605,7 +5605,7 @@ int lua_cocos2dx_studio_DisplayManager_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:init",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5649,7 +5649,7 @@ int lua_cocos2dx_studio_DisplayManager_getContentSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getContentSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:getContentSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5693,7 +5693,7 @@ int lua_cocos2dx_studio_DisplayManager_getBoundingBox(lua_State* tolua_S) rect_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBoundingBox",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:getBoundingBox",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5731,7 +5731,7 @@ int lua_cocos2dx_studio_DisplayManager_addDisplay(lua_State* tolua_S) if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.DisplayManager:addDisplay"); if (!ok) { break; } cobj->addDisplay(arg0, arg1); @@ -5746,7 +5746,7 @@ int lua_cocos2dx_studio_DisplayManager_addDisplay(lua_State* tolua_S) if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.DisplayManager:addDisplay"); if (!ok) { break; } cobj->addDisplay(arg0, arg1); @@ -5754,7 +5754,7 @@ int lua_cocos2dx_studio_DisplayManager_addDisplay(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addDisplay",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:addDisplay",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -5788,11 +5788,11 @@ int lua_cocos2dx_studio_DisplayManager_containPoint(lua_State* tolua_S) do{ if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.DisplayManager:containPoint"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "ccs.DisplayManager:containPoint"); if (!ok) { break; } bool ret = cobj->containPoint(arg0, arg1); @@ -5804,7 +5804,7 @@ int lua_cocos2dx_studio_DisplayManager_containPoint(lua_State* tolua_S) do{ if (argc == 1) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccs.DisplayManager:containPoint"); if (!ok) { break; } bool ret = cobj->containPoint(arg0); @@ -5813,7 +5813,7 @@ int lua_cocos2dx_studio_DisplayManager_containPoint(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "containPoint",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:containPoint",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5854,15 +5854,15 @@ int lua_cocos2dx_studio_DisplayManager_changeDisplayWithIndex(lua_State* tolua_S int arg0; bool arg1; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.DisplayManager:changeDisplayWithIndex"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccs.DisplayManager:changeDisplayWithIndex"); if(!ok) return 0; cobj->changeDisplayWithIndex(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "changeDisplayWithIndex",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:changeDisplayWithIndex",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -5903,15 +5903,15 @@ int lua_cocos2dx_studio_DisplayManager_changeDisplayWithName(lua_State* tolua_S) std::string arg0; bool arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.DisplayManager:changeDisplayWithName"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccs.DisplayManager:changeDisplayWithName"); if(!ok) return 0; cobj->changeDisplayWithName(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "changeDisplayWithName",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:changeDisplayWithName",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -5955,7 +5955,7 @@ int lua_cocos2dx_studio_DisplayManager_isForceChangeDisplay(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isForceChangeDisplay",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:isForceChangeDisplay",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5999,7 +5999,7 @@ int lua_cocos2dx_studio_DisplayManager_getCurrentDisplayIndex(lua_State* tolua_S tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCurrentDisplayIndex",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:getCurrentDisplayIndex",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6043,7 +6043,7 @@ int lua_cocos2dx_studio_DisplayManager_getAnchorPoint(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnchorPoint",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:getAnchorPoint",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6087,7 +6087,7 @@ int lua_cocos2dx_studio_DisplayManager_getDecorativeDisplayList(lua_State* tolua ccvector_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDecorativeDisplayList",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:getDecorativeDisplayList",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6131,7 +6131,7 @@ int lua_cocos2dx_studio_DisplayManager_isVisible(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isVisible",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:isVisible",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6171,13 +6171,13 @@ int lua_cocos2dx_studio_DisplayManager_setVisible(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccs.DisplayManager:setVisible"); if(!ok) return 0; cobj->setVisible(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVisible",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:setVisible",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6212,7 +6212,7 @@ int lua_cocos2dx_studio_DisplayManager_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.DisplayManager",(cocostudio::DisplayManager*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.DisplayManager:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -6244,7 +6244,7 @@ int lua_cocos2dx_studio_DisplayManager_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.DisplayManager"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "DisplayManager",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:DisplayManager",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6327,7 +6327,7 @@ int lua_cocos2dx_studio_Bone_isTransformDirty(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isTransformDirty",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:isTransformDirty",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6371,7 +6371,7 @@ int lua_cocos2dx_studio_Bone_isIgnoreMovementBoneData(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isIgnoreMovementBoneData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:isIgnoreMovementBoneData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6414,7 +6414,7 @@ int lua_cocos2dx_studio_Bone_updateZOrder(lua_State* tolua_S) cobj->updateZOrder(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateZOrder",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:updateZOrder",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6458,7 +6458,7 @@ int lua_cocos2dx_studio_Bone_getDisplayRenderNode(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDisplayRenderNode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:getDisplayRenderNode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6502,7 +6502,7 @@ int lua_cocos2dx_studio_Bone_isBlendDirty(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isBlendDirty",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:isBlendDirty",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6548,7 +6548,7 @@ int lua_cocos2dx_studio_Bone_addChildBone(lua_State* tolua_S) cobj->addChildBone(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addChildBone",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:addChildBone",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6592,7 +6592,7 @@ int lua_cocos2dx_studio_Bone_getWorldInfo(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.BaseData",(cocostudio::BaseData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getWorldInfo",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:getWorldInfo",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6636,7 +6636,7 @@ int lua_cocos2dx_studio_Bone_getTween(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.Tween",(cocostudio::Tween*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTween",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:getTween",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6680,7 +6680,7 @@ int lua_cocos2dx_studio_Bone_getParentBone(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.Bone",(cocostudio::Bone*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getParentBone",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:getParentBone",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6723,7 +6723,7 @@ int lua_cocos2dx_studio_Bone_updateColor(lua_State* tolua_S) cobj->updateColor(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:updateColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6763,13 +6763,13 @@ int lua_cocos2dx_studio_Bone_setTransformDirty(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccs.Bone:setTransformDirty"); if(!ok) return 0; cobj->setTransformDirty(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTransformDirty",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:setTransformDirty",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6813,7 +6813,7 @@ int lua_cocos2dx_studio_Bone_getDisplayRenderNodeType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDisplayRenderNodeType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:getDisplayRenderNodeType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6853,13 +6853,13 @@ int lua_cocos2dx_studio_Bone_removeDisplay(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.Bone:removeDisplay"); if(!ok) return 0; cobj->removeDisplay(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeDisplay",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:removeDisplay",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6905,7 +6905,7 @@ int lua_cocos2dx_studio_Bone_setBoneData(lua_State* tolua_S) cobj->setBoneData(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBoneData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:setBoneData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6939,7 +6939,7 @@ int lua_cocos2dx_studio_Bone_init(lua_State* tolua_S) do{ if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Bone:init"); if (!ok) { break; } bool ret = cobj->init(arg0); @@ -6956,7 +6956,7 @@ int lua_cocos2dx_studio_Bone_init(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7002,7 +7002,7 @@ int lua_cocos2dx_studio_Bone_setParentBone(lua_State* tolua_S) cobj->setParentBone(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setParentBone",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:setParentBone",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7040,7 +7040,7 @@ int lua_cocos2dx_studio_Bone_addDisplay(lua_State* tolua_S) if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.Bone:addDisplay"); if (!ok) { break; } cobj->addDisplay(arg0, arg1); @@ -7055,7 +7055,7 @@ int lua_cocos2dx_studio_Bone_addDisplay(lua_State* tolua_S) if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.Bone:addDisplay"); if (!ok) { break; } cobj->addDisplay(arg0, arg1); @@ -7063,7 +7063,7 @@ int lua_cocos2dx_studio_Bone_addDisplay(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addDisplay",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:addDisplay",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -7103,13 +7103,13 @@ int lua_cocos2dx_studio_Bone_removeFromParent(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccs.Bone:removeFromParent"); if(!ok) return 0; cobj->removeFromParent(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeFromParent",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:removeFromParent",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7153,7 +7153,7 @@ int lua_cocos2dx_studio_Bone_getColliderDetector(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ColliderDetector",(cocostudio::ColliderDetector*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getColliderDetector",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:getColliderDetector",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7197,7 +7197,7 @@ int lua_cocos2dx_studio_Bone_getChildArmature(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.Armature",(cocostudio::Armature*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getChildArmature",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:getChildArmature",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7241,7 +7241,7 @@ int lua_cocos2dx_studio_Bone_getTweenData(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.FrameData",(cocostudio::FrameData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTweenData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:getTweenData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7282,15 +7282,15 @@ int lua_cocos2dx_studio_Bone_changeDisplayWithIndex(lua_State* tolua_S) int arg0; bool arg1; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.Bone:changeDisplayWithIndex"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccs.Bone:changeDisplayWithIndex"); if(!ok) return 0; cobj->changeDisplayWithIndex(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "changeDisplayWithIndex",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:changeDisplayWithIndex",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -7331,15 +7331,15 @@ int lua_cocos2dx_studio_Bone_changeDisplayWithName(lua_State* tolua_S) std::string arg0; bool arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Bone:changeDisplayWithName"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccs.Bone:changeDisplayWithName"); if(!ok) return 0; cobj->changeDisplayWithName(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "changeDisplayWithName",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:changeDisplayWithName",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -7385,7 +7385,7 @@ int lua_cocos2dx_studio_Bone_setArmature(lua_State* tolua_S) cobj->setArmature(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setArmature",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:setArmature",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7425,13 +7425,13 @@ int lua_cocos2dx_studio_Bone_setBlendDirty(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccs.Bone:setBlendDirty"); if(!ok) return 0; cobj->setBlendDirty(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBlendDirty",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:setBlendDirty",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7474,13 +7474,13 @@ int lua_cocos2dx_studio_Bone_removeChildBone(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "ccs.Bone",&arg0); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccs.Bone:removeChildBone"); if(!ok) return 0; cobj->removeChildBone(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeChildBone",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:removeChildBone",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -7526,7 +7526,7 @@ int lua_cocos2dx_studio_Bone_setChildArmature(lua_State* tolua_S) cobj->setChildArmature(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setChildArmature",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:setChildArmature",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7570,7 +7570,7 @@ int lua_cocos2dx_studio_Bone_getNodeToArmatureTransform(lua_State* tolua_S) mat4_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNodeToArmatureTransform",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:getNodeToArmatureTransform",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7614,7 +7614,7 @@ int lua_cocos2dx_studio_Bone_getDisplayManager(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.DisplayManager",(cocostudio::DisplayManager*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDisplayManager",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:getDisplayManager",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7658,7 +7658,7 @@ int lua_cocos2dx_studio_Bone_getArmature(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.Armature",(cocostudio::Armature*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getArmature",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:getArmature",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7702,7 +7702,7 @@ int lua_cocos2dx_studio_Bone_getBoneData(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.BoneData",(cocostudio::BoneData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBoneData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:getBoneData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7731,7 +7731,7 @@ int lua_cocos2dx_studio_Bone_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Bone:create"); if (!ok) { break; } cocostudio::Bone* ret = cocostudio::Bone::create(arg0); object_to_luaval(tolua_S, "ccs.Bone",(cocostudio::Bone*)ret); @@ -7749,7 +7749,7 @@ int lua_cocos2dx_studio_Bone_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "ccs.Bone:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -7781,7 +7781,7 @@ int lua_cocos2dx_studio_Bone_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.Bone"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "Bone",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:Bone",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7877,7 +7877,7 @@ int lua_cocos2dx_studio_BatchNode_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.BatchNode:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7910,7 +7910,7 @@ int lua_cocos2dx_studio_BatchNode_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.BatchNode",(cocostudio::BatchNode*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.BatchNode:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -7973,7 +7973,7 @@ int lua_cocos2dx_studio_ArmatureAnimation_getSpeedScale(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSpeedScale",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:getSpeedScale",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8016,7 +8016,7 @@ int lua_cocos2dx_studio_ArmatureAnimation_pause(lua_State* tolua_S) cobj->pause(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pause",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:pause",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8056,13 +8056,13 @@ int lua_cocos2dx_studio_ArmatureAnimation_setSpeedScale(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ArmatureAnimation:setSpeedScale"); if(!ok) return 0; cobj->setSpeedScale(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSpeedScale",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:setSpeedScale",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8109,7 +8109,7 @@ int lua_cocos2dx_studio_ArmatureAnimation_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:init",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8149,7 +8149,7 @@ int lua_cocos2dx_studio_ArmatureAnimation_playWithIndexes(lua_State* tolua_S) { std::vector arg0; - ok &= luaval_to_std_vector_int(tolua_S, 2, &arg0); + ok &= luaval_to_std_vector_int(tolua_S, 2, &arg0, "ccs.ArmatureAnimation:playWithIndexes"); if(!ok) return 0; cobj->playWithIndexes(arg0); @@ -8160,9 +8160,9 @@ int lua_cocos2dx_studio_ArmatureAnimation_playWithIndexes(lua_State* tolua_S) std::vector arg0; int arg1; - ok &= luaval_to_std_vector_int(tolua_S, 2, &arg0); + ok &= luaval_to_std_vector_int(tolua_S, 2, &arg0, "ccs.ArmatureAnimation:playWithIndexes"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.ArmatureAnimation:playWithIndexes"); if(!ok) return 0; cobj->playWithIndexes(arg0, arg1); @@ -8174,17 +8174,17 @@ int lua_cocos2dx_studio_ArmatureAnimation_playWithIndexes(lua_State* tolua_S) int arg1; bool arg2; - ok &= luaval_to_std_vector_int(tolua_S, 2, &arg0); + ok &= luaval_to_std_vector_int(tolua_S, 2, &arg0, "ccs.ArmatureAnimation:playWithIndexes"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.ArmatureAnimation:playWithIndexes"); - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "ccs.ArmatureAnimation:playWithIndexes"); if(!ok) return 0; cobj->playWithIndexes(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "playWithIndexes",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:playWithIndexes",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8224,7 +8224,7 @@ int lua_cocos2dx_studio_ArmatureAnimation_play(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureAnimation:play"); if(!ok) return 0; cobj->play(arg0); @@ -8235,9 +8235,9 @@ int lua_cocos2dx_studio_ArmatureAnimation_play(lua_State* tolua_S) std::string arg0; int arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureAnimation:play"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.ArmatureAnimation:play"); if(!ok) return 0; cobj->play(arg0, arg1); @@ -8249,17 +8249,17 @@ int lua_cocos2dx_studio_ArmatureAnimation_play(lua_State* tolua_S) int arg1; int arg2; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureAnimation:play"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.ArmatureAnimation:play"); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "ccs.ArmatureAnimation:play"); if(!ok) return 0; cobj->play(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "play",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:play",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8299,13 +8299,13 @@ int lua_cocos2dx_studio_ArmatureAnimation_gotoAndPause(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ArmatureAnimation:gotoAndPause"); if(!ok) return 0; cobj->gotoAndPause(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "gotoAndPause",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:gotoAndPause",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8348,7 +8348,7 @@ int lua_cocos2dx_studio_ArmatureAnimation_resume(lua_State* tolua_S) cobj->resume(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resume",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:resume",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8391,7 +8391,7 @@ int lua_cocos2dx_studio_ArmatureAnimation_stop(lua_State* tolua_S) cobj->stop(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stop",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:stop",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8431,13 +8431,13 @@ int lua_cocos2dx_studio_ArmatureAnimation_update(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ArmatureAnimation:update"); if(!ok) return 0; cobj->update(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "update",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:update",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8481,7 +8481,7 @@ int lua_cocos2dx_studio_ArmatureAnimation_getAnimationData(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.AnimationData",(cocostudio::AnimationData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnimationData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:getAnimationData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8521,7 +8521,7 @@ int lua_cocos2dx_studio_ArmatureAnimation_playWithIndex(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ArmatureAnimation:playWithIndex"); if(!ok) return 0; cobj->playWithIndex(arg0); @@ -8532,9 +8532,9 @@ int lua_cocos2dx_studio_ArmatureAnimation_playWithIndex(lua_State* tolua_S) int arg0; int arg1; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ArmatureAnimation:playWithIndex"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.ArmatureAnimation:playWithIndex"); if(!ok) return 0; cobj->playWithIndex(arg0, arg1); @@ -8546,17 +8546,17 @@ int lua_cocos2dx_studio_ArmatureAnimation_playWithIndex(lua_State* tolua_S) int arg1; int arg2; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ArmatureAnimation:playWithIndex"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.ArmatureAnimation:playWithIndex"); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "ccs.ArmatureAnimation:playWithIndex"); if(!ok) return 0; cobj->playWithIndex(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "playWithIndex",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:playWithIndex",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8600,7 +8600,7 @@ int lua_cocos2dx_studio_ArmatureAnimation_getCurrentMovementID(lua_State* tolua_ tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCurrentMovementID",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:getCurrentMovementID",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8646,7 +8646,7 @@ int lua_cocos2dx_studio_ArmatureAnimation_setAnimationData(lua_State* tolua_S) cobj->setAnimationData(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAnimationData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:setAnimationData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8686,13 +8686,13 @@ int lua_cocos2dx_studio_ArmatureAnimation_gotoAndPlay(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ArmatureAnimation:gotoAndPlay"); if(!ok) return 0; cobj->gotoAndPlay(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "gotoAndPlay",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:gotoAndPlay",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8732,7 +8732,7 @@ int lua_cocos2dx_studio_ArmatureAnimation_playWithNames(lua_State* tolua_S) { std::vector arg0; - ok &= luaval_to_std_vector_string(tolua_S, 2, &arg0); + ok &= luaval_to_std_vector_string(tolua_S, 2, &arg0, "ccs.ArmatureAnimation:playWithNames"); if(!ok) return 0; cobj->playWithNames(arg0); @@ -8743,9 +8743,9 @@ int lua_cocos2dx_studio_ArmatureAnimation_playWithNames(lua_State* tolua_S) std::vector arg0; int arg1; - ok &= luaval_to_std_vector_string(tolua_S, 2, &arg0); + ok &= luaval_to_std_vector_string(tolua_S, 2, &arg0, "ccs.ArmatureAnimation:playWithNames"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.ArmatureAnimation:playWithNames"); if(!ok) return 0; cobj->playWithNames(arg0, arg1); @@ -8757,17 +8757,17 @@ int lua_cocos2dx_studio_ArmatureAnimation_playWithNames(lua_State* tolua_S) int arg1; bool arg2; - ok &= luaval_to_std_vector_string(tolua_S, 2, &arg0); + ok &= luaval_to_std_vector_string(tolua_S, 2, &arg0, "ccs.ArmatureAnimation:playWithNames"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.ArmatureAnimation:playWithNames"); - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "ccs.ArmatureAnimation:playWithNames"); if(!ok) return 0; cobj->playWithNames(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "playWithNames",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:playWithNames",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8811,7 +8811,7 @@ int lua_cocos2dx_studio_ArmatureAnimation_getMovementCount(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMovementCount",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:getMovementCount",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8846,7 +8846,7 @@ int lua_cocos2dx_studio_ArmatureAnimation_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ArmatureAnimation",(cocostudio::ArmatureAnimation*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ArmatureAnimation:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -8878,7 +8878,7 @@ int lua_cocos2dx_studio_ArmatureAnimation_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ArmatureAnimation"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ArmatureAnimation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:ArmatureAnimation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8960,7 +8960,7 @@ int lua_cocos2dx_studio_ArmatureDataManager_getAnimationDatas(lua_State* tolua_S ccmap_string_key_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnimationDatas",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:getAnimationDatas",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9000,13 +9000,13 @@ int lua_cocos2dx_studio_ArmatureDataManager_removeAnimationData(lua_State* tolua { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:removeAnimationData"); if(!ok) return 0; cobj->removeAnimationData(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAnimationData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:removeAnimationData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9047,7 +9047,7 @@ int lua_cocos2dx_studio_ArmatureDataManager_addArmatureData(lua_State* tolua_S) std::string arg0; cocostudio::ArmatureData* arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addArmatureData"); ok &= luaval_to_object(tolua_S, 3, "ccs.ArmatureData",&arg1); if(!ok) @@ -9061,17 +9061,17 @@ int lua_cocos2dx_studio_ArmatureDataManager_addArmatureData(lua_State* tolua_S) cocostudio::ArmatureData* arg1; std::string arg2; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addArmatureData"); ok &= luaval_to_object(tolua_S, 3, "ccs.ArmatureData",&arg1); - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccs.ArmatureDataManager:addArmatureData"); if(!ok) return 0; cobj->addArmatureData(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addArmatureData",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:addArmatureData",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -9105,15 +9105,15 @@ int lua_cocos2dx_studio_ArmatureDataManager_addArmatureFileInfo(lua_State* tolua do{ if (argc == 3) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addArmatureFileInfo"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccs.ArmatureDataManager:addArmatureFileInfo"); if (!ok) { break; } std::string arg2; - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccs.ArmatureDataManager:addArmatureFileInfo"); if (!ok) { break; } cobj->addArmatureFileInfo(arg0, arg1, arg2); @@ -9124,7 +9124,7 @@ int lua_cocos2dx_studio_ArmatureDataManager_addArmatureFileInfo(lua_State* tolua do{ if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addArmatureFileInfo"); if (!ok) { break; } cobj->addArmatureFileInfo(arg0); @@ -9132,7 +9132,7 @@ int lua_cocos2dx_studio_ArmatureDataManager_addArmatureFileInfo(lua_State* tolua } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addArmatureFileInfo",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:addArmatureFileInfo",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9172,13 +9172,13 @@ int lua_cocos2dx_studio_ArmatureDataManager_removeArmatureFileInfo(lua_State* to { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:removeArmatureFileInfo"); if(!ok) return 0; cobj->removeArmatureFileInfo(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeArmatureFileInfo",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:removeArmatureFileInfo",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9222,7 +9222,7 @@ int lua_cocos2dx_studio_ArmatureDataManager_getTextureDatas(lua_State* tolua_S) ccmap_string_key_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextureDatas",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:getTextureDatas",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9262,14 +9262,14 @@ int lua_cocos2dx_studio_ArmatureDataManager_getTextureData(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:getTextureData"); if(!ok) return 0; cocostudio::TextureData* ret = cobj->getTextureData(arg0); object_to_luaval(tolua_S, "ccs.TextureData",(cocostudio::TextureData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextureData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:getTextureData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9309,14 +9309,14 @@ int lua_cocos2dx_studio_ArmatureDataManager_getArmatureData(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:getArmatureData"); if(!ok) return 0; cocostudio::ArmatureData* ret = cobj->getArmatureData(arg0); object_to_luaval(tolua_S, "ccs.ArmatureData",(cocostudio::ArmatureData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getArmatureData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:getArmatureData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9356,14 +9356,14 @@ int lua_cocos2dx_studio_ArmatureDataManager_getAnimationData(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:getAnimationData"); if(!ok) return 0; cocostudio::AnimationData* ret = cobj->getAnimationData(arg0); object_to_luaval(tolua_S, "ccs.AnimationData",(cocostudio::AnimationData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnimationData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:getAnimationData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9404,7 +9404,7 @@ int lua_cocos2dx_studio_ArmatureDataManager_addAnimationData(lua_State* tolua_S) std::string arg0; cocostudio::AnimationData* arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addAnimationData"); ok &= luaval_to_object(tolua_S, 3, "ccs.AnimationData",&arg1); if(!ok) @@ -9418,17 +9418,17 @@ int lua_cocos2dx_studio_ArmatureDataManager_addAnimationData(lua_State* tolua_S) cocostudio::AnimationData* arg1; std::string arg2; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addAnimationData"); ok &= luaval_to_object(tolua_S, 3, "ccs.AnimationData",&arg1); - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccs.ArmatureDataManager:addAnimationData"); if(!ok) return 0; cobj->addAnimationData(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addAnimationData",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:addAnimationData",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -9472,7 +9472,7 @@ int lua_cocos2dx_studio_ArmatureDataManager_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9512,13 +9512,13 @@ int lua_cocos2dx_studio_ArmatureDataManager_removeArmatureData(lua_State* tolua_ { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:removeArmatureData"); if(!ok) return 0; cobj->removeArmatureData(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeArmatureData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:removeArmatureData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9562,7 +9562,7 @@ int lua_cocos2dx_studio_ArmatureDataManager_getArmatureDatas(lua_State* tolua_S) ccmap_string_key_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getArmatureDatas",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:getArmatureDatas",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9602,13 +9602,13 @@ int lua_cocos2dx_studio_ArmatureDataManager_removeTextureData(lua_State* tolua_S { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:removeTextureData"); if(!ok) return 0; cobj->removeTextureData(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeTextureData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:removeTextureData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9649,7 +9649,7 @@ int lua_cocos2dx_studio_ArmatureDataManager_addTextureData(lua_State* tolua_S) std::string arg0; cocostudio::TextureData* arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addTextureData"); ok &= luaval_to_object(tolua_S, 3, "ccs.TextureData",&arg1); if(!ok) @@ -9663,17 +9663,17 @@ int lua_cocos2dx_studio_ArmatureDataManager_addTextureData(lua_State* tolua_S) cocostudio::TextureData* arg1; std::string arg2; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addTextureData"); ok &= luaval_to_object(tolua_S, 3, "ccs.TextureData",&arg1); - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccs.ArmatureDataManager:addTextureData"); if(!ok) return 0; cobj->addTextureData(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addTextureData",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:addTextureData",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -9717,7 +9717,7 @@ int lua_cocos2dx_studio_ArmatureDataManager_isAutoLoadSpriteFile(lua_State* tolu tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isAutoLoadSpriteFile",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:isAutoLoadSpriteFile",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9758,9 +9758,9 @@ int lua_cocos2dx_studio_ArmatureDataManager_addSpriteFrameFromFile(lua_State* to std::string arg0; std::string arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addSpriteFrameFromFile"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccs.ArmatureDataManager:addSpriteFrameFromFile"); if(!ok) return 0; cobj->addSpriteFrameFromFile(arg0, arg1); @@ -9772,17 +9772,17 @@ int lua_cocos2dx_studio_ArmatureDataManager_addSpriteFrameFromFile(lua_State* to std::string arg1; std::string arg2; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addSpriteFrameFromFile"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccs.ArmatureDataManager:addSpriteFrameFromFile"); - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccs.ArmatureDataManager:addSpriteFrameFromFile"); if(!ok) return 0; cobj->addSpriteFrameFromFile(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addSpriteFrameFromFile",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:addSpriteFrameFromFile",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -9814,7 +9814,7 @@ int lua_cocos2dx_studio_ArmatureDataManager_destroyInstance(lua_State* tolua_S) cocostudio::ArmatureDataManager::destroyInstance(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "destroyInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ArmatureDataManager:destroyInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -9845,7 +9845,7 @@ int lua_cocos2dx_studio_ArmatureDataManager_getInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ArmatureDataManager",(cocostudio::ArmatureDataManager*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ArmatureDataManager:getInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -9921,14 +9921,14 @@ int lua_cocos2dx_studio_Armature_getBone(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Armature:getBone"); if(!ok) return 0; cocostudio::Bone* ret = cobj->getBone(arg0); object_to_luaval(tolua_S, "ccs.Bone",(cocostudio::Bone*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBone",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:getBone",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9971,13 +9971,13 @@ int lua_cocos2dx_studio_Armature_changeBoneParent(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "ccs.Bone",&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccs.Armature:changeBoneParent"); if(!ok) return 0; cobj->changeBoneParent(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "changeBoneParent",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:changeBoneParent",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10023,7 +10023,7 @@ int lua_cocos2dx_studio_Armature_setAnimation(lua_State* tolua_S) cobj->setAnimation(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAnimation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:setAnimation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10064,16 +10064,16 @@ int lua_cocos2dx_studio_Armature_getBoneAtPoint(lua_State* tolua_S) double arg0; double arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.Armature:getBoneAtPoint"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "ccs.Armature:getBoneAtPoint"); if(!ok) return 0; cocostudio::Bone* ret = cobj->getBoneAtPoint(arg0, arg1); object_to_luaval(tolua_S, "ccs.Bone",(cocostudio::Bone*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBoneAtPoint",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:getBoneAtPoint",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10117,7 +10117,7 @@ int lua_cocos2dx_studio_Armature_getArmatureTransformDirty(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getArmatureTransformDirty",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:getArmatureTransformDirty",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10157,13 +10157,13 @@ int lua_cocos2dx_studio_Armature_setVersion(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.Armature:setVersion"); if(!ok) return 0; cobj->setVersion(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVersion",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:setVersion",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10206,7 +10206,7 @@ int lua_cocos2dx_studio_Armature_updateOffsetPoint(lua_State* tolua_S) cobj->updateOffsetPoint(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateOffsetPoint",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:updateOffsetPoint",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10250,7 +10250,7 @@ int lua_cocos2dx_studio_Armature_getParentBone(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.Bone",(cocostudio::Bone*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getParentBone",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:getParentBone",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10293,13 +10293,13 @@ int lua_cocos2dx_studio_Armature_removeBone(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "ccs.Bone",&arg0); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccs.Armature:removeBone"); if(!ok) return 0; cobj->removeBone(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeBone",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:removeBone",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10343,7 +10343,7 @@ int lua_cocos2dx_studio_Armature_getBatchNode(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.BatchNode",(cocostudio::BatchNode*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBatchNode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:getBatchNode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10377,7 +10377,7 @@ int lua_cocos2dx_studio_Armature_init(lua_State* tolua_S) do{ if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Armature:init"); if (!ok) { break; } bool ret = cobj->init(arg0); @@ -10397,7 +10397,7 @@ int lua_cocos2dx_studio_Armature_init(lua_State* tolua_S) do{ if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Armature:init"); if (!ok) { break; } cocostudio::Bone* arg1; @@ -10410,7 +10410,7 @@ int lua_cocos2dx_studio_Armature_init(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:init",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10456,7 +10456,7 @@ int lua_cocos2dx_studio_Armature_setParentBone(lua_State* tolua_S) cobj->setParentBone(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setParentBone",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:setParentBone",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10499,7 +10499,7 @@ int lua_cocos2dx_studio_Armature_drawContour(lua_State* tolua_S) cobj->drawContour(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "drawContour",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:drawContour",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10545,7 +10545,7 @@ int lua_cocos2dx_studio_Armature_setBatchNode(lua_State* tolua_S) cobj->setBatchNode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBatchNode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:setBatchNode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10591,7 +10591,7 @@ int lua_cocos2dx_studio_Armature_setArmatureData(lua_State* tolua_S) cobj->setArmatureData(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setArmatureData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:setArmatureData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10634,13 +10634,13 @@ int lua_cocos2dx_studio_Armature_addBone(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "ccs.Bone",&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccs.Armature:addBone"); if(!ok) return 0; cobj->addBone(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addBone",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:addBone",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10684,7 +10684,7 @@ int lua_cocos2dx_studio_Armature_getArmatureData(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ArmatureData",(cocostudio::ArmatureData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getArmatureData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:getArmatureData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10728,7 +10728,7 @@ int lua_cocos2dx_studio_Armature_getVersion(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVersion",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:getVersion",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10772,7 +10772,7 @@ int lua_cocos2dx_studio_Armature_getAnimation(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ArmatureAnimation",(cocostudio::ArmatureAnimation*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnimation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:getAnimation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10816,7 +10816,7 @@ int lua_cocos2dx_studio_Armature_getBoneDic(lua_State* tolua_S) ccmap_string_key_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBoneDic",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:getBoneDic",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10845,7 +10845,7 @@ int lua_cocos2dx_studio_Armature_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Armature:create"); if (!ok) { break; } cocostudio::Armature* ret = cocostudio::Armature::create(arg0); object_to_luaval(tolua_S, "ccs.Armature",(cocostudio::Armature*)ret); @@ -10868,7 +10868,7 @@ int lua_cocos2dx_studio_Armature_create(lua_State* tolua_S) if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Armature:create"); if (!ok) { break; } cocostudio::Bone* arg1; ok &= luaval_to_object(tolua_S, 3, "ccs.Bone",&arg1); @@ -10879,7 +10879,7 @@ int lua_cocos2dx_studio_Armature_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "ccs.Armature:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -10911,7 +10911,7 @@ int lua_cocos2dx_studio_Armature_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.Armature"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "Armature",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:Armature",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10996,7 +10996,7 @@ int lua_cocos2dx_studio_Skin_getBone(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.Bone",(cocostudio::Bone*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBone",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Skin:getBone",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11040,7 +11040,7 @@ int lua_cocos2dx_studio_Skin_getNodeToWorldTransformAR(lua_State* tolua_S) mat4_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNodeToWorldTransformAR",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Skin:getNodeToWorldTransformAR",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11080,14 +11080,14 @@ int lua_cocos2dx_studio_Skin_initWithFile(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Skin:initWithFile"); if(!ok) return 0; bool ret = cobj->initWithFile(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Skin:initWithFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11131,7 +11131,7 @@ int lua_cocos2dx_studio_Skin_getDisplayName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDisplayName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Skin:getDisplayName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11174,7 +11174,7 @@ int lua_cocos2dx_studio_Skin_updateArmatureTransform(lua_State* tolua_S) cobj->updateArmatureTransform(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateArmatureTransform",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Skin:updateArmatureTransform",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11214,14 +11214,14 @@ int lua_cocos2dx_studio_Skin_initWithSpriteFrameName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Skin:initWithSpriteFrameName"); if(!ok) return 0; bool ret = cobj->initWithSpriteFrameName(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithSpriteFrameName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Skin:initWithSpriteFrameName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11267,7 +11267,7 @@ int lua_cocos2dx_studio_Skin_setBone(lua_State* tolua_S) cobj->setBone(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBone",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Skin:setBone",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11296,7 +11296,7 @@ int lua_cocos2dx_studio_Skin_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Skin:create"); if (!ok) { break; } cocostudio::Skin* ret = cocostudio::Skin::create(arg0); object_to_luaval(tolua_S, "ccs.Skin",(cocostudio::Skin*)ret); @@ -11314,7 +11314,7 @@ int lua_cocos2dx_studio_Skin_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "ccs.Skin:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -11340,14 +11340,14 @@ int lua_cocos2dx_studio_Skin_createWithSpriteFrameName(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Skin:createWithSpriteFrameName"); if(!ok) return 0; cocostudio::Skin* ret = cocostudio::Skin::createWithSpriteFrameName(arg0); object_to_luaval(tolua_S, "ccs.Skin",(cocostudio::Skin*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithSpriteFrameName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.Skin:createWithSpriteFrameName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -11379,7 +11379,7 @@ int lua_cocos2dx_studio_Skin_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.Skin"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "Skin",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Skin:Skin",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11448,7 +11448,7 @@ int lua_cocos2dx_studio_ComAttribute_getFloat(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:getFloat"); if(!ok) return 0; double ret = cobj->getFloat(arg0); @@ -11460,16 +11460,16 @@ int lua_cocos2dx_studio_ComAttribute_getFloat(lua_State* tolua_S) std::string arg0; double arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:getFloat"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "ccs.ComAttribute:getFloat"); if(!ok) return 0; double ret = cobj->getFloat(arg0, arg1); tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFloat",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAttribute:getFloat",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11509,7 +11509,7 @@ int lua_cocos2dx_studio_ComAttribute_getString(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:getString"); if(!ok) return 0; std::string ret = cobj->getString(arg0); @@ -11521,16 +11521,16 @@ int lua_cocos2dx_studio_ComAttribute_getString(lua_State* tolua_S) std::string arg0; std::string arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:getString"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccs.ComAttribute:getString"); if(!ok) return 0; std::string ret = cobj->getString(arg0, arg1); tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getString",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAttribute:getString",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11571,15 +11571,15 @@ int lua_cocos2dx_studio_ComAttribute_setFloat(lua_State* tolua_S) std::string arg0; double arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:setFloat"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "ccs.ComAttribute:setFloat"); if(!ok) return 0; cobj->setFloat(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFloat",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAttribute:setFloat",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -11620,15 +11620,15 @@ int lua_cocos2dx_studio_ComAttribute_setString(lua_State* tolua_S) std::string arg0; std::string arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:setString"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccs.ComAttribute:setString"); if(!ok) return 0; cobj->setString(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setString",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAttribute:setString",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -11668,7 +11668,7 @@ int lua_cocos2dx_studio_ComAttribute_getBool(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:getBool"); if(!ok) return 0; bool ret = cobj->getBool(arg0); @@ -11680,16 +11680,16 @@ int lua_cocos2dx_studio_ComAttribute_getBool(lua_State* tolua_S) std::string arg0; bool arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:getBool"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccs.ComAttribute:getBool"); if(!ok) return 0; bool ret = cobj->getBool(arg0, arg1); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBool",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAttribute:getBool",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11730,15 +11730,15 @@ int lua_cocos2dx_studio_ComAttribute_setInt(lua_State* tolua_S) std::string arg0; int arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:setInt"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.ComAttribute:setInt"); if(!ok) return 0; cobj->setInt(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setInt",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAttribute:setInt",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -11778,14 +11778,14 @@ int lua_cocos2dx_studio_ComAttribute_parse(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:parse"); if(!ok) return 0; bool ret = cobj->parse(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "parse",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAttribute:parse",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11825,7 +11825,7 @@ int lua_cocos2dx_studio_ComAttribute_getInt(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:getInt"); if(!ok) return 0; int ret = cobj->getInt(arg0); @@ -11837,16 +11837,16 @@ int lua_cocos2dx_studio_ComAttribute_getInt(lua_State* tolua_S) std::string arg0; int arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:getInt"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.ComAttribute:getInt"); if(!ok) return 0; int ret = cobj->getInt(arg0, arg1); tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getInt",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAttribute:getInt",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11887,15 +11887,15 @@ int lua_cocos2dx_studio_ComAttribute_setBool(lua_State* tolua_S) std::string arg0; bool arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:setBool"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccs.ComAttribute:setBool"); if(!ok) return 0; cobj->setBool(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBool",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAttribute:setBool",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -11928,7 +11928,7 @@ int lua_cocos2dx_studio_ComAttribute_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ComAttribute",(cocostudio::ComAttribute*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ComAttribute:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -11959,7 +11959,7 @@ int lua_cocos2dx_studio_ComAttribute_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ComAttribute:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -12030,7 +12030,7 @@ int lua_cocos2dx_studio_ComAudio_stopAllEffects(lua_State* tolua_S) cobj->stopAllEffects(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stopAllEffects",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:stopAllEffects",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12074,7 +12074,7 @@ int lua_cocos2dx_studio_ComAudio_getEffectsVolume(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEffectsVolume",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:getEffectsVolume",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12114,13 +12114,13 @@ int lua_cocos2dx_studio_ComAudio_stopEffect(lua_State* tolua_S) { unsigned int arg0; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "ccs.ComAudio:stopEffect"); if(!ok) return 0; cobj->stopEffect(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stopEffect",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:stopEffect",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12164,7 +12164,7 @@ int lua_cocos2dx_studio_ComAudio_getBackgroundMusicVolume(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackgroundMusicVolume",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:getBackgroundMusicVolume",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12208,7 +12208,7 @@ int lua_cocos2dx_studio_ComAudio_willPlayBackgroundMusic(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "willPlayBackgroundMusic",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:willPlayBackgroundMusic",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12248,13 +12248,13 @@ int lua_cocos2dx_studio_ComAudio_setBackgroundMusicVolume(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ComAudio:setBackgroundMusicVolume"); if(!ok) return 0; cobj->setBackgroundMusicVolume(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackgroundMusicVolume",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:setBackgroundMusicVolume",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12297,7 +12297,7 @@ int lua_cocos2dx_studio_ComAudio_end(lua_State* tolua_S) cobj->end(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "end",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:end",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12338,7 +12338,7 @@ int lua_cocos2dx_studio_ComAudio_stopBackgroundMusic(lua_State* tolua_S) do{ if (argc == 1) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccs.ComAudio:stopBackgroundMusic"); if (!ok) { break; } cobj->stopBackgroundMusic(arg0); @@ -12346,7 +12346,7 @@ int lua_cocos2dx_studio_ComAudio_stopBackgroundMusic(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stopBackgroundMusic",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:stopBackgroundMusic",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12389,7 +12389,7 @@ int lua_cocos2dx_studio_ComAudio_pauseBackgroundMusic(lua_State* tolua_S) cobj->pauseBackgroundMusic(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pauseBackgroundMusic",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:pauseBackgroundMusic",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12433,7 +12433,7 @@ int lua_cocos2dx_studio_ComAudio_isBackgroundMusicPlaying(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isBackgroundMusicPlaying",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:isBackgroundMusicPlaying",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12477,7 +12477,7 @@ int lua_cocos2dx_studio_ComAudio_isLoop(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isLoop",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:isLoop",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12520,7 +12520,7 @@ int lua_cocos2dx_studio_ComAudio_resumeAllEffects(lua_State* tolua_S) cobj->resumeAllEffects(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resumeAllEffects",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:resumeAllEffects",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12563,7 +12563,7 @@ int lua_cocos2dx_studio_ComAudio_pauseAllEffects(lua_State* tolua_S) cobj->pauseAllEffects(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pauseAllEffects",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:pauseAllEffects",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12603,13 +12603,13 @@ int lua_cocos2dx_studio_ComAudio_preloadBackgroundMusic(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccs.ComAudio:preloadBackgroundMusic"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->preloadBackgroundMusic(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "preloadBackgroundMusic",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:preloadBackgroundMusic",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12643,7 +12643,7 @@ int lua_cocos2dx_studio_ComAudio_playBackgroundMusic(lua_State* tolua_S) do{ if (argc == 1) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccs.ComAudio:playBackgroundMusic"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } cobj->playBackgroundMusic(arg0); @@ -12654,11 +12654,11 @@ int lua_cocos2dx_studio_ComAudio_playBackgroundMusic(lua_State* tolua_S) do{ if (argc == 2) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccs.ComAudio:playBackgroundMusic"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } bool arg1; - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccs.ComAudio:playBackgroundMusic"); if (!ok) { break; } cobj->playBackgroundMusic(arg0, arg1); @@ -12673,7 +12673,7 @@ int lua_cocos2dx_studio_ComAudio_playBackgroundMusic(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "playBackgroundMusic",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:playBackgroundMusic",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12707,7 +12707,7 @@ int lua_cocos2dx_studio_ComAudio_playEffect(lua_State* tolua_S) do{ if (argc == 1) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccs.ComAudio:playEffect"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } unsigned int ret = cobj->playEffect(arg0); @@ -12719,11 +12719,11 @@ int lua_cocos2dx_studio_ComAudio_playEffect(lua_State* tolua_S) do{ if (argc == 2) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccs.ComAudio:playEffect"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } bool arg1; - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccs.ComAudio:playEffect"); if (!ok) { break; } unsigned int ret = cobj->playEffect(arg0, arg1); @@ -12740,7 +12740,7 @@ int lua_cocos2dx_studio_ComAudio_playEffect(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "playEffect",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:playEffect",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12780,13 +12780,13 @@ int lua_cocos2dx_studio_ComAudio_preloadEffect(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccs.ComAudio:preloadEffect"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->preloadEffect(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "preloadEffect",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:preloadEffect",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12826,13 +12826,13 @@ int lua_cocos2dx_studio_ComAudio_setLoop(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccs.ComAudio:setLoop"); if(!ok) return 0; cobj->setLoop(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLoop",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:setLoop",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12872,13 +12872,13 @@ int lua_cocos2dx_studio_ComAudio_unloadEffect(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccs.ComAudio:unloadEffect"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->unloadEffect(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "unloadEffect",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:unloadEffect",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12921,7 +12921,7 @@ int lua_cocos2dx_studio_ComAudio_rewindBackgroundMusic(lua_State* tolua_S) cobj->rewindBackgroundMusic(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "rewindBackgroundMusic",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:rewindBackgroundMusic",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12961,13 +12961,13 @@ int lua_cocos2dx_studio_ComAudio_pauseEffect(lua_State* tolua_S) { unsigned int arg0; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "ccs.ComAudio:pauseEffect"); if(!ok) return 0; cobj->pauseEffect(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pauseEffect",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:pauseEffect",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13010,7 +13010,7 @@ int lua_cocos2dx_studio_ComAudio_resumeBackgroundMusic(lua_State* tolua_S) cobj->resumeBackgroundMusic(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resumeBackgroundMusic",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:resumeBackgroundMusic",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13050,13 +13050,13 @@ int lua_cocos2dx_studio_ComAudio_setFile(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccs.ComAudio:setFile"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->setFile(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:setFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13096,13 +13096,13 @@ int lua_cocos2dx_studio_ComAudio_setEffectsVolume(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ComAudio:setEffectsVolume"); if(!ok) return 0; cobj->setEffectsVolume(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEffectsVolume",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:setEffectsVolume",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13146,7 +13146,7 @@ int lua_cocos2dx_studio_ComAudio_getFile(lua_State* tolua_S) tolua_pushstring(tolua_S,(const char*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFile",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:getFile",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13186,13 +13186,13 @@ int lua_cocos2dx_studio_ComAudio_resumeEffect(lua_State* tolua_S) { unsigned int arg0; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "ccs.ComAudio:resumeEffect"); if(!ok) return 0; cobj->resumeEffect(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resumeEffect",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:resumeEffect",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13225,7 +13225,7 @@ int lua_cocos2dx_studio_ComAudio_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ComAudio",(cocostudio::ComAudio*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ComAudio:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -13256,7 +13256,7 @@ int lua_cocos2dx_studio_ComAudio_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ComAudio:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -13334,7 +13334,7 @@ int lua_cocos2dx_studio_ComController_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ComController",(cocostudio::ComController*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ComController:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -13365,7 +13365,7 @@ int lua_cocos2dx_studio_ComController_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ComController:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -13397,7 +13397,7 @@ int lua_cocos2dx_studio_ComController_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ComController"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ComController",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComController:ComController",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13465,7 +13465,7 @@ int lua_cocos2dx_studio_ComRender_setNode(lua_State* tolua_S) cobj->setNode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setNode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComRender:setNode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13509,7 +13509,7 @@ int lua_cocos2dx_studio_ComRender_getNode(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComRender:getNode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13541,7 +13541,7 @@ int lua_cocos2dx_studio_ComRender_create(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); if (!ok) { break; } const char* arg1; - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "ccs.ComRender:create"); arg1 = arg1_tmp.c_str(); if (!ok) { break; } cocostudio::ComRender* ret = cocostudio::ComRender::create(arg0, arg1); object_to_luaval(tolua_S, "ccs.ComRender",(cocostudio::ComRender*)ret); @@ -13559,7 +13559,7 @@ int lua_cocos2dx_studio_ComRender_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "ccs.ComRender:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -13590,7 +13590,7 @@ int lua_cocos2dx_studio_ComRender_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ComRender:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -13651,13 +13651,13 @@ int lua_cocos2dx_studio_GUIReader_setFilePath(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.GUIReader:setFilePath"); if(!ok) return 0; cobj->setFilePath(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFilePath",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.GUIReader:setFilePath",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13697,14 +13697,14 @@ int lua_cocos2dx_studio_GUIReader_widgetFromJsonFile(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccs.GUIReader:widgetFromJsonFile"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cocos2d::ui::Widget* ret = cobj->widgetFromJsonFile(arg0); object_to_luaval(tolua_S, "ccui.Widget",(cocos2d::ui::Widget*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "widgetFromJsonFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.GUIReader:widgetFromJsonFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13748,7 +13748,7 @@ int lua_cocos2dx_studio_GUIReader_getFilePath(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFilePath",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.GUIReader:getFilePath",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13788,14 +13788,14 @@ int lua_cocos2dx_studio_GUIReader_widgetFromBinaryFile(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccs.GUIReader:widgetFromBinaryFile"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cocos2d::ui::Widget* ret = cobj->widgetFromBinaryFile(arg0); object_to_luaval(tolua_S, "ccui.Widget",(cocos2d::ui::Widget*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "widgetFromBinaryFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.GUIReader:widgetFromBinaryFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13835,14 +13835,14 @@ int lua_cocos2dx_studio_GUIReader_getVersionInteger(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccs.GUIReader:getVersionInteger"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; int ret = cobj->getVersionInteger(arg0); tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVersionInteger",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.GUIReader:getVersionInteger",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13874,7 +13874,7 @@ int lua_cocos2dx_studio_GUIReader_destroyInstance(lua_State* tolua_S) cocostudio::GUIReader::destroyInstance(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "destroyInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.GUIReader:destroyInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -13905,7 +13905,7 @@ int lua_cocos2dx_studio_GUIReader_getInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.GUIReader",(cocostudio::GUIReader*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.GUIReader:getInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -13979,7 +13979,7 @@ int lua_cocos2dx_studio_SceneReader_setTarget(lua_State* tolua_S) cobj->setTarget(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTarget",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.SceneReader:setTarget",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14019,7 +14019,7 @@ int lua_cocos2dx_studio_SceneReader_createNodeWithSceneFile(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.SceneReader:createNodeWithSceneFile"); if(!ok) return 0; cocos2d::Node* ret = cobj->createNodeWithSceneFile(arg0); @@ -14031,16 +14031,16 @@ int lua_cocos2dx_studio_SceneReader_createNodeWithSceneFile(lua_State* tolua_S) std::string arg0; cocostudio::SceneReader::AttachComponentType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.SceneReader:createNodeWithSceneFile"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.SceneReader:createNodeWithSceneFile"); if(!ok) return 0; cocos2d::Node* ret = cobj->createNodeWithSceneFile(arg0, arg1); object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "createNodeWithSceneFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.SceneReader:createNodeWithSceneFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14084,7 +14084,7 @@ int lua_cocos2dx_studio_SceneReader_getAttachComponentType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAttachComponentType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.SceneReader:getAttachComponentType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14124,14 +14124,14 @@ int lua_cocos2dx_studio_SceneReader_getNodeByTag(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.SceneReader:getNodeByTag"); if(!ok) return 0; cocos2d::Node* ret = cobj->getNodeByTag(arg0); object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNodeByTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.SceneReader:getNodeByTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14163,7 +14163,7 @@ int lua_cocos2dx_studio_SceneReader_destroyInstance(lua_State* tolua_S) cocostudio::SceneReader::destroyInstance(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "destroyInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.SceneReader:destroyInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -14194,7 +14194,7 @@ int lua_cocos2dx_studio_SceneReader_sceneReaderVersion(lua_State* tolua_S) tolua_pushstring(tolua_S,(const char*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "sceneReaderVersion",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.SceneReader:sceneReaderVersion",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -14225,7 +14225,7 @@ int lua_cocos2dx_studio_SceneReader_getInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.SceneReader",(cocostudio::SceneReader*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.SceneReader:getInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -14289,13 +14289,13 @@ int lua_cocos2dx_studio_NodeReader_setJsonPath(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.NodeReader:setJsonPath"); if(!ok) return 0; cobj->setJsonPath(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setJsonPath",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.NodeReader:setJsonPath",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14335,14 +14335,14 @@ int lua_cocos2dx_studio_NodeReader_createNode(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.NodeReader:createNode"); if(!ok) return 0; cocos2d::Node* ret = cobj->createNode(arg0); object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "createNode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.NodeReader:createNode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14382,14 +14382,14 @@ int lua_cocos2dx_studio_NodeReader_loadNodeWithFile(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.NodeReader:loadNodeWithFile"); if(!ok) return 0; cocos2d::Node* ret = cobj->loadNodeWithFile(arg0); object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadNodeWithFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.NodeReader:loadNodeWithFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14432,7 +14432,7 @@ int lua_cocos2dx_studio_NodeReader_purge(lua_State* tolua_S) cobj->purge(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "purge",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.NodeReader:purge",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14475,7 +14475,7 @@ int lua_cocos2dx_studio_NodeReader_init(lua_State* tolua_S) cobj->init(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.NodeReader:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14515,14 +14515,14 @@ int lua_cocos2dx_studio_NodeReader_loadNodeWithContent(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.NodeReader:loadNodeWithContent"); if(!ok) return 0; cocos2d::Node* ret = cobj->loadNodeWithContent(arg0); object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadNodeWithContent",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.NodeReader:loadNodeWithContent",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14566,7 +14566,7 @@ int lua_cocos2dx_studio_NodeReader_isRecordJsonPath(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isRecordJsonPath",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.NodeReader:isRecordJsonPath",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14610,7 +14610,7 @@ int lua_cocos2dx_studio_NodeReader_getJsonPath(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getJsonPath",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.NodeReader:getJsonPath",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14650,13 +14650,13 @@ int lua_cocos2dx_studio_NodeReader_setRecordJsonPath(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccs.NodeReader:setRecordJsonPath"); if(!ok) return 0; cobj->setRecordJsonPath(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRecordJsonPath",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.NodeReader:setRecordJsonPath",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14688,7 +14688,7 @@ int lua_cocos2dx_studio_NodeReader_destroyInstance(lua_State* tolua_S) cocostudio::timeline::NodeReader::destroyInstance(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "destroyInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.NodeReader:destroyInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -14718,7 +14718,7 @@ int lua_cocos2dx_studio_NodeReader_constructor(lua_State* tolua_S) tolua_register_gc(tolua_S,lua_gettop(tolua_S)); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "NodeReader",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.NodeReader:NodeReader",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14788,14 +14788,14 @@ int lua_cocos2dx_studio_ActionTimelineCache_createAction(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ActionTimelineCache:createAction"); if(!ok) return 0; cocostudio::timeline::ActionTimeline* ret = cobj->createAction(arg0); object_to_luaval(tolua_S, "ccs.ActionTimeline",(cocostudio::timeline::ActionTimeline*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "createAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimelineCache:createAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14838,7 +14838,7 @@ int lua_cocos2dx_studio_ActionTimelineCache_purge(lua_State* tolua_S) cobj->purge(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "purge",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimelineCache:purge",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14881,7 +14881,7 @@ int lua_cocos2dx_studio_ActionTimelineCache_init(lua_State* tolua_S) cobj->init(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimelineCache:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14922,16 +14922,16 @@ int lua_cocos2dx_studio_ActionTimelineCache_loadAnimationActionWithContent(lua_S std::string arg0; std::string arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ActionTimelineCache:loadAnimationActionWithContent"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccs.ActionTimelineCache:loadAnimationActionWithContent"); if(!ok) return 0; cocostudio::timeline::ActionTimeline* ret = cobj->loadAnimationActionWithContent(arg0, arg1); object_to_luaval(tolua_S, "ccs.ActionTimeline",(cocostudio::timeline::ActionTimeline*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadAnimationActionWithContent",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimelineCache:loadAnimationActionWithContent",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -14971,14 +14971,14 @@ int lua_cocos2dx_studio_ActionTimelineCache_loadAnimationActionWithFile(lua_Stat { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ActionTimelineCache:loadAnimationActionWithFile"); if(!ok) return 0; cocostudio::timeline::ActionTimeline* ret = cobj->loadAnimationActionWithFile(arg0); object_to_luaval(tolua_S, "ccs.ActionTimeline",(cocostudio::timeline::ActionTimeline*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadAnimationActionWithFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimelineCache:loadAnimationActionWithFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15018,13 +15018,13 @@ int lua_cocos2dx_studio_ActionTimelineCache_removeAction(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ActionTimelineCache:removeAction"); if(!ok) return 0; cobj->removeAction(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimelineCache:removeAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15056,7 +15056,7 @@ int lua_cocos2dx_studio_ActionTimelineCache_destroyInstance(lua_State* tolua_S) cocostudio::timeline::ActionTimelineCache::destroyInstance(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "destroyInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ActionTimelineCache:destroyInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -15124,7 +15124,7 @@ int lua_cocos2dx_studio_Frame_clone(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.Frame",(cocostudio::timeline::Frame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "clone",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Frame:clone",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15170,7 +15170,7 @@ int lua_cocos2dx_studio_Frame_setNode(lua_State* tolua_S) cobj->setNode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setNode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Frame:setNode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15216,7 +15216,7 @@ int lua_cocos2dx_studio_Frame_setTimeline(lua_State* tolua_S) cobj->setTimeline(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTimeline",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Frame:setTimeline",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15260,7 +15260,7 @@ int lua_cocos2dx_studio_Frame_getFrameIndex(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFrameIndex",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Frame:getFrameIndex",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15300,13 +15300,13 @@ int lua_cocos2dx_studio_Frame_apply(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.Frame:apply"); if(!ok) return 0; cobj->apply(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "apply",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Frame:apply",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15350,7 +15350,7 @@ int lua_cocos2dx_studio_Frame_isTween(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isTween",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Frame:isTween",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15390,13 +15390,13 @@ int lua_cocos2dx_studio_Frame_setFrameIndex(lua_State* tolua_S) { unsigned int arg0; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "ccs.Frame:setFrameIndex"); if(!ok) return 0; cobj->setFrameIndex(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFrameIndex",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Frame:setFrameIndex",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15436,13 +15436,13 @@ int lua_cocos2dx_studio_Frame_setTween(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccs.Frame:setTween"); if(!ok) return 0; cobj->setTween(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTween",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Frame:setTween",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15486,7 +15486,7 @@ int lua_cocos2dx_studio_Frame_getTimeline(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.Timeline",(cocostudio::timeline::Timeline*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTimeline",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Frame:getTimeline",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15530,7 +15530,7 @@ int lua_cocos2dx_studio_Frame_getNode(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Frame:getNode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15603,7 +15603,7 @@ int lua_cocos2dx_studio_VisibleFrame_isVisible(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isVisible",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.VisibleFrame:isVisible",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15643,13 +15643,13 @@ int lua_cocos2dx_studio_VisibleFrame_setVisible(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccs.VisibleFrame:setVisible"); if(!ok) return 0; cobj->setVisible(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVisible",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.VisibleFrame:setVisible",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15682,7 +15682,7 @@ int lua_cocos2dx_studio_VisibleFrame_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.VisibleFrame",(cocostudio::timeline::VisibleFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.VisibleFrame:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -15714,7 +15714,7 @@ int lua_cocos2dx_studio_VisibleFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.VisibleFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "VisibleFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.VisibleFrame:VisibleFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15781,7 +15781,7 @@ int lua_cocos2dx_studio_TextureFrame_getTextureName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextureName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.TextureFrame:getTextureName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15827,7 +15827,7 @@ int lua_cocos2dx_studio_TextureFrame_setNode(lua_State* tolua_S) cobj->setNode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setNode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.TextureFrame:setNode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15867,13 +15867,13 @@ int lua_cocos2dx_studio_TextureFrame_setTextureName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.TextureFrame:setTextureName"); if(!ok) return 0; cobj->setTextureName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextureName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.TextureFrame:setTextureName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15906,7 +15906,7 @@ int lua_cocos2dx_studio_TextureFrame_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.TextureFrame",(cocostudio::timeline::TextureFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.TextureFrame:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -15938,7 +15938,7 @@ int lua_cocos2dx_studio_TextureFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.TextureFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TextureFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.TextureFrame:TextureFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16002,13 +16002,13 @@ int lua_cocos2dx_studio_RotationFrame_setRotation(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.RotationFrame:setRotation"); if(!ok) return 0; cobj->setRotation(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRotation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.RotationFrame:setRotation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16052,7 +16052,7 @@ int lua_cocos2dx_studio_RotationFrame_getRotation(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRotation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.RotationFrame:getRotation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16085,7 +16085,7 @@ int lua_cocos2dx_studio_RotationFrame_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.RotationFrame",(cocostudio::timeline::RotationFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.RotationFrame:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -16117,7 +16117,7 @@ int lua_cocos2dx_studio_RotationFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.RotationFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "RotationFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.RotationFrame:RotationFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16184,7 +16184,7 @@ int lua_cocos2dx_studio_SkewFrame_getSkewY(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSkewY",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.SkewFrame:getSkewY",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16224,13 +16224,13 @@ int lua_cocos2dx_studio_SkewFrame_setSkewX(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.SkewFrame:setSkewX"); if(!ok) return 0; cobj->setSkewX(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSkewX",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.SkewFrame:setSkewX",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16270,13 +16270,13 @@ int lua_cocos2dx_studio_SkewFrame_setSkewY(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.SkewFrame:setSkewY"); if(!ok) return 0; cobj->setSkewY(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSkewY",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.SkewFrame:setSkewY",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16320,7 +16320,7 @@ int lua_cocos2dx_studio_SkewFrame_getSkewX(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSkewX",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.SkewFrame:getSkewX",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16353,7 +16353,7 @@ int lua_cocos2dx_studio_SkewFrame_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.SkewFrame",(cocostudio::timeline::SkewFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.SkewFrame:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -16385,7 +16385,7 @@ int lua_cocos2dx_studio_SkewFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.SkewFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "SkewFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.SkewFrame:SkewFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16443,7 +16443,7 @@ int lua_cocos2dx_studio_RotationSkewFrame_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.RotationSkewFrame",(cocostudio::timeline::RotationSkewFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.RotationSkewFrame:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -16475,7 +16475,7 @@ int lua_cocos2dx_studio_RotationSkewFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.RotationSkewFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "RotationSkewFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.RotationSkewFrame:RotationSkewFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16540,7 +16540,7 @@ int lua_cocos2dx_studio_PositionFrame_getX(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getX",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.PositionFrame:getX",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16584,7 +16584,7 @@ int lua_cocos2dx_studio_PositionFrame_getY(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getY",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.PositionFrame:getY",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16624,13 +16624,13 @@ int lua_cocos2dx_studio_PositionFrame_setPosition(lua_State* tolua_S) { cocos2d::Point arg0; - ok &= luaval_to_point(tolua_S, 2, &arg0); + ok &= luaval_to_point(tolua_S, 2, &arg0, "ccs.PositionFrame:setPosition"); if(!ok) return 0; cobj->setPosition(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPosition",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.PositionFrame:setPosition",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16670,13 +16670,13 @@ int lua_cocos2dx_studio_PositionFrame_setX(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.PositionFrame:setX"); if(!ok) return 0; cobj->setX(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setX",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.PositionFrame:setX",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16716,13 +16716,13 @@ int lua_cocos2dx_studio_PositionFrame_setY(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.PositionFrame:setY"); if(!ok) return 0; cobj->setY(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setY",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.PositionFrame:setY",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16766,7 +16766,7 @@ int lua_cocos2dx_studio_PositionFrame_getPosition(lua_State* tolua_S) point_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPosition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.PositionFrame:getPosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16799,7 +16799,7 @@ int lua_cocos2dx_studio_PositionFrame_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.PositionFrame",(cocostudio::timeline::PositionFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.PositionFrame:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -16831,7 +16831,7 @@ int lua_cocos2dx_studio_PositionFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.PositionFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "PositionFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.PositionFrame:PositionFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16898,13 +16898,13 @@ int lua_cocos2dx_studio_ScaleFrame_setScaleY(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ScaleFrame:setScaleY"); if(!ok) return 0; cobj->setScaleY(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScaleY",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ScaleFrame:setScaleY",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16944,13 +16944,13 @@ int lua_cocos2dx_studio_ScaleFrame_setScaleX(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ScaleFrame:setScaleX"); if(!ok) return 0; cobj->setScaleX(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScaleX",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ScaleFrame:setScaleX",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16994,7 +16994,7 @@ int lua_cocos2dx_studio_ScaleFrame_getScaleY(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScaleY",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ScaleFrame:getScaleY",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17038,7 +17038,7 @@ int lua_cocos2dx_studio_ScaleFrame_getScaleX(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScaleX",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ScaleFrame:getScaleX",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17078,13 +17078,13 @@ int lua_cocos2dx_studio_ScaleFrame_setScale(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ScaleFrame:setScale"); if(!ok) return 0; cobj->setScale(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScale",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ScaleFrame:setScale",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -17117,7 +17117,7 @@ int lua_cocos2dx_studio_ScaleFrame_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ScaleFrame",(cocostudio::timeline::ScaleFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ScaleFrame:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -17149,7 +17149,7 @@ int lua_cocos2dx_studio_ScaleFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ScaleFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ScaleFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ScaleFrame:ScaleFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17215,13 +17215,13 @@ int lua_cocos2dx_studio_AnchorPointFrame_setAnchorPoint(lua_State* tolua_S) { cocos2d::Point arg0; - ok &= luaval_to_point(tolua_S, 2, &arg0); + ok &= luaval_to_point(tolua_S, 2, &arg0, "ccs.AnchorPointFrame:setAnchorPoint"); if(!ok) return 0; cobj->setAnchorPoint(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAnchorPoint",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.AnchorPointFrame:setAnchorPoint",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -17265,7 +17265,7 @@ int lua_cocos2dx_studio_AnchorPointFrame_getAnchorPoint(lua_State* tolua_S) point_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnchorPoint",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.AnchorPointFrame:getAnchorPoint",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17298,7 +17298,7 @@ int lua_cocos2dx_studio_AnchorPointFrame_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.AnchorPointFrame",(cocostudio::timeline::AnchorPointFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.AnchorPointFrame:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -17330,7 +17330,7 @@ int lua_cocos2dx_studio_AnchorPointFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.AnchorPointFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "AnchorPointFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.AnchorPointFrame:AnchorPointFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17397,7 +17397,7 @@ int lua_cocos2dx_studio_InnerActionFrame_getInnerActionType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getInnerActionType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.InnerActionFrame:getInnerActionType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17437,13 +17437,13 @@ int lua_cocos2dx_studio_InnerActionFrame_setStartFrameIndex(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.InnerActionFrame:setStartFrameIndex"); if(!ok) return 0; cobj->setStartFrameIndex(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStartFrameIndex",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.InnerActionFrame:setStartFrameIndex",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -17483,13 +17483,13 @@ int lua_cocos2dx_studio_InnerActionFrame_setInnerActionType(lua_State* tolua_S) { cocostudio::timeline::InnerActionType arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.InnerActionFrame:setInnerActionType"); if(!ok) return 0; cobj->setInnerActionType(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setInnerActionType",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.InnerActionFrame:setInnerActionType",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -17533,7 +17533,7 @@ int lua_cocos2dx_studio_InnerActionFrame_getStartFrameIndex(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartFrameIndex",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.InnerActionFrame:getStartFrameIndex",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17566,7 +17566,7 @@ int lua_cocos2dx_studio_InnerActionFrame_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.InnerActionFrame",(cocostudio::timeline::InnerActionFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.InnerActionFrame:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -17598,7 +17598,7 @@ int lua_cocos2dx_studio_InnerActionFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.InnerActionFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "InnerActionFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.InnerActionFrame:InnerActionFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17667,7 +17667,7 @@ int lua_cocos2dx_studio_ColorFrame_getAlpha(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAlpha",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ColorFrame:getAlpha",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17711,7 +17711,7 @@ int lua_cocos2dx_studio_ColorFrame_getColor(lua_State* tolua_S) color3b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ColorFrame:getColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17751,13 +17751,13 @@ int lua_cocos2dx_studio_ColorFrame_setAlpha(lua_State* tolua_S) { uint16_t arg0; - ok &= luaval_to_uint16(tolua_S, 2,&arg0); + ok &= luaval_to_uint16(tolua_S, 2,&arg0, "ccs.ColorFrame:setAlpha"); if(!ok) return 0; cobj->setAlpha(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAlpha",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ColorFrame:setAlpha",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -17797,13 +17797,13 @@ int lua_cocos2dx_studio_ColorFrame_setColor(lua_State* tolua_S) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "ccs.ColorFrame:setColor"); if(!ok) return 0; cobj->setColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ColorFrame:setColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -17836,7 +17836,7 @@ int lua_cocos2dx_studio_ColorFrame_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ColorFrame",(cocostudio::timeline::ColorFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ColorFrame:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -17868,7 +17868,7 @@ int lua_cocos2dx_studio_ColorFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ColorFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ColorFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ColorFrame:ColorFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17933,13 +17933,13 @@ int lua_cocos2dx_studio_EventFrame_setEvent(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.EventFrame:setEvent"); if(!ok) return 0; cobj->setEvent(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEvent",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.EventFrame:setEvent",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -17983,7 +17983,7 @@ int lua_cocos2dx_studio_EventFrame_getEvent(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEvent",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.EventFrame:getEvent",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18016,7 +18016,7 @@ int lua_cocos2dx_studio_EventFrame_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.EventFrame",(cocostudio::timeline::EventFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.EventFrame:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -18048,7 +18048,7 @@ int lua_cocos2dx_studio_EventFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.EventFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "EventFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.EventFrame:EventFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18115,7 +18115,7 @@ int lua_cocos2dx_studio_ZOrderFrame_getZOrder(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getZOrder",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ZOrderFrame:getZOrder",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18155,13 +18155,13 @@ int lua_cocos2dx_studio_ZOrderFrame_setZOrder(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ZOrderFrame:setZOrder"); if(!ok) return 0; cobj->setZOrder(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setZOrder",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ZOrderFrame:setZOrder",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -18194,7 +18194,7 @@ int lua_cocos2dx_studio_ZOrderFrame_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ZOrderFrame",(cocostudio::timeline::ZOrderFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ZOrderFrame:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -18226,7 +18226,7 @@ int lua_cocos2dx_studio_ZOrderFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ZOrderFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ZOrderFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ZOrderFrame:ZOrderFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18293,7 +18293,7 @@ int lua_cocos2dx_studio_Timeline_clone(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.Timeline",(cocostudio::timeline::Timeline*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "clone",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Timeline:clone",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18333,13 +18333,13 @@ int lua_cocos2dx_studio_Timeline_gotoFrame(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.Timeline:gotoFrame"); if(!ok) return 0; cobj->gotoFrame(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "gotoFrame",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Timeline:gotoFrame",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -18385,7 +18385,7 @@ int lua_cocos2dx_studio_Timeline_setNode(lua_State* tolua_S) cobj->setNode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setNode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Timeline:setNode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -18429,7 +18429,7 @@ int lua_cocos2dx_studio_Timeline_getActionTimeline(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ActionTimeline",(cocostudio::timeline::ActionTimeline*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getActionTimeline",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Timeline:getActionTimeline",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18472,13 +18472,13 @@ int lua_cocos2dx_studio_Timeline_insertFrame(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "ccs.Frame",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.Timeline:insertFrame"); if(!ok) return 0; cobj->insertFrame(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "insertFrame",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Timeline:insertFrame",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -18518,13 +18518,13 @@ int lua_cocos2dx_studio_Timeline_setActionTag(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.Timeline:setActionTag"); if(!ok) return 0; cobj->setActionTag(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setActionTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Timeline:setActionTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -18570,7 +18570,7 @@ int lua_cocos2dx_studio_Timeline_addFrame(lua_State* tolua_S) cobj->addFrame(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addFrame",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Timeline:addFrame",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -18614,7 +18614,7 @@ int lua_cocos2dx_studio_Timeline_getFrames(lua_State* tolua_S) ccvector_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFrames",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Timeline:getFrames",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18658,7 +18658,7 @@ int lua_cocos2dx_studio_Timeline_getActionTag(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getActionTag",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Timeline:getActionTag",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18702,7 +18702,7 @@ int lua_cocos2dx_studio_Timeline_getNode(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Timeline:getNode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18748,7 +18748,7 @@ int lua_cocos2dx_studio_Timeline_removeFrame(lua_State* tolua_S) cobj->removeFrame(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeFrame",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Timeline:removeFrame",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -18794,7 +18794,7 @@ int lua_cocos2dx_studio_Timeline_setActionTimeline(lua_State* tolua_S) cobj->setActionTimeline(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setActionTimeline",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Timeline:setActionTimeline",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -18834,13 +18834,13 @@ int lua_cocos2dx_studio_Timeline_stepToFrame(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.Timeline:stepToFrame"); if(!ok) return 0; cobj->stepToFrame(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stepToFrame",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Timeline:stepToFrame",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -18873,7 +18873,7 @@ int lua_cocos2dx_studio_Timeline_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.Timeline",(cocostudio::timeline::Timeline*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.Timeline:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -18905,7 +18905,7 @@ int lua_cocos2dx_studio_Timeline_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.Timeline"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "Timeline",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Timeline:Timeline",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18979,13 +18979,13 @@ int lua_cocos2dx_studio_ActionTimelineData_setActionTag(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ActionTimelineData:setActionTag"); if(!ok) return 0; cobj->setActionTag(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setActionTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimelineData:setActionTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -19029,7 +19029,7 @@ int lua_cocos2dx_studio_ActionTimelineData_getActionTag(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getActionTag",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimelineData:getActionTag",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19057,14 +19057,14 @@ int lua_cocos2dx_studio_ActionTimelineData_create(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ActionTimelineData:create"); if(!ok) return 0; cocostudio::timeline::ActionTimelineData* ret = cocostudio::timeline::ActionTimelineData::create(arg0); object_to_luaval(tolua_S, "ccs.ActionTimelineData",(cocostudio::timeline::ActionTimelineData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ActionTimelineData:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -19128,7 +19128,7 @@ int lua_cocos2dx_studio_ActionTimeline_getTimelines(lua_State* tolua_S) ccvector_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTimelines",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:getTimelines",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19172,7 +19172,7 @@ int lua_cocos2dx_studio_ActionTimeline_getCurrentFrame(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCurrentFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:getCurrentFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19216,7 +19216,7 @@ int lua_cocos2dx_studio_ActionTimeline_getStartFrame(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:getStartFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19259,7 +19259,7 @@ int lua_cocos2dx_studio_ActionTimeline_pause(lua_State* tolua_S) cobj->pause(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pause",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:pause",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19309,7 +19309,7 @@ int lua_cocos2dx_studio_ActionTimeline_setFrameEventCallFunc(lua_State* tolua_S) cobj->setFrameEventCallFunc(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFrameEventCallFunc",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:setFrameEventCallFunc",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -19352,7 +19352,7 @@ int lua_cocos2dx_studio_ActionTimeline_resume(lua_State* tolua_S) cobj->resume(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resume",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:resume",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19396,7 +19396,7 @@ int lua_cocos2dx_studio_ActionTimeline_getDuration(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDuration",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:getDuration",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19442,7 +19442,7 @@ int lua_cocos2dx_studio_ActionTimeline_addTimeline(lua_State* tolua_S) cobj->addTimeline(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addTimeline",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:addTimeline",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -19486,7 +19486,7 @@ int lua_cocos2dx_studio_ActionTimeline_getEndFrame(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEndFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:getEndFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19526,13 +19526,13 @@ int lua_cocos2dx_studio_ActionTimeline_setCurrentFrame(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ActionTimeline:setCurrentFrame"); if(!ok) return 0; cobj->setCurrentFrame(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCurrentFrame",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:setCurrentFrame",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -19572,13 +19572,13 @@ int lua_cocos2dx_studio_ActionTimeline_setTimeSpeed(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionTimeline:setTimeSpeed"); if(!ok) return 0; cobj->setTimeSpeed(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTimeSpeed",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:setTimeSpeed",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -19622,7 +19622,7 @@ int lua_cocos2dx_studio_ActionTimeline_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19662,13 +19662,13 @@ int lua_cocos2dx_studio_ActionTimeline_setDuration(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ActionTimeline:setDuration"); if(!ok) return 0; cobj->setDuration(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDuration",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:setDuration",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -19712,7 +19712,7 @@ int lua_cocos2dx_studio_ActionTimeline_getTimeSpeed(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTimeSpeed",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:getTimeSpeed",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19752,13 +19752,13 @@ int lua_cocos2dx_studio_ActionTimeline_gotoFrameAndPause(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ActionTimeline:gotoFrameAndPause"); if(!ok) return 0; cobj->gotoFrameAndPause(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "gotoFrameAndPause",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:gotoFrameAndPause",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -19802,7 +19802,7 @@ int lua_cocos2dx_studio_ActionTimeline_isPlaying(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isPlaying",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:isPlaying",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19836,11 +19836,11 @@ int lua_cocos2dx_studio_ActionTimeline_gotoFrameAndPlay(lua_State* tolua_S) do{ if (argc == 2) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ActionTimeline:gotoFrameAndPlay"); if (!ok) { break; } bool arg1; - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccs.ActionTimeline:gotoFrameAndPlay"); if (!ok) { break; } cobj->gotoFrameAndPlay(arg0, arg1); @@ -19851,7 +19851,7 @@ int lua_cocos2dx_studio_ActionTimeline_gotoFrameAndPlay(lua_State* tolua_S) do{ if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ActionTimeline:gotoFrameAndPlay"); if (!ok) { break; } cobj->gotoFrameAndPlay(arg0); @@ -19862,15 +19862,15 @@ int lua_cocos2dx_studio_ActionTimeline_gotoFrameAndPlay(lua_State* tolua_S) do{ if (argc == 3) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ActionTimeline:gotoFrameAndPlay"); if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.ActionTimeline:gotoFrameAndPlay"); if (!ok) { break; } bool arg2; - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "ccs.ActionTimeline:gotoFrameAndPlay"); if (!ok) { break; } cobj->gotoFrameAndPlay(arg0, arg1, arg2); @@ -19881,19 +19881,19 @@ int lua_cocos2dx_studio_ActionTimeline_gotoFrameAndPlay(lua_State* tolua_S) do{ if (argc == 4) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ActionTimeline:gotoFrameAndPlay"); if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.ActionTimeline:gotoFrameAndPlay"); if (!ok) { break; } int arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "ccs.ActionTimeline:gotoFrameAndPlay"); if (!ok) { break; } bool arg3; - ok &= luaval_to_boolean(tolua_S, 5,&arg3); + ok &= luaval_to_boolean(tolua_S, 5,&arg3, "ccs.ActionTimeline:gotoFrameAndPlay"); if (!ok) { break; } cobj->gotoFrameAndPlay(arg0, arg1, arg2, arg3); @@ -19901,7 +19901,7 @@ int lua_cocos2dx_studio_ActionTimeline_gotoFrameAndPlay(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "gotoFrameAndPlay",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:gotoFrameAndPlay",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 @@ -19947,7 +19947,7 @@ int lua_cocos2dx_studio_ActionTimeline_removeTimeline(lua_State* tolua_S) cobj->removeTimeline(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeTimeline",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:removeTimeline",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -19990,7 +19990,7 @@ int lua_cocos2dx_studio_ActionTimeline_clearFrameEventCallFunc(lua_State* tolua_ cobj->clearFrameEventCallFunc(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "clearFrameEventCallFunc",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:clearFrameEventCallFunc",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -20023,7 +20023,7 @@ int lua_cocos2dx_studio_ActionTimeline_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ActionTimeline",(cocostudio::timeline::ActionTimeline*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ActionTimeline:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -20055,7 +20055,7 @@ int lua_cocos2dx_studio_ActionTimeline_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ActionTimeline"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ActionTimeline",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:ActionTimeline",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp index 0b309b14cd..f4605cb5be 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp @@ -39,7 +39,7 @@ int lua_cocos2dx_ui_LayoutParameter_clone(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.LayoutParameter",(cocos2d::ui::LayoutParameter*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "clone",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LayoutParameter:clone",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -83,7 +83,7 @@ int lua_cocos2dx_ui_LayoutParameter_getLayoutType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLayoutType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LayoutParameter:getLayoutType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -127,7 +127,7 @@ int lua_cocos2dx_ui_LayoutParameter_createCloneInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.LayoutParameter",(cocos2d::ui::LayoutParameter*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "createCloneInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LayoutParameter:createCloneInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -173,7 +173,7 @@ int lua_cocos2dx_ui_LayoutParameter_copyProperties(lua_State* tolua_S) cobj->copyProperties(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "copyProperties",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LayoutParameter:copyProperties",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -206,7 +206,7 @@ int lua_cocos2dx_ui_LayoutParameter_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.LayoutParameter",(cocos2d::ui::LayoutParameter*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.LayoutParameter:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -238,7 +238,7 @@ int lua_cocos2dx_ui_LayoutParameter_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.LayoutParameter"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "LayoutParameter",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LayoutParameter:LayoutParameter",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -303,13 +303,13 @@ int lua_cocos2dx_ui_LinearLayoutParameter_setGravity(lua_State* tolua_S) { cocos2d::ui::LinearLayoutParameter::LinearGravity arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.LinearLayoutParameter:setGravity"); if(!ok) return 0; cobj->setGravity(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGravity",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LinearLayoutParameter:setGravity",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -353,7 +353,7 @@ int lua_cocos2dx_ui_LinearLayoutParameter_getGravity(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGravity",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LinearLayoutParameter:getGravity",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -386,7 +386,7 @@ int lua_cocos2dx_ui_LinearLayoutParameter_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.LinearLayoutParameter",(cocos2d::ui::LinearLayoutParameter*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.LinearLayoutParameter:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -418,7 +418,7 @@ int lua_cocos2dx_ui_LinearLayoutParameter_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.LinearLayoutParameter"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "LinearLayoutParameter",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LinearLayoutParameter:LinearLayoutParameter",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -481,13 +481,13 @@ int lua_cocos2dx_ui_RelativeLayoutParameter_setAlign(lua_State* tolua_S) { cocos2d::ui::RelativeLayoutParameter::RelativeAlign arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RelativeLayoutParameter:setAlign"); if(!ok) return 0; cobj->setAlign(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAlign",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RelativeLayoutParameter:setAlign",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -527,13 +527,13 @@ int lua_cocos2dx_ui_RelativeLayoutParameter_setRelativeToWidgetName(lua_State* t { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.RelativeLayoutParameter:setRelativeToWidgetName"); if(!ok) return 0; cobj->setRelativeToWidgetName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRelativeToWidgetName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RelativeLayoutParameter:setRelativeToWidgetName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -577,7 +577,7 @@ int lua_cocos2dx_ui_RelativeLayoutParameter_getRelativeName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRelativeName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RelativeLayoutParameter:getRelativeName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -621,7 +621,7 @@ int lua_cocos2dx_ui_RelativeLayoutParameter_getRelativeToWidgetName(lua_State* t tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRelativeToWidgetName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RelativeLayoutParameter:getRelativeToWidgetName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -661,13 +661,13 @@ int lua_cocos2dx_ui_RelativeLayoutParameter_setRelativeName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.RelativeLayoutParameter:setRelativeName"); if(!ok) return 0; cobj->setRelativeName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRelativeName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RelativeLayoutParameter:setRelativeName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -711,7 +711,7 @@ int lua_cocos2dx_ui_RelativeLayoutParameter_getAlign(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAlign",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RelativeLayoutParameter:getAlign",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -744,7 +744,7 @@ int lua_cocos2dx_ui_RelativeLayoutParameter_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.RelativeLayoutParameter",(cocos2d::ui::RelativeLayoutParameter*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.RelativeLayoutParameter:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -776,7 +776,7 @@ int lua_cocos2dx_ui_RelativeLayoutParameter_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.RelativeLayoutParameter"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "RelativeLayoutParameter",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RelativeLayoutParameter:RelativeLayoutParameter",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -843,13 +843,13 @@ int lua_cocos2dx_ui_Widget_setSizePercent(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccui.Widget:setSizePercent"); if(!ok) return 0; cobj->setSizePercent(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSizePercent",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setSizePercent",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -893,7 +893,7 @@ int lua_cocos2dx_ui_Widget_getCustomSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCustomSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getCustomSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -933,13 +933,13 @@ int lua_cocos2dx_ui_Widget_setFlippedY(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Widget:setFlippedY"); if(!ok) return 0; cobj->setFlippedY(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFlippedY",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setFlippedY",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -979,13 +979,13 @@ int lua_cocos2dx_ui_Widget_setFlippedX(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Widget:setFlippedX"); if(!ok) return 0; cobj->setFlippedX(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFlippedX",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setFlippedX",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1029,7 +1029,7 @@ int lua_cocos2dx_ui_Widget_getVirtualRenderer(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVirtualRenderer",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getVirtualRenderer",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1073,7 +1073,7 @@ int lua_cocos2dx_ui_Widget_getSizePercent(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSizePercent",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getSizePercent",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1113,13 +1113,13 @@ int lua_cocos2dx_ui_Widget_setPositionPercent(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccui.Widget:setPositionPercent"); if(!ok) return 0; cobj->setPositionPercent(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPositionPercent",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setPositionPercent",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1163,7 +1163,7 @@ int lua_cocos2dx_ui_Widget_getLayoutSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLayoutSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getLayoutSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1203,13 +1203,13 @@ int lua_cocos2dx_ui_Widget_setHighlighted(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Widget:setHighlighted"); if(!ok) return 0; cobj->setHighlighted(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setHighlighted",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setHighlighted",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1249,13 +1249,13 @@ int lua_cocos2dx_ui_Widget_setPositionType(lua_State* tolua_S) { cocos2d::ui::Widget::PositionType arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.Widget:setPositionType"); if(!ok) return 0; cobj->setPositionType(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPositionType",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setPositionType",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1299,7 +1299,7 @@ int lua_cocos2dx_ui_Widget_isIgnoreContentAdaptWithSize(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isIgnoreContentAdaptWithSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:isIgnoreContentAdaptWithSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1343,7 +1343,7 @@ int lua_cocos2dx_ui_Widget_getVirtualRendererSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVirtualRendererSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getVirtualRendererSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1387,7 +1387,7 @@ int lua_cocos2dx_ui_Widget_isHighlighted(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isHighlighted",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:isHighlighted",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1431,7 +1431,7 @@ int lua_cocos2dx_ui_Widget_getLayoutParameter(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.LayoutParameter",(cocos2d::ui::LayoutParameter*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLayoutParameter",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getLayoutParameter",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1472,7 +1472,7 @@ int lua_cocos2dx_ui_Widget_findNextFocusedWidget(lua_State* tolua_S) cocos2d::ui::Widget::FocusDirection arg0; cocos2d::ui::Widget* arg1; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.Widget:findNextFocusedWidget"); ok &= luaval_to_object(tolua_S, 3, "ccui.Widget",&arg1); if(!ok) @@ -1481,7 +1481,7 @@ int lua_cocos2dx_ui_Widget_findNextFocusedWidget(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.Widget",(cocos2d::ui::Widget*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "findNextFocusedWidget",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:findNextFocusedWidget",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -1525,7 +1525,7 @@ int lua_cocos2dx_ui_Widget_getPositionType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPositionType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getPositionType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1569,7 +1569,7 @@ int lua_cocos2dx_ui_Widget_getTopBoundary(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTopBoundary",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getTopBoundary",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1609,13 +1609,13 @@ int lua_cocos2dx_ui_Widget_ignoreContentAdaptWithSize(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Widget:ignoreContentAdaptWithSize"); if(!ok) return 0; cobj->ignoreContentAdaptWithSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ignoreContentAdaptWithSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:ignoreContentAdaptWithSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1659,7 +1659,7 @@ int lua_cocos2dx_ui_Widget_isEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:isEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1703,7 +1703,7 @@ int lua_cocos2dx_ui_Widget_isFocused(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isFocused",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:isFocused",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1747,7 +1747,7 @@ int lua_cocos2dx_ui_Widget_getTouchBeganPosition(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTouchBeganPosition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getTouchBeganPosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1791,7 +1791,7 @@ int lua_cocos2dx_ui_Widget_isTouchEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isTouchEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:isTouchEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1835,7 +1835,7 @@ int lua_cocos2dx_ui_Widget_getActionTag(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getActionTag",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getActionTag",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1879,7 +1879,7 @@ int lua_cocos2dx_ui_Widget_getWorldPosition(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getWorldPosition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getWorldPosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1919,13 +1919,13 @@ int lua_cocos2dx_ui_Widget_setFocused(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Widget:setFocused"); if(!ok) return 0; cobj->setFocused(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFocused",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setFocused",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1965,13 +1965,13 @@ int lua_cocos2dx_ui_Widget_setActionTag(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.Widget:setActionTag"); if(!ok) return 0; cobj->setActionTag(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setActionTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setActionTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2011,13 +2011,13 @@ int lua_cocos2dx_ui_Widget_setTouchEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Widget:setTouchEnabled"); if(!ok) return 0; cobj->setTouchEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTouchEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setTouchEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2061,7 +2061,7 @@ int lua_cocos2dx_ui_Widget_getLeftBoundary(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLeftBoundary",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getLeftBoundary",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2101,13 +2101,13 @@ int lua_cocos2dx_ui_Widget_setEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Widget:setEnabled"); if(!ok) return 0; cobj->setEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2151,7 +2151,7 @@ int lua_cocos2dx_ui_Widget_getRightBoundary(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRightBoundary",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getRightBoundary",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2191,13 +2191,13 @@ int lua_cocos2dx_ui_Widget_setBrightStyle(lua_State* tolua_S) { cocos2d::ui::Widget::BrightStyle arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.Widget:setBrightStyle"); if(!ok) return 0; cobj->setBrightStyle(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBrightStyle",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setBrightStyle",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2243,7 +2243,7 @@ int lua_cocos2dx_ui_Widget_setLayoutParameter(lua_State* tolua_S) cobj->setLayoutParameter(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLayoutParameter",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setLayoutParameter",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2287,7 +2287,7 @@ int lua_cocos2dx_ui_Widget_clone(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.Widget",(cocos2d::ui::Widget*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "clone",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:clone",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2327,13 +2327,13 @@ int lua_cocos2dx_ui_Widget_setFocusEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Widget:setFocusEnabled"); if(!ok) return 0; cobj->setFocusEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFocusEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setFocusEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2377,7 +2377,7 @@ int lua_cocos2dx_ui_Widget_getBottomBoundary(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBottomBoundary",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getBottomBoundary",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2421,7 +2421,7 @@ int lua_cocos2dx_ui_Widget_isBright(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isBright",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:isBright",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2465,7 +2465,7 @@ int lua_cocos2dx_ui_Widget_getCurrentFocusedWidget(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.Widget",(cocos2d::ui::Widget*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCurrentFocusedWidget",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getCurrentFocusedWidget",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2508,7 +2508,7 @@ int lua_cocos2dx_ui_Widget_requestFocus(lua_State* tolua_S) cobj->requestFocus(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "requestFocus",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:requestFocus",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2542,7 +2542,7 @@ int lua_cocos2dx_ui_Widget_updateSizeAndPosition(lua_State* tolua_S) do{ if (argc == 1) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.Widget:updateSizeAndPosition"); if (!ok) { break; } cobj->updateSizeAndPosition(arg0); @@ -2557,7 +2557,7 @@ int lua_cocos2dx_ui_Widget_updateSizeAndPosition(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateSizeAndPosition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:updateSizeAndPosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2601,7 +2601,7 @@ int lua_cocos2dx_ui_Widget_getTouchMovePosition(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTouchMovePosition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getTouchMovePosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2645,7 +2645,7 @@ int lua_cocos2dx_ui_Widget_getSizeType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSizeType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getSizeType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2695,7 +2695,7 @@ int lua_cocos2dx_ui_Widget_addTouchEventListener(lua_State* tolua_S) cobj->addTouchEventListener(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addTouchEventListener",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:addTouchEventListener",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2739,7 +2739,7 @@ int lua_cocos2dx_ui_Widget_getTouchEndPosition(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTouchEndPosition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getTouchEndPosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2783,7 +2783,7 @@ int lua_cocos2dx_ui_Widget_getPositionPercent(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPositionPercent",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getPositionPercent",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2823,14 +2823,14 @@ int lua_cocos2dx_ui_Widget_hitTest(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccui.Widget:hitTest"); if(!ok) return 0; bool ret = cobj->hitTest(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "hitTest",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:hitTest",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2874,7 +2874,7 @@ int lua_cocos2dx_ui_Widget_isFlippedX(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isFlippedX",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:isFlippedX",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2918,7 +2918,7 @@ int lua_cocos2dx_ui_Widget_isFlippedY(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isFlippedY",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:isFlippedY",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2958,14 +2958,14 @@ int lua_cocos2dx_ui_Widget_isClippingParentContainsPoint(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccui.Widget:isClippingParentContainsPoint"); if(!ok) return 0; bool ret = cobj->isClippingParentContainsPoint(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isClippingParentContainsPoint",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:isClippingParentContainsPoint",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3005,13 +3005,13 @@ int lua_cocos2dx_ui_Widget_setSizeType(lua_State* tolua_S) { cocos2d::ui::Widget::SizeType arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.Widget:setSizeType"); if(!ok) return 0; cobj->setSizeType(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSizeType",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setSizeType",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3051,13 +3051,13 @@ int lua_cocos2dx_ui_Widget_setBright(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Widget:setBright"); if(!ok) return 0; cobj->setBright(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBright",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setBright",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3101,7 +3101,7 @@ int lua_cocos2dx_ui_Widget_isFocusEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isFocusEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:isFocusEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3129,13 +3129,13 @@ int lua_cocos2dx_ui_Widget_enableDpadNavigation(lua_State* tolua_S) if (argc == 1) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Widget:enableDpadNavigation"); if(!ok) return 0; cocos2d::ui::Widget::enableDpadNavigation(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "enableDpadNavigation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.Widget:enableDpadNavigation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -3166,7 +3166,7 @@ int lua_cocos2dx_ui_Widget_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.Widget",(cocos2d::ui::Widget*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.Widget:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -3198,7 +3198,7 @@ int lua_cocos2dx_ui_Widget_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.Widget"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "Widget",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:Widget",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3311,13 +3311,13 @@ int lua_cocos2dx_ui_Layout_setBackGroundColorVector(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccui.Layout:setBackGroundColorVector"); if(!ok) return 0; cobj->setBackGroundColorVector(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackGroundColorVector",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:setBackGroundColorVector",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3357,13 +3357,13 @@ int lua_cocos2dx_ui_Layout_setClippingType(lua_State* tolua_S) { cocos2d::ui::Layout::ClippingType arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.Layout:setClippingType"); if(!ok) return 0; cobj->setClippingType(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setClippingType",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:setClippingType",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3403,13 +3403,13 @@ int lua_cocos2dx_ui_Layout_setBackGroundColorType(lua_State* tolua_S) { cocos2d::ui::Layout::BackGroundColorType arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.Layout:setBackGroundColorType"); if(!ok) return 0; cobj->setBackGroundColorType(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackGroundColorType",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:setBackGroundColorType",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3449,13 +3449,13 @@ int lua_cocos2dx_ui_Layout_setLoopFocus(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Layout:setLoopFocus"); if(!ok) return 0; cobj->setLoopFocus(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLoopFocus",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:setLoopFocus",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3495,13 +3495,13 @@ int lua_cocos2dx_ui_Layout_setBackGroundImageColor(lua_State* tolua_S) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "ccui.Layout:setBackGroundImageColor"); if(!ok) return 0; cobj->setBackGroundImageColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackGroundImageColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:setBackGroundImageColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3545,7 +3545,7 @@ int lua_cocos2dx_ui_Layout_getBackGroundColorVector(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackGroundColorVector",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:getBackGroundColorVector",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3589,7 +3589,7 @@ int lua_cocos2dx_ui_Layout_getClippingType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getClippingType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:getClippingType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3633,7 +3633,7 @@ int lua_cocos2dx_ui_Layout_isLoopFocus(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isLoopFocus",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:isLoopFocus",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3676,7 +3676,7 @@ int lua_cocos2dx_ui_Layout_removeBackGroundImage(lua_State* tolua_S) cobj->removeBackGroundImage(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeBackGroundImage",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:removeBackGroundImage",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3720,7 +3720,7 @@ int lua_cocos2dx_ui_Layout_getBackGroundColorOpacity(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackGroundColorOpacity",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:getBackGroundColorOpacity",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3764,7 +3764,7 @@ int lua_cocos2dx_ui_Layout_isClippingEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isClippingEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:isClippingEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3804,13 +3804,13 @@ int lua_cocos2dx_ui_Layout_setBackGroundImageOpacity(lua_State* tolua_S) { uint16_t arg0; - ok &= luaval_to_uint16(tolua_S, 2,&arg0); + ok &= luaval_to_uint16(tolua_S, 2,&arg0, "ccui.Layout:setBackGroundImageOpacity"); if(!ok) return 0; cobj->setBackGroundImageOpacity(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackGroundImageOpacity",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:setBackGroundImageOpacity",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3850,7 +3850,7 @@ int lua_cocos2dx_ui_Layout_setBackGroundImage(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Layout:setBackGroundImage"); if(!ok) return 0; cobj->setBackGroundImage(arg0); @@ -3861,15 +3861,15 @@ int lua_cocos2dx_ui_Layout_setBackGroundImage(lua_State* tolua_S) std::string arg0; cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Layout:setBackGroundImage"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Layout:setBackGroundImage"); if(!ok) return 0; cobj->setBackGroundImage(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackGroundImage",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:setBackGroundImage",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3903,11 +3903,11 @@ int lua_cocos2dx_ui_Layout_setBackGroundColor(lua_State* tolua_S) do{ if (argc == 2) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "ccui.Layout:setBackGroundColor"); if (!ok) { break; } cocos2d::Color3B arg1; - ok &= luaval_to_color3b(tolua_S, 3, &arg1); + ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.Layout:setBackGroundColor"); if (!ok) { break; } cobj->setBackGroundColor(arg0, arg1); @@ -3918,7 +3918,7 @@ int lua_cocos2dx_ui_Layout_setBackGroundColor(lua_State* tolua_S) do{ if (argc == 1) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "ccui.Layout:setBackGroundColor"); if (!ok) { break; } cobj->setBackGroundColor(arg0); @@ -3926,7 +3926,7 @@ int lua_cocos2dx_ui_Layout_setBackGroundColor(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackGroundColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:setBackGroundColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3969,7 +3969,7 @@ int lua_cocos2dx_ui_Layout_requestDoLayout(lua_State* tolua_S) cobj->requestDoLayout(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "requestDoLayout",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:requestDoLayout",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4013,7 +4013,7 @@ int lua_cocos2dx_ui_Layout_getBackGroundImageCapInsets(lua_State* tolua_S) rect_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackGroundImageCapInsets",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:getBackGroundImageCapInsets",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4057,7 +4057,7 @@ int lua_cocos2dx_ui_Layout_getBackGroundColor(lua_State* tolua_S) color3b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackGroundColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:getBackGroundColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4097,13 +4097,13 @@ int lua_cocos2dx_ui_Layout_setClippingEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Layout:setClippingEnabled"); if(!ok) return 0; cobj->setClippingEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setClippingEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:setClippingEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4147,7 +4147,7 @@ int lua_cocos2dx_ui_Layout_getBackGroundImageColor(lua_State* tolua_S) color3b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackGroundImageColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:getBackGroundImageColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4191,7 +4191,7 @@ int lua_cocos2dx_ui_Layout_isBackGroundImageScale9Enabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isBackGroundImageScale9Enabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:isBackGroundImageScale9Enabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4235,7 +4235,7 @@ int lua_cocos2dx_ui_Layout_getBackGroundColorType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackGroundColorType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:getBackGroundColorType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4279,7 +4279,7 @@ int lua_cocos2dx_ui_Layout_getBackGroundEndColor(lua_State* tolua_S) color3b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackGroundEndColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:getBackGroundEndColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4319,13 +4319,13 @@ int lua_cocos2dx_ui_Layout_setBackGroundColorOpacity(lua_State* tolua_S) { uint16_t arg0; - ok &= luaval_to_uint16(tolua_S, 2,&arg0); + ok &= luaval_to_uint16(tolua_S, 2,&arg0, "ccui.Layout:setBackGroundColorOpacity"); if(!ok) return 0; cobj->setBackGroundColorOpacity(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackGroundColorOpacity",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:setBackGroundColorOpacity",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4369,7 +4369,7 @@ int lua_cocos2dx_ui_Layout_getBackGroundImageOpacity(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackGroundImageOpacity",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:getBackGroundImageOpacity",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4413,7 +4413,7 @@ int lua_cocos2dx_ui_Layout_isPassFocusToChild(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isPassFocusToChild",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:isPassFocusToChild",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4453,13 +4453,13 @@ int lua_cocos2dx_ui_Layout_setBackGroundImageCapInsets(lua_State* tolua_S) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "ccui.Layout:setBackGroundImageCapInsets"); if(!ok) return 0; cobj->setBackGroundImageCapInsets(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackGroundImageCapInsets",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:setBackGroundImageCapInsets",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4503,7 +4503,7 @@ int lua_cocos2dx_ui_Layout_getBackGroundImageTextureSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackGroundImageTextureSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:getBackGroundImageTextureSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4513,6 +4513,49 @@ int lua_cocos2dx_ui_Layout_getBackGroundImageTextureSize(lua_State* tolua_S) return 0; } +int lua_cocos2dx_ui_Layout_forceDoLayout(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Layout* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Layout",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Layout*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Layout_forceDoLayout'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->forceDoLayout(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:forceDoLayout",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Layout_forceDoLayout'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_ui_Layout_getLayoutType(lua_State* tolua_S) { int argc = 0; @@ -4547,7 +4590,7 @@ int lua_cocos2dx_ui_Layout_getLayoutType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLayoutType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:getLayoutType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4587,13 +4630,13 @@ int lua_cocos2dx_ui_Layout_setPassFocusToChild(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Layout:setPassFocusToChild"); if(!ok) return 0; cobj->setPassFocusToChild(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPassFocusToChild",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:setPassFocusToChild",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4637,7 +4680,7 @@ int lua_cocos2dx_ui_Layout_getBackGroundStartColor(lua_State* tolua_S) color3b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackGroundStartColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:getBackGroundStartColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4677,13 +4720,13 @@ int lua_cocos2dx_ui_Layout_setBackGroundImageScale9Enabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Layout:setBackGroundImageScale9Enabled"); if(!ok) return 0; cobj->setBackGroundImageScale9Enabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackGroundImageScale9Enabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:setBackGroundImageScale9Enabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4723,13 +4766,13 @@ int lua_cocos2dx_ui_Layout_setLayoutType(lua_State* tolua_S) { cocos2d::ui::Layout::Type arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.Layout:setLayoutType"); if(!ok) return 0; cobj->setLayoutType(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLayoutType",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:setLayoutType",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4762,7 +4805,7 @@ int lua_cocos2dx_ui_Layout_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.Layout",(cocos2d::ui::Layout*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.Layout:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -4793,7 +4836,7 @@ int lua_cocos2dx_ui_Layout_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.Layout:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -4825,7 +4868,7 @@ int lua_cocos2dx_ui_Layout_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.Layout"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "Layout",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:Layout",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4875,6 +4918,7 @@ int lua_register_cocos2dx_ui_Layout(lua_State* tolua_S) tolua_function(tolua_S,"isPassFocusToChild",lua_cocos2dx_ui_Layout_isPassFocusToChild); tolua_function(tolua_S,"setBackGroundImageCapInsets",lua_cocos2dx_ui_Layout_setBackGroundImageCapInsets); tolua_function(tolua_S,"getBackGroundImageTextureSize",lua_cocos2dx_ui_Layout_getBackGroundImageTextureSize); + tolua_function(tolua_S,"forceDoLayout",lua_cocos2dx_ui_Layout_forceDoLayout); tolua_function(tolua_S,"getLayoutType",lua_cocos2dx_ui_Layout_getLayoutType); tolua_function(tolua_S,"setPassFocusToChild",lua_cocos2dx_ui_Layout_setPassFocusToChild); tolua_function(tolua_S,"getBackGroundStartColor",lua_cocos2dx_ui_Layout_getBackGroundStartColor); @@ -4923,7 +4967,7 @@ int lua_cocos2dx_ui_Button_getTitleText(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTitleText",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:getTitleText",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4963,13 +5007,13 @@ int lua_cocos2dx_ui_Button_setTitleFontSize(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.Button:setTitleFontSize"); if(!ok) return 0; cobj->setTitleFontSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTitleFontSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:setTitleFontSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5009,13 +5053,13 @@ int lua_cocos2dx_ui_Button_setScale9Enabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Button:setScale9Enabled"); if(!ok) return 0; cobj->setScale9Enabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScale9Enabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:setScale9Enabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5059,7 +5103,7 @@ int lua_cocos2dx_ui_Button_getCapInsetsDisabledRenderer(lua_State* tolua_S) rect_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCapInsetsDisabledRenderer",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:getCapInsetsDisabledRenderer",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5099,13 +5143,13 @@ int lua_cocos2dx_ui_Button_setTitleColor(lua_State* tolua_S) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "ccui.Button:setTitleColor"); if(!ok) return 0; cobj->setTitleColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTitleColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:setTitleColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5145,13 +5189,13 @@ int lua_cocos2dx_ui_Button_setCapInsetsDisabledRenderer(lua_State* tolua_S) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "ccui.Button:setCapInsetsDisabledRenderer"); if(!ok) return 0; cobj->setCapInsetsDisabledRenderer(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCapInsetsDisabledRenderer",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:setCapInsetsDisabledRenderer",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5191,13 +5235,13 @@ int lua_cocos2dx_ui_Button_setCapInsets(lua_State* tolua_S) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "ccui.Button:setCapInsets"); if(!ok) return 0; cobj->setCapInsets(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCapInsets",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:setCapInsets",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5237,7 +5281,7 @@ int lua_cocos2dx_ui_Button_loadTextureDisabled(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:loadTextureDisabled"); if(!ok) return 0; cobj->loadTextureDisabled(arg0); @@ -5248,15 +5292,15 @@ int lua_cocos2dx_ui_Button_loadTextureDisabled(lua_State* tolua_S) std::string arg0; cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:loadTextureDisabled"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Button:loadTextureDisabled"); if(!ok) return 0; cobj->loadTextureDisabled(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadTextureDisabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:loadTextureDisabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5296,13 +5340,13 @@ int lua_cocos2dx_ui_Button_setTitleText(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:setTitleText"); if(!ok) return 0; cobj->setTitleText(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTitleText",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:setTitleText",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5342,13 +5386,13 @@ int lua_cocos2dx_ui_Button_setCapInsetsNormalRenderer(lua_State* tolua_S) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "ccui.Button:setCapInsetsNormalRenderer"); if(!ok) return 0; cobj->setCapInsetsNormalRenderer(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCapInsetsNormalRenderer",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:setCapInsetsNormalRenderer",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5388,7 +5432,7 @@ int lua_cocos2dx_ui_Button_loadTexturePressed(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:loadTexturePressed"); if(!ok) return 0; cobj->loadTexturePressed(arg0); @@ -5399,15 +5443,15 @@ int lua_cocos2dx_ui_Button_loadTexturePressed(lua_State* tolua_S) std::string arg0; cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:loadTexturePressed"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Button:loadTexturePressed"); if(!ok) return 0; cobj->loadTexturePressed(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadTexturePressed",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:loadTexturePressed",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5447,13 +5491,13 @@ int lua_cocos2dx_ui_Button_setTitleFontName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:setTitleFontName"); if(!ok) return 0; cobj->setTitleFontName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTitleFontName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:setTitleFontName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5497,7 +5541,7 @@ int lua_cocos2dx_ui_Button_getCapInsetsNormalRenderer(lua_State* tolua_S) rect_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCapInsetsNormalRenderer",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:getCapInsetsNormalRenderer",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5541,7 +5585,7 @@ int lua_cocos2dx_ui_Button_getCapInsetsPressedRenderer(lua_State* tolua_S) rect_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCapInsetsPressedRenderer",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:getCapInsetsPressedRenderer",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5582,9 +5626,9 @@ int lua_cocos2dx_ui_Button_loadTextures(lua_State* tolua_S) std::string arg0; std::string arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:loadTextures"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Button:loadTextures"); if(!ok) return 0; cobj->loadTextures(arg0, arg1); @@ -5596,11 +5640,11 @@ int lua_cocos2dx_ui_Button_loadTextures(lua_State* tolua_S) std::string arg1; std::string arg2; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:loadTextures"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Button:loadTextures"); - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.Button:loadTextures"); if(!ok) return 0; cobj->loadTextures(arg0, arg1, arg2); @@ -5613,19 +5657,19 @@ int lua_cocos2dx_ui_Button_loadTextures(lua_State* tolua_S) std::string arg2; cocos2d::ui::Widget::TextureResType arg3; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:loadTextures"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Button:loadTextures"); - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.Button:loadTextures"); - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "ccui.Button:loadTextures"); if(!ok) return 0; cobj->loadTextures(arg0, arg1, arg2, arg3); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadTextures",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:loadTextures",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -5669,7 +5713,7 @@ int lua_cocos2dx_ui_Button_isScale9Enabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isScale9Enabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:isScale9Enabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5709,7 +5753,7 @@ int lua_cocos2dx_ui_Button_loadTextureNormal(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:loadTextureNormal"); if(!ok) return 0; cobj->loadTextureNormal(arg0); @@ -5720,15 +5764,15 @@ int lua_cocos2dx_ui_Button_loadTextureNormal(lua_State* tolua_S) std::string arg0; cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:loadTextureNormal"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Button:loadTextureNormal"); if(!ok) return 0; cobj->loadTextureNormal(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadTextureNormal",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:loadTextureNormal",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5768,13 +5812,13 @@ int lua_cocos2dx_ui_Button_setCapInsetsPressedRenderer(lua_State* tolua_S) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "ccui.Button:setCapInsetsPressedRenderer"); if(!ok) return 0; cobj->setCapInsetsPressedRenderer(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCapInsetsPressedRenderer",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:setCapInsetsPressedRenderer",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5818,7 +5862,7 @@ int lua_cocos2dx_ui_Button_getTitleFontSize(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTitleFontSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:getTitleFontSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5862,7 +5906,7 @@ int lua_cocos2dx_ui_Button_getTitleFontName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTitleFontName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:getTitleFontName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5906,7 +5950,7 @@ int lua_cocos2dx_ui_Button_getTitleColor(lua_State* tolua_S) color3b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTitleColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:getTitleColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5946,13 +5990,13 @@ int lua_cocos2dx_ui_Button_setPressedActionEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Button:setPressedActionEnabled"); if(!ok) return 0; cobj->setPressedActionEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPressedActionEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:setPressedActionEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5981,7 +6025,7 @@ int lua_cocos2dx_ui_Button_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:create"); if (!ok) { break; } cocos2d::ui::Button* ret = cocos2d::ui::Button::create(arg0); object_to_luaval(tolua_S, "ccui.Button",(cocos2d::ui::Button*)ret); @@ -5994,10 +6038,10 @@ int lua_cocos2dx_ui_Button_create(lua_State* tolua_S) if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Button:create"); if (!ok) { break; } cocos2d::ui::Button* ret = cocos2d::ui::Button::create(arg0, arg1); object_to_luaval(tolua_S, "ccui.Button",(cocos2d::ui::Button*)ret); @@ -6010,13 +6054,13 @@ int lua_cocos2dx_ui_Button_create(lua_State* tolua_S) if (argc == 3) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Button:create"); if (!ok) { break; } std::string arg2; - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.Button:create"); if (!ok) { break; } cocos2d::ui::Button* ret = cocos2d::ui::Button::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "ccui.Button",(cocos2d::ui::Button*)ret); @@ -6029,16 +6073,16 @@ int lua_cocos2dx_ui_Button_create(lua_State* tolua_S) if (argc == 4) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Button:create"); if (!ok) { break; } std::string arg2; - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.Button:create"); if (!ok) { break; } cocos2d::ui::Widget::TextureResType arg3; - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "ccui.Button:create"); if (!ok) { break; } cocos2d::ui::Button* ret = cocos2d::ui::Button::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "ccui.Button",(cocos2d::ui::Button*)ret); @@ -6056,7 +6100,7 @@ int lua_cocos2dx_ui_Button_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "ccui.Button:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -6087,7 +6131,7 @@ int lua_cocos2dx_ui_Button_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.Button:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -6119,7 +6163,7 @@ int lua_cocos2dx_ui_Button_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.Button"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "Button",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:Button",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6207,7 +6251,7 @@ int lua_cocos2dx_ui_CheckBox_getSelectedState(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSelectedState",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.CheckBox:getSelectedState",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6247,7 +6291,7 @@ int lua_cocos2dx_ui_CheckBox_loadTextureBackGroundSelected(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.CheckBox:loadTextureBackGroundSelected"); if(!ok) return 0; cobj->loadTextureBackGroundSelected(arg0); @@ -6258,15 +6302,15 @@ int lua_cocos2dx_ui_CheckBox_loadTextureBackGroundSelected(lua_State* tolua_S) std::string arg0; cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.CheckBox:loadTextureBackGroundSelected"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.CheckBox:loadTextureBackGroundSelected"); if(!ok) return 0; cobj->loadTextureBackGroundSelected(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadTextureBackGroundSelected",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.CheckBox:loadTextureBackGroundSelected",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6306,7 +6350,7 @@ int lua_cocos2dx_ui_CheckBox_loadTextureBackGroundDisabled(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.CheckBox:loadTextureBackGroundDisabled"); if(!ok) return 0; cobj->loadTextureBackGroundDisabled(arg0); @@ -6317,15 +6361,15 @@ int lua_cocos2dx_ui_CheckBox_loadTextureBackGroundDisabled(lua_State* tolua_S) std::string arg0; cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.CheckBox:loadTextureBackGroundDisabled"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.CheckBox:loadTextureBackGroundDisabled"); if(!ok) return 0; cobj->loadTextureBackGroundDisabled(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadTextureBackGroundDisabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.CheckBox:loadTextureBackGroundDisabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6375,7 +6419,7 @@ int lua_cocos2dx_ui_CheckBox_addEventListener(lua_State* tolua_S) cobj->addEventListener(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addEventListener",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.CheckBox:addEventListener",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6415,7 +6459,7 @@ int lua_cocos2dx_ui_CheckBox_loadTextureFrontCross(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.CheckBox:loadTextureFrontCross"); if(!ok) return 0; cobj->loadTextureFrontCross(arg0); @@ -6426,15 +6470,15 @@ int lua_cocos2dx_ui_CheckBox_loadTextureFrontCross(lua_State* tolua_S) std::string arg0; cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.CheckBox:loadTextureFrontCross"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.CheckBox:loadTextureFrontCross"); if(!ok) return 0; cobj->loadTextureFrontCross(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadTextureFrontCross",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.CheckBox:loadTextureFrontCross",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6478,15 +6522,15 @@ int lua_cocos2dx_ui_CheckBox_loadTextures(lua_State* tolua_S) std::string arg3; std::string arg4; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.CheckBox:loadTextures"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.CheckBox:loadTextures"); - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.CheckBox:loadTextures"); - ok &= luaval_to_std_string(tolua_S, 5,&arg3); + ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.CheckBox:loadTextures"); - ok &= luaval_to_std_string(tolua_S, 6,&arg4); + ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.CheckBox:loadTextures"); if(!ok) return 0; cobj->loadTextures(arg0, arg1, arg2, arg3, arg4); @@ -6501,23 +6545,23 @@ int lua_cocos2dx_ui_CheckBox_loadTextures(lua_State* tolua_S) std::string arg4; cocos2d::ui::Widget::TextureResType arg5; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.CheckBox:loadTextures"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.CheckBox:loadTextures"); - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.CheckBox:loadTextures"); - ok &= luaval_to_std_string(tolua_S, 5,&arg3); + ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.CheckBox:loadTextures"); - ok &= luaval_to_std_string(tolua_S, 6,&arg4); + ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.CheckBox:loadTextures"); - ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5); + ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5, "ccui.CheckBox:loadTextures"); if(!ok) return 0; cobj->loadTextures(arg0, arg1, arg2, arg3, arg4, arg5); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadTextures",argc, 5); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.CheckBox:loadTextures",argc, 5); return 0; #if COCOS2D_DEBUG >= 1 @@ -6557,7 +6601,7 @@ int lua_cocos2dx_ui_CheckBox_loadTextureBackGround(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.CheckBox:loadTextureBackGround"); if(!ok) return 0; cobj->loadTextureBackGround(arg0); @@ -6568,15 +6612,15 @@ int lua_cocos2dx_ui_CheckBox_loadTextureBackGround(lua_State* tolua_S) std::string arg0; cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.CheckBox:loadTextureBackGround"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.CheckBox:loadTextureBackGround"); if(!ok) return 0; cobj->loadTextureBackGround(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadTextureBackGround",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.CheckBox:loadTextureBackGround",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6616,13 +6660,13 @@ int lua_cocos2dx_ui_CheckBox_setSelectedState(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.CheckBox:setSelectedState"); if(!ok) return 0; cobj->setSelectedState(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSelectedState",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.CheckBox:setSelectedState",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6662,7 +6706,7 @@ int lua_cocos2dx_ui_CheckBox_loadTextureFrontCrossDisabled(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.CheckBox:loadTextureFrontCrossDisabled"); if(!ok) return 0; cobj->loadTextureFrontCrossDisabled(arg0); @@ -6673,15 +6717,15 @@ int lua_cocos2dx_ui_CheckBox_loadTextureFrontCrossDisabled(lua_State* tolua_S) std::string arg0; cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.CheckBox:loadTextureFrontCrossDisabled"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.CheckBox:loadTextureFrontCrossDisabled"); if(!ok) return 0; cobj->loadTextureFrontCrossDisabled(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadTextureFrontCrossDisabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.CheckBox:loadTextureFrontCrossDisabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6710,19 +6754,19 @@ int lua_cocos2dx_ui_CheckBox_create(lua_State* tolua_S) if (argc == 5) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.CheckBox:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.CheckBox:create"); if (!ok) { break; } std::string arg2; - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.CheckBox:create"); if (!ok) { break; } std::string arg3; - ok &= luaval_to_std_string(tolua_S, 5,&arg3); + ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.CheckBox:create"); if (!ok) { break; } std::string arg4; - ok &= luaval_to_std_string(tolua_S, 6,&arg4); + ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.CheckBox:create"); if (!ok) { break; } cocos2d::ui::CheckBox* ret = cocos2d::ui::CheckBox::create(arg0, arg1, arg2, arg3, arg4); object_to_luaval(tolua_S, "ccui.CheckBox",(cocos2d::ui::CheckBox*)ret); @@ -6735,22 +6779,22 @@ int lua_cocos2dx_ui_CheckBox_create(lua_State* tolua_S) if (argc == 6) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.CheckBox:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.CheckBox:create"); if (!ok) { break; } std::string arg2; - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.CheckBox:create"); if (!ok) { break; } std::string arg3; - ok &= luaval_to_std_string(tolua_S, 5,&arg3); + ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.CheckBox:create"); if (!ok) { break; } std::string arg4; - ok &= luaval_to_std_string(tolua_S, 6,&arg4); + ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.CheckBox:create"); if (!ok) { break; } cocos2d::ui::Widget::TextureResType arg5; - ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5); + ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5, "ccui.CheckBox:create"); if (!ok) { break; } cocos2d::ui::CheckBox* ret = cocos2d::ui::CheckBox::create(arg0, arg1, arg2, arg3, arg4, arg5); object_to_luaval(tolua_S, "ccui.CheckBox",(cocos2d::ui::CheckBox*)ret); @@ -6768,7 +6812,7 @@ int lua_cocos2dx_ui_CheckBox_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "ccui.CheckBox:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -6799,7 +6843,7 @@ int lua_cocos2dx_ui_CheckBox_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.CheckBox:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -6831,7 +6875,7 @@ int lua_cocos2dx_ui_CheckBox_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.CheckBox"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "CheckBox",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.CheckBox:CheckBox",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6902,7 +6946,7 @@ int lua_cocos2dx_ui_ImageView_loadTexture(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.ImageView:loadTexture"); if(!ok) return 0; cobj->loadTexture(arg0); @@ -6913,15 +6957,15 @@ int lua_cocos2dx_ui_ImageView_loadTexture(lua_State* tolua_S) std::string arg0; cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.ImageView:loadTexture"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.ImageView:loadTexture"); if(!ok) return 0; cobj->loadTexture(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ImageView:loadTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6961,13 +7005,13 @@ int lua_cocos2dx_ui_ImageView_setScale9Enabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.ImageView:setScale9Enabled"); if(!ok) return 0; cobj->setScale9Enabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScale9Enabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ImageView:setScale9Enabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7007,13 +7051,13 @@ int lua_cocos2dx_ui_ImageView_setTextureRect(lua_State* tolua_S) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "ccui.ImageView:setTextureRect"); if(!ok) return 0; cobj->setTextureRect(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextureRect",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ImageView:setTextureRect",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7053,13 +7097,13 @@ int lua_cocos2dx_ui_ImageView_setCapInsets(lua_State* tolua_S) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "ccui.ImageView:setCapInsets"); if(!ok) return 0; cobj->setCapInsets(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCapInsets",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ImageView:setCapInsets",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7103,7 +7147,7 @@ int lua_cocos2dx_ui_ImageView_getCapInsets(lua_State* tolua_S) rect_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCapInsets",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ImageView:getCapInsets",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7147,7 +7191,7 @@ int lua_cocos2dx_ui_ImageView_isScale9Enabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isScale9Enabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ImageView:isScale9Enabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7176,7 +7220,7 @@ int lua_cocos2dx_ui_ImageView_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.ImageView:create"); if (!ok) { break; } cocos2d::ui::ImageView* ret = cocos2d::ui::ImageView::create(arg0); object_to_luaval(tolua_S, "ccui.ImageView",(cocos2d::ui::ImageView*)ret); @@ -7189,10 +7233,10 @@ int lua_cocos2dx_ui_ImageView_create(lua_State* tolua_S) if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.ImageView:create"); if (!ok) { break; } cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.ImageView:create"); if (!ok) { break; } cocos2d::ui::ImageView* ret = cocos2d::ui::ImageView::create(arg0, arg1); object_to_luaval(tolua_S, "ccui.ImageView",(cocos2d::ui::ImageView*)ret); @@ -7210,7 +7254,7 @@ int lua_cocos2dx_ui_ImageView_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "ccui.ImageView:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -7241,7 +7285,7 @@ int lua_cocos2dx_ui_ImageView_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.ImageView:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -7273,7 +7317,7 @@ int lua_cocos2dx_ui_ImageView_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.ImageView"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ImageView",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ImageView:ImageView",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7311,7 +7355,7 @@ int lua_register_cocos2dx_ui_ImageView(lua_State* tolua_S) return 1; } -int lua_cocos2dx_ui_Text_getStringLength(lua_State* tolua_S) +int lua_cocos2dx_ui_Text_enableShadow(lua_State* tolua_S) { int argc = 0; cocos2d::ui::Text* cobj = nullptr; @@ -7331,7 +7375,7 @@ int lua_cocos2dx_ui_Text_getStringLength(lua_State* tolua_S) #if COCOS2D_DEBUG >= 1 if (!cobj) { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_getStringLength'", nullptr); + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_enableShadow'", nullptr); return 0; } #endif @@ -7341,16 +7385,275 @@ int lua_cocos2dx_ui_Text_getStringLength(lua_State* tolua_S) { if(!ok) return 0; - ssize_t ret = cobj->getStringLength(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; + cobj->enableShadow(); + return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStringLength",argc, 0); + if (argc == 1) + { + cocos2d::Color4B arg0; + + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "ccui.Text:enableShadow"); + if(!ok) + return 0; + cobj->enableShadow(arg0); + return 0; + } + if (argc == 2) + { + cocos2d::Color4B arg0; + cocos2d::Size arg1; + + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "ccui.Text:enableShadow"); + + ok &= luaval_to_size(tolua_S, 3, &arg1, "ccui.Text:enableShadow"); + if(!ok) + return 0; + cobj->enableShadow(arg0, arg1); + return 0; + } + if (argc == 3) + { + cocos2d::Color4B arg0; + cocos2d::Size arg1; + int arg2; + + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "ccui.Text:enableShadow"); + + ok &= luaval_to_size(tolua_S, 3, &arg1, "ccui.Text:enableShadow"); + + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "ccui.Text:enableShadow"); + if(!ok) + return 0; + cobj->enableShadow(arg0, arg1, arg2); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:enableShadow",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_getStringLength'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_enableShadow'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_ui_Text_getFontSize(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Text* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_getFontSize'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + int ret = cobj->getFontSize(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:getFontSize",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_getFontSize'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_ui_Text_getString(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Text* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_getString'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + const std::string& ret = cobj->getString(); + tolua_pushcppstring(tolua_S,ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:getString",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_getString'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_ui_Text_disableEffect(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Text* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_disableEffect'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->disableEffect(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:disableEffect",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_disableEffect'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_ui_Text_getTextColor(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Text* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_getTextColor'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + const cocos2d::Color4B& ret = cobj->getTextColor(); + color4b_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:getTextColor",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_getTextColor'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_ui_Text_setTextVerticalAlignment(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Text* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_setTextVerticalAlignment'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::TextVAlignment arg0; + + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.Text:setTextVerticalAlignment"); + if(!ok) + return 0; + cobj->setTextVerticalAlignment(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:setTextVerticalAlignment",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_setTextVerticalAlignment'.",&tolua_err); #endif return 0; @@ -7385,13 +7688,13 @@ int lua_cocos2dx_ui_Text_setFontName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Text:setFontName"); if(!ok) return 0; cobj->setFontName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFontName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:setFontName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7431,13 +7734,13 @@ int lua_cocos2dx_ui_Text_setTouchScaleChangeEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Text:setTouchScaleChangeEnabled"); if(!ok) return 0; cobj->setTouchScaleChangeEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTouchScaleChangeEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:setTouchScaleChangeEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7447,279 +7750,6 @@ int lua_cocos2dx_ui_Text_setTouchScaleChangeEnabled(lua_State* tolua_S) return 0; } -int lua_cocos2dx_ui_Text_getFontSize(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::ui::Text* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_getFontSize'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - int ret = cobj->getFontSize(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFontSize",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_getFontSize'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_ui_Text_enableOutline(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::ui::Text* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_enableOutline'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::Color4B arg0; - - ok &=luaval_to_color4b(tolua_S, 2, &arg0); - if(!ok) - return 0; - cobj->enableOutline(arg0); - return 0; - } - if (argc == 2) - { - cocos2d::Color4B arg0; - int arg1; - - ok &=luaval_to_color4b(tolua_S, 2, &arg0); - - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); - if(!ok) - return 0; - cobj->enableOutline(arg0, arg1); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "enableOutline",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_enableOutline'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_ui_Text_getTextVerticalAlignment(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::ui::Text* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_getTextVerticalAlignment'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - int ret = (int)cobj->getTextVerticalAlignment(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextVerticalAlignment",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_getTextVerticalAlignment'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_ui_Text_getString(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::ui::Text* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_getString'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - const std::string& ret = cobj->getString(); - tolua_pushcppstring(tolua_S,ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getString",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_getString'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_ui_Text_enableShadow(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::ui::Text* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_enableShadow'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cobj->enableShadow(); - return 0; - } - if (argc == 1) - { - cocos2d::Color4B arg0; - - ok &=luaval_to_color4b(tolua_S, 2, &arg0); - if(!ok) - return 0; - cobj->enableShadow(arg0); - return 0; - } - if (argc == 2) - { - cocos2d::Color4B arg0; - cocos2d::Size arg1; - - ok &=luaval_to_color4b(tolua_S, 2, &arg0); - - ok &= luaval_to_size(tolua_S, 3, &arg1); - if(!ok) - return 0; - cobj->enableShadow(arg0, arg1); - return 0; - } - if (argc == 3) - { - cocos2d::Color4B arg0; - cocos2d::Size arg1; - int arg2; - - ok &=luaval_to_color4b(tolua_S, 2, &arg0); - - ok &= luaval_to_size(tolua_S, 3, &arg1); - - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); - if(!ok) - return 0; - cobj->enableShadow(arg0, arg1, arg2); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "enableShadow",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_enableShadow'.",&tolua_err); -#endif - - return 0; -} int lua_cocos2dx_ui_Text_setString(lua_State* tolua_S) { int argc = 0; @@ -7750,13 +7780,13 @@ int lua_cocos2dx_ui_Text_setString(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Text:setString"); if(!ok) return 0; cobj->setString(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setString",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:setString",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7766,278 +7796,6 @@ int lua_cocos2dx_ui_Text_setString(lua_State* tolua_S) return 0; } -int lua_cocos2dx_ui_Text_getTextHorizontalAlignment(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::ui::Text* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_getTextHorizontalAlignment'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - int ret = (int)cobj->getTextHorizontalAlignment(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextHorizontalAlignment",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_getTextHorizontalAlignment'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_ui_Text_setTextVerticalAlignment(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::ui::Text* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_setTextVerticalAlignment'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::TextVAlignment arg0; - - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - if(!ok) - return 0; - cobj->setTextVerticalAlignment(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextVerticalAlignment",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_setTextVerticalAlignment'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_ui_Text_enableGlow(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::ui::Text* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_enableGlow'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::Color4B arg0; - - ok &=luaval_to_color4b(tolua_S, 2, &arg0); - if(!ok) - return 0; - cobj->enableGlow(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "enableGlow",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_enableGlow'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_ui_Text_getTextAreaSize(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::ui::Text* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_getTextAreaSize'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - const cocos2d::Size& ret = cobj->getTextAreaSize(); - size_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextAreaSize",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_getTextAreaSize'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_ui_Text_setTextHorizontalAlignment(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::ui::Text* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_setTextHorizontalAlignment'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::TextHAlignment arg0; - - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - if(!ok) - return 0; - cobj->setTextHorizontalAlignment(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextHorizontalAlignment",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_setTextHorizontalAlignment'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_ui_Text_setFontSize(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::ui::Text* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_setFontSize'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - int arg0; - - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - if(!ok) - return 0; - cobj->setFontSize(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFontSize",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_setFontSize'.",&tolua_err); -#endif - - return 0; -} int lua_cocos2dx_ui_Text_isTouchScaleChangeEnabled(lua_State* tolua_S) { int argc = 0; @@ -8072,7 +7830,7 @@ int lua_cocos2dx_ui_Text_isTouchScaleChangeEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isTouchScaleChangeEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:isTouchScaleChangeEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8082,93 +7840,6 @@ int lua_cocos2dx_ui_Text_isTouchScaleChangeEnabled(lua_State* tolua_S) return 0; } -int lua_cocos2dx_ui_Text_getType(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::ui::Text* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_getType'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - int ret = (int)cobj->getType(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getType",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_getType'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_ui_Text_disableEffect(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::ui::Text* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_disableEffect'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cobj->disableEffect(); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "disableEffect",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_disableEffect'.",&tolua_err); -#endif - - return 0; -} int lua_cocos2dx_ui_Text_getFontName(lua_State* tolua_S) { int argc = 0; @@ -8203,7 +7874,7 @@ int lua_cocos2dx_ui_Text_getFontName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFontName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:getFontName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8243,13 +7914,13 @@ int lua_cocos2dx_ui_Text_setTextAreaSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.Text:setTextAreaSize"); if(!ok) return 0; cobj->setTextAreaSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextAreaSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:setTextAreaSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8259,6 +7930,469 @@ int lua_cocos2dx_ui_Text_setTextAreaSize(lua_State* tolua_S) return 0; } +int lua_cocos2dx_ui_Text_getStringLength(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Text* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_getStringLength'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + ssize_t ret = cobj->getStringLength(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:getStringLength",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_getStringLength'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_ui_Text_enableOutline(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Text* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_enableOutline'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Color4B arg0; + + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "ccui.Text:enableOutline"); + if(!ok) + return 0; + cobj->enableOutline(arg0); + return 0; + } + if (argc == 2) + { + cocos2d::Color4B arg0; + int arg1; + + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "ccui.Text:enableOutline"); + + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Text:enableOutline"); + if(!ok) + return 0; + cobj->enableOutline(arg0, arg1); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:enableOutline",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_enableOutline'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_ui_Text_getType(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Text* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_getType'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + int ret = (int)cobj->getType(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:getType",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_getType'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_ui_Text_getTextHorizontalAlignment(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Text* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_getTextHorizontalAlignment'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + int ret = (int)cobj->getTextHorizontalAlignment(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:getTextHorizontalAlignment",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_getTextHorizontalAlignment'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_ui_Text_setFontSize(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Text* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_setFontSize'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + int arg0; + + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.Text:setFontSize"); + if(!ok) + return 0; + cobj->setFontSize(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:setFontSize",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_setFontSize'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_ui_Text_setTextColor(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Text* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_setTextColor'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Color4B arg0; + + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "ccui.Text:setTextColor"); + if(!ok) + return 0; + cobj->setTextColor(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:setTextColor",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_setTextColor'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_ui_Text_enableGlow(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Text* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_enableGlow'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Color4B arg0; + + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "ccui.Text:enableGlow"); + if(!ok) + return 0; + cobj->enableGlow(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:enableGlow",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_enableGlow'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_ui_Text_getTextVerticalAlignment(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Text* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_getTextVerticalAlignment'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + int ret = (int)cobj->getTextVerticalAlignment(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:getTextVerticalAlignment",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_getTextVerticalAlignment'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_ui_Text_getTextAreaSize(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Text* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_getTextAreaSize'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + const cocos2d::Size& ret = cobj->getTextAreaSize(); + size_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:getTextAreaSize",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_getTextAreaSize'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_ui_Text_setTextHorizontalAlignment(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Text* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_setTextHorizontalAlignment'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::TextHAlignment arg0; + + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.Text:setTextHorizontalAlignment"); + if(!ok) + return 0; + cobj->setTextHorizontalAlignment(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:setTextHorizontalAlignment",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_setTextHorizontalAlignment'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_ui_Text_create(lua_State* tolua_S) { int argc = 0; @@ -8278,13 +8412,13 @@ int lua_cocos2dx_ui_Text_create(lua_State* tolua_S) if (argc == 3) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Text:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Text:create"); if (!ok) { break; } int arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "ccui.Text:create"); if (!ok) { break; } cocos2d::ui::Text* ret = cocos2d::ui::Text::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "ccui.Text",(cocos2d::ui::Text*)ret); @@ -8302,7 +8436,7 @@ int lua_cocos2dx_ui_Text_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "ccui.Text:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -8333,7 +8467,7 @@ int lua_cocos2dx_ui_Text_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.Text:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -8365,7 +8499,7 @@ int lua_cocos2dx_ui_Text_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.Text"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "Text",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:Text",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8388,26 +8522,28 @@ int lua_register_cocos2dx_ui_Text(lua_State* tolua_S) tolua_beginmodule(tolua_S,"Text"); tolua_function(tolua_S,"new",lua_cocos2dx_ui_Text_constructor); - tolua_function(tolua_S,"getStringLength",lua_cocos2dx_ui_Text_getStringLength); + tolua_function(tolua_S,"enableShadow",lua_cocos2dx_ui_Text_enableShadow); + tolua_function(tolua_S,"getFontSize",lua_cocos2dx_ui_Text_getFontSize); + tolua_function(tolua_S,"getString",lua_cocos2dx_ui_Text_getString); + tolua_function(tolua_S,"disableEffect",lua_cocos2dx_ui_Text_disableEffect); + tolua_function(tolua_S,"getTextColor",lua_cocos2dx_ui_Text_getTextColor); + tolua_function(tolua_S,"setTextVerticalAlignment",lua_cocos2dx_ui_Text_setTextVerticalAlignment); tolua_function(tolua_S,"setFontName",lua_cocos2dx_ui_Text_setFontName); tolua_function(tolua_S,"setTouchScaleChangeEnabled",lua_cocos2dx_ui_Text_setTouchScaleChangeEnabled); - tolua_function(tolua_S,"getFontSize",lua_cocos2dx_ui_Text_getFontSize); - tolua_function(tolua_S,"enableOutline",lua_cocos2dx_ui_Text_enableOutline); - tolua_function(tolua_S,"getTextVerticalAlignment",lua_cocos2dx_ui_Text_getTextVerticalAlignment); - tolua_function(tolua_S,"getString",lua_cocos2dx_ui_Text_getString); - tolua_function(tolua_S,"enableShadow",lua_cocos2dx_ui_Text_enableShadow); tolua_function(tolua_S,"setString",lua_cocos2dx_ui_Text_setString); - tolua_function(tolua_S,"getTextHorizontalAlignment",lua_cocos2dx_ui_Text_getTextHorizontalAlignment); - tolua_function(tolua_S,"setTextVerticalAlignment",lua_cocos2dx_ui_Text_setTextVerticalAlignment); - tolua_function(tolua_S,"enableGlow",lua_cocos2dx_ui_Text_enableGlow); - tolua_function(tolua_S,"getTextAreaSize",lua_cocos2dx_ui_Text_getTextAreaSize); - tolua_function(tolua_S,"setTextHorizontalAlignment",lua_cocos2dx_ui_Text_setTextHorizontalAlignment); - tolua_function(tolua_S,"setFontSize",lua_cocos2dx_ui_Text_setFontSize); tolua_function(tolua_S,"isTouchScaleChangeEnabled",lua_cocos2dx_ui_Text_isTouchScaleChangeEnabled); - tolua_function(tolua_S,"getType",lua_cocos2dx_ui_Text_getType); - tolua_function(tolua_S,"disableEffect",lua_cocos2dx_ui_Text_disableEffect); tolua_function(tolua_S,"getFontName",lua_cocos2dx_ui_Text_getFontName); tolua_function(tolua_S,"setTextAreaSize",lua_cocos2dx_ui_Text_setTextAreaSize); + tolua_function(tolua_S,"getStringLength",lua_cocos2dx_ui_Text_getStringLength); + tolua_function(tolua_S,"enableOutline",lua_cocos2dx_ui_Text_enableOutline); + tolua_function(tolua_S,"getType",lua_cocos2dx_ui_Text_getType); + tolua_function(tolua_S,"getTextHorizontalAlignment",lua_cocos2dx_ui_Text_getTextHorizontalAlignment); + tolua_function(tolua_S,"setFontSize",lua_cocos2dx_ui_Text_setFontSize); + tolua_function(tolua_S,"setTextColor",lua_cocos2dx_ui_Text_setTextColor); + tolua_function(tolua_S,"enableGlow",lua_cocos2dx_ui_Text_enableGlow); + tolua_function(tolua_S,"getTextVerticalAlignment",lua_cocos2dx_ui_Text_getTextVerticalAlignment); + tolua_function(tolua_S,"getTextAreaSize",lua_cocos2dx_ui_Text_getTextAreaSize); + tolua_function(tolua_S,"setTextHorizontalAlignment",lua_cocos2dx_ui_Text_setTextHorizontalAlignment); tolua_function(tolua_S,"create", lua_cocos2dx_ui_Text_create); tolua_function(tolua_S,"createInstance", lua_cocos2dx_ui_Text_createInstance); tolua_endmodule(tolua_S); @@ -8451,7 +8587,7 @@ int lua_cocos2dx_ui_TextAtlas_getStringLength(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStringLength",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextAtlas:getStringLength",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8495,7 +8631,7 @@ int lua_cocos2dx_ui_TextAtlas_getString(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getString",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextAtlas:getString",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8535,13 +8671,13 @@ int lua_cocos2dx_ui_TextAtlas_setString(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TextAtlas:setString"); if(!ok) return 0; cobj->setString(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setString",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextAtlas:setString",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8585,21 +8721,21 @@ int lua_cocos2dx_ui_TextAtlas_setProperty(lua_State* tolua_S) int arg3; std::string arg4; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TextAtlas:setProperty"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.TextAtlas:setProperty"); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "ccui.TextAtlas:setProperty"); - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "ccui.TextAtlas:setProperty"); - ok &= luaval_to_std_string(tolua_S, 6,&arg4); + ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.TextAtlas:setProperty"); if(!ok) return 0; cobj->setProperty(arg0, arg1, arg2, arg3, arg4); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setProperty",argc, 5); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextAtlas:setProperty",argc, 5); return 0; #if COCOS2D_DEBUG >= 1 @@ -8642,7 +8778,7 @@ int lua_cocos2dx_ui_TextAtlas_adaptRenderers(lua_State* tolua_S) cobj->adaptRenderers(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "adaptRenderers",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextAtlas:adaptRenderers",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8671,19 +8807,19 @@ int lua_cocos2dx_ui_TextAtlas_create(lua_State* tolua_S) if (argc == 5) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TextAtlas:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.TextAtlas:create"); if (!ok) { break; } int arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "ccui.TextAtlas:create"); if (!ok) { break; } int arg3; - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "ccui.TextAtlas:create"); if (!ok) { break; } std::string arg4; - ok &= luaval_to_std_string(tolua_S, 6,&arg4); + ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.TextAtlas:create"); if (!ok) { break; } cocos2d::ui::TextAtlas* ret = cocos2d::ui::TextAtlas::create(arg0, arg1, arg2, arg3, arg4); object_to_luaval(tolua_S, "ccui.TextAtlas",(cocos2d::ui::TextAtlas*)ret); @@ -8701,7 +8837,7 @@ int lua_cocos2dx_ui_TextAtlas_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "ccui.TextAtlas:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -8732,7 +8868,7 @@ int lua_cocos2dx_ui_TextAtlas_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.TextAtlas:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -8764,7 +8900,7 @@ int lua_cocos2dx_ui_TextAtlas_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.TextAtlas"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TextAtlas",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextAtlas:TextAtlas",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8831,13 +8967,13 @@ int lua_cocos2dx_ui_LoadingBar_setPercent(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.LoadingBar:setPercent"); if(!ok) return 0; cobj->setPercent(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPercent",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LoadingBar:setPercent",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8877,7 +9013,7 @@ int lua_cocos2dx_ui_LoadingBar_loadTexture(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.LoadingBar:loadTexture"); if(!ok) return 0; cobj->loadTexture(arg0); @@ -8888,15 +9024,15 @@ int lua_cocos2dx_ui_LoadingBar_loadTexture(lua_State* tolua_S) std::string arg0; cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.LoadingBar:loadTexture"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.LoadingBar:loadTexture"); if(!ok) return 0; cobj->loadTexture(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LoadingBar:loadTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8936,13 +9072,13 @@ int lua_cocos2dx_ui_LoadingBar_setDirection(lua_State* tolua_S) { cocos2d::ui::LoadingBar::Direction arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.LoadingBar:setDirection"); if(!ok) return 0; cobj->setDirection(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDirection",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LoadingBar:setDirection",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8982,13 +9118,13 @@ int lua_cocos2dx_ui_LoadingBar_setScale9Enabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.LoadingBar:setScale9Enabled"); if(!ok) return 0; cobj->setScale9Enabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScale9Enabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LoadingBar:setScale9Enabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9028,13 +9164,13 @@ int lua_cocos2dx_ui_LoadingBar_setCapInsets(lua_State* tolua_S) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "ccui.LoadingBar:setCapInsets"); if(!ok) return 0; cobj->setCapInsets(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCapInsets",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LoadingBar:setCapInsets",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9078,7 +9214,7 @@ int lua_cocos2dx_ui_LoadingBar_getDirection(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDirection",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LoadingBar:getDirection",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9122,7 +9258,7 @@ int lua_cocos2dx_ui_LoadingBar_getCapInsets(lua_State* tolua_S) rect_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCapInsets",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LoadingBar:getCapInsets",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9166,7 +9302,7 @@ int lua_cocos2dx_ui_LoadingBar_isScale9Enabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isScale9Enabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LoadingBar:isScale9Enabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9210,7 +9346,7 @@ int lua_cocos2dx_ui_LoadingBar_getPercent(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPercent",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LoadingBar:getPercent",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9239,7 +9375,7 @@ int lua_cocos2dx_ui_LoadingBar_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.LoadingBar:create"); if (!ok) { break; } cocos2d::ui::LoadingBar* ret = cocos2d::ui::LoadingBar::create(arg0); object_to_luaval(tolua_S, "ccui.LoadingBar",(cocos2d::ui::LoadingBar*)ret); @@ -9252,10 +9388,10 @@ int lua_cocos2dx_ui_LoadingBar_create(lua_State* tolua_S) if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.LoadingBar:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "ccui.LoadingBar:create"); if (!ok) { break; } cocos2d::ui::LoadingBar* ret = cocos2d::ui::LoadingBar::create(arg0, arg1); object_to_luaval(tolua_S, "ccui.LoadingBar",(cocos2d::ui::LoadingBar*)ret); @@ -9273,7 +9409,7 @@ int lua_cocos2dx_ui_LoadingBar_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "ccui.LoadingBar:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -9304,7 +9440,7 @@ int lua_cocos2dx_ui_LoadingBar_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.LoadingBar:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -9336,7 +9472,7 @@ int lua_cocos2dx_ui_LoadingBar_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.LoadingBar"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "LoadingBar",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LoadingBar:LoadingBar",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9408,15 +9544,15 @@ int lua_cocos2dx_ui_ScrollView_scrollToTop(lua_State* tolua_S) double arg0; bool arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.ScrollView:scrollToTop"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccui.ScrollView:scrollToTop"); if(!ok) return 0; cobj->scrollToTop(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "scrollToTop",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:scrollToTop",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -9458,17 +9594,17 @@ int lua_cocos2dx_ui_ScrollView_scrollToPercentHorizontal(lua_State* tolua_S) double arg1; bool arg2; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.ScrollView:scrollToPercentHorizontal"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "ccui.ScrollView:scrollToPercentHorizontal"); - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "ccui.ScrollView:scrollToPercentHorizontal"); if(!ok) return 0; cobj->scrollToPercentHorizontal(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "scrollToPercentHorizontal",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:scrollToPercentHorizontal",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -9512,7 +9648,7 @@ int lua_cocos2dx_ui_ScrollView_isInertiaScrollEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isInertiaScrollEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:isInertiaScrollEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9554,17 +9690,17 @@ int lua_cocos2dx_ui_ScrollView_scrollToPercentBothDirection(lua_State* tolua_S) double arg1; bool arg2; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccui.ScrollView:scrollToPercentBothDirection"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "ccui.ScrollView:scrollToPercentBothDirection"); - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "ccui.ScrollView:scrollToPercentBothDirection"); if(!ok) return 0; cobj->scrollToPercentBothDirection(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "scrollToPercentBothDirection",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:scrollToPercentBothDirection",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -9608,7 +9744,7 @@ int lua_cocos2dx_ui_ScrollView_getDirection(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDirection",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:getDirection",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9649,15 +9785,15 @@ int lua_cocos2dx_ui_ScrollView_scrollToBottomLeft(lua_State* tolua_S) double arg0; bool arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.ScrollView:scrollToBottomLeft"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccui.ScrollView:scrollToBottomLeft"); if(!ok) return 0; cobj->scrollToBottomLeft(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "scrollToBottomLeft",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:scrollToBottomLeft",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -9701,7 +9837,7 @@ int lua_cocos2dx_ui_ScrollView_getInnerContainer(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.Layout",(cocos2d::ui::Layout*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getInnerContainer",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:getInnerContainer",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9744,7 +9880,7 @@ int lua_cocos2dx_ui_ScrollView_jumpToBottom(lua_State* tolua_S) cobj->jumpToBottom(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "jumpToBottom",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:jumpToBottom",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9784,13 +9920,13 @@ int lua_cocos2dx_ui_ScrollView_setDirection(lua_State* tolua_S) { cocos2d::ui::ScrollView::Direction arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.ScrollView:setDirection"); if(!ok) return 0; cobj->setDirection(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDirection",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:setDirection",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9831,15 +9967,15 @@ int lua_cocos2dx_ui_ScrollView_scrollToTopLeft(lua_State* tolua_S) double arg0; bool arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.ScrollView:scrollToTopLeft"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccui.ScrollView:scrollToTopLeft"); if(!ok) return 0; cobj->scrollToTopLeft(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "scrollToTopLeft",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:scrollToTopLeft",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -9882,7 +10018,7 @@ int lua_cocos2dx_ui_ScrollView_jumpToTopRight(lua_State* tolua_S) cobj->jumpToTopRight(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "jumpToTopRight",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:jumpToTopRight",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9925,7 +10061,7 @@ int lua_cocos2dx_ui_ScrollView_jumpToBottomLeft(lua_State* tolua_S) cobj->jumpToBottomLeft(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "jumpToBottomLeft",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:jumpToBottomLeft",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9965,13 +10101,13 @@ int lua_cocos2dx_ui_ScrollView_setInnerContainerSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.ScrollView:setInnerContainerSize"); if(!ok) return 0; cobj->setInnerContainerSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setInnerContainerSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:setInnerContainerSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10015,7 +10151,7 @@ int lua_cocos2dx_ui_ScrollView_getInnerContainerSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getInnerContainerSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:getInnerContainerSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10059,7 +10195,7 @@ int lua_cocos2dx_ui_ScrollView_isBounceEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isBounceEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:isBounceEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10099,13 +10235,13 @@ int lua_cocos2dx_ui_ScrollView_jumpToPercentVertical(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.ScrollView:jumpToPercentVertical"); if(!ok) return 0; cobj->jumpToPercentVertical(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "jumpToPercentVertical",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:jumpToPercentVertical",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10155,7 +10291,7 @@ int lua_cocos2dx_ui_ScrollView_addEventListener(lua_State* tolua_S) cobj->addEventListener(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addEventListener",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:addEventListener",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10195,13 +10331,13 @@ int lua_cocos2dx_ui_ScrollView_setInertiaScrollEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.ScrollView:setInertiaScrollEnabled"); if(!ok) return 0; cobj->setInertiaScrollEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setInertiaScrollEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:setInertiaScrollEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10244,7 +10380,7 @@ int lua_cocos2dx_ui_ScrollView_jumpToTopLeft(lua_State* tolua_S) cobj->jumpToTopLeft(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "jumpToTopLeft",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:jumpToTopLeft",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10284,13 +10420,13 @@ int lua_cocos2dx_ui_ScrollView_jumpToPercentHorizontal(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.ScrollView:jumpToPercentHorizontal"); if(!ok) return 0; cobj->jumpToPercentHorizontal(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "jumpToPercentHorizontal",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:jumpToPercentHorizontal",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10333,7 +10469,7 @@ int lua_cocos2dx_ui_ScrollView_jumpToBottomRight(lua_State* tolua_S) cobj->jumpToBottomRight(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "jumpToBottomRight",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:jumpToBottomRight",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10373,13 +10509,13 @@ int lua_cocos2dx_ui_ScrollView_setBounceEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.ScrollView:setBounceEnabled"); if(!ok) return 0; cobj->setBounceEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBounceEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:setBounceEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10422,7 +10558,7 @@ int lua_cocos2dx_ui_ScrollView_jumpToTop(lua_State* tolua_S) cobj->jumpToTop(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "jumpToTop",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:jumpToTop",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10463,15 +10599,15 @@ int lua_cocos2dx_ui_ScrollView_scrollToLeft(lua_State* tolua_S) double arg0; bool arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.ScrollView:scrollToLeft"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccui.ScrollView:scrollToLeft"); if(!ok) return 0; cobj->scrollToLeft(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "scrollToLeft",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:scrollToLeft",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10511,13 +10647,13 @@ int lua_cocos2dx_ui_ScrollView_jumpToPercentBothDirection(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccui.ScrollView:jumpToPercentBothDirection"); if(!ok) return 0; cobj->jumpToPercentBothDirection(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "jumpToPercentBothDirection",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:jumpToPercentBothDirection",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10559,17 +10695,17 @@ int lua_cocos2dx_ui_ScrollView_scrollToPercentVertical(lua_State* tolua_S) double arg1; bool arg2; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.ScrollView:scrollToPercentVertical"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "ccui.ScrollView:scrollToPercentVertical"); - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "ccui.ScrollView:scrollToPercentVertical"); if(!ok) return 0; cobj->scrollToPercentVertical(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "scrollToPercentVertical",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:scrollToPercentVertical",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -10610,15 +10746,15 @@ int lua_cocos2dx_ui_ScrollView_scrollToBottom(lua_State* tolua_S) double arg0; bool arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.ScrollView:scrollToBottom"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccui.ScrollView:scrollToBottom"); if(!ok) return 0; cobj->scrollToBottom(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "scrollToBottom",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:scrollToBottom",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10659,15 +10795,15 @@ int lua_cocos2dx_ui_ScrollView_scrollToBottomRight(lua_State* tolua_S) double arg0; bool arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.ScrollView:scrollToBottomRight"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccui.ScrollView:scrollToBottomRight"); if(!ok) return 0; cobj->scrollToBottomRight(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "scrollToBottomRight",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:scrollToBottomRight",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10710,7 +10846,7 @@ int lua_cocos2dx_ui_ScrollView_jumpToLeft(lua_State* tolua_S) cobj->jumpToLeft(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "jumpToLeft",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:jumpToLeft",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10751,15 +10887,15 @@ int lua_cocos2dx_ui_ScrollView_scrollToRight(lua_State* tolua_S) double arg0; bool arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.ScrollView:scrollToRight"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccui.ScrollView:scrollToRight"); if(!ok) return 0; cobj->scrollToRight(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "scrollToRight",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:scrollToRight",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10802,7 +10938,7 @@ int lua_cocos2dx_ui_ScrollView_jumpToRight(lua_State* tolua_S) cobj->jumpToRight(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "jumpToRight",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:jumpToRight",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10843,15 +10979,15 @@ int lua_cocos2dx_ui_ScrollView_scrollToTopRight(lua_State* tolua_S) double arg0; bool arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.ScrollView:scrollToTopRight"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccui.ScrollView:scrollToTopRight"); if(!ok) return 0; cobj->scrollToTopRight(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "scrollToTopRight",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:scrollToTopRight",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10884,7 +11020,7 @@ int lua_cocos2dx_ui_ScrollView_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.ScrollView",(cocos2d::ui::ScrollView*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.ScrollView:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -10915,7 +11051,7 @@ int lua_cocos2dx_ui_ScrollView_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.ScrollView:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -10947,7 +11083,7 @@ int lua_cocos2dx_ui_ScrollView_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.ScrollView"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ScrollView",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:ScrollView",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11048,7 +11184,7 @@ int lua_cocos2dx_ui_ListView_getIndex(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getIndex",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:getIndex",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11091,7 +11227,7 @@ int lua_cocos2dx_ui_ListView_removeAllItems(lua_State* tolua_S) cobj->removeAllItems(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllItems",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:removeAllItems",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11131,13 +11267,13 @@ int lua_cocos2dx_ui_ListView_setGravity(lua_State* tolua_S) { cocos2d::ui::ListView::Gravity arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.ListView:setGravity"); if(!ok) return 0; cobj->setGravity(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGravity",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:setGravity",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11183,7 +11319,7 @@ int lua_cocos2dx_ui_ListView_pushBackCustomItem(lua_State* tolua_S) cobj->pushBackCustomItem(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pushBackCustomItem",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:pushBackCustomItem",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11227,7 +11363,7 @@ int lua_cocos2dx_ui_ListView_getItems(lua_State* tolua_S) ccvector_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getItems",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:getItems",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11267,13 +11403,13 @@ int lua_cocos2dx_ui_ListView_removeItem(lua_State* tolua_S) { ssize_t arg0; - ok &= luaval_to_ssize(tolua_S, 2, &arg0); + ok &= luaval_to_ssize(tolua_S, 2, &arg0, "ccui.ListView:removeItem"); if(!ok) return 0; cobj->removeItem(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeItem",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:removeItem",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11317,7 +11453,7 @@ int lua_cocos2dx_ui_ListView_getCurSelectedIndex(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCurSelectedIndex",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:getCurSelectedIndex",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11357,13 +11493,13 @@ int lua_cocos2dx_ui_ListView_insertDefaultItem(lua_State* tolua_S) { ssize_t arg0; - ok &= luaval_to_ssize(tolua_S, 2, &arg0); + ok &= luaval_to_ssize(tolua_S, 2, &arg0, "ccui.ListView:insertDefaultItem"); if(!ok) return 0; cobj->insertDefaultItem(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "insertDefaultItem",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:insertDefaultItem",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11406,7 +11542,7 @@ int lua_cocos2dx_ui_ListView_requestRefreshView(lua_State* tolua_S) cobj->requestRefreshView(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "requestRefreshView",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:requestRefreshView",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11446,13 +11582,13 @@ int lua_cocos2dx_ui_ListView_setItemsMargin(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.ListView:setItemsMargin"); if(!ok) return 0; cobj->setItemsMargin(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setItemsMargin",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:setItemsMargin",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11495,7 +11631,7 @@ int lua_cocos2dx_ui_ListView_refreshView(lua_State* tolua_S) cobj->refreshView(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "refreshView",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:refreshView",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11538,7 +11674,7 @@ int lua_cocos2dx_ui_ListView_removeLastItem(lua_State* tolua_S) cobj->removeLastItem(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeLastItem",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:removeLastItem",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11582,7 +11718,7 @@ int lua_cocos2dx_ui_ListView_getItemsMargin(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getItemsMargin",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:getItemsMargin",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11632,7 +11768,7 @@ int lua_cocos2dx_ui_ListView_addEventListener(lua_State* tolua_S) cobj->addEventListener(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addEventListener",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:addEventListener",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11672,14 +11808,14 @@ int lua_cocos2dx_ui_ListView_getItem(lua_State* tolua_S) { ssize_t arg0; - ok &= luaval_to_ssize(tolua_S, 2, &arg0); + ok &= luaval_to_ssize(tolua_S, 2, &arg0, "ccui.ListView:getItem"); if(!ok) return 0; cocos2d::ui::Widget* ret = cobj->getItem(arg0); object_to_luaval(tolua_S, "ccui.Widget",(cocos2d::ui::Widget*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getItem",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:getItem",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11725,7 +11861,7 @@ int lua_cocos2dx_ui_ListView_setItemModel(lua_State* tolua_S) cobj->setItemModel(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setItemModel",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:setItemModel",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11768,7 +11904,7 @@ int lua_cocos2dx_ui_ListView_doLayout(lua_State* tolua_S) cobj->doLayout(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "doLayout",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:doLayout",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11811,7 +11947,7 @@ int lua_cocos2dx_ui_ListView_pushBackDefaultItem(lua_State* tolua_S) cobj->pushBackDefaultItem(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pushBackDefaultItem",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:pushBackDefaultItem",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11854,13 +11990,13 @@ int lua_cocos2dx_ui_ListView_insertCustomItem(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "ccui.Widget",&arg0); - ok &= luaval_to_ssize(tolua_S, 3, &arg1); + ok &= luaval_to_ssize(tolua_S, 3, &arg1, "ccui.ListView:insertCustomItem"); if(!ok) return 0; cobj->insertCustomItem(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "insertCustomItem",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:insertCustomItem",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -11893,7 +12029,7 @@ int lua_cocos2dx_ui_ListView_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.ListView",(cocos2d::ui::ListView*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.ListView:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -11924,7 +12060,7 @@ int lua_cocos2dx_ui_ListView_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.ListView:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -11956,7 +12092,7 @@ int lua_cocos2dx_ui_ListView_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.ListView"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ListView",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:ListView",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12037,13 +12173,13 @@ int lua_cocos2dx_ui_Slider_setPercent(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.Slider:setPercent"); if(!ok) return 0; cobj->setPercent(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPercent",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:setPercent",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12083,7 +12219,7 @@ int lua_cocos2dx_ui_Slider_loadSlidBallTextureDisabled(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTextureDisabled"); if(!ok) return 0; cobj->loadSlidBallTextureDisabled(arg0); @@ -12094,15 +12230,15 @@ int lua_cocos2dx_ui_Slider_loadSlidBallTextureDisabled(lua_State* tolua_S) std::string arg0; cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTextureDisabled"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Slider:loadSlidBallTextureDisabled"); if(!ok) return 0; cobj->loadSlidBallTextureDisabled(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadSlidBallTextureDisabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:loadSlidBallTextureDisabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12142,7 +12278,7 @@ int lua_cocos2dx_ui_Slider_loadSlidBallTextureNormal(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTextureNormal"); if(!ok) return 0; cobj->loadSlidBallTextureNormal(arg0); @@ -12153,15 +12289,15 @@ int lua_cocos2dx_ui_Slider_loadSlidBallTextureNormal(lua_State* tolua_S) std::string arg0; cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTextureNormal"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Slider:loadSlidBallTextureNormal"); if(!ok) return 0; cobj->loadSlidBallTextureNormal(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadSlidBallTextureNormal",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:loadSlidBallTextureNormal",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12201,7 +12337,7 @@ int lua_cocos2dx_ui_Slider_loadBarTexture(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadBarTexture"); if(!ok) return 0; cobj->loadBarTexture(arg0); @@ -12212,15 +12348,15 @@ int lua_cocos2dx_ui_Slider_loadBarTexture(lua_State* tolua_S) std::string arg0; cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadBarTexture"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Slider:loadBarTexture"); if(!ok) return 0; cobj->loadBarTexture(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadBarTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:loadBarTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12260,7 +12396,7 @@ int lua_cocos2dx_ui_Slider_loadProgressBarTexture(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadProgressBarTexture"); if(!ok) return 0; cobj->loadProgressBarTexture(arg0); @@ -12271,15 +12407,15 @@ int lua_cocos2dx_ui_Slider_loadProgressBarTexture(lua_State* tolua_S) std::string arg0; cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadProgressBarTexture"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Slider:loadProgressBarTexture"); if(!ok) return 0; cobj->loadProgressBarTexture(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadProgressBarTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:loadProgressBarTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12321,11 +12457,11 @@ int lua_cocos2dx_ui_Slider_loadSlidBallTextures(lua_State* tolua_S) std::string arg1; std::string arg2; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTextures"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Slider:loadSlidBallTextures"); - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.Slider:loadSlidBallTextures"); if(!ok) return 0; cobj->loadSlidBallTextures(arg0, arg1, arg2); @@ -12338,19 +12474,19 @@ int lua_cocos2dx_ui_Slider_loadSlidBallTextures(lua_State* tolua_S) std::string arg2; cocos2d::ui::Widget::TextureResType arg3; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTextures"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Slider:loadSlidBallTextures"); - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.Slider:loadSlidBallTextures"); - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "ccui.Slider:loadSlidBallTextures"); if(!ok) return 0; cobj->loadSlidBallTextures(arg0, arg1, arg2, arg3); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadSlidBallTextures",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:loadSlidBallTextures",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -12390,13 +12526,13 @@ int lua_cocos2dx_ui_Slider_setCapInsetProgressBarRebderer(lua_State* tolua_S) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "ccui.Slider:setCapInsetProgressBarRebderer"); if(!ok) return 0; cobj->setCapInsetProgressBarRebderer(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCapInsetProgressBarRebderer",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:setCapInsetProgressBarRebderer",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12436,13 +12572,13 @@ int lua_cocos2dx_ui_Slider_setCapInsetsBarRenderer(lua_State* tolua_S) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "ccui.Slider:setCapInsetsBarRenderer"); if(!ok) return 0; cobj->setCapInsetsBarRenderer(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCapInsetsBarRenderer",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:setCapInsetsBarRenderer",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12486,7 +12622,7 @@ int lua_cocos2dx_ui_Slider_getCapInsetsProgressBarRebderer(lua_State* tolua_S) rect_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCapInsetsProgressBarRebderer",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:getCapInsetsProgressBarRebderer",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12526,13 +12662,13 @@ int lua_cocos2dx_ui_Slider_setScale9Enabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Slider:setScale9Enabled"); if(!ok) return 0; cobj->setScale9Enabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScale9Enabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:setScale9Enabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12572,13 +12708,13 @@ int lua_cocos2dx_ui_Slider_setCapInsets(lua_State* tolua_S) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "ccui.Slider:setCapInsets"); if(!ok) return 0; cobj->setCapInsets(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCapInsets",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:setCapInsets",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12628,7 +12764,7 @@ int lua_cocos2dx_ui_Slider_addEventListener(lua_State* tolua_S) cobj->addEventListener(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addEventListener",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:addEventListener",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12668,7 +12804,7 @@ int lua_cocos2dx_ui_Slider_loadSlidBallTexturePressed(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTexturePressed"); if(!ok) return 0; cobj->loadSlidBallTexturePressed(arg0); @@ -12679,15 +12815,15 @@ int lua_cocos2dx_ui_Slider_loadSlidBallTexturePressed(lua_State* tolua_S) std::string arg0; cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTexturePressed"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Slider:loadSlidBallTexturePressed"); if(!ok) return 0; cobj->loadSlidBallTexturePressed(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadSlidBallTexturePressed",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:loadSlidBallTexturePressed",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12731,7 +12867,7 @@ int lua_cocos2dx_ui_Slider_isScale9Enabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isScale9Enabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:isScale9Enabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12775,7 +12911,7 @@ int lua_cocos2dx_ui_Slider_getCapInsetsBarRenderer(lua_State* tolua_S) rect_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCapInsetsBarRenderer",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:getCapInsetsBarRenderer",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12819,7 +12955,7 @@ int lua_cocos2dx_ui_Slider_getPercent(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPercent",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:getPercent",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12852,7 +12988,7 @@ int lua_cocos2dx_ui_Slider_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.Slider",(cocos2d::ui::Slider*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.Slider:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -12883,7 +13019,7 @@ int lua_cocos2dx_ui_Slider_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.Slider:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -12915,7 +13051,7 @@ int lua_cocos2dx_ui_Slider_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.Slider"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "Slider",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:Slider",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12993,13 +13129,13 @@ int lua_cocos2dx_ui_TextField_setAttachWithIME(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.TextField:setAttachWithIME"); if(!ok) return 0; cobj->setAttachWithIME(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAttachWithIME",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setAttachWithIME",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13043,7 +13179,7 @@ int lua_cocos2dx_ui_TextField_getFontSize(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFontSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getFontSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13087,7 +13223,7 @@ int lua_cocos2dx_ui_TextField_getStringValue(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStringValue",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getStringValue",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13131,7 +13267,7 @@ int lua_cocos2dx_ui_TextField_getDeleteBackward(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDeleteBackward",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getDeleteBackward",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13175,7 +13311,7 @@ int lua_cocos2dx_ui_TextField_getPlaceHolder(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPlaceHolder",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getPlaceHolder",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13219,7 +13355,7 @@ int lua_cocos2dx_ui_TextField_getAttachWithIME(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAttachWithIME",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getAttachWithIME",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13259,13 +13395,13 @@ int lua_cocos2dx_ui_TextField_setFontName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TextField:setFontName"); if(!ok) return 0; cobj->setFontName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFontName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setFontName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13309,7 +13445,7 @@ int lua_cocos2dx_ui_TextField_getInsertText(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getInsertText",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getInsertText",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13349,13 +13485,13 @@ int lua_cocos2dx_ui_TextField_setInsertText(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.TextField:setInsertText"); if(!ok) return 0; cobj->setInsertText(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setInsertText",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setInsertText",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13399,7 +13535,7 @@ int lua_cocos2dx_ui_TextField_getDetachWithIME(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDetachWithIME",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getDetachWithIME",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13439,13 +13575,13 @@ int lua_cocos2dx_ui_TextField_setTextVerticalAlignment(lua_State* tolua_S) { cocos2d::TextVAlignment arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.TextField:setTextVerticalAlignment"); if(!ok) return 0; cobj->setTextVerticalAlignment(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextVerticalAlignment",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setTextVerticalAlignment",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13495,7 +13631,7 @@ int lua_cocos2dx_ui_TextField_addEventListener(lua_State* tolua_S) cobj->addEventListener(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addEventListener",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:addEventListener",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13538,7 +13674,7 @@ int lua_cocos2dx_ui_TextField_didNotSelectSelf(lua_State* tolua_S) cobj->didNotSelectSelf(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "didNotSelectSelf",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:didNotSelectSelf",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13582,7 +13718,7 @@ int lua_cocos2dx_ui_TextField_getFontName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFontName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getFontName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13622,13 +13758,13 @@ int lua_cocos2dx_ui_TextField_setTextAreaSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.TextField:setTextAreaSize"); if(!ok) return 0; cobj->setTextAreaSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextAreaSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setTextAreaSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13671,7 +13807,7 @@ int lua_cocos2dx_ui_TextField_attachWithIME(lua_State* tolua_S) cobj->attachWithIME(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "attachWithIME",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:attachWithIME",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13715,7 +13851,7 @@ int lua_cocos2dx_ui_TextField_getStringLength(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStringLength",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getStringLength",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13755,13 +13891,13 @@ int lua_cocos2dx_ui_TextField_setPasswordEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.TextField:setPasswordEnabled"); if(!ok) return 0; cobj->setPasswordEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPasswordEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setPasswordEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13805,7 +13941,7 @@ int lua_cocos2dx_ui_TextField_getPasswordStyleText(lua_State* tolua_S) tolua_pushstring(tolua_S,(const char*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPasswordStyleText",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getPasswordStyleText",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13845,13 +13981,13 @@ int lua_cocos2dx_ui_TextField_setMaxLengthEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.TextField:setMaxLengthEnabled"); if(!ok) return 0; cobj->setMaxLengthEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMaxLengthEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setMaxLengthEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13891,13 +14027,13 @@ int lua_cocos2dx_ui_TextField_setPasswordStyleText(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccui.TextField:setPasswordStyleText"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->setPasswordStyleText(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPasswordStyleText",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setPasswordStyleText",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13937,13 +14073,13 @@ int lua_cocos2dx_ui_TextField_setDeleteBackward(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.TextField:setDeleteBackward"); if(!ok) return 0; cobj->setDeleteBackward(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDeleteBackward",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setDeleteBackward",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13983,13 +14119,13 @@ int lua_cocos2dx_ui_TextField_setFontSize(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.TextField:setFontSize"); if(!ok) return 0; cobj->setFontSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFontSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setFontSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14029,13 +14165,13 @@ int lua_cocos2dx_ui_TextField_setPlaceHolder(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TextField:setPlaceHolder"); if(!ok) return 0; cobj->setPlaceHolder(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPlaceHolder",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setPlaceHolder",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14079,7 +14215,7 @@ int lua_cocos2dx_ui_TextField_isPasswordEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isPasswordEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:isPasswordEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14119,13 +14255,13 @@ int lua_cocos2dx_ui_TextField_setTextHorizontalAlignment(lua_State* tolua_S) { cocos2d::TextHAlignment arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.TextField:setTextHorizontalAlignment"); if(!ok) return 0; cobj->setTextHorizontalAlignment(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextHorizontalAlignment",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setTextHorizontalAlignment",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14169,7 +14305,7 @@ int lua_cocos2dx_ui_TextField_getMaxLength(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMaxLength",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getMaxLength",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14213,7 +14349,7 @@ int lua_cocos2dx_ui_TextField_isMaxLengthEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isMaxLengthEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:isMaxLengthEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14253,13 +14389,13 @@ int lua_cocos2dx_ui_TextField_setDetachWithIME(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.TextField:setDetachWithIME"); if(!ok) return 0; cobj->setDetachWithIME(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDetachWithIME",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setDetachWithIME",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14299,13 +14435,13 @@ int lua_cocos2dx_ui_TextField_setText(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TextField:setText"); if(!ok) return 0; cobj->setText(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setText",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setText",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14345,13 +14481,13 @@ int lua_cocos2dx_ui_TextField_setTouchAreaEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.TextField:setTouchAreaEnabled"); if(!ok) return 0; cobj->setTouchAreaEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTouchAreaEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setTouchAreaEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14391,14 +14527,14 @@ int lua_cocos2dx_ui_TextField_hitTest(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccui.TextField:hitTest"); if(!ok) return 0; bool ret = cobj->hitTest(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "hitTest",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:hitTest",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14438,13 +14574,13 @@ int lua_cocos2dx_ui_TextField_setMaxLength(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.TextField:setMaxLength"); if(!ok) return 0; cobj->setMaxLength(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMaxLength",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setMaxLength",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14484,13 +14620,13 @@ int lua_cocos2dx_ui_TextField_setTouchSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.TextField:setTouchSize"); if(!ok) return 0; cobj->setTouchSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTouchSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setTouchSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14534,7 +14670,7 @@ int lua_cocos2dx_ui_TextField_getTouchSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTouchSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getTouchSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14563,13 +14699,13 @@ int lua_cocos2dx_ui_TextField_create(lua_State* tolua_S) if (argc == 3) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TextField:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.TextField:create"); if (!ok) { break; } int arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "ccui.TextField:create"); if (!ok) { break; } cocos2d::ui::TextField* ret = cocos2d::ui::TextField::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "ccui.TextField",(cocos2d::ui::TextField*)ret); @@ -14587,7 +14723,7 @@ int lua_cocos2dx_ui_TextField_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "ccui.TextField:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -14618,7 +14754,7 @@ int lua_cocos2dx_ui_TextField_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.TextField:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -14650,7 +14786,7 @@ int lua_cocos2dx_ui_TextField_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.TextField"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TextField",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:TextField",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14747,13 +14883,13 @@ int lua_cocos2dx_ui_TextBMFont_setFntFile(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TextBMFont:setFntFile"); if(!ok) return 0; cobj->setFntFile(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFntFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextBMFont:setFntFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14797,7 +14933,7 @@ int lua_cocos2dx_ui_TextBMFont_getStringLength(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStringLength",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextBMFont:getStringLength",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14837,13 +14973,13 @@ int lua_cocos2dx_ui_TextBMFont_setString(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TextBMFont:setString"); if(!ok) return 0; cobj->setString(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setString",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextBMFont:setString",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14887,7 +15023,7 @@ int lua_cocos2dx_ui_TextBMFont_getString(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getString",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextBMFont:getString",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14916,10 +15052,10 @@ int lua_cocos2dx_ui_TextBMFont_create(lua_State* tolua_S) if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TextBMFont:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.TextBMFont:create"); if (!ok) { break; } cocos2d::ui::TextBMFont* ret = cocos2d::ui::TextBMFont::create(arg0, arg1); object_to_luaval(tolua_S, "ccui.TextBMFont",(cocos2d::ui::TextBMFont*)ret); @@ -14937,7 +15073,7 @@ int lua_cocos2dx_ui_TextBMFont_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "ccui.TextBMFont:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -14968,7 +15104,7 @@ int lua_cocos2dx_ui_TextBMFont_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.TextBMFont:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -15000,7 +15136,7 @@ int lua_cocos2dx_ui_TextBMFont_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.TextBMFont"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TextBMFont",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextBMFont:TextBMFont",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15070,7 +15206,7 @@ int lua_cocos2dx_ui_PageView_getCurPageIndex(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCurPageIndex",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.PageView:getCurPageIndex",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15114,15 +15250,15 @@ int lua_cocos2dx_ui_PageView_addWidgetToPage(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "ccui.Widget",&arg0); - ok &= luaval_to_ssize(tolua_S, 3, &arg1); + ok &= luaval_to_ssize(tolua_S, 3, &arg1, "ccui.PageView:addWidgetToPage"); - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "ccui.PageView:addWidgetToPage"); if(!ok) return 0; cobj->addWidgetToPage(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addWidgetToPage",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.PageView:addWidgetToPage",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -15162,14 +15298,14 @@ int lua_cocos2dx_ui_PageView_getPage(lua_State* tolua_S) { ssize_t arg0; - ok &= luaval_to_ssize(tolua_S, 2, &arg0); + ok &= luaval_to_ssize(tolua_S, 2, &arg0, "ccui.PageView:getPage"); if(!ok) return 0; cocos2d::ui::Layout* ret = cobj->getPage(arg0); object_to_luaval(tolua_S, "ccui.Layout",(cocos2d::ui::Layout*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPage",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.PageView:getPage",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15215,7 +15351,7 @@ int lua_cocos2dx_ui_PageView_removePage(lua_State* tolua_S) cobj->removePage(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removePage",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.PageView:removePage",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15265,7 +15401,7 @@ int lua_cocos2dx_ui_PageView_addEventListener(lua_State* tolua_S) cobj->addEventListener(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addEventListener",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.PageView:addEventListener",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15308,13 +15444,13 @@ int lua_cocos2dx_ui_PageView_insertPage(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "ccui.Layout",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.PageView:insertPage"); if(!ok) return 0; cobj->insertPage(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "insertPage",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.PageView:insertPage",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -15354,13 +15490,13 @@ int lua_cocos2dx_ui_PageView_scrollToPage(lua_State* tolua_S) { ssize_t arg0; - ok &= luaval_to_ssize(tolua_S, 2, &arg0); + ok &= luaval_to_ssize(tolua_S, 2, &arg0, "ccui.PageView:scrollToPage"); if(!ok) return 0; cobj->scrollToPage(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "scrollToPage",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.PageView:scrollToPage",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15400,13 +15536,13 @@ int lua_cocos2dx_ui_PageView_removePageAtIndex(lua_State* tolua_S) { ssize_t arg0; - ok &= luaval_to_ssize(tolua_S, 2, &arg0); + ok &= luaval_to_ssize(tolua_S, 2, &arg0, "ccui.PageView:removePageAtIndex"); if(!ok) return 0; cobj->removePageAtIndex(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removePageAtIndex",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.PageView:removePageAtIndex",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15450,7 +15586,7 @@ int lua_cocos2dx_ui_PageView_getPages(lua_State* tolua_S) ccvector_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPages",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.PageView:getPages",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15493,7 +15629,7 @@ int lua_cocos2dx_ui_PageView_removeAllPages(lua_State* tolua_S) cobj->removeAllPages(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllPages",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.PageView:removeAllPages",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15539,7 +15675,7 @@ int lua_cocos2dx_ui_PageView_addPage(lua_State* tolua_S) cobj->addPage(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addPage",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.PageView:addPage",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15572,7 +15708,7 @@ int lua_cocos2dx_ui_PageView_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.PageView",(cocos2d::ui::PageView*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.PageView:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -15603,7 +15739,7 @@ int lua_cocos2dx_ui_PageView_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.PageView:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -15635,7 +15771,7 @@ int lua_cocos2dx_ui_PageView_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.PageView"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "PageView",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.PageView:PageView",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15678,6 +15814,43 @@ int lua_register_cocos2dx_ui_PageView(lua_State* tolua_S) return 1; } +int lua_cocos2dx_ui_Helper_getSubStringOfUTF8String(lua_State* tolua_S) +{ + int argc = 0; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertable(tolua_S,1,"ccui.Helper",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 3) + { + std::string arg0; + unsigned long arg1; + unsigned long arg2; + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Helper:getSubStringOfUTF8String"); + ok &= luaval_to_ulong(tolua_S, 3, &arg1, "ccui.Helper:getSubStringOfUTF8String"); + ok &= luaval_to_ulong(tolua_S, 4, &arg2, "ccui.Helper:getSubStringOfUTF8String"); + if(!ok) + return 0; + std::string ret = cocos2d::ui::Helper::getSubStringOfUTF8String(arg0, arg1, arg2); + tolua_pushcppstring(tolua_S,ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.Helper:getSubStringOfUTF8String",argc, 3); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Helper_getSubStringOfUTF8String'.",&tolua_err); +#endif + return 0; +} int lua_cocos2dx_ui_Helper_seekWidgetByTag(lua_State* tolua_S) { int argc = 0; @@ -15698,14 +15871,14 @@ int lua_cocos2dx_ui_Helper_seekWidgetByTag(lua_State* tolua_S) cocos2d::ui::Widget* arg0; int arg1; ok &= luaval_to_object(tolua_S, 2, "ccui.Widget",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Helper:seekWidgetByTag"); if(!ok) return 0; cocos2d::ui::Widget* ret = cocos2d::ui::Helper::seekWidgetByTag(arg0, arg1); object_to_luaval(tolua_S, "ccui.Widget",(cocos2d::ui::Widget*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "seekWidgetByTag",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.Helper:seekWidgetByTag",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -15733,14 +15906,14 @@ int lua_cocos2dx_ui_Helper_seekActionWidgetByActionTag(lua_State* tolua_S) cocos2d::ui::Widget* arg0; int arg1; ok &= luaval_to_object(tolua_S, 2, "ccui.Widget",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Helper:seekActionWidgetByActionTag"); if(!ok) return 0; cocos2d::ui::Widget* ret = cocos2d::ui::Helper::seekActionWidgetByActionTag(arg0, arg1); object_to_luaval(tolua_S, "ccui.Widget",(cocos2d::ui::Widget*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "seekActionWidgetByActionTag",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.Helper:seekActionWidgetByActionTag",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -15768,14 +15941,14 @@ int lua_cocos2dx_ui_Helper_seekWidgetByName(lua_State* tolua_S) cocos2d::ui::Widget* arg0; std::string arg1; ok &= luaval_to_object(tolua_S, 2, "ccui.Widget",&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Helper:seekWidgetByName"); if(!ok) return 0; cocos2d::ui::Widget* ret = cocos2d::ui::Helper::seekWidgetByName(arg0, arg1); object_to_luaval(tolua_S, "ccui.Widget",(cocos2d::ui::Widget*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "seekWidgetByName",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.Helper:seekWidgetByName",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -15795,6 +15968,7 @@ int lua_register_cocos2dx_ui_Helper(lua_State* tolua_S) tolua_cclass(tolua_S,"Helper","ccui.Helper","",nullptr); tolua_beginmodule(tolua_S,"Helper"); + tolua_function(tolua_S,"getSubStringOfUTF8String", lua_cocos2dx_ui_Helper_getSubStringOfUTF8String); tolua_function(tolua_S,"seekWidgetByTag", lua_cocos2dx_ui_Helper_seekWidgetByTag); tolua_function(tolua_S,"seekActionWidgetByActionTag", lua_cocos2dx_ui_Helper_seekActionWidgetByActionTag); tolua_function(tolua_S,"seekWidgetByName", lua_cocos2dx_ui_Helper_seekWidgetByName); @@ -15837,18 +16011,18 @@ int lua_cocos2dx_ui_RichElement_init(lua_State* tolua_S) cocos2d::Color3B arg1; uint16_t arg2; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElement:init"); - ok &= luaval_to_color3b(tolua_S, 3, &arg1); + ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.RichElement:init"); - ok &= luaval_to_uint16(tolua_S, 4,&arg2); + ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElement:init"); if(!ok) return 0; bool ret = cobj->init(arg0, arg1, arg2); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichElement:init",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -15882,7 +16056,7 @@ int lua_cocos2dx_ui_RichElement_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.RichElement"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "RichElement",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichElement:RichElement",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15948,24 +16122,24 @@ int lua_cocos2dx_ui_RichElementText_init(lua_State* tolua_S) std::string arg4; double arg5; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementText:init"); - ok &= luaval_to_color3b(tolua_S, 3, &arg1); + ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.RichElementText:init"); - ok &= luaval_to_uint16(tolua_S, 4,&arg2); + ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementText:init"); - ok &= luaval_to_std_string(tolua_S, 5,&arg3); + ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RichElementText:init"); - ok &= luaval_to_std_string(tolua_S, 6,&arg4); + ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.RichElementText:init"); - ok &= luaval_to_number(tolua_S, 7,&arg5); + ok &= luaval_to_number(tolua_S, 7,&arg5, "ccui.RichElementText:init"); if(!ok) return 0; bool ret = cobj->init(arg0, arg1, arg2, arg3, arg4, arg5); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 6); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichElementText:init",argc, 6); return 0; #if COCOS2D_DEBUG >= 1 @@ -15998,19 +16172,19 @@ int lua_cocos2dx_ui_RichElementText_create(lua_State* tolua_S) std::string arg3; std::string arg4; double arg5; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - ok &= luaval_to_color3b(tolua_S, 3, &arg1); - ok &= luaval_to_uint16(tolua_S, 4,&arg2); - ok &= luaval_to_std_string(tolua_S, 5,&arg3); - ok &= luaval_to_std_string(tolua_S, 6,&arg4); - ok &= luaval_to_number(tolua_S, 7,&arg5); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementText:create"); + ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.RichElementText:create"); + ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementText:create"); + ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RichElementText:create"); + ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.RichElementText:create"); + ok &= luaval_to_number(tolua_S, 7,&arg5, "ccui.RichElementText:create"); if(!ok) return 0; cocos2d::ui::RichElementText* ret = cocos2d::ui::RichElementText::create(arg0, arg1, arg2, arg3, arg4, arg5); object_to_luaval(tolua_S, "ccui.RichElementText",(cocos2d::ui::RichElementText*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 6); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.RichElementText:create",argc, 6); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -16042,7 +16216,7 @@ int lua_cocos2dx_ui_RichElementText_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.RichElementText"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "RichElementText",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichElementText:RichElementText",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16107,20 +16281,20 @@ int lua_cocos2dx_ui_RichElementImage_init(lua_State* tolua_S) uint16_t arg2; std::string arg3; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementImage:init"); - ok &= luaval_to_color3b(tolua_S, 3, &arg1); + ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.RichElementImage:init"); - ok &= luaval_to_uint16(tolua_S, 4,&arg2); + ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementImage:init"); - ok &= luaval_to_std_string(tolua_S, 5,&arg3); + ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RichElementImage:init"); if(!ok) return 0; bool ret = cobj->init(arg0, arg1, arg2, arg3); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichElementImage:init",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 @@ -16151,17 +16325,17 @@ int lua_cocos2dx_ui_RichElementImage_create(lua_State* tolua_S) cocos2d::Color3B arg1; uint16_t arg2; std::string arg3; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - ok &= luaval_to_color3b(tolua_S, 3, &arg1); - ok &= luaval_to_uint16(tolua_S, 4,&arg2); - ok &= luaval_to_std_string(tolua_S, 5,&arg3); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementImage:create"); + ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.RichElementImage:create"); + ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementImage:create"); + ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RichElementImage:create"); if(!ok) return 0; cocos2d::ui::RichElementImage* ret = cocos2d::ui::RichElementImage::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "ccui.RichElementImage",(cocos2d::ui::RichElementImage*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.RichElementImage:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -16193,7 +16367,7 @@ int lua_cocos2dx_ui_RichElementImage_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.RichElementImage"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "RichElementImage",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichElementImage:RichElementImage",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16258,11 +16432,11 @@ int lua_cocos2dx_ui_RichElementCustomNode_init(lua_State* tolua_S) uint16_t arg2; cocos2d::Node* arg3; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementCustomNode:init"); - ok &= luaval_to_color3b(tolua_S, 3, &arg1); + ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.RichElementCustomNode:init"); - ok &= luaval_to_uint16(tolua_S, 4,&arg2); + ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementCustomNode:init"); ok &= luaval_to_object(tolua_S, 5, "cc.Node",&arg3); if(!ok) @@ -16271,7 +16445,7 @@ int lua_cocos2dx_ui_RichElementCustomNode_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichElementCustomNode:init",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 @@ -16302,9 +16476,9 @@ int lua_cocos2dx_ui_RichElementCustomNode_create(lua_State* tolua_S) cocos2d::Color3B arg1; uint16_t arg2; cocos2d::Node* arg3; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - ok &= luaval_to_color3b(tolua_S, 3, &arg1); - ok &= luaval_to_uint16(tolua_S, 4,&arg2); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementCustomNode:create"); + ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.RichElementCustomNode:create"); + ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementCustomNode:create"); ok &= luaval_to_object(tolua_S, 5, "cc.Node",&arg3); if(!ok) return 0; @@ -16312,7 +16486,7 @@ int lua_cocos2dx_ui_RichElementCustomNode_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.RichElementCustomNode",(cocos2d::ui::RichElementCustomNode*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.RichElementCustomNode:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -16344,7 +16518,7 @@ int lua_cocos2dx_ui_RichElementCustomNode_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.RichElementCustomNode"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "RichElementCustomNode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichElementCustomNode:RichElementCustomNode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16409,13 +16583,13 @@ int lua_cocos2dx_ui_RichText_insertElement(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "ccui.RichElement",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.RichText:insertElement"); if(!ok) return 0; cobj->insertElement(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "insertElement",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichText:insertElement",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -16455,13 +16629,13 @@ int lua_cocos2dx_ui_RichText_setAnchorPoint(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccui.RichText:setAnchorPoint"); if(!ok) return 0; cobj->setAnchorPoint(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAnchorPoint",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichText:setAnchorPoint",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16507,7 +16681,7 @@ int lua_cocos2dx_ui_RichText_pushBackElement(lua_State* tolua_S) cobj->pushBackElement(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pushBackElement",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichText:pushBackElement",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16547,13 +16721,13 @@ int lua_cocos2dx_ui_RichText_ignoreContentAdaptWithSize(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.RichText:ignoreContentAdaptWithSize"); if(!ok) return 0; cobj->ignoreContentAdaptWithSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ignoreContentAdaptWithSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichText:ignoreContentAdaptWithSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16593,13 +16767,13 @@ int lua_cocos2dx_ui_RichText_setVerticalSpace(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.RichText:setVerticalSpace"); if(!ok) return 0; cobj->setVerticalSpace(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVerticalSpace",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichText:setVerticalSpace",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16642,7 +16816,7 @@ int lua_cocos2dx_ui_RichText_formatText(lua_State* tolua_S) cobj->formatText(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "formatText",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichText:formatText",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16687,7 +16861,7 @@ int lua_cocos2dx_ui_RichText_removeElement(lua_State* tolua_S) do{ if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichText:removeElement"); if (!ok) { break; } cobj->removeElement(arg0); @@ -16695,7 +16869,7 @@ int lua_cocos2dx_ui_RichText_removeElement(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeElement",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichText:removeElement",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16728,7 +16902,7 @@ int lua_cocos2dx_ui_RichText_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.RichText",(cocos2d::ui::RichText*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.RichText:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -16760,7 +16934,7 @@ int lua_cocos2dx_ui_RichText_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.RichText"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "RichText",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichText:RichText",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16817,7 +16991,7 @@ int lua_cocos2dx_ui_HBox_create(lua_State* tolua_S) if (argc == 1) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.HBox:create"); if (!ok) { break; } cocos2d::ui::HBox* ret = cocos2d::ui::HBox::create(arg0); object_to_luaval(tolua_S, "ccui.HBox",(cocos2d::ui::HBox*)ret); @@ -16835,7 +17009,7 @@ int lua_cocos2dx_ui_HBox_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "ccui.HBox:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -16867,7 +17041,7 @@ int lua_cocos2dx_ui_HBox_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.HBox"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "HBox",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.HBox:HBox",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16917,7 +17091,7 @@ int lua_cocos2dx_ui_VBox_create(lua_State* tolua_S) if (argc == 1) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.VBox:create"); if (!ok) { break; } cocos2d::ui::VBox* ret = cocos2d::ui::VBox::create(arg0); object_to_luaval(tolua_S, "ccui.VBox",(cocos2d::ui::VBox*)ret); @@ -16935,7 +17109,7 @@ int lua_cocos2dx_ui_VBox_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "ccui.VBox:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -16967,7 +17141,7 @@ int lua_cocos2dx_ui_VBox_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.VBox"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "VBox",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.VBox:VBox",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17017,7 +17191,7 @@ int lua_cocos2dx_ui_RelativeBox_create(lua_State* tolua_S) if (argc == 1) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.RelativeBox:create"); if (!ok) { break; } cocos2d::ui::RelativeBox* ret = cocos2d::ui::RelativeBox::create(arg0); object_to_luaval(tolua_S, "ccui.RelativeBox",(cocos2d::ui::RelativeBox*)ret); @@ -17035,7 +17209,7 @@ int lua_cocos2dx_ui_RelativeBox_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "ccui.RelativeBox:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -17067,7 +17241,7 @@ int lua_cocos2dx_ui_RelativeBox_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.RelativeBox"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "RelativeBox",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RelativeBox:RelativeBox",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp index a894093755..bb7e8f9958 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp @@ -393,6 +393,10 @@ int register_all_cocos2dx_ui(lua_State* tolua_S); + + + + diff --git a/cocos/scripting/lua-bindings/manual/CCLuaStack.cpp b/cocos/scripting/lua-bindings/manual/CCLuaStack.cpp index d8fc0cf0d6..144850b298 100644 --- a/cocos/scripting/lua-bindings/manual/CCLuaStack.cpp +++ b/cocos/scripting/lua-bindings/manual/CCLuaStack.cpp @@ -71,8 +71,12 @@ extern "C" { #include "lua_cocos2dx_physics_manual.hpp" #include "lua_cocos2dx_ui_auto.hpp" #include "lua_cocos2dx_ui_manual.hpp" +#include "lua_cocos2dx_experimental_auto.hpp" +#include "lua_cocos2dx_experimental_manual.hpp" +#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) #include "lua_cocos2dx_experimental_video_auto.hpp" #include "lua_cocos2dx_experimental_video_manual.hpp" +#endif namespace { int lua_print(lua_State * luastate) @@ -182,6 +186,8 @@ bool LuaStack::init(void) #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC) LuaObjcBridge::luaopen_luaoc(_state); #endif + register_all_cocos2dx_experimental(_state); + register_all_cocos2dx_experimental_manual(_state); #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) register_all_cocos2dx_experimental_video(_state); diff --git a/cocos/scripting/lua-bindings/manual/Cocos2dxLuaLoader.cpp b/cocos/scripting/lua-bindings/manual/Cocos2dxLuaLoader.cpp index e11d541626..e9d8d8a9fc 100644 --- a/cocos/scripting/lua-bindings/manual/Cocos2dxLuaLoader.cpp +++ b/cocos/scripting/lua-bindings/manual/Cocos2dxLuaLoader.cpp @@ -77,7 +77,6 @@ extern "C" pos = prefix.find("?.lua"); chunkName = prefix.substr(0, pos) + filename + BYTECODE_FILE_EXT; - chunkName = utils->fullPathForFilename(chunkName.c_str()); if (utils->isFileExist(chunkName)) { chunk = utils->getFileData(chunkName.c_str(), "rb", &chunkSize); @@ -86,7 +85,6 @@ extern "C" else { chunkName = prefix.substr(0, pos) + filename + NOT_BYTECODE_FILE_EXT; - chunkName = utils->fullPathForFilename(chunkName.c_str()); if (utils->isFileExist(chunkName)) { chunk = utils->getFileData(chunkName.c_str(), "rb", &chunkSize); diff --git a/cocos/scripting/lua-bindings/manual/LuaBasicConversions.cpp b/cocos/scripting/lua-bindings/manual/LuaBasicConversions.cpp index 8acf342552..da15b71819 100644 --- a/cocos/scripting/lua-bindings/manual/LuaBasicConversions.cpp +++ b/cocos/scripting/lua-bindings/manual/LuaBasicConversions.cpp @@ -31,7 +31,7 @@ std::unordered_map g_luaType; std::unordered_map g_typeCast; #if COCOS2D_DEBUG >=1 -void luaval_to_native_err(lua_State* L,const char* msg,tolua_Error* err) +void luaval_to_native_err(lua_State* L,const char* msg,tolua_Error* err, const char* funcName) { if (NULL == L || NULL == err || NULL == msg || 0 == strlen(msg)) return; @@ -44,16 +44,16 @@ void luaval_to_native_err(lua_State* L,const char* msg,tolua_Error* err) { int narg = err->index; if (err->array) - CCLOG("%s\n argument #%d is array of '%s'; array of '%s' expected.\n",msg+2,narg,provided,expected); + CCLOG("%s\n %s argument #%d is array of '%s'; array of '%s' expected.\n",msg+2,funcName,narg,provided,expected); else - CCLOG("%s\n argument #%d is '%s'; '%s' expected.\n",msg+2,narg,provided,expected); + CCLOG("%s\n %s argument #%d is '%s'; '%s' expected.\n",msg+2,funcName,narg,provided,expected); } else if (msg[1]=='v') { if (err->array) - CCLOG("%s\n value is array of '%s'; array of '%s' expected.\n",msg+2,provided,expected); + CCLOG("%s\n %s value is array of '%s'; array of '%s' expected.\n",funcName,msg+2,provided,expected); else - CCLOG("%s\n value is '%s'; '%s' expected.\n",msg+2,provided,expected); + CCLOG("%s\n %s value is '%s'; '%s' expected.\n",msg+2,funcName,provided,expected); } } } @@ -78,7 +78,7 @@ bool luaval_is_usertype(lua_State* L,int lo,const char* type, int def) return false; } -bool luaval_to_ushort(lua_State* L, int lo, unsigned short* outValue) +bool luaval_to_ushort(lua_State* L, int lo, unsigned short* outValue, const char* funcName) { if (nullptr == L || nullptr == outValue) return false; @@ -89,7 +89,7 @@ bool luaval_to_ushort(lua_State* L, int lo, unsigned short* outValue) if (!tolua_isnumber(L,lo,0,&tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -103,7 +103,7 @@ bool luaval_to_ushort(lua_State* L, int lo, unsigned short* outValue) } -bool luaval_to_int32(lua_State* L,int lo,int* outValue) +bool luaval_to_int32(lua_State* L,int lo,int* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -114,7 +114,7 @@ bool luaval_to_int32(lua_State* L,int lo,int* outValue) if (!tolua_isnumber(L,lo,0,&tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -127,7 +127,7 @@ bool luaval_to_int32(lua_State* L,int lo,int* outValue) return ok; } -bool luaval_to_uint32(lua_State* L, int lo, unsigned int* outValue) +bool luaval_to_uint32(lua_State* L, int lo, unsigned int* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -138,7 +138,7 @@ bool luaval_to_uint32(lua_State* L, int lo, unsigned int* outValue) if (!tolua_isnumber(L,lo,0,&tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -151,7 +151,7 @@ bool luaval_to_uint32(lua_State* L, int lo, unsigned int* outValue) return ok; } -bool luaval_to_uint16(lua_State* L,int lo,uint16_t* outValue) +bool luaval_to_uint16(lua_State* L,int lo,uint16_t* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -162,7 +162,7 @@ bool luaval_to_uint16(lua_State* L,int lo,uint16_t* outValue) if (!tolua_isnumber(L,lo,0,&tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -175,7 +175,7 @@ bool luaval_to_uint16(lua_State* L,int lo,uint16_t* outValue) return ok; } -bool luaval_to_boolean(lua_State* L,int lo,bool* outValue) +bool luaval_to_boolean(lua_State* L,int lo,bool* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -186,7 +186,7 @@ bool luaval_to_boolean(lua_State* L,int lo,bool* outValue) if (!tolua_isboolean(L,lo,0,&tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -199,7 +199,7 @@ bool luaval_to_boolean(lua_State* L,int lo,bool* outValue) return ok; } -bool luaval_to_number(lua_State* L,int lo,double* outValue) +bool luaval_to_number(lua_State* L,int lo,double* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -210,7 +210,7 @@ bool luaval_to_number(lua_State* L,int lo,double* outValue) if (!tolua_isnumber(L,lo,0,&tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -223,7 +223,7 @@ bool luaval_to_number(lua_State* L,int lo,double* outValue) return ok; } -bool luaval_to_long_long(lua_State* L,int lo,long long* outValue) +bool luaval_to_long_long(lua_State* L,int lo,long long* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -234,7 +234,7 @@ bool luaval_to_long_long(lua_State* L,int lo,long long* outValue) if (!tolua_isnumber(L,lo,0,&tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -247,7 +247,7 @@ bool luaval_to_long_long(lua_State* L,int lo,long long* outValue) return ok; } -bool luaval_to_std_string(lua_State* L, int lo, std::string* outValue) +bool luaval_to_std_string(lua_State* L, int lo, std::string* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -258,7 +258,7 @@ bool luaval_to_std_string(lua_State* L, int lo, std::string* outValue) if (!tolua_iscppstring(L,lo,0,&tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -271,7 +271,7 @@ bool luaval_to_std_string(lua_State* L, int lo, std::string* outValue) return ok; } -bool luaval_to_vec2(lua_State* L,int lo,cocos2d::Vec2* outValue) +bool luaval_to_vec2(lua_State* L,int lo,cocos2d::Vec2* outValue, const char* funcName) { if (nullptr == L || nullptr == outValue) return false; @@ -282,7 +282,7 @@ bool luaval_to_vec2(lua_State* L,int lo,cocos2d::Vec2* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -303,7 +303,7 @@ bool luaval_to_vec2(lua_State* L,int lo,cocos2d::Vec2* outValue) return ok; } -bool luaval_to_vec3(lua_State* L,int lo,cocos2d::Vec3* outValue) +bool luaval_to_vec3(lua_State* L,int lo,cocos2d::Vec3* outValue, const char* funcName) { if (nullptr == L || nullptr == outValue) return false; @@ -314,7 +314,7 @@ bool luaval_to_vec3(lua_State* L,int lo,cocos2d::Vec3* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -340,7 +340,7 @@ bool luaval_to_vec3(lua_State* L,int lo,cocos2d::Vec3* outValue) return ok; } -bool luaval_to_vec4(lua_State* L,int lo,cocos2d::Vec4* outValue) +bool luaval_to_vec4(lua_State* L,int lo,cocos2d::Vec4* outValue, const char* funcName) { if (nullptr == L || nullptr == outValue) return false; @@ -351,7 +351,7 @@ bool luaval_to_vec4(lua_State* L,int lo,cocos2d::Vec4* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -382,7 +382,7 @@ bool luaval_to_vec4(lua_State* L,int lo,cocos2d::Vec4* outValue) return ok; } -bool luaval_to_blendfunc(lua_State* L, int lo, cocos2d::BlendFunc* outValue) +bool luaval_to_blendfunc(lua_State* L, int lo, cocos2d::BlendFunc* outValue, const char* funcName) { if (nullptr == L || nullptr == outValue) return false; @@ -393,7 +393,7 @@ bool luaval_to_blendfunc(lua_State* L, int lo, cocos2d::BlendFunc* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -414,7 +414,7 @@ bool luaval_to_blendfunc(lua_State* L, int lo, cocos2d::BlendFunc* outValue) return ok; } -bool luaval_to_physics_material(lua_State* L,int lo,PhysicsMaterial* outValue) +bool luaval_to_physics_material(lua_State* L,int lo,PhysicsMaterial* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -425,7 +425,7 @@ bool luaval_to_physics_material(lua_State* L,int lo,PhysicsMaterial* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -451,12 +451,12 @@ bool luaval_to_physics_material(lua_State* L,int lo,PhysicsMaterial* outValue) return ok; } -bool luaval_to_ssize(lua_State* L,int lo, ssize_t* outValue) +bool luaval_to_ssize(lua_State* L,int lo, ssize_t* outValue, const char* funcName) { return luaval_to_long(L, lo, reinterpret_cast(outValue)); } -bool luaval_to_long(lua_State* L,int lo, long* outValue) +bool luaval_to_long(lua_State* L,int lo, long* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -467,7 +467,7 @@ bool luaval_to_long(lua_State* L,int lo, long* outValue) if (!tolua_isnumber(L,lo,0,&tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -480,7 +480,7 @@ bool luaval_to_long(lua_State* L,int lo, long* outValue) return ok; } -bool luaval_to_ulong(lua_State* L,int lo, unsigned long* outValue) +bool luaval_to_ulong(lua_State* L,int lo, unsigned long* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -491,7 +491,7 @@ bool luaval_to_ulong(lua_State* L,int lo, unsigned long* outValue) if (!tolua_isnumber(L,lo,0,&tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -504,7 +504,7 @@ bool luaval_to_ulong(lua_State* L,int lo, unsigned long* outValue) return ok; } -bool luaval_to_size(lua_State* L,int lo,Size* outValue) +bool luaval_to_size(lua_State* L,int lo,Size* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -515,7 +515,7 @@ bool luaval_to_size(lua_State* L,int lo,Size* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -536,7 +536,7 @@ bool luaval_to_size(lua_State* L,int lo,Size* outValue) return ok; } -bool luaval_to_rect(lua_State* L,int lo,Rect* outValue) +bool luaval_to_rect(lua_State* L,int lo,Rect* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -547,7 +547,7 @@ bool luaval_to_rect(lua_State* L,int lo,Rect* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -578,7 +578,7 @@ bool luaval_to_rect(lua_State* L,int lo,Rect* outValue) return ok; } -bool luaval_to_color4b(lua_State* L,int lo,Color4B* outValue) +bool luaval_to_color4b(lua_State* L,int lo,Color4B* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -589,7 +589,7 @@ bool luaval_to_color4b(lua_State* L,int lo,Color4B* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -620,7 +620,7 @@ bool luaval_to_color4b(lua_State* L,int lo,Color4B* outValue) return ok; } -bool luaval_to_color4f(lua_State* L,int lo,Color4F* outValue) +bool luaval_to_color4f(lua_State* L,int lo,Color4F* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -631,7 +631,7 @@ bool luaval_to_color4f(lua_State* L,int lo,Color4F* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -662,7 +662,7 @@ bool luaval_to_color4f(lua_State* L,int lo,Color4F* outValue) return ok; } -bool luaval_to_color3b(lua_State* L,int lo,Color3B* outValue) +bool luaval_to_color3b(lua_State* L,int lo,Color3B* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -673,7 +673,7 @@ bool luaval_to_color3b(lua_State* L,int lo,Color3B* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -699,7 +699,7 @@ bool luaval_to_color3b(lua_State* L,int lo,Color3B* outValue) return ok; } -bool luaval_to_affinetransform(lua_State* L,int lo, AffineTransform* outValue) +bool luaval_to_affinetransform(lua_State* L,int lo, AffineTransform* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -710,7 +710,7 @@ bool luaval_to_affinetransform(lua_State* L,int lo, AffineTransform* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -750,7 +750,7 @@ bool luaval_to_affinetransform(lua_State* L,int lo, AffineTransform* outValue) return ok; } -bool luaval_to_fontdefinition(lua_State* L, int lo, FontDefinition* outValue ) +bool luaval_to_fontdefinition(lua_State* L, int lo, FontDefinition* outValue , const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -761,7 +761,7 @@ bool luaval_to_fontdefinition(lua_State* L, int lo, FontDefinition* outValue ) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); ok = false; #endif } @@ -891,7 +891,7 @@ bool luaval_to_fontdefinition(lua_State* L, int lo, FontDefinition* outValue ) return ok; } -bool luaval_to_ttfconfig(lua_State* L,int lo, cocos2d::TTFConfig* outValue) +bool luaval_to_ttfconfig(lua_State* L,int lo, cocos2d::TTFConfig* outValue, const char* funcName) { if (nullptr == L || nullptr == outValue) return false; @@ -902,7 +902,7 @@ bool luaval_to_ttfconfig(lua_State* L,int lo, cocos2d::TTFConfig* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -946,7 +946,7 @@ bool luaval_to_ttfconfig(lua_State* L,int lo, cocos2d::TTFConfig* outValue) } -bool luaval_to_uniform(lua_State* L, int lo, cocos2d::Uniform* outValue) +bool luaval_to_uniform(lua_State* L, int lo, cocos2d::Uniform* outValue, const char* funcName) { if (nullptr == L || nullptr == outValue) return false; @@ -957,7 +957,7 @@ bool luaval_to_uniform(lua_State* L, int lo, cocos2d::Uniform* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -990,7 +990,7 @@ bool luaval_to_uniform(lua_State* L, int lo, cocos2d::Uniform* outValue) return false; } -bool luaval_to_vertexattrib(lua_State* L, int lo, cocos2d::VertexAttrib* outValue) +bool luaval_to_vertexattrib(lua_State* L, int lo, cocos2d::VertexAttrib* outValue, const char* funcName) { if (nullptr == L || nullptr == outValue) return false; @@ -1001,7 +1001,7 @@ bool luaval_to_vertexattrib(lua_State* L, int lo, cocos2d::VertexAttrib* outValu if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1034,7 +1034,7 @@ bool luaval_to_vertexattrib(lua_State* L, int lo, cocos2d::VertexAttrib* outValu return false; } -bool luaval_to_mat4(lua_State* L, int lo, cocos2d::Mat4* outValue ) +bool luaval_to_mat4(lua_State* L, int lo, cocos2d::Mat4* outValue , const char* funcName) { if (nullptr == L || nullptr == outValue) return false; @@ -1045,7 +1045,7 @@ bool luaval_to_mat4(lua_State* L, int lo, cocos2d::Mat4* outValue ) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); ok = false; #endif } @@ -1072,7 +1072,7 @@ bool luaval_to_mat4(lua_State* L, int lo, cocos2d::Mat4* outValue ) return ok; } -bool luaval_to_array(lua_State* L,int lo, __Array** outValue) +bool luaval_to_array(lua_State* L,int lo, __Array** outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -1083,7 +1083,7 @@ bool luaval_to_array(lua_State* L,int lo, __Array** outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1172,7 +1172,7 @@ bool luaval_to_array(lua_State* L,int lo, __Array** outValue) return ok; } -bool luaval_to_dictionary(lua_State* L,int lo, __Dictionary** outValue) +bool luaval_to_dictionary(lua_State* L,int lo, __Dictionary** outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -1183,7 +1183,7 @@ bool luaval_to_dictionary(lua_State* L,int lo, __Dictionary** outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1276,7 +1276,7 @@ bool luaval_to_dictionary(lua_State* L,int lo, __Dictionary** outValue) return ok; } -bool luaval_to_array_of_vec2(lua_State* L,int lo,cocos2d::Vec2 **points, int *numPoints) +bool luaval_to_array_of_vec2(lua_State* L,int lo,cocos2d::Vec2 **points, int *numPoints, const char* funcName) { if (NULL == L) return false; @@ -1288,7 +1288,7 @@ bool luaval_to_array_of_vec2(lua_State* L,int lo,cocos2d::Vec2 **points, int *nu if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1308,7 +1308,7 @@ bool luaval_to_array_of_vec2(lua_State* L,int lo,cocos2d::Vec2 **points, int *nu if (!tolua_istable(L,-1, 0, &tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif lua_pop(L, 1); CC_SAFE_DELETE_ARRAY(array); @@ -1436,7 +1436,7 @@ bool luavals_variadic_to_ccvaluevector(lua_State* L, int argc, cocos2d::ValueVec return true; } -bool luaval_to_ccvalue(lua_State* L, int lo, cocos2d::Value* ret) +bool luaval_to_ccvalue(lua_State* L, int lo, cocos2d::Value* ret, const char* funcName) { if ( nullptr == L || nullptr == ret) return false; @@ -1492,7 +1492,7 @@ bool luaval_to_ccvalue(lua_State* L, int lo, cocos2d::Value* ret) return ok; } -bool luaval_to_ccvaluemap(lua_State* L, int lo, cocos2d::ValueMap* ret) +bool luaval_to_ccvaluemap(lua_State* L, int lo, cocos2d::ValueMap* ret, const char* funcName) { if ( nullptr == L || nullptr == ret) return false; @@ -1502,7 +1502,7 @@ bool luaval_to_ccvaluemap(lua_State* L, int lo, cocos2d::ValueMap* ret) if (!tolua_istable(L, lo, 0, &tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1579,7 +1579,7 @@ bool luaval_to_ccvaluemap(lua_State* L, int lo, cocos2d::ValueMap* ret) return ok; } -bool luaval_to_ccvaluemapintkey(lua_State* L, int lo, cocos2d::ValueMapIntKey* ret) +bool luaval_to_ccvaluemapintkey(lua_State* L, int lo, cocos2d::ValueMapIntKey* ret, const char* funcName) { if (nullptr == L || nullptr == ret) return false; @@ -1589,7 +1589,7 @@ bool luaval_to_ccvaluemapintkey(lua_State* L, int lo, cocos2d::ValueMapIntKey* r if (!tolua_istable(L, lo, 0, &tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1667,7 +1667,7 @@ bool luaval_to_ccvaluemapintkey(lua_State* L, int lo, cocos2d::ValueMapIntKey* r return ok; } -bool luaval_to_ccvaluevector(lua_State* L, int lo, cocos2d::ValueVector* ret) +bool luaval_to_ccvaluevector(lua_State* L, int lo, cocos2d::ValueVector* ret, const char* funcName) { if (nullptr == L || nullptr == ret) return false; @@ -1677,7 +1677,7 @@ bool luaval_to_ccvaluevector(lua_State* L, int lo, cocos2d::ValueVector* ret) if (!tolua_istable(L, lo, 0, &tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1749,7 +1749,7 @@ bool luaval_to_ccvaluevector(lua_State* L, int lo, cocos2d::ValueVector* ret) return ok; } -bool luaval_to_std_vector_string(lua_State* L, int lo, std::vector* ret) +bool luaval_to_std_vector_string(lua_State* L, int lo, std::vector* ret, const char* funcName) { if (nullptr == L || nullptr == ret || lua_gettop(L) < lo) return false; @@ -1759,7 +1759,7 @@ bool luaval_to_std_vector_string(lua_State* L, int lo, std::vector* if (!tolua_istable(L, lo, 0, &tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1790,7 +1790,7 @@ bool luaval_to_std_vector_string(lua_State* L, int lo, std::vector* return ok; } -bool luaval_to_std_vector_int(lua_State* L, int lo, std::vector* ret) +bool luaval_to_std_vector_int(lua_State* L, int lo, std::vector* ret, const char* funcName) { if (nullptr == L || nullptr == ret || lua_gettop(L) < lo) return false; @@ -1800,7 +1800,7 @@ bool luaval_to_std_vector_int(lua_State* L, int lo, std::vector* ret) if (!tolua_istable(L, lo, 0, &tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1828,7 +1828,7 @@ bool luaval_to_std_vector_int(lua_State* L, int lo, std::vector* ret) return ok; } -bool luaval_to_mesh_vertex_attrib(lua_State* L, int lo, cocos2d::MeshVertexAttrib* ret) +bool luaval_to_mesh_vertex_attrib(lua_State* L, int lo, cocos2d::MeshVertexAttrib* ret, const char* funcName) { if (nullptr == L || nullptr == ret || lua_gettop(L) < lo) return false; @@ -1839,7 +1839,7 @@ bool luaval_to_mesh_vertex_attrib(lua_State* L, int lo, cocos2d::MeshVertexAttri if (!tolua_istable(L, lo, 0, &tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1872,7 +1872,7 @@ bool luaval_to_mesh_vertex_attrib(lua_State* L, int lo, cocos2d::MeshVertexAttri } -bool luaval_to_std_vector_float(lua_State* L, int lo, std::vector* ret) +bool luaval_to_std_vector_float(lua_State* L, int lo, std::vector* ret, const char* funcName) { if (nullptr == L || nullptr == ret || lua_gettop(L) < lo) return false; @@ -1883,7 +1883,7 @@ bool luaval_to_std_vector_float(lua_State* L, int lo, std::vector* ret) if (!tolua_istable(L, lo, 0, &tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1912,7 +1912,7 @@ bool luaval_to_std_vector_float(lua_State* L, int lo, std::vector* ret) } -bool luaval_to_std_vector_ushort(lua_State* L, int lo, std::vector* ret) +bool luaval_to_std_vector_ushort(lua_State* L, int lo, std::vector* ret, const char* funcName) { if (nullptr == L || nullptr == ret || lua_gettop(L) < lo) return false; @@ -1923,7 +1923,7 @@ bool luaval_to_std_vector_ushort(lua_State* L, int lo, std::vector=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } diff --git a/cocos/scripting/lua-bindings/manual/LuaBasicConversions.h b/cocos/scripting/lua-bindings/manual/LuaBasicConversions.h index f332afb076..0f3db745eb 100644 --- a/cocos/scripting/lua-bindings/manual/LuaBasicConversions.h +++ b/cocos/scripting/lua-bindings/manual/LuaBasicConversions.h @@ -37,7 +37,7 @@ extern std::unordered_map g_luaType; extern std::unordered_map g_typeCast; #if COCOS2D_DEBUG >=1 -void luaval_to_native_err(lua_State* L,const char* msg,tolua_Error* err); +void luaval_to_native_err(lua_State* L,const char* msg,tolua_Error* err, const char* funcName = ""); #endif #define LUA_PRECONDITION( condition, ...) if( ! (condition) ) { \ @@ -47,48 +47,49 @@ cocos2d::log(__VA_ARGS__); \ extern bool luaval_is_usertype(lua_State* L,int lo,const char* type, int def); // to native -extern bool luaval_to_ushort(lua_State* L, int lo, unsigned short* outValue); -extern bool luaval_to_int32(lua_State* L,int lo,int* outValue); -extern bool luaval_to_uint32(lua_State* L, int lo, unsigned int* outValue); -extern bool luaval_to_uint16(lua_State* L,int lo,uint16_t* outValue); -extern bool luaval_to_boolean(lua_State* L,int lo,bool* outValue); -extern bool luaval_to_number(lua_State* L,int lo,double* outValue); -extern bool luaval_to_long_long(lua_State* L,int lo,long long* outValue); -extern bool luaval_to_std_string(lua_State* L, int lo, std::string* outValue); -extern bool luaval_to_long(lua_State* L,int lo, long* outValue); -extern bool luaval_to_ssize(lua_State* L,int lo, ssize_t* outValue); -extern bool luaval_to_size(lua_State* L,int lo,Size* outValue); -extern bool luaval_to_rect(lua_State* L,int lo,Rect* outValue); -extern bool luaval_to_color3b(lua_State* L,int lo,Color3B* outValue); -extern bool luaval_to_color4b(lua_State* L,int lo,Color4B* outValue); -extern bool luaval_to_color4f(lua_State* L,int lo,Color4F* outValue); -extern bool luaval_to_physics_material(lua_State* L,int lo, cocos2d::PhysicsMaterial* outValue); -extern bool luaval_to_affinetransform(lua_State* L,int lo, AffineTransform* outValue); -extern bool luaval_to_fontdefinition(lua_State* L, int lo, FontDefinition* outValue ); -extern bool luaval_to_mat4(lua_State* L, int lo, cocos2d::Mat4* outValue ); -extern bool luaval_to_array(lua_State* L,int lo, __Array** outValue); -extern bool luaval_to_dictionary(lua_State* L,int lo, __Dictionary** outValue); -extern bool luaval_to_array_of_vec2(lua_State* L,int lo,cocos2d::Vec2 **points, int *numPoints); +extern bool luaval_to_ulong(lua_State* L,int lo, unsigned long* outValue, const char* funcName=""); +extern bool luaval_to_ushort(lua_State* L, int lo, unsigned short* outValue, const char* funcName = ""); +extern bool luaval_to_int32(lua_State* L,int lo,int* outValue, const char* funcName = ""); +extern bool luaval_to_uint32(lua_State* L, int lo, unsigned int* outValue, const char* funcName = ""); +extern bool luaval_to_uint16(lua_State* L,int lo,uint16_t* outValue, const char* funcName = ""); +extern bool luaval_to_boolean(lua_State* L,int lo,bool* outValue, const char* funcName = ""); +extern bool luaval_to_number(lua_State* L,int lo,double* outValue, const char* funcName = ""); +extern bool luaval_to_long_long(lua_State* L,int lo,long long* outValue, const char* funcName = ""); +extern bool luaval_to_std_string(lua_State* L, int lo, std::string* outValue, const char* funcName = ""); +extern bool luaval_to_long(lua_State* L,int lo, long* outValue, const char* funcName = ""); +extern bool luaval_to_ssize(lua_State* L,int lo, ssize_t* outValue, const char* funcName = ""); +extern bool luaval_to_size(lua_State* L,int lo,Size* outValue, const char* funcName = ""); +extern bool luaval_to_rect(lua_State* L,int lo,Rect* outValue, const char* funcName = ""); +extern bool luaval_to_color3b(lua_State* L,int lo,Color3B* outValue, const char* funcName = ""); +extern bool luaval_to_color4b(lua_State* L,int lo,Color4B* outValue, const char* funcName = ""); +extern bool luaval_to_color4f(lua_State* L,int lo,Color4F* outValue, const char* funcName = ""); +extern bool luaval_to_physics_material(lua_State* L,int lo, cocos2d::PhysicsMaterial* outValue, const char* funcName = ""); +extern bool luaval_to_affinetransform(lua_State* L,int lo, AffineTransform* outValue, const char* funcName = ""); +extern bool luaval_to_fontdefinition(lua_State* L, int lo, FontDefinition* outValue , const char* funcName = ""); +extern bool luaval_to_mat4(lua_State* L, int lo, cocos2d::Mat4* outValue , const char* funcName = ""); +extern bool luaval_to_array(lua_State* L,int lo, __Array** outValue, const char* funcName = ""); +extern bool luaval_to_dictionary(lua_State* L,int lo, __Dictionary** outValue, const char* funcName = ""); +extern bool luaval_to_array_of_vec2(lua_State* L,int lo,cocos2d::Vec2 **points, int *numPoints, const char* funcName = ""); extern bool luavals_variadic_to_array(lua_State* L,int argc, __Array** ret); extern bool luavals_variadic_to_ccvaluevector(lua_State* L, int argc, cocos2d::ValueVector* ret); -extern bool luaval_to_vec2(lua_State* L,int lo,cocos2d::Vec2* outValue); -extern bool luaval_to_vec3(lua_State* L,int lo,cocos2d::Vec3* outValue); -extern bool luaval_to_vec4(lua_State* L,int lo,cocos2d::Vec4* outValue); -extern bool luaval_to_blendfunc(lua_State* L, int lo, cocos2d::BlendFunc* outValue); -extern bool luaval_to_ttfconfig(lua_State* L, int lo, cocos2d::TTFConfig* outValue); -extern bool luaval_to_uniform(lua_State* L, int lo, cocos2d::Uniform* outValue); -extern bool luaval_to_vertexattrib(lua_State* L, int lo, cocos2d::VertexAttrib* outValue); +extern bool luaval_to_vec2(lua_State* L,int lo,cocos2d::Vec2* outValue, const char* funcName = ""); +extern bool luaval_to_vec3(lua_State* L,int lo,cocos2d::Vec3* outValue, const char* funcName = ""); +extern bool luaval_to_vec4(lua_State* L,int lo,cocos2d::Vec4* outValue, const char* funcName = ""); +extern bool luaval_to_blendfunc(lua_State* L, int lo, cocos2d::BlendFunc* outValue, const char* funcName = ""); +extern bool luaval_to_ttfconfig(lua_State* L, int lo, cocos2d::TTFConfig* outValue, const char* funcName = ""); +extern bool luaval_to_uniform(lua_State* L, int lo, cocos2d::Uniform* outValue, const char* funcName = ""); +extern bool luaval_to_vertexattrib(lua_State* L, int lo, cocos2d::VertexAttrib* outValue, const char* funcName = ""); -static inline bool luaval_to_point(lua_State* L,int lo,cocos2d::Vec2* outValue) +static inline bool luaval_to_point(lua_State* L,int lo,cocos2d::Vec2* outValue, const char* funcName = "") { return luaval_to_vec2(L, lo, outValue); } -CC_DEPRECATED_ATTRIBUTE static inline bool luaval_to_kmMat4(lua_State* L, int lo, cocos2d::Mat4* outValue ) +CC_DEPRECATED_ATTRIBUTE static inline bool luaval_to_kmMat4(lua_State* L, int lo, cocos2d::Mat4* outValue , const char* funcName = "") { return luaval_to_mat4(L, lo, outValue); } -CC_DEPRECATED_ATTRIBUTE static inline bool luaval_to_array_of_Point(lua_State* L,int lo,cocos2d::Vec2 **points, int *numPoints) +CC_DEPRECATED_ATTRIBUTE static inline bool luaval_to_array_of_Point(lua_State* L,int lo,cocos2d::Vec2 **points, int *numPoints, const char* funcName = "") { return luaval_to_array_of_vec2(L, lo, points, numPoints); } @@ -122,7 +123,7 @@ bool luavals_variadic_to_ccvector( lua_State* L, int argc, cocos2d::Vector* r } template -bool luaval_to_ccvector(lua_State* L, int lo , cocos2d::Vector* ret) +bool luaval_to_ccvector(lua_State* L, int lo , cocos2d::Vector* ret, const char* funcName = "") { if (nullptr == L || nullptr == ret) return false; @@ -159,11 +160,11 @@ bool luaval_to_ccvector(lua_State* L, int lo , cocos2d::Vector* ret) return ok; } -bool luaval_to_std_vector_string(lua_State* L, int lo, std::vector* ret); -bool luaval_to_std_vector_int(lua_State* L, int lo, std::vector* ret); +bool luaval_to_std_vector_string(lua_State* L, int lo, std::vector* ret, const char* funcName = ""); +bool luaval_to_std_vector_int(lua_State* L, int lo, std::vector* ret, const char* funcName = ""); template -bool luaval_to_ccmap_string_key(lua_State* L, int lo, cocos2d::Map* ret) +bool luaval_to_ccmap_string_key(lua_State* L, int lo, cocos2d::Map* ret, const char* funcName = "") { if(nullptr == L || nullptr == ret || lua_gettop(L) < lo) return false; @@ -209,10 +210,10 @@ bool luaval_to_ccmap_string_key(lua_State* L, int lo, cocos2d::Map bool luaval_to_object(lua_State* L, int lo, const char* type, T** ret) @@ -231,9 +232,9 @@ bool luaval_to_object(lua_State* L, int lo, const char* type, T** ret) return true; } -extern bool luaval_to_mesh_vertex_attrib(lua_State* L, int lo, cocos2d::MeshVertexAttrib* ret); -extern bool luaval_to_std_vector_float(lua_State* L, int lo, std::vector* ret); -extern bool luaval_to_std_vector_ushort(lua_State* L, int lo, std::vector* ret); +extern bool luaval_to_mesh_vertex_attrib(lua_State* L, int lo, cocos2d::MeshVertexAttrib* ret, const char* funcName = ""); +extern bool luaval_to_std_vector_float(lua_State* L, int lo, std::vector* ret, const char* funcName = ""); +extern bool luaval_to_std_vector_ushort(lua_State* L, int lo, std::vector* ret, const char* funcName = ""); // from native extern void vec2_to_luaval(lua_State* L,const cocos2d::Vec2& vec2); @@ -318,7 +319,7 @@ void ccmap_string_key_to_luaval(lua_State* L, const cocos2d::Map auto typeIter = g_luaType.find(name); if (g_luaType.end() != typeIter) { - lua_pushstring(L, name.c_str()); + lua_pushstring(L, key.c_str()); int ID = (obj) ? (int)obj->_ID : -1; int* luaID = (obj) ? &obj->_luaID : NULL; toluafix_pushusertype_ccobject(L, ID, luaID, (void*)obj,typeIter->second.c_str()); @@ -361,11 +362,10 @@ void object_to_luaval(lua_State* L,const char* type, T* ret) { if(nullptr != ret) { - - cocos2d::Ref* dynObject = dynamic_cast(ret); - - if (nullptr != dynObject) + if (std::is_base_of::value) { + // use c style cast, T may not polymorphic + cocos2d::Ref* dynObject = (cocos2d::Ref*)(ret); int ID = (int)(dynObject->_ID) ; int* luaID = &(dynObject->_luaID); toluafix_pushusertype_ccobject(L,ID, luaID, (void*)ret,type); diff --git a/cocos/scripting/lua-bindings/manual/LuaOpengl.cpp b/cocos/scripting/lua-bindings/manual/LuaOpengl.cpp index 8d7e5c100b..a1bf353acc 100644 --- a/cocos/scripting/lua-bindings/manual/LuaOpengl.cpp +++ b/cocos/scripting/lua-bindings/manual/LuaOpengl.cpp @@ -4429,7 +4429,7 @@ static int tolua_cocos2d_DrawPrimitives_drawPoint00(lua_State* tolua_S) #endif { cocos2d::Vec2 vec2; - if(luaval_to_vec2(tolua_S, 1, &vec2)) + if(luaval_to_vec2(tolua_S, 1, &vec2, "cc.DrawPrimitives.drawPoint")) { DrawPrimitives::drawPoint(vec2); } @@ -4476,7 +4476,7 @@ static int tolua_cocos2d_DrawPrimitives_drawPoints00(lua_State* tolua_S) goto tolua_lerror; } - if(!luaval_to_vec2(tolua_S, lua_gettop(tolua_S), &points[i])) + if(!luaval_to_vec2(tolua_S, lua_gettop(tolua_S), &points[i], "cc.DrawPrimitives.drawPoints")) { lua_pop(tolua_S, 1); CC_SAFE_DELETE_ARRAY(points); @@ -4512,11 +4512,11 @@ static int tolua_cocos2d_DrawPrimitives_drawLine00(lua_State* tolua_S) #endif { cocos2d::Vec2 origin; - if (!luaval_to_vec2(tolua_S, 1, &origin)) + if (!luaval_to_vec2(tolua_S, 1, &origin, "cc.DrawPrimitives.drawLine")) return 0; cocos2d::Vec2 destination; - if (!luaval_to_vec2(tolua_S, 2, &destination)) + if (!luaval_to_vec2(tolua_S, 2, &destination, "cc.DrawPrimitives.drawLine")) return 0; DrawPrimitives::drawLine(origin,destination); @@ -4545,11 +4545,11 @@ static int tolua_cocos2d_DrawPrimitives_drawRect00(lua_State* tolua_S) #endif { cocos2d::Vec2 origin; - if (!luaval_to_vec2(tolua_S, 1, &origin)) + if (!luaval_to_vec2(tolua_S, 1, &origin, "cc.DrawPrimitives.drawRect")) return 0; cocos2d::Vec2 destination; - if (!luaval_to_vec2(tolua_S, 2, &destination)) + if (!luaval_to_vec2(tolua_S, 2, &destination, "cc.DrawPrimitives.drawRect")) return 0; DrawPrimitives::drawRect(origin,destination); @@ -4580,15 +4580,15 @@ static int tolua_cocos2d_DrawPrimitives_drawSolidRect00(lua_State* tolua_S) #endif { cocos2d::Vec2 origin; - if (!luaval_to_vec2(tolua_S, 1, &origin)) + if (!luaval_to_vec2(tolua_S, 1, &origin, "cc.DrawPrimitives.drawSolidRect")) return 0; cocos2d::Vec2 destination; - if (!luaval_to_vec2(tolua_S, 2, &destination)) + if (!luaval_to_vec2(tolua_S, 2, &destination, "cc.DrawPrimitives.drawSolidRect")) return 0; Color4F color; - if (!luaval_to_color4f(tolua_S, 3, &color)) + if (!luaval_to_color4f(tolua_S, 3, &color, "cc.DrawPrimitives.drawSolidRect")) return 0; @@ -4638,7 +4638,7 @@ static int tolua_cocos2d_DrawPrimitives_drawPoly00(lua_State* tolua_S) goto tolua_lerror; } - if(!luaval_to_vec2(tolua_S, lua_gettop(tolua_S), &points[i])) + if(!luaval_to_vec2(tolua_S, lua_gettop(tolua_S), &points[i], "cc.DrawPrimitives.drawPoly")) { lua_pop(tolua_S, 1); CC_SAFE_DELETE_ARRAY(points); @@ -4692,7 +4692,7 @@ static int tolua_cocos2d_DrawPrimitives_drawSolidPoly00(lua_State* tolua_S) goto tolua_lerror; } - if(!luaval_to_vec2(tolua_S, lua_gettop(tolua_S), &points[i])) + if(!luaval_to_vec2(tolua_S, lua_gettop(tolua_S), &points[i], "cc.DrawPrimitives.drawSolidPoly")) { lua_pop(tolua_S, 1); CC_SAFE_DELETE_ARRAY(points); @@ -4702,7 +4702,7 @@ static int tolua_cocos2d_DrawPrimitives_drawSolidPoly00(lua_State* tolua_S) } Color4F color; - if (!luaval_to_color4f(tolua_S, 3, &color)) + if (!luaval_to_color4f(tolua_S, 3, &color, "cc.DrawPrimitives.drawSolidPoly")) { CC_SAFE_DELETE_ARRAY(points); return 0; @@ -4742,7 +4742,7 @@ static int tolua_cocos2d_DrawPrimitives_drawCircle00(lua_State* tolua_S) #endif { cocos2d::Vec2 center; - if (!luaval_to_vec2(tolua_S, 1, ¢er)) + if (!luaval_to_vec2(tolua_S, 1, ¢er, "cc.DrawPrimitives.drawCircle")) return 0; float radius = ((float) tolua_tonumber(tolua_S,2,0)); @@ -4783,7 +4783,7 @@ static int tolua_cocos2d_DrawPrimitives_drawSolidCircle00(lua_State* tolua_S) #endif { cocos2d::Vec2 center; - if (!luaval_to_vec2(tolua_S, 1, ¢er)) + if (!luaval_to_vec2(tolua_S, 1, ¢er, "cc.DrawPrimitives.drawSolidCircle")) return 0; float radius = ((float) tolua_tonumber(tolua_S,2,0)); float angle = ((float) tolua_tonumber(tolua_S,3,0)); @@ -4820,15 +4820,15 @@ static int tolua_cocos2d_DrawPrimitives_drawQuadBezier00(lua_State* tolua_S) #endif { cocos2d::Vec2 origin; - if (!luaval_to_vec2(tolua_S, 1, &origin)) + if (!luaval_to_vec2(tolua_S, 1, &origin, "cc.DrawPrimitives.drawQuadBezier")) return 0; cocos2d::Vec2 control; - if (!luaval_to_vec2(tolua_S, 2, &control)) + if (!luaval_to_vec2(tolua_S, 2, &control, "cc.DrawPrimitives.drawQuadBezier")) return 0; cocos2d::Vec2 destination; - if (!luaval_to_vec2(tolua_S, 3, &destination)) + if (!luaval_to_vec2(tolua_S, 3, &destination, "cc.DrawPrimitives.drawQuadBezier")) return 0; unsigned int segments = ((unsigned int) tolua_tonumber(tolua_S,4,0)); @@ -4863,19 +4863,19 @@ static int tolua_cocos2d_DrawPrimitives_drawCubicBezier00(lua_State* tolua_S) { cocos2d::Vec2 origin; - if (!luaval_to_vec2(tolua_S, 1, &origin)) + if (!luaval_to_vec2(tolua_S, 1, &origin, "cc.DrawPrimitives.drawCubicBezier")) return 0; cocos2d::Vec2 control1; - if (!luaval_to_vec2(tolua_S, 2, &control1)) + if (!luaval_to_vec2(tolua_S, 2, &control1, "cc.DrawPrimitives.drawCubicBezier")) return 0; cocos2d::Vec2 control2; - if (!luaval_to_vec2(tolua_S, 3, &control2)) + if (!luaval_to_vec2(tolua_S, 3, &control2, "cc.DrawPrimitives.drawCubicBezier")) return 0; cocos2d::Vec2 destination; - if (!luaval_to_vec2(tolua_S, 4, &destination)) + if (!luaval_to_vec2(tolua_S, 4, &destination, "cc.DrawPrimitives.drawCubicBezier")) return 0; unsigned int segments = ((unsigned int) tolua_tonumber(tolua_S,5,0)); @@ -4907,7 +4907,7 @@ int tolua_cocos2d_DrawPrimitives_drawCatmullRom00(lua_State* tolua_S) { int num = 0; cocos2d::Vec2 *arr = NULL; - if (!luaval_to_array_of_vec2(tolua_S, 1, &arr, &num)) + if (!luaval_to_array_of_vec2(tolua_S, 1, &arr, &num, "cc.DrawPrimitives.drawCatmullRom")) return 0; @@ -4954,7 +4954,7 @@ int tolua_cocos2d_DrawPrimitives_drawCardinalSpline00(lua_State* tolua_S) { int num = 0; cocos2d::Vec2 *arr = NULL; - if (!luaval_to_array_of_vec2(tolua_S, 1, &arr, &num)) + if (!luaval_to_array_of_vec2(tolua_S, 1, &arr, &num, "cc.DrawPrimitives.drawCatmullRom")) return 0; diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_coco_studio_manual.cpp b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_coco_studio_manual.cpp index a33e1adb2f..d7874f2782 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_coco_studio_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_coco_studio_manual.cpp @@ -428,7 +428,7 @@ int lua_cocos2dx_studio_NodeReader_getInstance(lua_State* L) tolua_pushusertype(L,(void*)ret, "ccs.NodeReader"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.NodeReader:getInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -471,7 +471,7 @@ int lua_cocos2dx_studio_ActionTimelineCache_getInstance(lua_State* L) tolua_pushusertype(L,(void*)ret, "ccs.ActionTimelineCache"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ActionTimelineCache:getInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_deprecated.cpp b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_deprecated.cpp index 8b6345ae4d..eb64b99bb1 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_deprecated.cpp +++ b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_deprecated.cpp @@ -1996,13 +1996,13 @@ static int lua_cocos2dx_LabelBMFont_setLineBreakWithoutSpace(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.LabelBMFont:setLineBreakWithoutSpace"); if(!ok) return 0; cobj->setLineBreakWithoutSpace(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLineBreakWithoutSpace",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:setLineBreakWithoutSpace",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2046,7 +2046,7 @@ static int lua_cocos2dx_LabelBMFont_getBlendFunc(lua_State* tolua_S) blendfunc_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBlendFunc",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:getBlendFunc",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2090,7 +2090,7 @@ static int lua_cocos2dx_LabelBMFont_isOpacityModifyRGB(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isOpacityModifyRGB",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:isOpacityModifyRGB",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2130,14 +2130,14 @@ static int lua_cocos2dx_LabelBMFont_getLetter(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.LabelBMFont:getLetter"); if(!ok) return 0; cocos2d::Sprite* ret = cobj->getLetter(arg0); object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLetter",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:getLetter",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2181,7 +2181,7 @@ static int lua_cocos2dx_LabelBMFont_getString(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getString",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:getString",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2227,7 +2227,7 @@ static int lua_cocos2dx_LabelBMFont_setBlendFunc(lua_State* tolua_S) cobj->setBlendFunc(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBlendFunc",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:setBlendFunc",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2267,13 +2267,13 @@ static int lua_cocos2dx_LabelBMFont_setString(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:setString"); if(!ok) return 0; cobj->setString(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setString",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:setString",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2314,9 +2314,9 @@ static int lua_cocos2dx_LabelBMFont_initWithString(lua_State* tolua_S) std::string arg0; std::string arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:initWithString"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelBMFont:initWithString"); if(!ok) return 0; bool ret = cobj->initWithString(arg0, arg1); @@ -2329,11 +2329,11 @@ static int lua_cocos2dx_LabelBMFont_initWithString(lua_State* tolua_S) std::string arg1; double arg2; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:initWithString"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1,"cc.LabelBMFont:initWithString"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelBMFont:initWithString"); if(!ok) return 0; bool ret = cobj->initWithString(arg0, arg1, arg2); @@ -2347,13 +2347,13 @@ static int lua_cocos2dx_LabelBMFont_initWithString(lua_State* tolua_S) double arg2; cocos2d::TextHAlignment arg3; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:initWithString"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelBMFont:initWithString"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelBMFont:initWithString"); - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.LabelBMFont:initWithString"); if(!ok) return 0; bool ret = cobj->initWithString(arg0, arg1, arg2, arg3); @@ -2368,22 +2368,22 @@ static int lua_cocos2dx_LabelBMFont_initWithString(lua_State* tolua_S) cocos2d::TextHAlignment arg3; cocos2d::Vec2 arg4; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:initWithString"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelBMFont:initWithString"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelBMFont:initWithString"); - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.LabelBMFont:initWithString"); - ok &= luaval_to_vec2(tolua_S, 6, &arg4); + ok &= luaval_to_vec2(tolua_S, 6, &arg4, "cc.LabelBMFont:initWithString"); if(!ok) return 0; bool ret = cobj->initWithString(arg0, arg1, arg2, arg3, arg4); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithString",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:initWithString",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -2423,13 +2423,13 @@ static int lua_cocos2dx_LabelBMFont_setOpacityModifyRGB(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.LabelBMFont:setOpacityModifyRGB"); if(!ok) return 0; cobj->setOpacityModifyRGB(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOpacityModifyRGB",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:setOpacityModifyRGB",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2473,7 +2473,7 @@ static int lua_cocos2dx_LabelBMFont_getFntFile(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFntFile",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:getFntFile",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2513,7 +2513,7 @@ static int lua_cocos2dx_LabelBMFont_setFntFile(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:setFntFile"); if(!ok) return 0; cobj->setFntFile(arg0); @@ -2524,15 +2524,15 @@ static int lua_cocos2dx_LabelBMFont_setFntFile(lua_State* tolua_S) std::string arg0; cocos2d::Vec2 arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:setFntFile"); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.LabelBMFont:setFntFile"); if(!ok) return 0; cobj->setFntFile(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFntFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:setFntFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2572,13 +2572,13 @@ static int lua_cocos2dx_LabelBMFont_setAlignment(lua_State* tolua_S) { cocos2d::TextHAlignment arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.LabelBMFont:setAlignment"); if(!ok) return 0; cobj->setAlignment(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAlignment",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:setAlignment",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2618,13 +2618,13 @@ static int lua_cocos2dx_LabelBMFont_setWidth(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.LabelBMFont:setWidth"); if(!ok) return 0; cobj->setWidth(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setWidth",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:setWidth",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2663,10 +2663,10 @@ static int lua_cocos2dx_LabelBMFont_create(lua_State* tolua_S) if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelBMFont:create"); if (!ok) { break; } cocos2d::LabelBMFont* ret = cocos2d::LabelBMFont::create(arg0, arg1); object_to_luaval(tolua_S, "cc.LabelBMFont",(cocos2d::LabelBMFont*)ret); @@ -2679,13 +2679,13 @@ static int lua_cocos2dx_LabelBMFont_create(lua_State* tolua_S) if (argc == 3) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelBMFont:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelBMFont:create"); if (!ok) { break; } cocos2d::LabelBMFont* ret = cocos2d::LabelBMFont::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.LabelBMFont",(cocos2d::LabelBMFont*)ret); @@ -2698,16 +2698,16 @@ static int lua_cocos2dx_LabelBMFont_create(lua_State* tolua_S) if (argc == 4) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelBMFont:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelBMFont:create"); if (!ok) { break; } cocos2d::TextHAlignment arg3; - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.LabelBMFont:create"); if (!ok) { break; } cocos2d::LabelBMFont* ret = cocos2d::LabelBMFont::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.LabelBMFont",(cocos2d::LabelBMFont*)ret); @@ -2720,19 +2720,19 @@ static int lua_cocos2dx_LabelBMFont_create(lua_State* tolua_S) if (argc == 5) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelBMFont:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelBMFont:create"); if (!ok) { break; } cocos2d::TextHAlignment arg3; - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.LabelBMFont:create"); if (!ok) { break; } cocos2d::Vec2 arg4; - ok &= luaval_to_vec2(tolua_S, 6, &arg4); + ok &= luaval_to_vec2(tolua_S, 6, &arg4, "cc.LabelBMFont:create"); if (!ok) { break; } cocos2d::LabelBMFont* ret = cocos2d::LabelBMFont::create(arg0, arg1, arg2, arg3, arg4); object_to_luaval(tolua_S, "cc.LabelBMFont",(cocos2d::LabelBMFont*)ret); @@ -2740,7 +2740,7 @@ static int lua_cocos2dx_LabelBMFont_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.LabelBMFont:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -2772,7 +2772,7 @@ static int lua_cocos2dx_LabelBMFont_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.LabelBMFont"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "LabelBMFont",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:new",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2851,11 +2851,11 @@ static int lua_cocos2dx_LabelTTF_enableShadow(lua_State* tolua_S) double arg1; double arg2; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.LabelTTF:enableShadow"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.LabelTTF:enableShadow"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelTTF:enableShadow"); if(!ok) return 0; cobj->enableShadow(arg0, arg1, arg2); @@ -2868,19 +2868,19 @@ static int lua_cocos2dx_LabelTTF_enableShadow(lua_State* tolua_S) double arg2; bool arg3; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.LabelTTF:enableShadow"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.LabelTTF:enableShadow"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelTTF:enableShadow"); - ok &= luaval_to_boolean(tolua_S, 5,&arg3); + ok &= luaval_to_boolean(tolua_S, 5,&arg3, "cc.LabelTTF:enableShadow"); if(!ok) return 0; cobj->enableShadow(arg0, arg1, arg2, arg3); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "enableShadow",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:enableShadow",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -2920,13 +2920,13 @@ static int lua_cocos2dx_LabelTTF_setDimensions(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.LabelTTF:setDimensions"); if(!ok) return 0; cobj->setDimensions(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDimensions",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setDimensions",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2970,7 +2970,7 @@ static int lua_cocos2dx_LabelTTF_getFontSize(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFontSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:getFontSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3014,7 +3014,7 @@ static int lua_cocos2dx_LabelTTF_getString(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getString",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:getString",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3054,13 +3054,13 @@ static int lua_cocos2dx_LabelTTF_setFlippedY(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.LabelTTF:setFlippedY"); if(!ok) return 0; cobj->setFlippedY(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFlippedY",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setFlippedY",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3100,13 +3100,13 @@ static int lua_cocos2dx_LabelTTF_setFlippedX(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.LabelTTF:setFlippedX"); if(!ok) return 0; cobj->setFlippedX(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFlippedX",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setFlippedX",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3146,13 +3146,13 @@ static int lua_cocos2dx_LabelTTF_setTextDefinition(lua_State* tolua_S) { cocos2d::FontDefinition arg0; - ok &= luaval_to_fontdefinition(tolua_S, 2, &arg0); + ok &= luaval_to_fontdefinition(tolua_S, 2, &arg0, "cc.LabelTTF:setTextDefinition"); if(!ok) return 0; cobj->setTextDefinition(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextDefinition",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setTextDefinition",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3192,13 +3192,13 @@ static int lua_cocos2dx_LabelTTF_setFontName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:setFontName"); if(!ok) return 0; cobj->setFontName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFontName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setFontName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3242,7 +3242,7 @@ static int lua_cocos2dx_LabelTTF_getHorizontalAlignment(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getHorizontalAlignment",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:getHorizontalAlignment",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3283,16 +3283,16 @@ static int lua_cocos2dx_LabelTTF_initWithStringAndTextDefinition(lua_State* tolu std::string arg0; cocos2d::FontDefinition arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:initWithStringAndTextDefinition"); - ok &= luaval_to_fontdefinition(tolua_S, 3, &arg1); + ok &= luaval_to_fontdefinition(tolua_S, 3, &arg1, "cc.LabelTTF:initWithStringAndTextDefinition"); if(!ok) return 0; bool ret = cobj->initWithStringAndTextDefinition(arg0, arg1); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithStringAndTextDefinition",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:initWithStringAndTextDefinition",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -3332,13 +3332,13 @@ static int lua_cocos2dx_LabelTTF_setString(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:setString"); if(!ok) return 0; cobj->setString(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setString",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setString",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3380,11 +3380,11 @@ static int lua_cocos2dx_LabelTTF_initWithString(lua_State* tolua_S) std::string arg1; double arg2; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:initWithString"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelTTF:initWithString"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelTTF:initWithString"); if(!ok) return 0; bool ret = cobj->initWithString(arg0, arg1, arg2); @@ -3398,13 +3398,13 @@ static int lua_cocos2dx_LabelTTF_initWithString(lua_State* tolua_S) double arg2; cocos2d::Size arg3; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:initWithString"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelTTF:initWithString"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelTTF:initWithString"); - ok &= luaval_to_size(tolua_S, 5, &arg3); + ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.LabelTTF:initWithString"); if(!ok) return 0; bool ret = cobj->initWithString(arg0, arg1, arg2, arg3); @@ -3419,15 +3419,15 @@ static int lua_cocos2dx_LabelTTF_initWithString(lua_State* tolua_S) cocos2d::Size arg3; cocos2d::TextHAlignment arg4; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:initWithString"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelTTF:initWithString"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelTTF:initWithString"); - ok &= luaval_to_size(tolua_S, 5, &arg3); + ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.LabelTTF:initWithString"); - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.LabelTTF:initWithString"); if(!ok) return 0; bool ret = cobj->initWithString(arg0, arg1, arg2, arg3, arg4); @@ -3443,24 +3443,24 @@ static int lua_cocos2dx_LabelTTF_initWithString(lua_State* tolua_S) cocos2d::TextHAlignment arg4; cocos2d::TextVAlignment arg5; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:initWithString"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelTTF:initWithString"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelTTF:initWithString"); - ok &= luaval_to_size(tolua_S, 5, &arg3); + ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.LabelTTF:initWithString"); - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.LabelTTF:initWithString"); - ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5); + ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5, "cc.LabelTTF:initWithString"); if(!ok) return 0; bool ret = cobj->initWithString(arg0, arg1, arg2, arg3, arg4, arg5); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithString",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:initWithString",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -3500,7 +3500,7 @@ static int lua_cocos2dx_LabelTTF_setFontFillColor(lua_State* tolua_S) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.LabelTTF:setFontFillColor"); if(!ok) return 0; cobj->setFontFillColor(arg0); @@ -3511,15 +3511,15 @@ static int lua_cocos2dx_LabelTTF_setFontFillColor(lua_State* tolua_S) cocos2d::Color3B arg0; bool arg1; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.LabelTTF:setFontFillColor"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.LabelTTF:setFontFillColor"); if(!ok) return 0; cobj->setFontFillColor(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFontFillColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setFontFillColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3563,7 +3563,7 @@ static int lua_cocos2dx_LabelTTF_getBlendFunc(lua_State* tolua_S) blendfunc_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBlendFunc",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:getBlendFunc",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3604,9 +3604,9 @@ static int lua_cocos2dx_LabelTTF_enableStroke(lua_State* tolua_S) cocos2d::Color3B arg0; double arg1; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.LabelTTF:enableStroke"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.LabelTTF:enableStroke"); if(!ok) return 0; cobj->enableStroke(arg0, arg1); @@ -3618,17 +3618,17 @@ static int lua_cocos2dx_LabelTTF_enableStroke(lua_State* tolua_S) double arg1; bool arg2; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.LabelTTF:enableStroke"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.LabelTTF:enableStroke"); - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.LabelTTF:enableStroke"); if(!ok) return 0; cobj->enableStroke(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "enableStroke",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:enableStroke",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -3672,7 +3672,7 @@ static int lua_cocos2dx_LabelTTF_getDimensions(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDimensions",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:getDimensions",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3712,13 +3712,13 @@ static int lua_cocos2dx_LabelTTF_setVerticalAlignment(lua_State* tolua_S) { cocos2d::TextVAlignment arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.LabelTTF:setVerticalAlignment"); if(!ok) return 0; cobj->setVerticalAlignment(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVerticalAlignment",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setVerticalAlignment",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3758,13 +3758,13 @@ static int lua_cocos2dx_LabelTTF_setFontSize(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.LabelTTF:setFontSize"); if(!ok) return 0; cobj->setFontSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFontSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setFontSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3808,7 +3808,7 @@ static int lua_cocos2dx_LabelTTF_getVerticalAlignment(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVerticalAlignment",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:getVerticalAlignment",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3852,7 +3852,7 @@ static int lua_cocos2dx_LabelTTF_getTextDefinition(lua_State* tolua_S) fontdefinition_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextDefinition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:getTextDefinition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3898,7 +3898,7 @@ static int lua_cocos2dx_LabelTTF_setBlendFunc(lua_State* tolua_S) cobj->setBlendFunc(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBlendFunc",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setBlendFunc",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3942,7 +3942,7 @@ static int lua_cocos2dx_LabelTTF_getFontName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFontName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:getFontName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3982,13 +3982,13 @@ static int lua_cocos2dx_LabelTTF_setHorizontalAlignment(lua_State* tolua_S) { cocos2d::TextHAlignment arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.LabelTTF:setHorizontalAlignment"); if(!ok) return 0; cobj->setHorizontalAlignment(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setHorizontalAlignment",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setHorizontalAlignment",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4035,13 +4035,13 @@ static int lua_cocos2dx_LabelTTF_disableShadow(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.LabelTTF:disableShadow"); if(!ok) return 0; cobj->disableShadow(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "disableShadow",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:disableShadow",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4088,13 +4088,13 @@ static int lua_cocos2dx_LabelTTF_disableStroke(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.LabelTTF:disableStroke"); if(!ok) return 0; cobj->disableStroke(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "disableStroke",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:disableStroke",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4133,13 +4133,13 @@ static int lua_cocos2dx_LabelTTF_create(lua_State* tolua_S) if (argc == 3) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelTTF:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelTTF:create"); if (!ok) { break; } cocos2d::LabelTTF* ret = cocos2d::LabelTTF::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.LabelTTF",(cocos2d::LabelTTF*)ret); @@ -4152,16 +4152,16 @@ static int lua_cocos2dx_LabelTTF_create(lua_State* tolua_S) if (argc == 4) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelTTF:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelTTF:create"); if (!ok) { break; } cocos2d::Size arg3; - ok &= luaval_to_size(tolua_S, 5, &arg3); + ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.LabelTTF:create"); if (!ok) { break; } cocos2d::LabelTTF* ret = cocos2d::LabelTTF::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.LabelTTF",(cocos2d::LabelTTF*)ret); @@ -4174,19 +4174,19 @@ static int lua_cocos2dx_LabelTTF_create(lua_State* tolua_S) if (argc == 5) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelTTF:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelTTF:create"); if (!ok) { break; } cocos2d::Size arg3; - ok &= luaval_to_size(tolua_S, 5, &arg3); + ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.LabelTTF:create"); if (!ok) { break; } cocos2d::TextHAlignment arg4; - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.LabelTTF:create"); if (!ok) { break; } cocos2d::LabelTTF* ret = cocos2d::LabelTTF::create(arg0, arg1, arg2, arg3, arg4); object_to_luaval(tolua_S, "cc.LabelTTF",(cocos2d::LabelTTF*)ret); @@ -4199,22 +4199,22 @@ static int lua_cocos2dx_LabelTTF_create(lua_State* tolua_S) if (argc == 6) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelTTF:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelTTF:create"); if (!ok) { break; } cocos2d::Size arg3; - ok &= luaval_to_size(tolua_S, 5, &arg3); + ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.LabelTTF:create"); if (!ok) { break; } cocos2d::TextHAlignment arg4; - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.LabelTTF:create"); if (!ok) { break; } cocos2d::TextVAlignment arg5; - ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5); + ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5, "cc.LabelTTF:create"); if (!ok) { break; } cocos2d::LabelTTF* ret = cocos2d::LabelTTF::create(arg0, arg1, arg2, arg3, arg4, arg5); object_to_luaval(tolua_S, "cc.LabelTTF",(cocos2d::LabelTTF*)ret); @@ -4222,7 +4222,7 @@ static int lua_cocos2dx_LabelTTF_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.LabelTTF:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -4249,15 +4249,15 @@ static int lua_cocos2dx_LabelTTF_createWithFontDefinition(lua_State* tolua_S) { std::string arg0; cocos2d::FontDefinition arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_fontdefinition(tolua_S, 3, &arg1); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:createWithFontDefinition"); + ok &= luaval_to_fontdefinition(tolua_S, 3, &arg1, "cc.LabelTTF:createWithFontDefinition"); if(!ok) return 0; cocos2d::LabelTTF* ret = cocos2d::LabelTTF::createWithFontDefinition(arg0, arg1); object_to_luaval(tolua_S, "cc.LabelTTF",(cocos2d::LabelTTF*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithFontDefinition",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.LabelTTF:createWithFontDefinition",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -4289,7 +4289,7 @@ static int lua_cocos2dx_LabelTTF_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.LabelTTF"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "LabelTTF",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:new",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4803,7 +4803,7 @@ static int lua_cocos2dx_Label_create_deprecated(lua_State* tolua_S) cocos2d::Size dimensions = cocos2d::Size::ZERO; if (lua_istable(tolua_S, 5)) { - luaval_to_size(tolua_S, 5, &dimensions); + luaval_to_size(tolua_S, 5, &dimensions, "cc.Label:create"); } TextHAlignment hAlignment = static_cast((int)tolua_tonumber(tolua_S, 6, 0)); TextVAlignment vAlignment = static_cast((int)tolua_tonumber(tolua_S, 7, 0)); diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_manual.cpp b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_manual.cpp new file mode 100644 index 0000000000..a759f0a274 --- /dev/null +++ b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_manual.cpp @@ -0,0 +1,93 @@ +#include "lua_cocos2dx_experimental_manual.hpp" +#include "UIVideoPlayer.h" +#include "tolua_fix.h" +#include "LuaBasicConversions.h" +#include "CCLuaValue.h" +#include "CCLuaEngine.h" + +static int lua_cocos2dx_experimental_TMXLayer_getTileGIDAt(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::experimental::TMXLayer* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccexp.TMXLayer",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::experimental::TMXLayer*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_experimental_TMXLayer_getTileGIDAt'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Vec2 arg0; + + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccexp.TMXLayer:getTileGIDAt"); + if(!ok) + return 0; + int ret = cobj->getTileGIDAt(arg0); + tolua_pushnumber(tolua_S,(lua_Number)ret); + tolua_pushnumber(tolua_S,(lua_Number)0); + return 2; + } + if (argc == 2) + { + cocos2d::Vec2 arg0; + int arg1 = 0; + + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccexp.TMXLayer:getTileGIDAt"); + ok &= luaval_to_int32(tolua_S, 3, &arg1, "ccexp.TMXLayer:getTileGIDAt"); + + if(!ok) + return 0; + + unsigned int ret = cobj->getTileGIDAt(arg0, (cocos2d::TMXTileFlags*)&arg1); + tolua_pushnumber(tolua_S,(lua_Number)ret); + tolua_pushnumber(tolua_S,(lua_Number)arg1); + return 2; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:getTileGIDAt",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 +tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_experimental_TMXLayer_getTileGIDAt'.",&tolua_err); +#endif + + return 0; +} + +static void extendExperimentalTMXLayer(lua_State* tolua_S) +{ + lua_pushstring(tolua_S, "ccexp.TMXLayer"); + lua_rawget(tolua_S, LUA_REGISTRYINDEX); + if (lua_istable(tolua_S,-1)) + { + tolua_function(tolua_S, "getTileGIDAt", lua_cocos2dx_experimental_TMXLayer_getTileGIDAt); + } + lua_pop(tolua_S, 1); +} + +int register_all_cocos2dx_experimental_manual(lua_State* L) +{ + if (nullptr == L) + return 0; + + extendExperimentalTMXLayer(L); + + return 0; +} + diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_manual.hpp b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_manual.hpp new file mode 100644 index 0000000000..a80dddc6e3 --- /dev/null +++ b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_manual.hpp @@ -0,0 +1,39 @@ +/**************************************************************************** + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ +#include "base/ccConfig.h" + +#ifndef COCOS_SCRIPTING_LUA_BINDINGS_LUA_COCOS2DX_EXPERIMENTAL_MANUAL_H +#define COCOS_SCRIPTING_LUA_BINDINGS_LUA_COCOS2DX_EXPERIMENTAL_MANUAL_H + +#ifdef __cplusplus +extern "C" { +#endif +#include "tolua++.h" +#ifdef __cplusplus +} +#endif + +TOLUA_API int register_all_cocos2dx_experimental_manual(lua_State* L); + +#endif //#ifndef COCOS_SCRIPTING_LUA_BINDINGS_LUA_COCOS2DX_EXPERIMENTAL_MANUAL_H diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_video_manual.cpp b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_video_manual.cpp index 9b144fa828..a937cada2c 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_video_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_video_manual.cpp @@ -54,7 +54,7 @@ static int lua_cocos2dx_experimental_video_VideoPlayer_addEventListener(lua_Stat return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "addEventListener",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccexp.VideoPlayer:addEventListener",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_video_manual.hpp b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_video_manual.hpp index fa4072a24e..6201540e59 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_video_manual.hpp +++ b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_video_manual.hpp @@ -37,5 +37,5 @@ extern "C" { TOLUA_API int register_all_cocos2dx_experimental_video_manual(lua_State* L); -#endif // COCOS_SCRIPTING_LUA_BINDINGS_LUA_COCOS2DX_EXPERIMENTAL_VIDEO_MANUAL_H +#endif //#ifndef COCOS_SCRIPTING_LUA_BINDINGS_LUA_COCOS2DX_EXPERIMENTAL_VIDEO_MANUAL_H #endif //#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_extension_manual.cpp b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_extension_manual.cpp index f2ffb17b4d..f8842796bf 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_extension_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_extension_manual.cpp @@ -156,12 +156,12 @@ static int tolua_cocos2d_ScrollView_registerScriptHandler(lua_State* tolua_S) return 0; } - CCLOG("'registerScriptHandler' function of ScrollView has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s function of ScrollView has wrong number of arguments: %d, was expecting %d\n", "cc.ScrollView:registerScriptHandler",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_ScrollView_registerScriptHandler'.",&tolua_err); return 0; #endif } @@ -201,12 +201,12 @@ static int tolua_cocos2d_ScrollView_unregisterScriptHandler(lua_State* tolua_S) return 0; } - CCLOG("'unregisterScriptHandler' function of ScrollView has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s function of ScrollView has wrong number of arguments: %d, was expecting %d\n", "cc.ScrollView:unregisterScriptHandler", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'unregisterScriptHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_ScrollView_unregisterScriptHandler'.",&tolua_err); return 0; #endif } @@ -277,12 +277,12 @@ static int tolua_cocos2d_Control_registerControlEventHandler(lua_State* tolua_S) return 0; } - CCLOG("'registerControlEventHandler' function of Control has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s function of Control has wrong number of arguments: %d, was expecting %d\n", "cc.Control:registerControlEventHandler", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerControlEventHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Control_registerControlEventHandler'.",&tolua_err); return 0; #endif } @@ -330,12 +330,12 @@ static int tolua_cocos2d_control_unregisterControlEventHandler(lua_State* tolua_ return 0; } - CCLOG("'unregisterControlEventHandler' function of Control has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s function of Control has wrong number of arguments: %d, was expecting %d\n", "cc.Control:unregisterControlEventHandler", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'unregisterControlEventHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_control_unregisterControlEventHandler'.",&tolua_err); return 0; #endif } @@ -393,12 +393,12 @@ static int tolua_cocos2d_EditBox_registerScriptEditBoxHandler(lua_State* tolua_S return 0; } - CCLOG("'registerScriptEditBoxHandler' function of EditBox has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s function of EditBox has wrong number of arguments: %d, was expecting %d\n", "cc.EditBox:registerScriptEditBoxHandler", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptEditBoxHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_EditBox_registerScriptEditBoxHandler'.",&tolua_err); return 0; #endif @@ -435,12 +435,12 @@ static int tolua_cocos2d_EditBox_unregisterScriptEditBoxHandler(lua_State* tolua return 0; } - CCLOG("'unregisterScriptEditBoxHandler' function of EditBox has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s function of EditBox has wrong number of arguments: %d, was expecting %d\n", "cc.EditBox:unregisterScriptEditBoxHandler", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'unregisterScriptEditBoxHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_EditBox_unregisterScriptEditBoxHandler'.",&tolua_err); return 0; #endif } @@ -484,12 +484,12 @@ static int tolua_cocos2d_CCBProxy_create(lua_State* tolua_S) return 1; } - CCLOG("'create' function of CCBProxy has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s function of CCBProxy has wrong number of arguments: %d, was expecting %d\n", "cc.CCBProxy:create", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBProxy_create'.",&tolua_err); return 0; #endif } @@ -528,12 +528,12 @@ static int tolua_cocos2d_CCBProxy_createCCBReader(lua_State* tolua_S) return 1; } - CCLOG("'createCCBReader' function of CCBProxy has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s function of CCBProxy has wrong number of arguments: %d, was expecting %d\n", "cc.CCBProxy:createCCBReader", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'createCCBReader'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBProxy_createCCBReader'.",&tolua_err); return 0; #endif } @@ -588,12 +588,12 @@ static int tolua_cocos2d_CCBProxy_readCCBFromFile(lua_State* tolua_S) return 1; } - CCLOG("'readCCBFromFile' function of CCBProxy has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s function of CCBProxy has wrong number of arguments: %d, was expecting %d\n", "cc.CCBReader:readCCBFromFile", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'readCCBFromFile'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBProxy_readCCBFromFile'.",&tolua_err); return 0; #endif } @@ -635,12 +635,12 @@ static int tolua_cocos2d_CCBProxy_getNodeTypeName(lua_State* tolua_S) return 1; } - CCLOG("'getNodeTypeName' function of CCBProxy has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG(" %s has wrong number of arguments: %d, was expecting %d\n", "cc.CCBProxy:getNodeTypeName", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'getNodeTypeName'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBProxy_getNodeTypeName'.",&tolua_err); return 0; #endif } @@ -685,12 +685,12 @@ static int tolua_cocos2d_CCBProxy_setCallback(lua_State* tolua_S) return 0; } - CCLOG("'setCallback' function of CCBProxy has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG(" %s has wrong number of arguments: %d, was expecting %d\n", "cc.CCBProxy:setCallback", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'setCallback'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBProxy_setCallback'.",&tolua_err); return 0; #endif } @@ -743,7 +743,7 @@ static int tolua_cocos2d_CCBReader_load(lua_State* tolua_S) { const char* fileName = nullptr; std::string fileName_tmp = ""; - ok &= luaval_to_std_string(tolua_S, 2, &fileName_tmp); + ok &= luaval_to_std_string(tolua_S, 2, &fileName_tmp, "cc.CCBReader:load"); fileName = fileName_tmp.c_str(); if (!ok) return 0; @@ -773,7 +773,7 @@ static int tolua_cocos2d_CCBReader_load(lua_State* tolua_S) } Size size; - ok &= luaval_to_size(tolua_S, 4, &size); + ok &= luaval_to_size(tolua_S, 4, &size, "cc.CCBReader:load"); if (!ok) return 0; @@ -785,12 +785,12 @@ static int tolua_cocos2d_CCBReader_load(lua_State* tolua_S) } - CCLOG("'load' function of CCBReader has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.CCBReader:load",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'load'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBReader_load'.",&tolua_err); return 0; #endif } @@ -852,12 +852,12 @@ static int tolua_cocos2d_CCBAnimationManager_setCallFuncForLuaCallbackNamed(lua_ return 0; } - CCLOG("'setCallFuncForLuaCallbackNamed' function of CCBAnimationManager has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.CCBAnimationManager:setCallFuncForLuaCallbackNamed",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'setCallFuncForLuaCallbackNamed'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBAnimationManager_setCallFuncForLuaCallbackNamed'.",&tolua_err); return 0; #endif } @@ -968,12 +968,12 @@ static int lua_cocos2dx_AssetsManager_setDelegate(lua_State* L) return 0; } - CCLOG("'setDelegate' function of AssetsManager has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.AssetsManager:setDelegate", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'setDelegate'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_AssetsManager_setDelegate'.",&tolua_err); return 0; #endif } @@ -1302,7 +1302,7 @@ static int lua_cocos2dx_TableView_create(lua_State* L) { LUA_TableViewDataSource* dataSource = new LUA_TableViewDataSource(); Size size; - ok &= luaval_to_size(L, 2, &size); + ok &= luaval_to_size(L, 2, &size, "cc.TableView:create"); TableView* ret = nullptr; @@ -1358,7 +1358,7 @@ static int lua_cocos2d_TableView_registerScriptHandler(lua_State* L) #if COCOS2D_DEBUG >= 1 tolua_Error tolua_err; - if (!tolua_isusertype(L,1,"cc.TableView",0,&tolua_err)) goto tolua_lerror; + if (!tolua_isusertype(L,1,"",0,&tolua_err)) goto tolua_lerror; #endif self = static_cast(tolua_tousertype(L,1,0)); @@ -1386,12 +1386,12 @@ static int lua_cocos2d_TableView_registerScriptHandler(lua_State* L) return 0; } - CCLOG("'registerScriptHandler' function of TableView has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.TableView:registerScriptHandler",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'registerScriptHandler'.",&tolua_err); + tolua_error(L,"#ferror in function 'tolua_cocos2d_TableView_registerScriptHandler'.",&tolua_err); return 0; #endif } @@ -1431,12 +1431,12 @@ static int lua_cocos2d_TableView_unregisterScriptHandler(lua_State* L) return 0; } - CCLOG("'unregisterScriptHandler' function of TableView has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.TableView:unregisterScriptHandler", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'unregisterScriptHandler'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2d_TableView_unregisterScriptHandler'.",&tolua_err); return 0; #endif } diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_manual.cpp b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_manual.cpp index b66fab6fb5..9b1c757bf4 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_manual.cpp @@ -106,7 +106,7 @@ static int tolua_cocos2d_MenuItemImage_create(lua_State* tolua_S) } } while (0); - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.MenuItemImage:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -147,12 +147,12 @@ static int tolua_cocos2d_MenuItemLabel_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.MenuItemLabel:create", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_MenuItemImage_create'.",&tolua_err); return 0; #endif } @@ -187,12 +187,12 @@ static int tolua_cocos2d_MenuItemFont_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.MenuItemFont:create", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_MenuItemImage_create'.",&tolua_err); return 0; #endif } @@ -241,12 +241,12 @@ static int tolua_cocos2d_MenuItemSprite_create(lua_State* tolua_S) return 1; } - CCLOG("create has wrong number of arguments: %d, was expecting %d\n", argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.MenuItemSprite:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_MenuItemImage_create'.",&tolua_err); return 0; #endif } @@ -391,7 +391,7 @@ static int tolua_cocos2dx_Menu_alignItemsInColumns(lua_State* tolua_S) #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'alignItemsInColumns'.\n",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_Menu_alignItemsInColumns'.\n",&tolua_err); #endif return 0; } @@ -436,12 +436,12 @@ static int tolua_cocos2d_MenuItemToggle_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.MenuItemToggle:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_MenuItemToggle_create'.",&tolua_err); return 0; #endif } @@ -477,12 +477,12 @@ static int tolua_cocos2d_MenuItem_registerScriptTapHandler(lua_State* tolua_S) return 0; } - CCLOG("'registerScriptTapHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.MenuItem:registerScriptTapHandler",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptTapHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_MenuItem_registerScriptTapHandler'.",&tolua_err); return 0; #endif } @@ -517,12 +517,12 @@ static int tolua_cocos2d_MenuItem_unregisterScriptTapHandler(lua_State* tolua_S) return 0; } - CCLOG("'unregisterScriptTapHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.MenuItem:unregisterScriptTapHandler", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'unregisterScriptTapHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_MenuItem_unregisterScriptTapHandler'.",&tolua_err); return 0; #endif } @@ -677,11 +677,11 @@ static int lua_cocos2dx_Layer_setTouchEnabled(lua_State* L) return 0; } - CCLOG("'setTouchEnabled' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:setTouchEnabled", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'setTouchEnabled'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_setTouchEnabled'.",&tolua_err); return 0; #endif @@ -724,11 +724,11 @@ static int lua_cocos2dx_Layer_isTouchEnabled(lua_State* L) return 0; } - CCLOG("'isTouchEnabled' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:isTouchEnabled", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'isTouchEnabled'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_isTouchEnabled'.",&tolua_err); return 0; #endif @@ -791,12 +791,12 @@ static int lua_cocos2dx_Layer_setTouchMode(lua_State* L) return 0; } - CCLOG("'setTouchMode' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:setTouchMode", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'setTouchMode'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_setTouchMode'.",&tolua_err); return 0; #endif } @@ -839,12 +839,12 @@ static int lua_cocos2dx_Layer_getTouchMode(lua_State* L) return 0; } - CCLOG("'getTouchMode' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:getTouchMode", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'getTouchMode'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_getTouchMode'.",&tolua_err); return 0; #endif } @@ -906,12 +906,12 @@ static int lua_cocos2dx_Layer_setSwallowsTouches(lua_State* L) return 0; } - CCLOG("'setSwallowsTouches' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:setSwallowsTouches", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'setSwallowsTouches'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_setSwallowsTouches'.",&tolua_err); return 0; #endif } @@ -952,12 +952,12 @@ static int lua_cocos2dx_Layer_isSwallowsTouches(lua_State* L) return 0; } - CCLOG("'isSwallowsTouches' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:isSwallowsTouches", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'isSwallowsTouches'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_isSwallowsTouches'.",&tolua_err); return 0; #endif } @@ -1024,12 +1024,12 @@ static int lua_cocos2dx_Layer_setKeyboardEnabled(lua_State* L) return 0; } - CCLOG("'setKeyboardEnabled' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:setKeyboardEnabled", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'setKeyboardEnabled'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_setKeyboardEnabled'.",&tolua_err); return 0; #endif } @@ -1071,12 +1071,12 @@ static int lua_cocos2dx_Layer_isKeyboardEnabled(lua_State* L) return 0; } - CCLOG("'isKeyboardEnabled' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:isKeyboardEnabled", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'isKeyboardEnabled'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_isKeyboardEnabled'.",&tolua_err); return 0; #endif } @@ -1144,12 +1144,12 @@ static int lua_cocos2dx_Layer_setAccelerometerEnabled(lua_State* L) return 0; } - CCLOG("'setAccelerometerEnabled' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:setAccelerometerEnabled", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'setAccelerometerEnabled'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_setAccelerometerEnabled'.",&tolua_err); return 0; #endif } @@ -1193,12 +1193,12 @@ static int lua_cocos2dx_Layer_isAccelerometerEnabled(lua_State* L) } - CCLOG("'isAccelerometerEnabled' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:isAccelerometerEnabled", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'isAccelerometerEnabled'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_isAccelerometerEnabled'.",&tolua_err); return 0; #endif } @@ -1238,12 +1238,12 @@ static int lua_cocos2dx_Layer_setAccelerometerInterval(lua_State* L) return 0; } - CCLOG("'setAccelerometerInterval' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:setAccelerometerInterval",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'setAccelerometerInterval'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_setAccelerometerInterval'.",&tolua_err); return 0; #endif } @@ -1368,12 +1368,12 @@ static int tolua_cocos2d_Layer_registerScriptTouchHandler(lua_State* tolua_S) return 0; } - CCLOG("'registerScriptTouchHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:registerScriptTouchHandler", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptTouchHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Layer_registerScriptTouchHandler'.",&tolua_err); return 0; #endif } @@ -1421,12 +1421,12 @@ static int tolua_cocos2d_Layer_unregisterScriptTouchHandler(lua_State* tolua_S) return 0; } - CCLOG("'unregisterScriptTouchHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:unregisterScriptTouchHandler", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'unregisterScriptTapHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Layer_unregisterScriptTouchHandler'.",&tolua_err); return 0; #endif } @@ -1468,12 +1468,12 @@ static int tolua_cocos2d_Layer_registerScriptKeypadHandler(lua_State* tolua_S) return 0; } - CCLOG("'registerScriptKeypadHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:registerScriptKeypadHandler", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptKeypadHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Layer_registerScriptKeypadHandler'.",&tolua_err); return 0; #endif } @@ -1521,12 +1521,12 @@ static int tolua_cocos2d_Layer_unregisterScriptKeypadHandler(lua_State* tolua_S) return 0; } - CCLOG("'unregisterScriptKeypadHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:unregisterScriptKeypadHandler", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'unregisterScriptKeypadHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Layer_unregisterScriptKeypadHandler'.",&tolua_err); return 0; #endif } @@ -1567,11 +1567,11 @@ static int tolua_cocos2d_Layer_registerScriptAccelerateHandler(lua_State* tolua_ return 0; } - CCLOG("'registerScriptAccelerateHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:registerScriptAccelerateHandler", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptAccelerateHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Layer_registerScriptAccelerateHandler'.",&tolua_err); return 0; #endif } @@ -1618,12 +1618,12 @@ static int tolua_cocos2d_Layer_unregisterScriptAccelerateHandler(lua_State* tolu return 0; } - CCLOG("'unregisterScriptAccelerateHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:unregisterScriptAccelerateHandler", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'unregisterScriptAccelerateHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Layer_unregisterScriptAccelerateHandler'.",&tolua_err); return 0; #endif } @@ -1668,12 +1668,12 @@ static int tolua_cocos2d_Scheduler_scheduleScriptFunc(lua_State* tolua_S) return 1; } - CCLOG("'scheduleScriptFunc' has wrong number of arguments: %d, was expecting %d\n", argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Scheduler:scheduleScriptFunc", argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'scheduleScriptFunc'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Scheduler_scheduleScriptFunc'.",&tolua_err); return 0; #endif } @@ -1715,12 +1715,12 @@ static int tolua_cocos2d_Scheduler_unscheduleScriptEntry(lua_State* tolua_S) return 0; } - CCLOG("'unscheduleScriptEntry' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Scheduler:unscheduleScriptEntry",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'unscheduleScriptEntry'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Scheduler_unscheduleScriptEntry'.",&tolua_err); return 0; #endif } @@ -1745,7 +1745,7 @@ int tolua_cocos2d_Sequence_create(lua_State* tolua_S) if (1 == argc && tolua_istable(tolua_S, 2, 0, &tolua_err)) { - luaval_to_ccvector(tolua_S, 2, &array); + luaval_to_ccvector(tolua_S, 2, &array, "cc.Sequence:create"); } else { @@ -1773,12 +1773,12 @@ int tolua_cocos2d_Sequence_create(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, nID, pLuaID, (void*)tolua_ret,"cc.Sequence"); return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Sequence:create", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Sequence_create'.",&tolua_err); return 0; #endif } @@ -1864,12 +1864,12 @@ static int tolua_cocos2d_CallFunc_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.CallFunc:create", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CallFunc_create'.",&tolua_err); return 0; #endif @@ -1911,12 +1911,12 @@ static int tolua_cocos2d_Node_registerScriptHandler(lua_State* tolua_S) return 0; } - CCLOG("'registerScriptHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Node:registerScriptHandler",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Node_registerScriptHandler'.",&tolua_err); return 0; #endif } @@ -1950,12 +1950,12 @@ static int tolua_cocos2d_Node_unregisterScriptHandler(lua_State* tolua_S) return 0; } - CCLOG("'unregisterScriptHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Node:unregisterScriptHandler", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'unregisterScriptHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Node_unregisterScriptHandler'.",&tolua_err); return 0; #endif } @@ -1993,19 +1993,19 @@ static int tolua_Cocos2d_Node_scheduleUpdateWithPriorityLua(lua_State* tolua_S) LUA_FUNCTION handler = toluafix_ref_function(tolua_S,2,0); int priority = 0; - if (luaval_to_int32(tolua_S, 3, &priority)) + if (luaval_to_int32(tolua_S, 3, &priority, "cc.Node:scheduleUpdateWithPriorityLua")) { self->scheduleUpdateWithPriorityLua(handler,priority); } return 0; } - CCLOG("'scheduleUpdateWithPriorityLua' has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n","cc.Node:scheduleUpdateWithPriorityLua", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'scheduleUpdateWithPriorityLua'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_Cocos2d_Node_scheduleUpdateWithPriorityLua'.",&tolua_err); return 0; #endif } @@ -2039,12 +2039,12 @@ static int tolua_cocos2d_Node_unscheduleUpdate(lua_State* tolua_S) return 0; } - CCLOG("'unscheduleUpdate' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Node:unscheduleUpdate", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'unscheduleUpdate'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Node_unscheduleUpdate'.",&tolua_err); return 0; #endif } @@ -2073,7 +2073,7 @@ int tolua_cocos2d_Node_setContentSize(lua_State* tolua_S) if (1 == argc) { cocos2d::Size size; - ok &= luaval_to_size(tolua_S, 2, &size); + ok &= luaval_to_size(tolua_S, 2, &size, "cc.Node:setContentSize"); if (!ok) return 0; @@ -2083,13 +2083,13 @@ int tolua_cocos2d_Node_setContentSize(lua_State* tolua_S) else if(2 == argc) { double width; - ok &= luaval_to_number(tolua_S, 2,&width); + ok &= luaval_to_number(tolua_S, 2,&width, "cc.Node:setContentSize"); if (!ok) return 0; double height; - ok &= luaval_to_number(tolua_S, 3,&height); + ok &= luaval_to_number(tolua_S, 3,&height, "cc.Node:setContentSize"); if (!ok) return 0; @@ -2098,7 +2098,7 @@ int tolua_cocos2d_Node_setContentSize(lua_State* tolua_S) return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setContentSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setContentSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -2131,7 +2131,7 @@ int tolua_cocos2d_Node_setAnchorPoint(lua_State* tolua_S) if (1 == argc) { cocos2d::Vec2 pt; - ok &= luaval_to_vec2(tolua_S, 2, &pt); + ok &= luaval_to_vec2(tolua_S, 2, &pt, "cc.Node:setAnchorPoint"); if (!ok) return 0; @@ -2141,13 +2141,13 @@ int tolua_cocos2d_Node_setAnchorPoint(lua_State* tolua_S) else if(2 == argc) { double x; - ok &= luaval_to_number(tolua_S, 2,&x); + ok &= luaval_to_number(tolua_S, 2,&x, "cc.Node:setAnchorPoint"); if (!ok) return 0; double y; - ok &= luaval_to_number(tolua_S, 3,&y); + ok &= luaval_to_number(tolua_S, 3,&y, "cc.Node:setAnchorPoint"); if (!ok) return 0; @@ -2156,7 +2156,7 @@ int tolua_cocos2d_Node_setAnchorPoint(lua_State* tolua_S) return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAnchorPoint",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setAnchorPoint",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -2205,12 +2205,12 @@ static int tolua_cocos2d_Node_getPosition(lua_State* tolua_S) return 2; } - CCLOG("'getPosition' function in Node has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s function in Node has wrong number of arguments: %d, was expecting %d\n", "cc.Node:getPosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'getPosition'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Node_getPosition'.",&tolua_err); return 0; #endif } @@ -2296,7 +2296,7 @@ static int tolua_cocos2d_Spawn_create(lua_State* tolua_S) if (1 == argc && tolua_istable(tolua_S, 2, 0, &tolua_err)) { - luaval_to_ccvector(tolua_S, 2, &array); + luaval_to_ccvector(tolua_S, 2, &array, "cc.Spawn:create"); } else { @@ -2323,12 +2323,12 @@ static int tolua_cocos2d_Spawn_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Spawn:create", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Spawn_create'.",&tolua_err); return 0; #endif } @@ -2351,18 +2351,18 @@ int lua_cocos2d_CardinalSplineBy_create(lua_State* tolua_S) if (argc == 3) { double dur = 0.0; - ok &= luaval_to_number(tolua_S, 2, &dur); + ok &= luaval_to_number(tolua_S, 2, &dur, "cc.CardinalSplineBy:create"); if (!ok) return 0; int num = 0; cocos2d::Vec2 *arr = NULL; - ok &= luaval_to_array_of_vec2(tolua_S, 3, &arr, &num); + ok &= luaval_to_array_of_vec2(tolua_S, 3, &arr, &num, "cc.CardinalSplineBy:create"); if (!ok) return 0; double ten = 0.0; - ok &= luaval_to_number(tolua_S, 4, &ten); + ok &= luaval_to_number(tolua_S, 4, &ten, "cc.CardinalSplineBy:create"); if (!ok) { CC_SAFE_DELETE_ARRAY(arr); @@ -2395,12 +2395,12 @@ int lua_cocos2d_CardinalSplineBy_create(lua_State* tolua_S) } } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.CardinalSplineBy:create", argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'lua_cocos2d_CardinalSplineBy_create'.",&tolua_err); return 0; #endif } @@ -2423,13 +2423,13 @@ int tolua_cocos2d_CatmullRomBy_create(lua_State* tolua_S) if (argc == 2) { double dur = 0.0; - ok &= luaval_to_number(tolua_S, 2, &dur); + ok &= luaval_to_number(tolua_S, 2, &dur, "cc.CatmullRomBy:create"); if (!ok) return 0; int num = 0; cocos2d::Vec2 *arr = NULL; - ok &= luaval_to_array_of_vec2(tolua_S, 3, &arr, &num); + ok &= luaval_to_array_of_vec2(tolua_S, 3, &arr, &num, "cc.CatmullRomBy:create"); if (!ok) return 0; @@ -2459,12 +2459,12 @@ int tolua_cocos2d_CatmullRomBy_create(lua_State* tolua_S) } } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.CatmullRomBy:create", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CatmullRomBy_create'.",&tolua_err); return 0; #endif } @@ -2487,13 +2487,13 @@ int tolua_cocos2d_CatmullRomTo_create(lua_State* tolua_S) if (argc == 2) { double dur = 0.0; - ok &= luaval_to_number(tolua_S, 2, &dur); + ok &= luaval_to_number(tolua_S, 2, &dur, "cc.CatmullRomTo:create"); if (!ok) return 0; int num = 0; cocos2d::Vec2 *arr = NULL; - ok &= luaval_to_array_of_vec2(tolua_S, 3, &arr, &num); + ok &= luaval_to_array_of_vec2(tolua_S, 3, &arr, &num, "cc.CatmullRomTo:create"); if (!ok) return 0; @@ -2523,12 +2523,12 @@ int tolua_cocos2d_CatmullRomTo_create(lua_State* tolua_S) } } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.CatmullRomTo:create", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CatmullRomTo_create'.",&tolua_err); return 0; #endif } @@ -2551,13 +2551,13 @@ int tolua_cocos2d_BezierBy_create(lua_State* tolua_S) if (argc == 2) { double t = 0.0; - ok &= luaval_to_number(tolua_S, 2, &t); + ok &= luaval_to_number(tolua_S, 2, &t, "cc.BezierBy:create"); if (!ok) return 0; int num = 0; cocos2d::Vec2 *arr = NULL; - ok &= luaval_to_array_of_vec2(tolua_S, 3, &arr, &num); + ok &= luaval_to_array_of_vec2(tolua_S, 3, &arr, &num, "cc.BezierBy:create"); if (!ok) return 0; @@ -2583,12 +2583,12 @@ int tolua_cocos2d_BezierBy_create(lua_State* tolua_S) } } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.BezierBy:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_BezierBy_create'.",&tolua_err); return 0; #endif } @@ -2611,13 +2611,13 @@ int tolua_cocos2d_BezierTo_create(lua_State* tolua_S) if (argc == 2) { double t = 0.0; - ok &= luaval_to_number(tolua_S, 2, &t); + ok &= luaval_to_number(tolua_S, 2, &t, "cc.BezierTo:create"); if (!ok) return 0; int num = 0; cocos2d::Vec2 *arr = NULL; - ok &= luaval_to_array_of_vec2(tolua_S, 3, &arr, &num); + ok &= luaval_to_array_of_vec2(tolua_S, 3, &arr, &num, "cc.BezierTo:create"); if (!ok) return 0; @@ -2643,12 +2643,12 @@ int tolua_cocos2d_BezierTo_create(lua_State* tolua_S) } } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.BezierTo:create", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_BezierTo_create'.",&tolua_err); return 0; #endif } @@ -2707,7 +2707,7 @@ static int tolua_cocos2d_DrawNode_drawPolygon(lua_State* tolua_S) #endif } - if(!luaval_to_vec2(tolua_S, lua_gettop(tolua_S), &points[i])) + if(!luaval_to_vec2(tolua_S, lua_gettop(tolua_S), &points[i], "cc.DrawNode:drawPolygon")) { lua_pop(tolua_S, 1); CC_SAFE_DELETE_ARRAY(points); @@ -2717,7 +2717,7 @@ static int tolua_cocos2d_DrawNode_drawPolygon(lua_State* tolua_S) } Color4F fillColor; - if (!luaval_to_color4f(tolua_S, 4, &fillColor)) + if (!luaval_to_color4f(tolua_S, 4, &fillColor, "cc.DrawNode:drawPolygon")) { CC_SAFE_DELETE_ARRAY(points); return 0; @@ -2726,7 +2726,7 @@ static int tolua_cocos2d_DrawNode_drawPolygon(lua_State* tolua_S) float borderWidth = (float)tolua_tonumber(tolua_S, 5, 0); Color4F borderColor; - if (!luaval_to_color4f(tolua_S, 6, &borderColor)) + if (!luaval_to_color4f(tolua_S, 6, &borderColor, "cc.DrawNode:drawPolygon")) { CC_SAFE_DELETE_ARRAY(points); return 0; @@ -2738,12 +2738,12 @@ static int tolua_cocos2d_DrawNode_drawPolygon(lua_State* tolua_S) } } - CCLOG("'drawPolygon' has wrong number of arguments: %d, was expecting %d\n", argc, 5); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.DrawNode:drawPolygon", argc, 5); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'drawPolygon'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_DrawNode_drawPolygon'.",&tolua_err); return 0; #endif } @@ -2769,10 +2769,10 @@ static int tolua_cocos2dx_setBlendFunc(lua_State* tolua_S,const char* className) if (2 == argc) { GLenum src, dst; - if (!luaval_to_int32(tolua_S, 2, (int32_t*)&src)) + if (!luaval_to_int32(tolua_S, 2, (int32_t*)&src, StringUtils::format("%s%s",className, ":setBlendFunc").c_str())) return 0; - if (!luaval_to_int32(tolua_S, 3, (int32_t*)&dst)) + if (!luaval_to_int32(tolua_S, 3, (int32_t*)&dst, StringUtils::format("%s%s",className, ":setBlendFunc").c_str())) return 0; BlendFunc blendFunc = {src, dst}; @@ -2786,7 +2786,7 @@ static int tolua_cocos2dx_setBlendFunc(lua_State* tolua_S,const char* className) #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'setBlendFunc'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_setBlendFunc'.",&tolua_err); return 0; #endif } @@ -2863,12 +2863,12 @@ static int tolua_cocos2dx_LayerMultiplex_create(lua_State* tolua_S) } } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.LayerMultiplex:create", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_LayerMultiplex_create'.",&tolua_err); return 0; #endif } @@ -2902,7 +2902,7 @@ static int tolua_cocos2dx_FileUtils_getStringFromFile(lua_State* tolua_S) if (1 == argc) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.FileUtils:getStringFromFile"); arg0 = arg0_tmp.c_str(); if (ok) { std::string fullPathName = FileUtils::getInstance()->fullPathForFilename(arg0); @@ -2916,12 +2916,12 @@ static int tolua_cocos2dx_FileUtils_getStringFromFile(lua_State* tolua_S) } } - CCLOG("'getStringFromFile' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.FileUtils:getStringFromFile", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'getStringFromFile'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_FileUtils_getStringFromFile'.",&tolua_err); return 0; #endif } @@ -2947,12 +2947,12 @@ static int tolua_cocos2dx_UserDefault_getInstance(lua_State* tolua_S) return 1; } - CCLOG("'getInstance' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.UserDefault:getInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'getInstance'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_UserDefault_getInstance'.",&tolua_err); return 0; #endif } @@ -2975,8 +2975,8 @@ static int tolua_cocos2dx_GLProgram_create(lua_State* tolua_S) if(2 == argc) { const char *arg0, *arg1; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.GLProgram:create"); arg0 = arg0_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "cc.GLProgram:create"); arg1 = arg1_tmp.c_str(); GLProgram* tolua_ret = new GLProgram(); if (nullptr == tolua_ret) @@ -2991,12 +2991,12 @@ static int tolua_cocos2dx_GLProgram_create(lua_State* tolua_S) } - CCLOG("'create' function of GLProgram wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s wrong number of arguments: %d, was expecting %d\n", "cc.GLProgram:create", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_GLProgram_create'.",&tolua_err); return 0; #endif } @@ -3032,12 +3032,12 @@ static int tolua_cocos2d_GLProgram_getProgram(lua_State* tolua_S) return 1; } - CCLOG("'getProgram' function of GLProgram wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.GLProgram:getProgram",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'getProgram'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_GLProgram_getProgram'.",&tolua_err); return 0; #endif } @@ -3137,12 +3137,12 @@ static int tolua_cocos2dx_GLProgram_setUniformLocationF32(lua_State* tolua_S) } } - CCLOG("'setUniformLocationF32' function of GLProgram wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG(" %s has wrong number of arguments: %d, was expecting %d\n", "cc.GLProgram:setUniformLocationF32",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'setUniformLocationF32'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_GLProgram_getProgram'.",&tolua_err); return 0; #endif } @@ -3178,7 +3178,7 @@ static int lua_cocos2dx_GLProgram_getUniform(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgram:getUniform"); if(!ok) return 0; cocos2d::Uniform* ret = cobj->getUniform(arg0); @@ -3192,7 +3192,7 @@ static int lua_cocos2dx_GLProgram_getUniform(lua_State* tolua_S) } return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getUniform",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:getUniform:getUniform",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3235,9 +3235,9 @@ int lua_cocos2dx_GLProgram_setUniformLocationWithMatrix2fv(lua_State* tolua_S) GLfloat* arg1; unsigned int arg2; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgram:setUniformLocationWithMatrix2fv"); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.GLProgram:setUniformLocationWithMatrix2fv"); if(!ok) { @@ -3265,7 +3265,7 @@ int lua_cocos2dx_GLProgram_setUniformLocationWithMatrix2fv(lua_State* tolua_S) CC_SAFE_DELETE_ARRAY(arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformLocationWithMatrix2fv",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:setUniformLocationWithMatrix2fv",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -3308,9 +3308,9 @@ int lua_cocos2dx_GLProgram_setUniformLocationWithMatrix3fv(lua_State* tolua_S) GLfloat* arg1; unsigned int arg2; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgram:setUniformLocationWithMatrix3fv"); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.GLProgram:setUniformLocationWithMatrix3fv"); if(!ok) { @@ -3339,7 +3339,7 @@ int lua_cocos2dx_GLProgram_setUniformLocationWithMatrix3fv(lua_State* tolua_S) return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformLocationWithMatrix3fv",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:setUniformLocationWithMatrix3fv",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -3382,9 +3382,9 @@ int lua_cocos2dx_GLProgram_setUniformLocationWithMatrix4fv(lua_State* tolua_S) GLfloat* arg1; unsigned int arg2; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgram:setUniformLocationWithMatrix4fv"); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.GLProgram:setUniformLocationWithMatrix4fv"); if(!ok) { @@ -3413,7 +3413,7 @@ int lua_cocos2dx_GLProgram_setUniformLocationWithMatrix4fv(lua_State* tolua_S) CC_SAFE_DELETE_ARRAY(arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformLocationWithMatrix4fv",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:setUniformLocationWithMatrix4fv",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -3455,9 +3455,9 @@ int lua_cocos2dx_GLProgram_setUniformLocationWith3iv(lua_State* tolua_S) GLint* arg1; unsigned int arg2; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgram:setUniformLocationWith3iv"); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.GLProgram:setUniformLocationWith3iv"); if(!ok) { CCLOG("Parse params error in the lua_cocos2dx_GLProgram_setUniformLocationWith3iv"); @@ -3485,7 +3485,7 @@ int lua_cocos2dx_GLProgram_setUniformLocationWith3iv(lua_State* tolua_S) CC_SAFE_DELETE_ARRAY(arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformLocationWith3iv",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:setUniformLocationWith3iv",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -3528,9 +3528,9 @@ int lua_cocos2dx_GLProgram_setUniformLocationWith4iv(lua_State* tolua_S) GLint* arg1; unsigned int arg2; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgram:setUniformLocationWith4iv"); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.GLProgram:setUniformLocationWith4iv"); if(!ok) { @@ -3557,7 +3557,7 @@ int lua_cocos2dx_GLProgram_setUniformLocationWith4iv(lua_State* tolua_S) CC_SAFE_DELETE_ARRAY(arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformLocationWith4iv",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:setUniformLocationWith4iv",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -3600,9 +3600,9 @@ int lua_cocos2dx_GLProgram_setUniformLocationWith2iv(lua_State* tolua_S) GLint* arg1; unsigned int arg2; - ok &= luaval_to_int32(tolua_S, 2,(GLint *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(GLint *)&arg0, "cc.GLProgram:setUniformLocationWith2iv"); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.GLProgram:setUniformLocationWith2iv"); if(!ok) { @@ -3626,7 +3626,7 @@ int lua_cocos2dx_GLProgram_setUniformLocationWith2iv(lua_State* tolua_S) CC_SAFE_DELETE_ARRAY(arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformLocationWith2iv",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:setUniformLocationWith2iv",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -3667,7 +3667,7 @@ int lua_cocos2dx_GLProgram_getVertexAttrib(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgram:getVertexAttrib"); if(!ok) return 0; cocos2d::VertexAttrib* ret = cobj->getVertexAttrib(arg0); @@ -3681,7 +3681,7 @@ int lua_cocos2dx_GLProgram_getVertexAttrib(lua_State* tolua_S) } return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVertexAttrib",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:getVertexAttrib",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3831,7 +3831,7 @@ static int tolua_cocos2dx_SpriteBatchNode_getDescendants(lua_State* tolua_S) return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDescendants",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:getDescendants",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -4371,12 +4371,12 @@ static int tolua_cocos2dx_LuaEventListenerAcceleration_create(lua_State* tolua_S return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerAcceleration:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_LuaEventListenerAcceleration_create'.",&tolua_err); return 0; #endif } @@ -4415,12 +4415,12 @@ static int tolua_cocos2d_LuaEventListenerCustom_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerCustom:create", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_LuaEventListenerCustom_create'.",&tolua_err); return 0; #endif } @@ -4473,12 +4473,12 @@ static int tolua_cocos2dx_EventListenerKeyboard_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerKeyboard:create", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerKeyboard_create'.",&tolua_err); return 0; #endif } @@ -4558,12 +4558,12 @@ static int tolua_cocos2dx_EventListenerKeyboard_clone(lua_State* tolua_S) return 1; } - CCLOG("'clone' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerKeyboard:clone",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'clone'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerKeyboard_clone'.",&tolua_err); return 0; #endif } @@ -4630,12 +4630,12 @@ static int tolua_cocos2dx_EventListenerKeyboard_registerScriptHandler(lua_State* return 0; } - CCLOG("'registerScriptHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerKeyboard:registerScriptHandler", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerKeyboard_registerScriptHandler'.",&tolua_err); return 0; #endif } @@ -4679,12 +4679,12 @@ static int tolua_cocos2dx_EventListenerTouchOneByOne_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerTouchOneByOne:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerTouchOneByOne_create'.",&tolua_err); return 0; #endif } @@ -4785,12 +4785,12 @@ static int tolua_cocos2dx_EventListenerTouchOneByOne_clone(lua_State* tolua_S) return 1; } - CCLOG("'clone' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerTouchOneByOne:create", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'clone'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerTouchOneByOne_clone'.",&tolua_err); return 0; #endif } @@ -4879,12 +4879,12 @@ static int tolua_cocos2dx_EventListenerTouchOneByOne_registerScriptHandler(lua_S return 0; } - CCLOG("'registerScriptHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerTouchOneByOne:registerScriptHandler", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerTouchOneByOne_registerScriptHandler'.",&tolua_err); return 0; #endif } @@ -4928,12 +4928,12 @@ static int tolua_cocos2dx_EventListenerTouchAllAtOnce_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerTouchAllAtOnce:registerScriptHandler",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerTouchAllAtOnce_create'.",&tolua_err); return 0; #endif } @@ -5033,12 +5033,12 @@ static int tolua_cocos2dx_EventListenerTouchAllAtOnce_clone(lua_State* tolua_S) return 1; } - CCLOG("'clone' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerTouchAllAtOnce:clone", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'clone'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerTouchAllAtOnce_clone'.",&tolua_err); return 0; #endif } @@ -5127,12 +5127,12 @@ static int tolua_cocos2dx_EventListenerTouchAllAtOnce_registerScriptHandler(lua_ return 0; } - CCLOG("'registerScriptHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerTouchAllAtOnce:registerScriptHandler",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerTouchAllAtOnce_registerScriptHandler'.",&tolua_err); return 0; #endif } @@ -5176,12 +5176,12 @@ static int tolua_cocos2dx_EventListenerMouse_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerMouse:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerMouse_create'.",&tolua_err); return 0; #endif } @@ -5281,12 +5281,12 @@ static int tolua_cocos2dx_EventListenerMouse_clone(lua_State* tolua_S) return 1; } - CCLOG("'clone' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerMouse:clone", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'clone'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerMouse_clone'.",&tolua_err); return 0; #endif } @@ -5377,12 +5377,12 @@ static int tolua_cocos2dx_EventListenerMouse_registerScriptHandler(lua_State* to return 0; } - CCLOG("'registerScriptHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerMouse:registerScriptHandler",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerMouse_registerScriptHandler'.",&tolua_err); return 0; #endif } @@ -5433,7 +5433,7 @@ static int tolua_cocos2dx_ActionCamera_reverse(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, reverse->_ID, &(reverse->_luaID), (void*)(reverse),"cc.ActionCamera"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "reverse",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionCamera:reverse",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -5486,7 +5486,7 @@ static int tolua_cocos2dx_GridAction_reverse(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, reverse->_ID, &(reverse->_luaID), (void*)(reverse),"cc.GridAction"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "reverse",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridAction:reverse",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -5536,11 +5536,11 @@ static int lua_cocos2dx_Label_createWithTTF00(lua_State* L) TTFConfig ttfConfig(""); std::string text = ""; - ok &= luaval_to_ttfconfig(L, 2, &ttfConfig); + ok &= luaval_to_ttfconfig(L, 2, &ttfConfig, "cc.Label:createWithTTF"); if (!ok) return 0; - ok &= luaval_to_std_string(L, 3, &text); + ok &= luaval_to_std_string(L, 3, &text, "cc.Label:createWithTTF"); if (!ok) return 0; @@ -5553,7 +5553,7 @@ static int lua_cocos2dx_Label_createWithTTF00(lua_State* L) toluafix_pushusertype_ccobject(L,ID, luaID, (void*)ret,"cc.Label"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Label:createWithTTF",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -5593,7 +5593,7 @@ static int lua_cocos2dx_Label_createWithTTF01(lua_State* L) cocos2d::Size dimensions = cocos2d::Size::ZERO; if (lua_istable(L, 5)) { - luaval_to_size(L, 5, &dimensions); + luaval_to_size(L, 5, &dimensions, "cc.Label:createWithTTF"); } TextHAlignment hAlignment = static_cast((int)tolua_tonumber(L, 6, 0)); TextVAlignment vAlignment = static_cast((int)tolua_tonumber(L, 7, 0)); @@ -5648,7 +5648,7 @@ static int lua_cocos2dx_TMXTiledMap_getPropertiesForGID(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.TMXTiledMap:getPropertiesForGID"); if (!ok) return 0; @@ -5656,7 +5656,7 @@ static int lua_cocos2dx_TMXTiledMap_getPropertiesForGID(lua_State* tolua_S) ccvalue_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPropertiesForGID",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTiledMap:getPropertiesForGID",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5704,9 +5704,9 @@ static int lua_cocos2dx_Console_send(lua_State* tolua_S) if (argc == 2) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,&arg0); + ok &= luaval_to_int32(tolua_S, 2,&arg0, "cc.Console:send"); std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Console:send"); if(!ok) return 0; @@ -5714,7 +5714,7 @@ static int lua_cocos2dx_Console_send(lua_State* tolua_S) return 0; } ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "send",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.Console:send",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -5750,7 +5750,7 @@ static int lua_cocos2dx_Console_wait(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,&arg0); + ok &= luaval_to_int32(tolua_S, 2,&arg0, "cc.Console:wait"); if(!ok) return 0; @@ -5759,7 +5759,7 @@ static int lua_cocos2dx_Console_wait(lua_State* tolua_S) return 0; } ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "wait",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.Console:wait",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -5796,7 +5796,7 @@ static int lua_cocos2dx_Console_addCommand(lua_State* tolua_S) if (ok && argc == 2) { ValueMap arg0; - ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0); + ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0, "cc.Console:addCommand"); // std::string name = std::string(arg0["name"].asString()); std::string help = std::string(arg0["help"].asString()); @@ -5828,7 +5828,7 @@ static int lua_cocos2dx_Console_addCommand(lua_State* tolua_S) } return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "addCommand",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.Console:addCommand",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -5886,17 +5886,17 @@ static int lua_cocos2dx_GLProgramState_setVertexAttribPointer(lua_State* tolua_S int arg4; int arg5; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgramState:setVertexAttribPointer"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.GLProgramState:setVertexAttribPointer"); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.GLProgramState:setVertexAttribPointer"); - ok &= luaval_to_boolean(tolua_S, 5, &arg3); + ok &= luaval_to_boolean(tolua_S, 5, &arg3, "cc.GLProgramState:setVertexAttribPointer"); - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.GLProgramState:setVertexAttribPointer"); - ok &= luaval_to_int32(tolua_S, 7, (int *)&arg5); + ok &= luaval_to_int32(tolua_S, 7, (int *)&arg5, "cc.GLProgramState:setVertexAttribPointer"); if(!ok) return 0; @@ -5914,17 +5914,17 @@ static int lua_cocos2dx_GLProgramState_setVertexAttribPointer(lua_State* tolua_S int arg6; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgramState:setVertexAttribPointer"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.GLProgramState:setVertexAttribPointer"); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.GLProgramState:setVertexAttribPointer"); - ok &= luaval_to_boolean(tolua_S, 5, &arg3); + ok &= luaval_to_boolean(tolua_S, 5, &arg3, "cc.GLProgramState:setVertexAttribPointer"); - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.GLProgramState:setVertexAttribPointer"); - ok &= luaval_to_int32(tolua_S, 8, (int *)&arg6); + ok &= luaval_to_int32(tolua_S, 8, (int *)&arg6, "cc.GLProgramState:setVertexAttribPointer"); size_t len = lua_objlen(tolua_S, 7); @@ -5963,7 +5963,7 @@ static int lua_cocos2dx_GLProgramState_setVertexAttribPointer(lua_State* tolua_S return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVertexAttribPointer",argc, 6); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:setVertexAttribPointer",argc, 6); return 0; #if COCOS2D_DEBUG >= 1 @@ -6033,7 +6033,7 @@ static int lua_cocos2dx_OrbitCamera_sphericalRadius(lua_State* tolua_S) return 3; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "sphericalRadius",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.OrbitCamera:sphericalRadius",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -6085,7 +6085,7 @@ int lua_cocos2dx_TMXLayer_getTileGIDAt(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.TMXLayer:getTileGIDAt"); if(!ok) return 0; unsigned int ret = cobj->getTileGIDAt(arg0); @@ -6098,8 +6098,8 @@ int lua_cocos2dx_TMXLayer_getTileGIDAt(lua_State* tolua_S) cocos2d::Vec2 arg0; int arg1; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); - ok &= luaval_to_int32(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.TMXLayer:getTileGIDAt"); + ok &= luaval_to_int32(tolua_S, 3, &arg1, "cc.TMXLayer:getTileGIDAt"); if(!ok) return 0; @@ -6109,7 +6109,7 @@ int lua_cocos2dx_TMXLayer_getTileGIDAt(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)arg1); return 2; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTileGIDAt",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:getTileGIDAt",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6177,7 +6177,7 @@ int lua_cocos2dx_TMXLayer_setTiles(lua_State* tolua_S) CC_SAFE_DELETE_ARRAY(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTiles",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:setTiles",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6226,12 +6226,12 @@ static int tolua_cocos2dx_EventListenerFocus_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerFocus:create", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerFocus_create'.",&tolua_err); return 0; #endif } @@ -6297,12 +6297,12 @@ static int tolua_cocos2dx_EventListenerFocus_clone(lua_State* tolua_S) return 1; } - CCLOG("'clone' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerFocus:clone", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'clone'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerFocus_clone'.",&tolua_err); return 0; #endif } @@ -6353,12 +6353,12 @@ static int tolua_cocos2dx_EventListenerFocus_registerScriptHandler(lua_State* to return 0; } - CCLOG("'registerScriptHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerFocus:registerScriptHandler", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerFocus_registerScriptHandler'.",&tolua_err); return 0; #endif } @@ -6416,7 +6416,7 @@ int lua_cocos2dx_Application_isIOS64bit(lua_State* tolua_S) tolua_pushboolean(tolua_S, isIOS64bit); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isIOS64bit",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Application:isIOS64bit",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6438,82 +6438,6 @@ static void extendApplication(lua_State* tolua_S) lua_pop(tolua_S, 1); } -static int lua_cocos2dx_FastTMXLayer_getTileGIDAt(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::FastTMXLayer* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.FastTMXLayer",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::FastTMXLayer*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_FastTMXLayer_getTileGIDAt'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::Vec2 arg0; - - ok &= luaval_to_vec2(tolua_S, 2, &arg0); - if(!ok) - return 0; - int ret = cobj->getTileGIDAt(arg0); - tolua_pushnumber(tolua_S,(lua_Number)ret); - tolua_pushnumber(tolua_S,(lua_Number)0); - return 2; - } - if (argc == 2) - { - cocos2d::Vec2 arg0; - int arg1 = 0; - - ok &= luaval_to_vec2(tolua_S, 2, &arg0); - ok &= luaval_to_int32(tolua_S, 3, &arg1); - - if(!ok) - return 0; - - unsigned int ret = cobj->getTileGIDAt(arg0, (cocos2d::TMXTileFlags*)&arg1); - tolua_pushnumber(tolua_S,(lua_Number)ret); - tolua_pushnumber(tolua_S,(lua_Number)arg1); - return 2; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTileGIDAt",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 -tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FastTMXLayer_getTileGIDAt'.",&tolua_err); -#endif - - return 0; -} - -static void extendFastTMXLayer(lua_State* tolua_S) -{ - lua_pushstring(tolua_S, "cc.FastTMXLayer"); - lua_rawget(tolua_S, LUA_REGISTRYINDEX); - if (lua_istable(tolua_S,-1)) - { - tolua_function(tolua_S, "getTileGIDAt", lua_cocos2dx_FastTMXLayer_getTileGIDAt); - } - lua_pop(tolua_S, 1); -} - static int lua_cocos2dx_TextureCache_addImageAsync(lua_State* tolua_S) { if (nullptr == tolua_S) @@ -6561,11 +6485,11 @@ static int lua_cocos2dx_TextureCache_addImageAsync(lua_State* tolua_S) return 0; } - CCLOG("'addImageAsync' function of TextureCache has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s function of TextureCache has wrong number of arguments: %d, was expecting %d\n", "cc.TextureCache:addImageAsync", argc, 1); #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'addImageAsync'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_TextureCache_addImageAsync'.",&tolua_err); #endif return 0; } @@ -6634,7 +6558,6 @@ int register_all_cocos2dx_manual(lua_State* tolua_S) extendTMXLayer(tolua_S); extendEventListenerFocus(tolua_S); extendApplication(tolua_S); - extendFastTMXLayer(tolua_S); extendTextureCache(tolua_S); return 0; @@ -6666,7 +6589,7 @@ static int tolua_cocos2d_utils_captureScreen(lua_State* tolua_S) } #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'captureScreen'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_utils_captureScreen'.",&tolua_err); return 0; #endif } @@ -6704,7 +6627,7 @@ static int tolua_cocos2d_utils_findChildren(lua_State* tolua_S) } #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'findChildren'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_utils_findChildren'.",&tolua_err); return 0; #endif } diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_physics_manual.cpp b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_physics_manual.cpp index f63ae9ef0d..c7914a12e9 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_physics_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_physics_manual.cpp @@ -174,8 +174,8 @@ int lua_cocos2dx_physics_PhysicsWorld_rayCast(lua_State* tolua_S) }; } while(0); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.PhysicsWorld:rayCast"); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.PhysicsWorld:rayCast"); if(!ok) return 0; cobj->rayCast(arg0, arg1, arg2, nullptr); @@ -231,7 +231,7 @@ int lua_cocos2dx_physics_PhysicsWorld_queryRect(lua_State* tolua_S) }; } while(0); - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.PhysicsWorld:queryRect"); if(!ok) return 0; cobj->queryRect(arg0, arg1, nullptr); @@ -290,7 +290,7 @@ int lua_cocos2dx_physics_PhysicsWorld_queryPoint(lua_State* tolua_S) assert(false); } while(0) ; - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.PhysicsWorld:queryPoint"); if(!ok) return 0; cobj->queryPoint(arg0, arg1, nullptr); @@ -328,7 +328,7 @@ int lua_cocos2dx_physics_PhysicsBody_createPolygon(lua_State* tolua_S) cocos2d::Vec2* arg0 = nullptr; int arg1 = 0; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsBody:createPolygon"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); @@ -359,11 +359,11 @@ int lua_cocos2dx_physics_PhysicsBody_createPolygon(lua_State* tolua_S) int arg1 = 0; cocos2d::PhysicsMaterial arg2; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsBody:createPolygon"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsBody:createPolygon"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -393,12 +393,12 @@ int lua_cocos2dx_physics_PhysicsBody_createPolygon(lua_State* tolua_S) cocos2d::PhysicsMaterial arg2; cocos2d::Vec2 arg3; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsBody:createPolygon"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); - ok &= luaval_to_vec2(tolua_S, 4, &arg3); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsBody:createPolygon"); + ok &= luaval_to_vec2(tolua_S, 4, &arg3, "cc.PhysicsBody:createPolygon"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -449,7 +449,7 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgePolygon(lua_State* tolua_S) cocos2d::Vec2* arg0; int arg1; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsBody:createEdgePolygon"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); @@ -480,11 +480,11 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgePolygon(lua_State* tolua_S) int arg1; cocos2d::PhysicsMaterial arg2; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsBody:createEdgePolygon"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsBody:createEdgePolygon"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -513,12 +513,12 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgePolygon(lua_State* tolua_S) cocos2d::PhysicsMaterial arg2; double arg3; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsBody:createEdgePolygon"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); - ok &= luaval_to_number(tolua_S, 4,&arg3); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsBody:createEdgePolygon"); + ok &= luaval_to_number(tolua_S, 4,&arg3, "cc.PhysicsBody:createEdgePolygon"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -569,7 +569,7 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeChain(lua_State* tolua_S) cocos2d::Vec2* arg0; int arg1; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsBody:createEdgeChain"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); @@ -600,11 +600,11 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeChain(lua_State* tolua_S) int arg1; cocos2d::PhysicsMaterial arg2; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsBody:createEdgeChain"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsBody:createEdgeChain"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -633,12 +633,12 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeChain(lua_State* tolua_S) cocos2d::PhysicsMaterial arg2; double arg3; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsBody:createEdgeChain"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); - ok &= luaval_to_number(tolua_S, 4,&arg3); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsBody:createEdgeChain"); + ok &= luaval_to_number(tolua_S, 4,&arg3, "cc.PhysicsBody:createEdgeChain"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -689,7 +689,7 @@ int lua_cocos2dx_physics_PhysicsShape_recenterPoints(lua_State* tolua_S) cocos2d::Vec2* arg0; int arg1 = 0; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShape:recenterPoints"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); @@ -710,11 +710,11 @@ int lua_cocos2dx_physics_PhysicsShape_recenterPoints(lua_State* tolua_S) int arg1 = 0; cocos2d::Vec2 arg2; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShape:recenterPoints"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_vec2(tolua_S, 3, &arg2); + ok &= luaval_to_vec2(tolua_S, 3, &arg2, "cc.PhysicsShape:recenterPoints"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -754,7 +754,7 @@ int lua_cocos2dx_physics_PhysicsShape_getPolyonCenter(lua_State* tolua_S) cocos2d::Vec2* arg0; int arg1 = 0; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShape:getPolyonCenter"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); @@ -883,7 +883,7 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_create(lua_State* tolua_S) cocos2d::Vec2* arg0; int arg1 = 0; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShapePolygon:create"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); @@ -904,11 +904,11 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_create(lua_State* tolua_S) int arg1 = 0; cocos2d::PhysicsMaterial arg2; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShapePolygon:create"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsShapePolygon:create"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -926,12 +926,12 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_create(lua_State* tolua_S) cocos2d::PhysicsMaterial arg2; cocos2d::Vec2 arg3; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShapePolygon:create"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); - ok &= luaval_to_vec2(tolua_S, 4, &arg3); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsShapePolygon:create"); + ok &= luaval_to_vec2(tolua_S, 4, &arg3, "cc.PhysicsShapePolygon:create"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -970,7 +970,7 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_calculateArea(lua_State* tolua_S) cocos2d::Vec2* arg0; int arg1 = 0; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShapePolygon:calculateArea"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); @@ -1012,9 +1012,9 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_calculateMoment(lua_State* tolua_S) double arg0; cocos2d::Vec2* arg1; int arg2 = 0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsShapePolygon:calculateMoment"); do { - ok = luaval_to_array_of_vec2(tolua_S, 3, &arg1, &arg2); + ok = luaval_to_array_of_vec2(tolua_S, 3, &arg1, &arg2, "cc.PhysicsShapePolygon:calculateMoment"); if (nullptr == arg1){ LUA_PRECONDITION( arg1, "Invalid Native Object"); }} while (0); @@ -1034,13 +1034,13 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_calculateMoment(lua_State* tolua_S) cocos2d::Vec2* arg1; int arg2 = 0; cocos2d::Vec2 arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsShapePolygon:calculateMoment"); do { - ok = luaval_to_array_of_vec2(tolua_S, 3, &arg1, &arg2); + ok = luaval_to_array_of_vec2(tolua_S, 3, &arg1, &arg2, "cc.PhysicsShapePolygon:calculateMoment"); if (nullptr == arg1){ LUA_PRECONDITION( arg1, "Invalid Native Object"); }} while (0); - ok &= luaval_to_vec2(tolua_S, 4, &arg3); + ok &= luaval_to_vec2(tolua_S, 4, &arg3, "cc.PhysicsShapePolygon:calculateMoment"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg1); @@ -1316,7 +1316,7 @@ int lua_cocos2dx_physics_PhysicsShapeEdgePolygon_create(lua_State* tolua_S) cocos2d::Vec2* arg0; int arg1 = 0; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShapeEdgePolygon:create"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); @@ -1336,11 +1336,11 @@ int lua_cocos2dx_physics_PhysicsShapeEdgePolygon_create(lua_State* tolua_S) int arg1 = 0; cocos2d::PhysicsMaterial arg2; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShapeEdgePolygon:create"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsShapeEdgePolygon:create"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -1358,12 +1358,12 @@ int lua_cocos2dx_physics_PhysicsShapeEdgePolygon_create(lua_State* tolua_S) cocos2d::PhysicsMaterial arg2; double arg3; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShapeEdgePolygon:create"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); - ok &= luaval_to_number(tolua_S, 4,&arg3); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsShapeEdgePolygon:create"); + ok &= luaval_to_number(tolua_S, 4,&arg3, "cc.PhysicsShapeEdgePolygon:create"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -1403,7 +1403,7 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeChain_create(lua_State* tolua_S) cocos2d::Vec2* arg0; int arg1 = 0; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShapeEdgeChain:create"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); @@ -1423,11 +1423,11 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeChain_create(lua_State* tolua_S) int arg1 = 0; cocos2d::PhysicsMaterial arg2; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShapeEdgeChain:create"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsShapeEdgeChain:create"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -1445,12 +1445,12 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeChain_create(lua_State* tolua_S) cocos2d::PhysicsMaterial arg2; double arg3; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShapeEdgeChain:create"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); - ok &= luaval_to_number(tolua_S, 4,&arg3); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsShapeEdgeChain:create"); + ok &= luaval_to_number(tolua_S, 4,&arg3, "cc.PhysicsShapeEdgeChain:create"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_spine_manual.cpp b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_spine_manual.cpp index 003e5527a2..9052750bf3 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_spine_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/lua_cocos2dx_spine_manual.cpp @@ -54,10 +54,10 @@ static int tolua_cocos2dx_setBlendFunc(lua_State* tolua_S,const char* className) if (2 == argc) { GLenum src, dst; - if (!luaval_to_int32(tolua_S, 2, (int32_t*)&src)) + if (!luaval_to_int32(tolua_S, 2, (int32_t*)&src, StringUtils::format("%s%s",className,":setBlendFunc").c_str())) return 0; - if (!luaval_to_int32(tolua_S, 3, (int32_t*)&dst)) + if (!luaval_to_int32(tolua_S, 3, (int32_t*)&dst,StringUtils::format("%s%s",className,":setBlendFunc").c_str())) return 0; BlendFunc blendFunc = {src, dst}; @@ -338,11 +338,11 @@ static int lua_cocos2dx_spine_SkeletonAnimation_addAnimation(lua_State* tolua_S) const char* arg1; bool arg2; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "sp.SkeletonAnimation:addAnimation"); - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "sp.SkeletonAnimation:addAnimation"); arg1 = arg1_tmp.c_str(); - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "sp.SkeletonAnimation:addAnimation"); if(!ok) return 0; cobj->addAnimation(arg0, arg1, arg2); @@ -356,13 +356,13 @@ static int lua_cocos2dx_spine_SkeletonAnimation_addAnimation(lua_State* tolua_S) bool arg2; double arg3; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "sp.SkeletonAnimation:addAnimation"); - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "sp.SkeletonAnimation:addAnimation"); arg1 = arg1_tmp.c_str(); - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "sp.SkeletonAnimation:addAnimation"); - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 5,&arg3, "sp.SkeletonAnimation:addAnimation"); if(!ok) return 0; @@ -413,11 +413,11 @@ static int lua_cocos2dx_spine_SkeletonAnimation_setAnimation(lua_State* tolua_S) const char* arg1; bool arg2; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "sp.SkeletonAnimation:setAnimation"); - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "sp.SkeletonAnimation:setAnimation"); arg1 = arg1_tmp.c_str(); - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "sp.SkeletonAnimation:setAnimation"); if(!ok) return 0; diff --git a/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj b/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj index a21824a6b7..80163c3135 100644 --- a/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj +++ b/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj @@ -19,10 +19,18 @@ 1540AF58193EC30500717D8E /* xxtea.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1540AF55193EC30500717D8E /* xxtea.cpp */; }; 1540AF59193EC30500717D8E /* xxtea.h in Headers */ = {isa = PBXBuildFile; fileRef = 1540AF56193EC30500717D8E /* xxtea.h */; }; 1540AF5A193EC30500717D8E /* xxtea.h in Headers */ = {isa = PBXBuildFile; fileRef = 1540AF56193EC30500717D8E /* xxtea.h */; }; - 15AECE12195C277100907DB0 /* lua_cocos2dx_experimental_video_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15AECE10195C277100907DB0 /* lua_cocos2dx_experimental_video_auto.cpp */; }; - 15AECE13195C277100907DB0 /* lua_cocos2dx_experimental_video_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 15AECE11195C277100907DB0 /* lua_cocos2dx_experimental_video_auto.hpp */; }; - 15AECE16195C28DF00907DB0 /* lua_cocos2dx_experimental_video_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15AECE14195C28DF00907DB0 /* lua_cocos2dx_experimental_video_manual.cpp */; }; - 15AECE17195C28DF00907DB0 /* lua_cocos2dx_experimental_video_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 15AECE15195C28DF00907DB0 /* lua_cocos2dx_experimental_video_manual.hpp */; }; + 15622969197780DE009C9067 /* lua_cocos2dx_experimental_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15622967197780DE009C9067 /* lua_cocos2dx_experimental_auto.cpp */; }; + 1562296A197780DE009C9067 /* lua_cocos2dx_experimental_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 15622968197780DE009C9067 /* lua_cocos2dx_experimental_auto.hpp */; }; + 1562297519778209009C9067 /* lua_cocos2dx_experimental_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1562297119778209009C9067 /* lua_cocos2dx_experimental_manual.cpp */; }; + 1562297619778209009C9067 /* lua_cocos2dx_experimental_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1562297219778209009C9067 /* lua_cocos2dx_experimental_manual.hpp */; }; + 156EADF31977A2BA00F53709 /* lua_cocos2dx_experimental_video_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 156EADF11977A2BA00F53709 /* lua_cocos2dx_experimental_video_auto.cpp */; }; + 156EADF41977A2BA00F53709 /* lua_cocos2dx_experimental_video_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 156EADF21977A2BA00F53709 /* lua_cocos2dx_experimental_video_auto.hpp */; }; + 156EADF51977A2BF00F53709 /* lua_cocos2dx_experimental_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15622967197780DE009C9067 /* lua_cocos2dx_experimental_auto.cpp */; }; + 156EADF61977A2C200F53709 /* lua_cocos2dx_experimental_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 15622968197780DE009C9067 /* lua_cocos2dx_experimental_auto.hpp */; }; + 156EADF91977A39F00F53709 /* lua_cocos2dx_experimental_video_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 156EADF71977A39F00F53709 /* lua_cocos2dx_experimental_video_manual.cpp */; }; + 156EADFA1977A39F00F53709 /* lua_cocos2dx_experimental_video_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 156EADF81977A39F00F53709 /* lua_cocos2dx_experimental_video_manual.hpp */; }; + 156EADFB1977A3A300F53709 /* lua_cocos2dx_experimental_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1562297119778209009C9067 /* lua_cocos2dx_experimental_manual.cpp */; }; + 156EADFC1977A3A500F53709 /* lua_cocos2dx_experimental_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1562297219778209009C9067 /* lua_cocos2dx_experimental_manual.hpp */; }; 1A262AB818BEEF5900D2DB92 /* tolua_fix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A262AB718BEEF5900D2DB92 /* tolua_fix.cpp */; }; 1A262AB918BEEF5900D2DB92 /* tolua_fix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A262AB718BEEF5900D2DB92 /* tolua_fix.cpp */; }; 1AACE7B518BC45C200215002 /* lua_cocos2dx_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE74918BC45C200215002 /* lua_cocos2dx_auto.cpp */; }; @@ -225,10 +233,14 @@ 1503FAA018DA8A1C00F6518C /* io.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = io.h; sourceTree = ""; }; 1540AF55193EC30500717D8E /* xxtea.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xxtea.cpp; sourceTree = ""; }; 1540AF56193EC30500717D8E /* xxtea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xxtea.h; sourceTree = ""; }; - 15AECE10195C277100907DB0 /* lua_cocos2dx_experimental_video_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_experimental_video_auto.cpp; sourceTree = ""; }; - 15AECE11195C277100907DB0 /* lua_cocos2dx_experimental_video_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_experimental_video_auto.hpp; sourceTree = ""; }; - 15AECE14195C28DF00907DB0 /* lua_cocos2dx_experimental_video_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_experimental_video_manual.cpp; sourceTree = ""; }; - 15AECE15195C28DF00907DB0 /* lua_cocos2dx_experimental_video_manual.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_experimental_video_manual.hpp; sourceTree = ""; }; + 15622967197780DE009C9067 /* lua_cocos2dx_experimental_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_experimental_auto.cpp; sourceTree = ""; }; + 15622968197780DE009C9067 /* lua_cocos2dx_experimental_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_experimental_auto.hpp; sourceTree = ""; }; + 1562297119778209009C9067 /* lua_cocos2dx_experimental_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_experimental_manual.cpp; sourceTree = ""; }; + 1562297219778209009C9067 /* lua_cocos2dx_experimental_manual.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_experimental_manual.hpp; sourceTree = ""; }; + 156EADF11977A2BA00F53709 /* lua_cocos2dx_experimental_video_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_experimental_video_auto.cpp; sourceTree = ""; }; + 156EADF21977A2BA00F53709 /* lua_cocos2dx_experimental_video_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_experimental_video_auto.hpp; sourceTree = ""; }; + 156EADF71977A39F00F53709 /* lua_cocos2dx_experimental_video_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_experimental_video_manual.cpp; sourceTree = ""; }; + 156EADF81977A39F00F53709 /* lua_cocos2dx_experimental_video_manual.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_experimental_video_manual.hpp; sourceTree = ""; }; 1A262AB718BEEF5900D2DB92 /* tolua_fix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tolua_fix.cpp; sourceTree = ""; }; 1AACE74618BC45A000215002 /* libluabindings Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libluabindings Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 1AACE74718BC45A000215002 /* libluabindings iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libluabindings iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -377,8 +389,10 @@ 1AACE74818BC45C200215002 /* auto */ = { isa = PBXGroup; children = ( - 15AECE10195C277100907DB0 /* lua_cocos2dx_experimental_video_auto.cpp */, - 15AECE11195C277100907DB0 /* lua_cocos2dx_experimental_video_auto.hpp */, + 156EADF11977A2BA00F53709 /* lua_cocos2dx_experimental_video_auto.cpp */, + 156EADF21977A2BA00F53709 /* lua_cocos2dx_experimental_video_auto.hpp */, + 15622967197780DE009C9067 /* lua_cocos2dx_experimental_auto.cpp */, + 15622968197780DE009C9067 /* lua_cocos2dx_experimental_auto.hpp */, 2905FACE18CF12E600240AA3 /* lua_cocos2dx_ui_auto.cpp */, 2905FACF18CF12E600240AA3 /* lua_cocos2dx_ui_auto.hpp */, 1AACE74918BC45C200215002 /* lua_cocos2dx_auto.cpp */, @@ -399,8 +413,10 @@ 1AACE75B18BC45C200215002 /* manual */ = { isa = PBXGroup; children = ( - 15AECE14195C28DF00907DB0 /* lua_cocos2dx_experimental_video_manual.cpp */, - 15AECE15195C28DF00907DB0 /* lua_cocos2dx_experimental_video_manual.hpp */, + 156EADF71977A39F00F53709 /* lua_cocos2dx_experimental_video_manual.cpp */, + 156EADF81977A39F00F53709 /* lua_cocos2dx_experimental_video_manual.hpp */, + 1562297119778209009C9067 /* lua_cocos2dx_experimental_manual.cpp */, + 1562297219778209009C9067 /* lua_cocos2dx_experimental_manual.hpp */, 2905FAD418CF143800240AA3 /* lua_cocos2dx_ui_manual.cpp */, 2905FAD518CF143800240AA3 /* lua_cocos2dx_ui_manual.hpp */, 1AACE75E18BC45C200215002 /* CCBProxy.cpp */, @@ -594,6 +610,7 @@ 1AACE7E818BC45C200215002 /* CCLuaStack.h in Headers */, 1ABCA1EF18CD8F470087CE3A /* luaconf.h in Headers */, 1ABCA23C18CD8F7D0087CE3A /* inet.h in Headers */, + 1562296A197780DE009C9067 /* lua_cocos2dx_experimental_auto.hpp in Headers */, 1AACE7D018BC45C200215002 /* lua_cocos2dx_spine_auto.hpp in Headers */, 1ABCA1EB18CD8F470087CE3A /* lauxlib.h in Headers */, 1AACE81018BC45C200215002 /* lua_extensions.h in Headers */, @@ -604,9 +621,11 @@ 1AACE81818BC45C200215002 /* lua_xml_http_request.h in Headers */, 1AACE87C18BC45C200215002 /* tolua_fix.h in Headers */, 1AACE83218BC45C200215002 /* CCLuaObjcBridge.h in Headers */, + 1562297619778209009C9067 /* lua_cocos2dx_experimental_manual.hpp in Headers */, 1AACE82418BC45C200215002 /* LuaScriptHandlerMgr.h in Headers */, 1AACE7FC18BC45C200215002 /* lua_cocos2dx_extension_manual.h in Headers */, 2905FAD318CF12E600240AA3 /* lua_cocos2dx_ui_auto.hpp in Headers */, + 156EADF41977A2BA00F53709 /* lua_cocos2dx_experimental_video_auto.hpp in Headers */, 1AACE7EC18BC45C200215002 /* CCLuaValue.h in Headers */, 2905FAD918CF143800240AA3 /* lua_cocos2dx_ui_manual.hpp in Headers */, 1AACE80C18BC45C200215002 /* lua_cocos2dx_spine_manual.hpp in Headers */, @@ -627,10 +646,9 @@ 1ABCA1ED18CD8F470087CE3A /* lua.h in Headers */, 1AACE7F418BC45C200215002 /* lua_cocos2dx_coco_studio_manual.hpp in Headers */, 1ABCA26818CD8F7D0087CE3A /* udp.h in Headers */, - 15AECE17195C28DF00907DB0 /* lua_cocos2dx_experimental_video_manual.hpp in Headers */, + 156EADFA1977A39F00F53709 /* lua_cocos2dx_experimental_video_manual.hpp in Headers */, 1ABCA25418CD8F7D0087CE3A /* select.h in Headers */, 1AACE7D618BC45C200215002 /* lua_cocos2dx_studio_auto.hpp in Headers */, - 15AECE13195C277100907DB0 /* lua_cocos2dx_experimental_video_auto.hpp in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -657,6 +675,8 @@ 1AACE7CF18BC45C200215002 /* lua_cocos2dx_spine_auto.hpp in Headers */, 1ABCA1EA18CD8F470087CE3A /* lauxlib.h in Headers */, 1AACE80F18BC45C200215002 /* lua_extensions.h in Headers */, + 156EADF61977A2C200F53709 /* lua_cocos2dx_experimental_auto.hpp in Headers */, + 156EADFC1977A3A500F53709 /* lua_cocos2dx_experimental_manual.hpp in Headers */, 1AACE81F18BC45C200215002 /* LuaOpengl.h in Headers */, 1503FAA318DA8A1C00F6518C /* buffer.h in Headers */, 1ABCA25F18CD8F7D0087CE3A /* tcp.h in Headers */, @@ -763,6 +783,7 @@ files = ( 1AACE7C818BC45C200215002 /* lua_cocos2dx_physics_auto.cpp in Sources */, 1AACE83418BC45C200215002 /* CCLuaObjcBridge.mm in Sources */, + 15622969197780DE009C9067 /* lua_cocos2dx_experimental_auto.cpp in Sources */, 1ABCA20518CD8F6E0087CE3A /* tolua_is.c in Sources */, 1AACE7F618BC45C200215002 /* lua_cocos2dx_deprecated.cpp in Sources */, 1ABCA24E18CD8F7D0087CE3A /* options.c in Sources */, @@ -770,11 +791,9 @@ 1AACE81E18BC45C200215002 /* LuaOpengl.cpp in Sources */, 1AACE7CE18BC45C200215002 /* lua_cocos2dx_spine_auto.cpp in Sources */, 1AACE80218BC45C200215002 /* lua_cocos2dx_manual.cpp in Sources */, - 15AECE16195C28DF00907DB0 /* lua_cocos2dx_experimental_video_manual.cpp in Sources */, 1ABCA23E18CD8F7D0087CE3A /* luasocket.c in Sources */, 1ABCA25218CD8F7D0087CE3A /* select.c in Sources */, 1ABCA24A18CD8F7D0087CE3A /* mime.c in Sources */, - 15AECE12195C277100907DB0 /* lua_cocos2dx_experimental_video_auto.cpp in Sources */, 1540AF58193EC30500717D8E /* xxtea.cpp in Sources */, 1ABCA26218CD8F7D0087CE3A /* timeout.c in Sources */, 1503FAA618DA8A1C00F6518C /* io.c in Sources */, @@ -786,6 +805,7 @@ 1AACE7F218BC45C200215002 /* lua_cocos2dx_coco_studio_manual.cpp in Sources */, 1503FAA218DA8A1C00F6518C /* buffer.c in Sources */, 1AACE80E18BC45C200215002 /* lua_extensions.c in Sources */, + 1562297519778209009C9067 /* lua_cocos2dx_experimental_manual.cpp in Sources */, 1AACE7EA18BC45C200215002 /* CCLuaValue.cpp in Sources */, 1AACE7D418BC45C200215002 /* lua_cocos2dx_studio_auto.cpp in Sources */, 1AACE7BC18BC45C200215002 /* lua_cocos2dx_extension_auto.cpp in Sources */, @@ -796,6 +816,7 @@ 1AACE81A18BC45C200215002 /* LuaBasicConversions.cpp in Sources */, 1AACE7EE18BC45C200215002 /* Cocos2dxLuaLoader.cpp in Sources */, 1AACE7DA18BC45C200215002 /* CCBProxy.cpp in Sources */, + 156EADF91977A39F00F53709 /* lua_cocos2dx_experimental_video_manual.cpp in Sources */, 1AACE81618BC45C200215002 /* lua_xml_http_request.cpp in Sources */, 1ABCA23A18CD8F7D0087CE3A /* inet.c in Sources */, 2905FAD118CF12E600240AA3 /* lua_cocos2dx_ui_auto.cpp in Sources */, @@ -806,6 +827,7 @@ 1AACE7DE18BC45C200215002 /* CCLuaBridge.cpp in Sources */, 1ABCA23218CD8F7D0087CE3A /* auxiliar.c in Sources */, 1ABCA20118CD8F6E0087CE3A /* tolua_event.c in Sources */, + 156EADF31977A2BA00F53709 /* lua_cocos2dx_experimental_video_auto.cpp in Sources */, C0FEF4D718BE0E70001F446C /* lua_debugger.c in Sources */, 1AACE7E618BC45C200215002 /* CCLuaStack.cpp in Sources */, 1AACE80618BC45C200215002 /* lua_cocos2dx_physics_manual.cpp in Sources */, @@ -844,6 +866,7 @@ 1503FAA118DA8A1C00F6518C /* buffer.c in Sources */, 1AACE80D18BC45C200215002 /* lua_extensions.c in Sources */, 1AACE7E918BC45C200215002 /* CCLuaValue.cpp in Sources */, + 156EADF51977A2BF00F53709 /* lua_cocos2dx_experimental_auto.cpp in Sources */, 1AACE7D318BC45C200215002 /* lua_cocos2dx_studio_auto.cpp in Sources */, 1AACE7BB18BC45C200215002 /* lua_cocos2dx_extension_auto.cpp in Sources */, 1ABCA20818CD8F6E0087CE3A /* tolua_push.c in Sources */, @@ -860,6 +883,7 @@ 1ABCA26D18CD8F7D0087CE3A /* usocket.c in Sources */, 1AACE81118BC45C200215002 /* Lua_web_socket.cpp in Sources */, 1AACE7F918BC45C200215002 /* lua_cocos2dx_extension_manual.cpp in Sources */, + 156EADFB1977A3A300F53709 /* lua_cocos2dx_experimental_manual.cpp in Sources */, 1AACE7DD18BC45C200215002 /* CCLuaBridge.cpp in Sources */, 1ABCA23118CD8F7D0087CE3A /* auxiliar.c in Sources */, 1ABCA20018CD8F6E0087CE3A /* tolua_event.c in Sources */, diff --git a/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/xcshareddata/xcschemes/luabindings Mac.xcscheme b/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/xcshareddata/xcschemes/luabindings Mac.xcscheme index 59ef8fc5d8..4aa19dbd74 100644 --- a/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/xcshareddata/xcschemes/luabindings Mac.xcscheme +++ b/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/xcshareddata/xcschemes/luabindings Mac.xcscheme @@ -1,6 +1,6 @@ + + + + @@ -48,6 +57,15 @@ useCustomWorkingDirectory = "NO" buildConfiguration = "Release" debugDocumentVersioning = "YES"> + + + + diff --git a/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/xcshareddata/xcschemes/luabindings iOS.xcscheme b/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/xcshareddata/xcschemes/luabindings iOS.xcscheme index ca661aa036..d9f900f7bb 100644 --- a/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/xcshareddata/xcschemes/luabindings iOS.xcscheme +++ b/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/xcshareddata/xcschemes/luabindings iOS.xcscheme @@ -1,6 +1,6 @@ + + + + @@ -48,6 +57,15 @@ useCustomWorkingDirectory = "NO" buildConfiguration = "Release" debugDocumentVersioning = "YES"> + + + + diff --git a/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj b/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj index 4ebf5661d4..17d4be7a0a 100644 --- a/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj +++ b/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj @@ -31,6 +31,7 @@ + @@ -48,6 +49,7 @@ + @@ -82,6 +84,7 @@ + @@ -99,6 +102,7 @@ + @@ -130,6 +134,11 @@ + + + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} + + {DDC3E27F-004D-4DD4-9DD3-931A013D2159} liblua diff --git a/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj.filters b/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj.filters index af8cd09e62..17e309c94c 100644 --- a/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj.filters +++ b/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj.filters @@ -165,6 +165,12 @@ xxtea + + manual + + + auto + @@ -314,6 +320,12 @@ xxtea + + manual + + + auto + diff --git a/cocos/scripting/lua-bindings/script/experimentalConstants.lua b/cocos/scripting/lua-bindings/script/experimentalConstants.lua index 9fea50ca3b..63a65648ea 100644 --- a/cocos/scripting/lua-bindings/script/experimentalConstants.lua +++ b/cocos/scripting/lua-bindings/script/experimentalConstants.lua @@ -1,7 +1,7 @@ -ccexprimental = ccexprimental or {} +ccexp = ccexp or {} -ccexprimental.VideoPlayerEvent = { +ccexp.VideoPlayerEvent = { PLAYING = 0, PAUSED = 1, STOPPED= 2, diff --git a/cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj b/cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj deleted file mode 100644 index 2f37b0f0fd..0000000000 --- a/cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj +++ /dev/null @@ -1,103 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - - - - - - - {632A8F38-D0F0-4D22-86B3-D69F5E6BF63A} - libLocalStorage - - - - StaticLibrary - true - v100 - v110 - v110_xp - v120 - v120_xp - Unicode - - - StaticLibrary - false - v100 - v110 - v110_xp - v120 - v120_xp - true - Unicode - - - - - - - - - - - - - - - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - - - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - - - - Level3 - Disabled - - - $(EngineRoot)external\sqlite3\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - 4267;4251;4244;%(DisableSpecificWarnings) - false - - - true - - - - - Level3 - MinSpace - true - true - - - $(EngineRoot)external\sqlite3\include;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - None - false - - - true - true - true - - - - - - \ No newline at end of file diff --git a/cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj.filters b/cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj.filters deleted file mode 100644 index b23d606b74..0000000000 --- a/cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj.filters +++ /dev/null @@ -1,21 +0,0 @@ - - - - - {0310200c-b520-4f77-85f6-46f568b10f4d} - - - {69cfa37c-4b20-409e-ad74-a26314878d8a} - - - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/cocos/ui/Android.mk b/cocos/ui/Android.mk index fed4a17385..40f4cb6a31 100644 --- a/cocos/ui/Android.mk +++ b/cocos/ui/Android.mk @@ -25,12 +25,12 @@ UILoadingBar.cpp \ UISlider.cpp \ UITextField.cpp \ UIRichText.cpp \ -CCProtectedNode.cpp \ UIHBox.cpp \ UIVBox.cpp \ UIRelativeBox.cpp \ UIVideoPlayerAndroid.cpp \ UIDeprecated.cpp \ +UIScale9Sprite.cpp \ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. \ $(LOCAL_PATH)/../editor-support diff --git a/cocos/ui/CMakeLists.txt b/cocos/ui/CMakeLists.txt index cd7066589d..02829ab86a 100644 --- a/cocos/ui/CMakeLists.txt +++ b/cocos/ui/CMakeLists.txt @@ -1,5 +1,4 @@ set(COCOS_UI_SRC - ui/CCProtectedNode.cpp ui/CocosGUI.cpp ui/UIButton.cpp ui/UICheckBox.cpp @@ -23,5 +22,6 @@ set(COCOS_UI_SRC ui/UIVBox.cpp ui/UIWidget.cpp ui/UIDeprecated.cpp + ui/UIScale9Sprite.cpp ) diff --git a/cocos/ui/CocosGUI.h b/cocos/ui/CocosGUI.h index 5a6c1810bb..5fc08abefc 100644 --- a/cocos/ui/CocosGUI.h +++ b/cocos/ui/CocosGUI.h @@ -49,12 +49,14 @@ THE SOFTWARE. #include "ui/UIVideoPlayer.h" #endif #include "ui/UIDeprecated.h" +#include "ui/GUIExport.h" +#include "ui/UIScale9Sprite.h" NS_CC_BEGIN namespace ui { -const char* CocosGUIVersion(); +CC_GUI_DLL const char* CocosGUIVersion(); } NS_CC_END diff --git a/cocos/ui/GUIExport.h b/cocos/ui/GUIExport.h new file mode 100644 index 0000000000..aec8809e0f --- /dev/null +++ b/cocos/ui/GUIExport.h @@ -0,0 +1,28 @@ +#ifndef __CCLIBGUI_H__ +#define __CCLIBGUI_H__ + +#if defined(WIN32) && defined(_WINDOWS) + #ifdef __MINGW32__ + #include + #endif + + #if defined(_USEGUIDLL) + #define CC_GUI_DLL __declspec(dllexport) + #else /* use a DLL library */ + #define CC_GUI_DLL __declspec(dllimport) + #endif + + + /* Define NULL pointer value */ + #ifndef NULL + #ifdef __cplusplus + #define NULL 0 + #else + #define NULL ((void *)0) + #endif + #endif +#else + #define CC_GUI_DLL +#endif + +#endif /* __CCEXTENSIONEXPORT_H__*/ \ No newline at end of file diff --git a/cocos/ui/UIButton.cpp b/cocos/ui/UIButton.cpp index 6cfdbecc86..bdd72c7b8a 100644 --- a/cocos/ui/UIButton.cpp +++ b/cocos/ui/UIButton.cpp @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ #include "ui/UIButton.h" -#include "extensions/GUI/CCControlExtension/CCScale9Sprite.h" +#include "ui/UIScale9Sprite.h" #include "2d/CCLabel.h" #include "2d/CCSprite.h" #include "2d/CCActionInterval.h" @@ -135,9 +135,13 @@ bool Button::init() void Button::initRenderer() { - _buttonNormalRenderer = Sprite::create(); - _buttonClickedRenderer = Sprite::create(); - _buttonDisableRenderer = Sprite::create(); + _buttonNormalRenderer = Scale9Sprite::create(); + _buttonClickedRenderer = Scale9Sprite::create(); + _buttonDisableRenderer = Scale9Sprite::create(); + _buttonClickedRenderer->setScale9Enabled(false); + _buttonNormalRenderer->setScale9Enabled(false); + _buttonDisableRenderer->setScale9Enabled(false); + _titleRenderer = Label::create(); _titleRenderer->setAnchorPoint(Vec2::ANCHOR_MIDDLE); @@ -153,33 +157,13 @@ void Button::setScale9Enabled(bool able) { return; } - _brightStyle = BrightStyle::NONE; + _scale9Enabled = able; - removeProtectedChild(_buttonNormalRenderer); - removeProtectedChild(_buttonClickedRenderer); - removeProtectedChild(_buttonDisableRenderer); - _buttonNormalRenderer = nullptr; - _buttonClickedRenderer = nullptr; - _buttonDisableRenderer = nullptr; - if (_scale9Enabled) - { - _buttonNormalRenderer = extension::Scale9Sprite::create(); - _buttonClickedRenderer = extension::Scale9Sprite::create(); - _buttonDisableRenderer = extension::Scale9Sprite::create(); - } - else - { - _buttonNormalRenderer = Sprite::create(); - _buttonClickedRenderer = Sprite::create(); - _buttonDisableRenderer = Sprite::create(); - } - - loadTextureNormal(_normalFileName, _normalTexType); - loadTexturePressed(_clickedFileName, _pressedTexType); - loadTextureDisabled(_disabledFileName, _disabledTexType); - addProtectedChild(_buttonNormalRenderer, NORMAL_RENDERER_Z, -1); - addProtectedChild(_buttonClickedRenderer, PRESSED_RENDERER_Z, -1); - addProtectedChild(_buttonDisableRenderer, DISABLED_RENDERER_Z, -1); + + _buttonNormalRenderer->setScale9Enabled(_scale9Enabled); + _buttonClickedRenderer->setScale9Enabled(_scale9Enabled); + _buttonDisableRenderer->setScale9Enabled(_scale9Enabled); + if (_scale9Enabled) { bool ignoreBefore = _ignoreSize; @@ -190,9 +174,12 @@ void Button::setScale9Enabled(bool able) { ignoreContentAdaptWithSize(_prevIgnoreSize); } + setCapInsetsNormalRenderer(_capInsetsNormal); setCapInsetsPressedRenderer(_capInsetsPressed); setCapInsetsDisabledRenderer(_capInsetsDisabled); + + _brightStyle = BrightStyle::NONE; setBright(_bright); } @@ -228,37 +215,19 @@ void Button::loadTextureNormal(const std::string& normal,TextureResType texType) } _normalFileName = normal; _normalTexType = texType; - if (_scale9Enabled) + + switch (_normalTexType) { - extension::Scale9Sprite* normalRendererScale9 = static_cast(_buttonNormalRenderer); - switch (_normalTexType) - { - case TextureResType::LOCAL: - normalRendererScale9->initWithFile(normal); - break; - case TextureResType::PLIST: - normalRendererScale9->initWithSpriteFrameName(normal); - break; - default: - break; - } - normalRendererScale9->setCapInsets(_capInsetsNormal); - } - else - { - Sprite* normalRenderer = static_cast(_buttonNormalRenderer); - switch (_normalTexType) - { - case TextureResType::LOCAL: - normalRenderer->setTexture(normal); - break; - case TextureResType::PLIST: - normalRenderer->setSpriteFrame(normal); - break; - default: - break; - } + case TextureResType::LOCAL: + _buttonNormalRenderer->initWithFile(normal); + break; + case TextureResType::PLIST: + _buttonNormalRenderer->initWithSpriteFrameName(normal); + break; + default: + break; } + _normalTextureSize = _buttonNormalRenderer->getContentSize(); updateFlippedX(); updateFlippedY(); @@ -276,38 +245,21 @@ void Button::loadTexturePressed(const std::string& selected,TextureResType texTy } _clickedFileName = selected; _pressedTexType = texType; - if (_scale9Enabled) + + switch (_pressedTexType) { - extension::Scale9Sprite* clickedRendererScale9 = static_cast(_buttonClickedRenderer); - switch (_pressedTexType) - { - case TextureResType::LOCAL: - clickedRendererScale9->initWithFile(selected); - break; - case TextureResType::PLIST: - clickedRendererScale9->initWithSpriteFrameName(selected); - break; - default: - break; - } - clickedRendererScale9->setCapInsets(_capInsetsPressed); - } - else - { - Sprite* clickedRenderer = static_cast(_buttonClickedRenderer); - switch (_pressedTexType) - { - case TextureResType::LOCAL: - clickedRenderer->setTexture(selected); - break; - case TextureResType::PLIST: - clickedRenderer->setSpriteFrame(selected); - break; - default: - break; - } + case TextureResType::LOCAL: + _buttonClickedRenderer->initWithFile(selected); + break; + case TextureResType::PLIST: + _buttonClickedRenderer->initWithSpriteFrameName(selected); + break; + default: + break; } + _pressedTextureSize = _buttonClickedRenderer->getContentSize(); + //TODO: mark as dirty updateFlippedX(); updateFlippedY(); @@ -323,37 +275,19 @@ void Button::loadTextureDisabled(const std::string& disabled,TextureResType texT } _disabledFileName = disabled; _disabledTexType = texType; - if (_scale9Enabled) + + switch (_disabledTexType) { - extension::Scale9Sprite* disabledScale9 = static_cast(_buttonDisableRenderer); - switch (_disabledTexType) - { - case TextureResType::LOCAL: - disabledScale9->initWithFile(disabled); - break; - case TextureResType::PLIST: - disabledScale9->initWithSpriteFrameName(disabled); - break; - default: - break; - } - disabledScale9->setCapInsets(_capInsetsDisabled); - } - else - { - Sprite* disabledRenderer = static_cast(_buttonDisableRenderer); - switch (_disabledTexType) - { - case TextureResType::LOCAL: - disabledRenderer->setTexture(disabled); - break; - case TextureResType::PLIST: - disabledRenderer->setSpriteFrame(disabled); - break; - default: - break; - } + case TextureResType::LOCAL: + _buttonDisableRenderer->initWithFile(disabled); + break; + case TextureResType::PLIST: + _buttonDisableRenderer->initWithSpriteFrameName(disabled); + break; + default: + break; } + _disabledTextureSize = _buttonDisableRenderer->getContentSize(); updateFlippedX(); updateFlippedY(); @@ -376,7 +310,7 @@ void Button::setCapInsetsNormalRenderer(const Rect &capInsets) { return; } - static_cast(_buttonNormalRenderer)->setCapInsets(capInsets); + _buttonNormalRenderer->setCapInsets(capInsets); } const Rect& Button::getCapInsetsNormalRenderer()const @@ -391,7 +325,7 @@ void Button::setCapInsetsPressedRenderer(const Rect &capInsets) { return; } - static_cast(_buttonClickedRenderer)->setCapInsets(capInsets); + _buttonClickedRenderer->setCapInsets(capInsets); } const Rect& Button::getCapInsetsPressedRenderer()const @@ -406,7 +340,7 @@ void Button::setCapInsetsDisabledRenderer(const Rect &capInsets) { return; } - static_cast(_buttonDisableRenderer)->setCapInsets(capInsets); + _buttonDisableRenderer->setCapInsets(capInsets); } const Rect& Button::getCapInsetsDisabledRenderer()const @@ -432,28 +366,10 @@ void Button::onPressStateChangedToNormal() } else { - if (_scale9Enabled) - { - updateTexturesRGBA(); - } - else - { - _buttonNormalRenderer->stopAllActions(); - _buttonNormalRenderer->setScale(_normalTextureScaleXInSize, _normalTextureScaleYInSize); - } + _buttonNormalRenderer->stopAllActions(); + _buttonNormalRenderer->setScale(_normalTextureScaleXInSize, _normalTextureScaleYInSize); } } - -void Button::updateTexturesRGBA() -{ - _buttonNormalRenderer->setColor(this->getColor()); - _buttonClickedRenderer->setColor(this->getColor()); - _buttonDisableRenderer->setColor(this->getColor()); - - _buttonNormalRenderer->setOpacity(this->getOpacity()); - _buttonClickedRenderer->setOpacity(this->getOpacity()); - _buttonDisableRenderer->setOpacity(this->getOpacity()); -} void Button::onPressStateChangedToPressed() { @@ -462,6 +378,7 @@ void Button::onPressStateChangedToPressed() _buttonNormalRenderer->setVisible(false); _buttonClickedRenderer->setVisible(true); _buttonDisableRenderer->setVisible(false); + if (_pressedActionEnabled) { _buttonNormalRenderer->stopAllActions(); @@ -501,36 +418,19 @@ void Button::updateFlippedX() { float flip = _flippedX ? -1.0f : 1.0f; _titleRenderer->setScaleX(flip); - if (_scale9Enabled) - { - _buttonNormalRenderer->setScaleX(flip); - _buttonClickedRenderer->setScaleX(flip); - _buttonDisableRenderer->setScaleX(flip); - } - else - { - static_cast(_buttonNormalRenderer)->setFlippedX(_flippedX); - static_cast(_buttonClickedRenderer)->setFlippedX(_flippedX); - static_cast(_buttonDisableRenderer)->setFlippedX(_flippedX); - } + + _buttonNormalRenderer->setFlippedX(_flippedX); + _buttonClickedRenderer->setFlippedX(_flippedX); + _buttonDisableRenderer->setFlippedX(_flippedX); } void Button::updateFlippedY() { float flip = _flippedY ? -1.0f : 1.0f; _titleRenderer->setScaleY(flip); - if (_scale9Enabled) - { - _buttonNormalRenderer->setScaleY(flip); - _buttonClickedRenderer->setScaleY(flip); - _buttonDisableRenderer->setScaleY(flip); - } - else - { - static_cast(_buttonNormalRenderer)->setFlippedY(_flippedY); - static_cast(_buttonClickedRenderer)->setFlippedY(_flippedY); - static_cast(_buttonDisableRenderer)->setFlippedY(_flippedY); - } + _buttonNormalRenderer->setFlippedY(_flippedY); + _buttonClickedRenderer->setFlippedY(_flippedY); + _buttonDisableRenderer->setFlippedY(_flippedY); } void Button::updateTitleLocation() @@ -605,8 +505,9 @@ void Button::normalTextureScaleChangedWithSize() { if (_scale9Enabled) { - static_cast(_buttonNormalRenderer)->setPreferredSize(_contentSize); + _buttonNormalRenderer->setPreferredSize(_contentSize); _normalTextureScaleXInSize = _normalTextureScaleYInSize = 1.0f; + _buttonNormalRenderer->setScale(_normalTextureScaleXInSize,_normalTextureScaleYInSize); } else { @@ -641,8 +542,9 @@ void Button::pressedTextureScaleChangedWithSize() { if (_scale9Enabled) { - static_cast(_buttonClickedRenderer)->setPreferredSize(_contentSize); + _buttonClickedRenderer->setPreferredSize(_contentSize); _pressedTextureScaleXInSize = _pressedTextureScaleYInSize = 1.0f; + _buttonClickedRenderer->setScale(_pressedTextureScaleXInSize,_pressedTextureScaleYInSize); } else { @@ -676,7 +578,8 @@ void Button::disabledTextureScaleChangedWithSize() { if (_scale9Enabled) { - static_cast(_buttonDisableRenderer)->setPreferredSize(_contentSize); + _buttonDisableRenderer->setScale(1.0); + _buttonDisableRenderer->setPreferredSize(_contentSize); } else { diff --git a/cocos/ui/UIButton.h b/cocos/ui/UIButton.h index 0510717c56..e44e148024 100644 --- a/cocos/ui/UIButton.h +++ b/cocos/ui/UIButton.h @@ -26,18 +26,20 @@ THE SOFTWARE. #define __UIBUTTON_H__ #include "ui/UIWidget.h" +#include "ui/GUIExport.h" NS_CC_BEGIN class Label; namespace ui{ - + + class Scale9Sprite; /** * @js NA * @lua NA */ -class Button : public Widget +class CC_GUI_DLL Button : public Widget { DECLARE_CLASS_GUI_INFO @@ -204,9 +206,7 @@ protected: virtual void updateFlippedX() override; virtual void updateFlippedY() override; - - void updateTexturesRGBA(); - + void normalTextureScaleChangedWithSize(); void pressedTextureScaleChangedWithSize(); void disabledTextureScaleChangedWithSize(); @@ -218,10 +218,11 @@ protected: virtual void copySpecialProperties(Widget* model) override; protected: - Node* _buttonNormalRenderer; - Node* _buttonClickedRenderer; - Node* _buttonDisableRenderer; + Scale9Sprite* _buttonNormalRenderer; + Scale9Sprite* _buttonClickedRenderer; + Scale9Sprite* _buttonDisableRenderer; Label* _titleRenderer; + std::string _normalFileName; std::string _clickedFileName; std::string _disabledFileName; diff --git a/cocos/ui/UICheckBox.h b/cocos/ui/UICheckBox.h index db7900fcbf..c90ab7b235 100644 --- a/cocos/ui/UICheckBox.h +++ b/cocos/ui/UICheckBox.h @@ -26,6 +26,7 @@ THE SOFTWARE. #define __UICHECKBOX_H__ #include "ui/UIWidget.h" +#include "ui/GUIExport.h" NS_CC_BEGIN @@ -46,7 +47,7 @@ typedef void (Ref::*SEL_SelectedStateEvent)(Ref*,CheckBoxEventType); * @js NA * @lua NA */ -class CheckBox : public Widget +class CC_GUI_DLL CheckBox : public Widget { DECLARE_CLASS_GUI_INFO diff --git a/cocos/ui/UIHBox.h b/cocos/ui/UIHBox.h index 1b6cf95ae9..872fe90664 100644 --- a/cocos/ui/UIHBox.h +++ b/cocos/ui/UIHBox.h @@ -26,12 +26,13 @@ #define __UIHBox_H__ #include "ui/UILayout.h" +#include "ui/GUIExport.h" NS_CC_BEGIN namespace ui { -class HBox : public Layout{ +class CC_GUI_DLL HBox : public Layout{ public: diff --git a/cocos/ui/UIHelper.cpp b/cocos/ui/UIHelper.cpp index 11b44c6b1d..73f1fdbabc 100644 --- a/cocos/ui/UIHelper.cpp +++ b/cocos/ui/UIHelper.cpp @@ -108,6 +108,43 @@ Widget* Helper::seekActionWidgetByActionTag(Widget* root, int tag) } return nullptr; } + +std::string Helper::getSubStringOfUTF8String(const std::string& str, std::string::size_type start, std::string::size_type length) +{ + if (length==0) + { + return ""; + } + std::string::size_type c, i, ix, q, min=std::string::npos, max=std::string::npos; + for (q=0, i=0, ix=str.length(); i < ix; i++, q++) + { + if (q==start) + { + min = i; + } + if (q <= start+length || length==std::string::npos) + { + max = i; + } + + c = (unsigned char) str[i]; + + if (c<=127) i+=0; + else if ((c & 0xE0) == 0xC0) i+=1; + else if ((c & 0xF0) == 0xE0) i+=2; + else if ((c & 0xF8) == 0xF0) i+=3; + else return "";//invalid utf8 + } + if (q <= start+length || length == std::string::npos) + { + max = i; + } + if (min==std::string::npos || max==std::string::npos) + { + return ""; + } + return str.substr(min,max); +} } diff --git a/cocos/ui/UIHelper.h b/cocos/ui/UIHelper.h index 68fa8dbfb9..fb6136e7c7 100644 --- a/cocos/ui/UIHelper.h +++ b/cocos/ui/UIHelper.h @@ -27,6 +27,7 @@ THE SOFTWARE. #include #include "base/CCPlatformMacros.h" +#include "ui/GUIExport.h" NS_CC_BEGIN @@ -38,7 +39,7 @@ namespace ui { * @js NA * @lua NA */ -class Helper +class CC_GUI_DLL Helper { public: /** @@ -65,6 +66,18 @@ public: /*temp action*/ static Widget* seekActionWidgetByActionTag(Widget* root, int tag); + + /** + * @brief Get a UTF8 substring from a std::string with a given start position and length + * Sample: std::string str = "中国中国中国”; substr = getSubStringOfUTF8String(str,0,2) will = "中国" + * @param start The start position of the substring. + * @param length The length of the substring in UTF8 count + * @return a UTF8 substring + */ + static std::string getSubStringOfUTF8String(const std::string& str, + std::string::size_type start, + std::string::size_type length); + }; } diff --git a/cocos/ui/UIImageView.cpp b/cocos/ui/UIImageView.cpp index 6f3471e0b7..1f048638a0 100644 --- a/cocos/ui/UIImageView.cpp +++ b/cocos/ui/UIImageView.cpp @@ -23,16 +23,12 @@ THE SOFTWARE. ****************************************************************************/ #include "ui/UIImageView.h" -#include "extensions/GUI/CCControlExtension/CCScale9Sprite.h" +#include "ui/UIScale9Sprite.h" #include "2d/CCSprite.h" NS_CC_BEGIN namespace ui { - - -#define STATIC_CAST_CCSPRITE static_cast(_imageRenderer) -#define STATIC_CAST_SCALE9SPRITE static_cast(_imageRenderer) static const int IMAGE_RENDERER_Z = (-1); @@ -108,7 +104,9 @@ bool ImageView::init(const std::string &imageFileName, TextureResType texType) void ImageView::initRenderer() { - _imageRenderer = Sprite::create(); + _imageRenderer = Scale9Sprite::create(); + _imageRenderer->setScale9Enabled(false); + addProtectedChild(_imageRenderer, IMAGE_RENDERER_Z, -1); } @@ -123,34 +121,15 @@ void ImageView::loadTexture(const std::string& fileName, TextureResType texType) switch (_imageTexType) { case TextureResType::LOCAL: - if (_scale9Enabled) - { - extension::Scale9Sprite* imageRendererScale9 = STATIC_CAST_SCALE9SPRITE; - imageRendererScale9->initWithFile(fileName); - imageRendererScale9->setCapInsets(_capInsets); - } - else - { - Sprite* imageRenderer = STATIC_CAST_CCSPRITE; - imageRenderer->setTexture(fileName); - } + _imageRenderer->initWithFile(fileName); break; case TextureResType::PLIST: - if (_scale9Enabled) - { - extension::Scale9Sprite* imageRendererScale9 = STATIC_CAST_SCALE9SPRITE; - imageRendererScale9->initWithSpriteFrameName(fileName); - imageRendererScale9->setCapInsets(_capInsets); - } - else - { - Sprite* imageRenderer = STATIC_CAST_CCSPRITE; - imageRenderer->setSpriteFrame(fileName); - } + _imageRenderer->initWithSpriteFrameName(fileName); break; default: break; } + _imageTextureSize = _imageRenderer->getContentSize(); updateFlippedX(); updateFlippedY(); @@ -161,39 +140,32 @@ void ImageView::loadTexture(const std::string& fileName, TextureResType texType) void ImageView::setTextureRect(const Rect &rect) { + //This API should be refactor if (_scale9Enabled) { } else { - STATIC_CAST_CCSPRITE->setTextureRect(rect); + auto sprite = _imageRenderer->getSprite(); + if (sprite) + { + sprite->setTextureRect(rect); + } + else + { + CCLOG("Warning!! you should load texture before set the texture's rect!"); + } } } void ImageView::updateFlippedX() { - if (_scale9Enabled) - { - int flip = _flippedX ? -1 : 1; - STATIC_CAST_SCALE9SPRITE->setScaleX(flip); - } - else - { - STATIC_CAST_CCSPRITE->setFlippedX(_flippedX); - } + _imageRenderer->setFlippedX(_flippedX); } void ImageView::updateFlippedY() { - if (_scale9Enabled) - { - int flip = _flippedY ? -1 : 1; - STATIC_CAST_SCALE9SPRITE->setScaleY(flip); - } - else - { - STATIC_CAST_CCSPRITE->setFlippedY(_flippedY); - } + _imageRenderer->setFlippedY(_flippedY); } @@ -206,18 +178,8 @@ void ImageView::setScale9Enabled(bool able) _scale9Enabled = able; - removeProtectedChild(_imageRenderer); - _imageRenderer = nullptr; - if (_scale9Enabled) - { - _imageRenderer = extension::Scale9Sprite::create(); - } - else - { - _imageRenderer = Sprite::create(); - } - loadTexture(_textureFile,_imageTexType); - addProtectedChild(_imageRenderer, IMAGE_RENDERER_Z, -1); + _imageRenderer->setScale9Enabled(_scale9Enabled); + if (_scale9Enabled) { bool ignoreBefore = _ignoreSize; @@ -252,7 +214,7 @@ void ImageView::setCapInsets(const Rect &capInsets) { return; } - STATIC_CAST_SCALE9SPRITE->setCapInsets(capInsets); + _imageRenderer->setCapInsets(capInsets); } const Rect& ImageView::getCapInsets()const @@ -298,7 +260,7 @@ void ImageView::imageTextureScaleChangedWithSize() { if (_scale9Enabled) { - static_cast(_imageRenderer)->setPreferredSize(_contentSize); + _imageRenderer->setPreferredSize(_contentSize); } else { diff --git a/cocos/ui/UIImageView.h b/cocos/ui/UIImageView.h index ada869b34a..a3150a8de4 100644 --- a/cocos/ui/UIImageView.h +++ b/cocos/ui/UIImageView.h @@ -26,16 +26,17 @@ THE SOFTWARE. #define __UIIMAGEVIEW_H__ #include "ui/UIWidget.h" +#include "ui/GUIExport.h" NS_CC_BEGIN namespace ui { - + class Scale9Sprite; /** * @js NA * @lua NA */ -class ImageView : public Widget +class CC_GUI_DLL ImageView : public Widget { DECLARE_CLASS_GUI_INFO @@ -131,7 +132,7 @@ protected: bool _scale9Enabled; bool _prevIgnoreSize; Rect _capInsets; - Node* _imageRenderer; + Scale9Sprite* _imageRenderer; std::string _textureFile; TextureResType _imageTexType; Size _imageTextureSize; diff --git a/cocos/ui/UILayout.cpp b/cocos/ui/UILayout.cpp index 50074ae5ae..c5460b0ea9 100644 --- a/cocos/ui/UILayout.cpp +++ b/cocos/ui/UILayout.cpp @@ -24,7 +24,7 @@ THE SOFTWARE. #include "ui/UILayout.h" #include "ui/UIHelper.h" -#include "extensions/GUI/CCControlExtension/CCScale9Sprite.h" +#include "ui/UIScale9Sprite.h" #include "renderer/CCGLProgram.h" #include "renderer/CCGLProgramCache.h" #include "base/CCDirector.h" @@ -33,7 +33,6 @@ THE SOFTWARE. #include "ui/UILayoutManager.h" #include "2d/CCDrawNode.h" #include "2d/CCLayer.h" -#include "CCGLView.h" #include "2d/CCSprite.h" #include "base/CCEventFocus.h" @@ -577,7 +576,7 @@ void Layout::onSizeChanged() _backGroundImage->setPosition(Vec2(_contentSize.width/2.0f, _contentSize.height/2.0f)); if (_backGroundScale9Enabled && _backGroundImage) { - static_cast(_backGroundImage)->setPreferredSize(_contentSize); + _backGroundImage->setPreferredSize(_contentSize); } } if (_colorRender) @@ -596,11 +595,13 @@ void Layout::setBackGroundImageScale9Enabled(bool able) { return; } - removeProtectedChild(_backGroundImage); - _backGroundImage = nullptr; _backGroundScale9Enabled = able; - addBackGroundImage(); - setBackGroundImage(_backGroundImageFileName,_bgImageTexType); + if (nullptr == _backGroundImage) + { + addBackGroundImage(); + setBackGroundImage(_backGroundImageFileName,_bgImageTexType); + } + _backGroundImage->setScale9Enabled(_backGroundScale9Enabled); setBackGroundImageCapInsets(_backGroundImageCapInsets); } @@ -621,36 +622,22 @@ void Layout::setBackGroundImage(const std::string& fileName,TextureResType texTy } _backGroundImageFileName = fileName; _bgImageTexType = texType; - if (_backGroundScale9Enabled) + + switch (_bgImageTexType) { - extension::Scale9Sprite* bgiScale9 = static_cast(_backGroundImage); - switch (_bgImageTexType) - { - case TextureResType::LOCAL: - bgiScale9->initWithFile(fileName); - break; - case TextureResType::PLIST: - bgiScale9->initWithSpriteFrameName(fileName); - break; - default: - break; - } - bgiScale9->setPreferredSize(_contentSize); + case TextureResType::LOCAL: + _backGroundImage->initWithFile(fileName); + break; + case TextureResType::PLIST: + _backGroundImage->initWithSpriteFrameName(fileName); + break; + default: + break; } - else - { - switch (_bgImageTexType) - { - case TextureResType::LOCAL: - static_cast(_backGroundImage)->setTexture(fileName); - break; - case TextureResType::PLIST: - static_cast(_backGroundImage)->setSpriteFrame(fileName); - break; - default: - break; - } + if (_backGroundScale9Enabled) { + _backGroundImage->setPreferredSize(_contentSize); } + _backGroundImageTextureSize = _backGroundImage->getContentSize(); _backGroundImage->setPosition(Vec2(_contentSize.width/2.0f, _contentSize.height/2.0f)); updateBackGroundImageRGBA(); @@ -661,7 +648,7 @@ void Layout::setBackGroundImageCapInsets(const Rect &capInsets) _backGroundImageCapInsets = capInsets; if (_backGroundScale9Enabled && _backGroundImage) { - static_cast(_backGroundImage)->setCapInsets(capInsets); + _backGroundImage->setCapInsets(capInsets); } } @@ -706,17 +693,11 @@ void Layout::supplyTheLayoutParameterLackToChild(Widget *child) void Layout::addBackGroundImage() { - if (_backGroundScale9Enabled) - { - _backGroundImage = extension::Scale9Sprite::create(); - addProtectedChild(_backGroundImage, BACKGROUNDIMAGE_Z, -1); - static_cast(_backGroundImage)->setPreferredSize(_contentSize); - } - else - { - _backGroundImage = Sprite::create(); - addProtectedChild(_backGroundImage, BACKGROUNDIMAGE_Z, -1); - } + _backGroundImage = Scale9Sprite::create(); + _backGroundImage->setScale9Enabled(false); + + addProtectedChild(_backGroundImage, BACKGROUNDIMAGE_Z, -1); + _backGroundImage->setPosition(Vec2(_contentSize.width/2.0f, _contentSize.height/2.0f)); } @@ -948,6 +929,12 @@ Layout::Type Layout::getLayoutType() const { return _layoutType; } + +void Layout::forceDoLayout() +{ + this->requestDoLayout(); + this->doLayout(); +} void Layout::requestDoLayout() { @@ -987,10 +974,14 @@ LayoutManager* Layout::createLayoutManager() void Layout::doLayout() { + if (!_doLayoutDirty) { return; } + + sortAllChildren(); + LayoutManager* executant = this->createLayoutManager(); if (executant) diff --git a/cocos/ui/UILayout.h b/cocos/ui/UILayout.h index e43df22522..63a986f511 100644 --- a/cocos/ui/UILayout.h +++ b/cocos/ui/UILayout.h @@ -26,6 +26,7 @@ THE SOFTWARE. #define __LAYOUT_H__ #include "ui/UIWidget.h" +#include "ui/GUIExport.h" #include "renderer/CCCustomCommand.h" #include "renderer/CCGroupCommand.h" @@ -35,12 +36,13 @@ class DrawNode; class LayerColor; class LayerGradient; + namespace ui { class LayoutManager; +class Scale9Sprite; - -class LayoutProtocol +class CC_GUI_DLL LayoutProtocol { public: LayoutProtocol(){} @@ -62,7 +64,7 @@ public: #endif #endif -class Layout : public Widget, public LayoutProtocol +class CC_GUI_DLL Layout : public Widget, public LayoutProtocol { DECLARE_CLASS_GUI_INFO @@ -265,7 +267,14 @@ public: */ virtual void removeAllChildrenWithCleanup(bool cleanup) override; + /** + * force refresh widget layout + */ + void forceDoLayout(); + /** + * request to refresh widget layout + */ void requestDoLayout(); virtual void onEnter() override; @@ -458,7 +467,7 @@ protected: //background bool _backGroundScale9Enabled; - Node* _backGroundImage; + Scale9Sprite* _backGroundImage; std::string _backGroundImageFileName; Rect _backGroundImageCapInsets; BackGroundColorType _colorType; diff --git a/cocos/ui/UILayoutManager.h b/cocos/ui/UILayoutManager.h index 5f82b3c39b..cbeefa5589 100644 --- a/cocos/ui/UILayoutManager.h +++ b/cocos/ui/UILayoutManager.h @@ -27,6 +27,7 @@ #include "base/CCRef.h" #include "base/CCVector.h" +#include "ui/GUIExport.h" NS_CC_BEGIN @@ -36,7 +37,7 @@ class LayoutProtocol; class Widget; class RelativeLayoutParameter; -class LayoutManager : public Ref +class CC_GUI_DLL LayoutManager : public Ref { public: virtual ~LayoutManager(){}; @@ -47,7 +48,7 @@ public: friend class Layout; }; -class LinearVerticalLayoutManager : public LayoutManager +class CC_GUI_DLL LinearVerticalLayoutManager : public LayoutManager { private: LinearVerticalLayoutManager(){}; @@ -58,7 +59,7 @@ private: friend class Layout; }; -class LinearHorizontalLayoutManager : public LayoutManager +class CC_GUI_DLL LinearHorizontalLayoutManager : public LayoutManager { private: LinearHorizontalLayoutManager(){}; @@ -69,7 +70,7 @@ private: friend class Layout; }; -class RelativeLayoutManager : public LayoutManager +class CC_GUI_DLL RelativeLayoutManager : public LayoutManager { private: RelativeLayoutManager() diff --git a/cocos/ui/UILayoutParameter.h b/cocos/ui/UILayoutParameter.h index 4681c82d3b..0fcdc98794 100644 --- a/cocos/ui/UILayoutParameter.h +++ b/cocos/ui/UILayoutParameter.h @@ -27,7 +27,7 @@ #include #include "base/CCRef.h" - +#include "ui/GUIExport.h" NS_CC_BEGIN @@ -37,7 +37,7 @@ namespace ui { * @js NA * @lua NA */ -class Margin +class CC_GUI_DLL Margin { public: float left; @@ -69,7 +69,7 @@ public: #endif #endif -class LayoutParameter : public Ref +class CC_GUI_DLL LayoutParameter : public Ref { public: enum class Type @@ -135,8 +135,6 @@ protected: class LayoutParameterProtocol { public: - LayoutParameterProtocol(){} - virtual ~LayoutParameterProtocol(){} virtual LayoutParameter* getLayoutParameter() const= 0; }; @@ -146,7 +144,7 @@ public: * @js NA * @lua NA */ -class LinearLayoutParameter : public LayoutParameter +class CC_GUI_DLL LinearLayoutParameter : public LayoutParameter { public: enum class LinearGravity @@ -209,7 +207,7 @@ protected: */ -class RelativeLayoutParameter : public LayoutParameter +class CC_GUI_DLL RelativeLayoutParameter : public LayoutParameter { public: enum class RelativeAlign diff --git a/cocos/ui/UIListView.cpp b/cocos/ui/UIListView.cpp index 5689f49be1..447366c718 100644 --- a/cocos/ui/UIListView.cpp +++ b/cocos/ui/UIListView.cpp @@ -24,7 +24,6 @@ THE SOFTWARE. #include "ui/UIListView.h" #include "ui/UIHelper.h" -#include "extensions/GUI/CCControlExtension/CCScale9Sprite.h" NS_CC_BEGIN diff --git a/cocos/ui/UIListView.h b/cocos/ui/UIListView.h index 53737812a6..65856ff1f7 100644 --- a/cocos/ui/UIListView.h +++ b/cocos/ui/UIListView.h @@ -27,6 +27,7 @@ THE SOFTWARE. #define __UILISTVIEW_H__ #include "ui/UIScrollView.h" +#include "ui/GUIExport.h" NS_CC_BEGIN @@ -41,7 +42,7 @@ typedef enum typedef void (Ref::*SEL_ListViewEvent)(Ref*,ListViewEventType); #define listvieweventselector(_SELECTOR) (SEL_ListViewEvent)(&_SELECTOR) -class ListView : public ScrollView +class CC_GUI_DLL ListView : public ScrollView { DECLARE_CLASS_GUI_INFO diff --git a/cocos/ui/UILoadingBar.cpp b/cocos/ui/UILoadingBar.cpp index 6e7e34415d..a1197e30ee 100644 --- a/cocos/ui/UILoadingBar.cpp +++ b/cocos/ui/UILoadingBar.cpp @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ #include "ui/UILoadingBar.h" -#include "extensions/GUI/CCControlExtension/CCScale9Sprite.h" +#include "ui/UIScale9Sprite.h" #include "2d/CCSprite.h" NS_CC_BEGIN @@ -81,7 +81,8 @@ LoadingBar* LoadingBar::create(const std::string &textureName, float percentage) void LoadingBar::initRenderer() { - _barRenderer = Sprite::create(); + _barRenderer = Scale9Sprite::create(); + _barRenderer->setScale9Enabled(false); addProtectedChild(_barRenderer, BAR_RENDERER_Z, -1); _barRenderer->setAnchorPoint(Vec2(0.0,0.5)); } @@ -100,17 +101,15 @@ void LoadingBar::setDirection(cocos2d::ui::LoadingBar::Direction direction) case Direction::LEFT: _barRenderer->setAnchorPoint(Vec2(0.0f,0.5f)); _barRenderer->setPosition(Vec2(-_totalLength*0.5f,0.0f)); - if (!_scale9Enabled) - { - static_cast(_barRenderer)->setFlippedX(false); + if (!_scale9Enabled) { + _barRenderer->setFlippedX(false); } break; case Direction::RIGHT: _barRenderer->setAnchorPoint(Vec2(1.0f,0.5f)); _barRenderer->setPosition(Vec2(_totalLength*0.5f,0.0f)); - if (!_scale9Enabled) - { - static_cast(_barRenderer)->setFlippedX(true); + if (!_scale9Enabled) { + _barRenderer->setFlippedX(true); } break; } @@ -134,28 +133,10 @@ void LoadingBar::loadTexture(const std::string& texture,TextureResType texType) switch (_renderBarTexType) { case TextureResType::LOCAL: - if (_scale9Enabled) - { - extension::Scale9Sprite* barRendererScale9 = static_cast(_barRenderer); - barRendererScale9->initWithFile(texture); - barRendererScale9->setCapInsets(_capInsets); - } - else - { - static_cast(_barRenderer)->setTexture(texture); - } + _barRenderer->initWithFile(texture); break; case TextureResType::PLIST: - if (_scale9Enabled) - { - extension::Scale9Sprite* barRendererScale9 = static_cast(_barRenderer); - barRendererScale9->initWithSpriteFrameName(texture); - barRendererScale9->setCapInsets(_capInsets); - } - else - { - static_cast(_barRenderer)->setSpriteFrame(texture); - } + _barRenderer->initWithSpriteFrameName(texture); break; default: break; @@ -167,19 +148,19 @@ void LoadingBar::loadTexture(const std::string& texture,TextureResType texType) { case Direction::LEFT: _barRenderer->setAnchorPoint(Vec2(0.0f,0.5f)); - if (!_scale9Enabled) - { - static_cast(_barRenderer)->setFlippedX(false); + if (!_scale9Enabled) { + _barRenderer->setFlippedX(false); } break; case Direction::RIGHT: _barRenderer->setAnchorPoint(Vec2(1.0f,0.5f)); - if (!_scale9Enabled) - { - static_cast(_barRenderer)->setFlippedX(true); + if (!_scale9Enabled) { + _barRenderer->setFlippedX(true); } break; } + _barRenderer->setCapInsets(_capInsets); + barRendererScaleChangedWithSize(); updateContentSizeWithTextureSize(_barRendererTextureSize); _barRendererAdaptDirty = true; @@ -192,18 +173,8 @@ void LoadingBar::setScale9Enabled(bool enabled) return; } _scale9Enabled = enabled; - removeProtectedChild(_barRenderer); - _barRenderer = nullptr; - if (_scale9Enabled) - { - _barRenderer = extension::Scale9Sprite::create(); - } - else - { - _barRenderer = Sprite::create(); - } - loadTexture(_textureFile,_renderBarTexType); - addProtectedChild(_barRenderer, BAR_RENDERER_Z, -1); + _barRenderer->setScale9Enabled(_scale9Enabled); + if (_scale9Enabled) { bool ignoreBefore = _ignoreSize; @@ -230,7 +201,7 @@ void LoadingBar::setCapInsets(const Rect &capInsets) { return; } - static_cast(_barRenderer)->setCapInsets(capInsets); + _barRenderer->setCapInsets(capInsets); } const Rect& LoadingBar::getCapInsets()const @@ -257,7 +228,7 @@ void LoadingBar::setPercent(float percent) } else { - Sprite* spriteRenderer = static_cast(_barRenderer); + Sprite* spriteRenderer = _barRenderer->getSprite(); Rect rect = spriteRenderer->getTextureRect(); rect.size.width = _barRendererTextureSize.width * res; spriteRenderer->setTextureRect(rect, spriteRenderer->isTextureRectRotated(), rect.size); @@ -351,7 +322,7 @@ void LoadingBar::barRendererScaleChangedWithSize() void LoadingBar::setScale9Scale() { float width = (float)(_percent) / 100.0f * _totalLength; - static_cast(_barRenderer)->setPreferredSize(Size(width, _contentSize.height)); + _barRenderer->setPreferredSize(Size(width, _contentSize.height)); } std::string LoadingBar::getDescription() const diff --git a/cocos/ui/UILoadingBar.h b/cocos/ui/UILoadingBar.h index 6fe4910130..be68f76306 100644 --- a/cocos/ui/UILoadingBar.h +++ b/cocos/ui/UILoadingBar.h @@ -26,16 +26,17 @@ THE SOFTWARE. #define __UILOADINGBAR_H__ #include "ui/UIWidget.h" +#include "ui/GUIExport.h" NS_CC_BEGIN namespace ui { - + class Scale9Sprite; /** * @js NA * @lua NA */ -class LoadingBar : public Widget +class CC_GUI_DLL LoadingBar : public Widget { DECLARE_CLASS_GUI_INFO @@ -153,7 +154,7 @@ protected: Direction _direction; float _percent; float _totalLength; - Node* _barRenderer; + Scale9Sprite* _barRenderer; TextureResType _renderBarTexType; Size _barRendererTextureSize; bool _scale9Enabled; diff --git a/cocos/ui/UIPageView.h b/cocos/ui/UIPageView.h index 52df2509ef..96d01c98df 100644 --- a/cocos/ui/UIPageView.h +++ b/cocos/ui/UIPageView.h @@ -26,6 +26,7 @@ THE SOFTWARE. #define __UIPAGEVIEW_H__ #include "ui/UILayout.h" +#include "ui/GUIExport.h" NS_CC_BEGIN @@ -39,7 +40,7 @@ typedef enum typedef void (Ref::*SEL_PageViewEvent)(Ref*, PageViewEventType); #define pagevieweventselector(_SELECTOR)(SEL_PageViewEvent)(&_SELECTOR) -class PageView : public Layout +class CC_GUI_DLL PageView : public Layout { DECLARE_CLASS_GUI_INFO diff --git a/cocos/ui/UIRelativeBox.h b/cocos/ui/UIRelativeBox.h index b4e7082b6d..ffef51b215 100644 --- a/cocos/ui/UIRelativeBox.h +++ b/cocos/ui/UIRelativeBox.h @@ -26,12 +26,13 @@ #define __UIRelativeBox_H__ #include "ui/UILayout.h" +#include "ui/GUIExport.h" NS_CC_BEGIN namespace ui { -class RelativeBox : public Layout{ +class CC_GUI_DLL RelativeBox : public Layout{ public: diff --git a/cocos/ui/UIRichText.cpp b/cocos/ui/UIRichText.cpp index 6bff82c007..e6d53993d2 100644 --- a/cocos/ui/UIRichText.cpp +++ b/cocos/ui/UIRichText.cpp @@ -26,27 +26,13 @@ #include "platform/CCFileUtils.h" #include "2d/CCLabel.h" #include "2d/CCSprite.h" +#include "base/ccUTF8.h" +#include "ui/UIHelper.h" NS_CC_BEGIN namespace ui { - -static int _calcCharCount(const char * pszText) -{ - int n = 0; - char ch = 0; - while ((ch = *pszText)) - { - CC_BREAK_IF(! ch); - - if (0x80 != (0xC0 & ch)) - { - ++n; - } - ++pszText; - } - return n; -} + bool RichElement::init(int tag, const Color3B &color, GLubyte opacity) { @@ -295,20 +281,20 @@ void RichText::handleTextRenderer(const std::string& text, const std::string& fo { float overstepPercent = (-_leftSpaceWidth) / textRendererWidth; std::string curText = text; - size_t stringLength = _calcCharCount(text.c_str()); + size_t stringLength = StringUtils::getCharacterCountInUTF8String(text); int leftLength = stringLength * (1.0f - overstepPercent); - std::string leftWords = curText.substr(0, leftLength); - std::string cutWords = curText.substr(leftLength, curText.length()-1); + std::string leftWords = Helper::getSubStringOfUTF8String(curText,0,leftLength); + std::string cutWords = Helper::getSubStringOfUTF8String(curText, leftLength, stringLength - leftLength); if (leftLength > 0) { Label* leftRenderer = nullptr; if (fileExist) { - leftRenderer = Label::createWithTTF(leftWords.substr(0, leftLength).c_str(), fontName, fontSize); - } + leftRenderer = Label::createWithTTF(Helper::getSubStringOfUTF8String(leftWords, 0, leftLength), fontName, fontSize); + } else { - leftRenderer = Label::createWithSystemFont(leftWords.substr(0, leftLength).c_str(), fontName, fontSize); + leftRenderer = Label::createWithSystemFont(Helper::getSubStringOfUTF8String(leftWords, 0, leftLength), fontName, fontSize); } if (leftRenderer) { @@ -440,6 +426,11 @@ void RichText::formarRenderers() _elementRenderersContainer->setPosition(_contentSize.width / 2.0f, _contentSize.height / 2.0f); } +void RichText::adaptRenderers() +{ + this->formatText(); +} + void RichText::pushToContainer(cocos2d::Node *renderer) { if (_elementRenders.size() <= 0) @@ -448,15 +439,6 @@ void RichText::pushToContainer(cocos2d::Node *renderer) } _elementRenders[_elementRenders.size()-1]->pushBack(renderer); } - -void RichText::visit(cocos2d::Renderer *renderer, const Mat4 &parentTransform, uint32_t parentFlags) -{ - if (_enabled) - { - formatText(); - Widget::visit(renderer, parentTransform, parentFlags); - } -} void RichText::setVerticalSpace(float space) { diff --git a/cocos/ui/UIRichText.h b/cocos/ui/UIRichText.h index cab8927b5c..62aca834a0 100644 --- a/cocos/ui/UIRichText.h +++ b/cocos/ui/UIRichText.h @@ -26,12 +26,13 @@ #define __UIRICHTEXT_H__ #include "ui/UIWidget.h" +#include "ui/GUIExport.h" NS_CC_BEGIN namespace ui { -class RichElement : public Ref +class CC_GUI_DLL RichElement : public Ref { public: enum class Type @@ -51,7 +52,7 @@ protected: friend class RichText; }; -class RichElementText : public RichElement +class CC_GUI_DLL RichElementText : public RichElement { public: RichElementText(){_type = Type::TEXT;}; @@ -66,7 +67,7 @@ protected: }; -class RichElementImage : public RichElement +class CC_GUI_DLL RichElementImage : public RichElement { public: RichElementImage(){_type = Type::IMAGE;}; @@ -80,7 +81,7 @@ protected: friend class RichText; }; -class RichElementCustomNode : public RichElement +class CC_GUI_DLL RichElementCustomNode : public RichElement { public: RichElementCustomNode(){_type = Type::CUSTOM;}; @@ -92,7 +93,7 @@ protected: friend class RichText; }; -class RichText : public Widget +class CC_GUI_DLL RichText : public Widget { public: RichText(); @@ -102,7 +103,7 @@ public: void pushBackElement(RichElement* element); void removeElement(int index); void removeElement(RichElement* element); - virtual void visit(cocos2d::Renderer *renderer, const Mat4 &parentTransform, uint32_t parentFlags) override; + void setVerticalSpace(float space); virtual void setAnchorPoint(const Vec2 &pt); virtual const Size& getVirtualRendererSize() const override; @@ -114,6 +115,8 @@ CC_CONSTRUCTOR_ACCESS: virtual bool init() override; protected: + virtual void adaptRenderers(); + virtual void initRenderer(); void pushToContainer(Node* renderer); void handleTextRenderer(const std::string& text, const std::string& fontName, float fontSize, const Color3B& color, GLubyte opacity); diff --git a/cocos/ui/UIScale9Sprite.cpp b/cocos/ui/UIScale9Sprite.cpp new file mode 100644 index 0000000000..13bb0eef4f --- /dev/null +++ b/cocos/ui/UIScale9Sprite.cpp @@ -0,0 +1,1052 @@ +/**************************************************************************** + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +#include "UIScale9Sprite.h" +#include "2d/CCSprite.h" +#include "2d/CCSpriteFrameCache.h" +#include "base/CCVector.h" +#include "base/CCDirector.h" + +NS_CC_BEGIN +namespace ui { + + Scale9Sprite::Scale9Sprite() + : _spritesGenerated(false) + , _spriteFrameRotated(false) + , _positionsAreDirty(false) + , _scale9Image(nullptr) + , _topLeft(nullptr) + , _top(nullptr) + , _topRight(nullptr) + , _left(nullptr) + , _centre(nullptr) + , _right(nullptr) + , _bottomLeft(nullptr) + , _bottom(nullptr) + , _bottomRight(nullptr) + , _insetLeft(0) + , _insetTop(0) + , _insetRight(0) + , _insetBottom(0), + _scale9Enabled(true) + { + this->setAnchorPoint(Vec2(0.5,0.5)); + } + + Scale9Sprite::~Scale9Sprite() + { + this->cleanupSlicedSprites(); + CC_SAFE_RELEASE(_scale9Image); + } + + void Scale9Sprite::cleanupSlicedSprites() + { + if (_topLeft && _top->isRunning()) + { + _topLeft->onExit(); + } + if (_top && _top->isRunning()) + { + _top->onExit(); + } + if (_topRight && _top->isRunning()) + { + _topRight->onExit(); + } + + if (_left && _top->isRunning()) + { + _left->onExit(); + } + + if (_centre && _top->isRunning()) + { + _centre->onExit(); + } + + if (_right && _top->isRunning()) + { + _right->onExit(); + } + + if (_bottomLeft && _top->isRunning()) + { + _bottomLeft->onExit(); + } + + if (_bottomRight && _top->isRunning()) + { + _bottomRight->onExit(); + } + + if (_bottom && _top->isRunning()) + { + _bottom->onExit(); + } + + CC_SAFE_RELEASE_NULL(_topLeft); + CC_SAFE_RELEASE_NULL(_top); + CC_SAFE_RELEASE_NULL(_topRight); + CC_SAFE_RELEASE_NULL(_left); + CC_SAFE_RELEASE_NULL(_centre); + CC_SAFE_RELEASE_NULL(_right); + CC_SAFE_RELEASE_NULL(_bottomLeft); + CC_SAFE_RELEASE_NULL(_bottom); + CC_SAFE_RELEASE_NULL(_bottomRight); + } + + bool Scale9Sprite::init() + { + return this->init(NULL, Rect::ZERO, Rect::ZERO); + } + + bool Scale9Sprite::init(Sprite* sprite, const Rect& rect, const Rect& capInsets) + { + return this->init(sprite, rect, false, capInsets); + } + + bool Scale9Sprite::init(Sprite* sprite, const Rect& rect, bool rotated, const Rect& capInsets) + { + if(sprite) + { + this->updateWithSprite(sprite, rect, rotated, capInsets); + } + this->setCascadeColorEnabled(true); + this->setCascadeOpacityEnabled(true); + this->setAnchorPoint(Vec2(0.5f, 0.5f)); + this->_positionsAreDirty = true; + + return true; + } + +#define TRANSLATE_X(x, y, xtranslate) \ +x+=xtranslate; \ + +#define TRANSLATE_Y(x, y, ytranslate) \ +y+=ytranslate; \ + + bool Scale9Sprite::updateWithSprite(Sprite* sprite, const Rect& originalRect, bool rotated, const Rect& capInsets) + { + GLubyte opacity = getOpacity(); + Color3B color = getColor(); + Rect rect(originalRect); + + // Release old sprites + _protectedChildren.clear(); + + this->cleanupSlicedSprites(); + + + if(this->_scale9Image != sprite) + { + CC_SAFE_RELEASE(this->_scale9Image); + _scale9Image = sprite; + CC_SAFE_RETAIN(_scale9Image); + } + + if (!_scale9Image) + { + return false; + } + + _capInsets = capInsets; + _spriteFrameRotated = rotated; + + // If there is no given rect + if ( rect.equals(Rect::ZERO) ) + { + // Get the texture size as original + Size textureSize = _scale9Image->getTexture()->getContentSize(); + + rect = Rect(0, 0, textureSize.width, textureSize.height); + } + + // Set the given rect's size as original size + _spriteRect = rect; + _originalSize = rect.size; + _preferredSize = _originalSize; + _capInsetsInternal = capInsets; + + if (_scale9Enabled) { + this->createSlicedSprites(rect, rotated); + } + + this->setContentSize(rect.size); + + if (_spritesGenerated) + { + // Restore color and opacity + this->setOpacity(opacity); + this->setColor(color); + } + _spritesGenerated = true; + + return true; + } + + void Scale9Sprite::createSlicedSprites(const Rect& rect, bool rotated) + { + float w = rect.size.width; + float h = rect.size.height; + + // If there is no specified center region + if ( _capInsetsInternal.equals(Rect::ZERO) ) + { + // log("... cap insets not specified : using default cap insets ..."); + _capInsetsInternal = Rect(w/3, h/3, w/3, h/3); + } + + float left_w = _capInsetsInternal.origin.x; + float center_w = _capInsetsInternal.size.width; + float right_w = rect.size.width - (left_w + center_w); + + float top_h = _capInsetsInternal.origin.y; + float center_h = _capInsetsInternal.size.height; + float bottom_h = rect.size.height - (top_h + center_h); + + // calculate rects + + // ... top row + float x = 0.0; + float y = 0.0; + + // top left + Rect lefttopbounds = Rect(x, y, left_w, top_h); + + // top center + TRANSLATE_X(x, y, left_w); + Rect centertopbounds = Rect(x, y, center_w, top_h); + + // top right + TRANSLATE_X(x, y, center_w); + Rect righttopbounds = Rect(x, y, right_w, top_h); + + // ... center row + x = 0.0; + y = 0.0; + TRANSLATE_Y(x, y, top_h); + + // center left + Rect leftcenterbounds = Rect(x, y, left_w, center_h); + + // center center + TRANSLATE_X(x, y, left_w); + Rect centerbounds = Rect(x, y, center_w, center_h); + + // center right + TRANSLATE_X(x, y, center_w); + Rect rightcenterbounds = Rect(x, y, right_w, center_h); + + // ... bottom row + x = 0.0; + y = 0.0; + TRANSLATE_Y(x, y, top_h); + TRANSLATE_Y(x, y, center_h); + + // bottom left + Rect leftbottombounds = Rect(x, y, left_w, bottom_h); + + // bottom center + TRANSLATE_X(x, y, left_w); + Rect centerbottombounds = Rect(x, y, center_w, bottom_h); + + // bottom right + TRANSLATE_X(x, y, center_w); + Rect rightbottombounds = Rect(x, y, right_w, bottom_h); + + + Rect rotatedcenterbounds = centerbounds; + Rect rotatedrightbottombounds = rightbottombounds; + Rect rotatedleftbottombounds = leftbottombounds; + Rect rotatedrighttopbounds = righttopbounds; + Rect rotatedlefttopbounds = lefttopbounds; + Rect rotatedrightcenterbounds = rightcenterbounds; + Rect rotatedleftcenterbounds = leftcenterbounds; + Rect rotatedcenterbottombounds = centerbottombounds; + Rect rotatedcentertopbounds = centertopbounds; + + if (!rotated) { + // log("!rotated"); + + AffineTransform t = AffineTransform::IDENTITY; + t = AffineTransformTranslate(t, rect.origin.x, rect.origin.y); + + rotatedcenterbounds = RectApplyAffineTransform(rotatedcenterbounds, t); + rotatedrightbottombounds = RectApplyAffineTransform(rotatedrightbottombounds, t); + rotatedleftbottombounds = RectApplyAffineTransform(rotatedleftbottombounds, t); + rotatedrighttopbounds = RectApplyAffineTransform(rotatedrighttopbounds, t); + rotatedlefttopbounds = RectApplyAffineTransform(rotatedlefttopbounds, t); + rotatedrightcenterbounds = RectApplyAffineTransform(rotatedrightcenterbounds, t); + rotatedleftcenterbounds = RectApplyAffineTransform(rotatedleftcenterbounds, t); + rotatedcenterbottombounds = RectApplyAffineTransform(rotatedcenterbottombounds, t); + rotatedcentertopbounds = RectApplyAffineTransform(rotatedcentertopbounds, t); + + + } else { + // set up transformation of coordinates + // to handle the case where the sprite is stored rotated + // in the spritesheet + // log("rotated"); + + AffineTransform t = AffineTransform::IDENTITY; + + t = AffineTransformTranslate(t, rect.size.height+rect.origin.x, rect.origin.y); + t = AffineTransformRotate(t, 1.57079633f); + + centerbounds = RectApplyAffineTransform(centerbounds, t); + rightbottombounds = RectApplyAffineTransform(rightbottombounds, t); + leftbottombounds = RectApplyAffineTransform(leftbottombounds, t); + righttopbounds = RectApplyAffineTransform(righttopbounds, t); + lefttopbounds = RectApplyAffineTransform(lefttopbounds, t); + rightcenterbounds = RectApplyAffineTransform(rightcenterbounds, t); + leftcenterbounds = RectApplyAffineTransform(leftcenterbounds, t); + centerbottombounds = RectApplyAffineTransform(centerbottombounds, t); + centertopbounds = RectApplyAffineTransform(centertopbounds, t); + + rotatedcenterbounds.origin = centerbounds.origin; + rotatedrightbottombounds.origin = rightbottombounds.origin; + rotatedleftbottombounds.origin = leftbottombounds.origin; + rotatedrighttopbounds.origin = righttopbounds.origin; + rotatedlefttopbounds.origin = lefttopbounds.origin; + rotatedrightcenterbounds.origin = rightcenterbounds.origin; + rotatedleftcenterbounds.origin = leftcenterbounds.origin; + rotatedcenterbottombounds.origin = centerbottombounds.origin; + rotatedcentertopbounds.origin = centertopbounds.origin; + + + } + + + // Centre + _centre = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedcenterbounds, rotated); + _centre->retain(); + this->addProtectedChild(_centre); + + + // Top + _top = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedcentertopbounds, rotated); + _top->retain(); + this->addProtectedChild(_top); + + // Bottom + _bottom = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedcenterbottombounds, rotated); + _bottom->retain(); + this->addProtectedChild(_bottom); + + // Left + _left = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedleftcenterbounds, rotated); + _left->retain(); + this->addProtectedChild(_left); + + // Right + _right = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedrightcenterbounds, rotated); + _right->retain(); + this->addProtectedChild(_right); + + // Top left + _topLeft = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedlefttopbounds, rotated); + _topLeft->retain(); + this->addProtectedChild(_topLeft); + + // Top right + _topRight = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedrighttopbounds, rotated); + _topRight->retain(); + this->addProtectedChild(_topRight); + + // Bottom left + _bottomLeft = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedleftbottombounds, rotated); + _bottomLeft->retain(); + this->addProtectedChild(_bottomLeft); + + // Bottom right + _bottomRight = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedrightbottombounds, rotated); + _bottomRight->retain(); + this->addProtectedChild(_bottomRight); + } + + void Scale9Sprite::setContentSize(const Size &size) + { + Node::setContentSize(size); + this->_positionsAreDirty = true; + } + + void Scale9Sprite::setAnchorPoint(const cocos2d::Vec2 &anchorPoint) + { + Node::setAnchorPoint(anchorPoint); + + if (_scale9Enabled) { + for(const auto& node : _protectedChildren) + { + node->setAnchorPoint(anchorPoint); + } + } + else + { + if (_scale9Image) { + _scale9Image->setAnchorPoint(anchorPoint); + } + + } + } + + void Scale9Sprite::updatePositions() + { + // Check that instances are non-NULL + if(!((_topLeft) && + (_topRight) && + (_bottomRight) && + (_bottomLeft) && + (_centre))) { + // if any of the above sprites are NULL, return + return; + } + + Size size = this->_contentSize; + + float sizableWidth = size.width - _topLeft->getContentSize().width - _topRight->getContentSize().width; + float sizableHeight = size.height - _topLeft->getContentSize().height - _bottomRight->getContentSize().height; + + float horizontalScale = sizableWidth/_centre->getContentSize().width; + float verticalScale = sizableHeight/_centre->getContentSize().height; + + _centre->setScaleX(horizontalScale); + _centre->setScaleY(verticalScale); + + float rescaledWidth = _centre->getContentSize().width * horizontalScale; + float rescaledHeight = _centre->getContentSize().height * verticalScale; + + float leftWidth = _bottomLeft->getContentSize().width; + float bottomHeight = _bottomLeft->getContentSize().height; + + _bottomLeft->setAnchorPoint(Vec2(0,0)); + _bottomRight->setAnchorPoint(Vec2(0,0)); + _topLeft->setAnchorPoint(Vec2(0,0)); + _topRight->setAnchorPoint(Vec2(0,0)); + _left->setAnchorPoint(Vec2(0,0)); + _right->setAnchorPoint(Vec2(0,0)); + _top->setAnchorPoint(Vec2(0,0)); + _bottom->setAnchorPoint(Vec2(0,0)); + _centre->setAnchorPoint(Vec2(0,0)); + + // Position corners + _bottomLeft->setPosition(Vec2(0,0)); + _bottomRight->setPosition(Vec2(leftWidth+rescaledWidth,0)); + _topLeft->setPosition(Vec2(0, bottomHeight+rescaledHeight)); + _topRight->setPosition(Vec2(leftWidth+rescaledWidth, bottomHeight+rescaledHeight)); + + // Scale and position borders + _left->setPosition(Vec2(0, bottomHeight)); + _left->setScaleY(verticalScale); + _right->setPosition(Vec2(leftWidth+rescaledWidth,bottomHeight)); + _right->setScaleY(verticalScale); + _bottom->setPosition(Vec2(leftWidth,0)); + _bottom->setScaleX(horizontalScale); + _top->setPosition(Vec2(leftWidth,bottomHeight+rescaledHeight)); + _top->setScaleX(horizontalScale); + + // Position centre + _centre->setPosition(Vec2(leftWidth, bottomHeight)); + } + + bool Scale9Sprite::initWithFile(const std::string& file, const Rect& rect, const Rect& capInsets) + { + Sprite *sprite = Sprite::create(file); + bool pReturn = this->init(sprite, rect, capInsets); + return pReturn; + } + + Scale9Sprite* Scale9Sprite::create(const std::string& file, const Rect& rect, const Rect& capInsets) + { + Scale9Sprite* pReturn = new Scale9Sprite(); + if ( pReturn && pReturn->initWithFile(file, rect, capInsets) ) + { + pReturn->autorelease(); + return pReturn; + } + CC_SAFE_DELETE(pReturn); + return NULL; + } + + bool Scale9Sprite::initWithFile(const std::string& file, const Rect& rect) + { + bool pReturn = this->initWithFile(file, rect, Rect::ZERO); + return pReturn; + } + + Scale9Sprite* Scale9Sprite::create(const std::string& file, const Rect& rect) + { + Scale9Sprite* pReturn = new Scale9Sprite(); + if ( pReturn && pReturn->initWithFile(file, rect) ) + { + pReturn->autorelease(); + return pReturn; + } + CC_SAFE_DELETE(pReturn); + return NULL; + } + + + bool Scale9Sprite::initWithFile(const Rect& capInsets, const std::string& file) + { + bool pReturn = this->initWithFile(file, Rect::ZERO, capInsets); + return pReturn; + } + + Scale9Sprite* Scale9Sprite::create(const Rect& capInsets, const std::string& file) + { + Scale9Sprite* pReturn = new Scale9Sprite(); + if ( pReturn && pReturn->initWithFile(capInsets, file) ) + { + pReturn->autorelease(); + return pReturn; + } + CC_SAFE_DELETE(pReturn); + return NULL; + } + + bool Scale9Sprite::initWithFile(const std::string& file) + { + bool pReturn = this->initWithFile(file, Rect::ZERO); + return pReturn; + + } + + Scale9Sprite* Scale9Sprite::create(const std::string& file) + { + Scale9Sprite* pReturn = new Scale9Sprite(); + if ( pReturn && pReturn->initWithFile(file) ) + { + pReturn->autorelease(); + return pReturn; + } + CC_SAFE_DELETE(pReturn); + return NULL; + } + + bool Scale9Sprite::initWithSpriteFrame(SpriteFrame* spriteFrame, const Rect& capInsets) + { + Texture2D* texture = spriteFrame->getTexture(); + CCASSERT(texture != NULL, "CCTexture must be not nil"); + + Sprite *sprite = Sprite::createWithSpriteFrame(spriteFrame); + CCASSERT(sprite != NULL, "sprite must be not nil"); + + bool pReturn = this->init(sprite, spriteFrame->getRect(), spriteFrame->isRotated(), capInsets); + return pReturn; + } + + Scale9Sprite* Scale9Sprite::createWithSpriteFrame(SpriteFrame* spriteFrame, const Rect& capInsets) + { + Scale9Sprite* pReturn = new Scale9Sprite(); + if ( pReturn && pReturn->initWithSpriteFrame(spriteFrame, capInsets) ) + { + pReturn->autorelease(); + return pReturn; + } + CC_SAFE_DELETE(pReturn); + return NULL; + } + bool Scale9Sprite::initWithSpriteFrame(SpriteFrame* spriteFrame) + { + CCASSERT(spriteFrame != NULL, "Invalid spriteFrame for sprite"); + bool pReturn = this->initWithSpriteFrame(spriteFrame, Rect::ZERO); + return pReturn; + } + + Scale9Sprite* Scale9Sprite::createWithSpriteFrame(SpriteFrame* spriteFrame) + { + Scale9Sprite* pReturn = new Scale9Sprite(); + if ( pReturn && pReturn->initWithSpriteFrame(spriteFrame) ) + { + pReturn->autorelease(); + return pReturn; + } + CC_SAFE_DELETE(pReturn); + return NULL; + } + + bool Scale9Sprite::initWithSpriteFrameName(const std::string& spriteFrameName, const Rect& capInsets) + { + CCASSERT((SpriteFrameCache::getInstance()) != NULL, "SpriteFrameCache::getInstance() must be non-NULL"); + + SpriteFrame *frame = SpriteFrameCache::getInstance()->getSpriteFrameByName(spriteFrameName); + CCASSERT(frame != NULL, "CCSpriteFrame must be non-NULL"); + + if (NULL == frame) return false; + + bool pReturn = this->initWithSpriteFrame(frame, capInsets); + return pReturn; + } + + Scale9Sprite* Scale9Sprite::createWithSpriteFrameName(const std::string& spriteFrameName, const Rect& capInsets) + { + Scale9Sprite* pReturn = new Scale9Sprite(); + if ( pReturn && pReturn->initWithSpriteFrameName(spriteFrameName, capInsets) ) + { + pReturn->autorelease(); + return pReturn; + } + CC_SAFE_DELETE(pReturn); + return NULL; + } + + bool Scale9Sprite::initWithSpriteFrameName(const std::string& spriteFrameName) + { + bool pReturn = this->initWithSpriteFrameName(spriteFrameName, Rect::ZERO); + return pReturn; + } + + Scale9Sprite* Scale9Sprite::createWithSpriteFrameName(const std::string& spriteFrameName) + { + Scale9Sprite* pReturn = new Scale9Sprite(); + if ( pReturn && pReturn->initWithSpriteFrameName(spriteFrameName) ) + { + pReturn->autorelease(); + return pReturn; + } + CC_SAFE_DELETE(pReturn); + + log("Could not allocate Scale9Sprite()"); + return NULL; + + } + + Scale9Sprite* Scale9Sprite::resizableSpriteWithCapInsets(const Rect& capInsets) + { + Scale9Sprite* pReturn = new Scale9Sprite(); + if ( pReturn && pReturn->init(_scale9Image, _spriteRect, capInsets) ) + { + pReturn->autorelease(); + return pReturn; + } + CC_SAFE_DELETE(pReturn); + return NULL; + } + + Scale9Sprite* Scale9Sprite::create() + { + Scale9Sprite *pReturn = new Scale9Sprite(); + if (pReturn && pReturn->init()) + { + pReturn->autorelease(); + return pReturn; + } + CC_SAFE_DELETE(pReturn); + return NULL; + } + + /** sets the opacity. + @warning If the the texture has premultiplied alpha then, the R, G and B channels will be modifed. + Values goes from 0 to 255, where 255 means fully opaque. + */ + + + + void Scale9Sprite::updateCapInset() + { + Rect insets; + if (this->_insetLeft == 0 && this->_insetTop == 0 && this->_insetRight == 0 && this->_insetBottom == 0) + { + insets = Rect::ZERO; + } + else + { + insets = Rect(_insetLeft, + _insetTop, + _spriteRect.size.width-_insetLeft-_insetRight, + _spriteRect.size.height-_insetTop-_insetBottom); + } + this->setCapInsets(insets); + } + + + void Scale9Sprite::setSpriteFrame(SpriteFrame * spriteFrame) + { + Sprite * sprite = Sprite::createWithTexture(spriteFrame->getTexture()); + this->updateWithSprite(sprite, spriteFrame->getRect(), spriteFrame->isRotated(), Rect::ZERO); + + // Reset insets + this->_insetLeft = 0; + this->_insetTop = 0; + this->_insetRight = 0; + this->_insetBottom = 0; + } + + void Scale9Sprite::setPreferredSize(const Size& preferedSize) + { + this->setContentSize(preferedSize); + this->_preferredSize = preferedSize; + } + + + void Scale9Sprite::setCapInsets(const Rect& capInsets) + { + Size contentSize = this->_contentSize; + this->updateWithSprite(this->_scale9Image, this->_spriteRect, _spriteFrameRotated, capInsets); + this->setContentSize(contentSize); + } + + + void Scale9Sprite::setInsetLeft(float insetLeft) + { + this->_insetLeft = insetLeft; + this->updateCapInset(); + } + + void Scale9Sprite::setInsetTop(float insetTop) + { + this->_insetTop = insetTop; + this->updateCapInset(); + } + + void Scale9Sprite::setInsetRight(float insetRight) + { + this->_insetRight = insetRight; + this->updateCapInset(); + } + + void Scale9Sprite::setInsetBottom(float insetBottom) + { + this->_insetBottom = insetBottom; + this->updateCapInset(); + } + + void Scale9Sprite::visit(Renderer *renderer, const Mat4 &parentTransform, uint32_t parentFlags) + { + + // quick return if not visible. children won't be drawn. + if (!_visible) + { + return; + } + + uint32_t flags = processParentFlags(parentTransform, parentFlags); + + // IMPORTANT: + // To ease the migration to v3.0, we still support the Mat4 stack, + // but it is deprecated and your code should not rely on it + Director* director = Director::getInstance(); + CCASSERT(nullptr != director, "Director is null when seting matrix stack"); + director->pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW); + director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW, _modelViewTransform); + + int i = 0; // used by _children + int j = 0; // used by _protectedChildren + + sortAllChildren(); + sortAllProtectedChildren(); + + // + // draw children and protectedChildren zOrder < 0 + // + for( ; i < _children.size(); i++ ) + { + auto node = _children.at(i); + + if ( node && node->getLocalZOrder() < 0 ) + node->visit(renderer, _modelViewTransform, flags); + else + break; + } + if (_scale9Enabled) { + for( ; j < _protectedChildren.size(); j++ ) + { + auto node = _protectedChildren.at(j); + + if ( node && node->getLocalZOrder() < 0 ) + node->visit(renderer, _modelViewTransform, flags); + else + break; + } + }else{ + if (_scale9Image) { + _scale9Image->visit(renderer, _modelViewTransform, flags); + } + } + + // + // draw self + // + this->draw(renderer, _modelViewTransform, flags); + + // + // draw children and protectedChildren zOrder >= 0 + // + if (_scale9Enabled) { + for(auto it=_protectedChildren.cbegin()+j; it != _protectedChildren.cend(); ++it) + (*it)->visit(renderer, _modelViewTransform, flags); + }else{ + if (_scale9Image) { + _scale9Image->visit(renderer, _modelViewTransform, flags); + } + } + + + for(auto it=_children.cbegin()+i; it != _children.cend(); ++it) + (*it)->visit(renderer, _modelViewTransform, flags); + + // reset for next frame + _orderOfArrival = 0; + + director->popMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW); + + } + + Size Scale9Sprite::getOriginalSize()const + { + return _originalSize; + } + + + Size Scale9Sprite::getPreferredSize() const + { + return _preferredSize; + } + + Rect Scale9Sprite::getCapInsets()const + { + return _capInsets; + } + + + float Scale9Sprite::getInsetLeft()const + { + return this->_insetLeft; + } + + float Scale9Sprite::getInsetTop()const + { + return this->_insetTop; + } + + float Scale9Sprite::getInsetRight()const + { + return this->_insetRight; + } + + float Scale9Sprite::getInsetBottom()const + { + return this->_insetBottom; + } + + void Scale9Sprite::setScale9Enabled(bool enabled) + { + _scale9Enabled = enabled; + if (!_scale9Enabled) { + this->cleanupSlicedSprites(); + } + _reorderProtectedChildDirty = true; + } + + bool Scale9Sprite::isScale9Enabled() const + { + return _scale9Enabled; + } + + void Scale9Sprite::addProtectedChild(cocos2d::Node *child) + { + _reorderProtectedChildDirty = true; + _protectedChildren.pushBack(child); + } + + void Scale9Sprite::sortAllProtectedChildren() + { + if(this->_positionsAreDirty) + { + this->updatePositions(); + this->_positionsAreDirty = false; + } + if( _reorderProtectedChildDirty ) { + if (!_scale9Enabled) { + this->adjustScale9ImagePosition(); + } + std::sort( std::begin(_protectedChildren), std::end(_protectedChildren), nodeComparisonLess ); + _reorderProtectedChildDirty = false; + } + } + + void Scale9Sprite::adjustScale9ImagePosition() + { + if (_scale9Image) { + _scale9Image->setPosition(Vec2(_contentSize.width * _anchorPoint.x, + _contentSize.height * _anchorPoint.y)); + } + } + + void Scale9Sprite::cleanup() + { + Node::cleanup(); + // timers + for( const auto &child: _protectedChildren) + child->cleanup(); + } + + void Scale9Sprite::onEnter() + { +#if CC_ENABLE_SCRIPT_BINDING + if (_scriptType == kScriptTypeJavascript) + { + if (ScriptEngineManager::sendNodeEventToJSExtended(this, kNodeOnEnter)) + return; + } +#endif + Node::onEnter(); + for( const auto &child: _protectedChildren) + child->onEnter(); + } + + void Scale9Sprite::onExit() + { + Node::onExit(); + for( const auto &child: _protectedChildren) + child->onExit(); + } + + void Scale9Sprite::onEnterTransitionDidFinish() + { + Node::onEnterTransitionDidFinish(); + for( const auto &child: _protectedChildren) + child->onEnterTransitionDidFinish(); + } + + void Scale9Sprite::onExitTransitionDidStart() + { + Node::onExitTransitionDidStart(); + for( const auto &child: _protectedChildren) + child->onExitTransitionDidStart(); + } + + void Scale9Sprite::updateDisplayedColor(const cocos2d::Color3B &parentColor) + { + _displayedColor.r = _realColor.r * parentColor.r/255.0; + _displayedColor.g = _realColor.g * parentColor.g/255.0; + _displayedColor.b = _realColor.b * parentColor.b/255.0; + updateColor(); + + if (_scale9Image) + { + _scale9Image->updateDisplayedColor(_displayedColor); + } + + for(const auto &child : _protectedChildren) + { + child->updateDisplayedColor(_displayedColor); + } + + if (_cascadeColorEnabled) + { + for(const auto &child : _children) + { + child->updateDisplayedColor(_displayedColor); + } + } + } + + void Scale9Sprite::updateDisplayedOpacity(GLubyte parentOpacity) + { + _displayedOpacity = _realOpacity * parentOpacity/255.0; + updateColor(); + + if (_scale9Image) + { + _scale9Image->updateDisplayedOpacity(_displayedOpacity); + } + + for(auto child : _protectedChildren) + { + child->updateDisplayedOpacity(_displayedOpacity); + } + + if (_cascadeOpacityEnabled) + { + for(auto child : _children) + { + child->updateDisplayedOpacity(_displayedOpacity); + } + } + } + + void Scale9Sprite::disableCascadeColor() + { + for(auto child : _children) + { + child->updateDisplayedColor(Color3B::WHITE); + } + for(auto child : _protectedChildren) + { + child->updateDisplayedColor(Color3B::WHITE); + } + if (_scale9Image) + { + _scale9Image->updateDisplayedColor(Color3B::WHITE); + } + } + + Sprite* Scale9Sprite::getSprite()const + { + return _scale9Image; + } + + void Scale9Sprite::setFlippedX(bool flippedX) + { + _flippedX = flippedX; + if (_scale9Enabled) + { + this->setScaleX(-1); + } + else + { + if (_scale9Image) + { + _scale9Image->setFlippedX(flippedX); + } + } + } + + void Scale9Sprite::setFlippedY(bool flippedY) + { + _flippedY = flippedY; + if (_scale9Enabled) + { + this->setScaleY(-1); + } + else + { + if (_scale9Image) + { + _scale9Image->setFlippedY(flippedY); + } + } + } + + bool Scale9Sprite::isFlippedX()const + { + return _flippedX; + } + + bool Scale9Sprite::isFlippedY()const + { + return _flippedY; + } +}} diff --git a/cocos/ui/UIScale9Sprite.h b/cocos/ui/UIScale9Sprite.h new file mode 100644 index 0000000000..1db19b9e1d --- /dev/null +++ b/cocos/ui/UIScale9Sprite.h @@ -0,0 +1,414 @@ +/**************************************************************************** + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +#ifndef __cocos2d_libs__UIScale9Sprite__ +#define __cocos2d_libs__UIScale9Sprite__ + +#include "2d/CCNode.h" +#include "2d/CCSpriteFrame.h" +#include "2d/CCSpriteBatchNode.h" +#include "base/CCPlatformMacros.h" +#include "ui/GUIExport.h" + +NS_CC_BEGIN +namespace ui { + + /** + * A 9-slice sprite for cocos2d. + * + * 9-slice scaling allows you to specify how scaling is applied + * to specific areas of a sprite. With 9-slice scaling (3x3 grid), + * you can ensure that the sprite does not become distorted when + * scaled. + * Note: When you set _scale9Enabled to false, then you could call scale9Sprite->getSprite() to return a new Sprite pointer. + * Then you could call any methods of Sprite class with the return pointers. + * + */ + class CC_GUI_DLL Scale9Sprite : public Node + { + public: + /** + * @js ctor + */ + Scale9Sprite(); + /** + * @js NA + * @lua NA + */ + virtual ~Scale9Sprite(); + + public: + static Scale9Sprite* create(); + + /** + * Creates a 9-slice sprite with a texture file, a delimitation zone and + * with the specified cap insets. + * + * @see initWithFile(const char *file, const Rect& rect, const Rect& capInsets) + */ + static Scale9Sprite* create(const std::string& file, const Rect& rect, const Rect& capInsets); + + /** + * Creates a 9-slice sprite with a texture file. The whole texture will be + * broken down into a 3×3 grid of equal blocks. + * + * @see initWithFile(const Rect& capInsets, const char *file) + */ + static Scale9Sprite* create(const Rect& capInsets, const std::string& file); + + /** + * Creates a 9-slice sprite with a texture file and a delimitation zone. The + * texture will be broken down into a 3×3 grid of equal blocks. + * + * @see initWithFile(const char *file, const Rect& rect) + */ + static Scale9Sprite* create(const std::string& file, const Rect& rect); + + /** + * Creates a 9-slice sprite with a texture file. The whole texture will be + * broken down into a 3×3 grid of equal blocks. + * + * @see initWithFile(const char *file) + */ + static Scale9Sprite* create(const std::string& file); + + /** + * Creates a 9-slice sprite with an sprite frame. + * Once the sprite is created, you can then call its "setContentSize:" method + * to resize the sprite will all it's 9-slice goodness intract. + * It respects the anchorPoint too. + * + * @see initWithSpriteFrame(SpriteFrame *spriteFrame) + */ + static Scale9Sprite* createWithSpriteFrame(SpriteFrame* spriteFrame); + + /** + * Creates a 9-slice sprite with an sprite frame and the centre of its zone. + * Once the sprite is created, you can then call its "setContentSize:" method + * to resize the sprite will all it's 9-slice goodness intract. + * It respects the anchorPoint too. + * + * @see initWithSpriteFrame(SpriteFrame *spriteFrame, const Rect& capInsets) + */ + static Scale9Sprite* createWithSpriteFrame(SpriteFrame* spriteFrame, const Rect& capInsets); + + /** + * Creates a 9-slice sprite with an sprite frame name. + * Once the sprite is created, you can then call its "setContentSize:" method + * to resize the sprite will all it's 9-slice goodness intract. + * It respects the anchorPoint too. + * + * @see initWithSpriteFrameName(const char *spriteFrameName) + */ + static Scale9Sprite* createWithSpriteFrameName(const std::string& spriteFrameName); + + /** + * Creates a 9-slice sprite with an sprite frame name and the centre of its + * zone. + * Once the sprite is created, you can then call its "setContentSize:" method + * to resize the sprite will all it's 9-slice goodness intract. + * It respects the anchorPoint too. + * + * @see initWithSpriteFrameName(const char *spriteFrameName, const Rect& capInsets) + */ + static Scale9Sprite* createWithSpriteFrameName(const std::string& spriteFrameName, const Rect& capInsets); + + /** + * Initializes a 9-slice sprite with a texture file, a delimitation zone and + * with the specified cap insets. + * Once the sprite is created, you can then call its "setContentSize:" method + * to resize the sprite will all it's 9-slice goodness intract. + * It respects the anchorPoint too. + * + * @param file The name of the texture file. + * @param rect The rectangle that describes the sub-part of the texture that + * is the whole image. If the shape is the whole texture, set this to the + * texture's full rect. + * @param capInsets The values to use for the cap insets. + */ + virtual bool initWithFile(const std::string& file, const Rect& rect, const Rect& capInsets); + + /** + * Initializes a 9-slice sprite with a texture file and a delimitation zone. The + * texture will be broken down into a 3×3 grid of equal blocks. + * Once the sprite is created, you can then call its "setContentSize:" method + * to resize the sprite will all it's 9-slice goodness intract. + * It respects the anchorPoint too. + * + * @param file The name of the texture file. + * @param rect The rectangle that describes the sub-part of the texture that + * is the whole image. If the shape is the whole texture, set this to the + * texture's full rect. + */ + virtual bool initWithFile(const std::string& file, const Rect& rect); + + /** + * Initializes a 9-slice sprite with a texture file and with the specified cap + * insets. + * Once the sprite is created, you can then call its "setContentSize:" method + * to resize the sprite will all it's 9-slice goodness intract. + * It respects the anchorPoint too. + * + * @param file The name of the texture file. + * @param capInsets The values to use for the cap insets. + */ + virtual bool initWithFile(const Rect& capInsets, const std::string& file); + + /** + * Initializes a 9-slice sprite with a texture file. The whole texture will be + * broken down into a 3×3 grid of equal blocks. + * Once the sprite is created, you can then call its "setContentSize:" method + * to resize the sprite will all it's 9-slice goodness intract. + * It respects the anchorPoint too. + * + * @param file The name of the texture file. + */ + virtual bool initWithFile(const std::string& file); + + /** + * Initializes a 9-slice sprite with an sprite frame and with the specified + * cap insets. + * Once the sprite is created, you can then call its "setContentSize:" method + * to resize the sprite will all it's 9-slice goodness intract. + * It respects the anchorPoint too. + * + * @param spriteFrame The sprite frame object. + * @param capInsets The values to use for the cap insets. + */ + virtual bool initWithSpriteFrame(SpriteFrame* spriteFrame, const Rect& capInsets); + + /** + * Initializes a 9-slice sprite with an sprite frame. + * Once the sprite is created, you can then call its "setContentSize:" method + * to resize the sprite will all it's 9-slice goodness intract. + * It respects the anchorPoint too. + * + * @param spriteFrame The sprite frame object. + */ + virtual bool initWithSpriteFrame(SpriteFrame* spriteFrame); + + /** + * Initializes a 9-slice sprite with an sprite frame name and with the specified + * cap insets. + * Once the sprite is created, you can then call its "setContentSize:" method + * to resize the sprite will all it's 9-slice goodness intract. + * It respects the anchorPoint too. + * + * @param spriteFrameName The sprite frame name. + * @param capInsets The values to use for the cap insets. + */ + virtual bool initWithSpriteFrameName(const std::string& spriteFrameName, const Rect& capInsets); + + /** + * Initializes a 9-slice sprite with an sprite frame name. + * Once the sprite is created, you can then call its "setContentSize:" method + * to resize the sprite will all it's 9-slice goodness intract. + * It respects the anchorPoint too. + * + * @param spriteFrameName The sprite frame name. + */ + virtual bool initWithSpriteFrameName(const std::string& spriteFrameName); + + virtual bool init(); + virtual bool init(Sprite* sprite, const Rect& rect, bool rotated, const Rect& capInsets); + virtual bool init(Sprite* sprite, const Rect& rect, const Rect& capInsets); + /** + * Creates and returns a new sprite object with the specified cap insets. + * You use this method to add cap insets to a sprite or to change the existing + * cap insets of a sprite. In both cases, you get back a new image and the + * original sprite remains untouched. + * + * @param capInsets The values to use for the cap insets. + */ + Scale9Sprite* resizableSpriteWithCapInsets(const Rect& capInsets); + + virtual bool updateWithSprite(Sprite* sprite, const Rect& rect, bool rotated, const Rect& capInsets); + virtual void setSpriteFrame(SpriteFrame * spriteFrame); + + // overrides + virtual void setContentSize(const Size & size) override; + virtual void setAnchorPoint(const Vec2& anchorPoint) override; + + Size getOriginalSize() const; + void setPreferredSize(const Size& size); + Size getPreferredSize() const; + void setCapInsets(const Rect& rect); + Rect getCapInsets()const; + void setInsetLeft(float leftInset); + float getInsetLeft()const; + void setInsetTop(float topInset); + float getInsetTop()const; + void setInsetRight(float rightInset); + float getInsetRight()const; + void setInsetBottom(float bottomInset); + float getInsetBottom()const; + void setScale9Enabled(bool enabled); + bool isScale9Enabled()const; + + + + /// @} end of Children and Parent + + virtual void visit(Renderer *renderer, const Mat4 &parentTransform, uint32_t parentFlags) override; + + virtual void cleanup() override; + + virtual void onEnter() override; + + /** Event callback that is invoked when the Node enters in the 'stage'. + * If the Node enters the 'stage' with a transition, this event is called when the transition finishes. + * If you override onEnterTransitionDidFinish, you shall call its parent's one, e.g. Node::onEnterTransitionDidFinish() + * @js NA + * @lua NA + */ + virtual void onEnterTransitionDidFinish() override; + + /** + * Event callback that is invoked every time the Node leaves the 'stage'. + * If the Node leaves the 'stage' with a transition, this event is called when the transition finishes. + * During onExit you can't access a sibling node. + * If you override onExit, you shall call its parent's one, e.g., Node::onExit(). + * @js NA + * @lua NA + */ + virtual void onExit() override; + + /** + * Event callback that is called every time the Node leaves the 'stage'. + * If the Node leaves the 'stage' with a transition, this callback is called when the transition starts. + * @js NA + * @lua NA + */ + virtual void onExitTransitionDidStart() override; + + virtual void updateDisplayedOpacity(GLubyte parentOpacity) override; + virtual void updateDisplayedColor(const Color3B& parentColor) override; + virtual void disableCascadeColor() override; + + Sprite* getSprite()const; + + /** + * Sets whether the widget should be flipped horizontally or not. + * + * @param bFlippedX true if the widget should be flipped horizaontally, false otherwise. + */ + virtual void setFlippedX(bool flippedX); + + /** + * Returns the flag which indicates whether the widget is flipped horizontally or not. + * + * It only flips the texture of the widget, and not the texture of the widget's children. + * Also, flipping the texture doesn't alter the anchorPoint. + * If you want to flip the anchorPoint too, and/or to flip the children too use: + * widget->setScaleX(sprite->getScaleX() * -1); + * + * @return true if the widget is flipped horizaontally, false otherwise. + */ + virtual bool isFlippedX()const; + + /** + * Sets whether the widget should be flipped vertically or not. + * + * @param bFlippedY true if the widget should be flipped vertically, flase otherwise. + */ + virtual void setFlippedY(bool flippedY); + + /** + * Return the flag which indicates whether the widget is flipped vertically or not. + * + * It only flips the texture of the widget, and not the texture of the widget's children. + * Also, flipping the texture doesn't alter the anchorPoint. + * If you want to flip the anchorPoint too, and/or to flip the children too use: + * widget->setScaleY(widget->getScaleY() * -1); + * + * @return true if the widget is flipped vertically, flase otherwise. + */ + virtual bool isFlippedY()const; + + protected: + void updateCapInset(); + void updatePositions(); + void createSlicedSprites(const Rect& rect, bool rotated); + void cleanupSlicedSprites(); + void adjustScale9ImagePosition(); + /** + * Sorts the children array once before drawing, instead of every time when a child is added or reordered. + * This appraoch can improves the performance massively. + * @note Don't call this manually unless a child added needs to be removed in the same frame + */ + virtual void sortAllProtectedChildren(); + + bool _spritesGenerated; + Rect _spriteRect; + bool _spriteFrameRotated; + Rect _capInsetsInternal; + bool _positionsAreDirty; + + Sprite* _scale9Image; //the original sprite + Sprite* _topLeft; + Sprite* _top; + Sprite* _topRight; + Sprite* _left; + Sprite* _centre; + Sprite* _right; + Sprite* _bottomLeft; + Sprite* _bottom; + Sprite* _bottomRight; + + bool _scale9Enabled; + + /** Original sprite's size. */ + Size _originalSize; + /** Prefered sprite's size. By default the prefered size is the original size. */ + + //if the preferredSize component is given as -1, it is ignored + Size _preferredSize; + /** + * The end-cap insets. + * On a non-resizeable sprite, this property is set to CGRect::ZERO; the sprite + * does not use end caps and the entire sprite is subject to stretching. + */ + Rect _capInsets; + /** Sets the left side inset */ + float _insetLeft; + /** Sets the top side inset */ + float _insetTop; + /** Sets the right side inset */ + float _insetRight; + /** Sets the bottom side inset */ + float _insetBottom; + + /// helper that reorder a child + void addProtectedChild(Node* child); + + Vector _protectedChildren; ///holds the 9 sprites + bool _reorderProtectedChildDirty; + + bool _flippedX; + bool _flippedY; + }; + +}} //end of namespace + +#endif /* defined(__cocos2d_libs__UIScale9Sprite__) */ diff --git a/cocos/ui/UIScrollView.h b/cocos/ui/UIScrollView.h index ae2bd6ab43..cc0dd25d45 100644 --- a/cocos/ui/UIScrollView.h +++ b/cocos/ui/UIScrollView.h @@ -26,6 +26,7 @@ THE SOFTWARE. #define __UISCROLLVIEW_H__ #include "ui/UILayout.h" +#include "ui/GUIExport.h" NS_CC_BEGIN @@ -50,7 +51,7 @@ typedef void (Ref::*SEL_ScrollViewEvent)(Ref*, ScrollviewEventType); #define scrollvieweventselector(_SELECTOR) (SEL_ScrollViewEvent)(&_SELECTOR) -class ScrollView : public Layout +class CC_GUI_DLL ScrollView : public Layout { DECLARE_CLASS_GUI_INFO diff --git a/cocos/ui/UISlider.cpp b/cocos/ui/UISlider.cpp index 642749d540..a2909b8d9d 100644 --- a/cocos/ui/UISlider.cpp +++ b/cocos/ui/UISlider.cpp @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ #include "ui/UISlider.h" -#include "extensions/GUI/CCControlExtension/CCScale9Sprite.h" +#include "ui/UIScale9Sprite.h" #include "2d/CCSprite.h" NS_CC_BEGIN @@ -98,20 +98,28 @@ bool Slider::init() void Slider::initRenderer() { - _barRenderer = Sprite::create(); - _progressBarRenderer = Sprite::create(); + _barRenderer = Scale9Sprite::create(); + _progressBarRenderer = Scale9Sprite::create(); + _barRenderer->setScale9Enabled(false); + _progressBarRenderer->setScale9Enabled(false); + _progressBarRenderer->setAnchorPoint(Vec2(0.0f, 0.5f)); + addProtectedChild(_barRenderer, BASEBAR_RENDERER_Z, -1); addProtectedChild(_progressBarRenderer, PROGRESSBAR_RENDERER_Z, -1); + _slidBallNormalRenderer = Sprite::create(); _slidBallPressedRenderer = Sprite::create(); _slidBallPressedRenderer->setVisible(false); _slidBallDisabledRenderer = Sprite::create(); _slidBallDisabledRenderer->setVisible(false); + _slidBallRenderer = Node::create(); + _slidBallRenderer->addChild(_slidBallNormalRenderer); _slidBallRenderer->addChild(_slidBallPressedRenderer); _slidBallRenderer->addChild(_slidBallDisabledRenderer); + addProtectedChild(_slidBallRenderer, SLIDBALL_RENDERER_Z, -1); } @@ -126,24 +134,10 @@ void Slider::loadBarTexture(const std::string& fileName, TextureResType texType) switch (_barTexType) { case TextureResType::LOCAL: - if (_scale9Enabled) - { - static_cast(_barRenderer)->initWithFile(fileName); - } - else - { - static_cast(_barRenderer)->setTexture(fileName); - } + _barRenderer->initWithFile(fileName); break; case TextureResType::PLIST: - if (_scale9Enabled) - { - static_cast(_barRenderer)->initWithSpriteFrameName(fileName); - } - else - { - static_cast(_barRenderer)->setSpriteFrame(fileName); - } + _barRenderer->initWithSpriteFrameName(fileName); break; default: break; @@ -165,24 +159,10 @@ void Slider::loadProgressBarTexture(const std::string& fileName, TextureResType switch (_progressBarTexType) { case TextureResType::LOCAL: - if (_scale9Enabled) - { - static_cast(_progressBarRenderer)->initWithFile(fileName); - } - else - { - static_cast(_progressBarRenderer)->setTexture(fileName); - } + _progressBarRenderer->initWithFile(fileName); break; case TextureResType::PLIST: - if (_scale9Enabled) - { - static_cast(_progressBarRenderer)->initWithSpriteFrameName(fileName); - } - else - { - static_cast(_progressBarRenderer)->setSpriteFrame(fileName); - } + _progressBarRenderer->initWithSpriteFrameName(fileName); break; default: break; @@ -201,24 +181,9 @@ void Slider::setScale9Enabled(bool able) } _scale9Enabled = able; - removeProtectedChild(_barRenderer); - removeProtectedChild(_progressBarRenderer); - _barRenderer = nullptr; - _progressBarRenderer = nullptr; - if (_scale9Enabled) - { - _barRenderer = extension::Scale9Sprite::create(); - _progressBarRenderer = extension::Scale9Sprite::create(); - } - else - { - _barRenderer = Sprite::create(); - _progressBarRenderer = Sprite::create(); - } - loadBarTexture(_textureFile, _barTexType); - loadProgressBarTexture(_progressBarTextureFile, _progressBarTexType); - addProtectedChild(_barRenderer, BASEBAR_RENDERER_Z, -1); - addProtectedChild(_progressBarRenderer, PROGRESSBAR_RENDERER_Z, -1); + _barRenderer->setScale9Enabled(_scale9Enabled); + _progressBarRenderer->setScale9Enabled(_scale9Enabled); + if (_scale9Enabled) { bool ignoreBefore = _ignoreSize; @@ -260,7 +225,7 @@ void Slider::setCapInsetsBarRenderer(const Rect &capInsets) { return; } - static_cast(_barRenderer)->setCapInsets(capInsets); + _barRenderer->setCapInsets(capInsets); } const Rect& Slider::getCapInsetsBarRenderer()const @@ -275,7 +240,7 @@ void Slider::setCapInsetProgressBarRebderer(const Rect &capInsets) { return; } - static_cast(_progressBarRenderer)->setCapInsets(capInsets); + _progressBarRenderer->setCapInsets(capInsets); } const Rect& Slider::getCapInsetsProgressBarRebderer()const @@ -369,14 +334,17 @@ void Slider::setPercent(int percent) _slidBallRenderer->setPosition(Vec2(dis, _contentSize.height / 2.0f)); if (_scale9Enabled) { - static_cast(_progressBarRenderer)->setPreferredSize(Size(dis,_progressBarTextureSize.height)); + _progressBarRenderer->setPreferredSize(Size(dis,_progressBarTextureSize.height)); } else { - Sprite* spriteRenderer = static_cast(_progressBarRenderer); - Rect rect = spriteRenderer->getTextureRect(); - rect.size.width = _progressBarTextureSize.width * res; - spriteRenderer->setTextureRect(rect, spriteRenderer->isTextureRectRotated(), rect.size); + Sprite* spriteRenderer = _progressBarRenderer->getSprite(); + + if (nullptr != spriteRenderer) { + Rect rect = spriteRenderer->getTextureRect(); + rect.size.width = _progressBarTextureSize.width * res; + spriteRenderer->setTextureRect(rect, spriteRenderer->isTextureRectRotated(), rect.size); + } } } @@ -497,7 +465,7 @@ void Slider::barRendererScaleChangedWithSize() _barLength = _contentSize.width; if (_scale9Enabled) { - static_cast(_barRenderer)->setPreferredSize(_contentSize); + _barRenderer->setPreferredSize(_contentSize); } else { @@ -534,7 +502,7 @@ void Slider::progressBarRendererScaleChangedWithSize() { if (_scale9Enabled) { - static_cast(_progressBarRenderer)->setPreferredSize(_contentSize); + _progressBarRenderer->setPreferredSize(_contentSize); _progressBarTextureSize = _progressBarRenderer->getContentSize(); } else diff --git a/cocos/ui/UISlider.h b/cocos/ui/UISlider.h index de8ed765b2..5c64aa32b9 100644 --- a/cocos/ui/UISlider.h +++ b/cocos/ui/UISlider.h @@ -26,13 +26,15 @@ THE SOFTWARE. #define __UISLIDER_H__ #include "ui/UIWidget.h" +#include "ui/GUIExport.h" NS_CC_BEGIN class Sprite; namespace ui { - + class Scale9Sprite; + typedef enum { SLIDER_PERCENTCHANGED @@ -45,7 +47,7 @@ typedef void (Ref::*SEL_SlidPercentChangedEvent)(Ref*,SliderEventType); * @js NA * @lua NA */ -class Slider : public Widget +class CC_GUI_DLL Slider : public Widget { DECLARE_CLASS_GUI_INFO @@ -225,8 +227,8 @@ protected: virtual void copySpecialProperties(Widget* model) override; virtual void adaptRenderers() override; protected: - Node* _barRenderer; - Node* _progressBarRenderer; + Scale9Sprite* _barRenderer; + Scale9Sprite* _progressBarRenderer; Size _progressBarTextureSize; Sprite* _slidBallNormalRenderer; diff --git a/cocos/ui/UIText.cpp b/cocos/ui/UIText.cpp index 2a0cd717b8..894db64db4 100644 --- a/cocos/ui/UIText.cpp +++ b/cocos/ui/UIText.cpp @@ -207,6 +207,16 @@ TextVAlignment Text::getTextVerticalAlignment()const { return _labelRenderer->getVerticalAlignment(); } + +void Text::setTextColor(const Color4B color) +{ + _labelRenderer->setTextColor(color); +} + +const Color4B& Text::getTextColor() const +{ + return _labelRenderer->getTextColor(); +} void Text::setTouchScaleChangeEnabled(bool enable) { diff --git a/cocos/ui/UIText.h b/cocos/ui/UIText.h index 3c38101abd..d08901b658 100644 --- a/cocos/ui/UIText.h +++ b/cocos/ui/UIText.h @@ -26,6 +26,7 @@ THE SOFTWARE. #define __UILABEL_H__ #include "ui/UIWidget.h" +#include "ui/GUIExport.h" NS_CC_BEGIN @@ -38,7 +39,7 @@ namespace ui { *@js *@lua NA */ -class Text : public Widget +class CC_GUI_DLL Text : public Widget { DECLARE_CLASS_GUI_INFO @@ -160,6 +161,10 @@ public: TextVAlignment getTextVerticalAlignment()const; + void setTextColor(const Color4B color); + + const Color4B& getTextColor() const; + /** * Enable shadow for the label * diff --git a/cocos/ui/UITextAtlas.h b/cocos/ui/UITextAtlas.h index 8058aa4d7d..cf00db4cfe 100644 --- a/cocos/ui/UITextAtlas.h +++ b/cocos/ui/UITextAtlas.h @@ -26,6 +26,7 @@ THE SOFTWARE. #define __UILABELATLAS_H__ #include "ui/UIWidget.h" +#include "ui/GUIExport.h" NS_CC_BEGIN @@ -37,7 +38,7 @@ namespace ui { * @js NA * @lua NA */ -class TextAtlas : public Widget +class CC_GUI_DLL TextAtlas : public Widget { DECLARE_CLASS_GUI_INFO diff --git a/cocos/ui/UITextBMFont.h b/cocos/ui/UITextBMFont.h index 707f42382c..5d3c7955fb 100644 --- a/cocos/ui/UITextBMFont.h +++ b/cocos/ui/UITextBMFont.h @@ -26,6 +26,7 @@ THE SOFTWARE. #define __UILABELBMFONT_H__ #include "ui/UIWidget.h" +#include "ui/GUIExport.h" NS_CC_BEGIN @@ -37,7 +38,7 @@ namespace ui { * @js NA * @lua NA */ -class TextBMFont : public Widget +class CC_GUI_DLL TextBMFont : public Widget { DECLARE_CLASS_GUI_INFO diff --git a/cocos/ui/UITextField.cpp b/cocos/ui/UITextField.cpp index 90fb9bc472..eda603d421 100644 --- a/cocos/ui/UITextField.cpp +++ b/cocos/ui/UITextField.cpp @@ -24,27 +24,12 @@ THE SOFTWARE. #include "ui/UITextField.h" #include "platform/CCFileUtils.h" +#include "ui/UIHelper.h" +#include "base/ccUTF8.h" NS_CC_BEGIN namespace ui { - -static int _calcCharCount(const char * pszText) -{ - int n = 0; - char ch = 0; - while ((ch = *pszText)) - { - CC_BREAK_IF(! ch); - - if (0x80 != (0xC0 & ch)) - { - ++n; - } - ++pszText; - } - return n; -} UICCTextField::UICCTextField() : _maxLengthEnabled(false) @@ -130,7 +115,7 @@ void UICCTextField::insertText(const char* text, size_t len) { if (_maxLengthEnabled) { - int text_count = _calcCharCount(getString().c_str()); + long text_count = StringUtils::getCharacterCountInUTF8String(getString()); if (text_count >= _maxLength) { // password @@ -141,69 +126,16 @@ void UICCTextField::insertText(const char* text, size_t len) return; } -#if ((CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) || (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)) - int input_count = _calcCharCount(text); - int total = total = text_count + input_count; + long input_count = StringUtils::getCharacterCountInUTF8String(text); + long total = text_count + input_count; if (total > _maxLength) { - int end = 0; - int length = _maxLength - text_count; + long length = _maxLength - text_count; - for (int i = 0; i < length; ++i) - { - char value = text[i]; - - if (value >= 0 && value <= 127) // ascii - { - end++; - } - else - { - end += 3; - } - } - input_text = input_text.substr(0, end); - len = end; + input_text = Helper::getSubStringOfUTF8String(input_text, 0, length); + len = input_text.length(); } -#elif (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) - int input_count = _calcCharCount(text); - int total = text_count + input_count; - if (total > _maxLength) - { - int ascii = 0; - int unicode = 0; - int end = 0; - int count = 0; - - for (int i = 0; i < total * 3; ++i) - { - char value = text[i]; - - if (value >= 0 && value <= 127) // ascii - { - ascii++; - count++; - } - else - { - unicode++; - if (unicode % 3 == 0) - { - count++; - } - } - - if (count == _maxLength) - { - break; - } - } - end = ascii + unicode; - input_text = input_text.substr(0, end); - len = end; - } -#endif } } TextFieldTTF::insertText(input_text.c_str(), len); @@ -294,8 +226,8 @@ void UICCTextField::setPasswordStyleText(const std::string& styleText) void UICCTextField::setPasswordText(const std::string& text) { std::string tempStr = ""; - int text_count = _calcCharCount(text.c_str()); - int max = text_count; + long text_count = StringUtils::getCharacterCountInUTF8String(text); + long max = text_count; if (_maxLengthEnabled) { @@ -479,40 +411,11 @@ void TextField::setText(const std::string& text) if (isMaxLengthEnabled()) { int max = _textFieldRenderer->getMaxLength(); - int text_count = _calcCharCount(text.c_str()); - int total = text_count + _calcCharCount(getStringValue().c_str()); + long text_count = StringUtils::getCharacterCountInUTF8String(text); + long total = text_count + StringUtils::getCharacterCountInUTF8String(getStringValue()); if (total > max) { - int ascii = 0; - int unicode = 0; - int end = 0; - int count = 0; - - for (int i = 0; i < total * 3; ++i) - { - char value = text[i]; - - if (value >= 0 && value <= 127) // ascii - { - ascii++; - count++; - } - else - { - unicode++; - if (unicode % 3 == 0) - { - count++; - } - } - - if (count == max) - { - break; - } - } - end = ascii + unicode; - strText = strText.substr(0, end); + strText = Helper::getSubStringOfUTF8String(strText, 0, max); } } @@ -799,24 +702,9 @@ void TextField::adaptRenderers() void TextField::textfieldRendererScaleChangedWithSize() { - if (_ignoreSize) - { - _textFieldRenderer->setDimensions(0,0); - _textFieldRenderer->setScale(1.0f); - } - else + if (!_ignoreSize) { _textFieldRenderer->setDimensions(_contentSize.width, _contentSize.height); - Size textureSize = getContentSize(); - if (textureSize.width <= 0.0f || textureSize.height <= 0.0f) - { - _textFieldRenderer->setScale(1.0f); - return; - } - float scaleX = _contentSize.width / textureSize.width; - float scaleY = _contentSize.height / textureSize.height; - _textFieldRenderer->setScaleX(scaleX); - _textFieldRenderer->setScaleY(scaleY); } _textFieldRenderer->setPosition(_contentSize.width / 2.0f, _contentSize.height / 2.0f); } @@ -871,7 +759,7 @@ void TextField::copySpecialProperties(Widget *widget) void TextField::setTextAreaSize(const Size &size) { - _textFieldRenderer->setDimensions(size.width,size.height); + this->setContentSize(size); } void TextField::setTextHorizontalAlignment(TextHAlignment alignment) diff --git a/cocos/ui/UITextField.h b/cocos/ui/UITextField.h index b26456fd33..eaea50d952 100644 --- a/cocos/ui/UITextField.h +++ b/cocos/ui/UITextField.h @@ -27,6 +27,7 @@ THE SOFTWARE. #include "ui/UIWidget.h" #include "2d/CCTextFieldTTF.h" +#include "ui/GUIExport.h" NS_CC_BEGIN @@ -36,7 +37,7 @@ namespace ui { * @js NA * @lua NA */ -class UICCTextField: public TextFieldTTF, public TextFieldDelegate +class CC_GUI_DLL UICCTextField: public TextFieldTTF, public TextFieldDelegate { public: UICCTextField(); @@ -106,7 +107,7 @@ typedef void (Ref::*SEL_TextFieldEvent)(Ref*, TextFiledEventType); * @js NA * @lua NA */ -class TextField : public Widget +class CC_GUI_DLL TextField : public Widget { DECLARE_CLASS_GUI_INFO diff --git a/cocos/ui/UIVBox.h b/cocos/ui/UIVBox.h index 216234f47f..dae3bf149b 100644 --- a/cocos/ui/UIVBox.h +++ b/cocos/ui/UIVBox.h @@ -26,12 +26,13 @@ #define __UIVBox_H__ #include "ui/UILayout.h" +#include "ui/GUIExport.h" NS_CC_BEGIN namespace ui { -class VBox : public Layout{ +class CC_GUI_DLL VBox : public Layout{ public: diff --git a/cocos/ui/UIVideoPlayer.h b/cocos/ui/UIVideoPlayer.h index 81d0787236..deb029aaee 100644 --- a/cocos/ui/UIVideoPlayer.h +++ b/cocos/ui/UIVideoPlayer.h @@ -73,7 +73,7 @@ namespace experimental{ virtual void addEventListener(const VideoPlayer::ccVideoPlayerCallback& callback); - virtual void onPlayEvent(VideoPlayer::EventType event); + virtual void onPlayEvent(int event); virtual void draw(Renderer *renderer, const Mat4& transform, uint32_t flags) override; protected: diff --git a/cocos/ui/UIVideoPlayerAndroid.cpp b/cocos/ui/UIVideoPlayerAndroid.cpp index a9deb991f3..ae61f94b14 100644 --- a/cocos/ui/UIVideoPlayerAndroid.cpp +++ b/cocos/ui/UIVideoPlayerAndroid.cpp @@ -31,16 +31,17 @@ #include #include "jni/JniHelper.h" #include "base/CCDirector.h" -#include "CCGLView.h" #include "base/CCEventListenerKeyboard.h" //----------------------------------------------------------------------------------------------------------- #define CLASS_NAME "org/cocos2dx/lib/Cocos2dxVideoHelper" -void executeVideoCallback(int index,int event); - USING_NS_CC; +static void executeVideoCallback(int index,int event); + +#define QUIT_FULLSCREEN 1000 + extern "C" { void Java_org_cocos2dx_lib_Cocos2dxVideoHelper_nativeExecuteVideoCallback(JNIEnv * env, jobject obj, jint index,jint event) { executeVideoCallback(index,event); @@ -87,6 +88,17 @@ void setVideoRectJNI(int index,int left,int top,int width,int height) } } +void setFullScreenEnabledJni(int index,bool enabled, int width, int height) +{ + JniMethodInfo t; + + if (JniHelper::getStaticMethodInfo(t, CLASS_NAME, "setFullScreenEnabled", "(IZII)V")) { + t.env->CallStaticVoidMethod(t.classID, t.methodID, index, enabled, width, height); + + t.env->DeleteLocalRef(t.classID); + } +} + void setVideoURLJNI(int index,int videoSource,const std::string& videoUrl) { JniMethodInfo t; @@ -166,16 +178,6 @@ VideoPlayer::VideoPlayer() { _videoPlayerIndex = createVideoWidgetJNI(); s_allVideoPlayers[_videoPlayerIndex] = this; - - auto listener = EventListenerKeyboard::create(); - listener->onKeyReleased = [&](EventKeyboard::KeyCode keycode, cocos2d::Event* event){ - if (keycode == EventKeyboard::KeyCode::KEY_BACKSPACE && _fullScreenEnabled) - { - this->setFullScreenEnabled(false); - } - }; - - _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this); } VideoPlayer::~VideoPlayer() @@ -202,31 +204,23 @@ void VideoPlayer::draw(Renderer* renderer, const Mat4 &transform, uint32_t flags { cocos2d::ui::Widget::draw(renderer,transform,flags); - if ((flags&FLAGS_TRANSFORM_DIRTY) || _fullScreenDirty) + if (flags & FLAGS_TRANSFORM_DIRTY) { - _fullScreenDirty = false; auto directorInstance = Director::getInstance(); auto glView = directorInstance->getOpenGLView(); auto frameSize = glView->getFrameSize(); - if (_fullScreenEnabled) - { - setVideoRectJNI(_videoPlayerIndex,0,0,frameSize.width,frameSize.height); - } - else - { - auto winSize = directorInstance->getWinSize(); + auto winSize = directorInstance->getWinSize(); - auto leftBottom = convertToWorldSpace(Point::ZERO); - auto rightTop = convertToWorldSpace(Point(_contentSize.width,_contentSize.height)); + auto leftBottom = convertToWorldSpace(Point::ZERO); + auto rightTop = convertToWorldSpace(Point(_contentSize.width,_contentSize.height)); - auto uiLeft = frameSize.width / 2 + (leftBottom.x - winSize.width / 2 ) * glView->getScaleX(); - auto uiTop = frameSize.height /2 - (rightTop.y - winSize.height / 2) * glView->getScaleY(); + auto uiLeft = frameSize.width / 2 + (leftBottom.x - winSize.width / 2 ) * glView->getScaleX(); + auto uiTop = frameSize.height /2 - (rightTop.y - winSize.height / 2) * glView->getScaleY(); - setVideoRectJNI(_videoPlayerIndex,uiLeft,uiTop, - (rightTop.x - leftBottom.x) * glView->getScaleX(), - (rightTop.y - leftBottom.y) * glView->getScaleY()); - } + setVideoRectJNI(_videoPlayerIndex,uiLeft,uiTop, + (rightTop.x - leftBottom.x) * glView->getScaleX(), + (rightTop.y - leftBottom.y) * glView->getScaleY()); } #if CC_VIDEOPLAYER_DEBUG_DRAW @@ -241,7 +235,9 @@ void VideoPlayer::setFullScreenEnabled(bool enabled) if (_fullScreenEnabled != enabled) { _fullScreenEnabled = enabled; - _fullScreenDirty = true; + + auto frameSize = Director::getInstance()->getOpenGLView()->getFrameSize(); + setFullScreenEnabledJni(_videoPlayerIndex, enabled, frameSize.width, frameSize.height); } } @@ -344,17 +340,25 @@ void VideoPlayer::addEventListener(const VideoPlayer::ccVideoPlayerCallback& cal _eventCallback = callback; } -void VideoPlayer::onPlayEvent(VideoPlayer::EventType event) +void VideoPlayer::onPlayEvent(int event) { - if (event == VideoPlayer::EventType::PLAYING) { - _isPlaying = true; - } else { - _isPlaying = false; - } - - if (_eventCallback) + if (event == QUIT_FULLSCREEN) { - _eventCallback(this,event); + _fullScreenEnabled = false; + } + else + { + VideoPlayer::EventType videoEvent = (VideoPlayer::EventType)event; + if (videoEvent == VideoPlayer::EventType::PLAYING) { + _isPlaying = true; + } else { + _isPlaying = false; + } + + if (_eventCallback) + { + _eventCallback(this,videoEvent); + } } } @@ -385,7 +389,7 @@ void executeVideoCallback(int index,int event) auto it = s_allVideoPlayers.find(index); if (it != s_allVideoPlayers.end()) { - s_allVideoPlayers[index]->onPlayEvent((VideoPlayer::EventType)event); + s_allVideoPlayers[index]->onPlayEvent(event); } } diff --git a/cocos/ui/UIVideoPlayerIOS.mm b/cocos/ui/UIVideoPlayerIOS.mm index 7bf359f822..d0a8dd819a 100644 --- a/cocos/ui/UIVideoPlayerIOS.mm +++ b/cocos/ui/UIVideoPlayerIOS.mm @@ -29,7 +29,6 @@ using namespace cocos2d::experimental::ui; //------------------------------------------------------------------------------------- #include "CCEAGLView.h" -#include "CCGLView.h" #import #include "base/CCDirector.h" @@ -171,7 +170,7 @@ using namespace cocos2d::experimental::ui; { if([self.moviePlayer playbackState] != MPMoviePlaybackStateStopped) { - _videoPlayer->onPlayEvent(VideoPlayer::EventType::COMPLETED); + _videoPlayer->onPlayEvent((int)VideoPlayer::EventType::COMPLETED); } } } @@ -181,13 +180,13 @@ using namespace cocos2d::experimental::ui; MPMoviePlaybackState state = [self.moviePlayer playbackState]; switch (state) { case MPMoviePlaybackStatePaused: - _videoPlayer->onPlayEvent(VideoPlayer::EventType::PAUSED); + _videoPlayer->onPlayEvent((int)VideoPlayer::EventType::PAUSED); break; case MPMoviePlaybackStateStopped: - _videoPlayer->onPlayEvent(VideoPlayer::EventType::STOPPED); + _videoPlayer->onPlayEvent((int)VideoPlayer::EventType::STOPPED); break; case MPMoviePlaybackStatePlaying: - _videoPlayer->onPlayEvent(VideoPlayer::EventType::PLAYING); + _videoPlayer->onPlayEvent((int)VideoPlayer::EventType::PLAYING); break; case MPMoviePlaybackStateInterrupted: break; @@ -323,7 +322,7 @@ void VideoPlayer::draw(Renderer* renderer, const Mat4 &transform, uint32_t flags auto directorInstance = Director::getInstance(); auto glView = directorInstance->getOpenGLView(); auto frameSize = glView->getFrameSize(); - auto scaleFactor = directorInstance->getContentScaleFactor(); + auto scaleFactor = [static_cast(glView->getEAGLView()) contentScaleFactor]; auto winSize = directorInstance->getWinSize(); @@ -449,9 +448,9 @@ void VideoPlayer::addEventListener(const VideoPlayer::ccVideoPlayerCallback& cal _eventCallback = callback; } -void VideoPlayer::onPlayEvent(VideoPlayer::EventType event) +void VideoPlayer::onPlayEvent(int event) { - if (event == VideoPlayer::EventType::PLAYING) { + if (event == (int)VideoPlayer::EventType::PLAYING) { _isPlaying = true; } else { _isPlaying = false; @@ -459,7 +458,7 @@ void VideoPlayer::onPlayEvent(VideoPlayer::EventType event) if (_eventCallback) { - _eventCallback(this,event); + _eventCallback(this, (VideoPlayer::EventType)event); } } diff --git a/cocos/ui/UIWidget.cpp b/cocos/ui/UIWidget.cpp index be7cd54206..6de3360581 100644 --- a/cocos/ui/UIWidget.cpp +++ b/cocos/ui/UIWidget.cpp @@ -261,10 +261,7 @@ void Widget::setContentSize(const cocos2d::Size &contentSize) { _contentSize = getVirtualRendererSize(); } - else - { - _contentSize = contentSize; - } + if (_running) { Widget* widgetParent = getWidgetParent(); @@ -322,7 +319,6 @@ void Widget::setSizePercent(const Vec2 &percent) this->setContentSize(cSize); } _customSize = cSize; - onSizeChanged(); } void Widget::updateSizeAndPosition() @@ -376,7 +372,8 @@ void Widget::updateSizeAndPosition(const cocos2d::Size &parentSize) default: break; } - onSizeChanged(); + + //update position & position percent Vec2 absPos = getPosition(); switch (_positionType) { @@ -429,7 +426,6 @@ void Widget::ignoreContentAdaptWithSize(bool ignore) { this->setContentSize(_customSize); } - onSizeChanged(); } bool Widget::isIgnoreContentAdaptWithSize() const @@ -489,7 +485,6 @@ void Widget::updateContentSizeWithTextureSize(const cocos2d::Size &size) { this->setContentSize(_customSize); } - onSizeChanged(); } void Widget::setTouchEnabled(bool enable) @@ -722,6 +717,7 @@ void Widget::onTouchCancelled(Touch *touch, Event *unusedEvent) void Widget::pushDownEvent() { + this->retain(); if (_touchEventCallback) { _touchEventCallback(this, TouchEventType::BEGAN); } @@ -730,10 +726,12 @@ void Widget::pushDownEvent() { (_touchEventListener->*_touchEventSelector)(this,TOUCH_EVENT_BEGAN); } + this->release(); } void Widget::moveEvent() { + this->retain(); if (_touchEventCallback) { _touchEventCallback(this, TouchEventType::MOVED); } @@ -742,11 +740,12 @@ void Widget::moveEvent() { (_touchEventListener->*_touchEventSelector)(this,TOUCH_EVENT_MOVED); } + this->release(); } void Widget::releaseUpEvent() { - + this->retain(); if (_touchEventCallback) { _touchEventCallback(this, TouchEventType::ENDED); } @@ -755,10 +754,12 @@ void Widget::releaseUpEvent() { (_touchEventListener->*_touchEventSelector)(this,TOUCH_EVENT_ENDED); } + this->release(); } void Widget::cancelUpEvent() { + this->retain(); if (_touchEventCallback) { _touchEventCallback(this, TouchEventType::CANCELED); @@ -768,7 +769,7 @@ void Widget::cancelUpEvent() { (_touchEventListener->*_touchEventSelector)(this,TOUCH_EVENT_CANCELED); } - + this->release(); } void Widget::addTouchEventListener(Ref *target, SEL_TouchEvent selector) @@ -1039,7 +1040,6 @@ void Widget::copyProperties(Widget *widget) { setLayoutParameter(iter->second->clone()); } - onSizeChanged(); } void Widget::setFlippedX(bool flippedX) diff --git a/cocos/ui/UIWidget.h b/cocos/ui/UIWidget.h index 8ea40cc9d5..f22b9718c1 100644 --- a/cocos/ui/UIWidget.h +++ b/cocos/ui/UIWidget.h @@ -25,9 +25,10 @@ THE SOFTWARE. #ifndef __UIWIDGET_H__ #define __UIWIDGET_H__ -#include "ui/CCProtectedNode.h" +#include "2d/CCProtectedNode.h" #include "ui/UILayoutParameter.h" #include "ui/GUIDefine.h" +#include "ui/GUIExport.h" #include "base/CCMap.h" NS_CC_BEGIN @@ -61,7 +62,7 @@ typedef void (Ref::*SEL_TouchEvent)(Ref*,TouchEventType); #endif -class Widget : public ProtectedNode, public LayoutParameterProtocol +class CC_GUI_DLL Widget : public ProtectedNode, public LayoutParameterProtocol { public: enum class FocusDirection diff --git a/cocos/ui/proj.win32/libGUI.vcxproj.user b/cocos/ui/proj.win32/libGUI.vcxproj.user deleted file mode 100644 index a375ae3527..0000000000 --- a/cocos/ui/proj.win32/libGUI.vcxproj.user +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cocos/ui/proj.win32/libGUI.vcxproj b/cocos/ui/proj.win32/libui.vcxproj similarity index 83% rename from cocos/ui/proj.win32/libGUI.vcxproj rename to cocos/ui/proj.win32/libui.vcxproj index 2483ce7005..ed67cf90df 100644 --- a/cocos/ui/proj.win32/libGUI.vcxproj +++ b/cocos/ui/proj.win32/libui.vcxproj @@ -11,8 +11,8 @@ - + @@ -27,6 +27,7 @@ + @@ -37,7 +38,6 @@ - @@ -53,6 +53,7 @@ + @@ -62,13 +63,22 @@ + + + {21b2c324-891f-48ea-ad1a-5ae13de12e28} + + + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} + + {7E06E92C-537A-442B-9E4A-4761C84F8A1A} - libGUI + libui + libui - StaticLibrary + DynamicLibrary true v100 v110 @@ -78,7 +88,7 @@ Unicode - StaticLibrary + DynamicLibrary false v100 v110 @@ -115,7 +125,7 @@ $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USEGUIDLL;%(PreprocessorDefinitions) true 4267;4251;4244;%(DisableSpecificWarnings) false @@ -123,6 +133,8 @@ true + $(OutDir);%(AdditionalLibraryDirectories) + opengl32.lib;glew32.lib;%(AdditionalDependencies) @@ -133,7 +145,7 @@ true - WIN32;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USEGUIDLL;%(PreprocessorDefinitions) $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) None false @@ -142,6 +154,8 @@ true true true + $(OutDir);%(AdditionalLibraryDirectories) + opengl32.lib;glew32.lib;%(AdditionalDependencies) diff --git a/cocos/ui/proj.win32/libGUI.vcxproj.filters b/cocos/ui/proj.win32/libui.vcxproj.filters similarity index 96% rename from cocos/ui/proj.win32/libGUI.vcxproj.filters rename to cocos/ui/proj.win32/libui.vcxproj.filters index 66f11c6cdd..c51a43c85d 100644 --- a/cocos/ui/proj.win32/libGUI.vcxproj.filters +++ b/cocos/ui/proj.win32/libui.vcxproj.filters @@ -72,9 +72,6 @@ UIWidgets - - BaseClasses - Layouts @@ -90,6 +87,12 @@ System + + System + + + BaseClasses + @@ -146,9 +149,6 @@ UIWidgets - - BaseClasses - Layouts @@ -164,5 +164,8 @@ System + + BaseClasses + \ No newline at end of file diff --git a/cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj.user b/cocos/ui/proj.win32/libui.vcxproj.user similarity index 100% rename from cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj.user rename to cocos/ui/proj.win32/libui.vcxproj.user diff --git a/cocos/ui/proj.wp8/libGUI.vcxproj b/cocos/ui/proj.wp8/libGUI.vcxproj index 461ca405b9..5e2e4e6453 100644 --- a/cocos/ui/proj.wp8/libGUI.vcxproj +++ b/cocos/ui/proj.wp8/libGUI.vcxproj @@ -165,7 +165,6 @@ - @@ -188,9 +187,9 @@ + - @@ -214,5 +213,6 @@ + \ No newline at end of file diff --git a/cocos/ui/proj.wp8/libGUI.vcxproj.filters b/cocos/ui/proj.wp8/libGUI.vcxproj.filters index 0513dc6afb..7a7b4ae6b4 100644 --- a/cocos/ui/proj.wp8/libGUI.vcxproj.filters +++ b/cocos/ui/proj.wp8/libGUI.vcxproj.filters @@ -69,9 +69,6 @@ BaseClasses - - BaseClasses - Layouts @@ -87,6 +84,9 @@ System + + BaseClasses + @@ -143,9 +143,6 @@ BaseClasses - - BaseClasses - Layouts @@ -161,5 +158,8 @@ System + + BaseClasses + \ No newline at end of file diff --git a/docs/RELEASE_NOTES.md b/docs/RELEASE_NOTES.md index 5c0f66fa93..48060de875 100644 --- a/docs/RELEASE_NOTES.md +++ b/docs/RELEASE_NOTES.md @@ -16,6 +16,7 @@ - [Highlights of v3.2](#user-content-highlights-of-v32) - [Documents](#user-content-documents) - [Toolchain requirement changed](#user-content-toolchain-requirement-changed) +- [atof issue on Android](#user-content-atof-issue-on-android) - [Features in detail](#user-content-features-in-detail) - [Sprite3D & Animation3D](#user-content-sprite3d--animation3d) - [fbx-conv usage](#user-content-fbx-conv-usage) @@ -46,7 +47,7 @@ ## Compiler Requirements -* Xcode 4.6 or newer for iOS or Mac +* Xcode 5.1 or newer for iOS or Mac * gcc 4.9 or newer for Linux * ndk-r9d or newer for Android * Visual Studio 2012 or newer for Windows (win32) @@ -135,11 +136,28 @@ Please refer to this document: [ReadMe](../README.md) # Toolchain requirement changed -`Node::enumerateChildren()` uses `std::regex` which will cause crash using gcc v4.8 or lower version. So +`Node::enumerateChildren()` uses `std::regex` which will cause crash using gcc v4.8 or lower version. +Because `OTHER_LDFLAGS` can not work in Xcode6 beta3. So we used fat library(including 64-bit libaries) on iOS. But Xcode 5.0 or lower version has building problem by this way. + +So * NDK r9d or newer version is required for Android building * gcc 4.9 is required for linux building +* Xcode 5.1 or newer is required on iOS +# atof issue on Android + +We found a bug of `atof` on Android when using libc++. The bug is that, the return value of `atof` may be `-inf` when passing some valid digit string. + +For example + +```c++ +atof("90.099998474121094"); // -> return value is -inf +``` + +We have reported it to google guys, and they confirmed that it is a bug. In order to work around this issue, we added `utils::atof()`. + +The corresponding pull request for this issue is [here](https://github.com/cocos2d/cocos2d-x/pull/7440). You can refer to this pull request for demail information. # Features in detail @@ -223,7 +241,7 @@ Fast tilemap has the same API as `TMXTiledMap` without deprecated functions. Sample code ```c++ -auto tilemap = FastTMXTiledMap::create("MyFile.tmx"); +auto tilemap = cocos2d::experimental::TMXTiledMap::create("MyFile.tmx"); addChild(tilemap); ``` diff --git a/download-deps.py b/download-deps.py index 994c942f86..bd48c13631 100755 --- a/download-deps.py +++ b/download-deps.py @@ -64,6 +64,10 @@ class CocosZipInstaller(object): self._current_version = data["version"] self._repo_name = data["repo_name"] + try: + self._move_dirs = data["move_dirs"] + except: + self._move_dirs = None self._filename = self._current_version + '.zip' self._url = data["repo_parent"] + self._repo_name + '/archive/' + self._filename self._zip_file_size = int(data["zip_file_size"]) @@ -190,13 +194,13 @@ class CocosZipInstaller(object): def ask_to_delete_downloaded_zip_file(self): - ret = self.get_input_value("==> Whether to delete '%s' file? It may be reused when you execute this script next time! (yes/no): " % self._filename) + ret = self.get_input_value("==> Do you want to keep '%s'? So you don't have to download it later. (yes/no): " % self._filename) ret = ret.strip() - if ret != 'yes' and ret != 'no': - print("==> Invalid answer, please answer 'yes' or 'no'!") - return self.ask_to_delete_downloaded_zip_file() + if ret != 'yes' and ret != 'y' and ret != 'no' and ret != 'n': + print("==> Cache the dependency libraries by default") + return False else: - return True if ret == 'yes' else False + return True if ret == 'no' or ret =='n' else False def download_zip_file(self): if not os.path.isfile(self._filename): @@ -230,7 +234,7 @@ class CocosZipInstaller(object): data = json.load(data_file) return data - def run(self, folder_for_extracting, remove_downloaded, force_update, download_only): + def run(self, workpath, folder_for_extracting, remove_downloaded, force_update, download_only): if not force_update and not self.need_to_update(): print("==> Not need to update!") return @@ -246,6 +250,12 @@ class CocosZipInstaller(object): if not os.path.exists(folder_for_extracting): os.mkdir(folder_for_extracting) distutils.dir_util.copy_tree(self._extracted_folder_name, folder_for_extracting) + if self._move_dirs is not None: + for srcDir in self._move_dirs.keys(): + distDir = os.path.join( os.path.join(workpath, self._move_dirs[srcDir]), srcDir) + if os.path.exists(distDir): + shutil.rmtree(distDir) + shutil.move( os.path.join(folder_for_extracting, srcDir), distDir) print("==> Cleaning...") if os.path.exists(self._extracted_folder_name): shutil.rmtree(self._extracted_folder_name) @@ -293,13 +303,13 @@ def main(): print("==> Prepare to download external libraries!") external_path = os.path.join(workpath, 'external') installer = CocosZipInstaller(workpath, os.path.join(workpath, 'external', 'config.json'), os.path.join(workpath, 'external', 'version.json'), "prebuilt_libs_version") - installer.run(external_path, opts.remove_downloaded, opts.force_update, opts.download_only) + installer.run(workpath,external_path, opts.remove_downloaded, opts.force_update, opts.download_only) print("=======================================================") print("==> Prepare to download lua runtime binaries") runtime_path = os.path.join(workpath, 'templates', 'lua-template-runtime', 'runtime') installer = CocosZipInstaller(workpath, os.path.join(runtime_path, 'config.json'), os.path.join(runtime_path, 'version.json')) - installer.run(runtime_path, opts.remove_downloaded, opts.force_update, opts.download_only) + installer.run(workpath, runtime_path, opts.remove_downloaded, opts.force_update, opts.download_only) # -------------- main -------------- if __name__ == '__main__': diff --git a/extensions/Android.mk b/extensions/Android.mk index e2ececf020..66206c6331 100644 --- a/extensions/Android.mk +++ b/extensions/Android.mk @@ -30,10 +30,8 @@ physics-nodes/CCPhysicsDebugNode.cpp \ physics-nodes/CCPhysicsSprite.cpp LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static -LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static LOCAL_WHOLE_STATIC_LIBRARIES += cocos_curl_static LOCAL_WHOLE_STATIC_LIBRARIES += box2d_static -LOCAL_WHOLE_STATIC_LIBRARIES += libwebsockets_static LOCAL_CXXFLAGS += -fexceptions @@ -46,8 +44,5 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. \ include $(BUILD_STATIC_LIBRARY) $(call import-module,.) -$(call import-module,audio/android) $(call import-module,curl/prebuilt/android) $(call import-module,Box2D) -$(call import-module,websockets/prebuilt/android) - diff --git a/extensions/ExtensionExport.h b/extensions/ExtensionExport.h new file mode 100644 index 0000000000..da01ffc98e --- /dev/null +++ b/extensions/ExtensionExport.h @@ -0,0 +1,28 @@ +#ifndef __CCEXTENSIONEXPORT_H__ +#define __CCEXTENSIONEXPORT_H__ + +#if defined(WIN32) && defined(_WINDOWS) + #ifdef __MINGW32__ + #include + #endif + + #if defined(_USREXDLL) + #define CC_EX_DLL __declspec(dllexport) + #else /* use a DLL library */ + #define CC_EX_DLL __declspec(dllimport) + #endif + + + /* Define NULL pointer value */ + #ifndef NULL + #ifdef __cplusplus + #define NULL 0 + #else + #define NULL ((void *)0) + #endif + #endif +#else + #define CC_EX_DLL +#endif + +#endif /* __CCEXTENSIONEXPORT_H__*/ \ No newline at end of file diff --git a/extensions/GUI/CCControlExtension/CCControl.h b/extensions/GUI/CCControlExtension/CCControl.h index cf6efa865d..1f7192a170 100644 --- a/extensions/GUI/CCControlExtension/CCControl.h +++ b/extensions/GUI/CCControlExtension/CCControl.h @@ -32,6 +32,7 @@ #include "CCControlUtils.h" #include "2d/CCLayer.h" +#include "extensions/ExtensionExport.h" NS_CC_EXT_BEGIN @@ -61,11 +62,11 @@ class Invocation; * * To use the Control you have to subclass it. */ -class Control : public Layer +class CC_EX_DLL Control : public Layer { public: /** Kinds of possible events for the control objects. */ - enum class EventType + enum class CC_EX_DLL EventType { TOUCH_DOWN = 1 << 0, // A touch-down event in the control. DRAG_INSIDE = 1 << 1, // An event where a finger is dragged inside the bounds of the control. @@ -266,7 +267,7 @@ private: CC_DISALLOW_COPY_AND_ASSIGN(Control); }; -Control::EventType operator|(Control::EventType a, Control::EventType b); +CC_EX_DLL Control::EventType operator|(Control::EventType a, Control::EventType b); // end of GUI group /// @} diff --git a/extensions/GUI/CCControlExtension/CCControlButton.h b/extensions/GUI/CCControlExtension/CCControlButton.h index cd73e63c5a..f7484e2172 100644 --- a/extensions/GUI/CCControlExtension/CCControlButton.h +++ b/extensions/GUI/CCControlExtension/CCControlButton.h @@ -34,6 +34,7 @@ #include "CCInvocation.h" #include "CCScale9Sprite.h" #include "base/CCMap.h" +#include "extensions/ExtensionExport.h" NS_CC_EXT_BEGIN @@ -51,7 +52,7 @@ NS_CC_EXT_BEGIN */ /** @class ControlButton Button control for Cocos2D. */ -class ControlButton : public Control +class CC_EX_DLL ControlButton : public Control { public: static ControlButton* create(); diff --git a/extensions/GUI/CCControlExtension/CCControlColourPicker.h b/extensions/GUI/CCControlExtension/CCControlColourPicker.h index 2cb09328c7..df282adda8 100644 --- a/extensions/GUI/CCControlExtension/CCControlColourPicker.h +++ b/extensions/GUI/CCControlExtension/CCControlColourPicker.h @@ -37,6 +37,7 @@ #include "CCControlUtils.h" #include "CCControlHuePicker.h" #include "CCControlSaturationBrightnessPicker.h" +#include "extensions/ExtensionExport.h" NS_CC_EXT_BEGIN @@ -47,7 +48,7 @@ NS_CC_EXT_BEGIN * @{ */ -class ControlColourPicker: public Control +class CC_EX_DLL ControlColourPicker: public Control { public: static ControlColourPicker* create(); diff --git a/extensions/GUI/CCControlExtension/CCControlHuePicker.h b/extensions/GUI/CCControlExtension/CCControlHuePicker.h index 9f007a2092..06e6371efd 100644 --- a/extensions/GUI/CCControlExtension/CCControlHuePicker.h +++ b/extensions/GUI/CCControlExtension/CCControlHuePicker.h @@ -35,6 +35,7 @@ #include "CCControl.h" #include "CCInvocation.h" +#include "extensions/ExtensionExport.h" NS_CC_EXT_BEGIN @@ -45,7 +46,7 @@ NS_CC_EXT_BEGIN * @{ */ -class ControlHuePicker : public Control +class CC_EX_DLL ControlHuePicker : public Control { public: static ControlHuePicker* create(Node* target, Vec2 pos); diff --git a/extensions/GUI/CCControlExtension/CCControlPotentiometer.h b/extensions/GUI/CCControlExtension/CCControlPotentiometer.h index fc8156a8b8..c70ec15e06 100644 --- a/extensions/GUI/CCControlExtension/CCControlPotentiometer.h +++ b/extensions/GUI/CCControlExtension/CCControlPotentiometer.h @@ -29,6 +29,7 @@ #include "CCControl.h" #include "2d/CCProgressTimer.h" +#include "extensions/ExtensionExport.h" NS_CC_EXT_BEGIN @@ -40,7 +41,7 @@ NS_CC_EXT_BEGIN */ /** @class ControlPotentiometer Potentiometer control for Cocos2D. */ -class ControlPotentiometer : public Control +class CC_EX_DLL ControlPotentiometer : public Control { public: /** diff --git a/extensions/GUI/CCControlExtension/CCControlSaturationBrightnessPicker.h b/extensions/GUI/CCControlExtension/CCControlSaturationBrightnessPicker.h index 0ae9cbeaa1..cff046281d 100644 --- a/extensions/GUI/CCControlExtension/CCControlSaturationBrightnessPicker.h +++ b/extensions/GUI/CCControlExtension/CCControlSaturationBrightnessPicker.h @@ -35,6 +35,7 @@ #include "CCControl.h" #include "CCInvocation.h" +#include "extensions/ExtensionExport.h" NS_CC_EXT_BEGIN @@ -45,7 +46,7 @@ NS_CC_EXT_BEGIN * @{ */ -class ControlSaturationBrightnessPicker : public Control +class CC_EX_DLL ControlSaturationBrightnessPicker : public Control { /** Contains the receiver's current saturation value. */ CC_SYNTHESIZE_READONLY(float, _saturation, Saturation); diff --git a/extensions/GUI/CCControlExtension/CCControlSlider.h b/extensions/GUI/CCControlExtension/CCControlSlider.h index eeca322c25..03bb5d9543 100644 --- a/extensions/GUI/CCControlExtension/CCControlSlider.h +++ b/extensions/GUI/CCControlExtension/CCControlSlider.h @@ -32,6 +32,7 @@ #include "CCControl.h" #include "CCInvocation.h" +#include "extensions/ExtensionExport.h" NS_CC_EXT_BEGIN @@ -42,7 +43,7 @@ NS_CC_EXT_BEGIN * @{ */ -class ControlSlider: public Control +class CC_EX_DLL ControlSlider: public Control { public: /** diff --git a/extensions/GUI/CCControlExtension/CCControlStepper.h b/extensions/GUI/CCControlExtension/CCControlStepper.h index 1b45a497f6..ae9bdaa22d 100644 --- a/extensions/GUI/CCControlExtension/CCControlStepper.h +++ b/extensions/GUI/CCControlExtension/CCControlStepper.h @@ -30,6 +30,7 @@ #include "CCControl.h" #include "2d/CCLabel.h" +#include "extensions/ExtensionExport.h" NS_CC_EXT_BEGIN @@ -40,7 +41,7 @@ NS_CC_EXT_BEGIN * @{ */ -class ControlStepper : public Control +class CC_EX_DLL ControlStepper : public Control { public: enum class Part diff --git a/extensions/GUI/CCControlExtension/CCControlSwitch.h b/extensions/GUI/CCControlExtension/CCControlSwitch.h index 6575937e13..98e67d77e2 100644 --- a/extensions/GUI/CCControlExtension/CCControlSwitch.h +++ b/extensions/GUI/CCControlExtension/CCControlSwitch.h @@ -29,7 +29,7 @@ #define __CCCONTROLSWITCH_H__ #include "CCControl.h" - +#include "extensions/ExtensionExport.h" namespace cocos2d { class Sprite; } namespace cocos2d { class Label; } @@ -46,7 +46,7 @@ class ControlSwitchSprite; */ /** @class ControlSwitch Switch control for Cocos2D. */ -class ControlSwitch : public Control +class CC_EX_DLL ControlSwitch : public Control { public: /** Creates a switch with a mask sprite, on/off sprites for on/off states, a thumb sprite and an on/off labels. */ diff --git a/extensions/GUI/CCControlExtension/CCControlUtils.h b/extensions/GUI/CCControlExtension/CCControlUtils.h index 4df2a0f125..abc6abd894 100644 --- a/extensions/GUI/CCControlExtension/CCControlUtils.h +++ b/extensions/GUI/CCControlExtension/CCControlUtils.h @@ -36,6 +36,7 @@ #include "2d/CCSprite.h" #include "../../ExtensionMacros.h" +#include "extensions/ExtensionExport.h" NS_CC_EXT_BEGIN @@ -62,7 +63,7 @@ typedef struct */ //helper class to store Color3B's in mutable arrays -class Color3bObject : public Ref +class CC_EX_DLL Color3bObject : public Ref { public: Color3B value; @@ -73,7 +74,7 @@ public: Color3bObject(Color3B s_value):value(s_value){} }; -class ControlUtils +class CC_EX_DLL ControlUtils { public: /** diff --git a/extensions/GUI/CCControlExtension/CCInvocation.h b/extensions/GUI/CCControlExtension/CCInvocation.h index e8a2a12b8d..015f582a23 100644 --- a/extensions/GUI/CCControlExtension/CCInvocation.h +++ b/extensions/GUI/CCControlExtension/CCInvocation.h @@ -32,6 +32,7 @@ #include "base/CCRef.h" #include "../../ExtensionMacros.h" +#include "extensions/ExtensionExport.h" #include "CCControl.h" NS_CC_EXT_BEGIN @@ -45,7 +46,7 @@ NS_CC_EXT_BEGIN #define cccontrol_selector(_SELECTOR) static_cast(&_SELECTOR) -class Invocation : public Ref +class CC_EX_DLL Invocation : public Ref { public: /** diff --git a/extensions/GUI/CCControlExtension/CCScale9Sprite.cpp b/extensions/GUI/CCControlExtension/CCScale9Sprite.cpp index 8d55e46003..099b1f128b 100644 --- a/extensions/GUI/CCControlExtension/CCScale9Sprite.cpp +++ b/extensions/GUI/CCControlExtension/CCScale9Sprite.cpp @@ -131,8 +131,6 @@ bool Scale9Sprite::updateWithBatchNode(SpriteBatchNode* batchnode, const Rect& o return false; } - _scale9Image->removeAllChildrenWithCleanup(true); - _capInsets = capInsets; _spriteFrameRotated = rotated; @@ -238,48 +236,48 @@ bool Scale9Sprite::updateWithBatchNode(SpriteBatchNode* batchnode, const Rect& o // Centre _centre = Sprite::createWithTexture(_scale9Image->getTexture(), centerbounds); _centre->retain(); - this->addChild(_centre, 0); + this->addChild(_centre); // Top _top = Sprite::createWithTexture(_scale9Image->getTexture(), centertopbounds); _top->retain(); - this->addChild(_top, 1); + this->addChild(_top); // Bottom _bottom = Sprite::createWithTexture(_scale9Image->getTexture(), centerbottombounds); _bottom->retain(); - this->addChild(_bottom, 1); + this->addChild(_bottom); // Left _left = Sprite::createWithTexture(_scale9Image->getTexture(), leftcenterbounds); _left->retain(); - this->addChild(_left, 1); + this->addChild(_left); // Right _right = Sprite::createWithTexture(_scale9Image->getTexture(), rightcenterbounds); _right->retain(); - this->addChild(_right, 1); + this->addChild(_right); // Top left _topLeft = Sprite::createWithTexture(_scale9Image->getTexture(), lefttopbounds); _topLeft->retain(); - this->addChild(_topLeft, 2); + this->addChild(_topLeft); // Top right _topRight = Sprite::createWithTexture(_scale9Image->getTexture(), righttopbounds); _topRight->retain(); - this->addChild(_topRight, 2); + this->addChild(_topRight); // Bottom left _bottomLeft = Sprite::createWithTexture(_scale9Image->getTexture(), leftbottombounds); _bottomLeft->retain(); - this->addChild(_bottomLeft, 2); + this->addChild(_bottomLeft); // Bottom right _bottomRight = Sprite::createWithTexture(_scale9Image->getTexture(), rightbottombounds); _bottomRight->retain(); - this->addChild(_bottomRight, 2); + this->addChild(_bottomRight); } else { // set up transformation of coordinates // to handle the case where the sprite is stored rotated @@ -329,46 +327,46 @@ bool Scale9Sprite::updateWithBatchNode(SpriteBatchNode* batchnode, const Rect& o // Top _top = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedcentertopbounds, true); _top->retain(); - this->addChild(_top, 1); + this->addChild(_top); // Bottom _bottom = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedcenterbottombounds, true); _bottom->retain(); - this->addChild(_bottom, 1); + this->addChild(_bottom); // Left _left = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedleftcenterbounds, true); _left->retain(); - this->addChild(_left, 1); + this->addChild(_left); // Right _right = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedrightcenterbounds, true); _right->retain(); - this->addChild(_right, 1); + this->addChild(_right); // Top left _topLeft = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedlefttopbounds, true); _topLeft->retain(); - this->addChild(_topLeft, 2); + this->addChild(_topLeft); // Top right _topRight = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedrighttopbounds, true); _topRight->retain(); - this->addChild(_topRight, 2); + this->addChild(_topRight); // Bottom left _bottomLeft = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedleftbottombounds, true); _bottomLeft->retain(); - this->addChild(_bottomLeft, 2); + this->addChild(_bottomLeft); // Bottom right _bottomRight = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedrightbottombounds, true); _bottomRight->retain(); - this->addChild(_bottomRight, 2); + this->addChild(_bottomRight); } this->setContentSize(rect.size); - this->addChild(_scale9Image); +// this->addChild(_scale9Image); if (_spritesGenerated) { diff --git a/extensions/GUI/CCControlExtension/CCScale9Sprite.h b/extensions/GUI/CCControlExtension/CCScale9Sprite.h index dc3c6b8696..fc1dea95ba 100644 --- a/extensions/GUI/CCControlExtension/CCScale9Sprite.h +++ b/extensions/GUI/CCControlExtension/CCScale9Sprite.h @@ -31,7 +31,7 @@ THE SOFTWARE. #include "2d/CCNode.h" #include "2d/CCSpriteFrame.h" #include "2d/CCSpriteBatchNode.h" - +#include "extensions/ExtensionExport.h" #include "../../ExtensionMacros.h" NS_CC_EXT_BEGIN @@ -53,7 +53,7 @@ NS_CC_EXT_BEGIN * * @see http://yannickloriot.com/library/ios/cccontrolextension/Classes/CCScale9Sprite.html */ -class Scale9Sprite : public Node +class CC_EX_DLL Scale9Sprite : public Node { public: /** diff --git a/extensions/GUI/CCEditBox/CCEditBox.h b/extensions/GUI/CCEditBox/CCEditBox.h index f6a12dbf46..9203cbfaac 100644 --- a/extensions/GUI/CCEditBox/CCEditBox.h +++ b/extensions/GUI/CCEditBox/CCEditBox.h @@ -29,6 +29,7 @@ #include "base/CCIMEDelegate.h" #include "extensions/ExtensionMacros.h" #include "../CCControlExtension/CCControlExtensions.h" +#include "extensions/ExtensionExport.h" NS_CC_EXT_BEGIN @@ -36,7 +37,7 @@ class EditBox; class EditBoxImpl; -class EditBoxDelegate +class CC_EX_DLL EditBoxDelegate { public: /** @@ -88,7 +89,7 @@ public: * */ -class EditBox +class CC_EX_DLL EditBox : public ControlButton , public IMEDelegate { diff --git a/extensions/GUI/CCEditBox/CCEditBoxImpl.h b/extensions/GUI/CCEditBox/CCEditBoxImpl.h index 44118c1c0b..79d3d8f3fa 100644 --- a/extensions/GUI/CCEditBox/CCEditBoxImpl.h +++ b/extensions/GUI/CCEditBox/CCEditBoxImpl.h @@ -28,11 +28,12 @@ #include "extensions/ExtensionMacros.h" #include "CCEditBox.h" +#include "extensions/ExtensionExport.h" NS_CC_EXT_BEGIN -class EditBoxImpl +class CC_EX_DLL EditBoxImpl { public: /** @@ -62,7 +63,7 @@ public: virtual void setPlaceHolder(const char* pText) = 0; virtual void doAnimationWhenKeyboardMove(float duration, float distance) = 0; - virtual void openKeyboard() = 0; + virtual void openKeyboard() = 0; virtual void closeKeyboard() = 0; virtual void setPosition(const Vec2& pos) = 0; diff --git a/extensions/GUI/CCEditBox/CCEditBoxImplMac.h b/extensions/GUI/CCEditBox/CCEditBoxImplMac.h index a5b93c4f58..34085e8278 100644 --- a/extensions/GUI/CCEditBox/CCEditBoxImplMac.h +++ b/extensions/GUI/CCEditBox/CCEditBoxImplMac.h @@ -39,6 +39,8 @@ @interface CCEditBoxImplMac : NSObject { + NSTextField* textField_; + NSSecureTextField* secureTextField_; void* editBox_; BOOL editState_; NSMutableDictionary* placeholderAttributes_; diff --git a/extensions/GUI/CCEditBox/CCEditBoxImplMac.mm b/extensions/GUI/CCEditBox/CCEditBoxImplMac.mm index 8ca0fd5d25..8fe9e5d034 100644 --- a/extensions/GUI/CCEditBox/CCEditBoxImplMac.mm +++ b/extensions/GUI/CCEditBox/CCEditBoxImplMac.mm @@ -29,9 +29,6 @@ #if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) #include "CCEditBox.h" -#define GLFW_EXPOSE_NATIVE_NSGL -#define GLFW_EXPOSE_NATIVE_COCOA -#include "glfw3native.h" #define getEditBoxImplMac() ((cocos2d::extension::EditBoxImplMac*)editBox_) @@ -49,7 +46,7 @@ - (id) getNSWindow { auto glview = cocos2d::Director::getInstance()->getOpenGLView(); - return glfwGetCocoaWindow(glview->getWindow()); + return glview->getCocoaWindow(); } - (void)dealloc @@ -287,7 +284,7 @@ void EditBoxImplMac::doAnimationWhenKeyboardMove(float duration, float distance) bool EditBoxImplMac::initWithSize(const Size& size) { - GLViewProtocol* eglView = Director::getInstance()->getOpenGLView(); + GLView* eglView = Director::getInstance()->getOpenGLView(); NSRect rect = NSMakeRect(0, 0, size.width * eglView->getScaleX(),size.height * eglView->getScaleY()); @@ -307,7 +304,10 @@ bool EditBoxImplMac::initWithSize(const Size& size) void EditBoxImplMac::setFont(const char* pFontName, int fontSize) { NSString * fntName = [NSString stringWithUTF8String:pFontName]; - NSFont *textFont = [NSFont fontWithName:fntName size:fontSize]; + float retinaFactor = _inRetinaMode ? 2.0f : 1.0f; + auto glview = cocos2d::Director::getInstance()->getOpenGLView(); + float scaleFactor = glview->getScaleX(); + NSFont *textFont = [NSFont fontWithName:fntName size:fontSize * scaleFactor / retinaFactor]; if (textFont != nil) { [_sysEdit.textField setFont:textFont]; [_sysEdit.secureTextField setFont:textFont]; @@ -317,14 +317,17 @@ void EditBoxImplMac::setFont(const char* pFontName, int fontSize) void EditBoxImplMac::setPlaceholderFont(const char* pFontName, int fontSize) { NSString *fontName = [NSString stringWithUTF8String:pFontName]; - NSFont *font = [NSFont fontWithName:fontName size:fontSize]; + float retinaFactor = _inRetinaMode ? 2.0f : 1.0f; + auto glview = cocos2d::Director::getInstance()->getOpenGLView(); + float scaleFactor = glview->getScaleX(); + NSFont *font = [NSFont fontWithName:fontName size:fontSize * scaleFactor / retinaFactor]; if (!font) { CCLOGWARN("Font not found: %s", pFontName); return; } - _sysEdit.placeholderAttributes[NSFontAttributeName] = font; + [_sysEdit.placeholderAttributes setObject:font forKey:NSFontAttributeName]; /* reload placeholder */ const char *placeholder = [_sysEdit.textField.cell placeholderAttributedString].string.UTF8String; @@ -343,7 +346,7 @@ void EditBoxImplMac::setFontColor(const Color3B& color) void EditBoxImplMac::setPlaceholderFontColor(const Color3B& color) { NSColor *nsColor = [NSColor colorWithCalibratedRed:color.r/255.f green:color.g / 255.f blue:color.b / 255.f alpha:1.0f]; - _sysEdit.placeholderAttributes[NSForegroundColorAttributeName] = nsColor; + [_sysEdit.placeholderAttributes setObject:nsColor forKey:NSForegroundColorAttributeName]; /* reload placeholder */ const char *placeholder = [_sysEdit.textField.cell placeholderAttributedString].string.UTF8String; @@ -431,7 +434,7 @@ NSPoint EditBoxImplMac::convertDesignCoordToScreenCoord(const Vec2& designCoord, NSRect frame = [_sysEdit.textField frame]; CGFloat height = frame.size.height; - GLViewProtocol* eglView = Director::getInstance()->getOpenGLView(); + GLView* eglView = Director::getInstance()->getOpenGLView(); Vec2 visiblePos = Vec2(designCoord.x * eglView->getScaleX(), designCoord.y * eglView->getScaleY()); Vec2 screenGLPos = visiblePos + eglView->getViewPortRect().origin; diff --git a/extensions/GUI/CCEditBox/CCEditBoxImplWin.cpp b/extensions/GUI/CCEditBox/CCEditBoxImplWin.cpp index 3ae5275689..2259e4dda0 100644 --- a/extensions/GUI/CCEditBox/CCEditBoxImplWin.cpp +++ b/extensions/GUI/CCEditBox/CCEditBoxImplWin.cpp @@ -26,17 +26,8 @@ #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) -#ifndef GLFW_EXPOSE_NATIVE_WIN32 -#define GLFW_EXPOSE_NATIVE_WIN32 -#endif - -#ifndef GLFW_EXPOSE_NATIVE_WGL -#define GLFW_EXPOSE_NATIVE_WGL -#endif - #include "CCEditBox.h" #include "proj.win32/Win32InputBox.h" -#include "glfw3native.h" NS_CC_EXT_BEGIN @@ -257,9 +248,8 @@ void EditBoxImplWin::openKeyboard() std::string text = getText(); if (text.length()) strncpy(pText, text.c_str(), 100); - GLView *glView = Director::getInstance()->getOpenGLView(); - GLFWwindow *glfwWindow = glView->getWindow(); - HWND hwnd = glfwGetWin32Window(glfwWindow); + auto glView = Director::getInstance()->getOpenGLView(); + HWND hwnd = glView->getWin32Window(); bool didChange = CWin32InputBox::InputBox("Input", placeHolder.c_str(), pText, 100, false, hwnd) == IDOK; if (didChange) diff --git a/extensions/GUI/CCEditBox/CCEditBoxImplWin.h b/extensions/GUI/CCEditBox/CCEditBoxImplWin.h index 7b29251644..4d04fb6cce 100644 --- a/extensions/GUI/CCEditBox/CCEditBoxImplWin.h +++ b/extensions/GUI/CCEditBox/CCEditBoxImplWin.h @@ -32,12 +32,13 @@ #include "extensions/ExtensionMacros.h" #include "CCEditBoxImpl.h" +#include "extensions/ExtensionExport.h" NS_CC_EXT_BEGIN class EditBox; -class EditBoxImplWin : public EditBoxImpl +class CC_EX_DLL EditBoxImplWin : public EditBoxImpl { public: /** diff --git a/extensions/GUI/CCScrollView/CCScrollView.cpp b/extensions/GUI/CCScrollView/CCScrollView.cpp index d45c9f62a8..74717f842d 100644 --- a/extensions/GUI/CCScrollView/CCScrollView.cpp +++ b/extensions/GUI/CCScrollView/CCScrollView.cpp @@ -24,7 +24,6 @@ ****************************************************************************/ #include "CCScrollView.h" -#include "CCGLView.h" #include "platform/CCDevice.h" #include "2d/CCActionInstant.h" #include "2d/CCActionInterval.h" diff --git a/extensions/GUI/CCScrollView/CCScrollView.h b/extensions/GUI/CCScrollView/CCScrollView.h index d26c9240e0..e4d62a7947 100644 --- a/extensions/GUI/CCScrollView/CCScrollView.h +++ b/extensions/GUI/CCScrollView/CCScrollView.h @@ -30,6 +30,7 @@ #include "base/CCEventListenerTouch.h" #include "2d/CCActionTween.h" #include "extensions/ExtensionMacros.h" +#include "extensions/ExtensionExport.h" NS_CC_EXT_BEGIN @@ -40,7 +41,7 @@ NS_CC_EXT_BEGIN class ScrollView; -class ScrollViewDelegate +class CC_EX_DLL ScrollViewDelegate { public: /** @@ -52,12 +53,12 @@ public: * @js NA * @lua NA */ - virtual void scrollViewDidScroll(ScrollView* view) = 0; + virtual void scrollViewDidScroll(ScrollView* view) {}; /** * @js NA * @lua NA */ - virtual void scrollViewDidZoom(ScrollView* view) = 0; + virtual void scrollViewDidZoom(ScrollView* view) {}; }; @@ -65,7 +66,7 @@ public: * ScrollView support for cocos2d-x. * It provides scroll view functionalities to cocos2d projects natively. */ -class ScrollView : public Layer, public ActionTweenDelegate +class CC_EX_DLL ScrollView : public Layer, public ActionTweenDelegate { public: enum class Direction diff --git a/extensions/GUI/CCScrollView/CCTableView.cpp b/extensions/GUI/CCScrollView/CCTableView.cpp index b074fc4e88..7a443cc549 100644 --- a/extensions/GUI/CCScrollView/CCTableView.cpp +++ b/extensions/GUI/CCScrollView/CCTableView.cpp @@ -591,9 +591,12 @@ void TableView::onTouchEnded(Touch *pTouch, Event *pEvent) bool TableView::onTouchBegan(Touch *pTouch, Event *pEvent) { - if (!this->isVisible()) + for (Node *c = this; c != nullptr; c = c->getParent()) { - return false; + if (!c->isVisible()) + { + return false; + } } bool touchResult = ScrollView::onTouchBegan(pTouch, pEvent); diff --git a/extensions/GUI/CCScrollView/CCTableView.h b/extensions/GUI/CCScrollView/CCTableView.h index c4d89b33a9..018c653110 100644 --- a/extensions/GUI/CCScrollView/CCTableView.h +++ b/extensions/GUI/CCScrollView/CCTableView.h @@ -28,6 +28,7 @@ #include "CCScrollView.h" #include "CCTableViewCell.h" +#include "extensions/ExtensionExport.h" #include #include @@ -39,7 +40,7 @@ class TableView; /** * Sole purpose of this delegate is to single touch event in this version. */ -class TableViewDelegate : public ScrollViewDelegate +class CC_EX_DLL TableViewDelegate : public ScrollViewDelegate { public: /** @@ -90,7 +91,7 @@ public: /** * Data source that governs table backend data. */ -class TableViewDataSource +class CC_EX_DLL TableViewDataSource { public: /** @@ -139,7 +140,7 @@ public: * * This is a very basic, minimal implementation to bring UITableView-like component into cocos2d world. */ -class TableView : public ScrollView, public ScrollViewDelegate +class CC_EX_DLL TableView : public ScrollView, public ScrollViewDelegate { public: diff --git a/extensions/GUI/CCScrollView/CCTableViewCell.h b/extensions/GUI/CCScrollView/CCTableViewCell.h index 9d45d665d8..4bc594db66 100644 --- a/extensions/GUI/CCScrollView/CCTableViewCell.h +++ b/extensions/GUI/CCScrollView/CCTableViewCell.h @@ -28,13 +28,14 @@ #include "extensions/ExtensionMacros.h" #include "2d/CCNode.h" +#include "extensions/ExtensionExport.h" NS_CC_EXT_BEGIN /** * Abstract class for SWTableView cell node */ -class TableViewCell: public Node +class CC_EX_DLL TableViewCell: public Node { public: CREATE_FUNC(TableViewCell); diff --git a/extensions/assets-manager/AssetsManager.h b/extensions/assets-manager/AssetsManager.h index e37ee4b3d9..7032d381a7 100644 --- a/extensions/assets-manager/AssetsManager.h +++ b/extensions/assets-manager/AssetsManager.h @@ -31,6 +31,7 @@ #include "cocos2d.h" #include "extensions/ExtensionMacros.h" +#include "extensions/ExtensionExport.h" NS_CC_EXT_BEGIN @@ -41,7 +42,7 @@ class AssetsManagerDelegateProtocol; * The updated package should be a zip file. And there should be a file named * version in the server, which contains version code. */ -class AssetsManager : public Node +class CC_EX_DLL AssetsManager : public Node { public: enum class ErrorCode diff --git a/extensions/physics-nodes/CCPhysicsDebugNode.h b/extensions/physics-nodes/CCPhysicsDebugNode.h index 390f24bfaa..16c0f56400 100644 --- a/extensions/physics-nodes/CCPhysicsDebugNode.h +++ b/extensions/physics-nodes/CCPhysicsDebugNode.h @@ -25,6 +25,7 @@ #include "extensions/ExtensionMacros.h" #include "2d/CCDrawNode.h" +#include "extensions/ExtensionExport.h" struct cpSpace; @@ -40,7 +41,7 @@ NS_CC_EXT_BEGIN @since v2.1 */ -class PhysicsDebugNode : public DrawNode +class CC_EX_DLL PhysicsDebugNode : public DrawNode { public: diff --git a/extensions/physics-nodes/CCPhysicsSprite.h b/extensions/physics-nodes/CCPhysicsSprite.h index fa1f0489d0..33f48a20b0 100644 --- a/extensions/physics-nodes/CCPhysicsSprite.h +++ b/extensions/physics-nodes/CCPhysicsSprite.h @@ -25,6 +25,7 @@ #include "2d/CCSprite.h" #include "extensions/ExtensionMacros.h" +#include "extensions/ExtensionExport.h" struct cpBody; class b2Body; @@ -43,7 +44,7 @@ NS_CC_EXT_BEGIN - If you update the rotation or position manually, the physics body will be updated - You can't enble both Chipmunk support and Box2d support at the same time. Only one can be enabled at compile time */ -class PhysicsSprite : public Sprite +class CC_EX_DLL PhysicsSprite : public Sprite { public: diff --git a/extensions/proj.win32/libExtensions.vcxproj b/extensions/proj.win32/libextension.vcxproj similarity index 86% rename from extensions/proj.win32/libExtensions.vcxproj rename to extensions/proj.win32/libextension.vcxproj index b3a911b84e..067f36876f 100644 --- a/extensions/proj.win32/libExtensions.vcxproj +++ b/extensions/proj.win32/libextension.vcxproj @@ -12,12 +12,13 @@ {21B2C324-891F-48EA-AD1A-5AE13DE12E28} - Extensions.win32 + libextension.win32 Win32Proj + libextension - StaticLibrary + DynamicLibrary Unicode v100 v110 @@ -26,7 +27,7 @@ v120_xp - StaticLibrary + DynamicLibrary Unicode v100 v110 @@ -69,7 +70,7 @@ Disabled $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\unzip;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)external\win32-specific\zlib\include;..\;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_DEBUG;_LIB;COCOS2D_DEBUG=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_DEBUG;COCOS2D_DEBUG=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USREXDLL;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -80,13 +81,21 @@ 4267;4251;4244;%(DisableSpecificWarnings) true + + libcocos2d.lib + $(OutDir);%(AdditionalLibraryDirectories) + + + $(OutDir);%(AdditionalLibraryDirectories) + libcocos2d.lib;opengl32.lib;glew32.lib;libcurl_imp.lib;libchipmunk.lib;libBox2D.lib;glfw3.lib;%(AdditionalDependencies) + MinSpace true $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\unzip;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)external\win32-specific\zlib\include;..\;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;NDEBUG;_LIB;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USREXDLL;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -97,6 +106,10 @@ true false + + $(OutDir);%(AdditionalLibraryDirectories) + libcocos2d.lib;opengl32.lib;glew32.lib;libcurl_imp.lib;libchipmunk.lib;libBox2D.lib;glfw3.lib;%(AdditionalDependencies) + @@ -123,6 +136,7 @@ + @@ -148,6 +162,11 @@ + + + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} + + diff --git a/extensions/proj.win32/libExtensions.vcxproj.filters b/extensions/proj.win32/libextension.vcxproj.filters similarity index 99% rename from extensions/proj.win32/libExtensions.vcxproj.filters rename to extensions/proj.win32/libextension.vcxproj.filters index fe37d0def2..fcad0bd423 100644 --- a/extensions/proj.win32/libExtensions.vcxproj.filters +++ b/extensions/proj.win32/libextension.vcxproj.filters @@ -157,5 +157,6 @@ physics_nodes + \ No newline at end of file diff --git a/extensions/proj.win32/libExtensions.vcxproj.user b/extensions/proj.win32/libextension.vcxproj.user similarity index 100% rename from extensions/proj.win32/libExtensions.vcxproj.user rename to extensions/proj.win32/libextension.vcxproj.user diff --git a/external/Box2D/proj.win32/Box2D.vcxproj b/external/Box2D/proj.win32/libbox2d.vcxproj similarity index 99% rename from external/Box2D/proj.win32/Box2D.vcxproj rename to external/Box2D/proj.win32/libbox2d.vcxproj index 8193b38dff..188b960501 100644 --- a/external/Box2D/proj.win32/Box2D.vcxproj +++ b/external/Box2D/proj.win32/libbox2d.vcxproj @@ -11,9 +11,9 @@ - libBox2D + libbox2d {929480E7-23C0-4DF6-8456-096D71547116} - Box2D.win32 + libbox2d.win32 Win32Proj diff --git a/external/Box2D/proj.win32/Box2D.vcxproj.filters b/external/Box2D/proj.win32/libbox2d.vcxproj.filters similarity index 100% rename from external/Box2D/proj.win32/Box2D.vcxproj.filters rename to external/Box2D/proj.win32/libbox2d.vcxproj.filters diff --git a/external/config.json b/external/config.json index 4fd1120e81..9448062a1d 100644 --- a/external/config.json +++ b/external/config.json @@ -1,6 +1,9 @@ { - "version":"v3-deps-5", - "zip_file_size":"57171285", + "version":"v3-deps-7", + "zip_file_size":"67964573", "repo_name":"cocos2d-x-3rd-party-libs-bin", - "repo_parent":"https://github.com/cocos2d/" + "repo_parent":"https://github.com/cocos2d/", + "move_dirs":{ + "fbx-conv":"tools" + } } diff --git a/licenses/LICENSE_spine.txt b/licenses/LICENSE_spine.txt new file mode 100644 index 0000000000..b7df802e2e --- /dev/null +++ b/licenses/LICENSE_spine.txt @@ -0,0 +1,33 @@ +/****************************************************************************** + * Spine Runtime Software License - Version 1.1 + * + * Copyright (c) 2013, Esoteric Software + * All rights reserved. + * + * Redistribution and use in source and binary forms in whole or in part, with + * or without modification, are permitted provided that the following conditions + * are met: + * + * 1. A Spine Essential, Professional, Enterprise, or Education License must + * be purchased from Esoteric Software and the license must remain valid: + * http://esotericsoftware.com/ + * 2. Redistributions of source code must retain this license, which is the + * above copyright notice, this declaration of conditions and the following + * disclaimer. + * 3. Redistributions in binary form must reproduce this license, which is the + * above copyright notice, this declaration of conditions and the following + * disclaimer, in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + *****************************************************************************/ + diff --git a/setup.py b/setup.py index 08ca197bdb..e5fec47e9f 100755 --- a/setup.py +++ b/setup.py @@ -557,7 +557,7 @@ class SetEnvVar(object): if ret is not None: print(" ->Path " + ret + " was found\n") else: - print(" ->Command " + ret + " not found\n") + print(" ->Command " + cmd + " not found\n") return ret def _find_value_from_sys(self, var_name): diff --git a/templates/cocos2dx_files.json b/templates/cocos2dx_files.json index 30678f6672..55ad74c6c1 100644 --- a/templates/cocos2dx_files.json +++ b/templates/cocos2dx_files.json @@ -147,6 +147,8 @@ "cocos/2d/CCParticleSystemQuad.h", "cocos/2d/CCProgressTimer.cpp", "cocos/2d/CCProgressTimer.h", + "cocos/2d/CCProtectedNode.cpp", + "cocos/2d/CCProtectedNode.h", "cocos/2d/CCRenderTexture.cpp", "cocos/2d/CCRenderTexture.h", "cocos/2d/CCScene.cpp", @@ -180,8 +182,7 @@ "cocos/2d/CCTweenFunction.cpp", "cocos/2d/CCTweenFunction.h", "cocos/2d/CMakeLists.txt", - "cocos/2d/cocos2d.vcxproj", - "cocos/2d/cocos2d.vcxproj.filters", + "cocos/2d/cocos2d.def", "cocos/2d/cocos2d_headers.props", "cocos/2d/cocos2d_winrt.props", "cocos/2d/cocos2d_winrt.vcxproj", @@ -191,6 +192,8 @@ "cocos/2d/cocos2d_wp8.vcxproj.filters", "cocos/2d/cocos2d_wp8_headers.props", "cocos/2d/cocos2dx.props", + "cocos/2d/libcocos2d.vcxproj", + "cocos/2d/libcocos2d.vcxproj.filters", "cocos/3d/CCAnimate3D.cpp", "cocos/3d/CCAnimate3D.h", "cocos/3d/CCAnimation3D.cpp", @@ -253,9 +256,9 @@ "cocos/audio/openal/OpenALDecoder.cpp", "cocos/audio/openal/OpenALDecoder.h", "cocos/audio/openal/SimpleAudioEngineOpenAL.cpp", - "cocos/audio/proj.win32/CocosDenshion.vcxproj", - "cocos/audio/proj.win32/CocosDenshion.vcxproj.filters", - "cocos/audio/proj.win32/CocosDenshion.vcxproj.user", + "cocos/audio/proj.win32/libcocosdenshion.vcxproj", + "cocos/audio/proj.win32/libcocosdenshion.vcxproj.filters", + "cocos/audio/proj.win32/libcocosdenshion.vcxproj.user", "cocos/audio/proj.wp8/CocosDenshion.vcxproj", "cocos/audio/proj.wp8/CocosDenshion.vcxproj.filters", "cocos/audio/proj.wp8/CocosDenshion.vcxproj.user", @@ -377,6 +380,8 @@ "cocos/base/etc1.cpp", "cocos/base/etc1.h", "cocos/base/firePngData.h", + "cocos/base/pvr.cpp", + "cocos/base/pvr.h", "cocos/base/s3tc.cpp", "cocos/base/s3tc.h", "cocos/base/uthash.h", @@ -452,9 +457,9 @@ "cocos/editor-support/cocosbuilder/CCSpriteLoader.h", "cocos/editor-support/cocosbuilder/CMakeLists.txt", "cocos/editor-support/cocosbuilder/CocosBuilder.h", - "cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj", "cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj.filters", "cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj.user", + "cocos/editor-support/cocosbuilder/proj.win32/libcocosbuilder.vcxproj", "cocos/editor-support/cocosbuilder/proj.wp8/libCocosBuilder.vcxproj", "cocos/editor-support/cocosbuilder/proj.wp8/libCocosBuilder.vcxproj.filters", "cocos/editor-support/cocosbuilder/proj.wp8/libCocosBuilder.vcxproj.user", @@ -537,6 +542,7 @@ "cocos/editor-support/cocostudio/CocoLoader.cpp", "cocos/editor-support/cocostudio/CocoLoader.h", "cocos/editor-support/cocostudio/CocoStudio.h", + "cocos/editor-support/cocostudio/CocosStudioExport.h", "cocos/editor-support/cocostudio/DictionaryHelper.cpp", "cocos/editor-support/cocostudio/DictionaryHelper.h", "cocos/editor-support/cocostudio/TriggerBase.cpp", @@ -574,9 +580,9 @@ "cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp", "cocos/editor-support/cocostudio/WidgetReader/WidgetReader.h", "cocos/editor-support/cocostudio/WidgetReader/WidgetReaderProtocol.h", - "cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj", - "cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters", - "cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.user", + "cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj", + "cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj.filters", + "cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj.user", "cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj", "cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj.filters", "cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj.user", @@ -683,9 +689,9 @@ "cocos/network/SocketIO.h", "cocos/network/WebSocket.cpp", "cocos/network/WebSocket.h", - "cocos/network/proj.win32/libNetwork.vcxproj", - "cocos/network/proj.win32/libNetwork.vcxproj.filters", - "cocos/network/proj.win32/libNetwork.vcxproj.user", + "cocos/network/proj.win32/libnetwork.vcxproj", + "cocos/network/proj.win32/libnetwork.vcxproj.filters", + "cocos/network/proj.win32/libnetwork.vcxproj.user", "cocos/network/proj.wp8/libNetwork.vcxproj", "cocos/network/proj.wp8/libNetwork.vcxproj.filters", "cocos/physics/CCPhysicsBody.cpp", @@ -715,8 +721,8 @@ "cocos/platform/CCDevice.h", "cocos/platform/CCFileUtils.cpp", "cocos/platform/CCFileUtils.h", - "cocos/platform/CCGLViewProtocol.cpp", - "cocos/platform/CCGLViewProtocol.h", + "cocos/platform/CCGLView.cpp", + "cocos/platform/CCGLView.h", "cocos/platform/CCImage.cpp", "cocos/platform/CCImage.h", "cocos/platform/CCSAXParser.cpp", @@ -732,8 +738,8 @@ "cocos/platform/android/CCFileUtilsAndroid.cpp", "cocos/platform/android/CCFileUtilsAndroid.h", "cocos/platform/android/CCGL.h", - "cocos/platform/android/CCGLView.cpp", - "cocos/platform/android/CCGLView.h", + "cocos/platform/android/CCGLViewImpl.cpp", + "cocos/platform/android/CCGLViewImpl.h", "cocos/platform/android/CCPlatformDefine.h", "cocos/platform/android/CCStdC.h", "cocos/platform/android/ControllerManualAdapter/.classpath", @@ -802,8 +808,8 @@ "cocos/platform/apple/CCLock.cpp", "cocos/platform/apple/CCLock.h", "cocos/platform/apple/CCThread.mm", - "cocos/platform/desktop/CCGLView.cpp", - "cocos/platform/desktop/CCGLView.h", + "cocos/platform/desktop/CCGLViewImpl.cpp", + "cocos/platform/desktop/CCGLViewImpl.h", "cocos/platform/ios/CCApplication.h", "cocos/platform/ios/CCApplication.mm", "cocos/platform/ios/CCCommon.mm", @@ -816,8 +822,8 @@ "cocos/platform/ios/CCES2Renderer.m", "cocos/platform/ios/CCESRenderer.h", "cocos/platform/ios/CCGL.h", - "cocos/platform/ios/CCGLView.h", - "cocos/platform/ios/CCGLView.mm", + "cocos/platform/ios/CCGLViewImpl.h", + "cocos/platform/ios/CCGLViewImpl.mm", "cocos/platform/ios/CCImage.mm", "cocos/platform/ios/CCPlatformDefine.h", "cocos/platform/ios/CCStdC.h", @@ -977,18 +983,14 @@ "cocos/storage/local-storage/LocalStorage.cpp", "cocos/storage/local-storage/LocalStorage.h", "cocos/storage/local-storage/LocalStorageAndroid.cpp", - "cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj", - "cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj.filters", - "cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj.user", "cocos/storage/local-storage/proj.wp8/libLocalStorage.vcxproj", "cocos/storage/local-storage/proj.wp8/libLocalStorage.vcxproj.filters", "cocos/ui/Android.mk", - "cocos/ui/CCProtectedNode.cpp", - "cocos/ui/CCProtectedNode.h", "cocos/ui/CMakeLists.txt", "cocos/ui/CocosGUI.cpp", "cocos/ui/CocosGUI.h", "cocos/ui/GUIDefine.h", + "cocos/ui/GUIExport.h", "cocos/ui/UIButton.cpp", "cocos/ui/UIButton.h", "cocos/ui/UICheckBox.cpp", @@ -1017,6 +1019,8 @@ "cocos/ui/UIRelativeBox.h", "cocos/ui/UIRichText.cpp", "cocos/ui/UIRichText.h", + "cocos/ui/UIScale9Sprite.cpp", + "cocos/ui/UIScale9Sprite.h", "cocos/ui/UIScrollView.cpp", "cocos/ui/UIScrollView.h", "cocos/ui/UISlider.cpp", @@ -1036,9 +1040,9 @@ "cocos/ui/UIVideoPlayerIOS.mm", "cocos/ui/UIWidget.cpp", "cocos/ui/UIWidget.h", - "cocos/ui/proj.win32/libGUI.vcxproj", - "cocos/ui/proj.win32/libGUI.vcxproj.filters", - "cocos/ui/proj.win32/libGUI.vcxproj.user", + "cocos/ui/proj.win32/libui.vcxproj", + "cocos/ui/proj.win32/libui.vcxproj.filters", + "cocos/ui/proj.win32/libui.vcxproj.user", "cocos/ui/proj.wp8/libGUI.vcxproj", "cocos/ui/proj.wp8/libGUI.vcxproj.filters", "docs/CODING_STYLE.md", @@ -1050,6 +1054,7 @@ "download-deps.py", "extensions/Android.mk", "extensions/CMakeLists.txt", + "extensions/ExtensionExport.h", "extensions/ExtensionMacros.h", "extensions/GUI/CCControlExtension/CCControl.cpp", "extensions/GUI/CCControlExtension/CCControl.h", @@ -1105,9 +1110,9 @@ "extensions/physics-nodes/CCPhysicsSprite.h", "extensions/proj.win32/Win32InputBox.cpp", "extensions/proj.win32/Win32InputBox.h", - "extensions/proj.win32/libExtensions.vcxproj", - "extensions/proj.win32/libExtensions.vcxproj.filters", - "extensions/proj.win32/libExtensions.vcxproj.user", + "extensions/proj.win32/libextension.vcxproj", + "extensions/proj.win32/libextension.vcxproj.filters", + "extensions/proj.win32/libextension.vcxproj.user", "extensions/proj.wp8/libExtensions.vcxproj", "extensions/proj.wp8/libExtensions.vcxproj.filters", "extensions/proj.wp8/pch.cpp", @@ -1207,8 +1212,8 @@ "external/Box2D/Dynamics/b2WorldCallbacks.h", "external/Box2D/Rope/b2Rope.cpp", "external/Box2D/Rope/b2Rope.h", - "external/Box2D/proj.win32/Box2D.vcxproj", - "external/Box2D/proj.win32/Box2D.vcxproj.filters", + "external/Box2D/proj.win32/libbox2d.vcxproj", + "external/Box2D/proj.win32/libbox2d.vcxproj.filters", "external/Box2D/proj.wp8/Box2D.vcxproj", "external/Box2D/proj.wp8/Box2D.vcxproj.filters", "external/ConvertUTF/ConvertUTF.c", @@ -2267,6 +2272,7 @@ "licenses/LICENSE_llvm.txt", "licenses/LICENSE_lua.txt", "licenses/LICENSE_ogg_vorbis.txt", + "licenses/LICENSE_spine.txt", "licenses/LICENSE_tolua++.txt", "licenses/LICENSE_unicode.txt", "licenses/LICENSE_zlib.txt", @@ -3551,6 +3557,15 @@ "plugin/tools/toolsForPublish/checkEnvironment.sh", "plugin/tools/toolsForPublish/genPrebuildMK.sh", "plugin/tools/toolsForPublish/publishPlugin.sh", + "tools/fbx-conv/README.md", + "tools/fbx-conv/mac/fbx-conv", + "tools/fbx-conv/mac/libfbxsdk.dylib", + "tools/gen-prebuilt/README.md", + "tools/gen-prebuilt/build_config.json", + "tools/gen-prebuilt/excopy.py", + "tools/gen-prebuilt/gen_prebuilt_libs.py", + "tools/gen-prebuilt/module_config.json", + "tools/gen-prebuilt/module_organize.py", "tools/particle/convert_YCoordFlipped.py" ], "lua": [ @@ -3698,8 +3713,6 @@ "cocos/scripting/lua-bindings/auto/api/FadeOutTRTiles.lua", "cocos/scripting/lua-bindings/auto/api/FadeOutUpTiles.lua", "cocos/scripting/lua-bindings/auto/api/FadeTo.lua", - "cocos/scripting/lua-bindings/auto/api/FastTMXLayer.lua", - "cocos/scripting/lua-bindings/auto/api/FastTMXTiledMap.lua", "cocos/scripting/lua-bindings/auto/api/FileUtils.lua", "cocos/scripting/lua-bindings/auto/api/FiniteTimeAction.lua", "cocos/scripting/lua-bindings/auto/api/FlipX.lua", @@ -3713,7 +3726,7 @@ "cocos/scripting/lua-bindings/auto/api/GLProgramCache.lua", "cocos/scripting/lua-bindings/auto/api/GLProgramState.lua", "cocos/scripting/lua-bindings/auto/api/GLView.lua", - "cocos/scripting/lua-bindings/auto/api/GLViewProtocol.lua", + "cocos/scripting/lua-bindings/auto/api/GLViewImpl.lua", "cocos/scripting/lua-bindings/auto/api/GUIReader.lua", "cocos/scripting/lua-bindings/auto/api/Grid3D.lua", "cocos/scripting/lua-bindings/auto/api/Grid3DAction.lua", @@ -3937,6 +3950,7 @@ "cocos/scripting/lua-bindings/auto/api/ZOrderFrame.lua", "cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua", "cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_controller_auto_api.lua", + "cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_experimental_auto_api.lua", "cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_experimental_video_auto_api.lua", "cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_extension_auto_api.lua", "cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_physics_auto_api.lua", @@ -3947,6 +3961,8 @@ "cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp", "cocos/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.cpp", "cocos/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.hpp", + "cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_auto.cpp", + "cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_auto.hpp", "cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_video_auto.cpp", "cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_video_auto.hpp", "cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.cpp", @@ -3987,6 +4003,8 @@ "cocos/scripting/lua-bindings/manual/lua_cocos2dx_controller_manual.hpp", "cocos/scripting/lua-bindings/manual/lua_cocos2dx_deprecated.cpp", "cocos/scripting/lua-bindings/manual/lua_cocos2dx_deprecated.h", + "cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_manual.cpp", + "cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_manual.hpp", "cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_video_manual.cpp", "cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_video_manual.hpp", "cocos/scripting/lua-bindings/manual/lua_cocos2dx_extension_manual.cpp", @@ -4418,6 +4436,7 @@ "tools/tolua/README.mdown", "tools/tolua/cocos2dx.ini", "tools/tolua/cocos2dx_controller.ini", + "tools/tolua/cocos2dx_experimental.ini", "tools/tolua/cocos2dx_experimental_video.ini", "tools/tolua/cocos2dx_extension.ini", "tools/tolua/cocos2dx_physics.ini", diff --git a/templates/cpp-template-default/Classes/AppDelegate.cpp b/templates/cpp-template-default/Classes/AppDelegate.cpp index c0f7c567b4..beb7bc9e7a 100644 --- a/templates/cpp-template-default/Classes/AppDelegate.cpp +++ b/templates/cpp-template-default/Classes/AppDelegate.cpp @@ -16,7 +16,7 @@ bool AppDelegate::applicationDidFinishLaunching() { auto director = Director::getInstance(); auto glview = director->getOpenGLView(); if(!glview) { - glview = GLView::create("My Game"); + glview = GLViewImpl::create("My Game"); director->setOpenGLView(glview); } diff --git a/templates/cpp-template-default/proj.android/.project b/templates/cpp-template-default/proj.android/.project index 13490a653a..5b37f94afb 100644 --- a/templates/cpp-template-default/proj.android/.project +++ b/templates/cpp-template-default/proj.android/.project @@ -121,7 +121,7 @@ libcocos2d 2 - PARENT-1-PROJECT_LOC/cocos2d/cocos/2d/platform/android/java/src + PARENT-1-PROJECT_LOC/cocos2d/cocos/platform/android/java/src diff --git a/templates/cpp-template-default/proj.ios_mac/ios/AppController.mm b/templates/cpp-template-default/proj.ios_mac/ios/AppController.mm index 94f112f4ca..897519c84c 100644 --- a/templates/cpp-template-default/proj.ios_mac/ios/AppController.mm +++ b/templates/cpp-template-default/proj.ios_mac/ios/AppController.mm @@ -74,7 +74,7 @@ static AppDelegate s_sharedApplication; [[UIApplication sharedApplication] setStatusBarHidden:true]; // IMPORTANT: Setting the GLView should be done after creating the RootViewController - cocos2d::GLView *glview = cocos2d::GLView::createWithEAGLView(eaglView); + cocos2d::GLView *glview = cocos2d::GLViewImpl::createWithEAGLView(eaglView); cocos2d::Director::getInstance()->setOpenGLView(glview); cocos2d::Application::getInstance()->run(); diff --git a/templates/cpp-template-default/proj.ios_mac/ios/RootViewController.mm b/templates/cpp-template-default/proj.ios_mac/ios/RootViewController.mm index c6e23901b4..1c56c06631 100644 --- a/templates/cpp-template-default/proj.ios_mac/ios/RootViewController.mm +++ b/templates/cpp-template-default/proj.ios_mac/ios/RootViewController.mm @@ -72,7 +72,7 @@ - (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation { [super didRotateFromInterfaceOrientation:fromInterfaceOrientation]; - cocos2d::GLView *glview = cocos2d::Director::getInstance()->getOpenGLView(); + auto glview = cocos2d::Director::getInstance()->getOpenGLView(); if (glview) { diff --git a/templates/lua-template-default/src/main.lua b/templates/lua-template-default/src/main.lua index b33be1cbca..4b1e4d37c6 100644 --- a/templates/lua-template-default/src/main.lua +++ b/templates/lua-template-default/src/main.lua @@ -58,7 +58,7 @@ local function main() local origin = cc.Director:getInstance():getVisibleOrigin() -- add the moving dog - local function creatDog() + local function createDog() local frameWidth = 105 local frameHeight = 95 @@ -130,7 +130,7 @@ local function main() end -- add moving dog - local spriteDog = creatDog() + local spriteDog = createDog() layerFarm:addChild(spriteDog) -- handing touch events diff --git a/templates/lua-template-runtime/.settings/version.json b/templates/lua-template-runtime/.settings/version.json index 5f06abfbad..62ee19a364 100644 --- a/templates/lua-template-runtime/.settings/version.json +++ b/templates/lua-template-runtime/.settings/version.json @@ -1,4 +1,4 @@ { - "templateVersion":"1.2", - "runtimeVersion":"1.2" + "templateVersion":"1.3", + "runtimeVersion":"1.3" } \ No newline at end of file diff --git a/templates/lua-template-runtime/config.json b/templates/lua-template-runtime/config.json index 09215954df..c88d6cf401 100644 --- a/templates/lua-template-runtime/config.json +++ b/templates/lua-template-runtime/config.json @@ -4,7 +4,8 @@ "name": "HelloLua", "width": 960, "height": 640, - "entry": "src/main.lua" + "entry": "src/main.lua", + "consolePort": 6010 }, "simulator_screen_size": [ { diff --git a/templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp b/templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp index 1b2efff673..515cfdc6b0 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp +++ b/templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp @@ -46,9 +46,7 @@ bool AppDelegate::applicationDidFinishLaunching() #endif } - // turn on display FPS - director->setDisplayStats(true); - + // set FPS. the default value is 1.0/60 if you don't call this director->setAnimationInterval(1.0 / 60); diff --git a/templates/lua-template-runtime/frameworks/runtime-src/Classes/ConfigParser.cpp b/templates/lua-template-runtime/frameworks/runtime-src/Classes/ConfigParser.cpp index 9054ac4ca8..9e5381a07a 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/Classes/ConfigParser.cpp +++ b/templates/lua-template-runtime/frameworks/runtime-src/Classes/ConfigParser.cpp @@ -24,6 +24,7 @@ bool ConfigParser::isInit() void ConfigParser::readConfig() { _isInit = true; + _consolePort = 6010; string filecfg = "config.json"; string fileContent; @@ -69,6 +70,9 @@ void ConfigParser::readConfig() if (objectInitView.HasMember("entry") && objectInitView["entry"].IsString()) { _entryfile = objectInitView["entry"].GetString(); } + if (objectInitView.HasMember("consolePort")){ + _consolePort = objectInitView["consolePort"].GetUint(); + } } } if (_docRootjson.HasMember("simulator_screen_size")) @@ -123,6 +127,10 @@ bool ConfigParser::isLanscape() return _isLandscape; } +int ConfigParser::getConsolePort() +{ + return _consolePort; +} int ConfigParser::getScreenSizeCount(void) { return (int)_screenSizeArray.size(); diff --git a/templates/lua-template-runtime/frameworks/runtime-src/Classes/ConfigParser.h b/templates/lua-template-runtime/frameworks/runtime-src/Classes/ConfigParser.h index 7b2f536bb6..adae188dd5 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/Classes/ConfigParser.h +++ b/templates/lua-template-runtime/frameworks/runtime-src/Classes/ConfigParser.h @@ -36,6 +36,7 @@ public: string getEntryFile(); rapidjson::Document& getConfigJsonRoot(); const SimulatorScreenSize getScreenSize(int index); + int getConsolePort(); bool isLanscape(); bool isInit(); @@ -48,6 +49,7 @@ private: string _entryfile; bool _isLandscape; bool _isInit; + int _consolePort; rapidjson::Document _docRootjson; }; diff --git a/templates/lua-template-runtime/frameworks/runtime-src/Classes/protobuf-lite/google/protobuf/stubs/atomicops_internals_x86_gcc.cc b/templates/lua-template-runtime/frameworks/runtime-src/Classes/protobuf-lite/google/protobuf/stubs/atomicops_internals_x86_gcc.cc new file mode 100644 index 0000000000..07748723f6 --- /dev/null +++ b/templates/lua-template-runtime/frameworks/runtime-src/Classes/protobuf-lite/google/protobuf/stubs/atomicops_internals_x86_gcc.cc @@ -0,0 +1,137 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2012 Google Inc. All rights reserved. +// http://code.google.com/p/protobuf/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +// This module gets enough CPU information to optimize the +// atomicops module on x86. + +#include + +#include + +// This file only makes sense with atomicops_internals_x86_gcc.h -- it +// depends on structs that are defined in that file. If atomicops.h +// doesn't sub-include that file, then we aren't needed, and shouldn't +// try to do anything. +#ifdef GOOGLE_PROTOBUF_ATOMICOPS_INTERNALS_X86_GCC_H_ + +// Inline cpuid instruction. In PIC compilations, %ebx contains the address +// of the global offset table. To avoid breaking such executables, this code +// must preserve that register's value across cpuid instructions. +#if defined(__i386__) +#define cpuid(a, b, c, d, inp) \ + asm("mov %%ebx, %%edi\n" \ + "cpuid\n" \ + "xchg %%edi, %%ebx\n" \ + : "=a" (a), "=D" (b), "=c" (c), "=d" (d) : "a" (inp)) +#elif defined(__x86_64__) +#define cpuid(a, b, c, d, inp) \ + asm("mov %%rbx, %%rdi\n" \ + "cpuid\n" \ + "xchg %%rdi, %%rbx\n" \ + : "=a" (a), "=D" (b), "=c" (c), "=d" (d) : "a" (inp)) +#endif + +#if defined(cpuid) // initialize the struct only on x86 + +namespace google { +namespace protobuf { +namespace internal { + +// Set the flags so that code will run correctly and conservatively, so even +// if we haven't been initialized yet, we're probably single threaded, and our +// default values should hopefully be pretty safe. +struct AtomicOps_x86CPUFeatureStruct AtomicOps_Internalx86CPUFeatures = { + false, // bug can't exist before process spawns multiple threads + false, // no SSE2 +}; + +namespace { + +// Initialize the AtomicOps_Internalx86CPUFeatures struct. +void AtomicOps_Internalx86CPUFeaturesInit() { + uint32_t eax; + uint32_t ebx; + uint32_t ecx; + uint32_t edx; + + // Get vendor string (issue CPUID with eax = 0) + cpuid(eax, ebx, ecx, edx, 0); + char vendor[13]; + memcpy(vendor, &ebx, 4); + memcpy(vendor + 4, &edx, 4); + memcpy(vendor + 8, &ecx, 4); + vendor[12] = 0; + + // get feature flags in ecx/edx, and family/model in eax + cpuid(eax, ebx, ecx, edx, 1); + + int family = (eax >> 8) & 0xf; // family and model fields + int model = (eax >> 4) & 0xf; + if (family == 0xf) { // use extended family and model fields + family += (eax >> 20) & 0xff; + model += ((eax >> 16) & 0xf) << 4; + } + + // Opteron Rev E has a bug in which on very rare occasions a locked + // instruction doesn't act as a read-acquire barrier if followed by a + // non-locked read-modify-write instruction. Rev F has this bug in + // pre-release versions, but not in versions released to customers, + // so we test only for Rev E, which is family 15, model 32..63 inclusive. + if (strcmp(vendor, "AuthenticAMD") == 0 && // AMD + family == 15 && + 32 <= model && model <= 63) { + AtomicOps_Internalx86CPUFeatures.has_amd_lock_mb_bug = true; + } else { + AtomicOps_Internalx86CPUFeatures.has_amd_lock_mb_bug = false; + } + + // edx bit 26 is SSE2 which we use to tell use whether we can use mfence + AtomicOps_Internalx86CPUFeatures.has_sse2 = ((edx >> 26) & 1); +} + +class AtomicOpsx86Initializer { + public: + AtomicOpsx86Initializer() { + AtomicOps_Internalx86CPUFeaturesInit(); + } +}; + +// A global to get use initialized on startup via static initialization :/ +AtomicOpsx86Initializer g_initer; + +} // namespace + +} // namespace internal +} // namespace protobuf +} // namespace google + +#endif // __i386__ + +#endif // GOOGLE_PROTOBUF_ATOMICOPS_INTERNALS_X86_GCC_H_ diff --git a/templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/Runtime.cpp b/templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/Runtime.cpp index 1dddcd2832..07bb6906bb 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/Runtime.cpp +++ b/templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/Runtime.cpp @@ -35,6 +35,7 @@ THE SOFTWARE. #include "ConfigParser.h" #include "Protos.pb.h" #include "zlib.h" +#include "lua.h" #ifdef _WIN32 #include @@ -49,7 +50,7 @@ using namespace std; using namespace cocos2d; std::string g_resourcePath; -extern string getIPAddress(); + //1M size #define MAXPROTOLENGTH 1048576 @@ -60,11 +61,81 @@ extern string getIPAddress(); #define usleep(t) usleep(t) #endif +extern string getIPAddress(); const char* getRuntimeVersion() { - return "1.2"; + return "1.3"; } +static string& replaceAll(string& str,const string& old_value,const string& new_value) +{ + while(true) + { + int pos=0; + if((pos=str.find(old_value,0))!=string::npos) + str.replace(pos,old_value.length(),new_value); + else break; + } + return str; +} +static bool resetLuaModule(string fileName) +{ + if (fileName.empty()) + { + CCLOG("fileName is null"); + return false; + } + auto engine = LuaEngine::getInstance(); + LuaStack* luaStack = engine->getLuaStack(); + lua_State* stack=luaStack->getLuaState(); + lua_getglobal(stack, "package"); /* L: package */ + lua_getfield(stack, -1, "loaded"); /* L: package loaded */ + lua_pushnil(stack); /* L: lotable ?-.. nil */ + while ( 0 != lua_next(stack, -2 ) ) /* L: lotable ?-.. key value */ + { + //CCLOG("%s - %s \n", tolua_tostring(stack, -2, ""), lua_typename(stack, lua_type(stack, -1))); + std::string key=tolua_tostring(stack, -2, ""); + std::string tableKey =key; + int found = tableKey.rfind(".lua"); + if (found!=std::string::npos) + tableKey = tableKey.substr(0,found); + tableKey=replaceAll(tableKey,".","/"); + tableKey=replaceAll(tableKey,"\\","/"); + tableKey.append(".lua"); + found = fileName.rfind(tableKey); + if (0 == found || ( found!=std::string::npos && fileName.at(found-1) == '/')) + { + lua_pushstring(stack, key.c_str()); + lua_pushnil(stack); + if (lua_istable(stack, -5)) + { + lua_settable(stack, -5); + } + } + lua_pop(stack, 1); + } + lua_pop(stack, 2); + return true; +} +bool reloadScript(string modulefile) +{ + auto director = Director::getInstance(); + FontFNT::purgeCachedData(); + if (director->getOpenGLView()) + { + SpriteFrameCache::getInstance()->removeSpriteFrames(); + director->getTextureCache()->removeAllTextures(); + } + FileUtils::getInstance()->purgeCachedEntries(); + if (!resetLuaModule(modulefile)) + { + modulefile = ConfigParser::getInstance()->getEntryFile().c_str(); + } + auto engine = LuaEngine::getInstance(); + LuaStack* luaStack = engine->getLuaStack(); + std::string require = "require \'" + modulefile + "\'"; + return luaStack->executeString(require.c_str()); +} void startScript(string strDebugArg) { // register lua engine @@ -77,28 +148,8 @@ void startScript(string strDebugArg) engine->executeScriptFile(ConfigParser::getInstance()->getEntryFile().c_str()); } -bool reloadScript(const string& modulefile) -{ - string strfile = modulefile; - if (strfile.empty()) - { - strfile = ConfigParser::getInstance()->getEntryFile().c_str(); - } - auto director = Director::getInstance(); - FontFNT::purgeCachedData(); - if (director->getOpenGLView()) - { - SpriteFrameCache::getInstance()->removeSpriteFrames(); - director->getTextureCache()->removeAllTextures(); - } - FileUtils::getInstance()->purgeCachedEntries(); - - director->getScheduler()->unscheduleAll(); - director->getScheduler()->scheduleUpdate(director->getActionManager(), Scheduler::PRIORITY_SYSTEM, false); - - return (LuaEngine::getInstance()->reload(strfile.c_str())==0); -} + #if defined(_MSC_VER) || defined(__MINGW32__) #include @@ -231,7 +282,7 @@ void FileServer::readResFileFinfo() if (!pFile) return ; fwrite(str,sizeof(char),strlen(str),pFile); fclose(pFile); - },this, 10.0f, false, "fileinfo"); + },this, 5.0f, false, "fileinfo"); } void FileServer::addResFileInfo(const char* filename,uint64_t u64) @@ -337,19 +388,8 @@ void FileServer::stop() } } -string& replaceAll(string& str,const string& old_value,const string& new_value) -{ - while(true) - { - int pos=0; - if((pos=str.find(old_value,0))!=string::npos) - str.replace(pos,old_value.length(),new_value); - else break; - } - return str; -} -bool CreateDir(const char *sPathName) +static bool CreateDir(const char *sPathName) { char DirName[256]={0}; strcpy(DirName, sPathName); @@ -382,7 +422,7 @@ bool CreateDir(const char *sPathName) return true; } -void recvBuf(int fd,char *pbuf,int bufsize) +static void recvBuf(int fd,char *pbuf,int bufsize) { int startFlagLen = bufsize; while (startFlagLen != 0){ @@ -447,7 +487,14 @@ void FileServer::loopReceiveFile() } } int contentSize = recvDataBuf.fileProto.content_size(); - if (contentSize>0){ + if (contentSize == 0) + { + recvDataBuf.contentBuf=""; + _recvBufListMutex.lock(); + _recvBufList.push_back(recvDataBuf); + _recvBufListMutex.unlock(); + }else if(contentSize>0) + { //recv body data Bytef *contentbuf= new Bytef[contentSize+1]; memset(contentbuf,0,contentSize+1); @@ -513,7 +560,7 @@ void FileServer::loopWriteFile() _fileNameMutex.lock(); _strFileName = filename; _fileNameMutex.unlock(); - cocos2d::log("WriteFile:: fullfilename = %s",filename.c_str()); + //cocos2d::log("WriteFile:: fullfilename = %s",filename.c_str()); CreateDir(fullfilename.substr(0,fullfilename.find_last_of("/")).c_str()); FILE *fp= nullptr; @@ -531,7 +578,7 @@ void FileServer::loopWriteFile() continue; } if (fp){ - if (0 == fwrite(recvDataBuf.contentBuf.c_str(), sizeof(char), recvDataBuf.contentBuf.size(),fp)){ + if (recvDataBuf.contentBuf.size() > 0 && 0 == fwrite(recvDataBuf.contentBuf.c_str(), sizeof(char), recvDataBuf.contentBuf.size(),fp)){ addResponse(recvDataBuf.fd,filename,runtime::FileSendComplete::RESULTTYPE::FileSendComplete_RESULTTYPE_FWRITE_ERROR,errno); fclose(fp); continue; @@ -751,16 +798,23 @@ public: for (int i=0;i< sizeof(commands)/sizeof(Console::Command);i++) { _console->addCommand(commands[i]); } +#if(CC_PLATFORM_MAC == CC_TARGET_PLATFORM || CC_PLATFORM_WIN32 == CC_TARGET_PLATFORM) + _console->listenOnTCP(ConfigParser::getInstance()->getConsolePort()); +#else _console->listenOnTCP(6010); - +#endif + _fileserver = nullptr; +#if(CC_PLATFORM_MAC != CC_TARGET_PLATFORM && CC_PLATFORM_WIN32 != CC_TARGET_PLATFORM) _fileserver= FileServer::getShareInstance(); _fileserver->listenOnTCP(6020); _fileserver->readResFileFinfo(); +#endif } ~ConsoleCustomCommand() { Director::getInstance()->getConsole()->stop(); + if(_fileserver) _fileserver->stop(); } @@ -810,9 +864,11 @@ public: dReplyParse.AddMember("code",0,dReplyParse.GetAllocator()); }else if(strcmp(strcmd.c_str(),"getfileinfo")==0){ rapidjson::Value bodyvalue(rapidjson::kObjectType); - rapidjson::Document* filecfgjson = _fileserver->getFileCfgJson(); - for (auto it=filecfgjson->MemberonBegin();it!=filecfgjson->MemberonEnd();++it){ - bodyvalue.AddMember(it->name.GetString(),it->value.GetString(),dReplyParse.GetAllocator()); + if(_fileserver){ + rapidjson::Document* filecfgjson = _fileserver->getFileCfgJson(); + for (auto it=filecfgjson->MemberonBegin();it!=filecfgjson->MemberonEnd();++it){ + bodyvalue.AddMember(it->name.GetString(),it->value.GetString(),dReplyParse.GetAllocator()); + } } dReplyParse.AddMember("body",bodyvalue,dReplyParse.GetAllocator()); dReplyParse.AddMember("code",0,dReplyParse.GetAllocator()); @@ -1056,6 +1112,11 @@ bool initRuntime() searchPathArray.insert(searchPathArray.begin(),g_resourcePath); FileUtils::getInstance()->setSearchPaths(searchPathArray); + auto engine = LuaEngine::getInstance(); + ScriptEngineManager::getInstance()->setScriptEngine(engine); + LuaStack* stack = engine->getLuaStack(); + register_runtime_override_function(stack->getLuaState()); + luaopen_debugger(engine->getLuaStack()->getLuaState()); return true; } @@ -1075,16 +1136,13 @@ bool startRuntime() #endif #endif - static ConsoleCustomCommand s_customCommand; - s_customCommand.init(); - auto engine = LuaEngine::getInstance(); - ScriptEngineManager::getInstance()->setScriptEngine(engine); + // turn on display FPS + Director::getInstance()->setDisplayStats(true); - LuaStack* stack = engine->getLuaStack(); - register_runtime_override_function(stack->getLuaState()); - - luaopen_debugger(engine->getLuaStack()->getLuaState()); - + static ConsoleCustomCommand *g_customCommand; + g_customCommand = new ConsoleCustomCommand(); + g_customCommand->init(); + auto scene = Scene::create(); auto connectLayer = new ConnectWaitLayer(); connectLayer->autorelease(); diff --git a/templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/Runtime.h b/templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/Runtime.h index 284c34942f..34d662924b 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/Runtime.h +++ b/templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/Runtime.h @@ -31,7 +31,7 @@ using namespace std; bool initRuntime(); bool startRuntime(); -bool reloadScript(const string& modulefile); +bool reloadScript(string modulefile); #endif // _RUNTIME__H_ diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/Android.mk b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/Android.mk index d4ea0d1d11..c86a999470 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/Android.mk +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/Android.mk @@ -13,6 +13,7 @@ LOCAL_SRC_FILES := \ ../../Classes/protobuf-lite/google/protobuf/generated_message_util.cc \ ../../Classes/protobuf-lite/google/protobuf/message_lite.cc \ ../../Classes/protobuf-lite/google/protobuf/stubs/once.cc \ +../../Classes/protobuf-lite/google/protobuf/stubs/atomicops_internals_x86_gcc.cc \ ../../Classes/protobuf-lite/google/protobuf/repeated_field.cc \ ../../Classes/protobuf-lite/google/protobuf/wire_format_lite.cc \ ../../Classes/protobuf-lite/google/protobuf/io/zero_copy_stream.cc \ diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/src/org/cocos2dx/lua/AppActivity.java b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/src/org/cocos2dx/lua/AppActivity.java index d4dd55873a..512805a1aa 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/src/org/cocos2dx/lua/AppActivity.java +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/src/org/cocos2dx/lua/AppActivity.java @@ -30,6 +30,7 @@ import java.net.InetAddress; import java.net.NetworkInterface; import java.net.SocketException; import java.util.Enumeration; +import java.util.ArrayList; import org.cocos2dx.lib.Cocos2dxActivity; @@ -48,6 +49,7 @@ import android.os.Environment; import android.provider.Settings; import android.text.format.Formatter; import android.util.Log; +import android.view.WindowManager; import android.widget.Toast; // The name of .so is specified in AndroidMenifest.xml. NativityActivity will load it automatically for you. @@ -72,7 +74,8 @@ public class AppActivity extends Cocos2dxActivity{ // Check the wifi is opened when the native is debug. if(nativeIsDebug()) { - if(!isWifiConnected()) + getWindow().setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON, WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); + if(!isNetworkConnected()) { AlertDialog.Builder builder=new AlertDialog.Builder(this); builder.setTitle("Warning"); @@ -92,11 +95,20 @@ public class AppActivity extends Cocos2dxActivity{ } hostIPAdress = getHostIpAddress(); } - private boolean isWifiConnected() { + private boolean isNetworkConnected() { ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); if (cm != null) { NetworkInfo networkInfo = cm.getActiveNetworkInfo(); - if (networkInfo != null && networkInfo.getType() == ConnectivityManager.TYPE_WIFI) { + ArrayList networkTypes = new ArrayList(); + networkTypes.add(ConnectivityManager.TYPE_WIFI); + try { + networkTypes.add(ConnectivityManager.class.getDeclaredField("TYPE_ETHERNET").getInt(null)); + } catch (NoSuchFieldException nsfe) { + } + catch (IllegalAccessException iae) { + throw new RuntimeException(iae); + } + if (networkInfo != null && networkTypes.contains(networkInfo.getType())) { return true; } } diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj index 7f79759d56..e3f1928ef5 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj @@ -44,6 +44,7 @@ 3EB5156D1952865D006966AA /* stringprintf.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3EB515511952865D006966AA /* stringprintf.cc */; }; 3EB5156E1952865D006966AA /* wire_format_lite.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3EB515551952865D006966AA /* wire_format_lite.cc */; }; 3EB5156F1952865D006966AA /* wire_format_lite.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3EB515551952865D006966AA /* wire_format_lite.cc */; }; + 3EEEDB61197107C0006A9FF8 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EEEDB60197107C0006A9FF8 /* MediaPlayer.framework */; }; 5023811817EBBCAC00990C9B /* AppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5023810817EBBCAC00990C9B /* AppController.mm */; }; 5023811917EBBCAC00990C9B /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023810917EBBCAC00990C9B /* Default-568h@2x.png */; }; 5023811A17EBBCAC00990C9B /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023810A17EBBCAC00990C9B /* Default.png */; }; @@ -161,9 +162,6 @@ C08D5D6718E567C6009071A4 /* tp.lua in Resources */ = {isa = PBXBuildFile; fileRef = C08D5D5418E567C6009071A4 /* tp.lua */; }; C08D5D6818E567C6009071A4 /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = C08D5D5518E567C6009071A4 /* url.lua */; }; C08D5D6918E567C6009071A4 /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = C08D5D5518E567C6009071A4 /* url.lua */; }; - C09BA7E718BC929700A85A3E /* WorkSpaceDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = C09BA7E418BC929700A85A3E /* WorkSpaceDialog.xib */; }; - C09BA7E818BC929700A85A3E /* WorkSpaceDialogController.mm in Sources */ = {isa = PBXBuildFile; fileRef = C09BA7E618BC929700A85A3E /* WorkSpaceDialogController.mm */; }; - C09BA7EE18BCA49600A85A3E /* NSAppSheetAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = C09BA7ED18BCA49600A85A3E /* NSAppSheetAdditions.m */; }; D6B061351803AC000077942B /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D6B061341803AC000077942B /* CoreMotion.framework */; }; F293B3CD15EB7BE500256477 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3CC15EB7BE500256477 /* QuartzCore.framework */; }; F293B3D115EB7BE500256477 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3D015EB7BE500256477 /* OpenAL.framework */; }; @@ -390,6 +388,7 @@ 3EB515551952865D006966AA /* wire_format_lite.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wire_format_lite.cc; sourceTree = ""; }; 3EB515561952865D006966AA /* wire_format_lite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wire_format_lite.h; sourceTree = ""; }; 3EB515571952865D006966AA /* wire_format_lite_inl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wire_format_lite_inl.h; sourceTree = ""; }; + 3EEEDB60197107C0006A9FF8 /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/MediaPlayer.framework; sourceTree = DEVELOPER_DIR; }; 5023810717EBBCAC00990C9B /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = ""; }; 5023810817EBBCAC00990C9B /* AppController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppController.mm; sourceTree = ""; }; 5023810917EBBCAC00990C9B /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; @@ -471,11 +470,6 @@ C08D5D5318E567C6009071A4 /* socket.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = socket.lua; path = "../../cocos2d-x/external/lua/luasocket/socket.lua"; sourceTree = ""; }; C08D5D5418E567C6009071A4 /* tp.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = tp.lua; path = "../../cocos2d-x/external/lua/luasocket/tp.lua"; sourceTree = ""; }; C08D5D5518E567C6009071A4 /* url.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = url.lua; path = "../../cocos2d-x/external/lua/luasocket/url.lua"; sourceTree = ""; }; - C09BA7E418BC929700A85A3E /* WorkSpaceDialog.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = WorkSpaceDialog.xib; sourceTree = ""; }; - C09BA7E518BC929700A85A3E /* WorkSpaceDialogController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkSpaceDialogController.h; sourceTree = ""; }; - C09BA7E618BC929700A85A3E /* WorkSpaceDialogController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WorkSpaceDialogController.mm; sourceTree = ""; }; - C09BA7EC18BCA49600A85A3E /* NSAppSheetAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSAppSheetAdditions.h; sourceTree = ""; }; - C09BA7ED18BCA49600A85A3E /* NSAppSheetAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSAppSheetAdditions.m; sourceTree = ""; }; D6B061341803AC000077942B /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/CoreMotion.framework; sourceTree = DEVELOPER_DIR; }; F293B3C815EB7BE500256477 /* HelloLua iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HelloLua iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; F293B3CC15EB7BE500256477 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; @@ -518,6 +512,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 3EEEDB61197107C0006A9FF8 /* MediaPlayer.framework in Frameworks */, C03781F618BF65B100FE4F13 /* libluabindings iOS.a in Frameworks */, 15A8A4441834C43700142BE0 /* libchipmunk iOS.a in Frameworks */, 15A8A4451834C43700142BE0 /* libcocos2dx iOS.a in Frameworks */, @@ -689,11 +684,6 @@ 5023817117EBBE3400990C9B /* mac */ = { isa = PBXGroup; children = ( - C09BA7EC18BCA49600A85A3E /* NSAppSheetAdditions.h */, - C09BA7ED18BCA49600A85A3E /* NSAppSheetAdditions.m */, - C09BA7E418BC929700A85A3E /* WorkSpaceDialog.xib */, - C09BA7E518BC929700A85A3E /* WorkSpaceDialogController.h */, - C09BA7E618BC929700A85A3E /* WorkSpaceDialogController.mm */, 5023817217EBBE3400990C9B /* Icon.icns */, C07828F418B4D72E00BD2287 /* main.m */, C07828F518B4D72E00BD2287 /* MainMenu.xib */, @@ -780,6 +770,7 @@ F293B3CB15EB7BE500256477 /* Frameworks */ = { isa = PBXGroup; children = ( + 3EEEDB60197107C0006A9FF8 /* MediaPlayer.framework */, 3EB51526195187AF006966AA /* CFNetwork.framework */, 15A8A4871834C90E00142BE0 /* libcurl.dylib */, D6B061341803AC000077942B /* CoreMotion.framework */, @@ -1019,7 +1010,6 @@ C08D5D6118E567C6009071A4 /* mime.lua in Resources */, C03781D418BF656A00FE4F13 /* Cocos2d.lua in Resources */, C03781BA18BF655400FE4F13 /* res in Resources */, - C09BA7E718BC929700A85A3E /* WorkSpaceDialog.xib in Resources */, C03781BC18BF655400FE4F13 /* src in Resources */, C08D5D6918E567C6009071A4 /* url.lua in Resources */, C03781E218BF656A00FE4F13 /* DrawPrimitives.lua in Resources */, @@ -1148,12 +1138,10 @@ 3EB515691952865D006966AA /* common.cc in Sources */, 3EB515651952865D006966AA /* repeated_field.cc in Sources */, 3EB5156B1952865D006966AA /* once.cc in Sources */, - C09BA7EE18BCA49600A85A3E /* NSAppSheetAdditions.m in Sources */, 3EB5155D1952865D006966AA /* coded_stream.cc in Sources */, C00FD4991938512100C6382D /* Portrait_png.cpp in Sources */, C06C3797191A1D1E00617BED /* ConfigParser.cpp in Sources */, 3EB5156D1952865D006966AA /* stringprintf.cc in Sources */, - C09BA7E818BC929700A85A3E /* WorkSpaceDialogController.mm in Sources */, C07828F818B4D72E00BD2287 /* main.m in Sources */, 3EB515611952865D006966AA /* zero_copy_stream_impl_lite.cc in Sources */, 3EB5156F1952865D006966AA /* wire_format_lite.cc in Sources */, diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/MainMenu.xib b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/MainMenu.xib index 1d691c1d28..a803574695 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/MainMenu.xib +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/MainMenu.xib @@ -2,10 +2,10 @@ 1060 - 13C64 + 13D65 5056 - 1265.19 - 697.40 + 1265.20 + 698.00 com.apple.InterfaceBuilder.CocoaPlugin 5056 @@ -164,14 +164,6 @@ File - - - ChangeProject - - 2147483647 - - - Close @@ -299,6 +291,14 @@ + + + Keep Window Top + + 2147483647 + + + @@ -386,14 +386,6 @@ tSA-7z-LPk - - - onChangeProject: - - - - KV1-nK-nLn - onFileClose: @@ -458,6 +450,14 @@ XXg-eJ-YSn + + + onSetTop: + + + + jvv-x1-KeN + menu @@ -594,16 +594,10 @@ 81 - - - UUd-nT-0Tr - - - 611 @@ -687,6 +681,7 @@ + @@ -718,6 +713,11 @@ + + CXy-V7-NaY + + + @@ -761,6 +761,7 @@ com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -777,8 +778,6 @@ com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -801,7 +800,68 @@ - + + + + AppController + NSObject + + id + id + id + id + id + id + id + + + + onFileClose: + id + + + onRelaunch: + id + + + onScreenLandscape: + id + + + onScreenPortait: + id + + + onScreenZoomOut: + id + + + onSetTop: + id + + + onViewChangeFrameSize: + id + + + + menu + NSMenu + + + menu + + menu + NSMenu + + + + IBProjectSource + ./Classes/AppController.h + + + + 0 IBCocoaFramework YES @@ -811,7 +871,7 @@ com.apple.InterfaceBuilder.CocoaPlugin.macosx - + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/NSAppSheetAdditions.h b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/NSAppSheetAdditions.h deleted file mode 100644 index 0f7e43b3ce..0000000000 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/NSAppSheetAdditions.h +++ /dev/null @@ -1,8 +0,0 @@ - -#import - -@interface NSApplication (SheetAdditions) - -- (void)beginSheet:(NSWindow *)sheet modalForWindow:(NSWindow *)docWindow didEndBlock:(void (^)(NSInteger returnCode))block; - -@end diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/NSAppSheetAdditions.m b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/NSAppSheetAdditions.m deleted file mode 100644 index b5845bd784..0000000000 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/NSAppSheetAdditions.m +++ /dev/null @@ -1,22 +0,0 @@ - -#import "NSAppSheetAdditions.h" - -@implementation NSApplication (SheetAdditions) - -- (void)beginSheet:(NSWindow *)sheet modalForWindow:(NSWindow *)docWindow didEndBlock:(void (^)(NSInteger returnCode))block -{ - [self beginSheet:sheet - modalForWindow:docWindow - modalDelegate:self - didEndSelector:@selector(my_blockSheetDidEnd:returnCode:contextInfo:) - contextInfo:Block_copy(block)]; -} - -- (void)my_blockSheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo -{ - void (^block)(NSInteger returnCode) = contextInfo; - block(returnCode); - Block_release(block); -} - -@end diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.h b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.h index 411a256e9f..d7815e3ef7 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.h +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.h @@ -41,7 +41,7 @@ void createSimulator(const char* viewName, float width, float height,bool isLand @property (nonatomic, assign) IBOutlet NSMenu* menu; -- (IBAction) onChangeProject:(id)sender; +- (IBAction) onSetTop:(id)sender; - (IBAction) onFileClose:(id)sender; - (IBAction) onScreenPortait:(id)sender; - (IBAction) onScreenLandscape:(id)sender; diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm index 43cce5504e..b860aac9e9 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm @@ -22,16 +22,13 @@ THE SOFTWARE. ****************************************************************************/ -#import "SimulatorApp.h" -#import "WorkSpaceDialogController.h" -#import "NSAppSheetAdditions.h" - #include #include #include #include #include +#import "SimulatorApp.h" #include "AppDelegate.h" #include "glfw3.h" #include "glfw3native.h" @@ -43,6 +40,7 @@ using namespace cocos2d; bool g_landscape = false; +bool g_windTop = true; cocos2d::Size g_screenSize; GLView* g_eglView = nullptr; @@ -104,7 +102,7 @@ std::string getCurAppPath(void) width = height; height = tmpvalue; } - + g_windTop = true; g_eglView = GLView::createWithRect([viewName cStringUsingEncoding:NSUTF8StringEncoding],cocos2d::Rect(0.0f,0.0f,width,height),frameZoomFactor); auto director = Director::getInstance(); director->setOpenGLView(g_eglView); @@ -115,7 +113,7 @@ std::string getCurAppPath(void) [self createViewMenu]; [self updateMenu]; [window center]; - + [window becomeFirstResponder]; [window makeKeyAndOrderFront:self]; } @@ -172,6 +170,18 @@ void createSimulator(const char* viewName, float width, float height,bool isLand [itemPortait setState:NSOnState]; [itemLandscape setState:NSOffState]; } + + NSMenu *menuControl = [[[window menu] itemWithTitle:@"Control"] submenu]; + NSMenuItem *itemTop = [menuControl itemWithTitle:@"Keep Window Top"]; + if (g_windTop) { + [window setLevel:NSFloatingWindowLevel]; + [itemTop setState:NSOnState]; + } + else + { + [window setLevel:NSNormalWindowLevel]; + [itemTop setState:NSOffState]; + } int scale = g_eglView->getFrameZoomFactor()*100; @@ -223,7 +233,6 @@ void createSimulator(const char* viewName, float width, float height,bool isLand } - //[window setTitle:[NSString stringWithFormat:@"quick-x-player (%0.0f%%)", projectConfig.getFrameScale() * 100]]; } @@ -261,17 +270,10 @@ void createSimulator(const char* viewName, float width, float height,bool isLand [[NSRunningApplication currentApplication] terminate]; } -- (IBAction) onChangeProject:(id)sender +- (IBAction) onSetTop:(id)sender { - - WorkSpaceDialogController *controller = [[WorkSpaceDialogController alloc] initWithWindowNibName:@"WorkSpaceDialog"]; - [NSApp beginSheet:controller.window modalForWindow:window didEndBlock:^(NSInteger returnCode) { - if (returnCode == NSRunStoppedResponse) - { - CCLOG("1111"); - } - [controller release]; - }]; + g_windTop = !g_windTop; + [self updateMenu]; } diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialog.xib b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialog.xib deleted file mode 100644 index 7ebed71aa1..0000000000 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialog.xib +++ /dev/null @@ -1,846 +0,0 @@ - - - - 1070 - 13C64 - 5056 - 1265.19 - 697.40 - - com.apple.InterfaceBuilder.CocoaPlugin - 5056 - - - IBNSLayoutConstraint - NSButton - NSButtonCell - NSCustomObject - NSTextField - NSTextFieldCell - NSView - NSWindowTemplate - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - WorkSpaceDialogController - - - FirstResponder - - - NSApplication - - - 3 - 2 - {{196, 240}, {650, 150}} - 544736256 - Change Project - NSWindow - - - - - 256 - - - - 268 - {{17, 113}, {626, 17}} - - - YES - - 68157504 - 272630784 - Choose Project Directory: - - .LucidaGrandeUI - 13 - 1044 - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - NO - 1 - - - - 268 - {{20, 83}, {516, 22}} - - - YES - - -1804599231 - 272630848 - - - - YES - - 6 - System - textBackgroundColor - - 3 - MQA - - - - 6 - System - textColor - - - - NO - 1 - - - - 268 - {{538, 77}, {108, 32}} - - - {250, 750} - YES - - 67108864 - 134217728 - Select... - - - -2038284288 - 129 - - .LucidaGrandeUI - 13 - 16 - - - - 400 - 75 - - NO - - - - 268 - {{538, 22}, {109, 32}} - - - {250, 750} - YES - - 67108864 - 134217728 - Open Project - - - -2038284288 - 129 - - - - 400 - 75 - - NO - - - - 268 - {{13, 32}, {82, 32}} - - - {250, 750} - YES - - 67108864 - 134217728 - Cancel - - - -2038284288 - 129 - - - Gw - 400 - 75 - - NO - - - {650, 150} - - - - {{0, 0}, {1920, 1058}} - {10000000000000, 10000000000000} - NO - - - - NO - - - - textFieldProjectDirectory - - - - 307 - - - - window - - - - 308 - - - - browseProjectDirectory: - - - - 315 - - - - onOpenProject: - - - - OsS-1W-RIl - - - - onCancel: - - - - NeH-n8-xBM - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 1 - - - - - - - - 2 - - - - - - - - - - 9 - 0 - - 9 - 1 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - NO - - - - 4 - 0 - - 4 - 1 - 1 - - 29 - - 1000 - - 3 - 9 - 3 - NO - - - - 6 - 0 - - 6 - 1 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - NO - - - - 3 - 0 - - 4 - 1 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - NO - - - - 5 - 0 - - 5 - 1 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - NO - - - - 5 - 0 - - 6 - 1 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - NO - - - - 4 - 0 - - 4 - 1 - 1 - - 39 - - 1000 - - 3 - 9 - 3 - NO - - - - 5 - 0 - - 5 - 1 - 1 - - 20 - - 1000 - - 8 - 23 - 3 - NO - - - - 3 - 0 - - 4 - 1 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - NO - - - - 5 - 0 - - 5 - 1 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - NO - - - - 3 - 0 - - 3 - 1 - 1 - - 20 - - 1000 - - 8 - 23 - 3 - NO - - - - - - 3 - - - - - - 7 - 0 - - 0 - 1 - 1 - - 622 - - 1000 - - 3 - 9 - 1 - NO - - - - - - 4 - - - - - 9 - - - - - - 7 - 0 - - 0 - 1 - 1 - - 516 - - 1000 - - 3 - 9 - 1 - NO - - - - - - 10 - - - - - 15 - - - - - - 7 - 0 - - 0 - 1 - 1 - - 96 - - 1000 - - 3 - 9 - 1 - NO - - - - - - 16 - - - - - 290 - - - - - - - - 291 - - - - - h9P-cE-Nn4 - - - - - - - - IHP-6G-mVo - - - - - iMi-xo-eWy - - - - - YJ1-Hw-Y6d - - - - - PG0-hY-geV - - - - - i6K-RE-2fe - - - - - gk1-TV-YZn - - - - - pS2-KY-JwZ - - - - - H3W-Ag-EM4 - - - - - uNq-ax-eLX - - - - - G4a-SP-Ne5 - - - - - V9F-80-0WS - - - - - jJo-kq-191 - - - - - LdE-9Z-oWz - - - - - 88D-6W-iEt - - - - - DKd-WY-ZYy - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - - - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - - - - WorkSpaceDialogController - NSWindowController - - id - id - id - - - - browseProjectDirectory: - id - - - onCancel: - id - - - onOpenProject: - id - - - - NSButton - NSTextField - NSTextField - - - - buttonOpenProject - NSButton - - - textFieldProjectDirectory - NSTextField - - - textFieldScriptFile - NSTextField - - - - IBProjectSource - ./Classes/WorkSpaceDialogController.h - - - - - 0 - IBCocoaFramework - YES - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - YES - - diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialogController.h b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialogController.h deleted file mode 100644 index 2b9cddbd15..0000000000 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialogController.h +++ /dev/null @@ -1,22 +0,0 @@ - -#import - -@interface WorkSpaceDialogController : NSWindowController -{ - - NSTextField *textFieldProjectDirectory; - NSTextField *textFieldScriptFile; - NSButton *buttonOpenProject; -} - -@property (nonatomic, assign) IBOutlet NSTextField *textFieldProjectDirectory; -@property (nonatomic, assign) IBOutlet NSTextField *textFieldScriptFile; - -@property (nonatomic, assign) IBOutlet NSButton *buttonOpenProject; - -- (IBAction) browseProjectDirectory:(id)sender; - -- (IBAction) onCancel:(id)sender; -- (IBAction) onOpenProject:(id)sender; - -@end diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialogController.mm b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialogController.mm deleted file mode 100644 index 223803e55e..0000000000 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialogController.mm +++ /dev/null @@ -1,97 +0,0 @@ - -#import "WorkSpaceDialogController.h" - -#pragma mark - - -@implementation WorkSpaceDialogController - -@synthesize textFieldProjectDirectory; -@synthesize textFieldScriptFile; -@synthesize buttonOpenProject; - -NSString* projectPath=nil; -- (id)initWithWindow:(NSWindow *)window -{ - self = [super initWithWindow:window]; - if (self) { - // Initialization code here. - } - - return self; -} - -- (void)dealloc -{ - [super dealloc]; - NSLog(@"[WorkSpaceDialogController dealloc]"); -} - -- (void)windowDidLoad -{ - [super windowDidLoad]; - - // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file. - [self.window makeFirstResponder:textFieldProjectDirectory]; - if (nil != projectPath && 0 != projectPath.length) - { - [textFieldProjectDirectory setStringValue:projectPath]; - } -} - -#pragma mark - -#pragma mark functions - -- (NSString*) browseFolder:(NSString*)title -{ - NSOpenPanel* openDlg = [NSOpenPanel openPanel]; - [openDlg setTitle:title]; - [openDlg setCanChooseDirectories:YES]; - [openDlg setCanChooseFiles:NO]; - [openDlg setCanHide:YES]; - [openDlg setCanCreateDirectories:NO]; - [openDlg setCanSelectHiddenExtension:NO]; - [openDlg setAllowsMultipleSelection:NO]; - - if ([openDlg runModal] == NSFileHandlingPanelOKButton) - { - NSURL *url = [openDlg.URLs objectAtIndex:0]; - return [url path]; - } - return nil; -} - -#pragma mark - -#pragma mark outlet - -- (IBAction) browseProjectDirectory:(id)sender -{ - NSString *path = [self browseFolder:@"Choose Project Directory"]; - if (path) - { - [textFieldProjectDirectory setStringValue:path]; - } -} - - -- (IBAction) onCancel:(id)sender -{ - [self close]; - [NSApp endSheet:self.window returnCode:NSRunAbortedResponse]; -} - -- (IBAction) onOpenProject:(id)sender -{ - if([[textFieldProjectDirectory stringValue] isEqualToString:@""]) - { - NSRunAlertPanel(@"Waring", - @"Project path empty!", - @"OK", NULL, NULL); - return; - } - projectPath = [textFieldProjectDirectory stringValue]; - [self close]; - [NSApp endSheet:self.window returnCode:NSRunAbortedResponse]; -} - - -@end diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/SimulatorWindow.cpp b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/SimulatorWindow.cpp index d4ed7258a9..8e64c3d2cb 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/SimulatorWindow.cpp +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/SimulatorWindow.cpp @@ -38,6 +38,7 @@ using namespace cocos2d; WNDPROC g_oldProc=NULL; bool g_landscape=false; +bool g_windTop = true; CCSize g_screenSize; GLView* g_eglView=NULL; INT_PTR CALLBACK AboutDialogCallback(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); @@ -70,6 +71,7 @@ void updateMenu() { HMENU hSysMenu = GetSystemMenu(glfwGetWin32Window(g_eglView->getWindow()), FALSE); HMENU viewMenu = GetSubMenu(hSysMenu, 8); + HMENU viewControl = GetSubMenu(hSysMenu, 9); if (g_landscape) { @@ -82,6 +84,16 @@ void updateMenu() CheckMenuItem(viewMenu, ID_VIEW_LANDSCAPE, MF_BYCOMMAND | MF_UNCHECKED); } + if (g_windTop) + { + ::SetWindowPos(glfwGetWin32Window(g_eglView->getWindow()),HWND_TOPMOST,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE); + CheckMenuItem(viewControl, ID_CONTROL_TOP, MF_BYCOMMAND | MF_CHECKED); + + }else + { + ::SetWindowPos(glfwGetWin32Window(g_eglView->getWindow()),HWND_NOTOPMOST,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE); + CheckMenuItem(viewControl, ID_CONTROL_TOP, MF_BYCOMMAND | MF_UNCHECKED); + } int width = g_screenSize.width; int height = g_screenSize.height; if (height > width) @@ -244,6 +256,10 @@ LRESULT CALLBACK SNewWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPar switch (wmId) { + case ID_CONTROL_TOP: + g_windTop = !g_windTop; + updateView(); + break; case ID_FILE_EXIT: shutDownApp(); break; @@ -324,6 +340,7 @@ void createSimulator(const char* viewName, float width, float height, bool isLan width = height; height = tmpvalue; } + g_windTop = true; g_eglView = GLView::createWithRect(viewName,Rect(0,0,width,height),frameZoomFactor); auto director = Director::getInstance(); diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/game.rc b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/game.rc index 556a26c626..46a66d6cf7 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/game.rc +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/game.rc @@ -66,6 +66,7 @@ BEGIN POPUP "&Control" BEGIN MENUITEM "Restart(F5)", ID_CONTROL_RELOAD + MENUITEM "Keep Window Top", ID_CONTROL_TOP END POPUP "&Help" BEGIN @@ -88,19 +89,6 @@ BEGIN LTEXT "Cocos2d-x-Simulator",IDC_STATIC,29,17,169,25 END -IDD_DIALOG_VIEWCUSTOM DIALOGEX 0, 0, 179, 98 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Custom" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - DEFPUSHBUTTON "OK",IDOK,47,77,50,14 - PUSHBUTTON "Cancel",IDCANCEL,104,77,50,14 - LTEXT "Width",IDC_STATIC,15,14,30,8 - LTEXT "Height",IDC_STATIC,15,36,36,12 - EDITTEXT IDC_EDIT_WIDTH,60,15,89,14,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_HEIGHT,62,36,87,14,ES_AUTOHSCROLL -END - ///////////////////////////////////////////////////////////////////////////// // @@ -117,14 +105,6 @@ BEGIN TOPMARGIN, 7 BOTTOMMARGIN, 87 END - - IDD_DIALOG_VIEWCUSTOM, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 172 - TOPMARGIN, 7 - BOTTOMMARGIN, 91 - END END #endif // APSTUDIO_INVOKED diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/resource.h b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/resource.h index 6f04655931..d3ddc2bd16 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/resource.h +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/resource.h @@ -7,10 +7,7 @@ #define IDR_MENU_COCOS 201 #define IDD_DIALOG1 202 #define IDD_DIALOG_ABOUT 202 -#define IDD_DIALOG_VIEWCUSTOM 203 -#define IDC_EDIT_WIDTH 1000 #define IDC_EDIT2 1001 -#define IDC_EDIT_HEIGHT 1001 #define ID_VIEW_SIZE 30001 #define ID_FILE_NEW_WINDOW 32771 #define ID_VIEW_PORTRAIT 32775 @@ -27,13 +24,14 @@ #define ID_VIEW_ZOOMOUT75 32786 #define ID_VIEW_ZOOMOUT50 32787 #define ID_VIEW_ZOOMOUT25 32788 +#define ID_CONTROL_TOP 32793 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 201 -#define _APS_NEXT_COMMAND_VALUE 32793 +#define _APS_NEXT_COMMAND_VALUE 32794 #define _APS_NEXT_CONTROL_VALUE 1000 #define _APS_NEXT_SYMED_VALUE 101 #endif diff --git a/templates/lua-template-runtime/runtime/config.json b/templates/lua-template-runtime/runtime/config.json index 7d3a94ae77..4f28c9624c 100644 --- a/templates/lua-template-runtime/runtime/config.json +++ b/templates/lua-template-runtime/runtime/config.json @@ -1,6 +1,6 @@ { - "version":"v3-lua-runtime-1.2", - "zip_file_size":"24461574 ", + "version":"v3-lua-runtime-1.3.1", + "zip_file_size":"24660780", "repo_name":"cocos-runtime-bin", "repo_parent":"https://github.com/chukong/" } diff --git a/templates/lua-template-runtime/src/GameScene.lua b/templates/lua-template-runtime/src/GameScene.lua new file mode 100644 index 0000000000..cd817c5ba0 --- /dev/null +++ b/templates/lua-template-runtime/src/GameScene.lua @@ -0,0 +1,184 @@ +require "Cocos2d" +require "Cocos2dConstants" + +local GameScene = class("GameScene",function() + return cc.Scene:create() +end) + +function GameScene.create() + local scene = GameScene.new() + scene:addChild(scene:createLayerFarm()) + scene:addChild(scene:createLayerMenu()) + return scene +end + + +function GameScene:ctor() + self.visibleSize = cc.Director:getInstance():getVisibleSize() + self.origin = cc.Director:getInstance():getVisibleOrigin() + self.schedulerID = nil +end + +function GameScene:playBgMusic() + local bgMusicPath = cc.FileUtils:getInstance():fullPathForFilename("background.mp3") + cc.SimpleAudioEngine:getInstance():playMusic(bgMusicPath, true) + local effectPath = cc.FileUtils:getInstance():fullPathForFilename("effect1.wav") + cc.SimpleAudioEngine:getInstance():preloadEffect(effectPath) +end + +function GameScene:creatDog() + local frameWidth = 105 + local frameHeight = 95 + + -- create dog animate + local textureDog = cc.Director:getInstance():getTextureCache():addImage("dog.png") + local rect = cc.rect(0, 0, frameWidth, frameHeight) + local frame0 = cc.SpriteFrame:createWithTexture(textureDog, rect) + rect = cc.rect(frameWidth, 0, frameWidth, frameHeight) + local frame1 = cc.SpriteFrame:createWithTexture(textureDog, rect) + + local spriteDog = cc.Sprite:createWithSpriteFrame(frame0) + spriteDog:setPosition(self.origin.x, self.origin.y + self.visibleSize.height / 4 * 3) + spriteDog.isPaused = false + + local animation = cc.Animation:createWithSpriteFrames({frame0,frame1}, 0.5) + local animate = cc.Animate:create(animation); + spriteDog:runAction(cc.RepeatForever:create(animate)) + + -- moving dog at every frame + local function tick() + if spriteDog.isPaused then return end + local x, y = spriteDog:getPosition() + if x > self.origin.x + self.visibleSize.width then + x = self.origin.x + else + x = x + 1 + end + + spriteDog:setPositionX(x) + end + + self.schedulerID = cc.Director:getInstance():getScheduler():scheduleScriptFunc(tick, 0, false) + + return spriteDog +end + +-- create farm +function GameScene:createLayerFarm() + local layerFarm = cc.Layer:create() + -- add in farm background + local bg = cc.Sprite:create("farm.jpg") + bg:setPosition(self.origin.x + self.visibleSize.width / 2 + 80, self.origin.y + self.visibleSize.height / 2) + layerFarm:addChild(bg) + + -- add land sprite + for i = 0, 3 do + for j = 0, 1 do + local spriteLand = cc.Sprite:create("land.png") + spriteLand:setPosition(200 + j * 180 - i % 2 * 90, 10 + i * 95 / 2) + layerFarm:addChild(spriteLand) + end + end + + -- add crop + local frameCrop = cc.SpriteFrame:create("crop.png", cc.rect(0, 0, 105, 95)) + for i = 0, 3 do + for j = 0, 1 do + local spriteCrop = cc.Sprite:createWithSpriteFrame(frameCrop); + spriteCrop:setPosition(210 + j * 180 - i % 2 * 90, 40 + i * 95 / 2) + layerFarm:addChild(spriteCrop) + end + end + + -- add moving dog + local spriteDog = self:creatDog() + layerFarm:addChild(spriteDog) + + -- handing touch events + local touchBeginPoint = nil + local function onTouchBegan(touch, event) + local location = touch:getLocation() + --cclog("onTouchBegan: %0.2f, %0.2f", location.x, location.y) + touchBeginPoint = {x = location.x, y = location.y} + spriteDog.isPaused = true + -- CCTOUCHBEGAN event must return true + return true + end + + local function onTouchMoved(touch, event) + local location = touch:getLocation() + --cclog("onTouchMoved: %0.2f, %0.2f", location.x, location.y) + if touchBeginPoint then + local cx, cy = layerFarm:getPosition() + layerFarm:setPosition(cx + location.x - touchBeginPoint.x, + cy + location.y - touchBeginPoint.y) + touchBeginPoint = {x = location.x, y = location.y} + end + end + + local function onTouchEnded(touch, event) + local location = touch:getLocation() + --cclog("onTouchEnded: %0.2f, %0.2f", location.x, location.y) + touchBeginPoint = nil + spriteDog.isPaused = false + end + + local listener = cc.EventListenerTouchOneByOne:create() + listener:registerScriptHandler(onTouchBegan,cc.Handler.EVENT_TOUCH_BEGAN ) + listener:registerScriptHandler(onTouchMoved,cc.Handler.EVENT_TOUCH_MOVED ) + listener:registerScriptHandler(onTouchEnded,cc.Handler.EVENT_TOUCH_ENDED ) + local eventDispatcher = layerFarm:getEventDispatcher() + eventDispatcher:addEventListenerWithSceneGraphPriority(listener, layerFarm) + + local function onNodeEvent(event) + if "exit" == event then + cc.Director:getInstance():getScheduler():unscheduleScriptEntry(self.schedulerID) + end + end + layerFarm:registerScriptHandler(onNodeEvent) + + return layerFarm +end + +-- create menu +function GameScene:createLayerMenu() + + local layerMenu = cc.Layer:create() + local menuPopup, menuTools, effectID + + local function menuCallbackClosePopup() + -- stop test sound effect + cc.SimpleAudioEngine:getInstance():stopEffect(effectID) + menuPopup:setVisible(false) + end + + local function menuCallbackOpenPopup() + -- loop test sound effect + local effectPath = cc.FileUtils:getInstance():fullPathForFilename("effect1.wav") + effectID = cc.SimpleAudioEngine:getInstance():playEffect(effectPath) + menuPopup:setVisible(true) + end + + -- add a popup menu + local menuPopupItem = cc.MenuItemImage:create("menu2.png", "menu2.png") + menuPopupItem:setPosition(0, 0) + menuPopupItem:registerScriptTapHandler(menuCallbackClosePopup) + menuPopup = cc.Menu:create(menuPopupItem) + menuPopup:setPosition(self.origin.x + self.visibleSize.width / 2, self.origin.y + self.visibleSize.height / 2) + menuPopup:setVisible(false) + layerMenu:addChild(menuPopup) + + -- add the left-bottom "tools" menu to invoke menuPopup + local menuToolsItem = cc.MenuItemImage:create("menu1.png", "menu1.png") + menuToolsItem:setPosition(0, 0) + menuToolsItem:registerScriptTapHandler(menuCallbackOpenPopup) + menuTools = cc.Menu:create(menuToolsItem) + local itemWidth = menuToolsItem:getContentSize().width + local itemHeight = menuToolsItem:getContentSize().height + menuTools:setPosition(self.origin.x + itemWidth/2, self.origin.y + itemHeight/2) + layerMenu:addChild(menuTools) + + return layerMenu +end + +return GameScene diff --git a/templates/lua-template-runtime/src/hello2.lua b/templates/lua-template-runtime/src/hello2.lua deleted file mode 100644 index 27158aa788..0000000000 --- a/templates/lua-template-runtime/src/hello2.lua +++ /dev/null @@ -1,3 +0,0 @@ -function myadd(x, y) - return x + y -end \ No newline at end of file diff --git a/templates/lua-template-runtime/src/main.lua b/templates/lua-template-runtime/src/main.lua index a270259bf4..32f49d9378 100644 --- a/templates/lua-template-runtime/src/main.lua +++ b/templates/lua-template-runtime/src/main.lua @@ -1,8 +1,8 @@ + require "Cocos2d" -require "Cocos2dConstants" -- cclog -cclog = function(...) +local cclog = function(...) print(string.format(...)) end @@ -20,209 +20,21 @@ local function main() -- avoid memory leak collectgarbage("setpause", 100) collectgarbage("setstepmul", 5000) + + cc.FileUtils:getInstance():addSearchPath("src") + cc.FileUtils:getInstance():addSearchPath("res") cc.Director:getInstance():getOpenGLView():setDesignResolutionSize(480, 320, 0) - cc.FileUtils:getInstance():addSearchPath("src") - cc.FileUtils:getInstance():addSearchPath("res") - local schedulerID = 0 - --support debug - local targetPlatform = cc.Application:getInstance():getTargetPlatform() - if (cc.PLATFORM_OS_IPHONE == targetPlatform) or (cc.PLATFORM_OS_IPAD == targetPlatform) or - (cc.PLATFORM_OS_ANDROID == targetPlatform) or (cc.PLATFORM_OS_WINDOWS == targetPlatform) or - (cc.PLATFORM_OS_MAC == targetPlatform) then - cclog("result is ") - --require('debugger')() - + + --create scene + local scene = require("GameScene") + local gameScene = scene.create() + gameScene:playBgMusic() + + if cc.Director:getInstance():getRunningScene() then + cc.Director:getInstance():replaceScene(gameScene) + else + cc.Director:getInstance():runWithScene(gameScene) end - require "hello2" - cclog("result is " .. myadd(1, 1)) - - --------------- - - local visibleSize = cc.Director:getInstance():getVisibleSize() - local origin = cc.Director:getInstance():getVisibleOrigin() - - -- add the moving dog - local function creatDog() - local frameWidth = 105 - local frameHeight = 95 - - -- create dog animate - local textureDog = cc.Director:getInstance():getTextureCache():addImage("dog.png") - local rect = cc.rect(0, 0, frameWidth, frameHeight) - local frame0 = cc.SpriteFrame:createWithTexture(textureDog, rect) - rect = cc.rect(frameWidth, 0, frameWidth, frameHeight) - local frame1 = cc.SpriteFrame:createWithTexture(textureDog, rect) - - local spriteDog = cc.Sprite:createWithSpriteFrame(frame0) - spriteDog.isPaused = false - spriteDog:setPosition(origin.x, origin.y + visibleSize.height / 4 * 3) ---[[ - local animFrames = CCArray:create() - - animFrames:addObject(frame0) - animFrames:addObject(frame1) -]]-- - - local animation = cc.Animation:createWithSpriteFrames({frame0,frame1}, 0.5) - local animate = cc.Animate:create(animation); - spriteDog:runAction(cc.RepeatForever:create(animate)) - - -- moving dog at every frame - local function tick() - if spriteDog.isPaused then return end - local x, y = spriteDog:getPosition() - if x > origin.x + visibleSize.width then - x = origin.x - else - x = x + 1 - end - - spriteDog:setPositionX(x) - end - - schedulerID = cc.Director:getInstance():getScheduler():scheduleScriptFunc(tick, 0, false) - - return spriteDog - end - - -- create farm - local function createLayerFarm() - local layerFarm = cc.Layer:create() - - -- add in farm background - local bg = cc.Sprite:create("farm.jpg") - bg:setPosition(origin.x + visibleSize.width / 2 + 80, origin.y + visibleSize.height / 2) - layerFarm:addChild(bg) - - -- add land sprite - for i = 0, 3 do - for j = 0, 1 do - local spriteLand = cc.Sprite:create("land.png") - spriteLand:setPosition(200 + j * 180 - i % 2 * 90, 10 + i * 95 / 2) - layerFarm:addChild(spriteLand) - end - end - - -- add crop - local frameCrop = cc.SpriteFrame:create("crop.png", cc.rect(0, 0, 105, 95)) - for i = 0, 3 do - for j = 0, 1 do - local spriteCrop = cc.Sprite:createWithSpriteFrame(frameCrop); - spriteCrop:setPosition(10 + 200 + j * 180 - i % 2 * 90, 30 + 10 + i * 95 / 2) - layerFarm:addChild(spriteCrop) - end - end - - -- add moving dog - local spriteDog = creatDog() - layerFarm:addChild(spriteDog) - - -- handing touch events - local touchBeginPoint = nil - local function onTouchBegan(touch, event) - local location = touch:getLocation() - --cclog("onTouchBegan: %0.2f, %0.2f", location.x, location.y) - touchBeginPoint = {x = location.x, y = location.y} - spriteDog.isPaused = true - -- CCTOUCHBEGAN event must return true - return true - end - - local function onTouchMoved(touch, event) - local location = touch:getLocation() - --cclog("onTouchMoved: %0.2f, %0.2f", location.x, location.y) - if touchBeginPoint then - local cx, cy = layerFarm:getPosition() - layerFarm:setPosition(cx + location.x - touchBeginPoint.x, - cy + location.y - touchBeginPoint.y) - touchBeginPoint = {x = location.x, y = location.y} - end - end - - local function onTouchEnded(touch, event) - local location = touch:getLocation() - --cclog("onTouchEnded: %0.2f, %0.2f", location.x, location.y) - touchBeginPoint = nil - spriteDog.isPaused = false - end - - local listener = cc.EventListenerTouchOneByOne:create() - listener:registerScriptHandler(onTouchBegan,cc.Handler.EVENT_TOUCH_BEGAN ) - listener:registerScriptHandler(onTouchMoved,cc.Handler.EVENT_TOUCH_MOVED ) - listener:registerScriptHandler(onTouchEnded,cc.Handler.EVENT_TOUCH_ENDED ) - local eventDispatcher = layerFarm:getEventDispatcher() - eventDispatcher:addEventListenerWithSceneGraphPriority(listener, layerFarm) - - local function onNodeEvent(event) - if "exit" == event then - cc.Director:getInstance():getScheduler():unscheduleScriptEntry(schedulerID) - end - end - layerFarm:registerScriptHandler(onNodeEvent) - - return layerFarm - end - - - -- create menu - local function createLayerMenu() - local layerMenu = cc.Layer:create() - - local menuPopup, menuTools, effectID - - local function menuCallbackClosePopup() - -- stop test sound effect - cc.SimpleAudioEngine:getInstance():stopEffect(effectID) - menuPopup:setVisible(false) - end - - local function menuCallbackOpenPopup() - -- loop test sound effect - local effectPath = cc.FileUtils:getInstance():fullPathForFilename("effect1.wav") - effectID = cc.SimpleAudioEngine:getInstance():playEffect(effectPath) - menuPopup:setVisible(true) - end - - -- add a popup menu - local menuPopupItem = cc.MenuItemImage:create("menu2.png", "menu2.png") - menuPopupItem:setPosition(0, 0) - menuPopupItem:registerScriptTapHandler(menuCallbackClosePopup) - menuPopup = cc.Menu:create(menuPopupItem) - menuPopup:setPosition(origin.x + visibleSize.width / 2, origin.y + visibleSize.height / 2) - menuPopup:setVisible(false) - layerMenu:addChild(menuPopup) - - -- add the left-bottom "tools" menu to invoke menuPopup - local menuToolsItem = cc.MenuItemImage:create("menu1.png", "menu1.png") - menuToolsItem:setPosition(0, 0) - menuToolsItem:registerScriptTapHandler(menuCallbackOpenPopup) - menuTools = cc.Menu:create(menuToolsItem) - local itemWidth = menuToolsItem:getContentSize().width - local itemHeight = menuToolsItem:getContentSize().height - menuTools:setPosition(origin.x + itemWidth/2, origin.y + itemHeight/2) - layerMenu:addChild(menuTools) - - return layerMenu - end - - -- play background music, preload effect - - -- uncomment below for the BlackBerry version - local bgMusicPath = cc.FileUtils:getInstance():fullPathForFilename("background.mp3") - cc.SimpleAudioEngine:getInstance():playMusic(bgMusicPath, true) - local effectPath = cc.FileUtils:getInstance():fullPathForFilename("effect1.wav") - cc.SimpleAudioEngine:getInstance():preloadEffect(effectPath) - - -- run - local sceneGame = cc.Scene:create() - sceneGame:addChild(createLayerFarm()) - sceneGame:addChild(createLayerMenu()) - - if cc.Director:getInstance():getRunningScene() then - cc.Director:getInstance():replaceScene(sceneGame) - else - cc.Director:getInstance():runWithScene(sceneGame) - end end diff --git a/tests/cpp-empty-test/proj.ios/AppController.mm b/tests/cpp-empty-test/proj.ios/AppController.mm index c91d512703..daa056bca0 100644 --- a/tests/cpp-empty-test/proj.ios/AppController.mm +++ b/tests/cpp-empty-test/proj.ios/AppController.mm @@ -72,7 +72,7 @@ static AppDelegate s_sharedApplication; [[UIApplication sharedApplication] setStatusBarHidden: YES]; // IMPORTANT: Setting the GLView should be done after creating the RootViewController - cocos2d::GLView *glview = cocos2d::GLView::createWithEAGLView(eaglView); + cocos2d::GLViewImpl *glview = cocos2d::GLViewImpl::createWithEAGLView(eaglView); cocos2d::Director::getInstance()->setOpenGLView(glview); cocos2d::Application *app = cocos2d::Application::getInstance(); diff --git a/tests/cpp-empty-test/proj.win32/cpp-empty-test.vcxproj b/tests/cpp-empty-test/proj.win32/cpp-empty-test.vcxproj index 0bd4855f12..cb5221ad76 100644 --- a/tests/cpp-empty-test/proj.win32/cpp-empty-test.vcxproj +++ b/tests/cpp-empty-test/proj.win32/cpp-empty-test.vcxproj @@ -23,8 +23,8 @@ v100 v110 v110_xp - v120 - v120_xp + v120 + v120_xp Application @@ -32,8 +32,8 @@ v100 v110 v110_xp - v120 - v120_xp + v120 + v120_xp @@ -89,7 +89,7 @@ true Windows MachineX86 - libcocos2d.lib;libchipmunk.lib;%(AdditionalDependencies) + %(AdditionalDependencies) @@ -111,7 +111,7 @@ 4267;4251;4244;%(DisableSpecificWarnings) - libcocos2d.lib;%(AdditionalDependencies) + %(AdditionalDependencies) $(OutDir)$(ProjectName).exe $(OutDir);%(AdditionalLibraryDirectories) true @@ -137,9 +137,8 @@ - + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - false {207bc7a9-ccf1-4f2f-a04d-45f72242ae25} diff --git a/tests/cpp-tests/Android.mk b/tests/cpp-tests/Android.mk index af90d53565..64e2f581fe 100644 --- a/tests/cpp-tests/Android.mk +++ b/tests/cpp-tests/Android.mk @@ -68,6 +68,7 @@ Classes/UITest/CocoStudioGUITest/CocostudioParserTest.cpp \ Classes/UITest/CocoStudioGUITest/GUIEditorTest.cpp \ Classes/UITest/CocoStudioGUITest/CustomGUIScene.cpp \ Classes/UITest/CocoStudioGUITest/UIScene.cpp \ +Classes/UITest/CocoStudioGUITest/UIScale9SpriteTest.cpp \ Classes/UITest/CocoStudioGUITest/UISceneManager.cpp \ Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp \ Classes/UITest/CocoStudioGUITest/UIFocusTest/UIFocusTest.cpp \ @@ -186,19 +187,21 @@ Classes/ZwoptexTest/ZwoptexTest.cpp LOCAL_C_INCLUDES := $(LOCAL_PATH)/Classes LOCAL_WHOLE_STATIC_LIBRARIES := cocosbuilder_static +LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static LOCAL_WHOLE_STATIC_LIBRARIES += spine_static LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_static LOCAL_WHOLE_STATIC_LIBRARIES += cocos_network_static LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static - +LOCAL_WHOLE_STATIC_LIBRARIES += box2d_static LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/Classes - + include $(BUILD_STATIC_LIBRARY) $(call import-module,extensions) +$(call import-module,audio/android) $(call import-module,editor-support/cocosbuilder) $(call import-module,editor-support/spine) $(call import-module,editor-support/cocostudio) $(call import-module,network) -$(call import-module,.) +$(call import-module,Box2D) diff --git a/tests/cpp-tests/CMakeLists.txt b/tests/cpp-tests/CMakeLists.txt index 48267493f4..4fa705d785 100644 --- a/tests/cpp-tests/CMakeLists.txt +++ b/tests/cpp-tests/CMakeLists.txt @@ -80,6 +80,7 @@ set(SAMPLE_SRC Classes/UITest/CocoStudioGUITest/GUIEditorTest.cpp Classes/UITest/CocoStudioGUITest/CustomGUIScene.cpp Classes/UITest/CocoStudioGUITest/UIScene.cpp + Classes/UITest/CocoStudioGUITest/UIScale9SpriteTest.cpp Classes/UITest/CocoStudioGUITest/UISceneManager.cpp Classes/UITest/CocoStudioGUITest/CocostudioParserTest/CocostudioParserJsonTest.cpp Classes/UITest/CocoStudioGUITest/CocostudioParserTest.cpp diff --git a/tests/cpp-tests/Classes/AppDelegate.cpp b/tests/cpp-tests/Classes/AppDelegate.cpp index 5e448e1f61..b5daf4a333 100644 --- a/tests/cpp-tests/Classes/AppDelegate.cpp +++ b/tests/cpp-tests/Classes/AppDelegate.cpp @@ -108,7 +108,7 @@ bool AppDelegate::applicationDidFinishLaunching() // a bug in DirectX 11 level9-x on the device prevents ResolutionPolicy::NO_BORDER from working correctly glview->setDesignResolutionSize(designSize.width, designSize.height, ResolutionPolicy::SHOW_ALL); #else - glview->setDesignResolutionSize(designSize.width, designSize.height, ResolutionPolicy::NO_BORDER); + glview->setDesignResolutionSize(designSize.width, designSize.height, ResolutionPolicy::SHOW_ALL); #endif auto scene = Scene::create(); diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp index b2cff48fa8..88648b763a 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp @@ -1540,27 +1540,31 @@ std::string TestLoadFromBinary::subtitle() const void TestLoadFromBinary::onTouchesEnded(const std::vector& touches, Event* event) { - // remove json created - // remove sync resource if(-1 == m_armatureIndex ) { + m_armatureIndex = -2; // is loading + + // remove json created and need remove their names: exprtjsone & csbs ArmatureDataManager::getInstance()->removeArmatureFileInfo(m_binaryFilesNames[0]); ArmatureDataManager::getInstance()->removeArmatureFileInfo("armature/Cowboy.ExportJson"); ArmatureDataManager::getInstance()->removeArmatureFileInfo("armature/hero.ExportJson"); ArmatureDataManager::getInstance()->removeArmatureFileInfo("armature/horse.ExportJson"); ArmatureDataManager::getInstance()->removeArmatureFileInfo("armature/HeroAnimation.ExportJson"); ArmatureDataManager::getInstance()->removeArmatureFileInfo("armature/testEasing.ExportJson"); + for( int i = 0; i < BINARYFILECOUNT; i++) + { + ArmatureDataManager::getInstance()->removeArmatureFileInfo(m_binaryFilesNames[i]); + } for( int i = 0; i < BINARYFILECOUNT; i++) { ArmatureDataManager::getInstance()->addArmatureFileInfoAsync(m_binaryFilesNames[i], this, schedule_selector(TestLoadFromBinary::dataLoaded)); } - m_armatureIndex = -2; // is loading } else if(m_armatureIndex>=0 && m_armature != nullptr) { - this->removeChild(m_armature); + m_armature->removeFromParent(); m_armatureIndex = m_armatureIndex==BINARYFILECOUNT-1 ? 0 : m_armatureIndex+1; m_armature = Armature::create(m_armatureNames[m_armatureIndex]); m_armature->setPosition(Vec2(VisibleRect::center().x, VisibleRect::center().y)); diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp index 0d6931120d..ebc3dcb8e6 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp @@ -277,6 +277,7 @@ cocos2d::Node* LoadSceneEdtiorFileTest::createGameScene() { _filePath = "scenetest/LoadSceneEdtiorFileTest/FishJoy2.json"; //default is json _rootNode = SceneReader::getInstance()->createNodeWithSceneFile(_filePath.c_str()); + ActionManagerEx::getInstance()->playActionByName("startMenu_1.json", "Animation1"); if (_rootNode == nullptr) { return nullptr; diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h index ed55549d88..3cd549716a 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h @@ -2,6 +2,7 @@ #define _TIMELINE_TESTLAYER_H_ #include "cocos2d.h" +#include "audio/include/SimpleAudioEngine.h" #include "extensions/cocos-ext.h" #include "cocosbuilder/CocosBuilder.h" diff --git a/tests/cpp-tests/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp index ed957a8ef4..a05c87a6c6 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp @@ -369,12 +369,12 @@ void HttpClientTest::onHttpRequestCompleted(HttpClient *sender, HttpResponse *re // dump data std::vector *buffer = response->getResponseData(); - printf("Http Test, dump data: "); + log("Http Test, dump data: "); for (unsigned int i = 0; i < buffer->size(); i++) { - printf("%c", (*buffer)[i]); + log("%c", (*buffer)[i]); } - printf("\n"); + log("\n"); if (response->getHttpRequest()->getReferenceCount() != 2) { log("request ref count not 2, is %d", response->getHttpRequest()->getReferenceCount()); diff --git a/tests/cpp-tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp index 8f86aae1c7..cd64c3a8e3 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp @@ -46,7 +46,9 @@ static std::function createFunctions[] = { CL(S9_TexturePacker), CL(S9FrameNameSpriteSheetRotatedInsetsScaled), CL(S9FrameNameSpriteSheetRotatedSetCapInsetLater), - CL(S9CascadeOpacityAndColor) + CL(S9CascadeOpacityAndColor), + CL(S9ZOrder), + CL(S9Flip) }; static int sceneIdx=-1; @@ -679,3 +681,104 @@ std::string S9CascadeOpacityAndColor::subtitle() const { return "when parent change color/opacity, Scale9Sprite should also change"; } + +// +//// S9ZOrder +// + +void S9ZOrder::onEnter() +{ + S9SpriteTestDemo::onEnter(); + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + + auto blocks_scaled_with_insets = Scale9Sprite::createWithSpriteFrameName("blocks9r.png"); + + blocks_scaled_with_insets->setPosition(Vec2(x, y)); + this->addChild(blocks_scaled_with_insets); + + Sprite *normalSprite = Sprite::createWithSpriteFrameName("blocks9r.png"); + normalSprite->setColor(Color3B::RED); + blocks_scaled_with_insets->addChild(normalSprite); + + auto topLabel = Label::createWithSystemFont("I Must be On the Top", "Arial", 15); + topLabel->setPosition(Vec2(20,20)); + blocks_scaled_with_insets->addChild(topLabel); + + auto bottomLabel = Label::createWithSystemFont("I Must be On the Bottom", "Arial", 15); + bottomLabel->setPosition(Vec2(80,80)); + bottomLabel->setColor(Color3B::BLUE); + blocks_scaled_with_insets->addChild(bottomLabel,-1); + +} + +std::string S9ZOrder::title() const +{ + return "Scale9Sprite ZOrder issue"; +} + +std::string S9ZOrder::subtitle() const +{ + return "When adding nodes to Scale9Sprite, it should be added on top itself"; +} + +// +//// S9Flip +// + +void S9Flip::onEnter() +{ + S9SpriteTestDemo::onEnter(); + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + + + auto normalSprite = Scale9Sprite::createWithSpriteFrameName("blocks9r.png"); + + normalSprite->setPosition(Vec2(x, y )); + this->addChild(normalSprite); + + + auto normalLabel = Label::createWithSystemFont("Normal Sprite","Airal",10); + normalLabel->setPosition(normalSprite->getPosition() + Vec2(0, normalSprite->getContentSize().height/2 + 10)); + this->addChild(normalLabel); + + + + auto flipXSprite = Scale9Sprite::createWithSpriteFrameName("blocks9r.png"); + + flipXSprite->setPosition(Vec2(x - 120, y )); + this->addChild(flipXSprite); + + flipXSprite->setScaleX(-1); + + auto flipXLabel = Label::createWithSystemFont("Sprite FlipX","Airal",10); + flipXLabel->setPosition(flipXSprite->getPosition() + Vec2(0, flipXSprite->getContentSize().height/2 + 10)); + this->addChild(flipXLabel); + + + auto flipYSprite = Scale9Sprite::createWithSpriteFrameName("blocks9r.png"); + + flipYSprite->setPosition(Vec2(x + 120, y)); + this->addChild(flipYSprite); + + flipYSprite->setScaleY(-1); + + auto flipYLabel = Label::createWithSystemFont("Sprite FlipY","Airal",10); + flipYLabel->setPosition(flipYSprite->getPosition() + Vec2(0, flipYSprite->getContentSize().height/2 + 10)); + this->addChild(flipYLabel); + + +} + +std::string S9Flip::title() const +{ + return "Scale9Sprite Flip issue"; +} + +std::string S9Flip::subtitle() const +{ + return "When Flipped, the scale9Sprite should behavior like a normal node"; +} diff --git a/tests/cpp-tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.h b/tests/cpp-tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.h index edde512780..a5448fb86e 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.h @@ -227,3 +227,29 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; }; + +// Scale9Sprite ZOrder + +class S9ZOrder : public S9SpriteTestDemo +{ +public: + CREATE_FUNC(S9ZOrder); + + virtual void onEnter() override; + + virtual std::string title() const override; + virtual std::string subtitle() const override; +}; + +// Scale9Sprite Flip + +class S9Flip : public S9SpriteTestDemo +{ +public: + CREATE_FUNC(S9Flip); + + virtual void onEnter() override; + + virtual std::string title() const override; + virtual std::string subtitle() const override; +}; diff --git a/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.cpp b/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.cpp index cec7fdc3fb..13e8d7f314 100644 --- a/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.cpp +++ b/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.cpp @@ -5,6 +5,8 @@ static std::function createFunctions[] = { CL(TestSearchPath), CL(TestFilenameLookup), CL(TestIsFileExist), + CL(TestFileFuncs), + CL(TestDirectoryFuncs), CL(TextWritePlist), }; @@ -271,19 +273,19 @@ void TestIsFileExist::onEnter() auto s = Director::getInstance()->getWinSize(); auto sharedFileUtils = FileUtils::getInstance(); - Label* pTTF = nullptr; + Label* label = nullptr; bool isExist = false; isExist = sharedFileUtils->isFileExist("Images/grossini.png"); - pTTF = Label::createWithSystemFont(isExist ? "Images/grossini.png exists" : "Images/grossini.png doesn't exist", "", 20); - pTTF->setPosition(Vec2(s.width/2, s.height/3)); - this->addChild(pTTF); + label = Label::createWithSystemFont(isExist ? "Images/grossini.png exists" : "Images/grossini.png doesn't exist", "", 20); + label->setPosition(Vec2(s.width/2, s.height/3)); + this->addChild(label); isExist = sharedFileUtils->isFileExist("Images/grossini.xcf"); - pTTF = Label::createWithSystemFont(isExist ? "Images/grossini.xcf exists" : "Images/grossini.xcf doesn't exist", "", 20); - pTTF->setPosition(Vec2(s.width/2, s.height/3*2)); - this->addChild(pTTF); + label = Label::createWithSystemFont(isExist ? "Images/grossini.xcf exists" : "Images/grossini.xcf doesn't exist", "", 20); + label->setPosition(Vec2(s.width/2, s.height/3*2)); + this->addChild(label); } void TestIsFileExist::onExit() @@ -307,6 +309,168 @@ std::string TestIsFileExist::subtitle() const return ""; } +// TestFileFuncs + +void TestFileFuncs::onEnter() +{ + FileUtilsDemo::onEnter(); + auto s = Director::getInstance()->getWinSize(); + auto sharedFileUtils = FileUtils::getInstance(); + + int x = s.width/2, + y = s.height/5; + Label* label = nullptr; + + std::string filename = "__test.test"; + std::string filename2 = "__newtest.test"; + std::string filepath = sharedFileUtils->getWritablePath() + filename; + std::string content = "Test string content to put into created file"; + std::string msg; + + FILE *out = fopen(filepath.c_str(), "w"); + fputs(content.c_str(), out); + fclose(out); + + // Check whether file can be created + if (sharedFileUtils->isFileExist(filepath)) + { + label = Label::createWithSystemFont("Test file '__test.test' created", "", 20); + label->setPosition(Vec2(x, y * 4)); + this->addChild(label); + + // getFileSize Test + long size = sharedFileUtils->getFileSize(filepath); + msg = StringUtils::format("getFileSize: Test file size equals %ld", size); + label = Label::createWithSystemFont(msg, "", 20); + label->setPosition(Vec2(x, y * 3)); + this->addChild(label); + + // renameFile Test + if (sharedFileUtils->renameFile(sharedFileUtils->getWritablePath(), filename, filename2)) + { + label = Label::createWithSystemFont("renameFile: Test file renamed to '__newtest.test'", "", 20); + label->setPosition(Vec2(x, y * 2)); + this->addChild(label); + + // removeFile Test + filepath = sharedFileUtils->getWritablePath() + filename2; + if (sharedFileUtils->removeFile(filepath)) + { + label = Label::createWithSystemFont("removeFile: Test file removed", "", 20); + label->setPosition(Vec2(x, y * 1)); + this->addChild(label); + } + else + { + label = Label::createWithSystemFont("removeFile: Failed to remove test file", "", 20); + label->setPosition(Vec2(x, y * 1)); + this->addChild(label); + } + } + else + { + label = Label::createWithSystemFont("renameFile: Failed to rename test file to '__newtest.test', further test skipped", "", 20); + label->setPosition(Vec2(x, y * 2)); + this->addChild(label); + } + } + else + { + label = Label::createWithSystemFont("Test file can not be created, test skipped", "", 20); + label->setPosition(Vec2(x, y * 4)); + this->addChild(label); + } +} + +std::string TestFileFuncs::title() const +{ + return "FileUtils: file control functions"; +} + +std::string TestFileFuncs::subtitle() const +{ + return ""; +} + +// TestDirectoryFuncs + +void TestDirectoryFuncs::onEnter() +{ + FileUtilsDemo::onEnter(); + auto s = Director::getInstance()->getWinSize(); + auto sharedFileUtils = FileUtils::getInstance(); + + int x = s.width/2, + y = s.height/4; + Label* label = nullptr; + + std::string dir = sharedFileUtils->getWritablePath() + "__test/"; + std::string subDir = "dir1/dir2"; + std::string msg; + bool ok; + + // Check whether dir can be created + ok = sharedFileUtils->createDirectory(dir); + if (ok && sharedFileUtils->isDirectoryExist(dir)) + { + msg = StringUtils::format("createDirectory: Directory '__test' created"); + label = Label::createWithSystemFont(msg, "", 20); + label->setPosition(Vec2(x, y * 3)); + this->addChild(label); + + // Create sub directories recursively + ok = sharedFileUtils->createDirectory(dir + subDir); + if (ok && sharedFileUtils->isDirectoryExist(dir + subDir)) + { + msg = StringUtils::format("createDirectory: Sub directories '%s' created", subDir.c_str()); + label = Label::createWithSystemFont(msg, "", 20); + label->setPosition(Vec2(x, y * 2)); + this->addChild(label); + } + else + { + msg = StringUtils::format("createDirectory: Failed to create sub directories '%s'", subDir.c_str()); + label = Label::createWithSystemFont(msg, "", 20); + label->setPosition(Vec2(x, y * 2)); + this->addChild(label); + } + + // Remove directory + ok = sharedFileUtils->removeDirectory(dir); + if (ok && !sharedFileUtils->isDirectoryExist(dir)) + { + msg = StringUtils::format("removeDirectory: Directory '__test' removed"); + label = Label::createWithSystemFont(msg, "", 20); + label->setPosition(Vec2(x, y)); + this->addChild(label); + } + else + { + msg = StringUtils::format("removeDirectory: Failed to remove directory '__test'"); + label = Label::createWithSystemFont(msg, "", 20); + label->setPosition(Vec2(x, y)); + this->addChild(label); + } + } + else + { + msg = StringUtils::format("createDirectory: Directory '__test' can not be created"); + label = Label::createWithSystemFont(msg, "", 20); + label->setPosition(Vec2(x, y * 2)); + this->addChild(label); + } +} + +std::string TestDirectoryFuncs::title() const +{ + return "FileUtils: directory control functions"; +} + +std::string TestDirectoryFuncs::subtitle() const +{ + return ""; +} + // TestWritePlist void TextWritePlist::onEnter() diff --git a/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.h b/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.h index 6661276449..51fd8b23f8 100644 --- a/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.h +++ b/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.h @@ -72,6 +72,26 @@ public: virtual std::string subtitle() const override; }; +class TestFileFuncs : public FileUtilsDemo +{ +public: + CREATE_FUNC(TestFileFuncs); + + virtual void onEnter() override; + virtual std::string title() const override; + virtual std::string subtitle() const override; +}; + +class TestDirectoryFuncs : public FileUtilsDemo +{ +public: + CREATE_FUNC(TestDirectoryFuncs); + + virtual void onEnter() override; + virtual std::string title() const override; + virtual std::string subtitle() const override; +}; + class TextWritePlist : public FileUtilsDemo { public: diff --git a/tests/cpp-tests/Classes/FontTest/FontTest.cpp b/tests/cpp-tests/Classes/FontTest/FontTest.cpp index dd6a1662d1..cd0da05f1f 100644 --- a/tests/cpp-tests/Classes/FontTest/FontTest.cpp +++ b/tests/cpp-tests/Classes/FontTest/FontTest.cpp @@ -14,26 +14,15 @@ enum { static int fontIdx = 0; +//you don't need any ifdef anymore static std::string fontList[] = { -#if ((CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)) - // custom ttf files are defined in Test-info.plist - "American Typewriter", - "Marker Felt", - "A Damn Mess", - "Abberancy", - "Abduction", - "Paint Boy", - "Schwarzwald Regular", - "Scissor Cuts", -#else "fonts/A Damn Mess.ttf", "fonts/Abberancy.ttf", "fonts/Abduction.ttf", "fonts/Paint Boy.ttf", - "fonts/Schwarzwald Regular.ttf", + "fonts/Schwarzwald.ttf", "fonts/Scissor Cuts.ttf", -#endif }; static int fontCount = sizeof(fontList) / sizeof(*fontList); diff --git a/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp index 9dca43b4ae..5ed6bd7d2b 100644 --- a/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp +++ b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp @@ -1167,7 +1167,7 @@ LabelTTFFontsTestNew::LabelTTFFontsTestNew() "fonts/Abduction.ttf", "fonts/American Typewriter.ttf", "fonts/Paint Boy.ttf", - "fonts/Schwarzwald Regular.ttf", + "fonts/Schwarzwald.ttf", "fonts/Scissor Cuts.ttf", }; #define arraysize(ar) (sizeof(ar) / sizeof(ar[0])) diff --git a/tests/cpp-tests/Classes/ParticleTest/ParticleTest.cpp b/tests/cpp-tests/Classes/ParticleTest/ParticleTest.cpp index 5f3beb9d31..b12946a99c 100644 --- a/tests/cpp-tests/Classes/ParticleTest/ParticleTest.cpp +++ b/tests/cpp-tests/Classes/ParticleTest/ParticleTest.cpp @@ -1012,13 +1012,14 @@ Layer* createParticleLayer(int nIndex) case 46: return new Issue3990(); case 47: return new ParticleAutoBatching(); case 48: return new ParticleVisibleTest(); + case 49: return new ParticleResetTotalParticles(); default: break; } return nullptr; } -#define MAX_LAYER 49 +#define MAX_LAYER 50 Layer* nextParticleAction() @@ -2005,6 +2006,52 @@ std::string ParticleAutoBatching::subtitle() const return "All 10 particles should be drawin in one batch"; } + +// +// ParticleResetTotalParticles +// +void ParticleResetTotalParticles::onEnter() +{ + ParticleDemo::onEnter(); + + _color->setColor(Color3B::BLACK); + removeChild(_background, true); + _background = nullptr; + + auto p = ParticleFire::createWithTotalParticles(10); + this->addChild(p); + + auto add = MenuItemFont::create("add 10 particles", + [p](Ref*)->void + { + p->setTotalParticles(p->getTotalParticles() + 10 ); + }); + add->setPosition(Vec2(0, 25)); + auto remove = MenuItemFont::create("remove 10 particles", + [p](Ref*)->void + { + int count = p->getTotalParticles() - 10; + if (count < 0) { count = 0; } + p->setTotalParticles(count); + }); + remove->setPosition(Vec2(0, -25)); + + auto menu = Menu::create(add, remove, nullptr); + menu->setPosition(Vec2(VisibleRect::center())); + this->addChild(menu); + +} + +std::string ParticleResetTotalParticles::title() const +{ + return "reset total particles"; +} + +std::string ParticleResetTotalParticles::subtitle() const +{ + return "it should work as well"; +} + // // main // diff --git a/tests/cpp-tests/Classes/ParticleTest/ParticleTest.h b/tests/cpp-tests/Classes/ParticleTest/ParticleTest.h index ba3adb9058..c18d00be62 100644 --- a/tests/cpp-tests/Classes/ParticleTest/ParticleTest.h +++ b/tests/cpp-tests/Classes/ParticleTest/ParticleTest.h @@ -328,4 +328,12 @@ public: virtual std::string subtitle() const override; }; +class ParticleResetTotalParticles : public ParticleDemo +{ +public: + virtual void onEnter() override; + virtual std::string title() const override; + virtual std::string subtitle() const override; +}; + #endif diff --git a/tests/cpp-tests/Classes/PerformanceTest/PerformanceAllocTest.cpp b/tests/cpp-tests/Classes/PerformanceTest/PerformanceAllocTest.cpp index 141f7c9c33..7aee682d4f 100644 --- a/tests/cpp-tests/Classes/PerformanceTest/PerformanceAllocTest.cpp +++ b/tests/cpp-tests/Classes/PerformanceTest/PerformanceAllocTest.cpp @@ -230,7 +230,7 @@ void NodeCreateTest::initWithQuantityOfNodes(unsigned int nNodes) { PerformceAllocScene::initWithQuantityOfNodes(nNodes); - printf("Size of Node: %lu\n", sizeof(Node)); + log("Size of Node: %u\n", sizeof(Node)); scheduleUpdate(); } @@ -278,7 +278,7 @@ void NodeDeallocTest::initWithQuantityOfNodes(unsigned int nNodes) { PerformceAllocScene::initWithQuantityOfNodes(nNodes); - printf("Size of Node: %lu\n", sizeof(Node)); + log("Size of Node: %u\n", sizeof(Node)); scheduleUpdate(); } @@ -331,7 +331,7 @@ void SpriteCreateEmptyTest::initWithQuantityOfNodes(unsigned int nNodes) { PerformceAllocScene::initWithQuantityOfNodes(nNodes); - printf("Size of Sprite: %lu\n", sizeof(Sprite)); + log("Size of Sprite: %u\n", sizeof(Sprite)); scheduleUpdate(); } @@ -381,7 +381,7 @@ void SpriteCreateTest::initWithQuantityOfNodes(unsigned int nNodes) { PerformceAllocScene::initWithQuantityOfNodes(nNodes); - printf("Size of Sprite: %lu\n", sizeof(Sprite)); + log("Size of Sprite: %u\n", sizeof(Sprite)); scheduleUpdate(); } @@ -431,7 +431,7 @@ void SpriteDeallocTest::initWithQuantityOfNodes(unsigned int nNodes) { PerformceAllocScene::initWithQuantityOfNodes(nNodes); - printf("Size of sprite: %lu\n", sizeof(Sprite)); + log("Size of sprite: %u\n", sizeof(Sprite)); scheduleUpdate(); } diff --git a/tests/cpp-tests/Classes/PerformanceTest/PerformanceContainerTest.cpp b/tests/cpp-tests/Classes/PerformanceTest/PerformanceContainerTest.cpp index fd5ddf10a2..2ebe66e483 100644 --- a/tests/cpp-tests/Classes/PerformanceTest/PerformanceContainerTest.cpp +++ b/tests/cpp-tests/Classes/PerformanceTest/PerformanceContainerTest.cpp @@ -156,7 +156,7 @@ void PerformanceContainerScene::initWithQuantityOfNodes(unsigned int nNodes) addChild(menuLayer); menuLayer->release(); - printf("Size of Node: %lu\n", sizeof(Node)); + log("Size of Node: %u\n", sizeof(Node)); int oldFontSize = MenuItemFont::getFontSize(); MenuItemFont::setFontSize(24); diff --git a/tests/cpp-tests/Classes/TileMapTest/TileMapTest2.cpp b/tests/cpp-tests/Classes/TileMapTest/TileMapTest2.cpp index f89cb73e62..bac5608530 100644 --- a/tests/cpp-tests/Classes/TileMapTest/TileMapTest2.cpp +++ b/tests/cpp-tests/Classes/TileMapTest/TileMapTest2.cpp @@ -4,6 +4,7 @@ #include "2d/CCFastTMXLayer.h" #include "2d/CCFastTMXTiledMap.h" + namespace { enum @@ -287,7 +288,7 @@ TMXOrthoTestNew::TMXOrthoTestNew() //auto color = LayerColor::create( Color4B(64,64,64,255) ); //addChild(color, -1); - auto map = FastTMXTiledMap::create("TileMaps/orthogonal-test2.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/orthogonal-test2.tmx"); addChild(map, 0, kTagTileMap); @@ -330,7 +331,7 @@ std::string TMXOrthoTestNew::title() const //------------------------------------------------------------------ TMXOrthoTest2New::TMXOrthoTest2New() { - auto map = FastTMXTiledMap::create("TileMaps/orthogonal-test1.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/orthogonal-test1.tmx"); addChild(map, 0, kTagTileMap); Size CC_UNUSED s = map->getContentSize(); @@ -351,7 +352,7 @@ std::string TMXOrthoTest2New::title() const //------------------------------------------------------------------ TMXOrthoTest3New::TMXOrthoTest3New() { - auto map = FastTMXTiledMap::create("TileMaps/orthogonal-test3.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/orthogonal-test3.tmx"); addChild(map, 0, kTagTileMap); Size CC_UNUSED s = map->getContentSize(); @@ -373,7 +374,7 @@ std::string TMXOrthoTest3New::title() const //------------------------------------------------------------------ TMXOrthoTest4New::TMXOrthoTest4New() { - auto map = FastTMXTiledMap::create("TileMaps/orthogonal-test4.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/orthogonal-test4.tmx"); addChild(map, 0, kTagTileMap); Size CC_UNUSED s1 = map->getContentSize(); @@ -402,7 +403,7 @@ void TMXOrthoTest4New::removeSprite(float dt) { unschedule(schedule_selector(TMXOrthoTest4New::removeSprite)); - auto map = static_cast( getChildByTag(kTagTileMap) ); + auto map = static_cast( getChildByTag(kTagTileMap) ); auto layer = map->getLayer("Layer 0"); auto s = layer->getLayerSize(); @@ -435,7 +436,7 @@ TMXReadWriteTestNew::TMXReadWriteTestNew() { _gid = 0; - auto map = FastTMXTiledMap::create("TileMaps/orthogonal-test2.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/orthogonal-test2.tmx"); addChild(map, 0, kTagTileMap); Size CC_UNUSED s = map->getContentSize(); @@ -501,8 +502,8 @@ void TMXReadWriteTestNew::removeSprite(Node* sender) void TMXReadWriteTestNew::updateCol(float dt) { - auto map = (FastTMXTiledMap*)getChildByTag(kTagTileMap); - auto layer = (FastTMXLayer*)map->getChildByTag(0); + auto map = (cocos2d::experimental::TMXTiledMap*)getChildByTag(kTagTileMap); + auto layer = (cocos2d::experimental::TMXLayer*)map->getChildByTag(0); ////----CCLOG("++++atlas quantity: %d", layer->textureAtlas()->getTotalQuads()); ////----CCLOG("++++children: %d", layer->getChildren()->count() ); @@ -522,8 +523,8 @@ void TMXReadWriteTestNew::repaintWithGID(float dt) { // unschedule:_cmd); - auto map = (FastTMXTiledMap*)getChildByTag(kTagTileMap); - auto layer = (FastTMXLayer*)map->getChildByTag(0); + auto map = (cocos2d::experimental::TMXTiledMap*)getChildByTag(kTagTileMap); + auto layer = (cocos2d::experimental::TMXLayer*)map->getChildByTag(0); auto s = layer->getLayerSize(); for( int x=0; xgetChildByTag(0); + auto map = (cocos2d::experimental::TMXTiledMap*)getChildByTag(kTagTileMap); + auto layer = (cocos2d::experimental::TMXLayer*)map->getChildByTag(0); auto s = layer->getLayerSize(); for( int y=0; y< s.height; y++ ) @@ -565,7 +566,7 @@ TMXHexTestNew::TMXHexTestNew() auto color = LayerColor::create( Color4B(64,64,64,255) ); addChild(color, -1); - auto map = FastTMXTiledMap::create("TileMaps/hexa-test.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/hexa-test.tmx"); addChild(map, 0, kTagTileMap); Size CC_UNUSED s = map->getContentSize(); @@ -587,7 +588,7 @@ TMXIsoTestNew::TMXIsoTestNew() auto color = LayerColor::create( Color4B(64,64,64,255) ); addChild(color, -1); - auto map = FastTMXTiledMap::create("TileMaps/iso-test.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/iso-test.tmx"); addChild(map, 0, kTagTileMap); // move map to the center of the screen @@ -611,7 +612,7 @@ TMXIsoTest1New::TMXIsoTest1New() auto color = LayerColor::create( Color4B(64,64,64,255) ); addChild(color, -1); - auto map = FastTMXTiledMap::create("TileMaps/iso-test1.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/iso-test1.tmx"); addChild(map, 0, kTagTileMap); Size CC_UNUSED s = map->getContentSize(); @@ -635,7 +636,7 @@ TMXIsoTest2New::TMXIsoTest2New() auto color = LayerColor::create( Color4B(64,64,64,255) ); addChild(color, -1); - auto map = FastTMXTiledMap::create("TileMaps/iso-test2.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/iso-test2.tmx"); addChild(map, 0, kTagTileMap); Size CC_UNUSED s = map->getContentSize(); @@ -662,7 +663,7 @@ TMXUncompressedTestNew::TMXUncompressedTestNew() auto color = LayerColor::create( Color4B(64,64,64,255) ); addChild(color, -1); - auto map = FastTMXTiledMap::create("TileMaps/iso-test2-uncompressed.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/iso-test2-uncompressed.tmx"); addChild(map, 0, kTagTileMap); Size CC_UNUSED s = map->getContentSize(); @@ -675,11 +676,11 @@ TMXUncompressedTestNew::TMXUncompressedTestNew() //unsupported // // testing release map -// FastTMXLayer* layer; +// TMXLayer* layer; // // auto& children = map->getChildren(); // for(const auto &node : children) { -// layer= static_cast(node); +// layer= static_cast(node); // layer->releaseMap(); // } @@ -697,7 +698,7 @@ std::string TMXUncompressedTestNew::title() const //------------------------------------------------------------------ TMXTilesetTestNew::TMXTilesetTestNew() { - auto map = FastTMXTiledMap::create("TileMaps/orthogonal-test5.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/orthogonal-test5.tmx"); addChild(map, 0, kTagTileMap); Size CC_UNUSED s = map->getContentSize(); @@ -716,7 +717,7 @@ std::string TMXTilesetTestNew::title() const //------------------------------------------------------------------ TMXOrthoObjectsTestNew::TMXOrthoObjectsTestNew() { - auto map = FastTMXTiledMap::create("TileMaps/ortho-objects.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/ortho-objects.tmx"); addChild(map, -1, kTagTileMap); Size CC_UNUSED s = map->getContentSize(); @@ -743,7 +744,7 @@ void TMXOrthoObjectsTestNew::onDraw(const Mat4 &transform, uint32_t flags) director->pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW); director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW, transform); - auto map = static_cast( getChildByTag(kTagTileMap) ); + auto map = static_cast( getChildByTag(kTagTileMap) ); auto pos = map->getPosition(); auto group = map->getObjectGroup("Object Group 1"); @@ -790,7 +791,7 @@ std::string TMXOrthoObjectsTestNew::subtitle() const TMXIsoObjectsTestNew::TMXIsoObjectsTestNew() { - auto map = FastTMXTiledMap::create("TileMaps/iso-test-objectgroup.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/iso-test-objectgroup.tmx"); addChild(map, -1, kTagTileMap); Size CC_UNUSED s = map->getContentSize(); @@ -818,7 +819,7 @@ void TMXIsoObjectsTestNew::onDraw(const Mat4 &transform, uint32_t flags) director->pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW); director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW, transform); - auto map = (FastTMXTiledMap*) getChildByTag(kTagTileMap); + auto map = (cocos2d::experimental::TMXTiledMap*) getChildByTag(kTagTileMap); auto pos = map->getPosition(); auto group = map->getObjectGroup("Object Group 1"); @@ -863,13 +864,13 @@ std::string TMXIsoObjectsTestNew::subtitle() const TMXResizeTestNew::TMXResizeTestNew() { - auto map = FastTMXTiledMap::create("TileMaps/orthogonal-test5.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/orthogonal-test5.tmx"); addChild(map, 0, kTagTileMap); Size CC_UNUSED s = map->getContentSize(); CCLOG("ContentSize: %f, %f", s.width,s.height); - FastTMXLayer* layer; + cocos2d::experimental::TMXLayer* layer; layer = map->getLayer("Layer 0"); auto ls = layer->getLayerSize(); @@ -900,7 +901,7 @@ std::string TMXResizeTestNew::subtitle() const //------------------------------------------------------------------ TMXIsoZorderNew::TMXIsoZorderNew() { - auto map = FastTMXTiledMap::create("TileMaps/iso-test-zorder.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/iso-test-zorder.tmx"); addChild(map, 0, kTagTileMap); auto s = map->getContentSize(); @@ -969,7 +970,7 @@ std::string TMXIsoZorderNew::subtitle() const //------------------------------------------------------------------ TMXOrthoZorderNew::TMXOrthoZorderNew() { - auto map = FastTMXTiledMap::create("TileMaps/orthogonal-test-zorder.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/orthogonal-test-zorder.tmx"); addChild(map, 0, kTagTileMap); Size CC_UNUSED s = map->getContentSize(); @@ -1030,7 +1031,7 @@ std::string TMXOrthoZorderNew::subtitle() const //------------------------------------------------------------------ TMXIsoVertexZNew::TMXIsoVertexZNew() { - auto map = FastTMXTiledMap::create("TileMaps/iso-test-vertexz.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/iso-test-vertexz.tmx"); addChild(map, 0, kTagTileMap); auto s = map->getContentSize(); @@ -1102,7 +1103,7 @@ std::string TMXIsoVertexZNew::subtitle() const //------------------------------------------------------------------ TMXOrthoVertexZNew::TMXOrthoVertexZNew() { - auto map = FastTMXTiledMap::create("TileMaps/orthogonal-test-vertexz.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/orthogonal-test-vertexz.tmx"); addChild(map, 0, kTagTileMap); Size CC_UNUSED s = map->getContentSize(); @@ -1173,7 +1174,7 @@ std::string TMXOrthoVertexZNew::subtitle() const //------------------------------------------------------------------ TMXIsoMoveLayerNew::TMXIsoMoveLayerNew() { - auto map = FastTMXTiledMap::create("TileMaps/iso-test-movelayer.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/iso-test-movelayer.tmx"); addChild(map, 0, kTagTileMap); map->setPosition(Vec2(-700,-50)); @@ -1200,7 +1201,7 @@ std::string TMXIsoMoveLayerNew::subtitle() const //------------------------------------------------------------------ TMXOrthoMoveLayerNew::TMXOrthoMoveLayerNew() { - auto map = FastTMXTiledMap::create("TileMaps/orthogonal-test-movelayer.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/orthogonal-test-movelayer.tmx"); addChild(map, 0, kTagTileMap); Size CC_UNUSED s = map->getContentSize(); @@ -1225,7 +1226,7 @@ std::string TMXOrthoMoveLayerNew::subtitle() const TMXTilePropertyTestNew::TMXTilePropertyTestNew() { - auto map = FastTMXTiledMap::create("TileMaps/ortho-tile-property.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/ortho-tile-property.tmx"); addChild(map ,0 ,kTagTileMap); for(int i=1;i<=20;i++){ @@ -1254,7 +1255,7 @@ std::string TMXTilePropertyTestNew::subtitle() const TMXOrthoFlipTestNew::TMXOrthoFlipTestNew() { - auto map = FastTMXTiledMap::create("TileMaps/ortho-rotation-test.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/ortho-rotation-test.tmx"); addChild(map, 0, kTagTileMap); Size CC_UNUSED s = map->getContentSize(); @@ -1277,7 +1278,7 @@ std::string TMXOrthoFlipTestNew::title() const TMXOrthoFlipRunTimeTestNew::TMXOrthoFlipRunTimeTestNew() { - auto map = FastTMXTiledMap::create("TileMaps/ortho-rotation-test.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/ortho-rotation-test.tmx"); addChild(map, 0, kTagTileMap); auto s = map->getContentSize(); @@ -1301,7 +1302,7 @@ std::string TMXOrthoFlipRunTimeTestNew::subtitle() const void TMXOrthoFlipRunTimeTestNew::flipIt(float dt) { - auto map = (FastTMXTiledMap*) getChildByTag(kTagTileMap); + auto map = (cocos2d::experimental::TMXTiledMap*) getChildByTag(kTagTileMap); auto layer = map->getLayer("Layer 0"); //blue diamond @@ -1349,7 +1350,7 @@ TMXOrthoFromXMLTestNew::TMXOrthoFromXMLTestNew() auto str = String::createWithContentsOfFile(FileUtils::getInstance()->fullPathForFilename(file.c_str()).c_str()); CCASSERT(str != nullptr, "Unable to open file"); - auto map = FastTMXTiledMap::createWithXML(str->getCString() ,resources.c_str()); + auto map = cocos2d::experimental::TMXTiledMap::createWithXML(str->getCString() ,resources.c_str()); addChild(map, 0, kTagTileMap); auto s = map->getContentSize(); @@ -1375,7 +1376,7 @@ TMXOrthoXMLFormatTestNew::TMXOrthoXMLFormatTestNew() // 1. load xml format tilemap // 2. gid lower than firstgid is ignored // 3. firstgid in tsx is ignored, tile property in tsx loaded correctly. - auto map = FastTMXTiledMap::create("TileMaps/xml-test.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/xml-test.tmx"); addChild(map, 0, kTagTileMap); auto s = map->getContentSize(); @@ -1401,7 +1402,7 @@ std::string TMXOrthoXMLFormatTestNew::title() const //------------------------------------------------------------------ TMXBug987New::TMXBug987New() { - auto map = FastTMXTiledMap::create("TileMaps/orthogonal-test6.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/orthogonal-test6.tmx"); addChild(map, 0, kTagTileMap); Size CC_UNUSED s1 = map->getContentSize(); @@ -1429,7 +1430,7 @@ std::string TMXBug987New::subtitle() const //------------------------------------------------------------------ TMXBug787New::TMXBug787New() { - auto map = FastTMXTiledMap::create("TileMaps/iso-test-bug787.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/iso-test-bug787.tmx"); addChild(map, 0, kTagTileMap); map->setScale(0.25f); @@ -1452,7 +1453,7 @@ std::string TMXBug787New::subtitle() const //------------------------------------------------------------------ TMXGIDObjectsTestNew::TMXGIDObjectsTestNew() { - auto map = FastTMXTiledMap::create("TileMaps/test-object-layer.tmx"); + auto map = cocos2d::experimental::TMXTiledMap::create("TileMaps/test-object-layer.tmx"); addChild(map, -1, kTagTileMap); Size CC_UNUSED s = map->getContentSize(); @@ -1477,7 +1478,7 @@ void TMXGIDObjectsTestNew::onDraw(const Mat4 &transform, uint32_t flags) director->pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW); director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW, transform); - auto map = (FastTMXTiledMap*)getChildByTag(kTagTileMap); + auto map = (cocos2d::experimental::TMXTiledMap*)getChildByTag(kTagTileMap); auto pos = map->getPosition(); auto group = map->getObjectGroup("Object Layer 1"); diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp index 7f56938d5e..055bbc2fa3 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp @@ -42,6 +42,18 @@ g_guisTests[] = Scene* scene = sceneManager->currentUIScene(); Director::getInstance()->replaceScene(scene); } + }, + { + "Scale9 Sprite Test", + [](Ref* sender) + { + UISceneManager* sceneManager = UISceneManager::sharedUISceneManager(); + sceneManager->setCurrentUISceneId(kUIScale9SpriteTest); + sceneManager->setMinUISceneId(kUIScale9SpriteTest); + sceneManager->setMaxUISceneId(kUIS9Flip); + Scene* scene = sceneManager->currentUIScene(); + Director::getInstance()->replaceScene(scene); + } }, { @@ -51,7 +63,7 @@ g_guisTests[] = UISceneManager* sceneManager = UISceneManager::sharedUISceneManager(); sceneManager->setCurrentUISceneId(kUIButtonTest); sceneManager->setMinUISceneId(kUIButtonTest); - sceneManager->setMaxUISceneId(kUIButtonTest_Title); + sceneManager->setMaxUISceneId(kUIButtonTestSwitchScale9); Scene* scene = sceneManager->currentUIScene(); Director::getInstance()->replaceScene(scene); } @@ -87,7 +99,7 @@ g_guisTests[] = UISceneManager* sceneManager = UISceneManager::sharedUISceneManager(); sceneManager->setCurrentUISceneId(kUIImageViewTest); sceneManager->setMinUISceneId(kUIImageViewTest); - sceneManager->setMaxUISceneId(kUIImageViewTest_Scale9); + sceneManager->setMaxUISceneId(kUIImageViewTest_ContentSize); Scene* scene = sceneManager->currentUIScene(); Director::getInstance()->replaceScene(scene); } diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocostudioParserTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocostudioParserTest.cpp index 7b600324aa..05b7a8055b 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocostudioParserTest.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocostudioParserTest.cpp @@ -130,7 +130,7 @@ void CocostudioParserTestScene::onEnter() //#endif MenuItemLabel* pMenuItem = MenuItemLabel::create(label, CC_CALLBACK_1(CocostudioParserTestScene::BackCallback, this)); - Menu* pMenu = Menu::create(pMenuItem, NULL); + Menu* pMenu = Menu::create(pMenuItem, nullptr); pMenu->setPosition( Vec2::ZERO ); pMenuItem->setPosition( Vec2( VisibleRect::right().x - 50, VisibleRect::bottom().y + 25) ); diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocostudioParserTest/CocostudioParserJsonTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocostudioParserTest/CocostudioParserJsonTest.cpp index 689b3e1e4f..822bbed3fe 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocostudioParserTest/CocostudioParserJsonTest.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocostudioParserTest/CocostudioParserJsonTest.cpp @@ -76,7 +76,7 @@ void CocostudioParserJsonScene::onEnter() //#endif MenuItemLabel* pMenuItem = MenuItemLabel::create(label, CC_CALLBACK_1(CocostudioParserJsonScene::BackCallback, this)); - Menu* pMenu = Menu::create(pMenuItem, NULL); + Menu* pMenu = Menu::create(pMenuItem, nullptr); pMenu->setPosition( Vec2::ZERO ); pMenuItem->setPosition( Vec2( VisibleRect::right().x - 50, VisibleRect::bottom().y + 25) ); diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomImageView.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomImageView.cpp index 6c392cc8a6..fdef802b13 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomImageView.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomImageView.cpp @@ -49,7 +49,7 @@ void CustomImageView::initRenderer() ImageView::initRenderer(); _label = Label::create(); - ProtectedNode::addChild(_label, getLocalZOrder() + 1, -1); + addChild(_label, getLocalZOrder() + 1, -1); } void CustomImageView::setText(const std::string &text) diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.cpp index 43ec7bcc2d..af2f041c81 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.cpp @@ -75,7 +75,7 @@ void CustomParticleWidget::setParticlePlist(const char *plist) _emitter = ParticleSystemQuad::create(plist); } //Warning!!! don't forget to set the position - addProtectedChild(_emitter , getLocalZOrder() + 1, -1); + addChild(_emitter , getLocalZOrder() + 1, -1); this->setParticlePosition(Vec2::ZERO); _emitterPlist = plist; diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp index 35c713551b..aad498fcd0 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp @@ -344,3 +344,168 @@ void UIButtonTest_Title::touchEvent(Ref *pSender, Widget::TouchEventType type) break; } } + + +// UIButtonTest_RemoveSelf +UIButtonTestRemoveSelf::UIButtonTestRemoveSelf() +: _displayValueLabel(nullptr) +{ + +} + +UIButtonTestRemoveSelf::~UIButtonTestRemoveSelf() +{ +} + +bool UIButtonTestRemoveSelf::init() +{ + if (UIScene::init()) + { + Size widgetSize = _widget->getContentSize(); + + // Add a label in which the button events will be displayed + _displayValueLabel = Text::create("No Event", "fonts/Marker Felt.ttf",32); + _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f)); + _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f)); + _uiLayer->addChild(_displayValueLabel); + + // Add the alert + Text* alert = Text::create("Remove Self in the Button's Callback shouldn't cause crash!","fonts/Marker Felt.ttf",10); + alert->setColor(Color3B(159, 168, 176)); + + alert->setPosition(Vec2(widgetSize.width / 2.0f, + widgetSize.height / 2.0f - alert->getContentSize().height * 2.75f)); + + _uiLayer->addChild(alert); + + Layout *layout = Layout::create(); + layout->setContentSize(widgetSize * 0.6); + layout->setBackGroundColor(Color3B::GREEN); + layout->setBackGroundColorType(Layout::BackGroundColorType::SOLID); + layout->setBackGroundColorOpacity(100); + layout->setPosition(Size(widgetSize.width/2, widgetSize.height/2)); + layout->setAnchorPoint(Vec2::ANCHOR_MIDDLE); + layout->setTag(12); + _uiLayer->addChild(layout); + + // Create the button + Button* button = Button::create("cocosui/animationbuttonnormal.png", + "cocosui/animationbuttonpressed.png"); + button->setPosition(Vec2(layout->getContentSize().width / 2.0f, layout->getContentSize().height / 2.0f)); + // button->addTouchEventListener(this, toucheventselector(UIButtonTest::touchEvent)); + button->addTouchEventListener(CC_CALLBACK_2(UIButtonTestRemoveSelf::touchEvent, this)); + layout->addChild(button); + + + + return true; + } + return false; +} + +void UIButtonTestRemoveSelf::touchEvent(Ref *pSender, Widget::TouchEventType type) +{ + switch (type) + { + case Widget::TouchEventType::BEGAN: + _displayValueLabel->setString(String::createWithFormat("Touch Down")->getCString()); + break; + + case Widget::TouchEventType::MOVED: + _displayValueLabel->setString(String::createWithFormat("Touch Move")->getCString()); + break; + + case Widget::TouchEventType::ENDED: + { + _displayValueLabel->setString(String::createWithFormat("Touch Up")->getCString()); + auto layout = _uiLayer->getChildByTag(12); + layout->removeFromParentAndCleanup(true); + } + break; + + case Widget::TouchEventType::CANCELED: + _displayValueLabel->setString(String::createWithFormat("Touch Cancelled")->getCString()); + break; + + default: + break; + } +} + +// UIButtonTestSwitchScale9 +UIButtonTestSwitchScale9::UIButtonTestSwitchScale9() +: _displayValueLabel(nullptr) +{ + +} + +UIButtonTestSwitchScale9::~UIButtonTestSwitchScale9() +{ +} + +bool UIButtonTestSwitchScale9::init() +{ + if (UIScene::init()) + { + Size widgetSize = _widget->getContentSize(); + + // Add a label in which the button events will be displayed + _displayValueLabel = Text::create("No Event", "fonts/Marker Felt.ttf",32); + _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f)); + _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f)); + _uiLayer->addChild(_displayValueLabel); + + // Add the alert + Text* alert = Text::create("Button","fonts/Marker Felt.ttf",30); + alert->setColor(Color3B(159, 168, 176)); + + alert->setPosition(Vec2(widgetSize.width / 2.0f, + widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f)); + + _uiLayer->addChild(alert); + + // Create the button + Button* button = Button::create("cocosui/animationbuttonnormal.png", + "cocosui/animationbuttonpressed.png"); + button->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f)); + button->addTouchEventListener(CC_CALLBACK_2(UIButtonTestSwitchScale9::touchEvent, this)); + button->ignoreContentAdaptWithSize(false); + + _uiLayer->addChild(button); + + + + return true; + } + return false; +} + +void UIButtonTestSwitchScale9::touchEvent(Ref *pSender, Widget::TouchEventType type) +{ + switch (type) + { + case Widget::TouchEventType::BEGAN: + _displayValueLabel->setString(String::createWithFormat("Touch Down")->getCString()); + break; + + case Widget::TouchEventType::MOVED: + _displayValueLabel->setString(String::createWithFormat("Touch Move")->getCString()); + break; + + case Widget::TouchEventType::ENDED: + { + _displayValueLabel->setString(String::createWithFormat("Touch Up")->getCString()); + auto btn = ((Button*)pSender); + btn->setScale9Enabled(!btn->isScale9Enabled()); + btn->setContentSize(Size(200,100)); + } + break; + + case Widget::TouchEventType::CANCELED: + _displayValueLabel->setString(String::createWithFormat("Touch Cancelled")->getCString()); + break; + + default: + break; + } +} diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h index 0cf2f01c8f..c9f7be36f7 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h @@ -79,4 +79,30 @@ protected: Text* _displayValueLabel; }; +class UIButtonTestRemoveSelf : public UIScene +{ +public: + UIButtonTestRemoveSelf(); + ~UIButtonTestRemoveSelf(); + bool init(); + void touchEvent(Ref *pSender, Widget::TouchEventType type); + +protected: + UI_SCENE_CREATE_FUNC(UIButtonTestRemoveSelf) + Text* _displayValueLabel; +}; + +class UIButtonTestSwitchScale9 : public UIScene +{ +public: + UIButtonTestSwitchScale9(); + ~UIButtonTestSwitchScale9(); + bool init(); + void touchEvent(Ref *pSender, Widget::TouchEventType type); + +protected: + UI_SCENE_CREATE_FUNC(UIButtonTestSwitchScale9) + Text* _displayValueLabel; +}; + #endif /* defined(__TestCpp__UIButtonTest__) */ diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp index a8b34f408e..01978a4e86 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp @@ -61,3 +61,71 @@ bool UIImageViewTest_Scale9::init() } return false; } + +// UIImageViewTest_ContentSize + +bool UIImageViewTest_ContentSize::init() +{ + if (UIScene::init()) + { + Size widgetSize = _widget->getContentSize(); + + Text* alert = Text::create("ImageView ContentSize Change", "fonts/Marker Felt.ttf", 26); + alert->setColor(Color3B(159, 168, 176)); + alert->setPosition(Vec2(widgetSize.width / 2.0f, + widgetSize.height / 2.0f - alert->getContentSize().height * 2.125f)); + + _uiLayer->addChild(alert); + + Text *status = Text::create("child ImageView position percent", "fonts/Marker Felt.ttf", 16); + status->setColor(Color3B::RED); + status->setPosition(Vec2(widgetSize.width/2, widgetSize.height/2 + 80)); + _uiLayer->addChild(status,20); + + // Create the imageview + ImageView* imageView = ImageView::create("cocosui/buttonHighlighted.png"); + imageView->setScale9Enabled(true); + imageView->setContentSize(Size(200, 80)); + imageView->setPosition(Vec2(widgetSize.width / 2.0f, + widgetSize.height / 2.0f )); + + + ImageView* imageViewChild = ImageView::create("cocosui/buttonHighlighted.png"); + imageViewChild->setScale9Enabled(true); + imageViewChild->setSizeType(Widget::SizeType::PERCENT); + imageViewChild->setPositionType(Widget::PositionType::PERCENT); + imageViewChild->setSizePercent(Vec2::ANCHOR_MIDDLE); + imageViewChild->setPositionPercent(Vec2::ANCHOR_MIDDLE); + imageViewChild->setPosition(Vec2(widgetSize.width / 2.0f, + widgetSize.height / 2.0f)); + + ImageView* imageViewChild2 = ImageView::create("cocosui/buttonHighlighted.png"); + imageViewChild2->setScale9Enabled(true); + imageViewChild2->setSizeType(Widget::SizeType::PERCENT); + imageViewChild2->setPositionType(Widget::PositionType::PERCENT); + imageViewChild2->setSizePercent(Vec2::ANCHOR_MIDDLE); + imageViewChild2->setPositionPercent(Vec2::ANCHOR_MIDDLE); + imageViewChild->addChild(imageViewChild2); + + + imageView->addChild(imageViewChild); + + imageView->setTouchEnabled(true); + imageView->addTouchEventListener([=](Ref* sender, Widget::TouchEventType type){ + if (type == Widget::TouchEventType::ENDED) { + float width = CCRANDOM_0_1() * 200 + 50; + float height = CCRANDOM_0_1() * 80 + 30; + imageView->setContentSize(Size(width, height)); + + imageViewChild->setPositionPercent(Vec2(CCRANDOM_0_1(), CCRANDOM_0_1())); + status->setString(StringUtils::format("child ImageView position percent: %f, %f", + imageViewChild->getPositionPercent().x, imageViewChild->getPositionPercent().y)); + } + }); + + _uiLayer->addChild(imageView); + + return true; + } + return false; +} diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h index 7067bbb407..a70668751c 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h @@ -45,4 +45,13 @@ protected: UI_SCENE_CREATE_FUNC(UIImageViewTest_Scale9) }; +class UIImageViewTest_ContentSize : public UIScene +{ +public: + bool init(); + +protected: + UI_SCENE_CREATE_FUNC(UIImageViewTest_ContentSize) +}; + #endif /* defined(__TestCpp__UIImageViewTest__) */ diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp index d69288aa6b..c9c3049ec6 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp @@ -20,6 +20,23 @@ bool UIRichTextTest::init() { Size widgetSize = _widget->getContentSize(); + auto config = Configuration::getInstance(); + config->loadConfigFile("configs/config-test-ok.plist"); + + + std::string str1 = config->getValue("Chinese").asString(); + std::string str2 = config->getValue("Japanese").asString(); + CCLOG("str1:%s ascii length = %ld, utf8 length = %ld, substr = %s", + str1.c_str(), + str1.length(), + StringUtils::getCharacterCountInUTF8String(str1), + Helper::getSubStringOfUTF8String(str1, 0, 5).c_str()); + CCLOG("str2:%s ascii length = %ld, utf8 length = %ld, substr = %s", + str2.c_str(), + str2.length(), + StringUtils::getCharacterCountInUTF8String(str2), + Helper::getSubStringOfUTF8String(str2, 0, 2).c_str()); + // Add the alert Text *alert = Text::create("RichText", "fonts/Marker Felt.ttf", 30); alert->setColor(Color3B(159, 168, 176)); @@ -31,7 +48,6 @@ bool UIRichTextTest::init() button->setTouchEnabled(true); button->setTitleText("switch"); button->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + button->getContentSize().height * 2.5)); -// button->addTouchEventListener(this, toucheventselector(UIRichTextTest::touchEvent)); button->addTouchEventListener(CC_CALLBACK_2(UIRichTextTest::touchEvent, this)); button->setLocalZOrder(10); _widget->addChild(button); @@ -42,10 +58,10 @@ bool UIRichTextTest::init() _richText->ignoreContentAdaptWithSize(false); _richText->setContentSize(Size(100, 100)); - RichElementText* re1 = RichElementText::create(1, Color3B::WHITE, 255, "This color is white. ", "Helvetica", 10); + RichElementText* re1 = RichElementText::create(1, Color3B::WHITE, 255, str1, "Marker Felt", 10); RichElementText* re2 = RichElementText::create(2, Color3B::YELLOW, 255, "And this is yellow. ", "Helvetica", 10); - RichElementText* re3 = RichElementText::create(3, Color3B::BLUE, 255, "This one is blue. ", "Helvetica", 10); - RichElementText* re4 = RichElementText::create(4, Color3B::GREEN, 255, "And green. ", "Helvetica", 10); + RichElementText* re3 = RichElementText::create(3, Color3B::GRAY, 255, str2, "Helvetica", 10); + RichElementText* re4 = RichElementText::create(4, Color3B::GREEN, 255, "And green with TTF support. ", "fonts/Marker Felt.ttf", 10); RichElementText* re5 = RichElementText::create(5, Color3B::RED, 255, "Last one is red ", "Helvetica", 10); RichElementImage* reimg = RichElementImage::create(6, Color3B::WHITE, 255, "cocosui/sliderballnormal.png"); diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScale9SpriteTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScale9SpriteTest.cpp new file mode 100644 index 0000000000..9f595f617b --- /dev/null +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScale9SpriteTest.cpp @@ -0,0 +1,661 @@ +/**************************************************************************** + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +#include "UIScale9SpriteTest.h" +#include "testResource.h" + +// UIScale9SpriteTest +UIScale9SpriteTest::UIScale9SpriteTest() +{ + +} + +UIScale9SpriteTest::~UIScale9SpriteTest() +{ +} + +bool UIScale9SpriteTest::init() +{ + if (UIScene::init()) + { + Size widgetSize = _widget->getContentSize(); + + auto moveTo = MoveBy::create(1.0, Vec2(30,0)); + auto moveBack = moveTo->reverse(); + auto rotateBy = RotateBy::create(1.0, 180); + auto action = Sequence::create(moveTo,moveBack, rotateBy, NULL); + + + Sprite *normalSprite1 = Sprite::create("cocosui/animationbuttonnormal.png"); + normalSprite1->setPosition(100, 270); +// normalSprite1->setAnchorPoint(Vec2(0.5,0.5)); +// normalSprite1->setContentSize(Size(100,100)); + + this->addChild(normalSprite1); + normalSprite1->runAction((FiniteTimeAction*)action->clone()); + + ui::Scale9Sprite *normalSprite2 = ui::Scale9Sprite::create("cocosui/animationbuttonnormal.png"); + normalSprite2->setPosition(120, 270); + normalSprite2->setScale9Enabled(false); +// normalSprite2->setContentSize(Size(100,100)); +// normalSprite2->setAnchorPoint(Vec2(0.5,0.5)); + normalSprite2->setOpacity(100); + this->addChild(normalSprite2); + normalSprite2->setColor(Color3B::GREEN); + normalSprite2->runAction(action); + + auto action2 = action->clone(); + ui::Scale9Sprite *sp1 = ui::Scale9Sprite::create("cocosui/animationbuttonnormal.png"); + sp1->setPosition(100, 160); + sp1->setScale(1.2); + sp1->setContentSize(Size(100,100)); + sp1->setColor(Color3B::GREEN); +// sp1->setScale9Enabled(false); + this->addChild(sp1); + sp1->runAction((FiniteTimeAction*)action2); + + cocos2d::ui::Scale9Sprite *sp2 = ui::Scale9Sprite::create("cocosui/animationbuttonnormal.png"); + sp2->setPosition(350, 160); + sp2->setPreferredSize(sp1->getContentSize() * 1.2); + sp2->setColor(Color3B::GREEN); + sp2->setContentSize(Size(100,100)); + + this->addChild(sp2); + auto action3 = action->clone(); + sp2->runAction((FiniteTimeAction*)action3); + + return true; + } + return false; +} + + +UIScale9SpriteHierarchialTest::UIScale9SpriteHierarchialTest() +{ + +} + +UIScale9SpriteHierarchialTest::~UIScale9SpriteHierarchialTest() +{ +} + +bool UIScale9SpriteHierarchialTest::init() +{ + if (UIScene::init()) + { + Size widgetSize = _widget->getContentSize(); + + auto moveTo = MoveBy::create(1.0, Vec2(30,0)); + auto moveBack = moveTo->reverse(); + auto rotateBy = RotateBy::create(1.0, 180); + auto fadeOut = FadeOut::create(2.0); + auto action = Sequence::create(moveTo,moveBack, rotateBy,fadeOut, NULL); + + + Sprite *normalSprite1 = Sprite::create("cocosui/animationbuttonnormal.png"); + normalSprite1->setPosition(100, 270); + // normalSprite1->setAnchorPoint(Vec2(0.5,0.5)); + // normalSprite1->setContentSize(Size(100,100)); + +// Sprite *childSprite = Sprite::create("cocosui/animationbuttonnormal.png"); + normalSprite1->setCascadeColorEnabled(true); + normalSprite1->setCascadeOpacityEnabled(true); + normalSprite1->setColor(Color3B::GREEN); + + + + this->addChild(normalSprite1); + normalSprite1->runAction((FiniteTimeAction*)action->clone()); + + ui::Scale9Sprite *normalSprite2 = ui::Scale9Sprite::create("cocosui/animationbuttonnormal.png"); +// normalSprite2->setPosition(120, 270); + normalSprite2->setScale9Enabled(false); + // normalSprite2->setContentSize(Size(100,100)); + // normalSprite2->setAnchorPoint(Vec2(0.5,0.5)); + normalSprite2->setOpacity(100); + normalSprite1->addChild(normalSprite2); + + auto action2 = action->clone(); + ui::Scale9Sprite *sp1 = ui::Scale9Sprite::create("cocosui/animationbuttonnormal.png"); + sp1->setPosition(200, 160); + sp1->setScale(1.2); + sp1->setContentSize(Size(100,100)); + sp1->setColor(Color3B::GREEN); + // sp1->setScale9Enabled(false); + this->addChild(sp1); + sp1->runAction((FiniteTimeAction*)action2); + + cocos2d::ui::Scale9Sprite *sp2 = ui::Scale9Sprite::create("cocosui/animationbuttonnormal.png"); +// sp2->setPosition(350, 160); + sp2->setPreferredSize(sp1->getContentSize() * 1.2); + sp2->setColor(Color3B::GREEN); + sp2->setContentSize(Size(100,100)); + + sp1->addChild(sp2); +// auto action3 = action->clone(); +// sp2->runAction((FiniteTimeAction*)action3); + + return true; + } + return false; +} + +UIScale9SpriteTouchTest::UIScale9SpriteTouchTest() +{ + +} + +UIScale9SpriteTouchTest::~UIScale9SpriteTouchTest() +{ +} + +bool UIScale9SpriteTouchTest::init() +{ + if (UIScene::init()) + { + + Vec2 origin = Director::getInstance()->getVisibleOrigin(); + Size size = Director::getInstance()->getVisibleSize(); + + auto containerForSprite1 = Node::create(); + auto sprite1 = cocos2d::ui::Scale9Sprite::create("Images/CyanSquare.png"); +// sprite1->setScale9Enabled(false); + sprite1->setPosition(origin+Vec2(size.width/2, size.height/2) + Vec2(-80, 80)); + containerForSprite1->addChild(sprite1); + addChild(containerForSprite1, 10); + + auto sprite2 = ui::Scale9Sprite::create("Images/MagentaSquare.png"); + sprite2->setPosition(origin+Vec2(size.width/2, size.height/2)); +// sprite2->setCascadeOpacityEnabled(false); +// sprite2->setScale9Enabled(false); + + addChild(sprite2, 20); + + auto sprite3 = ui::Scale9Sprite::create("Images/YellowSquare.png"); + sprite3->setPosition(Vec2(0, 0)); + sprite3->setCascadeOpacityEnabled(false); + sprite2->addChild(sprite3, 1); +// sprite3->setScale9Enabled(false); + + + // Make sprite1 touchable + auto listener1 = EventListenerTouchOneByOne::create(); + listener1->setSwallowTouches(true); + + listener1->onTouchBegan = [](Touch* touch, Event* event){ + auto target = static_cast(event->getCurrentTarget()); + + Vec2 locationInNode = target->convertToNodeSpace(touch->getLocation()); + Size s = target->getContentSize(); + Rect rect = Rect(0, 0, s.width, s.height); + + if (rect.containsPoint(locationInNode)) + { + log("sprite began... x = %f, y = %f", locationInNode.x, locationInNode.y); + target->setOpacity(180); + return true; + } + return false; + }; + + listener1->onTouchMoved = [](Touch* touch, Event* event){ + auto target = static_cast(event->getCurrentTarget()); + target->setPosition(target->getPosition() + touch->getDelta()); + }; + + listener1->onTouchEnded = [=](Touch* touch, Event* event){ + auto target = static_cast(event->getCurrentTarget()); + log("sprite onTouchesEnded.. "); + target->setOpacity(255); + if (target == sprite2) + { + containerForSprite1->setLocalZOrder(100); + } + else if(target == sprite1) + { + containerForSprite1->setLocalZOrder(0); + } + }; + + _eventDispatcher->addEventListenerWithSceneGraphPriority(listener1, sprite1); + _eventDispatcher->addEventListenerWithSceneGraphPriority(listener1->clone(), sprite2); + _eventDispatcher->addEventListenerWithSceneGraphPriority(listener1->clone(), sprite3); + + return true; + } + return false; +} + +bool UIS9BatchNodeBasic::init() +{ + if (UIScene::init()) { + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + + + auto sprite = Sprite::create("Images/blocks9.png"); + + auto blocks = ui::Scale9Sprite::create(); + + blocks->updateWithSprite(sprite, Rect(0, 0, 96, 96), false, Rect(0, 0, 96, 96)); + + blocks->setPosition(Vec2(x, y)); + + this->addChild(blocks); + + + return true; + } + + + return false; +} + +bool UIS9FrameNameSpriteSheet::init() +{ + if (UIScene::init()) { + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + + SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist); + + + auto blocks = ui::Scale9Sprite::createWithSpriteFrameName("blocks9.png"); + + blocks->setPosition(Vec2(x, y)); + + this->addChild(blocks); + + + return true; + } + + return false; +} + + +bool UIS9FrameNameSpriteSheetRotated::init() +{ + if (UIScene::init()) { + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + + SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist); + + auto blocks = ui::Scale9Sprite::createWithSpriteFrameName("blocks9r.png"); + + blocks->setPosition(Vec2(x, y)); + + this->addChild(blocks); + + return true; + } + + return false; +} + + +bool UIS9BatchNodeScaledNoInsets::init() +{ + if (UIScene::init()) { + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + + // scaled without insets + auto sprite_scaled = Sprite::create("Images/blocks9.png"); + + auto blocks_scaled = ui::Scale9Sprite::create(); + blocks_scaled->updateWithSprite(sprite_scaled, Rect(0, 0, 96, 96), false, Rect(0, 0, 96, 96)); + + blocks_scaled->setPosition(Vec2(x, y)); + + blocks_scaled->setContentSize(Size(96 * 4, 96*2)); + + this->addChild(blocks_scaled); + return true; + } + return false; +} + +bool UIS9FrameNameSpriteSheetScaledNoInsets::init() +{ + if (UIScene::init()) { + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist); + + auto blocks_scaled = ui::Scale9Sprite::createWithSpriteFrameName("blocks9.png"); + + blocks_scaled->setPosition(Vec2(x, y)); + + blocks_scaled->setContentSize(Size(96 * 4, 96*2)); + + this->addChild(blocks_scaled); + return true; + } + return false; +} + +bool UIS9FrameNameSpriteSheetRotatedScaledNoInsets::init() +{ + if (UIScene::init()) { + SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist); + + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + + + auto blocks_scaled = ui::Scale9Sprite::createWithSpriteFrameName("blocks9r.png"); + + blocks_scaled->setPosition(Vec2(x, y)); + + blocks_scaled->setContentSize(Size(96 * 4, 96*2)); + + this->addChild(blocks_scaled); + + return true; + } + return false; +} + + +bool UIS9BatchNodeScaleWithCapInsets::init() +{ + if (UIScene::init()) { + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + + + auto sprite_scaled_with_insets = Sprite::create("Images/blocks9.png"); + + auto blocks_scaled_with_insets = ui::Scale9Sprite::create(); + + blocks_scaled_with_insets->updateWithSprite(sprite_scaled_with_insets, Rect(0, 0, 96, 96), false, Rect(32, 32, 32, 32)); + + blocks_scaled_with_insets->setContentSize(Size(96 * 4.5, 96 * 2.5)); + + blocks_scaled_with_insets->setPosition(Vec2(x, y)); + + this->addChild(blocks_scaled_with_insets); + return true; + } + return false; +} + +bool UIS9FrameNameSpriteSheetInsets::init() +{ + if (UIScene::init()) { + SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist); + + + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + + + auto blocks_with_insets = ui::Scale9Sprite::createWithSpriteFrameName("blocks9.png", Rect(32, 32, 32, 32)); + + blocks_with_insets->setPosition(Vec2(x, y)); + + this->addChild(blocks_with_insets); + return true; + } + return false; +} + +bool UIS9FrameNameSpriteSheetInsetsScaled::init() +{ + if (UIScene::init()) { + SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist); + + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + + auto blocks_scaled_with_insets = ui::Scale9Sprite::createWithSpriteFrameName("blocks9.png", Rect(32, 32, 32, 32)); + + blocks_scaled_with_insets->setContentSize(Size(96 * 4.5, 96 * 2.5)); + + blocks_scaled_with_insets->setPosition(Vec2(x, y)); + + this->addChild(blocks_scaled_with_insets); + return true; + } + return false; +} + +bool UIS9FrameNameSpriteSheetRotatedInsets::init() +{ + if (UIScene::init()) { + SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist); + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + + auto blocks_with_insets = ui::Scale9Sprite::createWithSpriteFrameName("blocks9r.png", Rect(32, 32, 32, 32)); + + blocks_with_insets->setPosition(Vec2(x, y)); + + this->addChild(blocks_with_insets); + return true; + } + return false; +} + +bool UIS9_TexturePacker::init() +{ + if (UIScene::init()) { + SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist); + + auto winSize = Director::getInstance()->getWinSize(); + SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_ui_plist); + + float x = winSize.width / 4; + float y = 0 + (winSize.height / 2); + + auto s = ui::Scale9Sprite::createWithSpriteFrameName("button_normal.png"); + + s->setPosition(Vec2(x, y)); + + s->setContentSize(Size(14 * 16, 10 * 16)); + + this->addChild(s); + + x = winSize.width * 3/4; + + auto s2 = ui::Scale9Sprite::createWithSpriteFrameName("button_actived.png"); + + s2->setPosition(Vec2(x, y)); + + s2->setContentSize(Size(14 * 16, 10 * 16)); + + this->addChild(s2); + return true; + } + return false; +} + +bool UIS9FrameNameSpriteSheetRotatedInsetsScaled::init() +{ + if (UIScene::init()) { + SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist); + + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + + auto blocks_scaled_with_insets = ui::Scale9Sprite::createWithSpriteFrameName("blocks9.png", Rect(32, 32, 32, 32)); + + blocks_scaled_with_insets->setContentSize(Size(96 * 4.5, 96 * 2.5)); + + blocks_scaled_with_insets->setPosition(Vec2(x, y)); + + this->addChild(blocks_scaled_with_insets); + return true; + } + return false; +} + +bool UIS9FrameNameSpriteSheetRotatedSetCapInsetLater::init() +{ + if (UIScene::init()) { + SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist); + + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + + auto blocks_scaled_with_insets = ui::Scale9Sprite::createWithSpriteFrameName("blocks9r.png"); + + blocks_scaled_with_insets->setInsetLeft(32); + blocks_scaled_with_insets->setInsetRight(32); + + blocks_scaled_with_insets->setPreferredSize(Size(32*5.5f, 32*4)); + blocks_scaled_with_insets->setPosition(Vec2(x, y)); + + this->addChild(blocks_scaled_with_insets); + return true; + } + return false; +} + +bool UIS9CascadeOpacityAndColor::init() +{ + if (UIScene::init()) { + SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist); + + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + auto rgba = Layer::create(); + rgba->setCascadeColorEnabled(true); + rgba->setCascadeOpacityEnabled(true); + this->addChild(rgba); + + + auto blocks_scaled_with_insets = ui::Scale9Sprite::createWithSpriteFrameName("blocks9r.png"); + + blocks_scaled_with_insets->setPosition(Vec2(x, y)); + + rgba->addChild(blocks_scaled_with_insets); + auto actions = Sequence::create(FadeIn::create(1), + TintTo::create(1, 0, 255, 0), + TintTo::create(1, 255, 255, 255), + FadeOut::create(1), + nullptr); + auto repeat = RepeatForever::create(actions); + rgba->runAction(repeat); + return true; + } + return false; +} + +bool UIS9ZOrder::init() +{ + if (UIScene::init()) { + SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist); + + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + + auto blocks_scaled_with_insets = ui::Scale9Sprite::createWithSpriteFrameName("blocks9r.png"); + + blocks_scaled_with_insets->setPosition(Vec2(x, y)); + this->addChild(blocks_scaled_with_insets); + + Sprite *normalSprite = Sprite::createWithSpriteFrameName("blocks9r.png"); + normalSprite->setColor(Color3B::RED); + blocks_scaled_with_insets->addChild(normalSprite); + + auto topLabel = Label::createWithSystemFont("I Must be On the Top", "Arial", 15); + topLabel->setPosition(Vec2(20,20)); + blocks_scaled_with_insets->addChild(topLabel); + + auto bottomLabel = Label::createWithSystemFont("I Must be On the Bottom", "Arial", 15); + bottomLabel->setPosition(Vec2(80,80)); + bottomLabel->setColor(Color3B::BLUE); + blocks_scaled_with_insets->addChild(bottomLabel,-1); + + return true; + } + return false; +} + +bool UIS9Flip::init() +{ + if (UIScene::init()) { + SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist); + + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + + + auto normalSprite = ui::Scale9Sprite::createWithSpriteFrameName("blocks9r.png"); + + normalSprite->setPosition(Vec2(x, y )); + this->addChild(normalSprite); + + + auto normalLabel = Label::createWithSystemFont("Normal Sprite","Airal",10); + normalLabel->setPosition(normalSprite->getPosition() + Vec2(0, normalSprite->getContentSize().height/2 + 10)); + this->addChild(normalLabel); + + + + auto flipXSprite = ui::Scale9Sprite::createWithSpriteFrameName("blocks9r.png"); + + flipXSprite->setPosition(Vec2(x - 120, y )); + this->addChild(flipXSprite); + + flipXSprite->setFlippedX(true); + + auto flipXLabel = Label::createWithSystemFont("Sprite FlipX","Airal",10); + flipXLabel->setPosition(flipXSprite->getPosition() + Vec2(0, flipXSprite->getContentSize().height/2 + 10)); + this->addChild(flipXLabel); + + + auto flipYSprite = ui::Scale9Sprite::createWithSpriteFrameName("blocks9r.png"); + + flipYSprite->setPosition(Vec2(x + 120, y)); + this->addChild(flipYSprite); + + flipYSprite->setFlippedY(true); + + auto flipYLabel = Label::createWithSystemFont("Sprite FlipY","Airal",10); + flipYLabel->setPosition(flipYSprite->getPosition() + Vec2(0, flipYSprite->getContentSize().height/2 + 10)); + this->addChild(flipYLabel); + + return true; + } + return false; +} diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScale9SpriteTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScale9SpriteTest.h new file mode 100644 index 0000000000..f57827ca35 --- /dev/null +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScale9SpriteTest.h @@ -0,0 +1,259 @@ +/**************************************************************************** + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +#ifndef __cocos2d_tests__UIScale9SpriteTest__ +#define __cocos2d_tests__UIScale9SpriteTest__ +#include "UIScene.h" + +class UIScale9SpriteTest : public UIScene +{ +public: + UIScale9SpriteTest(); + ~UIScale9SpriteTest(); + bool init(); + +protected: + UI_SCENE_CREATE_FUNC(UIScale9SpriteTest) +}; + +class UIScale9SpriteHierarchialTest : public UIScene +{ +public: + UIScale9SpriteHierarchialTest(); + ~UIScale9SpriteHierarchialTest(); + bool init(); + +protected: + UI_SCENE_CREATE_FUNC(UIScale9SpriteHierarchialTest) +}; + +class UIScale9SpriteTouchTest : public UIScene +{ +public: + UIScale9SpriteTouchTest(); + ~UIScale9SpriteTouchTest(); + bool init(); + +protected: + UI_SCENE_CREATE_FUNC(UIScale9SpriteTouchTest) +}; + +// S9BatchNodeBasic + +class UIS9BatchNodeBasic : public UIScene +{ +public: + CREATE_FUNC(UIS9BatchNodeBasic); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9BatchNodeBasic) +}; + +// S9FrameNameSpriteSheet + +class UIS9FrameNameSpriteSheet : public UIScene +{ +public: + CREATE_FUNC(UIS9FrameNameSpriteSheet); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9FrameNameSpriteSheet) + +}; + +// S9FrameNameSpriteSheetRotated + +class UIS9FrameNameSpriteSheetRotated : public UIScene +{ +public: + CREATE_FUNC(UIS9FrameNameSpriteSheetRotated); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9FrameNameSpriteSheetRotated) +}; + +// S9BatchNodeScaledNoInsets + +class UIS9BatchNodeScaledNoInsets : public UIScene +{ +public: + CREATE_FUNC(UIS9BatchNodeScaledNoInsets); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9BatchNodeScaledNoInsets) +}; + +// S9FrameNameSpriteSheetScaledNoInsets + +class UIS9FrameNameSpriteSheetScaledNoInsets : public UIScene +{ +public: + CREATE_FUNC(UIS9FrameNameSpriteSheetScaledNoInsets); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9FrameNameSpriteSheetScaledNoInsets) +}; + +// S9FrameNameSpriteSheetRotatedScaledNoInsets + +class UIS9FrameNameSpriteSheetRotatedScaledNoInsets : public UIScene +{ +public: + CREATE_FUNC(UIS9FrameNameSpriteSheetRotatedScaledNoInsets); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9FrameNameSpriteSheetRotatedScaledNoInsets) +}; + + +// S9BatchNodeScaleWithCapInsets + +class UIS9BatchNodeScaleWithCapInsets : public UIScene +{ +public: + CREATE_FUNC(UIS9BatchNodeScaleWithCapInsets); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9BatchNodeScaleWithCapInsets) +}; + +// S9FrameNameSpriteSheetInsets + +class UIS9FrameNameSpriteSheetInsets : public UIScene +{ +public: + CREATE_FUNC(UIS9FrameNameSpriteSheetInsets); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9FrameNameSpriteSheetInsets) +}; + +// S9FrameNameSpriteSheetInsetsScaled + +class UIS9FrameNameSpriteSheetInsetsScaled : public UIScene +{ +public: + CREATE_FUNC(UIS9FrameNameSpriteSheetInsetsScaled); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9FrameNameSpriteSheetInsetsScaled) +}; + +// S9FrameNameSpriteSheetRotatedInsets + +class UIS9FrameNameSpriteSheetRotatedInsets : public UIScene +{ +public: + CREATE_FUNC(UIS9FrameNameSpriteSheetRotatedInsets); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9FrameNameSpriteSheetRotatedInsets) +}; + +// S9_TexturePacker + +class UIS9_TexturePacker : public UIScene +{ +public: + CREATE_FUNC(UIS9_TexturePacker); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9_TexturePacker) + +}; + +// S9FrameNameSpriteSheetRotatedInsetsScaled + +class UIS9FrameNameSpriteSheetRotatedInsetsScaled : public UIScene +{ +public: + CREATE_FUNC(UIS9FrameNameSpriteSheetRotatedInsetsScaled); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9FrameNameSpriteSheetRotatedInsetsScaled) +}; + +// S9FrameNameSpriteSheetRotatedInsetsScaled + +class UIS9FrameNameSpriteSheetRotatedSetCapInsetLater : public UIScene +{ +public: + CREATE_FUNC(UIS9FrameNameSpriteSheetRotatedSetCapInsetLater); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9FrameNameSpriteSheetRotatedSetCapInsetLater) +}; + +// S9CascadeOpacityAndColor + +class UIS9CascadeOpacityAndColor : public UIScene +{ +public: + CREATE_FUNC(UIS9CascadeOpacityAndColor); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9CascadeOpacityAndColor) +}; + +// Scale9Sprite ZOrder + +class UIS9ZOrder : public UIScene +{ +public: + CREATE_FUNC(UIS9ZOrder); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9ZOrder) + +}; + +// Scale9Sprite Flip + +class UIS9Flip : public UIScene +{ +public: + CREATE_FUNC(UIS9Flip); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9Flip) +}; + + +#endif /* defined(__cocos2d_tests__UIScale9SpriteTest__) */ diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.cpp index edbecf2bd2..0216a22967 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.cpp @@ -21,21 +21,8 @@ #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) #include "UIVideoPlayerTest/UIVideoPlayerTest.h" #endif -/* -#include "UISwitchTest/UISwitchTest.h" - */ - /* -#include "UIProgressTimerTest/UIProgressTimerTest.h" - */ -/* -#include "UIPotentiometerTest/UIPotentiometerTest.h" - */ -/* -#include "UIGridViewTest/UIGridViewTest.h" - */ -/* -#include "UIPickerViewTest/UIPickerViewTest.h" - */ +#include "UIScale9SpriteTest.h" + USING_NS_CC; @@ -45,32 +32,20 @@ static const char* s_testArray[] = "UIButtonTest_Scale9", "UIButtonTest_PressedAction", "UIButtonTest_Title", + "UIButtonTest_RemoveSelf", + "UIButtonTestSwitchScale9", "UICheckBoxTest", "UISliderTest", "UISliderTest_Scale9", - /* - "UIPotentiometerTest", - */ - /* - "UISwitchTest_Horizontal", - "UISwitchTest_Vertical", - "UISwitchTest_VerticalAndTitleVertical", - */ + "UIImageViewTest", "UIImageViewTest_Scale9", + "UIImageViewTest_ContentSize", "UILoadingBarTest_Left", "UILoadingBarTest_Right", "UILoadingBarTest_Left_Scale9", "UILoadingBarTest_Right_Scale9", - /* - "UIProgressTimerTest_Radial", - "UIProgressTimerTest_Horizontal", - "UIProgressTimerTest_Vertical", - "UIProgressTimerTest_RadialMidpointChanged", - "UIProgressTimerTest_BarVarious", - "UIProgressTimerTest_BarTintAndFade", - "UIProgressTimerTest_WithSpriteFrame", - */ + "UITextAtlasTest", "UITextTest", "UITextTest_LineWrap", @@ -93,9 +68,7 @@ static const char* s_testArray[] = "UILayoutTest_Layout_Linear_Horizontal", "UILayoutTest_Layout_Relative_Align_Parent", "UILayoutTest_Layout_Relative_Location", - /* - "UILayoutTest_Layout_Grid", - */ + "UIScrollViewTest_Vertical", "UIScrollViewTest_Horizontal", "UIScrollViewTest_Both", @@ -105,14 +78,7 @@ static const char* s_testArray[] = "UIPageViewButtonTest", "UIListViewTest_Vertical", "UIListViewTest_Horizontal", - /* - "UIGridViewTest_Mode_Column", - "UIGridViewTest_Mode_Row", - */ - /* - "UIPickerViewTest_Vertical", - "UIPickerViewTest_Horizontal", - */ + "UIWidgetAddNodeTest", "UIRichTextTest", "UIFocusTest-HBox", @@ -122,8 +88,27 @@ static const char* s_testArray[] = "UIFocusTest-NestedLayout3", "UIFocusTest-ListView", #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) - "UIVideoPlayerTest" + "UIVideoPlayerTest", #endif + "UIScale9SpriteTest", + "UIScale9SpriteHierarchialTest", + "UIScale9SpriteTouchTest", + "UIS9BatchNodeBasic", + "UIS9FrameNameSpriteSheet", + "UIS9FrameNameSpriteSheetRotated", + "UIS9BatchNodeScaledNoInsets", + "UIS9FrameNameSpriteSheetScaledNoInsets", + "UIS9FrameNameSpriteSheetRotatedScaledNoInsets", + "UIS9BatchNodeScaleWithCapInsets", + "UIS9FrameNameSpriteSheetInsets", + "UIS9FrameNameSpriteSheetInsetsScaled", + "UIS9FrameNameSpriteSheetRotatedInsets", + "UIS9_TexturePacker", + "UIS9FrameNameSpriteSheetRotatedInsetsScaled", + "UIS9FrameNameSpriteSheetRotatedSetCapInsetLater", + "UIS9CascadeOpacityAndColor", + "UIS9ZOrder", + "UIS9Flip", }; static UISceneManager *sharedInstance = nullptr; @@ -190,7 +175,10 @@ Scene *UISceneManager::currentUIScene() case kUIButtonTest_Title: return UIButtonTest_Title::sceneWithTitle(s_testArray[_currentUISceneId]); - + case kUIButtonTest_RemoveSelf: + return UIButtonTestRemoveSelf::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIButtonTestSwitchScale9: + return UIButtonTestSwitchScale9::sceneWithTitle(s_testArray[_currentUISceneId]); case kUICheckBoxTest: return UICheckBoxTest::sceneWithTitle(s_testArray[_currentUISceneId]); @@ -205,7 +193,8 @@ Scene *UISceneManager::currentUIScene() case kUIImageViewTest_Scale9: return UIImageViewTest_Scale9::sceneWithTitle(s_testArray[_currentUISceneId]); - + case kUIImageViewTest_ContentSize: + return UIImageViewTest_ContentSize::sceneWithTitle(s_testArray[_currentUISceneId]); case kUILoadingBarTest_Left: return UILoadingBarTest_Left::sceneWithTitle(s_testArray[_currentUISceneId]); @@ -325,6 +314,44 @@ Scene *UISceneManager::currentUIScene() case kUIVideoPlayerTest: return VideoPlayerTest::sceneWithTitle(s_testArray[_currentUISceneId]); #endif + case kUIScale9SpriteTest: + return UIScale9SpriteTest::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIScale9SpriteHierarchialTest: + return UIScale9SpriteHierarchialTest::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIScale9SpriteTouchTest: + return UIScale9SpriteTouchTest::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9BatchNodeBasic: + return UIS9BatchNodeBasic::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9FrameNameSpriteSheet: + return UIS9FrameNameSpriteSheet::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9FrameNameSpriteSheetRotated: + return UIS9FrameNameSpriteSheetRotated::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9BatchNodeScaledNoInsets: + return UIS9BatchNodeScaledNoInsets::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9FrameNameSpriteSheetScaledNoInsets: + return UIS9FrameNameSpriteSheetScaledNoInsets::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9FrameNameSpriteSheetRotatedScaledNoInsets: + return UIS9FrameNameSpriteSheetRotatedScaledNoInsets::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9BatchNodeScaleWithCapInsets: + return UIS9BatchNodeScaleWithCapInsets::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9FrameNameSpriteSheetInsets: + return UIS9FrameNameSpriteSheetInsets::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9FrameNameSpriteSheetInsetsScaled: + return UIS9FrameNameSpriteSheetInsetsScaled::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9FrameNameSpriteSheetRotatedInsets: + return UIS9FrameNameSpriteSheetRotatedInsets::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9_TexturePacker: + return UIS9_TexturePacker::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9FrameNameSpriteSheetRotatedInsetsScaled: + return UIS9FrameNameSpriteSheetRotatedInsetsScaled::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9FrameNameSpriteSheetRotatedSetCapInsetLater: + return UIS9FrameNameSpriteSheetRotatedSetCapInsetLater::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9CascadeOpacityAndColor: + return UIS9CascadeOpacityAndColor::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9ZOrder: + return UIS9ZOrder::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9Flip: + return UIS9Flip::sceneWithTitle(s_testArray[_currentUISceneId]); } return nullptr; } diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.h index 0dd94ad395..f316bb12cf 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.h @@ -35,32 +35,18 @@ enum kUIButtonTest_Scale9, kUIButtonTest_PressedAction, kUIButtonTest_Title, + kUIButtonTest_RemoveSelf, + kUIButtonTestSwitchScale9, kUICheckBoxTest, kUISliderTest, kUISliderTest_Scale9, - /* - kUIPotentiometerTest, - */ - /* - kUISwitchTest_Horizontal, - kUISwitchTest_Vertical, - kUISwitchTest_VerticalAndTitleVertical, - */ kUIImageViewTest, kUIImageViewTest_Scale9, + kUIImageViewTest_ContentSize, kUILoadingBarTest_Left, kUILoadingBarTest_Right, kUILoadingBarTest_Left_Scale9, kUILoadingBarTest_Right_Scale9, - /* - kUIProgressTimerTest_Radial, - kUIProgressTimerTest_Horizontal, - kUIProgressTimerTest_Vertical, - kUIProgressTimerTest_RadialMidpointChanged, - kUIProgressTimerTest_BarVarious, - kUIProgressTimerTest_BarTintAndFade, - kUIProgressTimerTest_WithSpriteFrame, - */ kUITextAtlasTest, kUITextTest, kUITextTest_LineWrap, @@ -82,9 +68,6 @@ enum kUILayoutTest_Layout_Linear_Horizontal, kUILayoutTest_Layout_Relative_Align_Parent, kUILayoutTest_Layout_Relative_Location, - /* - kUILayoutTest_Layout_Grid, - */ kUIScrollViewTest_Vertical, kUIScrollViewTest_Horizontal, kUIScrollViewTest_Both, @@ -94,12 +77,6 @@ enum kUIPageViewButtonTest, kUIListViewTest_Vertical, kUIListViewTest_Horizontal, - /* - kUIGridViewTest_Mode_Column, - kUIGridViewTest_Mode_Row, - kUIPickerViewTest_Vertical, - kUIPickerViewTest_Horizontal, - */ kUIWidgetAddNodeTest, kUIRichTextTest, KUIFocusTest_HBox, @@ -111,6 +88,25 @@ enum #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) kUIVideoPlayerTest, #endif + kUIScale9SpriteTest, + kUIScale9SpriteHierarchialTest, + kUIScale9SpriteTouchTest, + kUIS9BatchNodeBasic, + kUIS9FrameNameSpriteSheet, + kUIS9FrameNameSpriteSheetRotated, + kUIS9BatchNodeScaledNoInsets, + kUIS9FrameNameSpriteSheetScaledNoInsets, + kUIS9FrameNameSpriteSheetRotatedScaledNoInsets, + kUIS9BatchNodeScaleWithCapInsets, + kUIS9FrameNameSpriteSheetInsets, + kUIS9FrameNameSpriteSheetInsetsScaled, + kUIS9FrameNameSpriteSheetRotatedInsets, + kUIS9_TexturePacker, + kUIS9FrameNameSpriteSheetRotatedInsetsScaled, + kUIS9FrameNameSpriteSheetRotatedSetCapInsetLater, + kUIS9CascadeOpacityAndColor, + kUIS9ZOrder, + kUIS9Flip, kUITestMax }; diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp index 22cbebc1b4..9f3b8485e6 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp @@ -32,7 +32,7 @@ bool UITextFieldTest::init() _uiLayer->addChild(alert); // Create the textfield - TextField* textField = TextField::create("input words here","fonts/Marker Felt.ttf",30); + TextField* textField = TextField::create("input words here","Arial",30); textField->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f)); textField->addEventListener(CC_CALLBACK_2(UITextFieldTest::textFieldEvent, this)); @@ -110,7 +110,7 @@ bool UITextFieldTest_MaxLength::init() _uiLayer->addChild(alert); // Create the textfield - TextField* textField = TextField::create("input words here","fonts/Marker Felt.ttf",30); + TextField* textField = TextField::create("input words here","Arial",30); textField->setMaxLengthEnabled(true); textField->setMaxLength(3); textField->setPosition(Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f)); @@ -194,7 +194,7 @@ bool UITextFieldTest_Password::init() _uiLayer->addChild(alert); // Create the textfield - TextField* textField = TextField::create("input password here","fonts/Marker Felt.ttf",30); + TextField* textField = TextField::create("input password here","Arial",30); textField->setPasswordEnabled(true); textField->setPasswordStyleText("*"); textField->setPosition(Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f)); @@ -275,7 +275,9 @@ bool UITextFieldTest_LineWrap::init() // Create the textfield TextField* textField = TextField::create("input words here","fonts/Marker Felt.ttf",30); textField->ignoreContentAdaptWithSize(false); - textField->setContentSize(Size(240, 160)); + ((Label*)(textField->getVirtualRenderer()))->setLineBreakWithoutSpace(true); + textField->setContentSize(Size(240, 170)); + textField->setText("input words here"); textField->setTextHorizontalAlignment(TextHAlignment::CENTER); textField->setTextVerticalAlignment(TextVAlignment::CENTER); textField->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f)); @@ -296,7 +298,7 @@ void UITextFieldTest_LineWrap::textFieldEvent(Ref *pSender, TextField::EventType TextField* textField = dynamic_cast(pSender); Size widgetSize = _widget->getContentSize(); textField->runAction(CCMoveTo::create(0.225f, - Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + textField->getContentSize().height / 2))); + Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + 30))); textField->setTextHorizontalAlignment(TextHAlignment::LEFT); textField->setTextVerticalAlignment(TextVAlignment::TOP); diff --git a/tests/cpp-tests/Classes/controller.cpp b/tests/cpp-tests/Classes/controller.cpp index e02aed5089..355ef40b9c 100644 --- a/tests/cpp-tests/Classes/controller.cpp +++ b/tests/cpp-tests/Classes/controller.cpp @@ -77,7 +77,9 @@ Controller g_aTestNames[] = { { "Node: Sprite", [](){return new SpriteTestScene(); } }, { "Node: Sprite3D", [](){ return new Sprite3DTestScene(); }}, { "Node: TileMap", [](){return new TileMapTestScene(); } }, +#if CC_TARGET_PLATFORM != CC_PLATFORM_WP8 { "Node: FastTileMap", [](){return new TileMapTestSceneNew(); } }, +#endif { "Node: Text Input", [](){return new TextInputTestScene(); } }, { "Node: UI", [](){ return new UITestScene(); }}, { "Mouse", []() { return new MouseTestScene(); } }, @@ -87,8 +89,10 @@ Controller g_aTestNames[] = { { "ReleasePool", [](){ return new ReleasePoolTestScene(); } }, { "Rotate World", [](){return new RotateWorldTestScene(); } }, { "Scheduler", [](){return new SchedulerTestScene(); } }, +#if CC_TARGET_PLATFORM != CC_PLATFORM_WP8 { "Shader - Basic", []() { return new ShaderTestScene(); } }, { "Shader - Sprite", []() { return new ShaderTestScene2(); } }, +#endif { "Texture2D", [](){return new TextureTestScene(); } }, { "TextureCache", []() { return new TextureCacheTestScene(); } }, { "TexturePacker Encryption", []() { return new TextureAtlasEncryptionTestScene(); } }, diff --git a/tests/cpp-tests/Classes/testBasic.h b/tests/cpp-tests/Classes/testBasic.h index d86aed6e26..5da3ba1a11 100644 --- a/tests/cpp-tests/Classes/testBasic.h +++ b/tests/cpp-tests/Classes/testBasic.h @@ -2,6 +2,7 @@ #define _TEST_BASIC_H_ #include "cocos2d.h" +#include "audio/include/SimpleAudioEngine.h" #include "VisibleRect.h" USING_NS_CC; diff --git a/tests/cpp-tests/Resources/CocosBuilderExample.ccbresourcelog b/tests/cpp-tests/Resources/CocosBuilderExample.ccbresourcelog index 9f6795b5a0..10e21a680c 100755 --- a/tests/cpp-tests/Resources/CocosBuilderExample.ccbresourcelog +++ b/tests/cpp-tests/Resources/CocosBuilderExample.ccbresourcelog @@ -118,7 +118,7 @@ fonts/Marker Felt.ttf fonts/markerFelt.fnt fonts/markerFelt.png fonts/Paint Boy.ttf -fonts/Schwarzwald Regular.ttf +fonts/Schwarzwald.ttf fonts/Scissor Cuts.ttf fonts/tahoma.ttf fonts/Thonburi.ttf diff --git a/tests/cpp-tests/Resources/configs/config-test-ok.plist b/tests/cpp-tests/Resources/configs/config-test-ok.plist index a4d08007cc..0b4c9e5a26 100755 --- a/tests/cpp-tests/Resources/configs/config-test-ok.plist +++ b/tests/cpp-tests/Resources/configs/config-test-ok.plist @@ -4,6 +4,10 @@ data + Japanese + ご静聴ありがとうございました！！ご静聴ありがとうございました！！ + Chinese + 中国中国中国中国中国中国中国中国中国中国 test.1 test1 test.2 diff --git a/tests/cpp-tests/Resources/fonts/Schwarzwald Regular.ttf b/tests/cpp-tests/Resources/fonts/Schwarzwald.ttf similarity index 100% rename from tests/cpp-tests/Resources/fonts/Schwarzwald Regular.ttf rename to tests/cpp-tests/Resources/fonts/Schwarzwald.ttf diff --git a/tests/cpp-tests/proj.ios/Classes/testsAppDelegate.mm b/tests/cpp-tests/proj.ios/Classes/testsAppDelegate.mm index 963ac7f9e1..2e725af131 100644 --- a/tests/cpp-tests/proj.ios/Classes/testsAppDelegate.mm +++ b/tests/cpp-tests/proj.ios/Classes/testsAppDelegate.mm @@ -81,7 +81,7 @@ static AppDelegate s_sharedApplication; [[UIApplication sharedApplication] setStatusBarHidden:true]; // IMPORTANT: Setting the GLView should be done after creating the RootViewController - cocos2d::GLView *glview = cocos2d::GLView::createWithEAGLView(eaglView); + cocos2d::GLView *glview = cocos2d::GLViewImpl::createWithEAGLView(eaglView); cocos2d::Director::getInstance()->setOpenGLView(glview); app->run(); diff --git a/tests/cpp-tests/proj.ios/Info.plist b/tests/cpp-tests/proj.ios/Info.plist index 467758a542..0d0aff0b3b 100644 --- a/tests/cpp-tests/proj.ios/Info.plist +++ b/tests/cpp-tests/proj.ios/Info.plist @@ -65,7 +65,7 @@ fonts/Abberancy.ttf fonts/Abduction.ttf fonts/Paint Boy.ttf - fonts/Schwarzwald Regular.ttf + fonts/Schwarzwald.ttf fonts/Scissor Cuts.ttf UIPrerenderedIcon diff --git a/tests/cpp-tests/proj.mac/Info.plist b/tests/cpp-tests/proj.mac/Info.plist index 4709c4705e..c6a169726f 100644 --- a/tests/cpp-tests/proj.mac/Info.plist +++ b/tests/cpp-tests/proj.mac/Info.plist @@ -36,7 +36,7 @@ fonts/Abberancy.ttf fonts/Abduction.ttf fonts/Paint Boy.ttf - fonts/Schwarzwald Regular.ttf + fonts/Schwarzwald.ttf fonts/Scissor Cuts.ttf ATSApplicationFontsPath diff --git a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj index b842c9b028..51add3e3cd 100644 --- a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj +++ b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj @@ -74,7 +74,7 @@ Disabled ..\Classes;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\network;$(EngineRoot)external;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\win32\include;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;COCOS2DXWIN32_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -90,7 +90,7 @@ true Windows MachineX86 - libcurl_imp.lib;websockets.lib;%(AdditionalDependencies) + libcurl_imp.lib;websockets.lib;opengl32.lib;glew32.lib;%(AdditionalDependencies) @@ -118,7 +118,7 @@ false - libcurl_imp.lib;websockets.lib;%(AdditionalDependencies) + libcurl_imp.lib;websockets.lib;opengl32.lib;glew32.lib;%(AdditionalDependencies) $(OutDir)$(ProjectName).exe $(OutDir);%(AdditionalLibraryDirectories) false @@ -214,6 +214,7 @@ + @@ -399,6 +400,7 @@ + @@ -558,39 +560,32 @@ - + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - false - + {f8edd7fa-9a51-4e80-baeb-860825d2eac6} - false - + {811c0dab-7b96-4bd3-a154-b7572b58e4ab} - + {b57cf53f-2e49-4031-9822-047cc0e6bde2} - + {b7c2a162-dec9-4418-972e-240ab3cbfcae} - - {7e06e92c-537a-442b-9e4a-4761c84f8a1a} - {df2638c0-8128-4847-867c-6eafe3dee7b5} - - {632a8f38-d0f0-4d22-86b3-d69f5e6bf63a} + + {7e06e92c-537a-442b-9e4a-4761c84f8a1a} - + {21b2c324-891f-48ea-ad1a-5ae13de12e28} - false - + {929480e7-23c0-4df6-8456-096d71547116} - false {207bc7a9-ccf1-4f2f-a04d-45f72242ae25} diff --git a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj.filters b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj.filters index 3404238b21..a2efb55b47 100644 --- a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj.filters +++ b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj.filters @@ -738,21 +738,6 @@ Classes\UITest\CocostudioGUISceneTest\CustomTest\CustomParticleWidgetTest - - Classes\UITest\CocostudioGUISceneTest\CustomWidget - - - Classes\UITest\CocostudioGUISceneTest\CustomWidget - - - Classes\UITest\CocostudioGUISceneTest\CustomWidget - - - Classes\UITest\CocostudioGUISceneTest\CustomWidget - - - Classes\UITest\CocostudioGUISceneTest\CustomWidget - Classes\UITest\CocostudioGUISceneTest\UIButtonTest @@ -855,6 +840,24 @@ Classes\UITest\CocostudioGUISceneTest + + Classes\UITest\CocostudioGUISceneTest\CustomWidget + + + Classes\UITest\CocostudioGUISceneTest\CustomWidget + + + Classes\UITest\CocostudioGUISceneTest\CustomWidget + + + Classes\UITest\CocostudioGUISceneTest\CustomWidget + + + Classes\UITest\CocostudioGUISceneTest\CustomWidget + + + Classes\UITest\CocostudioGUISceneTest + @@ -1463,21 +1466,6 @@ Classes\UITest\CocostudioGUISceneTest\CustomTest\CustomParticleWidgetTest - - Classes\UITest\CocostudioGUISceneTest\CustomWidget - - - Classes\UITest\CocostudioGUISceneTest\CustomWidget - - - Classes\UITest\CocostudioGUISceneTest\CustomWidget - - - Classes\UITest\CocostudioGUISceneTest\CustomWidget - - - Classes\UITest\CocostudioGUISceneTest\CustomWidget - Classes\UITest\CocostudioGUISceneTest\UIButtonTest @@ -1580,5 +1568,23 @@ Classes\UITest\CocostudioGUISceneTest + + Classes\UITest\CocostudioGUISceneTest\CustomWidget + + + Classes\UITest\CocostudioGUISceneTest\CustomWidget + + + Classes\UITest\CocostudioGUISceneTest\CustomWidget + + + Classes\UITest\CocostudioGUISceneTest\CustomWidget + + + Classes\UITest\CocostudioGUISceneTest\CustomWidget + + + Classes\UITest\CocostudioGUISceneTest + \ No newline at end of file diff --git a/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj b/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj index f360d9d55e..c152ba0746 100644 --- a/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj +++ b/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj @@ -260,6 +260,7 @@ + @@ -460,6 +461,7 @@ + diff --git a/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters b/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters index 7cc4e29a0a..5959863578 100644 --- a/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters +++ b/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters @@ -855,6 +855,9 @@ Classes\UITest\CocosStudioGUITest + + Classes\UITest\CocosStudioGUITest + @@ -1584,6 +1587,9 @@ Classes\UITest\CocosStudioGUITest + + Classes\UITest\CocosStudioGUITest + diff --git a/tests/game-controller-test/Classes/AppDelegate.cpp b/tests/game-controller-test/Classes/AppDelegate.cpp index 6bd1bb104f..682d42b140 100644 --- a/tests/game-controller-test/Classes/AppDelegate.cpp +++ b/tests/game-controller-test/Classes/AppDelegate.cpp @@ -21,7 +21,7 @@ bool AppDelegate::applicationDidFinishLaunching() { auto director = Director::getInstance(); auto glview = director->getOpenGLView(); if(!glview) { - glview = GLView::create("Game Controller Test"); + glview = GLViewImpl::create("Game Controller Test"); director->setOpenGLView(glview); } diff --git a/tests/game-controller-test/Classes/GameControllerTest.cpp b/tests/game-controller-test/Classes/GameControllerTest.cpp index ef27469315..de5a0d6c5c 100644 --- a/tests/game-controller-test/Classes/GameControllerTest.cpp +++ b/tests/game-controller-test/Classes/GameControllerTest.cpp @@ -196,6 +196,12 @@ void GameControllerTest::showButtonState(cocos2d::Controller *controller, int ke case Controller::Key::BUTTON_RIGHT_SHOULDER: holder->_buttonR1->setColor(Color3B(19,231,238)); break; + case Controller::Key::BUTTON_LEFT_THUMBSTICK: + holder->_leftJoystick->setColor(Color3B(19,231,238)); + break; + case Controller::Key::BUTTON_RIGHT_THUMBSTICK: + holder->_rightJoystick->setColor(Color3B(19,231,238)); + break; default: { char ketStatus[30]; @@ -239,6 +245,12 @@ void GameControllerTest::showButtonState(cocos2d::Controller *controller, int ke case Controller::Key::BUTTON_RIGHT_SHOULDER: holder->_buttonR1->setColor(Color3B::WHITE); break; + case Controller::Key::BUTTON_LEFT_THUMBSTICK: + holder->_leftJoystick->setColor(Color3B::WHITE); + break; + case Controller::Key::BUTTON_RIGHT_THUMBSTICK: + holder->_rightJoystick->setColor(Color3B::WHITE); + break; default: { char ketStatus[30]; diff --git a/tests/game-controller-test/proj.ios/AppController.mm b/tests/game-controller-test/proj.ios/AppController.mm index c91d512703..b32bf90a76 100644 --- a/tests/game-controller-test/proj.ios/AppController.mm +++ b/tests/game-controller-test/proj.ios/AppController.mm @@ -72,7 +72,7 @@ static AppDelegate s_sharedApplication; [[UIApplication sharedApplication] setStatusBarHidden: YES]; // IMPORTANT: Setting the GLView should be done after creating the RootViewController - cocos2d::GLView *glview = cocos2d::GLView::createWithEAGLView(eaglView); + cocos2d::GLView *glview = cocos2d::GLViewImpl::createWithEAGLView(eaglView); cocos2d::Director::getInstance()->setOpenGLView(glview); cocos2d::Application *app = cocos2d::Application::getInstance(); diff --git a/tests/lua-empty-test/project/proj.ios/AppController.mm b/tests/lua-empty-test/project/proj.ios/AppController.mm index 9f38038aed..a4a76d5cc1 100644 --- a/tests/lua-empty-test/project/proj.ios/AppController.mm +++ b/tests/lua-empty-test/project/proj.ios/AppController.mm @@ -73,7 +73,7 @@ static AppDelegate s_sharedApplication; [[UIApplication sharedApplication] setStatusBarHidden: YES]; // IMPORTANT: Setting the GLView should be done after creating the RootViewController - cocos2d::GLView *glview = cocos2d::GLView::createWithEAGLView(eaglView); + cocos2d::GLView *glview = cocos2d::GLViewImpl::createWithEAGLView(eaglView); cocos2d::Director::getInstance()->setOpenGLView(glview); cocos2d::Application *app = cocos2d::Application::getInstance(); diff --git a/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj b/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj index c54bd5bfc6..234a4bee40 100644 --- a/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj +++ b/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj @@ -21,8 +21,8 @@ v100 v110 v110_xp - v120 - v120_xp + v120 + v120_xp Application @@ -30,8 +30,8 @@ v100 v110 v110_xp - v120 - v120_xp + v120 + v120_xp @@ -175,34 +175,31 @@ xcopy "$(ProjectDir)..\..\..\..\external\lua\luasocket\*.lua" "$(ProjectDir)..\. - + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - + {f8edd7fa-9a51-4e80-baeb-860825d2eac6} - + {811c0dab-7b96-4bd3-a154-b7572b58e4ab} - + {b57cf53f-2e49-4031-9822-047cc0e6bde2} - + {b7c2a162-dec9-4418-972e-240ab3cbfcae} {ddc3e27f-004d-4dd4-9dd3-931a013d2159} - - {7e06e92c-537a-442b-9e4a-4761c84f8a1a} - {df2638c0-8128-4847-867c-6eafe3dee7b5} - - {632a8f38-d0f0-4d22-86b3-d69f5e6bf63a} + + {7e06e92c-537a-442b-9e4a-4761c84f8a1a} - + {21b2c324-891f-48ea-ad1a-5ae13de12e28} diff --git a/tests/lua-empty-test/src/hello.lua b/tests/lua-empty-test/src/hello.lua index d9ab1b2a8d..fd6bfb17c3 100644 --- a/tests/lua-empty-test/src/hello.lua +++ b/tests/lua-empty-test/src/hello.lua @@ -18,7 +18,7 @@ local function initGLView() local director = cc.Director:getInstance() local glView = director:getOpenGLView() if nil == glView then - glView = cc.GLView:create("Lua Empty Test") + glView = cc.GLViewImpl:create("Lua Empty Test") director:setOpenGLView(glView) end diff --git a/tests/lua-game-controller-test/project/proj.ios/AppController.mm b/tests/lua-game-controller-test/project/proj.ios/AppController.mm index 9f38038aed..a4a76d5cc1 100644 --- a/tests/lua-game-controller-test/project/proj.ios/AppController.mm +++ b/tests/lua-game-controller-test/project/proj.ios/AppController.mm @@ -73,7 +73,7 @@ static AppDelegate s_sharedApplication; [[UIApplication sharedApplication] setStatusBarHidden: YES]; // IMPORTANT: Setting the GLView should be done after creating the RootViewController - cocos2d::GLView *glview = cocos2d::GLView::createWithEAGLView(eaglView); + cocos2d::GLView *glview = cocos2d::GLViewImpl::createWithEAGLView(eaglView); cocos2d::Director::getInstance()->setOpenGLView(glview); cocos2d::Application *app = cocos2d::Application::getInstance(); diff --git a/tests/lua-game-controller-test/src/GameControllerTest.lua b/tests/lua-game-controller-test/src/GameControllerTest.lua index ca87a39bef..9b186fb84b 100644 --- a/tests/lua-game-controller-test/src/GameControllerTest.lua +++ b/tests/lua-game-controller-test/src/GameControllerTest.lua @@ -276,6 +276,10 @@ function GameControllerTest:registerControllerListener() holder._buttonL1:setColor(cc.c3b(19,231,238)) elseif keyCode == cc.ControllerKey.BUTTON_RIGHT_SHOULDER then holder._buttonR1:setColor(cc.c3b(19,231,238)) + elseif keyCode == cc.ControllerKey.BUTTON_LEFT_THUMBSTICK then + holder._leftJoystick:setColor(cc.c3b(19,231,238)) + elseif keyCode == cc.ControllerKey.BUTTON_RIGHT_THUMBSTICK then + holder._rightJoystick:setColor(cc.c3b(19,231,238)) else local ketStatus = string.format("Key Down:%d",keyCode) holder._externalKeyLabel:setString(ketStatus) @@ -301,6 +305,10 @@ function GameControllerTest:registerControllerListener() holder._buttonL1:setColor(cc.c3b(250,255,255)) elseif keyCode == cc.ControllerKey.BUTTON_RIGHT_SHOULDER then holder._buttonR1:setColor(cc.c3b(250,255,255)) + elseif keyCode == cc.ControllerKey.BUTTON_LEFT_THUMBSTICK then + holder._leftJoystick:setColor(cc.c3b(250,255,255)) + elseif keyCode == cc.ControllerKey.BUTTON_RIGHT_THUMBSTICK then + holder._rightJoystick:setColor(cc.c3b(250,255,255)) else local ketStatus = string.format("Key Up:%d",keyCode) holder._externalKeyLabel:setString(ketStatus) diff --git a/tests/lua-tests/project/proj.ios_mac/ios/AppController.mm b/tests/lua-tests/project/proj.ios_mac/ios/AppController.mm index c7d5d8312f..3305eb9259 100644 --- a/tests/lua-tests/project/proj.ios_mac/ios/AppController.mm +++ b/tests/lua-tests/project/proj.ios_mac/ios/AppController.mm @@ -76,7 +76,7 @@ static AppDelegate s_sharedApplication; // IMPORTANT: Setting the GLView should be done after creating the RootViewController - cocos2d::GLView *glview = cocos2d::GLView::createWithEAGLView(eaglView); + cocos2d::GLView *glview = cocos2d::GLViewImpl::createWithEAGLView(eaglView); cocos2d::Director::getInstance()->setOpenGLView(glview); cocos2d::Application::getInstance()->run(); diff --git a/tests/lua-tests/project/proj.ios_mac/ios/Info.plist b/tests/lua-tests/project/proj.ios_mac/ios/Info.plist index 9926484e84..dbfaaa0b95 100644 --- a/tests/lua-tests/project/proj.ios_mac/ios/Info.plist +++ b/tests/lua-tests/project/proj.ios_mac/ios/Info.plist @@ -52,7 +52,7 @@ fonts/Abberancy.ttf fonts/Abduction.ttf fonts/Paint Boy.ttf - fonts/Schwarzwald Regular.ttf + fonts/Schwarzwald.ttf fonts/Scissor Cuts.ttf UIPrerenderedIcon diff --git a/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj b/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj index 7d5ab0cb3a..0e3fb6f8e3 100644 --- a/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj +++ b/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj @@ -22,8 +22,8 @@ v100 v110 v110_xp - v120 - v120_xp + v120 + v120_xp Application @@ -32,8 +32,8 @@ v100 v110 v110_xp - v120 - v120_xp + v120 + v120_xp @@ -178,34 +178,31 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" - - {ddc3e27f-004d-4dd4-9dd3-931a013d2159} - - + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - + {f8edd7fa-9a51-4e80-baeb-860825d2eac6} - + {811c0dab-7b96-4bd3-a154-b7572b58e4ab} - + {b57cf53f-2e49-4031-9822-047cc0e6bde2} - + {b7c2a162-dec9-4418-972e-240ab3cbfcae} - - {7e06e92c-537a-442b-9e4a-4761c84f8a1a} + + {ddc3e27f-004d-4dd4-9dd3-931a013d2159} {df2638c0-8128-4847-867c-6eafe3dee7b5} - - {632a8f38-d0f0-4d22-86b3-d69f5e6bf63a} + + {7e06e92c-537a-442b-9e4a-4761c84f8a1a} - + {21b2c324-891f-48ea-ad1a-5ae13de12e28} diff --git a/tests/lua-tests/src/FastTiledMapTest/FastTiledMapTest.lua b/tests/lua-tests/src/FastTiledMapTest/FastTiledMapTest.lua index d3ee245bd5..87c001f3e7 100644 --- a/tests/lua-tests/src/FastTiledMapTest/FastTiledMapTest.lua +++ b/tests/lua-tests/src/FastTiledMapTest/FastTiledMapTest.lua @@ -144,7 +144,7 @@ local function TMXOrthoTest() --local color = cc.LayerColor:create( cc.c4b(64,64,64,255) ) --addChild(color, -1) - local map = cc.FastTMXTiledMap:create("TileMaps/orthogonal-test2.tmx") + local map = ccexp.TMXTiledMap:create("TileMaps/orthogonal-test2.tmx") layer:addChild(map, 0, kTagTileMap) local s = map:getContentSize() @@ -178,7 +178,7 @@ end local function TMXOrthoTest2() local layer = createTileDemoLayer("TMX Ortho test2") - local map = cc.FastTMXTiledMap:create("TileMaps/orthogonal-test1.tmx") + local map = ccexp.TMXTiledMap:create("TileMaps/orthogonal-test1.tmx") layer:addChild(map, 0, kTagTileMap) local s = map:getContentSize() @@ -195,7 +195,7 @@ end -------------------------------------------------------------------- local function TMXOrthoTest3() local layer = createTileDemoLayer("TMX anchorPoint test") - local map = cc.FastTMXTiledMap:create("TileMaps/orthogonal-test3.tmx") + local map = ccexp.TMXTiledMap:create("TileMaps/orthogonal-test3.tmx") layer:addChild(map, 0, kTagTileMap) local s = map:getContentSize() @@ -214,7 +214,7 @@ end -------------------------------------------------------------------- local function TMXOrthoTest4() local ret = createTileDemoLayer("TMX width/height test") - local map = cc.FastTMXTiledMap:create("TileMaps/orthogonal-test4.tmx") + local map = ccexp.TMXTiledMap:create("TileMaps/orthogonal-test4.tmx") ret:addChild(map, 0, kTagTileMap) local s1 = map:getContentSize() @@ -277,7 +277,7 @@ local function TMXReadWriteTest() local ret = createTileDemoLayer("TMX Read/Write test") local m_gid = 0 local m_gid2 = 0 - local map = cc.FastTMXTiledMap:create("TileMaps/orthogonal-test2.tmx") + local map = ccexp.TMXTiledMap:create("TileMaps/orthogonal-test2.tmx") ret:addChild(map, 0, kTagTileMap) local s = map:getContentSize() @@ -437,7 +437,7 @@ local function TMXIsoTest() local color = cc.LayerColor:create( cc.c4b(64,64,64,255) ) ret:addChild(color, -1) - local map = cc.FastTMXTiledMap:create("TileMaps/iso-test.tmx") + local map = ccexp.TMXTiledMap:create("TileMaps/iso-test.tmx") ret:addChild(map, 0, kTagTileMap) -- move map to the center of the screen @@ -457,7 +457,7 @@ local function TMXIsoTest1() local color = cc.LayerColor:create( cc.c4b(64,64,64,255) ) ret:addChild(color, -1) - local map = cc.FastTMXTiledMap:create("TileMaps/iso-test1.tmx") + local map = ccexp.TMXTiledMap:create("TileMaps/iso-test1.tmx") ret:addChild(map, 0, kTagTileMap) local s = map:getContentSize() @@ -477,7 +477,7 @@ local function TMXIsoTest2() local color = cc.LayerColor:create( cc.c4b(64,64,64,255) ) ret:addChild(color, -1) - local map = cc.FastTMXTiledMap:create("TileMaps/iso-test2.tmx") + local map = ccexp.TMXTiledMap:create("TileMaps/iso-test2.tmx") ret:addChild(map, 0, kTagTileMap) local s = map:getContentSize() @@ -500,7 +500,7 @@ local function TMXUncompressedTest() local color = cc.LayerColor:create( cc.c4b(64,64,64,255) ) ret:addChild(color, -1) - local map = cc.FastTMXTiledMap:create("TileMaps/iso-test2-uncompressed.tmx") + local map = ccexp.TMXTiledMap:create("TileMaps/iso-test2-uncompressed.tmx") ret:addChild(map, 0, kTagTileMap) local s = map:getContentSize() @@ -521,7 +521,7 @@ end -------------------------------------------------------------------- local function TMXTilesetTest() local ret = createTileDemoLayer("TMX Tileset test") - local map = cc.FastTMXTiledMap:create("TileMaps/orthogonal-test5.tmx") + local map = ccexp.TMXTiledMap:create("TileMaps/orthogonal-test5.tmx") ret:addChild(map, 0, kTagTileMap) local s = map:getContentSize() @@ -537,7 +537,7 @@ end -------------------------------------------------------------------- local function TMXOrthoObjectsTest() local ret = createTileDemoLayer("TMX Ortho object test", "You should see a white box around the 3 platforms") - local map = cc.FastTMXTiledMap:create("TileMaps/ortho-objects.tmx") + local map = ccexp.TMXTiledMap:create("TileMaps/ortho-objects.tmx") ret:addChild(map, -1, kTagTileMap) local s = map:getContentSize() @@ -610,7 +610,7 @@ end local function TMXIsoObjectsTest() local ret = createTileDemoLayer("TMX Iso object test", "You need to parse them manually. See bug #810") - local map = cc.FastTMXTiledMap:create("TileMaps/iso-test-objectgroup.tmx") + local map = ccexp.TMXTiledMap:create("TileMaps/iso-test-objectgroup.tmx") ret:addChild(map, -1, kTagTileMap) local s = map:getContentSize() @@ -679,7 +679,7 @@ end local function TMXResizeTest() local ret = createTileDemoLayer("TMX resize test", "Should not crash. Testing issue #740") - local map = cc.FastTMXTiledMap:create("TileMaps/orthogonal-test5.tmx") + local map = ccexp.TMXTiledMap:create("TileMaps/orthogonal-test5.tmx") ret:addChild(map, 0, kTagTileMap) local s = map:getContentSize() @@ -705,7 +705,7 @@ end local function TMXIsoZorder() local m_tamara = nil local ret = createTileDemoLayer("TMX Iso Zorder", "Sprite should hide behind the trees") - local map = cc.FastTMXTiledMap:create("TileMaps/iso-test-zorder.tmx") + local map = ccexp.TMXTiledMap:create("TileMaps/iso-test-zorder.tmx") ret:addChild(map, 0, kTagTileMap) local s = map:getContentSize() @@ -765,7 +765,7 @@ end local function TMXOrthoZorder() local m_tamara = nil local ret = createTileDemoLayer("TMX Ortho Zorder", "Sprite should hide behind the trees") - local map = cc.FastTMXTiledMap:create("TileMaps/orthogonal-test-zorder.tmx") + local map = ccexp.TMXTiledMap:create("TileMaps/orthogonal-test-zorder.tmx") ret:addChild(map, 0, kTagTileMap) local s = map:getContentSize() @@ -823,7 +823,7 @@ end local function TMXIsoVertexZ() local m_tamara = nil local ret = createTileDemoLayer("TMX Iso VertexZ", "Sprite should hide behind the trees") - local map = cc.FastTMXTiledMap:create("TileMaps/iso-test-vertexz.tmx") + local map = ccexp.TMXTiledMap:create("TileMaps/iso-test-vertexz.tmx") ret:addChild(map, 0, kTagTileMap) local s = map:getContentSize() @@ -878,7 +878,7 @@ end local function TMXOrthoVertexZ() local m_tamara = nil local ret = createTileDemoLayer("TMX Ortho vertexZ", "Sprite should hide behind the trees") - local map = cc.FastTMXTiledMap:create("TileMaps/orthogonal-test-vertexz.tmx") + local map = ccexp.TMXTiledMap:create("TileMaps/orthogonal-test-vertexz.tmx") ret:addChild(map, 0, kTagTileMap) local s = map:getContentSize() @@ -932,7 +932,7 @@ end -------------------------------------------------------------------- local function TMXIsoMoveLayer() local ret = createTileDemoLayer("TMX Iso Move Layer", "Trees should be horizontally aligned") - local map = cc.FastTMXTiledMap:create("TileMaps/iso-test-movelayer.tmx") + local map = ccexp.TMXTiledMap:create("TileMaps/iso-test-movelayer.tmx") ret:addChild(map, 0, kTagTileMap) map:setPosition(cc.p(-700,-50)) @@ -950,7 +950,7 @@ end -------------------------------------------------------------------- local function TMXOrthoMoveLayer() local ret = createTileDemoLayer("TMX Ortho Move Layer", "Trees should be horizontally aligned") - local map = cc.FastTMXTiledMap:create("TileMaps/orthogonal-test-movelayer.tmx") + local map = ccexp.TMXTiledMap:create("TileMaps/orthogonal-test-movelayer.tmx") ret:addChild(map, 0, kTagTileMap) local s = map:getContentSize() @@ -983,7 +983,7 @@ end local function TMXOrthoFlipTest() local ret = createTileDemoLayer("TMX tile flip test") - local map = cc.FastTMXTiledMap:create("TileMaps/ortho-rotation-test.tmx") + local map = ccexp.TMXTiledMap:create("TileMaps/ortho-rotation-test.tmx") ret:addChild(map, 0, kTagTileMap) local s = map:getContentSize() @@ -1002,7 +1002,7 @@ end local function TMXOrthoFlipRunTimeTest() local ret = createTileDemoLayer("TMX tile flip run time test", "in 2 sec bottom left tiles will flip") - local map = cc.FastTMXTiledMap:create("TileMaps/ortho-rotation-test.tmx") + local map = ccexp.TMXTiledMap:create("TileMaps/ortho-rotation-test.tmx") ret:addChild(map, 0, kTagTileMap) local s = map:getContentSize() @@ -1076,7 +1076,7 @@ local function TMXOrthoFromXMLTest() cclog("Unable to open file") end - local map = cc.FastTMXTiledMap:createWithXML(str ,resources) + local map = ccexp.TMXTiledMap:createWithXML(str ,resources) ret:addChild(map, 0, kTagTileMap) local s = map:getContentSize() @@ -1096,7 +1096,7 @@ end local function TMXOrthoXMLFormatTest() local ret = createTileDemoLayer("you should see blue, green and yellow in console.") - local map = cc.FastTMXTiledMap:create("TileMaps/xml-test.tmx") + local map = ccexp.TMXTiledMap:create("TileMaps/xml-test.tmx") ret:addChild(map, 0, kTagTileMap) local s = map:getContentSize() @@ -1118,7 +1118,7 @@ end -------------------------------------------------------------------- local function TMXBug987() local ret = createTileDemoLayer("TMX Bug 987", "You should see an square") - local map = cc.FastTMXTiledMap:create("TileMaps/orthogonal-test6.tmx") + local map = ccexp.TMXTiledMap:create("TileMaps/orthogonal-test6.tmx") ret:addChild(map, 0, kTagTileMap) local s1 = map:getContentSize() @@ -1137,7 +1137,7 @@ end -------------------------------------------------------------------- local function TMXBug787() local ret = createTileDemoLayer("TMX Bug 787", "You should see a map") - local map = cc.FastTMXTiledMap:create("TileMaps/iso-test-bug787.tmx") + local map = ccexp.TMXTiledMap:create("TileMaps/iso-test-bug787.tmx") ret:addChild(map, 0, kTagTileMap) map:setScale(0.25) return ret diff --git a/tests/lua-tests/src/FontTest/FontTest.lua b/tests/lua-tests/src/FontTest/FontTest.lua index 1e19a714ae..461df655f5 100644 --- a/tests/lua-tests/src/FontTest/FontTest.lua +++ b/tests/lua-tests/src/FontTest/FontTest.lua @@ -8,7 +8,7 @@ local fontList = { "fonts/Abberancy.ttf", "fonts/Abduction.ttf", "fonts/Paint Boy.ttf", - "fonts/Schwarzwald Regular.ttf", + "fonts/Schwarzwald.ttf", "fonts/Scissor Cuts.ttf" } diff --git a/tests/lua-tests/src/LabelTestNew/LabelTestNew.lua b/tests/lua-tests/src/LabelTestNew/LabelTestNew.lua index 74ccbb576f..9e9b2b5f9f 100644 --- a/tests/lua-tests/src/LabelTestNew/LabelTestNew.lua +++ b/tests/lua-tests/src/LabelTestNew/LabelTestNew.lua @@ -1085,7 +1085,7 @@ function LabelTTFFontsTestNew.create() "fonts/Abduction.ttf", "fonts/American Typewriter.ttf", "fonts/Paint Boy.ttf", - "fonts/Schwarzwald Regular.ttf", + "fonts/Schwarzwald.ttf", "fonts/Scissor Cuts.ttf", } local ttfConfig = {} diff --git a/tests/lua-tests/src/VideoPlayerTest/VideoPlayerTest.lua b/tests/lua-tests/src/VideoPlayerTest/VideoPlayerTest.lua index 022745d079..41ec6834eb 100644 --- a/tests/lua-tests/src/VideoPlayerTest/VideoPlayerTest.lua +++ b/tests/lua-tests/src/VideoPlayerTest/VideoPlayerTest.lua @@ -21,18 +21,18 @@ local function VideoPlayerTest() layer:addChild(videoStateLabel) local function onVideoEventCallback(sener, eventType) - if eventType == ccexprimental.VideoPlayerEvent.PLAYING then + if eventType == ccexp.VideoPlayerEvent.PLAYING then videoStateLabel:setString("PLAYING") - elseif eventType == ccexprimental.VideoPlayerEvent.PAUSED then + elseif eventType == ccexp.VideoPlayerEvent.PAUSED then videoStateLabel:setString("PAUSED") - elseif eventType == ccexprimental.VideoPlayerEvent.STOPPED then + elseif eventType == ccexp.VideoPlayerEvent.STOPPED then videoStateLabel:setString("STOPPED") - elseif eventType == ccexprimental.VideoPlayerEvent.COMPLETED then + elseif eventType == ccexp.VideoPlayerEvent.COMPLETED then videoStateLabel:setString("COMPLETED") end end local widgetSize = widget:getContentSize() - local videoPlayer = ccexprimental.VideoPlayer:create() + local videoPlayer = ccexp.VideoPlayer:create() videoPlayer:setPosition(centerPos) videoPlayer:setAnchorPoint(cc.p(0.5, 0.5)) videoPlayer:setContentSize(cc.size(widgetSize.width * 0.4,widgetSize.height * 0.4)) diff --git a/tests/lua-tests/src/controller.lua b/tests/lua-tests/src/controller.lua index 1e89841d68..a4fb1c9718 100644 --- a/tests/lua-tests/src/controller.lua +++ b/tests/lua-tests/src/controller.lua @@ -9,7 +9,7 @@ collectgarbage("setstepmul", 5000) local director = cc.Director:getInstance() local glView = director:getOpenGLView() if nil == glView then - glView = cc.GLView:createWithRect("Lua Tests", cc.rect(0,0,900,640)) + glView = cc.GLViewImpl:createWithRect("Lua Tests", cc.rect(0,0,900,640)) director:setOpenGLView(glView) end diff --git a/tools/bindings-generator b/tools/bindings-generator index 56aaed8134..ee16f69272 160000 --- a/tools/bindings-generator +++ b/tools/bindings-generator @@ -1 +1 @@ -Subproject commit 56aaed8134d624cdbaa365dc44c5134f325957cc +Subproject commit ee16f692722f6bbb7d485032751f9b826ec9e926 diff --git a/tools/cocos2d-console b/tools/cocos2d-console index 728515cc5e..97a87d1a93 160000 --- a/tools/cocos2d-console +++ b/tools/cocos2d-console @@ -1 +1 @@ -Subproject commit 728515cc5e9b54a12b31e61785f355fc3c057007 +Subproject commit 97a87d1a93bd34be8bb8efdf6acfa35ddf7997b4 diff --git a/tools/gen-prebuilt/.gitignore b/tools/gen-prebuilt/.gitignore new file mode 100644 index 0000000000..71c422c076 --- /dev/null +++ b/tools/gen-prebuilt/.gitignore @@ -0,0 +1,4 @@ +.idea/* +build/* +prebuilt* +cocos2d-x/* diff --git a/tools/gen-prebuilt/README.md b/tools/gen-prebuilt/README.md new file mode 100644 index 0000000000..e762a37e06 --- /dev/null +++ b/tools/gen-prebuilt/README.md @@ -0,0 +1,41 @@ + +# Generate prebuilt engine + +## Purpose + +The tools in `gen-prebuilt` are used for generating prebuilt engine. + +## Steps + +1. Generate prebuilt libs + * First, build libs for `Mac, iOS & android`: Run `python gen_prebuilt_libs.py` on Mac. + * Second, build libs for `Windows`: Run `python gen_prebuilt_libs.py -n` on Windows. +2. Organize the prebuilt libs with modules + Run command `python module_organize.py` on Windows or Mac. + +## Script Details + +1. gen_prebuilt_libs.py + + ``` + Usage: gen_prebuilt_libs.py [options] + + Options: + -c Remove the "prebuilt" directory first. + -n, --no-android Not build android libs. + -s, --strip Enable strip when generating iOS, Mac & Android libs. + -i, --incredibuild Use incredibuild to build win32 projects. Only available on windows. + ``` + + The result of the script is : A folder named `prebuilt` which contains prebuilt libs will generated. + +2. module_organize.py + + ``` + Usage: module_organize.py [options] + + Options: + -d, --dst-root Specify a path where to place the engine organized by modules. Default value is the same path with `module_organize.py`. + ``` + + The result of the script is : A folder named `cocos2d-x` will generated in the `dst-root`. \ No newline at end of file diff --git a/tools/gen-prebuilt/build_config.json b/tools/gen-prebuilt/build_config.json new file mode 100644 index 0000000000..e41969c1cd --- /dev/null +++ b/tools/gen-prebuilt/build_config.json @@ -0,0 +1,19 @@ +{ + "xcode_proj_info" : { + "build/cocos2d_libs.xcodeproj" : { + "outputdir" : "prebuilt", + "targets" :[ "build all libs" ] + } + }, + "win32_proj_info" : { + "build/cocos2d-win32.vc2012.sln" : { + "outputdir" : "prebuilt/win32", + "targets" : [ + "libcocosdenshion", "libbox2d", "libchipmunk", + "libcocos2d", "libcocosbuilder", "libcocostudio", + "libextension", "libui", "liblua", + "libnetwork", "libspine" + ] + } + } +} diff --git a/tools/gen-prebuilt/excopy.py b/tools/gen-prebuilt/excopy.py new file mode 100644 index 0000000000..4b4877d726 --- /dev/null +++ b/tools/gen-prebuilt/excopy.py @@ -0,0 +1,100 @@ +#!/usr/bin/python +# ---------------------------------------------------------------------------- +# extend methods for copy files/dirs +# +# Copyright 2014 (C) zhangbin +# +# License: MIT +# ---------------------------------------------------------------------------- + +import os +import shutil + +def copy_files_in_dir(src, dst): + + for item in os.listdir(src): + path = os.path.join(src, item) + if os.path.isfile(path): + shutil.copy(path, dst) + if os.path.isdir(path): + new_dst = os.path.join(dst, item) + if not os.path.isdir(new_dst): + os.makedirs(new_dst) + copy_files_in_dir(path, new_dst) + +def copy_files_with_config(config, src_root, dst_root): + src_dir = config["from"] + dst_dir = config["to"] + + src_dir = os.path.join(src_root, src_dir) + dst_dir = os.path.join(dst_root, dst_dir) + + include_rules = None + if config.has_key("include"): + include_rules = config["include"] + include_rules = convert_rules(include_rules) + + exclude_rules = None + if config.has_key("exclude"): + exclude_rules = config["exclude"] + exclude_rules = convert_rules(exclude_rules) + + copy_files_with_rules(src_dir, src_dir, dst_dir, include_rules, exclude_rules) + +def copy_files_with_rules(src_rootDir, src, dst, include = None, exclude = None): + if os.path.isfile(src): + if not os.path.exists(dst): + os.makedirs(dst) + shutil.copy(src, dst) + return + + if (include is None) and (exclude is None): + if not os.path.exists(dst): + os.makedirs(dst) + copy_files_in_dir(src, dst) + elif (include is not None): + # have include + for name in os.listdir(src): + abs_path = os.path.join(src, name) + rel_path = os.path.relpath(abs_path, src_rootDir) + if os.path.isdir(abs_path): + sub_dst = os.path.join(dst, name) + copy_files_with_rules(src_rootDir, abs_path, sub_dst, include = include) + elif os.path.isfile(abs_path): + if _in_rules(rel_path, include): + if not os.path.exists(dst): + os.makedirs(dst) + shutil.copy(abs_path, dst) + elif (exclude is not None): + # have exclude + for name in os.listdir(src): + abs_path = os.path.join(src, name) + rel_path = os.path.relpath(abs_path, src_rootDir) + if os.path.isdir(abs_path): + sub_dst = os.path.join(dst, name) + copy_files_with_rules(src_rootDir, abs_path, sub_dst, exclude = exclude) + elif os.path.isfile(abs_path): + if not _in_rules(rel_path, exclude): + if not os.path.exists(dst): + os.makedirs(dst) + shutil.copy(abs_path, dst) + +def _in_rules(rel_path, rules): + import re + ret = False + path_str = rel_path.replace("\\", "/") + for rule in rules: + if re.match(rule, path_str): + ret = True + + return ret + +def convert_rules(rules): + ret_rules = [] + for rule in rules: + ret = rule.replace('.', '\\.') + ret = ret.replace('*', '.*') + ret = "%s" % ret + ret_rules.append(ret) + + return ret_rules diff --git a/tools/gen-prebuilt/gen_prebuilt_libs.py b/tools/gen-prebuilt/gen_prebuilt_libs.py new file mode 100644 index 0000000000..d8d3e06119 --- /dev/null +++ b/tools/gen-prebuilt/gen_prebuilt_libs.py @@ -0,0 +1,361 @@ +#!/usr/bin/python +# ---------------------------------------------------------------------------- +# generate the prebuilt libs of engine +# +# Copyright 2014 (C) zhangbin +# +# License: MIT +# ---------------------------------------------------------------------------- +''' +Generate the prebuilt libs of engine +''' + +import os +import subprocess +import shutil +import sys +import excopy +import json + +from argparse import ArgumentParser + +if sys.platform == 'win32': + import _winreg + +ANDROID_SO_PATH = "frameworks/runtime-src/proj.android/libs" +ANDROID_A_PATH = "frameworks/runtime-src/proj.android/obj/local" +MK_PATH = "frameworks/runtime-src/proj.android/jni/Application.mk" +CONSOLE_PATH = "tools/cocos2d-console/bin" + +def os_is_win32(): + return sys.platform == 'win32' + +def os_is_mac(): + return sys.platform == 'darwin' + +def run_shell(cmd, cwd=None): + p = subprocess.Popen(cmd, shell=True, cwd=cwd) + p.wait() + + if p.returncode: + raise subprocess.CalledProcessError(returncode=p.returncode, cmd=cmd) + + return p.returncode + +class Generator(object): + + XCODE_CMD_FMT = "xcodebuild -project \"%s\" -configuration Release -target \"%s\" %s CONFIGURATION_BUILD_DIR=%s" + + CONFIG_FILE = "build_config.json" + KEY_XCODE_PROJ_INFO = "xcode_proj_info" + KEY_WIN32_PROJ_INFO = "win32_proj_info" + + KEY_OUTPUT_DIR = "outputdir" + KEY_TARGETS = "targets" + + def __init__(self, args): + self.need_clean = args.need_clean + self.enable_strip = args.enable_strip + self.use_incredibuild = args.use_incredibuild + self.tool_dir = os.path.realpath(os.path.dirname(__file__)) + self.no_android = args.no_android + + self.engine_dir = os.path.join(self.tool_dir, os.path.pardir, os.path.pardir) + + self.load_config() + + def load_config(self): + cfg_json = os.path.join(self.tool_dir, Generator.CONFIG_FILE) + f = open(cfg_json) + cfg_info = json.load(f) + f.close() + + self.xcode_proj_info = cfg_info[Generator.KEY_XCODE_PROJ_INFO] + self.win32_proj_info = cfg_info[Generator.KEY_WIN32_PROJ_INFO] + + def modify_mk(self, mk_file): + if os.path.isfile(mk_file): + file_obj = open(mk_file, "a") + file_obj.write("\nAPP_ABI :=armeabi armeabi-v7a\n") + file_obj.close() + + def build_android(self): + # build .so for android + language = "lua" + + console_dir = os.path.join(self.engine_dir, CONSOLE_PATH) + cmd_path = os.path.join(console_dir, "cocos") + proj_name = "My%sGame" % language + proj_path = os.path.join(self.engine_dir, proj_name) + if os.path.exists(proj_path): + shutil.rmtree(proj_path) + + # create a runtime project + create_cmd = "%s new -l %s -t runtime -d %s %s" % (cmd_path, language, self.engine_dir, proj_name) + run_shell(create_cmd) + + # Add multi ABI in Application.mk + mk_file = os.path.join(proj_path, MK_PATH) + self.modify_mk(mk_file) + + # build it + build_cmd = "%s compile -s %s -p android --ndk-mode release -j 4" % (cmd_path, proj_path) + run_shell(build_cmd) + + # copy .a to prebuilt dir + obj_dir = os.path.join(proj_path, ANDROID_A_PATH) + prebuilt_dir = os.path.join(self.tool_dir, "prebuilt", "android") + copy_cfg = { + "from": obj_dir, + "to": prebuilt_dir, + "include": [ + "*.a$" + ] + } + excopy.copy_files_with_config(copy_cfg, obj_dir, prebuilt_dir) + + if self.enable_strip: + # strip the android libs + ndk_root = os.environ["NDK_ROOT"] + if os_is_win32(): + if self.is_32bit_windows(): + bit_str = "x86" + else: + bit_str = "x86_64" + + sys_folder_name = "windows-%s" % bit_str + elif os_is_mac(): + sys_folder_name = "darwin-x86_64" + + strip_cmd_path = os.path.join(ndk_root, "toolchains/arm-linux-androideabi-4.8/prebuilt/%s/arm-linux-androideabi/bin/strip" % sys_folder_name) + if os.path.exists(strip_cmd_path): + strip_cmd = "%s -S %s/armeabi*/*.a" % (strip_cmd_path, prebuilt_dir) + run_shell(strip_cmd) + + # remove the project + shutil.rmtree(proj_path) + + def get_required_vs_version(self, proj_file): + # get the VS version required by the project + import re + file_obj = open(proj_file) + pattern = re.compile(r"^# Visual Studio.+(\d{4})") + num = None + for line in file_obj: + match = pattern.match(line) + if match is not None: + num = match.group(1) + break + + if num is not None: + if num == "2012": + ret = "11.0" + elif num == "2013": + ret = "12.0" + else: + ret = None + else: + ret = None + + return ret + + def get_vs_cmd_path(self, require_version): + # find the VS in register, if system is 64bit, should find vs in both 32bit & 64bit register + if self.is_32bit_windows(): + reg_flag_list = [ _winreg.KEY_WOW64_32KEY ] + else: + reg_flag_list = [ _winreg.KEY_WOW64_64KEY, _winreg.KEY_WOW64_32KEY ] + + needUpgrade = False + vsPath = None + + try: + for reg_flag in reg_flag_list: + print("find vs in reg : %s" % ("32bit" if reg_flag == _winreg.KEY_WOW64_32KEY else "64bit")) + vs = _winreg.OpenKey( + _winreg.HKEY_LOCAL_MACHINE, + r"SOFTWARE\Microsoft\VisualStudio", + 0, + _winreg.KEY_READ | reg_flag + ) + + try: + i = 0 + while True: + try: + # enum the keys in vs reg + version = _winreg.EnumKey(vs, i) + find_ver = float(version) + + # find the vs which version >= required version + if find_ver >= float(require_version): + key = _winreg.OpenKey(vs, r"SxS\VS7") + vsPath, type = _winreg.QueryValueEx(key, version) + + if os.path.exists(vsPath): + if float(version) > float(require_version): + needUpgrade = True + break + else: + vsPath = None + except: + continue + finally: + i += 1 + except: + pass + + # if find one right vs, break + if vsPath is not None: + break + except WindowsError as e: + message = "Visual Studio wasn't installed" + print(e) + raise Exception(message) + + commandPath = os.path.join(vsPath, "Common7", "IDE", "devenv") + return (needUpgrade, commandPath) + + def is_32bit_windows(self): + arch = os.environ['PROCESSOR_ARCHITECTURE'].lower() + archw = os.environ.has_key("PROCESSOR_ARCHITEW6432") + return (arch == "x86" and not archw) + + def build_win32_proj(self, cmd_path, sln_path, proj_name, mode): + build_cmd = " ".join([ + "\"%s\"" % cmd_path, + "\"%s\"" % sln_path, + "/%s \"Release|Win32\"" % mode, + "/Project \"%s\"" % proj_name + ]) + run_shell(build_cmd) + + def build_win32(self): + print("Building Win32") + + for key in self.win32_proj_info.keys(): + output_dir = self.win32_proj_info[key][Generator.KEY_OUTPUT_DIR] + proj_path = os.path.join(self.engine_dir, key) + require_vs_version = self.get_required_vs_version(proj_path) + needUpgrade, vs_command = self.get_vs_cmd_path(require_vs_version) + + # get the build folder & win32 output folder + build_folder_path = os.path.join(os.path.dirname(proj_path), "Release.win32") + if os.path.exists(build_folder_path): + shutil.rmtree(build_folder_path) + os.makedirs(build_folder_path) + + win32_output_dir = os.path.join(self.tool_dir, output_dir) + if os.path.exists(win32_output_dir): + shutil.rmtree(win32_output_dir) + os.makedirs(win32_output_dir) + + # upgrade projects + if needUpgrade: + commandUpgrade = ' '.join([ + "\"%s\"" % vs_command, + "\"%s\"" % proj_path, + "/Upgrade" + ]) + run_shell(commandUpgrade) + + if self.use_incredibuild: + # use incredibuild, build whole sln + build_cmd = " ".join([ + "BuildConsole", + "%s" % proj_path, + "/build", + "/cfg=\"Release|Win32\"" + ]) + run_shell(build_cmd) + + if not self.use_incredibuild: + # build the projects + for proj_name in self.win32_proj_info[key][Generator.KEY_TARGETS]: + self.build_win32_proj(vs_command, proj_path, proj_name, "build") + + lib_file_path = os.path.join(build_folder_path, "%s.lib" % proj_name) + if not os.path.exists(lib_file_path): + # if the lib is not generated, rebuild the project + self.build_win32_proj(vs_command, proj_path, proj_name, "rebuild") + + if not os.path.exists(lib_file_path): + raise Exception("Library %s not generated as expected!" % lib_file_path) + + # copy the libs into prebuilt dir + for file_name in os.listdir(build_folder_path): + file_path = os.path.join(build_folder_path, file_name) + shutil.copy(file_path, win32_output_dir) + + print("Win32 build succeeded.") + + def build_ios_mac(self): + for key in self.xcode_proj_info.keys(): + output_dir = self.xcode_proj_info[key][Generator.KEY_OUTPUT_DIR] + proj_path = os.path.join(self.engine_dir, key) + ios_out_dir = os.path.join(self.tool_dir, output_dir, "ios") + mac_out_dir = os.path.join(self.tool_dir, output_dir, "mac") + + ios_sim_libs_dir = os.path.join(ios_out_dir, "simulator") + ios_dev_libs_dir = os.path.join(ios_out_dir, "device") + for target in self.xcode_proj_info[key][Generator.KEY_TARGETS]: + build_cmd = Generator.XCODE_CMD_FMT % (proj_path, "%s iOS" % target, "-sdk iphonesimulator", ios_sim_libs_dir) + run_shell(build_cmd, self.tool_dir) + + build_cmd = Generator.XCODE_CMD_FMT % (proj_path, "%s iOS" % target, "-sdk iphoneos", ios_dev_libs_dir) + run_shell(build_cmd, self.tool_dir) + + build_cmd = Generator.XCODE_CMD_FMT % (proj_path, "%s Mac" % target, "", mac_out_dir) + run_shell(build_cmd, self.tool_dir) + + # generate fat libs for iOS + for lib in os.listdir(ios_sim_libs_dir): + sim_lib = os.path.join(ios_sim_libs_dir, lib) + dev_lib = os.path.join(ios_dev_libs_dir, lib) + output_lib = os.path.join(ios_out_dir, lib) + lipo_cmd = "lipo -create -output \"%s\" \"%s\" \"%s\"" % (output_lib, sim_lib, dev_lib) + + run_shell(lipo_cmd) + + # remove the simulator & device libs in iOS + shutil.rmtree(ios_sim_libs_dir) + shutil.rmtree(ios_dev_libs_dir) + + if self.enable_strip: + # strip the libs + ios_strip_cmd = "xcrun -sdk iphoneos strip -S %s/*.a" % ios_out_dir + run_shell(ios_strip_cmd) + mac_strip_cmd = "xcrun strip -S %s/*.a" % mac_out_dir + run_shell(mac_strip_cmd) + + def build_all_libs(self): + if os_is_mac(): + # build for iOS & Mac + self.build_ios_mac() + + if os_is_win32(): + # build for win32 + self.build_win32() + + if not self.no_android: + self.build_android() + + def do_generate(self): + output_dir = os.path.join(self.tool_dir, "prebuilt") + if self.need_clean and os.path.exists(output_dir): + shutil.rmtree(output_dir) + self.build_all_libs() + +if __name__ == "__main__": + parser = ArgumentParser(description="Generate prebuilt engine for Cocos Engine.") + parser.add_argument('-c', dest='need_clean', action="store_true", help='Remove the \"prebuilt\" directory first.') + parser.add_argument('-n', "--no-android", dest='no_android', action="store_true", help='Not build android libs.') + parser.add_argument('-s', "--strip", dest='enable_strip', action="store_true", help='Strip the generated libs.') + parser.add_argument('-i', "--incredibuild", dest='use_incredibuild', action="store_true", help='Use incredibuild to build win32 projects. Only available on windows.') + (args, unknown) = parser.parse_known_args() + + if len(unknown) > 0: + print("unknown arguments: %s" % unknown) + + gen_obj = Generator(args) + gen_obj.do_generate() diff --git a/tools/gen-prebuilt/module_config.json b/tools/gen-prebuilt/module_config.json new file mode 100644 index 0000000000..3e787f9f8b --- /dev/null +++ b/tools/gen-prebuilt/module_config.json @@ -0,0 +1,329 @@ +{ + "cocos2d" : { + "module_type" : "compiled", + "target_dir" : "cocos", + "win32_lib_file_name" : "libcocos2d", + "ios_lib_file_name" : "libcocos2d iOS.a", + "mac_lib_file_name" : "libcocos2d Mac.a", + "android_lib_name" : "cocos2dx_static", + "android_lib_file_name" : "libcocos2d", + "include" : [ + { + "from": "cocos", + "to": "cocos/include", + "include" : [ + "2d/*.h", "3d/*.h", "3d/*.inl", "base/*.h", + "deprecated/*.h", "math/*.h", "math/*.inl", + "physics/*.h", "platform/*.h", "renderer/*.h", + "storage/*.h", "cocos2d.h", "2d/*.props" + ] + }, + { + "from": "cocos/platform/android/java", + "to": "cocos/include/platform/android/java" + }, + { + "from": "external", + "to": "external", + "include": [ + "tinyxml2/*.h", + "unzip/*.h", + "xxhash/*.h", + "json/*.h", + "win32-specific/*" + ] + } + ], + "export_include" : [ + "../../include", + "../../../modules", + "../../../external/tinyxml2", + "../../../external/unzip", + "../../../external/chipmunk/include/chipmunk", + "../../../external/edtaa3func", + "../../../external/xxhash", + "../../../external/ConvertUTF", + "../../../external" + ], + "depend_modules" : [ + "chipmunk", "freetype", "jpeg", + "png", "webp", "tiff", + "cocos_android", "curl", "websockets" + ], + "export_ldlibs" : [ + "GLESv2", "log", "z", "android" + ], + "export_cflags" : [ + "-Wno-psabi", "-DUSE_FILE32API" + ], + "export_cppflags" : [ + "-Wno-literal-suffix", "-Wno-deprecated-declarations" + ] + }, + "freetype" : { + "module_type" : "prebuilt", + "from_dir" : "external/freetype2", + "target_dir" : "external/freetype2", + "android_lib_name" : "cocos_freetype2_static" + }, + "jpeg" : { + "module_type" : "prebuilt", + "from_dir" : "external/jpeg", + "target_dir" : "external/jpeg", + "android_lib_name" : "cocos_jpeg_static" + }, + "png" : { + "module_type" : "prebuilt", + "from_dir" : "external/png", + "target_dir" : "external/png", + "android_lib_name" : "cocos_png_static" + }, + "webp" : { + "module_type" : "prebuilt", + "from_dir" : "external/webp", + "target_dir" : "external/webp", + "android_lib_name" : "cocos_webp_static" + }, + "tiff" : { + "module_type" : "prebuilt", + "from_dir" : "external/tiff", + "target_dir" : "external/tiff", + "android_lib_name" : "cocos_tiff_static" + }, + "curl" : { + "module_type" : "prebuilt", + "from_dir" : "external/curl", + "target_dir" : "external/curl", + "android_lib_name" : "cocos_curl_static" + }, + "websockets" : { + "module_type" : "prebuilt", + "from_dir" : "external/websockets", + "target_dir" : "external/websockets", + "android_lib_name" : "websockets_static" + }, + "glfw3": { + "module_type" : "prebuilt", + "from_dir" : "external/glfw3", + "target_dir" : "external/glfw3" + }, + "cocos_android" : { + "module_type" : "compiled", + "target_dir" : "cocos/include/platform/android", + "android_lib_name" : "cocos2dxandroid_static", + "android_lib_file_name" : "libcocos2dandroid", + "export_include" : [ + "../../" + ], + "export_ldlibs" : [ + "GLESv1_CM", "GLESv2", "EGL", "log", "z", "android" + ] + }, + "chipmunk" : { + "module_type" : "compiled", + "target_dir" : "modules/chipmunk", + "win32_lib_file_name" : "libchipmunk", + "ios_lib_file_name" : "libchipmunk iOS.a", + "mac_lib_file_name" : "libchipmunk Mac.a", + "android_lib_name" : "chipmunk_static", + "android_lib_file_name" : "libchipmunk", + "include" : [ + { + "from": "external/chipmunk", + "to": "modules/chipmunk", + "include" : [ + "include/*.h" + ] + } + ], + "export_include" : [ + "../../include/chipmunk" + ] + }, + "box2d" : { + "module_type" : "compiled", + "target_dir" : "modules/Box2D", + "win32_lib_file_name" : "libbox2d", + "ios_lib_file_name" : "libbox2d iOS.a", + "mac_lib_file_name" : "libbox2d Mac.a", + "android_lib_name" : "box2d_static", + "android_lib_file_name" : "libbox2d", + "include" : [ + { + "from": "external/Box2D", + "to": "modules/Box2D/include/Box2D", + "include" : [ + "*.h" + ] + } + ], + "export_include" : [ + "../../include" + ] + }, + "audio" : { + "module_type" : "compiled", + "target_dir" : "modules/audio", + "win32_lib_file_name" : "libcocosdenshion", + "ios_lib_file_name" : "libcocosdenshion iOS.a", + "mac_lib_file_name" : "libcocosdenshion Mac.a", + "android_lib_name" : "cocosdenshion_static", + "android_lib_file_name" : "libcocosdenshion", + "include" : [ + { + "from": "cocos/audio", + "to": "modules/audio", + "include" : [ + "include/*.h" + ] + } + ], + "export_include" : [ + "../../include" + ] + }, + "network" : { + "module_type" : "compiled", + "target_dir" : "modules/network", + "win32_lib_file_name" : "libnetwork", + "ios_lib_file_name" : "libnetwork iOS.a", + "mac_lib_file_name" : "libnetwork Mac.a", + "android_lib_name" : "cocos_network_static", + "android_lib_file_name" : "libnetwork", + "include" : [ + { + "from": "cocos/network", + "to": "modules/network/include/network", + "include" : [ + "*.h" + ] + } + ], + "export_include" : [ + "../../include" + ], + "depend_modules" : [ + "cocos2d", "curl", "websockets" + ] + }, + "ui" : { + "module_type" : "compiled", + "target_dir" : "modules/ui", + "win32_lib_file_name" : "libui", + "ios_lib_file_name" : "libui iOS.a", + "mac_lib_file_name" : "libui Mac.a", + "android_lib_name" : "cocos_ui_static", + "android_lib_file_name" : "libui", + "include" : [ + { + "from": "cocos/ui", + "to": "modules/ui/include/ui", + "include" : [ + "*.h" + ] + } + ], + "export_include" : [ + "../../include" + ], + "depend_modules" : [ + "cocos2d", "extensions" + ] + }, + "extensions" : { + "module_type" : "compiled", + "target_dir" : "modules/extensions", + "win32_lib_file_name" : "libextension", + "ios_lib_file_name" : "libextension iOS.a", + "mac_lib_file_name" : "libextension Mac.a", + "android_lib_name" : "cocos_extension_static", + "android_lib_file_name" : "libextension", + "include" : [ + { + "from": "extensions", + "to": "modules/extensions/include/extensions", + "include" : [ + "*.h" + ] + } + ], + "export_include" : [ + "../../include" + ], + "depend_modules" : [ + "cocos2d", "curl", "box2d" + ] + }, + "cocostudio" : { + "module_type" : "compiled", + "target_dir" : "modules/cocostudio", + "win32_lib_file_name" : "libcocostudio", + "ios_lib_file_name" : "libcocostudio iOS.a", + "mac_lib_file_name" : "libcocostudio Mac.a", + "android_lib_name" : "cocostudio_static", + "android_lib_file_name" : "libcocostudio", + "include" : [ + { + "from": "cocos/editor-support/cocostudio", + "to": "modules/cocostudio/include/cocostudio", + "include" : [ + "*.h" + ] + } + ], + "export_include" : [ + "../../include" + ], + "depend_modules" : [ + "ui", "audio" + ] + }, + "spine" : { + "module_type" : "compiled", + "target_dir" : "modules/spine", + "win32_lib_file_name" : "libspine", + "ios_lib_file_name" : "libspine iOS.a", + "mac_lib_file_name" : "libspine Mac.a", + "android_lib_name" : "spine_static", + "android_lib_file_name" : "libspine", + "include" : [ + { + "from": "cocos/editor-support/spine", + "to": "modules/spine/include/spine", + "include" : [ + "*.h" + ] + } + ], + "export_include" : [ + "../../include" + ], + "depend_modules" : [ + "cocos2d" + ] + }, + "cocosbuilder" : { + "module_type" : "compiled", + "target_dir" : "modules/cocosbuilder", + "win32_lib_file_name" : "libcocosbuilder", + "ios_lib_file_name" : "libcocosbuilder iOS.a", + "mac_lib_file_name" : "libcocosbuilder Mac.a", + "android_lib_name" : "cocosbuilder_static", + "android_lib_file_name" : "libcocosbuilder", + "include" : [ + { + "from": "cocos/editor-support/cocosbuilder", + "to": "modules/cocosbuilder/include/cocosbuilder", + "include" : [ + "*.h" + ] + } + ], + "export_include" : [ + "../../include" + ], + "depend_modules" : [ + "extensions" + ] + } +} diff --git a/tools/gen-prebuilt/module_organize.py b/tools/gen-prebuilt/module_organize.py new file mode 100644 index 0000000000..ee3f32514a --- /dev/null +++ b/tools/gen-prebuilt/module_organize.py @@ -0,0 +1,239 @@ +import os +import shutil +import json +import excopy + +from argparse import ArgumentParser + +class ModuleOrganizer(object): + + CFG_FILE = "module_config.json" + + KEY_MODULE_TYPE = "module_type" + MODULE_TYPE_COMPILED = "compiled" + MODULE_TYPE_PREBUILT = "prebuilt" + + KEY_MODULE_FROM_DIR = "from_dir" + KEY_MODULE_TARGET_DIR = "target_dir" + KEY_MODULE_INCLUDE = "include" + KEY_MODULE_ANDROID_LIB_NAME = "android_lib_name" + KEY_MODULE_ANDROID_LIB_FILE_NAME = "android_lib_file_name" + KEY_MODULE_EXPORT_INCLUDE = "export_include" + KEY_MODULE_DEPEND_MODULES = "depend_modules" + KEY_MODULE_EXPORT_LDLIBS = "export_ldlibs" + KEY_MODULE_EXPORT_CFLAGS = "export_cflags" + KEY_MODULE_EXPORT_CPPFLAGS = "export_cppflags" + KEY_MODULE_WIN32_LIB_FILE_NAME = "win32_lib_file_name" + KEY_MODULE_IOS_LIB_FILE_NAME = "ios_lib_file_name" + KEY_MODULE_MAC_LIB_FILE_NAME = "mac_lib_file_name" + + # Parameter 5--9 means: + # 5. LOCAL_EXPORT_LDLIBS + # 6. LOCAL_EXPORT_CFLAGS + # 7. LOCAL_EXPORT_CPPFLAGS + # 8. LOCAL_WHOLE_STATIC_LIBRARIES + # 9. $(call import-module, xxx) + MK_FORMAT = "LOCAL_PATH := $(call my-dir)\n\n" \ + "include $(CLEAR_VARS)\n\n" \ + "LOCAL_MODULE := %s\n" \ + "LOCAL_MODULE_FILENAME := %s\n\n" \ + "LOCAL_SRC_FILES := %s\n\n" \ + "LOCAL_EXPORT_C_INCLUDES := %s\n\n" \ + "%s" \ + "%s" \ + "%s" \ + "%s" \ + "include $(PREBUILT_STATIC_LIBRARY)\n\n" \ + "%s\n" + + def __init__(self, dst_root): + self.local_path = os.path.realpath(os.path.dirname(__file__)) + self.modules_info = self._parse_modules() + + self.src_root = os.path.join(self.local_path, os.path.pardir, os.path.pardir) + self.prebuilt_dir = os.path.join(self.local_path, "prebuilt") + + if dst_root is None: + dst = self.local_path + else: + if os.path.isabs(dst_root): + dst = dst_root + else: + dst = os.path.abspath(dst_root) + self.dst_root = os.path.join(dst, "cocos2d-x") + + def _parse_modules(self): + cfg_path = os.path.join(self.local_path, ModuleOrganizer.CFG_FILE) + f = open(cfg_path) + cfg_info = json.load(f) + f.close() + + return cfg_info + + def gen_android_depend_str(self, depends): + whole_libs_str = "" + call_import_str = "" + i = 0 + for module in depends: + depend_info = self.modules_info[module] + if i == 0: + flag = ":" + else: + flag = "+" + whole_libs_str += ("LOCAL_WHOLE_STATIC_LIBRARIES %s= %s\n" % (flag, depend_info[ModuleOrganizer.KEY_MODULE_ANDROID_LIB_NAME])) + call_import_str += ("$(call import-module,%s/prebuilt/android)\n" % depend_info[ModuleOrganizer.KEY_MODULE_TARGET_DIR]) + i += 1 + + whole_libs_str += "\n" + return (whole_libs_str, call_import_str) + + def handle_for_android(self, module_info): + # copy libs file + android_lib_file_name = module_info[ModuleOrganizer.KEY_MODULE_ANDROID_LIB_FILE_NAME] + copy_android_lib_cfg = {} + copy_android_lib_cfg["from"] = "android" + copy_android_lib_cfg["to"] = "%s/prebuilt/android" % module_info[ModuleOrganizer.KEY_MODULE_TARGET_DIR] + copy_android_lib_cfg["include"] = [ + "*/%s.a" % android_lib_file_name + ] + excopy.copy_files_with_config(copy_android_lib_cfg, self.prebuilt_dir, self.dst_root) + + # generate the prebuilt Android.mk for the module + android_lib_name = module_info[ModuleOrganizer.KEY_MODULE_ANDROID_LIB_NAME] + local_src_file = "./$(TARGET_ARCH_ABI)/%s.a" % android_lib_file_name + export_include_paths = [] + for include_path in module_info[ModuleOrganizer.KEY_MODULE_EXPORT_INCLUDE]: + temp_path = "${LOCAL_PATH}/%s" % include_path + export_include_paths.append(temp_path) + export_include_str = " \\\n".join(export_include_paths) + + export_ldlibs_str = "" + if module_info.has_key(ModuleOrganizer.KEY_MODULE_EXPORT_LDLIBS): + export_ldlibs_str = "LOCAL_EXPORT_LDLIBS := " + for ldlib in module_info[ModuleOrganizer.KEY_MODULE_EXPORT_LDLIBS]: + export_ldlibs_str += ("-l%s " % ldlib) + export_ldlibs_str += "\n\n" + + export_cflags_str = "" + if module_info.has_key(ModuleOrganizer.KEY_MODULE_EXPORT_CFLAGS): + export_cflags_str = "LOCAL_EXPORT_CFLAGS := " + export_cflags_str += " ".join(module_info[ModuleOrganizer.KEY_MODULE_EXPORT_CFLAGS]) + export_cflags_str += "\n\n" + + export_cppflags_str = "" + if module_info.has_key(ModuleOrganizer.KEY_MODULE_EXPORT_CPPFLAGS): + export_cppflags_str = "LOCAL_EXPORT_CPPFLAGS := " + export_cppflags_str += " ".join(module_info[ModuleOrganizer.KEY_MODULE_EXPORT_CPPFLAGS]) + export_cppflags_str += "\n\n" + + whole_libs = "" + call_libs = "" + if module_info.has_key(ModuleOrganizer.KEY_MODULE_DEPEND_MODULES): + whole_libs, call_libs = self.gen_android_depend_str(module_info[ModuleOrganizer.KEY_MODULE_DEPEND_MODULES]) + + mk_content = ModuleOrganizer.MK_FORMAT % \ + (android_lib_name, + android_lib_file_name, + local_src_file, + export_include_str, + export_ldlibs_str, + export_cflags_str, + export_cppflags_str, + whole_libs, + call_libs + ) + + mk_file_path = os.path.join(self.dst_root, module_info[ModuleOrganizer.KEY_MODULE_TARGET_DIR], "prebuilt/android/Android.mk") + mk_dir = os.path.dirname(mk_file_path) + if not os.path.exists(mk_dir): + os.makedirs(mk_dir) + mk_obj = open(mk_file_path, "w") + mk_obj.write(mk_content) + mk_obj.close() + + def handle_for_win32(self, module_info): + if module_info.has_key(ModuleOrganizer.KEY_MODULE_WIN32_LIB_FILE_NAME): + dst_dir = os.path.join(self.dst_root, module_info[ModuleOrganizer.KEY_MODULE_TARGET_DIR], "prebuilt", "win32") + src_lib_file = os.path.join(self.prebuilt_dir, "win32", "%s.lib" % module_info[ModuleOrganizer.KEY_MODULE_WIN32_LIB_FILE_NAME]) + src_dll_file = os.path.join(self.prebuilt_dir, "win32", "%s.dll" % module_info[ModuleOrganizer.KEY_MODULE_WIN32_LIB_FILE_NAME]) + if not os.path.exists(dst_dir): + os.makedirs(dst_dir) + + if os.path.exists(src_lib_file): + shutil.copy(src_lib_file, dst_dir) + else: + print("\t%s is not existed" % src_lib_file) + + if os.path.exists(src_dll_file): + shutil.copy(src_dll_file, dst_dir) + + def handle_for_ios_mac(self, module_info): + if module_info.has_key(ModuleOrganizer.KEY_MODULE_IOS_LIB_FILE_NAME): + dst_dir = os.path.join(self.dst_root, module_info[ModuleOrganizer.KEY_MODULE_TARGET_DIR], "prebuilt", "ios") + src_lib_file = os.path.join(self.prebuilt_dir, "ios", module_info[ModuleOrganizer.KEY_MODULE_IOS_LIB_FILE_NAME]) + if not os.path.exists(dst_dir): + os.makedirs(dst_dir) + + if os.path.exists(src_lib_file): + shutil.copy(src_lib_file, dst_dir) + else: + print("\t%s is not existed" % src_lib_file) + + if module_info.has_key(ModuleOrganizer.KEY_MODULE_MAC_LIB_FILE_NAME): + dst_dir = os.path.join(self.dst_root, module_info[ModuleOrganizer.KEY_MODULE_TARGET_DIR], "prebuilt", "mac") + src_lib_file = os.path.join(self.prebuilt_dir, "mac", module_info[ModuleOrganizer.KEY_MODULE_MAC_LIB_FILE_NAME]) + if not os.path.exists(dst_dir): + os.makedirs(dst_dir) + + if os.path.exists(src_lib_file): + shutil.copy(src_lib_file, dst_dir) + else: + print("\t%s is not existed" % src_lib_file) + + def gen_compiled_module(self, module_name): + print("generate compiled module : %s" % module_name) + module_info = self.modules_info[module_name] + # copy the include files + if module_info.has_key(ModuleOrganizer.KEY_MODULE_INCLUDE): + for inclue_cfg in module_info[ModuleOrganizer.KEY_MODULE_INCLUDE]: + excopy.copy_files_with_config(inclue_cfg, self.src_root, self.dst_root) + + # handle the process for android + self.handle_for_android(module_info) + + # handle the process for win32 + self.handle_for_win32(module_info) + + # handle the process for ios and mac + self.handle_for_ios_mac(module_info) + + def gen_prebuilt_module(self, module_name): + print("generate prebuilt module : %s" % module_name) + module_info = self.modules_info[module_name] + copy_cfg = { + "from" : module_info[ModuleOrganizer.KEY_MODULE_FROM_DIR], + "to": module_info[ModuleOrganizer.KEY_MODULE_TARGET_DIR] + } + excopy.copy_files_with_config(copy_cfg, self.src_root, self.dst_root) + + def gen_modules(self): + if os.path.exists(self.dst_root): + shutil.rmtree(self.dst_root) + + for module in self.modules_info.keys(): + module_info = self.modules_info[module] + if module_info[ModuleOrganizer.KEY_MODULE_TYPE] == ModuleOrganizer.MODULE_TYPE_COMPILED: + self.gen_compiled_module(module) + elif module_info[ModuleOrganizer.KEY_MODULE_TYPE] == ModuleOrganizer.MODULE_TYPE_PREBUILT: + self.gen_prebuilt_module(module) + +if __name__ == '__main__': + parser = ArgumentParser(description="Organize the modules of engine from prebuilt engine.") + parser.add_argument('-d', "--dst-root", dest='dst_root', help='The path where to place the engine organized by modules.') + (args, unknown) = parser.parse_known_args() + + if len(unknown) > 0: + print("unknown arguments: %s" % unknown) + + organizer = ModuleOrganizer(args.dst_root) + organizer.gen_modules() diff --git a/tools/jenkins-scripts/ci-dailybuild-android.py b/tools/jenkins-scripts/ci-dailybuild-android.py new file mode 100644 index 0000000000..469ff1680a --- /dev/null +++ b/tools/jenkins-scripts/ci-dailybuild-android.py @@ -0,0 +1,162 @@ +import os +import platform +import json +from shutil import copy +import sys +import traceback +import MySQLdb +from email.mime.text import MIMEText +import smtplib +import datetime +def check_current_3rd_libs(): + #get current_libs config + backup_files = range(2) + current_files = range(2) + config_file_paths = ['external/config.json','templates/lua-template-runtime/runtime/config.json'] + for i, config_file_path in enumerate(config_file_paths): + if not os.path.isfile(config_file_path): + raise Exception("Could not find 'external/config.json'") + + with open(config_file_path) as data_file: + data = json.load(data_file) + + current_3rd_libs_version = data["version"] + filename = current_3rd_libs_version + '.zip' + node_name = os.environ['NODE_NAME'] + backup_file = '../cocos-2dx-external/node/' + node_name + '/' + filename + backup_files[i] = backup_file + current_file = filename + current_files[i] = current_file + if os.path.isfile(backup_file): + copy(backup_file, current_file) + #run download-deps.py + os.system('python download-deps.py -r no') + #backup file + for i, backup_file in enumerate(backup_files): + current_file = current_files[i] + copy(current_file, backup_file) + +def strip_android_libs(): + strip_cmd = os.environ['ndk_strip'] + print strip_cmd + _cmd = strip_cmd + ' ./tests/cpp-tests/proj.android/obj/local/armeabi/*.a' + os.system(_cmd) + +def save_build_stats(filename, size): + db_host = os.environ['db_host'] + db_user = os.environ['db_user'] + db_pw = os.environ['db_pw'] + db = MySQLdb.connect(db_host, db_user, db_pw, "dailybuild" ) + cursor = db.cursor() + sql = "INSERT INTO %s (size, createdTime) VALUES(%d, now())" % (filename, size) + print sql + cursor.execute(sql) + db.commit() + db.close() + +def scan_all_libs(): + stats = {} + _path = 'tests/cpp-empty-test/proj.android/libs/armeabi/libcpp_empty_test.so' + filesize = os.path.getsize(_path)/1024 + stats['libcpp_empty_test'] = filesize + save_build_stats('libcpp_empty_test', filesize) + _path = 'tests/lua-empty-test/project/proj.android/libs/armeabi/liblua_empty_test.so' + filesize = os.path.getsize(_path)/1024 + stats['liblua_empty_test'] = filesize + save_build_stats('liblua_empty_test', filesize) + lib_path = './tests/cpp-tests/proj.android/obj/local/armeabi' + for root, dirs, files in os.walk(lib_path): + for _file in files: + if not _file.endswith(".a"): + continue + print _file + libfile = lib_path + '/' + _file + _filename = _file.split('.')[0] + filesize = os.path.getsize(libfile)/1024 + stats[_filename]=filesize + save_build_stats(_filename, filesize) + return stats + +def send_mail(sub,title,content): + #to_list = os.environ['EMAIL_LIST'].split(' ') + mail_user = os.environ['EMAIL_USER'] + mail_pass = os.environ['EMAIL_PWD'] + to_list = os.environ['EMAIL_LIST'].split(' ') + mail_postfix = 'gmail.com' + me = mail_user + "<" + mail_user + "@" + mail_postfix + ">" + msg = MIMEText(content, _subtype='plain', _charset='gb2312') + msg['Subject'] = sub + msg['From'] = me + msg['To'] = " ".join(to_list) + print 'to users:', msg['To'] + msg['Content'] = 'test' + try: + s = smtplib.SMTP('smtp.gmail.com', 587) + s.ehlo() + s.starttls() + s.login(mail_user,mail_pass) + s.sendmail(me, to_list, str(msg)) + print 'info:', me, to_list, str(msg) + s.close() + return True + except Exception, e: + print str(e) + return False + +def sendEmail(stats): + now = datetime.datetime.now() + sub = "Cocos2d-x Android dailybuild stats of " + now.strftime("%Y-%m-%d") + title = "Dailybuild stats" + content = "The following list tracks the sizes of Cocos2d-x Android built libraries:\n" + + for key in stats: + content += key + content += " : " + content += str(stats[key]) + "KB" + content += "\n" + + send_mail(sub, title, content) + +def main(): + print 'Build Config:' + print ' Branch:v3' + print ' Target:Android' + print ' build script:python build/android-build.py -b release all' + if(os.path.exists('build/android-build.py') == False): + node_name = os.environ['NODE_NAME'] + source_dir = '../cocos-2dx-develop-base-repo/node/' + node_name + "/." + os.system("cp -r " + source_dir + " .") + + os.system('git pull origin v3') + os.system('git submodule update --init --force') + check_current_3rd_libs() + + ret = os.system("python tools/jenkins-scripts/gen_jsb.py") + if(ret != 0): + return(1) + + ret = os.system('python build/android-build.py -b release all') + if(ret == 0): + strip_android_libs() + stats = scan_all_libs() + sendEmail(stats) + os.system('git clean -xdf -f') + print 'build exit' + print ret + if ret == 0: + ret = 0 + else: + ret = 1 + return ret + +# -------------- main -------------- +if __name__ == '__main__': + sys_ret = 0 + try: + sys_ret = main() + except: + traceback.print_exc() + sys_ret = 1 + finally: + sys.exit(sys_ret) + diff --git a/tools/jenkins-scripts/pull-request-builder.py b/tools/jenkins-scripts/pull-request-builder.py index a64d6e0403..6df99fb569 100755 --- a/tools/jenkins-scripts/pull-request-builder.py +++ b/tools/jenkins-scripts/pull-request-builder.py @@ -13,6 +13,7 @@ import platform import subprocess import codecs from shutil import copy +import MySQLdb #set Jenkins build description using submitDescription to mock browser behavior #TODO: need to set parent build description @@ -61,10 +62,25 @@ def check_current_3rd_libs(branch): current_file = current_files[i] copy(current_file, backup_file) +def save_build_stats(pr_num, key, value): + db_host = os.environ['db_host'] + db_user = os.environ['db_user'] + db_pw = os.environ['db_pw'] + db = MySQLdb.connect(db_host, db_user, db_pw, "jenkins" ) + cursor = db.cursor() + sql = '''INSERT INTO PullRequestBuild (pr_number, %s) + VALUES(%d, %d) ON DUPLICATE KEY UPDATE pr_number=VALUES(pr_number), + %s=VALUES(%s)''' % (key, pr_num, value, key, key) + print sql + cursor.execute(sql) + db.commit() + db.close() + http_proxy = '' if(os.environ.has_key('HTTP_PROXY')): http_proxy = os.environ['HTTP_PROXY'] proxyDict = {'http':http_proxy,'https':http_proxy} + def main(): #get payload from os env payload_str = os.environ['payload'] @@ -115,6 +131,8 @@ def main(): #reset path to workspace root os.system("cd " + os.environ['WORKSPACE']); + #pull latest code + os.system("git pull origin v3") os.system("git checkout v3") os.system("git branch -D pull" + str(pr_num)) #clean workspace @@ -126,9 +144,16 @@ def main(): if(ret != 0): return(2) - #checkout - git_checkout = "git checkout -b " + "pull" + str(pr_num) + " FETCH_HEAD" + #checkout a new branch from v3 + git_checkout = "git checkout -b " + "pull" + str(pr_num) os.system(git_checkout) + #merge pull reqeust head + p = os.popen('git merge --no-edit FETCH_HEAD') + r = p.read() + #check if merge fail + if r.find('CONFLICT') > 0: + print r + return(3) # After checkout a new branch, clean workspace again print "After checkout: git clean -xdf -f" @@ -205,8 +230,9 @@ def main(): if(ret == 0): _path = 'tests/cpp-empty-test/proj.android/libs/armeabi/libcpp_empty_test.so' filesize = os.path.getsize(_path) - pr_desc = pr_desc + '

size of libcpp_empty_test.so is:' + str(filesize/1024) + 'kb

' + pr_desc = pr_desc + '

size of libcpp_empty_test.so is:' + str(filesize/1024) + 'kb

' set_description(pr_desc, target_url) + save_build_stats(pr_num, 'cpp_empty_test_so', filesize/1024) elif(node_name == 'win32_win7'): ret = subprocess.call('"%VS110COMNTOOLS%..\IDE\devenv.com" "build\cocos2d-win32.vc2012.sln" /Build "Debug|Win32"', shell=True) elif(node_name == 'ios_mac'): diff --git a/tools/make-package/config.json b/tools/make-package/config.json index 08e78eed34..ecb66e33a7 100644 --- a/tools/make-package/config.json +++ b/tools/make-package/config.json @@ -16,5 +16,9 @@ "zip_file_path": "../cocos2d-console", "extract_to_zip_path": "tools/cocos2d-console" } + ], + "extra_dirs": + [ + "tools/fbx-conv" ] } diff --git a/tools/make-package/git-archive-all b/tools/make-package/git-archive-all index 9af9b8622e..448c855852 100755 --- a/tools/make-package/git-archive-all +++ b/tools/make-package/git-archive-all @@ -234,6 +234,16 @@ class GitArchiver(object): path_in_zip = extra_to_zip_file + file_path[(len(extra_folder_path)):] add(file_path, path_in_zip) + outfile_name, outfile_ext = path.splitext(output_path) + for extra_dir in config_data["extra_dirs"]: + dir_path = path.join(self.main_repo_abspath, extra_dir) + list_dirs = os.walk(dir_path) + for root,dirs,files in list_dirs: + for f in files: + file_path = path.join(root,f) + path_in_zip = file_path[(len(self.main_repo_abspath)+1):] + add(file_path, path_in_zip) + if not dry_run: archive.close() diff --git a/tools/tolua/cocos2dx.ini b/tools/tolua/cocos2dx.ini index 71eec29a40..c658d5355d 100644 --- a/tools/tolua/cocos2dx.ini +++ b/tools/tolua/cocos2dx.ini @@ -22,11 +22,11 @@ cxxgenerator_headers = extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(cocos_headers)s %(android_flags)s %(clang_flags)s %(cocos_flags)s %(extra_flags)s # what headers to parse -headers = %(cocosdir)s/cocos/cocos2d.h %(cocosdir)s/cocos/audio/include/SimpleAudioEngine.h %(cocosdir)s/cocos/ui/CCProtectedNode.h %(cocosdir)s/cocos/3d/CCAnimation3D.h %(cocosdir)s/cocos/3d/CCAnimate3D.h +headers = %(cocosdir)s/cocos/cocos2d.h %(cocosdir)s/cocos/audio/include/SimpleAudioEngine.h %(cocosdir)s/cocos/2d/CCProtectedNode.h %(cocosdir)s/cocos/3d/CCAnimation3D.h %(cocosdir)s/cocos/3d/CCAnimate3D.h # what classes to produce code for. You can use regular expressions here. When testing the regular # expression, it will be enclosed in "^$", like this: "^Menu*$". -classes = New.* Sprite.* Scene Node.* Director Layer.* Menu.* Touch .*Action.* Move.* Rotate.* Blink.* Tint.* Sequence Repeat.* Fade.* Ease.* Scale.* Transition.* Spawn Animat.* Flip.* Delay.* Skew.* Jump.* Place.* Show.* Progress.* PointArray ToggleVisibility.* RemoveSelf Hide Particle.* Label.* Atlas.* TextureCache.* Texture2D Cardinal.* CatmullRom.* ParallaxNode TileMap.* .*TMX.* CallFunc RenderTexture GridAction Grid3DAction GridBase$ .+Grid Shaky3D Waves3D FlipX3D FlipY3D Speed ActionManager Set SimpleAudioEngine Scheduler Timer Orbit.* Follow.* Bezier.* CardinalSpline.* Camera.* DrawNode .*3D$ Liquid$ Waves$ ShuffleTiles$ TurnOffTiles$ Split.* Twirl$ FileUtils$ GLProgram ShaderCache Application ClippingNode MotionStreak ^Ref$ UserDefault GLViewProtocol GLView Image Event(?!.*(Physics).*).* Component ProtectedNode Console Mesh GLProgramCache GLProgramState +classes = New.* Sprite.* Scene Node.* Director Layer.* Menu.* Touch .*Action.* Move.* Rotate.* Blink.* Tint.* Sequence Repeat.* Fade.* Ease.* Scale.* Transition.* Spawn Animat.* Flip.* Delay.* Skew.* Jump.* Place.* Show.* Progress.* PointArray ToggleVisibility.* RemoveSelf Hide Particle.* Label.* Atlas.* TextureCache.* Texture2D Cardinal.* CatmullRom.* ParallaxNode TileMap.* .*TMX.* CallFunc RenderTexture GridAction Grid3DAction GridBase$ .+Grid Shaky3D Waves3D FlipX3D FlipY3D Speed ActionManager Set SimpleAudioEngine Scheduler Timer Orbit.* Follow.* Bezier.* CardinalSpline.* Camera.* DrawNode .*3D$ Liquid$ Waves$ ShuffleTiles$ TurnOffTiles$ Split.* Twirl$ FileUtils$ GLProgram ShaderCache Application ClippingNode MotionStreak ^Ref$ UserDefault GLViewImpl GLView Image Event(?!.*(Physics).*).* Component ProtectedNode Console Mesh GLProgramCache GLProgramState # what should we skip? in the format ClassName::[function function] # ClassName is a regular expression, but will be used like this: "^ClassName$" functions are also @@ -108,8 +108,8 @@ skip = Node::[setGLServerState description getUserObject .*UserData getGLServerS ccFontDefinition::[*], Ref::[autorelease isEqual acceptVisitor update], UserDefault::[getInstance (s|g)etDataForKey], - GLViewProtocol::[setTouchDelegate], - GLView::[end swapBuffers], + GLView::[setTouchDelegate], + GLViewImpl::[end swapBuffers], NewTextureAtlas::[*], DisplayLinkDirector::[mainLoop setAnimationInterval startAnimation stopAnimation], RenderTexture::[listenToBackground listenToForeground], @@ -131,8 +131,7 @@ skip = Node::[setGLServerState description getUserObject .*UserData getGLServerS Animation3D::[getBoneCurveByName], Animation3DCache::[*], Sprite3DMaterialCache::[*], - Bone3D::[*], - FastTMXLayer::[(g|s)etTiles getTileGIDAt] + Bone3D::[*] rename_functions = SpriteFrameCache::[addSpriteFramesWithFile=addSpriteFrames getSpriteFrameByName=getSpriteFrame], ProgressTimer::[setReverseProgress=setReverseDirection], @@ -163,7 +162,7 @@ base_classes_to_skip = Clonable # classes that create no constructor # Set is special and we will use a hand-written constructor -abstract_classes = Action FiniteTimeAction ActionInterval ActionEase EaseRateAction EaseElastic EaseBounce ActionInstant GridAction Grid3DAction TiledGrid3DAction Director SpriteFrameCache TransitionEaseScene Set SimpleAudioEngine FileUtils Application ClippingNode Label GLViewProtocol GLView EventAcceleration DisplayLinkDirector Component Console +abstract_classes = Action FiniteTimeAction ActionInterval ActionEase EaseRateAction EaseElastic EaseBounce ActionInstant GridAction Grid3DAction TiledGrid3DAction Director SpriteFrameCache TransitionEaseScene Set SimpleAudioEngine FileUtils Application ClippingNode Label GLViewImpl GLView EventAcceleration DisplayLinkDirector Component Console # Determining whether to use script object(js object) to control the lifecycle of native(cpp) object or the other way around. Supported values are 'yes' or 'no'. script_control_cpp = no diff --git a/tools/tolua/cocos2dx_experimental.ini b/tools/tolua/cocos2dx_experimental.ini new file mode 100644 index 0000000000..97d890abf1 --- /dev/null +++ b/tools/tolua/cocos2dx_experimental.ini @@ -0,0 +1,60 @@ +[cocos2dx_experimental] +# the prefix to be added to the generated functions. You might or might not use this in your own +# templates +prefix = cocos2dx_experimental + +# create a target namespace (in javascript, this would create some code like the equiv. to `ns = ns || {}`) +# all classes will be embedded in that namespace +target_namespace = ccexp + +android_headers = -I%(androidndkdir)s/platforms/android-14/arch-arm/usr/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.7/libs/armeabi-v7a/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.7/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi-v7a/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.8/include +android_flags = -D_SIZE_T_DEFINED_ + +clang_headers = -I%(clangllvmdir)s/lib/clang/3.3/include +clang_flags = -nostdinc -x c++ -std=c++11 + +cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/editor-support -I%(cocosdir)s/cocos/platform/android + +cocos_flags = -DANDROID + +cxxgenerator_headers = + +# extra arguments for clang +extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(cocos_headers)s %(android_flags)s %(clang_flags)s %(cocos_flags)s %(extra_flags)s + +# what headers to parse +headers = %(cocosdir)s/cocos/2d/CCFastTMXLayer.h %(cocosdir)s/cocos/2d/CCFastTMXTiledMap.h + +# what classes to produce code for. You can use regular expressions here. When testing the regular +# expression, it will be enclosed in "^$", like this: "^Menu*$". +classes = TMXLayer TMXTiledMap + +# what should we skip? in the format ClassName::[function function] +# ClassName is a regular expression, but will be used like this: "^ClassName$" functions are also +# regular expressions, they will not be surrounded by "^$". If you want to skip a whole class, just +# add a single "*" as functions. See bellow for several examples. A special class name is "*", which +# will apply to all class names. This is a convenience wildcard to be able to skip similar named +# functions from all classes. + +skip = TMXLayer::[(g|s)etTiles getTileGIDAt] + +rename_functions = + +rename_classes = + +# for all class names, should we remove something when registering in the target VM? +remove_prefix = + +# classes for which there will be no "parent" lookup +classes_have_no_parents = + +# base classes which will be skipped when their sub-classes found them. +base_classes_to_skip = + +# classes that create no constructor +# Set is special and we will use a hand-written constructor +abstract_classes = + +# Determining whether to use script object(js object) to control the lifecycle of native(cpp) object or the other way around. Supported values are 'yes' or 'no'. +script_control_cpp = no + diff --git a/tools/tolua/cocos2dx_experimental_video.ini b/tools/tolua/cocos2dx_experimental_video.ini index 80bf9a254a..e0c343b56e 100644 --- a/tools/tolua/cocos2dx_experimental_video.ini +++ b/tools/tolua/cocos2dx_experimental_video.ini @@ -5,7 +5,7 @@ prefix = cocos2dx_experimental_video # create a target namespace (in javascript, this would create some code like the equiv. to `ns = ns || {}`) # all classes will be embedded in that namespace -target_namespace = ccexprimental +target_namespace = ccexp macro_judgement = #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) @@ -29,7 +29,7 @@ headers = %(cocosdir)s/cocos/ui/UIVideoPlayer.h # what classes to produce code for. You can use regular expressions here. When testing the regular # expression, it will be enclosed in "^$", like this: "^Menu*$". -classes = VideoPlayer +classes = VideoPlayer FastTMXLayer FastTMXTiledMap # what should we skip? in the format ClassName::[function function] # ClassName is a regular expression, but will be used like this: "^ClassName$" functions are also diff --git a/tools/tolua/genbindings.py b/tools/tolua/genbindings.py index 1c72481ff5..72fa4824bd 100755 --- a/tools/tolua/genbindings.py +++ b/tools/tolua/genbindings.py @@ -133,6 +133,7 @@ def main(): 'cocos2dx_spine.ini' : ('cocos2dx_spine', 'lua_cocos2dx_spine_auto'), \ 'cocos2dx_physics.ini' : ('cocos2dx_physics', 'lua_cocos2dx_physics_auto'), \ 'cocos2dx_experimental_video.ini' : ('cocos2dx_experimental_video', 'lua_cocos2dx_experimental_video_auto'), \ + 'cocos2dx_experimental.ini' : ('cocos2dx_experimental', 'lua_cocos2dx_experimental_auto'), \ 'cocos2dx_controller.ini' : ('cocos2dx_controller', 'lua_cocos2dx_controller_auto'), \ } target = 'lua'