diff --git a/native/cocos/2d/CCActionInterval.cpp b/native/cocos/2d/CCActionInterval.cpp index 941adb86e0..3d72973f0a 100644 --- a/native/cocos/2d/CCActionInterval.cpp +++ b/native/cocos/2d/CCActionInterval.cpp @@ -1355,15 +1355,14 @@ void JumpBy::update(float t) float x = _delta.x * t; #if CC_ENABLE_STACKABLE_ACTIONS - Vec2 currentPos = _target->getPosition(); + auto currentPos = _target->getPosition(); Vec2 diff = currentPos - _previousPos; _startPosition = diff + _startPosition; - Vec2 newPos = _startPosition + Vec2(x,y); - _target->setPosition(newPos); - - _previousPos = newPos; + _previousPos.x = _startPosition.x + x; + _previousPos.y = _startPosition.y + y; + _target->setPosition(_previousPos); #else _target->setPosition(_startPosition + Vec2(x,y)); #endif // !CC_ENABLE_STACKABLE_ACTIONS @@ -1502,14 +1501,13 @@ void BezierBy::update(float time) float y = bezierat(ya, yb, yc, yd, time); #if CC_ENABLE_STACKABLE_ACTIONS - Vec2 currentPos = _target->getPosition(); + auto currentPos = _target->getPosition(); Vec2 diff = currentPos - _previousPosition; _startPosition = _startPosition + diff; - Vec2 newPos = _startPosition + Vec2(x,y); - _target->setPosition(newPos); - - _previousPosition = newPos; + _previousPosition.x = _startPosition.x + x; + _previousPosition.y = _startPosition.y + y; + _target->setPosition(_previousPosition); #else _target->setPosition( _startPosition + Vec2(x,y)); #endif // !CC_ENABLE_STACKABLE_ACTIONS diff --git a/native/cocos/2d/CCParticleSystem.cpp b/native/cocos/2d/CCParticleSystem.cpp index 1cb211f2a1..1dbda818c3 100644 --- a/native/cocos/2d/CCParticleSystem.cpp +++ b/native/cocos/2d/CCParticleSystem.cpp @@ -712,15 +712,16 @@ dc[i] = (dc[i] - c[i]) / _particleData.timeToLive[i];\ _particleData.modeA.tangentialAccel[i] = modeA.tangentialAccel + modeA.tangentialAccelVar * RANDOM_M11(&RANDSEED); } + Vec2 dir; // rotation is dir if( modeA.rotationIsDir ) { for (int i = start; i < _particleCount; ++i) { float a = CC_DEGREES_TO_RADIANS( _angle + _angleVar * RANDOM_M11(&RANDSEED) ); - Vec2 v(cosf( a ), sinf( a )); float s = modeA.speed + modeA.speedVar * RANDOM_M11(&RANDSEED); - Vec2 dir = v * s; + dir.x = cosf( a ) * s; + dir.y = sinf( a ) * s; _particleData.modeA.dirX[i] = dir.x;//v * s ; _particleData.modeA.dirY[i] = dir.y; _particleData.rotation[i] = -CC_RADIANS_TO_DEGREES(dir.getAngle()); @@ -731,9 +732,9 @@ dc[i] = (dc[i] - c[i]) / _particleData.timeToLive[i];\ for (int i = start; i < _particleCount; ++i) { float a = CC_DEGREES_TO_RADIANS( _angle + _angleVar * RANDOM_M11(&RANDSEED) ); - Vec2 v(cosf( a ), sinf( a )); float s = modeA.speed + modeA.speedVar * RANDOM_M11(&RANDSEED); - Vec2 dir = v * s; + dir.x = cosf( a ) * s; + dir.y = sinf( a ) * s; _particleData.modeA.dirX[i] = dir.x;//v * s ; _particleData.modeA.dirY[i] = dir.y; } diff --git a/native/cocos/editor-support/cocosbuilder/CCControlButtonLoader.cpp b/native/cocos/editor-support/cocosbuilder/CCControlButtonLoader.cpp index 4fd368c7b9..4c6ff326fa 100644 --- a/native/cocos/editor-support/cocosbuilder/CCControlButtonLoader.cpp +++ b/native/cocos/editor-support/cocosbuilder/CCControlButtonLoader.cpp @@ -77,7 +77,7 @@ void ControlButtonLoader::onHandlePropTypePoint(Node * pNode, Node * pParent, co } } -void ControlButtonLoader::onHandlePropTypeSize(Node * pNode, Node * pParent, const char * pPropertyName, Size pSize, CCBReader * ccbReader) { +void ControlButtonLoader::onHandlePropTypeSize(Node * pNode, Node * pParent, const char * pPropertyName, const Size& pSize, CCBReader * ccbReader) { if(strcmp(pPropertyName, PROPERTY_PREFEREDSIZE) == 0) { ((ControlButton *)pNode)->setPreferredSize(pSize); } else { @@ -103,7 +103,7 @@ void ControlButtonLoader::onHandlePropTypeSpriteFrame(Node * pNode, Node * pPare } } -void ControlButtonLoader::onHandlePropTypeColor3(Node * pNode, Node * pParent, const char * pPropertyName, Color3B pColor3B, CCBReader * ccbReader) { +void ControlButtonLoader::onHandlePropTypeColor3(Node * pNode, Node * pParent, const char * pPropertyName, const Color3B& pColor3B, CCBReader * ccbReader) { if(strcmp(pPropertyName, PROPERTY_TITLECOLOR_NORMAL) == 0) { ((ControlButton *)pNode)->setTitleColorForState(pColor3B, Control::State::NORMAL); } else if(strcmp(pPropertyName, PROPERTY_TITLECOLOR_HIGHLIGHTED) == 0) { diff --git a/native/cocos/editor-support/cocosbuilder/CCControlButtonLoader.h b/native/cocos/editor-support/cocosbuilder/CCControlButtonLoader.h index af6d2b55d3..fec3c95df0 100644 --- a/native/cocos/editor-support/cocosbuilder/CCControlButtonLoader.h +++ b/native/cocos/editor-support/cocosbuilder/CCControlButtonLoader.h @@ -30,9 +30,9 @@ class CC_DLL ControlButtonLoader : public ControlLoader { virtual void onHandlePropTypeFontTTF(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, const char * pFontTTF, CCBReader * ccbReader); virtual void onHandlePropTypeFloatScale(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, float pFloatScale, CCBReader * ccbReader); virtual void onHandlePropTypePoint(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, const cocos2d::Vec2& pPoint, CCBReader * ccbReader); - virtual void onHandlePropTypeSize(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, cocos2d::Size pSize, CCBReader * ccbReader); + virtual void onHandlePropTypeSize(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, const cocos2d::Size& pSize, CCBReader * ccbReader); virtual void onHandlePropTypeSpriteFrame(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, cocos2d::SpriteFrame * pSpriteFrame, CCBReader * ccbReader); - virtual void onHandlePropTypeColor3(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, cocos2d::Color3B pColor3B, CCBReader * ccbReader); + virtual void onHandlePropTypeColor3(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, const cocos2d::Color3B& pColor3B, CCBReader * ccbReader); }; } diff --git a/native/cocos/editor-support/cocosbuilder/CCLabelBMFontLoader.cpp b/native/cocos/editor-support/cocosbuilder/CCLabelBMFontLoader.cpp index 55b503b7c3..9d74319b2e 100644 --- a/native/cocos/editor-support/cocosbuilder/CCLabelBMFontLoader.cpp +++ b/native/cocos/editor-support/cocosbuilder/CCLabelBMFontLoader.cpp @@ -10,7 +10,7 @@ namespace cocosbuilder { #define PROPERTY_FNTFILE "fntFile" #define PROPERTY_STRING "string" -void LabelBMFontLoader::onHandlePropTypeColor3(Node * pNode, Node * pParent, const char * pPropertyName, Color3B pColor3B, CCBReader * ccbReader) { +void LabelBMFontLoader::onHandlePropTypeColor3(Node * pNode, Node * pParent, const char * pPropertyName, const Color3B& pColor3B, CCBReader * ccbReader) { if(strcmp(pPropertyName, PROPERTY_COLOR) == 0) { ((Label *)pNode)->setColor(pColor3B); } else { @@ -26,7 +26,7 @@ void LabelBMFontLoader::onHandlePropTypeByte(Node * pNode, Node * pParent, const } } -void LabelBMFontLoader::onHandlePropTypeBlendFunc(Node * pNode, Node * pParent, const char * pPropertyName, BlendFunc pBlendFunc, CCBReader * ccbReader) { +void LabelBMFontLoader::onHandlePropTypeBlendFunc(Node * pNode, Node * pParent, const char * pPropertyName, const BlendFunc& pBlendFunc, CCBReader * ccbReader) { if(strcmp(pPropertyName, PROPERTY_BLENDFUNC) == 0) { ((Label *)pNode)->setBlendFunc(pBlendFunc); } else { diff --git a/native/cocos/editor-support/cocosbuilder/CCLabelBMFontLoader.h b/native/cocos/editor-support/cocosbuilder/CCLabelBMFontLoader.h index 4a6beda025..ebd6e9c3fb 100644 --- a/native/cocos/editor-support/cocosbuilder/CCLabelBMFontLoader.h +++ b/native/cocos/editor-support/cocosbuilder/CCLabelBMFontLoader.h @@ -23,9 +23,9 @@ public: protected: CCB_VIRTUAL_NEW_AUTORELEASE_CREATECCNODE_METHOD(cocos2d::Label); - virtual void onHandlePropTypeColor3(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, cocos2d::Color3B pColor3B, CCBReader * ccbReader); + virtual void onHandlePropTypeColor3(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, const cocos2d::Color3B& pColor3B, CCBReader * ccbReader); virtual void onHandlePropTypeByte(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, unsigned char pByte, CCBReader * ccbReader); - virtual void onHandlePropTypeBlendFunc(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, cocos2d::BlendFunc pBlendFunc, CCBReader * ccbReader); + virtual void onHandlePropTypeBlendFunc(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, const cocos2d::BlendFunc& pBlendFunc, CCBReader * ccbReader); virtual void onHandlePropTypeFntFile(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, const char* pFntFile, CCBReader * ccbReader); virtual void onHandlePropTypeText(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, const char* pText, CCBReader * ccbReader); }; diff --git a/native/cocos/editor-support/cocosbuilder/CCLabelTTFLoader.cpp b/native/cocos/editor-support/cocosbuilder/CCLabelTTFLoader.cpp index ac11c90760..b57b47a8ef 100644 --- a/native/cocos/editor-support/cocosbuilder/CCLabelTTFLoader.cpp +++ b/native/cocos/editor-support/cocosbuilder/CCLabelTTFLoader.cpp @@ -14,7 +14,7 @@ using namespace cocos2d; namespace cocosbuilder { -void LabelTTFLoader::onHandlePropTypeColor3(Node * pNode, Node * pParent, const char * pPropertyName, Color3B pColor3B, CCBReader * ccbReader) { +void LabelTTFLoader::onHandlePropTypeColor3(Node * pNode, Node * pParent, const char * pPropertyName, const Color3B& pColor3B, CCBReader * ccbReader) { if(strcmp(pPropertyName, PROPERTY_COLOR) == 0) { ((Label *)pNode)->setColor(pColor3B); } else { @@ -30,7 +30,7 @@ void LabelTTFLoader::onHandlePropTypeByte(Node * pNode, Node * pParent, const ch } } -void LabelTTFLoader::onHandlePropTypeBlendFunc(Node * pNode, Node * pParent, const char * pPropertyName, BlendFunc pBlendFunc, CCBReader * ccbReader) { +void LabelTTFLoader::onHandlePropTypeBlendFunc(Node * pNode, Node * pParent, const char * pPropertyName, const BlendFunc& pBlendFunc, CCBReader * ccbReader) { if(strcmp(pPropertyName, PROPERTY_BLENDFUNC) == 0) { ((Label *)pNode)->setBlendFunc(pBlendFunc); } else { @@ -72,7 +72,7 @@ void LabelTTFLoader::onHandlePropTypeIntegerLabeled(Node * pNode, Node * pParent } } -void LabelTTFLoader::onHandlePropTypeSize(Node * pNode, Node * pParent, const char * pPropertyName, Size size, CCBReader * ccbReader) { +void LabelTTFLoader::onHandlePropTypeSize(Node * pNode, Node * pParent, const char * pPropertyName, const Size& size, CCBReader * ccbReader) { if(strcmp(pPropertyName, PROPERTY_DIMENSIONS) == 0) { ((Label *)pNode)->setDimensions(size.width,size.height); } else { diff --git a/native/cocos/editor-support/cocosbuilder/CCLabelTTFLoader.h b/native/cocos/editor-support/cocosbuilder/CCLabelTTFLoader.h index 40899bcba3..34bb3e3dc8 100644 --- a/native/cocos/editor-support/cocosbuilder/CCLabelTTFLoader.h +++ b/native/cocos/editor-support/cocosbuilder/CCLabelTTFLoader.h @@ -23,14 +23,14 @@ public: protected: CCB_VIRTUAL_NEW_AUTORELEASE_CREATECCNODE_METHOD(cocos2d::Label); - virtual void onHandlePropTypeColor3(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, cocos2d::Color3B pColor3B, CCBReader * ccbReader); + virtual void onHandlePropTypeColor3(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, const cocos2d::Color3B& pColor3B, CCBReader * ccbReader); virtual void onHandlePropTypeByte(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, unsigned char pByte, CCBReader * ccbReader); - virtual void onHandlePropTypeBlendFunc(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, cocos2d::BlendFunc pBlendFunc, CCBReader * ccbReader); + virtual void onHandlePropTypeBlendFunc(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, const cocos2d::BlendFunc& pBlendFunc, CCBReader * ccbReader); virtual void onHandlePropTypeFontTTF(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, const char * pFontTTF, CCBReader * ccbReader); virtual void onHandlePropTypeText(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, const char * pText, CCBReader * ccbReader); virtual void onHandlePropTypeFloatScale(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, float pFloatScale, CCBReader * ccbReader); virtual void onHandlePropTypeIntegerLabeled(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, int pIntegerLabeled, CCBReader * ccbReader); - virtual void onHandlePropTypeSize(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, cocos2d::Size pSize, CCBReader * ccbReader); + virtual void onHandlePropTypeSize(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, const cocos2d::Size& pSize, CCBReader * ccbReader); }; } diff --git a/native/cocos/editor-support/cocosbuilder/CCLayerColorLoader.cpp b/native/cocos/editor-support/cocosbuilder/CCLayerColorLoader.cpp index 1fb954d103..ad1068d847 100644 --- a/native/cocos/editor-support/cocosbuilder/CCLayerColorLoader.cpp +++ b/native/cocos/editor-support/cocosbuilder/CCLayerColorLoader.cpp @@ -8,7 +8,7 @@ namespace cocosbuilder { #define PROPERTY_OPACITY "opacity" #define PROPERTY_BLENDFUNC "blendFunc" -void LayerColorLoader::onHandlePropTypeColor3(Node * pNode, Node * pParent, const char * pPropertyName, Color3B pColor3B, CCBReader * ccbReader) { +void LayerColorLoader::onHandlePropTypeColor3(Node * pNode, Node * pParent, const char * pPropertyName, const Color3B& pColor3B, CCBReader * ccbReader) { if(strcmp(pPropertyName, PROPERTY_COLOR) == 0) { ((LayerColor *)pNode)->setColor(pColor3B); } else { @@ -24,7 +24,7 @@ void LayerColorLoader::onHandlePropTypeByte(Node * pNode, Node * pParent, const } } -void LayerColorLoader::onHandlePropTypeBlendFunc(Node * pNode, Node * pParent, const char * pPropertyName, BlendFunc pBlendFunc, CCBReader * ccbReader) { +void LayerColorLoader::onHandlePropTypeBlendFunc(Node * pNode, Node * pParent, const char * pPropertyName, const BlendFunc& pBlendFunc, CCBReader * ccbReader) { if(strcmp(pPropertyName, PROPERTY_BLENDFUNC) == 0) { ((LayerColor *)pNode)->setBlendFunc(pBlendFunc); } else { diff --git a/native/cocos/editor-support/cocosbuilder/CCLayerColorLoader.h b/native/cocos/editor-support/cocosbuilder/CCLayerColorLoader.h index 628ac0d737..0516334615 100644 --- a/native/cocos/editor-support/cocosbuilder/CCLayerColorLoader.h +++ b/native/cocos/editor-support/cocosbuilder/CCLayerColorLoader.h @@ -20,9 +20,9 @@ public: protected: CCB_VIRTUAL_NEW_AUTORELEASE_CREATECCNODE_METHOD(cocos2d::LayerColor); - virtual void onHandlePropTypeColor3(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, cocos2d::Color3B pColor3B, CCBReader * ccbReader); + virtual void onHandlePropTypeColor3(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, const cocos2d::Color3B& pColor3B, CCBReader * ccbReader); virtual void onHandlePropTypeByte(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, unsigned char pByte, CCBReader * ccbReader); - virtual void onHandlePropTypeBlendFunc(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, cocos2d::BlendFunc pBlendFunc, CCBReader * ccbReader); + virtual void onHandlePropTypeBlendFunc(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, const cocos2d::BlendFunc& pBlendFunc, CCBReader * ccbReader); }; } diff --git a/native/cocos/editor-support/cocosbuilder/CCLayerGradientLoader.cpp b/native/cocos/editor-support/cocosbuilder/CCLayerGradientLoader.cpp index 07569789c3..ccc577aec1 100644 --- a/native/cocos/editor-support/cocosbuilder/CCLayerGradientLoader.cpp +++ b/native/cocos/editor-support/cocosbuilder/CCLayerGradientLoader.cpp @@ -11,7 +11,7 @@ using namespace cocos2d; namespace cocosbuilder { -void LayerGradientLoader::onHandlePropTypeColor3(Node * pNode, Node * pParent, const char * pPropertyName, Color3B pColor3B, CCBReader * ccbReader) { +void LayerGradientLoader::onHandlePropTypeColor3(Node * pNode, Node * pParent, const char * pPropertyName, const Color3B& pColor3B, CCBReader * ccbReader) { if(strcmp(pPropertyName, PROPERTY_STARTCOLOR) == 0) { ((LayerGradient *)pNode)->setStartColor(pColor3B); } else if(strcmp(pPropertyName, PROPERTY_ENDCOLOR) == 0) { @@ -31,7 +31,7 @@ void LayerGradientLoader::onHandlePropTypeByte(Node * pNode, Node * pParent, con } } -void LayerGradientLoader::onHandlePropTypeBlendFunc(Node * pNode, Node * pParent, const char * pPropertyName, BlendFunc pBlendFunc, CCBReader * ccbReader) { +void LayerGradientLoader::onHandlePropTypeBlendFunc(Node * pNode, Node * pParent, const char * pPropertyName, const BlendFunc& pBlendFunc, CCBReader * ccbReader) { if(strcmp(pPropertyName, PROPERTY_BLENDFUNC) == 0) { ((LayerGradient *)pNode)->setBlendFunc(pBlendFunc); } else { diff --git a/native/cocos/editor-support/cocosbuilder/CCLayerGradientLoader.h b/native/cocos/editor-support/cocosbuilder/CCLayerGradientLoader.h index 7db02feda0..01d3cd99ab 100644 --- a/native/cocos/editor-support/cocosbuilder/CCLayerGradientLoader.h +++ b/native/cocos/editor-support/cocosbuilder/CCLayerGradientLoader.h @@ -20,10 +20,10 @@ public: protected: CCB_VIRTUAL_NEW_AUTORELEASE_CREATECCNODE_METHOD(cocos2d::LayerGradient); - virtual void onHandlePropTypeColor3(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, cocos2d::Color3B pColor3B, CCBReader * ccbReader); + virtual void onHandlePropTypeColor3(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, const cocos2d::Color3B& pColor3B, CCBReader * ccbReader); virtual void onHandlePropTypeByte(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, unsigned char pByte, CCBReader * ccbReader); virtual void onHandlePropTypePoint(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, const cocos2d::Vec2& pPoint, CCBReader * ccbReader); - virtual void onHandlePropTypeBlendFunc(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, cocos2d::BlendFunc pBlendFunc, CCBReader * ccbReader); + virtual void onHandlePropTypeBlendFunc(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, const cocos2d::BlendFunc& pBlendFunc, CCBReader * ccbReader); }; } diff --git a/native/cocos/editor-support/cocosbuilder/CCParticleSystemQuadLoader.cpp b/native/cocos/editor-support/cocosbuilder/CCParticleSystemQuadLoader.cpp index 1350758f5b..8e7e375a90 100644 --- a/native/cocos/editor-support/cocosbuilder/CCParticleSystemQuadLoader.cpp +++ b/native/cocos/editor-support/cocosbuilder/CCParticleSystemQuadLoader.cpp @@ -117,7 +117,7 @@ void ParticleSystemQuadLoader::onHandlePropTypeColor4FVar(Node * pNode, Node * p } } -void ParticleSystemQuadLoader::onHandlePropTypeBlendFunc(Node * pNode, Node * pParent, const char * pPropertyName, BlendFunc pBlendFunc, CCBReader * ccbReader) { +void ParticleSystemQuadLoader::onHandlePropTypeBlendFunc(Node * pNode, Node * pParent, const char * pPropertyName, const BlendFunc& pBlendFunc, CCBReader * ccbReader) { if(strcmp(pPropertyName, PROPERTY_BLENDFUNC) == 0) { ((ParticleSystemQuad *)pNode)->setBlendFunc(pBlendFunc); } else { diff --git a/native/cocos/editor-support/cocosbuilder/CCParticleSystemQuadLoader.h b/native/cocos/editor-support/cocosbuilder/CCParticleSystemQuadLoader.h index 60d20d8aa5..0a81f7f041 100644 --- a/native/cocos/editor-support/cocosbuilder/CCParticleSystemQuadLoader.h +++ b/native/cocos/editor-support/cocosbuilder/CCParticleSystemQuadLoader.h @@ -64,7 +64,7 @@ protected: * @js NA * @lua NA */ - virtual void onHandlePropTypeBlendFunc(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, cocos2d::BlendFunc pBlendFunc, CCBReader * ccbReader); + virtual void onHandlePropTypeBlendFunc(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, const cocos2d::BlendFunc& pBlendFunc, CCBReader * ccbReader); /** * @js NA * @lua NA diff --git a/native/cocos/editor-support/cocosbuilder/CCScale9SpriteLoader.cpp b/native/cocos/editor-support/cocosbuilder/CCScale9SpriteLoader.cpp index 71f1fdcd53..a479185135 100644 --- a/native/cocos/editor-support/cocosbuilder/CCScale9SpriteLoader.cpp +++ b/native/cocos/editor-support/cocosbuilder/CCScale9SpriteLoader.cpp @@ -25,7 +25,7 @@ void Scale9SpriteLoader::onHandlePropTypeSpriteFrame(Node * pNode, Node * pParen } } -void Scale9SpriteLoader::onHandlePropTypeColor3(Node * pNode, Node * pParent, const char * pPropertyName, Color3B pColor3B, CCBReader * ccbReader) { +void Scale9SpriteLoader::onHandlePropTypeColor3(Node * pNode, Node * pParent, const char * pPropertyName, const Color3B& pColor3B, CCBReader * ccbReader) { if(strcmp(pPropertyName, PROPERTY_COLOR) == 0) { ((cocos2d::ui::Scale9Sprite *)pNode)->setColor(pColor3B); } else { @@ -41,7 +41,7 @@ void Scale9SpriteLoader::onHandlePropTypeByte(Node * pNode, Node * pParent, cons } } -void Scale9SpriteLoader::onHandlePropTypeBlendFunc(Node * pNode, Node * pParent, const char * pPropertyName, BlendFunc pBlendFunc, CCBReader * ccbReader) { +void Scale9SpriteLoader::onHandlePropTypeBlendFunc(Node * pNode, Node * pParent, const char * pPropertyName, const BlendFunc& pBlendFunc, CCBReader * ccbReader) { if(strcmp(pPropertyName, PROPERTY_BLENDFUNC) == 0) { // TODO Not exported by CocosBuilder yet! // ((Scale9Sprite *)pNode)->setBlendFunc(pBlendFunc); @@ -50,7 +50,7 @@ void Scale9SpriteLoader::onHandlePropTypeBlendFunc(Node * pNode, Node * pParent, } } -void Scale9SpriteLoader::onHandlePropTypeSize(Node * pNode, Node * pParent, const char * pPropertyName, Size pSize, CCBReader * ccbReader) { +void Scale9SpriteLoader::onHandlePropTypeSize(Node * pNode, Node * pParent, const char * pPropertyName, const Size& pSize, CCBReader * ccbReader) { if(strcmp(pPropertyName, PROPERTY_CONTENTSIZE) == 0) { //((Scale9Sprite *)pNode)->setContentSize(pSize); } else if(strcmp(pPropertyName, PROPERTY_PREFEREDSIZE) == 0) { diff --git a/native/cocos/editor-support/cocosbuilder/CCScale9SpriteLoader.h b/native/cocos/editor-support/cocosbuilder/CCScale9SpriteLoader.h index 36a71666c4..9990d9e790 100644 --- a/native/cocos/editor-support/cocosbuilder/CCScale9SpriteLoader.h +++ b/native/cocos/editor-support/cocosbuilder/CCScale9SpriteLoader.h @@ -39,7 +39,7 @@ protected: * @js NA * @lua NA */ - virtual void onHandlePropTypeColor3(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, cocos2d::Color3B pColor3B, CCBReader * ccbReader); + virtual void onHandlePropTypeColor3(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, const cocos2d::Color3B& pColor3B, CCBReader * ccbReader); /** * @js NA * @lua NA @@ -49,7 +49,7 @@ protected: * @js NA * @lua NA */ - virtual void onHandlePropTypeBlendFunc(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, cocos2d::BlendFunc pBlendFunc, CCBReader * ccbReader); + virtual void onHandlePropTypeBlendFunc(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, const cocos2d::BlendFunc& pBlendFunc, CCBReader * ccbReader); /** * @js NA * @lua NA @@ -59,7 +59,7 @@ protected: * @js NA * @lua NA */ - virtual void onHandlePropTypeSize(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, cocos2d::Size pSize, CCBReader * ccbReader); + virtual void onHandlePropTypeSize(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, const cocos2d::Size& pSize, CCBReader * ccbReader); /** * @js NA * @lua NA diff --git a/native/cocos/editor-support/cocosbuilder/CCScrollViewLoader.cpp b/native/cocos/editor-support/cocosbuilder/CCScrollViewLoader.cpp index fcbf700fef..bd33537883 100644 --- a/native/cocos/editor-support/cocosbuilder/CCScrollViewLoader.cpp +++ b/native/cocos/editor-support/cocosbuilder/CCScrollViewLoader.cpp @@ -11,7 +11,7 @@ using namespace cocos2d::extension; namespace cocosbuilder { -void ScrollViewLoader::onHandlePropTypeSize(Node * pNode, Node * pParent, const char * pPropertyName, Size pSize, CCBReader * ccbReader) { +void ScrollViewLoader::onHandlePropTypeSize(Node * pNode, Node * pParent, const char * pPropertyName, const Size& pSize, CCBReader * ccbReader) { if(strcmp(pPropertyName, PROPERTY_CONTENTSIZE) == 0) { ((ScrollView *)pNode)->setViewSize(pSize); } else { diff --git a/native/cocos/editor-support/cocosbuilder/CCScrollViewLoader.h b/native/cocos/editor-support/cocosbuilder/CCScrollViewLoader.h index 5ad183e7b1..63595359b9 100644 --- a/native/cocos/editor-support/cocosbuilder/CCScrollViewLoader.h +++ b/native/cocos/editor-support/cocosbuilder/CCScrollViewLoader.h @@ -24,7 +24,7 @@ public: protected: CCB_VIRTUAL_NEW_AUTORELEASE_CREATECCNODE_METHOD(cocos2d::extension::ScrollView); - virtual void onHandlePropTypeSize(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, cocos2d::Size pSize, CCBReader * ccbReader); + virtual void onHandlePropTypeSize(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, const cocos2d::Size& pSize, CCBReader * ccbReader); virtual void onHandlePropTypeCCBFile(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, cocos2d::Node * pCCBFileNode, CCBReader * ccbReader); virtual void onHandlePropTypeCheck(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, bool pCheck, CCBReader * ccbReader); virtual void onHandlePropTypeFloat(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, float pFloat, CCBReader * ccbReader); diff --git a/native/cocos/editor-support/cocosbuilder/CCSpriteLoader.cpp b/native/cocos/editor-support/cocosbuilder/CCSpriteLoader.cpp index 8602c009a2..d71bb10dc1 100644 --- a/native/cocos/editor-support/cocosbuilder/CCSpriteLoader.cpp +++ b/native/cocos/editor-support/cocosbuilder/CCSpriteLoader.cpp @@ -31,7 +31,7 @@ void SpriteLoader::onHandlePropTypeFlip(Node * pNode, Node * pParent, const char } } -void SpriteLoader::onHandlePropTypeColor3(Node * pNode, Node * pParent, const char * pPropertyName, Color3B pColor3B, CCBReader * ccbReader) { +void SpriteLoader::onHandlePropTypeColor3(Node * pNode, Node * pParent, const char * pPropertyName, const Color3B& pColor3B, CCBReader * ccbReader) { if(strcmp(pPropertyName, PROPERTY_COLOR) == 0) { ((Sprite *)pNode)->setColor(pColor3B); } else { @@ -47,7 +47,7 @@ void SpriteLoader::onHandlePropTypeByte(Node * pNode, Node * pParent, const char } } -void SpriteLoader::onHandlePropTypeBlendFunc(Node * pNode, Node * pParent, const char * pPropertyName, BlendFunc pBlendFunc, CCBReader * ccbReader) { +void SpriteLoader::onHandlePropTypeBlendFunc(Node * pNode, Node * pParent, const char * pPropertyName, const BlendFunc& pBlendFunc, CCBReader * ccbReader) { if(strcmp(pPropertyName, PROPERTY_BLENDFUNC) == 0) { ((Sprite *)pNode)->setBlendFunc(pBlendFunc); } else { diff --git a/native/cocos/editor-support/cocosbuilder/CCSpriteLoader.h b/native/cocos/editor-support/cocosbuilder/CCSpriteLoader.h index 68717e6efb..207189dcf2 100644 --- a/native/cocos/editor-support/cocosbuilder/CCSpriteLoader.h +++ b/native/cocos/editor-support/cocosbuilder/CCSpriteLoader.h @@ -24,9 +24,9 @@ public: protected: CCB_VIRTUAL_NEW_AUTORELEASE_CREATECCNODE_METHOD(cocos2d::Sprite); - virtual void onHandlePropTypeColor3(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, cocos2d::Color3B pColor3B, CCBReader * ccbReader); + virtual void onHandlePropTypeColor3(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, const cocos2d::Color3B& pColor3B, CCBReader * ccbReader); virtual void onHandlePropTypeByte(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, unsigned char pByte, CCBReader * ccbReader); - virtual void onHandlePropTypeBlendFunc(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, cocos2d::BlendFunc pCCBBlendFunc, CCBReader * ccbReader); + virtual void onHandlePropTypeBlendFunc(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, const cocos2d::BlendFunc& pCCBBlendFunc, CCBReader * ccbReader); virtual void onHandlePropTypeSpriteFrame(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, cocos2d::SpriteFrame * pSpriteFrame, CCBReader * ccbReader); virtual void onHandlePropTypeFlip(cocos2d::Node * pNode, cocos2d::Node * pParent, const char * pPropertyName, bool * pFlip, CCBReader * ccbReader); }; diff --git a/native/cocos/scripting/js-bindings/manual/js_manual_conversions.cpp b/native/cocos/scripting/js-bindings/manual/js_manual_conversions.cpp index bbec3348ab..980f2476c0 100644 --- a/native/cocos/scripting/js-bindings/manual/js_manual_conversions.cpp +++ b/native/cocos/scripting/js-bindings/manual/js_manual_conversions.cpp @@ -2449,7 +2449,7 @@ jsval vector_vec2_to_jsval(JSContext *cx, const std::vector& v) JS::RootedObject jsretArr(cx, JS_NewArrayObject(cx, v.size())); int i = 0; - for (const cocos2d::Vec2 obj : v) + for (const cocos2d::Vec2& obj : v) { JS::RootedValue arrElement(cx); arrElement = vector2_to_jsval(cx, obj);