X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Fsequence.cpp;h=f2a88a51f760ab6ccc6fc9e5c17062ab460824ae;hp=e953b4d6925944b10d872301ef35667a7904f857;hb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;hpb=e9a898f315b5d1396f196d785913a283c30940f2

diff --git a/source/render/sequence.cpp b/source/render/sequence.cpp
index e953b4d6..f2a88a51 100644
--- a/source/render/sequence.cpp
+++ b/source/render/sequence.cpp
@@ -1,68 +1,65 @@
-#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"
-#include "view.h"
 
 using namespace std;
 
 namespace Msp {
 namespace GL {
 
-Sequence::Sequence(unsigned w, unsigned h, const FrameFormat &f)
+Sequence::Sequence(unsigned w, unsigned h, const FrameFormat &f):
+	width(w),
+	height(h),
+	target_format(f)
 {
-	init(w, h, f);
+	if(target_format.empty())
+		throw invalid_argument("Sequence::Sequence");
+
+	FrameFormat postproc_fmt = target_format;
+	postproc_fmt.set_samples(1);
+	target[0] = new RenderTarget(width, height, postproc_fmt);
+	target[1] = new RenderTarget(width, height, postproc_fmt);
+
+	if(target_format.get_samples()>1)
+		target_ms = new RenderTarget(width, height, target_format);
 }
 
-Sequence::Sequence(const View &view, const FrameFormat &f)
+Sequence::~Sequence()
 {
-	init(view.get_width(), view.get_height(), f);
+	for(PostProcStep &p: postproc)
+		if(p.owned)
+			delete p.postproc;
+	delete target[0];
+	delete target[1];
+	delete target_ms;
 }
 
-Sequence::Sequence(const Framebuffer &fbo, const FrameFormat &f)
+void Sequence::set_clear_enabled(bool c)
 {
-	init(fbo.get_width(), fbo.get_height(), f);
+	clear_enabled = c;
 }
 
-void Sequence::init(unsigned w, unsigned h, const FrameFormat &f)
+void Sequence::set_clear_colors(const vector<Color> &c)
 {
-	width = w;
-	height = h;
-	target_format = f;
+	clear_enabled = true;
+	clear_colors = c;
+}
 
-	if(!target_format.empty())
-	{
-		FrameFormat postproc_fmt = target_format;
-		postproc_fmt.set_samples(1);
-		target[0] = new RenderTarget(width, height, postproc_fmt);
-		target[1] = new RenderTarget(width, height, postproc_fmt);
-
-		if(target_format.get_samples()>1)
-			target_ms = new RenderTarget(width, height, target_format);
-		else
-			target_ms = 0;
-	}
-	else
-	{
-		target_ms = 0;
-		target[0] = 0;
-		target[1] = 0;
-	}
+void Sequence::set_clear_depth(float d)
+{
+	clear_enabled = true;
+	clear_depth = d;
 }
 
-Sequence::~Sequence()
+void Sequence::set_clear_stencil(int s)
 {
-	for(PostProcStep &p: postproc)
-		if(p.owned)
-			delete p.postproc;
-	delete target[0];
-	delete target[1];
-	delete target_ms;
+	clear_enabled = true;
+	clear_stencil = s;
 }
 
 Sequence::Step &Sequence::add_step(Tag tag, Renderable &r)
@@ -116,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)
@@ -140,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);