fix C4244 warning (#20162)

* fix C4244 warning

* fix warning C4244

* fix compile error

Author: Mee-gu

cocos/2d/CCActionCatmullRom.cpp

@@ -269,8 +269,8 @@ void CardinalSplineTo::update(float time)
     }
     else 
     {
-        p = time / _deltaT;
-        lt = (time - _deltaT * (float)p) / _deltaT;
+        p = (ssize_t)(time / _deltaT);
+        lt = (time - _deltaT * p) / _deltaT;
     }
 
     // Interpolate

cocos/2d/CCActionGrid3D.cpp

@@ -71,10 +71,11 @@ void Waves3D::update(float time)
     {
         for (j = 0; j < _gridSize.height + 1; ++j)
         {
-            Vec3 v = getOriginalVertex(Vec2(i ,j));
+            Vec2 pos((float)i, (float)j);
+            Vec3 v = getOriginalVertex(pos);
             v.z += (sinf((float)M_PI * time * _waves * 2 + (v.y+v.x) * 0.01f) * _amplitude * _amplitudeRate);
             //CCLOG("v.z offset is %f\n", (sinf((float)M_PI * time * _waves * 2 + (v.y+v.x) * .01f) * _amplitude * _amplitudeRate));
-            setVertex(Vec2(i, j), v);
+            setVertex(pos, v);
         }
     }
 }
@@ -347,7 +348,8 @@ void Lens3D::update(float /*time*/)
         {
             for (j = 0; j < _gridSize.height + 1; ++j)
             {
-                Vec3 v = getOriginalVertex(Vec2(i, j));
+                Vec2 pos((float)i, (float)j);
+                Vec3 v = getOriginalVertex(pos);
                 Vec2 vect = _position - Vec2(v.x, v.y);
                 float r = vect.getLength();
 
@@ -371,7 +373,7 @@ void Lens3D::update(float /*time*/)
                     }
                 }
 
-                setVertex(Vec2(i, j), v);
+                setVertex(pos, v);
             }
         }
 
@@ -439,7 +441,8 @@ void Ripple3D::update(float time)
     {
         for (j = 0; j < (_gridSize.height+1); ++j)
         {
-            Vec3 v = getOriginalVertex(Vec2(i, j));
+            Vec2 pos((float)i, (float)j);
+            Vec3 v = getOriginalVertex(pos);
             Vec2 vect = _position - Vec2(v.x,v.y);
             float r = vect.getLength();
 
@@ -450,7 +453,7 @@ void Ripple3D::update(float time)
                 v.z += (sinf( time*(float)M_PI * _waves * 2 + r * 0.1f) * _amplitude * _amplitudeRate * rate);
             }
 
-            setVertex(Vec2(i, j), v);
+            setVertex(pos, v);
         }
     }
 }
@@ -506,15 +509,16 @@ void Shaky3D::update(float /*time*/)
     {
         for (j = 0; j < (_gridSize.height+1); ++j)
         {
-            Vec3 v = getOriginalVertex(Vec2(i ,j));
+            Vec2 pos((float)i, (float)j);
+            Vec3 v = getOriginalVertex(pos);
             v.x += (rand() % (_randrange*2)) - _randrange;
             v.y += (rand() % (_randrange*2)) - _randrange;
             if (_shakeZ)
             {
                 v.z += (rand() % (_randrange*2)) - _randrange;
             }
 
-            setVertex(Vec2(i, j), v);
+            setVertex(pos, v);
         }
     }
 }
@@ -571,10 +575,11 @@ void Liquid::update(float time)
     {
         for (j = 1; j < _gridSize.height; ++j)
         {
-            Vec3 v = getOriginalVertex(Vec2(i, j));
+            Vec2 pos((float)i, (float)j);
+            Vec3 v = getOriginalVertex(pos);
             v.x = (v.x + (sinf(time * (float)M_PI * _waves * 2 + v.x * .01f) * _amplitude * _amplitudeRate));
             v.y = (v.y + (sinf(time * (float)M_PI * _waves * 2 + v.y * .01f) * _amplitude * _amplitudeRate));
-            setVertex(Vec2(i, j), v);
+            setVertex(pos, v);
         }
     }
 }
