From 0bf4ad9e4a9e1c97e92aa23a365405dfef89bd7c Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sun, 17 Jan 2021 19:36:30 +0000 Subject: Big reshuffle Fixes code quality warnings now picked up. --- obj_loader.h | 53 ----------------------------------------------------- 1 file changed, 53 deletions(-) delete mode 100644 obj_loader.h (limited to 'obj_loader.h') diff --git a/obj_loader.h b/obj_loader.h deleted file mode 100644 index 11c6b38..0000000 --- a/obj_loader.h +++ /dev/null @@ -1,53 +0,0 @@ -#ifndef OBJ_LOADER_H_INCLUDED -#define OBJ_LOADER_H_INCLUDED - -#include -#include -#include - -struct OBJIndex { - unsigned int vertexIndex; - unsigned int uvIndex; - unsigned int normalIndex; - - bool - operator<(const OBJIndex & r) const - { - return vertexIndex < r.vertexIndex; - } -}; - -class IndexedModel { -public: - std::vector positions; - std::vector texCoords; - std::vector normals; - std::vector indices; - - void CalcNormals(); -}; - -class OBJModel { -public: - std::vector OBJIndices; - std::vector vertices; - std::vector uvs; - std::vector normals; - bool hasUVs; - bool hasNormals; - - explicit OBJModel(const std::string & fileName); - - IndexedModel ToIndexedModel(); - -private: - unsigned int FindLastVertexIndex( - const std::vector & indexLookup, const OBJIndex * currentIndex, const IndexedModel & result); - void CreateOBJFace(const std::string & line); - - glm::vec2 ParseOBJVec2(const std::string & line); - glm::vec3 ParseOBJVec3(const std::string & line); - OBJIndex ParseOBJIndex(const std::string & token, bool * hasUVs, bool * hasNormals); -}; - -#endif // OBJ_LOADER_H_INCLUDED -- cgit v1.2.3