fix warning (#20146)

* fix warning
fix warning

* remove integer type constructor for Vec2

Author: Mee-gu

cocos/2d/CCActionTiledGrid.cpp

@@ -623,7 +623,7 @@ void TurnOffTiles::update(float time)
     for (unsigned int i = 0; i < _tilesCount; i++ )
     {
         t = _tilesOrder[i];
-        Vec2 tilePos( (unsigned int)(t / _gridSize.height), t % (unsigned int)_gridSize.height );
+        Vec2 tilePos((t /_gridSize.height), (float)(t % (int)_gridSize.height));
 
         if ( i < l )
         {
@@ -795,9 +795,9 @@ void SplitRows::startWithTarget(Node *target)
 
 void SplitRows::update(float time)
 {
-    for (unsigned int j = 0; j < _gridSize.height; ++j)
+    for (int j = 0; j < _gridSize.height; ++j)
     {
-        Quad3 coords = getOriginalTile(Vec2(0, j));
+        Quad3 coords = getOriginalTile(Vec2(0.0f, (float)j));
         float    direction = 1;
 
         if ( (j % 2 ) == 0 )
@@ -810,7 +810,7 @@ void SplitRows::update(float time)
         coords.tl.x += direction * _winSize.width * time;
         coords.tr.x += direction * _winSize.width * time;
 
-        setTile(Vec2(0, j), coords);
+        setTile(Vec2(0.0f, (float)j), coords);
     }
 }
 
@@ -852,7 +852,7 @@ void SplitCols::update(float time)
 {
     for (unsigned int i = 0; i < _gridSize.width; ++i)
     {
-        Quad3 coords = getOriginalTile(Vec2(i, 0));
+        Quad3 coords = getOriginalTile(Vec2((float)i, 0.0f));
         float    direction = 1;
 
         if ( (i % 2 ) == 0 )
@@ -865,7 +865,7 @@ void SplitCols::update(float time)
         coords.tl.y += direction * _winSize.height * time;
         coords.tr.y += direction * _winSize.height * time;
 
-        setTile(Vec2(i, 0), coords);
+        setTile(Vec2((float)i, 0.0f), coords);
     }
 }
 

cocos/2d/CCAutoPolygon.cpp

@@ -249,13 +249,13 @@ unsigned int AutoPolygon::getSquareValue(unsigned int x, unsigned int y, const R
     //NOTE: due to the way we pick points from texture, rect needs to be smaller, otherwise it goes outside 1 pixel
     auto fixedRect = Rect(rect.origin, rect.size-Size(2,2));
 
-    Vec2 tl = Vec2(x-1, y-1);
+    Vec2 tl((float)x-1, (float)y-1);
     sv += (fixedRect.containsPoint(tl) && getAlphaByPos(tl) > threshold)? 1 : 0;
-    Vec2 tr = Vec2(x, y-1);
+    Vec2 tr((float)x, (float)y-1);
     sv += (fixedRect.containsPoint(tr) && getAlphaByPos(tr) > threshold)? 2 : 0;
-    Vec2 bl = Vec2(x-1, y);
+    Vec2 bl((float)x-1, (float)y);
     sv += (fixedRect.containsPoint(bl) && getAlphaByPos(bl) > threshold)? 4 : 0;
-    Vec2 br = Vec2(x, y);
+    Vec2 br((float)x, (float)y);
     sv += (fixedRect.containsPoint(br) && getAlphaByPos(br) > threshold)? 8 : 0;
     CCASSERT(sv != 0 && sv != 15, "square value should not be 0, or 15");
     return sv;

cocos/2d/CCLabel.cpp

@@ -1568,7 +1568,7 @@ void Label::updateContent()
                 // FIXME: system fonts don't report the height of the font correctly. only the size of the texture, which is POT
                 y += spriteSize.height / 2;
             // FIXME: Might not work with different vertical alignments
-            _underlineNode->drawLine(Vec2(0,y), Vec2(spriteSize.width,y), Color4F(_textSprite->getDisplayedColor()));
+            _underlineNode->drawLine(Vec2(0.0f,y), Vec2(spriteSize.width,y), Color4F(_textSprite->getDisplayedColor()));
         }
     }
 
@@ -1581,9 +1581,9 @@ void Label::updateContent()
     Vec2 vertices[4] =
     {
         Vec2::ZERO,
-        Vec2(_contentSize.width, 0),
+        Vec2(_contentSize.width, 0.0f),
         Vec2(_contentSize.width, _contentSize.height),
-        Vec2(0, _contentSize.height)
+        Vec2(0.0f, _contentSize.height)
     };
     _debugDrawNode->drawPoly(vertices, 4, true, Color4F::WHITE);
 #endif

cocos/2d/CCLabelAtlas.cpp

@@ -264,7 +264,7 @@ void LabelAtlas::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
         Vec2::ZERO,
         Vec2(size.width, 0),
         Vec2(size.width, size.height),
-        Vec2(0, size.height)
+        Vec2(0.0f, size.height)
     };
     _debugDrawNode->drawPoly(vertices, 4, true, Color4F(1.0, 1.0, 1.0, 1.0));
 }

