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

Removed love.graphics.setAlphaTest: incompatible with OpenGL ES 2+, core OpenGL 3+, and Direct3D 10+. Shaders can accomplish the same things and more.

Browse Source
This commit is contained in:
Alex Szpakowski
2013-08-01 12:55:46 -03:00
parent ce9d0be1ea
commit d7802b053b
6 changed files with 0 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/Graphics.cpp
-22
View File
@@ -79,16 +79,6 @@ bool Graphics::getConstant(PointStyle in, const char *&out)
return pointStyles.find(in, out);
}
bool Graphics::getConstant(const char *in, AlphaTestMode &out)
{
return alphaTests.find(in, out);
}
bool Graphics::getConstant(AlphaTestMode in, const char *&out)
{
return alphaTests.find(in, out);
}
bool Graphics::getConstant(const char *in, Support &out)
{
return support.find(in, out);
@@ -155,18 +145,6 @@ StringMap<Graphics::PointStyle, Graphics::POINT_MAX_ENUM>::Entry Graphics::point
StringMap<Graphics::PointStyle, Graphics::POINT_MAX_ENUM> Graphics::pointStyles(Graphics::pointStyleEntries, sizeof(Graphics::pointStyleEntries));
StringMap<Graphics::AlphaTestMode, Graphics::ALPHATEST_MAX_ENUM>::Entry Graphics::alphaTestEntries[] =
{
{ "<", Graphics::ALPHATEST_LESS },
{ "<=", Graphics::ALPHATEST_LEQUAL },
{ "==", Graphics::ALPHATEST_EQUAL },
{ "~=", Graphics::ALPHATEST_NOTEQUAL },
{ ">=", Graphics::ALPHATEST_GEQUAL },
{ ">", Graphics::ALPHATEST_GREATER },
};
StringMap<Graphics::AlphaTestMode, Graphics::ALPHATEST_MAX_ENUM> Graphics::alphaTests(Graphics::alphaTestEntries, sizeof(Graphics::alphaTestEntries));
StringMap<Graphics::Support, Graphics::SUPPORT_MAX_ENUM>::Entry Graphics::supportEntries[] =
{
{ "canvas", Graphics::SUPPORT_CANVAS },
src/modules/graphics/Graphics.h
-17
View File
@@ -75,17 +75,6 @@ public:
POINT_MAX_ENUM
};
enum AlphaTestMode
{
ALPHATEST_LESS = 1,
ALPHATEST_LEQUAL,
ALPHATEST_EQUAL,
ALPHATEST_NOTEQUAL,
ALPHATEST_GEQUAL,
ALPHATEST_GREATER,
ALPHATEST_MAX_ENUM
};
enum Support
{
SUPPORT_CANVAS = 1,
@@ -139,9 +128,6 @@ public:
static bool getConstant(const char *in, PointStyle &out);
static bool getConstant(PointStyle in, const char *&out);
static bool getConstant(const char *in, AlphaTestMode &out);
static bool getConstant(AlphaTestMode in, const char *&out);
static bool getConstant(const char *in, Support &out);
static bool getConstant(Support in, const char *&out);
@@ -165,9 +151,6 @@ private:
static StringMap<PointStyle, POINT_MAX_ENUM>::Entry pointStyleEntries[];
static StringMap<PointStyle, POINT_MAX_ENUM> pointStyles;
static StringMap<AlphaTestMode, ALPHATEST_MAX_ENUM>::Entry alphaTestEntries[];
static StringMap<AlphaTestMode, ALPHATEST_MAX_ENUM> alphaTests;
static StringMap<Support, SUPPORT_MAX_ENUM>::Entry supportEntries[];
static StringMap<Support, SUPPORT_MAX_ENUM> support;
src/modules/graphics/opengl/Graphics.cpp
-90
View File
@@ -84,14 +84,6 @@ DisplayState Graphics::saveState()
glGetFloatv(GL_POINT_SIZE, &s.pointSize);
//get point style
s.pointStyle = (glIsEnabled(GL_POINT_SMOOTH) == GL_TRUE) ? Graphics::POINT_SMOOTH : Graphics::POINT_ROUGH;
// get alpha test status
s.alphaTest = isAlphaTestEnabled();
if (s.alphaTest)
{
// if alpha testing is enabled, store mode and reference alpha
s.alphaTestMode = getAlphaTestMode();
s.alphaTestRef = getAlphaTestRef();
}
//get scissor status
s.scissor = (glIsEnabled(GL_SCISSOR_TEST) == GL_TRUE);
//do we have scissor, if so, store the box
@@ -113,10 +105,6 @@ void Graphics::restoreState(const DisplayState &s)
setLineStyle(s.lineStyle);
setPointSize(s.pointSize);
setPointStyle(s.pointStyle);
if (s.alphaTest)
setAlphaTest(s.alphaTestMode, s.alphaTestRef);
else
setAlphaTest();
if (s.scissor)
setScissor(s.scissorBox.x, s.scissorBox.y, s.scissorBox.w, s.scissorBox.h);
else
@@ -154,10 +142,6 @@ bool Graphics::setMode(int width, int height)
if (GLEE_VERSION_1_4 || GLEE_SGIS_generate_mipmap)
glHint(GL_GENERATE_MIPMAP_HINT, GL_NICEST);
// Set default alpha test mode and value
glAlphaFunc(GL_GREATER, 0.0f);
setAlphaTest();
// Enable textures
glEnable(GL_TEXTURE_2D);
gl.setTextureUnit(0);
@@ -320,80 +304,6 @@ void Graphics::discardStencil()
glDisable(GL_STENCIL_TEST);
}
void Graphics::setAlphaTest(Graphics::AlphaTestMode mode, unsigned char refalpha)
{
GLclampf ref = refalpha / 255.0f;
glEnable(GL_ALPHA_TEST);
switch (mode)
{
case ALPHATEST_LESS:
glAlphaFunc(GL_LESS, ref);
break;
case ALPHATEST_LEQUAL:
glAlphaFunc(GL_LEQUAL, ref);
break;
case ALPHATEST_EQUAL:
glAlphaFunc(GL_EQUAL, ref);
break;
case ALPHATEST_NOTEQUAL:
glAlphaFunc(GL_NOTEQUAL, ref);
break;
case ALPHATEST_GEQUAL:
glAlphaFunc(GL_GEQUAL, ref);
break;
case ALPHATEST_GREATER:
glAlphaFunc(GL_GREATER, ref);
break;
default:
glDisable(GL_ALPHA_TEST);
break;
}
}
void Graphics::setAlphaTest()
{
glDisable(GL_ALPHA_TEST);
}
bool Graphics::isAlphaTestEnabled()
{
return glIsEnabled(GL_ALPHA_TEST) == GL_TRUE;
}
Graphics::AlphaTestMode Graphics::getAlphaTestMode()
{
GLint func;
glGetIntegerv(GL_ALPHA_TEST_FUNC, &func);
switch (func)
{
case GL_LESS:
return ALPHATEST_LESS;
case GL_LEQUAL:
return ALPHATEST_LEQUAL;
case GL_EQUAL:
return ALPHATEST_EQUAL;
case GL_NOTEQUAL:
return ALPHATEST_NOTEQUAL;
case GL_GEQUAL:
return ALPHATEST_GEQUAL;
case GL_GREATER:
return ALPHATEST_GREATER;
default:
return ALPHATEST_MAX_ENUM;
}
}
unsigned char Graphics::getAlphaTestRef()
{
GLfloat ref;
glGetFloatv(GL_ALPHA_TEST_REF, &ref);
return ref * 255;
}
int Graphics::getMaxImageSize() const
{
return gl.getMaxTextureSize();
src/modules/graphics/opengl/Graphics.h
-32
View File
@@ -74,10 +74,6 @@ struct DisplayState
float pointSize;
Graphics::PointStyle pointStyle;
bool alphaTest;
Graphics::AlphaTestMode alphaTestMode;
unsigned char alphaTestRef;
// Scissor.
bool scissor;
OpenGL::Viewport scissorBox;
@@ -94,7 +90,6 @@ struct DisplayState
lineStyle = Graphics::LINE_SMOOTH;
pointSize = 1.0f;
pointStyle = Graphics::POINT_SMOOTH;
alphaTest = false;
scissor = false;
colorMask[0] = colorMask[1] = colorMask[2] = colorMask[3] = true;
}
@@ -189,33 +184,6 @@ public:
*/
void discardStencil();
/**
* Enables alpha testing for all following draw calls
* @param mode The alpha comparison mode used when performing the alpha test
* @param refalpha The reference alpha value used when perfoming the alpha test
*/
void setAlphaTest(Graphics::AlphaTestMode mode, unsigned char refalpha);
/**
* Disables alpha testing
*/
void setAlphaTest();
/**
* True if alpha testing is enabled
*/
bool isAlphaTestEnabled();
/**
* Gets the current alpha test comparison mode
*/
Graphics::AlphaTestMode getAlphaTestMode();
/**
* Gets the current alpha test reference alpha value (0-255)
*/
unsigned char getAlphaTestRef();
/**
* Gets the maximum supported width or height of Images and Canvases on this
* system.
src/modules/graphics/opengl/wrap_Graphics.cpp
-44
View File
@@ -134,47 +134,6 @@ int w_setInvertedStencil(lua_State *L)
return setStencil(L, true);
}
int w_setAlphaTest(lua_State *L)
{
// disable alpha testing if no arguments are given
if (lua_gettop(L) == 0)
{
instance->setAlphaTest();
return 0;
}
const char *modestr = luaL_checkstring(L, 1);
unsigned char refalpha = (unsigned char) luaL_checkinteger(L, 2);
Graphics::AlphaTestMode mode;
if (!Graphics::getConstant(modestr, mode))
return luaL_error(L, "Invalid alpha test mode: %s", modestr);
instance->setAlphaTest(mode, refalpha);
return 0;
}
int w_getAlphaTest(lua_State *L)
{
// return nil if not enabled
if (!instance->isAlphaTestEnabled())
return 0;
Graphics::AlphaTestMode mode = instance->getAlphaTestMode();
const char *modestr;
if (!Graphics::getConstant(mode, modestr))
return 0; // also return nil if alpha test mode isn't valid
unsigned char refalpha = instance->getAlphaTestRef();
lua_pushstring(L, modestr);
lua_pushnumber(L, refalpha);
return 2;
}
int w_getMaxImageSize(lua_State *L)
{
lua_pushinteger(L, instance->getMaxImageSize());
@@ -1527,9 +1486,6 @@ static const luaL_Reg functions[] =
{ "setStencil", w_setStencil },
{ "setInvertedStencil", w_setInvertedStencil },
{ "setAlphaTest", w_setAlphaTest },
{ "getAlphaTest", w_getAlphaTest },
{ "point", w_point },
{ "line", w_line },
{ "rectangle", w_rectangle },
src/modules/graphics/opengl/wrap_Graphics.h
-2
View File
@@ -48,8 +48,6 @@ int w_getDimensions(lua_State *L);
int w_setScissor(lua_State *L);
int w_getScissor(lua_State *L);
int w_setStencil(lua_State *L);
int w_setAlphaTest(lua_State *L);
int w_getAlphaTest(lua_State *L);
int w_getMaxImageSize(lua_State *L);
int w_newImage(lua_State *L);
int w_newGeometry(lua_State *L);