josh/wfobj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

replace m_data with m_vertices

Browse Source
This commit is contained in:
Josh Holtrop 2011-04-19 15:58:18 -04:00
parent 594642f489
commit f46f887472
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
WFObj.cc
View File

@ -104,8 +104,8 @@ WFObj::~WFObj()
void WFObj::clear() void WFObj::clear()
{ {
m_data = std::vector< std::vector<std::string> >(); for (int i = 0; i < sizeof(m_vertices)/sizeof(m_vertices[0]); i++)
m_loadedVertex = false; m_vertices[i].clear();
} }
bool WFObj::load(const char *fname) bool WFObj::load(const char *fname)
@ -193,7 +193,6 @@ GLuint WFObj::render(bool doTextureInfo, bool enableBlending)
GLuint list = glGenLists(1); GLuint list = glGenLists(1);
glNewList(list, GL_COMPILE); glNewList(list, GL_COMPILE);
int len = m_data.size(); int len = m_data.size();
enum { VERTEX, VERTEX_TEXTURE, VERTEX_NORMAL, VERTEX_TYPES };
vector<Vertex> vertices[VERTEX_TYPES]; vector<Vertex> vertices[VERTEX_TYPES];
int numVertsLast = 0; int numVertsLast = 0;
bool inFace = false; bool inFace = false;

5
WFObj.h
View File

@ -48,6 +48,8 @@ public:
WFObj * m_obj; WFObj * m_obj;
}; };
enum { VERTEX, VERTEX_TEXTURE, VERTEX_NORMAL, VERTEX_TYPES };
/* constructors */ /* constructors */
WFObj(loadfile_t lf = NULL, loadtexture_t lt = NULL); WFObj(loadfile_t lf = NULL, loadtexture_t lt = NULL);
~WFObj(); ~WFObj();
@ -80,10 +82,9 @@ protected:
std::string getLine(const Buff & buff, size_t idx, size_t *update_idx); std::string getLine(const Buff & buff, size_t idx, size_t *update_idx);
/* variables */ /* variables */
std::vector< std::vector<std::string> > m_data; std::vector<Vector> m_vertices[VERTEX_TYPES];
FileLoader::Path m_path; FileLoader::Path m_path;
float m_aabb[6]; float m_aabb[6];
bool m_loadedVertex;
loadfile_t m_loadfile; loadfile_t m_loadfile;
loadtexture_t m_loadtexture; loadtexture_t m_loadtexture;
}; };