X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fsequence.h;h=f862bbcb55914b229ff1d4d2e756e1fc0809e6c8;hb=73590a7fcd931261d2b9c26fd3a0e53a37aa6e2c;hp=b1d2c7cabc54f81eea9d0a1ac2abcaf6bf4f2b69;hpb=1863f17c5c5563be8492d7f01e5c613a740ea1e9;p=libs%2Fgl.git

diff --git a/source/render/sequence.h b/source/render/sequence.h
index b1d2c7ca..f862bbcb 100644
--- a/source/render/sequence.h
+++ b/source/render/sequence.h
@@ -3,10 +3,12 @@
 
 #include <map>
 #include <set>
+#include "blend.h"
+#include "depthtest.h"
 #include "framebuffer.h"
 #include "renderable.h"
-#include "renderbuffer.h"
 #include "rendertarget.h"
+#include "stenciltest.h"
 #include "texture2d.h"
 
 namespace Msp {
@@ -15,7 +17,6 @@ namespace GL {
 class Blend;
 class Camera;
 class Clipping;
-class DepthTest;
 class Lighting;
 class PostProcessor;
 class View;
@@ -42,8 +43,9 @@ public:
 	private:
 		Tag tag;
 		const Lighting *lighting;
-		const DepthTest *depth_test;
-		const Blend *blend;
+		DepthTest depth_test;
+		StencilTest stencil_test;
+		Blend blend;
 		const Clipping *clipping;
 		Renderable *renderable;
 
@@ -53,18 +55,18 @@ public:
 		Tag get_tag() const { return tag; }
 
 		void set_lighting(const Lighting *);
-		void set_depth_test(const DepthTest *);
-		void set_blend(const Blend *);
+		void set_depth_test(const DepthTest &);
+		void set_stencil_test(const StencilTest &);
+		void set_blend(const Blend &);
 		void set_clipping(const Clipping *);
 		const Lighting *get_lighting() const { return lighting; }
-		const DepthTest *get_depth_test() const { return depth_test; }
-		const Blend *get_blend() const { return blend; }
+		const DepthTest &get_depth_test() const { return depth_test; }
+		const StencilTest &get_stencil_test() const { return stencil_test; }
+		const Blend &get_blend() const { return blend; }
 		const Clipping *get_clipping() const { return clipping; }
 		Renderable *get_renderable() const { return renderable; }
 	};
 
-	DEPRECATED typedef Step Pass;
-
 private:
 	struct PostProcStep
 	{
@@ -75,7 +77,6 @@ private:
 	};
 
 	std::vector<Step> steps;
-	const Camera *camera;
 	std::vector<PostProcStep> postproc;
 	unsigned width;
 	unsigned height;
@@ -114,8 +115,6 @@ public:
 	Renderable multiple times. */
 	Step &add_step(Tag, Renderable &);
 
-	DEPRECATED Step &add_pass(Tag t, Renderable &r) { return add_step(t, r); }
-
 	/** Adds a postprocessor to the sequence. */
 	void add_postprocessor(PostProcessor &);