From f672782921b1b4d5f7a205a12672ef48cf8c053a Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop+git@gmail.com>
Date: Mon, 16 May 2011 15:43:54 -0400
Subject: [PATCH] preparing for textures

---
 wfobj-view.cc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/wfobj-view.cc b/wfobj-view.cc
index 8ec7785..113de7d 100644
--- a/wfobj-view.cc
+++ b/wfobj-view.cc
@@ -19,7 +19,8 @@ using namespace std;
 
 enum Locations {
     LOC_POSITION,
-    LOC_NORMAL
+    LOC_NORMAL,
+    LOC_TEXTURE
 };
 
 class Viewer
@@ -267,7 +268,8 @@ void Viewer::display()
             stride, (GLvoid *) m_obj.getNormalOffset());
     if (m_obj.doTextures())
     {
-        /* TODO */
+        glVertexAttribPointer(LOC_TEXTURE, 3, GL_FLOAT, GL_FALSE,
+                stride, (GLvoid *) m_obj.getTextureCoordOffset());
     }
     for (map<string, WFObj::Material>::iterator it =
             m_obj.getMaterials().begin();
@@ -287,9 +289,9 @@ void Viewer::display()
         {
             cerr << "error: textured materials not implemented yet" << endl;
         }
-        glDrawElements(GL_TRIANGLES, it->second.num_vertices,
+        glDrawElements(GL_TRIANGLES, m.num_vertices,
                 GL_UNSIGNED_SHORT,
-                (GLvoid *) (sizeof(GLushort) * it->second.first_vertex));
+                (GLvoid *) (sizeof(GLushort) * m.first_vertex));
     }
     SDL_GL_SwapBuffers();
 }