X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Fsequence.cpp;h=74b8bc3b0b4fe9a6835d9f5fab5326dddcc62fe3;hp=254a6c462abcbdc01aa232a104c05cf5380db269;hb=5871764de7aa23d2c40cac03ad9d07088fb57e06;hpb=ff8a8bfa114a690b7b25d9503bb5ed811d6aeca9

diff --git a/source/render/sequence.cpp b/source/render/sequence.cpp
index 254a6c46..74b8bc3b 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,20 +12,12 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Sequence::Sequence():
-	width(0),
-	height(0),
-	target{0, 0},
-	target_ms(0),
-	clear_enabled(false)
-{ }
+Tag Sequence::noclear_tag = "noclear";
 
 Sequence::Sequence(unsigned w, unsigned h, const FrameFormat &f):
 	width(w),
 	height(h),
-	target_format(f),
-	target_ms(0),
-	clear_enabled(false)
+	target_format(f)
 {
 	if(target_format.empty())
 		throw invalid_argument("Sequence::Sequence");
@@ -42,9 +33,8 @@ Sequence::Sequence(unsigned w, unsigned h, const FrameFormat &f):
 
 Sequence::~Sequence()
 {
-	for(PostProcStep &p: postproc)
-		if(p.owned)
-			delete p.postproc;
+	for(OwnedObject &o: owned_data)
+		o.delete_func(o.pointer);
 	delete target[0];
 	delete target[1];
 	delete target_ms;
@@ -55,31 +45,35 @@ void Sequence::set_clear_enabled(bool c)
 	clear_enabled = c;
 }
 
-Sequence::Step &Sequence::add_step(Tag tag, Renderable &r)
+void Sequence::set_clear_colors(const vector<Color> &c)
 {
-	steps.push_back(Step(tag, &r));
-	return steps.back();
+	clear_enabled = true;
+	clear_colors = c;
 }
 
-void Sequence::add_postprocessor(PostProcessor &pp)
+void Sequence::set_clear_depth(float d)
+{
+	clear_enabled = true;
+	clear_depth = d;
+}
+
+void Sequence::set_clear_stencil(int s)
 {
-	add_postprocessor(&pp, false);
+	clear_enabled = true;
+	clear_stencil = s;
 }
 
-void Sequence::add_postprocessor_owned(PostProcessor *pp)
+Sequence::Step &Sequence::add_step(Tag tag, Renderable &r)
 {
-	add_postprocessor(pp, true);
+	steps.emplace_back(tag, &r);
+	return steps.back();
 }
 
-void Sequence::add_postprocessor(PostProcessor *pp, bool owned)
+void Sequence::add_postprocessor(PostProcessor &pp)
 {
 	if(target_format.empty())
-	{
-		if(owned)
-			delete pp;
 		throw invalid_operation("Sequence::add_postprocessor");
-	}
-	postproc.push_back(PostProcStep(pp, owned));
+	postproc.push_back(&pp);
 }
 
 void Sequence::setup_frame(Renderer &renderer)
@@ -98,7 +92,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);
@@ -108,8 +102,30 @@ void Sequence::render(Renderer &renderer, Tag tag) const
 	if(target[0])
 		renderer.set_framebuffer(&(target_ms ? target_ms : target[0])->get_framebuffer());
 
-	if(clear_enabled)
-		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[FrameFormat::MAX_ATTACHMENTS];
+		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)
 	{
@@ -117,20 +133,18 @@ void Sequence::render(Renderer &renderer, Tag tag) const
 
 		renderer.set_depth_test(&s.get_depth_test());
 		renderer.set_stencil_test(&s.get_stencil_test());
-		renderer.set_blend(&s.get_blend());
 
-		if (const Lighting *lighting = s.get_lighting())
+		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());
+			renderable->render(renderer, s.get_tag());
 	}
 
 	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);
@@ -142,7 +156,7 @@ void Sequence::render(Renderer &renderer, Tag tag) const
 			renderer.set_framebuffer(i+1<postproc.size() ? &target[1-j]->get_framebuffer() : out_fbo);
 			const Texture2D &color = target[j]->get_target_texture(COLOR_ATTACHMENT);
 			const Texture2D &depth = target[j]->get_target_texture(DEPTH_ATTACHMENT);
-			postproc[i].postproc->render(renderer, color, depth);
+			postproc[i]->render(renderer, color, depth);
 		}
 	}
 }
@@ -164,7 +178,6 @@ void Sequence::set_debug_name(const string &name)
 Sequence::Step::Step(Tag t, Renderable *r):
 	tag(t),
 	lighting(0),
-	clipping(0),
 	renderable(r)
 { }
 
@@ -183,15 +196,5 @@ void Sequence::Step::set_stencil_test(const StencilTest &st)
 	stencil_test = st;
 }
 
-void Sequence::Step::set_blend(const Blend &b)
-{
-	blend = b;
-}
-
-void Sequence::Step::set_clipping(const Clipping *c)
-{
-	clipping = c;
-}
-
 } // namespace GL
 } // namespace Msp