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

Changed love.graphics.newMesh, Mesh:setVertex, and Mesh:setVertices to default the u,v arguments to 0,0 instead of requiring them

Browse Source
This commit is contained in:
Alex Szpakowski
2014-02-27 05:38:46 -04:00
parent fe5e7c17e7
commit ecf37320a9
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/Memoizer.cpp
+6 -2
View File
@@ -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
src/modules/graphics/opengl/wrap_Graphics.cpp
+2 -2
View File
@@ -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);
src/modules/graphics/opengl/wrap_Mesh.cpp
+6 -6
View File
@@ -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);