From 7924672b699574a491d3a27d4e6716079ab749ac Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop+git@gmail.com>
Date: Sun, 19 Dec 2010 00:11:38 -0500
Subject: [PATCH] fixed texturing on quads

---
 Engine.cc | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Engine.cc b/Engine.cc
index fb1f455..661956f 100644
--- a/Engine.cc
+++ b/Engine.cc
@@ -1375,10 +1375,12 @@ int Engine::Quad::render()
     }
     if (m_texture != 0)
     {
+        glEnable(GL_TEXTURE_2D);
         glBindTexture(GL_TEXTURE_2D, m_texture);
     }
     else
     {
+        glDisable(GL_TEXTURE_2D);
         glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, &m_color[0]);
     }
     if (m_enable_blending)
@@ -1390,15 +1392,23 @@ int Engine::Quad::render()
     glTranslatef(m_position[0], m_position[1], m_position[2]);
     glBegin(GL_QUADS);
     glNormal3f(m_normal[0], m_normal[1], m_normal[2]);
+    if (m_texture != 0)
+        glTexCoord2f(1.0, 1.0);
     glVertex3f(m_center[0] + m_v1[0] + m_v2[0],
                m_center[1] + m_v1[1] + m_v2[1],
                m_center[2] + m_v1[2] + m_v2[2]);
+    if (m_texture != 0)
+        glTexCoord2f(0, 1.0);
     glVertex3f(m_center[0] - m_v1[0] + m_v2[0],
                m_center[1] - m_v1[1] + m_v2[1],
                m_center[2] - m_v1[2] + m_v2[2]);
+    if (m_texture != 0)
+        glTexCoord2f(0, 0);
     glVertex3f(m_center[0] - m_v1[0] - m_v2[0],
                m_center[1] - m_v1[1] - m_v2[1],
                m_center[2] - m_v1[2] - m_v2[2]);
+    if (m_texture != 0)
+        glTexCoord2f(1.0, 0);
     glVertex3f(m_center[0] + m_v1[0] - m_v2[0],
                m_center[1] + m_v1[1] - m_v2[1],
                m_center[2] + m_v1[2] - m_v2[2]);