X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftechnique.h;h=608af19d9fc8a6af523d03cdcaf1201e79ac3abb;hb=2f09d68a0844d2838d116d93d3ecc69723b52f16;hp=3bb347ea4c98b9bb535cf132ec68dbb429383b4c;hpb=927a1aa0a3a27e463ec0efc08bd08e7c4e969909;p=libs%2Fgl.git

diff --git a/source/technique.h b/source/technique.h
index 3bb347ea..608af19d 100644
--- a/source/technique.h
+++ b/source/technique.h
@@ -8,7 +8,7 @@ Distributed under the LGPL
 #ifndef TECHNIQUE_H_
 #define TECHNIQUE_H_
 
-#include "objectpass.h"
+#include "renderpass.h"
 
 namespace Msp {
 namespace GL {
@@ -18,9 +18,6 @@ class Tag;
 class Texture;
 
 /**
-Stores a complete multipass rendering technique for an Object.  This includes
-shaders, textures and a material.  A Technique can also specify empty texture
-slots which Objects must override.
 */
 class Technique
 {
@@ -28,46 +25,34 @@ public:
 	class Loader: public Msp::DataFile::CollectionObjectLoader<Technique>
 	{
 	public:
+		Loader(Technique &);
 		Loader(Technique &, Collection &);
 
 	private:
-		virtual void finish();
-		void material_inline();
+		void init();
+		void inherit(const std::string &);
 		void pass(const std::string &);
-		void shader(const std::string &);
-		void shader_texture(const std::string &);
-		void texture(const std::string &);
-		void texture_slot(const std::string &);
 	};
 
 private:
-	struct TextureSlot
+	class InheritLoader: public Msp::DataFile::CollectionObjectLoader<Technique>
 	{
-		std::string name;
-		const Texture *texture;
-
-		TextureSlot(): texture(0) { }
+	public:
+		InheritLoader(Technique &, Collection &);
+	
+	private:
+		void texture(unsigned, const std::string &);
 	};
 
-	typedef std::map<Tag, ObjectPass> PassMap;
+	typedef std::map<Tag, RenderPass> PassMap;
 
-	std::vector<TextureSlot> textures;
-	const Texture *main_texture;
 	PassMap passes;
-	ObjectPass *normal_pass;
-	const Material *material;
 
 public:
-	Technique();
-	~Technique();
-
+	RenderPass &add_pass(const GL::Tag &);
 	bool has_pass(const GL::Tag &) const;
-	const ObjectPass &get_pass(const GL::Tag &) const;
-	unsigned get_n_textures() const { return textures.size(); }
-	unsigned get_texture_index(const std::string &) const;
-	const Texture *get_texture(unsigned) const;
-	const Texture *get_main_texture() const { return main_texture; }
-	const Material *get_material() const { return material; }
+	const RenderPass &get_pass(const GL::Tag &) const;
+	const PassMap &get_passes() const { return passes; }
 };
 
 } // namespace GL