@@ -633,7 +638,8 @@ void Waves::update(float time)
     {
         for (j = 0; j < _gridSize.height + 1; ++j)
         {
-            Vec3 v = getOriginalVertex(Vec2(i, j));
+            Vec2 pos((float)i, (float)j);
+            Vec3 v = getOriginalVertex(pos);
 
             if (_vertical)
             {
@@ -645,7 +651,7 @@ void Waves::update(float time)
                 v.y = (v.y + (sinf(time * (float)M_PI * _waves * 2 + v.x * .01f) * _amplitude * _amplitudeRate));
             }
 
-            setVertex(Vec2(i, j), v);
+            setVertex(pos, v);
         }
     }
 }
@@ -709,7 +715,8 @@ void Twirl::update(float time)
     {
         for (j = 0; j < (_gridSize.height+1); ++j)
         {
-            Vec3 v = getOriginalVertex(Vec2(i ,j));
+            Vec2 pos((float)i, (float)j);
+            Vec3 v = getOriginalVertex(pos);
 
             Vec2 avg(i-(_gridSize.width/2.0f), j-(_gridSize.height/2.0f));
             float r = avg.getLength();
@@ -724,7 +731,7 @@ void Twirl::update(float time)
             v.x = c.x + d.x;
             v.y = c.y + d.y;
 
-            setVertex(Vec2(i ,j), v);
+            setVertex(pos, v);
         }
     }
 }

cocos/2d/CCActionInterval.cpp

@@ -2095,7 +2095,7 @@ Blink* Blink::reverse() const
 FadeIn* FadeIn::create(float d)
 {
     FadeIn* action = new (std::nothrow) FadeIn();
-    if (action && action->initWithDuration(d,255.0f))
+    if (action && action->initWithDuration(d,255))
     {
         action->autorelease();
         return action;
@@ -2132,7 +2132,7 @@ void FadeIn::startWithTarget(cocos2d::Node *target)
     if (nullptr != _reverseAction)
         this->_toOpacity = this->_reverseAction->_fromOpacity;
     else
-        _toOpacity = 255.0f;
+        _toOpacity = 255;
 
     if (target)
         _fromOpacity = target->getOpacity();
@@ -2145,7 +2145,7 @@ void FadeIn::startWithTarget(cocos2d::Node *target)
 FadeOut* FadeOut::create(float d)
 {
     FadeOut* action = new (std::nothrow) FadeOut();
-    if (action && action->initWithDuration(d,0.0f))
+    if (action && action->initWithDuration(d,0))
     {
         action->autorelease();
         return action;
@@ -2168,7 +2168,7 @@ void FadeOut::startWithTarget(cocos2d::Node *target)
     if (nullptr != _reverseAction)
         _toOpacity = _reverseAction->_fromOpacity;
     else
-        _toOpacity = 0.0f;
+        _toOpacity = 0;
 
     if (target)
         _fromOpacity = target->getOpacity();

cocos/2d/CCActionPageTurn3D.cpp

@@ -74,7 +74,7 @@ void PageTurn3D::update(float time)
     float deltaTheta = sqrtf(time);
     float theta = deltaTheta > 0.5f ? (float)M_PI_2*deltaTheta : (float)M_PI_2*(1-deltaTheta);
 
-    float rotateByYAxis = (2-time)* M_PI;
+    float rotateByYAxis = (2-time)* (float)M_PI;
 
     float sinTheta = sinf(theta);
     float cosTheta = cosf(theta);
@@ -83,8 +83,9 @@ void PageTurn3D::update(float time)
     {
         for (int j = 0; j <= _gridSize.height; ++j)
         {
+            Vec2 pos((float)i, (float)j);
             // Get original vertex
-            Vec3 p = getOriginalVertex(Vec2(i ,j));
+            Vec3 p = getOriginalVertex(pos);
 
             p.x -= getGridRect().origin.x;
             float R = sqrtf((p.x * p.x) + ((p.y - ay) * (p.y - ay)));
@@ -124,7 +125,7 @@ void PageTurn3D::update(float time)
 
             // Set new coords
             p.x += getGridRect().origin.x;
-            setVertex(Vec2(i, j), p);
+            setVertex(pos, p);
 
         }
     }