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

Merged in changes from main repository

Browse Source
This commit is contained in:
Alexander Szpakowski
2013-01-21 02:31:15 -04:00
parent ce75b3af69 ba4cf6204d
commit f016840ed0
13 changed files with 191 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/wrap_Graphics.cpp
+12 -11
View File
@@ -733,14 +733,11 @@ int w_setPointSize(lua_State *L)
int w_setPointStyle(lua_State *L)
{
Graphics::PointStyle style = Graphics::POINT_SMOOTH;
Graphics::PointStyle style;
if (lua_gettop(L) >= 2)
{
const char *str = luaL_checkstring(L, 1);
if (!Graphics::getConstant(str, style))
return luaL_error(L, "Invalid point style: %s", str);
}
const char *str = luaL_checkstring(L, 1);
if (!Graphics::getConstant(str, style))
return luaL_error(L, "Invalid point style: %s", str);
instance->setPointStyle(style);
return 0;
@@ -750,10 +747,14 @@ int w_setPoint(lua_State *L)
{
float size = (float)luaL_checknumber(L, 1);
Graphics::PointStyle style;
const char *str = luaL_checkstring(L, 2);
if (!Graphics::getConstant(str, style))
return luaL_error(L, "Invalid point style: %s", str);
Graphics::PointStyle style = Graphics::POINT_SMOOTH;
if (lua_gettop(L) >= 2)
{
const char *str = luaL_checkstring(L, 2);
if (!Graphics::getConstant(str, style))
return luaL_error(L, "Invalid point style: %s", str);
}
instance->setPoint(size, style);
return 0;