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

Merge remote-tracking branch 'upstream/v3' into focus3861

This commit is contained in:
andyque 2014-05-07 11:42:09 +08:00
parent ef44b2687b b766c6bdb5
commit 657720e509
150 changed files with 1235 additions and 1138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@ -1,3 +1,7 @@
cocos2d-x-3.1-alpha1 May.8 2014
[FIX] Label: label is unsharp if it's created by system font with small size on iOS & Mac OS X
[FIX] ParticleSystem: Particles can be created without a texture
cocos2d-x-3.1-alpha0 May.1 2014
[NEW] Android: Adds support for get response when Activity's onActivityResult is triggered
[NEW] Core: Adds RefPtr<T> smart pointer support

7
cocos/2d/CCParticleSystem.cpp
View File

@ -387,9 +387,9 @@ bool ParticleSystem::initWithDictionary(ValueMap& dictionary, const std::string&
{
setTexture(tex);
}
else
else if( dictionary.find("textureImageData") != dictionary.end() )
{
std::string textureData = dictionary["textureImageData"].asString();
std::string textureData = dictionary.at("textureImageData").asString();
CCASSERT(!textureData.empty(), "");
auto dataLen = textureData.size();
@ -421,7 +421,8 @@ bool ParticleSystem::initWithDictionary(ValueMap& dictionary, const std::string&
_yCoordFlipped = dictionary["yCoordFlipped"].asInt();
}
CCASSERT( this->_texture != nullptr, "CCParticleSystem: error loading the texture");
if( !this->_texture)
CCLOGWARN("cocos2d: Warning: ParticleSystemQuad system without a texture");
}
ret = true;
}

83
cocos/2d/CCParticleSystemQuad.cpp
View File

@ -48,42 +48,6 @@ THE SOFTWARE.
NS_CC_BEGIN
//implementation ParticleSystemQuad
// overriding the init method
bool ParticleSystemQuad::initWithTotalParticles(int numberOfParticles)
{
// base initialization
if( ParticleSystem::initWithTotalParticles(numberOfParticles) )
{
// allocating data space
if( ! this->allocMemory() ) {
this->release();
return false;
}
initIndices();
if (Configuration::getInstance()->supportsShareableVAO())
{
setupVBOandVAO();
}
else
{
setupVBO();
}
setShaderProgram(ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR_NO_MVP));
#if CC_ENABLE_CACHE_TEXTURE_DATA
// Need to listen the event only when not use batchnode, because it will use VBO
auto listener = EventListenerCustom::create(EVENT_COME_TO_FOREGROUND, CC_CALLBACK_1(ParticleSystemQuad::listenBackToForeground, this));
_eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
#endif
return true;
}
return false;
}
ParticleSystemQuad::ParticleSystemQuad()
:_quads(nullptr)
,_indices(nullptr)
@ -132,6 +96,53 @@ ParticleSystemQuad * ParticleSystemQuad::createWithTotalParticles(int numberOfPa
return ret;
}
ParticleSystemQuad * ParticleSystemQuad::create(ValueMap &dictionary)
{
ParticleSystemQuad *ret = new (std::nothrow) ParticleSystemQuad();
if (ret && ret->initWithDictionary(dictionary))
{
ret->autorelease();
return ret;
}
CC_SAFE_DELETE(ret);
return ret;
}
//implementation ParticleSystemQuad
// overriding the init method
bool ParticleSystemQuad::initWithTotalParticles(int numberOfParticles)
{
// base initialization
if( ParticleSystem::initWithTotalParticles(numberOfParticles) )
{
// allocating data space
if( ! this->allocMemory() ) {
this->release();
return false;
}
initIndices();
if (Configuration::getInstance()->supportsShareableVAO())
{
setupVBOandVAO();
}
else
{
setupVBO();
}
setShaderProgram(ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR_NO_MVP));
#if CC_ENABLE_CACHE_TEXTURE_DATA
// Need to listen the event only when not use batchnode, because it will use VBO
auto listener = EventListenerCustom::create(EVENT_COME_TO_FOREGROUND, CC_CALLBACK_1(ParticleSystemQuad::listenBackToForeground, this));
_eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
#endif
return true;
}
return false;
}
// pointRect should be in Texture coordinates, not pixel coordinates
void ParticleSystemQuad::initTexCoordsWithRect(const Rect& pointRect)

2
cocos/2d/CCParticleSystemQuad.h
View File

