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

diff --git a/source/program.h b/source/program.h
index 818e72be..1e41e844 100644
--- a/source/program.h
+++ b/source/program.h
@@ -11,24 +11,16 @@ Distributed under the LGPL
 #include <list>
 #include <string>
 #include <msp/datafile/objectloader.h>
+#include "bindable.h"
 #include "gl.h"
-#include "types.h"
 
 namespace Msp {
 namespace GL {
 
 class Shader;
 
-class Program
+class Program: public Bindable<Program>
 {
-private:
-	uint id;
-	std::list<Shader *> shaders;
-	bool del_shaders;
-	bool linked;
-
-	static const Program *cur_prog;
-
 public:
 	class Loader: public DataFile::ObjectLoader<Program>
 	{
@@ -36,13 +28,43 @@ public:
 		Loader(Program &);
 
 	private:
-		void vertex_shader(const std::string &);
-		void fragment_shader(const std::string &);
-		void attribute(uint, const std::string &);
 		virtual void finish();
+
+		void attribute(unsigned, const std::string &);
+		void fragment_shader(const std::string &);
+		void standard();
+		void vertex_shader(const std::string &);
 	};
 
+	struct StandardFeatures
+	{
+		class Loader: public DataFile::ObjectLoader<StandardFeatures>
+		{
+		public:
+			Loader(StandardFeatures &);
+		};
+
+		bool texture;
+		bool material;
+		bool lighting;
+		bool specular;
+		bool normalmap;
+		bool shadow;
+
+		StandardFeatures();
+
+		std::string create_flags() const;
+	};
+
+private:
+	unsigned id;
+	std::list<Shader *> shaders;
+	bool del_shaders;
+	bool linked;
+
+public:
 	Program();
+	Program(const StandardFeatures &);
 	Program(const std::string &, const std::string &);
 private:
 	void init();
@@ -51,9 +73,13 @@ public:
 
 	void attach_shader(Shader &shader);
 	void detach_shader(Shader &shader);
+	void add_standard_shaders(const StandardFeatures &);
+private:
+	static std::string process_standard_source(const char **, const std::string &);
+public:
 	const std::list<Shader *> &get_shaders() const { return shaders; }
 	void set_del_shaders(bool);
-	void bind_attribute(uint, const std::string &);
+	void bind_attribute(unsigned, const std::string &);
 	void link();
 	int get_param(GLenum param) const;
 	bool get_linked() const { return linked; }
@@ -62,9 +88,6 @@ public:
 	int get_uniform_location(const std::string &) const;
 
 	static void unbind();
-
-private:
-	void maybe_bind();
 };
 
 } // namespace GL