Use default member initializers for simple types

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

diff --git a/source/render/sequence.h b/source/render/sequence.h
index be8ed30621a08403842616c11d09fbab877359d3..cc4b6963b017ce98b2250597d2f02c8c55f67988 100644 (file)
--- a/source/render/sequence.h
+++ b/source/render/sequence.h
@@ -1,26 +1,20 @@
 #ifndef MSP_GL_SEQUENCE_H_
 #define MSP_GL_SEQUENCE_H_
 
-#include <map>
-#include <set>
+#include <vector>
 #include "blend.h"
 #include "depthtest.h"
-#include "framebuffer.h"
+#include "frameformat.h"
 #include "renderable.h"
-#include "renderbuffer.h"
-#include "rendertarget.h"
 #include "stenciltest.h"
-#include "texture2d.h"
 
 namespace Msp {
 namespace GL {
 
-class Blend;
-class Camera;
 class Clipping;
 class Lighting;
 class PostProcessor;
-class View;
+class RenderTarget;
 
 /**
 Top-level content class.  Typically a Sequence is used as the content
@@ -68,8 +62,6 @@ public:
                Renderable *get_renderable() const { return renderable; }
        };
 
-       DEPRECATED typedef Step Pass;
-
 private:
        struct PostProcStep
        {
@@ -80,47 +72,35 @@ private:
        };
 
        std::vector<Step> steps;
-       const Camera *camera;
        std::vector<PostProcStep> postproc;
-       unsigned width;
-       unsigned height;
-       bool hdr;
-       bool alpha;
-       unsigned samples;
-       RenderTarget *target[2];
-       RenderTarget *target_ms;
-       std::string debug_name;
+       unsigned width = 0;
+       unsigned height = 0;
+       FrameFormat target_format;
+       RenderTarget *target[2] = { 0, 0 };
+       RenderTarget *target_ms = 0;
+       bool clear_enabled = false;
+       std::vector<Color> clear_colors;
+       float clear_depth = 1.0f;
+       int clear_stencil = 0;
 
 public:
-       Sequence(unsigned, unsigned, bool = false);
-       Sequence(const View &);
-       Sequence(const Framebuffer &);
-private:
-       void init(unsigned, unsigned);
-public:
+       Sequence() = default;
+       Sequence(unsigned, unsigned, const FrameFormat &);
        ~Sequence();
 
-       /* Sets high dynamic range mode.  Requires floating-point texture support.
-       A ColorCurve postprocessor is recommended for full benefit. */
-       void set_hdr(bool);
-
-       /* Enable or disable alpha channel.  When enabled, all render targets are
-       created with an RGBA pixel format instead of RGB. */
-       void set_alpha(bool);
-
-       void set_multisample(unsigned);
-
        unsigned get_width() const { return width; }
        unsigned get_height() const { return height; }
-       bool get_hdr() const { return hdr; }
-       unsigned get_multisample() const { return samples; }
+       const FrameFormat &get_target_format() { return target_format; }
+
+       void set_clear_enabled(bool);
+       void set_clear_colors(const std::vector<Color> &);
+       void set_clear_depth(float);
+       void set_clear_stencil(int);
 
        /** Adds a step to the sequence.  It's permissible to add the same
        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 &);
 
@@ -138,13 +118,7 @@ public:
 
        virtual void render(Renderer &, Tag tag = Tag()) const;
 
-private:
-       void create_targets(unsigned);
-
-public:
        void set_debug_name(const std::string &);
-private:
-       void set_target_debug_names();
 };
 
 } // namespace GL