Redesign depth and stencil test and blend state management

[libs/gl.git] / source / render / sequence.h

diff --git a/source/render/sequence.h b/source/render/sequence.h
index b1d2c7cabc54f81eea9d0a1ac2abcaf6bf4f2b69..be8ed30621a08403842616c11d09fbab877359d3 100644 (file)
--- a/source/render/sequence.h
+++ b/source/render/sequence.h
@@ -3,10 +3,13 @@
 
 #include <map>
 #include <set>
 
 #include <map>
 #include <set>

+#include "blend.h"
+#include "depthtest.h"

 #include "framebuffer.h"
 #include "renderable.h"
 #include "renderbuffer.h"
 #include "rendertarget.h"
 #include "framebuffer.h"
 #include "renderable.h"
 #include "renderbuffer.h"
 #include "rendertarget.h"

+#include "stenciltest.h"

 #include "texture2d.h"
 
 namespace Msp {
 #include "texture2d.h"
 
 namespace Msp {


@@ -15,7 +18,6 @@ namespace GL {
 class Blend;
 class Camera;
 class Clipping;
 class Blend;
 class Camera;
 class Clipping;

-class DepthTest;

 class Lighting;
 class PostProcessor;
 class View;
 class Lighting;
 class PostProcessor;
 class View;


@@ -42,8 +44,9 @@ public:
        private:
                Tag tag;
                const Lighting *lighting;
        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;
 
                const Clipping *clipping;
                Renderable *renderable;
 


@@ -53,12 +56,14 @@ public:
                Tag get_tag() const { return tag; }
 
                void set_lighting(const Lighting *);
                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; }
                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; }
        };
                const Clipping *get_clipping() const { return clipping; }
                Renderable *get_renderable() const { return renderable; }
        };