X-Git-Url: http://git.lukelau.me/?p=opengl.git;a=blobdiff_plain;f=model.hpp;h=92aab0dd21cb80cb95791f475819522ee0b58056;hp=0339538429cc94ae87292ff3f53e56cd460777a6;hb=b75b26b3081207cd4169f2ac50875e35d19b8a14;hpb=b64cd5a5ec09e6f051583371045ef7080c69b776

diff --git a/model.hpp b/model.hpp
index 0339538..92aab0d 100644
--- a/model.hpp
+++ b/model.hpp
@@ -1,4 +1,5 @@
 #include <vector>
+#include <map>
 #ifdef __APPLE__
 #include <GL/glew.h>
 #else
@@ -6,27 +7,72 @@
 #endif
 #include <glm/glm.hpp>
 #include <assimp/scene.h>
+#include "material.hpp"
+#include "program.hpp"
+#include "skybox.hpp"
 
-class Model {
-	public:
-		Model(const std::string &path, GLuint progId): progId(progId) {
-			loadModel(path);
+inline glm::mat4 aiMatrixToMat4(aiMatrix4x4 from) {
+	glm::mat4 to;
+	for (int i = 0; i < 4; i++)
+		for (int j = 0; j < 4; j++)
+			to[i][j] = from[j][i];
+	return to;
 }
-		void draw();
-	private:
-		const GLuint progId;
+
+class Model {
+
+	struct Animation {
+		double duration;
+		std::vector<const aiNodeAnim*> nodeAnims;
+	};
+
+	typedef std::map<std::string, std::pair<unsigned int, glm::mat4>> BoneMap;
+	typedef std::map<std::string, std::vector<const Animation>> AnimMap;
+	typedef std::map<std::string, glm::mat4> BoneTransforms;
+
+	struct VertBones {
+		unsigned int ids[4] = {0, 0, 0 ,0};
+		float weights[4] = {1, 0, 0, 0};
+	};
 
 	struct Mesh {
 		Mesh(const aiMesh *aiMesh, GLuint progId);
+		GLuint progId, vao, numIndices;
+		unsigned int materialIndex;
+		BoneMap boneMap;
+	};
 	
-			GLuint vao, vertexVbo, normalVbo, indicesVbo;
+	public:
+		Model(const aiScene *scene, Program p);
+		void draw(Skybox skybox, const float tick) const;
+
+		class Node {
+			public:
+				Node(const aiNode &aiNode, GLuint progId, AnimMap *animMap);
+				void draw(const std::vector<Mesh> &meshes, const std::vector<Material> &materials, const Skybox s, const float tick, glm::mat4 parentModel, BoneTransforms boneTransforms) const;
+				const std::vector<Node*> &getChildren() const { return children; }
+				Node* findNode(const aiNode &aiNode);
+				const aiNode &ai;
+
+			private:
+				const GLuint progId;
 
-			std::vector<glm::vec3> vertices;
-			std::vector<glm::vec3> normals;
-			std::vector<glm::vec2> texCoords;
-			std::vector<GLuint> indices;
+				const AnimMap *animMap;
+				std::vector<Node*> children;
+				std::vector<unsigned int> meshIndices;
 		};
 		
+		Node* getRoot() { return root; }
+		Node* find(const aiString name);
+		Node* find(const std::string &name);
+	
+	private:
+		const Program program;
+		
 		std::vector<Mesh> meshes;
+		Node *root;
+
+		std::vector<Material> materials;
+
 		void loadModel(const std::string &path);
 };