Move blend state from Sequence::Step to RenderMethod

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

diff --git a/source/builders/sequencetemplate.h b/source/builders/sequencetemplate.h
index 52c42bb1b18046490ba981cc205da22aac3559ee..044cbd5e083f7ee90610cec18753c7bb404212e7 100644 (file)
--- a/source/builders/sequencetemplate.h
+++ b/source/builders/sequencetemplate.h
@@ -5,7 +5,6 @@
 #include <vector>
 #include <msp/core/typeregistry.h>
 #include <msp/datafile/objectloader.h>
-#include "blend.h"
 #include "depthtest.h"
 #include "postprocessor.h"
 #include "resources.h"
@@ -75,8 +74,6 @@ public:
                        void set_inline_base_name(const std::string &);
 
                private:
-                       void blend();
-                       void blend_factors(BlendFactor, BlendFactor);
                        void depth_test();
                        void depth_compare(Predicate);
                        void lighting(const std::string &);
@@ -87,14 +84,11 @@ public:
                };
 
                std::string tag;
-               const Lighting *lighting;
+               const Lighting *lighting = 0;
                DepthTest depth_test;
                StencilTest stencil_test;
-               Blend blend;
                std::string slot_name;
-               Renderable *default_renderable;
-
-               ~Step();
+               Renderable *default_renderable = 0;
        };
 
        struct PostProcessor
@@ -119,19 +113,18 @@ private:
 
        typedef TypeRegistry<PostProcLoader::AddPostProc, PostProcLoader &> PostProcessorRegistry;
 
-       bool hdr;
-       bool alpha;
-       unsigned required_multisample;
-       unsigned max_multisample;
+       bool hdr = false;
+       bool alpha = false;
+       unsigned required_multisample = 0;
+       unsigned max_multisample = 0;
        std::vector<Step> steps;
        std::vector<PostProcessor> postprocessors;
-       bool clear_enabled;
+       bool clear_enabled = false;
        std::vector<Color> clear_colors;
-       float clear_depth;
-       int clear_stencil;
+       float clear_depth = 1.0f;
+       int clear_stencil = 0;
 
 public:
-       SequenceTemplate();
        ~SequenceTemplate();
 
        bool get_hdr() const { return hdr; }