Allow creating sequences without size

[libs/gl.git] / source / builders / sequencetemplate.h

diff --git a/source/builders/sequencetemplate.h b/source/builders/sequencetemplate.h
index 32736d8ee7645e255255d9275abb6156db354b1a..9de2082d9ab68bdba42b112da51e1e460fa6fd20 100644 (file)
--- a/source/builders/sequencetemplate.h
+++ b/source/builders/sequencetemplate.h
@@ -6,13 +6,14 @@
 #include <msp/core/typeregistry.h>
 #include <msp/datafile/objectloader.h>
 #include "blend.h"
+#include "depthtest.h"
 #include "postprocessor.h"
 #include "predicate.h"
+#include "stenciltest.h"
 
 namespace Msp {
 namespace GL {
 
-class DepthTest;
 class Lighting;
 class Renderable;
 
@@ -77,20 +78,22 @@ public:
                        void set_inline_base_name(const std::string &);
 
                private:
-                       void blend(BlendFactor, BlendFactor);
-                       void blend_predefined(const std::string &);
-                       void depth_test(Predicate);
-                       void depth_test_predefined(const std::string &);
+                       void blend();
+                       void blend_factors(BlendFactor, BlendFactor);
+                       void depth_test();
+                       void depth_compare(Predicate);
                        void lighting(const std::string &);
                        void lighting_inline();
                        void object(const std::string &);
                        void scene(const std::string &);
+                       void stencil_test();
                };
 
                std::string tag;
                const Lighting *lighting;
-               RefPtr<const DepthTest> depth_test;
-               RefPtr<const Blend> blend;
+               DepthTest depth_test;
+               StencilTest stencil_test;
+               Blend blend;
                std::string slot_name;
                Renderable *default_renderable;
 
@@ -105,8 +108,6 @@ public:
                PostProcessor(GL::PostProcessor::Template * = 0);
        };
 
-       typedef std::vector<PostProcessor> PostProcessorArray;
-
 private:
        typedef TypeRegistry<PostProcLoader::AddPostProc, PostProcLoader &> PostProcessorRegistry;
 
@@ -115,7 +116,7 @@ private:
        unsigned required_multisample;
        unsigned max_multisample;
        std::vector<Step> steps;
-       PostProcessorArray postprocessors;
+       std::vector<PostProcessor> postprocessors;
 
 public:
        SequenceTemplate();
@@ -126,7 +127,7 @@ public:
        unsigned get_required_multisample() const { return required_multisample; }
        unsigned get_maximum_multisample() const { return max_multisample; }
        const std::vector<Step> &get_steps() const { return steps; }
-       const PostProcessorArray &get_postprocessors() const { return postprocessors; }
+       const std::vector<PostProcessor> &get_postprocessors() const { return postprocessors; }
 
        template<typename T>
        static void register_postprocessor(const std::string &);