cocos/2d/CCLayer.h

@@ -427,7 +427,7 @@ class CC_DLL LayerGradient : public LayerColor
     Color3B _endColor = Color3B::BLACK;
     uint8_t _startOpacity = 255;
     uint8_t _endOpacity = 255;
-    Vec2   _alongVector = {0, -1};
+    Vec2   _alongVector = {0.0f, -1.0f};
     bool    _compressedInterpolation = true;
 };
 

cocos/2d/CCParticleExamples.cpp

@@ -1076,7 +1076,7 @@ bool ParticleSnow::initWithTotalParticles(int numberOfParticles)
         // emitter position
         Size winSize = Director::getInstance()->getWinSize();
         this->setPosition(winSize.width/2, winSize.height + 10);
-        setPosVar(Vec2(winSize.width/2, 0));
+        setPosVar(Vec2(winSize.width/2, 0.0f));
 
         // angle
         _angle = -90;
@@ -1188,7 +1188,7 @@ bool ParticleRain::initWithTotalParticles(int numberOfParticles)
         // emitter position
         Size winSize = Director::getInstance()->getWinSize();
         this->setPosition(winSize.width/2, winSize.height);
-        setPosVar(Vec2(winSize.width/2, 0));
+        setPosVar(Vec2(winSize.width/2, 0.0f));
 
         // life of particles
         _life = 4.5f;

cocos/2d/CCTMXXMLParser.cpp

