X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogram.h;h=818e72be1174d4a0464bc91b5a691d8f54efd602;hb=927a1aa0a3a27e463ec0efc08bd08e7c4e969909;hp=af249edefa2066c29bcf23e7c6f643ddd7d6c95c;hpb=cea3c333797cadd9629aefaa5b82243173a02d16;p=libs%2Fgl.git

diff --git a/source/program.h b/source/program.h
index af249ede..818e72be 100644
--- a/source/program.h
+++ b/source/program.h
@@ -10,8 +10,8 @@ Distributed under the LGPL
 
 #include <list>
 #include <string>
-#include <GL/gl.h>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
+#include "gl.h"
 #include "types.h"
 
 namespace Msp {
@@ -27,45 +27,39 @@ private:
 	bool del_shaders;
 	bool linked;
 
-	static Program *cur_prog;
+	static const Program *cur_prog;
 
 public:
-	class Loader: public DataFile::Loader
+	class Loader: public DataFile::ObjectLoader<Program>
 	{
-	private:
-		Program &prog;
-
 	public:
 		Loader(Program &);
-		~Loader();
 
 	private:
 		void vertex_shader(const std::string &);
 		void fragment_shader(const std::string &);
+		void attribute(uint, const std::string &);
+		virtual void finish();
 	};
 
 	Program();
 	Program(const std::string &, const std::string &);
+private:
+	void init();
+public:
 	virtual ~Program();
 
 	void attach_shader(Shader &shader);
 	void detach_shader(Shader &shader);
 	const std::list<Shader *> &get_shaders() const { return shaders; }
 	void set_del_shaders(bool);
-	void bind_attribute(int, const std::string &);
-	bool link();
+	void bind_attribute(uint, const std::string &);
+	void link();
 	int get_param(GLenum param) const;
 	bool get_linked() const { return linked; }
 	std::string get_info_log() const;
-	void bind();
+	void bind() const;
 	int get_uniform_location(const std::string &) const;
-	void uniform(int, int);
-	void uniform(int, float);
-	void uniform(int, float, float);
-	void uniform(int, float, float, float);
-	void uniform(int, float, float, float, float);
-	void uniform4(int, const float *);
-	void uniform_matrix4(int, const float *);
 
 	static void unbind();