immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More cleanup

dev
Tomasz Kapuściński 2022-05-02 19:22:50 +02:00
parent a1e4e4b97c
commit 2a529ae07f
3 changed files with 0 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/graphics/core/device.h
View File

@ -128,22 +128,6 @@ struct DeviceCapabilities
int maxSamples = 1; int maxSamples = 1;
}; };
/**
* \enum CompFunc
* \brief Type of function used to compare values
*/
enum CompFunc
{
COMP_FUNC_NEVER,
COMP_FUNC_LESS,
COMP_FUNC_EQUAL,
COMP_FUNC_NOTEQUAL,
COMP_FUNC_LEQUAL,
COMP_FUNC_GREATER,
COMP_FUNC_GEQUAL,
COMP_FUNC_ALWAYS
};
/** /**
* \enum FillMode * \enum FillMode
* \brief Polygon fill mode * \brief Polygon fill mode

34
src/graphics/opengl33/glutil.cpp
View File

@ -287,40 +287,6 @@ GLenum TranslateGfxPrimitive(PrimitiveType type)
return flag; return flag;
} }
CompFunc TranslateGLCompFunc(GLenum flag)
{
switch (flag)
{
case GL_NEVER: return COMP_FUNC_NEVER;
case GL_LESS: return COMP_FUNC_LESS;
case GL_EQUAL: return COMP_FUNC_EQUAL;
case GL_NOTEQUAL: return COMP_FUNC_NOTEQUAL;
case GL_LEQUAL: return COMP_FUNC_LEQUAL;
case GL_GREATER: return COMP_FUNC_GREATER;
case GL_GEQUAL: return COMP_FUNC_GEQUAL;
case GL_ALWAYS: return COMP_FUNC_ALWAYS;
default: assert(false); break;
}
return COMP_FUNC_NEVER;
}
GLenum TranslateGfxCompFunc(CompFunc func)
{
switch (func)
{
case COMP_FUNC_NEVER: return GL_NEVER;
case COMP_FUNC_LESS: return GL_LESS;
case COMP_FUNC_EQUAL: return GL_EQUAL;
case COMP_FUNC_NOTEQUAL: return GL_NOTEQUAL;
case COMP_FUNC_LEQUAL: return GL_LEQUAL;
case COMP_FUNC_GREATER: return GL_GREATER;
case COMP_FUNC_GEQUAL: return GL_GEQUAL;
case COMP_FUNC_ALWAYS: return GL_ALWAYS;
default: assert(false); break;
}
return 0;
}
bool InPlane(glm::vec3 normal, float originPlane, glm::vec3 center, float radius) bool InPlane(glm::vec3 normal, float originPlane, glm::vec3 center, float radius)
{ {
float distance = originPlane + glm::dot(normal, center); float distance = originPlane + glm::dot(normal, center);

4
src/graphics/opengl33/glutil.h
View File

@ -67,10 +67,6 @@ bool CheckGLErrors();
//! Translate Gfx primitive type to OpenGL primitive type //! Translate Gfx primitive type to OpenGL primitive type
GLenum TranslateGfxPrimitive(PrimitiveType type); GLenum TranslateGfxPrimitive(PrimitiveType type);
CompFunc TranslateGLCompFunc(GLenum flag);
GLenum TranslateGfxCompFunc(CompFunc func);
bool InPlane(glm::vec3 normal, float originPlane, glm::vec3 center, float radius); bool InPlane(glm::vec3 normal, float originPlane, glm::vec3 center, float radius);
GLenum TranslateType(Type type); GLenum TranslateType(Type type);