X-Git-Url: http://git.lukelau.me/?p=opengl.git;a=blobdiff_plain;f=model.hpp;h=358b92d07701211a99eff67692e1ec56045f6468;hp=98c630e83306e36c72053760629eba52d52970e4;hb=511a2c92fcb9dda82dd5d38b91ea03790d0cb7b2;hpb=ba5e08bf25de722d907748ce55b27a45b2b270bf

diff --git a/model.hpp b/model.hpp
index 98c630e..358b92d 100644
--- a/model.hpp
+++ b/model.hpp
@@ -7,23 +7,26 @@
 #include <glm/glm.hpp>
 #include <assimp/scene.h>
 #include <assimp/Importer.hpp>
+#include "material.hpp"
+#include "program.hpp"
+#include "skybox.hpp"
 
 class Model {
 
 	struct Mesh {
 		Mesh(const aiMesh *aiMesh, GLuint progId);
-		GLuint vao;
-		GLuint numIndices;
+		GLuint progId, vao, numIndices;
+		unsigned int materialIndex;
 	};
 	
 	public:
-		Model(const std::string &path, GLuint progId);
-		void draw() const;
+		Model(const std::string &path, Program p);
+		void draw(Skybox skybox) const;
 
 		class Node {
 			public:
 				Node(const aiNode &aiNode, GLuint progId);
-				void draw(const std::vector<Mesh> &meshes, glm::mat4 parentModel) const;
+				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);
@@ -39,10 +42,13 @@ class Model {
 		Node* find(const std::string &name);
 	
 	private:
-		const GLuint progId;
+		const Program program;
 		
 		std::vector<Mesh> meshes;
 		Node *root;
+
+		std::vector<Material> materials;
+
 		void loadModel(const std::string &path);
 
 		Assimp::Importer importer;