@ -65,6 +65,8 @@ public:
This plist files can be created manually or with Particle Designer:
*/
static ParticleSystemQuad * create(const std::string& filename);
/** creates a Particle Emitter with a dictionary */
static ParticleSystemQuad * create(ValueMap &dictionary);
/** Sets a new SpriteFrame as particle.
WARNING: this method is experimental. Use setTextureWithRect instead.

22
cocos/2d/CCSprite.cpp
View File

@ -61,8 +61,8 @@ NS_CC_BEGIN
Sprite* Sprite::createWithTexture(Texture2D *texture)
{
Sprite *sprite = new Sprite();
if (sprite->initWithTexture(texture))
Sprite *sprite = new (std::nothrow) Sprite();
if (sprite && sprite->initWithTexture(texture))
{
sprite->autorelease();
return sprite;
@ -73,8 +73,8 @@ Sprite* Sprite::createWithTexture(Texture2D *texture)
Sprite* Sprite::createWithTexture(Texture2D *texture, const Rect& rect, bool rotated)
{
Sprite *sprite = new Sprite();
if (sprite->initWithTexture(texture, rect, rotated))
Sprite *sprite = new (std::nothrow) Sprite();
if (sprite && sprite->initWithTexture(texture, rect, rotated))
{
sprite->autorelease();
return sprite;
@ -85,8 +85,8 @@ Sprite* Sprite::createWithTexture(Texture2D *texture, const Rect& rect, bool rot
Sprite* Sprite::create(const std::string& filename)
{
Sprite *sprite = new Sprite();
if (sprite->initWithFile(filename))
Sprite *sprite = new (std::nothrow) Sprite();
if (sprite && sprite->initWithFile(filename))
{
sprite->autorelease();
return sprite;
@ -97,8 +97,8 @@ Sprite* Sprite::create(const std::string& filename)
Sprite* Sprite::create(const std::string& filename, const Rect& rect)
{
Sprite *sprite = new Sprite();
if (sprite->initWithFile(filename, rect))
Sprite *sprite = new (std::nothrow) Sprite();
if (sprite && sprite->initWithFile(filename, rect))
{
sprite->autorelease();
return sprite;
@ -109,8 +109,8 @@ Sprite* Sprite::create(const std::string& filename, const Rect& rect)
Sprite* Sprite::createWithSpriteFrame(SpriteFrame *spriteFrame)
{
Sprite *sprite = new Sprite();
if (spriteFrame && sprite->initWithSpriteFrame(spriteFrame))
Sprite *sprite = new (std::nothrow) Sprite();
if (sprite && spriteFrame && sprite->initWithSpriteFrame(spriteFrame))
{
sprite->autorelease();
return sprite;
@ -134,7 +134,7 @@ Sprite* Sprite::createWithSpriteFrameName(const std::string& spriteFrameName)
Sprite* Sprite::create()
{
Sprite *sprite = new Sprite();
Sprite *sprite = new (std::nothrow) Sprite();
if (sprite && sprite->init())
{
sprite->autorelease();

13
cocos/2d/CCTexture2D.cpp
View File

@ -1079,7 +1079,10 @@ bool Texture2D::initWithString(const char *text, const std::string& fontName, fl
bool Texture2D::initWithString(const char *text, const FontDefinition& textDefinition)
{
if(!text || 0 == strlen(text))
{
return false;
}
#if CC_ENABLE_CACHE_TEXTURE_DATA
// cache the texture data
VolatileTextureMgr::addStringTexture(this, text, textDefinition);
@ -1127,9 +1130,11 @@ bool Texture2D::initWithString(const char *text, const FontDefinition& textDefin
textDef._stroke._strokeSize *= contentScaleFactor;
textDef._shadow._shadowEnabled = false;
Data outData = Device::getTextureDataForText(text,textDef,align,imageWidth,imageHeight);
Data outData = Device::getTextureDataForText(text, textDef, align, imageWidth, imageHeight, _hasPremultipliedAlpha);
if(outData.isNull())
{
return false;
}
Size imageSize = Size((float)imageWidth, (float)imageHeight);
pixelFormat = convertDataToFormat(outData.getBytes(), imageWidth*imageHeight*4, PixelFormat::RGBA8888, pixelFormat, &outTempData, &outTempDataLen);
@ -1140,11 +1145,7 @@ bool Texture2D::initWithString(const char *text, const FontDefinition& textDefin
{
free(outTempData);
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) || (CC_TARGET_PLATFORM == CC_PLATFORM_LINUX)
_hasPremultipliedAlpha = true;
#else
_hasPremultipliedAlpha = false;
#endif
return ret;
}

133
cocos/2d/cocos2d_wp8.vcxproj
View File

@ -210,17 +210,36 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\base\atitc.cpp" />
<ClCompile Include="..\base\CCAffineTransform.cpp" />
<ClCompile Include="..\base\base64.cpp" />
<ClCompile Include="..\base\CCAutoreleasePool.cpp" />
<ClCompile Include="..\base\CCConfiguration.cpp" />
<ClCompile Include="..\base\CCConsole.cpp" />
<ClCompile Include="..\base\CCData.cpp" />
<ClCompile Include="..\base\CCDataVisitor.cpp" />
<ClCompile Include="..\base\CCGeometry.cpp" />
<ClCompile Include="..\base\CCDirector.cpp" />
<ClCompile Include="..\base\CCEvent.cpp" />
<ClCompile Include="..\base\CCEventAcceleration.cpp" />
<ClCompile Include="..\base\CCEventCustom.cpp" />
<ClCompile Include="..\base\CCEventDispatcher.cpp" />
<ClCompile Include="..\base\CCEventKeyboard.cpp" />
<ClCompile Include="..\base\CCEventListener.cpp" />
<ClCompile Include="..\base\CCEventListenerAcceleration.cpp" />
<ClCompile Include="..\base\CCEventListenerCustom.cpp" />
<ClCompile Include="..\base\CCEventListenerKeyboard.cpp" />
<ClCompile Include="..\base\CCEventListenerMouse.cpp" />
<ClCompile Include="..\base\CCEventListenerTouch.cpp" />
<ClCompile Include="..\base\CCEventMouse.cpp" />
<ClCompile Include="..\base\CCEventTouch.cpp" />
<ClCompile Include="..\base\CCNS.cpp" />
<ClCompile Include="..\base\CCProfiling.cpp" />
<ClCompile Include="..\base\CCRef.cpp" />
<ClCompile Include="..\base\CCScheduler.cpp" />
<ClCompile Include="..\base\CCTouch.cpp" />
<ClCompile Include="..\base\ccTypes.cpp" />
<ClCompile Include="..\base\CCValue.cpp" />
<ClCompile Include="..\base\etc1.cpp" />
<ClCompile Include="..\base\s3tc.cpp" />
<ClCompile Include="..\base\ZipUtils.cpp" />
<ClCompile Include="..\cocos2d.cpp" />
<ClCompile Include="..\deprecated\CCArray.cpp" />
<ClCompile Include="..\deprecated\CCDeprecated.cpp" />
@ -228,9 +247,12 @@
<ClCompile Include="..\deprecated\CCNotificationCenter.cpp" />
<ClCompile Include="..\deprecated\CCSet.cpp" />
<ClCompile Include="..\deprecated\CCString.cpp" />
<ClCompile Include="..\math\CCAffineTransform.cpp" />
<ClCompile Include="..\math\CCGeometry.cpp" />
<ClCompile Include="..\math\MathUtil.cpp" />
<ClCompile Include="..\math\Matrix.cpp" />
<ClCompile Include="..\math\Quaternion.cpp" />
<ClCompile Include="..\math\TransformUtils.cpp" />
<ClCompile Include="..\math\Vector2.cpp" />
<ClCompile Include="..\math\Vector3.cpp" />
<ClCompile Include="..\math\Vector4.cpp" />
@ -244,7 +266,12 @@
<ClCompile Include="..\physics\chipmunk\CCPhysicsJointInfo_chipmunk.cpp" />
<ClCompile Include="..\physics\chipmunk\CCPhysicsShapeInfo_chipmunk.cpp" />
<ClCompile Include="..\physics\chipmunk\CCPhysicsWorldInfo_chipmunk.cpp" />
<ClCompile Include="base64.cpp" />
<ClCompile Include="..\renderer\CCBatchCommand.cpp" />
<ClCompile Include="..\renderer\CCCustomCommand.cpp" />
<ClCompile Include="..\renderer\CCGroupCommand.cpp" />
<ClCompile Include="..\renderer\CCQuadCommand.cpp" />
<ClCompile Include="..\renderer\CCRenderCommand.cpp" />
<ClCompile Include="..\renderer\CCRenderer.cpp" />
<ClCompile Include="CCAction.cpp" />
<ClCompile Include="CCActionCamera.cpp" />
<ClCompile Include="CCActionCatmullRom.cpp" />
@ -265,23 +292,8 @@
<ClCompile Include="CCClippingNode.cpp" />
<ClCompile Include="CCComponent.cpp" />
<ClCompile Include="CCComponentContainer.cpp" />
<ClCompile Include="CCConfiguration.cpp" />
<ClCompile Include="CCDirector.cpp" />
<ClCompile Include="CCDrawingPrimitives.cpp" />
<ClCompile Include="CCDrawNode.cpp" />
<ClCompile Include="CCEvent.cpp" />
<ClCompile Include="CCEventAcceleration.cpp" />
<ClCompile Include="CCEventCustom.cpp" />
<ClCompile Include="CCEventDispatcher.cpp" />
<ClCompile Include="CCEventKeyboard.cpp" />
<ClCompile Include="CCEventListener.cpp" />
<ClCompile Include="CCEventListenerAcceleration.cpp" />
<ClCompile Include="CCEventListenerCustom.cpp" />
<ClCompile Include="CCEventListenerKeyboard.cpp" />
<ClCompile Include="CCEventListenerMouse.cpp" />
<ClCompile Include="CCEventListenerTouch.cpp" />
<ClCompile Include="CCEventMouse.cpp" />
<ClCompile Include="CCEventTouch.cpp" />
<ClCompile Include="CCFont.cpp" />
<ClCompile Include="CCFontAtlas.cpp" />
<ClCompile Include="CCFontAtlasCache.cpp" />
@ -327,11 +339,9 @@
<ClCompile Include="CCParticleExamples.cpp" />
<ClCompile Include="CCParticleSystem.cpp" />
<ClCompile Include="CCParticleSystemQuad.cpp" />
<ClCompile Include="CCProfiling.cpp" />
<ClCompile Include="CCProgressTimer.cpp" />
<ClCompile Include="CCRenderTexture.cpp" />
<ClCompile Include="CCScene.cpp" />
<ClCompile Include="CCScheduler.cpp" />
<ClCompile Include="CCScriptSupport.cpp" />
<ClCompile Include="CCShaderCache.cpp" />
<ClCompile Include="ccShaders.cpp" />
@ -348,11 +358,9 @@
<ClCompile Include="CCTMXObjectGroup.cpp" />
<ClCompile Include="CCTMXTiledMap.cpp" />
<ClCompile Include="CCTMXXMLParser.cpp" />
<ClCompile Include="CCTouch.cpp" />
<ClCompile Include="CCTransition.cpp" />
<ClCompile Include="CCTransitionPageTurn.cpp" />
<ClCompile Include="CCTransitionProgress.cpp" />
<ClCompile Include="ccTypes.cpp" />
<ClCompile Include="CCTweenFunction.cpp" />
<ClCompile Include="CCUserDefault.cpp" />
<ClCompile Include="ccUTF8.cpp" />
@ -401,16 +409,7 @@
<ClCompile Include="platform\winrt\sha1.cpp" />
<ClCompile Include="platform\wp8\CCGLView.cpp" />
<ClCompile Include="platform\wp8\DirectXBase.cpp" />
<ClCompile Include="renderer\CCBatchCommand.cpp" />
<ClCompile Include="renderer\CCCustomCommand.cpp" />
<ClCompile Include="renderer\CCGroupCommand.cpp" />
<ClCompile Include="renderer\CCMaterialManager.cpp" />
<ClCompile Include="renderer\CCQuadCommand.cpp" />
<ClCompile Include="renderer\CCRenderCommand.cpp" />
<ClCompile Include="renderer\CCRenderer.cpp" />
<ClCompile Include="TGAlib.cpp" />
<ClCompile Include="TransformUtils.cpp" />
<ClCompile Include="ZipUtils.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\external\edtaa3func\edtaa3func.h" />
@ -419,21 +418,44 @@
<ClInclude Include="..\..\external\unzip\unzip.h" />
<ClInclude Include="..\..\external\xxhash\xxhash.h" />
<ClInclude Include="..\base\atitc.h" />
<ClInclude Include="..\base\CCAffineTransform.h" />
<ClInclude Include="..\base\base64.h" />
<ClInclude Include="..\base\CCAutoreleasePool.h" />
<ClInclude Include="..\base\ccConfig.h" />
<ClInclude Include="..\base\CCConfiguration.h" />
<ClInclude Include="..\base\CCConsole.h" />
<ClInclude Include="..\base\CCData.h" />
<ClInclude Include="..\base\CCDataVisitor.h" />
<ClInclude Include="..\base\CCGeometry.h" />
<ClInclude Include="..\base\CCDirector.h" />
<ClInclude Include="..\base\CCEvent.h" />
<ClInclude Include="..\base\CCEventAcceleration.h" />
<ClInclude Include="..\base\CCEventCustom.h" />
<ClInclude Include="..\base\CCEventDispatcher.h" />
<ClInclude Include="..\base\CCEventKeyboard.h" />
<ClInclude Include="..\base\CCEventListener.h" />
<ClInclude Include="..\base\CCEventListenerAcceleration.h" />
<ClInclude Include="..\base\CCEventListenerCustom.h" />
<ClInclude Include="..\base\CCEventListenerKeyboard.h" />
<ClInclude Include="..\base\CCEventListenerMouse.h" />
<ClInclude Include="..\base\CCEventListenerTouch.h" />
<ClInclude Include="..\base\CCEventMouse.h" />
<ClInclude Include="..\base\CCEventTouch.h" />
<ClInclude Include="..\base\CCEventType.h" />
<ClInclude Include="..\base\ccMacros.h" />
<ClInclude Include="..\base\CCMap.h" />
<ClInclude Include="..\base\CCNS.h" />
<ClInclude Include="..\base\CCRef.h" />
<ClInclude Include="..\base\CCPlatformConfig.h" />
<ClInclude Include="..\base\CCPlatformMacros.h" />
<ClInclude Include="..\base\CCProfiling.h" />
<ClInclude Include="..\base\CCRef.h" />
<ClInclude Include="..\base\CCRefPtr.h" />
<ClInclude Include="..\base\CCScheduler.h" />
<ClInclude Include="..\base\CCTouch.h" />
<ClInclude Include="..\base\ccTypes.h" />
<ClInclude Include="..\base\CCValue.h" />
<ClInclude Include="..\base\CCVector.h" />
<ClInclude Include="..\base\etc1.h" />
<ClInclude Include="..\base\s3tc.h" />
<ClInclude Include="..\base\ZipUtils.h" />
<ClInclude Include="..\deprecated\CCArray.h" />
<ClInclude Include="..\deprecated\CCBool.h" />
<ClInclude Include="..\deprecated\CCDeprecated.h" />
@ -444,11 +466,14 @@
<ClInclude Include="..\deprecated\CCNotificationCenter.h" />
<ClInclude Include="..\deprecated\CCSet.h" />
<ClInclude Include="..\deprecated\CCString.h" />
<ClInclude Include="..\math\CCAffineTransform.h" />
<ClInclude Include="..\math\CCGeometry.h" />
<ClInclude Include="..\math\CCMath.h" />
<ClInclude Include="..\math\CCMathBase.h" />
<ClInclude Include="..\math\MathUtil.h" />
<ClInclude Include="..\math\Matrix.h" />
<ClInclude Include="..\math\Quaternion.h" />
<ClInclude Include="..\math\TransformUtils.h" />
<ClInclude Include="..\math\Vector2.h" />
<ClInclude Include="..\math\Vector3.h" />
<ClInclude Include="..\math\Vector4.h" />
@ -463,7 +488,13 @@
<ClInclude Include="..\physics\chipmunk\CCPhysicsJointInfo_chipmunk.h" />
<ClInclude Include="..\physics\chipmunk\CCPhysicsShapeInfo_chipmunk.h" />
<ClInclude Include="..\physics\chipmunk\CCPhysicsWorldInfo_chipmunk.h" />
<ClInclude Include="base64.h" />
<ClInclude Include="..\renderer\CCBatchCommand.h" />
<ClInclude Include="..\renderer\CCCustomCommand.h" />
<ClInclude Include="..\renderer\CCGroupCommand.h" />
<ClInclude Include="..\renderer\CCQuadCommand.h" />
<ClInclude Include="..\renderer\CCRenderCommand.h" />
<ClInclude Include="..\renderer\CCRenderCommandPool.h" />
<ClInclude Include="..\renderer\CCRenderer.h" />
<ClInclude Include="CCAction.h" />
<ClInclude Include="CCActionCamera.h" />
<ClInclude Include="CCActionCatmullRom.h" />
@ -485,23 +516,8 @@
<ClInclude Include="CCComponent.h" />
<ClInclude Include="CCComponentContainer.h" />
<ClInclude Include="ccConfig.h" />
<ClInclude Include="CCConfiguration.h" />
<ClInclude Include="CCDirector.h" />
<ClInclude Include="CCDrawingPrimitives.h" />
<ClInclude Include="CCDrawNode.h" />
<ClInclude Include="CCEvent.h" />
<ClInclude Include="CCEventAcceleration.h" />
<ClInclude Include="CCEventCustom.h" />
<ClInclude Include="CCEventDispatcher.h" />
<ClInclude Include="CCEventKeyboard.h" />
<ClInclude Include="CCEventListener.h" />
<ClInclude Include="CCEventListenerAcceleration.h" />
<ClInclude Include="CCEventListenerCustom.h" />
<ClInclude Include="CCEventListenerKeyboard.h" />
<ClInclude Include="CCEventListenerMouse.h" />
<ClInclude Include="CCEventListenerTouch.h" />
<ClInclude Include="CCEventMouse.h" />
<ClInclude Include="CCEventTouch.h" />
<ClInclude Include="CCEventType.h" />
<ClInclude Include="CCFont.h" />
<ClInclude Include="CCFontAtlas.h" />
@ -533,12 +549,10 @@
<ClInclude Include="CCParticleExamples.h" />
<ClInclude Include="CCParticleSystem.h" />
<ClInclude Include="CCParticleSystemQuad.h" />
<ClInclude Include="CCProfiling.h" />
<ClInclude Include="CCProgressTimer.h" />
<ClInclude Include="CCProtocols.h" />
<ClInclude Include="CCRenderTexture.h" />
<ClInclude Include="CCScene.h" />
<ClInclude Include="CCScheduler.h" />
<ClInclude Include="CCScriptSupport.h" />
<ClInclude Include="CCShaderCache.h" />
<ClInclude Include="ccShaders.h" />
@ -555,7 +569,6 @@
<ClInclude Include="CCTMXObjectGroup.h" />
<ClInclude Include="CCTMXTiledMap.h" />
<ClInclude Include="CCTMXXMLParser.h" />
<ClInclude Include="CCTouch.h" />
<ClInclude Include="CCTransition.h" />
<ClInclude Include="CCTransitionPageTurn.h" />
<ClInclude Include="CCTransitionProgress.h" />
@ -590,20 +603,9 @@
<ClInclude Include="platform\winrt\sha1.h" />
<ClInclude Include="platform\wp8\CCGLView.h" />
<ClInclude Include="platform\wp8\DirectXBase.h" />
<ClInclude Include="renderer\CCBatchCommand.h" />
<ClInclude Include="renderer\CCCustomCommand.h" />
<ClInclude Include="renderer\CCGroupCommand.h" />
<ClInclude Include="renderer\CCMaterialManager.h" />
<ClInclude Include="renderer\CCQuadCommand.h" />
<ClInclude Include="renderer\CCRenderCommand.h" />
<ClInclude Include="renderer\CCRenderCommandPool.h" />
<ClInclude Include="renderer\CCRenderer.h" />
<ClInclude Include="renderer\CCRenderMaterial.h" />
<ClInclude Include="TGAlib.h" />
<ClInclude Include="TransformUtils.h" />
<ClInclude Include="uthash.h" />
<ClInclude Include="utlist.h" />
<ClInclude Include="ZipUtils.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\math\MathUtil.inl" />
@ -614,4 +616,7 @@
<None Include="..\math\Vector3.inl" />
<None Include="..\math\Vector4.inl" />
</ItemGroup>
<ItemGroup>
<Text Include="..\base\CMakeLists.txt" />
</ItemGroup>
</Project>

474
cocos/2d/cocos2d_wp8.vcxproj.filters
View File

@ -76,9 +76,6 @@
<Filter Include="platform\etc">
<UniqueIdentifier>{47fda93e-6eb4-4abc-b5bc-725bf667a395}</UniqueIdentifier>
</Filter>
<Filter Include="event_dispatcher">
<UniqueIdentifier>{3ff2746c-a91b-4b86-93b7-43a9ec14825b}</UniqueIdentifier>
</Filter>
<Filter Include="physics">
<UniqueIdentifier>{08593631-5bf5-46aa-9436-62595c4f7bf6}</UniqueIdentifier>
</Filter>
@ -135,42 +132,6 @@
<ClCompile Include="CCGrid.cpp">
<Filter>effects</Filter>
</ClCompile>
<ClCompile Include="CCEventDispatcher.cpp">
<Filter>event_dispatcher</Filter>
</ClCompile>
<ClCompile Include="CCEventKeyboard.cpp">
<Filter>event_dispatcher</Filter>
</ClCompile>
<ClCompile Include="CCEventListener.cpp">
<Filter>event_dispatcher</Filter>
</ClCompile>
<ClCompile Include="CCEventListenerAcceleration.cpp">
<Filter>event_dispatcher</Filter>
</ClCompile>
<ClCompile Include="CCEventListenerCustom.cpp">
<Filter>event_dispatcher</Filter>
</ClCompile>
<ClCompile Include="CCEventListenerKeyboard.cpp">
<Filter>event_dispatcher</Filter>
</ClCompile>
<ClCompile Include="CCEventListenerTouch.cpp">
<Filter>event_dispatcher</Filter>
</ClCompile>
<ClCompile Include="CCEventTouch.cpp">
<Filter>event_dispatcher</Filter>
</ClCompile>
<ClCompile Include="CCEvent.cpp">
<Filter>event_dispatcher</Filter>
</ClCompile>
<ClCompile Include="CCEventAcceleration.cpp">
<Filter>event_dispatcher</Filter>
</ClCompile>
<ClCompile Include="CCEventCustom.cpp">
<Filter>event_dispatcher</Filter>
</ClCompile>
<ClCompile Include="CCTouch.cpp">
<Filter>event_dispatcher</Filter>
</ClCompile>
<ClCompile Include="CCLayer.cpp">
<Filter>layers_scenes_transitions_nodes</Filter>
</ClCompile>
@ -378,26 +339,13 @@
<ClCompile Include="CCParallaxNode.cpp">
<Filter>tilemap_parallax_nodes</Filter>
</ClCompile>
<ClCompile Include="CCConfiguration.cpp" />
<ClCompile Include="CCDirector.cpp" />
<ClCompile Include="ccFPSImages.c" />
<ClCompile Include="CCScheduler.cpp" />
<ClCompile Include="ccTypes.cpp" />
<ClCompile Include="base64.cpp">
<Filter>support</Filter>
</ClCompile>
<ClCompile Include="CCProfiling.cpp">
<Filter>support</Filter>
</ClCompile>
<ClCompile Include="ccUTF8.cpp">
<Filter>support</Filter>
</ClCompile>
<ClCompile Include="CCVertex.cpp">
<Filter>support</Filter>
</ClCompile>
<ClCompile Include="TransformUtils.cpp">
<Filter>support</Filter>
</ClCompile>
<ClCompile Include="CCComponent.cpp">
<Filter>support\component</Filter>
</ClCompile>
@ -422,39 +370,9 @@
<ClCompile Include="..\..\external\unzip\unzip.cpp">
<Filter>support\zip_support</Filter>
</ClCompile>
<ClCompile Include="ZipUtils.cpp">
<Filter>support\zip_support</Filter>
</ClCompile>
<ClCompile Include="..\base\CCAffineTransform.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\CCAutoreleasePool.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\CCData.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\CCDataVisitor.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\CCGeometry.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\CCNS.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\CCRef.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="ccUtils.cpp">
<Filter>support</Filter>
</ClCompile>
<ClCompile Include="CCEventListenerMouse.cpp">
<Filter>event_dispatcher</Filter>
</ClCompile>
<ClCompile Include="CCEventMouse.cpp">
<Filter>event_dispatcher</Filter>
</ClCompile>
<ClCompile Include="..\physics\chipmunk\CCPhysicsBodyInfo_chipmunk.cpp">
<Filter>physics\chipmunk</Filter>
</ClCompile>
@ -470,36 +388,12 @@
<ClCompile Include="..\physics\chipmunk\CCPhysicsWorldInfo_chipmunk.cpp">
<Filter>physics\chipmunk</Filter>
</ClCompile>
<ClCompile Include="..\base\CCValue.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="CCNodeGrid.cpp">
<Filter>misc_nodes</Filter>
</ClCompile>
<ClCompile Include="..\..\external\edtaa3func\edtaa3func.cpp">
<Filter>label_nodes</Filter>
</ClCompile>
<ClCompile Include="renderer\CCCustomCommand.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="renderer\CCGroupCommand.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="renderer\CCMaterialManager.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="renderer\CCQuadCommand.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="renderer\CCRenderCommand.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="renderer\CCRenderer.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="renderer\CCBatchCommand.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="CCFontCharMap.cpp">
<Filter>label_nodes</Filter>
</ClCompile>
@ -525,9 +419,6 @@
<ClCompile Include="platform\winrt\CCStdC.cpp">
<Filter>platform\winrt</Filter>
</ClCompile>
<ClCompile Include="..\base\CCConsole.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="platform\winrt\CCWinRTUtils.cpp">
<Filter>platform\winrt</Filter>
</ClCompile>
@ -592,6 +483,117 @@
<ClCompile Include="..\math\Vector4.cpp">
<Filter>math</Filter>
</ClCompile>
<ClCompile Include="..\base\base64.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\CCAutoreleasePool.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\CCConfiguration.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\CCConsole.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\CCData.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\CCDataVisitor.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\CCDirector.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\CCEvent.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\CCEventAcceleration.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\CCEventCustom.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\CCEventDispatcher.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\CCEventKeyboard.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\CCEventListener.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\CCEventListenerAcceleration.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\CCEventListenerCustom.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\CCEventListenerKeyboard.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\CCEventListenerMouse.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\CCEventListenerTouch.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\CCEventMouse.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\CCEventTouch.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\CCNS.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\CCProfiling.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\CCRef.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\CCScheduler.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\CCTouch.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\ccTypes.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\CCValue.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\base\ZipUtils.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\renderer\CCBatchCommand.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="..\renderer\CCCustomCommand.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="..\renderer\CCGroupCommand.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="..\renderer\CCQuadCommand.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="..\renderer\CCRenderCommand.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="..\renderer\CCRenderer.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="..\math\CCAffineTransform.cpp">
<Filter>math</Filter>
</ClCompile>
<ClCompile Include="..\math\CCGeometry.cpp">
<Filter>math</Filter>
</ClCompile>
<ClCompile Include="..\math\TransformUtils.cpp">
<Filter>math</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\physics\CCPhysicsBody.h">
@ -621,42 +623,6 @@
<ClInclude Include="CCGrid.h">
<Filter>effects</Filter>
</ClInclude>
<ClInclude Include="CCEventDispatcher.h">
<Filter>event_dispatcher</Filter>
</ClInclude>
<ClInclude Include="CCEventKeyboard.h">
<Filter>event_dispatcher</Filter>
</ClInclude>
<ClInclude Include="CCEventListener.h">
<Filter>event_dispatcher</Filter>
</ClInclude>
<ClInclude Include="CCEventListenerAcceleration.h">
<Filter>event_dispatcher</Filter>
</ClInclude>
<ClInclude Include="CCEventListenerCustom.h">
<Filter>event_dispatcher</Filter>
</ClInclude>
<ClInclude Include="CCEventListenerKeyboard.h">
<Filter>event_dispatcher</Filter>
</ClInclude>
<ClInclude Include="CCEventListenerTouch.h">
<Filter>event_dispatcher</Filter>
</ClInclude>
<ClInclude Include="CCEventTouch.h">
<Filter>event_dispatcher</Filter>
</ClInclude>
<ClInclude Include="CCEvent.h">
<Filter>event_dispatcher</Filter>
</ClInclude>
<ClInclude Include="CCEventAcceleration.h">
<Filter>event_dispatcher</Filter>
</ClInclude>
<ClInclude Include="CCEventCustom.h">
<Filter>event_dispatcher</Filter>
</ClInclude>
<ClInclude Include="CCTouch.h">
<Filter>event_dispatcher</Filter>
</ClInclude>
<ClInclude Include="ccConfig.h">
<Filter>include</Filter>
</ClInclude>
@ -903,16 +869,7 @@
<ClInclude Include="CCParallaxNode.h">
<Filter>tilemap_parallax_nodes</Filter>
</ClInclude>
<ClInclude Include="CCConfiguration.h" />
<ClInclude Include="CCDirector.h" />
<ClInclude Include="ccFPSImages.h" />
<ClInclude Include="CCScheduler.h" />
<ClInclude Include="base64.h">
<Filter>support</Filter>
</ClInclude>
<ClInclude Include="CCProfiling.h">
<Filter>support</Filter>
</ClInclude>
<ClInclude Include="ccUTF8.h">
<Filter>support</Filter>
</ClInclude>
@ -922,9 +879,6 @@
<ClInclude Include="CCVertex.h">
<Filter>support</Filter>
</ClInclude>
<ClInclude Include="TransformUtils.h">
<Filter>support</Filter>
</ClInclude>
<ClInclude Include="CCComponent.h">
<Filter>support\component</Filter>
</ClInclude>
@ -955,36 +909,6 @@
<ClInclude Include="..\..\external\unzip\unzip.h">
<Filter>support\zip_support</Filter>
</ClInclude>
<ClInclude Include="ZipUtils.h">
<Filter>support\zip_support</Filter>
</ClInclude>
<ClInclude Include="..\base\CCAffineTransform.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCAutoreleasePool.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCData.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCDataVisitor.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCGeometry.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCNS.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCRef.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="CCEventListenerMouse.h">
<Filter>event_dispatcher</Filter>
</ClInclude>
<ClInclude Include="CCEventMouse.h">
<Filter>event_dispatcher</Filter>
</ClInclude>
<ClInclude Include="..\physics\chipmunk\CCPhysicsBodyInfo_chipmunk.h">
<Filter>physics\chipmunk</Filter>
</ClInclude>
@ -1003,48 +927,12 @@
<ClInclude Include="..\physics\chipmunk\CCPhysicsWorldInfo_chipmunk.h">
<Filter>physics\chipmunk</Filter>
</ClInclude>
<ClInclude Include="..\base\CCMap.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCValue.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCVector.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="CCNodeGrid.h">
<Filter>misc_nodes</Filter>
</ClInclude>
<ClInclude Include="..\..\external\edtaa3func\edtaa3func.h">
<Filter>label_nodes</Filter>
</ClInclude>
<ClInclude Include="renderer\CCCustomCommand.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="renderer\CCGroupCommand.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="renderer\CCMaterialManager.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="renderer\CCQuadCommand.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="renderer\CCRenderCommand.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="renderer\CCRenderCommandPool.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="renderer\CCRenderer.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="renderer\CCRenderMaterial.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="renderer\CCBatchCommand.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="CCFontCharMap.h">
<Filter>label_nodes</Filter>
</ClInclude>
@ -1073,9 +961,6 @@
<ClInclude Include="platform\winrt\CCStdC.h">
<Filter>platform\winrt</Filter>
</ClInclude>
<ClInclude Include="..\base\CCConsole.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="platform\winrt\CCWinRTUtils.h">
<Filter>platform\winrt</Filter>
</ClInclude>
@ -1157,6 +1042,138 @@
<ClInclude Include="..\math\Vector4.h">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\base\base64.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCAutoreleasePool.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\ccConfig.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCConfiguration.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCConsole.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCData.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCDataVisitor.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCDirector.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCEvent.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCEventAcceleration.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCEventCustom.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCEventDispatcher.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCEventKeyboard.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCEventListener.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCEventListenerAcceleration.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCEventListenerCustom.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCEventListenerKeyboard.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCEventListenerMouse.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCEventListenerTouch.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCEventMouse.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCEventTouch.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCEventType.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\ccMacros.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCMap.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCNS.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCProfiling.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCRef.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCRefPtr.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCScheduler.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCTouch.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\ccTypes.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCValue.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\CCVector.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\base\ZipUtils.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\renderer\CCBatchCommand.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="..\renderer\CCCustomCommand.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="..\renderer\CCGroupCommand.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="..\renderer\CCQuadCommand.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="..\renderer\CCRenderCommand.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="..\renderer\CCRenderCommandPool.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="..\renderer\CCRenderer.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="..\math\CCAffineTransform.h">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\math\CCGeometry.h">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\math\TransformUtils.h">
<Filter>math</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\math\MathUtil.inl">
@ -1181,4 +1198,9 @@
<Filter>math</Filter>
</None>
</ItemGroup>
<ItemGroup>
<Text Include="..\base\CMakeLists.txt">
<Filter>base</Filter>
</Text>
</ItemGroup>
</Project>

2
cocos/2d/platform/CCDevice.h
View File

@ -64,7 +64,7 @@ public:
*/
static void setAccelerometerInterval(float interval);
static Data getTextureDataForText(const char * text,const FontDefinition& textDefinition,TextAlign align,int &widht,int &height);
static Data getTextureDataForText(const char * text, const FontDefinition& textDefinition, TextAlign align, int &width, int &height, bool& hasPremultipliedAlpha);
private:
CC_DISALLOW_IMPLICIT_CONSTRUCTORS(Device);

