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 0bc65cb78e5f1c5d410b4d5cbc52ca6e4a18adf1..cc4b6963b017ce98b2250597d2f02c8c55f67988 100644 (file)
--- a/source/render/sequence.h
+++ b/source/render/sequence.h
@@ -1,24 +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 "rendertarget.h"
 #include "stenciltest.h"
-#include "texture2d.h"
 
 namespace Msp {
 namespace GL {
 
-class Blend;
-class Camera;
 class Clipping;
 class Lighting;
 class PostProcessor;
+class RenderTarget;
 
 /**
 Top-level content class.  Typically a Sequence is used as the content
@@ -77,20 +73,29 @@ private:
 
        std::vector<Step> steps;
        std::vector<PostProcStep> postproc;
-       unsigned width;
-       unsigned height;
+       unsigned width = 0;
+       unsigned height = 0;
        FrameFormat target_format;
-       RenderTarget *target[2];
-       RenderTarget *target_ms;
+       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, const FrameFormat & = FrameFormat());
+       Sequence() = default;
+       Sequence(unsigned, unsigned, const FrameFormat &);
        ~Sequence();
 
-       const FrameFormat &get_target_format() { return target_format; }
-
        unsigned get_width() const { return width; }
        unsigned get_height() const { return height; }
+       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. */