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

Removed love.graphics.get/setPointStyle. ‘rough’ points are now the only possibility (resolves issue #581).

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2014-01-15 03:32:07 -04:00
parent a691b7efb9
commit 639ddedc0a
6 changed files with 0 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/Graphics.cpp
-18
View File
@@ -79,16 +79,6 @@ bool Graphics::getConstant(LineJoin in, const char *&out)
return lineJoins.find(in, out);
}
bool Graphics::getConstant(const char *in, PointStyle &out)
{
return pointStyles.find(in, out);
}
bool Graphics::getConstant(PointStyle in, const char *&out)
{
return pointStyles.find(in, out);
}
bool Graphics::getConstant(const char *in, Support &out)
{
return support.find(in, out);
@@ -156,14 +146,6 @@ StringMap<Graphics::LineJoin, Graphics::LINE_JOIN_MAX_ENUM>::Entry Graphics::lin
StringMap<Graphics::LineJoin, Graphics::LINE_JOIN_MAX_ENUM> Graphics::lineJoins(Graphics::lineJoinEntries, sizeof(Graphics::lineJoinEntries));
StringMap<Graphics::PointStyle, Graphics::POINT_MAX_ENUM>::Entry Graphics::pointStyleEntries[] =
{
{ "smooth", Graphics::POINT_SMOOTH },
{ "rough", Graphics::POINT_ROUGH }
};
StringMap<Graphics::PointStyle, Graphics::POINT_MAX_ENUM> Graphics::pointStyles(Graphics::pointStyleEntries, sizeof(Graphics::pointStyleEntries));
StringMap<Graphics::Support, Graphics::SUPPORT_MAX_ENUM>::Entry Graphics::supportEntries[] =
{
{ "canvas", Graphics::SUPPORT_CANVAS },
src/modules/graphics/Graphics.h
-13
View File
@@ -76,13 +76,6 @@ public:
LINE_JOIN_MAX_ENUM
};
enum PointStyle
{
POINT_ROUGH = 1,
POINT_SMOOTH,
POINT_MAX_ENUM
};
enum Support
{
SUPPORT_CANVAS = 1,
@@ -141,9 +134,6 @@ public:
static bool getConstant(const char *in, LineJoin &out);
static bool getConstant(LineJoin in, const char *&out);
static bool getConstant(const char *in, PointStyle &out);
static bool getConstant(PointStyle in, const char *&out);
static bool getConstant(const char *in, Support &out);
static bool getConstant(Support in, const char *&out);
@@ -167,9 +157,6 @@ private:
static StringMap<LineJoin, LINE_JOIN_MAX_ENUM>::Entry lineJoinEntries[];
static StringMap<LineJoin, LINE_JOIN_MAX_ENUM> lineJoins;
static StringMap<PointStyle, POINT_MAX_ENUM>::Entry pointStyleEntries[];
static StringMap<PointStyle, POINT_MAX_ENUM> pointStyles;
static StringMap<Support, SUPPORT_MAX_ENUM>::Entry supportEntries[];
static StringMap<Support, SUPPORT_MAX_ENUM> support;
src/modules/graphics/opengl/Graphics.cpp
-19
View File
@@ -86,8 +86,6 @@ DisplayState Graphics::saveState()
s.lineStyle = lineStyle;
//get the point size
glGetFloatv(GL_POINT_SIZE, &s.pointSize);
//get point style
s.pointStyle = (glIsEnabled(GL_POINT_SMOOTH) == GL_TRUE) ? Graphics::POINT_SMOOTH : Graphics::POINT_ROUGH;
//get scissor status
s.scissor = (glIsEnabled(GL_SCISSOR_TEST) == GL_TRUE);
//do we have scissor, if so, store the box
@@ -108,7 +106,6 @@ void Graphics::restoreState(const DisplayState &s)
setLineWidth(lineWidth);
setLineStyle(s.lineStyle);
setPointSize(s.pointSize);
setPointStyle(s.pointStyle);
if (s.scissor)
setScissor(s.scissorBox.x, s.scissorBox.y, s.scissorBox.w, s.scissorBox.h);
else
@@ -689,14 +686,6 @@ void Graphics::setPointSize(float size)
glPointSize((GLfloat)size);
}
void Graphics::setPointStyle(Graphics::PointStyle style)
{
if (style == POINT_SMOOTH)
glEnable(GL_POINT_SMOOTH);
else // love::POINT_ROUGH
glDisable(GL_POINT_SMOOTH);
}
float Graphics::getPointSize() const
{
GLfloat size;
@@ -704,14 +693,6 @@ float Graphics::getPointSize() const
return (float)size;
}
Graphics::PointStyle Graphics::getPointStyle() const
{
if (glIsEnabled(GL_POINT_SMOOTH) == GL_TRUE)
return POINT_SMOOTH;
else
return POINT_ROUGH;
}
int Graphics::getMaxPointSize() const
{
GLint max;
src/modules/graphics/opengl/Graphics.h
-13
View File
@@ -72,7 +72,6 @@ struct DisplayState
// Point.
float pointSize;
Graphics::PointStyle pointStyle;
// Scissor.
bool scissor;
@@ -90,7 +89,6 @@ struct DisplayState
lineStyle = Graphics::LINE_SMOOTH;
lineJoin = Graphics::LINE_JOIN_MITER;
pointSize = 1.0f;
pointStyle = Graphics::POINT_SMOOTH;
scissor = false;
colorMask[0] = colorMask[1] = colorMask[2] = colorMask[3] = true;
}
@@ -320,22 +318,11 @@ public:
**/
void setPointSize(float size);
/**
* Sets the style of points.
* @param style POINT_SMOOTH or POINT_ROUGH.
**/
void setPointStyle(PointStyle style);
/**
* Gets the point size.
**/
float getPointSize() const;
/**
* Gets the point style.
**/
PointStyle getPointStyle() const;
/**
* Gets the maximum point size supported.
* This may vary from computer to computer.
src/modules/graphics/opengl/wrap_Graphics.cpp
-24
View File
@@ -790,34 +790,12 @@ int w_setPointSize(lua_State *L)
return 0;
}
int w_setPointStyle(lua_State *L)
{
Graphics::PointStyle style;
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;
}
int w_getPointSize(lua_State *L)
{
lua_pushnumber(L, instance->getPointSize());
return 1;
}
int w_getPointStyle(lua_State *L)
{
Graphics::PointStyle style = instance->getPointStyle();
const char *str;
if (!Graphics::getConstant(style, str))
return luaL_error(L, "Unknown point style");
lua_pushstring(L, str);
return 1;
}
int w_getMaxPointSize(lua_State *L)
{
lua_pushnumber(L, instance->getMaxPointSize());
@@ -1344,9 +1322,7 @@ static const luaL_Reg functions[] =
{ "getLineStyle", w_getLineStyle },
{ "getLineJoin", w_getLineJoin },
{ "setPointSize", w_setPointSize },
{ "setPointStyle", w_setPointStyle },
{ "getPointSize", w_getPointSize },
{ "getPointStyle", w_getPointStyle },
{ "getMaxPointSize", w_getMaxPointSize },
{ "getMaxTextureSize", w_getMaxTextureSize },
{ "newScreenshot", w_newScreenshot },
src/modules/graphics/opengl/wrap_Graphics.h
-2
View File
@@ -81,9 +81,7 @@ int w_getLineWidth(lua_State *L);
int w_getLineStyle(lua_State *L);
int w_getLineJoin(lua_State *L);
int w_setPointSize(lua_State *L);
int w_setPointStyle(lua_State *L);
int w_getPointSize(lua_State *L);
int w_getPointStyle(lua_State *L);
int w_getMaxPointSize(lua_State *L);
int w_newScreenshot(lua_State *L);
int w_setCanvas(lua_State *L);