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

Merge branch 'v3' into mergeExtensionEditBox

This commit is contained in:
andyque 2014-09-02 00:03:16 -07:00
parent c13e7b7224 4749205b61
commit 8033b1f7bb
388 changed files with 7138 additions and 2565 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

236
cocos/3d/CCBundle3D.cpp
View File

@ -201,7 +201,7 @@ bool Bundle3D::load(const std::string& path)
}
else
{
CCLOGINFO("%s is invalid file formate", path);
CCLOG("warning: %s is invalid file formate", path.c_str());
}
ret?(_path = path):(_path = "");
@ -302,7 +302,7 @@ bool Bundle3D::loadObj(MeshDatas& meshdatas, MaterialDatas& materialdatas, NodeD
}
return true;
}
CCLOG("load %s file error: %s", fullPath.c_str(), ret.c_str());
CCLOG("warning: load %s file error: %s", fullPath.c_str(), ret.c_str());
return false;
}
@ -376,7 +376,7 @@ bool Bundle3D::loadMeshDatas(MeshDatas& meshdatas)
{
return loadMeshDatasBinary_0_2(meshdatas);
}
else if(_version == "0.3")
else
{
return loadMeshDatasBinary(meshdatas);
}
@ -391,7 +391,7 @@ bool Bundle3D::loadMeshDatas(MeshDatas& meshdatas)
{
return loadMeshDataJson_0_2(meshdatas);
}
else if(_version == "0.3")
else
{
return loadMeshDatasJson(meshdatas);
}
@ -405,7 +405,7 @@ bool Bundle3D::loadMeshDatasBinary(MeshDatas& meshdatas)
unsigned int meshSize = 0;
if (_binaryReader.read(&meshSize, 4, 1) != 1)
{
CCLOGINFO("Failed to read meshdata: attribCount '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: attribCount '%s'.", _path.c_str());
return false;
}
for(int i = 0; i < meshSize ; i++ )
@ -415,7 +415,7 @@ bool Bundle3D::loadMeshDatasBinary(MeshDatas& meshdatas)
// read mesh data
if (_binaryReader.read(&attribSize, 4, 1) != 1 || attribSize < 1)
{
CCLOGINFO("Failed to read meshdata: attribCount '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: attribCount '%s'.", _path.c_str());
return false;
}
meshData->attribCount = attribSize;
@ -426,7 +426,7 @@ bool Bundle3D::loadMeshDatasBinary(MeshDatas& meshdatas)
unsigned int vSize;
if (_binaryReader.read(&vSize, 4, 1) != 1)
{
CCLOGINFO("Failed to read meshdata: usage or size '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: usage or size '%s'.", _path.c_str());
return false;
}
std::string type = _binaryReader.readString();
@ -440,14 +440,14 @@ bool Bundle3D::loadMeshDatasBinary(MeshDatas& meshdatas)
// Read vertex data
if (_binaryReader.read(&vertexSizeInFloat, 4, 1) != 1 || vertexSizeInFloat == 0)
{
CCLOGINFO("Failed to read meshdata: vertexSizeInFloat '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: vertexSizeInFloat '%s'.", _path.c_str());
return false;
}
meshData->vertex.resize(vertexSizeInFloat);
if (_binaryReader.read(&meshData->vertex[0], 4, vertexSizeInFloat) != vertexSizeInFloat)
{
CCLOGINFO("Failed to read meshdata: vertex element '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: vertex element '%s'.", _path.c_str());
return false;
}
@ -463,13 +463,13 @@ bool Bundle3D::loadMeshDatasBinary(MeshDatas& meshdatas)
unsigned int nIndexCount;
if (_binaryReader.read(&nIndexCount, 4, 1) != 1)
{
CCLOGINFO("Failed to read meshdata: nIndexCount '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: nIndexCount '%s'.", _path.c_str());
return false;
}
indexArray.resize(nIndexCount);
if (_binaryReader.read(&indexArray[0], 2, nIndexCount) != nIndexCount)
{
CCLOGINFO("Failed to read meshdata: indices '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: indices '%s'.", _path.c_str());
return false;
}
meshData->subMeshIndices.push_back(indexArray);
@ -492,7 +492,7 @@ bool Bundle3D::loadMeshDatasBinary_0_1(MeshDatas& meshdatas)
unsigned int attribSize=0;
if (_binaryReader.read(&attribSize, 4, 1) != 1 || attribSize < 1)
{
CCLOGINFO("Failed to read meshdata: attribCount '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: attribCount '%s'.", _path.c_str());
return false;
}
enum
@ -514,7 +514,7 @@ bool Bundle3D::loadMeshDatasBinary_0_1(MeshDatas& meshdatas)
unsigned int vUsage, vSize;
if (_binaryReader.read(&vUsage, 4, 1) != 1 || _binaryReader.read(&vSize, 4, 1) != 1)
{
CCLOGINFO("Failed to read meshdata: usage or size '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: usage or size '%s'.", _path.c_str());
return false;
}
@ -550,14 +550,14 @@ bool Bundle3D::loadMeshDatasBinary_0_1(MeshDatas& meshdatas)
// Read vertex data
if (_binaryReader.read(&meshdata->vertexSizeInFloat, 4, 1) != 1 || meshdata->vertexSizeInFloat == 0)
{
CCLOGINFO("Failed to read meshdata: vertexSizeInFloat '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: vertexSizeInFloat '%s'.", _path.c_str());
return false;
}
meshdata->vertex.resize(meshdata->vertexSizeInFloat);
if (_binaryReader.read(&meshdata->vertex[0], 4, meshdata->vertexSizeInFloat) != meshdata->vertexSizeInFloat)
{
CCLOGINFO("Failed to read meshdata: vertex element '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: vertex element '%s'.", _path.c_str());
return false;
}
@ -568,7 +568,7 @@ bool Bundle3D::loadMeshDatasBinary_0_1(MeshDatas& meshdatas)
unsigned int nIndexCount;
if (_binaryReader.read(&nIndexCount, 4, 1) != 1)
{
CCLOGINFO("Failed to read meshdata: nIndexCount '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: nIndexCount '%s'.", _path.c_str());
return false;
}
@ -576,7 +576,7 @@ bool Bundle3D::loadMeshDatasBinary_0_1(MeshDatas& meshdatas)
indices.resize(nIndexCount);
if (_binaryReader.read(&indices[0], 2, nIndexCount) != nIndexCount)
{
CCLOGINFO("Failed to read meshdata: indices '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: indices '%s'.", _path.c_str());
return false;
}
@ -600,7 +600,7 @@ bool Bundle3D::loadMeshDatasBinary_0_2(MeshDatas& meshdatas)
unsigned int attribSize=0;
if (_binaryReader.read(&attribSize, 4, 1) != 1 || attribSize < 1)
{
CCLOGINFO("Failed to read meshdata: attribCount '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: attribCount '%s'.", _path.c_str());
return false;
}
enum
@ -622,7 +622,7 @@ bool Bundle3D::loadMeshDatasBinary_0_2(MeshDatas& meshdatas)
unsigned int vUsage, vSize;
if (_binaryReader.read(&vUsage, 4, 1) != 1 || _binaryReader.read(&vSize, 4, 1) != 1)
{
CCLOGINFO("Failed to read meshdata: usage or size '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: usage or size '%s'.", _path.c_str());
return false;
}
@ -658,14 +658,14 @@ bool Bundle3D::loadMeshDatasBinary_0_2(MeshDatas& meshdatas)
// Read vertex data
if (_binaryReader.read(&meshdata->vertexSizeInFloat, 4, 1) != 1 || meshdata->vertexSizeInFloat == 0)
{
CCLOGINFO("Failed to read meshdata: vertexSizeInFloat '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: vertexSizeInFloat '%s'.", _path.c_str());
return false;
}
meshdata->vertex.resize(meshdata->vertexSizeInFloat);
if (_binaryReader.read(&meshdata->vertex[0], 4, meshdata->vertexSizeInFloat) != meshdata->vertexSizeInFloat)
{
CCLOGINFO("Failed to read meshdata: vertex element '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: vertex element '%s'.", _path.c_str());
return false;
}
@ -673,7 +673,7 @@ bool Bundle3D::loadMeshDatasBinary_0_2(MeshDatas& meshdatas)
unsigned int submeshCount;
if (_binaryReader.read(&submeshCount, 4, 1) != 1)
{
CCLOGINFO("Failed to read meshdata: submeshCount '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: submeshCount '%s'.", _path.c_str());
return false;
}
@ -682,7 +682,7 @@ bool Bundle3D::loadMeshDatasBinary_0_2(MeshDatas& meshdatas)
unsigned int nIndexCount;
if (_binaryReader.read(&nIndexCount, 4, 1) != 1)
{
CCLOGINFO("Failed to read meshdata: nIndexCount '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: nIndexCount '%s'.", _path.c_str());
return false;
}
@ -690,7 +690,7 @@ bool Bundle3D::loadMeshDatasBinary_0_2(MeshDatas& meshdatas)
indices.resize(nIndexCount);
if (_binaryReader.read(&indices[0], 2, nIndexCount) != nIndexCount)
{
CCLOGINFO("Failed to read meshdata: indices '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: indices '%s'.", _path.c_str());
return false;
}
@ -823,7 +823,7 @@ bool Bundle3D::loadMaterials(MaterialDatas& materialdatas)
{
return loadMaterialsBinary_0_2(materialdatas);
}
else if (_version == "0.3")
else
{
return loadMaterialsBinary(materialdatas);
}
@ -838,7 +838,7 @@ bool Bundle3D::loadMaterials(MaterialDatas& materialdatas)
{
return loadMaterialDataJson_0_2(materialdatas);
}
else if (_version == "0.3")
else
{
return loadMaterialsJson(materialdatas);
}
@ -866,13 +866,13 @@ bool Bundle3D::loadMaterialsBinary(MaterialDatas& materialdatas)
textureData.id = _binaryReader.readString();
if (textureData.id.empty())
{
CCLOGINFO("Failed to read Materialdata: texturePath is empty '%s'.", textureID.c_str());
CCLOG("warning: Failed to read Materialdata: texturePath is empty '%s'.", textureData.id.c_str());
return false;
}
std::string texturePath = _binaryReader.readString();
if (texturePath.empty())
{
CCLOGINFO("Failed to read Materialdata: texturePath is empty '%s'.", _path.c_str());
CCLOG("warning: Failed to read Materialdata: texturePath is empty '%s'.", _path.c_str());
return false;
}
@ -898,7 +898,7 @@ bool Bundle3D::loadMaterialsBinary_0_1(MaterialDatas& materialdatas)
std::string texturePath = _binaryReader.readString();
if (texturePath.empty())
{
CCLOGINFO("Failed to read Materialdata: texturePath is empty '%s'.", _path.c_str());
CCLOG("warning: Failed to read Materialdata: texturePath is empty '%s'.", _path.c_str());
return false;
}
@ -926,7 +926,7 @@ bool Bundle3D::loadMaterialsBinary_0_2(MaterialDatas& materialdatas)
std::string texturePath = _binaryReader.readString();
if (texturePath.empty())
{
CCLOGINFO("Failed to read Materialdata: texturePath is empty '%s'.", _path.c_str());
CCLOG("warning: Failed to read Materialdata: texturePath is empty '%s'.", _path.c_str());
return false;
}
@ -987,7 +987,11 @@ bool Bundle3D::loadJson(const std::string& path)
}
const rapidjson::Value& mash_data_array = _jsonReader[VERSION];
_version = mash_data_array.GetString();
if (mash_data_array.IsArray()) // Compatible with the old version
_version = "1.2";
else
_version = mash_data_array.GetString();
return true;
}
@ -1251,7 +1255,7 @@ bool Bundle3D::loadBinary(const std::string& path)
if (_binaryBuffer->isNull())
{
clear();
CCLOGINFO(false, "Failed to read file: %s", path.c_str());
CCLOG("warning: Failed to read file: %s", path.c_str());
return false;
}
@ -1264,14 +1268,14 @@ bool Bundle3D::loadBinary(const std::string& path)
if (_binaryReader.read(sig, 1, 4) != 4 || memcmp(sig, identifier, 4) != 0)
{
clear();
CCLOGINFO(false, "Invalid identifier: %s", path.c_str());
CCLOG("warning: Invalid identifier: %s", path.c_str());
return false;
}
// Read version
unsigned char ver[2];
if (_binaryReader.read(ver, 1, 2)!= 2){
CCLOG("Failed to read version:");
CCLOG("warning: Failed to read version:");
return false;
}
@ -1283,7 +1287,7 @@ bool Bundle3D::loadBinary(const std::string& path)
if (_binaryReader.read(&_referenceCount, 4, 1) != 1)
{
clear();
CCLOGINFO("Failed to read ref table size '%s'.", path.c_str());
CCLOG("warning: Failed to read ref table size '%s'.", path.c_str());
return false;
}
@ -1297,7 +1301,7 @@ bool Bundle3D::loadBinary(const std::string& path)
_binaryReader.read(&_references[i].offset, 4, 1) != 1)
{
clear();
CCLOGINFO("Failed to read ref number %d for bundle '%s'.", i, path.c_str());
CCLOG("warning: Failed to read ref number %d for bundle '%s'.", (int)i, path.c_str());
CC_SAFE_DELETE_ARRAY(_references);
return false;
}
@ -1318,7 +1322,7 @@ bool Bundle3D::loadMeshDataBinary(MeshData* meshdata)
}
else
{
CCLOGINFO(false, "Unsupported version of loadMeshDataBinary() : %s", _version);
CCLOG("warning: Unsupported version of loadMeshDataBinary() : %s", _version.c_str());
return false;
}
}
@ -1331,7 +1335,7 @@ bool Bundle3D::loadMeshDataBinary_0_1(MeshData* meshdata)
// read mesh data
if (_binaryReader.read(&meshdata->attribCount, 4, 1) != 1 || meshdata->attribCount < 1)
{
CCLOGINFO("Failed to read meshdata: attribCount '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: attribCount '%s'.", _path.c_str());
return false;
}
@ -1341,7 +1345,7 @@ bool Bundle3D::loadMeshDataBinary_0_1(MeshData* meshdata)
unsigned int vUsage, vSize;
if (_binaryReader.read(&vUsage, 4, 1) != 1 || _binaryReader.read(&vSize, 4, 1) != 1)
{
CCLOGINFO("Failed to read meshdata: usage or size '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: usage or size '%s'.", _path.c_str());
return false;
}
@ -1354,14 +1358,14 @@ bool Bundle3D::loadMeshDataBinary_0_1(MeshData* meshdata)
// Read vertex data
if (_binaryReader.read(&meshdata->vertexSizeInFloat, 4, 1) != 1 || meshdata->vertexSizeInFloat == 0)
{
CCLOGINFO("Failed to read meshdata: vertexSizeInFloat '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: vertexSizeInFloat '%s'.", _path.c_str());
return false;
}
meshdata->vertex.resize(meshdata->vertexSizeInFloat);
if (_binaryReader.read(&meshdata->vertex[0], 4, meshdata->vertexSizeInFloat) != meshdata->vertexSizeInFloat)
{
CCLOGINFO("Failed to read meshdata: vertex element '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: vertex element '%s'.", _path.c_str());
return false;
}
@ -1374,7 +1378,7 @@ bool Bundle3D::loadMeshDataBinary_0_1(MeshData* meshdata)
unsigned int nIndexCount;
if (_binaryReader.read(&nIndexCount, 4, 1) != 1)
{
CCLOGINFO("Failed to read meshdata: nIndexCount '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: nIndexCount '%s'.", _path.c_str());
return false;
}
@ -1382,7 +1386,7 @@ bool Bundle3D::loadMeshDataBinary_0_1(MeshData* meshdata)
indices.resize(nIndexCount);
if (_binaryReader.read(&indices[0], 2, nIndexCount) != nIndexCount)
{
CCLOGINFO("Failed to read meshdata: indices '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: indices '%s'.", _path.c_str());
return false;
}
@ -1402,7 +1406,7 @@ bool Bundle3D::loadMeshDataBinary_0_2(MeshData* meshdata)
// read mesh data
if (_binaryReader.read(&meshdata->attribCount, 4, 1) != 1 || meshdata->attribCount < 1)
{
CCLOGINFO("Failed to read meshdata: attribCount '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: attribCount '%s'.", _path.c_str());
return false;
}
@ -1412,7 +1416,7 @@ bool Bundle3D::loadMeshDataBinary_0_2(MeshData* meshdata)
unsigned int vUsage, vSize;
if (_binaryReader.read(&vUsage, 4, 1) != 1 || _binaryReader.read(&vSize, 4, 1) != 1)
{
CCLOGINFO("Failed to read meshdata: usage or size '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: usage or size '%s'.", _path.c_str());
return false;
}
@ -1425,14 +1429,14 @@ bool Bundle3D::loadMeshDataBinary_0_2(MeshData* meshdata)
// Read vertex data
if (_binaryReader.read(&meshdata->vertexSizeInFloat, 4, 1) != 1 || meshdata->vertexSizeInFloat == 0)
{
CCLOGINFO("Failed to read meshdata: vertexSizeInFloat '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: vertexSizeInFloat '%s'.", _path.c_str());
return false;
}
meshdata->vertex.resize(meshdata->vertexSizeInFloat);
if (_binaryReader.read(&meshdata->vertex[0], 4, meshdata->vertexSizeInFloat) != meshdata->vertexSizeInFloat)
{
CCLOGINFO("Failed to read meshdata: vertex element '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: vertex element '%s'.", _path.c_str());
return false;
}
@ -1440,7 +1444,7 @@ bool Bundle3D::loadMeshDataBinary_0_2(MeshData* meshdata)
unsigned int submeshCount;
if (_binaryReader.read(&submeshCount, 4, 1) != 1)
{
CCLOGINFO("Failed to read meshdata: submeshCount '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: submeshCount '%s'.", _path.c_str());
return false;
}
@ -1449,7 +1453,7 @@ bool Bundle3D::loadMeshDataBinary_0_2(MeshData* meshdata)
unsigned int nIndexCount;
if (_binaryReader.read(&nIndexCount, 4, 1) != 1)
{
CCLOGINFO("Failed to read meshdata: nIndexCount '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: nIndexCount '%s'.", _path.c_str());
return false;
}
@ -1457,7 +1461,7 @@ bool Bundle3D::loadMeshDataBinary_0_2(MeshData* meshdata)
indices.resize(nIndexCount);
if (_binaryReader.read(&indices[0], 2, nIndexCount) != nIndexCount)
{
CCLOGINFO("Failed to read meshdata: indices '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: indices '%s'.", _path.c_str());
return false;
}
@ -1478,7 +1482,7 @@ bool Bundle3D::loadSkinDataBinary(SkinData* skindata)
float bindShape[16];
if (!_binaryReader.readMatrix(bindShape))
{
CCLOGINFO("Failed to read SkinData: bindShape matrix '%s'.", _path.c_str());
CCLOG("warning: Failed to read SkinData: bindShape matrix '%s'.", _path.c_str());
return false;
}
@ -1486,7 +1490,7 @@ bool Bundle3D::loadSkinDataBinary(SkinData* skindata)
unsigned int boneNum;
if (!_binaryReader.read(&boneNum))
{
CCLOGINFO("Failed to read SkinData: boneNum '%s'.", _path.c_str());
CCLOG("warning: Failed to read SkinData: boneNum '%s'.", _path.c_str());
return false;
}
@ -1498,7 +1502,7 @@ bool Bundle3D::loadSkinDataBinary(SkinData* skindata)
skindata->skinBoneNames.push_back(skinBoneName);
if (!_binaryReader.readMatrix(bindpos))
{
CCLOGINFO("Failed to load SkinData: bindpos '%s'.", _path.c_str());
CCLOG("warning: Failed to load SkinData: bindpos '%s'.", _path.c_str());
return false;
}
skindata->inverseBindPoseMatrices.push_back(bindpos);
@ -1539,7 +1543,7 @@ bool Bundle3D::loadSkinDataBinary(SkinData* skindata)
if (!_binaryReader.readMatrix(transform))
{
CCLOGINFO("Failed to load SkinData: transform '%s'.", _path.c_str());
CCLOG("warning: Failed to load SkinData: transform '%s'.", _path.c_str());
return false;
}
@ -1584,7 +1588,7 @@ bool Bundle3D::loadMaterialDataBinary(MaterialData* materialdata)
std::string texturePath = _binaryReader.readString();
if (texturePath.empty())
{
CCLOGINFO("Failed to read Materialdata: texturePath is empty '%s'.", _path.c_str());
CCLOG("warning: Failed to read Materialdata: texturePath is empty '%s'.", _path.c_str());
return false;
}
@ -1600,11 +1604,11 @@ bool Bundle3D::loadAnimationDataBinary(Animation3DData* animationdata)
if (!seekToFirstType(BUNDLE_TYPE_ANIMATIONS))
return false;
unsigned int animNum=0;
if( _version == "0.3")
if( _version == "0.3"|| _version == "0.4")
{
if (!_binaryReader.read(&animNum))
{
CCLOGINFO("Failed to read AnimationData: animNum '%s'.", _path.c_str());
CCLOG("warning: Failed to read AnimationData: animNum '%s'.", _path.c_str());
return false;
}
}
@ -1612,14 +1616,14 @@ bool Bundle3D::loadAnimationDataBinary(Animation3DData* animationdata)
if (!_binaryReader.read(&animationdata->_totalTime))
{
CCLOGINFO("Failed to read AnimationData: totalTime '%s'.", _path.c_str());
CCLOG("warning: Failed to read AnimationData: totalTime '%s'.", _path.c_str());
return false;
}
unsigned int nodeAnimationNum;
if (!_binaryReader.read(&nodeAnimationNum))
{
CCLOGINFO("Failed to read AnimationData: animNum '%s'.", _path.c_str());
CCLOG("warning: Failed to read AnimationData: animNum '%s'.", _path.c_str());
return false;
}
for (unsigned int i = 0; i < nodeAnimationNum; ++i)
@ -1628,7 +1632,7 @@ bool Bundle3D::loadAnimationDataBinary(Animation3DData* animationdata)
unsigned int keyframeNum;
if (!_binaryReader.read(&keyframeNum))
{
CCLOGINFO("Failed to read AnimationData: keyframeNum '%s'.", _path.c_str());
CCLOG("warning: Failed to read AnimationData: keyframeNum '%s'.", _path.c_str());
return false;
}
@ -1641,33 +1645,68 @@ bool Bundle3D::loadAnimationDataBinary(Animation3DData* animationdata)
float keytime;
if (!_binaryReader.read(&keytime))
{
CCLOGINFO("Failed to read AnimationData: keytime '%s'.", _path.c_str());
CCLOG("warning: Failed to read AnimationData: keytime '%s'.", _path.c_str());
return false;
}
Quaternion rotate;
if (_binaryReader.read(&rotate, 4, 4) != 4)
// transform flag
unsigned char transformFlag(0);
if (_version == "0.4")
{
CCLOGINFO("Failed to read AnimationData: rotate '%s'.", _path.c_str());
return false;
if (!_binaryReader.read(&transformFlag))
{
CCLOG("warning: Failed to read AnimationData: transformFlag '%s'.", _path.c_str());
return false;
}
}
// rotation
bool hasRotate = true;
if (_version == "0.4")
hasRotate = transformFlag & 0x01;
if (hasRotate)
{
Quaternion rotate;
if (_binaryReader.read(&rotate, 4, 4) != 4)
{
CCLOG("warning: Failed to read AnimationData: rotate '%s'.", _path.c_str());
return false;
}
animationdata->_rotationKeys[boneName].push_back(Animation3DData::QuatKey(keytime, rotate));
}
animationdata->_rotationKeys[boneName].push_back(Animation3DData::QuatKey(keytime, rotate));
Vec3 scale;
if (_binaryReader.read(&scale, 4, 3) != 3)
// scale
bool hasScale = true;
if (_version == "0.4")
hasScale = (transformFlag >> 1) & 0x01;
if (hasScale)
{
CCLOGINFO("Failed to read AnimationData: scale '%s'.", _path.c_str());
return false;
Vec3 scale;
if (_binaryReader.read(&scale, 4, 3) != 3)
{
CCLOG("warning: Failed to read AnimationData: scale '%s'.", _path.c_str());
return false;
}
animationdata->_scaleKeys[boneName].push_back(Animation3DData::Vec3Key(keytime, scale));
}
animationdata->_scaleKeys[boneName].push_back(Animation3DData::Vec3Key(keytime, scale));
Vec3 position;
if (_binaryReader.read(&position, 4, 3) != 3)
// translation
bool hasTranslation = true;
if (_version == "0.4")
hasTranslation = (transformFlag >> 2) & 0x01;
if (hasTranslation)
{
CCLOGINFO("Failed to read AnimationData: position '%s'.", _path.c_str());
return false;
Vec3 position;
if (_binaryReader.read(&position, 4, 3) != 3)
{
CCLOG("warning: Failed to read AnimationData: position '%s'.", _path.c_str());
return false;
}
animationdata->_translationKeys[boneName].push_back(Animation3DData::Vec3Key(keytime, position));
}
animationdata->_translationKeys[boneName].push_back(Animation3DData::Vec3Key(keytime, position));
}
}
return true;
@ -1697,11 +1736,6 @@ bool Bundle3D::loadNodesJson(NodeDatas& nodedatas)
NodeData* Bundle3D::parseNodesRecursivelyJson(const rapidjson::Value& jvalue)
{
NodeData* nodedata = new (std::nothrow) NodeData();;
//if (jvalue.HasMember(PARTS))
// nodedata = new (std::nothrow) ModelNodeData();
//else
//nodedata = new (std::nothrow) NodeData();
// id
nodedata->id = jvalue[ID].GetString();
@ -1732,7 +1766,7 @@ NodeData* Bundle3D::parseNodesRecursivelyJson(const rapidjson::Value& jvalue)
if (modelnodedata->subMeshId == "" || modelnodedata->matrialId == "")
{
std::string err = "Node " + nodedata->id + " part is missing meshPartId or materialId";
CCASSERT(false, err.c_str());
CCLOG("warning: Node %s part is missing meshPartId or materialId", nodedata->id.c_str());
return nullptr;
}
@ -1747,7 +1781,7 @@ NodeData* Bundle3D::parseNodesRecursivelyJson(const rapidjson::Value& jvalue)
// node
if (!bone.HasMember(NODE))
{
CCASSERT(false, "Bone node ID missing");
CCLOG("warning: Bone node ID missing");
return nullptr;
}
@ -1791,7 +1825,7 @@ bool Bundle3D::loadNodesBinary(NodeDatas& nodedatas)
unsigned int nodeSize = 0;
if (_binaryReader.read(&nodeSize, 4, 1) != 1)
{
CCASSERT(false, "Failed to read nodes");
CCLOG("warning: Failed to read nodes");
return false;
}
@ -1816,7 +1850,7 @@ NodeData* Bundle3D::parseNodesRecursivelyBinary(bool& skeleton)
bool skeleton_;
if (_binaryReader.read(&skeleton_, 1, 1) != 1)
{
CCASSERT(false, "Failed to read is sleleton");
CCLOG("warning: Failed to read is sleleton");
return nullptr;
}
if (skeleton_)
@ -1826,14 +1860,14 @@ NodeData* Bundle3D::parseNodesRecursivelyBinary(bool& skeleton)
Mat4 transform;
if (!_binaryReader.readMatrix(transform.m))
{
CCASSERT(false,"Failed to read transform matrix");
CCLOG("warning: Failed to read transform matrix");
return nullptr;
}
// parts
unsigned int partsSize = 0;
if (_binaryReader.read(&partsSize, 4, 1) != 1)
{
CCLOGINFO("Failed to read meshdata: attribCount '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: attribCount '%s'.", _path.c_str());
return nullptr;
}
@ -1842,7 +1876,7 @@ NodeData* Bundle3D::parseNodesRecursivelyBinary(bool& skeleton)
nodedata->transform = transform;
if (partsSize > 0)
{
for (rapidjson::SizeType i = 0; i < partsSize; i++)
for (unsigned int i = 0; i < partsSize; i++)
{
auto modelnodedata = new (std::nothrow) ModelData();
modelnodedata->subMeshId = _binaryReader.readString();
@ -1851,7 +1885,7 @@ NodeData* Bundle3D::parseNodesRecursivelyBinary(bool& skeleton)
if (modelnodedata->subMeshId == "" || modelnodedata->matrialId == "")
{
std::string err = "Node " + nodedata->id + " part is missing meshPartId or materialId";
CCASSERT(false, err.c_str());
CCLOG("Node %s part is missing meshPartId or materialId", nodedata->id.c_str());
return nullptr;
}
@ -1859,13 +1893,13 @@ NodeData* Bundle3D::parseNodesRecursivelyBinary(bool& skeleton)
unsigned int bonesSize = 0;
if (_binaryReader.read(&bonesSize, 4, 1) != 1)
{
CCLOGINFO("Failed to read meshdata: attribCount '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: attribCount '%s'.", _path.c_str());
return nullptr;
}
if (bonesSize > 0)
{
for (rapidjson::SizeType j = 0; j < bonesSize; j++)
for (unsigned int j = 0; j < bonesSize; j++)
{
std::string name = _binaryReader.readString();
modelnodedata->bones.push_back(name);
@ -1882,7 +1916,7 @@ NodeData* Bundle3D::parseNodesRecursivelyBinary(bool& skeleton)
unsigned int uvMapping = 0;
if (_binaryReader.read(&uvMapping, 4, 1) != 1)
{
CCLOGINFO("Failed to read nodedata: uvMapping '%s'.", _path.c_str());
CCLOG("warning: Failed to read nodedata: uvMapping '%s'.", _path.c_str());
return nullptr;
}
for( int j = 0 ;j < uvMapping ; j++ )
@ -1890,7 +1924,7 @@ NodeData* Bundle3D::parseNodesRecursivelyBinary(bool& skeleton)
unsigned int textureIndexSize=0;
if (_binaryReader.read(&textureIndexSize, 4, 1) != 1)
{
CCLOGINFO("Failed to read meshdata: attribCount '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: attribCount '%s'.", _path.c_str());
return nullptr;
}
for(int k =0; k < textureIndexSize ; k++ )
@ -1905,22 +1939,16 @@ NodeData* Bundle3D::parseNodesRecursivelyBinary(bool& skeleton)
nodedata->modelNodeDatas.push_back(modelnodedata);
}
}
//else
//{
// nodedata = new (std::nothrow) NodeData();
// nodedata->id = id;
// nodedata->transform = transform;
//}
unsigned int childrenSize = 0;
if (_binaryReader.read(&childrenSize, 4, 1) != 1)
{
CCLOGINFO("Failed to read meshdata: attribCount '%s'.", _path.c_str());
CCLOG("warning: Failed to read meshdata: attribCount '%s'.", _path.c_str());
return nullptr;
}
if (childrenSize > 0)
{
for (rapidjson::SizeType i = 0; i < childrenSize; i++)
for (unsigned int i = 0; i < childrenSize; i++)
{
NodeData* tempdata = parseNodesRecursivelyBinary(skeleton);
nodedata->children.push_back(tempdata);
@ -1969,7 +1997,7 @@ GLenum Bundle3D::parseGLType(const std::string& str)
}
else
{
CCASSERT(false, "Wrong GL type");
CCASSERT(false, "Invalid GL type");
return 0;
}
}
@ -2100,7 +2128,7 @@ Reference* Bundle3D::seekToFirstType(unsigned int type)
// Found a match
if (_binaryReader.seek(ref->offset, SEEK_SET) == false)
{
CCLOGINFO("Failed to seek to object '%s' in bundle '%s'.", ref->id.c_str(), _path.c_str());
CCLOG("warning: Failed to seek to object '%s' in bundle '%s'.", ref->id.c_str(), _path.c_str());
return nullptr;
}
return ref;

59
cocos/3d/CCBundleReader.cpp
View File

@ -29,9 +29,9 @@ NS_CC_BEGIN
BundleReader::BundleReader()
{
m_buffer = nullptr;
m_position = 0;
m_length = 0;
_buffer = nullptr;
_position = 0;
_length = 0;
};
BundleReader::~BundleReader()
@ -39,41 +39,42 @@ BundleReader::~BundleReader()
};
void BundleReader::init(char* lpbuffer, ssize_t length)
void BundleReader::init(char* buffer, ssize_t length)
{
m_position = 0;
m_buffer = lpbuffer;
m_length = length;
_position = 0;
_buffer = buffer;
_length = length;
}
ssize_t BundleReader::read(void* ptr, ssize_t size, ssize_t count)
{
if (!m_buffer || eof())
if (!_buffer || eof())
return 0;
ssize_t validCount;
ssize_t validLength = m_length - m_position;
ssize_t validLength = _length - _position;
ssize_t needLength = size*count;
char* ptr1 = (char*)ptr;
if(validLength <= needLength)
{
validCount = validLength/size;
ssize_t readLength = size*validCount;
memcpy(ptr1,(char*)m_buffer+m_position,readLength);
memcpy(ptr1,(char*)_buffer+_position,readLength);
ptr1 += readLength;
m_position += readLength;
_position += readLength;
readLength = validLength - readLength;
if(readLength>0)
{
memcpy(ptr1,(char*)m_buffer+m_position,readLength);
m_position += readLength;
memcpy(ptr1,(char*)_buffer+_position,readLength);
_position += readLength;
validCount+=1;
}
CCLOG("warning: bundle reader out of range");
}
else
{
memcpy(ptr1,(char*)m_buffer+m_position,needLength);
m_position += needLength;
memcpy(ptr1,(char*)_buffer+_position,needLength);
_position += needLength;
validCount = count;
}
@ -82,19 +83,19 @@ ssize_t BundleReader::read(void* ptr, ssize_t size, ssize_t count)
char* BundleReader::readLine(int num,char* line)
{
if (!m_buffer)
if (!_buffer)
return 0;
char* buffer = (char*)m_buffer+m_position;
char* buffer = (char*)_buffer+_position;
char* p = line;
char c;
ssize_t readNum = 0;
while((c=*buffer) != 10 && readNum < (ssize_t)num && m_position < m_length)
while((c=*buffer) != 10 && readNum < (ssize_t)num && _position < _length)
{
*p = c;
p++;
buffer++;
m_position++;
_position++;
readNum++;
}
*p = '\0';
@ -104,7 +105,7 @@ char* BundleReader::readLine(int num,char* line)
bool BundleReader::eof()
{
if (!m_buffer)
if (!_buffer)
return true;
return ((ssize_t)tell()) >= length();
@ -112,32 +113,32 @@ bool BundleReader::eof()
ssize_t BundleReader::length()
{
return m_length;
return _length;
}
ssize_t BundleReader::tell()
{
if (!m_buffer)
if (!_buffer)
return -1;
return m_position;
return _position;
}
bool BundleReader::seek(long int offset, int origin)
{
if (!m_buffer)
if (!_buffer)
return false;
if(origin == SEEK_CUR)
{
m_position += offset;
_position += offset;
}
else if(origin == SEEK_SET)
{
m_position = offset;
_position = offset;
}
else if(origin == SEEK_END)
{
m_position = m_length+offset;
_position = _length+offset;
}
else
return false;
@ -147,9 +148,9 @@ bool BundleReader::seek(long int offset, int origin)
bool BundleReader::rewind()
{
if (m_buffer != nullptr)
if (_buffer != nullptr)
{
m_position = 0;
_position = 0;
return true;
}
return false;

8
cocos/3d/CCBundleReader.h
View File

@ -55,7 +55,7 @@ public:
* @param lpbuffer The data buffer pointer
* @param length The data buffer size
*/
void init(char* lpbuffer, ssize_t length);
void init(char* buffer, ssize_t length);
/**
* Reads an array of elements.
@ -112,9 +112,9 @@ public:
bool readMatrix(float* m);
private:
ssize_t m_position;
ssize_t m_length;
char* m_buffer;
ssize_t _position;
ssize_t _length;
char* _buffer;
};
/**

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);
}

2
cocos/renderer/CCRenderer.cpp
View File

@ -553,7 +553,7 @@ bool Renderer::checkVisibility(const Mat4 &transform, const Size &size)
{
auto scene = Director::getInstance()->getRunningScene();
// only cull the default camera. The culling algorithm is valid for default camera.
if (scene->_defaultCamera != Camera::getVisitingCamera())
if (scene && scene->_defaultCamera != Camera::getVisitingCamera())
return true;
// half size of the screen

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

133
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)
--------------------------------
--
-- @function [parent=#ControlButton] getHorizontalOrigin
-- @param self
-- @return int#int ret (return value: int)
--------------------------------
--
-- @function [parent=#ControlButton] needsLayout
-- @param self
@ -112,105 +143,145 @@
-- @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)
--------------------------------
-- 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 #cc.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 #cc.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
@ -223,50 +294,58 @@
-- @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)

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

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

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

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

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

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

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

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

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

@ -5,21 +5,25 @@
-- @parent_module cc
--------------------------------
-- set period of the wave in radians.
-- @function [parent=#EaseElastic] setPeriod
-- @param self
-- @param #float float
-- @param #float fPeriod
--------------------------------
-- get period of the wave in radians. default is 0.3
-- @function [parent=#EaseElastic] getPeriod
-- @param self
-- @return float#float ret (return value: float)
--------------------------------
--
-- @function [parent=#EaseElastic] clone
-- @param self
-- @return EaseElastic#EaseElastic ret (return value: cc.EaseElastic)
--------------------------------
--
-- @function [parent=#EaseElastic] reverse
-- @param self
-- @return EaseElastic#EaseElastic ret (return value: cc.EaseElastic)

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

@ -9,21 +9,24 @@
-- @overload self, cc.ActionInterval, float
-- @function [parent=#EaseElasticIn] create
-- @param self
-- @param #cc.ActionInterval actioninterval
-- @param #float float
-- @param #cc.ActionInterval action
-- @param #float period
-- @return EaseElasticIn#EaseElasticIn ret (retunr value: cc.EaseElasticIn)
--------------------------------
--
-- @function [parent=#EaseElasticIn] clone
-- @param self
-- @return EaseElasticIn#EaseElasticIn ret (return value: cc.EaseElasticIn)
--------------------------------
--
-- @function [parent=#EaseElasticIn] update
-- @param self
-- @param #float float
-- @param #float time
--------------------------------
--
-- @function [parent=#EaseElasticIn] reverse
-- @param self
-- @return EaseElastic#EaseElastic ret (return value: cc.EaseElastic)

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

@ -9,21 +9,24 @@
-- @overload self, cc.ActionInterval, float
-- @function [parent=#EaseElasticInOut] create
-- @param self
-- @param #cc.ActionInterval actioninterval
-- @param #float float
-- @param #cc.ActionInterval action
-- @param #float period
-- @return EaseElasticInOut#EaseElasticInOut ret (retunr value: cc.EaseElasticInOut)
--------------------------------
--
-- @function [parent=#EaseElasticInOut] clone
-- @param self
-- @return EaseElasticInOut#EaseElasticInOut ret (return value: cc.EaseElasticInOut)
--------------------------------
--
-- @function [parent=#EaseElasticInOut] update
-- @param self
-- @param #float float
-- @param #float time
--------------------------------
--
-- @function [parent=#EaseElasticInOut] reverse
-- @param self
-- @return EaseElasticInOut#EaseElasticInOut ret (return value: cc.EaseElasticInOut)

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

@ -9,21 +9,24 @@
-- @overload self, cc.ActionInterval, float
-- @function [parent=#EaseElasticOut] create
-- @param self
-- @param #cc.ActionInterval actioninterval
-- @param #float float
-- @param #cc.ActionInterval action
-- @param #float period
-- @return EaseElasticOut#EaseElasticOut ret (retunr value: cc.EaseElasticOut)
--------------------------------
--
-- @function [parent=#EaseElasticOut] clone
-- @param self
-- @return EaseElasticOut#EaseElasticOut ret (return value: cc.EaseElasticOut)
--------------------------------
--
-- @function [parent=#EaseElasticOut] update
-- @param self
-- @param #float float
-- @param #float time
--------------------------------
--
-- @function [parent=#EaseElasticOut] reverse
-- @param self
-- @return EaseElastic#EaseElastic ret (return value: cc.EaseElastic)

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