Skip to content

Commit fb39795

Browse files
Mee-guMee-gu
committed
fix warning
1 parent 3020079 commit fb39795

File tree

9 files changed

+80
-79
lines changed

9 files changed

+80
-79
lines changed

‎cocos/scripting/lua-bindings/manual/CCLuaBridge.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ int LuaBridge::pushLuaFunctionById(int functionId)
5151
lua_pushnil(L); /* L: f_id nil */
5252
while (lua_next(L, -2) != 0) /* L: f_id f id */
5353
{
54-
int value = lua_tonumber(L, -1);
54+
int value = lua_tointeger(L, -1);
5555
lua_pop(L, 1); /* L: f_id f */
5656
if (value == functionId)
5757
{
@@ -85,7 +85,7 @@ int LuaBridge::retainLuaFunctionById(int functionId)
8585
}
8686

8787
// increase counter
88-
int retainCount = lua_tonumber(L, -1);
88+
int retainCount = lua_tointeger(L, -1);
8989
retainCount++;
9090
lua_pop(L, 1); /* L: id_r */
9191
lua_pushinteger(L, functionId); /* L: id_r id */
@@ -130,7 +130,7 @@ int LuaBridge::releaseLuaFunctionById(int functionId)
130130
return 0;
131131
}
132132

133-
int retainCount = lua_tonumber(L, -1);
133+
int retainCount = lua_tointeger(L, -1);
134134
retainCount--;
135135

