X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderpass.h;h=5c1b84520db58ef8d38e894066de2f8f56a2b1f5;hb=5172d32d67595ea0b70184fadcfcb8e023cccbc8;hp=acbe29491cf9f493477663f8f51954ef63de2605;hpb=d51a234320449909eb34c802faa1f0c516ef70a0;p=libs%2Fgl.git

diff --git a/source/renderpass.h b/source/renderpass.h
index acbe2949..5c1b8452 100644
--- a/source/renderpass.h
+++ b/source/renderpass.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007-2008, 2010  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2008, 2010-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -28,7 +28,7 @@ This includes shader and data for it, material and texturing.
 
 XXX Does not delete inline texture from datafiles properly
 */
-class RenderPass: public Bindable<RenderPass>
+class RenderPass
 {
 public:
 	class Loader: public DataFile::CollectionObjectLoader<RenderPass>
@@ -39,8 +39,7 @@ public:
 
 	private:
 		void init();
-		virtual void finish();
-		void material();
+		void material_inline();
 		void material(const std::string &);
 		void texunit(unsigned);
 		void uniforms();
@@ -75,12 +74,12 @@ public:
 	RenderPass(const RenderPass &);
 	~RenderPass();
 
+	const Program *get_shader_program() const { return shprog; }
+	const ProgramData *get_shader_data() const { return shdata; }
 	void set_material(const Material *);
+	const Material *get_material() const { return material.get(); }
 	void set_texture(unsigned, const Texture *);
-
-	void bind() const;
-
-	static void unbind();
+	const Texturing *get_texturing() const { return texturing; }
 };
 
 } // namespace GL