Skip to content

Commit 965ea37

Browse files
minggominggo
authored
Merge pull request #20139 from Mee-gu/fixWarning
fix warning
2 parents 00f8713 + 0dbe341 commit 965ea37

File tree

4 files changed

+44
-44
lines changed

4 files changed

+44
-44
lines changed

‎cocos/editor-support/cocostudio/ActionTimeline/CCBoneNode.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,8 @@ class CC_STUDIO_DLL BoneNode : public cocos2d::Node, public cocos2d::BlendProtoc
215215

216216
bool _isRackShow = false;
217217
cocos2d::Color4F _rackColor = cocos2d::Color4F::WHITE;
218-
int _rackLength = 50;
219-
int _rackWidth = 20;
218+
float _rackLength = 50.0f;
219+
float _rackWidth = 20.0f;
220220

221221
cocos2d::Vector<BoneNode*> _childBones;
222222
cocos2d::Vector<SkinNode*> _boneSkins;

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

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2798,7 +2798,7 @@ static int tolua_cocos2d_Spawn_create(lua_State* tolua_S)
27982798
if (argc > 0)
27992799
{
28002800
Vector<FiniteTimeAction*> array;
2801-
uint32_t i = 1;
2801+
int i = 1;
28022802

28032803
if (1 == argc && tolua_istable(tolua_S, 2, 0, &tolua_err))
28042804
{
@@ -2890,7 +2890,7 @@ int lua_cocos2d_CardinalSplineBy_create(lua_State* tolua_S)
28902890
}
28912891

28922892
CC_SAFE_DELETE_ARRAY(arr);
2893-
CardinalSplineBy* tolua_ret = CardinalSplineBy::create(dur, points, ten);
2893+
CardinalSplineBy* tolua_ret = CardinalSplineBy::create((float)dur, points, (float)ten);
28942894
if (NULL != tolua_ret)
28952895
{
28962896
int nID = (tolua_ret) ? (int)tolua_ret->_ID : -1;
@@ -2954,7 +2954,7 @@ int tolua_cocos2d_CatmullRomBy_create(lua_State* tolua_S)
29542954
}
29552955

29562956
CC_SAFE_DELETE_ARRAY(arr);
2957-
CatmullRomBy* tolua_ret = CatmullRomBy::create(dur, points);
2957+
CatmullRomBy* tolua_ret = CatmullRomBy::create((float)dur, points);
29582958
if (NULL != tolua_ret)
29592959
{
29602960
int nID = (tolua_ret) ? (int)tolua_ret->_ID : -1;
@@ -3018,7 +3018,7 @@ int tolua_cocos2d_CatmullRomTo_create(lua_State* tolua_S)
30183018
}
30193019

30203020
CC_SAFE_DELETE_ARRAY(arr);
3021-
CatmullRomTo* tolua_ret = CatmullRomTo::create(dur, points);
3021+
CatmullRomTo* tolua_ret = CatmullRomTo::create((float)dur, points);
30223022
if (NULL != tolua_ret)
30233023
{
30243024
int nID = (tolua_ret) ? (int)tolua_ret->_ID : -1;
@@ -3079,7 +3079,7 @@ int tolua_cocos2d_BezierBy_create(lua_State* tolua_S)
30793079
config.endPosition = arr[2];
30803080
CC_SAFE_DELETE_ARRAY(arr);
30813081

3082-
BezierBy* tolua_ret = BezierBy::create(t, config);
3082+
BezierBy* tolua_ret = BezierBy::create((float)t, config);
30833083
if (NULL != tolua_ret)
30843084
{
30853085
int nID = (tolua_ret) ? (int)tolua_ret->_ID : -1;
@@ -3139,7 +3139,7 @@ int tolua_cocos2d_BezierTo_create(lua_State* tolua_S)
31393139
config.endPosition = arr[2];
31403140
CC_SAFE_DELETE_ARRAY(arr);
31413141

3142-
BezierTo* tolua_ret = BezierTo::create(t, config);
3142+
BezierTo* tolua_ret = BezierTo::create((float)t, config);
31433143
if (NULL != tolua_ret)
31443144
{
31453145
int nID = (tolua_ret) ? (int)tolua_ret->_ID : -1;
@@ -3194,7 +3194,7 @@ static int tolua_cocos2dx_DrawNode_drawPolygon(lua_State* tolua_S)
31943194
goto tolua_lerror;
31953195
}
31963196
#endif
3197-
size_t size = lua_tonumber(tolua_S, 3);
3197+
int size = lua_tointeger(tolua_S, 3);
31983198
if ( size > 0 )
31993199
{
32003200
cocos2d::Vec2* points = new (std::nothrow) cocos2d::Vec2[size];
@@ -3287,7 +3287,7 @@ int tolua_cocos2dx_DrawNode_drawSolidPoly(lua_State* tolua_S)
32873287
if (NULL == points)
32883288
return 0;
32893289

3290-
for (int i = 0; i < size; i++)
3290+
for (unsigned int i = 0; i < size; i++)
32913291
{
32923292
lua_pushnumber(tolua_S,i + 1);
32933293
lua_gettable(tolua_S,2);
@@ -3366,7 +3366,7 @@ int tolua_cocos2dx_DrawNode_drawPoly(lua_State* tolua_S)
33663366
if (NULL == points)
33673367
return 0;
33683368

3369-
for (int i = 0; i < size; i++)
3369+
for (unsigned int i = 0; i < size; i++)
33703370
{
33713371
lua_pushnumber(tolua_S,i + 1);
33723372
lua_gettable(tolua_S,2);
@@ -3464,7 +3464,7 @@ int tolua_cocos2dx_DrawNode_drawCardinalSpline(lua_State* tolua_S)
34643464
ok &= luaval_to_color4f(tolua_S, 5, &arg3, "cc.DrawNode:drawCardinalSpline");
34653465
if(!ok)
34663466
return 0;
3467-
self->drawCardinalSpline(config, arg1, arg2, arg3);
3467+
self->drawCardinalSpline(config, (float)arg1, arg2, arg3);
34683468
return 0;
34693469
}
34703470
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.DrawNode:drawCardinalSpline",argc, 4);
@@ -3574,7 +3574,7 @@ int tolua_cocos2dx_DrawNode_drawPoints(lua_State* tolua_S)
35743574
if (NULL == points)
35753575
return 0;
35763576

3577-
for (int i = 0; i < size; i++)
3577+
for (unsigned int i = 0; i < size; i++)
35783578
{
35793579
lua_pushnumber(tolua_S,i + 1);
35803580
lua_gettable(tolua_S,2);
@@ -3614,7 +3614,7 @@ int tolua_cocos2dx_DrawNode_drawPoints(lua_State* tolua_S)
36143614
if (nullptr == points)
36153615
return 0;
36163616

3617-
for (int i = 0; i < size; i++)
3617+
for (unsigned int i = 0; i < size; i++)
36183618
{
36193619
lua_pushnumber(tolua_S,i + 1);
36203620
lua_gettable(tolua_S,2);
@@ -6153,8 +6153,8 @@ static int lua_cocos2dx_Label_createWithTTF00(lua_State* L)
61536153
return 0;
61546154

61556155

6156-
int alignment = tolua_tonumber(L, 4, 1);
6157-
int lineSize = tolua_tonumber(L, 5, 0);
6156+
int alignment = (int)tolua_tonumber(L, 4, 1);
6157+
int lineSize = (int)tolua_tonumber(L, 5, 0);
61586158
cocos2d::Label* ret = cocos2d::Label::createWithTTF(ttfConfig, text, static_cast<TextHAlignment>(alignment), lineSize);
61596159
int ID = ret ? (int)(ret->_ID) : -1;
61606160
int* luaID = ret ? &(ret->_luaID) : nullptr;
@@ -6197,7 +6197,7 @@ static int lua_cocos2dx_Label_createWithTTF01(lua_State* L)
61976197
{
61986198
std::string text = tolua_tostring(L, 2, "");
61996199
std::string fontFile = tolua_tostring(L, 3, "");
6200-
float fontSize = tolua_tonumber(L, 4, 0);
6200+
float fontSize = (float)tolua_tonumber(L, 4, 0);
62016201
cocos2d::Size dimensions = cocos2d::Size::ZERO;
62026202
if (lua_istable(L, 5))
62036203
{
@@ -6420,7 +6420,7 @@ static int lua_cocos2dx_Console_addCommand(lua_State* tolua_S)
64206420
handler = ( toluafix_ref_function(tolua_S,3,0));
64216421
ScriptHandlerMgr::getInstance()->addCustomHandler((void*)cobj, handler);
64226422

6423-
struct Console::Command outValue = {
6423+
Console::Command outValue = {
64246424
name,
64256425
help,
64266426
[=](int fd, const std::string& args)
@@ -6642,7 +6642,7 @@ int lua_cocos2dx_TMXLayer_setTiles(lua_State* tolua_S)
66426642
return 0;
66436643
}
66446644

6645-
for (int i = 1 ; i <= len; i++)
6645+
for (size_t i = 1 ; i <= len; i++)
66466646
{
66476647
arg0[i - 1] = (uint32_t)tolua_tofieldnumber(tolua_S, 2, i, 0);
66486648
}
@@ -7513,7 +7513,7 @@ int lua_cocos2dx_AutoPolygon_generatePolygon(lua_State* tolua_S)
75137513
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_AutoPolygon_generatePolygon'", nullptr);
75147514
return 0;
75157515
}
7516-
cocos2d::PolygonInfo* ret = new (std::nothrow) cocos2d::PolygonInfo(cocos2d::AutoPolygon::generatePolygon(arg0, arg1, arg2));
7516+
cocos2d::PolygonInfo* ret = new (std::nothrow) cocos2d::PolygonInfo(cocos2d::AutoPolygon::generatePolygon(arg0, arg1, (float)arg2));
75177517
object_to_luaval<cocos2d::PolygonInfo>(tolua_S, "cc.PolygonInfo",(cocos2d::PolygonInfo*)ret);
75187518
tolua_register_gc(tolua_S,lua_gettop(tolua_S));
75197519
return 1;
@@ -7533,7 +7533,7 @@ int lua_cocos2dx_AutoPolygon_generatePolygon(lua_State* tolua_S)
75337533
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_AutoPolygon_generatePolygon'", nullptr);
75347534
return 0;
75357535
}
7536-
cocos2d::PolygonInfo* ret = new (std::nothrow) cocos2d::PolygonInfo(cocos2d::AutoPolygon::generatePolygon(arg0, arg1, arg2, arg3));
7536+
cocos2d::PolygonInfo* ret = new (std::nothrow) cocos2d::PolygonInfo(cocos2d::AutoPolygon::generatePolygon(arg0, arg1, (float)arg2, (float)arg3));
75377537
object_to_luaval<cocos2d::PolygonInfo>(tolua_S, "cc.PolygonInfo",(cocos2d::PolygonInfo*)ret);
75387538
tolua_register_gc(tolua_S,lua_gettop(tolua_S));
75397539
return 1;
@@ -8255,7 +8255,7 @@ int tolua_cocos2d_Mat4_createRotationZ(lua_State* tolua_S)
82558255
ok &= luaval_to_mat4(tolua_S, 1, &mat);
82568256
if (!ok)
82578257
return 0;
8258-
angle = lua_tonumber(tolua_S, 2);
8258+
angle = (float)lua_tonumber(tolua_S, 2);
82598259
cocos2d::Mat4::createRotationZ(angle, &mat);
82608260
mat4_to_luaval(tolua_S, mat);
82618261
return 1;
@@ -8785,7 +8785,7 @@ static int tolua_cocos2d_bytearray_intv(lua_State *L)
87858785
}
87868786
lua_pop(L, 1);
87878787
lua_newtable(L);
8788-
for (auto idx = 0; idx < arg.size(); idx++)
8788+
for (size_t idx = 0; idx < arg.size(); idx++)
87898789
{
87908790
lua_pushnumber(L, arg[idx]);
87918791
lua_rawseti(L, 1, idx + 1);

‎tests/cpp-tests/Classes/NavMeshTest/NavMeshTest.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ Vec3 jump(const Vec3* pV1, const Vec3* pV2, float height, float t)
219219
pOut.x = pV1->x + t * (pV2->x - pV1->x);
220220
pOut.y = pV1->y + t * (pV2->y - pV1->y);
221221
pOut.z = pV1->z + t * (pV2->z - pV1->z);
222-
pOut.y += height * sinf(M_PI * t);
222+
pOut.y += height * sinf((float)M_PI * t);
223223
return pOut;
224224
}
225225

@@ -258,7 +258,7 @@ void NavMeshBaseTestDemo::moveAgents(const cocos2d::Vec3 &des)
258258
void NavMeshBaseTestDemo::update(float delta)
259259
{
260260
for (auto iter : _agents){
261-
float speed = iter.first->getCurrentVelocity().length() * 0.2;
261+
float speed = iter.first->getCurrentVelocity().length() * 0.2f;
262262
iter.second->setSpeed(0.0f < speed ? speed : 0.0f);
263263
}
264264
}

‎tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIEditBoxTest.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ bool UIEditBoxTest::init()
6767
_editName->setPlaceHolder("Name:");
6868
_editName->setPlaceholderFontColor(Color3B::WHITE);
6969
_editName->setMaxLength(8);
70-
_editName->setFontSize(editBoxSize.height/2);
70+
_editName->setFontSize((int)editBoxSize.height/2);
7171
_editName->setText("v👐👊💝");
7272
_editName->setReturnType(ui::EditBox::KeyboardReturnType::DONE);
7373
_editName->setDelegate(this);
@@ -93,7 +93,7 @@ bool UIEditBoxTest::init()
9393
_editPassword->setMaxLength(6);
9494
_editPassword->setInputFlag(ui::EditBox::InputFlag::PASSWORD);
9595
_editPassword->setInputMode(ui::EditBox::InputMode::SINGLE_LINE);
96-
_editPassword->setFontSize(editBoxSize.height/2);
96+
_editPassword->setFontSize((int)editBoxSize.height/2);
9797
_editPassword->setDelegate(this);
9898
_editPassword->setVisible(true);
9999
addChild(_editPassword);
@@ -190,7 +190,7 @@ bool UIEditBoxTestToggleVisibility::init()
190190
addChild(_TTFShowEditReturn);
191191

192192

193-
auto editBoxSize = Size(visibleSize.width - 100, visibleSize.height * 0.1);
193+
auto editBoxSize = Size(visibleSize.width - 100, visibleSize.height * 0.1f);
194194

195195
// top
196196
std::string pNormalSprite = "extensions/green_edit.png";
@@ -200,7 +200,7 @@ bool UIEditBoxTestToggleVisibility::init()
200200
_editName->setPlaceHolder("Name:");
201201
_editName->setPlaceholderFontColor(Color3B::WHITE);
202202
_editName->setMaxLength(8);
203-
_editName->setFontSize(editBoxSize.height/2);
203+
_editName->setFontSize((int)editBoxSize.height/2);
204204
_editName->setText("v👐👊💝");
205205
_editName->setReturnType(ui::EditBox::KeyboardReturnType::DONE);
206206
_editName->setDelegate(this);
@@ -225,7 +225,7 @@ bool UIEditBoxTestToggleVisibility::init()
225225
_editPassword->setMaxLength(6);
226226
_editPassword->setInputFlag(ui::EditBox::InputFlag::PASSWORD);
227227
_editPassword->setInputMode(ui::EditBox::InputMode::SINGLE_LINE);
228-
_editPassword->setFontSize(editBoxSize.height/2);
228+
_editPassword->setFontSize((float)editBoxSize.height/2);
229229
_editPassword->setDelegate(this);
230230
_editPassword->setVisible(true);
231231
addChild(_editPassword);
@@ -307,27 +307,27 @@ bool UIEditBoxTestTextHorizontalAlignment::init() {
307307
const auto glview = Director::getInstance()->getOpenGLView();
308308
const auto visibleOrigin = glview->getVisibleOrigin();
309309
const auto visibleSize = glview->getVisibleSize();
310-
const auto editBoxSize = Size(visibleSize.width - 100, visibleSize.height * 0.1);
310+
const auto editBoxSize = Size(visibleSize.width - 100, visibleSize.height * 0.1f);
311311

312312
const auto createEditBox = [this, editBoxSize, visibleOrigin, visibleSize](const std::string& text,
313313
const TextHAlignment alignment,
314314
const int position_y) {
315315
ui::EditBox* editbox = ui::EditBox::create(editBoxSize + Size(0,40), ui::Scale9Sprite::create("extensions/green_edit.png"));
316-
editbox->setPosition(Vec2(visibleOrigin.x+visibleSize.width/2-50, position_y));
316+
editbox->setPosition(Vec2(visibleOrigin.x+visibleSize.width/2-50, (float)position_y));
317317
editbox->setFontColor(Color3B::RED);
318318
editbox->setPlaceHolder(text.c_str());
319319
editbox->setPlaceholderFontColor(Color3B::WHITE);
320-
editbox->setPlaceholderFontSize(editBoxSize.height/2);
321-
editbox->setFontSize(editBoxSize.height/2);
320+
editbox->setPlaceholderFontSize((int)editBoxSize.height/2);
321+
editbox->setFontSize((int)editBoxSize.height/2);
322322
editbox->setText(text.c_str());
323323
editbox->setTextHorizontalAlignment(alignment);
324324
editbox->setReturnType(ui::EditBox::KeyboardReturnType::DONE);
325325
addChild(editbox);
326326
};
327327

328-
createEditBox("horizontal left text", TextHAlignment::LEFT, visibleOrigin.y+visibleSize.height*3/4);
329-
createEditBox("horizontal center text", TextHAlignment::CENTER, visibleOrigin.y+visibleSize.height/2);
330-
createEditBox("horizontal right text", TextHAlignment::RIGHT, visibleOrigin.y+visibleSize.height/4);
328+
createEditBox("horizontal left text", TextHAlignment::LEFT, (int)(visibleOrigin.y+visibleSize.height*3/4));
329+
createEditBox("horizontal center text", TextHAlignment::CENTER, (int)(visibleOrigin.y+visibleSize.height/2));
330+
createEditBox("horizontal right text", TextHAlignment::RIGHT, (int)(visibleOrigin.y+visibleSize.height/4));
331331

332332
return true;
333333
}
@@ -341,15 +341,15 @@ bool UIEditBoxTestPressedAndDisabled::init() {
341341
auto glview = Director::getInstance()->getOpenGLView();
342342
auto visibleOrigin = glview->getVisibleOrigin();
343343
auto visibleSize = glview->getVisibleSize();
344-
const auto editBoxSize = Size(visibleSize.width - 100, visibleSize.height * 0.1);
344+
const auto editBoxSize = Size(visibleSize.width - 100, visibleSize.height * 0.1f);
345345

346346
ui::EditBox* editbox = ui::EditBox::create(editBoxSize + Size(0,40), "extensions/yellow_edit.png", "extensions/orange_edit.png");
347347
editbox->setPosition(Vec2(visibleOrigin.x+visibleSize.width/2, visibleOrigin.y+visibleSize.height*3/4));
348348
editbox->setFontColor(Color3B::GREEN);
349349
editbox->setPlaceHolder("Test Pressed Image");
350350
editbox->setPlaceholderFontColor(Color3B::WHITE);
351-
editbox->setPlaceholderFontSize(editBoxSize.height/2);
352-
editbox->setFontSize(editBoxSize.height/2);
351+
editbox->setPlaceholderFontSize((int)editBoxSize.height/2);
352+
editbox->setFontSize((int)editBoxSize.height/2);
353353
editbox->setReturnType(ui::EditBox::KeyboardReturnType::DONE);
354354
addChild(editbox);
355355

@@ -358,8 +358,8 @@ bool UIEditBoxTestPressedAndDisabled::init() {
358358
editbox->setFontColor(Color3B::GREEN);
359359
editbox->setPlaceHolder("Test Disabled Image - green");
360360
editbox->setPlaceholderFontColor(Color3B::WHITE);
361-
editbox->setPlaceholderFontSize(editBoxSize.height/2);
362-
editbox->setFontSize(editBoxSize.height/2);
361+
editbox->setPlaceholderFontSize((int)editBoxSize.height/2);
362+
editbox->setFontSize((int)editBoxSize.height/2);
363363
editbox->setReturnType(ui::EditBox::KeyboardReturnType::DONE);
364364
addChild(editbox);
365365
editbox->setEnabled(false);
@@ -369,8 +369,8 @@ bool UIEditBoxTestPressedAndDisabled::init() {
369369
editbox->setFontColor(Color3B::GREEN);
370370
editbox->setPlaceHolder("Disabled Gray effect");
371371
editbox->setPlaceholderFontColor(Color3B::WHITE);
372-
editbox->setPlaceholderFontSize(editBoxSize.height/2);
373-
editbox->setFontSize(editBoxSize.height/2);
372+
editbox->setPlaceholderFontSize((int)editBoxSize.height/2);
373+
editbox->setFontSize((int)editBoxSize.height/2);
374374
editbox->setReturnType(ui::EditBox::KeyboardReturnType::DONE);
375375
addChild(editbox);
376376
editbox->setEnabled(false);

0 commit comments

Comments
 (0)