From 0bf4ad9e4a9e1c97e92aa23a365405dfef89bd7c Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 17 Jan 2021 19:36:30 +0000
Subject: Big reshuffle

Fixes code quality warnings now picked up.
---
 gfx/models/obj_loader.h | 53 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 gfx/models/obj_loader.h

(limited to 'gfx/models/obj_loader.h')

diff --git a/gfx/models/obj_loader.h b/gfx/models/obj_loader.h
new file mode 100644
index 0000000..11c6b38
--- /dev/null
+++ b/gfx/models/obj_loader.h
@@ -0,0 +1,53 @@
+#ifndef OBJ_LOADER_H_INCLUDED
+#define OBJ_LOADER_H_INCLUDED
+
+#include <glm/glm.hpp>
+#include <string>
+#include <vector>
+
+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<glm::vec3> positions;
+	std::vector<glm::vec2> texCoords;
+	std::vector<glm::vec3> normals;
+	std::vector<unsigned int> indices;
+
+	void CalcNormals();
+};
+
+class OBJModel {
+public:
+	std::vector<OBJIndex> OBJIndices;
+	std::vector<glm::vec3> vertices;
+	std::vector<glm::vec2> uvs;
+	std::vector<glm::vec3> normals;
+	bool hasUVs;
+	bool hasNormals;
+
+	explicit OBJModel(const std::string & fileName);
+
+	IndexedModel ToIndexedModel();
+
+private:
+	unsigned int FindLastVertexIndex(
+			const std::vector<OBJIndex *> & 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