X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frenderpass.h;h=c90108d1c27be58632c313e77f491012dcfb8b79;hp=934a213e3e815f0f855dfc10ca3b9add2c2193e5;hb=cfd4d36c2b6b6095ada3aef8082e5d409a233a21;hpb=e7556941c41b1a0fc84fe7986c98ee79eccbf564

diff --git a/source/renderpass.h b/source/renderpass.h
index 934a213e..c90108d1 100644
--- a/source/renderpass.h
+++ b/source/renderpass.h
@@ -12,7 +12,6 @@ class Material;
 class Program;
 class ProgramData;
 class Renderer;
-class TexEnv;
 class Texture;
 class Texturing;
 
@@ -46,36 +45,36 @@ private:
 	private:
 		unsigned index;
 		RefPtr<Texture> tex;
-		RefPtr<TexEnv> env;
 
 	public:
 		TextureLoader(Texturing &, unsigned, Collection *);
 	private:
 		virtual void finish();
 
-		void texenv();
 		void texture(const std::string &);
 		void texture2d();
 	};
 
 	const Program *shprog;
-	RefPtr<const ProgramData> shdata;
+	ProgramData *shdata;
 	RefPtr<const Material> material;
+	std::string material_slot;
 	Texturing *texturing;
 	std::map<std::string, unsigned> tex_names;
 	bool back_faces;
 
-	RenderPass &operator=(const RenderPass &);
 public:
 	RenderPass();
 	RenderPass(const RenderPass &);
+	RenderPass &operator=(const RenderPass &);
 	~RenderPass();
 
 	void set_shader_program(const Program *, const ProgramData *);
 	const Program *get_shader_program() const { return shprog; }
-	const ProgramData *get_shader_data() const { return shdata.get(); }
+	const ProgramData *get_shader_data() const { return shdata; }
 	void set_material(const Material *);
 	const Material *get_material() const { return material.get(); }
+	const std::string &get_material_slot_name() const { return material_slot; }
 	void set_texture(unsigned, const Texture *);
 	const Texturing *get_texturing() const { return texturing; }
 	int get_texture_index(const std::string &) const;