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

diff --git a/source/render/sequence.cpp b/source/render/sequence.cpp
index 3460bc72..535e8185 100644
--- a/source/render/sequence.cpp
+++ b/source/render/sequence.cpp
@@ -7,59 +7,42 @@
 #include "renderer.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)
-{
-	init(w, h, f);
-}
-
-Sequence::Sequence(const View &view, const FrameFormat &f)
-{
-	init(view.get_width(), view.get_height(), f);
-}
+Sequence::Sequence():
+	width(0),
+	height(0),
+	target{0, 0},
+	target_ms(0)
+{ }
 
-Sequence::Sequence(const Framebuffer &fbo, const FrameFormat &f)
+Sequence::Sequence(unsigned w, unsigned h, const FrameFormat &f):
+	width(w),
+	height(h),
+	target_format(f),
+	target_ms(0)
 {
-	init(fbo.get_width(), fbo.get_height(), f);
-}
+	if(target_format.empty())
+		throw invalid_argument("Sequence::Sequence");
 
-void Sequence::init(unsigned w, unsigned h, const FrameFormat &f)
-{
-	width = w;
-	height = h;
-	target_format = f;
+	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.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;
-	}
+	if(target_format.get_samples()>1)
+		target_ms = new RenderTarget(width, height, target_format);
 }
 
 Sequence::~Sequence()
 {
-	for(vector<PostProcStep>::iterator i=postproc.begin(); i!=postproc.end(); ++i)
-		if(i->owned)
-			delete i->postproc;
+	for(PostProcStep &p: postproc)
+		if(p.owned)
+			delete p.postproc;
 	delete target[0];
 	delete target[1];
 	delete target_ms;
@@ -94,15 +77,15 @@ void Sequence::add_postprocessor(PostProcessor *pp, bool owned)
 
 void Sequence::setup_frame(Renderer &renderer)
 {
-	for(vector<Step>::const_iterator i=steps.begin(); i!=steps.end(); ++i)
-		if(Renderable *renderable = i->get_renderable())
+	for(const Step &s: steps)
+		if(Renderable *renderable = s.get_renderable())
 			renderable->setup_frame(renderer);
 }
 
 void Sequence::finish_frame()
 {
-	for(vector<Step>::const_iterator i=steps.begin(); i!=steps.end(); ++i)
-		if(Renderable *renderable = i->get_renderable())
+	for(const Step &s: steps)
+		if(Renderable *renderable = s.get_renderable())
 			renderable->finish_frame();
 }
 
@@ -121,20 +104,20 @@ void Sequence::render(Renderer &renderer, Tag tag) const
 		renderer.clear();
 	}
 
-	for(vector<Step>::const_iterator i=steps.begin(); i!=steps.end(); ++i)
+	for(const Step &s: steps)
 	{
 		Renderer::Push _push2(renderer);
 
-		renderer.set_depth_test(&i->get_depth_test());
-		renderer.set_stencil_test(&i->get_stencil_test());
-		renderer.set_blend(&i->get_blend());
+		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 = i->get_lighting())
+		if (const Lighting *lighting = s.get_lighting())
 			renderer.add_shader_data(lighting->get_shader_data());
-		renderer.set_clipping(i->get_clipping());
+		renderer.set_clipping(s.get_clipping());
 
-		if(const Renderable *renderable = i->get_renderable())
-			renderer.render(*renderable, i->get_tag());
+		if(const Renderable *renderable = s.get_renderable())
+			renderer.render(*renderable, s.get_tag());
 	}
 
 	if(target[0])