136136
if (retainCount > 0)
@@ -155,7 +155,7 @@ int LuaBridge::releaseLuaFunctionById(int functionId)
155155
lua_pushnil(L); /* L: f_id nil */
156156
while (lua_next(L, -2) != 0) /* L: f_id f id */
157157
{
158-
int value = lua_tonumber(L, -1);
158+
int value = lua_tointeger(L, -1);
159159
lua_pop(L, 1); /* L: f_id f */
160160
if (value == functionId)
161161
{
@@ -214,7 +214,7 @@ int LuaBridge::retainLuaFunction(lua_State *L, int functionIndex, int *retainCou
214214
}
215215
else
216216
{
217-
functionId = lua_tonumber(L, -1);
217+
functionId = lua_tointeger(L, -1);
218218
}
219219

220220
// get function retain
@@ -230,7 +230,7 @@ int LuaBridge::retainLuaFunction(lua_State *L, int functionIndex, int *retainCou
230230
else
231231
{
232232
// add retain count
233-
retainCount = lua_tonumber(L, -1);
233+
retainCount = lua_tointeger(L, -1);
234234
retainCount++;
235235
lua_pop(L, 1);
236236
lua_pushinteger(L, retainCount);

‎cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -420,10 +420,10 @@ int LuaEngine::handleAccelerometerEvent(void* data)
420420
return 0;
421421

422422
Acceleration* accelerationValue = static_cast<Acceleration*>(basicScriptData->value);
423-
_stack->pushFloat(accelerationValue->x);
424-
_stack->pushFloat(accelerationValue->y);
425-
_stack->pushFloat(accelerationValue->z);
426-
_stack->pushFloat(accelerationValue->timestamp);
423+
_stack->pushFloat(float(accelerationValue->x));
424+
_stack->pushFloat(float(accelerationValue->y));
425+
_stack->pushFloat(float(accelerationValue->z));
426+
_stack->pushFloat(float(accelerationValue->timestamp));
427427
int ret = _stack->executeFunctionByHandler(handler, 4);
428428
_stack->clean();
429429
return ret;

‎cocos/scripting/lua-bindings/manual/LuaBasicConversions.cpp

Lines changed: 42 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -340,12 +340,12 @@ bool luaval_to_vec2(lua_State* L,int lo,cocos2d::Vec2* outValue, const char* fun
340340
{
341341
lua_pushstring(L, "x");
342342
lua_gettable(L, lo);
343-
outValue->x = lua_isnil(L, -1) ? 0 : lua_tonumber(L, -1);
343+
outValue->x = lua_isnil(L, -1) ? 0.0f : (float)lua_tonumber(L, -1);
344344
lua_pop(L, 1);
345345

346346
lua_pushstring(L, "y");
347347
lua_gettable(L, lo);
348-
outValue->y = lua_isnil(L, -1) ? 0 : lua_tonumber(L, -1);
348+
outValue->y = lua_isnil(L, -1) ? 0.0f : (float)lua_tonumber(L, -1);
349349
lua_pop(L, 1);
350350
}
351351
return ok;
@@ -372,17 +372,17 @@ bool luaval_to_vec3(lua_State* L,int lo,cocos2d::Vec3* outValue, const char* fun
372372
{
373373
lua_pushstring(L, "x");
374374
lua_gettable(L, lo);
375-
outValue->x = lua_isnil(L, -1) ? 0 : lua_tonumber(L, -1);
375+
outValue->x = lua_isnil(L, -1) ? 0.0f : (float)lua_tonumber(L, -1);
376376
lua_pop(L, 1);
377377

378378
lua_pushstring(L, "y");
379379
lua_gettable(L, lo);
380-
outValue->y = lua_isnil(L, -1) ? 0 : lua_tonumber(L, -1);
380+
outValue->y = lua_isnil(L, -1) ? 0.0f : (float)lua_tonumber(L, -1);
381381
lua_pop(L, 1);
382382

383383
lua_pushstring(L, "z");
384384
lua_gettable(L, lo);
385-
outValue->z = lua_isnil(L, -1) ? 0 : lua_tonumber(L, -1);
385+
outValue->z = lua_isnil(L, -1) ? 0.0f : (float)lua_tonumber(L, -1);
386386
lua_pop(L, 1);
387387
}
388388
return ok;
@@ -409,22 +409,22 @@ bool luaval_to_vec4(lua_State* L,int lo,cocos2d::Vec4* outValue, const char* fun
409409
{
410410
lua_pushstring(L, "x");
411411
lua_gettable(L, lo);
412-
outValue->x = lua_isnil(L, -1) ? 0 : lua_tonumber(L, -1);
412+
outValue->x = lua_isnil(L, -1) ? 0.0f : (float)lua_tonumber(L, -1);
413413
lua_pop(L, 1);
414414

415415
lua_pushstring(L, "y");
416416
lua_gettable(L, lo);
417-
outValue->y = lua_isnil(L, -1) ? 0 : lua_tonumber(L, -1);
417+
outValue->y = lua_isnil(L, -1) ? 0.0f : (float)lua_tonumber(L, -1);
418418
lua_pop(L, 1);
419419

420420
lua_pushstring(L, "z");
421421
lua_gettable(L, lo);
422-
outValue->z = lua_isnil(L, -1) ? 0 : lua_tonumber(L, -1);
422+
outValue->z = lua_isnil(L, -1) ? 0.0f : (float)lua_tonumber(L, -1);
423423
lua_pop(L, 1);
424424

425425
lua_pushstring(L, "w");
426426
lua_gettable(L, lo);
427-
outValue->w = lua_isnil(L, -1) ? 0 : lua_tonumber(L, -1);
427+
outValue->w = lua_isnil(L, -1) ? 0.0f : (float)lua_tonumber(L, -1);
428428
lua_pop(L, 1);
429429
}
430430
return ok;
@@ -490,17 +490,17 @@ bool luaval_to_physics_material(lua_State* L,int lo,PhysicsMaterial* outValue, c
490490
{
491491
lua_pushstring(L, "density");
492492
lua_gettable(L, lo);
493-
outValue->density = lua_isnil(L, -1) ? 0 : lua_tonumber(L, -1);
493+
outValue->density = lua_isnil(L, -1) ? 0.0f : (float)lua_tonumber(L, -1);
494494
lua_pop(L, 1);
495495

496496
lua_pushstring(L, "restitution");
497497
lua_gettable(L, lo);
498-
outValue->restitution = lua_isnil(L, -1) ? 0 : lua_tonumber(L, -1);
498+
outValue->restitution = lua_isnil(L, -1) ? 0.0f : (float)lua_tonumber(L, -1);
499499
lua_pop(L, 1);
500500

501501
lua_pushstring(L, "friction");
502502
lua_gettable(L, lo);
503-
outValue->friction = lua_isnil(L, -1) ? 0 : lua_tonumber(L, -1);
503+
outValue->friction = lua_isnil(L, -1) ? 0.0f : (float)lua_tonumber(L, -1);
504504
lua_pop(L, 1);
505505
}
506506
return ok;
@@ -580,12 +580,12 @@ bool luaval_to_size(lua_State* L,int lo,Size* outValue, const char* funcName)
580580
{
581581
lua_pushstring(L, "width"); /* L: paramStack key */
582582
lua_gettable(L,lo);/* L: paramStack paramStack[lo][key] */
583-
outValue->width = lua_isnil(L,-1) ? 0 : lua_tonumber(L,-1);
583+
outValue->width = lua_isnil(L,-1) ? 0.0f : (float)lua_tonumber(L,-1);
584584
lua_pop(L,1);/* L: paramStack*/
585585

586586
lua_pushstring(L, "height");
587587
lua_gettable(L,lo);
588-
outValue->height = lua_isnil(L,-1) ? 0 : lua_tonumber(L,-1);
588+
outValue->height = lua_isnil(L,-1) ? 0.0f : (float)lua_tonumber(L,-1);
589589
lua_pop(L,1);
590590
}
591591

@@ -612,22 +612,22 @@ bool luaval_to_rect(lua_State* L,int lo,Rect* outValue, const char* funcName)
612612
{
613613
lua_pushstring(L, "x");
614614
lua_gettable(L,lo);
615-
outValue->origin.x = lua_isnil(L,-1) ? 0 : lua_tonumber(L,-1);
615+
outValue->origin.x = lua_isnil(L,-1) ? 0.0f : (float)lua_tonumber(L,-1);
616616
lua_pop(L,1);
617617

618618
lua_pushstring(L, "y");
619619
lua_gettable(L,lo);
620-
outValue->origin.y = lua_isnil(L,-1) ? 0 : lua_tonumber(L,-1);
620+
outValue->origin.y = lua_isnil(L,-1) ? 0.0f : (float)lua_tonumber(L,-1);
621621
lua_pop(L,1);
622622

623623
lua_pushstring(L, "width");
624624
lua_gettable(L,lo);
625-
outValue->size.width = lua_isnil(L,-1) ? 0 : lua_tonumber(L,-1);
625+
outValue->size.width = lua_isnil(L,-1) ? 0.0f : (float)lua_tonumber(L,-1);
626626
lua_pop(L,1);
627627

628628
lua_pushstring(L, "height");
629629
lua_gettable(L,lo);
630-
outValue->size.height = lua_isnil(L,-1) ? 0 : lua_tonumber(L,-1);
630+
outValue->size.height = lua_isnil(L,-1) ? 0.0f : (float)lua_tonumber(L,-1);
631631
lua_pop(L,1);
632632
}
633633

@@ -654,22 +654,22 @@ bool luaval_to_color4b(lua_State* L,int lo,Color4B* outValue, const char* funcNa
654654
{
655655
lua_pushstring(L, "r");
656656
lua_gettable(L,lo);
657-
outValue->r = lua_isnil(L,-1) ? 0 : lua_tonumber(L,-1);
657+
outValue->r = lua_isnil(L,-1) ? 0 : static_cast<uint8_t>(lua_tonumber(L,-1));
658658
lua_pop(L,1);
659659

660660
lua_pushstring(L, "g");
661661
lua_gettable(L,lo);
662-
outValue->g = lua_isnil(L,-1) ? 0 : lua_tonumber(L,-1);
662+
outValue->g = lua_isnil(L,-1) ? 0 : static_cast<uint8_t>(lua_tonumber(L,-1));
663663
lua_pop(L,1);
664664

665665
lua_pushstring(L, "b");
666666
lua_gettable(L,lo);
667-
outValue->b = lua_isnil(L,-1) ? 0 : lua_tonumber(L,-1);
667+
outValue->b = lua_isnil(L,-1) ? 0 : static_cast<uint8_t>(lua_tonumber(L,-1));
668668
lua_pop(L,1);
669669

670670
lua_pushstring(L, "a");
671671
lua_gettable(L,lo);
672-
outValue->a = lua_isnil(L,-1) ? 255 : lua_tonumber(L,-1);
672+
outValue->a = lua_isnil(L,-1) ? 255 : static_cast<uint8_t>(lua_tonumber(L,-1));
673673
lua_pop(L,1);
674674
}
675675

@@ -696,22 +696,22 @@ bool luaval_to_color4f(lua_State* L,int lo,Color4F* outValue, const char* funcNa
696696
{
697697
lua_pushstring(L, "r");
698698
lua_gettable(L,lo);
699-
outValue->r = lua_isnil(L,-1) ? 0 : lua_tonumber(L,-1);
699+
outValue->r = lua_isnil(L,-1) ? 0.0f : (float)lua_tonumber(L,-1);
700700
lua_pop(L,1);
701701

702702
lua_pushstring(L, "g");
703703
lua_gettable(L,lo);
704-
outValue->g = lua_isnil(L,-1) ? 0 : lua_tonumber(L,-1);
704+
outValue->g = lua_isnil(L,-1) ? 0.0f : (float)lua_tonumber(L,-1);
705705
lua_pop(L,1);
706706

707707
lua_pushstring(L, "b");
708708
lua_gettable(L,lo);
709-
outValue->b = lua_isnil(L,-1) ? 0 : lua_tonumber(L,-1);
709+
outValue->b = lua_isnil(L,-1) ? 0.0f : (float)lua_tonumber(L,-1);
710710
lua_pop(L,1);
711711

712712
lua_pushstring(L, "a");
713713
lua_gettable(L,lo);
714-
outValue->a = lua_isnil(L,-1) ? 0 : lua_tonumber(L,-1);
714+
outValue->a = lua_isnil(L,-1) ? 0.0f : (float)lua_tonumber(L,-1);
715715
lua_pop(L,1);
716716
}
717717

@@ -738,17 +738,17 @@ bool luaval_to_color3b(lua_State* L,int lo,Color3B* outValue, const char* funcNa
738738
{
739739
lua_pushstring(L, "r");
740740
lua_gettable(L,lo);
741-
outValue->r = lua_isnil(L,-1) ? 0 : lua_tonumber(L,-1);
741+
outValue->r = lua_isnil(L,-1) ? 0 : static_cast<uint8_t>(lua_tonumber(L,-1));
742742
lua_pop(L,1);
743743

744744
lua_pushstring(L, "g");
745745
lua_gettable(L,lo);
746-
outValue->g = lua_isnil(L,-1) ? 0 : lua_tonumber(L,-1);
746+
outValue->g = lua_isnil(L,-1) ? 0 : static_cast<uint8_t>(lua_tonumber(L,-1));
747747
lua_pop(L,1);
748748

749749
lua_pushstring(L, "b");
750750
lua_gettable(L,lo);
751-
outValue->b = lua_isnil(L,-1) ? 0 : lua_tonumber(L,-1);
751+
outValue->b = lua_isnil(L,-1) ? 0 : static_cast<uint8_t>(lua_tonumber(L,-1));
752752
lua_pop(L,1);
753753
}
754754

@@ -945,7 +945,7 @@ bool luaval_to_fontdefinition(lua_State* L, int lo, FontDefinition* outValue , c
945945
lua_gettable(L,lo);
946946
if (!lua_isnil(L,-1))
947947
{
948-
outValue->_shadow._shadowOpacity = lua_tonumber(L,-1);
948+
outValue->_shadow._shadowOpacity = (float)lua_tonumber(L,-1);
949949
}
950950
lua_pop(L,1);
951951
}
@@ -1011,7 +1011,7 @@ bool luaval_to_ttfconfig(lua_State* L,int lo, cocos2d::TTFConfig* outValue, cons
10111011

10121012
lua_pushstring(L, "fontSize");
10131013
lua_gettable(L,lo);
1014-
outValue->fontSize = lua_isnumber(L, -1)?(int)lua_tointeger(L, -1) : 0;
1014+
outValue->fontSize = lua_isnumber(L, -1)?(float)lua_tointeger(L, -1) : 0.0f;
10151015
lua_pop(L,1);
10161016

10171017
lua_pushstring(L, "glyphs");
@@ -1071,7 +1071,7 @@ bool luaval_to_mat4(lua_State* L, int lo, cocos2d::Mat4* outValue , const char*
10711071
lua_gettable(L,lo);
10721072
if (tolua_isnumber(L, -1, 0, &tolua_err))
10731073
{
1074-
outValue->m[i] = tolua_tonumber(L, -1, 0);
1074+
outValue->m[i] = (float)tolua_tonumber(L, -1, 0);
10751075
}
10761076
else
10771077
{
@@ -1976,22 +1976,22 @@ bool luaval_to_quaternion(lua_State* L,int lo,cocos2d::Quaternion* outValue, con
19761976
{
19771977
lua_pushstring(L, "x");
19781978
lua_gettable(L, lo);
1979-
outValue->x = lua_isnil(L, -1) ? 0 : lua_tonumber(L, -1);
1979+
outValue->x = lua_isnil(L, -1) ? 0.0f : (float)lua_tonumber(L, -1);
19801980
lua_pop(L, 1);
19811981

19821982
lua_pushstring(L, "y");
19831983
lua_gettable(L, lo);
1984-
outValue->y = lua_isnil(L, -1) ? 0 : lua_tonumber(L, -1);
1984+
outValue->y = lua_isnil(L, -1) ? 0.0f : (float)lua_tonumber(L, -1);
19851985
lua_pop(L, 1);
19861986

19871987
lua_pushstring(L, "z");
19881988
lua_gettable(L, lo);
1989-
outValue->z = lua_isnil(L, -1) ? 0 : lua_tonumber(L, -1);
1989+
outValue->z = lua_isnil(L, -1) ? 0.0f : (float)lua_tonumber(L, -1);
19901990
lua_pop(L, 1);
19911991

19921992
lua_pushstring(L, "w");
19931993
lua_gettable(L, lo);
1994-
outValue->w = lua_isnil(L, -1) ? 0 : lua_tonumber(L, -1);
1994+
outValue->w = lua_isnil(L, -1) ? 0.0f : (float)lua_tonumber(L, -1);
19951995
lua_pop(L, 1);
19961996
}
19971997
return ok;
@@ -2017,22 +2017,22 @@ bool luaval_to_texparams(lua_State* L,int lo,cocos2d::Texture2D::TexParams* outV
20172017
{
20182018
lua_pushstring(L, "minFilter");
20192019
lua_gettable(L, lo);
2020-
outValue->minFilter = utils::toBackendSamplerFilter(lua_isnil(L, -1) ? 0 : lua_tonumber(L, -1));
2020+
outValue->minFilter = utils::toBackendSamplerFilter(lua_isnil(L, -1) ? 0 : lua_tointeger(L, -1));
20212021
lua_pop(L, 1);
20222022

20232023
lua_pushstring(L, "magFilter");
20242024
lua_gettable(L, lo);
2025-
outValue->magFilter = utils::toBackendSamplerFilter(lua_isnil(L, -1) ? 0 : lua_tonumber(L, -1));
2025+
outValue->magFilter = utils::toBackendSamplerFilter(lua_isnil(L, -1) ? 0 : lua_tointeger(L, -1));
20262026
lua_pop(L, 1);
20272027

20282028
lua_pushstring(L, "wrapS");
20292029
lua_gettable(L, lo);
2030-
outValue->sAddressMode = utils::toBackendAddressMode(lua_isnil(L, -1) ? 0 : lua_tonumber(L, -1));
2030+
outValue->sAddressMode = utils::toBackendAddressMode(lua_isnil(L, -1) ? 0 : lua_tointeger(L, -1));
20312031
lua_pop(L, 1);
20322032

20332033
lua_pushstring(L, "wrapT");
20342034
lua_gettable(L, lo);
2035-
outValue->tAddressMode = utils::toBackendAddressMode(lua_isnil(L, -1) ? 0 : lua_tonumber(L, -1));
2035+
outValue->tAddressMode = utils::toBackendAddressMode(lua_isnil(L, -1) ? 0 : lua_tointeger(L, -1));
20362036
lua_pop(L, 1);
20372037
}
20382038
return ok;
@@ -2054,21 +2054,19 @@ bool luaval_to_tex2f(lua_State* L, int lo, cocos2d::Tex2F* outValue, const char*
20542054
ok = false;
20552055
}
20562056

2057-
20582057
if (ok)
20592058
{
20602059
lua_pushstring(L, "u");
20612060
lua_gettable(L, lo);
2062-
outValue->u = lua_isnil(L, -1) ? 0 : lua_tonumber(L, -1);
2061+
outValue->u = lua_isnil(L, -1) ? 0.0f : (float)lua_tonumber(L, -1);
20632062
lua_pop(L, 1);
20642063

20652064
lua_pushstring(L, "v");
20662065
lua_gettable(L, lo);
2067-
outValue->v = lua_isnil(L, -1) ? 0 : lua_tonumber(L, -1);
2066+
outValue->v = lua_isnil(L, -1) ? 0.0f : (float)lua_tonumber(L, -1);
20682067
lua_pop(L, 1);
20692068
}
20702069
return ok;
2071-
20722070
}
20732071

20742072

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1541,7 +1541,7 @@ static int tolua_cocos2d_kmGLLoadMatrix00(lua_State* tolua_S)
15411541
else
15421542
#endif
15431543
{
1544-
mat4.m[i] = tolua_tonumber(tolua_S, -1, 0);
1544+
mat4.m[i] = (float)tolua_tonumber(tolua_S, -1, 0);
15451545
lua_pop(tolua_S, 1);
15461546
}
15471547
}

0 commit comments

Comments
 (0)