X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpipeline.cpp;h=eca9a49a3c22dfca97cfa5119da4e2d53710ec7a;hb=97e1aa9b5d2bacd3f1dddf2d1889f2714e36b766;hp=95f96536f81c1f6891c5be726c2517ca95a08e2a;hpb=cd446554e998204eaba22504b7b28227feb8edbb;p=libs%2Fgl.git

diff --git a/source/pipeline.cpp b/source/pipeline.cpp
index 95f96536..eca9a49a 100644
--- a/source/pipeline.cpp
+++ b/source/pipeline.cpp
@@ -1,19 +1,13 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2009-2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#include <msp/core/maputils.h>
 #include "blend.h"
 #include "camera.h"
 #include "effect.h"
-#include "except.h"
 #include "framebuffer.h"
 #include "lighting.h"
 #include "pipeline.h"
 #include "postprocessor.h"
 #include "renderbuffer.h"
+#include "renderer.h"
 #include "tests.h"
 #include "texture2d.h"
 
@@ -27,9 +21,13 @@ Pipeline::Pipeline(unsigned w, unsigned h, bool d):
 	width(w),
 	height(h),
 	hdr(d),
+	samples(0),
 	fbo(0),
 	color_buf(0),
-	depth_buf(0)
+	depth_buf(0),
+	fbo_ms(0),
+	color_buf_ms(0),
+	depth_buf_ms(0)
 { }
 
 Pipeline::~Pipeline()
@@ -39,6 +37,20 @@ Pipeline::~Pipeline()
 	delete depth_buf;
 }
 
+void Pipeline::set_hdr(bool h)
+{
+	hdr = h;
+	if(!postproc.empty())
+		create_fbos();
+}
+
+void Pipeline::set_multisample(unsigned s)
+{
+	samples = s;
+	if(!postproc.empty())
+		create_fbos();
+}
+
 void Pipeline::set_camera(const Camera *c)
 {
 	camera = c;
@@ -46,28 +58,19 @@ void Pipeline::set_camera(const Camera *c)
 
 PipelinePass &Pipeline::add_pass(const Tag &tag)
 {
-	if(passes.count(tag))
-		throw KeyError("Pass already exists");
-
-	PipelinePass &pass = passes[tag];
+	PipelinePass &pass = insert_unique(passes, tag, PipelinePass())->second;
 	pass_order.push_back(tag);
 	return pass;
 }
 
 PipelinePass &Pipeline::get_pass(const Tag &tag)
 {
-	PassMap::iterator i = passes.find(tag);
-	if(i==passes.end())
-		throw KeyError("Unknown pass");
-	return i->second;
+	return get_item(passes, tag);
 }
 
 const PipelinePass &Pipeline::get_pass(const Tag &tag) const
 {
-	PassMap::const_iterator i = passes.find(tag);
-	if(i==passes.end())
-		throw KeyError("Unknown pass");
-	return i->second;
+	return get_item(passes, tag);
 }
 
 void Pipeline::add_renderable(const Renderable &r)
@@ -114,21 +117,12 @@ void Pipeline::add_postprocessor(PostProcessor &pp)
 {
 	postproc.push_back(&pp);
 	if(!fbo)
+		create_fbos();
 	{
-		fbo = new Framebuffer;
-		color_buf = new Texture2D;
-		color_buf->set_min_filter(NEAREST);
-		color_buf->set_mag_filter(NEAREST);
-		color_buf->storage((hdr ? RGB16F : RGB), width, height);
-		color_buf->image(0, RGB, UNSIGNED_BYTE, 0);
-		fbo->attach(COLOR_ATTACHMENT0, *color_buf, 0);
-		depth_buf = new Renderbuffer;
-		depth_buf->storage(DEPTH_COMPONENT, width, height);
-		fbo->attach(DEPTH_ATTACHMENT, *depth_buf);
 	}
 }
 
-void Pipeline::render(const Tag &tag) const
+void Pipeline::render(Renderer &renderer, const Tag &tag) const
 {
 	const PipelinePass &pass = get_pass(tag);
 
@@ -141,7 +135,7 @@ void Pipeline::render(const Tag &tag) const
 
 	for(vector<Slot>::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
 		if(i->passes.empty() || i->passes.count(tag))
-			i->renderable->render(tag);
+			i->renderable->render(renderer, tag);
 
 	for(vector<Effect *>::const_iterator i=pass.effects.end(); i!=pass.effects.begin();)
 		(*--i)->cleanup();
@@ -154,25 +148,74 @@ void Pipeline::render_all() const
 
 	if(fbo)
 	{
-		fbo->bind();
-		fbo->clear(COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT);
+		Framebuffer *f = (fbo_ms ? fbo_ms : fbo);
+		f->bind();
+		f->clear(COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT);
 	}
 
 	for(vector<Effect *>::const_iterator i=effects.begin(); i!=effects.end(); ++i)
 		(*i)->prepare();
 
+	Renderer renderer(camera);
 	for(vector<Tag>::const_iterator i=pass_order.begin(); i!=pass_order.end(); ++i)
-		render(*i);
+		render(renderer, *i);
 
 	for(vector<Effect *>::const_iterator i=effects.end(); i!=effects.begin();)
 		(*--i)->cleanup();
 
 	if(fbo)
+	{
+		if(fbo_ms)
+			fbo->blit_from(*fbo_ms, COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT, false);
 		Framebuffer::unbind();
+	}
 
 	// XXX Need two color buffer textures to handle multiple post-processors correctly
 	for(vector<PostProcessor *>::const_iterator i=postproc.begin(); i!=postproc.end(); ++i)
-		(*i)->render(*color_buf);
+		(*i)->render(*color_buf, *depth_buf);
+}
+
+void Pipeline::create_fbos()
+{
+	delete fbo;
+	delete color_buf;
+	delete depth_buf;
+
+	delete fbo_ms;
+	fbo_ms = 0;
+	delete color_buf_ms;
+	color_buf_ms = 0;
+	delete depth_buf_ms;
+	depth_buf_ms = 0;
+
+	fbo = new Framebuffer;
+
+	color_buf = new Texture2D;
+	color_buf->set_min_filter(NEAREST);
+	color_buf->set_mag_filter(NEAREST);
+	color_buf->set_wrap(CLAMP_TO_EDGE);
+	color_buf->storage((hdr ? RGB16F : RGB), width, height);
+	fbo->attach(COLOR_ATTACHMENT0, *color_buf, 0);
+
+	depth_buf = new Texture2D;
+	depth_buf->set_min_filter(NEAREST);
+	depth_buf->set_mag_filter(NEAREST);
+	depth_buf->set_wrap(CLAMP_TO_EDGE);
+	depth_buf->storage(DEPTH_COMPONENT, width, height);
+	fbo->attach(DEPTH_ATTACHMENT, *depth_buf, 0);
+
+	if(samples)
+	{
+		fbo_ms = new Framebuffer;
+
+		color_buf_ms = new Renderbuffer;
+		color_buf_ms->storage_multisample(samples, (hdr ? RGB16F : RGB), width, height);
+		fbo_ms->attach(COLOR_ATTACHMENT0, *color_buf_ms);
+
+		depth_buf_ms = new Renderbuffer;
+		depth_buf_ms->storage_multisample(samples, DEPTH_COMPONENT, width, height);
+		fbo_ms->attach(DEPTH_ATTACHMENT, *depth_buf_ms);
+	}
 }