X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogram.h;h=f007fb3a5d3636b72820ffb9b6656e7860172977;hb=3f285d3f4fd0a6790bf1efa780284dc7ba2287a2;hp=a77a70d708102fcf9345e33b80ab273bd97bda9e;hpb=85facfb688035b5bbc9a3a87d080582fbf34930b;p=libs%2Fgl.git

diff --git a/source/program.h b/source/program.h
index a77a70d7..f007fb3a 100644
--- a/source/program.h
+++ b/source/program.h
@@ -11,7 +11,7 @@ Distributed under the LGPL
 #include <list>
 #include <string>
 #include <GL/gl.h>
-#include "shader.h"
+#include <msp/datafile/loader.h>
 #include "types.h"
 
 namespace Msp {
@@ -21,25 +21,55 @@ class Shader;
 
 class Program
 {
+private:
+	uint id;
+	std::list<Shader *> shaders;
+	bool del_shaders;
+	bool linked;
+
+	static Program *cur_prog;
+
 public:
+	class Loader: public DataFile::Loader
+	{
+	private:
+		Program &prog;
+
+	public:
+		Loader(Program &);
+		~Loader();
+
+	private:
+		void vertex_shader(const std::string &);
+		void fragment_shader(const std::string &);
+	};
+
 	Program();
+	Program(const std::string &, const std::string &);
 	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();
 	int get_param(GLenum param) const;
+	bool get_linked() const { return linked; }
 	std::string get_info_log() const;
 	void bind();
+	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 uniform_matrix4(int, const float *);
 
 	static void unbind();
-private:
-	uint id;
-	std::list<Shader *> shaders;
-	bool linked;
 
-	static Program *cur_prog;
+private:
+	void maybe_bind();
 };
 
 } // namespace GL