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

Merge branch 'newcode' into v3

This commit is contained in:
yangxiao 2014-09-03 16:28:04 +08:00
parent f03c4d4790 290238f6e1
commit 8c5f928456
466 changed files with 9295 additions and 8862 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AUTHORS
View File

@ -989,6 +989,9 @@ Developers:
xiangxw
Fixed the bug that Console::sendPrompt() will send extra `\0`
kaishiqi
Fixed a but that cursor postion is wrong on desktop.
Retired Core Developers:
WenSheng Yang

1
CHANGELOG
View File

@ -3,6 +3,7 @@ cocos2d-x-3.3?? ??
[NEW] Node: added stopAllActionsByTag()
[NEW] UI: added `WebView` on iOS and Android
[FIX] EditBox: moved to ui:EditBox
[FIX] Node: create unneeded temple `Vec2` object in `setPosition(int, int)`, `setPositionX()` and `setPositionY()`
[FIX] Node: skew effect is wrong
[FIX] TextureAtlas: may crash if only drawing part of it

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

@ -969,8 +969,6 @@
15AE1BDD19AAE01E00C27E9E /* CCControlUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168491807AF4E005B8026 /* CCControlUtils.h */; };
15AE1BDE19AAE01E00C27E9E /* CCInvocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A1684A1807AF4E005B8026 /* CCInvocation.cpp */; };
15AE1BDF19AAE01E00C27E9E /* CCInvocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A1684B1807AF4E005B8026 /* CCInvocation.h */; };
15AE1BE019AAE01E00C27E9E /* CCScale9Sprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A1684C1807AF4E005B8026 /* CCScale9Sprite.cpp */; };
15AE1BE119AAE01E00C27E9E /* CCScale9Sprite.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A1684D1807AF4E005B8026 /* CCScale9Sprite.h */; };
15AE1BE219AAE01E00C27E9E /* CCScrollView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A1685E1807AF4E005B8026 /* CCScrollView.cpp */; };
15AE1BE319AAE01E00C27E9E /* CCScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A1685F1807AF4E005B8026 /* CCScrollView.h */; };
15AE1BE419AAE01E00C27E9E /* CCTableView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A168621807AF4E005B8026 /* CCTableView.cpp */; };
@ -1000,24 +998,12 @@
15AE1BFC19AAE01E00C27E9E /* CCControlUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168491807AF4E005B8026 /* CCControlUtils.h */; };
15AE1BFD19AAE01E00C27E9E /* CCInvocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A1684A1807AF4E005B8026 /* CCInvocation.cpp */; };
15AE1BFE19AAE01E00C27E9E /* CCInvocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A1684B1807AF4E005B8026 /* CCInvocation.h */; };
15AE1BFF19AAE01E00C27E9E /* CCScale9Sprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A1684C1807AF4E005B8026 /* CCScale9Sprite.cpp */; };
15AE1C0019AAE01E00C27E9E /* CCScale9Sprite.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A1684D1807AF4E005B8026 /* CCScale9Sprite.h */; };
15AE1C0119AAE01E00C27E9E /* CCScrollView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A1685E1807AF4E005B8026 /* CCScrollView.cpp */; };
15AE1C0219AAE01E00C27E9E /* CCScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A1685F1807AF4E005B8026 /* CCScrollView.h */; };
15AE1C0319AAE01E00C27E9E /* CCTableView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A168621807AF4E005B8026 /* CCTableView.cpp */; };
15AE1C0419AAE01E00C27E9E /* CCTableView.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168631807AF4E005B8026 /* CCTableView.h */; };
15AE1C0519AAE01E00C27E9E /* CCTableViewCell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A168641807AF4E005B8026 /* CCTableViewCell.cpp */; };
15AE1C0619AAE01E00C27E9E /* CCTableViewCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168651807AF4E005B8026 /* CCTableViewCell.h */; };
15AE1C0719AAE02500C27E9E /* CCEditBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A1684F1807AF4E005B8026 /* CCEditBox.cpp */; };
15AE1C0819AAE02500C27E9E /* CCEditBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168501807AF4E005B8026 /* CCEditBox.h */; };
15AE1C0919AAE02500C27E9E /* CCEditBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A1684F1807AF4E005B8026 /* CCEditBox.cpp */; };
15AE1C0A19AAE02500C27E9E /* CCEditBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168501807AF4E005B8026 /* CCEditBox.h */; };
15AE1C0B19AAE02D00C27E9E /* CCEditBoxImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168511807AF4E005B8026 /* CCEditBoxImpl.h */; };
15AE1C0C19AAE02D00C27E9E /* CCEditBoxImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168511807AF4E005B8026 /* CCEditBoxImpl.h */; };
15AE1C0D19AAE03400C27E9E /* CCEditBoxImplMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = B282B47C1980E02B00666787 /* CCEditBoxImplMac.mm */; };
15AE1C0E19AAE03400C27E9E /* CCEditBoxImplMac.h in Headers */ = {isa = PBXBuildFile; fileRef = B282B47D1980E02B00666787 /* CCEditBoxImplMac.h */; };
15AE1C0F19AAE03E00C27E9E /* CCEditBoxImplIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168541807AF4E005B8026 /* CCEditBoxImplIOS.h */; };
15AE1C1019AAE03E00C27E9E /* CCEditBoxImplIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A168551807AF4E005B8026 /* CCEditBoxImplIOS.mm */; };
15AE1C1119AAE2C600C27E9E /* CCPhysicsDebugNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71EEC180E27CF00808F54 /* CCPhysicsDebugNode.cpp */; };
15AE1C1219AAE2C600C27E9E /* CCPhysicsDebugNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71EED180E27CF00808F54 /* CCPhysicsDebugNode.h */; };
15AE1C1319AAE2C600C27E9E /* CCPhysicsSprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71EEE180E27CF00808F54 /* CCPhysicsSprite.cpp */; };
@ -1350,6 +1336,30 @@
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 */; };
292DB13D19B4574100A80320 /* UIEditBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292DB12F19B4574100A80320 /* UIEditBox.cpp */; };
292DB13E19B4574100A80320 /* UIEditBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292DB12F19B4574100A80320 /* UIEditBox.cpp */; };
292DB13F19B4574100A80320 /* UIEditBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB13019B4574100A80320 /* UIEditBox.h */; };
292DB14019B4574100A80320 /* UIEditBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB13019B4574100A80320 /* UIEditBox.h */; };
292DB14119B4574100A80320 /* UIEditBoxImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB13119B4574100A80320 /* UIEditBoxImpl.h */; };
292DB14219B4574100A80320 /* UIEditBoxImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB13119B4574100A80320 /* UIEditBoxImpl.h */; };
292DB14319B4574100A80320 /* UIEditBoxImplAndroid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292DB13219B4574100A80320 /* UIEditBoxImplAndroid.cpp */; };
292DB14419B4574100A80320 /* UIEditBoxImplAndroid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292DB13219B4574100A80320 /* UIEditBoxImplAndroid.cpp */; };
292DB14519B4574100A80320 /* UIEditBoxImplAndroid.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB13319B4574100A80320 /* UIEditBoxImplAndroid.h */; };
292DB14619B4574100A80320 /* UIEditBoxImplAndroid.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB13319B4574100A80320 /* UIEditBoxImplAndroid.h */; };
292DB14719B4574100A80320 /* UIEditBoxImplIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB13419B4574100A80320 /* UIEditBoxImplIOS.h */; };
292DB14819B4574100A80320 /* UIEditBoxImplIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB13419B4574100A80320 /* UIEditBoxImplIOS.h */; };
292DB14919B4574100A80320 /* UIEditBoxImplIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 292DB13519B4574100A80320 /* UIEditBoxImplIOS.mm */; };
292DB14A19B4574100A80320 /* UIEditBoxImplIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 292DB13519B4574100A80320 /* UIEditBoxImplIOS.mm */; };
292DB14B19B4574100A80320 /* UIEditBoxImplMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB13619B4574100A80320 /* UIEditBoxImplMac.h */; };
292DB14C19B4574100A80320 /* UIEditBoxImplMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB13619B4574100A80320 /* UIEditBoxImplMac.h */; };
292DB14D19B4574100A80320 /* UIEditBoxImplMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 292DB13719B4574100A80320 /* UIEditBoxImplMac.mm */; };
292DB14E19B4574100A80320 /* UIEditBoxImplMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 292DB13719B4574100A80320 /* UIEditBoxImplMac.mm */; };
292DB14F19B4574100A80320 /* UIEditBoxImplNone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292DB13819B4574100A80320 /* UIEditBoxImplNone.cpp */; };
292DB15019B4574100A80320 /* UIEditBoxImplNone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292DB13819B4574100A80320 /* UIEditBoxImplNone.cpp */; };
292DB15F19B461CA00A80320 /* ExtensionDeprecated.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292DB15D19B461CA00A80320 /* ExtensionDeprecated.cpp */; };
292DB16019B461CA00A80320 /* ExtensionDeprecated.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292DB15D19B461CA00A80320 /* ExtensionDeprecated.cpp */; };
292DB16119B461CA00A80320 /* ExtensionDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB15E19B461CA00A80320 /* ExtensionDeprecated.h */; };
292DB16219B461CA00A80320 /* ExtensionDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB15E19B461CA00A80320 /* ExtensionDeprecated.h */; };
29394CF019B01DBA00D2DE1A /* UIWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 29394CEC19B01DBA00D2DE1A /* UIWebView.h */; };
29394CF119B01DBA00D2DE1A /* UIWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 29394CEC19B01DBA00D2DE1A /* UIWebView.h */; };
29394CF219B01DBA00D2DE1A /* UIWebView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29394CED19B01DBA00D2DE1A /* UIWebView.mm */; };
@ -2304,6 +2314,18 @@
2905FA1318CF08D100240AA3 /* UIWidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIWidget.cpp; sourceTree = "<group>"; };
2905FA1418CF08D100240AA3 /* UIWidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIWidget.h; sourceTree = "<group>"; };
29080DEB191B82CE0066F8DF /* UIDeprecated.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UIDeprecated.h; sourceTree = "<group>"; };
292DB12F19B4574100A80320 /* UIEditBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIEditBox.cpp; sourceTree = "<group>"; };
292DB13019B4574100A80320 /* UIEditBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIEditBox.h; sourceTree = "<group>"; };
292DB13119B4574100A80320 /* UIEditBoxImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIEditBoxImpl.h; sourceTree = "<group>"; };
292DB13219B4574100A80320 /* UIEditBoxImplAndroid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIEditBoxImplAndroid.cpp; sourceTree = "<group>"; };
292DB13319B4574100A80320 /* UIEditBoxImplAndroid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIEditBoxImplAndroid.h; sourceTree = "<group>"; };
292DB13419B4574100A80320 /* UIEditBoxImplIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIEditBoxImplIOS.h; sourceTree = "<group>"; };
292DB13519B4574100A80320 /* UIEditBoxImplIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UIEditBoxImplIOS.mm; sourceTree = "<group>"; };
292DB13619B4574100A80320 /* UIEditBoxImplMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIEditBoxImplMac.h; sourceTree = "<group>"; };
292DB13719B4574100A80320 /* UIEditBoxImplMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UIEditBoxImplMac.mm; sourceTree = "<group>"; };
292DB13819B4574100A80320 /* UIEditBoxImplNone.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIEditBoxImplNone.cpp; sourceTree = "<group>"; };
292DB15D19B461CA00A80320 /* ExtensionDeprecated.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExtensionDeprecated.cpp; sourceTree = "<group>"; };
292DB15E19B461CA00A80320 /* ExtensionDeprecated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExtensionDeprecated.h; sourceTree = "<group>"; };
29394CEC19B01DBA00D2DE1A /* UIWebView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIWebView.h; sourceTree = "<group>"; };
29394CED19B01DBA00D2DE1A /* UIWebView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UIWebView.mm; sourceTree = "<group>"; };
29394CEE19B01DBA00D2DE1A /* UIWebViewImpl_iOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIWebViewImpl_iOS.h; sourceTree = "<group>"; };
@ -2405,18 +2427,6 @@
46A168491807AF4E005B8026 /* CCControlUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCControlUtils.h; sourceTree = "<group>"; };
46A1684A1807AF4E005B8026 /* CCInvocation.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCInvocation.cpp; sourceTree = "<group>"; };
46A1684B1807AF4E005B8026 /* CCInvocation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCInvocation.h; sourceTree = "<group>"; };
46A1684C1807AF4E005B8026 /* CCScale9Sprite.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCScale9Sprite.cpp; sourceTree = "<group>"; };
46A1684D1807AF4E005B8026 /* CCScale9Sprite.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCScale9Sprite.h; sourceTree = "<group>"; };
46A1684F1807AF4E005B8026 /* CCEditBox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCEditBox.cpp; sourceTree = "<group>"; };
46A168501807AF4E005B8026 /* CCEditBox.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCEditBox.h; sourceTree = "<group>"; };
46A168511807AF4E005B8026 /* CCEditBoxImpl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCEditBoxImpl.h; sourceTree = "<group>"; };
46A168521807AF4E005B8026 /* CCEditBoxImplAndroid.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCEditBoxImplAndroid.cpp; sourceTree = "<group>"; };
46A168531807AF4E005B8026 /* CCEditBoxImplAndroid.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCEditBoxImplAndroid.h; sourceTree = "<group>"; };
46A168541807AF4E005B8026 /* CCEditBoxImplIOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCEditBoxImplIOS.h; sourceTree = "<group>"; };
46A168551807AF4E005B8026 /* CCEditBoxImplIOS.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CCEditBoxImplIOS.mm; sourceTree = "<group>"; };
46A168581807AF4E005B8026 /* CCEditBoxImplNone.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCEditBoxImplNone.cpp; sourceTree = "<group>"; };
46A1685B1807AF4E005B8026 /* CCEditBoxImplWin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCEditBoxImplWin.cpp; sourceTree = "<group>"; };
46A1685C1807AF4E005B8026 /* CCEditBoxImplWin.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCEditBoxImplWin.h; sourceTree = "<group>"; };
46A1685E1807AF4E005B8026 /* CCScrollView.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = CCScrollView.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
46A1685F1807AF4E005B8026 /* CCScrollView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCScrollView.h; sourceTree = "<group>"; };
46A168621807AF4E005B8026 /* CCTableView.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCTableView.cpp; sourceTree = "<group>"; };
@ -2867,8 +2877,6 @@
B276EF5C1988D1D500CD400F /* CCVertexIndexData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCVertexIndexData.cpp; sourceTree = "<group>"; };
B276EF5D1988D1D500CD400F /* CCVertexIndexBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCVertexIndexBuffer.h; sourceTree = "<group>"; };
B276EF5E1988D1D500CD400F /* CCVertexIndexBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCVertexIndexBuffer.cpp; sourceTree = "<group>"; };
B282B47C1980E02B00666787 /* CCEditBoxImplMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCEditBoxImplMac.mm; sourceTree = "<group>"; };
B282B47D1980E02B00666787 /* CCEditBoxImplMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEditBoxImplMac.h; sourceTree = "<group>"; };
B29594AF1926D5D9003EEF37 /* ccShader_3D_Color.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_3D_Color.frag; sourceTree = "<group>"; };
B29594B01926D5D9003EEF37 /* ccShader_3D_ColorTex.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_3D_ColorTex.frag; sourceTree = "<group>"; };
B29594B11926D5D9003EEF37 /* ccShader_3D_PositionTex.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_3D_PositionTex.vert; sourceTree = "<group>"; };
@ -3979,6 +3987,23 @@
path = ../cocos/ui;
sourceTree = "<group>";
};
292DB12E19B4574100A80320 /* UIEditBox */ = {
isa = PBXGroup;
children = (
292DB12F19B4574100A80320 /* UIEditBox.cpp */,
292DB13019B4574100A80320 /* UIEditBox.h */,
292DB13119B4574100A80320 /* UIEditBoxImpl.h */,
292DB13219B4574100A80320 /* UIEditBoxImplAndroid.cpp */,
292DB13319B4574100A80320 /* UIEditBoxImplAndroid.h */,
292DB13419B4574100A80320 /* UIEditBoxImplIOS.h */,
292DB13519B4574100A80320 /* UIEditBoxImplIOS.mm */,
292DB13619B4574100A80320 /* UIEditBoxImplMac.h */,
292DB13719B4574100A80320 /* UIEditBoxImplMac.mm */,
292DB13819B4574100A80320 /* UIEditBoxImplNone.cpp */,
);
path = UIEditBox;
sourceTree = "<group>";
};
29CB8F501929D63600C841D6 /* layout */ = {
isa = PBXGroup;
children = (
@ -4030,6 +4055,7 @@
29CB8F531929D67D00C841D6 /* widgets */ = {
isa = PBXGroup;
children = (
292DB12E19B4574100A80320 /* UIEditBox */,
2905F9FE18CF08D000240AA3 /* UIListView.cpp */,
2905F9FF18CF08D000240AA3 /* UIListView.h */,
2905FA0018CF08D000240AA3 /* UILoadingBar.cpp */,
@ -4129,6 +4155,8 @@
46A167981807AF4D005B8026 /* extensions */ = {
isa = PBXGroup;
children = (
292DB15D19B461CA00A80320 /* ExtensionDeprecated.cpp */,
292DB15E19B461CA00A80320 /* ExtensionDeprecated.h */,
46A167D21807AF4D005B8026 /* cocos-ext.h */,
46A168321807AF4E005B8026 /* ExtensionMacros.h */,
1AAF5350180E305F000584C8 /* assets-manager */,
@ -4143,7 +4171,6 @@
isa = PBXGroup;
children = (
46A168341807AF4E005B8026 /* CCControlExtension */,
46A1684E1807AF4E005B8026 /* CCEditBox */,
46A1685D1807AF4E005B8026 /* CCScrollView */,
);
path = GUI;
@ -4175,31 +4202,10 @@
46A168491807AF4E005B8026 /* CCControlUtils.h */,
46A1684A1807AF4E005B8026 /* CCInvocation.cpp */,
46A1684B1807AF4E005B8026 /* CCInvocation.h */,
46A1684C1807AF4E005B8026 /* CCScale9Sprite.cpp */,
46A1684D1807AF4E005B8026 /* CCScale9Sprite.h */,
);
path = CCControlExtension;
sourceTree = "<group>";
};
46A1684E1807AF4E005B8026 /* CCEditBox */ = {
isa = PBXGroup;
children = (
B282B47C1980E02B00666787 /* CCEditBoxImplMac.mm */,
B282B47D1980E02B00666787 /* CCEditBoxImplMac.h */,
46A1684F1807AF4E005B8026 /* CCEditBox.cpp */,
46A168501807AF4E005B8026 /* CCEditBox.h */,
46A168511807AF4E005B8026 /* CCEditBoxImpl.h */,
46A168521807AF4E005B8026 /* CCEditBoxImplAndroid.cpp */,
46A168531807AF4E005B8026 /* CCEditBoxImplAndroid.h */,
46A168541807AF4E005B8026 /* CCEditBoxImplIOS.h */,
46A168551807AF4E005B8026 /* CCEditBoxImplIOS.mm */,
46A168581807AF4E005B8026 /* CCEditBoxImplNone.cpp */,
46A1685B1807AF4E005B8026 /* CCEditBoxImplWin.cpp */,
46A1685C1807AF4E005B8026 /* CCEditBoxImplWin.h */,
);
path = CCEditBox;
sourceTree = "<group>";
};
46A1685D1807AF4E005B8026 /* CCScrollView */ = {
isa = PBXGroup;
children = (
@ -4943,9 +4949,11 @@
50ABBE851925AB6F00A911A9 /* ccFPSImages.h in Headers */,
15AE1A5319AAD40300C27E9E /* b2Draw.h in Headers */,
5034CA39191D591100CE6051 /* ccShader_PositionColorLengthTexture.frag in Headers */,
292DB14B19B4574100A80320 /* UIEditBoxImplMac.h in Headers */,
50ABBE891925AB6F00A911A9 /* CCMap.h in Headers */,
50ABBE8D1925AB6F00A911A9 /* CCNS.h in Headers */,
50ABBEA51925AB6F00A911A9 /* CCScriptSupport.h in Headers */,
292DB14519B4574100A80320 /* UIEditBoxImplAndroid.h in Headers */,
15AE1B9A19AADFDF00C27E9E /* UIHBox.h in Headers */,
15AE18EB19AAD35000C27E9E /* CCActionNode.h in Headers */,
15AE1A3819AAD3D500C27E9E /* b2Shape.h in Headers */,
@ -5020,7 +5028,6 @@
15AE199919AAD39600C27E9E /* LoadingBarReader.h in Headers */,
15AE1A8F19AAD40300C27E9E /* b2RopeJoint.h in Headers */,
15AE18ED19AAD35000C27E9E /* CCActionObject.h in Headers */,
15AE1C0C19AAE02D00C27E9E /* CCEditBoxImpl.h in Headers */,
ED9C6A9618599AD8000A5232 /* CCNodeGrid.h in Headers */,
15AE18A719AAD33D00C27E9E /* CCScrollViewLoader.h in Headers */,
15AE184819AAD2F700C27E9E /* cocos3d.h in Headers */,
@ -5030,7 +5037,6 @@
50ABBEA11925AB6F00A911A9 /* CCScheduler.h in Headers */,
15AE1B6219AADA9900C27E9E /* UIButton.h in Headers */,
50ABBDB71925AB4100A911A9 /* CCTexture2D.h in Headers */,
15AE1BE119AAE01E00C27E9E /* CCScale9Sprite.h in Headers */,
50ABBE811925AB6F00A911A9 /* CCEventType.h in Headers */,
1A57008F180BC5A10088DEC7 /* CCActionTiledGrid.h in Headers */,
15AE19A319AAD39600C27E9E /* TextBMFontReader.h in Headers */,
@ -5175,6 +5181,7 @@
15AE188519AAD33D00C27E9E /* CCBSequence.h in Headers */,
15AE1AE219AAD42500C27E9E /* cpDampedRotarySpring.h in Headers */,
5034CA49191D591100CE6051 /* ccShader_Label_df.frag in Headers */,
292DB14119B4574100A80320 /* UIEditBoxImpl.h in Headers */,
1A01C68C18F57BE800EFE3A6 /* CCDeprecated.h in Headers */,
50ABBD561925AB0000A911A9 /* TransformUtils.h in Headers */,
299754F6193EC95400A54AC3 /* ObjectFactory.h in Headers */,
@ -5183,6 +5190,7 @@
15AE18FB19AAD35000C27E9E /* CCColliderDetector.h in Headers */,
15AE19E119AAD3A700C27E9E /* Skeleton.h in Headers */,
1A570280180BCC900088DEC7 /* CCSprite.h in Headers */,
292DB14719B4574100A80320 /* UIEditBoxImplIOS.h in Headers */,
15AE1A9119AAD40300C27E9E /* b2WeldJoint.h in Headers */,
15AE1A5419AAD40300C27E9E /* b2GrowableStack.h in Headers */,
15AE1B4E19AADA9900C27E9E /* UIListView.h in Headers */,
@ -5286,7 +5294,6 @@
15AE1BCA19AAE01E00C27E9E /* CCControl.h in Headers */,
50ABBDBF1925AB4100A911A9 /* CCTextureCache.h in Headers */,
15AE186719AAD31D00C27E9E /* CDXMacOSXSupport.h in Headers */,
15AE1C0A19AAE02500C27E9E /* CCEditBox.h in Headers */,
B37510741823AC9F00B3BA6A /* CCPhysicsContactInfo_chipmunk.h in Headers */,
15AE1ADF19AAD42500C27E9E /* chipmunk_types.h in Headers */,
5034CA35191D591100CE6051 /* ccShader_PositionTexture.frag in Headers */,
@ -5336,6 +5343,7 @@
15AE18A919AAD33D00C27E9E /* CCSpriteLoader.h in Headers */,
15AE198419AAD36400C27E9E /* WidgetReaderProtocol.h in Headers */,
50ABBEC91925AB6F00A911A9 /* firePngData.h in Headers */,
292DB16119B461CA00A80320 /* ExtensionDeprecated.h in Headers */,
503DD8F51926B0DB00CD74DD /* CCIMEDelegate.h in Headers */,
50ABBD5A1925AB0000A911A9 /* Vec2.h in Headers */,
15AE1BDB19AAE01E00C27E9E /* CCControlSwitch.h in Headers */,
@ -5365,6 +5373,7 @@
15AE1AEC19AAD42500C27E9E /* util.h in Headers */,
15AE19DD19AAD3A700C27E9E /* Json.h in Headers */,
15AE191A19AAD35000C27E9E /* CCSSceneReader.h in Headers */,
292DB13F19B4574100A80320 /* UIEditBox.h in Headers */,
50ABBE671925AB6F00A911A9 /* CCEventListenerCustom.h in Headers */,
15AE18E219AAD35000C27E9E /* TriggerMng.h in Headers */,
15AE1B2B19AAD43700C27E9E /* prime.h in Headers */,
@ -5417,7 +5426,6 @@
50ABBE771925AB6F00A911A9 /* CCEventListenerTouch.h in Headers */,
5034CA33191D591100CE6051 /* ccShader_PositionTexture_uColor.frag in Headers */,
50ABC0171926664800A911A9 /* CCImage.h in Headers */,
15AE1C0E19AAE03400C27E9E /* CCEditBoxImplMac.h in Headers */,
15AE1AED19AAD42500C27E9E /* cpArbiter.h in Headers */,
50ABBDA91925AB4100A911A9 /* CCRenderCommand.h in Headers */,
50ABBD951925AB4100A911A9 /* CCGLProgramState.h in Headers */,
@ -5448,6 +5456,7 @@
15AE183319AAD2F700C27E9E /* CCOBB.h in Headers */,
15AE18B119AAD33D00C27E9E /* CCBMemberVariableAssigner.h in Headers */,
15AE1AFA19AAD42500C27E9E /* cpConstraint.h in Headers */,
292DB14019B4574100A80320 /* UIEditBox.h in Headers */,
50ABBD3B1925AB0000A911A9 /* CCAffineTransform.h in Headers */,
15AE1A0A19AAD3A700C27E9E /* CCSkeleton.h in Headers */,
5034CA38191D591100CE6051 /* ccShader_PositionColorLengthTexture.vert in Headers */,
@ -5456,6 +5465,7 @@
46A171011807CECB005B8026 /* CCPhysicsJoint.h in Headers */,
46A170FD1807CECB005B8026 /* CCPhysicsBody.h in Headers */,
50ABBE9C1925AB6F00A911A9 /* CCRef.h in Headers */,
292DB16219B461CA00A80320 /* ExtensionDeprecated.h in Headers */,
50ABBD961925AB4100A911A9 /* CCGLProgramState.h in Headers */,
46A171061807CECB005B8026 /* CCPhysicsWorld.h in Headers */,
50ABBDB41925AB4100A911A9 /* ccShaders.h in Headers */,
@ -5543,6 +5553,7 @@
15AE19F819AAD3A700C27E9E /* Animation.h in Headers */,
1A5700A1180BC5D20088DEC7 /* CCNode.h in Headers */,
15AE181919AAD2F700C27E9E /* CCAttachNode.h in Headers */,
292DB14C19B4574100A80320 /* UIEditBoxImplMac.h in Headers */,
15AE1BF019AAE01E00C27E9E /* CCControlHuePicker.h in Headers */,
15AE18B819AAD33D00C27E9E /* CCBSequenceProperty.h in Headers */,
503DD8E41926736A00CD74DD /* CCDirectorCaller.h in Headers */,
@ -5572,6 +5583,7 @@
50ABBD5B1925AB0000A911A9 /* Vec2.h in Headers */,
50ABBD411925AB0000A911A9 /* CCMath.h in Headers */,
1A5701A0180BCB590088DEC7 /* CCFont.h in Headers */,
292DB14819B4574100A80320 /* UIEditBoxImplIOS.h in Headers */,
15AE1A0819AAD3A700C27E9E /* BoneData.h in Headers */,
50ABBD9A1925AB4100A911A9 /* CCGLProgramStateCache.h in Headers */,
15AE181D19AAD2F700C27E9E /* CCBundle3D.h in Headers */,
@ -5603,6 +5615,7 @@
15AE196B19AAD35100C27E9E /* DictionaryHelper.h in Headers */,
15AE1AA619AAD40300C27E9E /* b2Fixture.h in Headers */,
15AE1BBA19AADFF000C27E9E /* HttpClient.h in Headers */,
292DB14619B4574100A80320 /* UIEditBoxImplAndroid.h in Headers */,
15AE1AF819AAD42500C27E9E /* chipmunk_types.h in Headers */,
15AE1B9419AADA9A00C27E9E /* GUIDefine.h in Headers */,
15AE183B19AAD2F700C27E9E /* CCRay.h in Headers */,
@ -5745,6 +5758,7 @@
15AE1B8D19AADA9A00C27E9E /* UIScale9Sprite.h in Headers */,
15AE18AC19AAD33D00C27E9E /* CCBAnimationManager.h in Headers */,
15AE1A1A19AAD3A700C27E9E /* Skin.h in Headers */,
292DB14219B4574100A80320 /* UIEditBoxImpl.h in Headers */,
1A570303180BCE890088DEC7 /* CCParallaxNode.h in Headers */,
50ABBE2A1925AB6F00A911A9 /* CCAutoreleasePool.h in Headers */,
1A57030F180BCF190088DEC7 /* CCComponent.h in Headers */,
@ -5766,7 +5780,6 @@
15AE1BFE19AAE01E00C27E9E /* CCInvocation.h in Headers */,
15AE1A9E19AAD40300C27E9E /* b2StackAllocator.h in Headers */,
1A570357180BD0B00088DEC7 /* ioapi.h in Headers */,
15AE1C0F19AAE03E00C27E9E /* CCEditBoxImplIOS.h in Headers */,
15AE1A1619AAD3A700C27E9E /* SkeletonData.h in Headers */,
50ABBD4B1925AB0000A911A9 /* Mat4.h in Headers */,
15AE1BBE19AADFF000C27E9E /* SocketIO.h in Headers */,
@ -5827,7 +5840,6 @@
15AE198019AAD35700C27E9E /* CCTimeLine.h in Headers */,
50ABBD4F1925AB0000A911A9 /* MathUtil.h in Headers */,
1A01C69718F57BE800EFE3A6 /* CCInteger.h in Headers */,
15AE1C0019AAE01E00C27E9E /* CCScale9Sprite.h in Headers */,
15AE1C0619AAE01E00C27E9E /* CCTableViewCell.h in Headers */,
15AE19AB19AAD39700C27E9E /* ListViewReader.h in Headers */,
50ABBEBE1925AB6F00A911A9 /* ccUtils.h in Headers */,
@ -5883,13 +5895,11 @@
B276EF641988D1D500CD400F /* CCVertexIndexBuffer.h in Headers */,
15AE1A0619AAD3A700C27E9E /* Bone.h in Headers */,
ED9C6A9718599AD8000A5232 /* CCNodeGrid.h in Headers */,
15AE1C0819AAE02500C27E9E /* CCEditBox.h in Headers */,
50ABC0201926664800A911A9 /* CCThread.h in Headers */,
15AE1B8519AADA9A00C27E9E /* UITextField.h in Headers */,
1A01C69318F57BE800EFE3A6 /* CCDouble.h in Headers */,
15AE184B19AAD30500C27E9E /* Export.h in Headers */,
15AE196019AAD35100C27E9E /* CCSpriteFrameCacheHelper.h in Headers */,
15AE1C0B19AAE02D00C27E9E /* CCEditBoxImpl.h in Headers */,
50ABBE221925AB6F00A911A9 /* atitc.h in Headers */,
15AE1AB719AAD40300C27E9E /* b2ContactSolver.h in Headers */,
15AE193319AAD35100C27E9E /* CCActionNode.h in Headers */,
@ -6002,6 +6012,7 @@
15AE1B1E19AAD43700C27E9E /* cpBody.c in Sources */,
15AE1BDE19AAE01E00C27E9E /* CCInvocation.cpp in Sources */,
3EA3EDBC1991CDFA00645534 /* CCCamera.cpp in Sources */,
292DB14F19B4574100A80320 /* UIEditBoxImplNone.cpp in Sources */,
15AE199419AAD39600C27E9E /* LayoutReader.cpp in Sources */,
1A01C68A18F57BE800EFE3A6 /* CCDeprecated.cpp in Sources */,
1A1645B0191B726C008C7C7F /* ConvertUTF.c in Sources */,
@ -6033,7 +6044,6 @@
15AE186319AAD31D00C27E9E /* CDAudioManager.m in Sources */,
15AE1B2219AAD43700C27E9E /* cpShape.c in Sources */,
ED9C6A9418599AD8000A5232 /* CCNodeGrid.cpp in Sources */,
15AE1C0D19AAE03400C27E9E /* CCEditBoxImplMac.mm in Sources */,
15AE1A2C19AAD3D500C27E9E /* b2DynamicTree.cpp in Sources */,
15AE184019AAD2F700C27E9E /* CCSprite3D.cpp in Sources */,
46A170E61807CECA005B8026 /* CCPhysicsBody.cpp in Sources */,
@ -6045,7 +6055,6 @@
50ABBEBB1925AB6F00A911A9 /* ccUtils.cpp in Sources */,
15AE186A19AAD31D00C27E9E /* CocosDenshion.m in Sources */,
15AE198C19AAD36E00C27E9E /* CheckBoxReader.cpp in Sources */,
15AE1C0919AAE02500C27E9E /* CCEditBox.cpp in Sources */,
15AE1B6319AADA9900C27E9E /* UICheckBox.cpp in Sources */,
15EFA211198A2BB5000C57D3 /* CCProtectedNode.cpp in Sources */,
50ABBEB71925AB6F00A911A9 /* ccUTF8.cpp in Sources */,
@ -6122,6 +6131,7 @@
50ABBE391925AB6F00A911A9 /* CCData.cpp in Sources */,
1A57010E180BC8EE0088DEC7 /* CCDrawingPrimitives.cpp in Sources */,
50ABBED71925AB6F00A911A9 /* ZipUtils.cpp in Sources */,
292DB14919B4574100A80320 /* UIEditBoxImplIOS.mm in Sources */,
15AE181019AAD2F700C27E9E /* CCAnimation3D.cpp in Sources */,
1A01C68418F57BE800EFE3A6 /* CCArray.cpp in Sources */,
1A570112180BC8EE0088DEC7 /* CCDrawNode.cpp in Sources */,
@ -6152,6 +6162,7 @@
15AE1B5319AADA9900C27E9E /* UIRichText.cpp in Sources */,
15AE19DC19AAD3A700C27E9E /* Json.cpp in Sources */,
15AE1B2419AAD43700C27E9E /* cpSpaceComponent.c in Sources */,
292DB13D19B4574100A80320 /* UIEditBox.cpp in Sources */,
50ABBE551925AB6F00A911A9 /* CCEventFocus.cpp in Sources */,
15AE1A8819AAD40300C27E9E /* b2PrismaticJoint.cpp in Sources */,
50ABBE491925AB6F00A911A9 /* CCEventAcceleration.cpp in Sources */,
@ -6200,6 +6211,8 @@
1A570202180BCBD40088DEC7 /* CCClippingNode.cpp in Sources */,
1A570208180BCBDF0088DEC7 /* CCMotionStreak.cpp in Sources */,
1A570210180BCBF40088DEC7 /* CCProgressTimer.cpp in Sources */,
292DB15F19B461CA00A80320 /* ExtensionDeprecated.cpp in Sources */,
292DB14D19B4574100A80320 /* UIEditBoxImplMac.mm in Sources */,
50ABBDB51925AB4100A911A9 /* CCTexture2D.cpp in Sources */,
1A570214180BCBF40088DEC7 /* CCRenderTexture.cpp in Sources */,
15AE1BD019AAE01E00C27E9E /* CCControlHuePicker.cpp in Sources */,
@ -6218,7 +6231,6 @@
1A570286180BCC900088DEC7 /* CCSpriteFrame.cpp in Sources */,
B24AA989195A675C007B4522 /* CCFastTMXTiledMap.cpp in Sources */,
15AE199619AAD39600C27E9E /* ListViewReader.cpp in Sources */,
15AE1BE019AAE01E00C27E9E /* CCScale9Sprite.cpp in Sources */,
50ABC0191926664800A911A9 /* CCSAXParser.cpp in Sources */,
15AE1B1419AAD43700C27E9E /* cpPinJoint.c in Sources */,
15AE189219AAD33D00C27E9E /* CCLayerGradientLoader.cpp in Sources */,
@ -6338,6 +6350,7 @@
50ABC0631926664800A911A9 /* CCDevice.mm in Sources */,
15AE1A2819AAD3D500C27E9E /* b2Collision.cpp in Sources */,
15AE1B6719AADA9900C27E9E /* UIScale9Sprite.cpp in Sources */,
292DB14319B4574100A80320 /* UIEditBoxImplAndroid.cpp in Sources */,
15AE1A5219AAD40300C27E9E /* b2Draw.cpp in Sources */,
50ABBE1F1925AB6F00A911A9 /* atitc.cpp in Sources */,
1A01C69818F57BE800EFE3A6 /* CCSet.cpp in Sources */,
@ -6451,6 +6464,7 @@
46A171031807CECB005B8026 /* CCPhysicsShape.cpp in Sources */,
50ABC0161926664800A911A9 /* CCImage.cpp in Sources */,
1A01C6A518F58F7500EFE3A6 /* CCNotificationCenter.cpp in Sources */,
292DB14E19B4574100A80320 /* UIEditBoxImplMac.mm in Sources */,
15AE1BFB19AAE01E00C27E9E /* CCControlUtils.cpp in Sources */,
15AE1B9019AADA9A00C27E9E /* UIWidget.cpp in Sources */,
ED9C6A9518599AD8000A5232 /* CCNodeGrid.cpp in Sources */,
@ -6502,6 +6516,7 @@
15AE198E19AAD36E00C27E9E /* CheckBoxReader.cpp in Sources */,
50ABBE621925AB6F00A911A9 /* CCEventListenerAcceleration.cpp in Sources */,
15AE1AB619AAD40300C27E9E /* b2ContactSolver.cpp in Sources */,
292DB13E19B4574100A80320 /* UIEditBox.cpp in Sources */,
3E6176681960F89B00DE83F5 /* CCController-iOS.mm in Sources */,
15AE19EF19AAD3A700C27E9E /* SkeletonBounds.cpp in Sources */,
15AE18B219AAD33D00C27E9E /* CCBReader.cpp in Sources */,
@ -6547,6 +6562,7 @@
15AE1B4319AAD43700C27E9E /* cpSpaceHash.c in Sources */,
15AE1A1D19AAD3A700C27E9E /* SlotData.cpp in Sources */,
50ABBD551925AB0000A911A9 /* TransformUtils.cpp in Sources */,
292DB14419B4574100A80320 /* UIEditBoxImplAndroid.cpp in Sources */,
15AE193619AAD35100C27E9E /* CCArmature.cpp in Sources */,
1A57007A180BC5A10088DEC7 /* CCActionInstant.cpp in Sources */,
15AE1AC419AAD40300C27E9E /* b2FrictionJoint.cpp in Sources */,
@ -6566,7 +6582,6 @@
1A570086180BC5A10088DEC7 /* CCActionPageTurn3D.cpp in Sources */,
15AE1AB819AAD40300C27E9E /* b2EdgeAndCircleContact.cpp in Sources */,
15AE19FF19AAD3A700C27E9E /* AtlasAttachmentLoader.cpp in Sources */,
15AE1C0719AAE02500C27E9E /* CCEditBox.cpp in Sources */,
1A57008A180BC5A10088DEC7 /* CCActionProgressTimer.cpp in Sources */,
15AE18AF19AAD33D00C27E9E /* CCBKeyframe.cpp in Sources */,
15AE19FB19AAD3A700C27E9E /* AnimationStateData.cpp in Sources */,
@ -6596,6 +6611,7 @@
15AE195F19AAD35100C27E9E /* CCSpriteFrameCacheHelper.cpp in Sources */,
15AE193019AAD35100C27E9E /* CCActionManagerEx.cpp in Sources */,
503DD8E21926736A00CD74DD /* CCCommon.mm in Sources */,
292DB14A19B4574100A80320 /* UIEditBoxImplIOS.mm in Sources */,
15AE1A9419AAD40300C27E9E /* b2BlockAllocator.cpp in Sources */,
15AE1B4419AAD43700C27E9E /* cpSpaceQuery.c in Sources */,
15AE1A4D19AAD3D500C27E9E /* b2PolygonShape.cpp in Sources */,
@ -6612,6 +6628,7 @@
15AE1AB019AAD40300C27E9E /* b2ChainAndPolygonContact.cpp in Sources */,
1A5701B2180BCB590088DEC7 /* CCFontFNT.cpp in Sources */,
1A5701B6180BCB590088DEC7 /* CCFontFreeType.cpp in Sources */,
292DB16019B461CA00A80320 /* ExtensionDeprecated.cpp in Sources */,
50ABBEAC1925AB6F00A911A9 /* ccTypes.cpp in Sources */,
15AE196A19AAD35100C27E9E /* DictionaryHelper.cpp in Sources */,
15AE1A3F19AAD3D500C27E9E /* b2Collision.cpp in Sources */,
@ -6672,6 +6689,7 @@
15AE194019AAD35100C27E9E /* CCBone.cpp in Sources */,
1A570215180BCBF40088DEC7 /* CCRenderTexture.cpp in Sources */,
1A570222180BCC1A0088DEC7 /* CCParticleBatchNode.cpp in Sources */,
292DB15019B4574100A80320 /* UIEditBoxImplNone.cpp in Sources */,
15AE19F119AAD3A700C27E9E /* Event.cpp in Sources */,
15AE185F19AAD31200C27E9E /* SimpleAudioEngine.mm in Sources */,
15AE1BE819AAE01E00C27E9E /* CCControl.cpp in Sources */,
@ -6681,7 +6699,6 @@
15AE182919AAD2F700C27E9E /* CCMeshSkin.cpp in Sources */,
15AE1BBD19AADFF000C27E9E /* SocketIO.cpp in Sources */,
15AE1A4319AAD3D500C27E9E /* b2DynamicTree.cpp in Sources */,
15AE1BFF19AAE01E00C27E9E /* CCScale9Sprite.cpp in Sources */,
15AE1A3A19AAD3D500C27E9E /* b2BroadPhase.cpp in Sources */,
15AE19B619AAD39700C27E9E /* TextBMFontReader.cpp in Sources */,
15AE1BFD19AAE01E00C27E9E /* CCInvocation.cpp in Sources */,
@ -6715,7 +6732,6 @@
15AE19AE19AAD39700C27E9E /* PageViewReader.cpp in Sources */,
3EA3EDBD1991CDFA00645534 /* CCCamera.cpp in Sources */,
1A570297180BCCAB0088DEC7 /* CCAnimationCache.cpp in Sources */,
15AE1C1019AAE03E00C27E9E /* CCEditBoxImplIOS.mm in Sources */,
50ABBE321925AB6F00A911A9 /* CCConfiguration.cpp in Sources */,
15AE1A9F19AAD40300C27E9E /* b2Timer.cpp in Sources */,
15AE1AD419AAD40300C27E9E /* b2WeldJoint.cpp in Sources */,

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

@ -472,8 +472,6 @@
1AC35BEE18CECF0C00F37B72 /* CCControlStepperTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A7318CECF0B00F37B72 /* CCControlStepperTest.cpp */; };
1AC35BEF18CECF0C00F37B72 /* CCControlSwitchTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A7618CECF0B00F37B72 /* CCControlSwitchTest.cpp */; };
1AC35BF018CECF0C00F37B72 /* CCControlSwitchTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A7618CECF0B00F37B72 /* CCControlSwitchTest.cpp */; };
1AC35BF118CECF0C00F37B72 /* EditBoxTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A7918CECF0B00F37B72 /* EditBoxTest.cpp */; };
1AC35BF218CECF0C00F37B72 /* EditBoxTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A7918CECF0B00F37B72 /* EditBoxTest.cpp */; };
1AC35BF318CECF0C00F37B72 /* ExtensionsTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A7B18CECF0B00F37B72 /* ExtensionsTest.cpp */; };
1AC35BF418CECF0C00F37B72 /* ExtensionsTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A7B18CECF0B00F37B72 /* ExtensionsTest.cpp */; };
1AC35BF518CECF0C00F37B72 /* HttpClientTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A7E18CECF0B00F37B72 /* HttpClientTest.cpp */; };
@ -484,8 +482,6 @@
1AC35BFA18CECF0C00F37B72 /* WebSocketTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A8218CECF0B00F37B72 /* WebSocketTest.cpp */; };
1AC35BFB18CECF0C00F37B72 /* NotificationCenterTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A8518CECF0B00F37B72 /* NotificationCenterTest.cpp */; };
1AC35BFC18CECF0C00F37B72 /* NotificationCenterTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A8518CECF0B00F37B72 /* NotificationCenterTest.cpp */; };
1AC35BFD18CECF0C00F37B72 /* Scale9SpriteTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A8818CECF0B00F37B72 /* Scale9SpriteTest.cpp */; };
1AC35BFE18CECF0C00F37B72 /* Scale9SpriteTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A8818CECF0B00F37B72 /* Scale9SpriteTest.cpp */; };
1AC35BFF18CECF0C00F37B72 /* CustomTableViewCell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A8B18CECF0B00F37B72 /* CustomTableViewCell.cpp */; };
1AC35C0018CECF0C00F37B72 /* CustomTableViewCell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A8B18CECF0B00F37B72 /* CustomTableViewCell.cpp */; };
1AC35C0118CECF0C00F37B72 /* TableViewTestScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A8D18CECF0B00F37B72 /* TableViewTestScene.cpp */; };
@ -863,6 +859,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 */; };
292CF01419A1965E00E8E6A0 /* UIEditBoxTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292CF01219A1965E00E8E6A0 /* UIEditBoxTest.cpp */; };
292CF01519A1965E00E8E6A0 /* UIEditBoxTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292CF01219A1965E00E8E6A0 /* UIEditBoxTest.cpp */; };
295824591987415900F9746D /* UIScale9SpriteTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 295824571987415900F9746D /* UIScale9SpriteTest.cpp */; };
2958245A1987415900F9746D /* UIScale9SpriteTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 295824571987415900F9746D /* UIScale9SpriteTest.cpp */; };
298D7F6F19AC31F300FF096D /* UIWebViewTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 298D7F6D19AC31F300FF096D /* UIWebViewTest.cpp */; };
@ -2555,8 +2553,6 @@
1AC35A7418CECF0B00F37B72 /* CCControlStepperTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCControlStepperTest.h; sourceTree = "<group>"; };
1AC35A7618CECF0B00F37B72 /* CCControlSwitchTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCControlSwitchTest.cpp; sourceTree = "<group>"; };
1AC35A7718CECF0B00F37B72 /* CCControlSwitchTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCControlSwitchTest.h; sourceTree = "<group>"; };
1AC35A7918CECF0B00F37B72 /* EditBoxTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EditBoxTest.cpp; sourceTree = "<group>"; };
1AC35A7A18CECF0B00F37B72 /* EditBoxTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditBoxTest.h; sourceTree = "<group>"; };
1AC35A7B18CECF0B00F37B72 /* ExtensionsTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExtensionsTest.cpp; sourceTree = "<group>"; };
1AC35A7C18CECF0B00F37B72 /* ExtensionsTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExtensionsTest.h; sourceTree = "<group>"; };
1AC35A7E18CECF0B00F37B72 /* HttpClientTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HttpClientTest.cpp; sourceTree = "<group>"; };
@ -2567,8 +2563,6 @@
1AC35A8318CECF0B00F37B72 /* WebSocketTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocketTest.h; sourceTree = "<group>"; };
1AC35A8518CECF0B00F37B72 /* NotificationCenterTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NotificationCenterTest.cpp; sourceTree = "<group>"; };
1AC35A8618CECF0B00F37B72 /* NotificationCenterTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotificationCenterTest.h; sourceTree = "<group>"; };
1AC35A8818CECF0B00F37B72 /* Scale9SpriteTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Scale9SpriteTest.cpp; sourceTree = "<group>"; };
1AC35A8918CECF0B00F37B72 /* Scale9SpriteTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Scale9SpriteTest.h; sourceTree = "<group>"; };
1AC35A8B18CECF0B00F37B72 /* CustomTableViewCell.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CustomTableViewCell.cpp; sourceTree = "<group>"; };
1AC35A8C18CECF0B00F37B72 /* CustomTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomTableViewCell.h; sourceTree = "<group>"; };
1AC35A8D18CECF0B00F37B72 /* TableViewTestScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TableViewTestScene.cpp; sourceTree = "<group>"; };
@ -2886,6 +2880,8 @@
29080D8C191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIWidgetAddNodeTest_Editor.h; sourceTree = "<group>"; };
290E94B3196FC16900694919 /* CocostudioParserTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CocostudioParserTest.cpp; path = ../CocostudioParserTest.cpp; sourceTree = "<group>"; };
290E94B4196FC16900694919 /* CocostudioParserTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CocostudioParserTest.h; path = ../CocostudioParserTest.h; sourceTree = "<group>"; };
292CF01219A1965E00E8E6A0 /* UIEditBoxTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIEditBoxTest.cpp; sourceTree = "<group>"; };
292CF01319A1965E00E8E6A0 /* UIEditBoxTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIEditBoxTest.h; sourceTree = "<group>"; };
295824571987415900F9746D /* UIScale9SpriteTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIScale9SpriteTest.cpp; sourceTree = "<group>"; };
295824581987415900F9746D /* UIScale9SpriteTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIScale9SpriteTest.h; sourceTree = "<group>"; };
298D7F6D19AC31F300FF096D /* UIWebViewTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UIWebViewTest.cpp; path = UIWebViewTest/UIWebViewTest.cpp; sourceTree = "<group>"; };
@ -5773,12 +5769,10 @@
1AC359DF18CECF0B00F37B72 /* CocoStudioComponentsTest */,
1AC35A5818CECF0B00F37B72 /* CocoStudioSceneTest */,
1AC35A6118CECF0B00F37B72 /* ControlExtensionTest */,
1AC35A7818CECF0B00F37B72 /* EditBoxTest */,
1AC35A7B18CECF0B00F37B72 /* ExtensionsTest.cpp */,
1AC35A7C18CECF0B00F37B72 /* ExtensionsTest.h */,
1AC35A7D18CECF0B00F37B72 /* NetworkTest */,
1AC35A8418CECF0B00F37B72 /* NotificationCenterTest */,
1AC35A8718CECF0B00F37B72 /* Scale9SpriteTest */,
1AC35A8A18CECF0B00F37B72 /* TableViewTest */,
);
path = ExtensionsTest;
@ -6020,15 +6014,6 @@
path = CCControlSwitchTest;
sourceTree = "<group>";
};
1AC35A7818CECF0B00F37B72 /* EditBoxTest */ = {
isa = PBXGroup;
children = (
1AC35A7918CECF0B00F37B72 /* EditBoxTest.cpp */,
1AC35A7A18CECF0B00F37B72 /* EditBoxTest.h */,
);
path = EditBoxTest;
sourceTree = "<group>";
};
1AC35A7D18CECF0B00F37B72 /* NetworkTest */ = {
isa = PBXGroup;
children = (
@ -6051,15 +6036,6 @@
path = NotificationCenterTest;
sourceTree = "<group>";
};
1AC35A8718CECF0B00F37B72 /* Scale9SpriteTest */ = {
isa = PBXGroup;
children = (
1AC35A8818CECF0B00F37B72 /* Scale9SpriteTest.cpp */,
1AC35A8918CECF0B00F37B72 /* Scale9SpriteTest.h */,
);
path = Scale9SpriteTest;
sourceTree = "<group>";
};
1AC35A8A18CECF0B00F37B72 /* TableViewTest */ = {
isa = PBXGroup;
children = (
@ -7006,6 +6982,8 @@
298D7F6C19AC31C000FF096D /* UIWebViewTest */,
295824571987415900F9746D /* UIScale9SpriteTest.cpp */,
295824581987415900F9746D /* UIScale9SpriteTest.h */,
292CF01219A1965E00E8E6A0 /* UIEditBoxTest.cpp */,
292CF01319A1965E00E8E6A0 /* UIEditBoxTest.h */,
29080D1F191B595E0066F8DF /* CocosGUIScene.cpp */,
29080D20191B595E0066F8DF /* CocosGUIScene.h */,
29080D37191B595E0066F8DF /* GUIEditorTest.cpp */,
@ -7970,7 +7948,6 @@
1AC35B6718CECF0C00F37B72 /* AnimationsTestLayer.cpp in Sources */,
29080DB7191B595E0066F8DF /* UIListViewTest_Editor.cpp in Sources */,
1AC35BF918CECF0C00F37B72 /* WebSocketTest.cpp in Sources */,
1AC35BF118CECF0C00F37B72 /* EditBoxTest.cpp in Sources */,
1AC35B3918CECF0C00F37B72 /* Bug-1174.cpp in Sources */,
1AC35BE318CECF0C00F37B72 /* CCControlColourPickerTest.cpp in Sources */,
29080DB1191B595E0066F8DF /* UILayoutTest.cpp in Sources */,
@ -8021,7 +7998,6 @@
29080DD1191B595E0066F8DF /* UISliderTest_Editor.cpp in Sources */,
1AC35B2718CECF0C00F37B72 /* ActionsTest.cpp in Sources */,
1AC35C4918CECF0C00F37B72 /* ShaderTest.cpp in Sources */,
1AC35BFD18CECF0C00F37B72 /* Scale9SpriteTest.cpp in Sources */,
1AC35B4318CECF0C00F37B72 /* Bug-624.cpp in Sources */,
1AC35BF718CECF0C00F37B72 /* SocketIOTest.cpp in Sources */,
1AC35C4F18CECF0C00F37B72 /* SpriteTest.cpp in Sources */,
@ -8040,6 +8016,7 @@
1AC35B7D18CECF0C00F37B72 /* PlayerController.cpp in Sources */,
29080D9F191B595E0066F8DF /* CustomReader.cpp in Sources */,
1AC35BE718CECF0C00F37B72 /* CCControlScene.cpp in Sources */,
292CF01419A1965E00E8E6A0 /* UIEditBoxTest.cpp in Sources */,
29080DBF191B595E0066F8DF /* UIPageViewTest_Editor.cpp in Sources */,
1AC35B5F18CECF0C00F37B72 /* DataVisitorTest.cpp in Sources */,
1AC35B5D18CECF0C00F37B72 /* CurrentLanguageTest.cpp in Sources */,
@ -8166,7 +8143,6 @@
1AC35B6818CECF0C00F37B72 /* AnimationsTestLayer.cpp in Sources */,
29080D8E191B595E0066F8DF /* CocosGUIScene.cpp in Sources */,
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 */,
@ -8221,9 +8197,9 @@
1AC35C0618CECF0C00F37B72 /* FontTest.cpp in Sources */,
1AC35C3818CECF0C00F37B72 /* PerformanceTest.cpp in Sources */,
1F33635018E37E840074764D /* RefPtrTest.cpp in Sources */,
292CF01519A1965E00E8E6A0 /* UIEditBoxTest.cpp in Sources */,
1AC35B2818CECF0C00F37B72 /* ActionsTest.cpp in Sources */,
1AC35C4A18CECF0C00F37B72 /* ShaderTest.cpp in Sources */,
1AC35BFE18CECF0C00F37B72 /* Scale9SpriteTest.cpp in Sources */,
C04F935B1941B05400E9FEAB /* TileMapTest2.cpp in Sources */,
1AC35B4418CECF0C00F37B72 /* Bug-624.cpp in Sources */,
1AC35BF818CECF0C00F37B72 /* SocketIOTest.cpp in Sources */,

4
cocos/2d/CCTransition.cpp
View File

@ -1278,7 +1278,7 @@ void TransitionCrossFade::onEnter()
LayerColor* layer = LayerColor::create(color);
// create the first render texture for inScene
RenderTexture* inTexture = RenderTexture::create((int)size.width, (int)size.height);
RenderTexture* inTexture = RenderTexture::create((int)size.width, (int)size.height,Texture2D::PixelFormat::RGBA8888,GL_DEPTH24_STENCIL8);
if (nullptr == inTexture)
{
@ -1295,7 +1295,7 @@ void TransitionCrossFade::onEnter()
inTexture->end();
// create the second render texture for outScene
RenderTexture* outTexture = RenderTexture::create((int)size.width, (int)size.height);
RenderTexture* outTexture = RenderTexture::create((int)size.width, (int)size.height,Texture2D::PixelFormat::RGBA8888,GL_DEPTH24_STENCIL8);
outTexture->getSprite()->setAnchorPoint( Vec2(0.5f,0.5f) );
outTexture->setPosition(size.width/2, size.height/2);
outTexture->setAnchorPoint( Vec2(0.5f,0.5f) );

2
cocos/2d/CCTransitionProgress.cpp
View File

@ -71,7 +71,7 @@ void TransitionProgress::onEnter()
Size size = Director::getInstance()->getWinSize();
// create the second render texture for outScene
RenderTexture *texture = RenderTexture::create((int)size.width, (int)size.height);
RenderTexture *texture = RenderTexture::create((int)size.width, (int)size.height,Texture2D::PixelFormat::RGBA8888,GL_DEPTH24_STENCIL8);
texture->getSprite()->setAnchorPoint(Vec2(0.5f,0.5f));
texture->setPosition(size.width/2, size.height/2);
texture->setAnchorPoint(Vec2(0.5f,0.5f));

20
cocos/2d/libcocos2d.vcxproj
View File

@ -24,7 +24,7 @@
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
@ -33,7 +33,7 @@
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@ -192,15 +192,11 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\spine\prebuilt\release-l
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlSwitch.cpp" />
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlUtils.cpp" />
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCInvocation.cpp" />
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCScale9Sprite.cpp" />
<ClCompile Include="..\..\extensions\GUI\CCEditBox\CCEditBox.cpp" />
<ClCompile Include="..\..\extensions\GUI\CCEditBox\CCEditBoxImplWin.cpp" />
<ClCompile Include="..\..\extensions\GUI\CCScrollView\CCScrollView.cpp" />
<ClCompile Include="..\..\extensions\GUI\CCScrollView\CCTableView.cpp" />
<ClCompile Include="..\..\extensions\GUI\CCScrollView\CCTableViewCell.cpp" />
<ClCompile Include="..\..\extensions\physics-nodes\CCPhysicsDebugNode.cpp" />
<ClCompile Include="..\..\extensions\physics-nodes\CCPhysicsSprite.cpp" />
<ClCompile Include="..\..\extensions\proj.win32\Win32InputBox.cpp" />
<ClCompile Include="..\..\external\ConvertUTF\ConvertUTF.c" />
<ClCompile Include="..\..\external\ConvertUTF\ConvertUTFWrapper.cpp" />
<ClCompile Include="..\..\external\edtaa3func\edtaa3func.cpp" />
@ -409,9 +405,12 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\spine\prebuilt\release-l
<ClCompile Include="..\renderer\CCVertexIndexData.cpp" />
<ClCompile Include="..\storage\local-storage\LocalStorage.cpp" />
<ClCompile Include="..\ui\CocosGUI.cpp" />
<ClCompile Include="..\ui\proj.win32\Win32InputBox.cpp" />
<ClCompile Include="..\ui\UIButton.cpp" />
<ClCompile Include="..\ui\UICheckBox.cpp" />
<ClCompile Include="..\ui\UIDeprecated.cpp" />
<ClCompile Include="..\ui\UIEditBox\UIEditBox.cpp" />
<ClCompile Include="..\ui\UIEditBox\UIEditBoxImplWin.cpp" />
<ClCompile Include="..\ui\UIHBox.cpp" />
<ClCompile Include="..\ui\UIHelper.cpp" />
<ClCompile Include="..\ui\UIImageView.cpp" />
@ -516,16 +515,11 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\spine\prebuilt\release-l
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlSwitch.h" />
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlUtils.h" />
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCInvocation.h" />
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCScale9Sprite.h" />
<ClInclude Include="..\..\extensions\GUI\CCEditBox\CCEditBox.h" />
<ClInclude Include="..\..\extensions\GUI\CCEditBox\CCEditBoxImpl.h" />
<ClInclude Include="..\..\extensions\GUI\CCEditBox\CCEditBoxImplWin.h" />
<ClInclude Include="..\..\extensions\GUI\CCScrollView\CCScrollView.h" />
<ClInclude Include="..\..\extensions\GUI\CCScrollView\CCTableView.h" />
<ClInclude Include="..\..\extensions\GUI\CCScrollView\CCTableViewCell.h" />
<ClInclude Include="..\..\extensions\physics-nodes\CCPhysicsDebugNode.h" />
<ClInclude Include="..\..\extensions\physics-nodes\CCPhysicsSprite.h" />
<ClInclude Include="..\..\extensions\proj.win32\Win32InputBox.h" />
<ClInclude Include="..\..\external\ConvertUTF\ConvertUTF.h" />
<ClInclude Include="..\..\external\edtaa3func\edtaa3func.h" />
<ClInclude Include="..\..\external\json\document.h" />
@ -786,9 +780,13 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\spine\prebuilt\release-l
<ClInclude Include="..\storage\local-storage\LocalStorage.h" />
<ClInclude Include="..\ui\CocosGUI.h" />
<ClInclude Include="..\ui\GUIExport.h" />
<ClInclude Include="..\ui\proj.win32\Win32InputBox.h" />
<ClInclude Include="..\ui\UIButton.h" />
<ClInclude Include="..\ui\UICheckBox.h" />
<ClInclude Include="..\ui\UIDeprecated.h" />
<ClInclude Include="..\ui\UIEditBox\UIEditBox.h" />
<ClInclude Include="..\ui\UIEditBox\UIEditBoxImpl.h" />
<ClInclude Include="..\ui\UIEditBox\UIEditBoxImplWin.h" />
<ClInclude Include="..\ui\UIHBox.h" />
<ClInclude Include="..\ui\UIHelper.h" />
<ClInclude Include="..\ui\UIImageView.h" />

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

@ -76,15 +76,9 @@
<Filter Include="extension\GUI">
<UniqueIdentifier>{b27aba95-51a2-413c-8570-0aff9adf2b6b}</UniqueIdentifier>
</Filter>
<Filter Include="extension\GUI\CCControlExtension">
<UniqueIdentifier>{220cf2ee-61b0-40cf-a88a-8627e4e609f1}</UniqueIdentifier>
</Filter>
<Filter Include="extension\GUI\CCScrollView">
<UniqueIdentifier>{a1f539bc-d5be-4224-a4d2-01c0b6f17d6e}</UniqueIdentifier>
</Filter>
<Filter Include="extension\GUI\CCEditBox">
<UniqueIdentifier>{dc45cd54-4576-4401-87b7-a276f91a45bd}</UniqueIdentifier>
</Filter>
<Filter Include="extension\physics_nodes">
<UniqueIdentifier>{1de7fce7-0dee-4571-8fcd-43eb617aaf8b}</UniqueIdentifier>
</Filter>
@ -211,6 +205,12 @@
<Filter Include="cocosbuilder\Source Files">
<UniqueIdentifier>{8579ed15-b266-4f80-818d-a3a9251c4248}</UniqueIdentifier>
</Filter>
<Filter Include="ui\UIWidgets\EditBox">
<UniqueIdentifier>{89eb6312-dc7f-4fda-b9b2-ab67c31ddd55}</UniqueIdentifier>
</Filter>
<Filter Include="extension\GUI\CCControlExtensions">
<UniqueIdentifier>{118d80ca-ccf2-480c-b87d-25220af23440}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\physics\CCPhysicsBody.cpp">
@ -787,42 +787,6 @@
<ClCompile Include="..\..\extensions\assets-manager\AssetsManager.cpp">
<Filter>extension\AssetsManager</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControl.cpp">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlButton.cpp">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlColourPicker.cpp">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlHuePicker.cpp">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlPotentiometer.cpp">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlSaturationBrightnessPicker.cpp">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlSlider.cpp">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlStepper.cpp">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlSwitch.cpp">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlUtils.cpp">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCInvocation.cpp">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCScale9Sprite.cpp">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCScrollView\CCScrollView.cpp">
<Filter>extension\GUI\CCScrollView</Filter>
</ClCompile>
@ -832,15 +796,6 @@
<ClCompile Include="..\..\extensions\GUI\CCScrollView\CCTableViewCell.cpp">
<Filter>extension\GUI\CCScrollView</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCEditBox\CCEditBox.cpp">
<Filter>extension\GUI\CCEditBox</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCEditBox\CCEditBoxImplWin.cpp">
<Filter>extension\GUI\CCEditBox</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\proj.win32\Win32InputBox.cpp">
<Filter>extension\GUI\CCEditBox</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\physics-nodes\CCPhysicsDebugNode.cpp">
<Filter>extension\physics_nodes</Filter>
</ClCompile>
@ -1165,6 +1120,48 @@
<ClCompile Include="..\editor-support\cocosbuilder\CCSpriteLoader.cpp">
<Filter>cocosbuilder\Source Files</Filter>
</ClCompile>
<ClCompile Include="..\ui\UIEditBox\UIEditBox.cpp">
<Filter>ui\UIWidgets\EditBox</Filter>
</ClCompile>
<ClCompile Include="..\ui\UIEditBox\UIEditBoxImplWin.cpp">
<Filter>ui\UIWidgets\EditBox</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControl.cpp">
<Filter>extension\GUI\CCControlExtensions</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlButton.cpp">
<Filter>extension\GUI\CCControlExtensions</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlColourPicker.cpp">
<Filter>extension\GUI\CCControlExtensions</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlHuePicker.cpp">
<Filter>extension\GUI\CCControlExtensions</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlPotentiometer.cpp">
<Filter>extension\GUI\CCControlExtensions</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlSaturationBrightnessPicker.cpp">
<Filter>extension\GUI\CCControlExtensions</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlSlider.cpp">
<Filter>extension\GUI\CCControlExtensions</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlStepper.cpp">
<Filter>extension\GUI\CCControlExtensions</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlSwitch.cpp">
<Filter>extension\GUI\CCControlExtensions</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCControlUtils.cpp">
<Filter>extension\GUI\CCControlExtensions</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\GUI\CCControlExtension\CCInvocation.cpp">
<Filter>extension\GUI\CCControlExtensions</Filter>
</ClCompile>
<ClCompile Include="..\ui\proj.win32\Win32InputBox.cpp">
<Filter>ui\UIWidgets\EditBox</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\physics\CCPhysicsBody.h">
@ -1825,45 +1822,6 @@
<ClInclude Include="..\..\extensions\assets-manager\AssetsManager.h">
<Filter>extension\AssetsManager</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControl.h">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlButton.h">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlColourPicker.h">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlExtensions.h">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlHuePicker.h">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlPotentiometer.h">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlSaturationBrightnessPicker.h">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlSlider.h">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlStepper.h">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlSwitch.h">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlUtils.h">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCInvocation.h">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCScale9Sprite.h">
<Filter>extension\GUI\CCControlExtension</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCScrollView\CCScrollView.h">
<Filter>extension\GUI\CCScrollView</Filter>
</ClInclude>
@ -1873,18 +1831,6 @@
<ClInclude Include="..\..\extensions\GUI\CCScrollView\CCTableViewCell.h">
<Filter>extension\GUI\CCScrollView</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCEditBox\CCEditBox.h">
<Filter>extension\GUI\CCEditBox</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCEditBox\CCEditBoxImpl.h">
<Filter>extension\GUI\CCEditBox</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCEditBox\CCEditBoxImplWin.h">
<Filter>extension\GUI\CCEditBox</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\proj.win32\Win32InputBox.h">
<Filter>extension\GUI\CCEditBox</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\physics-nodes\CCPhysicsDebugNode.h">
<Filter>extension\physics_nodes</Filter>
</ClInclude>
@ -2290,6 +2236,54 @@
<ClInclude Include="..\editor-support\cocosbuilder\CocosBuilder.h">
<Filter>cocosbuilder\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\ui\UIEditBox\UIEditBox.h">
<Filter>ui\UIWidgets\EditBox</Filter>
</ClInclude>
<ClInclude Include="..\ui\UIEditBox\UIEditBoxImpl.h">
<Filter>ui\UIWidgets\EditBox</Filter>
</ClInclude>
<ClInclude Include="..\ui\UIEditBox\UIEditBoxImplWin.h">
<Filter>ui\UIWidgets\EditBox</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControl.h">
<Filter>extension\GUI\CCControlExtensions</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlButton.h">
<Filter>extension\GUI\CCControlExtensions</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlColourPicker.h">
<Filter>extension\GUI\CCControlExtensions</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlExtensions.h">
<Filter>extension\GUI\CCControlExtensions</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlHuePicker.h">
<Filter>extension\GUI\CCControlExtensions</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlPotentiometer.h">
<Filter>extension\GUI\CCControlExtensions</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlSaturationBrightnessPicker.h">
<Filter>extension\GUI\CCControlExtensions</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlSlider.h">
<Filter>extension\GUI\CCControlExtensions</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlStepper.h">
<Filter>extension\GUI\CCControlExtensions</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlSwitch.h">
<Filter>extension\GUI\CCControlExtensions</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCControlUtils.h">
<Filter>extension\GUI\CCControlExtensions</Filter>
</ClInclude>
<ClInclude Include="..\..\extensions\GUI\CCControlExtension\CCInvocation.h">
<Filter>extension\GUI\CCControlExtensions</Filter>
</ClInclude>
<ClInclude Include="..\ui\proj.win32\Win32InputBox.h">
<Filter>ui\UIWidgets\EditBox</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\math\Mat4.inl">

3
cocos/CMakeLists.txt
View File

@ -90,9 +90,6 @@ list(REMOVE_ITEM cocos2d_source_files
"${CMAKE_CURRENT_SOURCE_DIR}/storage/local-storage/LocalStorageAndroid.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/base/CCEventController.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/base/CCEventListenerController.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/../extensions/GUI/CCEditBox/CCEditBoxImplAndroid.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/../extensions/GUI/CCEditBox/CCEditBoxImplWin.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/../extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/editor-support/cocostudio/proj.wp8/pch.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/../extensions/proj.wp8/pch.cpp")

16
cocos/editor-support/cocosbuilder/CCScale9SpriteLoader.cpp
View File

@ -19,7 +19,7 @@ namespace cocosbuilder {
void Scale9SpriteLoader::onHandlePropTypeSpriteFrame(Node * pNode, Node * pParent, const char * pPropertyName, SpriteFrame * pSpriteFrame, CCBReader * ccbReader) {
if(strcmp(pPropertyName, PROPERTY_SPRITEFRAME) == 0) {
((Scale9Sprite *)pNode)->setSpriteFrame(pSpriteFrame);
((cocos2d::ui::Scale9Sprite *)pNode)->setSpriteFrame(pSpriteFrame);
} else {
NodeLoader::onHandlePropTypeSpriteFrame(pNode, pParent, pPropertyName, pSpriteFrame, ccbReader);
}
@ -27,7 +27,7 @@ void Scale9SpriteLoader::onHandlePropTypeSpriteFrame(Node * pNode, Node * pParen
void Scale9SpriteLoader::onHandlePropTypeColor3(Node * pNode, Node * pParent, const char * pPropertyName, Color3B pColor3B, CCBReader * ccbReader) {
if(strcmp(pPropertyName, PROPERTY_COLOR) == 0) {
((Scale9Sprite *)pNode)->setColor(pColor3B);
((cocos2d::ui::Scale9Sprite *)pNode)->setColor(pColor3B);
} else {
NodeLoader::onHandlePropTypeColor3(pNode, pParent, pPropertyName, pColor3B, ccbReader);
}
@ -35,7 +35,7 @@ void Scale9SpriteLoader::onHandlePropTypeColor3(Node * pNode, Node * pParent, co
void Scale9SpriteLoader::onHandlePropTypeByte(Node * pNode, Node * pParent, const char * pPropertyName, unsigned char pByte, CCBReader * ccbReader) {
if(strcmp(pPropertyName, PROPERTY_OPACITY) == 0) {
((Scale9Sprite *)pNode)->setOpacity(pByte);
((cocos2d::ui::Scale9Sprite *)pNode)->setOpacity(pByte);
} else {
NodeLoader::onHandlePropTypeByte(pNode, pParent, pPropertyName, pByte, ccbReader);
}
@ -54,7 +54,7 @@ void Scale9SpriteLoader::onHandlePropTypeSize(Node * pNode, Node * pParent, cons
if(strcmp(pPropertyName, PROPERTY_CONTENTSIZE) == 0) {
//((Scale9Sprite *)pNode)->setContentSize(pSize);
} else if(strcmp(pPropertyName, PROPERTY_PREFEREDSIZE) == 0) {
((Scale9Sprite *)pNode)->setPreferredSize(pSize);
((cocos2d::ui::Scale9Sprite *)pNode)->setPreferredSize(pSize);
} else {
NodeLoader::onHandlePropTypeSize(pNode, pParent, pPropertyName, pSize, ccbReader);
}
@ -62,13 +62,13 @@ void Scale9SpriteLoader::onHandlePropTypeSize(Node * pNode, Node * pParent, cons
void Scale9SpriteLoader::onHandlePropTypeFloat(Node * pNode, Node * pParent, const char * pPropertyName, float pFloat, CCBReader * ccbReader) {
if(strcmp(pPropertyName, PROPERTY_INSETLEFT) == 0) {
((Scale9Sprite *)pNode)->setInsetLeft(pFloat);
((cocos2d::ui::Scale9Sprite *)pNode)->setInsetLeft(pFloat);
} else if(strcmp(pPropertyName, PROPERTY_INSETTOP) == 0) {
((Scale9Sprite *)pNode)->setInsetTop(pFloat);
((cocos2d::ui::Scale9Sprite *)pNode)->setInsetTop(pFloat);
} else if(strcmp(pPropertyName, PROPERTY_INSETRIGHT) == 0) {
((Scale9Sprite *)pNode)->setInsetRight(pFloat);
((cocos2d::ui::Scale9Sprite *)pNode)->setInsetRight(pFloat);
} else if(strcmp(pPropertyName, PROPERTY_INSETBOTTOM) == 0) {
((Scale9Sprite *)pNode)->setInsetBottom(pFloat);
((cocos2d::ui::Scale9Sprite *)pNode)->setInsetBottom(pFloat);
} else {
NodeLoader::onHandlePropTypeFloat(pNode, pParent, pPropertyName, pFloat, ccbReader);
}

6
cocos/editor-support/cocosbuilder/CCScale9SpriteLoader.h
View File

@ -3,7 +3,7 @@
#include "CCNodeLoader.h"
#include "CCScale9SpriteLoader.h"
#include "extensions/GUI/CCControlExtension/CCScale9Sprite.h"
#include "ui/UIScale9Sprite.h"
namespace cocosbuilder {
@ -28,8 +28,8 @@ protected:
* @js NA
* @lua NA
*/
virtual cocos2d::extension::Scale9Sprite * createNode(cocos2d::Node * pParent, cocosbuilder::CCBReader * ccbReader) {
cocos2d::extension::Scale9Sprite* pNode = cocos2d::extension::Scale9Sprite::create();
virtual cocos2d::ui::Scale9Sprite * createNode(cocos2d::Node * pParent, cocosbuilder::CCBReader * ccbReader) {
cocos2d::ui::Scale9Sprite* pNode = cocos2d::ui::Scale9Sprite::create();
pNode->setAnchorPoint(cocos2d::Vec2::ZERO);

109
cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxETCLoader.java
View File

@ -1,109 +0,0 @@
/****************************************************************************
Copyright (c) 2013 cocos2d-x.org
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.
****************************************************************************/
package org.cocos2dx.lib;
import java.io.FileInputStream;
import java.io.InputStream;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import android.content.Context;
import android.content.res.AssetManager;
import android.opengl.ETC1Util;
import android.util.Log;
public class Cocos2dxETCLoader {
private static final String ASSETS_PATH = "assets/";
private static Context context;
public static boolean loadTexture(String filePath) {
if (! ETC1Util.isETC1Supported()) {
return false;
}
if (filePath.length() == 0) {
return false;
}
// Create ETC1Texture
InputStream inputStream = null;
ETC1Util.ETC1Texture texture = null;
AssetManager assetManager = null;
try {
if (filePath.charAt(0) == '/') {
// absolute path
inputStream = new FileInputStream(filePath);
} else {
// remove prefix: "assets/"
if (filePath.startsWith(ASSETS_PATH)) {
filePath = filePath.substring(ASSETS_PATH.length());
}
assetManager = context.getAssets();
inputStream = assetManager.open(filePath);
}
texture = ETC1Util.createTexture(inputStream);
inputStream.close();
} catch (Exception e) {
Log.d("Cocos2dx", "Unable to create texture for " + filePath);
texture = null;
}
if (texture != null) {
boolean ret = true;
try {
final int width = texture.getWidth();
final int height = texture.getHeight();
final int length = texture.getData().remaining();
final byte[] data = new byte[length];
final ByteBuffer buf = ByteBuffer.wrap(data);
buf.order(ByteOrder.nativeOrder());
buf.put(texture.getData());
nativeSetTextureInfo(width,
height,
data,
length);
} catch (Exception e)
{
Log.d("invoke native function error", e.toString());
ret = false;
}
return ret;
} else {
return false;
}
}
public static void setContext(Context context) {
Cocos2dxETCLoader.context = context;
}
private static native void nativeSetTextureInfo(final int width, final int height, final byte[] data,
final int dataLength);
}

4
cocos/platform/desktop/CCGLViewImpl.cpp
View File

@ -650,8 +650,10 @@ void GLViewImpl::onGLFWMouseScrollCallback(GLFWwindow* window, double x, double
{
EventMouse event(EventMouse::MouseEventType::MOUSE_SCROLL);
//Because OpenGL and cocos2d-x uses different Y axis, we need to convert the coordinate here
float cursorX = (_mouseX - _viewPortRect.origin.x) / _scaleX;
float cursorY = (_viewPortRect.origin.y + _viewPortRect.size.height - _mouseY) / _scaleY;
event.setScrollData((float)x, -(float)y);
event.setCursorPosition(_mouseX, this->getViewPortRect().size.height - _mouseY);
event.setCursorPosition(cursorX, cursorY);
Director::getInstance()->getEventDispatcher()->dispatchEvent(&event);
}

3
cocos/platform/ios/CCEAGLView.mm
View File

@ -374,7 +374,8 @@ Copyright (C) 2008 Apple Inc. All Rights Reserved.
for(UIView* view in subviews)
{
if([view isKindOfClass:NSClassFromString(@"CCCustomUITextField")])
if([view isKindOfClass:NSClassFromString(@"CCCustomUITextField")] ||
[view isKindOfClass:NSClassFromString(@"UICustomUITextField")])
{
if ([view isFirstResponder])
{

33
cocos/scripting/lua-bindings/auto/api/Action.lua
View File

@ -5,65 +5,86 @@
-- @parent_module cc
--------------------------------
-- called before the action start. It will also set the target.
-- @function [parent=#Action] startWithTarget
-- @param self
-- @param #cc.Node node
-- @param #cc.Node target
--------------------------------
-- Set the original target, since target can be nil.<br>
-- Is the target that were used to run the action. Unless you are doing something complex, like ActionManager, you should NOT call this method.<br>
-- The target is 'assigned', it is not 'retained'.<br>
-- since v0.8.2
-- @function [parent=#Action] setOriginalTarget
-- @param self
-- @param #cc.Node node
-- @param #cc.Node originalTarget
--------------------------------
-- returns a clone of action
-- @function [parent=#Action] clone
-- @param self
-- @return Action#Action ret (return value: cc.Action)
--------------------------------
--
-- @function [parent=#Action] getOriginalTarget
-- @param self
-- @return Node#Node ret (return value: cc.Node)
--------------------------------
-- called after the action has finished. It will set the 'target' to nil.<br>
-- IMPORTANT: You should never call "[action stop]" manually. Instead, use: "target->stopAction(action);"
-- @function [parent=#Action] stop
-- @param self
--------------------------------
-- called once per frame. time a value between 0 and 1<br>
-- For example: <br>
-- - 0 means that the action just started<br>
-- - 0.5 means that the action is in the middle<br>
-- - 1 means that the action is over
-- @function [parent=#Action] update
-- @param self
-- @param #float float
-- @param #float time
--------------------------------
--
-- @function [parent=#Action] getTarget
-- @param self
-- @return Node#Node ret (return value: cc.Node)
--------------------------------
-- called every frame with it's delta time. DON'T override unless you know what you are doing.
-- @function [parent=#Action] step
-- @param self
-- @param #float float
-- @param #float dt
--------------------------------
--
-- @function [parent=#Action] setTag
-- @param self
-- @param #int int
-- @param #int tag
--------------------------------
--
-- @function [parent=#Action] getTag
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
-- The action will modify the target properties.
-- @function [parent=#Action] setTarget
-- @param self
-- @param #cc.Node node
-- @param #cc.Node target
--------------------------------
-- return true if the action has finished
-- @function [parent=#Action] isDone
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
-- returns a new action that performs the exactly the reverse action
-- @function [parent=#Action] reverse
-- @param self
-- @return Action#Action ret (return value: cc.Action)

21
cocos/scripting/lua-bindings/auto/api/ActionCamera.lua
View File

@ -9,51 +9,60 @@
-- @overload self, vec3_table
-- @function [parent=#ActionCamera] setEye
-- @param self
-- @param #float float
-- @param #float float
-- @param #float float
-- @param #float x
-- @param #float y
-- @param #float z
--------------------------------
--
-- @function [parent=#ActionCamera] getEye
-- @param self
-- @return vec3_table#vec3_table ret (return value: vec3_table)
--------------------------------
--
-- @function [parent=#ActionCamera] setUp
-- @param self
-- @param #vec3_table vec3
-- @param #vec3_table up
--------------------------------
--
-- @function [parent=#ActionCamera] getCenter
-- @param self
-- @return vec3_table#vec3_table ret (return value: vec3_table)
--------------------------------
--
-- @function [parent=#ActionCamera] setCenter
-- @param self
-- @param #vec3_table vec3
-- @param #vec3_table center
--------------------------------
--
-- @function [parent=#ActionCamera] getUp
-- @param self
-- @return vec3_table#vec3_table ret (return value: vec3_table)
--------------------------------
--
-- @function [parent=#ActionCamera] startWithTarget
-- @param self
-- @param #cc.Node node
-- @param #cc.Node target
--------------------------------
--
-- @function [parent=#ActionCamera] clone
-- @param self
-- @return ActionCamera#ActionCamera ret (return value: cc.ActionCamera)
--------------------------------
--
-- @function [parent=#ActionCamera] reverse
-- @param self
-- @return ActionCamera#ActionCamera ret (return value: cc.ActionCamera)
--------------------------------
-- js ctor
-- @function [parent=#ActionCamera] ActionCamera
-- @param self

10
cocos/scripting/lua-bindings/auto/api/ActionEase.lua
View File

@ -5,32 +5,38 @@
-- @parent_module cc
--------------------------------
--
-- @function [parent=#ActionEase] getInnerAction
-- @param self
-- @return ActionInterval#ActionInterval ret (return value: cc.ActionInterval)
--------------------------------
--
-- @function [parent=#ActionEase] startWithTarget
-- @param self
-- @param #cc.Node node
-- @param #cc.Node target
--------------------------------
--
-- @function [parent=#ActionEase] clone
-- @param self
-- @return ActionEase#ActionEase ret (return value: cc.ActionEase)
--------------------------------
--
-- @function [parent=#ActionEase] stop
-- @param self
--------------------------------
--
-- @function [parent=#ActionEase] reverse
-- @param self
-- @return ActionEase#ActionEase ret (return value: cc.ActionEase)
--------------------------------
--
-- @function [parent=#ActionEase] update
-- @param self
-- @param #float float
-- @param #float time
return nil

12
cocos/scripting/lua-bindings/auto/api/ActionFadeFrame.lua
View File

@ -5,22 +5,30 @@
-- @parent_module ccs
--------------------------------
-- Gets the fade action opacity.<br>
-- return the fade action opacity.
-- @function [parent=#ActionFadeFrame] getOpacity
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
-- Gets the ActionInterval of ActionFrame.<br>
-- parame duration the duration time of ActionFrame<br>
-- return ActionInterval
-- @function [parent=#ActionFadeFrame] getAction
-- @param self
-- @param #float float
-- @param #float duration
-- @return ActionInterval#ActionInterval ret (return value: cc.ActionInterval)
--------------------------------
-- Changes the fade action opacity.<br>
-- param opacity the fade action opacity
-- @function [parent=#ActionFadeFrame] setOpacity
-- @param self
-- @param #int int
-- @param #int opacity
--------------------------------
-- Default constructor
-- @function [parent=#ActionFadeFrame] ActionFadeFrame
-- @param self

33
cocos/scripting/lua-bindings/auto/api/ActionFrame.lua
View File

@ -9,56 +9,75 @@
-- @overload self, float
-- @function [parent=#ActionFrame] getAction
-- @param self
-- @param #float float
-- @param #ccs.ActionFrame actionframe
-- @param #float duration
-- @param #ccs.ActionFrame srcFrame
-- @return ActionInterval#ActionInterval ret (retunr value: cc.ActionInterval)
--------------------------------
-- Gets the type of action frame<br>
-- return the type of action frame
-- @function [parent=#ActionFrame] getFrameType
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
-- Changes the time of action frame<br>
-- param fTime the time of action frame
-- @function [parent=#ActionFrame] setFrameTime
-- @param self
-- @param #float float
-- @param #float fTime
--------------------------------
-- Changes the easing type.<br>
-- param easingType the easing type.
-- @function [parent=#ActionFrame] setEasingType
-- @param self
-- @param #int int
-- @param #int easingType
--------------------------------
-- Gets the time of action frame<br>
-- return fTime the time of action frame
-- @function [parent=#ActionFrame] getFrameTime
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
-- Gets the index of action frame<br>
-- return the index of action frame
-- @function [parent=#ActionFrame] getFrameIndex
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
-- Changes the type of action frame<br>
-- param frameType the type of action frame
-- @function [parent=#ActionFrame] setFrameType
-- @param self
-- @param #int int
-- @param #int frameType
--------------------------------
-- Changes the index of action frame<br>
-- param index the index of action frame
-- @function [parent=#ActionFrame] setFrameIndex
-- @param self
-- @param #int int
-- @param #int index
--------------------------------
-- Set the ActionInterval easing parameter.<br>
-- parame parameter the parameter for frame ease
-- @function [parent=#ActionFrame] setEasingParameter
-- @param self
-- @param #array_table array
-- @param #array_table parameter
--------------------------------
-- Gets the easing type.<br>
-- return the easing type.
-- @function [parent=#ActionFrame] getEasingType
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
-- Default constructor
-- @function [parent=#ActionFrame] ActionFrame
-- @param self

9
cocos/scripting/lua-bindings/auto/api/ActionInstant.lua
View File

@ -5,28 +5,33 @@
-- @parent_module cc
--------------------------------
--
-- @function [parent=#ActionInstant] step
-- @param self
-- @param #float float
-- @param #float dt
--------------------------------
--
-- @function [parent=#ActionInstant] clone
-- @param self
-- @return ActionInstant#ActionInstant ret (return value: cc.ActionInstant)
--------------------------------
--
-- @function [parent=#ActionInstant] reverse
-- @param self
-- @return ActionInstant#ActionInstant ret (return value: cc.ActionInstant)
--------------------------------
--
-- @function [parent=#ActionInstant] isDone
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#ActionInstant] update
-- @param self
-- @param #float float
-- @param #float time
return nil

14
cocos/scripting/lua-bindings/auto/api/ActionInterval.lua
View File

@ -5,41 +5,49 @@
-- @parent_module cc
--------------------------------
--
-- @function [parent=#ActionInterval] getAmplitudeRate
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#ActionInterval] setAmplitudeRate
-- @param self
-- @param #float float
-- @param #float amp
--------------------------------
-- how many seconds had elapsed since the actions started to run.
-- @function [parent=#ActionInterval] getElapsed
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#ActionInterval] startWithTarget
-- @param self
-- @param #cc.Node node
-- @param #cc.Node target
--------------------------------
--
-- @function [parent=#ActionInterval] step
-- @param self
-- @param #float float
-- @param #float dt
--------------------------------
--
-- @function [parent=#ActionInterval] clone
-- @param self
-- @return ActionInterval#ActionInterval ret (return value: cc.ActionInterval)
--------------------------------
--
-- @function [parent=#ActionInterval] reverse
-- @param self
-- @return ActionInterval#ActionInterval ret (return value: cc.ActionInterval)
--------------------------------
--
-- @function [parent=#ActionInterval] isDone
-- @param self
-- @return bool#bool ret (return value: bool)

50
cocos/scripting/lua-bindings/auto/api/ActionManager.lua
View File

@ -5,77 +5,99 @@
-- @parent_module cc
--------------------------------
-- Gets an action given its tag an a target<br>
-- return the Action the with the given tag
-- @function [parent=#ActionManager] getActionByTag
-- @param self
-- @param #int int
-- @param #cc.Node node
-- @param #int tag
-- @param #cc.Node target
-- @return Action#Action ret (return value: cc.Action)
--------------------------------
-- Removes an action given its tag and the target
-- @function [parent=#ActionManager] removeActionByTag
-- @param self
-- @param #int int
-- @param #cc.Node node
-- @param #int tag
-- @param #cc.Node target
--------------------------------
-- Removes all actions from all the targets.
-- @function [parent=#ActionManager] removeAllActions
-- @param self
--------------------------------
-- Adds an action with a target. <br>
-- If the target is already present, then the action will be added to the existing target.<br>
-- If the target is not present, a new instance of this target will be created either paused or not, and the action will be added to the newly created target.<br>
-- When the target is paused, the queued actions won't be 'ticked'.
-- @function [parent=#ActionManager] addAction
-- @param self
-- @param #cc.Action action
-- @param #cc.Node node
-- @param #bool bool
-- @param #cc.Node target
-- @param #bool paused
--------------------------------
-- Resumes the target. All queued actions will be resumed.
-- @function [parent=#ActionManager] resumeTarget
-- @param self
-- @param #cc.Node node
-- @param #cc.Node target
--------------------------------
--
-- @function [parent=#ActionManager] update
-- @param self
-- @param #float float
-- @param #float dt
--------------------------------
-- Pauses the target: all running actions and newly added actions will be paused.
-- @function [parent=#ActionManager] pauseTarget
-- @param self
-- @param #cc.Node node
-- @param #cc.Node target
--------------------------------
-- Returns the numbers of actions that are running in a certain target. <br>
-- Composable actions are counted as 1 action. Example:<br>
-- - If you are running 1 Sequence of 7 actions, it will return 1.<br>
-- - If you are running 7 Sequences of 2 actions, it will return 7.
-- @function [parent=#ActionManager] getNumberOfRunningActionsInTarget
-- @param self
-- @param #cc.Node node
-- @param #cc.Node target
-- @return long#long ret (return value: long)
--------------------------------
-- Removes all actions from a certain target.<br>
-- All the actions that belongs to the target will be removed.
-- @function [parent=#ActionManager] removeAllActionsFromTarget
-- @param self
-- @param #cc.Node node
-- @param #cc.Node target
--------------------------------
-- Resume a set of targets (convenience function to reverse a pauseAllRunningActions call)
-- @function [parent=#ActionManager] resumeTargets
-- @param self
-- @param #array_table array
-- @param #array_table targetsToResume
--------------------------------
-- Removes an action given an action reference.
-- @function [parent=#ActionManager] removeAction
-- @param self
-- @param #cc.Action action
--------------------------------
-- Removes all actions given its tag and the target
-- @function [parent=#ActionManager] removeAllActionsByTag
-- @param self
-- @param #int int
-- @param #cc.Node node
-- @param #int tag
-- @param #cc.Node target
--------------------------------
-- Pauses all running actions, returning a list of targets whose actions were paused.
-- @function [parent=#ActionManager] pauseAllRunningActions
-- @param self
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- js ctor
-- @function [parent=#ActionManager] ActionManager
-- @param self

21
cocos/scripting/lua-bindings/auto/api/ActionManagerEx.lua
View File

@ -9,27 +9,38 @@
-- @overload self, char, char
-- @function [parent=#ActionManagerEx] playActionByName
-- @param self
-- @param #char char
-- @param #char char
-- @param #cc.CallFunc callfunc
-- @param #char jsonName
-- @param #char actionName
-- @param #cc.CallFunc func
-- @return ActionObject#ActionObject ret (retunr value: ccs.ActionObject)
--------------------------------
-- Gets an ActionObject with a name.<br>
-- param jsonName UI file name<br>
-- param actionName action name in the UI file.<br>
-- return ActionObject which named as the param name
-- @function [parent=#ActionManagerEx] getActionByName
-- @param self
-- @param #char char
-- @param #char char
-- @param #char jsonName
-- @param #char actionName
-- @return ActionObject#ActionObject ret (return value: ccs.ActionObject)
--------------------------------
-- Release all actions.
-- @function [parent=#ActionManagerEx] releaseActions
-- @param self
--------------------------------
-- Purges ActionManager point.<br>
-- js purge<br>
-- lua destroyActionManager
-- @function [parent=#ActionManagerEx] destroyInstance
-- @param self
--------------------------------
-- Gets the static instance of ActionManager.<br>
-- js getInstance<br>
-- lua getInstance
-- @function [parent=#ActionManagerEx] getInstance
-- @param self
-- @return ActionManagerEx#ActionManagerEx ret (return value: ccs.ActionManagerEx)

12
cocos/scripting/lua-bindings/auto/api/ActionMoveFrame.lua
View File

@ -5,22 +5,30 @@
-- @parent_module ccs
--------------------------------
-- Changes the move action position.<br>
-- param the move action position.
-- @function [parent=#ActionMoveFrame] setPosition
-- @param self
-- @param #vec2_table vec2
-- @param #vec2_table pos
--------------------------------
-- Gets the ActionInterval of ActionFrame.<br>
-- parame duration the duration time of ActionFrame<br>
-- return ActionInterval
-- @function [parent=#ActionMoveFrame] getAction
-- @param self
-- @param #float float
-- @param #float duration
-- @return ActionInterval#ActionInterval ret (return value: cc.ActionInterval)
--------------------------------
-- Gets the move action position.<br>
-- return the move action position.
-- @function [parent=#ActionMoveFrame] getPosition
-- @param self
-- @return vec2_table#vec2_table ret (return value: vec2_table)
--------------------------------
-- Default constructor
-- @function [parent=#ActionMoveFrame] ActionMoveFrame
-- @param self

47
cocos/scripting/lua-bindings/auto/api/ActionObject.lua
View File

@ -5,35 +5,47 @@
-- @parent_module ccs
--------------------------------
-- Sets the current time of frame.<br>
-- param fTime the current time of frame
-- @function [parent=#ActionObject] setCurrentTime
-- @param self
-- @param #float float
-- @param #float fTime
--------------------------------
-- Pause the action.
-- @function [parent=#ActionObject] pause
-- @param self
--------------------------------
-- Sets name for object<br>
-- param name name of object
-- @function [parent=#ActionObject] setName
-- @param self
-- @param #char char
-- @param #char name
--------------------------------
-- Sets the time interval of frame.<br>
-- param fTime the time interval of frame
-- @function [parent=#ActionObject] setUnitTime
-- @param self
-- @param #float float
-- @param #float fTime
--------------------------------
-- Gets the total time of frame.<br>
-- return the total time of frame
-- @function [parent=#ActionObject] getTotalTime
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
-- Gets name of object<br>
-- return name of object
-- @function [parent=#ActionObject] getName
-- @param self
-- @return char#char ret (return value: char)
--------------------------------
-- Stop the action.
-- @function [parent=#ActionObject] stop
-- @param self
@ -42,54 +54,71 @@
-- @overload self
-- @function [parent=#ActionObject] play
-- @param self
-- @param #cc.CallFunc callfunc
-- @param #cc.CallFunc func
--------------------------------
-- Gets the current time of frame.<br>
-- return the current time of frame
-- @function [parent=#ActionObject] getCurrentTime
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
-- Removes a ActionNode which play the action.<br>
-- param node the ActionNode which play the action
-- @function [parent=#ActionObject] removeActionNode
-- @param self
-- @param #ccs.ActionNode actionnode
-- @param #ccs.ActionNode node
--------------------------------
-- Gets if the action will loop play.<br>
-- return that if the action will loop play
-- @function [parent=#ActionObject] getLoop
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
-- Adds a ActionNode to play the action.<br>
-- param node the ActionNode which will play the action
-- @function [parent=#ActionObject] addActionNode
-- @param self
-- @param #ccs.ActionNode actionnode
-- @param #ccs.ActionNode node
--------------------------------
-- Gets the time interval of frame.<br>
-- return the time interval of frame
-- @function [parent=#ActionObject] getUnitTime
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
-- Return if the action is playing.<br>
-- return true if the action is playing, false the otherwise
-- @function [parent=#ActionObject] isPlaying
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#ActionObject] updateToFrameByTime
-- @param self
-- @param #float float
-- @param #float fTime
--------------------------------
-- Sets if the action will loop play.<br>
-- param bLoop that if the action will loop play
-- @function [parent=#ActionObject] setLoop
-- @param self
-- @param #bool bool
-- @param #bool bLoop
--------------------------------
--
-- @function [parent=#ActionObject] simulationActionUpdate
-- @param self
-- @param #float float
-- @param #float dt
--------------------------------
-- Default constructor
-- @function [parent=#ActionObject] ActionObject
-- @param self

11
cocos/scripting/lua-bindings/auto/api/ActionRotationFrame.lua
View File

@ -5,25 +5,30 @@
-- @parent_module ccs
--------------------------------
-- Changes rotate action rotation.<br>
-- param rotation rotate action rotation.
-- @function [parent=#ActionRotationFrame] setRotation
-- @param self
-- @param #float float
-- @param #float rotation
--------------------------------
-- @overload self, float, ccs.ActionFrame
-- @overload self, float
-- @function [parent=#ActionRotationFrame] getAction
-- @param self
-- @param #float float
-- @param #ccs.ActionFrame actionframe
-- @param #float duration
-- @param #ccs.ActionFrame srcFrame
-- @return ActionInterval#ActionInterval ret (retunr value: cc.ActionInterval)
--------------------------------
-- Gets the rotate action rotation.<br>
-- return the rotate action rotation.
-- @function [parent=#ActionRotationFrame] getRotation
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
-- Default constructor
-- @function [parent=#ActionRotationFrame] ActionRotationFrame
-- @param self

18
cocos/scripting/lua-bindings/auto/api/ActionScaleFrame.lua
View File

@ -5,32 +5,44 @@
-- @parent_module ccs
--------------------------------
-- Changes the scale action scaleY.<br>
-- param rotation the scale action scaleY.
-- @function [parent=#ActionScaleFrame] setScaleY
-- @param self
-- @param #float float
-- @param #float scaleY
--------------------------------
-- Changes the scale action scaleX.<br>
-- param the scale action scaleX.
-- @function [parent=#ActionScaleFrame] setScaleX
-- @param self
-- @param #float float
-- @param #float scaleX
--------------------------------
-- Gets the scale action scaleY.<br>
-- return the the scale action scaleY.
-- @function [parent=#ActionScaleFrame] getScaleY
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
-- Gets the scale action scaleX.<br>
-- return the scale action scaleX.
-- @function [parent=#ActionScaleFrame] getScaleX
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
-- Gets the ActionInterval of ActionFrame.<br>
-- parame duration the duration time of ActionFrame<br>
-- return ActionInterval
-- @function [parent=#ActionScaleFrame] getAction
-- @param self
-- @param #float float
-- @param #float duration
-- @return ActionInterval#ActionInterval ret (return value: cc.ActionInterval)
--------------------------------
-- Default constructor
-- @function [parent=#ActionScaleFrame] ActionScaleFrame
-- @param self

51
cocos/scripting/lua-bindings/auto/api/ActionTimeline.lua
View File

@ -5,79 +5,98 @@
-- @parent_module ccs
--------------------------------
--
-- @function [parent=#ActionTimeline] getTimelines
-- @param self
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- Get current frame.
-- @function [parent=#ActionTimeline] getCurrentFrame
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
-- Start frame index of this action
-- @function [parent=#ActionTimeline] getStartFrame
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
-- Pause the animation.
-- @function [parent=#ActionTimeline] pause
-- @param self
--------------------------------
-- Set ActionTimeline's frame event callback function
-- @function [parent=#ActionTimeline] setFrameEventCallFunc
-- @param self
-- @param #function func
-- @param #function listener
--------------------------------
-- Resume the animation.
-- @function [parent=#ActionTimeline] resume
-- @param self
--------------------------------
--
-- @function [parent=#ActionTimeline] getDuration
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
-- add Timeline to ActionTimeline
-- @function [parent=#ActionTimeline] addTimeline
-- @param self
-- @param #ccs.Timeline timeline
--------------------------------
-- End frame of this action.<br>
-- When action play to this frame, if action is not loop, then it will stop, <br>
-- or it will play from start frame again.
-- @function [parent=#ActionTimeline] getEndFrame
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
-- Set current frame index, this will cause action plays to this frame.
-- @function [parent=#ActionTimeline] setCurrentFrame
-- @param self
-- @param #int int
-- @param #int frameIndex
--------------------------------
-- Set the animation speed, this will speed up or slow down the speed.
-- @function [parent=#ActionTimeline] setTimeSpeed
-- @param self
-- @param #float float
-- @param #float speed
--------------------------------
--
-- @function [parent=#ActionTimeline] init
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
-- duration of the whole action
-- @function [parent=#ActionTimeline] setDuration
-- @param self
-- @param #int int
-- @param #int duration
--------------------------------
-- Get current animation speed.
-- @function [parent=#ActionTimeline] getTimeSpeed
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
-- Goto the specified frame index, and pause at this index.<br>
-- param startIndex The animation will pause at this index.
-- @function [parent=#ActionTimeline] gotoFrameAndPause
-- @param self
-- @param #int int
-- @param #int startIndex
--------------------------------
-- Whether or not Action is playing.
-- @function [parent=#ActionTimeline] isPlaying
-- @param self
-- @return bool#bool ret (return value: bool)
@ -89,51 +108,61 @@
-- @overload self, int, int, int, bool
-- @function [parent=#ActionTimeline] gotoFrameAndPlay
-- @param self
-- @param #int int
-- @param #int int
-- @param #int int
-- @param #bool bool
-- @param #int startIndex
-- @param #int endIndex
-- @param #int currentFrameIndex
-- @param #bool loop
--------------------------------
--
-- @function [parent=#ActionTimeline] removeTimeline
-- @param self
-- @param #ccs.Timeline timeline
--------------------------------
--
-- @function [parent=#ActionTimeline] clearFrameEventCallFunc
-- @param self
--------------------------------
--
-- @function [parent=#ActionTimeline] create
-- @param self
-- @return ActionTimeline#ActionTimeline ret (return value: ccs.ActionTimeline)
--------------------------------
--
-- @function [parent=#ActionTimeline] step
-- @param self
-- @param #float float
-- @param #float delta
--------------------------------
--
-- @function [parent=#ActionTimeline] startWithTarget
-- @param self
-- @param #cc.Node node
-- @param #cc.Node target
--------------------------------
-- Returns a clone of ActionTimeline
-- @function [parent=#ActionTimeline] clone
-- @param self
-- @return ActionTimeline#ActionTimeline ret (return value: ccs.ActionTimeline)
--------------------------------
-- Returns a reverse of ActionTimeline. <br>
-- Not implement yet.
-- @function [parent=#ActionTimeline] reverse
-- @param self
-- @return ActionTimeline#ActionTimeline ret (return value: ccs.ActionTimeline)
--------------------------------
--
-- @function [parent=#ActionTimeline] isDone
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#ActionTimeline] ActionTimeline
-- @param self

17
cocos/scripting/lua-bindings/auto/api/ActionTimelineCache.lua
View File

@ -4,38 +4,45 @@
-- @parent_module ccs
--------------------------------
-- Clone a action with the specified name from the container.
-- @function [parent=#ActionTimelineCache] createAction
-- @param self
-- @param #string str
-- @param #string fileName
-- @return ActionTimeline#ActionTimeline ret (return value: ccs.ActionTimeline)
--------------------------------
--
-- @function [parent=#ActionTimelineCache] purge
-- @param self
--------------------------------
--
-- @function [parent=#ActionTimelineCache] init
-- @param self
--------------------------------
--
-- @function [parent=#ActionTimelineCache] loadAnimationActionWithContent
-- @param self
-- @param #string str
-- @param #string str
-- @param #string fileName
-- @param #string content
-- @return ActionTimeline#ActionTimeline ret (return value: ccs.ActionTimeline)
--------------------------------
--
-- @function [parent=#ActionTimelineCache] loadAnimationActionWithFile
-- @param self
-- @param #string str
-- @param #string fileName
-- @return ActionTimeline#ActionTimeline ret (return value: ccs.ActionTimeline)
--------------------------------
-- Remove action with filename, and also remove other resource relate with this file
-- @function [parent=#ActionTimelineCache] removeAction
-- @param self
-- @param #string str
-- @param #string fileName
--------------------------------
-- Destroys the singleton
-- @function [parent=#ActionTimelineCache] destroyInstance
-- @param self

7
cocos/scripting/lua-bindings/auto/api/ActionTimelineData.lua
View File

@ -5,19 +5,22 @@
-- @parent_module ccs
--------------------------------
--
-- @function [parent=#ActionTimelineData] setActionTag
-- @param self
-- @param #int int
-- @param #int actionTag
--------------------------------
--
-- @function [parent=#ActionTimelineData] getActionTag
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
--
-- @function [parent=#ActionTimelineData] create
-- @param self
-- @param #int int
-- @param #int actionTag
-- @return ActionTimelineData#ActionTimelineData ret (return value: ccs.ActionTimelineData)
return nil

12
cocos/scripting/lua-bindings/auto/api/ActionTintFrame.lua
View File

@ -5,22 +5,30 @@
-- @parent_module ccs
--------------------------------
-- Gets the tint action color.<br>
-- return the tint action color.
-- @function [parent=#ActionTintFrame] getColor
-- @param self
-- @return color3b_table#color3b_table ret (return value: color3b_table)
--------------------------------
-- Gets the ActionInterval of ActionFrame.<br>
-- parame duration the duration time of ActionFrame<br>
-- return ActionInterval
-- @function [parent=#ActionTintFrame] getAction
-- @param self
-- @param #float float
-- @param #float duration
-- @return ActionInterval#ActionInterval ret (return value: cc.ActionInterval)
--------------------------------
-- Changes the tint action color.<br>
-- param ccolor the tint action color
-- @function [parent=#ActionTintFrame] setColor
-- @param self
-- @param #color3b_table color3b
-- @param #color3b_table ccolor
--------------------------------
-- Default constructor
-- @function [parent=#ActionTintFrame] ActionTintFrame
-- @param self

17
cocos/scripting/lua-bindings/auto/api/ActionTween.lua
View File

@ -5,30 +5,35 @@
-- @parent_module cc
--------------------------------
-- creates an initializes the action with the property name (key), and the from and to parameters.
-- @function [parent=#ActionTween] create
-- @param self
-- @param #float float
-- @param #string str
-- @param #float float
-- @param #float float
-- @param #float duration
-- @param #string key
-- @param #float from
-- @param #float to
-- @return ActionTween#ActionTween ret (return value: cc.ActionTween)
--------------------------------
--
-- @function [parent=#ActionTween] startWithTarget
-- @param self
-- @param #cc.Node node
-- @param #cc.Node target
--------------------------------
--
-- @function [parent=#ActionTween] clone
-- @param self
-- @return ActionTween#ActionTween ret (return value: cc.ActionTween)
--------------------------------
--
-- @function [parent=#ActionTween] update
-- @param self
-- @param #float float
-- @param #float dt
--------------------------------
--
-- @function [parent=#ActionTween] reverse
-- @param self
-- @return ActionTween#ActionTween ret (return value: cc.ActionTween)

7
cocos/scripting/lua-bindings/auto/api/AnchorPointFrame.lua
View File

@ -5,26 +5,31 @@
-- @parent_module ccs
--------------------------------
--
-- @function [parent=#AnchorPointFrame] setAnchorPoint
-- @param self
-- @param #vec2_table vec2
-- @param #vec2_table point
--------------------------------
--
-- @function [parent=#AnchorPointFrame] getAnchorPoint
-- @param self
-- @return vec2_table#vec2_table ret (return value: vec2_table)
--------------------------------
--
-- @function [parent=#AnchorPointFrame] create
-- @param self
-- @return AnchorPointFrame#AnchorPointFrame ret (return value: ccs.AnchorPointFrame)
--------------------------------
--
-- @function [parent=#AnchorPointFrame] clone
-- @param self
-- @return Frame#Frame ret (return value: ccs.Frame)
--------------------------------
--
-- @function [parent=#AnchorPointFrame] AnchorPointFrame
-- @param self

11
cocos/scripting/lua-bindings/auto/api/Animate.lua
View File

@ -12,38 +12,45 @@
-- @return Animation#Animation ret (retunr value: cc.Animation)
--------------------------------
-- sets the Animation object to be animated
-- @function [parent=#Animate] setAnimation
-- @param self
-- @param #cc.Animation animation
--------------------------------
-- creates the action with an Animation and will restore the original frame when the animation is over
-- @function [parent=#Animate] create
-- @param self
-- @param #cc.Animation animation
-- @return Animate#Animate ret (return value: cc.Animate)
--------------------------------
--
-- @function [parent=#Animate] startWithTarget
-- @param self
-- @param #cc.Node node
-- @param #cc.Node target
--------------------------------
--
-- @function [parent=#Animate] clone
-- @param self
-- @return Animate#Animate ret (return value: cc.Animate)
--------------------------------
--
-- @function [parent=#Animate] stop
-- @param self
--------------------------------
--
-- @function [parent=#Animate] reverse
-- @param self
-- @return Animate#Animate ret (return value: cc.Animate)
--------------------------------
--
-- @function [parent=#Animate] update
-- @param self
-- @param #float float
-- @param #float t
return nil

25
cocos/scripting/lua-bindings/auto/api/Animate3D.lua
View File

@ -5,21 +5,25 @@
-- @parent_module cc
--------------------------------
--
-- @function [parent=#Animate3D] setSpeed
-- @param self
-- @param #float float
-- @param #float speed
--------------------------------
--
-- @function [parent=#Animate3D] setWeight
-- @param self
-- @param #float float
-- @param #float weight
--------------------------------
-- get & set speed, negative speed means playing reverse
-- @function [parent=#Animate3D] getSpeed
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
-- get & set blend weight, weight must positive
-- @function [parent=#Animate3D] getWeight
-- @param self
-- @return float#float ret (return value: float)
@ -29,34 +33,39 @@
-- @overload self, cc.Animation3D
-- @function [parent=#Animate3D] create
-- @param self
-- @param #cc.Animation3D animation3d
-- @param #float float
-- @param #float float
-- @param #cc.Animation3D animation
-- @param #float fromTime
-- @param #float duration
-- @return Animate3D#Animate3D ret (retunr value: cc.Animate3D)
--------------------------------
--
-- @function [parent=#Animate3D] startWithTarget
-- @param self
-- @param #cc.Node node
-- @param #cc.Node target
--------------------------------
--
-- @function [parent=#Animate3D] step
-- @param self
-- @param #float float
-- @param #float dt
--------------------------------
--
-- @function [parent=#Animate3D] clone
-- @param self
-- @return Animate3D#Animate3D ret (return value: cc.Animate3D)
--------------------------------
--
-- @function [parent=#Animate3D] reverse
-- @param self
-- @return Animate3D#Animate3D ret (return value: cc.Animate3D)
--------------------------------
--
-- @function [parent=#Animate3D] update
-- @param self
-- @param #float float
-- @param #float t
return nil

46
cocos/scripting/lua-bindings/auto/api/Animation.lua
View File

@ -5,74 +5,93 @@
-- @parent_module cc
--------------------------------
-- Gets the times the animation is going to loop. 0 means animation is not animated. 1, animation is executed one time, ...
-- @function [parent=#Animation] getLoops
-- @param self
-- @return unsigned int#unsigned int ret (return value: unsigned int)
--------------------------------
-- Adds a SpriteFrame to a Animation.<br>
-- The frame will be added with one "delay unit".
-- @function [parent=#Animation] addSpriteFrame
-- @param self
-- @param #cc.SpriteFrame spriteframe
-- @param #cc.SpriteFrame frame
--------------------------------
-- Sets whether to restore the original frame when animation finishes
-- @function [parent=#Animation] setRestoreOriginalFrame
-- @param self
-- @param #bool bool
-- @param #bool restoreOriginalFrame
--------------------------------
--
-- @function [parent=#Animation] clone
-- @param self
-- @return Animation#Animation ret (return value: cc.Animation)
--------------------------------
-- Gets the duration in seconds of the whole animation. It is the result of totalDelayUnits * delayPerUnit
-- @function [parent=#Animation] getDuration
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
-- Sets the array of AnimationFrames
-- @function [parent=#Animation] setFrames
-- @param self
-- @param #array_table array
-- @param #array_table frames
--------------------------------
-- Gets the array of AnimationFrames
-- @function [parent=#Animation] getFrames
-- @param self
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- Sets the times the animation is going to loop. 0 means animation is not animated. 1, animation is executed one time, ...
-- @function [parent=#Animation] setLoops
-- @param self
-- @param #unsigned int int
-- @param #unsigned int loops
--------------------------------
-- Sets the delay in seconds of the "delay unit"
-- @function [parent=#Animation] setDelayPerUnit
-- @param self
-- @param #float float
-- @param #float delayPerUnit
--------------------------------
-- Adds a frame with an image filename. Internally it will create a SpriteFrame and it will add it.<br>
-- The frame will be added with one "delay unit".<br>
-- Added to facilitate the migration from v0.8 to v0.9.
-- @function [parent=#Animation] addSpriteFrameWithFile
-- @param self
-- @param #string str
-- @param #string filename
--------------------------------
-- Gets the total Delay units of the Animation.
-- @function [parent=#Animation] getTotalDelayUnits
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
-- Gets the delay in seconds of the "delay unit"
-- @function [parent=#Animation] getDelayPerUnit
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
-- Checks whether to restore the original frame when animation finishes.
-- @function [parent=#Animation] getRestoreOriginalFrame
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
-- Adds a frame with a texture and a rect. Internally it will create a SpriteFrame and it will add it.<br>
-- The frame will be added with one "delay unit".<br>
-- Added to facilitate the migration from v0.8 to v0.9.
-- @function [parent=#Animation] addSpriteFrameWithTexture
-- @param self
-- @param #cc.Texture2D texture2d
-- @param #cc.Texture2D pobTexture
-- @param #rect_table rect
--------------------------------
@ -80,17 +99,18 @@
-- @overload self
-- @function [parent=#Animation] create
-- @param self
-- @param #array_table array
-- @param #float float
-- @param #unsigned int int
-- @param #array_table arrayOfAnimationFrameNames
-- @param #float delayPerUnit
-- @param #unsigned int loops
-- @return Animation#Animation ret (retunr value: cc.Animation)
--------------------------------
--
-- @function [parent=#Animation] createWithSpriteFrames
-- @param self
-- @param #array_table array
-- @param #float float
-- @param #unsigned int int
-- @param #array_table arrayOfSpriteFrameNames
-- @param #float delay
-- @param #unsigned int loops
-- @return Animation#Animation ret (return value: cc.Animation)
return nil

6
cocos/scripting/lua-bindings/auto/api/Animation3D.lua
View File

@ -5,15 +5,17 @@
-- @parent_module cc
--------------------------------
-- get duration
-- @function [parent=#Animation3D] getDuration
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
-- read all animation or only the animation with given animationName? animationName == "" read the first.
-- @function [parent=#Animation3D] create
-- @param self
-- @param #string str
-- @param #string str
-- @param #string filename
-- @param #string animationName
-- @return Animation3D#Animation3D ret (return value: cc.Animation3D)
return nil

30
cocos/scripting/lua-bindings/auto/api/AnimationCache.lua
View File

@ -5,48 +5,66 @@
-- @parent_module cc
--------------------------------
-- Returns a Animation that was previously added.<br>
-- If the name is not found it will return nil.<br>
-- You should retain the returned copy if you are going to use it.
-- @function [parent=#AnimationCache] getAnimation
-- @param self
-- @param #string str
-- @param #string name
-- @return Animation#Animation ret (return value: cc.Animation)
--------------------------------
-- Adds a Animation with a name.
-- @function [parent=#AnimationCache] addAnimation
-- @param self
-- @param #cc.Animation animation
-- @param #string str
-- @param #string name
--------------------------------
--
-- @function [parent=#AnimationCache] init
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
-- Adds an animation from an NSDictionary<br>
-- Make sure that the frames were previously loaded in the SpriteFrameCache.<br>
-- param plist The path of the relative file,it use to find the plist path for load SpriteFrames.<br>
-- since v1.1
-- @function [parent=#AnimationCache] addAnimationsWithDictionary
-- @param self
-- @param #map_table map
-- @param #string str
-- @param #map_table dictionary
-- @param #string plist
--------------------------------
-- Deletes a Animation from the cache.
-- @function [parent=#AnimationCache] removeAnimation
-- @param self
-- @param #string str
-- @param #string name
--------------------------------
-- Adds an animation from a plist file.<br>
-- Make sure that the frames were previously loaded in the SpriteFrameCache.<br>
-- since v1.1<br>
-- js addAnimations<br>
-- lua addAnimations
-- @function [parent=#AnimationCache] addAnimationsWithFile
-- @param self
-- @param #string str
-- @param #string plist
--------------------------------
-- Purges the cache. It releases all the Animation objects and the shared instance.
-- @function [parent=#AnimationCache] destroyInstance
-- @param self
--------------------------------
-- Returns the shared instance of the Animation cache
-- @function [parent=#AnimationCache] getInstance
-- @param self
-- @return AnimationCache#AnimationCache ret (return value: cc.AnimationCache)
--------------------------------
-- js ctor
-- @function [parent=#AnimationCache] AnimationCache
-- @param self

9
cocos/scripting/lua-bindings/auto/api/AnimationData.lua
View File

@ -5,27 +5,32 @@
-- @parent_module ccs
--------------------------------
--
-- @function [parent=#AnimationData] getMovement
-- @param self
-- @param #string str
-- @param #string movementName
-- @return MovementData#MovementData ret (return value: ccs.MovementData)
--------------------------------
--
-- @function [parent=#AnimationData] getMovementCount
-- @param self
-- @return long#long ret (return value: long)
--------------------------------
--
-- @function [parent=#AnimationData] addMovement
-- @param self
-- @param #ccs.MovementData movementdata
-- @param #ccs.MovementData movData
--------------------------------
--
-- @function [parent=#AnimationData] create
-- @param self
-- @return AnimationData#AnimationData ret (return value: ccs.AnimationData)
--------------------------------
-- js ctor
-- @function [parent=#AnimationData] AnimationData
-- @param self

20
cocos/scripting/lua-bindings/auto/api/AnimationFrame.lua
View File

@ -5,9 +5,10 @@
-- @parent_module cc
--------------------------------
--
-- @function [parent=#AnimationFrame] setSpriteFrame
-- @param self
-- @param #cc.SpriteFrame spriteframe
-- @param #cc.SpriteFrame frame
--------------------------------
-- @overload self
@ -17,36 +18,43 @@
-- @return map_table#map_table ret (retunr value: map_table)
--------------------------------
-- Sets the units of time the frame takes
-- @function [parent=#AnimationFrame] setDelayUnits
-- @param self
-- @param #float float
-- @param #float delayUnits
--------------------------------
--
-- @function [parent=#AnimationFrame] clone
-- @param self
-- @return AnimationFrame#AnimationFrame ret (return value: cc.AnimationFrame)
--------------------------------
--
-- @function [parent=#AnimationFrame] getSpriteFrame
-- @param self
-- @return SpriteFrame#SpriteFrame ret (return value: cc.SpriteFrame)
--------------------------------
-- Gets the units of time the frame takes
-- @function [parent=#AnimationFrame] getDelayUnits
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
-- Sets user infomation
-- @function [parent=#AnimationFrame] setUserInfo
-- @param self
-- @param #map_table map
-- @param #map_table userInfo
--------------------------------
-- Creates the animation frame with a spriteframe, number of delay units and a notification user info<br>
-- since 3.0
-- @function [parent=#AnimationFrame] create
-- @param self
-- @param #cc.SpriteFrame spriteframe
-- @param #float float
-- @param #map_table map
-- @param #cc.SpriteFrame spriteFrame
-- @param #float delayUnits
-- @param #map_table userInfo
-- @return AnimationFrame#AnimationFrame ret (return value: cc.AnimationFrame)
return nil

11
cocos/scripting/lua-bindings/auto/api/Application.lua
View File

@ -4,26 +4,35 @@
-- @parent_module cc
--------------------------------
-- brief Get target platform
-- @function [parent=#Application] getTargetPlatform
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
-- brief Get current language iso 639-1 code<br>
-- return Current language iso 639-1 code
-- @function [parent=#Application] getCurrentLanguageCode
-- @param self
-- @return char#char ret (return value: char)
--------------------------------
-- brief Get current language config<br>
-- return Current language config
-- @function [parent=#Application] getCurrentLanguage
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
-- brief Callback by Director to limit FPS.<br>
-- param interval The time, expressed in seconds, between current frame and next.
-- @function [parent=#Application] setAnimationInterval
-- @param self
-- @param #double double
-- @param #double interval
--------------------------------
-- brief Get current application instance.<br>
-- return Current application instance pointer.
-- @function [parent=#Application] getInstance
-- @param self
-- @return Application#Application ret (return value: cc.Application)

72
cocos/scripting/lua-bindings/auto/api/Armature.lua
View File

@ -5,55 +5,70 @@
-- @parent_module ccs
--------------------------------
-- Get a bone with the specified name<br>
-- param name The bone's name you want to get
-- @function [parent=#Armature] getBone
-- @param self
-- @param #string str
-- @param #string name
-- @return Bone#Bone ret (return value: ccs.Bone)
--------------------------------
-- Change a bone's parent with the specified parent name.<br>
-- param bone The bone you want to change parent<br>
-- param parentName The new parent's name.
-- @function [parent=#Armature] changeBoneParent
-- @param self
-- @param #ccs.Bone bone
-- @param #string str
-- @param #string parentName
--------------------------------
--
-- @function [parent=#Armature] setAnimation
-- @param self
-- @param #ccs.ArmatureAnimation armatureanimation
-- @param #ccs.ArmatureAnimation animation
--------------------------------
--
-- @function [parent=#Armature] getBoneAtPoint
-- @param self
-- @param #float float
-- @param #float float
-- @param #float x
-- @param #float y
-- @return Bone#Bone ret (return value: ccs.Bone)
--------------------------------
--
-- @function [parent=#Armature] getArmatureTransformDirty
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#Armature] setVersion
-- @param self
-- @param #float float
-- @param #float version
--------------------------------
-- Set contentsize and Calculate anchor point.
-- @function [parent=#Armature] updateOffsetPoint
-- @param self
--------------------------------
--
-- @function [parent=#Armature] getParentBone
-- @param self
-- @return Bone#Bone ret (return value: ccs.Bone)
--------------------------------
-- Remove a bone with the specified name. If recursion it will also remove child Bone recursionly.<br>
-- param bone The bone you want to remove<br>
-- param recursion Determine whether remove the bone's child recursion.
-- @function [parent=#Armature] removeBone
-- @param self
-- @param #ccs.Bone bone
-- @param #bool bool
-- @param #bool recursion
--------------------------------
--
-- @function [parent=#Armature] getBatchNode
-- @param self
-- @return BatchNode#BatchNode ret (return value: ccs.BatchNode)
@ -64,51 +79,63 @@
-- @overload self, string, ccs.Bone
-- @function [parent=#Armature] init
-- @param self
-- @param #string str
-- @param #ccs.Bone bone
-- @param #string name
-- @param #ccs.Bone parentBone
-- @return bool#bool ret (retunr value: bool)
--------------------------------
--
-- @function [parent=#Armature] setParentBone
-- @param self
-- @param #ccs.Bone bone
-- @param #ccs.Bone parentBone
--------------------------------
--
-- @function [parent=#Armature] drawContour
-- @param self
--------------------------------
--
-- @function [parent=#Armature] setBatchNode
-- @param self
-- @param #ccs.BatchNode batchnode
-- @param #ccs.BatchNode batchNode
--------------------------------
--
-- @function [parent=#Armature] setArmatureData
-- @param self
-- @param #ccs.ArmatureData armaturedata
-- @param #ccs.ArmatureData armatureData
--------------------------------
-- Add a Bone to this Armature,<br>
-- param bone The Bone you want to add to Armature<br>
-- param parentName The parent Bone's name you want to add to . If it's nullptr, then set Armature to its parent
-- @function [parent=#Armature] addBone
-- @param self
-- @param #ccs.Bone bone
-- @param #string str
-- @param #string parentName
--------------------------------
--
-- @function [parent=#Armature] getArmatureData
-- @param self
-- @return ArmatureData#ArmatureData ret (return value: ccs.ArmatureData)
--------------------------------
--
-- @function [parent=#Armature] getVersion
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#Armature] getAnimation
-- @param self
-- @return ArmatureAnimation#ArmatureAnimation ret (return value: ccs.ArmatureAnimation)
--------------------------------
-- Get Armature's bone dictionary<br>
-- return Armature's bone dictionary
-- @function [parent=#Armature] getBoneDic
-- @param self
-- @return map_table#map_table ret (return value: map_table)
@ -119,43 +146,50 @@
-- @overload self, string, ccs.Bone
-- @function [parent=#Armature] create
-- @param self
-- @param #string str
-- @param #ccs.Bone bone
-- @param #string name
-- @param #ccs.Bone parentBone
-- @return Armature#Armature ret (retunr value: ccs.Armature)
--------------------------------
--
-- @function [parent=#Armature] setAnchorPoint
-- @param self
-- @param #vec2_table vec2
-- @param #vec2_table point
--------------------------------
--
-- @function [parent=#Armature] draw
-- @param self
-- @param #cc.Renderer renderer
-- @param #mat4_table mat4
-- @param #unsigned int int
-- @param #mat4_table transform
-- @param #unsigned int flags
--------------------------------
--
-- @function [parent=#Armature] getAnchorPointInPoints
-- @param self
-- @return vec2_table#vec2_table ret (return value: vec2_table)
--------------------------------
--
-- @function [parent=#Armature] update
-- @param self
-- @param #float float
-- @param #float dt
--------------------------------
--
-- @function [parent=#Armature] getNodeToParentTransform
-- @param self
-- @return mat4_table#mat4_table ret (return value: mat4_table)
--------------------------------
-- This boundingBox will calculate all bones' boundingBox every time
-- @function [parent=#Armature] getBoundingBox
-- @param self
-- @return rect_table#rect_table ret (return value: rect_table)
--------------------------------
-- js ctor
-- @function [parent=#Armature] Armature
-- @param self

71
cocos/scripting/lua-bindings/auto/api/ArmatureAnimation.lua
View File

@ -5,103 +5,140 @@
-- @parent_module ccs
--------------------------------
--
-- @function [parent=#ArmatureAnimation] getSpeedScale
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
-- Pause the Process
-- @function [parent=#ArmatureAnimation] pause
-- @param self
--------------------------------
-- Scale animation play speed.<br>
-- param animationScale Scale value
-- @function [parent=#ArmatureAnimation] setSpeedScale
-- @param self
-- @param #float float
-- @param #float speedScale
--------------------------------
-- Init with a Armature<br>
-- param armature The Armature ArmatureAnimation will bind to
-- @function [parent=#ArmatureAnimation] init
-- @param self
-- @param #ccs.Armature armature
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#ArmatureAnimation] playWithIndexes
-- @param self
-- @param #array_table array
-- @param #int int
-- @param #bool bool
-- @param #array_table movementIndexes
-- @param #int durationTo
-- @param #bool loop
--------------------------------
-- Play animation by animation name.<br>
-- param animationName The animation name you want to play<br>
-- param durationTo The frames between two animation changing-over.<br>
-- It's meaning is changing to this animation need how many frames<br>
-- -1 : use the value from MovementData get from flash design panel<br>
-- param loop Whether the animation is loop<br>
-- loop < 0 : use the value from MovementData get from flash design panel<br>
-- loop = 0 : this animation is not loop<br>
-- loop > 0 : this animation is loop
-- @function [parent=#ArmatureAnimation] play
-- @param self
-- @param #string str
-- @param #int int
-- @param #int int
-- @param #string animationName
-- @param #int durationTo
-- @param #int loop
--------------------------------
-- Go to specified frame and pause current movement.
-- @function [parent=#ArmatureAnimation] gotoAndPause
-- @param self
-- @param #int int
-- @param #int frameIndex
--------------------------------
-- Resume the Process
-- @function [parent=#ArmatureAnimation] resume
-- @param self
--------------------------------
-- Stop the Process
-- @function [parent=#ArmatureAnimation] stop
-- @param self
--------------------------------
--
-- @function [parent=#ArmatureAnimation] update
-- @param self
-- @param #float float
-- @param #float dt
--------------------------------
--
-- @function [parent=#ArmatureAnimation] getAnimationData
-- @param self
-- @return AnimationData#AnimationData ret (return value: ccs.AnimationData)
--------------------------------
--
-- @function [parent=#ArmatureAnimation] playWithIndex
-- @param self
-- @param #int int
-- @param #int int
-- @param #int int
-- @param #int animationIndex
-- @param #int durationTo
-- @param #int loop
--------------------------------
-- Get current movementID<br>
-- return The name of current movement
-- @function [parent=#ArmatureAnimation] getCurrentMovementID
-- @param self
-- @return string#string ret (return value: string)
--------------------------------
--
-- @function [parent=#ArmatureAnimation] setAnimationData
-- @param self
-- @param #ccs.AnimationData animationdata
-- @param #ccs.AnimationData data
--------------------------------
-- Go to specified frame and play current movement.<br>
-- You need first switch to the movement you want to play, then call this function.<br>
-- example : playByIndex(0);<br>
-- gotoAndPlay(0);<br>
-- playByIndex(1);<br>
-- gotoAndPlay(0);<br>
-- gotoAndPlay(15);
-- @function [parent=#ArmatureAnimation] gotoAndPlay
-- @param self
-- @param #int int
-- @param #int frameIndex
--------------------------------
--
-- @function [parent=#ArmatureAnimation] playWithNames
-- @param self
-- @param #array_table array
-- @param #int int
-- @param #bool bool
-- @param #array_table movementNames
-- @param #int durationTo
-- @param #bool loop
--------------------------------
-- Get movement count
-- @function [parent=#ArmatureAnimation] getMovementCount
-- @param self
-- @return long#long ret (return value: long)
--------------------------------
-- Create with a Armature<br>
-- param armature The Armature ArmatureAnimation will bind to
-- @function [parent=#ArmatureAnimation] create
-- @param self
-- @param #ccs.Armature armature
-- @return ArmatureAnimation#ArmatureAnimation ret (return value: ccs.ArmatureAnimation)
--------------------------------
-- js ctor
-- @function [parent=#ArmatureAnimation] ArmatureAnimation
-- @param self

9
cocos/scripting/lua-bindings/auto/api/ArmatureData.lua
View File

@ -5,27 +5,32 @@
-- @parent_module ccs
--------------------------------
--
-- @function [parent=#ArmatureData] addBoneData
-- @param self
-- @param #ccs.BoneData bonedata
-- @param #ccs.BoneData boneData
--------------------------------
--
-- @function [parent=#ArmatureData] init
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#ArmatureData] getBoneData
-- @param self
-- @param #string str
-- @param #string boneName
-- @return BoneData#BoneData ret (return value: ccs.BoneData)
--------------------------------
--
-- @function [parent=#ArmatureData] create
-- @param self
-- @return ArmatureData#ArmatureData ret (return value: ccs.ArmatureData)
--------------------------------
-- js ctor
-- @function [parent=#ArmatureData] ArmatureData
-- @param self

77
cocos/scripting/lua-bindings/auto/api/ArmatureDataManager.lua
View File

@ -5,110 +5,143 @@
-- @parent_module ccs
--------------------------------
--
-- @function [parent=#ArmatureDataManager] getAnimationDatas
-- @param self
-- @return map_table#map_table ret (return value: map_table)
--------------------------------
-- brief remove animation data<br>
-- param id the id of the animation data
-- @function [parent=#ArmatureDataManager] removeAnimationData
-- @param self
-- @param #string str
-- @param #string id
--------------------------------
-- Add armature data<br>
-- param id The id of the armature data<br>
-- param armatureData ArmatureData *
-- @function [parent=#ArmatureDataManager] addArmatureData
-- @param self
-- @param #string str
-- @param #ccs.ArmatureData armaturedata
-- @param #string str
-- @param #string id
-- @param #ccs.ArmatureData armatureData
-- @param #string configFilePath
--------------------------------
-- @overload self, string, string, string
-- @overload self, string
-- @function [parent=#ArmatureDataManager] addArmatureFileInfo
-- @param self
-- @param #string str
-- @param #string str
-- @param #string str
-- @param #string imagePath
-- @param #string plistPath
-- @param #string configFilePath
--------------------------------
--
-- @function [parent=#ArmatureDataManager] removeArmatureFileInfo
-- @param self
-- @param #string str
-- @param #string configFilePath
--------------------------------
--
-- @function [parent=#ArmatureDataManager] getTextureDatas
-- @param self
-- @return map_table#map_table ret (return value: map_table)
--------------------------------
-- brief get texture data<br>
-- param id the id of the texture data you want to get<br>
-- return TextureData *
-- @function [parent=#ArmatureDataManager] getTextureData
-- @param self
-- @param #string str
-- @param #string id
-- @return TextureData#TextureData ret (return value: ccs.TextureData)
--------------------------------
-- brief get armature data<br>
-- param id the id of the armature data you want to get<br>
-- return ArmatureData *
-- @function [parent=#ArmatureDataManager] getArmatureData
-- @param self
-- @param #string str
-- @param #string id
-- @return ArmatureData#ArmatureData ret (return value: ccs.ArmatureData)
--------------------------------
-- brief get animation data from _animationDatas(Dictionary)<br>
-- param id the id of the animation data you want to get<br>
-- return AnimationData *
-- @function [parent=#ArmatureDataManager] getAnimationData
-- @param self
-- @param #string str
-- @param #string id
-- @return AnimationData#AnimationData ret (return value: ccs.AnimationData)
--------------------------------
-- brief add animation data<br>
-- param id the id of the animation data<br>
-- return AnimationData *
-- @function [parent=#ArmatureDataManager] addAnimationData
-- @param self
-- @param #string str
-- @param #ccs.AnimationData animationdata
-- @param #string str
-- @param #string id
-- @param #ccs.AnimationData animationData
-- @param #string configFilePath
--------------------------------
-- Init ArmatureDataManager
-- @function [parent=#ArmatureDataManager] init
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
-- brief remove armature data<br>
-- param id the id of the armature data you want to get
-- @function [parent=#ArmatureDataManager] removeArmatureData
-- @param self
-- @param #string str
-- @param #string id
--------------------------------
--
-- @function [parent=#ArmatureDataManager] getArmatureDatas
-- @param self
-- @return map_table#map_table ret (return value: map_table)
--------------------------------
-- brief remove texture data<br>
-- param id the id of the texture data you want to get
-- @function [parent=#ArmatureDataManager] removeTextureData
-- @param self
-- @param #string str
-- @param #string id
--------------------------------
-- brief add texture data<br>
-- param id the id of the texture data<br>
-- return TextureData *
-- @function [parent=#ArmatureDataManager] addTextureData
-- @param self
-- @param #string str
-- @param #ccs.TextureData texturedata
-- @param #string str
-- @param #string id
-- @param #ccs.TextureData textureData
-- @param #string configFilePath
--------------------------------
-- brief Juge whether or not need auto load sprite file
-- @function [parent=#ArmatureDataManager] isAutoLoadSpriteFile
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
-- brief Add sprite frame to CCSpriteFrameCache, it will save display name and it's relative image name
-- @function [parent=#ArmatureDataManager] addSpriteFrameFromFile
-- @param self
-- @param #string str
-- @param #string str
-- @param #string str
-- @param #string plistPath
-- @param #string imagePath
-- @param #string configFilePath
--------------------------------
--
-- @function [parent=#ArmatureDataManager] destroyInstance
-- @param self
--------------------------------
--
-- @function [parent=#ArmatureDataManager] getInstance
-- @param self
-- @return ArmatureDataManager#ArmatureDataManager ret (return value: ccs.ArmatureDataManager)

2
cocos/scripting/lua-bindings/auto/api/ArmatureDisplayData.lua
View File

@ -5,11 +5,13 @@
-- @parent_module ccs
--------------------------------
--
-- @function [parent=#ArmatureDisplayData] create
-- @param self
-- @return ArmatureDisplayData#ArmatureDisplayData ret (return value: ccs.ArmatureDisplayData)
--------------------------------
-- js ctor
-- @function [parent=#ArmatureDisplayData] ArmatureDisplayData
-- @param self

34
cocos/scripting/lua-bindings/auto/api/AssetsManager.lua
View File

@ -5,75 +5,89 @@
-- @parent_module cc
--------------------------------
--
-- @function [parent=#AssetsManager] setStoragePath
-- @param self
-- @param #char char
-- @param #char storagePath
--------------------------------
--
-- @function [parent=#AssetsManager] setPackageUrl
-- @param self
-- @param #char char
-- @param #char packageUrl
--------------------------------
--
-- @function [parent=#AssetsManager] checkUpdate
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#AssetsManager] getStoragePath
-- @param self
-- @return char#char ret (return value: char)
--------------------------------
--
-- @function [parent=#AssetsManager] update
-- @param self
--------------------------------
-- @brief Sets connection time out in seconds
-- @function [parent=#AssetsManager] setConnectionTimeout
-- @param self
-- @param #unsigned int int
-- @param #unsigned int timeout
--------------------------------
--
-- @function [parent=#AssetsManager] setVersionFileUrl
-- @param self
-- @param #char char
-- @param #char versionFileUrl
--------------------------------
--
-- @function [parent=#AssetsManager] getPackageUrl
-- @param self
-- @return char#char ret (return value: char)
--------------------------------
-- @brief Gets connection time out in secondes
-- @function [parent=#AssetsManager] getConnectionTimeout
-- @param self
-- @return unsigned int#unsigned int ret (return value: unsigned int)
--------------------------------
--
-- @function [parent=#AssetsManager] getVersion
-- @param self
-- @return string#string ret (return value: string)
--------------------------------
--
-- @function [parent=#AssetsManager] getVersionFileUrl
-- @param self
-- @return char#char ret (return value: char)
--------------------------------
--
-- @function [parent=#AssetsManager] deleteVersion
-- @param self
--------------------------------
--
-- @function [parent=#AssetsManager] create
-- @param self
-- @param #char char
-- @param #char char
-- @param #char char
-- @param #function func
-- @param #function func
-- @param #function func
-- @param #char packageUrl
-- @param #char versionFileUrl
-- @param #char storagePath
-- @param #function errorCallback
-- @param #function progressCallback
-- @param #function successCallback
-- @return AssetsManager#AssetsManager ret (return value: cc.AssetsManager)
--------------------------------
--
-- @function [parent=#AssetsManager] AssetsManager
-- @param self

39
cocos/scripting/lua-bindings/auto/api/AtlasNode.lua
View File

@ -5,78 +5,93 @@
-- @parent_module cc
--------------------------------
-- updates the Atlas (indexed vertex array).<br>
-- Shall be overridden in subclasses
-- @function [parent=#AtlasNode] updateAtlasValues
-- @param self
--------------------------------
--
-- @function [parent=#AtlasNode] getTexture
-- @param self
-- @return Texture2D#Texture2D ret (return value: cc.Texture2D)
--------------------------------
--
-- @function [parent=#AtlasNode] setTextureAtlas
-- @param self
-- @param #cc.TextureAtlas textureatlas
-- @param #cc.TextureAtlas textureAtlas
--------------------------------
--
-- @function [parent=#AtlasNode] getTextureAtlas
-- @param self
-- @return TextureAtlas#TextureAtlas ret (return value: cc.TextureAtlas)
--------------------------------
--
-- @function [parent=#AtlasNode] getQuadsToDraw
-- @param self
-- @return long#long ret (return value: long)
--------------------------------
--
-- @function [parent=#AtlasNode] setTexture
-- @param self
-- @param #cc.Texture2D texture2d
-- @param #cc.Texture2D texture
--------------------------------
--
-- @function [parent=#AtlasNode] setQuadsToDraw
-- @param self
-- @param #long long
-- @param #long quadsToDraw
--------------------------------
-- creates a AtlasNode with an Atlas file the width and height of each item and the quantity of items to render
-- @function [parent=#AtlasNode] create
-- @param self
-- @param #string str
-- @param #int int
-- @param #int int
-- @param #int int
-- @param #string filename
-- @param #int tileWidth
-- @param #int tileHeight
-- @param #int itemsToRender
-- @return AtlasNode#AtlasNode ret (return value: cc.AtlasNode)
--------------------------------
--
-- @function [parent=#AtlasNode] draw
-- @param self
-- @param #cc.Renderer renderer
-- @param #mat4_table mat4
-- @param #unsigned int int
-- @param #mat4_table transform
-- @param #unsigned int flags
--------------------------------
--
-- @function [parent=#AtlasNode] isOpacityModifyRGB
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#AtlasNode] setColor
-- @param self
-- @param #color3b_table color3b
-- @param #color3b_table color
--------------------------------
--
-- @function [parent=#AtlasNode] getColor
-- @param self
-- @return color3b_table#color3b_table ret (return value: color3b_table)
--------------------------------
--
-- @function [parent=#AtlasNode] setOpacityModifyRGB
-- @param self
-- @param #bool bool
-- @param #bool isOpacityModifyRGB
--------------------------------
--
-- @function [parent=#AtlasNode] setOpacity
-- @param self
-- @param #unsigned char char
-- @param #unsigned char opacity
return nil

10
cocos/scripting/lua-bindings/auto/api/AttachNode.lua
View File

@ -5,21 +5,25 @@
-- @parent_module cc
--------------------------------
-- creates an AttachNode<br>
-- param attachBone The bone to which the AttachNode is going to attach, the attacheBone must be a bone of the AttachNode's parent
-- @function [parent=#AttachNode] create
-- @param self
-- @param #cc.Bone3D bone3d
-- @param #cc.Bone3D attachBone
-- @return AttachNode#AttachNode ret (return value: cc.AttachNode)
--------------------------------
--
-- @function [parent=#AttachNode] getWorldToNodeTransform
-- @param self
-- @return mat4_table#mat4_table ret (return value: mat4_table)
--------------------------------
--
-- @function [parent=#AttachNode] visit
-- @param self
-- @param #cc.Renderer renderer
-- @param #mat4_table mat4
-- @param #unsigned int int
-- @param #mat4_table parentTransform
-- @param #unsigned int parentFlags
return nil

6
cocos/scripting/lua-bindings/auto/api/BaseData.lua
View File

@ -5,21 +5,25 @@
-- @parent_module ccs
--------------------------------
--
-- @function [parent=#BaseData] getColor
-- @param self
-- @return color4b_table#color4b_table ret (return value: color4b_table)
--------------------------------
--
-- @function [parent=#BaseData] setColor
-- @param self
-- @param #color4b_table color4b
-- @param #color4b_table color
--------------------------------
--
-- @function [parent=#BaseData] create
-- @param self
-- @return BaseData#BaseData ret (return value: ccs.BaseData)
--------------------------------
-- js ctor
-- @function [parent=#BaseData] BaseData
-- @param self

18
cocos/scripting/lua-bindings/auto/api/BatchNode.lua
View File

@ -5,11 +5,13 @@
-- @parent_module ccs
--------------------------------
-- js NA
-- @function [parent=#BatchNode] init
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#BatchNode] create
-- @param self
-- @return BatchNode#BatchNode ret (return value: ccs.BatchNode)
@ -19,21 +21,23 @@
-- @overload self, cc.Node, int, int
-- @function [parent=#BatchNode] addChild
-- @param self
-- @param #cc.Node node
-- @param #int int
-- @param #int int
-- @param #cc.Node pChild
-- @param #int zOrder
-- @param #int tag
--------------------------------
--
-- @function [parent=#BatchNode] draw
-- @param self
-- @param #cc.Renderer renderer
-- @param #mat4_table mat4
-- @param #unsigned int int
-- @param #mat4_table transform
-- @param #unsigned int flags
--------------------------------
--
-- @function [parent=#BatchNode] removeChild
-- @param self
-- @param #cc.Node node
-- @param #bool bool
-- @param #cc.Node child
-- @param #bool cleanup
return nil

8
cocos/scripting/lua-bindings/auto/api/BezierBy.lua
View File

@ -5,23 +5,27 @@
-- @parent_module cc
--------------------------------
--
-- @function [parent=#BezierBy] startWithTarget
-- @param self
-- @param #cc.Node node
-- @param #cc.Node target
--------------------------------
--
-- @function [parent=#BezierBy] clone
-- @param self
-- @return BezierBy#BezierBy ret (return value: cc.BezierBy)
--------------------------------
--
-- @function [parent=#BezierBy] reverse
-- @param self
-- @return BezierBy#BezierBy ret (return value: cc.BezierBy)
--------------------------------
--
-- @function [parent=#BezierBy] update
-- @param self
-- @param #float float
-- @param #float time
return nil

5
cocos/scripting/lua-bindings/auto/api/BezierTo.lua
View File

@ -5,16 +5,19 @@
-- @parent_module cc
--------------------------------
--
-- @function [parent=#BezierTo] startWithTarget
-- @param self
-- @param #cc.Node node
-- @param #cc.Node target
--------------------------------
--
-- @function [parent=#BezierTo] clone
-- @param self
-- @return BezierTo#BezierTo ret (return value: cc.BezierTo)
--------------------------------
--
-- @function [parent=#BezierTo] reverse
-- @param self
-- @return BezierTo#BezierTo ret (return value: cc.BezierTo)

14
cocos/scripting/lua-bindings/auto/api/Blink.lua
View File

@ -5,34 +5,40 @@
-- @parent_module cc
--------------------------------
-- creates the action
-- @function [parent=#Blink] create
-- @param self
-- @param #float float
-- @param #int int
-- @param #float duration
-- @param #int blinks
-- @return Blink#Blink ret (return value: cc.Blink)
--------------------------------
--
-- @function [parent=#Blink] startWithTarget
-- @param self
-- @param #cc.Node node
-- @param #cc.Node target
--------------------------------
--
-- @function [parent=#Blink] clone
-- @param self
-- @return Blink#Blink ret (return value: cc.Blink)
--------------------------------
--
-- @function [parent=#Blink] stop
-- @param self
--------------------------------
--
-- @function [parent=#Blink] reverse
-- @param self
-- @return Blink#Blink ret (return value: cc.Blink)
--------------------------------
--
-- @function [parent=#Blink] update
-- @param self
-- @param #float float
-- @param #float time
return nil

85
cocos/scripting/lua-bindings/auto/api/Bone.lua
View File

@ -5,163 +5,200 @@
-- @parent_module ccs
--------------------------------
--
-- @function [parent=#Bone] isTransformDirty
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#Bone] isIgnoreMovementBoneData
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
-- Update zorder
-- @function [parent=#Bone] updateZOrder
-- @param self
--------------------------------
--
-- @function [parent=#Bone] getDisplayRenderNode
-- @param self
-- @return Node#Node ret (return value: cc.Node)
--------------------------------
--
-- @function [parent=#Bone] isBlendDirty
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
-- Add a child to this bone, and it will let this child call setParent(Bone *parent) function to set self to it's parent<br>
-- param child the child you want to add
-- @function [parent=#Bone] addChildBone
-- @param self
-- @param #ccs.Bone bone
-- @param #ccs.Bone child
--------------------------------
--
-- @function [parent=#Bone] getWorldInfo
-- @param self
-- @return BaseData#BaseData ret (return value: ccs.BaseData)
--------------------------------
--
-- @function [parent=#Bone] getTween
-- @param self
-- @return Tween#Tween ret (return value: ccs.Tween)
--------------------------------
-- Get parent bone<br>
-- return parent bone
-- @function [parent=#Bone] getParentBone
-- @param self
-- @return Bone#Bone ret (return value: ccs.Bone)
--------------------------------
-- Update color to render display
-- @function [parent=#Bone] updateColor
-- @param self
--------------------------------
--
-- @function [parent=#Bone] setTransformDirty
-- @param self
-- @param #bool bool
-- @param #bool dirty
--------------------------------
--
-- @function [parent=#Bone] getDisplayRenderNodeType
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
--
-- @function [parent=#Bone] removeDisplay
-- @param self
-- @param #int int
-- @param #int index
--------------------------------
--
-- @function [parent=#Bone] setBoneData
-- @param self
-- @param #ccs.BoneData bonedata
-- @param #ccs.BoneData boneData
--------------------------------
-- @overload self, string
-- @overload self
-- @function [parent=#Bone] init
-- @param self
-- @param #string str
-- @param #string name
-- @return bool#bool ret (retunr value: bool)
--------------------------------
-- Set parent bone.<br>
-- If parent is NUll, then also remove this bone from armature.<br>
-- It will not set the Armature, if you want to add the bone to a Armature, you should use Armature::addBone(Bone *bone, const char* parentName).<br>
-- param parent the parent bone.<br>
-- nullptr : remove this bone from armature
-- @function [parent=#Bone] setParentBone
-- @param self
-- @param #ccs.Bone bone
-- @param #ccs.Bone parent
--------------------------------
-- @overload self, cc.Node, int
-- @overload self, ccs.DisplayData, int
-- @function [parent=#Bone] addDisplay
-- @param self
-- @param #ccs.DisplayData displaydata
-- @param #int int
-- @param #ccs.DisplayData displayData
-- @param #int index
--------------------------------
-- Remove itself from its parent.<br>
-- param recursion whether or not to remove childBone's display
-- @function [parent=#Bone] removeFromParent
-- @param self
-- @param #bool bool
-- @param #bool recursion
--------------------------------
--
-- @function [parent=#Bone] getColliderDetector
-- @param self
-- @return ColliderDetector#ColliderDetector ret (return value: ccs.ColliderDetector)
--------------------------------
--
-- @function [parent=#Bone] getChildArmature
-- @param self
-- @return Armature#Armature ret (return value: ccs.Armature)
--------------------------------
--
-- @function [parent=#Bone] getTweenData
-- @param self
-- @return FrameData#FrameData ret (return value: ccs.FrameData)
--------------------------------
--
-- @function [parent=#Bone] changeDisplayWithIndex
-- @param self
-- @param #int int
-- @param #bool bool
-- @param #int index
-- @param #bool force
--------------------------------
--
-- @function [parent=#Bone] changeDisplayWithName
-- @param self
-- @param #string str
-- @param #bool bool
-- @param #string name
-- @param #bool force
--------------------------------
--
-- @function [parent=#Bone] setArmature
-- @param self
-- @param #ccs.Armature armature
--------------------------------
--
-- @function [parent=#Bone] setBlendDirty
-- @param self
-- @param #bool bool
-- @param #bool dirty
--------------------------------
-- Removes a child Bone<br>
-- param bone the bone you want to remove
-- @function [parent=#Bone] removeChildBone
-- @param self
-- @param #ccs.Bone bone
-- @param #bool bool
-- @param #bool recursion
--------------------------------
--
-- @function [parent=#Bone] setChildArmature
-- @param self
-- @param #ccs.Armature armature
-- @param #ccs.Armature childArmature
--------------------------------
--
-- @function [parent=#Bone] getNodeToArmatureTransform
-- @param self
-- @return mat4_table#mat4_table ret (return value: mat4_table)
--------------------------------
--
-- @function [parent=#Bone] getDisplayManager
-- @param self
-- @return DisplayManager#DisplayManager ret (return value: ccs.DisplayManager)
--------------------------------
--
-- @function [parent=#Bone] getArmature
-- @param self
-- @return Armature#Armature ret (return value: ccs.Armature)
--------------------------------
--
-- @function [parent=#Bone] getBoneData
-- @param self
-- @return BoneData#BoneData ret (return value: ccs.BoneData)
@ -171,35 +208,41 @@
-- @overload self
-- @function [parent=#Bone] create
-- @param self
-- @param #string str
-- @param #string name
-- @return Bone#Bone ret (retunr value: ccs.Bone)
--------------------------------
--
-- @function [parent=#Bone] updateDisplayedColor
-- @param self
-- @param #color3b_table color3b
-- @param #color3b_table parentColor
--------------------------------
--
-- @function [parent=#Bone] setLocalZOrder
-- @param self
-- @param #int int
-- @param #int zOrder
--------------------------------
--
-- @function [parent=#Bone] getNodeToWorldTransform
-- @param self
-- @return mat4_table#mat4_table ret (return value: mat4_table)
--------------------------------
--
-- @function [parent=#Bone] update
-- @param self
-- @param #float float
-- @param #float delta
--------------------------------
--
-- @function [parent=#Bone] updateDisplayedOpacity
-- @param self
-- @param #unsigned char char
-- @param #unsigned char parentOpacity
--------------------------------
-- js ctor
-- @function [parent=#Bone] Bone
-- @param self

9
cocos/scripting/lua-bindings/auto/api/BoneData.lua
View File

@ -5,27 +5,32 @@
-- @parent_module ccs
--------------------------------
--
-- @function [parent=#BoneData] getDisplayData
-- @param self
-- @param #int int
-- @param #int index
-- @return DisplayData#DisplayData ret (return value: ccs.DisplayData)
--------------------------------
--
-- @function [parent=#BoneData] init
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#BoneData] addDisplayData
-- @param self
-- @param #ccs.DisplayData displaydata
-- @param #ccs.DisplayData displayData
--------------------------------
--
-- @function [parent=#BoneData] create
-- @param self
-- @return BoneData#BoneData ret (return value: ccs.BoneData)
--------------------------------
-- js ctor
-- @function [parent=#BoneData] BoneData
-- @param self

99
cocos/scripting/lua-bindings/auto/api/Button.lua
View File

@ -5,168 +5,215 @@
-- @parent_module ccui
--------------------------------
--
-- @function [parent=#Button] getTitleText
-- @param self
-- @return string#string ret (return value: string)
--------------------------------
--
-- @function [parent=#Button] setTitleFontSize
-- @param self
-- @param #float float
-- @param #float size
--------------------------------
-- Sets if button is using scale9 renderer.<br>
-- param true that using scale9 renderer, false otherwise.
-- @function [parent=#Button] setScale9Enabled
-- @param self
-- @param #bool bool
-- @param #bool able
--------------------------------
-- brief Return a zoom scale
-- @function [parent=#Button] getZoomScale
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#Button] getCapInsetsDisabledRenderer
-- @param self
-- @return rect_table#rect_table ret (return value: rect_table)
--------------------------------
--
-- @function [parent=#Button] setTitleColor
-- @param self
-- @param #color3b_table color3b
-- @param #color3b_table color
--------------------------------
-- Sets capinsets for button, if button is using scale9 renderer.<br>
-- param capInsets capinsets for button
-- @function [parent=#Button] setCapInsetsDisabledRenderer
-- @param self
-- @param #rect_table rect
-- @param #rect_table capInsets
--------------------------------
-- Sets capinsets for button, if button is using scale9 renderer.<br>
-- param capInsets capinsets for button
-- @function [parent=#Button] setCapInsets
-- @param self
-- @param #rect_table rect
-- @param #rect_table capInsets
--------------------------------
-- Load dark state texture for button.<br>
-- param disabled dark state texture.<br>
-- param texType @see TextureResType
-- @function [parent=#Button] loadTextureDisabled
-- @param self
-- @param #string str
-- @param #int texturerestype
-- @param #string disabled
-- @param #int texType
--------------------------------
--
-- @function [parent=#Button] setTitleText
-- @param self
-- @param #string str
-- @param #string text
--------------------------------
-- Sets capinsets for button, if button is using scale9 renderer.<br>
-- param capInsets capinsets for button
-- @function [parent=#Button] setCapInsetsNormalRenderer
-- @param self
-- @param #rect_table rect
-- @param #rect_table capInsets
--------------------------------
-- Load selected state texture for button.<br>
-- param selected selected state texture.<br>
-- param texType @see TextureResType
-- @function [parent=#Button] loadTexturePressed
-- @param self
-- @param #string str
-- @param #int texturerestype
-- @param #string selected
-- @param #int texType
--------------------------------
--
-- @function [parent=#Button] setTitleFontName
-- @param self
-- @param #string str
-- @param #string fontName
--------------------------------
--
-- @function [parent=#Button] getCapInsetsNormalRenderer
-- @param self
-- @return rect_table#rect_table ret (return value: rect_table)
--------------------------------
--
-- @function [parent=#Button] getCapInsetsPressedRenderer
-- @param self
-- @return rect_table#rect_table ret (return value: rect_table)
--------------------------------
-- Load textures for button.<br>
-- param normal normal state texture name.<br>
-- param selected selected state texture name.<br>
-- param disabled disabled state texture name.<br>
-- param texType @see TextureResType
-- @function [parent=#Button] loadTextures
-- @param self
-- @param #string str
-- @param #string str
-- @param #string str
-- @param #int texturerestype
-- @param #string normal
-- @param #string selected
-- @param #string disabled
-- @param #int texType
--------------------------------
--
-- @function [parent=#Button] isScale9Enabled
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
-- Load normal state texture for button.<br>
-- param normal normal state texture.<br>
-- param texType @see TextureResType
-- @function [parent=#Button] loadTextureNormal
-- @param self
-- @param #string str
-- @param #int texturerestype
-- @param #string normal
-- @param #int texType
--------------------------------
-- Sets capinsets for button, if button is using scale9 renderer.<br>
-- param capInsets capinsets for button
-- @function [parent=#Button] setCapInsetsPressedRenderer
-- @param self
-- @param #rect_table rect
-- @param #rect_table capInsets
--------------------------------
--
-- @function [parent=#Button] getTitleFontSize
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#Button] getTitleFontName
-- @param self
-- @return string#string ret (return value: string)
--------------------------------
--
-- @function [parent=#Button] getTitleColor
-- @param self
-- @return color3b_table#color3b_table ret (return value: color3b_table)
--------------------------------
-- Changes if button can be clicked zoom effect.<br>
-- param true that can be clicked zoom effect, false otherwise.
-- @function [parent=#Button] setPressedActionEnabled
-- @param self
-- @param #bool bool
-- @param #bool enabled
--------------------------------
-- When user pressed the button, the button will zoom to a scale.<br>
-- The final scale of the button equals (button original scale + _zoomScale)
-- @function [parent=#Button] setZoomScale
-- @param self
-- @param #float float
-- @param #float scale
--------------------------------
-- @overload self, string, string, string, int
-- @overload self
-- @function [parent=#Button] create
-- @param self
-- @param #string str
-- @param #string str
-- @param #string str
-- @param #int texturerestype
-- @param #string normalImage
-- @param #string selectedImage
-- @param #string disableImage
-- @param #int texType
-- @return Button#Button ret (retunr value: ccui.Button)
--------------------------------
--
-- @function [parent=#Button] createInstance
-- @param self
-- @return Ref#Ref ret (return value: cc.Ref)
--------------------------------
--
-- @function [parent=#Button] getVirtualRenderer
-- @param self
-- @return Node#Node ret (return value: cc.Node)
--------------------------------
-- Returns the "class name" of widget.
-- @function [parent=#Button] getDescription
-- @param self
-- @return string#string ret (return value: string)
--------------------------------
--
-- @function [parent=#Button] getVirtualRendererSize
-- @param self
-- @return size_table#size_table ret (return value: size_table)
--------------------------------
--
-- @function [parent=#Button] ignoreContentAdaptWithSize
-- @param self
-- @param #bool bool
-- @param #bool ignore
--------------------------------
-- Default constructor
-- @function [parent=#Button] Button
-- @param self

87
cocos/scripting/lua-bindings/auto/api/CCBAnimationManager.lua
View File

@ -5,197 +5,234 @@
-- @parent_module cc
--------------------------------
--
-- @function [parent=#CCBAnimationManager] moveAnimationsFromNode
-- @param self
-- @param #cc.Node node
-- @param #cc.Node node
-- @param #cc.Node fromNode
-- @param #cc.Node toNode
--------------------------------
--
-- @function [parent=#CCBAnimationManager] setAutoPlaySequenceId
-- @param self
-- @param #int int
-- @param #int autoPlaySequenceId
--------------------------------
--
-- @function [parent=#CCBAnimationManager] getDocumentCallbackNames
-- @param self
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
--
-- @function [parent=#CCBAnimationManager] actionForSoundChannel
-- @param self
-- @param #cc.CCBSequenceProperty ccbsequenceproperty
-- @param #cc.CCBSequenceProperty channel
-- @return Sequence#Sequence ret (return value: cc.Sequence)
--------------------------------
--
-- @function [parent=#CCBAnimationManager] setBaseValue
-- @param self
-- @param #cc.Value value
-- @param #cc.Node node
-- @param #string str
-- @param #cc.Node pNode
-- @param #string propName
--------------------------------
--
-- @function [parent=#CCBAnimationManager] getDocumentOutletNodes
-- @param self
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
--
-- @function [parent=#CCBAnimationManager] getLastCompletedSequenceName
-- @param self
-- @return string#string ret (return value: string)
--------------------------------
--
-- @function [parent=#CCBAnimationManager] setRootNode
-- @param self
-- @param #cc.Node node
-- @param #cc.Node pRootNode
--------------------------------
--
-- @function [parent=#CCBAnimationManager] runAnimationsForSequenceNamedTweenDuration
-- @param self
-- @param #char char
-- @param #float float
-- @param #char pName
-- @param #float fTweenDuration
--------------------------------
--
-- @function [parent=#CCBAnimationManager] addDocumentOutletName
-- @param self
-- @param #string str
-- @param #string name
--------------------------------
--
-- @function [parent=#CCBAnimationManager] getSequences
-- @param self
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
--
-- @function [parent=#CCBAnimationManager] getRootContainerSize
-- @param self
-- @return size_table#size_table ret (return value: size_table)
--------------------------------
--
-- @function [parent=#CCBAnimationManager] setDocumentControllerName
-- @param self
-- @param #string str
-- @param #string name
--------------------------------
--
-- @function [parent=#CCBAnimationManager] setObject
-- @param self
-- @param #cc.Ref ref
-- @param #cc.Node node
-- @param #string str
-- @param #cc.Ref obj
-- @param #cc.Node pNode
-- @param #string propName
--------------------------------
--
-- @function [parent=#CCBAnimationManager] getContainerSize
-- @param self
-- @param #cc.Node node
-- @param #cc.Node pNode
-- @return size_table#size_table ret (return value: size_table)
--------------------------------
--
-- @function [parent=#CCBAnimationManager] actionForCallbackChannel
-- @param self
-- @param #cc.CCBSequenceProperty ccbsequenceproperty
-- @param #cc.CCBSequenceProperty channel
-- @return Sequence#Sequence ret (return value: cc.Sequence)
--------------------------------
--
-- @function [parent=#CCBAnimationManager] getDocumentOutletNames
-- @param self
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
--
-- @function [parent=#CCBAnimationManager] addDocumentCallbackControlEvents
-- @param self
-- @param #int eventtype
-- @param #int eventType
--------------------------------
--
-- @function [parent=#CCBAnimationManager] init
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#CCBAnimationManager] getKeyframeCallbacks
-- @param self
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
--
-- @function [parent=#CCBAnimationManager] getDocumentCallbackControlEvents
-- @param self
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
--
-- @function [parent=#CCBAnimationManager] setRootContainerSize
-- @param self
-- @param #size_table size
-- @param #size_table rootContainerSize
--------------------------------
--
-- @function [parent=#CCBAnimationManager] runAnimationsForSequenceIdTweenDuration
-- @param self
-- @param #int int
-- @param #float float
-- @param #int nSeqId
-- @param #float fTweenDuraiton
--------------------------------
--
-- @function [parent=#CCBAnimationManager] getRunningSequenceName
-- @param self
-- @return char#char ret (return value: char)
--------------------------------
--
-- @function [parent=#CCBAnimationManager] getAutoPlaySequenceId
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
--
-- @function [parent=#CCBAnimationManager] addDocumentCallbackName
-- @param self
-- @param #string str
-- @param #string name
--------------------------------
--
-- @function [parent=#CCBAnimationManager] getRootNode
-- @param self
-- @return Node#Node ret (return value: cc.Node)
--------------------------------
--
-- @function [parent=#CCBAnimationManager] addDocumentOutletNode
-- @param self
-- @param #cc.Node node
--------------------------------
--
-- @function [parent=#CCBAnimationManager] getSequenceDuration
-- @param self
-- @param #char char
-- @param #char pSequenceName
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#CCBAnimationManager] addDocumentCallbackNode
-- @param self
-- @param #cc.Node node
--------------------------------
--
-- @function [parent=#CCBAnimationManager] runAnimationsForSequenceNamed
-- @param self
-- @param #char char
-- @param #char pName
--------------------------------
--
-- @function [parent=#CCBAnimationManager] getSequenceId
-- @param self
-- @param #char char
-- @param #char pSequenceName
-- @return int#int ret (return value: int)
--------------------------------
--
-- @function [parent=#CCBAnimationManager] getDocumentCallbackNodes
-- @param self
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
--
-- @function [parent=#CCBAnimationManager] setSequences
-- @param self
-- @param #array_table array
-- @param #array_table seq
--------------------------------
--
-- @function [parent=#CCBAnimationManager] debug
-- @param self
--------------------------------
--
-- @function [parent=#CCBAnimationManager] getDocumentControllerName
-- @param self
-- @return string#string ret (return value: string)
--------------------------------
-- js ctor
-- @function [parent=#CCBAnimationManager] CCBAnimationManager
-- @param self

45
cocos/scripting/lua-bindings/auto/api/CCBReader.lua
View File

@ -5,101 +5,122 @@
-- @parent_module cc
--------------------------------
--
-- @function [parent=#CCBReader] addOwnerOutletName
-- @param self
-- @param #string str
-- @param #string name
--------------------------------
--
-- @function [parent=#CCBReader] getOwnerCallbackNames
-- @param self
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
--
-- @function [parent=#CCBReader] addDocumentCallbackControlEvents
-- @param self
-- @param #int eventtype
-- @param #int eventType
--------------------------------
--
-- @function [parent=#CCBReader] setCCBRootPath
-- @param self
-- @param #char char
-- @param #char ccbRootPath
--------------------------------
--
-- @function [parent=#CCBReader] addOwnerOutletNode
-- @param self
-- @param #cc.Node node
--------------------------------
--
-- @function [parent=#CCBReader] getOwnerCallbackNodes
-- @param self
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
--
-- @function [parent=#CCBReader] readSoundKeyframesForSeq
-- @param self
-- @param #cc.CCBSequence ccbsequence
-- @param #cc.CCBSequence seq
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#CCBReader] getCCBRootPath
-- @param self
-- @return string#string ret (return value: string)
--------------------------------
--
-- @function [parent=#CCBReader] getOwnerCallbackControlEvents
-- @param self
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
--
-- @function [parent=#CCBReader] getOwnerOutletNodes
-- @param self
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
--
-- @function [parent=#CCBReader] readUTF8
-- @param self
-- @return string#string ret (return value: string)
--------------------------------
--
-- @function [parent=#CCBReader] addOwnerCallbackControlEvents
-- @param self
-- @param #int eventtype
-- @param #int type
--------------------------------
--
-- @function [parent=#CCBReader] getOwnerOutletNames
-- @param self
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- js setActionManager<br>
-- lua setActionManager
-- @function [parent=#CCBReader] setAnimationManager
-- @param self
-- @param #cc.CCBAnimationManager ccbanimationmanager
-- @param #cc.CCBAnimationManager pAnimationManager
--------------------------------
--
-- @function [parent=#CCBReader] readCallbackKeyframesForSeq
-- @param self
-- @param #cc.CCBSequence ccbsequence
-- @param #cc.CCBSequence seq
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#CCBReader] getAnimationManagersForNodes
-- @param self
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
--
-- @function [parent=#CCBReader] getNodesWithAnimationManagers
-- @param self
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- js getActionManager<br>
-- lua getActionManager
-- @function [parent=#CCBReader] getAnimationManager
-- @param self
-- @return CCBAnimationManager#CCBAnimationManager ret (return value: cc.CCBAnimationManager)
--------------------------------
--
-- @function [parent=#CCBReader] setResolutionScale
-- @param self
-- @param #float float
-- @param #float scale
--------------------------------
-- @overload self, cc.CCBReader
@ -107,9 +128,9 @@
-- @overload self
-- @function [parent=#CCBReader] CCBReader
-- @param self
-- @param #cc.NodeLoaderLibrary nodeloaderlibrary
-- @param #cc.CCBMemberVariableAssigner ccbmembervariableassigner
-- @param #cc.CCBSelectorResolver ccbselectorresolver
-- @param #cc.NodeLoaderListener nodeloaderlistener
-- @param #cc.NodeLoaderLibrary pNodeLoaderLibrary
-- @param #cc.CCBMemberVariableAssigner pCCBMemberVariableAssigner
-- @param #cc.CCBSelectorResolver pCCBSelectorResolver
-- @param #cc.NodeLoaderListener pNodeLoaderListener
return nil

10
cocos/scripting/lua-bindings/auto/api/CallFunc.lua
View File

@ -5,30 +5,36 @@
-- @parent_module cc
--------------------------------
-- executes the callback
-- @function [parent=#CallFunc] execute
-- @param self
--------------------------------
--
-- @function [parent=#CallFunc] getTargetCallback
-- @param self
-- @return Ref#Ref ret (return value: cc.Ref)
--------------------------------
--
-- @function [parent=#CallFunc] setTargetCallback
-- @param self
-- @param #cc.Ref ref
-- @param #cc.Ref sel
--------------------------------
--
-- @function [parent=#CallFunc] clone
-- @param self
-- @return CallFunc#CallFunc ret (return value: cc.CallFunc)
--------------------------------
--
-- @function [parent=#CallFunc] update
-- @param self
-- @param #float float
-- @param #float time
--------------------------------
--
-- @function [parent=#CallFunc] reverse
-- @param self
-- @return CallFunc#CallFunc ret (return value: cc.CallFunc)

59
cocos/scripting/lua-bindings/auto/api/Camera.lua
View File

@ -5,79 +5,108 @@
-- @parent_module cc
--------------------------------
-- Gets the camera's projection matrix.<br>
-- return The camera projection matrix.
-- @function [parent=#Camera] getProjectionMatrix
-- @param self
-- @return mat4_table#mat4_table ret (return value: mat4_table)
--------------------------------
-- get view projection matrix
-- @function [parent=#Camera] getViewProjectionMatrix
-- @param self
-- @return mat4_table#mat4_table ret (return value: mat4_table)
--------------------------------
-- Gets the camera's view matrix.<br>
-- return The camera view matrix.
-- @function [parent=#Camera] getViewMatrix
-- @param self
-- @return mat4_table#mat4_table ret (return value: mat4_table)
--------------------------------
-- get & set Camera flag
-- @function [parent=#Camera] getCameraFlag
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
-- Gets the type of camera.<br>
-- return The camera type.
-- @function [parent=#Camera] getType
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
-- Creates a view matrix based on the specified input parameters.<br>
-- param eyePosition The eye position.<br>
-- param targetPosition The target's center position.<br>
-- param up The up vector.<br>
-- param dst A matrix to store the result in.
-- @function [parent=#Camera] lookAt
-- @param self
-- @param #vec3_table vec3
-- @param #vec3_table vec3
-- @param #vec3_table target
-- @param #vec3_table up
--------------------------------
--
-- @function [parent=#Camera] setCameraFlag
-- @param self
-- @param #int cameraflag
-- @param #int flag
--------------------------------
-- Convert the specified point of viewport from screenspace coordinate into the worldspace coordinate.
-- @function [parent=#Camera] unproject
-- @param self
-- @param #size_table size
-- @param #vec3_table vec3
-- @param #vec3_table vec3
-- @param #size_table viewport
-- @param #vec3_table src
-- @param #vec3_table dst
--------------------------------
-- create default camera, the camera type depends on Director::getProjection
-- @function [parent=#Camera] create
-- @param self
-- @return Camera#Camera ret (return value: cc.Camera)
--------------------------------
-- Creates a perspective camera.<br>
-- param fieldOfView The field of view for the perspective camera (normally in the range of 40-60 degrees).<br>
-- param aspectRatio The aspect ratio of the camera (normally the width of the viewport divided by the height of the viewport).<br>
-- param nearPlane The near plane distance.<br>
-- param farPlane The far plane distance.
-- @function [parent=#Camera] createPerspective
-- @param self
-- @param #float float
-- @param #float float
-- @param #float float
-- @param #float float
-- @param #float fieldOfView
-- @param #float aspectRatio
-- @param #float nearPlane
-- @param #float farPlane
-- @return Camera#Camera ret (return value: cc.Camera)
--------------------------------
-- Creates an orthographic camera.<br>
-- param zoomX The zoom factor along the X-axis of the orthographic projection (the width of the ortho projection).<br>
-- param zoomY The zoom factor along the Y-axis of the orthographic projection (the height of the ortho projection).<br>
-- param aspectRatio The aspect ratio of the orthographic projection.<br>
-- param nearPlane The near plane distance.<br>
-- param farPlane The far plane distance.
-- @function [parent=#Camera] createOrthographic
-- @param self
-- @param #float float
-- @param #float float
-- @param #float float
-- @param #float float
-- @param #float zoomX
-- @param #float zoomY
-- @param #float nearPlane
-- @param #float farPlane
-- @return Camera#Camera ret (return value: cc.Camera)
--------------------------------
--
-- @function [parent=#Camera] getVisitingCamera
-- @param self
-- @return Camera#Camera ret (return value: cc.Camera)
--------------------------------
-- Sets the position (X, Y, and Z) in its parent's coordinate system
-- @function [parent=#Camera] setPosition3D
-- @param self
-- @param #vec3_table vec3
-- @param #vec3_table position
return nil

9
cocos/scripting/lua-bindings/auto/api/CardinalSplineBy.lua
View File

@ -5,26 +5,31 @@
-- @parent_module cc
--------------------------------
--
-- @function [parent=#CardinalSplineBy] startWithTarget
-- @param self
-- @param #cc.Node node
-- @param #cc.Node target
--------------------------------
--
-- @function [parent=#CardinalSplineBy] clone
-- @param self
-- @return CardinalSplineBy#CardinalSplineBy ret (return value: cc.CardinalSplineBy)
--------------------------------
--
-- @function [parent=#CardinalSplineBy] updatePosition
-- @param self
-- @param #vec2_table vec2
-- @param #vec2_table newPos
--------------------------------
--
-- @function [parent=#CardinalSplineBy] reverse
-- @param self
-- @return CardinalSplineBy#CardinalSplineBy ret (return value: cc.CardinalSplineBy)
--------------------------------
--
-- @function [parent=#CardinalSplineBy] CardinalSplineBy
-- @param self

21
cocos/scripting/lua-bindings/auto/api/CardinalSplineTo.lua
View File

@ -5,44 +5,53 @@
-- @parent_module cc
--------------------------------
--
-- @function [parent=#CardinalSplineTo] getPoints
-- @param self
-- @return point_table#point_table ret (return value: point_table)
--------------------------------
--
-- @function [parent=#CardinalSplineTo] updatePosition
-- @param self
-- @param #vec2_table vec2
-- @param #vec2_table newPos
--------------------------------
-- initializes the action with a duration and an array of points
-- @function [parent=#CardinalSplineTo] initWithDuration
-- @param self
-- @param #float float
-- @param #point_table pointarray
-- @param #float float
-- @param #float duration
-- @param #point_table points
-- @param #float tension
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#CardinalSplineTo] startWithTarget
-- @param self
-- @param #cc.Node node
-- @param #cc.Node target
--------------------------------
--
-- @function [parent=#CardinalSplineTo] clone
-- @param self
-- @return CardinalSplineTo#CardinalSplineTo ret (return value: cc.CardinalSplineTo)
--------------------------------
--
-- @function [parent=#CardinalSplineTo] reverse
-- @param self
-- @return CardinalSplineTo#CardinalSplineTo ret (return value: cc.CardinalSplineTo)
--------------------------------
--
-- @function [parent=#CardinalSplineTo] update
-- @param self
-- @param #float float
-- @param #float time
--------------------------------
-- js NA<br>
-- lua NA
-- @function [parent=#CardinalSplineTo] CardinalSplineTo
-- @param self

7
cocos/scripting/lua-bindings/auto/api/CatmullRomBy.lua
View File

@ -5,18 +5,21 @@
-- @parent_module cc
--------------------------------
-- initializes the action with a duration and an array of points
-- @function [parent=#CatmullRomBy] initWithDuration
-- @param self
-- @param #float float
-- @param #point_table pointarray
-- @param #float dt
-- @param #point_table points
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#CatmullRomBy] clone
-- @param self
-- @return CatmullRomBy#CatmullRomBy ret (return value: cc.CatmullRomBy)
--------------------------------
--
-- @function [parent=#CatmullRomBy] reverse
-- @param self
-- @return CatmullRomBy#CatmullRomBy ret (return value: cc.CatmullRomBy)

7
cocos/scripting/lua-bindings/auto/api/CatmullRomTo.lua
View File

@ -5,18 +5,21 @@
-- @parent_module cc
--------------------------------
-- initializes the action with a duration and an array of points
-- @function [parent=#CatmullRomTo] initWithDuration
-- @param self
-- @param #float float
-- @param #point_table pointarray
-- @param #float dt
-- @param #point_table points
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#CatmullRomTo] clone
-- @param self
-- @return CatmullRomTo#CatmullRomTo ret (return value: cc.CatmullRomTo)
--------------------------------
--
-- @function [parent=#CatmullRomTo] reverse
-- @param self
-- @return CatmullRomTo#CatmullRomTo ret (return value: cc.CatmullRomTo)

77
cocos/scripting/lua-bindings/auto/api/CheckBox.lua
View File

@ -5,94 +5,123 @@
-- @parent_module ccui
--------------------------------
-- Load backGroundSelected texture for checkbox.<br>
-- param backGroundSelected backGround selected state texture.<br>
-- param texType @see TextureResType
-- @function [parent=#CheckBox] loadTextureBackGroundSelected
-- @param self
-- @param #string str
-- @param #int texturerestype
-- @param #string backGroundSelected
-- @param #int texType
--------------------------------
-- Load backGroundDisabled texture for checkbox.<br>
-- param backGroundDisabled backGroundDisabled texture.<br>
-- param texType @see TextureResType
-- @function [parent=#CheckBox] loadTextureBackGroundDisabled
-- @param self
-- @param #string str
-- @param #int texturerestype
-- @param #string backGroundDisabled
-- @param #int texType
--------------------------------
--
-- @function [parent=#CheckBox] setSelected
-- @param self
-- @param #bool bool
-- @param #bool selected
--------------------------------
--
-- @function [parent=#CheckBox] addEventListener
-- @param self
-- @param #function func
-- @param #function callback
--------------------------------
-- Load cross texture for checkbox.<br>
-- param cross cross texture.<br>
-- param texType @see TextureResType
-- @function [parent=#CheckBox] loadTextureFrontCross
-- @param self
-- @param #string str
-- @param #int texturerestype
-- @param #string
-- @param #int texType
--------------------------------
--
-- @function [parent=#CheckBox] isSelected
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
-- Load textures for checkbox.<br>
-- param backGround backGround texture.<br>
-- param backGroundSelected backGround selected state texture.<br>
-- param cross cross texture.<br>
-- param frontCrossDisabled cross dark state texture.<br>
-- param texType @see TextureResType
-- @function [parent=#CheckBox] loadTextures
-- @param self
-- @param #string str
-- @param #string str
-- @param #string str
-- @param #string str
-- @param #string str
-- @param #int texturerestype
-- @param #string backGround
-- @param #string backGroundSelected
-- @param #string cross
-- @param #string backGroundDisabled
-- @param #string frontCrossDisabled
-- @param #int texType
--------------------------------
-- Load backGround texture for checkbox.<br>
-- param backGround backGround texture.<br>
-- param texType @see TextureResType
-- @function [parent=#CheckBox] loadTextureBackGround
-- @param self
-- @param #string str
-- @param #int texturerestype
-- @param #string backGround
-- @param #int type
--------------------------------
-- Load frontCrossDisabled texture for checkbox.<br>
-- param frontCrossDisabled frontCrossDisabled texture.<br>
-- param texType @see TextureResType
-- @function [parent=#CheckBox] loadTextureFrontCrossDisabled
-- @param self
-- @param #string str
-- @param #int texturerestype
-- @param #string frontCrossDisabled
-- @param #int texType
--------------------------------
-- @overload self, string, string, string, string, string, int
-- @overload self
-- @function [parent=#CheckBox] create
-- @param self
-- @param #string str
-- @param #string str
-- @param #string str
-- @param #string str
-- @param #string str
-- @param #int texturerestype
-- @param #string backGround
-- @param #string backGroundSeleted
-- @param #string cross
-- @param #string backGroundDisabled
-- @param #string frontCrossDisabled
-- @param #int texType
-- @return CheckBox#CheckBox ret (retunr value: ccui.CheckBox)
--------------------------------
--
-- @function [parent=#CheckBox] createInstance
-- @param self
-- @return Ref#Ref ret (return value: cc.Ref)
--------------------------------
--
-- @function [parent=#CheckBox] getVirtualRenderer
-- @param self
-- @return Node#Node ret (return value: cc.Node)
--------------------------------
-- Returns the "class name" of widget.
-- @function [parent=#CheckBox] getDescription
-- @param self
-- @return string#string ret (return value: string)
--------------------------------
--
-- @function [parent=#CheckBox] getVirtualRendererSize
-- @param self
-- @return size_table#size_table ret (return value: size_table)
--------------------------------
-- Default constructor
-- @function [parent=#CheckBox] CheckBox
-- @param self

26
cocos/scripting/lua-bindings/auto/api/ClippingNode.lua
View File

@ -5,48 +5,62 @@
-- @parent_module cc
--------------------------------
-- Inverted. If this is set to true,<br>
-- the stencil is inverted, so the content is drawn where the stencil is NOT drawn.<br>
-- This default to false.
-- @function [parent=#ClippingNode] isInverted
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#ClippingNode] setInverted
-- @param self
-- @param #bool bool
-- @param #bool inverted
--------------------------------
--
-- @function [parent=#ClippingNode] setStencil
-- @param self
-- @param #cc.Node node
-- @param #cc.Node stencil
--------------------------------
-- The alpha threshold.<br>
-- The content is drawn only where the stencil have pixel with alpha greater than the alphaThreshold.<br>
-- Should be a float between 0 and 1.<br>
-- This default to 1 (so alpha test is disabled).
-- @function [parent=#ClippingNode] getAlphaThreshold
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
-- The Node to use as a stencil to do the clipping.<br>
-- The stencil node will be retained.<br>
-- This default to nil.
-- @function [parent=#ClippingNode] getStencil
-- @param self
-- @return Node#Node ret (return value: cc.Node)
--------------------------------
--
-- @function [parent=#ClippingNode] setAlphaThreshold
-- @param self
-- @param #float float
-- @param #float alphaThreshold
--------------------------------
-- @overload self, cc.Node
-- @overload self
-- @function [parent=#ClippingNode] create
-- @param self
-- @param #cc.Node node
-- @param #cc.Node stencil
-- @return ClippingNode#ClippingNode ret (retunr value: cc.ClippingNode)
--------------------------------
--
-- @function [parent=#ClippingNode] visit
-- @param self
-- @param #cc.Renderer renderer
-- @param #mat4_table mat4
-- @param #unsigned int int
-- @param #mat4_table parentTransform
-- @param #unsigned int parentFlags
return nil

14
cocos/scripting/lua-bindings/auto/api/ColorFrame.lua
View File

@ -5,41 +5,49 @@
-- @parent_module ccs
--------------------------------
--
-- @function [parent=#ColorFrame] getAlpha
-- @param self
-- @return unsigned char#unsigned char ret (return value: unsigned char)
--------------------------------
--
-- @function [parent=#ColorFrame] getColor
-- @param self
-- @return color3b_table#color3b_table ret (return value: color3b_table)
--------------------------------
--
-- @function [parent=#ColorFrame] setAlpha
-- @param self
-- @param #unsigned char char
-- @param #unsigned char alpha
--------------------------------
--
-- @function [parent=#ColorFrame] setColor
-- @param self
-- @param #color3b_table color3b
-- @param #color3b_table color
--------------------------------
--
-- @function [parent=#ColorFrame] create
-- @param self
-- @return ColorFrame#ColorFrame ret (return value: ccs.ColorFrame)
--------------------------------
--
-- @function [parent=#ColorFrame] apply
-- @param self
-- @param #float float
-- @param #float percent
--------------------------------
--
-- @function [parent=#ColorFrame] clone
-- @param self
-- @return Frame#Frame ret (return value: ccs.Frame)
--------------------------------
--
-- @function [parent=#ColorFrame] ColorFrame
-- @param self

49
cocos/scripting/lua-bindings/auto/api/ComAttribute.lua
View File

@ -5,82 +5,95 @@
-- @parent_module ccs
--------------------------------
--
-- @function [parent=#ComAttribute] getFloat
-- @param self
-- @param #string str
-- @param #float float
-- @param #string key
-- @param #float def
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#ComAttribute] getString
-- @param self
-- @param #string str
-- @param #string str
-- @param #string key
-- @param #string def
-- @return string#string ret (return value: string)
--------------------------------
--
-- @function [parent=#ComAttribute] setFloat
-- @param self
-- @param #string str
-- @param #float float
-- @param #string key
-- @param #float value
--------------------------------
--
-- @function [parent=#ComAttribute] setString
-- @param self
-- @param #string str
-- @param #string str
-- @param #string key
-- @param #string value
--------------------------------
--
-- @function [parent=#ComAttribute] getBool
-- @param self
-- @param #string str
-- @param #bool bool
-- @param #string key
-- @param #bool def
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#ComAttribute] setInt
-- @param self
-- @param #string str
-- @param #int int
-- @param #string key
-- @param #int value
--------------------------------
--
-- @function [parent=#ComAttribute] parse
-- @param self
-- @param #string str
-- @param #string jsonFile
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#ComAttribute] getInt
-- @param self
-- @param #string str
-- @param #int int
-- @param #string key
-- @param #int def
-- @return int#int ret (return value: int)
--------------------------------
--
-- @function [parent=#ComAttribute] setBool
-- @param self
-- @param #string str
-- @param #bool bool
-- @param #string key
-- @param #bool value
--------------------------------
--
-- @function [parent=#ComAttribute] create
-- @param self
-- @return ComAttribute#ComAttribute ret (return value: ccs.ComAttribute)
--------------------------------
--
-- @function [parent=#ComAttribute] createInstance
-- @param self
-- @return Ref#Ref ret (return value: cc.Ref)
--------------------------------
--
-- @function [parent=#ComAttribute] init
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#ComAttribute] serialize
-- @param self
-- @param #void void
-- @param #void r
-- @return bool#bool ret (return value: bool)
return nil

63
cocos/scripting/lua-bindings/auto/api/ComAudio.lua
View File

@ -5,35 +5,42 @@
-- @parent_module ccs
--------------------------------
--
-- @function [parent=#ComAudio] stopAllEffects
-- @param self
--------------------------------
--
-- @function [parent=#ComAudio] getEffectsVolume
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#ComAudio] stopEffect
-- @param self
-- @param #unsigned int int
-- @param #unsigned int nSoundId
--------------------------------
--
-- @function [parent=#ComAudio] getBackgroundMusicVolume
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#ComAudio] willPlayBackgroundMusic
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#ComAudio] setBackgroundMusicVolume
-- @param self
-- @param #float float
-- @param #float volume
--------------------------------
--
-- @function [parent=#ComAudio] end
-- @param self
@ -42,34 +49,40 @@
-- @overload self, bool
-- @function [parent=#ComAudio] stopBackgroundMusic
-- @param self
-- @param #bool bool
-- @param #bool bReleaseData
--------------------------------
--
-- @function [parent=#ComAudio] pauseBackgroundMusic
-- @param self
--------------------------------
--
-- @function [parent=#ComAudio] isBackgroundMusicPlaying
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#ComAudio] isLoop
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#ComAudio] resumeAllEffects
-- @param self
--------------------------------
--
-- @function [parent=#ComAudio] pauseAllEffects
-- @param self
--------------------------------
--
-- @function [parent=#ComAudio] preloadBackgroundMusic
-- @param self
-- @param #char char
-- @param #char pszFilePath
--------------------------------
-- @overload self, char
@ -77,8 +90,8 @@
-- @overload self
-- @function [parent=#ComAudio] playBackgroundMusic
-- @param self
-- @param #char char
-- @param #bool bool
-- @param #char pszFilePath
-- @param #bool bLoop
--------------------------------
-- @overload self, char
@ -86,85 +99,101 @@
-- @overload self
-- @function [parent=#ComAudio] playEffect
-- @param self
-- @param #char char
-- @param #bool bool
-- @param #char pszFilePath
-- @param #bool bLoop
-- @return unsigned int#unsigned int ret (retunr value: unsigned int)
--------------------------------
--
-- @function [parent=#ComAudio] preloadEffect
-- @param self
-- @param #char char
-- @param #char pszFilePath
--------------------------------
--
-- @function [parent=#ComAudio] setLoop
-- @param self
-- @param #bool bool
-- @param #bool bLoop
--------------------------------
--
-- @function [parent=#ComAudio] unloadEffect
-- @param self
-- @param #char char
-- @param #char pszFilePath
--------------------------------
--
-- @function [parent=#ComAudio] rewindBackgroundMusic
-- @param self
--------------------------------
--
-- @function [parent=#ComAudio] pauseEffect
-- @param self
-- @param #unsigned int int
-- @param #unsigned int nSoundId
--------------------------------
--
-- @function [parent=#ComAudio] resumeBackgroundMusic
-- @param self
--------------------------------
--
-- @function [parent=#ComAudio] setFile
-- @param self
-- @param #char char
-- @param #char pszFilePath
--------------------------------
--
-- @function [parent=#ComAudio] setEffectsVolume
-- @param self
-- @param #float float
-- @param #float volume
--------------------------------
--
-- @function [parent=#ComAudio] getFile
-- @param self
-- @return char#char ret (return value: char)
--------------------------------
--
-- @function [parent=#ComAudio] resumeEffect
-- @param self
-- @param #unsigned int int
-- @param #unsigned int nSoundId
--------------------------------
--
-- @function [parent=#ComAudio] create
-- @param self
-- @return ComAudio#ComAudio ret (return value: ccs.ComAudio)
--------------------------------
--
-- @function [parent=#ComAudio] createInstance
-- @param self
-- @return Ref#Ref ret (return value: cc.Ref)
--------------------------------
--
-- @function [parent=#ComAudio] setEnabled
-- @param self
-- @param #bool bool
-- @param #bool b
--------------------------------
--
-- @function [parent=#ComAudio] isEnabled
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#ComAudio] serialize
-- @param self
-- @param #void void
-- @param #void r
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#ComAudio] init
-- @param self
-- @return bool#bool ret (return value: bool)

11
cocos/scripting/lua-bindings/auto/api/ComController.lua
View File

@ -5,36 +5,43 @@
-- @parent_module ccs
--------------------------------
--
-- @function [parent=#ComController] create
-- @param self
-- @return ComController#ComController ret (return value: ccs.ComController)
--------------------------------
--
-- @function [parent=#ComController] createInstance
-- @param self
-- @return Ref#Ref ret (return value: cc.Ref)
--------------------------------
--
-- @function [parent=#ComController] setEnabled
-- @param self
-- @param #bool bool
-- @param #bool b
--------------------------------
--
-- @function [parent=#ComController] isEnabled
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#ComController] update
-- @param self
-- @param #float float
-- @param #float delta
--------------------------------
--
-- @function [parent=#ComController] init
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
-- js ctor
-- @function [parent=#ComController] ComController
-- @param self

8
cocos/scripting/lua-bindings/auto/api/ComRender.lua
View File

@ -5,11 +5,13 @@
-- @parent_module ccs
--------------------------------
--
-- @function [parent=#ComRender] setNode
-- @param self
-- @param #cc.Node node
--------------------------------
--
-- @function [parent=#ComRender] getNode
-- @param self
-- @return Node#Node ret (return value: cc.Node)
@ -20,18 +22,20 @@
-- @function [parent=#ComRender] create
-- @param self
-- @param #cc.Node node
-- @param #char char
-- @param #char comName
-- @return ComRender#ComRender ret (retunr value: ccs.ComRender)
--------------------------------
--
-- @function [parent=#ComRender] createInstance
-- @param self
-- @return Ref#Ref ret (return value: cc.Ref)
--------------------------------
--
-- @function [parent=#ComRender] serialize
-- @param self
-- @param #void void
-- @param #void r
-- @return bool#bool ret (return value: bool)
return nil

17
cocos/scripting/lua-bindings/auto/api/Component.lua
View File

@ -5,46 +5,55 @@
-- @parent_module cc
--------------------------------
--
-- @function [parent=#Component] setEnabled
-- @param self
-- @param #bool bool
-- @param #bool b
--------------------------------
--
-- @function [parent=#Component] setName
-- @param self
-- @param #string str
-- @param #string name
--------------------------------
--
-- @function [parent=#Component] isEnabled
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#Component] update
-- @param self
-- @param #float float
-- @param #float delta
--------------------------------
--
-- @function [parent=#Component] getOwner
-- @param self
-- @return Node#Node ret (return value: cc.Node)
--------------------------------
--
-- @function [parent=#Component] init
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#Component] setOwner
-- @param self
-- @param #cc.Node node
-- @param #cc.Node pOwner
--------------------------------
--
-- @function [parent=#Component] getName
-- @param self
-- @return string#string ret (return value: string)
--------------------------------
--
-- @function [parent=#Component] create
-- @param self
-- @return Component#Component ret (return value: cc.Component)

10
cocos/scripting/lua-bindings/auto/api/Console.lua
View File

@ -5,24 +5,28 @@
-- @parent_module cc
--------------------------------
-- stops the Console. 'stop' will be called at destruction time as well
-- @function [parent=#Console] stop
-- @param self
--------------------------------
-- starts listening to specifed TCP port
-- @function [parent=#Console] listenOnTCP
-- @param self
-- @param #int int
-- @param #int port
-- @return bool#bool ret (return value: bool)
--------------------------------
-- starts listening to specifed file descriptor
-- @function [parent=#Console] listenOnFileDescriptor
-- @param self
-- @param #int int
-- @param #int fd
-- @return bool#bool ret (return value: bool)
--------------------------------
-- log something in the console
-- @function [parent=#Console] log
-- @param self
-- @param #char char
-- @param #char buf
return nil

6
cocos/scripting/lua-bindings/auto/api/ContourData.lua
View File

@ -5,21 +5,25 @@
-- @parent_module ccs
--------------------------------
--
-- @function [parent=#ContourData] init
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#ContourData] addVertex
-- @param self
-- @param #vec2_table vec2
-- @param #vec2_table vertex
--------------------------------
--
-- @function [parent=#ContourData] create
-- @param self
-- @return ContourData#ContourData ret (return value: ccs.ContourData)
--------------------------------
-- js ctor
-- @function [parent=#ContourData] ContourData
-- @param self

36
cocos/scripting/lua-bindings/auto/api/Control.lua
View File

@ -5,53 +5,65 @@
-- @parent_module cc
--------------------------------
-- Tells whether the control is enabled.
-- @function [parent=#Control] setEnabled
-- @param self
-- @param #bool bool
-- @param #bool bEnabled
--------------------------------
--
-- @function [parent=#Control] onTouchMoved
-- @param self
-- @param #cc.Touch touch
-- @param #cc.Event event
--------------------------------
--
-- @function [parent=#Control] getState
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
--
-- @function [parent=#Control] onTouchEnded
-- @param self
-- @param #cc.Touch touch
-- @param #cc.Event event
--------------------------------
-- Sends action messages for the given control events.<br>
-- param controlEvents A bitmask whose set flags specify the control events for<br>
-- which action messages are sent. See "CCControlEvent" for bitmask constants.
-- @function [parent=#Control] sendActionsForControlEvents
-- @param self
-- @param #int eventtype
-- @param #int controlEvents
--------------------------------
-- A Boolean value that determines the control selected state.
-- @function [parent=#Control] setSelected
-- @param self
-- @param #bool bool
-- @param #bool bSelected
--------------------------------
--
-- @function [parent=#Control] isEnabled
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#Control] onTouchCancelled
-- @param self
-- @param #cc.Touch touch
-- @param #cc.Event event
--------------------------------
-- Updates the control layout using its current internal state.
-- @function [parent=#Control] needsLayout
-- @param self
--------------------------------
--
-- @function [parent=#Control] onTouchBegan
-- @param self
-- @param #cc.Touch touch
@ -59,50 +71,64 @@
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#Control] hasVisibleParents
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#Control] isSelected
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
-- Returns a boolean value that indicates whether a touch is inside the bounds<br>
-- of the receiver. The given touch must be relative to the world.<br>
-- param touch A Touch object that represents a touch.<br>
-- return Whether a touch is inside the receiver's rect.
-- @function [parent=#Control] isTouchInside
-- @param self
-- @param #cc.Touch touch
-- @return bool#bool ret (return value: bool)
--------------------------------
-- A Boolean value that determines whether the control is highlighted.
-- @function [parent=#Control] setHighlighted
-- @param self
-- @param #bool bool
-- @param #bool bHighlighted
--------------------------------
-- Returns a point corresponding to the touh location converted into the<br>
-- control space coordinates.<br>
-- param touch A Touch object that represents a touch.
-- @function [parent=#Control] getTouchLocation
-- @param self
-- @param #cc.Touch touch
-- @return vec2_table#vec2_table ret (return value: vec2_table)
--------------------------------
--
-- @function [parent=#Control] isHighlighted
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
-- Creates a Control object
-- @function [parent=#Control] create
-- @param self
-- @return Control#Control ret (return value: cc.Control)
--------------------------------
--
-- @function [parent=#Control] isOpacityModifyRGB
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#Control] setOpacityModifyRGB
-- @param self
-- @param #bool bool
-- @param #bool bOpacityModifyRGB
return nil

141
cocos/scripting/lua-bindings/auto/api/ControlButton.lua
View File

@ -5,102 +5,133 @@
-- @parent_module cc
--------------------------------
--
-- @function [parent=#ControlButton] isPushed
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#ControlButton] setSelected
-- @param self
-- @param #bool bool
-- @param #bool enabled
--------------------------------
-- Sets the title label to use for the specified state.<br>
-- If a property is not specified for a state, the default is to use<br>
-- the ButtonStateNormal value.<br>
-- param label The title label to use for the specified state.<br>
-- param state The state that uses the specified title. The values are described<br>
-- in "CCControlState".
-- @function [parent=#ControlButton] setTitleLabelForState
-- @param self
-- @param #cc.Node node
-- @param #cc.Node label
-- @param #int state
--------------------------------
--
-- @function [parent=#ControlButton] setAdjustBackgroundImage
-- @param self
-- @param #bool bool
-- @param #bool adjustBackgroundImage
--------------------------------
--
-- @function [parent=#ControlButton] setHighlighted
-- @param self
-- @param #bool bool
-- @param #bool enabled
--------------------------------
--
-- @function [parent=#ControlButton] setZoomOnTouchDown
-- @param self
-- @param #bool bool
-- @param #bool var
--------------------------------
-- Sets the title string to use for the specified state.<br>
-- If a property is not specified for a state, the default is to use<br>
-- the ButtonStateNormal value.<br>
-- param title The title string to use for the specified state.<br>
-- param state The state that uses the specified title. The values are described<br>
-- in "CCControlState".
-- @function [parent=#ControlButton] setTitleForState
-- @param self
-- @param #string str
-- @param #string title
-- @param #int state
--------------------------------
--
-- @function [parent=#ControlButton] setLabelAnchorPoint
-- @param self
-- @param #vec2_table vec2
-- @param #vec2_table var
--------------------------------
--
-- @function [parent=#ControlButton] getLabelAnchorPoint
-- @param self
-- @return vec2_table#vec2_table ret (return value: vec2_table)
--------------------------------
--
-- @function [parent=#ControlButton] getTitleTTFSizeForState
-- @param self
-- @param #int state
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#ControlButton] setTitleTTFForState
-- @param self
-- @param #string str
-- @param #string fntFile
-- @param #int state
--------------------------------
--
-- @function [parent=#ControlButton] setTitleTTFSizeForState
-- @param self
-- @param #float float
-- @param #float size
-- @param #int state
--------------------------------
--
-- @function [parent=#ControlButton] setTitleLabel
-- @param self
-- @param #cc.Node node
-- @param #cc.Node var
--------------------------------
--
-- @function [parent=#ControlButton] setPreferredSize
-- @param self
-- @param #size_table size
-- @param #size_table var
--------------------------------
--
-- @function [parent=#ControlButton] getCurrentTitleColor
-- @param self
-- @return color3b_table#color3b_table ret (return value: color3b_table)
--------------------------------
--
-- @function [parent=#ControlButton] setEnabled
-- @param self
-- @param #bool bool
-- @param #bool enabled
--------------------------------
-- Returns the background sprite used for a state.<br>
-- param state The state that uses the background sprite. Possible values are<br>
-- described in "CCControlState".
-- @function [parent=#ControlButton] getBackgroundSpriteForState
-- @param self
-- @param #int state
-- @return Scale9Sprite#Scale9Sprite ret (return value: cc.Scale9Sprite)
-- @return Scale9Sprite#Scale9Sprite ret (return value: ccui.Scale9Sprite)
--------------------------------
--
-- @function [parent=#ControlButton] getHorizontalOrigin
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
--
-- @function [parent=#ControlButton] needsLayout
-- @param self
@ -112,161 +143,209 @@
-- @return string#string ret (retunr value: string)
--------------------------------
--
-- @function [parent=#ControlButton] getScaleRatio
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#ControlButton] getTitleTTFForState
-- @param self
-- @param #int state
-- @return string#string ret (return value: string)
--------------------------------
--
-- @function [parent=#ControlButton] getBackgroundSprite
-- @param self
-- @return Scale9Sprite#Scale9Sprite ret (return value: cc.Scale9Sprite)
-- @return Scale9Sprite#Scale9Sprite ret (return value: ccui.Scale9Sprite)
--------------------------------
-- Returns the title color used for a state.<br>
-- param state The state that uses the specified color. The values are described<br>
-- in "CCControlState".<br>
-- return The color of the title for the specified state.
-- @function [parent=#ControlButton] getTitleColorForState
-- @param self
-- @param #int state
-- @return color3b_table#color3b_table ret (return value: color3b_table)
--------------------------------
-- Sets the color of the title to use for the specified state.<br>
-- param color The color of the title to use for the specified state.<br>
-- param state The state that uses the specified color. The values are described<br>
-- in "CCControlState".
-- @function [parent=#ControlButton] setTitleColorForState
-- @param self
-- @param #color3b_table color3b
-- @param #color3b_table color
-- @param #int state
--------------------------------
-- Adjust the background image. YES by default. If the property is set to NO, the<br>
-- background will use the prefered size of the background image.
-- @function [parent=#ControlButton] doesAdjustBackgroundImage
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
-- Sets the background spriteFrame to use for the specified button state.<br>
-- param spriteFrame The background spriteFrame to use for the specified state.<br>
-- param state The state that uses the specified image. The values are described<br>
-- in "CCControlState".
-- @function [parent=#ControlButton] setBackgroundSpriteFrameForState
-- @param self
-- @param #cc.SpriteFrame spriteframe
-- @param #cc.SpriteFrame spriteFrame
-- @param #int state
--------------------------------
-- Sets the background sprite to use for the specified button state.<br>
-- param sprite The background sprite to use for the specified state.<br>
-- param state The state that uses the specified image. The values are described<br>
-- in "CCControlState".
-- @function [parent=#ControlButton] setBackgroundSpriteForState
-- @param self
-- @param #cc.Scale9Sprite scale9sprite
-- @param #ccui.Scale9Sprite sprite
-- @param #int state
--------------------------------
--
-- @function [parent=#ControlButton] setScaleRatio
-- @param self
-- @param #float float
-- @param #float var
--------------------------------
--
-- @function [parent=#ControlButton] setBackgroundSprite
-- @param self
-- @param #cc.Scale9Sprite scale9sprite
-- @param #ccui.Scale9Sprite var
--------------------------------
--
-- @function [parent=#ControlButton] getTitleLabel
-- @param self
-- @return Node#Node ret (return value: cc.Node)
--------------------------------
--
-- @function [parent=#ControlButton] getPreferredSize
-- @param self
-- @return size_table#size_table ret (return value: size_table)
--------------------------------
--
-- @function [parent=#ControlButton] getVerticalMargin
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
-- Returns the title label used for a state.<br>
-- param state The state that uses the title label. Possible values are described<br>
-- in "CCControlState".
-- @function [parent=#ControlButton] getTitleLabelForState
-- @param self
-- @param #int state
-- @return Node#Node ret (return value: cc.Node)
--------------------------------
--
-- @function [parent=#ControlButton] setMargins
-- @param self
-- @param #int int
-- @param #int int
-- @param #int marginH
-- @param #int marginV
--------------------------------
-- Sets the font of the label, changes the label to a BMFont if neccessary.<br>
-- param fntFile The name of the font to change to<br>
-- param state The state that uses the specified fntFile. The values are described<br>
-- in "CCControlState".
-- @function [parent=#ControlButton] setTitleBMFontForState
-- @param self
-- @param #string str
-- @param #string fntFile
-- @param #int state
--------------------------------
--
-- @function [parent=#ControlButton] getTitleBMFontForState
-- @param self
-- @param #int state
-- @return string#string ret (return value: string)
--------------------------------
--
-- @function [parent=#ControlButton] getZoomOnTouchDown
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
-- Returns the title used for a state.<br>
-- param state The state that uses the title. Possible values are described in<br>
-- "CCControlState".<br>
-- return The title for the specified state.
-- @function [parent=#ControlButton] getTitleForState
-- @param self
-- @param #int state
-- @return string#string ret (return value: string)
--------------------------------
-- @overload self, cc.Scale9Sprite
-- @overload self, ccui.Scale9Sprite
-- @overload self
-- @overload self, cc.Node, cc.Scale9Sprite
-- @overload self, cc.Node, ccui.Scale9Sprite
-- @overload self, string, string, float
-- @function [parent=#ControlButton] create
-- @param self
-- @param #string str
-- @param #string str
-- @param #float float
-- @param #string title
-- @param #string fontName
-- @param #float fontSize
-- @return ControlButton#ControlButton ret (retunr value: cc.ControlButton)
--------------------------------
--
-- @function [parent=#ControlButton] onTouchMoved
-- @param self
-- @param #cc.Touch touch
-- @param #cc.Event event
--------------------------------
--
-- @function [parent=#ControlButton] onTouchEnded
-- @param self
-- @param #cc.Touch touch
-- @param #cc.Event event
--------------------------------
--
-- @function [parent=#ControlButton] setColor
-- @param self
-- @param #color3b_table color3b
-- @param #color3b_table
--------------------------------
--
-- @function [parent=#ControlButton] onTouchCancelled
-- @param self
-- @param #cc.Touch touch
-- @param #cc.Event event
--------------------------------
--
-- @function [parent=#ControlButton] setOpacity
-- @param self
-- @param #unsigned char char
-- @param #unsigned char var
--------------------------------
--
-- @function [parent=#ControlButton] updateDisplayedOpacity
-- @param self
-- @param #unsigned char char
-- @param #unsigned char parentOpacity
--------------------------------
--
-- @function [parent=#ControlButton] updateDisplayedColor
-- @param self
-- @param #color3b_table color3b
-- @param #color3b_table parentColor
--------------------------------
--
-- @function [parent=#ControlButton] onTouchBegan
-- @param self
-- @param #cc.Touch touch

31
cocos/scripting/lua-bindings/auto/api/ControlColourPicker.lua
View File

@ -5,68 +5,81 @@
-- @parent_module cc
--------------------------------
--
-- @function [parent=#ControlColourPicker] setEnabled
-- @param self
-- @param #bool bool
-- @param #bool bEnabled
--------------------------------
--
-- @function [parent=#ControlColourPicker] getHuePicker
-- @param self
-- @return ControlHuePicker#ControlHuePicker ret (return value: cc.ControlHuePicker)
--------------------------------
--
-- @function [parent=#ControlColourPicker] setColor
-- @param self
-- @param #color3b_table color3b
-- @param #color3b_table colorValue
--------------------------------
--
-- @function [parent=#ControlColourPicker] hueSliderValueChanged
-- @param self
-- @param #cc.Ref ref
-- @param #int eventtype
-- @param #cc.Ref sender
-- @param #int controlEvent
--------------------------------
--
-- @function [parent=#ControlColourPicker] getcolourPicker
-- @param self
-- @return ControlSaturationBrightnessPicker#ControlSaturationBrightnessPicker ret (return value: cc.ControlSaturationBrightnessPicker)
--------------------------------
--
-- @function [parent=#ControlColourPicker] setBackground
-- @param self
-- @param #cc.Sprite sprite
-- @param #cc.Sprite var
--------------------------------
--
-- @function [parent=#ControlColourPicker] init
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#ControlColourPicker] setcolourPicker
-- @param self
-- @param #cc.ControlSaturationBrightnessPicker controlsaturationbrightnesspicker
-- @param #cc.ControlSaturationBrightnessPicker var
--------------------------------
--
-- @function [parent=#ControlColourPicker] colourSliderValueChanged
-- @param self
-- @param #cc.Ref ref
-- @param #int eventtype
-- @param #cc.Ref sender
-- @param #int controlEvent
--------------------------------
--
-- @function [parent=#ControlColourPicker] setHuePicker
-- @param self
-- @param #cc.ControlHuePicker controlhuepicker
-- @param #cc.ControlHuePicker var
--------------------------------
--
-- @function [parent=#ControlColourPicker] getBackground
-- @param self
-- @return Sprite#Sprite ret (return value: cc.Sprite)
--------------------------------
--
-- @function [parent=#ControlColourPicker] create
-- @param self
-- @return ControlColourPicker#ControlColourPicker ret (return value: cc.ControlColourPicker)
--------------------------------
-- js ctor
-- @function [parent=#ControlColourPicker] ControlColourPicker
-- @param self

39
cocos/scripting/lua-bindings/auto/api/ControlHuePicker.lua
View File

@ -5,83 +5,98 @@
-- @parent_module cc
--------------------------------
--
-- @function [parent=#ControlHuePicker] setEnabled
-- @param self
-- @param #bool bool
-- @param #bool enabled
--------------------------------
--
-- @function [parent=#ControlHuePicker] initWithTargetAndPos
-- @param self
-- @param #cc.Node node
-- @param #vec2_table vec2
-- @param #cc.Node target
-- @param #vec2_table pos
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#ControlHuePicker] setHue
-- @param self
-- @param #float float
-- @param #float val
--------------------------------
--
-- @function [parent=#ControlHuePicker] getStartPos
-- @param self
-- @return vec2_table#vec2_table ret (return value: vec2_table)
--------------------------------
--
-- @function [parent=#ControlHuePicker] getHue
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#ControlHuePicker] getSlider
-- @param self
-- @return Sprite#Sprite ret (return value: cc.Sprite)
--------------------------------
--
-- @function [parent=#ControlHuePicker] setBackground
-- @param self
-- @param #cc.Sprite sprite
-- @param #cc.Sprite var
--------------------------------
--
-- @function [parent=#ControlHuePicker] setHuePercentage
-- @param self
-- @param #float float
-- @param #float val
--------------------------------
--
-- @function [parent=#ControlHuePicker] getBackground
-- @param self
-- @return Sprite#Sprite ret (return value: cc.Sprite)
--------------------------------
--
-- @function [parent=#ControlHuePicker] getHuePercentage
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#ControlHuePicker] setSlider
-- @param self
-- @param #cc.Sprite sprite
-- @param #cc.Sprite var
--------------------------------
--
-- @function [parent=#ControlHuePicker] create
-- @param self
-- @param #cc.Node node
-- @param #vec2_table vec2
-- @param #cc.Node target
-- @param #vec2_table pos
-- @return ControlHuePicker#ControlHuePicker ret (return value: cc.ControlHuePicker)
--------------------------------
--
-- @function [parent=#ControlHuePicker] onTouchMoved
-- @param self
-- @param #cc.Touch touch
-- @param #cc.Event event
-- @param #cc.Touch pTouch
-- @param #cc.Event pEvent
--------------------------------
--
-- @function [parent=#ControlHuePicker] onTouchBegan
-- @param self
-- @param #cc.Touch touch
-- @param #cc.Event event
-- @param #cc.Event pEvent
-- @return bool#bool ret (return value: bool)
--------------------------------
-- js ctor
-- @function [parent=#ControlHuePicker] ControlHuePicker
-- @param self

83
cocos/scripting/lua-bindings/auto/api/ControlPotentiometer.lua
View File

@ -5,143 +5,170 @@
-- @parent_module cc
--------------------------------
--
-- @function [parent=#ControlPotentiometer] setPreviousLocation
-- @param self
-- @param #vec2_table vec2
-- @param #vec2_table var
--------------------------------
--
-- @function [parent=#ControlPotentiometer] setValue
-- @param self
-- @param #float float
-- @param #float value
--------------------------------
--
-- @function [parent=#ControlPotentiometer] getProgressTimer
-- @param self
-- @return ProgressTimer#ProgressTimer ret (return value: cc.ProgressTimer)
--------------------------------
--
-- @function [parent=#ControlPotentiometer] getMaximumValue
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
-- Returns the angle in degree between line1 and line2.
-- @function [parent=#ControlPotentiometer] angleInDegreesBetweenLineFromPoint_toPoint_toLineFromPoint_toPoint
-- @param self
-- @param #vec2_table vec2
-- @param #vec2_table vec2
-- @param #vec2_table vec2
-- @param #vec2_table vec2
-- @param #vec2_table beginLineA
-- @param #vec2_table endLineA
-- @param #vec2_table beginLineB
-- @param #vec2_table endLineB
-- @return float#float ret (return value: float)
--------------------------------
-- Factorize the event dispath into these methods.
-- @function [parent=#ControlPotentiometer] potentiometerBegan
-- @param self
-- @param #vec2_table vec2
-- @param #vec2_table location
--------------------------------
--
-- @function [parent=#ControlPotentiometer] setMaximumValue
-- @param self
-- @param #float float
-- @param #float maximumValue
--------------------------------
--
-- @function [parent=#ControlPotentiometer] getMinimumValue
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#ControlPotentiometer] setThumbSprite
-- @param self
-- @param #cc.Sprite sprite
-- @param #cc.Sprite var
--------------------------------
--
-- @function [parent=#ControlPotentiometer] getValue
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#ControlPotentiometer] getPreviousLocation
-- @param self
-- @return vec2_table#vec2_table ret (return value: vec2_table)
--------------------------------
-- Returns the distance between the point1 and point2.
-- @function [parent=#ControlPotentiometer] distanceBetweenPointAndPoint
-- @param self
-- @param #vec2_table vec2
-- @param #vec2_table vec2
-- @param #vec2_table point1
-- @param #vec2_table point2
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#ControlPotentiometer] potentiometerEnded
-- @param self
-- @param #vec2_table vec2
-- @param #vec2_table location
--------------------------------
--
-- @function [parent=#ControlPotentiometer] setProgressTimer
-- @param self
-- @param #cc.ProgressTimer progresstimer
-- @param #cc.ProgressTimer var
--------------------------------
--
-- @function [parent=#ControlPotentiometer] setMinimumValue
-- @param self
-- @param #float float
-- @param #float minimumValue
--------------------------------
--
-- @function [parent=#ControlPotentiometer] getThumbSprite
-- @param self
-- @return Sprite#Sprite ret (return value: cc.Sprite)
--------------------------------
-- Initializes a potentiometer with a track sprite and a progress bar.<br>
-- param trackSprite Sprite, that is used as a background.<br>
-- param progressTimer ProgressTimer, that is used as a progress bar.
-- @function [parent=#ControlPotentiometer] initWithTrackSprite_ProgressTimer_ThumbSprite
-- @param self
-- @param #cc.Sprite sprite
-- @param #cc.ProgressTimer progresstimer
-- @param #cc.Sprite sprite
-- @param #cc.Sprite trackSprite
-- @param #cc.ProgressTimer progressTimer
-- @param #cc.Sprite thumbSprite
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#ControlPotentiometer] potentiometerMoved
-- @param self
-- @param #vec2_table vec2
-- @param #vec2_table location
--------------------------------
-- Creates potentiometer with a track filename and a progress filename.
-- @function [parent=#ControlPotentiometer] create
-- @param self
-- @param #char char
-- @param #char char
-- @param #char char
-- @param #char backgroundFile
-- @param #char progressFile
-- @param #char thumbFile
-- @return ControlPotentiometer#ControlPotentiometer ret (return value: cc.ControlPotentiometer)
--------------------------------
--
-- @function [parent=#ControlPotentiometer] isTouchInside
-- @param self
-- @param #cc.Touch touch
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#ControlPotentiometer] setEnabled
-- @param self
-- @param #bool bool
-- @param #bool enabled
--------------------------------
--
-- @function [parent=#ControlPotentiometer] onTouchMoved
-- @param self
-- @param #cc.Touch touch
-- @param #cc.Event event
-- @param #cc.Touch pTouch
-- @param #cc.Event pEvent
--------------------------------
--
-- @function [parent=#ControlPotentiometer] onTouchEnded
-- @param self
-- @param #cc.Touch touch
-- @param #cc.Event event
-- @param #cc.Touch pTouch
-- @param #cc.Event pEvent
--------------------------------
--
-- @function [parent=#ControlPotentiometer] onTouchBegan
-- @param self
-- @param #cc.Touch touch
-- @param #cc.Event event
-- @param #cc.Touch pTouch
-- @param #cc.Event pEvent
-- @return bool#bool ret (return value: bool)
--------------------------------
-- js ctor
-- @function [parent=#ControlPotentiometer] ControlPotentiometer
-- @param self

21
cocos/scripting/lua-bindings/auto/api/ControlSaturationBrightnessPicker.lua
View File

@ -5,60 +5,71 @@
-- @parent_module cc
--------------------------------
--
-- @function [parent=#ControlSaturationBrightnessPicker] getShadow
-- @param self
-- @return Sprite#Sprite ret (return value: cc.Sprite)
--------------------------------
--
-- @function [parent=#ControlSaturationBrightnessPicker] initWithTargetAndPos
-- @param self
-- @param #cc.Node node
-- @param #vec2_table vec2
-- @param #cc.Node target
-- @param #vec2_table pos
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#ControlSaturationBrightnessPicker] getStartPos
-- @param self
-- @return vec2_table#vec2_table ret (return value: vec2_table)
--------------------------------
--
-- @function [parent=#ControlSaturationBrightnessPicker] getOverlay
-- @param self
-- @return Sprite#Sprite ret (return value: cc.Sprite)
--------------------------------
--
-- @function [parent=#ControlSaturationBrightnessPicker] setEnabled
-- @param self
-- @param #bool bool
-- @param #bool enabled
--------------------------------
--
-- @function [parent=#ControlSaturationBrightnessPicker] getSlider
-- @param self
-- @return Sprite#Sprite ret (return value: cc.Sprite)
--------------------------------
--
-- @function [parent=#ControlSaturationBrightnessPicker] getBackground
-- @param self
-- @return Sprite#Sprite ret (return value: cc.Sprite)
--------------------------------
--
-- @function [parent=#ControlSaturationBrightnessPicker] getSaturation
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#ControlSaturationBrightnessPicker] getBrightness
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#ControlSaturationBrightnessPicker] create
-- @param self
-- @param #cc.Node node
-- @param #vec2_table vec2
-- @param #cc.Node target
-- @param #vec2_table pos
-- @return ControlSaturationBrightnessPicker#ControlSaturationBrightnessPicker ret (return value: cc.ControlSaturationBrightnessPicker)
--------------------------------
-- js ctor
-- @function [parent=#ControlSaturationBrightnessPicker] ControlSaturationBrightnessPicker
-- @param self

59
cocos/scripting/lua-bindings/auto/api/ControlSlider.lua
View File

@ -5,76 +5,91 @@
-- @parent_module cc
--------------------------------
--
-- @function [parent=#ControlSlider] getSelectedThumbSprite
-- @param self
-- @return Sprite#Sprite ret (return value: cc.Sprite)
--------------------------------
--
-- @function [parent=#ControlSlider] locationFromTouch
-- @param self
-- @param #cc.Touch touch
-- @return vec2_table#vec2_table ret (return value: vec2_table)
--------------------------------
--
-- @function [parent=#ControlSlider] setSelectedThumbSprite
-- @param self
-- @param #cc.Sprite sprite
-- @param #cc.Sprite var
--------------------------------
--
-- @function [parent=#ControlSlider] setProgressSprite
-- @param self
-- @param #cc.Sprite sprite
-- @param #cc.Sprite var
--------------------------------
--
-- @function [parent=#ControlSlider] getMaximumAllowedValue
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#ControlSlider] getMinimumAllowedValue
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#ControlSlider] getMinimumValue
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#ControlSlider] setThumbSprite
-- @param self
-- @param #cc.Sprite sprite
-- @param #cc.Sprite var
--------------------------------
--
-- @function [parent=#ControlSlider] setMinimumValue
-- @param self
-- @param #float float
-- @param #float val
--------------------------------
--
-- @function [parent=#ControlSlider] setMinimumAllowedValue
-- @param self
-- @param #float float
-- @param #float var
--------------------------------
--
-- @function [parent=#ControlSlider] setEnabled
-- @param self
-- @param #bool bool
-- @param #bool enabled
--------------------------------
--
-- @function [parent=#ControlSlider] setValue
-- @param self
-- @param #float float
-- @param #float val
--------------------------------
--
-- @function [parent=#ControlSlider] setMaximumValue
-- @param self
-- @param #float float
-- @param #float val
--------------------------------
--
-- @function [parent=#ControlSlider] needsLayout
-- @param self
--------------------------------
--
-- @function [parent=#ControlSlider] getBackgroundSprite
-- @param self
-- @return Sprite#Sprite ret (return value: cc.Sprite)
@ -84,47 +99,54 @@
-- @overload self, cc.Sprite, cc.Sprite, cc.Sprite
-- @function [parent=#ControlSlider] initWithSprites
-- @param self
-- @param #cc.Sprite sprite
-- @param #cc.Sprite sprite
-- @param #cc.Sprite sprite
-- @param #cc.Sprite sprite
-- @param #cc.Sprite backgroundSprite
-- @param #cc.Sprite progressSprite
-- @param #cc.Sprite thumbSprite
-- @param #cc.Sprite selectedThumbSprite
-- @return bool#bool ret (retunr value: bool)
--------------------------------
--
-- @function [parent=#ControlSlider] getMaximumValue
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#ControlSlider] isTouchInside
-- @param self
-- @param #cc.Touch touch
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#ControlSlider] getValue
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#ControlSlider] getThumbSprite
-- @param self
-- @return Sprite#Sprite ret (return value: cc.Sprite)
--------------------------------
--
-- @function [parent=#ControlSlider] getProgressSprite
-- @param self
-- @return Sprite#Sprite ret (return value: cc.Sprite)
--------------------------------
--
-- @function [parent=#ControlSlider] setBackgroundSprite
-- @param self
-- @param #cc.Sprite sprite
-- @param #cc.Sprite var
--------------------------------
--
-- @function [parent=#ControlSlider] setMaximumAllowedValue
-- @param self
-- @param #float float
-- @param #float var
--------------------------------
-- @overload self, cc.Sprite, cc.Sprite, cc.Sprite
@ -133,13 +155,14 @@
-- @overload self, cc.Sprite, cc.Sprite, cc.Sprite, cc.Sprite
-- @function [parent=#ControlSlider] create
-- @param self
-- @param #cc.Sprite sprite
-- @param #cc.Sprite sprite
-- @param #cc.Sprite sprite
-- @param #cc.Sprite sprite
-- @param #cc.Sprite backgroundSprite
-- @param #cc.Sprite pogressSprite
-- @param #cc.Sprite thumbSprite
-- @param #cc.Sprite selectedThumbSprite
-- @return ControlSlider#ControlSlider ret (retunr value: cc.ControlSlider)
--------------------------------
-- js ctor
-- @function [parent=#ControlSlider] ControlSlider
-- @param self

72
cocos/scripting/lua-bindings/auto/api/ControlStepper.lua
View File

@ -5,138 +5,164 @@
-- @parent_module cc
--------------------------------
--
-- @function [parent=#ControlStepper] setMinusSprite
-- @param self
-- @param #cc.Sprite sprite
-- @param #cc.Sprite var
--------------------------------
--
-- @function [parent=#ControlStepper] getMinusLabel
-- @param self
-- @return Label#Label ret (return value: cc.Label)
--------------------------------
--
-- @function [parent=#ControlStepper] setWraps
-- @param self
-- @param #bool bool
-- @param #bool wraps
--------------------------------
--
-- @function [parent=#ControlStepper] isContinuous
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#ControlStepper] getMinusSprite
-- @param self
-- @return Sprite#Sprite ret (return value: cc.Sprite)
--------------------------------
-- Update the layout of the stepper with the given touch location.
-- @function [parent=#ControlStepper] updateLayoutUsingTouchLocation
-- @param self
-- @param #vec2_table vec2
-- @param #vec2_table location
--------------------------------
-- Set the numeric value of the stepper. If send is true, the Control::EventType::VALUE_CHANGED is sent.
-- @function [parent=#ControlStepper] setValueWithSendingEvent
-- @param self
-- @param #double double
-- @param #bool bool
-- @param #double value
-- @param #bool send
--------------------------------
--
-- @function [parent=#ControlStepper] getPlusLabel
-- @param self
-- @return Label#Label ret (return value: cc.Label)
--------------------------------
-- Stop the autorepeat.
-- @function [parent=#ControlStepper] stopAutorepeat
-- @param self
--------------------------------
--
-- @function [parent=#ControlStepper] setMinimumValue
-- @param self
-- @param #double double
-- @param #double minimumValue
--------------------------------
--
-- @function [parent=#ControlStepper] getPlusSprite
-- @param self
-- @return Sprite#Sprite ret (return value: cc.Sprite)
--------------------------------
--
-- @function [parent=#ControlStepper] setPlusSprite
-- @param self
-- @param #cc.Sprite sprite
-- @param #cc.Sprite var
--------------------------------
--
-- @function [parent=#ControlStepper] setMinusLabel
-- @param self
-- @param #cc.Label label
-- @param #cc.Label var
--------------------------------
--
-- @function [parent=#ControlStepper] setValue
-- @param self
-- @param #double double
-- @param #double value
--------------------------------
--
-- @function [parent=#ControlStepper] setStepValue
-- @param self
-- @param #double double
-- @param #double stepValue
--------------------------------
--
-- @function [parent=#ControlStepper] setMaximumValue
-- @param self
-- @param #double double
-- @param #double maximumValue
--------------------------------
--
-- @function [parent=#ControlStepper] update
-- @param self
-- @param #float float
-- @param #float dt
--------------------------------
-- Start the autorepeat increment/decrement.
-- @function [parent=#ControlStepper] startAutorepeat
-- @param self
--------------------------------
--
-- @function [parent=#ControlStepper] initWithMinusSpriteAndPlusSprite
-- @param self
-- @param #cc.Sprite sprite
-- @param #cc.Sprite sprite
-- @param #cc.Sprite minusSprite
-- @param #cc.Sprite plusSprite
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#ControlStepper] getValue
-- @param self
-- @return double#double ret (return value: double)
--------------------------------
--
-- @function [parent=#ControlStepper] setPlusLabel
-- @param self
-- @param #cc.Label label
-- @param #cc.Label var
--------------------------------
--
-- @function [parent=#ControlStepper] create
-- @param self
-- @param #cc.Sprite sprite
-- @param #cc.Sprite sprite
-- @param #cc.Sprite minusSprite
-- @param #cc.Sprite plusSprite
-- @return ControlStepper#ControlStepper ret (return value: cc.ControlStepper)
--------------------------------
--
-- @function [parent=#ControlStepper] onTouchMoved
-- @param self
-- @param #cc.Touch touch
-- @param #cc.Event event
-- @param #cc.Touch pTouch
-- @param #cc.Event pEvent
--------------------------------
--
-- @function [parent=#ControlStepper] onTouchEnded
-- @param self
-- @param #cc.Touch touch
-- @param #cc.Event event
-- @param #cc.Touch pTouch
-- @param #cc.Event pEvent
--------------------------------
--
-- @function [parent=#ControlStepper] onTouchBegan
-- @param self
-- @param #cc.Touch touch
-- @param #cc.Event event
-- @param #cc.Touch pTouch
-- @param #cc.Event pEvent
-- @return bool#bool ret (return value: bool)
--------------------------------
-- js ctor
-- @function [parent=#ControlStepper] ControlStepper
-- @param self

55
cocos/scripting/lua-bindings/auto/api/ControlSwitch.lua
View File

@ -5,19 +5,21 @@
-- @parent_module cc
--------------------------------
--
-- @function [parent=#ControlSwitch] setEnabled
-- @param self
-- @param #bool bool
-- @param #bool enabled
--------------------------------
-- @overload self, bool
-- @overload self, bool, bool
-- @function [parent=#ControlSwitch] setOn
-- @param self
-- @param #bool bool
-- @param #bool bool
-- @param #bool isOn
-- @param #bool animated
--------------------------------
--
-- @function [parent=#ControlSwitch] isOn
-- @param self
-- @return bool#bool ret (return value: bool)
@ -27,20 +29,22 @@
-- @overload self, cc.Sprite, cc.Sprite, cc.Sprite, cc.Sprite
-- @function [parent=#ControlSwitch] initWithMaskSprite
-- @param self
-- @param #cc.Sprite sprite
-- @param #cc.Sprite sprite
-- @param #cc.Sprite sprite
-- @param #cc.Sprite sprite
-- @param #cc.Label label
-- @param #cc.Label label
-- @param #cc.Sprite maskSprite
-- @param #cc.Sprite onSprite
-- @param #cc.Sprite offSprite
-- @param #cc.Sprite thumbSprite
-- @param #cc.Label onLabel
-- @param #cc.Label offLabel
-- @return bool#bool ret (retunr value: bool)
--------------------------------
--
-- @function [parent=#ControlSwitch] hasMoved
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#ControlSwitch] locationFromTouch
-- @param self
-- @param #cc.Touch touch
@ -51,40 +55,45 @@
-- @overload self, cc.Sprite, cc.Sprite, cc.Sprite, cc.Sprite, cc.Label, cc.Label
-- @function [parent=#ControlSwitch] create
-- @param self
-- @param #cc.Sprite sprite
-- @param #cc.Sprite sprite
-- @param #cc.Sprite sprite
-- @param #cc.Sprite sprite
-- @param #cc.Label label
-- @param #cc.Label label
-- @param #cc.Sprite maskSprite
-- @param #cc.Sprite onSprite
-- @param #cc.Sprite offSprite
-- @param #cc.Sprite thumbSprite
-- @param #cc.Label onLabel
-- @param #cc.Label offLabel
-- @return ControlSwitch#ControlSwitch ret (retunr value: cc.ControlSwitch)
--------------------------------
--
-- @function [parent=#ControlSwitch] onTouchMoved
-- @param self
-- @param #cc.Touch touch
-- @param #cc.Event event
-- @param #cc.Touch pTouch
-- @param #cc.Event pEvent
--------------------------------
--
-- @function [parent=#ControlSwitch] onTouchEnded
-- @param self
-- @param #cc.Touch touch
-- @param #cc.Event event
-- @param #cc.Touch pTouch
-- @param #cc.Event pEvent
--------------------------------
--
-- @function [parent=#ControlSwitch] onTouchCancelled
-- @param self
-- @param #cc.Touch touch
-- @param #cc.Event event
-- @param #cc.Touch pTouch
-- @param #cc.Event pEvent
--------------------------------
--
-- @function [parent=#ControlSwitch] onTouchBegan
-- @param self
-- @param #cc.Touch touch
-- @param #cc.Event event
-- @param #cc.Touch pTouch
-- @param #cc.Event pEvent
-- @return bool#bool ret (return value: bool)
--------------------------------
-- js ctor
-- @function [parent=#ControlSwitch] ControlSwitch
-- @param self

26
cocos/scripting/lua-bindings/auto/api/Controller.lua
View File

@ -4,48 +4,66 @@
-- @parent_module cc
--------------------------------
-- Activate receives key event from external key. e.g. back,menu.<br>
-- Controller receives only standard key which contained within enum Key by default.<br>
-- warning The API only work on the android platform for support diversified game controller.<br>
-- param externalKeyCode external key code<br>
-- param receive true if external key event on this controller should be receive, false otherwise.
-- @function [parent=#Controller] receiveExternalKeyEvent
-- @param self
-- @param #int int
-- @param #bool bool
-- @param #int externalKeyCode
-- @param #bool receive
--------------------------------
--
-- @function [parent=#Controller] getDeviceName
-- @param self
-- @return string#string ret (return value: string)
--------------------------------
--
-- @function [parent=#Controller] isConnected
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#Controller] getDeviceId
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
-- Changes the tag that is used to identify the controller easily.<br>
-- param tag A integer that identifies the controller.
-- @function [parent=#Controller] setTag
-- @param self
-- @param #int int
-- @param #int tag
--------------------------------
-- Returns a tag that is used to identify the controller easily.<br>
-- return An integer that identifies the controller.
-- @function [parent=#Controller] getTag
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
-- To start discovering new controllers<br>
-- warning The API only work on the IOS platform.Empty implementation on Android
-- @function [parent=#Controller] startDiscoveryController
-- @param self
--------------------------------
-- End the discovery process<br>
-- warning The API only work on the IOS platform.Empty implementation on Android
-- @function [parent=#Controller] stopDiscoveryController
-- @param self
--------------------------------
-- Gets a controller with its tag<br>
-- param tag An identifier to find the controller.
-- @function [parent=#Controller] getControllerByTag
-- @param self
-- @param #int int
-- @param #int tag
-- @return Controller#Controller ret (return value: cc.Controller)
return nil

8
cocos/scripting/lua-bindings/auto/api/DelayTime.lua
View File

@ -5,22 +5,26 @@
-- @parent_module cc
--------------------------------
-- creates the action
-- @function [parent=#DelayTime] create
-- @param self
-- @param #float float
-- @param #float d
-- @return DelayTime#DelayTime ret (return value: cc.DelayTime)
--------------------------------
--
-- @function [parent=#DelayTime] clone
-- @param self
-- @return DelayTime#DelayTime ret (return value: cc.DelayTime)
--------------------------------
--
-- @function [parent=#DelayTime] update
-- @param self
-- @param #float float
-- @param #float time
--------------------------------
--
-- @function [parent=#DelayTime] reverse
-- @param self
-- @return DelayTime#DelayTime ret (return value: cc.DelayTime)

151
cocos/scripting/lua-bindings/auto/api/Director.lua
View File

@ -4,307 +4,418 @@
-- @parent_module cc
--------------------------------
-- Pauses the running scene.<br>
-- The running scene will be _drawed_ but all scheduled timers will be paused<br>
-- While paused, the draw rate will be 4 FPS to reduce CPU consumption
-- @function [parent=#Director] pause
-- @param self
--------------------------------
-- Sets the EventDispatcher associated with this director <br>
-- since v3.0
-- @function [parent=#Director] setEventDispatcher
-- @param self
-- @param #cc.EventDispatcher eventdispatcher
-- @param #cc.EventDispatcher dispatcher
--------------------------------
-- Suspends the execution of the running scene, pushing it on the stack of suspended scenes.<br>
-- The new scene will be executed.<br>
-- Try to avoid big stacks of pushed scenes to reduce memory allocation. <br>
-- ONLY call it if there is a running scene.
-- @function [parent=#Director] pushScene
-- @param self
-- @param #cc.Scene scene
--------------------------------
--
-- @function [parent=#Director] getDeltaTime
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#Director] getContentScaleFactor
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
-- returns the size of the OpenGL view in pixels.
-- @function [parent=#Director] getWinSizeInPixels
-- @param self
-- @return size_table#size_table ret (return value: size_table)
--------------------------------
--
-- @function [parent=#Director] getConsole
-- @param self
-- @return Console#Console ret (return value: cc.Console)
--------------------------------
--
-- @function [parent=#Director] pushMatrix
-- @param self
-- @param #int matrix_stack_type
-- @param #int type
--------------------------------
-- sets the OpenGL default values
-- @function [parent=#Director] setGLDefaultValues
-- @param self
--------------------------------
-- Sets the ActionManager associated with this director<br>
-- since v2.0
-- @function [parent=#Director] setActionManager
-- @param self
-- @param #cc.ActionManager actionmanager
-- @param #cc.ActionManager actionManager
--------------------------------
-- enables/disables OpenGL alpha blending
-- @function [parent=#Director] setAlphaBlending
-- @param self
-- @param #bool bool
-- @param #bool on
--------------------------------
-- Pops out all scenes from the stack until the root scene in the queue.<br>
-- This scene will replace the running one.<br>
-- Internally it will call `popToSceneStackLevel(1)`
-- @function [parent=#Director] popToRootScene
-- @param self
--------------------------------
--
-- @function [parent=#Director] loadMatrix
-- @param self
-- @param #int matrix_stack_type
-- @param #mat4_table mat4
-- @param #int type
-- @param #mat4_table mat
--------------------------------
-- This object will be visited after the main scene is visited.<br>
-- This object MUST implement the "visit" selector.<br>
-- Useful to hook a notification object, like Notifications (http:github.com/manucorporat/CCNotifications)<br>
-- since v0.99.5
-- @function [parent=#Director] getNotificationNode
-- @param self
-- @return Node#Node ret (return value: cc.Node)
--------------------------------
-- returns the size of the OpenGL view in points.
-- @function [parent=#Director] getWinSize
-- @param self
-- @return size_table#size_table ret (return value: size_table)
--------------------------------
--
-- @function [parent=#Director] getTextureCache
-- @param self
-- @return TextureCache#TextureCache ret (return value: cc.TextureCache)
--------------------------------
-- Whether or not the replaced scene will receive the cleanup message.<br>
-- If the new scene is pushed, then the old scene won't receive the "cleanup" message.<br>
-- If the new scene replaces the old one, the it will receive the "cleanup" message.<br>
-- since v0.99.0
-- @function [parent=#Director] isSendCleanupToScene
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
-- returns visible origin of the OpenGL view in points.
-- @function [parent=#Director] getVisibleOrigin
-- @param self
-- @return vec2_table#vec2_table ret (return value: vec2_table)
--------------------------------
--
-- @function [parent=#Director] mainLoop
-- @param self
--------------------------------
-- enables/disables OpenGL depth test
-- @function [parent=#Director] setDepthTest
-- @param self
-- @param #bool bool
-- @param #bool on
--------------------------------
-- get Frame Rate
-- @function [parent=#Director] getFrameRate
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
-- seconds per frame
-- @function [parent=#Director] getSecondsPerFrame
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
-- converts an OpenGL coordinate to a UIKit coordinate<br>
-- Useful to convert node points to window points for calls such as glScissor
-- @function [parent=#Director] convertToUI
-- @param self
-- @param #vec2_table vec2
-- @param #vec2_table point
-- @return vec2_table#vec2_table ret (return value: vec2_table)
--------------------------------
-- sets the default values based on the Configuration info
-- @function [parent=#Director] setDefaultValues
-- @param self
--------------------------------
--
-- @function [parent=#Director] init
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
-- Sets the Scheduler associated with this director<br>
-- since v2.0
-- @function [parent=#Director] setScheduler
-- @param self
-- @param #cc.Scheduler scheduler
--------------------------------
-- The main loop is triggered again.<br>
-- Call this function only if [stopAnimation] was called earlier<br>
-- warning Don't call this function to start the main loop. To run the main loop call runWithScene
-- @function [parent=#Director] startAnimation
-- @param self
--------------------------------
-- Get the GLView, where everything is rendered<br>
-- js NA<br>
-- lua NA
-- @function [parent=#Director] getOpenGLView
-- @param self
-- @return GLView#GLView ret (return value: cc.GLView)
--------------------------------
-- Get current running Scene. Director can only run one Scene at a time
-- @function [parent=#Director] getRunningScene
-- @param self
-- @return Scene#Scene ret (return value: cc.Scene)
--------------------------------
-- Sets the glViewport
-- @function [parent=#Director] setViewport
-- @param self
--------------------------------
-- Stops the animation. Nothing will be drawn. The main loop won't be triggered anymore.<br>
-- If you don't want to pause your animation call [pause] instead.
-- @function [parent=#Director] stopAnimation
-- @param self
--------------------------------
-- The size in pixels of the surface. It could be different than the screen size.<br>
-- High-res devices might have a higher surface size than the screen size.<br>
-- Only available when compiled using SDK >= 4.0.<br>
-- since v0.99.4
-- @function [parent=#Director] setContentScaleFactor
-- @param self
-- @param #float float
-- @param #float scaleFactor
--------------------------------
-- Pops out all scenes from the stack until it reaches `level`.<br>
-- If level is 0, it will end the director.<br>
-- If level is 1, it will pop all scenes until it reaches to root scene.<br>
-- If level is <= than the current stack level, it won't do anything.
-- @function [parent=#Director] popToSceneStackLevel
-- @param self
-- @param #int int
-- @param #int level
--------------------------------
-- Resumes the paused scene<br>
-- The scheduled timers will be activated again.<br>
-- The "delta time" will be 0 (as if the game wasn't paused)
-- @function [parent=#Director] resume
-- @param self
--------------------------------
--
-- @function [parent=#Director] isNextDeltaTimeZero
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
-- Ends the execution, releases the running scene.<br>
-- It doesn't remove the OpenGL view from its parent. You have to do it manually.<br>
-- lua endToLua
-- @function [parent=#Director] end
-- @param self
--------------------------------
--
-- @function [parent=#Director] setOpenGLView
-- @param self
-- @param #cc.GLView glview
-- @param #cc.GLView openGLView
--------------------------------
-- converts a UIKit coordinate to an OpenGL coordinate<br>
-- Useful to convert (multi) touch coordinates to the current layout (portrait or landscape)
-- @function [parent=#Director] convertToGL
-- @param self
-- @param #vec2_table vec2
-- @param #vec2_table point
-- @return vec2_table#vec2_table ret (return value: vec2_table)
--------------------------------
-- Removes all cocos2d cached data.<br>
-- It will purge the TextureCache, SpriteFrameCache, LabelBMFont cache<br>
-- since v0.99.3
-- @function [parent=#Director] purgeCachedData
-- @param self
--------------------------------
-- How many frames were called since the director started
-- @function [parent=#Director] getTotalFrames
-- @param self
-- @return unsigned int#unsigned int ret (return value: unsigned int)
--------------------------------
-- Enters the Director's main loop with the given Scene.<br>
-- Call it to run only your FIRST scene.<br>
-- Don't call it if there is already a running scene.<br>
-- It will call pushScene: and then it will call startAnimation
-- @function [parent=#Director] runWithScene
-- @param self
-- @param #cc.Scene scene
--------------------------------
--
-- @function [parent=#Director] setNotificationNode
-- @param self
-- @param #cc.Node node
--------------------------------
-- Draw the scene.<br>
-- This method is called every frame. Don't call it manually.
-- @function [parent=#Director] drawScene
-- @param self
--------------------------------
-- / FIXME: missing description
-- @function [parent=#Director] getZEye
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#Director] getMatrix
-- @param self
-- @param #int matrix_stack_type
-- @param #int type
-- @return mat4_table#mat4_table ret (return value: mat4_table)
--------------------------------
-- Pops out a scene from the stack.<br>
-- This scene will replace the running one.<br>
-- The running scene will be deleted. If there are no more scenes in the stack the execution is terminated.<br>
-- ONLY call it if there is a running scene.
-- @function [parent=#Director] popScene
-- @param self
--------------------------------
-- Whether or not to display the FPS on the bottom-left corner
-- @function [parent=#Director] isDisplayStats
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#Director] setProjection
-- @param self
-- @param #int projection
--------------------------------
--
-- @function [parent=#Director] loadIdentityMatrix
-- @param self
-- @param #int matrix_stack_type
-- @param #int type
--------------------------------
--
-- @function [parent=#Director] setNextDeltaTimeZero
-- @param self
-- @param #bool bool
-- @param #bool nextDeltaTimeZero
--------------------------------
--
-- @function [parent=#Director] resetMatrixStack
-- @param self
--------------------------------
--
-- @function [parent=#Director] popMatrix
-- @param self
-- @param #int matrix_stack_type
-- @param #int type
--------------------------------
-- returns visible size of the OpenGL view in points.<br>
-- the value is equal to getWinSize if don't invoke<br>
-- GLView::setDesignResolutionSize()
-- @function [parent=#Director] getVisibleSize
-- @param self
-- @return size_table#size_table ret (return value: size_table)
--------------------------------
-- Gets the Scheduler associated with this director<br>
-- since v2.0
-- @function [parent=#Director] getScheduler
-- @param self
-- @return Scheduler#Scheduler ret (return value: cc.Scheduler)
--------------------------------
-- Set the FPS value.
-- @function [parent=#Director] setAnimationInterval
-- @param self
-- @param #double double
-- @param #double interval
--------------------------------
-- Get the FPS value
-- @function [parent=#Director] getAnimationInterval
-- @param self
-- @return double#double ret (return value: double)
--------------------------------
-- Whether or not the Director is paused
-- @function [parent=#Director] isPaused
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
-- Display the FPS on the bottom-left corner
-- @function [parent=#Director] setDisplayStats
-- @param self
-- @param #bool bool
-- @param #bool displayStats
--------------------------------
-- Gets the EventDispatcher associated with this director <br>
-- since v3.0
-- @function [parent=#Director] getEventDispatcher
-- @param self
-- @return EventDispatcher#EventDispatcher ret (return value: cc.EventDispatcher)
--------------------------------
-- Replaces the running scene with a new one. The running scene is terminated.<br>
-- ONLY call it if there is a running scene.
-- @function [parent=#Director] replaceScene
-- @param self
-- @param #cc.Scene scene
--------------------------------
--
-- @function [parent=#Director] multiplyMatrix
-- @param self
-- @param #int matrix_stack_type
-- @param #mat4_table mat4
-- @param #int type
-- @param #mat4_table mat
--------------------------------
-- Gets the ActionManager associated with this director<br>
-- since v2.0
-- @function [parent=#Director] getActionManager
-- @param self
-- @return ActionManager#ActionManager ret (return value: cc.ActionManager)
--------------------------------
-- returns a shared instance of the director
-- @function [parent=#Director] getInstance
-- @param self
-- @return Director#Director ret (return value: cc.Director)

8
cocos/scripting/lua-bindings/auto/api/DisplayData.lua
View File

@ -5,22 +5,26 @@
-- @parent_module ccs
--------------------------------
--
-- @function [parent=#DisplayData] copy
-- @param self
-- @param #ccs.DisplayData displaydata
-- @param #ccs.DisplayData displayData
--------------------------------
--
-- @function [parent=#DisplayData] changeDisplayToTexture
-- @param self
-- @param #string str
-- @param #string displayName
-- @return string#string ret (return value: string)
--------------------------------
--
-- @function [parent=#DisplayData] create
-- @param self
-- @return DisplayData#DisplayData ret (return value: ccs.DisplayData)
--------------------------------
-- js ctor
-- @function [parent=#DisplayData] DisplayData
-- @param self

48
cocos/scripting/lua-bindings/auto/api/DisplayManager.lua
View File

@ -5,42 +5,50 @@
-- @parent_module ccs
--------------------------------
--
-- @function [parent=#DisplayManager] getDisplayRenderNode
-- @param self
-- @return Node#Node ret (return value: cc.Node)
--------------------------------
--
-- @function [parent=#DisplayManager] getAnchorPointInPoints
-- @param self
-- @return vec2_table#vec2_table ret (return value: vec2_table)
--------------------------------
--
-- @function [parent=#DisplayManager] getDisplayRenderNodeType
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
--
-- @function [parent=#DisplayManager] removeDisplay
-- @param self
-- @param #int int
-- @param #int index
--------------------------------
--
-- @function [parent=#DisplayManager] setForceChangeDisplay
-- @param self
-- @param #bool bool
-- @param #bool force
--------------------------------
--
-- @function [parent=#DisplayManager] init
-- @param self
-- @param #ccs.Bone bone
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#DisplayManager] getContentSize
-- @param self
-- @return size_table#size_table ret (return value: size_table)
--------------------------------
--
-- @function [parent=#DisplayManager] getBoundingBox
-- @param self
-- @return rect_table#rect_table ret (return value: rect_table)
@ -50,67 +58,85 @@
-- @overload self, ccs.DisplayData, int
-- @function [parent=#DisplayManager] addDisplay
-- @param self
-- @param #ccs.DisplayData displaydata
-- @param #int int
-- @param #ccs.DisplayData displayData
-- @param #int index
--------------------------------
-- @overload self, float, float
-- @overload self, vec2_table
-- @function [parent=#DisplayManager] containPoint
-- @param self
-- @param #float float
-- @param #float float
-- @param #float x
-- @param #float y
-- @return bool#bool ret (retunr value: bool)
--------------------------------
-- Change display by index. You can just use this method to change display in the display list.<br>
-- The display list is just used for this bone, and it is the displays you may use in every frame.<br>
-- Note : if index is the same with prev index, the method will not effect<br>
-- param index The index of the display you want to change<br>
-- param force If true, then force change display to specified display, or current display will set to display index edit in the flash every key frame.
-- @function [parent=#DisplayManager] changeDisplayWithIndex
-- @param self
-- @param #int int
-- @param #bool bool
-- @param #int index
-- @param #bool force
--------------------------------
--
-- @function [parent=#DisplayManager] changeDisplayWithName
-- @param self
-- @param #string str
-- @param #bool bool
-- @param #string name
-- @param #bool force
--------------------------------
--
-- @function [parent=#DisplayManager] isForceChangeDisplay
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
--
-- @function [parent=#DisplayManager] getCurrentDisplayIndex
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
--
-- @function [parent=#DisplayManager] getAnchorPoint
-- @param self
-- @return vec2_table#vec2_table ret (return value: vec2_table)
--------------------------------
--
-- @function [parent=#DisplayManager] getDecorativeDisplayList
-- @param self
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- Determines if the display is visible<br>
-- see setVisible(bool)<br>
-- return true if the node is visible, false if the node is hidden.
-- @function [parent=#DisplayManager] isVisible
-- @param self
-- @return bool#bool ret (return value: bool)
--------------------------------
-- Sets whether the display is visible<br>
-- The default value is true, a node is default to visible<br>
-- param visible true if the node is visible, false if the node is hidden.
-- @function [parent=#DisplayManager] setVisible
-- @param self
-- @param #bool bool
-- @param #bool visible
--------------------------------
--
-- @function [parent=#DisplayManager] create
-- @param self
-- @param #ccs.Bone bone
-- @return DisplayManager#DisplayManager ret (return value: ccs.DisplayManager)
--------------------------------
--
-- @function [parent=#DisplayManager] DisplayManager
-- @param self

61
cocos/scripting/lua-bindings/auto/api/DrawNode.lua
View File

@ -5,67 +5,76 @@
-- @parent_module cc
--------------------------------
-- draw a quadratic bezier curve with color and number of segments
-- @function [parent=#DrawNode] drawQuadraticBezier
-- @param self
-- @param #vec2_table vec2
-- @param #vec2_table vec2
-- @param #vec2_table vec2
-- @param #unsigned int int
-- @param #color4f_table color4f
-- @param #vec2_table from
-- @param #vec2_table control
-- @param #vec2_table to
-- @param #unsigned int segments
-- @param #color4f_table color
--------------------------------
--
-- @function [parent=#DrawNode] onDraw
-- @param self
-- @param #mat4_table mat4
-- @param #unsigned int int
-- @param #mat4_table transform
-- @param #unsigned int flags
--------------------------------
-- Clear the geometry in the node's buffer.
-- @function [parent=#DrawNode] clear
-- @param self
--------------------------------
-- draw a triangle with color
-- @function [parent=#DrawNode] drawTriangle
-- @param self
-- @param #vec2_table vec2
-- @param #vec2_table vec2
-- @param #vec2_table vec2
-- @param #color4f_table color4f
-- @param #vec2_table p1
-- @param #vec2_table p2
-- @param #vec2_table p3
-- @param #color4f_table color
--------------------------------
-- draw a dot at a position, with a given radius and color
-- @function [parent=#DrawNode] drawDot
-- @param self
-- @param #vec2_table vec2
-- @param #float float
-- @param #color4f_table color4f
-- @param #vec2_table pos
-- @param #float radius
-- @param #color4f_table color
--------------------------------
-- draw a cubic bezier curve with color and number of segments
-- @function [parent=#DrawNode] drawCubicBezier
-- @param self
-- @param #vec2_table vec2
-- @param #vec2_table vec2
-- @param #vec2_table vec2
-- @param #vec2_table vec2
-- @param #unsigned int int
-- @param #color4f_table color4f
-- @param #vec2_table from
-- @param #vec2_table control1
-- @param #vec2_table control2
-- @param #vec2_table to
-- @param #unsigned int segments
-- @param #color4f_table color
--------------------------------
-- draw a segment with a radius and color
-- @function [parent=#DrawNode] drawSegment
-- @param self
-- @param #vec2_table vec2
-- @param #vec2_table vec2
-- @param #float float
-- @param #color4f_table color4f
-- @param #vec2_table from
-- @param #vec2_table to
-- @param #float radius
-- @param #color4f_table color
--------------------------------
-- creates and initialize a DrawNode node
-- @function [parent=#DrawNode] create
-- @param self
-- @return DrawNode#DrawNode ret (return value: cc.DrawNode)
--------------------------------
--
-- @function [parent=#DrawNode] draw
-- @param self
-- @param #cc.Renderer renderer
-- @param #mat4_table mat4
-- @param #unsigned int int
-- @param #mat4_table transform
-- @param #unsigned int flags
return nil

8
cocos/scripting/lua-bindings/auto/api/EaseBackIn.lua
View File

@ -5,22 +5,26 @@
-- @parent_module cc
--------------------------------
-- creates the action
-- @function [parent=#EaseBackIn] create
-- @param self
-- @param #cc.ActionInterval actioninterval
-- @param #cc.ActionInterval action
-- @return EaseBackIn#EaseBackIn ret (return value: cc.EaseBackIn)
--------------------------------
--
-- @function [parent=#EaseBackIn] clone
-- @param self
-- @return EaseBackIn#EaseBackIn ret (return value: cc.EaseBackIn)
--------------------------------
--
-- @function [parent=#EaseBackIn] update
-- @param self
-- @param #float float
-- @param #float time
--------------------------------
--
-- @function [parent=#EaseBackIn] reverse
-- @param self
-- @return ActionEase#ActionEase ret (return value: cc.ActionEase)

8
cocos/scripting/lua-bindings/auto/api/EaseBackInOut.lua
View File

@ -5,22 +5,26 @@
-- @parent_module cc
--------------------------------
-- creates the action
-- @function [parent=#EaseBackInOut] create
-- @param self
-- @param #cc.ActionInterval actioninterval
-- @param #cc.ActionInterval action
-- @return EaseBackInOut#EaseBackInOut ret (return value: cc.EaseBackInOut)
--------------------------------
--
-- @function [parent=#EaseBackInOut] clone
-- @param self
-- @return EaseBackInOut#EaseBackInOut ret (return value: cc.EaseBackInOut)
--------------------------------
--
-- @function [parent=#EaseBackInOut] update
-- @param self
-- @param #float float
-- @param #float time
--------------------------------
--
-- @function [parent=#EaseBackInOut] reverse
-- @param self
-- @return EaseBackInOut#EaseBackInOut ret (return value: cc.EaseBackInOut)

8
cocos/scripting/lua-bindings/auto/api/EaseBackOut.lua
View File

@ -5,22 +5,26 @@
-- @parent_module cc
--------------------------------
-- creates the action
-- @function [parent=#EaseBackOut] create
-- @param self
-- @param #cc.ActionInterval actioninterval
-- @param #cc.ActionInterval action
-- @return EaseBackOut#EaseBackOut ret (return value: cc.EaseBackOut)
--------------------------------
--
-- @function [parent=#EaseBackOut] clone
-- @param self
-- @return EaseBackOut#EaseBackOut ret (return value: cc.EaseBackOut)
--------------------------------
--
-- @function [parent=#EaseBackOut] update
-- @param self
-- @param #float float
-- @param #float time
--------------------------------
--
-- @function [parent=#EaseBackOut] reverse
-- @param self
-- @return ActionEase#ActionEase ret (return value: cc.ActionEase)

17
cocos/scripting/lua-bindings/auto/api/EaseBezierAction.lua
View File

@ -5,30 +5,35 @@
-- @parent_module cc
--------------------------------
--
-- @function [parent=#EaseBezierAction] setBezierParamer
-- @param self
-- @param #float float
-- @param #float float
-- @param #float float
-- @param #float float
-- @param #float p0
-- @param #float p1
-- @param #float p2
-- @param #float p3
--------------------------------
-- creates the action
-- @function [parent=#EaseBezierAction] create
-- @param self
-- @param #cc.ActionInterval actioninterval
-- @param #cc.ActionInterval action
-- @return EaseBezierAction#EaseBezierAction ret (return value: cc.EaseBezierAction)
--------------------------------
--
-- @function [parent=#EaseBezierAction] clone
-- @param self
-- @return EaseBezierAction#EaseBezierAction ret (return value: cc.EaseBezierAction)
--------------------------------
--
-- @function [parent=#EaseBezierAction] update
-- @param self
-- @param #float float
-- @param #float time
--------------------------------
--
-- @function [parent=#EaseBezierAction] reverse
-- @param self
-- @return EaseBezierAction#EaseBezierAction ret (return value: cc.EaseBezierAction)

2
cocos/scripting/lua-bindings/auto/api/EaseBounce.lua
View File

@ -5,11 +5,13 @@
-- @parent_module cc
--------------------------------
--
-- @function [parent=#EaseBounce] clone
-- @param self
-- @return EaseBounce#EaseBounce ret (return value: cc.EaseBounce)
--------------------------------
--
-- @function [parent=#EaseBounce] reverse
-- @param self
-- @return EaseBounce#EaseBounce ret (return value: cc.EaseBounce)

8
cocos/scripting/lua-bindings/auto/api/EaseBounceIn.lua
View File

@ -5,22 +5,26 @@
-- @parent_module cc
--------------------------------
-- creates the action
-- @function [parent=#EaseBounceIn] create
-- @param self
-- @param #cc.ActionInterval actioninterval
-- @param #cc.ActionInterval action
-- @return EaseBounceIn#EaseBounceIn ret (return value: cc.EaseBounceIn)
--------------------------------
--
-- @function [parent=#EaseBounceIn] clone
-- @param self
-- @return EaseBounceIn#EaseBounceIn ret (return value: cc.EaseBounceIn)
--------------------------------
--
-- @function [parent=#EaseBounceIn] update
-- @param self
-- @param #float float
-- @param #float time
--------------------------------
--
-- @function [parent=#EaseBounceIn] reverse
-- @param self
-- @return EaseBounce#EaseBounce ret (return value: cc.EaseBounce)

8
cocos/scripting/lua-bindings/auto/api/EaseBounceInOut.lua
View File

@ -5,22 +5,26 @@
-- @parent_module cc
--------------------------------
-- creates the action
-- @function [parent=#EaseBounceInOut] create
-- @param self
-- @param #cc.ActionInterval actioninterval
-- @param #cc.ActionInterval action
-- @return EaseBounceInOut#EaseBounceInOut ret (return value: cc.EaseBounceInOut)
--------------------------------
--
-- @function [parent=#EaseBounceInOut] clone
-- @param self
-- @return EaseBounceInOut#EaseBounceInOut ret (return value: cc.EaseBounceInOut)
--------------------------------
--
-- @function [parent=#EaseBounceInOut] update
-- @param self
-- @param #float float
-- @param #float time
--------------------------------
--
-- @function [parent=#EaseBounceInOut] reverse
-- @param self
-- @return EaseBounceInOut#EaseBounceInOut ret (return value: cc.EaseBounceInOut)

8
cocos/scripting/lua-bindings/auto/api/EaseBounceOut.lua
View File

@ -5,22 +5,26 @@
-- @parent_module cc
--------------------------------
-- creates the action
-- @function [parent=#EaseBounceOut] create
-- @param self
-- @param #cc.ActionInterval actioninterval
-- @param #cc.ActionInterval action
-- @return EaseBounceOut#EaseBounceOut ret (return value: cc.EaseBounceOut)
--------------------------------
--
-- @function [parent=#EaseBounceOut] clone
-- @param self
-- @return EaseBounceOut#EaseBounceOut ret (return value: cc.EaseBounceOut)
--------------------------------
--
-- @function [parent=#EaseBounceOut] update
-- @param self
-- @param #float float
-- @param #float time
--------------------------------
--
-- @function [parent=#EaseBounceOut] reverse
-- @param self
-- @return EaseBounce#EaseBounce ret (return value: cc.EaseBounce)

8
cocos/scripting/lua-bindings/auto/api/EaseCircleActionIn.lua
View File

@ -5,22 +5,26 @@
-- @parent_module cc
--------------------------------
-- creates the action
-- @function [parent=#EaseCircleActionIn] create
-- @param self
-- @param #cc.ActionInterval actioninterval
-- @param #cc.ActionInterval action
-- @return EaseCircleActionIn#EaseCircleActionIn ret (return value: cc.EaseCircleActionIn)
--------------------------------
--
-- @function [parent=#EaseCircleActionIn] clone
-- @param self
-- @return EaseCircleActionIn#EaseCircleActionIn ret (return value: cc.EaseCircleActionIn)
--------------------------------
--
-- @function [parent=#EaseCircleActionIn] update
-- @param self
-- @param #float float
-- @param #float time
--------------------------------
--
-- @function [parent=#EaseCircleActionIn] reverse
-- @param self
-- @return EaseCircleActionIn#EaseCircleActionIn ret (return value: cc.EaseCircleActionIn)

8
cocos/scripting/lua-bindings/auto/api/EaseCircleActionInOut.lua
View File

@ -5,22 +5,26 @@
-- @parent_module cc
--------------------------------
-- creates the action
-- @function [parent=#EaseCircleActionInOut] create
-- @param self
-- @param #cc.ActionInterval actioninterval
-- @param #cc.ActionInterval action
-- @return EaseCircleActionInOut#EaseCircleActionInOut ret (return value: cc.EaseCircleActionInOut)
--------------------------------
--
-- @function [parent=#EaseCircleActionInOut] clone
-- @param self
-- @return EaseCircleActionInOut#EaseCircleActionInOut ret (return value: cc.EaseCircleActionInOut)
--------------------------------
--
-- @function [parent=#EaseCircleActionInOut] update
-- @param self
-- @param #float float
-- @param #float time
--------------------------------
--
-- @function [parent=#EaseCircleActionInOut] reverse
-- @param self
-- @return EaseCircleActionInOut#EaseCircleActionInOut ret (return value: cc.EaseCircleActionInOut)

Some files were not shown because too many files have changed in this diff Show More