From 84b6eedf1fa853ca6ed60d2307b2006fafd642bf Mon Sep 17 00:00:00 2001 From: Bart van Strien Date: Fri, 18 Jan 2013 12:43:43 +0100 Subject: [PATCH] Make the default point style to setPoint 'smooth' (issue #543), and fix setPointStyle ignoring normal operation --- src/modules/graphics/opengl/wrap_Graphics.cpp | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/modules/graphics/opengl/wrap_Graphics.cpp b/src/modules/graphics/opengl/wrap_Graphics.cpp index 4ad88f0a9..4ff95ca86 100644 --- a/src/modules/graphics/opengl/wrap_Graphics.cpp +++ b/src/modules/graphics/opengl/wrap_Graphics.cpp @@ -712,14 +712,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; @@ -729,10 +726,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;