X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpipeline.h;h=a63eeb5f686a2deb4cd541e60cd0b05ab0a7101a;hb=483f28cfaff846f74fd49cb73b9f45fe843011fe;hp=19bea10a641d9664992013758b1c17a5ec709243;hpb=e17243fb2421977cb781361828b77718e2cf8d48;p=libs%2Fgl.git

diff --git a/source/pipeline.h b/source/pipeline.h
index 19bea10a..a63eeb5f 100644
--- a/source/pipeline.h
+++ b/source/pipeline.h
@@ -9,12 +9,14 @@ Distributed under the LGPL
 #define MSP_GL_PIPELINE_H_
 
 #include <map>
+#include <set>
 #include "pipelinepass.h"
 #include "renderable.h"
 
 namespace Msp {
 namespace GL {
 
+class Camera;
 class Effect;
 class Framebuffer;
 class PostProcessor;
@@ -24,9 +26,20 @@ class Texture2D;
 class Pipeline: public Renderable
 {
 private:
-	std::map<unsigned, PipelinePass> passes;
+	struct Slot
+	{
+		const Renderable *renderable;
+		std::set<Tag> passes;
+
+		Slot(const Renderable *);
+	};
+
+	typedef std::map<Tag, PipelinePass> PassMap;
+
+	PassMap passes;
 	std::vector<Tag> pass_order;
-	std::vector<const Renderable *> renderables;
+	const Camera *camera;
+	std::vector<Slot> renderables;
 	std::vector<Effect *> effects;
 	std::vector<PostProcessor *> postproc;
 	unsigned width;
@@ -34,22 +47,25 @@ private:
 	bool hdr;
 	Framebuffer *fbo;
 	Texture2D *color_buf;
-	Renderbuffer *depth_buf;
+	Texture2D *depth_buf;
 
 public:
 	Pipeline(unsigned, unsigned, bool);
 	~Pipeline();
 
+	void set_camera(const Camera *);
+
 	PipelinePass &add_pass(const Tag &tag);
 	PipelinePass &get_pass(const Tag &tag);
 	const PipelinePass &get_pass(const Tag &tag) const;
-	virtual bool has_pass(const Tag &tag) const;
 
 	void add_renderable(const Renderable &);
+	void add_renderable_for_pass(const Renderable &, const Tag &);
+	void remove_renderable(const Renderable &);
 	void add_effect(Effect &);
 	void add_postprocessor(PostProcessor &);
 
-	virtual void render(const Tag &tag=Tag()) const;
+	virtual void render(const Tag &tag = Tag()) const;
 	void render_all() const;
 };