Use default member initializers for simple types

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

diff --git a/source/render/sequence.cpp b/source/render/sequence.cpp
index 535e81859aa0dea0a8d403088abc8ae2ce819d6a..f2a88a51f760ab6ccc6fc9e5c17062ab460824ae 100644 (file)
--- a/source/render/sequence.cpp
+++ b/source/render/sequence.cpp
@@ -1,10 +1,9 @@
-#include <msp/core/maputils.h>
-#include "blend.h"
+#include <msp/strings/format.h>
 #include "error.h"
-#include "framebuffer.h"
 #include "lighting.h"
 #include "postprocessor.h"
 #include "renderer.h"
+#include "rendertarget.h"
 #include "sequence.h"
 #include "texture2d.h"
 
@@ -13,18 +12,10 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Sequence::Sequence():
-       width(0),
-       height(0),
-       target{0, 0},
-       target_ms(0)
-{ }
-
 Sequence::Sequence(unsigned w, unsigned h, const FrameFormat &f):
        width(w),
        height(h),
-       target_format(f),
-       target_ms(0)
+       target_format(f)
 {
        if(target_format.empty())
                throw invalid_argument("Sequence::Sequence");
@@ -48,6 +39,29 @@ Sequence::~Sequence()
        delete target_ms;
 }
 
+void Sequence::set_clear_enabled(bool c)
+{
+       clear_enabled = c;
+}
+
+void Sequence::set_clear_colors(const vector<Color> &c)
+{
+       clear_enabled = true;
+       clear_colors = c;
+}
+
+void Sequence::set_clear_depth(float d)
+{
+       clear_enabled = true;
+       clear_depth = d;
+}
+
+void Sequence::set_clear_stencil(int s)
+{
+       clear_enabled = true;
+       clear_stencil = s;
+}
+
 Sequence::Step &Sequence::add_step(Tag tag, Renderable &r)
 {
        steps.push_back(Step(tag, &r));
@@ -99,9 +113,31 @@ void Sequence::render(Renderer &renderer, Tag tag) const
        const Framebuffer *out_fbo = renderer.get_framebuffer();
 
        if(target[0])
-       {
                renderer.set_framebuffer(&(target_ms ? target_ms : target[0])->get_framebuffer());
-               renderer.clear();
+
+       if(clear_enabled)
+       {
+               const Framebuffer *target_fbo = renderer.get_framebuffer();
+               if(!target_fbo)
+                       throw invalid_operation("Sequence::render");
+
+               const FrameFormat &format = target_fbo->get_format();
+               ClearValue clear_values[7];
+               unsigned i = 0;
+               Color default_color = (clear_colors.empty() ? Color(0.0f, 0.0f, 0.0f, 0.0f) : clear_colors.front());
+               ClearValue *cv = clear_values;
+               for(FrameAttachment a: format)
+               {
+                       if(get_attach_point(a)==get_attach_point(DEPTH_ATTACHMENT))
+                               cv->depth_stencil.depth = clear_depth;
+                       else if(get_attach_point(a)==get_attach_point(STENCIL_ATTACHMENT))
+                               cv->depth_stencil.stencil = clear_stencil;
+                       else
+                               cv->color = (i<clear_colors.size() ? clear_colors[i++] : default_color);
+                       ++cv;
+               }
+
+               renderer.clear(clear_values);
        }
 
        for(const Step &s: steps)
@@ -123,7 +159,7 @@ void Sequence::render(Renderer &renderer, Tag tag) const
        if(target[0])
        {
                if(target_ms)
-                       renderer.resolve_multisample(target[0]->get_framebuffer(), COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT);
+                       renderer.resolve_multisample(target[0]->get_framebuffer());
 
                renderer.set_depth_test(0);
                renderer.set_stencil_test(0);