From ecf37320a96fd271d46d6b2b909efda843e665e2 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Thu, 27 Feb 2014 05:38:46 -0400 Subject: [PATCH] Changed love.graphics.newMesh, Mesh:setVertex, and Mesh:setVertices to default the u,v arguments to 0,0 instead of requiring them --- src/common/Memoizer.cpp | 8 ++++++-- src/modules/graphics/opengl/wrap_Graphics.cpp | 4 ++-- src/modules/graphics/opengl/wrap_Mesh.cpp | 12 ++++++------ 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/common/Memoizer.cpp b/src/common/Memoizer.cpp index dcc8e5df2..8d6ec7d4f 100644 --- a/src/common/Memoizer.cpp +++ b/src/common/Memoizer.cpp @@ -38,8 +38,12 @@ void Memoizer::remove(void *key) void *Memoizer::find(void *key) { - if (objectMap.count(key)) return objectMap[key]; - return NULL; + auto it = objectMap.find(key); + + if (it != objectMap.end()) + return it->second; + else + return nullptr; } } // love diff --git a/src/modules/graphics/opengl/wrap_Graphics.cpp b/src/modules/graphics/opengl/wrap_Graphics.cpp index e7d6a6d74..243c9e908 100644 --- a/src/modules/graphics/opengl/wrap_Graphics.cpp +++ b/src/modules/graphics/opengl/wrap_Graphics.cpp @@ -494,8 +494,8 @@ int w_newMesh(lua_State *L) v.x = (float) luaL_checknumber(L, -8); v.y = (float) luaL_checknumber(L, -7); - v.s = (float) luaL_checknumber(L, -6); - v.t = (float) luaL_checknumber(L, -5); + v.s = (float) luaL_optnumber(L, -6, 0.0); + v.t = (float) luaL_optnumber(L, -5, 0.0); v.r = (unsigned char) luaL_optinteger(L, -4, 255); v.g = (unsigned char) luaL_optinteger(L, -3, 255); diff --git a/src/modules/graphics/opengl/wrap_Mesh.cpp b/src/modules/graphics/opengl/wrap_Mesh.cpp index 92a0371cf..83e21afd3 100644 --- a/src/modules/graphics/opengl/wrap_Mesh.cpp +++ b/src/modules/graphics/opengl/wrap_Mesh.cpp @@ -53,8 +53,8 @@ int w_Mesh_setVertex(lua_State *L) v.x = luaL_checknumber(L, -8); v.y = luaL_checknumber(L, -7); - v.s = luaL_checknumber(L, -6); - v.t = luaL_checknumber(L, -5); + v.s = luaL_optnumber(L, -6, 0.0); + v.t = luaL_optnumber(L, -5, 0.0); v.r = luaL_optinteger(L, -4, 255); v.g = luaL_optinteger(L, -3, 255); v.b = luaL_optinteger(L, -2, 255); @@ -66,8 +66,8 @@ int w_Mesh_setVertex(lua_State *L) { v.x = luaL_checknumber(L, 3); v.y = luaL_checknumber(L, 4); - v.s = luaL_checknumber(L, 5); - v.t = luaL_checknumber(L, 6); + v.s = luaL_optnumber(L, 5, 0.0); + v.t = luaL_optnumber(L, 6, 0.0); v.r = luaL_optinteger(L, 7, 255); v.g = luaL_optinteger(L, 8, 255); v.b = luaL_optinteger(L, 9, 255); @@ -122,8 +122,8 @@ int w_Mesh_setVertices(lua_State *L) v.x = (float) luaL_checknumber(L, -8); v.y = (float) luaL_checknumber(L, -7); - v.s = (float) luaL_checknumber(L, -6); - v.t = (float) luaL_checknumber(L, -5); + v.s = (float) luaL_optnumber(L, -6, 0.0); + v.t = (float) luaL_optnumber(L, -5, 0.0); v.r = (unsigned char) luaL_optinteger(L, -4, 255); v.g = (unsigned char) luaL_optinteger(L, -3, 255);