From f46f88747282b724b4139178fe2efbedda6be2c1 Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop+git@gmail.com>
Date: Tue, 19 Apr 2011 15:58:18 -0400
Subject: [PATCH] replace m_data with m_vertices

---
 WFObj.cc | 5 ++---
 WFObj.h  | 5 +++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WFObj.cc b/WFObj.cc
index 068be4b..efdcd62 100644
--- a/WFObj.cc
+++ b/WFObj.cc
@@ -104,8 +104,8 @@ WFObj::~WFObj()
 
 void WFObj::clear()
 {
-    m_data = std::vector< std::vector<std::string> >();
-    m_loadedVertex = false;
+    for (int i = 0; i < sizeof(m_vertices)/sizeof(m_vertices[0]); i++)
+        m_vertices[i].clear();
 }
 
 bool WFObj::load(const char *fname)
@@ -193,7 +193,6 @@ GLuint WFObj::render(bool doTextureInfo, bool enableBlending)
     GLuint list = glGenLists(1);
     glNewList(list, GL_COMPILE);
     int len = m_data.size();
-    enum { VERTEX, VERTEX_TEXTURE, VERTEX_NORMAL, VERTEX_TYPES };
     vector<Vertex> vertices[VERTEX_TYPES];
     int numVertsLast = 0;
     bool inFace = false;
diff --git a/WFObj.h b/WFObj.h
index 7c6fe7d..cdba484 100644
--- a/WFObj.h
+++ b/WFObj.h
@@ -48,6 +48,8 @@ public:
         WFObj * m_obj;
     };
 
+    enum { VERTEX, VERTEX_TEXTURE, VERTEX_NORMAL, VERTEX_TYPES };
+
     /* constructors */
     WFObj(loadfile_t lf = NULL, loadtexture_t lt = NULL);
     ~WFObj();
@@ -80,10 +82,9 @@ protected:
     std::string getLine(const Buff & buff, size_t idx, size_t *update_idx);
 
     /* variables */
-    std::vector< std::vector<std::string> > m_data;
+    std::vector<Vector> m_vertices[VERTEX_TYPES];
     FileLoader::Path m_path;
     float m_aabb[6];
-    bool m_loadedVertex;
     loadfile_t m_loadfile;
     loadtexture_t m_loadtexture;
 };