diff --git a/CHANGELOG b/CHANGELOG index cb5733b47d..0ed89c4443 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 smart pointer support diff --git a/cocos/2d/CCParticleSystem.cpp b/cocos/2d/CCParticleSystem.cpp index 5e79f27f6b..8dc9e3ff02 100644 --- a/cocos/2d/CCParticleSystem.cpp +++ b/cocos/2d/CCParticleSystem.cpp @@ -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(); @@ -420,8 +420,9 @@ 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; } diff --git a/cocos/2d/CCParticleSystemQuad.cpp b/cocos/2d/CCParticleSystemQuad.cpp index cc8a275dca..283e6692cf 100644 --- a/cocos/2d/CCParticleSystemQuad.cpp +++ b/cocos/2d/CCParticleSystemQuad.cpp @@ -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) diff --git a/cocos/2d/CCParticleSystemQuad.h b/cocos/2d/CCParticleSystemQuad.h index c77ccb983a..4566f06e1d 100644 --- a/cocos/2d/CCParticleSystemQuad.h +++ b/cocos/2d/CCParticleSystemQuad.h @@ -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. diff --git a/cocos/2d/CCSprite.cpp b/cocos/2d/CCSprite.cpp index 6c48a27751..7129bd6e98 100644 --- a/cocos/2d/CCSprite.cpp +++ b/cocos/2d/CCSprite.cpp @@ -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(); diff --git a/cocos/2d/CCTexture2D.cpp b/cocos/2d/CCTexture2D.cpp index 71261c0e8a..520fafc409 100644 --- a/cocos/2d/CCTexture2D.cpp +++ b/cocos/2d/CCTexture2D.cpp @@ -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; } diff --git a/cocos/2d/cocos2d_wp8.vcxproj b/cocos/2d/cocos2d_wp8.vcxproj index a932465d98..a3c29778b4 100644 --- a/cocos/2d/cocos2d_wp8.vcxproj +++ b/cocos/2d/cocos2d_wp8.vcxproj @@ -210,17 +210,36 @@ NotUsing - + + - + + + + + + + + + + + + + + + + + + + @@ -228,9 +247,12 @@ + + + @@ -244,7 +266,12 @@ - + + + + + + @@ -265,23 +292,8 @@ - - - - - - - - - - - - - - - @@ -327,11 +339,9 @@ - - @@ -348,11 +358,9 @@ - - @@ -401,16 +409,7 @@ - - - - - - - - - @@ -419,21 +418,44 @@ - + + + - + + + + + + + + + + + + + + + + - + + + + + + + @@ -444,11 +466,14 @@ + + + @@ -463,7 +488,13 @@ - + + + + + + + @@ -485,23 +516,8 @@ - - - - - - - - - - - - - - - @@ -533,12 +549,10 @@ - - @@ -555,7 +569,6 @@ - @@ -590,20 +603,9 @@ - - - - - - - - - - - @@ -614,4 +616,7 @@ + + + \ No newline at end of file diff --git a/cocos/2d/cocos2d_wp8.vcxproj.filters b/cocos/2d/cocos2d_wp8.vcxproj.filters index 6033b06ccf..bebc9d9acc 100644 --- a/cocos/2d/cocos2d_wp8.vcxproj.filters +++ b/cocos/2d/cocos2d_wp8.vcxproj.filters @@ -76,9 +76,6 @@ {47fda93e-6eb4-4abc-b5bc-725bf667a395} - - {3ff2746c-a91b-4b86-93b7-43a9ec14825b} - {08593631-5bf5-46aa-9436-62595c4f7bf6} @@ -135,42 +132,6 @@ effects - - event_dispatcher - - - event_dispatcher - - - event_dispatcher - - - event_dispatcher - - - event_dispatcher - - - event_dispatcher - - - event_dispatcher - - - event_dispatcher - - - event_dispatcher - - - event_dispatcher - - - event_dispatcher - - - event_dispatcher - layers_scenes_transitions_nodes @@ -378,26 +339,13 @@ tilemap_parallax_nodes - - - - - - support - - - support - support support - - support - support\component @@ -422,39 +370,9 @@ support\zip_support - - support\zip_support - - - base - - - base - - - base - - - base - - - base - - - base - - - base - support - - event_dispatcher - - - event_dispatcher - physics\chipmunk @@ -470,36 +388,12 @@ physics\chipmunk - - base - misc_nodes label_nodes - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - label_nodes @@ -525,9 +419,6 @@ platform\winrt - - base - platform\winrt @@ -592,6 +483,117 @@ math + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + math + + + math + + + math + @@ -621,42 +623,6 @@ effects - - event_dispatcher - - - event_dispatcher - - - event_dispatcher - - - event_dispatcher - - - event_dispatcher - - - event_dispatcher - - - event_dispatcher - - - event_dispatcher - - - event_dispatcher - - - event_dispatcher - - - event_dispatcher - - - event_dispatcher - include @@ -903,16 +869,7 @@ tilemap_parallax_nodes - - - - - support - - - support - support @@ -922,9 +879,6 @@ support - - support - support\component @@ -955,36 +909,6 @@ support\zip_support - - support\zip_support - - - base - - - base - - - base - - - base - - - base - - - base - - - base - - - event_dispatcher - - - event_dispatcher - physics\chipmunk @@ -1003,48 +927,12 @@ physics\chipmunk - - base - - - base - - - base - misc_nodes label_nodes - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - label_nodes @@ -1073,9 +961,6 @@ platform\winrt - - base - platform\winrt @@ -1157,6 +1042,138 @@ math + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + base + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + math + + + math + + + math + @@ -1181,4 +1198,9 @@ math + + + base + + \ No newline at end of file diff --git a/cocos/2d/platform/CCDevice.h b/cocos/2d/platform/CCDevice.h index dfa696d076..1affa43e7b 100644 --- a/cocos/2d/platform/CCDevice.h +++ b/cocos/2d/platform/CCDevice.h @@ -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); diff --git a/cocos/2d/platform/android/CCDevice.cpp b/cocos/2d/platform/android/CCDevice.cpp index 2d3510b394..2a4cca9c5f 100644 --- a/cocos/2d/platform/android/CCDevice.cpp +++ b/cocos/2d/platform/android/CCDevice.cpp @@ -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; diff --git a/cocos/2d/platform/ios/CCDevice.mm b/cocos/2d/platform/ios/CCDevice.mm index a90ffcceb9..3a72be780a 100644 --- a/cocos/2d/platform/ios/CCDevice.mm +++ b/cocos/2d/platform/ios/CCDevice.mm @@ -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; diff --git a/cocos/2d/platform/linux/CCDevice.cpp b/cocos/2d/platform/linux/CCDevice.cpp index 32f1449960..262c4301e7 100644 --- a/cocos/2d/platform/linux/CCDevice.cpp +++ b/cocos/2d/platform/linux/CCDevice.cpp @@ -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; diff --git a/cocos/2d/platform/mac/CCDevice.mm b/cocos/2d/platform/mac/CCDevice.mm index faa82f1f9e..9130d39315 100644 --- a/cocos/2d/platform/mac/CCDevice.mm +++ b/cocos/2d/platform/mac/CCDevice.mm @@ -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; diff --git a/cocos/2d/platform/win32/CCDevice.cpp b/cocos/2d/platform/win32/CCDevice.cpp index a97e5cfda7..839e67e495 100644 --- a/cocos/2d/platform/win32/CCDevice.cpp +++ b/cocos/2d/platform/win32/CCDevice.cpp @@ -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; } diff --git a/cocos/2d/platform/winrt/CCDevice.cpp b/cocos/2d/platform/winrt/CCDevice.cpp index 3edeaa4bef..46c9b0cd43 100644 --- a/cocos/2d/platform/winrt/CCDevice.cpp +++ b/cocos/2d/platform/winrt/CCDevice.cpp @@ -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; diff --git a/cocos/2d/platform/wp8/CCGLView.h b/cocos/2d/platform/wp8/CCGLView.h index 9dc2603b11..187c796ad9 100644 --- a/cocos/2d/platform/wp8/CCGLView.h +++ b/cocos/2d/platform/wp8/CCGLView.h @@ -28,7 +28,6 @@ THE SOFTWARE. #include "CCStdC.h" #include "platform/CCCommon.h" -#include "CCGeometry.h" #include "platform/CCGLViewProtocol.h" #include "InputEvent.h" diff --git a/cocos/Android.mk b/cocos/Android.mk index 424c525b59..bdd8f7bc73 100644 --- a/cocos/Android.mk +++ b/cocos/Android.mk @@ -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 \ diff --git a/cocos/deprecated/CCDeprecated.h b/cocos/deprecated/CCDeprecated.h index 14cfb3ca82..525a72942b 100644 --- a/cocos/deprecated/CCDeprecated.h +++ b/cocos/deprecated/CCDeprecated.h @@ -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; diff --git a/cocos/math/CCGeometry.h b/cocos/math/CCGeometry.h index cc1b3e407f..7ecfc0affb 100644 --- a/cocos/math/CCGeometry.h +++ b/cocos/math/CCGeometry.h @@ -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: diff --git a/cocos/math/CCMathBase.h b/cocos/math/CCMathBase.h index b1bb0b08a4..2bc0865108 100644 --- a/cocos/math/CCMathBase.h +++ b/cocos/math/CCMathBase.h @@ -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 diff --git a/cocos/math/Quaternion.cpp b/cocos/math/Quaternion.cpp index 8592277c34..da96e294d4 100644 --- a/cocos/math/Quaternion.cpp +++ b/cocos/math/Quaternion.cpp @@ -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; } diff --git a/cocos/math/Vector2.cpp b/cocos/math/Vector2.cpp index 600b836559..3cde513e31 100644 --- a/cocos/math/Vector2.cpp +++ b/cocos/math/Vector2.cpp @@ -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); diff --git a/cocos/math/Vector2.h b/cocos/math/Vector2.h index b8558930b6..731d19e04e 100644 --- a/cocos/math/Vector2.h +++ b/cocos/math/Vector2.h @@ -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" diff --git a/cocos/math/Vector3.cpp b/cocos/math/Vector3.cpp index f21d7608bf..96656e62fc 100644 --- a/cocos/math/Vector3.cpp +++ b/cocos/math/Vector3.cpp @@ -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 diff --git a/cocos/math/Vector3.h b/cocos/math/Vector3.h index 3ebb47db26..0e1f0a5969 100644 --- a/cocos/math/Vector3.h +++ b/cocos/math/Vector3.h @@ -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" diff --git a/cocos/math/Vector4.cpp b/cocos/math/Vector4.cpp index c960969ce1..7abeb10979 100644 --- a/cocos/math/Vector4.cpp +++ b/cocos/math/Vector4.cpp @@ -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 diff --git a/cocos/math/Vector4.h b/cocos/math/Vector4.h index 8f9a62c8b6..616ae3094a 100644 --- a/cocos/math/Vector4.h +++ b/cocos/math/Vector4.h @@ -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; }; /** diff --git a/cocos/scripting/lua-bindings/auto/api/ActionCamera.lua b/cocos/scripting/lua-bindings/auto/api/ActionCamera.lua index 895e285893..0aad939852 100644 --- a/cocos/scripting/lua-bindings/auto/api/ActionCamera.lua +++ b/cocos/scripting/lua-bindings/auto/api/ActionCamera.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/Armature.lua b/cocos/scripting/lua-bindings/auto/api/Armature.lua index d03f18f530..f41c59ddfd 100644 --- a/cocos/scripting/lua-bindings/auto/api/Armature.lua +++ b/cocos/scripting/lua-bindings/auto/api/Armature.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/AtlasNode.lua b/cocos/scripting/lua-bindings/auto/api/AtlasNode.lua index 365d795046..118eab29d1 100644 --- a/cocos/scripting/lua-bindings/auto/api/AtlasNode.lua +++ b/cocos/scripting/lua-bindings/auto/api/AtlasNode.lua @@ -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 -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/BatchNode.lua b/cocos/scripting/lua-bindings/auto/api/BatchNode.lua index 25e59b271d..6ab9846a70 100644 --- a/cocos/scripting/lua-bindings/auto/api/BatchNode.lua +++ b/cocos/scripting/lua-bindings/auto/api/BatchNode.lua @@ -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 -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/Bone.lua b/cocos/scripting/lua-bindings/auto/api/Bone.lua index 6763db3330..5831335aaa 100644 --- a/cocos/scripting/lua-bindings/auto/api/Bone.lua +++ b/cocos/scripting/lua-bindings/auto/api/Bone.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/CardinalSplineBy.lua b/cocos/scripting/lua-bindings/auto/api/CardinalSplineBy.lua index a8ca0be658..91086fba88 100644 --- a/cocos/scripting/lua-bindings/auto/api/CardinalSplineBy.lua +++ b/cocos/scripting/lua-bindings/auto/api/CardinalSplineBy.lua @@ -16,7 +16,7 @@ -------------------------------- -- @function [parent=#CardinalSplineBy] updatePosition -- @param self --- @param #cc.math::Vector2 array +-- @param #array_table array -------------------------------- -- @function [parent=#CardinalSplineBy] reverse diff --git a/cocos/scripting/lua-bindings/auto/api/CardinalSplineTo.lua b/cocos/scripting/lua-bindings/auto/api/CardinalSplineTo.lua index 6a35ef0118..bc9f21a6f6 100644 --- a/cocos/scripting/lua-bindings/auto/api/CardinalSplineTo.lua +++ b/cocos/scripting/lua-bindings/auto/api/CardinalSplineTo.lua @@ -11,7 +11,7 @@ -------------------------------- -- @function [parent=#CardinalSplineTo] updatePosition -- @param self --- @param #cc.math::Vector2 array +-- @param #array_table array -------------------------------- -- @function [parent=#CardinalSplineTo] initWithDuration diff --git a/cocos/scripting/lua-bindings/auto/api/ContourData.lua b/cocos/scripting/lua-bindings/auto/api/ContourData.lua index 1ea660ffbd..7b648eed60 100644 --- a/cocos/scripting/lua-bindings/auto/api/ContourData.lua +++ b/cocos/scripting/lua-bindings/auto/api/ContourData.lua @@ -11,7 +11,7 @@ -------------------------------- -- @function [parent=#ContourData] addVertex -- @param self --- @param #cc.math::Vector2 array +-- @param #array_table array -------------------------------- -- @function [parent=#ContourData] create diff --git a/cocos/scripting/lua-bindings/auto/api/Control.lua b/cocos/scripting/lua-bindings/auto/api/Control.lua index b31c0cd7db..7c40b76557 100644 --- a/cocos/scripting/lua-bindings/auto/api/Control.lua +++ b/cocos/scripting/lua-bindings/auto/api/Control.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/ControlButton.lua b/cocos/scripting/lua-bindings/auto/api/ControlButton.lua index d9a52be2d8..c2f7157658 100644 --- a/cocos/scripting/lua-bindings/auto/api/ControlButton.lua +++ b/cocos/scripting/lua-bindings/auto/api/ControlButton.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/ControlHuePicker.lua b/cocos/scripting/lua-bindings/auto/api/ControlHuePicker.lua index 9b31d6fae6..2cacb772b1 100644 --- a/cocos/scripting/lua-bindings/auto/api/ControlHuePicker.lua +++ b/cocos/scripting/lua-bindings/auto/api/ControlHuePicker.lua @@ -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) -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/ControlPotentiometer.lua b/cocos/scripting/lua-bindings/auto/api/ControlPotentiometer.lua index d5f261a21d..cc6641c57c 100644 --- a/cocos/scripting/lua-bindings/auto/api/ControlPotentiometer.lua +++ b/cocos/scripting/lua-bindings/auto/api/ControlPotentiometer.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/ControlSaturationBrightnessPicker.lua b/cocos/scripting/lua-bindings/auto/api/ControlSaturationBrightnessPicker.lua index 87ed524a86..081e840ba6 100644 --- a/cocos/scripting/lua-bindings/auto/api/ControlSaturationBrightnessPicker.lua +++ b/cocos/scripting/lua-bindings/auto/api/ControlSaturationBrightnessPicker.lua @@ -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) -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/ControlSlider.lua b/cocos/scripting/lua-bindings/auto/api/ControlSlider.lua index 096cbbc085..cff4fdfd6b 100644 --- a/cocos/scripting/lua-bindings/auto/api/ControlSlider.lua +++ b/cocos/scripting/lua-bindings/auto/api/ControlSlider.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/ControlStepper.lua b/cocos/scripting/lua-bindings/auto/api/ControlStepper.lua index 17f0c1fe45..d447a1c37f 100644 --- a/cocos/scripting/lua-bindings/auto/api/ControlStepper.lua +++ b/cocos/scripting/lua-bindings/auto/api/ControlStepper.lua @@ -31,7 +31,7 @@ -------------------------------- -- @function [parent=#ControlStepper] updateLayoutUsingTouchLocation -- @param self --- @param #cc.math::Vector2 array +-- @param #array_table array -------------------------------- -- @function [parent=#ControlStepper] setValueWithSendingEvent diff --git a/cocos/scripting/lua-bindings/auto/api/ControlSwitch.lua b/cocos/scripting/lua-bindings/auto/api/ControlSwitch.lua index f4af55caa2..07bdd24a45 100644 --- a/cocos/scripting/lua-bindings/auto/api/ControlSwitch.lua +++ b/cocos/scripting/lua-bindings/auto/api/ControlSwitch.lua @@ -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) diff --git a/cocos/scripting/lua-bindings/auto/api/Director.lua b/cocos/scripting/lua-bindings/auto/api/Director.lua index 571d6f416d..a5b572f5b4 100644 --- a/cocos/scripting/lua-bindings/auto/api/Director.lua +++ b/cocos/scripting/lua-bindings/auto/api/Director.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/DisplayManager.lua b/cocos/scripting/lua-bindings/auto/api/DisplayManager.lua index 2b65773e8c..9742ad82be 100644 --- a/cocos/scripting/lua-bindings/auto/api/DisplayManager.lua +++ b/cocos/scripting/lua-bindings/auto/api/DisplayManager.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/DrawNode.lua b/cocos/scripting/lua-bindings/auto/api/DrawNode.lua index 2629a091be..85c1b8d837 100644 --- a/cocos/scripting/lua-bindings/auto/api/DrawNode.lua +++ b/cocos/scripting/lua-bindings/auto/api/DrawNode.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/EditBox.lua b/cocos/scripting/lua-bindings/auto/api/EditBox.lua index 4f2fa3ed91..a3d04f0f60 100644 --- a/cocos/scripting/lua-bindings/auto/api/EditBox.lua +++ b/cocos/scripting/lua-bindings/auto/api/EditBox.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/FadeOutTRTiles.lua b/cocos/scripting/lua-bindings/auto/api/FadeOutTRTiles.lua index ee1632aebb..e33a0164a1 100644 --- a/cocos/scripting/lua-bindings/auto/api/FadeOutTRTiles.lua +++ b/cocos/scripting/lua-bindings/auto/api/FadeOutTRTiles.lua @@ -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 -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/FadeOutUpTiles.lua b/cocos/scripting/lua-bindings/auto/api/FadeOutUpTiles.lua index d662622cd1..0c77b114ee 100644 --- a/cocos/scripting/lua-bindings/auto/api/FadeOutUpTiles.lua +++ b/cocos/scripting/lua-bindings/auto/api/FadeOutUpTiles.lua @@ -6,7 +6,7 @@ -------------------------------- -- @function [parent=#FadeOutUpTiles] transformTile -- @param self --- @param #cc.math::Vector2 array +-- @param #array_table array -- @param #float float -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/GLProgram.lua b/cocos/scripting/lua-bindings/auto/api/GLProgram.lua index e50a56a36f..bf7e9daae2 100644 --- a/cocos/scripting/lua-bindings/auto/api/GLProgram.lua +++ b/cocos/scripting/lua-bindings/auto/api/GLProgram.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/GLViewProtocol.lua b/cocos/scripting/lua-bindings/auto/api/GLViewProtocol.lua index d37b0b93db..9c275b9960 100644 --- a/cocos/scripting/lua-bindings/auto/api/GLViewProtocol.lua +++ b/cocos/scripting/lua-bindings/auto/api/GLViewProtocol.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/GridBase.lua b/cocos/scripting/lua-bindings/auto/api/GridBase.lua index f58ebdec3f..3ec43d3764 100644 --- a/cocos/scripting/lua-bindings/auto/api/GridBase.lua +++ b/cocos/scripting/lua-bindings/auto/api/GridBase.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/JumpBy.lua b/cocos/scripting/lua-bindings/auto/api/JumpBy.lua index a63d3884bb..0a46e0a85a 100644 --- a/cocos/scripting/lua-bindings/auto/api/JumpBy.lua +++ b/cocos/scripting/lua-bindings/auto/api/JumpBy.lua @@ -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) diff --git a/cocos/scripting/lua-bindings/auto/api/JumpTo.lua b/cocos/scripting/lua-bindings/auto/api/JumpTo.lua index 6e3b259c90..3c0c1fffbb 100644 --- a/cocos/scripting/lua-bindings/auto/api/JumpTo.lua +++ b/cocos/scripting/lua-bindings/auto/api/JumpTo.lua @@ -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) diff --git a/cocos/scripting/lua-bindings/auto/api/Label.lua b/cocos/scripting/lua-bindings/auto/api/Label.lua index d5ab92ebe8..29d64d1911 100644 --- a/cocos/scripting/lua-bindings/auto/api/Label.lua +++ b/cocos/scripting/lua-bindings/auto/api/Label.lua @@ -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 -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/LabelBMFont.lua b/cocos/scripting/lua-bindings/auto/api/LabelBMFont.lua index af71e4e307..b4b8b0c221 100644 --- a/cocos/scripting/lua-bindings/auto/api/LabelBMFont.lua +++ b/cocos/scripting/lua-bindings/auto/api/LabelBMFont.lua @@ -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) -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/LayerColor.lua b/cocos/scripting/lua-bindings/auto/api/LayerColor.lua index a6819789a2..0b9d5d5d9b 100644 --- a/cocos/scripting/lua-bindings/auto/api/LayerColor.lua +++ b/cocos/scripting/lua-bindings/auto/api/LayerColor.lua @@ -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 -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/LayerGradient.lua b/cocos/scripting/lua-bindings/auto/api/LayerGradient.lua index fb71dd38fb..1d90c766c6 100644 --- a/cocos/scripting/lua-bindings/auto/api/LayerGradient.lua +++ b/cocos/scripting/lua-bindings/auto/api/LayerGradient.lua @@ -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) -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/Layout.lua b/cocos/scripting/lua-bindings/auto/api/Layout.lua index 973d90115d..a20debff9f 100644 --- a/cocos/scripting/lua-bindings/auto/api/Layout.lua +++ b/cocos/scripting/lua-bindings/auto/api/Layout.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/Lens3D.lua b/cocos/scripting/lua-bindings/auto/api/Lens3D.lua index 95ced1d9b6..28148f147c 100644 --- a/cocos/scripting/lua-bindings/auto/api/Lens3D.lua +++ b/cocos/scripting/lua-bindings/auto/api/Lens3D.lua @@ -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) diff --git a/cocos/scripting/lua-bindings/auto/api/MotionStreak.lua b/cocos/scripting/lua-bindings/auto/api/MotionStreak.lua index 12abd49f44..1d0fd73255 100644 --- a/cocos/scripting/lua-bindings/auto/api/MotionStreak.lua +++ b/cocos/scripting/lua-bindings/auto/api/MotionStreak.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/MoveBy.lua b/cocos/scripting/lua-bindings/auto/api/MoveBy.lua index 5a7fd568fb..cb0108953f 100644 --- a/cocos/scripting/lua-bindings/auto/api/MoveBy.lua +++ b/cocos/scripting/lua-bindings/auto/api/MoveBy.lua @@ -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) -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/MoveTo.lua b/cocos/scripting/lua-bindings/auto/api/MoveTo.lua index d7a02cb71c..b2fcb15a7e 100644 --- a/cocos/scripting/lua-bindings/auto/api/MoveTo.lua +++ b/cocos/scripting/lua-bindings/auto/api/MoveTo.lua @@ -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) -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/Node.lua b/cocos/scripting/lua-bindings/auto/api/Node.lua index daddce3751..48d48d3610 100644 --- a/cocos/scripting/lua-bindings/auto/api/Node.lua +++ b/cocos/scripting/lua-bindings/auto/api/Node.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/ParallaxNode.lua b/cocos/scripting/lua-bindings/auto/api/ParallaxNode.lua index 21a547ce9e..8ae2159c5f 100644 --- a/cocos/scripting/lua-bindings/auto/api/ParallaxNode.lua +++ b/cocos/scripting/lua-bindings/auto/api/ParallaxNode.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/ParticleBatchNode.lua b/cocos/scripting/lua-bindings/auto/api/ParticleBatchNode.lua index 9e2e222c16..d83c7fe5ce 100644 --- a/cocos/scripting/lua-bindings/auto/api/ParticleBatchNode.lua +++ b/cocos/scripting/lua-bindings/auto/api/ParticleBatchNode.lua @@ -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 -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/ParticleSystem.lua b/cocos/scripting/lua-bindings/auto/api/ParticleSystem.lua index 21edcf75a3..62d9ee07eb 100644 --- a/cocos/scripting/lua-bindings/auto/api/ParticleSystem.lua +++ b/cocos/scripting/lua-bindings/auto/api/ParticleSystem.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/ParticleSystemQuad.lua b/cocos/scripting/lua-bindings/auto/api/ParticleSystemQuad.lua index b725a61d3b..507231d015 100644 --- a/cocos/scripting/lua-bindings/auto/api/ParticleSystemQuad.lua +++ b/cocos/scripting/lua-bindings/auto/api/ParticleSystemQuad.lua @@ -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) -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsBody.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsBody.lua index 8ddf15bc8d..0135b66666 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsBody.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsBody.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsContactPostSolve.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsContactPostSolve.lua index cbde91e54a..e31f0e5c0c 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsContactPostSolve.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsContactPostSolve.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsContactPreSolve.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsContactPreSolve.lua index 6576a6714e..3e2e540e80 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsContactPreSolve.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsContactPreSolve.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsJointDistance.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsJointDistance.lua index ca862396c9..3ccb00cd10 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsJointDistance.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsJointDistance.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsJointFixed.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsJointFixed.lua index 007d6c2309..726ebc4a73 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsJointFixed.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsJointFixed.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsJointGroove.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsJointGroove.lua index 8a57d08582..9db4c759c2 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsJointGroove.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsJointGroove.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsJointLimit.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsJointLimit.lua index caae6fad51..6b5e725753 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsJointLimit.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsJointLimit.lua @@ -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) diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsJointPin.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsJointPin.lua index 51a0144425..ccbacd0f58 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsJointPin.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsJointPin.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsJointSpring.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsJointSpring.lua index 804dde4f5c..c91484f670 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsJointSpring.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsJointSpring.lua @@ -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) diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsShape.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsShape.lua index c01d6e8a90..d3c03aa415 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsShape.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsShape.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsShapeBox.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsShapeBox.lua index 76742ff4d9..5d1278ba23 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsShapeBox.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsShapeBox.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsShapeCircle.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsShapeCircle.lua index 588b6c7894..2de98f24d7 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsShapeCircle.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsShapeCircle.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgeBox.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgeBox.lua index 847711f930..7fdd1d48e2 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgeBox.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgeBox.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgeChain.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgeChain.lua index ab2e037c9e..b1dd60fdc2 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgeChain.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgeChain.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgePolygon.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgePolygon.lua index 760679d5f9..782242212b 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgePolygon.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgePolygon.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgeSegment.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgeSegment.lua index 12cd091e6f..2eec791ba2 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgeSegment.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgeSegment.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsShapePolygon.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsShapePolygon.lua index 92fa93a8ef..11469e3c24 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsShapePolygon.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsShapePolygon.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsWorld.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsWorld.lua index dbbcfc9aff..1adc72ec63 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsWorld.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsWorld.lua @@ -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) -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/Place.lua b/cocos/scripting/lua-bindings/auto/api/Place.lua index c2b1205286..9444b7538e 100644 --- a/cocos/scripting/lua-bindings/auto/api/Place.lua +++ b/cocos/scripting/lua-bindings/auto/api/Place.lua @@ -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) -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/ProgressTimer.lua b/cocos/scripting/lua-bindings/auto/api/ProgressTimer.lua index 3d941e47b8..da2f43a5c2 100644 --- a/cocos/scripting/lua-bindings/auto/api/ProgressTimer.lua +++ b/cocos/scripting/lua-bindings/auto/api/ProgressTimer.lua @@ -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 -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/RenderTexture.lua b/cocos/scripting/lua-bindings/auto/api/RenderTexture.lua index b0112e7de4..d1d4e72bdd 100644 --- a/cocos/scripting/lua-bindings/auto/api/RenderTexture.lua +++ b/cocos/scripting/lua-bindings/auto/api/RenderTexture.lua @@ -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 -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/RichText.lua b/cocos/scripting/lua-bindings/auto/api/RichText.lua index 3784d1641f..f3334b5290 100644 --- a/cocos/scripting/lua-bindings/auto/api/RichText.lua +++ b/cocos/scripting/lua-bindings/auto/api/RichText.lua @@ -12,7 +12,7 @@ -------------------------------- -- @function [parent=#RichText] setAnchorPoint -- @param self --- @param #cc.math::Vector2 array +-- @param #array_table array -------------------------------- -- @function [parent=#RichText] pushBackElement diff --git a/cocos/scripting/lua-bindings/auto/api/Ripple3D.lua b/cocos/scripting/lua-bindings/auto/api/Ripple3D.lua index 07f11ea945..4e94374d6c 100644 --- a/cocos/scripting/lua-bindings/auto/api/Ripple3D.lua +++ b/cocos/scripting/lua-bindings/auto/api/Ripple3D.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/RotateBy.lua b/cocos/scripting/lua-bindings/auto/api/RotateBy.lua index cb458bdf91..719008037b 100644 --- a/cocos/scripting/lua-bindings/auto/api/RotateBy.lua +++ b/cocos/scripting/lua-bindings/auto/api/RotateBy.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/ScrollView.lua b/cocos/scripting/lua-bindings/auto/api/ScrollView.lua index 55acf29a7e..e83907a26b 100644 --- a/cocos/scripting/lua-bindings/auto/api/ScrollView.lua +++ b/cocos/scripting/lua-bindings/auto/api/ScrollView.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/ShuffleTiles.lua b/cocos/scripting/lua-bindings/auto/api/ShuffleTiles.lua index 39b4e1a257..1d2c0e69ef 100644 --- a/cocos/scripting/lua-bindings/auto/api/ShuffleTiles.lua +++ b/cocos/scripting/lua-bindings/auto/api/ShuffleTiles.lua @@ -6,7 +6,7 @@ -------------------------------- -- @function [parent=#ShuffleTiles] placeTile -- @param self --- @param #cc.math::Vector2 array +-- @param #array_table array -- @param #cc.Tile tile -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/Skeleton.lua b/cocos/scripting/lua-bindings/auto/api/Skeleton.lua index cdd7493168..466b26aec6 100644 --- a/cocos/scripting/lua-bindings/auto/api/Skeleton.lua +++ b/cocos/scripting/lua-bindings/auto/api/Skeleton.lua @@ -15,7 +15,7 @@ -------------------------------- -- @function [parent=#Skeleton] onDraw -- @param self --- @param #cc.math::Matrix matrix +-- @param #cc.Matrix matrix -- @param #bool bool -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/Skin.lua b/cocos/scripting/lua-bindings/auto/api/Skin.lua index 03dd604500..e824b1bca8 100644 --- a/cocos/scripting/lua-bindings/auto/api/Skin.lua +++ b/cocos/scripting/lua-bindings/auto/api/Skin.lua @@ -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 -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/Slider.lua b/cocos/scripting/lua-bindings/auto/api/Slider.lua index 358fbaf7be..9203a480d2 100644 --- a/cocos/scripting/lua-bindings/auto/api/Slider.lua +++ b/cocos/scripting/lua-bindings/auto/api/Slider.lua @@ -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) -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/Sprite.lua b/cocos/scripting/lua-bindings/auto/api/Sprite.lua index 3eda812b25..a81721b269 100644 --- a/cocos/scripting/lua-bindings/auto/api/Sprite.lua +++ b/cocos/scripting/lua-bindings/auto/api/Sprite.lua @@ -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 diff --git a/cocos/scripting/lua-bindings/auto/api/SpriteBatchNode.lua b/cocos/scripting/lua-bindings/auto/api/SpriteBatchNode.lua index a674d7a168..8b85c6226f 100644 --- a/cocos/scripting/lua-bindings/auto/api/SpriteBatchNode.lua +++ b/cocos/scripting/lua-bindings/auto/api/SpriteBatchNode.lua @@ -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 -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/SpriteFrame.lua b/cocos/scripting/lua-bindings/auto/api/SpriteFrame.lua index d75dbd0ca2..8238998fae 100644 --- a/cocos/scripting/lua-bindings/auto/api/SpriteFrame.lua +++ b/cocos/scripting/lua-bindings/auto/api/SpriteFrame.lua @@ -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) diff --git a/cocos/scripting/lua-bindings/auto/api/TMXLayer.lua b/cocos/scripting/lua-bindings/auto/api/TMXLayer.lua index 977ae25979..9651db7395 100644 --- a/cocos/scripting/lua-bindings/auto/api/TMXLayer.lua +++ b/cocos/scripting/lua-bindings/auto/api/TMXLayer.lua @@ -6,15 +6,15 @@ -------------------------------- -- @function [parent=#TMXLayer] getTileGIDAt -- @param self --- @param #cc.math::Vector2 array +-- @param #array_table array -- @param #cc.TMXTileFlags_ tmxtileflags_ -- @return unsigned int#unsigned int ret (return value: unsigned int) -------------------------------- -- @function [parent=#TMXLayer] getPositionAt -- @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=#TMXLayer] setLayerOrientation @@ -58,7 +58,7 @@ -------------------------------- -- @function [parent=#TMXLayer] removeTileAt -- @param self --- @param #cc.math::Vector2 array +-- @param #array_table array -------------------------------- -- @function [parent=#TMXLayer] initWithTilesetInfo @@ -73,14 +73,14 @@ -- @param self -------------------------------- --- overload function: setTileGID(unsigned int, cc.math::Vector2, cc.TMXTileFlags_) +-- overload function: setTileGID(unsigned int, array_table, cc.TMXTileFlags_) -- --- overload function: setTileGID(unsigned int, cc.math::Vector2) +-- overload function: setTileGID(unsigned int, array_table) -- -- @function [parent=#TMXLayer] setTileGID -- @param self -- @param #unsigned int int --- @param #cc.math::Vector2 array +-- @param #array_table array -- @param #cc.TMXTileFlags_ tmxtileflags_ -------------------------------- @@ -126,7 +126,7 @@ -------------------------------- -- @function [parent=#TMXLayer] getTileAt -- @param self --- @param #cc.math::Vector2 array +-- @param #array_table array -- @return Sprite#Sprite ret (return value: cc.Sprite) -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/TMXObjectGroup.lua b/cocos/scripting/lua-bindings/auto/api/TMXObjectGroup.lua index ef313b1b11..0c78e9c74e 100644 --- a/cocos/scripting/lua-bindings/auto/api/TMXObjectGroup.lua +++ b/cocos/scripting/lua-bindings/auto/api/TMXObjectGroup.lua @@ -6,7 +6,7 @@ -------------------------------- -- @function [parent=#TMXObjectGroup] setPositionOffset -- @param self --- @param #cc.math::Vector2 array +-- @param #array_table array -------------------------------- -- @function [parent=#TMXObjectGroup] getProperty @@ -17,7 +17,7 @@ -------------------------------- -- @function [parent=#TMXObjectGroup] 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=#TMXObjectGroup] getObject diff --git a/cocos/scripting/lua-bindings/auto/api/TextField.lua b/cocos/scripting/lua-bindings/auto/api/TextField.lua index 598daa0fc7..e3e6695b89 100644 --- a/cocos/scripting/lua-bindings/auto/api/TextField.lua +++ b/cocos/scripting/lua-bindings/auto/api/TextField.lua @@ -149,7 +149,7 @@ -------------------------------- -- @function [parent=#TextField] hitTest -- @param self --- @param #cc.math::Vector2 array +-- @param #array_table array -- @return bool#bool ret (return value: bool) -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/Texture2D.lua b/cocos/scripting/lua-bindings/auto/api/Texture2D.lua index 0cc5aec89d..6a6dece5b4 100644 --- a/cocos/scripting/lua-bindings/auto/api/Texture2D.lua +++ b/cocos/scripting/lua-bindings/auto/api/Texture2D.lua @@ -149,7 +149,7 @@ -------------------------------- -- @function [parent=#Texture2D] drawAtPoint -- @param self --- @param #cc.math::Vector2 array +-- @param #array_table array -------------------------------- -- @function [parent=#Texture2D] hasMipmaps diff --git a/cocos/scripting/lua-bindings/auto/api/TileMapAtlas.lua b/cocos/scripting/lua-bindings/auto/api/TileMapAtlas.lua index 1c11210be0..be56f68350 100644 --- a/cocos/scripting/lua-bindings/auto/api/TileMapAtlas.lua +++ b/cocos/scripting/lua-bindings/auto/api/TileMapAtlas.lua @@ -24,14 +24,14 @@ -------------------------------- -- @function [parent=#TileMapAtlas] getTileAt -- @param self --- @param #cc.math::Vector2 array +-- @param #array_table array -- @return color3B_table#color3B_table ret (return value: color3B_table) -------------------------------- -- @function [parent=#TileMapAtlas] setTile -- @param self -- @param #color3B_table color3b --- @param #cc.math::Vector2 array +-- @param #array_table array -------------------------------- -- @function [parent=#TileMapAtlas] setTGAInfo diff --git a/cocos/scripting/lua-bindings/auto/api/Touch.lua b/cocos/scripting/lua-bindings/auto/api/Touch.lua index 7802c2ae3d..ff48325100 100644 --- a/cocos/scripting/lua-bindings/auto/api/Touch.lua +++ b/cocos/scripting/lua-bindings/auto/api/Touch.lua @@ -6,27 +6,27 @@ -------------------------------- -- @function [parent=#Touch] getPreviousLocationInView -- @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=#Touch] getLocation -- @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=#Touch] getDelta -- @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=#Touch] getStartLocationInView -- @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=#Touch] getStartLocation -- @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=#Touch] getID @@ -43,12 +43,12 @@ -------------------------------- -- @function [parent=#Touch] getLocationInView -- @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=#Touch] 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=#Touch] Touch diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionCrossFade.lua b/cocos/scripting/lua-bindings/auto/api/TransitionCrossFade.lua index b5b735a4b6..6f7b3e28bb 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionCrossFade.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionCrossFade.lua @@ -14,7 +14,7 @@ -- @function [parent=#TransitionCrossFade] draw -- @param self -- @param #cc.Renderer renderer --- @param #cc.math::Matrix matrix +-- @param #cc.Matrix matrix -- @param #bool bool return nil diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionFadeTR.lua b/cocos/scripting/lua-bindings/auto/api/TransitionFadeTR.lua index f45e733e57..801b78f191 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionFadeTR.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionFadeTR.lua @@ -26,7 +26,7 @@ -- @function [parent=#TransitionFadeTR] draw -- @param self -- @param #cc.Renderer renderer --- @param #cc.math::Matrix matrix +-- @param #cc.Matrix matrix -- @param #bool bool return nil diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionPageTurn.lua b/cocos/scripting/lua-bindings/auto/api/TransitionPageTurn.lua index c4ba102982..a38210ba52 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionPageTurn.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionPageTurn.lua @@ -29,7 +29,7 @@ -- @function [parent=#TransitionPageTurn] draw -- @param self -- @param #cc.Renderer renderer --- @param #cc.math::Matrix matrix +-- @param #cc.Matrix matrix -- @param #bool bool -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionScene.lua b/cocos/scripting/lua-bindings/auto/api/TransitionScene.lua index d2c3c41aab..9fb27c281d 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionScene.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionScene.lua @@ -22,7 +22,7 @@ -- @function [parent=#TransitionScene] draw -- @param self -- @param #cc.Renderer renderer --- @param #cc.math::Matrix matrix +-- @param #cc.Matrix matrix -- @param #bool bool -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionSplitCols.lua b/cocos/scripting/lua-bindings/auto/api/TransitionSplitCols.lua index 687eda7f5d..2c0c19e36a 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionSplitCols.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionSplitCols.lua @@ -25,7 +25,7 @@ -- @function [parent=#TransitionSplitCols] draw -- @param self -- @param #cc.Renderer renderer --- @param #cc.math::Matrix matrix +-- @param #cc.Matrix matrix -- @param #bool bool return nil diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionTurnOffTiles.lua b/cocos/scripting/lua-bindings/auto/api/TransitionTurnOffTiles.lua index c8ff900ffe..4edc916066 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionTurnOffTiles.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionTurnOffTiles.lua @@ -20,7 +20,7 @@ -- @function [parent=#TransitionTurnOffTiles] draw -- @param self -- @param #cc.Renderer renderer --- @param #cc.math::Matrix matrix +-- @param #cc.Matrix matrix -- @param #bool bool return nil diff --git a/cocos/scripting/lua-bindings/auto/api/TurnOffTiles.lua b/cocos/scripting/lua-bindings/auto/api/TurnOffTiles.lua index 22557ee331..0304f4f019 100644 --- a/cocos/scripting/lua-bindings/auto/api/TurnOffTiles.lua +++ b/cocos/scripting/lua-bindings/auto/api/TurnOffTiles.lua @@ -6,12 +6,12 @@ -------------------------------- -- @function [parent=#TurnOffTiles] turnOnTile -- @param self --- @param #cc.math::Vector2 array +-- @param #array_table array -------------------------------- -- @function [parent=#TurnOffTiles] turnOffTile -- @param self --- @param #cc.math::Vector2 array +-- @param #array_table array -------------------------------- -- @function [parent=#TurnOffTiles] shuffle diff --git a/cocos/scripting/lua-bindings/auto/api/Twirl.lua b/cocos/scripting/lua-bindings/auto/api/Twirl.lua index 08b20deee4..63ec449e83 100644 --- a/cocos/scripting/lua-bindings/auto/api/Twirl.lua +++ b/cocos/scripting/lua-bindings/auto/api/Twirl.lua @@ -26,19 +26,19 @@ -------------------------------- -- @function [parent=#Twirl] setPosition -- @param self --- @param #cc.math::Vector2 array +-- @param #array_table array -------------------------------- -- @function [parent=#Twirl] 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=#Twirl] create -- @param self -- @param #float float -- @param #size_table size --- @param #cc.math::Vector2 array +-- @param #array_table array -- @param #unsigned int int -- @param #float float -- @return Twirl#Twirl ret (return value: cc.Twirl) diff --git a/cocos/scripting/lua-bindings/auto/api/Widget.lua b/cocos/scripting/lua-bindings/auto/api/Widget.lua index c70422820f..db7263217e 100644 --- a/cocos/scripting/lua-bindings/auto/api/Widget.lua +++ b/cocos/scripting/lua-bindings/auto/api/Widget.lua @@ -6,7 +6,7 @@ -------------------------------- -- @function [parent=#Widget] setSizePercent -- @param self --- @param #cc.math::Vector2 array +-- @param #array_table array -------------------------------- -- @function [parent=#Widget] getCustomSize @@ -31,12 +31,12 @@ -------------------------------- -- @function [parent=#Widget] getTouchEndPos -- @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=#Widget] setPositionPercent -- @param self --- @param #cc.math::Vector2 array +-- @param #array_table array -------------------------------- -- @function [parent=#Widget] getLayoutSize @@ -113,7 +113,7 @@ -------------------------------- -- @function [parent=#Widget] getWorldPosition -- @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=#Widget] didNotSelectSelf @@ -137,7 +137,7 @@ -------------------------------- -- @function [parent=#Widget] getTouchMovePos -- @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=#Widget] setEnabled @@ -167,12 +167,12 @@ -------------------------------- -- @function [parent=#Widget] getSizePercent -- @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=#Widget] getTouchStartPos -- @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=#Widget] setActionTag @@ -187,7 +187,7 @@ -------------------------------- -- @function [parent=#Widget] clippingParentAreaContainPoint -- @param self --- @param #cc.math::Vector2 array +-- @param #array_table array -- @return bool#bool ret (return value: bool) -------------------------------- @@ -227,12 +227,12 @@ -------------------------------- -- @function [parent=#Widget] getPositionPercent -- @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=#Widget] hitTest -- @param self --- @param #cc.math::Vector2 array +-- @param #array_table array -- @return bool#bool ret (return value: bool) -------------------------------- @@ -255,7 +255,7 @@ -- @param self -- @param #int int -- @param #ccui.Widget widget --- @param #cc.math::Vector2 array +-- @param #array_table array -------------------------------- -- @function [parent=#Widget] setSize @@ -295,7 +295,7 @@ -------------------------------- -- @function [parent=#Widget] setPosition -- @param self --- @param #cc.math::Vector2 array +-- @param #array_table array -------------------------------- -- @function [parent=#Widget] getDescription diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp index 386e6619a3..c81ec01999 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp @@ -718,7 +718,7 @@ int lua_cocos2dx_GLProgram_setUniformsForBuiltins(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; do{ if (argc == 1) { - cocos2d::math::Matrix arg0; + cocos2d::Matrix arg0; ok &= luaval_to_matrix(tolua_S, 2, &arg0); if (!ok) { break; } @@ -1598,7 +1598,7 @@ int lua_cocos2dx_Touch_getPreviousLocationInView(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getPreviousLocationInView(); + cocos2d::Vector2 ret = cobj->getPreviousLocationInView(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -1642,7 +1642,7 @@ int lua_cocos2dx_Touch_getLocation(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getLocation(); + cocos2d::Vector2 ret = cobj->getLocation(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -1686,7 +1686,7 @@ int lua_cocos2dx_Touch_getDelta(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getDelta(); + cocos2d::Vector2 ret = cobj->getDelta(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -1730,7 +1730,7 @@ int lua_cocos2dx_Touch_getStartLocationInView(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getStartLocationInView(); + cocos2d::Vector2 ret = cobj->getStartLocationInView(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -1774,7 +1774,7 @@ int lua_cocos2dx_Touch_getStartLocation(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getStartLocation(); + cocos2d::Vector2 ret = cobj->getStartLocation(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -1914,7 +1914,7 @@ int lua_cocos2dx_Touch_getLocationInView(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getLocationInView(); + cocos2d::Vector2 ret = cobj->getLocationInView(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -1958,7 +1958,7 @@ int lua_cocos2dx_Touch_getPreviousLocation(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getPreviousLocation(); + cocos2d::Vector2 ret = cobj->getPreviousLocation(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -3640,7 +3640,7 @@ int lua_cocos2dx_Texture2D_drawAtPoint(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -5406,12 +5406,12 @@ int lua_cocos2dx_Node_convertToWorldSpaceAR(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->convertToWorldSpaceAR(arg0); + cocos2d::Vector2 ret = cobj->convertToWorldSpaceAR(arg0); vector2_to_luaval(tolua_S, ret); return 1; } @@ -5952,7 +5952,7 @@ int lua_cocos2dx_Node_getNodeToWorldTransform(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Matrix ret = cobj->getNodeToWorldTransform(); + cocos2d::Matrix ret = cobj->getNodeToWorldTransform(); matrix_to_luaval(tolua_S, ret); return 1; } @@ -5996,7 +5996,7 @@ int lua_cocos2dx_Node_getPosition3D(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector3 ret = cobj->getPosition3D(); + cocos2d::Vector3 ret = cobj->getPosition3D(); vector3_to_luaval(tolua_S, ret); return 1; } @@ -6097,12 +6097,12 @@ int lua_cocos2dx_Node_convertToWorldSpace(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->convertToWorldSpace(arg0); + cocos2d::Vector2 ret = cobj->convertToWorldSpace(arg0); vector2_to_luaval(tolua_S, ret); return 1; } @@ -6373,7 +6373,7 @@ int lua_cocos2dx_Node_convertTouchToNodeSpace(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Touch",&arg0); if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->convertTouchToNodeSpace(arg0); + cocos2d::Vector2 ret = cobj->convertTouchToNodeSpace(arg0); vector2_to_luaval(tolua_S, ret); return 1; } @@ -6600,7 +6600,7 @@ int lua_cocos2dx_Node_getRotation3D(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector3 ret = cobj->getRotation3D(); + cocos2d::Vector3 ret = cobj->getRotation3D(); vector3_to_luaval(tolua_S, ret); return 1; } @@ -6644,7 +6644,7 @@ int lua_cocos2dx_Node_getNodeToParentTransform(lua_State* tolua_S) { if(!ok) return 0; - const cocos2d::math::Matrix& ret = cobj->getNodeToParentTransform(); + const cocos2d::Matrix& ret = cobj->getNodeToParentTransform(); matrix_to_luaval(tolua_S, ret); return 1; } @@ -6691,7 +6691,7 @@ int lua_cocos2dx_Node_convertTouchToNodeSpaceAR(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Touch",&arg0); if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->convertTouchToNodeSpaceAR(arg0); + cocos2d::Vector2 ret = cobj->convertTouchToNodeSpaceAR(arg0); vector2_to_luaval(tolua_S, ret); return 1; } @@ -6733,12 +6733,12 @@ int lua_cocos2dx_Node_convertToNodeSpace(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->convertToNodeSpace(arg0); + cocos2d::Vector2 ret = cobj->convertToNodeSpace(arg0); vector2_to_luaval(tolua_S, ret); return 1; } @@ -6877,7 +6877,7 @@ int lua_cocos2dx_Node_setPosition(lua_State* tolua_S) ok = true; do{ if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if (!ok) { break; } @@ -7111,7 +7111,7 @@ int lua_cocos2dx_Node_setRotation3D(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector3 arg0; + cocos2d::Vector3 arg0; ok &= luaval_to_vector3(tolua_S, 2, &arg0); if(!ok) @@ -7203,7 +7203,7 @@ int lua_cocos2dx_Node_setNodeToParentTransform(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Matrix arg0; + cocos2d::Matrix arg0; ok &= luaval_to_matrix(tolua_S, 2, &arg0); if(!ok) @@ -7251,7 +7251,7 @@ int lua_cocos2dx_Node_getAnchorPoint(lua_State* tolua_S) { if(!ok) return 0; - const cocos2d::math::Vector2& ret = cobj->getAnchorPoint(); + const cocos2d::Vector2& ret = cobj->getAnchorPoint(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -7468,12 +7468,12 @@ int lua_cocos2dx_Node_convertToNodeSpaceAR(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->convertToNodeSpaceAR(arg0); + cocos2d::Vector2 ret = cobj->convertToNodeSpaceAR(arg0); vector2_to_luaval(tolua_S, ret); return 1; } @@ -7654,7 +7654,7 @@ int lua_cocos2dx_Node_getAnchorPointInPoints(lua_State* tolua_S) { if(!ok) return 0; - const cocos2d::math::Vector2& ret = cobj->getAnchorPointInPoints(); + const cocos2d::Vector2& ret = cobj->getAnchorPointInPoints(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -8017,8 +8017,8 @@ int lua_cocos2dx_Node_setAdditionalTransform(lua_State* tolua_S) ok = true; do{ if (argc == 1) { - cocos2d::math::Matrix* arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.math::Matrix",&arg0); + cocos2d::Matrix* arg0; + ok &= luaval_to_object(tolua_S, 2, "cc.Matrix",&arg0); if (!ok) { break; } cobj->setAdditionalTransform(arg0); @@ -8801,7 +8801,7 @@ int lua_cocos2dx_Node_getParentToNodeTransform(lua_State* tolua_S) { if(!ok) return 0; - const cocos2d::math::Matrix& ret = cobj->getParentToNodeTransform(); + const cocos2d::Matrix& ret = cobj->getParentToNodeTransform(); matrix_to_luaval(tolua_S, ret); return 1; } @@ -9671,7 +9671,7 @@ int lua_cocos2dx_Node_draw(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Renderer",&arg0); if (!ok) { break; } - cocos2d::math::Matrix arg1; + cocos2d::Matrix arg1; ok &= luaval_to_matrix(tolua_S, 3, &arg1); if (!ok) { break; } @@ -9817,7 +9817,7 @@ int lua_cocos2dx_Node_setPosition3D(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector3 arg0; + cocos2d::Vector3 arg0; ok &= luaval_to_vector3(tolua_S, 2, &arg0); if(!ok) @@ -9954,7 +9954,7 @@ int lua_cocos2dx_Node_getWorldToNodeTransform(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Matrix ret = cobj->getWorldToNodeTransform(); + cocos2d::Matrix ret = cobj->getWorldToNodeTransform(); matrix_to_luaval(tolua_S, ret); return 1; } @@ -11726,7 +11726,7 @@ int lua_cocos2dx_Director_loadMatrix(lua_State* tolua_S) if (argc == 2) { cocos2d::MATRIX_STACK_TYPE arg0; - cocos2d::math::Matrix arg1; + cocos2d::Matrix arg1; ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); @@ -11952,7 +11952,7 @@ int lua_cocos2dx_Director_getVisibleOrigin(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getVisibleOrigin(); + cocos2d::Vector2 ret = cobj->getVisibleOrigin(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -12171,12 +12171,12 @@ int lua_cocos2dx_Director_convertToUI(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->convertToUI(arg0); + cocos2d::Vector2 ret = cobj->convertToUI(arg0); vector2_to_luaval(tolua_S, ret); return 1; } @@ -12836,12 +12836,12 @@ int lua_cocos2dx_Director_convertToGL(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->convertToGL(arg0); + cocos2d::Vector2 ret = cobj->convertToGL(arg0); vector2_to_luaval(tolua_S, ret); return 1; } @@ -13154,7 +13154,7 @@ int lua_cocos2dx_Director_getMatrix(lua_State* tolua_S) ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); if(!ok) return 0; - cocos2d::math::Matrix ret = cobj->getMatrix(arg0); + cocos2d::Matrix ret = cobj->getMatrix(arg0); matrix_to_luaval(tolua_S, ret); return 1; } @@ -13825,7 +13825,7 @@ int lua_cocos2dx_Director_multiplyMatrix(lua_State* tolua_S) if (argc == 2) { cocos2d::MATRIX_STACK_TYPE arg0; - cocos2d::math::Matrix arg1; + cocos2d::Matrix arg1; ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); @@ -17335,7 +17335,7 @@ int lua_cocos2dx_SpriteFrame_initWithTexture(lua_State* tolua_S) ok &= luaval_to_boolean(tolua_S, 4,&arg2); if (!ok) { break; } - cocos2d::math::Vector2 arg3; + cocos2d::Vector2 arg3; ok &= luaval_to_vector2(tolua_S, 5, &arg3); if (!ok) { break; } @@ -17537,7 +17537,7 @@ int lua_cocos2dx_SpriteFrame_setOffsetInPixels(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -17763,7 +17763,7 @@ int lua_cocos2dx_SpriteFrame_setOffset(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -17811,7 +17811,7 @@ int lua_cocos2dx_SpriteFrame_getOffset(lua_State* tolua_S) { if(!ok) return 0; - const cocos2d::math::Vector2& ret = cobj->getOffset(); + const cocos2d::Vector2& ret = cobj->getOffset(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -17904,7 +17904,7 @@ int lua_cocos2dx_SpriteFrame_initWithTextureFilename(lua_State* tolua_S) ok &= luaval_to_boolean(tolua_S, 4,&arg2); if (!ok) { break; } - cocos2d::math::Vector2 arg3; + cocos2d::Vector2 arg3; ok &= luaval_to_vector2(tolua_S, 5, &arg3); if (!ok) { break; } @@ -18020,7 +18020,7 @@ int lua_cocos2dx_SpriteFrame_getOffsetInPixels(lua_State* tolua_S) { if(!ok) return 0; - const cocos2d::math::Vector2& ret = cobj->getOffsetInPixels(); + const cocos2d::Vector2& ret = cobj->getOffsetInPixels(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -18105,7 +18105,7 @@ int lua_cocos2dx_SpriteFrame_create(lua_State* tolua_S) bool arg2; ok &= luaval_to_boolean(tolua_S, 4,&arg2); if (!ok) { break; } - cocos2d::math::Vector2 arg3; + cocos2d::Vector2 arg3; ok &= luaval_to_vector2(tolua_S, 5, &arg3); if (!ok) { break; } cocos2d::Size arg4; @@ -18168,7 +18168,7 @@ int lua_cocos2dx_SpriteFrame_createWithTexture(lua_State* tolua_S) bool arg2; ok &= luaval_to_boolean(tolua_S, 4,&arg2); if (!ok) { break; } - cocos2d::math::Vector2 arg3; + cocos2d::Vector2 arg3; ok &= luaval_to_vector2(tolua_S, 5, &arg3); if (!ok) { break; } cocos2d::Size arg4; @@ -20038,7 +20038,7 @@ int lua_cocos2dx_RotateBy_create(lua_State* tolua_S) double arg0; ok &= luaval_to_number(tolua_S, 2,&arg0); if (!ok) { break; } - cocos2d::math::Vector3 arg1; + cocos2d::Vector3 arg1; ok &= luaval_to_vector3(tolua_S, 3, &arg1); if (!ok) { break; } cocos2d::RotateBy* ret = cocos2d::RotateBy::create(arg0, arg1); @@ -20093,7 +20093,7 @@ int lua_cocos2dx_MoveBy_create(lua_State* tolua_S) if (argc == 2) { double arg0; - cocos2d::math::Vector2 arg1; + cocos2d::Vector2 arg1; ok &= luaval_to_number(tolua_S, 2,&arg0); ok &= luaval_to_vector2(tolua_S, 3, &arg1); if(!ok) @@ -20148,7 +20148,7 @@ int lua_cocos2dx_MoveTo_create(lua_State* tolua_S) if (argc == 2) { double arg0; - cocos2d::math::Vector2 arg1; + cocos2d::Vector2 arg1; ok &= luaval_to_number(tolua_S, 2,&arg0); ok &= luaval_to_vector2(tolua_S, 3, &arg1); if(!ok) @@ -20317,7 +20317,7 @@ int lua_cocos2dx_JumpBy_create(lua_State* tolua_S) if (argc == 4) { double arg0; - cocos2d::math::Vector2 arg1; + cocos2d::Vector2 arg1; double arg2; int arg3; ok &= luaval_to_number(tolua_S, 2,&arg0); @@ -20376,7 +20376,7 @@ int lua_cocos2dx_JumpTo_create(lua_State* tolua_S) if (argc == 4) { double arg0; - cocos2d::math::Vector2 arg1; + cocos2d::Vector2 arg1; double arg2; int arg3; ok &= luaval_to_number(tolua_S, 2,&arg0); @@ -21474,7 +21474,7 @@ int lua_cocos2dx_ActionCamera_setEye(lua_State* tolua_S) ok = true; do{ if (argc == 1) { - cocos2d::math::Vector3 arg0; + cocos2d::Vector3 arg0; ok &= luaval_to_vector3(tolua_S, 2, &arg0); if (!ok) { break; } @@ -21523,7 +21523,7 @@ int lua_cocos2dx_ActionCamera_getEye(lua_State* tolua_S) { if(!ok) return 0; - const cocos2d::math::Vector3& ret = cobj->getEye(); + const cocos2d::Vector3& ret = cobj->getEye(); vector3_to_luaval(tolua_S, ret); return 1; } @@ -21565,7 +21565,7 @@ int lua_cocos2dx_ActionCamera_setUp(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector3 arg0; + cocos2d::Vector3 arg0; ok &= luaval_to_vector3(tolua_S, 2, &arg0); if(!ok) @@ -21613,7 +21613,7 @@ int lua_cocos2dx_ActionCamera_getCenter(lua_State* tolua_S) { if(!ok) return 0; - const cocos2d::math::Vector3& ret = cobj->getCenter(); + const cocos2d::Vector3& ret = cobj->getCenter(); vector3_to_luaval(tolua_S, ret); return 1; } @@ -21655,7 +21655,7 @@ int lua_cocos2dx_ActionCamera_setCenter(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector3 arg0; + cocos2d::Vector3 arg0; ok &= luaval_to_vector3(tolua_S, 2, &arg0); if(!ok) @@ -21703,7 +21703,7 @@ int lua_cocos2dx_ActionCamera_getUp(lua_State* tolua_S) { if(!ok) return 0; - const cocos2d::math::Vector3& ret = cobj->getUp(); + const cocos2d::Vector3& ret = cobj->getUp(); vector3_to_luaval(tolua_S, ret); return 1; } @@ -25101,7 +25101,7 @@ int lua_cocos2dx_Place_create(lua_State* tolua_S) if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) return 0; @@ -25965,7 +25965,7 @@ int lua_cocos2dx_Lens3D_setPosition(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -26105,7 +26105,7 @@ int lua_cocos2dx_Lens3D_getPosition(lua_State* tolua_S) { if(!ok) return 0; - const cocos2d::math::Vector2& ret = cobj->getPosition(); + const cocos2d::Vector2& ret = cobj->getPosition(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -26182,7 +26182,7 @@ int lua_cocos2dx_Lens3D_create(lua_State* tolua_S) { double arg0; cocos2d::Size arg1; - cocos2d::math::Vector2 arg2; + cocos2d::Vector2 arg2; double arg3; ok &= luaval_to_number(tolua_S, 2,&arg0); ok &= luaval_to_size(tolua_S, 3, &arg1); @@ -26435,7 +26435,7 @@ int lua_cocos2dx_Ripple3D_setPosition(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -26483,7 +26483,7 @@ int lua_cocos2dx_Ripple3D_getPosition(lua_State* tolua_S) { if(!ok) return 0; - const cocos2d::math::Vector2& ret = cobj->getPosition(); + const cocos2d::Vector2& ret = cobj->getPosition(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -26516,7 +26516,7 @@ int lua_cocos2dx_Ripple3D_create(lua_State* tolua_S) { double arg0; cocos2d::Size arg1; - cocos2d::math::Vector2 arg2; + cocos2d::Vector2 arg2; double arg3; unsigned int arg4; double arg5; @@ -27323,7 +27323,7 @@ int lua_cocos2dx_Twirl_setPosition(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -27371,7 +27371,7 @@ int lua_cocos2dx_Twirl_getPosition(lua_State* tolua_S) { if(!ok) return 0; - const cocos2d::math::Vector2& ret = cobj->getPosition(); + const cocos2d::Vector2& ret = cobj->getPosition(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -27404,7 +27404,7 @@ int lua_cocos2dx_Twirl_create(lua_State* tolua_S) { double arg0; cocos2d::Size arg1; - cocos2d::math::Vector2 arg2; + cocos2d::Vector2 arg2; unsigned int arg3; double arg4; ok &= luaval_to_number(tolua_S, 2,&arg0); @@ -27765,7 +27765,7 @@ int lua_cocos2dx_ShuffleTiles_placeTile(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 2) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; cocos2d::Tile* arg1; ok &= luaval_to_vector2(tolua_S, 2, &arg0); @@ -27970,7 +27970,7 @@ int lua_cocos2dx_FadeOutTRTiles_turnOnTile(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -28016,7 +28016,7 @@ int lua_cocos2dx_FadeOutTRTiles_turnOffTile(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -28062,7 +28062,7 @@ int lua_cocos2dx_FadeOutTRTiles_transformTile(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 2) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; double arg1; ok &= luaval_to_vector2(tolua_S, 2, &arg0); @@ -28275,7 +28275,7 @@ int lua_cocos2dx_FadeOutUpTiles_transformTile(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 2) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; double arg1; ok &= luaval_to_vector2(tolua_S, 2, &arg0); @@ -28435,7 +28435,7 @@ int lua_cocos2dx_TurnOffTiles_turnOnTile(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -28481,7 +28481,7 @@ int lua_cocos2dx_TurnOffTiles_turnOffTile(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -29355,7 +29355,7 @@ int lua_cocos2dx_CardinalSplineTo_updatePosition(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -29704,9 +29704,9 @@ int lua_cocos2dx_DrawNode_drawQuadraticBezier(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 5) { - cocos2d::math::Vector2 arg0; - cocos2d::math::Vector2 arg1; - cocos2d::math::Vector2 arg2; + cocos2d::Vector2 arg0; + cocos2d::Vector2 arg1; + cocos2d::Vector2 arg2; unsigned int arg3; cocos2d::Color4F arg4; @@ -29762,7 +29762,7 @@ int lua_cocos2dx_DrawNode_onDraw(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 2) { - cocos2d::math::Matrix arg0; + cocos2d::Matrix arg0; bool arg1; ok &= luaval_to_matrix(tolua_S, 2, &arg0); @@ -29854,9 +29854,9 @@ int lua_cocos2dx_DrawNode_drawTriangle(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 4) { - cocos2d::math::Vector2 arg0; - cocos2d::math::Vector2 arg1; - cocos2d::math::Vector2 arg2; + cocos2d::Vector2 arg0; + cocos2d::Vector2 arg1; + cocos2d::Vector2 arg2; cocos2d::Color4F arg3; ok &= luaval_to_vector2(tolua_S, 2, &arg0); @@ -29909,7 +29909,7 @@ int lua_cocos2dx_DrawNode_drawDot(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 3) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; double arg1; cocos2d::Color4F arg2; @@ -29961,10 +29961,10 @@ int lua_cocos2dx_DrawNode_drawCubicBezier(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 6) { - cocos2d::math::Vector2 arg0; - cocos2d::math::Vector2 arg1; - cocos2d::math::Vector2 arg2; - cocos2d::math::Vector2 arg3; + cocos2d::Vector2 arg0; + cocos2d::Vector2 arg1; + cocos2d::Vector2 arg2; + cocos2d::Vector2 arg3; unsigned int arg4; cocos2d::Color4F arg5; @@ -30022,8 +30022,8 @@ int lua_cocos2dx_DrawNode_drawSegment(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 4) { - cocos2d::math::Vector2 arg0; - cocos2d::math::Vector2 arg1; + cocos2d::Vector2 arg0; + cocos2d::Vector2 arg1; double arg2; cocos2d::Color4F arg3; @@ -33219,7 +33219,7 @@ int lua_cocos2dx_Label_setBMFontFilePath(lua_State* tolua_S) if (argc == 2) { std::string arg0; - cocos2d::math::Vector2 arg1; + cocos2d::Vector2 arg1; ok &= luaval_to_std_string(tolua_S, 2,&arg0); @@ -34452,7 +34452,7 @@ int lua_cocos2dx_Label_createWithBMFont(lua_State* tolua_S) std::string arg1; cocos2d::TextHAlignment arg2; int arg3; - cocos2d::math::Vector2 arg4; + cocos2d::Vector2 arg4; ok &= luaval_to_std_string(tolua_S, 2,&arg0); ok &= luaval_to_std_string(tolua_S, 3,&arg1); ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); @@ -35135,7 +35135,7 @@ int lua_cocos2dx_LabelBMFont_initWithString(lua_State* tolua_S) std::string arg1; double arg2; cocos2d::TextHAlignment arg3; - cocos2d::math::Vector2 arg4; + cocos2d::Vector2 arg4; ok &= luaval_to_std_string(tolua_S, 2,&arg0); @@ -35291,7 +35291,7 @@ int lua_cocos2dx_LabelBMFont_setFntFile(lua_State* tolua_S) if (argc == 2) { std::string arg0; - cocos2d::math::Vector2 arg1; + cocos2d::Vector2 arg1; ok &= luaval_to_std_string(tolua_S, 2,&arg0); @@ -35500,7 +35500,7 @@ int lua_cocos2dx_LabelBMFont_create(lua_State* tolua_S) cocos2d::TextHAlignment arg3; ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); if (!ok) { break; } - cocos2d::math::Vector2 arg4; + cocos2d::Vector2 arg4; ok &= luaval_to_vector2(tolua_S, 6, &arg4); if (!ok) { break; } cocos2d::LabelBMFont* ret = cocos2d::LabelBMFont::create(arg0, arg1, arg2, arg3, arg4); @@ -36024,7 +36024,7 @@ int lua_cocos2dx_LayerGradient_setVector(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -36210,7 +36210,7 @@ int lua_cocos2dx_LayerGradient_getVector(lua_State* tolua_S) { if(!ok) return 0; - const cocos2d::math::Vector2& ret = cobj->getVector(); + const cocos2d::Vector2& ret = cobj->getVector(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -36454,7 +36454,7 @@ int lua_cocos2dx_LayerGradient_create(lua_State* tolua_S) cocos2d::Color4B arg1; ok &=luaval_to_color4b(tolua_S, 3, &arg1); if (!ok) { break; } - cocos2d::math::Vector2 arg2; + cocos2d::Vector2 arg2; ok &= luaval_to_vector2(tolua_S, 4, &arg2); if (!ok) { break; } cocos2d::LayerGradient* ret = cocos2d::LayerGradient::create(arg0, arg1, arg2); @@ -43045,7 +43045,7 @@ int lua_cocos2dx_Sprite_getOffsetPosition(lua_State* tolua_S) { if(!ok) return 0; - const cocos2d::math::Vector2& ret = cobj->getOffsetPosition(); + const cocos2d::Vector2& ret = cobj->getOffsetPosition(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -44204,7 +44204,7 @@ int lua_cocos2dx_ProgressTimer_setBarChangeRate(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -44428,7 +44428,7 @@ int lua_cocos2dx_ProgressTimer_setMidpoint(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -44476,7 +44476,7 @@ int lua_cocos2dx_ProgressTimer_getBarChangeRate(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getBarChangeRate(); + cocos2d::Vector2 ret = cobj->getBarChangeRate(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -44573,7 +44573,7 @@ int lua_cocos2dx_ProgressTimer_getMidpoint(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getMidpoint(); + cocos2d::Vector2 ret = cobj->getMidpoint(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -45521,7 +45521,7 @@ int lua_cocos2dx_RenderTexture_setVirtualViewport(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 3) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; cocos2d::Rect arg1; cocos2d::Rect arg2; @@ -47840,7 +47840,7 @@ int lua_cocos2dx_ParticleSystem_setPosVar(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -48476,7 +48476,7 @@ int lua_cocos2dx_ParticleSystem_getGravity(lua_State* tolua_S) { if(!ok) return 0; - const cocos2d::math::Vector2& ret = cobj->getGravity(); + const cocos2d::Vector2& ret = cobj->getGravity(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -48882,7 +48882,7 @@ int lua_cocos2dx_ParticleSystem_getPosVar(lua_State* tolua_S) { if(!ok) return 0; - const cocos2d::math::Vector2& ret = cobj->getPosVar(); + const cocos2d::Vector2& ret = cobj->getPosVar(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -49146,7 +49146,7 @@ int lua_cocos2dx_ParticleSystem_getSourcePosition(lua_State* tolua_S) { if(!ok) return 0; - const cocos2d::math::Vector2& ret = cobj->getSourcePosition(); + const cocos2d::Vector2& ret = cobj->getSourcePosition(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -49327,7 +49327,7 @@ int lua_cocos2dx_ParticleSystem_updateQuadWithParticle(lua_State* tolua_S) if (argc == 2) { cocos2d::sParticle* arg0; - cocos2d::math::Vector2 arg1; + cocos2d::Vector2 arg1; #pragma warning NO CONVERSION TO NATIVE FOR sParticle*; @@ -50184,7 +50184,7 @@ int lua_cocos2dx_ParticleSystem_setSourcePosition(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -51044,7 +51044,7 @@ int lua_cocos2dx_ParticleSystem_setGravity(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -52364,7 +52364,20 @@ int lua_cocos2dx_ParticleSystemQuad_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + do + { + if (argc == 1) + { + cocos2d::ValueMap arg0; + ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0); + if (!ok) { break; } + cocos2d::ParticleSystemQuad* ret = cocos2d::ParticleSystemQuad::create(arg0); + object_to_luaval(tolua_S, "cc.ParticleSystemQuad",(cocos2d::ParticleSystemQuad*)ret); + return 1; + } + } while (0); + ok = true; + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -53659,7 +53672,7 @@ int lua_cocos2dx_GridBase_getStep(lua_State* tolua_S) { if(!ok) return 0; - const cocos2d::math::Vector2& ret = cobj->getStep(); + const cocos2d::Vector2& ret = cobj->getStep(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -53744,7 +53757,7 @@ int lua_cocos2dx_GridBase_setStep(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -55120,7 +55133,7 @@ int lua_cocos2dx_GLViewProtocol_getVisibleOrigin(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getVisibleOrigin(); + cocos2d::Vector2 ret = cobj->getVisibleOrigin(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -58404,8 +58417,8 @@ int lua_cocos2dx_ParallaxNode_addChild(lua_State* tolua_S) { cocos2d::Node* arg0; int arg1; - cocos2d::math::Vector2 arg2; - cocos2d::math::Vector2 arg3; + cocos2d::Vector2 arg2; + cocos2d::Vector2 arg3; ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); @@ -58604,7 +58617,7 @@ int lua_cocos2dx_TMXObjectGroup_setPositionOffset(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -58699,7 +58712,7 @@ int lua_cocos2dx_TMXObjectGroup_getPositionOffset(lua_State* tolua_S) { if(!ok) return 0; - const cocos2d::math::Vector2& ret = cobj->getPositionOffset(); + const cocos2d::Vector2& ret = cobj->getPositionOffset(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -60995,7 +61008,7 @@ int lua_cocos2dx_TMXLayer_getTileGIDAt(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -61006,7 +61019,7 @@ int lua_cocos2dx_TMXLayer_getTileGIDAt(lua_State* tolua_S) } if (argc == 2) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; cocos2d::TMXTileFlags_* arg1; ok &= luaval_to_vector2(tolua_S, 2, &arg0); @@ -61056,12 +61069,12 @@ int lua_cocos2dx_TMXLayer_getPositionAt(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getPositionAt(arg0); + cocos2d::Vector2 ret = cobj->getPositionAt(arg0); vector2_to_luaval(tolua_S, ret); return 1; } @@ -61464,7 +61477,7 @@ int lua_cocos2dx_TMXLayer_removeTileAt(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -61605,7 +61618,7 @@ int lua_cocos2dx_TMXLayer_setTileGID(lua_State* tolua_S) ok &= luaval_to_uint32(tolua_S, 2,&arg0); if (!ok) { break; } - cocos2d::math::Vector2 arg1; + cocos2d::Vector2 arg1; ok &= luaval_to_vector2(tolua_S, 3, &arg1); if (!ok) { break; } @@ -61624,7 +61637,7 @@ int lua_cocos2dx_TMXLayer_setTileGID(lua_State* tolua_S) ok &= luaval_to_uint32(tolua_S, 2,&arg0); if (!ok) { break; } - cocos2d::math::Vector2 arg1; + cocos2d::Vector2 arg1; ok &= luaval_to_vector2(tolua_S, 3, &arg1); if (!ok) { break; } @@ -61989,7 +62002,7 @@ int lua_cocos2dx_TMXLayer_getTileAt(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -62989,7 +63002,7 @@ int lua_cocos2dx_TileMapAtlas_getTileAt(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -63037,7 +63050,7 @@ int lua_cocos2dx_TileMapAtlas_setTile(lua_State* tolua_S) if (argc == 2) { cocos2d::Color3B arg0; - cocos2d::math::Vector2 arg1; + cocos2d::Vector2 arg1; ok &= luaval_to_color3b(tolua_S, 2, &arg0); diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.cpp index 6605367095..b6bce1338b 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.cpp @@ -2027,7 +2027,7 @@ int lua_cocos2dx_extension_Control_getTouchLocation(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Touch",&arg0); if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getTouchLocation(arg0); + cocos2d::Vector2 ret = cobj->getTouchLocation(arg0); vector2_to_luaval(tolua_S, ret); return 1; } @@ -2506,7 +2506,7 @@ int lua_cocos2dx_extension_ControlButton_setLabelAnchorPoint(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -2554,7 +2554,7 @@ int lua_cocos2dx_extension_ControlButton_getLabelAnchorPoint(lua_State* tolua_S) { if(!ok) return 0; - const cocos2d::math::Vector2& ret = cobj->getLabelAnchorPoint(); + const cocos2d::Vector2& ret = cobj->getLabelAnchorPoint(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -4170,7 +4170,7 @@ int lua_cocos2dx_extension_ControlHuePicker_initWithTargetAndPos(lua_State* tolu if (argc == 2) { cocos2d::Node* arg0; - cocos2d::math::Vector2 arg1; + cocos2d::Vector2 arg1; ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); @@ -4267,7 +4267,7 @@ int lua_cocos2dx_extension_ControlHuePicker_getStartPos(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getStartPos(); + cocos2d::Vector2 ret = cobj->getStartPos(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -4613,7 +4613,7 @@ int lua_cocos2dx_extension_ControlHuePicker_create(lua_State* tolua_S) if (argc == 2) { cocos2d::Node* arg0; - cocos2d::math::Vector2 arg1; + cocos2d::Vector2 arg1; ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); ok &= luaval_to_vector2(tolua_S, 3, &arg1); if(!ok) @@ -4769,7 +4769,7 @@ int lua_cocos2dx_extension_ControlSaturationBrightnessPicker_initWithTargetAndPo if (argc == 2) { cocos2d::Node* arg0; - cocos2d::math::Vector2 arg1; + cocos2d::Vector2 arg1; ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); @@ -4820,7 +4820,7 @@ int lua_cocos2dx_extension_ControlSaturationBrightnessPicker_getStartPos(lua_Sta { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getStartPos(); + cocos2d::Vector2 ret = cobj->getStartPos(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -5118,7 +5118,7 @@ int lua_cocos2dx_extension_ControlSaturationBrightnessPicker_create(lua_State* t if (argc == 2) { cocos2d::Node* arg0; - cocos2d::math::Vector2 arg1; + cocos2d::Vector2 arg1; ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); ok &= luaval_to_vector2(tolua_S, 3, &arg1); if(!ok) @@ -5828,7 +5828,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_setPreviousLocation(lua_State* t argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -6008,10 +6008,10 @@ int lua_cocos2dx_extension_ControlPotentiometer_angleInDegreesBetweenLineFromPoi argc = lua_gettop(tolua_S)-1; if (argc == 4) { - cocos2d::math::Vector2 arg0; - cocos2d::math::Vector2 arg1; - cocos2d::math::Vector2 arg2; - cocos2d::math::Vector2 arg3; + cocos2d::Vector2 arg0; + cocos2d::Vector2 arg1; + cocos2d::Vector2 arg2; + cocos2d::Vector2 arg3; ok &= luaval_to_vector2(tolua_S, 2, &arg0); @@ -6064,7 +6064,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_potentiometerBegan(lua_State* to argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -6292,7 +6292,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_getPreviousLocation(lua_State* t { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getPreviousLocation(); + cocos2d::Vector2 ret = cobj->getPreviousLocation(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -6334,8 +6334,8 @@ int lua_cocos2dx_extension_ControlPotentiometer_distanceBetweenPointAndPoint(lua argc = lua_gettop(tolua_S)-1; if (argc == 2) { - cocos2d::math::Vector2 arg0; - cocos2d::math::Vector2 arg1; + cocos2d::Vector2 arg0; + cocos2d::Vector2 arg1; ok &= luaval_to_vector2(tolua_S, 2, &arg0); @@ -6384,7 +6384,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_potentiometerEnded(lua_State* to argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -6619,7 +6619,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_potentiometerMoved(lua_State* to argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -6824,7 +6824,7 @@ int lua_cocos2dx_extension_ControlSlider_locationFromTouch(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Touch",&arg0); if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->locationFromTouch(arg0); + cocos2d::Vector2 ret = cobj->locationFromTouch(arg0); vector2_to_luaval(tolua_S, ret); return 1; } @@ -8249,7 +8249,7 @@ int lua_cocos2dx_extension_ControlStepper_updateLayoutUsingTouchLocation(lua_Sta argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -9374,7 +9374,7 @@ int lua_cocos2dx_extension_ControlSwitch_locationFromTouch(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Touch",&arg0); if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->locationFromTouch(arg0); + cocos2d::Vector2 ret = cobj->locationFromTouch(arg0); vector2_to_luaval(tolua_S, ret); return 1; } @@ -9688,7 +9688,7 @@ int lua_cocos2dx_extension_ScrollView_setContentOffsetInDuration(lua_State* tolu argc = lua_gettop(tolua_S)-1; if (argc == 2) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; double arg1; ok &= luaval_to_vector2(tolua_S, 2, &arg0); @@ -10253,7 +10253,7 @@ int lua_cocos2dx_extension_ScrollView_setContentOffset(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -10263,7 +10263,7 @@ int lua_cocos2dx_extension_ScrollView_setContentOffset(lua_State* tolua_S) } if (argc == 2) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; bool arg1; ok &= luaval_to_vector2(tolua_S, 2, &arg0); @@ -10541,7 +10541,7 @@ int lua_cocos2dx_extension_ScrollView_getContentOffset(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getContentOffset(); + cocos2d::Vector2 ret = cobj->getContentOffset(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -10816,7 +10816,7 @@ int lua_cocos2dx_extension_ScrollView_maxContainerOffset(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->maxContainerOffset(); + cocos2d::Vector2 ret = cobj->maxContainerOffset(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -11001,7 +11001,7 @@ int lua_cocos2dx_extension_ScrollView_minContainerOffset(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->minContainerOffset(); + cocos2d::Vector2 ret = cobj->minContainerOffset(); vector2_to_luaval(tolua_S, ret); return 1; } diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.cpp index 131e153314..39f5662b2b 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.cpp @@ -35,7 +35,7 @@ int lua_cocos2dx_physics_PhysicsWorld_getGravity(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getGravity(); + cocos2d::Vector2 ret = cobj->getGravity(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -121,7 +121,7 @@ int lua_cocos2dx_physics_PhysicsWorld_setGravity(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -413,7 +413,7 @@ int lua_cocos2dx_physics_PhysicsWorld_getShapes(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -513,7 +513,7 @@ int lua_cocos2dx_physics_PhysicsWorld_getShape(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -1335,7 +1335,7 @@ int lua_cocos2dx_physics_PhysicsShape_containsPoint(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -1516,7 +1516,7 @@ int lua_cocos2dx_physics_PhysicsShape_getCenter(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getCenter(); + cocos2d::Vector2 ret = cobj->getCenter(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -1828,7 +1828,7 @@ int lua_cocos2dx_physics_PhysicsShape_getOffset(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getOffset(); + cocos2d::Vector2 ret = cobj->getOffset(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -2293,7 +2293,7 @@ int lua_cocos2dx_physics_PhysicsShapeCircle_create(lua_State* tolua_S) { double arg0; cocos2d::PhysicsMaterial arg1; - cocos2d::math::Vector2 arg2; + cocos2d::Vector2 arg2; ok &= luaval_to_number(tolua_S, 2,&arg0); ok &= luaval_to_physics_material(tolua_S, 3, &arg1); ok &= luaval_to_vector2(tolua_S, 4, &arg2); @@ -2375,7 +2375,7 @@ int lua_cocos2dx_physics_PhysicsShapeCircle_calculateMoment(lua_State* tolua_S) { double arg0; double arg1; - cocos2d::math::Vector2 arg2; + cocos2d::Vector2 arg2; ok &= luaval_to_number(tolua_S, 2,&arg0); ok &= luaval_to_number(tolua_S, 3,&arg1); ok &= luaval_to_vector2(tolua_S, 4, &arg2); @@ -2545,7 +2545,7 @@ int lua_cocos2dx_physics_PhysicsShapeBox_create(lua_State* tolua_S) { cocos2d::Size arg0; cocos2d::PhysicsMaterial arg1; - cocos2d::math::Vector2 arg2; + cocos2d::Vector2 arg2; ok &= luaval_to_size(tolua_S, 2, &arg0); ok &= luaval_to_physics_material(tolua_S, 3, &arg1); ok &= luaval_to_vector2(tolua_S, 4, &arg2); @@ -2627,7 +2627,7 @@ int lua_cocos2dx_physics_PhysicsShapeBox_calculateMoment(lua_State* tolua_S) { double arg0; cocos2d::Size arg1; - cocos2d::math::Vector2 arg2; + cocos2d::Vector2 arg2; ok &= luaval_to_number(tolua_S, 2,&arg0); ok &= luaval_to_size(tolua_S, 3, &arg1); ok &= luaval_to_vector2(tolua_S, 4, &arg2); @@ -2746,7 +2746,7 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_getPoint(lua_State* tolua_S) ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getPoint(arg0); + cocos2d::Vector2 ret = cobj->getPoint(arg0); vector2_to_luaval(tolua_S, ret); return 1; } @@ -2811,7 +2811,7 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeSegment_getPointB(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getPointB(); + cocos2d::Vector2 ret = cobj->getPointB(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -2855,7 +2855,7 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeSegment_getPointA(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getPointA(); + cocos2d::Vector2 ret = cobj->getPointA(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -2886,8 +2886,8 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeSegment_create(lua_State* tolua_S) if (argc == 2) { - cocos2d::math::Vector2 arg0; - cocos2d::math::Vector2 arg1; + cocos2d::Vector2 arg0; + cocos2d::Vector2 arg1; ok &= luaval_to_vector2(tolua_S, 2, &arg0); ok &= luaval_to_vector2(tolua_S, 3, &arg1); if(!ok) @@ -2898,8 +2898,8 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeSegment_create(lua_State* tolua_S) } if (argc == 3) { - cocos2d::math::Vector2 arg0; - cocos2d::math::Vector2 arg1; + cocos2d::Vector2 arg0; + cocos2d::Vector2 arg1; cocos2d::PhysicsMaterial arg2; ok &= luaval_to_vector2(tolua_S, 2, &arg0); ok &= luaval_to_vector2(tolua_S, 3, &arg1); @@ -2912,8 +2912,8 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeSegment_create(lua_State* tolua_S) } if (argc == 4) { - cocos2d::math::Vector2 arg0; - cocos2d::math::Vector2 arg1; + cocos2d::Vector2 arg0; + cocos2d::Vector2 arg1; cocos2d::PhysicsMaterial arg2; double arg3; ok &= luaval_to_vector2(tolua_S, 2, &arg0); @@ -3056,7 +3056,7 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeBox_create(lua_State* tolua_S) cocos2d::Size arg0; cocos2d::PhysicsMaterial arg1; double arg2; - cocos2d::math::Vector2 arg3; + cocos2d::Vector2 arg3; ok &= luaval_to_size(tolua_S, 2, &arg0); ok &= luaval_to_physics_material(tolua_S, 3, &arg1); ok &= luaval_to_number(tolua_S, 4,&arg2); @@ -3644,11 +3644,11 @@ int lua_cocos2dx_physics_PhysicsBody_applyImpulse(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; do{ if (argc == 2) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if (!ok) { break; } - cocos2d::math::Vector2 arg1; + cocos2d::Vector2 arg1; ok &= luaval_to_vector2(tolua_S, 3, &arg1); if (!ok) { break; } @@ -3659,7 +3659,7 @@ int lua_cocos2dx_physics_PhysicsBody_applyImpulse(lua_State* tolua_S) ok = true; do{ if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if (!ok) { break; } @@ -3747,11 +3747,11 @@ int lua_cocos2dx_physics_PhysicsBody_applyForce(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; do{ if (argc == 2) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if (!ok) { break; } - cocos2d::math::Vector2 arg1; + cocos2d::Vector2 arg1; ok &= luaval_to_vector2(tolua_S, 3, &arg1); if (!ok) { break; } @@ -3762,7 +3762,7 @@ int lua_cocos2dx_physics_PhysicsBody_applyForce(lua_State* tolua_S) ok = true; do{ if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if (!ok) { break; } @@ -4008,7 +4008,7 @@ int lua_cocos2dx_physics_PhysicsBody_getVelocity(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getVelocity(); + cocos2d::Vector2 ret = cobj->getVelocity(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -4287,7 +4287,7 @@ int lua_cocos2dx_physics_PhysicsBody_getPositionOffset(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getPositionOffset(); + cocos2d::Vector2 ret = cobj->getPositionOffset(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -4465,7 +4465,7 @@ int lua_cocos2dx_physics_PhysicsBody_getPosition(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getPosition(); + cocos2d::Vector2 ret = cobj->getPosition(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -4733,12 +4733,12 @@ int lua_cocos2dx_physics_PhysicsBody_local2World(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->local2World(arg0); + cocos2d::Vector2 ret = cobj->local2World(arg0); vector2_to_luaval(tolua_S, ret); return 1; } @@ -5048,12 +5048,12 @@ int lua_cocos2dx_physics_PhysicsBody_world2Local(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->world2Local(arg0); + cocos2d::Vector2 ret = cobj->world2Local(arg0); vector2_to_luaval(tolua_S, ret); return 1; } @@ -5314,7 +5314,7 @@ int lua_cocos2dx_physics_PhysicsBody_setVelocity(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -5452,7 +5452,7 @@ int lua_cocos2dx_physics_PhysicsBody_setPositionOffset(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -5632,12 +5632,12 @@ int lua_cocos2dx_physics_PhysicsBody_getVelocityAtLocalPoint(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getVelocityAtLocalPoint(arg0); + cocos2d::Vector2 ret = cobj->getVelocityAtLocalPoint(arg0); vector2_to_luaval(tolua_S, ret); return 1; } @@ -5862,12 +5862,12 @@ int lua_cocos2dx_physics_PhysicsBody_getVelocityAtWorldPoint(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getVelocityAtWorldPoint(arg0); + cocos2d::Vector2 ret = cobj->getVelocityAtWorldPoint(arg0); vector2_to_luaval(tolua_S, ret); return 1; } @@ -6099,7 +6099,7 @@ int lua_cocos2dx_physics_PhysicsBody_createBox(lua_State* tolua_S) { cocos2d::Size arg0; cocos2d::PhysicsMaterial arg1; - cocos2d::math::Vector2 arg2; + cocos2d::Vector2 arg2; ok &= luaval_to_size(tolua_S, 2, &arg0); ok &= luaval_to_physics_material(tolua_S, 3, &arg1); ok &= luaval_to_vector2(tolua_S, 4, &arg2); @@ -6134,8 +6134,8 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeSegment(lua_State* tolua_S) if (argc == 2) { - cocos2d::math::Vector2 arg0; - cocos2d::math::Vector2 arg1; + cocos2d::Vector2 arg0; + cocos2d::Vector2 arg1; ok &= luaval_to_vector2(tolua_S, 2, &arg0); ok &= luaval_to_vector2(tolua_S, 3, &arg1); if(!ok) @@ -6146,8 +6146,8 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeSegment(lua_State* tolua_S) } if (argc == 3) { - cocos2d::math::Vector2 arg0; - cocos2d::math::Vector2 arg1; + cocos2d::Vector2 arg0; + cocos2d::Vector2 arg1; cocos2d::PhysicsMaterial arg2; ok &= luaval_to_vector2(tolua_S, 2, &arg0); ok &= luaval_to_vector2(tolua_S, 3, &arg1); @@ -6160,8 +6160,8 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeSegment(lua_State* tolua_S) } if (argc == 4) { - cocos2d::math::Vector2 arg0; - cocos2d::math::Vector2 arg1; + cocos2d::Vector2 arg0; + cocos2d::Vector2 arg1; cocos2d::PhysicsMaterial arg2; double arg3; ok &= luaval_to_vector2(tolua_S, 2, &arg0); @@ -6299,7 +6299,7 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeBox(lua_State* tolua_S) cocos2d::Size arg0; cocos2d::PhysicsMaterial arg1; double arg2; - cocos2d::math::Vector2 arg3; + cocos2d::Vector2 arg3; ok &= luaval_to_size(tolua_S, 2, &arg0); ok &= luaval_to_physics_material(tolua_S, 3, &arg1); ok &= luaval_to_number(tolua_S, 4,&arg2); @@ -6359,7 +6359,7 @@ int lua_cocos2dx_physics_PhysicsBody_createCircle(lua_State* tolua_S) { double arg0; cocos2d::PhysicsMaterial arg1; - cocos2d::math::Vector2 arg2; + cocos2d::Vector2 arg2; ok &= luaval_to_number(tolua_S, 2,&arg0); ok &= luaval_to_physics_material(tolua_S, 3, &arg1); ok &= luaval_to_vector2(tolua_S, 4, &arg2); @@ -6913,7 +6913,7 @@ int lua_cocos2dx_physics_PhysicsContactPreSolve_getSurfaceVelocity(lua_State* to { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getSurfaceVelocity(); + cocos2d::Vector2 ret = cobj->getSurfaceVelocity(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -6955,7 +6955,7 @@ int lua_cocos2dx_physics_PhysicsContactPreSolve_setSurfaceVelocity(lua_State* to argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -7119,7 +7119,7 @@ int lua_cocos2dx_physics_PhysicsContactPostSolve_getSurfaceVelocity(lua_State* t { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getSurfaceVelocity(); + cocos2d::Vector2 ret = cobj->getSurfaceVelocity(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -8184,7 +8184,7 @@ int lua_cocos2dx_physics_PhysicsJointFixed_construct(lua_State* tolua_S) { cocos2d::PhysicsBody* arg0; cocos2d::PhysicsBody* arg1; - cocos2d::math::Vector2 arg2; + cocos2d::Vector2 arg2; ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsBody",&arg0); ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); ok &= luaval_to_vector2(tolua_S, 4, &arg2); @@ -8250,7 +8250,7 @@ int lua_cocos2dx_physics_PhysicsJointLimit_setAnchr2(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -8296,7 +8296,7 @@ int lua_cocos2dx_physics_PhysicsJointLimit_setAnchr1(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -8390,7 +8390,7 @@ int lua_cocos2dx_physics_PhysicsJointLimit_getAnchr2(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getAnchr2(); + cocos2d::Vector2 ret = cobj->getAnchr2(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -8434,7 +8434,7 @@ int lua_cocos2dx_physics_PhysicsJointLimit_getAnchr1(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getAnchr1(); + cocos2d::Vector2 ret = cobj->getAnchr1(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -8606,10 +8606,10 @@ int lua_cocos2dx_physics_PhysicsJointLimit_construct(lua_State* tolua_S) cocos2d::PhysicsBody* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); if (!ok) { break; } - cocos2d::math::Vector2 arg2; + cocos2d::Vector2 arg2; ok &= luaval_to_vector2(tolua_S, 4, &arg2); if (!ok) { break; } - cocos2d::math::Vector2 arg3; + cocos2d::Vector2 arg3; ok &= luaval_to_vector2(tolua_S, 5, &arg3); if (!ok) { break; } double arg4; @@ -8634,10 +8634,10 @@ int lua_cocos2dx_physics_PhysicsJointLimit_construct(lua_State* tolua_S) cocos2d::PhysicsBody* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); if (!ok) { break; } - cocos2d::math::Vector2 arg2; + cocos2d::Vector2 arg2; ok &= luaval_to_vector2(tolua_S, 4, &arg2); if (!ok) { break; } - cocos2d::math::Vector2 arg3; + cocos2d::Vector2 arg3; ok &= luaval_to_vector2(tolua_S, 5, &arg3); if (!ok) { break; } cocos2d::PhysicsJointLimit* ret = cocos2d::PhysicsJointLimit::construct(arg0, arg1, arg2, arg3); @@ -8701,7 +8701,7 @@ int lua_cocos2dx_physics_PhysicsJointPin_construct(lua_State* tolua_S) { cocos2d::PhysicsBody* arg0; cocos2d::PhysicsBody* arg1; - cocos2d::math::Vector2 arg2; + cocos2d::Vector2 arg2; ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsBody",&arg0); ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); ok &= luaval_to_vector2(tolua_S, 4, &arg2); @@ -8848,8 +8848,8 @@ int lua_cocos2dx_physics_PhysicsJointDistance_construct(lua_State* tolua_S) { cocos2d::PhysicsBody* arg0; cocos2d::PhysicsBody* arg1; - cocos2d::math::Vector2 arg2; - cocos2d::math::Vector2 arg3; + cocos2d::Vector2 arg2; + cocos2d::Vector2 arg3; ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsBody",&arg0); ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); ok &= luaval_to_vector2(tolua_S, 4, &arg2); @@ -8918,7 +8918,7 @@ int lua_cocos2dx_physics_PhysicsJointSpring_setAnchr2(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -8964,7 +8964,7 @@ int lua_cocos2dx_physics_PhysicsJointSpring_setAnchr1(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -9146,7 +9146,7 @@ int lua_cocos2dx_physics_PhysicsJointSpring_getAnchr2(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getAnchr2(); + cocos2d::Vector2 ret = cobj->getAnchr2(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -9190,7 +9190,7 @@ int lua_cocos2dx_physics_PhysicsJointSpring_getAnchr1(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getAnchr1(); + cocos2d::Vector2 ret = cobj->getAnchr1(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -9359,8 +9359,8 @@ int lua_cocos2dx_physics_PhysicsJointSpring_construct(lua_State* tolua_S) { cocos2d::PhysicsBody* arg0; cocos2d::PhysicsBody* arg1; - cocos2d::math::Vector2 arg2; - cocos2d::math::Vector2 arg3; + cocos2d::Vector2 arg2; + cocos2d::Vector2 arg3; double arg4; double arg5; ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsBody",&arg0); @@ -9441,7 +9441,7 @@ int lua_cocos2dx_physics_PhysicsJointGroove_setAnchr2(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -9487,7 +9487,7 @@ int lua_cocos2dx_physics_PhysicsJointGroove_setGrooveA(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -9533,7 +9533,7 @@ int lua_cocos2dx_physics_PhysicsJointGroove_setGrooveB(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -9581,7 +9581,7 @@ int lua_cocos2dx_physics_PhysicsJointGroove_getGrooveA(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getGrooveA(); + cocos2d::Vector2 ret = cobj->getGrooveA(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -9625,7 +9625,7 @@ int lua_cocos2dx_physics_PhysicsJointGroove_getGrooveB(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getGrooveB(); + cocos2d::Vector2 ret = cobj->getGrooveB(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -9669,7 +9669,7 @@ int lua_cocos2dx_physics_PhysicsJointGroove_getAnchr2(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getAnchr2(); + cocos2d::Vector2 ret = cobj->getAnchr2(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -9702,9 +9702,9 @@ int lua_cocos2dx_physics_PhysicsJointGroove_construct(lua_State* tolua_S) { cocos2d::PhysicsBody* arg0; cocos2d::PhysicsBody* arg1; - cocos2d::math::Vector2 arg2; - cocos2d::math::Vector2 arg3; - cocos2d::math::Vector2 arg4; + cocos2d::Vector2 arg2; + cocos2d::Vector2 arg3; + cocos2d::Vector2 arg4; ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsBody",&arg0); ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); ok &= luaval_to_vector2(tolua_S, 4, &arg2); diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_spine_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_spine_auto.cpp index c39d88a203..cc8c8cf493 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_spine_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_spine_auto.cpp @@ -122,7 +122,7 @@ int lua_cocos2dx_spine_Skeleton_onDraw(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 2) { - cocos2d::math::Matrix arg0; + cocos2d::Matrix arg0; bool arg1; ok &= luaval_to_matrix(tolua_S, 2, &arg0); diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp index 192fc0bada..d912d49a5e 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp @@ -3026,7 +3026,7 @@ int lua_cocos2dx_studio_ContourData_addVertex(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -3813,7 +3813,7 @@ int lua_cocos2dx_studio_DisplayManager_getAnchorPointInPoints(lua_State* tolua_S { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getAnchorPointInPoints(); + cocos2d::Vector2 ret = cobj->getAnchorPointInPoints(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -4198,7 +4198,7 @@ int lua_cocos2dx_studio_DisplayManager_containPoint(lua_State* tolua_S) ok = true; do{ if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if (!ok) { break; } @@ -4434,7 +4434,7 @@ int lua_cocos2dx_studio_DisplayManager_getAnchorPoint(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getAnchorPoint(); + cocos2d::Vector2 ret = cobj->getAnchorPoint(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -6051,7 +6051,7 @@ int lua_cocos2dx_studio_Bone_getNodeToArmatureTransform(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Matrix ret = cobj->getNodeToArmatureTransform(); + cocos2d::Matrix ret = cobj->getNodeToArmatureTransform(); matrix_to_luaval(tolua_S, ret); return 1; } @@ -9615,7 +9615,7 @@ int lua_cocos2dx_studio_Skin_getNodeToWorldTransformAR(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Matrix ret = cobj->getNodeToWorldTransformAR(); + cocos2d::Matrix ret = cobj->getNodeToWorldTransformAR(); matrix_to_luaval(tolua_S, ret); return 1; } diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp index 67bac7c575..961c620764 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp @@ -841,7 +841,7 @@ int lua_cocos2dx_ui_Widget_setSizePercent(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -1069,7 +1069,7 @@ int lua_cocos2dx_ui_Widget_getTouchEndPos(lua_State* tolua_S) { if(!ok) return 0; - const cocos2d::math::Vector2& ret = cobj->getTouchEndPos(); + const cocos2d::Vector2& ret = cobj->getTouchEndPos(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -1111,7 +1111,7 @@ int lua_cocos2dx_ui_Widget_setPositionPercent(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -1783,7 +1783,7 @@ int lua_cocos2dx_ui_Widget_getWorldPosition(lua_State* tolua_S) { if(!ok) return 0; - cocos2d::math::Vector2 ret = cobj->getWorldPosition(); + cocos2d::Vector2 ret = cobj->getWorldPosition(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -2006,7 +2006,7 @@ int lua_cocos2dx_ui_Widget_getTouchMovePos(lua_State* tolua_S) { if(!ok) return 0; - const cocos2d::math::Vector2& ret = cobj->getTouchMovePos(); + const cocos2d::Vector2& ret = cobj->getTouchMovePos(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -2278,7 +2278,7 @@ int lua_cocos2dx_ui_Widget_getSizePercent(lua_State* tolua_S) { if(!ok) return 0; - const cocos2d::math::Vector2& ret = cobj->getSizePercent(); + const cocos2d::Vector2& ret = cobj->getSizePercent(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -2322,7 +2322,7 @@ int lua_cocos2dx_ui_Widget_getTouchStartPos(lua_State* tolua_S) { if(!ok) return 0; - const cocos2d::math::Vector2& ret = cobj->getTouchStartPos(); + const cocos2d::Vector2& ret = cobj->getTouchStartPos(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -2454,7 +2454,7 @@ int lua_cocos2dx_ui_Widget_clippingParentAreaContainPoint(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -2774,7 +2774,7 @@ int lua_cocos2dx_ui_Widget_getPositionPercent(lua_State* tolua_S) { if(!ok) return 0; - const cocos2d::math::Vector2& ret = cobj->getPositionPercent(); + const cocos2d::Vector2& ret = cobj->getPositionPercent(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -2816,7 +2816,7 @@ int lua_cocos2dx_ui_Widget_hitTest(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -2999,7 +2999,7 @@ int lua_cocos2dx_ui_Widget_checkChildInfo(lua_State* tolua_S) { int arg0; cocos2d::ui::Widget* arg1; - cocos2d::math::Vector2 arg2; + cocos2d::Vector2 arg2; ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); @@ -3278,7 +3278,7 @@ int lua_cocos2dx_ui_Layout_setBackGroundColorVector(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -3464,7 +3464,7 @@ int lua_cocos2dx_ui_Layout_getBackGroundColorVector(lua_State* tolua_S) { if(!ok) return 0; - const cocos2d::math::Vector2& ret = cobj->getBackGroundColorVector(); + const cocos2d::Vector2& ret = cobj->getBackGroundColorVector(); vector2_to_luaval(tolua_S, ret); return 1; } @@ -8960,7 +8960,7 @@ int lua_cocos2dx_ui_ScrollView_scrollToPercentBothDirection(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 3) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; double arg1; bool arg2; @@ -9869,7 +9869,7 @@ int lua_cocos2dx_ui_ScrollView_jumpToPercentBothDirection(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -13508,7 +13508,7 @@ int lua_cocos2dx_ui_TextField_hitTest(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) @@ -15474,7 +15474,7 @@ int lua_cocos2dx_ui_RichText_setAnchorPoint(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - cocos2d::math::Vector2 arg0; + cocos2d::Vector2 arg0; ok &= luaval_to_vector2(tolua_S, 2, &arg0); if(!ok) diff --git a/cocos/scripting/lua-bindings/manual/LuaBasicConversions.cpp b/cocos/scripting/lua-bindings/manual/LuaBasicConversions.cpp index 1fd9c5c9d0..16f9ba23a9 100644 --- a/cocos/scripting/lua-bindings/manual/LuaBasicConversions.cpp +++ b/cocos/scripting/lua-bindings/manual/LuaBasicConversions.cpp @@ -817,7 +817,7 @@ bool luaval_to_fontdefinition(lua_State* L, int lo, FontDefinition* outValue ) return ok; } -bool luaval_to_matrix(lua_State* L, int lo, cocos2d::math::Matrix* outValue ) +bool luaval_to_matrix(lua_State* L, int lo, cocos2d::Matrix* outValue ) { if (nullptr == L || nullptr == outValue) return false; @@ -2320,7 +2320,7 @@ void ccvaluevector_to_luaval(lua_State* L, const cocos2d::ValueVector& inValue) } } -void matrix_to_luaval(lua_State* L, const cocos2d::math::Matrix& mat) +void matrix_to_luaval(lua_State* L, const cocos2d::Matrix& mat) { if (nullptr == L) return; diff --git a/cocos/scripting/lua-bindings/manual/LuaBasicConversions.h b/cocos/scripting/lua-bindings/manual/LuaBasicConversions.h index 2f283fa8de..1ca0c46950 100644 --- a/cocos/scripting/lua-bindings/manual/LuaBasicConversions.h +++ b/cocos/scripting/lua-bindings/manual/LuaBasicConversions.h @@ -69,7 +69,7 @@ extern bool luaval_to_color4f(lua_State* L,int lo,Color4F* outValue); extern bool luaval_to_physics_material(lua_State* L,int lo, cocos2d::PhysicsMaterial* outValue); extern bool luaval_to_affinetransform(lua_State* L,int lo, AffineTransform* outValue); extern bool luaval_to_fontdefinition(lua_State* L, int lo, FontDefinition* outValue ); -extern bool luaval_to_matrix(lua_State* L, int lo, cocos2d::math::Matrix* outValue ); +extern bool luaval_to_matrix(lua_State* L, int lo, cocos2d::Matrix* outValue ); extern bool luaval_to_array(lua_State* L,int lo, __Array** outValue); extern bool luaval_to_dictionary(lua_State* L,int lo, __Dictionary** outValue); extern bool luaval_to_array_of_vector2(lua_State* L,int lo,cocos2d::Vector2 **points, int *numPoints); @@ -83,7 +83,7 @@ CC_DEPRECATED_ATTRIBUTE static inline bool luaval_to_point(lua_State* L,int lo,c return luaval_to_vector2(L, lo, outValue); } -CC_DEPRECATED_ATTRIBUTE static inline bool luaval_to_kmMat4(lua_State* L, int lo, cocos2d::math::Matrix* outValue ) +CC_DEPRECATED_ATTRIBUTE static inline bool luaval_to_kmMat4(lua_State* L, int lo, cocos2d::Matrix* outValue ) { return luaval_to_matrix(L, lo, outValue); } @@ -247,7 +247,7 @@ extern void affinetransform_to_luaval(lua_State* L,const AffineTransform& inValu extern void fontdefinition_to_luaval(lua_State* L,const FontDefinition& inValue); extern void array_to_luaval(lua_State* L, __Array* inValue); extern void dictionary_to_luaval(lua_State* L, __Dictionary* dict); -extern void matrix_to_luaval(lua_State* L, const cocos2d::math::Matrix& mat); +extern void matrix_to_luaval(lua_State* L, const cocos2d::Matrix& mat); CC_DEPRECATED_ATTRIBUTE static inline void point_to_luaval(lua_State* L,const cocos2d::Vector2& pt) { diff --git a/cocos/scripting/lua-bindings/manual/LuaOpengl.cpp b/cocos/scripting/lua-bindings/manual/LuaOpengl.cpp index f617e93e41..c5303c3fd6 100644 --- a/cocos/scripting/lua-bindings/manual/LuaOpengl.cpp +++ b/cocos/scripting/lua-bindings/manual/LuaOpengl.cpp @@ -38,14 +38,14 @@ using namespace cocos2d::extension; -void GLNode::draw(Renderer *renderer, const cocos2d::math::Matrix& transform, bool transformUpdated) +void GLNode::draw(Renderer *renderer, const cocos2d::Matrix& transform, bool transformUpdated) { _renderCmd.init(_globalZOrder); _renderCmd.func = CC_CALLBACK_0(GLNode::onDraw, this, transform, transformUpdated); renderer->addCommand(&_renderCmd); } -void GLNode::onDraw(const cocos2d::math::Matrix &transform, bool transformUpdated) +void GLNode::onDraw(const cocos2d::Matrix &transform, bool transformUpdated) { int handler = ScriptHandlerMgr::getInstance()->getObjectHandler((void*)this, ScriptHandlerMgr::HandlerType::GL_NODE_DRAW); if (0 != handler) diff --git a/cocos/scripting/lua-bindings/manual/LuaOpengl.h b/cocos/scripting/lua-bindings/manual/LuaOpengl.h index acb5f4451d..950201fd78 100644 --- a/cocos/scripting/lua-bindings/manual/LuaOpengl.h +++ b/cocos/scripting/lua-bindings/manual/LuaOpengl.h @@ -39,10 +39,10 @@ class GLNode:public cocos2d::Node { public: virtual ~GLNode(){} - virtual void draw(cocos2d::Renderer *renderer, const cocos2d::math::Matrix& transform, bool transformUpdated) override; + virtual void draw(cocos2d::Renderer *renderer, const cocos2d::Matrix& transform, bool transformUpdated) override; protected: cocos2d::CustomCommand _renderCmd; - void onDraw(const cocos2d::math::Matrix &transform, bool transformUpdated); + void onDraw(const cocos2d::Matrix &transform, bool transformUpdated); }; TOLUA_API int tolua_opengl_open(lua_State* tolua_S); diff --git a/download-deps.py b/download-deps.py new file mode 100755 index 0000000000..6cbf4efbf4 --- /dev/null +++ b/download-deps.py @@ -0,0 +1,153 @@ +#!/usr/bin/env python +#coding=utf-8 +# +# ./download-deps.py +# +# Download Cocos2D-X resources from github (https://github.com/cocos2d/cocos2d-x-external) and extract from ZIP +# +# Helps prevent repo bloat due to large binary files since they can +# be hosted separately. +# + +import urllib2 +import os.path,zipfile +import shutil +import sys +import traceback +import distutils + +from time import time +from sys import stdout +from distutils.errors import DistutilsError +from distutils.dir_util import copy_tree, remove_tree + +prefix = 'https://github.com/cocos2d/cocos2d-x-external/archive/' +filename = 'v3-deps-1' +extracted_folder_name='cocos2d-x-resources-' + filename + +def download_file(url, file_name): + print("--> Ready to download %s from %s" % (file_name, url)) + + u = urllib2.urlopen(url) + f = open(file_name, 'wb') + meta = u.info() + content_len = meta.getheaders("Content-Length") + file_size = 0 + if content_len and len(content_len) > 0: + file_size = int(content_len[0]) + print("--> Get file size succeed!") + else: + print("WARNING: Couldn't grab the file size, ignore it") + + print("--> Start to download, please wait ...") + + file_size_dl = 0 + block_sz = 8192 + block_size_per_second = 0 + old_time=time() + + while True: + buffer = u.read(block_sz) + if not buffer: + break + + file_size_dl += len(buffer) + block_size_per_second += len(buffer) + f.write(buffer) + new_time = time() + if (new_time - old_time) > 1: + speed = block_size_per_second / (new_time - old_time) / 1000.0 + status = "" + if file_size != 0: + percent = file_size_dl * 100. / file_size + status = r" Downloaded: %6dK / Total: %dK, Percent: %3.2f%%, Speed: %6.2f KB/S" % (file_size_dl / 1000, file_size / 1000, percent, speed) + else: + status = r" Downloaded: %6dK, Speed: %6.2f KB/S" % (file_size_dl / 1000, speed) + + status = status + chr(8)*(len(status)+1) + print(status), + sys.stdout.flush() + block_size_per_second = 0 + old_time = new_time + + print("--> Downloading finished!") + f.close() + +def default_filter(src,dst): + """The default progress/filter callback; returns True for all files""" + return dst + +def ensure_directory(target): + if not os.path.exists(target): + os.mkdir(target) + +def unpack_zipfile(filename, extract_dir, progress_filter=default_filter): + """Unpack zip `filename` to `extract_dir` + + Raises ``UnrecognizedFormat`` if `filename` is not a zipfile (as determined + by ``zipfile.is_zipfile()``). See ``unpack_archive()`` for an explanation + of the `progress_filter` argument. + """ + + if not zipfile.is_zipfile(filename): + raise UnrecognizedFormat("%s is not a zip file" % (filename,)) + + z = zipfile.ZipFile(filename) + try: + for info in z.infolist(): + name = info.filename + + # don't extract absolute paths or ones with .. in them + if name.startswith('/') or '..' in name: + continue + + target = os.path.join(extract_dir, *name.split('/')) + target = progress_filter(name, target) + if not target: + continue + if name.endswith('/'): + # directory + ensure_directory(target) + else: + # file + data = z.read(info.filename) + f = open(target,'wb') + try: + f.write(data) + finally: + f.close() + del data + unix_attributes = info.external_attr >> 16 + if unix_attributes: + os.chmod(target, unix_attributes) + finally: + z.close() + +def main(): + workpath = os.path.dirname(os.path.realpath(__file__)) + + if os.path.exists(extracted_folder_name): + shutil.rmtree(extracted_folder_name) + + # if not os.path.isfile(filename + '.zip'): + download_file(prefix+filename+'.zip', filename+'.zip') + + print("--> Extracting files, please wait ...") + # unpack_zipfile(filename+'.zip', workpath) + print("--> Extraction done!") + print("--> Copying files ...") + # distutils.dir_util.copy_tree(extracted_folder_name, workpath) + print("--> Cleaning ...") + # if os.path.isfile(filename+'.zip'): + # os.remove(filename+'.zip') + # if os.path.exists(extracted_folder_name): + # shutil.rmtree(extracted_folder_name) + print("--> DONE! Cheers!") + +# -------------- main -------------- +if __name__ == '__main__': + try: + main() + except Exception as e: + traceback.print_exc() + sys.exit(1) diff --git a/extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp b/extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp index 88a4f24f1f..1b0c4f68e9 100644 --- a/extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp +++ b/extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp @@ -25,7 +25,6 @@ THE SOFTWARE. #include "CCEditBoxImplWp8.h" #include "CCEditBox.h" #include "CCGLView.h" -#include "CCGeometry.h" #include "CCScriptSupport.h" #include "ccUTF8.h" diff --git a/templates/cocos2dx_files.json b/templates/cocos2dx_files.json index d7dfaa06fe..55b44ececd 100644 --- a/templates/cocos2dx_files.json +++ b/templates/cocos2dx_files.json @@ -955,6 +955,7 @@ "docs/RELEASE_NOTES.md", "docs/cocos2dx_portrait.png", "docs/doxygen.config", + "download-deps.py", "extensions/Android.mk", "extensions/CMakeLists.txt", "extensions/ExtensionMacros.h", diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/AlignmentGrid.png b/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/AlignmentGrid.png new file mode 100644 index 0000000000..f7d2e97804 Binary files /dev/null and b/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/AlignmentGrid.png differ diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/ApplicationIcon.png b/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/ApplicationIcon.png new file mode 100644 index 0000000000..7d95d4e081 Binary files /dev/null and b/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/ApplicationIcon.png differ diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/FlipCycleTileLarge.png b/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/FlipCycleTileLarge.png new file mode 100644 index 0000000000..e0c59ac014 Binary files /dev/null and b/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/FlipCycleTileLarge.png differ diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/FlipCycleTileMedium.png b/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/FlipCycleTileMedium.png new file mode 100644 index 0000000000..e93b89d600 Binary files /dev/null and b/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/FlipCycleTileMedium.png differ diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/FlipCycleTileSmall.png b/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/FlipCycleTileSmall.png new file mode 100644 index 0000000000..550b1b5e8d Binary files /dev/null and b/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/FlipCycleTileSmall.png differ diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/IconicTileMediumLarge.png b/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/IconicTileMediumLarge.png new file mode 100644 index 0000000000..686e6b53f0 Binary files /dev/null and b/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/IconicTileMediumLarge.png differ diff --git a/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/IconicTileSmall.png b/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/IconicTileSmall.png new file mode 100644 index 0000000000..d4b5ede1b5 Binary files /dev/null and b/templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Assets/Tiles/IconicTileSmall.png differ diff --git a/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/AlignmentGrid.png b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/AlignmentGrid.png new file mode 100644 index 0000000000..f7d2e97804 Binary files /dev/null and b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/AlignmentGrid.png differ diff --git a/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/ApplicationIcon.png b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/ApplicationIcon.png new file mode 100644 index 0000000000..7d95d4e081 Binary files /dev/null and b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/ApplicationIcon.png differ diff --git a/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/Tiles/FlipCycleTileLarge.png b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/Tiles/FlipCycleTileLarge.png new file mode 100644 index 0000000000..e0c59ac014 Binary files /dev/null and b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/Tiles/FlipCycleTileLarge.png differ diff --git a/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/Tiles/FlipCycleTileMedium.png b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/Tiles/FlipCycleTileMedium.png new file mode 100644 index 0000000000..e93b89d600 Binary files /dev/null and b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/Tiles/FlipCycleTileMedium.png differ diff --git a/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/Tiles/FlipCycleTileSmall.png b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/Tiles/FlipCycleTileSmall.png new file mode 100644 index 0000000000..550b1b5e8d Binary files /dev/null and b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/Tiles/FlipCycleTileSmall.png differ diff --git a/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/Tiles/IconicTileMediumLarge.png b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/Tiles/IconicTileMediumLarge.png new file mode 100644 index 0000000000..686e6b53f0 Binary files /dev/null and b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/Tiles/IconicTileMediumLarge.png differ diff --git a/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/Tiles/IconicTileSmall.png b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/Tiles/IconicTileSmall.png new file mode 100644 index 0000000000..d4b5ede1b5 Binary files /dev/null and b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Assets/Tiles/IconicTileSmall.png differ diff --git a/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/AlignmentGrid.png b/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/AlignmentGrid.png new file mode 100644 index 0000000000..f7d2e97804 Binary files /dev/null and b/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/AlignmentGrid.png differ diff --git a/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/ApplicationIcon.png b/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/ApplicationIcon.png new file mode 100644 index 0000000000..7d95d4e081 Binary files /dev/null and b/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/ApplicationIcon.png differ diff --git a/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/Tiles/FlipCycleTileLarge.png b/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/Tiles/FlipCycleTileLarge.png new file mode 100644 index 0000000000..e0c59ac014 Binary files /dev/null and b/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/Tiles/FlipCycleTileLarge.png differ diff --git a/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/Tiles/FlipCycleTileMedium.png b/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/Tiles/FlipCycleTileMedium.png new file mode 100644 index 0000000000..e93b89d600 Binary files /dev/null and b/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/Tiles/FlipCycleTileMedium.png differ diff --git a/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/Tiles/FlipCycleTileSmall.png b/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/Tiles/FlipCycleTileSmall.png new file mode 100644 index 0000000000..550b1b5e8d Binary files /dev/null and b/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/Tiles/FlipCycleTileSmall.png differ diff --git a/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/Tiles/IconicTileMediumLarge.png b/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/Tiles/IconicTileMediumLarge.png new file mode 100644 index 0000000000..686e6b53f0 Binary files /dev/null and b/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/Tiles/IconicTileMediumLarge.png differ diff --git a/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/Tiles/IconicTileSmall.png b/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/Tiles/IconicTileSmall.png new file mode 100644 index 0000000000..d4b5ede1b5 Binary files /dev/null and b/tests/cpp-tests/proj.wp8-xaml/cpp-tests/Assets/Tiles/IconicTileSmall.png differ diff --git a/tools/jenkins-scripts/cocos-console-test.py b/tools/jenkins-scripts/cocos-console-test.py index dc0dbf02ae..4623cdc83b 100755 --- a/tools/jenkins-scripts/cocos-console-test.py +++ b/tools/jenkins-scripts/cocos-console-test.py @@ -11,6 +11,7 @@ import sys import json import time import socket +import threading import smtplib from email.mime.text import MIMEText from os.path import join, getsize @@ -176,6 +177,30 @@ def appendToResult(content): global console_result console_result = console_result + content +info_of_close_app = {} +cur_test_name = '' +class myThread(threading.Thread): + def __init__(self,threadname): + threading.Thread.__init__(self,name=threadname) + def run(self): + run_name = self.getName() + print 'run_name:', run_name + if run_name == 'close': + while True: + soc = socket.socket( socket.AF_INET, socket.SOCK_STREAM ) + try: + soc.connect(('localhost', PORT)) + cmd_close = 'director end\r\n' + print 'cmd close:', cmd_close + soc.send(cmd_close) + time.sleep(2) + global cur_test_name + print 'cur_test_name:', cur_test_name + info_of_close_app[cur_test_name] = True + break + except Exception, e: + time.sleep(5) + # if any error ANY_ERROR_IN_RUN = 0 # excute cocos command @@ -212,14 +237,14 @@ def cocos_project(level): if phone == 'android' and getAndroidDevices() == 0: strInfo = 'no android device, please checkout the device is running ok.' print strInfo - # appendToResult(' '+strInfo+"\n\r\t") else: - info_cmd = os.system(cmd) - print 'info '+COCOS_CMD[level]+':', not info_cmd if level == ENUM_PARAM.run: - time.sleep(20) - strClose = close_proj(proj, phone) - appendToResult(' '+strClose+"\n\r\t") + global cur_test_name + cur_test_name = proj+','+phone + thread_close = myThread('close') + thread_close.start() + info_cmd = os.system(cmd) + time.sleep(5) appendToResult(' '+cmd +': ' + str(not info_cmd) + ".\n\r\t") # build and run according to params of provided.(lv_ignore: e.g:ignore new)