X-Git-Url: https://git.lukelau.me/?p=opengl.git;a=blobdiff_plain;f=model.hpp;fp=model.hpp;h=de8e27f8639f8c422de78127faa300ec15b4fd45;hp=a39c70a0651eb8043cd14bbb9ea4e0567bba85d9;hb=c44e69ec78367fb2957324026894aef970f2481a;hpb=85f8f7278f24fe73fef1a19174376b155319072f

diff --git a/model.hpp b/model.hpp
index a39c70a..de8e27f 100644
--- a/model.hpp
+++ b/model.hpp
@@ -8,6 +8,7 @@
 #include <assimp/scene.h>
 #include <assimp/Importer.hpp>
 #include "material.hpp"
+#include "program.hpp"
 
 class Model {
 
@@ -18,7 +19,7 @@ class Model {
 	};
 	
 	public:
-		Model(const std::string &path, GLuint progId);
+		Model(const std::string &path, Program p);
 		void draw() const;
 
 		class Node {
@@ -40,7 +41,7 @@ class Model {
 		Node* find(const std::string &name);
 	
 	private:
-		const GLuint progId;
+		const Program program;
 		
 		std::vector<Mesh> meshes;
 		Node *root;