Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update Terrain Lua binding

This commit is contained in:
tangziwen 2015-04-09 10:01:40 +08:00
parent 4ca6b559e6
commit 176532eef4
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
cocos/scripting/lua-bindings/manual/3d/lua_cocos2dx_3d_manual.cpp
View File

@ -233,22 +233,22 @@ bool luaval_to_terraindata(lua_State* L, int lo, cocos2d::Terrain::TerrainData*
lua_gettable(L,lo); lua_gettable(L,lo);
if (!lua_isnil(L, -1)) if (!lua_isnil(L, -1))
{ {
luaval_to_size(L, -1, &(outValue->chunkSize)); luaval_to_size(L, -1, &(outValue->_chunkSize));
} }
else else
{ {
outValue->chunkSize = cocos2d::Size(32, 32); outValue->_chunkSize = cocos2d::Size(32, 32);
} }
lua_pop(L, 1); lua_pop(L, 1);
lua_pushstring(L, "heightMapSrc"); lua_pushstring(L, "heightMapSrc");
lua_gettable(L,lo); lua_gettable(L,lo);
outValue->heightMapSrc = tolua_tocppstring(L, -1, ""); outValue->_heightMapSrc = tolua_tocppstring(L, -1, "");
lua_pop(L,1); lua_pop(L,1);
lua_pushstring(L, "alphaMapSrc"); lua_pushstring(L, "alphaMapSrc");
lua_gettable(L,lo); lua_gettable(L,lo);
outValue->alphaMapSrc = const_cast<char*>(tolua_tocppstring(L, -1, "")); outValue->_alphaMapSrc = const_cast<char*>(tolua_tocppstring(L, -1, ""));
lua_pop(L,1); lua_pop(L,1);
lua_pushstring(L, "detailMaps"); lua_pushstring(L, "detailMaps");
@ -264,12 +264,12 @@ bool luaval_to_terraindata(lua_State* L, int lo, cocos2d::Terrain::TerrainData*
{ {
lua_pushstring(L, "detailMapSrc"); lua_pushstring(L, "detailMapSrc");
lua_gettable(L,-2); lua_gettable(L,-2);
outValue->detailMaps[i].detailMapSrc = tolua_tocppstring(L, -1, ""); outValue->_detailMaps[i]._detailMapSrc = tolua_tocppstring(L, -1, "");
lua_pop(L,1); lua_pop(L,1);
lua_pushstring(L, "detailMapSize"); lua_pushstring(L, "detailMapSize");
lua_gettable(L,-2); lua_gettable(L,-2);
outValue->detailMaps[i].detailMapSize = lua_isnil(L,-1) ? 0.0f : (float)lua_tonumber(L,-1); outValue->_detailMaps[i]._detailMapSize = lua_isnil(L,-1) ? 0.0f : (float)lua_tonumber(L,-1);
lua_pop(L,1); lua_pop(L,1);
} }
lua_pop(L, 1); lua_pop(L, 1);
@ -279,12 +279,12 @@ bool luaval_to_terraindata(lua_State* L, int lo, cocos2d::Terrain::TerrainData*
lua_pushstring(L, "mapHeight"); lua_pushstring(L, "mapHeight");
lua_gettable(L,lo); lua_gettable(L,lo);
outValue->mapHeight = lua_isnil(L,-1) ? 2.0f : (float)lua_tonumber(L,-1); outValue->_mapHeight = lua_isnil(L,-1) ? 2.0f : (float)lua_tonumber(L,-1);
lua_pop(L,1); lua_pop(L,1);
lua_pushstring(L, "mapScale"); lua_pushstring(L, "mapScale");
lua_gettable(L,lo); lua_gettable(L,lo);
outValue->mapScale = lua_isnil(L,-1) ? 0.1f : (float)lua_tonumber(L,-1); outValue->_mapScale = lua_isnil(L,-1) ? 0.1f : (float)lua_tonumber(L,-1);
lua_pop(L,1); lua_pop(L,1);
lua_pushstring(L, "_detailMapAmount"); lua_pushstring(L, "_detailMapAmount");
@ -294,7 +294,7 @@ bool luaval_to_terraindata(lua_State* L, int lo, cocos2d::Terrain::TerrainData*
lua_pushstring(L, "skirtHeightRatio"); lua_pushstring(L, "skirtHeightRatio");
lua_gettable(L,lo); lua_gettable(L,lo);
outValue->skirtHeightRatio = lua_isnil(L,-1) ? 1.0f : (float)lua_tonumber(L,-1); outValue->_skirtHeightRatio = lua_isnil(L,-1) ? 1.0f : (float)lua_tonumber(L,-1);
lua_pop(L,1); lua_pop(L,1);
} }
@ -308,20 +308,20 @@ void terraindata_to_luaval(lua_State* L,const cocos2d::Terrain::TerrainData& inV
lua_newtable(L); lua_newtable(L);
lua_pushstring(L, "chunkSize"); lua_pushstring(L, "chunkSize");
size_to_luaval(L, inValue.chunkSize); size_to_luaval(L, inValue._chunkSize);
lua_rawset(L, -3); lua_rawset(L, -3);
if (inValue.heightMapSrc.length() > 0) if (inValue._heightMapSrc.length() > 0)
{ {
lua_pushstring(L, "heightMapSrc"); lua_pushstring(L, "heightMapSrc");
lua_pushstring(L, inValue.heightMapSrc.c_str()); lua_pushstring(L, inValue._heightMapSrc.c_str());
lua_rawset(L, -3); lua_rawset(L, -3);
} }
if (nullptr != inValue.alphaMapSrc) if (nullptr != inValue._alphaMapSrc)
{ {
lua_pushstring(L, "alphaMapSrc"); lua_pushstring(L, "alphaMapSrc");
lua_pushstring(L, inValue.alphaMapSrc); lua_pushstring(L, inValue._alphaMapSrc);
lua_rawset(L, -3); lua_rawset(L, -3);
} }
@ -334,11 +334,11 @@ void terraindata_to_luaval(lua_State* L,const cocos2d::Terrain::TerrainData& inV
lua_newtable(L); lua_newtable(L);
lua_pushstring(L, "detailMapSrc"); lua_pushstring(L, "detailMapSrc");
lua_pushstring(L, inValue.detailMaps[i].detailMapSrc.c_str()); lua_pushstring(L, inValue._detailMaps[i]._detailMapSrc.c_str());
lua_rawset(L, -3); lua_rawset(L, -3);
lua_pushstring(L, "detailMapSize"); lua_pushstring(L, "detailMapSize");
lua_pushnumber(L, (lua_Number)inValue.detailMaps[i].detailMapSize); lua_pushnumber(L, (lua_Number)inValue._detailMaps[i]._detailMapSize);
lua_rawset(L, -3); lua_rawset(L, -3);
lua_rawset(L, -3); lua_rawset(L, -3);
@ -347,11 +347,11 @@ void terraindata_to_luaval(lua_State* L,const cocos2d::Terrain::TerrainData& inV
lua_pushstring(L, "mapHeight"); lua_pushstring(L, "mapHeight");
lua_pushnumber(L, (lua_Number)inValue.mapHeight); lua_pushnumber(L, (lua_Number)inValue._mapHeight);
lua_rawset(L, -3); lua_rawset(L, -3);
lua_pushstring(L, "mapScale"); lua_pushstring(L, "mapScale");
lua_pushnumber(L, (lua_Number)inValue.mapScale); lua_pushnumber(L, (lua_Number)inValue._mapScale);
lua_rawset(L, -3); lua_rawset(L, -3);
lua_pushstring(L, "_detailMapAmount"); lua_pushstring(L, "_detailMapAmount");
@ -359,7 +359,7 @@ void terraindata_to_luaval(lua_State* L,const cocos2d::Terrain::TerrainData& inV
lua_rawset(L, -3); lua_rawset(L, -3);
lua_pushstring(L, "skirtHeightRatio"); lua_pushstring(L, "skirtHeightRatio");
lua_pushnumber(L, (lua_Number)inValue.skirtHeightRatio); lua_pushnumber(L, (lua_Number)inValue._skirtHeightRatio);
lua_rawset(L, -3); lua_rawset(L, -3);
} }