X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frenderpass.h;h=9e704376a446b56abb056edf0d1aab803a269f7d;hp=688327bb84ebb7c067a504c2b03779181f026b2b;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hpb=25c81b4953dd38993250321b9407ce8b0139cbeb

diff --git a/source/renderpass.h b/source/renderpass.h
index 688327bb..9e704376 100644
--- a/source/renderpass.h
+++ b/source/renderpass.h
@@ -1,16 +1,8 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2008, 2010-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_RENDERPASS_H_
 #define MSP_GL_RENDERPASS_H_
 
 #include <msp/core/refptr.h>
 #include <msp/datafile/objectloader.h>
-#include "bindable.h"
 
 namespace Msp {
 namespace GL {
@@ -18,15 +10,14 @@ namespace GL {
 class Material;
 class Program;
 class ProgramData;
-class TexEnv;
+class Renderer;
+class Sampler;
 class Texture;
 class Texturing;
 
 /**
 Encapsulates the data that determines the appearance of a rendered surface.
 This includes shader and data for it, material and texturing.
-
-XXX Does not delete inline texture from datafiles properly
 */
 class RenderPass
 {
@@ -39,11 +30,16 @@ public:
 
 	private:
 		void init();
-		virtual void finish();
-		void material();
+
+		void material_inline();
 		void material(const std::string &);
+		void shader(const std::string &);
 		void texunit(unsigned);
+		void texunit_auto(const std::string &);
+		void texunit_named(unsigned, const std::string &);
 		void uniforms();
+		void uniform_slot(const std::string &);
+		void uniform_slot2(const std::string &, const std::string &);
 	};
 
 private:
@@ -51,36 +47,54 @@ private:
 	{
 	private:
 		unsigned index;
-		RefPtr<Texture> tex;
-		RefPtr<TexEnv> env;
+		const Texture *tex;
+		const Sampler *samp;
 
 	public:
 		TextureLoader(Texturing &, unsigned, Collection *);
 	private:
 		virtual void finish();
 
-		void texenv();
+		void sampler(const std::string &);
 		void texture(const std::string &);
-		void texture2d();
 	};
 
-	Program *shprog;
-	ProgramData *shdata;
+	RefPtr<const Program> shprog;
+	bool shprog_from_material;
+	RefPtr<ProgramData> shdata;
+	std::map<std::string, std::string> uniform_slots;
 	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();
 
-	const Program *get_shader_program() const { return shprog; }
-	const ProgramData *get_shader_data() const { return shdata; }
+private:
+	void finalize_material(DataFile::Collection *);
+	void maybe_create_material_shader(DataFile::Collection *);
+	void ensure_private_shader_data();
+
+public:
+	void set_shader_program(const Program *, const ProgramData *);
+	const Program *get_shader_program() const { return shprog.get(); }
+	const ProgramData *get_shader_data() const { return shdata.get(); }
+	const std::string &get_slotted_uniform_name(const std::string &) const;
 	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;
+	void set_back_faces(bool);
+	bool get_back_faces() const { return back_faces; }
+
+	void apply(Renderer &) const;
 };
 
 } // namespace GL