Added glwrapper, which expands the GLStateManager class from tilebuf into a (g)raphics (l)ibrary wrapper. Also updated the makefile to include it when making with GL=y

1 files changed, 137 insertions, 0 deletions

diff --git a/crawl-ref/source/glwrapper.cc b/crawl-ref/source/glwrapper.cc
new file mode 100644
index 0000000000..6198aaedcf
--- /dev/null
+++ b/crawl-ref/source/glwrapper.cc
@@ -0,0 +1,137 @@
+#include "glwrapper.h"
+
+#ifdef USE_TILE
+
+#ifdef USE_SDL
+#include <SDL_opengl.h>
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// GLState
+
+// Note: these defaults should match the OpenGL defaults
+GLState::GLState() :
+    array_vertex(false),
+    array_texcoord(false),
+    array_colour(false),
+    blend(false),
+    texture(false),
+    depthtest(false),
+    alphatest(false),
+    alpharef(0)
+{
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// GLStateManager
+
+void GLStateManager::init()
+{
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    glClearColor(0.0, 0.0, 0.0, 1.0f);
+    glDepthFunc(GL_LEQUAL);
+}
+
+void GLStateManager::set(const GLState& state)
+{
+    if (state.array_vertex)
+        glEnableClientState(GL_VERTEX_ARRAY);
+    else
+        glDisableClientState(GL_VERTEX_ARRAY);
+
+    if (state.array_texcoord)
+        glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+    else
+        glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+
+    if (state.array_colour)
+    {
+        glEnableClientState(GL_COLOR_ARRAY);
+    }
+    else
+    {
+        glDisableClientState(GL_COLOR_ARRAY);
+
+        // [enne] This should *not* be necessary, but the Linux OpenGL
+        // driver that I'm using sets this to the last colour of the
+        // colour array.  So, we need to unset it here.
+        glColor3f(1.0f, 1.0f, 1.0f);
+    }
+
+    if (state.texture)
+        glEnable(GL_TEXTURE_2D);
+    else
+        glDisable(GL_TEXTURE_2D);
+
+    if (state.blend)
+        glEnable(GL_BLEND);
+    else
+        glDisable(GL_BLEND);
+
+    if (state.depthtest)
+        glEnable(GL_DEPTH_TEST);
+    else
+        glDisable(GL_DEPTH_TEST);
+
+    if (state.alphatest)
+    {
+        glEnable(GL_ALPHA_TEST);
+        glAlphaFunc(GL_NOTEQUAL, state.alpharef);
+    }
+    else
+        glDisable(GL_ALPHA_TEST);
+}
+
+void GLStateManager::drawPTVert(long int size, int mode, int count
+    void *vert_pointer, void *tex_pointer)
+{
+    glVertexPointer(2, GL_FLOAT, size, vert_pointer;
+    glTexCoordPointer(2, GL_FLOAT, size, tex_pointer;
+    glDrawArrays(mode, 0, count);
+}
+
+void GLStateManager::drawPCVert(long int size, int mode, int count
+    void *vert_pointer, void *color_pointer)
+{
+    glVertexPointer(2, GL_FLOAT, size, vert_pointer);
+    glColorPointer(4, GL_UNSIGNED_BYTE, size, color_pointer);
+    glDrawArrays(mode, 0, count);
+}
+
+static void drawPTCVert(long int size, int mode, int count
+    void *vert_pointer, void *tex_pointer, void *color_pointer)
+{
+    glVertexPointer(2, GL_FLOAT, size, vert_pointer);
+    glTexCoordPointer(2, GL_FLOAT, size, tex_pointer);
+    glColorPointer(4, GL_UNSIGNED_BYTE, size, color_pointer);
+    glDrawArrays(mode, 0, count);
+}
+
+static void drawP3TCVert(long int size, int mode, int count
+    void *vert_pointer, void *tex_pointer, void *color_pointer)
+{
+    glVertexPointer(3, GL_FLOAT, size, vert_pointer);
+    glTexCoordPointer(2, GL_FLOAT, size, tex_pointer);
+    glColorPointer(4, GL_UNSIGNED_BYTE, size, color_pointer);
+    glDrawArrays(mode, 0, count);
+}
+
+static void pushMatrix()
+{
+    glPushMatrix();
+}
+
+static void popMatrix()
+{
+    glPopMatrix();
+}
+
+static void translatef(float x, float y, float z)
+{
+    glTranslatef(x, y ,z);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// Static Methods
+
+#endif 
\ No newline at end of file