X-Git-Url: https://git.lukelau.me/?p=opengl.git;a=blobdiff_plain;f=model.hpp;h=e0c8a2d93acd0a4e7fedcd542bcc4a36cb1746a9;hp=0339538429cc94ae87292ff3f53e56cd460777a6;hb=8abaf8f77191e1c660def0832d8036a8b4639ba8;hpb=b64cd5a5ec09e6f051583371045ef7080c69b776

diff --git a/model.hpp b/model.hpp
index 0339538..e0c8a2d 100644
--- a/model.hpp
+++ b/model.hpp
@@ -6,27 +6,51 @@
 #endif
 #include <glm/glm.hpp>
 #include <assimp/scene.h>
+#include <assimp/Importer.hpp>
+#include "material.hpp"
+#include "program.hpp"
+#include "skybox.hpp"
 
 class Model {
-	public:
-		Model(const std::string &path, GLuint progId): progId(progId) {
-			loadModel(path);
-		}
-		void draw();
-	private:
-		const GLuint progId;
 
 	struct Mesh {
 		Mesh(const aiMesh *aiMesh, GLuint progId);
+		GLuint progId, vao, numIndices;
+		unsigned int materialIndex;
+	};
 	
-			GLuint vao, vertexVbo, normalVbo, indicesVbo;
+	public:
+		Model(const std::string &path, Program p, Skybox s);
+		void draw() const;
 
-			std::vector<glm::vec3> vertices;
-			std::vector<glm::vec3> normals;
-			std::vector<glm::vec2> texCoords;
-			std::vector<GLuint> indices;
+		class Node {
+			public:
+				Node(const aiNode &aiNode, GLuint progId);
+				void draw(const std::vector<Mesh> &meshes, const std::vector<Material> &materials, const Skybox s, glm::mat4 parentModel) const;
+				const std::vector<Node*> &getChildren() const { return children; }
+				Node* findNode(const aiNode &aiNode);
+				glm::mat4 model = glm::mat4(1);
+				const aiNode &ai;
+			private:
+				const GLuint progId;
+
+				std::vector<Node*> children;
+				std::vector<unsigned int> meshIndices;
 		};
 		
+		Node* getRoot() { return root; }
+		Node* find(const std::string &name);
+	
+	private:
+		const Program program;
+		const Skybox skybox;
+		
 		std::vector<Mesh> meshes;
+		Node *root;
+
+		std::vector<Material> materials;
+
 		void loadModel(const std::string &path);
+
+		Assimp::Importer importer;
 };