@@ -416,9 +416,9 @@ void TMXMapInfo::startElement(void* /*ctx*/, const char *name, const char **atts
     {
         TMXTilesetInfo* tileset = tmxMapInfo->getTilesets().back();
 
-        double tileOffsetX = attributeDict["x"].asDouble();
+        float tileOffsetX = attributeDict["x"].asFloat();
 
-        double tileOffsetY = attributeDict["y"].asDouble();
+        float tileOffsetY = attributeDict["y"].asFloat();
 
         tileset->_tileOffset = Vec2(tileOffsetX, tileOffsetY);
 

cocos/2d/CCTransition.cpp

@@ -360,7 +360,7 @@ void TransitionJumpZoom::onEnter()
     _inScene->setAnchorPoint(Vec2(0.5f, 0.5f));
     _outScene->setAnchorPoint(Vec2(0.5f, 0.5f));
 
-    ActionInterval *jump = JumpBy::create(_duration/4, Vec2(-s.width,0), s.width/4, 2);
+    ActionInterval *jump = JumpBy::create(_duration/4, Vec2(-s.width,0.0f), s.width/4, 2);
     ActionInterval *scaleIn = ScaleTo::create(_duration/4, 1.0f);
     ActionInterval *scaleOut = ScaleTo::create(_duration/4, 0.5f);
 
@@ -425,7 +425,7 @@ void TransitionMoveInL::onEnter()
 
 ActionInterval* TransitionMoveInL::action()
 {
-    return MoveTo::create(_duration, Vec2(0,0));
+    return MoveTo::create(_duration, Vec2(0.0f,0.0f));
 }
 
 ActionInterval* TransitionMoveInL::easeActionWithAction(ActionInterval* action)
@@ -569,13 +569,13 @@ void TransitionSlideInL::sceneOrder()
 void TransitionSlideInL:: initScenes()
 {
     Size s = Director::getInstance()->getWinSize();
-    _inScene->setPosition(-(s.width-ADJUST_FACTOR),0);
+    _inScene->setPosition(-(s.width-ADJUST_FACTOR),0.0f);
 }
 
 ActionInterval* TransitionSlideInL::action()
 {
     Size s = Director::getInstance()->getWinSize();
-    return MoveBy::create(_duration, Vec2(s.width-ADJUST_FACTOR,0));
+    return MoveBy::create(_duration, Vec2(s.width-ADJUST_FACTOR,0.0f));
 }
 
 ActionInterval* TransitionSlideInL::easeActionWithAction(ActionInterval* action)
@@ -632,7 +632,7 @@ void TransitionSlideInR::initScenes()
 ActionInterval* TransitionSlideInR:: action()
 {
     Size s = Director::getInstance()->getWinSize();
-    return MoveBy::create(_duration, Vec2(-(s.width-ADJUST_FACTOR),0));
+    return MoveBy::create(_duration, Vec2(-(s.width-ADJUST_FACTOR),0.0f));
 }
 
 
@@ -673,7 +673,7 @@ void TransitionSlideInT::initScenes()
 ActionInterval* TransitionSlideInT::action()
 {
     Size s = Director::getInstance()->getWinSize();
-    return MoveBy::create(_duration, Vec2(0,-(s.height-ADJUST_FACTOR)));
+    return MoveBy::create(_duration, Vec2(0.0f,-(s.height-ADJUST_FACTOR)));
 }
 
 //
@@ -713,7 +713,7 @@ void TransitionSlideInB:: initScenes()
 ActionInterval* TransitionSlideInB:: action()
 {
     Size s = Director::getInstance()->getWinSize();
-    return MoveBy::create(_duration, Vec2(0,s.height-ADJUST_FACTOR));
+    return MoveBy::create(_duration, Vec2(0.0f,s.height-ADJUST_FACTOR));
 }
 
 //

cocos/physics/CCPhysicsShape.h

@@ -388,7 +388,7 @@ class CC_DLL PhysicsShapeCircle : public PhysicsShape
      * @param   offset A Vec2 object, it is the offset from the body's center of gravity in body local coordinates.
      * @return  An autoreleased PhysicsShapeCircle object pointer.
      */
-    static PhysicsShapeCircle* create(float radius, const PhysicsMaterial& material = PHYSICSSHAPE_MATERIAL_DEFAULT, const Vec2& offset = Vec2(0, 0));
+    static PhysicsShapeCircle* create(float radius, const PhysicsMaterial& material = PHYSICSSHAPE_MATERIAL_DEFAULT, const Vec2& offset = Vec2(0.0f, 0.0f));
 
     /**
      * Calculate the area of a circle with specified radius.

cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.cpp

@@ -598,7 +598,7 @@ static int tolua_cocos2d_MenuItemToggle_create(lua_State* tolua_S)
             return 0;
         }
 
-        for (auto i = 0; i < argc; ++i)
+        for (int i = 0; i < argc; ++i)
         {
 #if COCOS2D_DEBUG >= 1
             if (!tolua_isusertype(tolua_S, i + 2,"cc.MenuItem",0,&tolua_err) )
@@ -2403,7 +2403,7 @@ int tolua_cocos2d_Node_setAnchorPoint(lua_State* tolua_S)
         if (!ok)
             return 0;
 
-        cobj->setAnchorPoint(cocos2d::Vec2(x,y));
+        cobj->setAnchorPoint(cocos2d::Vec2((float)x,(float)y));
         lua_settop(tolua_S, 1);
         return 1;
     }
@@ -7830,10 +7830,10 @@ static int tolua_cocos2d_Mat4_transformVector(lua_State* tolua_S)
             if (!ok)
                 return 0;
 
-            x = (float)tolua_tonumber(tolua_S, 2, 0);
-            y = (float)tolua_tonumber(tolua_S, 3, 0);
-            z = (float)tolua_tonumber(tolua_S, 4, 0);
-            w = (float)tolua_tonumber(tolua_S, 5, 0);
+            x = tolua_tonumber(tolua_S, 2, 0);
+            y = tolua_tonumber(tolua_S, 3, 0);
+            z = tolua_tonumber(tolua_S, 4, 0);
+            w = tolua_tonumber(tolua_S, 5, 0);
 
             mat.transformVector(x,y,z,w, &dst);
             vec3_to_luaval(tolua_S, dst);
@@ -8832,7 +8832,7 @@ static int tolua_cocos2d_bytearray_floatv(lua_State *L)
             }
             lua_pop(L, 1);
             lua_newtable(L);
-            for (size_t idx = 0; idx < arg.size(); idx++)
+            for (auto idx = 0; idx < arg.size(); idx++)
             {
                 lua_pushnumber(L, arg[idx]);
                 lua_rawseti(L, 1, idx + 1);