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

diff --git a/model.hpp b/model.hpp
index a39c70a..358b92d 100644
--- a/model.hpp
+++ b/model.hpp
@@ -8,6 +8,8 @@
 #include <assimp/scene.h>
 #include <assimp/Importer.hpp>
 #include "material.hpp"
+#include "program.hpp"
+#include "skybox.hpp"
 
 class Model {
 
@@ -18,13 +20,13 @@ class Model {
 	};
 	
 	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, const std::vector<Material> &materials, 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);
@@ -40,7 +42,7 @@ class Model {
 		Node* find(const std::string &name);
 	
 	private:
-		const GLuint progId;
+		const Program program;
 		
 		std::vector<Mesh> meshes;
 		Node *root;