LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-19 12:14:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the new love.graphics.newMesh variant that accepts a Data object.

Browse Source
This commit is contained in:
Alex Szpakowski
2015-05-15 14:45:11 -03:00
parent f2538ac2fa
commit 30b083bd23
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/wrap_Graphics.cpp
+4 -3
View File
@@ -784,13 +784,14 @@ static Mesh *newCustomMesh(lua_State *L)
int w_newMesh(lua_State *L) int w_newMesh(lua_State *L)
{ {
// Check first argument: table or number of vertices. // Check first argument: table or number of vertices.
int ttype = lua_type(L, 1); int arg1type = lua_type(L, 1);
if (ttype != LUA_TTABLE && ttype != LUA_TNUMBER) if (arg1type != LUA_TTABLE && arg1type != LUA_TNUMBER)
luaL_argerror(L, 1, "table or number expected"); luaL_argerror(L, 1, "table or number expected");
Mesh *t = nullptr; Mesh *t = nullptr;
if (ttype == LUA_TTABLE && (lua_istable(L, 2) || lua_type(L, 2) == LUA_TNUMBER)) int arg2type = lua_type(L, 2);
if (arg1type == LUA_TTABLE && (arg2type == LUA_TTABLE || arg2type == LUA_TNUMBER || arg2type == LUA_TUSERDATA))
t = newCustomMesh(L); t = newCustomMesh(L);
else else
t = newStandardMesh(L); t = newStandardMesh(L);