X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fsequence.cpp;h=f7dea9bf617ebf1db173fec541408b0735b4989b;hb=867c4e8c34fe24146f4f8cf6bd0b27a6d99aa1a2;hp=535e81859aa0dea0a8d403088abc8ae2ce819d6a;hpb=d4e380914f02800b7d915a8748ac9ccd7029bc3b;p=libs%2Fgl.git

diff --git a/source/render/sequence.cpp b/source/render/sequence.cpp
index 535e8185..f7dea9bf 100644
--- 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,12 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Sequence::Sequence():
-	width(0),
-	height(0),
-	target{0, 0},
-	target_ms(0)
-{ }
+Tag Sequence::noclear_tag = "noclear";
 
 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 +41,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));
@@ -91,7 +107,7 @@ void Sequence::finish_frame()
 
 void Sequence::render(Renderer &renderer, Tag tag) const
 {
-	if(tag.id)
+	if(tag.id && tag!=noclear_tag)
 		return;
 
 	Renderer::Push _push(renderer);
@@ -99,9 +115,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 && tag!=noclear_tag)
+	{
+		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)
@@ -114,7 +152,6 @@ void Sequence::render(Renderer &renderer, Tag tag) const
 
 		if (const Lighting *lighting = s.get_lighting())
 			renderer.add_shader_data(lighting->get_shader_data());
-		renderer.set_clipping(s.get_clipping());
 
 		if(const Renderable *renderable = s.get_renderable())
 			renderer.render(*renderable, s.get_tag());
@@ -123,7 +160,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);
@@ -157,7 +194,6 @@ void Sequence::set_debug_name(const string &name)
 Sequence::Step::Step(Tag t, Renderable *r):
 	tag(t),
 	lighting(0),
-	clipping(0),
 	renderable(r)
 { }
 
@@ -181,10 +217,5 @@ void Sequence::Step::set_blend(const Blend &b)
 	blend = b;
 }
 
-void Sequence::Step::set_clipping(const Clipping *c)
-{
-	clipping = c;
-}
-
 } // namespace GL
 } // namespace Msp