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

diff --git a/source/render/sequence.cpp b/source/render/sequence.cpp
index f2a88a51..4ccf5408 100644
--- a/source/render/sequence.cpp
+++ b/source/render/sequence.cpp
@@ -12,6 +12,8 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+Tag Sequence::noclear_tag = "noclear";
+
 Sequence::Sequence(unsigned w, unsigned h, const FrameFormat &f):
 	width(w),
 	height(h),
@@ -105,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);
@@ -115,7 +117,7 @@ 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)
+	if(clear_enabled && tag!=noclear_tag)
 	{
 		const Framebuffer *target_fbo = renderer.get_framebuffer();
 		if(!target_fbo)
@@ -146,11 +148,9 @@ 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());
@@ -193,7 +193,6 @@ void Sequence::set_debug_name(const string &name)
 Sequence::Step::Step(Tag t, Renderable *r):
 	tag(t),
 	lighting(0),
-	clipping(0),
 	renderable(r)
 { }
 
@@ -212,15 +211,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