3
cocos/2d/platform/android/CCDevice.cpp
View File

@ -167,7 +167,7 @@ static BitmapDC& sharedBitmapDC()
return s_BmpDC;
}
Data Device::getTextureDataForText(const char * text,const FontDefinition& textDefinition,TextAlign align,int &width,int &height)
Data Device::getTextureDataForText(const char * text, const FontDefinition& textDefinition, TextAlign align, int &width, int &height, bool& hasPremultipliedAlpha)
{
Data ret;
do
@ -196,6 +196,7 @@ Data Device::getTextureDataForText(const char * text,const FontDefinition& textD
width = dc._width;
height = dc._height;
ret.fastSet(dc._data,width * height * 4);
hasPremultipliedAlpha = true;
} while (0);
return ret;

3
cocos/2d/platform/ios/CCDevice.mm
View File

@ -452,7 +452,7 @@ static bool _initWithString(const char * text, cocos2d::Device::TextAlign align,
}
Data Device::getTextureDataForText(const char * text,const FontDefinition& textDefinition,TextAlign align,int &width,int &height)
Data Device::getTextureDataForText(const char * text, const FontDefinition& textDefinition, TextAlign align, int &width, int &height, bool& hasPremultipliedAlpha)
{
Data ret;
@ -481,6 +481,7 @@ Data Device::getTextureDataForText(const char * text,const FontDefinition& textD
height = (short)info.height;
width = (short)info.width;
ret.fastSet(info.data,width * height * 4);
hasPremultipliedAlpha = true;
} while (0);
return ret;

3
cocos/2d/platform/linux/CCDevice.cpp
View File

@ -480,7 +480,7 @@ static BitmapDC& sharedBitmapDC()
return s_BmpDC;
}
Data Device::getTextureDataForText(const char * text,const FontDefinition& textDefinition,TextAlign align,int &width,int &height)
Data Device::getTextureDataForText(const char * text, const FontDefinition& textDefinition, TextAlign align, int &width, int &height, bool& hasPremultipliedAlpha)
{
Data ret;
do
@ -493,6 +493,7 @@ Data Device::getTextureDataForText(const char * text,const FontDefinition& textD
height = dc.iMaxLineHeight;
dc.reset();
ret.fastSet(dc._data,width * height * 4);
hasPremultipliedAlpha = true;
} while (0);
return ret;

3
cocos/2d/platform/mac/CCDevice.mm
View File

@ -224,7 +224,7 @@ static bool _initWithString(const char * text, Device::TextAlign align, const ch
return ret;
}
Data Device::getTextureDataForText(const char * text,const FontDefinition& textDefinition,TextAlign align,int &width,int &height)
Data Device::getTextureDataForText(const char * text, const FontDefinition& textDefinition, TextAlign align, int &width, int &height, bool& hasPremultipliedAlpha)
{
Data ret;
do {
@ -239,6 +239,7 @@ Data Device::getTextureDataForText(const char * text,const FontDefinition& textD
height = (short)info.height;
width = (short)info.width;
ret.fastSet(info.data,width * height * 4);
hasPremultipliedAlpha = true;
} while (0);
return ret;

4
cocos/2d/platform/win32/CCDevice.cpp
View File

@ -377,7 +377,7 @@ static BitmapDC& sharedBitmapDC()
return s_BmpDC;
}
Data Device::getTextureDataForText(const char * text,const FontDefinition& textDefinition,TextAlign align,int &width,int &height)
Data Device::getTextureDataForText(const char * text, const FontDefinition& textDefinition, TextAlign align, int &width, int &height, bool& hasPremultipliedAlpha)
{
Data ret;
do
@ -429,7 +429,9 @@ Data Device::getTextureDataForText(const char * text,const FontDefinition& textD
}
ret.fastSet(dataBuf,dataLen);
hasPremultipliedAlpha = false;
} while (0);
return ret;
}

3
cocos/2d/platform/winrt/CCDevice.cpp
View File

@ -147,7 +147,7 @@ void Device::setAccelerometerInterval(float interval)
Data Device::getTextureDataForText(const char * text,const FontDefinition& textDefinition,TextAlign align,int &width,int &height)
Data Device::getTextureDataForText(const char * text, const FontDefinition& textDefinition, TextAlign align, int &width, int &height, bool& hasPremultipliedAlpha)
{
Data ret;
ssize_t dataLen;
@ -157,6 +157,7 @@ Data Device::getTextureDataForText(const char * text,const FontDefinition& textD
if (data)
{
ret.fastSet(data, dataLen);
hasPremultipliedAlpha = false;
}
return ret;

1
cocos/2d/platform/wp8/CCGLView.h
View File

@ -28,7 +28,6 @@ THE SOFTWARE.
#include "CCStdC.h"
#include "platform/CCCommon.h"
#include "CCGeometry.h"
#include "platform/CCGLViewProtocol.h"
#include "InputEvent.h"

1
cocos/Android.mk
View File

@ -166,6 +166,7 @@ physics/chipmunk/CCPhysicsWorldInfo_chipmunk.cpp \
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \
$(LOCAL_PATH)/. \
$(LOCAL_PATH)/2d \
$(LOCAL_PATH)/2d/platform/android \
$(LOCAL_PATH)/../external/tinyxml2 \
$(LOCAL_PATH)/../external/unzip \

1
cocos/deprecated/CCDeprecated.h
View File

@ -770,6 +770,7 @@ CC_DEPRECATED_ATTRIBUTE typedef GLView CCEGLView;
CC_DEPRECATED_ATTRIBUTE typedef Component CCComponent;
CC_DEPRECATED_ATTRIBUTE typedef AffineTransform CCAffineTransform;
CC_DEPRECATED_ATTRIBUTE typedef Vector2 CCPoint;
CC_DEPRECATED_ATTRIBUTE typedef Vector2 Point;
CC_DEPRECATED_ATTRIBUTE typedef Size CCSize;
CC_DEPRECATED_ATTRIBUTE typedef Rect CCRect;
CC_DEPRECATED_ATTRIBUTE typedef Color3B ccColor3B;

5
cocos/math/CCGeometry.h
View File

@ -42,11 +42,6 @@ USING_NS_CC_MATH;
* @{
*/
// for Vector2 assignement operator and copy constructor
class CC_DLL Size;
CC_DEPRECATED_ATTRIBUTE typedef Vector2 Point;
class CC_DLL Size
{
public:

6
cocos/math/CCMathBase.h
View File

@ -23,9 +23,9 @@
//#define M_1_PI 0.31830988618379067154
#ifdef __cplusplus
#define NS_CC_MATH_BEGIN namespace cocos2d { namespace math {
#define NS_CC_MATH_END } }
#define USING_NS_CC_MATH using namespace cocos2d::math
#define NS_CC_MATH_BEGIN namespace cocos2d {
#define NS_CC_MATH_END }
#define USING_NS_CC_MATH using namespace cocos2d
#else
#define NS_CC_MATH_BEGIN
#define NS_CC_MATH_END

4
cocos/math/Quaternion.cpp
View File

@ -104,7 +104,7 @@ void Quaternion::conjugate()
x = -x;
y = -y;
z = -z;
w = w;
//w = w;
}
Quaternion Quaternion::getConjugated() const
@ -122,7 +122,7 @@ bool Quaternion::inverse()
x = -x;
y = -y;
z = -z;
w = w;
//w = w;
return true;
}

27
cocos/math/Vector2.cpp
View File

@ -96,30 +96,6 @@ Vector2::~Vector2()
{
}
const Vector2& Vector2::zero()
{
static Vector2 value(0.0f, 0.0f);
return value;
}
const Vector2& Vector2::one()
{
static Vector2 value(1.0f, 1.0f);
return value;
}
const Vector2& Vector2::unitX()
{
static Vector2 value(1.0f, 0.0f);
return value;
}
const Vector2& Vector2::unitY()
{
static Vector2 value(0.0f, 1.0f);
return value;
}
bool Vector2::isZero() const
{
return x == 0.0f && y == 0.0f;
@ -474,6 +450,9 @@ Vector2 Vector2::getIntersectPoint(const Vector2& A, const Vector2& B, const Vec
}
const Vector2 Vector2::ZERO = Vector2(0.0f, 0.0f);
const Vector2 Vector2::ONE = Vector2(1.0f, 1.0f);
const Vector2 Vector2::UNIT_X = Vector2(1.0f, 0.0f);
const Vector2 Vector2::UNIT_Y = Vector2(0.0f, 1.0f);
const Vector2 Vector2::ANCHOR_MIDDLE = Vector2(0.5f, 0.5f);
const Vector2 Vector2::ANCHOR_BOTTOM_LEFT = Vector2(0.0f, 0.0f);
const Vector2 Vector2::ANCHOR_TOP_LEFT = Vector2(0.0f, 1.0f);

36
cocos/math/Vector2.h
View File

@ -97,34 +97,6 @@ public:
*/
~Vector2();
/**
* Returns the zero vector.
*
* @return The 2-element vector of 0s.
*/
static const Vector2& zero();
/**
* Returns the one vector.
*
* @return The 2-element vector of 1s.
*/
static const Vector2& one();
/**
* Returns the unit x vector.
*
* @return The 2-element unit vector along the x axis.
*/
static const Vector2& unitX();
/**
* Returns the unit y vector.
*
* @return The 2-element unit vector along the y axis.
*/
static const Vector2& unitY();
/**
* Indicates whether this vector contains all zeros.
*
@ -735,6 +707,12 @@ public:
/** equals to Vector2(0,0) */
static const Vector2 ZERO;
/** equals to Vector2(1,1) */
static const Vector2 ONE;
/** equals to Vector2(1,0) */
static const Vector2 UNIT_X;
/** equals to Vector2(0,1) */
static const Vector2 UNIT_Y;
/** equals to Vector2(0.5, 0.5) */
static const Vector2 ANCHOR_MIDDLE;
/** equals to Vector2(0, 0) */
@ -764,6 +742,8 @@ public:
*/
inline const Vector2 operator*(float x, const Vector2& v);
typedef Vector2 Point2;
NS_CC_MATH_END
#include "Vector2.inl"

36
cocos/math/Vector3.cpp
View File

@ -68,36 +68,6 @@ Vector3::~Vector3()
{
}
const Vector3& Vector3::zero()
{
static Vector3 value(0.0f, 0.0f, 0.0f);
return value;
}
const Vector3& Vector3::one()
{
static Vector3 value(1.0f, 1.0f, 1.0f);
return value;
}
const Vector3& Vector3::unitX()
{
static Vector3 value(1.0f, 0.0f, 0.0f);
return value;
}
const Vector3& Vector3::unitY()
{
static Vector3 value(0.0f, 1.0f, 0.0f);
return value;
}
const Vector3& Vector3::unitZ()
{
static Vector3 value(0.0f, 0.0f, 1.0f);
return value;
}
bool Vector3::isZero() const
{
return x == 0.0f && y == 0.0f && z == 0.0f;
@ -329,4 +299,10 @@ void Vector3::smooth(const Vector3& target, float elapsedTime, float responseTim
}
}
const Vector3 Vector3::ZERO = Vector3(0.0f, 0.0f, 0.0f);
const Vector3 Vector3::ONE = Vector3(1.0f, 1.0f, 1.0f);
const Vector3 Vector3::UNIT_X = Vector3(1.0f, 0.0f, 0.0f);
const Vector3 Vector3::UNIT_Y = Vector3(0.0f, 1.0f, 0.0f);
const Vector3 Vector3::UNIT_Z = Vector3(0.0f, 0.0f, 1.0f);
NS_CC_MATH_END

48
cocos/math/Vector3.h
View File

@ -107,41 +107,6 @@ public:
*/
~Vector3();
/**
* Returns the zero vector.
*
* @return The 3-element vector of 0s.
*/
static const Vector3& zero();
/**
* Returns the one vector.
*
* @return The 3-element vector of 1s.
*/
static const Vector3& one();
/**
* Returns the unit x vector.
*
* @return The 3-element unit vector along the x axis.
*/
static const Vector3& unitX();
/**
* Returns the unit y vector.
*
* @return The 3-element unit vector along the y axis.
*/
static const Vector3& unitY();
/**
* Returns the unit z vector.
*
* @return The 3-element unit vector along the z axis.
*/
static const Vector3& unitZ();
/**
* Indicates whether this vector contains all zeros.
*
@ -480,6 +445,17 @@ public:
* @return True if this vector is not equal to the given vector, false otherwise.
*/
inline bool operator!=(const Vector3& v) const;
/** equals to Vector3(0,0,0) */
static const Vector3 ZERO;
/** equals to Vector3(1,1,1) */
static const Vector3 ONE;
/** equals to Vector3(1,0,0) */
static const Vector3 UNIT_X;
/** equals to Vector3(0,1,0) */
static const Vector3 UNIT_Y;
/** equals to Vector3(0,0,1) */
static const Vector3 UNIT_Z;
};
/**
@ -491,6 +467,8 @@ public:
*/
inline const Vector3 operator*(float x, const Vector3& v);
typedef Vector3 Point3;
NS_CC_MATH_END
#include "Vector3.inl"

43
cocos/math/Vector4.cpp
View File

@ -68,42 +68,6 @@ Vector4::~Vector4()
{
}
const Vector4& Vector4::zero()
{
static Vector4 value(0.0f, 0.0f, 0.0f, 0.0f);
return value;
}
const Vector4& Vector4::one()
{
static Vector4 value(1.0f, 1.0f, 1.0f, 1.0f);
return value;
}
const Vector4& Vector4::unitX()
{
static Vector4 value(1.0f, 0.0f, 0.0f, 0.0f);
return value;
}
const Vector4& Vector4::unitY()
{
static Vector4 value(0.0f, 1.0f, 0.0f, 0.0f);
return value;
}
const Vector4& Vector4::unitZ()
{
static Vector4 value(0.0f, 0.0f, 1.0f, 0.0f);
return value;
}
const Vector4& Vector4::unitW()
{
static Vector4 value(0.0f, 0.0f, 0.0f, 1.0f);
return value;
}
bool Vector4::isZero() const
{
return x == 0.0f && y == 0.0f && z == 0.0f && w == 0.0f;
@ -339,4 +303,11 @@ void Vector4::subtract(const Vector4& v1, const Vector4& v2, Vector4* dst)
dst->w = v1.w - v2.w;
}
const Vector4 Vector4::ZERO = Vector4(0.0f, 0.0f, 0.0f, 0.0f);
const Vector4 Vector4::ONE = Vector4(1.0f, 1.0f, 1.0f, 1.0f);
const Vector4 Vector4::UNIT_X = Vector4(1.0f, 0.0f, 0.0f, 0.0f);
const Vector4 Vector4::UNIT_Y = Vector4(0.0f, 1.0f, 0.0f, 0.0f);
const Vector4 Vector4::UNIT_Z = Vector4(0.0f, 0.0f, 1.0f, 0.0f);
const Vector4 Vector4::UNIT_W = Vector4(0.0f, 0.0f, 0.0f, 1.0f);
NS_CC_MATH_END

55
cocos/math/Vector4.h
View File

@ -108,48 +108,6 @@ public:
*/
~Vector4();
/**
* Returns the zero vector.
*
* @return The 4-element vector of 0s.
*/
static const Vector4& zero();
/**
* Returns the one vector.
*
* @return The 4-element vector of 1s.
*/
static const Vector4& one();
/**
* Returns the unit x vector.
*
* @return The 4-element unit vector along the x axis.
*/
static const Vector4& unitX();
/**
* Returns the unit y vector.
*
* @return The 4-element unit vector along the y axis.
*/
static const Vector4& unitY();
/**
* Returns the unit z vector.
*
* @return The 4-element unit vector along the z axis.
*/
static const Vector4& unitZ();
/**
* Returns the unit w vector.
*
* @return The 4-element unit vector along the w axis.
*/
static const Vector4& unitW();
/**
* Indicates whether this vector contains all zeros.
*
@ -462,6 +420,19 @@ public:
* @return True if this vector is not equal to the given vector, false otherwise.
*/
inline bool operator!=(const Vector4& v) const;
/** equals to Vector4(0,0,0,0) */
static const Vector4 ZERO;
/** equals to Vector4(1,1,1,1) */
static const Vector4 ONE;
/** equals to Vector4(1,0,0,0) */
static const Vector4 UNIT_X;
/** equals to Vector4(0,1,0,0) */
static const Vector4 UNIT_Y;
/** equals to Vector4(0,0,1,0) */
static const Vector4 UNIT_Z;
/** equals to Vector4(0,0,0,1) */
static const Vector4 UNIT_W;
};
/**

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

@ -6,7 +6,7 @@
--------------------------------
-- overload function: setEye(float, float, float)
--
-- overload function: setEye(cc.math::Vector3)
-- overload function: setEye(array_table)
--
-- @function [parent=#ActionCamera] setEye
-- @param self
@ -17,27 +17,27 @@
--------------------------------
-- @function [parent=#ActionCamera] getEye
-- @param self
-- @return math::Vector3#math::Vector3 ret (return value: cc.math::Vector3)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#ActionCamera] setUp
-- @param self
-- @param #cc.math::Vector3 array
-- @param #array_table array
--------------------------------
-- @function [parent=#ActionCamera] getCenter
-- @param self
-- @return math::Vector3#math::Vector3 ret (return value: cc.math::Vector3)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#ActionCamera] setCenter
-- @param self
-- @param #cc.math::Vector3 array
-- @param #array_table array
--------------------------------
-- @function [parent=#ActionCamera] getUp
-- @param self
-- @return math::Vector3#math::Vector3 ret (return value: cc.math::Vector3)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#ActionCamera] startWithTarget

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

@ -141,19 +141,19 @@
--------------------------------
-- @function [parent=#Armature] setAnchorPoint
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#Armature] draw
-- @param self
-- @param #cc.Renderer renderer
-- @param #cc.math::Matrix matrix
-- @param #cc.Matrix matrix
-- @param #bool bool
--------------------------------
-- @function [parent=#Armature] getAnchorPointInPoints
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#Armature] update
@ -163,7 +163,7 @@
--------------------------------
-- @function [parent=#Armature] getNodeToParentTransform
-- @param self
-- @return math::Matrix#math::Matrix ret (return value: cc.math::Matrix)
-- @return Matrix#Matrix ret (return value: cc.Matrix)
--------------------------------
-- @function [parent=#Armature] getBoundingBox

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

@ -50,7 +50,7 @@
-- @function [parent=#AtlasNode] draw
-- @param self
-- @param #cc.Renderer renderer
-- @param #cc.math::Matrix matrix
-- @param #cc.Matrix matrix
-- @param #bool bool
--------------------------------

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

@ -30,7 +30,7 @@
-- @function [parent=#BatchNode] draw
-- @param self
-- @param #cc.Renderer renderer
-- @param #cc.math::Matrix matrix
-- @param #cc.Matrix matrix
-- @param #bool bool
--------------------------------

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

@ -162,7 +162,7 @@
--------------------------------
-- @function [parent=#Bone] getNodeToArmatureTransform
-- @param self
-- @return math::Matrix#math::Matrix ret (return value: cc.math::Matrix)
-- @return Matrix#Matrix ret (return value: cc.Matrix)
--------------------------------
-- @function [parent=#Bone] getDisplayManager
@ -202,7 +202,7 @@
--------------------------------
-- @function [parent=#Bone] getNodeToWorldTransform
-- @param self
-- @return math::Matrix#math::Matrix ret (return value: cc.math::Matrix)
-- @return Matrix#Matrix ret (return value: cc.Matrix)
--------------------------------
-- @function [parent=#Bone] update

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

@ -16,7 +16,7 @@
--------------------------------
-- @function [parent=#CardinalSplineBy] updatePosition
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#CardinalSplineBy] reverse

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

@ -11,7 +11,7 @@
--------------------------------
-- @function [parent=#CardinalSplineTo] updatePosition
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#CardinalSplineTo] initWithDuration

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

@ -11,7 +11,7 @@
--------------------------------
-- @function [parent=#ContourData] addVertex
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#ContourData] create

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

@ -82,7 +82,7 @@
-- @function [parent=#Control] getTouchLocation
-- @param self
-- @param #cc.Touch touch
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#Control] isHighlighted

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

@ -43,12 +43,12 @@
--------------------------------
-- @function [parent=#ControlButton] setLabelAnchorPoint
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#ControlButton] getLabelAnchorPoint
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#ControlButton] getTitleTTFSizeForState

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

@ -12,7 +12,7 @@
-- @function [parent=#ControlHuePicker] initWithTargetAndPos
-- @param self
-- @param #cc.Node node
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @return bool#bool ret (return value: bool)
--------------------------------
@ -23,7 +23,7 @@
--------------------------------
-- @function [parent=#ControlHuePicker] getStartPos
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#ControlHuePicker] getHue
@ -64,7 +64,7 @@
-- @function [parent=#ControlHuePicker] create
-- @param self
-- @param #cc.Node node
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @return ControlHuePicker#ControlHuePicker ret (return value: cc.ControlHuePicker)
--------------------------------

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

@ -6,7 +6,7 @@
--------------------------------
-- @function [parent=#ControlPotentiometer] setPreviousLocation
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#ControlPotentiometer] setValue
@ -26,16 +26,16 @@
--------------------------------
-- @function [parent=#ControlPotentiometer] angleInDegreesBetweenLineFromPoint_toPoint_toLineFromPoint_toPoint
-- @param self
-- @param #cc.math::Vector2 array
-- @param #cc.math::Vector2 array
-- @param #cc.math::Vector2 array
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @param #array_table array
-- @param #array_table array
-- @param #array_table array
-- @return float#float ret (return value: float)
--------------------------------
-- @function [parent=#ControlPotentiometer] potentiometerBegan
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#ControlPotentiometer] setMaximumValue
@ -60,19 +60,19 @@
--------------------------------
-- @function [parent=#ControlPotentiometer] getPreviousLocation
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#ControlPotentiometer] distanceBetweenPointAndPoint
-- @param self
-- @param #cc.math::Vector2 array
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @param #array_table array
-- @return float#float ret (return value: float)
--------------------------------
-- @function [parent=#ControlPotentiometer] potentiometerEnded
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#ControlPotentiometer] setProgressTimer
@ -100,7 +100,7 @@
--------------------------------
-- @function [parent=#ControlPotentiometer] potentiometerMoved
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#ControlPotentiometer] create

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

@ -12,13 +12,13 @@
-- @function [parent=#ControlSaturationBrightnessPicker] initWithTargetAndPos
-- @param self
-- @param #cc.Node node
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @return bool#bool ret (return value: bool)
--------------------------------
-- @function [parent=#ControlSaturationBrightnessPicker] getStartPos
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#ControlSaturationBrightnessPicker] getOverlay
@ -54,7 +54,7 @@
-- @function [parent=#ControlSaturationBrightnessPicker] create
-- @param self
-- @param #cc.Node node
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @return ControlSaturationBrightnessPicker#ControlSaturationBrightnessPicker ret (return value: cc.ControlSaturationBrightnessPicker)
--------------------------------

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

@ -12,7 +12,7 @@
-- @function [parent=#ControlSlider] locationFromTouch
-- @param self
-- @param #cc.Touch touch
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#ControlSlider] setSelectedThumbSprite

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

@ -31,7 +31,7 @@
--------------------------------
-- @function [parent=#ControlStepper] updateLayoutUsingTouchLocation
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#ControlStepper] setValueWithSendingEvent

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

@ -47,7 +47,7 @@
-- @function [parent=#ControlSwitch] locationFromTouch
-- @param self
-- @param #cc.Touch touch
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- overload function: create(cc.Sprite, cc.Sprite, cc.Sprite, cc.Sprite)

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

@ -58,7 +58,7 @@
-- @function [parent=#Director] loadMatrix
-- @param self
-- @param #cc.MATRIX_STACK_TYPE matrix_stack_type
-- @param #cc.math::Matrix matrix
-- @param #cc.Matrix matrix
--------------------------------
-- @function [parent=#Director] getNotificationNode
@ -83,7 +83,7 @@
--------------------------------
-- @function [parent=#Director] getVisibleOrigin
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#Director] mainLoop
@ -107,8 +107,8 @@
--------------------------------
-- @function [parent=#Director] convertToUI
-- @param self
-- @param #cc.math::Vector2 array
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @param #array_table array
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#Director] setDefaultValues
@ -177,8 +177,8 @@
--------------------------------
-- @function [parent=#Director] convertToGL
-- @param self
-- @param #cc.math::Vector2 array
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @param #array_table array
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#Director] purgeCachedData
@ -212,7 +212,7 @@
-- @function [parent=#Director] getMatrix
-- @param self
-- @param #cc.MATRIX_STACK_TYPE matrix_stack_type
-- @return math::Matrix#math::Matrix ret (return value: cc.math::Matrix)
-- @return Matrix#Matrix ret (return value: cc.Matrix)
--------------------------------
-- @function [parent=#Director] popScene
@ -286,7 +286,7 @@
-- @function [parent=#Director] multiplyMatrix
-- @param self
-- @param #cc.MATRIX_STACK_TYPE matrix_stack_type
-- @param #cc.math::Matrix matrix
-- @param #cc.Matrix matrix
--------------------------------
-- @function [parent=#Director] getActionManager

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

@ -11,7 +11,7 @@
--------------------------------
-- @function [parent=#DisplayManager] getAnchorPointInPoints
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#DisplayManager] getDisplayRenderNodeType
@ -57,7 +57,7 @@
--------------------------------
-- overload function: containPoint(float, float)
--
-- overload function: containPoint(cc.math::Vector2)
-- overload function: containPoint(array_table)
--
-- @function [parent=#DisplayManager] containPoint
-- @param self
@ -90,7 +90,7 @@
--------------------------------
-- @function [parent=#DisplayManager] getAnchorPoint
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#DisplayManager] getDecorativeDisplayList

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

@ -6,16 +6,16 @@
--------------------------------
-- @function [parent=#DrawNode] drawQuadraticBezier
-- @param self
-- @param #cc.math::Vector2 array
-- @param #cc.math::Vector2 array
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @param #array_table array
-- @param #array_table array
-- @param #unsigned int int
-- @param #color4F_table color4f
--------------------------------
-- @function [parent=#DrawNode] onDraw
-- @param self
-- @param #cc.math::Matrix matrix
-- @param #cc.Matrix matrix
-- @param #bool bool
--------------------------------
@ -25,33 +25,33 @@
--------------------------------
-- @function [parent=#DrawNode] drawTriangle
-- @param self
-- @param #cc.math::Vector2 array
-- @param #cc.math::Vector2 array
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @param #array_table array
-- @param #array_table array
-- @param #color4F_table color4f
--------------------------------
-- @function [parent=#DrawNode] drawDot
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @param #float float
-- @param #color4F_table color4f
--------------------------------
-- @function [parent=#DrawNode] drawCubicBezier
-- @param self
-- @param #cc.math::Vector2 array
-- @param #cc.math::Vector2 array
-- @param #cc.math::Vector2 array
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @param #array_table array
-- @param #array_table array
-- @param #array_table array
-- @param #unsigned int int
-- @param #color4F_table color4f
--------------------------------
-- @function [parent=#DrawNode] drawSegment
-- @param self
-- @param #cc.math::Vector2 array
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @param #array_table array
-- @param #float float
-- @param #color4F_table color4f
@ -64,7 +64,7 @@
-- @function [parent=#DrawNode] draw
-- @param self
-- @param #cc.Renderer renderer
-- @param #cc.math::Matrix matrix
-- @param #cc.Matrix matrix
-- @param #bool bool
return nil

4
cocos/scripting/lua-bindings/auto/api/EditBox.lua
View File

@ -109,12 +109,12 @@
--------------------------------
-- @function [parent=#EditBox] setAnchorPoint
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#EditBox] setPosition
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#EditBox] setVisible

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

@ -6,17 +6,17 @@
--------------------------------
-- @function [parent=#FadeOutTRTiles] turnOnTile
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#FadeOutTRTiles] turnOffTile
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#FadeOutTRTiles] transformTile
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @param #float float
--------------------------------

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

@ -6,7 +6,7 @@
--------------------------------
-- @function [parent=#FadeOutUpTiles] transformTile
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @param #float float
--------------------------------

4
cocos/scripting/lua-bindings/auto/api/GLProgram.lua
View File

@ -45,13 +45,13 @@
-- @return string#string ret (return value: string)
--------------------------------
-- overload function: setUniformsForBuiltins(cc.math::Matrix)
-- overload function: setUniformsForBuiltins(cc.Matrix)
--
-- overload function: setUniformsForBuiltins()
--
-- @function [parent=#GLProgram] setUniformsForBuiltins
-- @param self
-- @param #cc.math::Matrix matrix
-- @param #cc.Matrix matrix
--------------------------------
-- @function [parent=#GLProgram] setUniformLocationWith3i

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

@ -53,7 +53,7 @@
--------------------------------
-- @function [parent=#GLViewProtocol] getVisibleOrigin
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#GLViewProtocol] getFrameSize

4
cocos/scripting/lua-bindings/auto/api/GridBase.lua
View File

@ -34,7 +34,7 @@
--------------------------------
-- @function [parent=#GridBase] getStep
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#GridBase] set2DProjection
@ -43,7 +43,7 @@
--------------------------------
-- @function [parent=#GridBase] setStep
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#GridBase] setTextureFlipped

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

@ -7,7 +7,7 @@
-- @function [parent=#JumpBy] create
-- @param self
-- @param #float float
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @param #float float
-- @param #int int
-- @return JumpBy#JumpBy ret (return value: cc.JumpBy)

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

@ -7,7 +7,7 @@
-- @function [parent=#JumpTo] create
-- @param self
-- @param #float float
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @param #float float
-- @param #int int
-- @return JumpTo#JumpTo ret (return value: cc.JumpTo)

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

@ -76,7 +76,7 @@
-- @function [parent=#Label] setBMFontFilePath
-- @param self
-- @param #string str
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @return bool#bool ret (return value: bool)
--------------------------------
@ -222,7 +222,7 @@
-- @param #string str
-- @param #cc.TextHAlignment texthalignment
-- @param #int int
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @return Label#Label ret (return value: cc.Label)
--------------------------------
@ -260,7 +260,7 @@
-- @function [parent=#Label] draw
-- @param self
-- @param #cc.Renderer renderer
-- @param #cc.math::Matrix matrix
-- @param #cc.Matrix matrix
-- @param #bool bool
--------------------------------

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

@ -46,7 +46,7 @@
-- @param #string str
-- @param #float float
-- @param #cc.TextHAlignment texthalignment
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @return bool#bool ret (return value: bool)
--------------------------------
@ -63,7 +63,7 @@
-- @function [parent=#LabelBMFont] setFntFile
-- @param self
-- @param #string str
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#LabelBMFont] setAlignment
@ -78,7 +78,7 @@
--------------------------------
-- overload function: create()
--
-- overload function: create(string, string, float, cc.TextHAlignment, cc.math::Vector2)
-- overload function: create(string, string, float, cc.TextHAlignment, array_table)
--
-- @function [parent=#LabelBMFont] create
-- @param self
@ -86,7 +86,7 @@
-- @param #string str
-- @param #float float
-- @param #cc.TextHAlignment texthalignment
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @return LabelBMFont#LabelBMFont ret (retunr value: cc.LabelBMFont)
--------------------------------

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

@ -37,7 +37,7 @@
-- @function [parent=#LayerColor] draw
-- @param self
-- @param #cc.Renderer renderer
-- @param #cc.math::Matrix matrix
-- @param #cc.Matrix matrix
-- @param #bool bool
--------------------------------

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

@ -21,7 +21,7 @@
--------------------------------
-- @function [parent=#LayerGradient] setVector
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#LayerGradient] setStartOpacity
@ -41,7 +41,7 @@
--------------------------------
-- @function [parent=#LayerGradient] getVector
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#LayerGradient] setEndColor
@ -68,13 +68,13 @@
--
-- overload function: create()
--
-- overload function: create(color4B_table, color4B_table, cc.math::Vector2)
-- overload function: create(color4B_table, color4B_table, array_table)
--
-- @function [parent=#LayerGradient] create
-- @param self
-- @param #color4B_table color4b
-- @param #color4B_table color4b
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @return LayerGradient#LayerGradient ret (retunr value: cc.LayerGradient)
--------------------------------

4
cocos/scripting/lua-bindings/auto/api/Layout.lua
View File

@ -6,7 +6,7 @@
--------------------------------
-- @function [parent=#Layout] setBackGroundColorVector
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#Layout] setClippingType
@ -26,7 +26,7 @@
--------------------------------
-- @function [parent=#Layout] getBackGroundColorVector
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#Layout] getClippingType

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

@ -6,7 +6,7 @@
--------------------------------
-- @function [parent=#Lens3D] setPosition
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#Lens3D] setConcave
@ -21,7 +21,7 @@
--------------------------------
-- @function [parent=#Lens3D] getPosition
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#Lens3D] getLensEffect
@ -33,7 +33,7 @@
-- @param self
-- @param #float float
-- @param #size_table size
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @param #float float
-- @return Lens3D#Lens3D ret (return value: cc.Lens3D)

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

@ -99,7 +99,7 @@
--------------------------------
-- overload function: setPosition(float, float)
--
-- overload function: setPosition(cc.math::Vector2)
-- overload function: setPosition(array_table)
--
-- @function [parent=#MotionStreak] setPosition
-- @param self

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

@ -7,7 +7,7 @@
-- @function [parent=#MoveBy] create
-- @param self
-- @param #float float
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @return MoveBy#MoveBy ret (return value: cc.MoveBy)
--------------------------------

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

@ -7,7 +7,7 @@
-- @function [parent=#MoveTo] create
-- @param self
-- @param #float float
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @return MoveTo#MoveTo ret (return value: cc.MoveTo)
--------------------------------

52
cocos/scripting/lua-bindings/auto/api/Node.lua
View File

@ -72,8 +72,8 @@
--------------------------------
-- @function [parent=#Node] convertToWorldSpaceAR
-- @param self
-- @param #cc.math::Vector2 array
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @param #array_table array
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#Node] isIgnoreAnchorPointForPosition
@ -132,12 +132,12 @@
--------------------------------
-- @function [parent=#Node] getNodeToWorldTransform
-- @param self
-- @return math::Matrix#math::Matrix ret (return value: cc.math::Matrix)
-- @return Matrix#Matrix ret (return value: cc.Matrix)
--------------------------------
-- @function [parent=#Node] getPosition3D
-- @param self
-- @return math::Vector3#math::Vector3 ret (return value: cc.math::Vector3)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#Node] removeChild
@ -148,8 +148,8 @@
--------------------------------
-- @function [parent=#Node] convertToWorldSpace
-- @param self
-- @param #cc.math::Vector2 array
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @param #array_table array
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#Node] getScene
@ -180,7 +180,7 @@
-- @function [parent=#Node] convertTouchToNodeSpace
-- @param self
-- @param #cc.Touch touch
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- overload function: removeAllChildrenWithCleanup(bool)
@ -209,24 +209,24 @@
--------------------------------
-- @function [parent=#Node] getRotation3D
-- @param self
-- @return math::Vector3#math::Vector3 ret (return value: cc.math::Vector3)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#Node] getNodeToParentTransform
-- @param self
-- @return math::Matrix#math::Matrix ret (return value: cc.math::Matrix)
-- @return Matrix#Matrix ret (return value: cc.Matrix)
--------------------------------
-- @function [parent=#Node] convertTouchToNodeSpaceAR
-- @param self
-- @param #cc.Touch touch
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#Node] convertToNodeSpace
-- @param self
-- @param #cc.math::Vector2 array
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @param #array_table array
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#Node] resume
@ -240,7 +240,7 @@
--------------------------------
-- overload function: setPosition(float, float)
--
-- overload function: setPosition(cc.math::Vector2)
-- overload function: setPosition(array_table)
--
-- @function [parent=#Node] setPosition
-- @param self
@ -271,7 +271,7 @@
--------------------------------
-- @function [parent=#Node] setRotation3D
-- @param self
-- @param #cc.math::Vector3 array
-- @param #array_table array
--------------------------------
-- @function [parent=#Node] setPositionX
@ -281,12 +281,12 @@
--------------------------------
-- @function [parent=#Node] setNodeToParentTransform
-- @param self
-- @param #cc.math::Matrix matrix
-- @param #cc.Matrix matrix
--------------------------------
-- @function [parent=#Node] getAnchorPoint
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#Node] getNumberOfRunningActions
@ -310,8 +310,8 @@
--------------------------------
-- @function [parent=#Node] convertToNodeSpaceAR
-- @param self
-- @param #cc.math::Vector2 array
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @param #array_table array
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#Node] addComponent
@ -332,7 +332,7 @@
--------------------------------
-- @function [parent=#Node] getAnchorPointInPoints
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#Node] runAction
@ -373,11 +373,11 @@
--------------------------------
-- overload function: setAdditionalTransform(cc.AffineTransform)
--
-- overload function: setAdditionalTransform(cc.math::Matrix)
-- overload function: setAdditionalTransform(cc.Matrix)
--
-- @function [parent=#Node] setAdditionalTransform
-- @param self
-- @param #cc.math::Matrix matrix
-- @param #cc.Matrix matrix
--------------------------------
-- @function [parent=#Node] getDisplayedOpacity
@ -471,7 +471,7 @@
--------------------------------
-- @function [parent=#Node] getParentToNodeTransform
-- @param self
-- @return math::Matrix#math::Matrix ret (return value: cc.math::Matrix)
-- @return Matrix#Matrix ret (return value: cc.Matrix)
--------------------------------
-- @function [parent=#Node] setGlobalZOrder
@ -572,12 +572,12 @@
--------------------------------
-- overload function: draw()
--
-- overload function: draw(cc.Renderer, cc.math::Matrix, bool)
-- overload function: draw(cc.Renderer, cc.Matrix, bool)
--
-- @function [parent=#Node] draw
-- @param self
-- @param #cc.Renderer renderer
-- @param #cc.math::Matrix matrix
-- @param #cc.Matrix matrix
-- @param #bool bool
--------------------------------
@ -597,7 +597,7 @@
--------------------------------
-- @function [parent=#Node] setPosition3D
-- @param self
-- @param #cc.math::Vector3 array
-- @param #array_table array
--------------------------------
-- @function [parent=#Node] update
@ -611,7 +611,7 @@
--------------------------------
-- @function [parent=#Node] getWorldToNodeTransform
-- @param self
-- @return math::Matrix#math::Matrix ret (return value: cc.math::Matrix)
-- @return Matrix#Matrix ret (return value: cc.Matrix)
--------------------------------
-- @function [parent=#Node] getScale

4
cocos/scripting/lua-bindings/auto/api/ParallaxNode.lua
View File

@ -17,8 +17,8 @@
-- @param self
-- @param #cc.Node node
-- @param #int int
-- @param #cc.math::Vector2 array
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @param #array_table array
--------------------------------
-- @function [parent=#ParallaxNode] removeAllChildrenWithCleanup

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

@ -70,7 +70,7 @@
-- @function [parent=#ParticleBatchNode] draw
-- @param self
-- @param #cc.Renderer renderer
-- @param #cc.math::Matrix matrix
-- @param #cc.Matrix matrix
-- @param #bool bool
--------------------------------

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

@ -36,7 +36,7 @@
--------------------------------
-- @function [parent=#ParticleSystem] setPosVar
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#ParticleSystem] getEndSpin
@ -106,7 +106,7 @@
--------------------------------
-- @function [parent=#ParticleSystem] getGravity
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#ParticleSystem] getTangentialAccel
@ -151,7 +151,7 @@
--------------------------------
-- @function [parent=#ParticleSystem] getPosVar
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#ParticleSystem] updateWithNoTime
@ -179,7 +179,7 @@
--------------------------------
-- @function [parent=#ParticleSystem] getSourcePosition
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#ParticleSystem] setLifeVar
@ -200,7 +200,7 @@
-- @function [parent=#ParticleSystem] updateQuadWithParticle
-- @param self
-- @param #cc.sParticle sparticle
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#ParticleSystem] getAtlasIndex
@ -294,7 +294,7 @@
--------------------------------
-- @function [parent=#ParticleSystem] setSourcePosition
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#ParticleSystem] getEndSpinVar
@ -389,7 +389,7 @@
--------------------------------
-- @function [parent=#ParticleSystem] setGravity
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#ParticleSystem] postStep

4
cocos/scripting/lua-bindings/auto/api/ParticleSystemQuad.lua
View File

@ -19,9 +19,11 @@
--
-- overload function: create()
--
-- overload function: create(map_table)
--
-- @function [parent=#ParticleSystemQuad] create
-- @param self
-- @param #string str
-- @param #map_table map
-- @return ParticleSystemQuad#ParticleSystemQuad ret (retunr value: cc.ParticleSystemQuad)
--------------------------------

52
cocos/scripting/lua-bindings/auto/api/PhysicsBody.lua
View File

@ -48,14 +48,14 @@
-- @return float#float ret (return value: float)
--------------------------------
-- overload function: applyImpulse(cc.math::Vector2, cc.math::Vector2)
-- overload function: applyImpulse(array_table, array_table)
--
-- overload function: applyImpulse(cc.math::Vector2)
-- overload function: applyImpulse(array_table)
--
-- @function [parent=#PhysicsBody] applyImpulse
-- @param self
-- @param #cc.math::Vector2 array
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @param #array_table array
--------------------------------
-- @function [parent=#PhysicsBody] setRotationOffset
@ -63,14 +63,14 @@
-- @param #float float
--------------------------------
-- overload function: applyForce(cc.math::Vector2, cc.math::Vector2)
-- overload function: applyForce(array_table, array_table)
--
-- overload function: applyForce(cc.math::Vector2)
-- overload function: applyForce(array_table)
--
-- @function [parent=#PhysicsBody] applyForce
-- @param self
-- @param #cc.math::Vector2 array
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @param #array_table array
--------------------------------
-- @function [parent=#PhysicsBody] addShape
@ -97,7 +97,7 @@
--------------------------------
-- @function [parent=#PhysicsBody] getVelocity
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#PhysicsBody] getLinearDamping
@ -126,7 +126,7 @@
--------------------------------
-- @function [parent=#PhysicsBody] getPositionOffset
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#PhysicsBody] setCategoryBitmask
@ -146,7 +146,7 @@
--------------------------------
-- @function [parent=#PhysicsBody] getPosition
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#PhysicsBody] setEnable
@ -176,8 +176,8 @@
--------------------------------
-- @function [parent=#PhysicsBody] local2World
-- @param self
-- @param #cc.math::Vector2 array
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @param #array_table array
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#PhysicsBody] getCategoryBitmask
@ -212,8 +212,8 @@
--------------------------------
-- @function [parent=#PhysicsBody] world2Local
-- @param self
-- @param #cc.math::Vector2 array
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @param #array_table array
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#PhysicsBody] isEnabled
@ -243,7 +243,7 @@
--------------------------------
-- @function [parent=#PhysicsBody] setVelocity
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#PhysicsBody] setLinearDamping
@ -258,7 +258,7 @@
--------------------------------
-- @function [parent=#PhysicsBody] setPositionOffset
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#PhysicsBody] setRotationEnable
@ -278,8 +278,8 @@
--------------------------------
-- @function [parent=#PhysicsBody] getVelocityAtLocalPoint
-- @param self
-- @param #cc.math::Vector2 array
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @param #array_table array
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#PhysicsBody] isResting
@ -305,8 +305,8 @@
--------------------------------
-- @function [parent=#PhysicsBody] getVelocityAtWorldPoint
-- @param self
-- @param #cc.math::Vector2 array
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @param #array_table array
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#PhysicsBody] setContactTestBitmask
@ -332,14 +332,14 @@
-- @param self
-- @param #size_table size
-- @param #cc.PhysicsMaterial physicsmaterial
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @return PhysicsBody#PhysicsBody ret (return value: cc.PhysicsBody)
--------------------------------
-- @function [parent=#PhysicsBody] createEdgeSegment
-- @param self
-- @param #cc.math::Vector2 array
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @param #array_table array
-- @param #cc.PhysicsMaterial physicsmaterial
-- @param #float float
-- @return PhysicsBody#PhysicsBody ret (return value: cc.PhysicsBody)
@ -363,7 +363,7 @@
-- @param #size_table size
-- @param #cc.PhysicsMaterial physicsmaterial
-- @param #float float
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @return PhysicsBody#PhysicsBody ret (return value: cc.PhysicsBody)
--------------------------------
@ -371,7 +371,7 @@
-- @param self
-- @param #float float
-- @param #cc.PhysicsMaterial physicsmaterial
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @return PhysicsBody#PhysicsBody ret (return value: cc.PhysicsBody)
return nil

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

@ -10,7 +10,7 @@
--------------------------------
-- @function [parent=#PhysicsContactPostSolve] getSurfaceVelocity
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#PhysicsContactPostSolve] getRestitution

4
cocos/scripting/lua-bindings/auto/api/PhysicsContactPreSolve.lua
View File

@ -24,12 +24,12 @@
--------------------------------
-- @function [parent=#PhysicsContactPreSolve] getSurfaceVelocity
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#PhysicsContactPreSolve] setSurfaceVelocity
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#PhysicsContactPreSolve] setRestitution

4
cocos/scripting/lua-bindings/auto/api/PhysicsJointDistance.lua
View File

@ -18,8 +18,8 @@
-- @param self
-- @param #cc.PhysicsBody physicsbody
-- @param #cc.PhysicsBody physicsbody
-- @param #cc.math::Vector2 array
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @param #array_table array
-- @return PhysicsJointDistance#PhysicsJointDistance ret (return value: cc.PhysicsJointDistance)
return nil

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

@ -8,7 +8,7 @@
-- @param self
-- @param #cc.PhysicsBody physicsbody
-- @param #cc.PhysicsBody physicsbody
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @return PhysicsJointFixed#PhysicsJointFixed ret (return value: cc.PhysicsJointFixed)
return nil

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

@ -6,41 +6,41 @@
--------------------------------
-- @function [parent=#PhysicsJointGroove] setAnchr2
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#PhysicsJointGroove] setGrooveA
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#PhysicsJointGroove] setGrooveB
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#PhysicsJointGroove] getGrooveA
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#PhysicsJointGroove] getGrooveB
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#PhysicsJointGroove] getAnchr2
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#PhysicsJointGroove] construct
-- @param self
-- @param #cc.PhysicsBody physicsbody
-- @param #cc.PhysicsBody physicsbody
-- @param #cc.math::Vector2 array
-- @param #cc.math::Vector2 array
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @param #array_table array
-- @param #array_table array
-- @return PhysicsJointGroove#PhysicsJointGroove ret (return value: cc.PhysicsJointGroove)
return nil

16
cocos/scripting/lua-bindings/auto/api/PhysicsJointLimit.lua
View File

@ -6,12 +6,12 @@
--------------------------------
-- @function [parent=#PhysicsJointLimit] setAnchr2
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#PhysicsJointLimit] setAnchr1
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#PhysicsJointLimit] setMax
@ -21,12 +21,12 @@
--------------------------------
-- @function [parent=#PhysicsJointLimit] getAnchr2
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#PhysicsJointLimit] getAnchr1
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#PhysicsJointLimit] getMin
@ -44,16 +44,16 @@
-- @param #float float
--------------------------------
-- overload function: construct(cc.PhysicsBody, cc.PhysicsBody, cc.math::Vector2, cc.math::Vector2, float, float)
-- overload function: construct(cc.PhysicsBody, cc.PhysicsBody, array_table, array_table, float, float)
--
-- overload function: construct(cc.PhysicsBody, cc.PhysicsBody, cc.math::Vector2, cc.math::Vector2)
-- overload function: construct(cc.PhysicsBody, cc.PhysicsBody, array_table, array_table)
--
-- @function [parent=#PhysicsJointLimit] construct
-- @param self
-- @param #cc.PhysicsBody physicsbody
-- @param #cc.PhysicsBody physicsbody
-- @param #cc.math::Vector2 array
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @param #array_table array
-- @param #float float
-- @param #float float
-- @return PhysicsJointLimit#PhysicsJointLimit ret (retunr value: cc.PhysicsJointLimit)

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

@ -8,7 +8,7 @@
-- @param self
-- @param #cc.PhysicsBody physicsbody
-- @param #cc.PhysicsBody physicsbody
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @return PhysicsJointPin#PhysicsJointPin ret (return value: cc.PhysicsJointPin)
return nil

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

@ -6,12 +6,12 @@
--------------------------------
-- @function [parent=#PhysicsJointSpring] setAnchr2
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#PhysicsJointSpring] setAnchr1
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#PhysicsJointSpring] getDamping
@ -31,12 +31,12 @@
--------------------------------
-- @function [parent=#PhysicsJointSpring] getAnchr2
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#PhysicsJointSpring] getAnchr1
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#PhysicsJointSpring] getStiffness
@ -58,8 +58,8 @@
-- @param self
-- @param #cc.PhysicsBody physicsbody
-- @param #cc.PhysicsBody physicsbody
-- @param #cc.math::Vector2 array
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @param #array_table array
-- @param #float float
-- @param #float float
-- @return PhysicsJointSpring#PhysicsJointSpring ret (return value: cc.PhysicsJointSpring)

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

@ -56,7 +56,7 @@
--------------------------------
-- @function [parent=#PhysicsShape] containsPoint
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @return bool#bool ret (return value: bool)
--------------------------------
@ -77,7 +77,7 @@
--------------------------------
-- @function [parent=#PhysicsShape] getCenter
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#PhysicsShape] getDensity
@ -112,7 +112,7 @@
--------------------------------
-- @function [parent=#PhysicsShape] getOffset
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#PhysicsShape] getRestitution

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

@ -18,7 +18,7 @@
-- @param self
-- @param #size_table size
-- @param #cc.PhysicsMaterial physicsmaterial
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @return PhysicsShapeBox#PhysicsShapeBox ret (return value: cc.PhysicsShapeBox)
--------------------------------
@ -32,13 +32,13 @@
-- @param self
-- @param #float float
-- @param #size_table size
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @return float#float ret (return value: float)
--------------------------------
-- @function [parent=#PhysicsShapeBox] getOffset
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#PhysicsShapeBox] calculateDefaultMoment

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

@ -13,7 +13,7 @@
-- @param self
-- @param #float float
-- @param #cc.PhysicsMaterial physicsmaterial
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @return PhysicsShapeCircle#PhysicsShapeCircle ret (return value: cc.PhysicsShapeCircle)
--------------------------------
@ -27,13 +27,13 @@
-- @param self
-- @param #float float
-- @param #float float
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @return float#float ret (return value: float)
--------------------------------
-- @function [parent=#PhysicsShapeCircle] getOffset
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#PhysicsShapeCircle] calculateDefaultMoment

4
cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgeBox.lua
View File

@ -14,12 +14,12 @@
-- @param #size_table size
-- @param #cc.PhysicsMaterial physicsmaterial
-- @param #float float
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @return PhysicsShapeEdgeBox#PhysicsShapeEdgeBox ret (return value: cc.PhysicsShapeEdgeBox)
--------------------------------
-- @function [parent=#PhysicsShapeEdgeBox] getOffset
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
return nil

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

@ -11,6 +11,6 @@
--------------------------------
-- @function [parent=#PhysicsShapeEdgeChain] getCenter
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
return nil

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

@ -11,6 +11,6 @@
--------------------------------
-- @function [parent=#PhysicsShapeEdgePolygon] getCenter
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
return nil

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

@ -6,18 +6,18 @@
--------------------------------
-- @function [parent=#PhysicsShapeEdgeSegment] getPointB
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#PhysicsShapeEdgeSegment] getPointA
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#PhysicsShapeEdgeSegment] create
-- @param self
-- @param #cc.math::Vector2 array
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @param #array_table array
-- @param #cc.PhysicsMaterial physicsmaterial
-- @param #float float
-- @return PhysicsShapeEdgeSegment#PhysicsShapeEdgeSegment ret (return value: cc.PhysicsShapeEdgeSegment)
@ -25,6 +25,6 @@
--------------------------------
-- @function [parent=#PhysicsShapeEdgeSegment] getCenter
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
return nil

4
cocos/scripting/lua-bindings/auto/api/PhysicsShapePolygon.lua
View File

@ -12,7 +12,7 @@
-- @function [parent=#PhysicsShapePolygon] getPoint
-- @param self
-- @param #int int
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#PhysicsShapePolygon] calculateDefaultMoment
@ -22,6 +22,6 @@
--------------------------------
-- @function [parent=#PhysicsShapePolygon] getCenter
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
return nil

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

@ -5,7 +5,7 @@
--------------------------------
-- @function [parent=#PhysicsWorld] getGravity
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#PhysicsWorld] getAllBodies
@ -15,7 +15,7 @@
--------------------------------
-- @function [parent=#PhysicsWorld] setGravity
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#PhysicsWorld] getSpeed
@ -50,7 +50,7 @@
--------------------------------
-- @function [parent=#PhysicsWorld] getShapes
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
@ -60,7 +60,7 @@
--------------------------------
-- @function [parent=#PhysicsWorld] getShape
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @return PhysicsShape#PhysicsShape ret (return value: cc.PhysicsShape)
--------------------------------

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

@ -6,7 +6,7 @@
--------------------------------
-- @function [parent=#Place] create
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @return Place#Place ret (return value: cc.Place)
--------------------------------

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

@ -11,7 +11,7 @@
--------------------------------
-- @function [parent=#ProgressTimer] setBarChangeRate
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#ProgressTimer] getPercentage
@ -36,12 +36,12 @@
--------------------------------
-- @function [parent=#ProgressTimer] setMidpoint
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#ProgressTimer] getBarChangeRate
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- overload function: setReverseDirection(bool)
@ -55,7 +55,7 @@
--------------------------------
-- @function [parent=#ProgressTimer] getMidpoint
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#ProgressTimer] setPercentage
@ -76,13 +76,13 @@
--------------------------------
-- @function [parent=#ProgressTimer] setAnchorPoint
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#ProgressTimer] draw
-- @param self
-- @param #cc.Renderer renderer
-- @param #cc.math::Matrix matrix
-- @param #cc.Matrix matrix
-- @param #bool bool
--------------------------------

4
cocos/scripting/lua-bindings/auto/api/RenderTexture.lua
View File

@ -6,7 +6,7 @@
--------------------------------
-- @function [parent=#RenderTexture] setVirtualViewport
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @param #rect_table rect
-- @param #rect_table rect
@ -169,7 +169,7 @@
-- @function [parent=#RenderTexture] draw
-- @param self
-- @param #cc.Renderer renderer
-- @param #cc.math::Matrix matrix
-- @param #cc.Matrix matrix
-- @param #bool bool
--------------------------------

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

@ -12,7 +12,7 @@
--------------------------------
-- @function [parent=#RichText] setAnchorPoint
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#RichText] pushBackElement

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

@ -26,19 +26,19 @@
--------------------------------
-- @function [parent=#Ripple3D] setPosition
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#Ripple3D] getPosition
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#Ripple3D] create
-- @param self
-- @param #float float
-- @param #size_table size
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @param #float float
-- @param #unsigned int int
-- @param #float float

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

@ -8,7 +8,7 @@
--
-- overload function: create(float, float)
--
-- overload function: create(float, cc.math::Vector3)
-- overload function: create(float, array_table)
--
-- @function [parent=#RotateBy] create
-- @param self

4
cocos/scripting/lua-bindings/auto/api/ScrollView.lua
View File

@ -24,7 +24,7 @@
--------------------------------
-- @function [parent=#ScrollView] scrollToPercentBothDirection
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @param #float float
-- @param #bool bool
@ -123,7 +123,7 @@
--------------------------------
-- @function [parent=#ScrollView] jumpToPercentBothDirection
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#ScrollView] scrollToPercentVertical

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

@ -6,7 +6,7 @@
--------------------------------
-- @function [parent=#ShuffleTiles] placeTile
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @param #cc.Tile tile
--------------------------------

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

@ -15,7 +15,7 @@
--------------------------------
-- @function [parent=#Skeleton] onDraw
-- @param self
-- @param #cc.math::Matrix matrix
-- @param #cc.Matrix matrix
-- @param #bool bool
--------------------------------

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

@ -11,7 +11,7 @@
--------------------------------
-- @function [parent=#Skin] getNodeToWorldTransformAR
-- @param self
-- @return math::Matrix#math::Matrix ret (return value: cc.math::Matrix)
-- @return Matrix#Matrix ret (return value: cc.Matrix)
--------------------------------
-- @function [parent=#Skin] initWithFile
@ -62,13 +62,13 @@
--------------------------------
-- @function [parent=#Skin] getNodeToWorldTransform
-- @param self
-- @return math::Matrix#math::Matrix ret (return value: cc.math::Matrix)
-- @return Matrix#Matrix ret (return value: cc.Matrix)
--------------------------------
-- @function [parent=#Skin] draw
-- @param self
-- @param #cc.Renderer renderer
-- @param #cc.math::Matrix matrix
-- @param #cc.Matrix matrix
-- @param #bool bool
--------------------------------

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

@ -114,7 +114,7 @@
--------------------------------
-- @function [parent=#Slider] hitTest
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @return bool#bool ret (return value: bool)
--------------------------------

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

@ -44,7 +44,7 @@
--------------------------------
-- @function [parent=#Sprite] getOffsetPosition
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#Sprite] removeAllChildrenWithCleanup
@ -184,7 +184,7 @@
-- @function [parent=#Sprite] draw
-- @param self
-- @param #cc.Renderer renderer
-- @param #cc.math::Matrix matrix
-- @param #cc.Matrix matrix
-- @param #bool bool
--------------------------------
@ -217,7 +217,7 @@
--------------------------------
-- @function [parent=#Sprite] setAnchorPoint
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#Sprite] setRotationSkewX

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

@ -118,7 +118,7 @@
-- @function [parent=#SpriteBatchNode] draw
-- @param self
-- @param #cc.Renderer renderer
-- @param #cc.math::Matrix matrix
-- @param #cc.Matrix matrix
-- @param #bool bool
--------------------------------

24
cocos/scripting/lua-bindings/auto/api/SpriteFrame.lua
View File

@ -19,7 +19,7 @@
-- @param #cc.Texture2D texture2d
--------------------------------
-- overload function: initWithTexture(cc.Texture2D, rect_table, bool, cc.math::Vector2, size_table)
-- overload function: initWithTexture(cc.Texture2D, rect_table, bool, array_table, size_table)
--
-- overload function: initWithTexture(cc.Texture2D, rect_table)
--
@ -28,7 +28,7 @@
-- @param #cc.Texture2D texture2d
-- @param #rect_table rect
-- @param #bool bool
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @param #size_table size
-- @return bool#bool ret (retunr value: bool)
@ -50,7 +50,7 @@
--------------------------------
-- @function [parent=#SpriteFrame] setOffsetInPixels
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#SpriteFrame] getRectInPixels
@ -75,12 +75,12 @@
--------------------------------
-- @function [parent=#SpriteFrame] setOffset
-- @param self
-- @param #cc.math::Vector2 array
-- @param #array_table array
--------------------------------
-- @function [parent=#SpriteFrame] getOffset
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#SpriteFrame] isRotated
@ -88,7 +88,7 @@
-- @return bool#bool ret (return value: bool)
--------------------------------
-- overload function: initWithTextureFilename(string, rect_table, bool, cc.math::Vector2, size_table)
-- overload function: initWithTextureFilename(string, rect_table, bool, array_table, size_table)
--
-- overload function: initWithTextureFilename(string, rect_table)
--
@ -97,7 +97,7 @@
-- @param #string str
-- @param #rect_table rect
-- @param #bool bool
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @param #size_table size
-- @return bool#bool ret (retunr value: bool)
@ -109,7 +109,7 @@
--------------------------------
-- @function [parent=#SpriteFrame] getOffsetInPixels
-- @param self
-- @return math::Vector2#math::Vector2 ret (return value: cc.math::Vector2)
-- @return array_table#array_table ret (return value: array_table)
--------------------------------
-- @function [parent=#SpriteFrame] getOriginalSize
@ -117,7 +117,7 @@
-- @return size_table#size_table ret (return value: size_table)
--------------------------------
-- overload function: create(string, rect_table, bool, cc.math::Vector2, size_table)
-- overload function: create(string, rect_table, bool, array_table, size_table)
--
-- overload function: create(string, rect_table)
--
@ -126,12 +126,12 @@
-- @param #string str
-- @param #rect_table rect
-- @param #bool bool
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @param #size_table size
-- @return SpriteFrame#SpriteFrame ret (retunr value: cc.SpriteFrame)
--------------------------------
-- overload function: createWithTexture(cc.Texture2D, rect_table, bool, cc.math::Vector2, size_table)
-- overload function: createWithTexture(cc.Texture2D, rect_table, bool, array_table, size_table)
--
-- overload function: createWithTexture(cc.Texture2D, rect_table)
--
@ -140,7 +140,7 @@
-- @param #cc.Texture2D texture2d
-- @param #rect_table rect
-- @param #bool bool
-- @param #cc.math::Vector2 array
-- @param #array_table array
-- @param #size_table size
-- @return SpriteFrame#SpriteFrame ret (retunr value: cc.SpriteFrame)

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