X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Fsequence.cpp;h=74b8bc3b0b4fe9a6835d9f5fab5326dddcc62fe3;hp=e953b4d6925944b10d872301ef35667a7904f857;hb=HEAD;hpb=e9a898f315b5d1396f196d785913a283c30940f2 diff --git a/source/render/sequence.cpp b/source/render/sequence.cpp index e953b4d6..4f10026a 100644 --- a/source/render/sequence.cpp +++ b/source/render/sequence.cpp @@ -1,95 +1,79 @@ -#include -#include "blend.h" +#include #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) -{ - init(w, h, f); -} - -Sequence::Sequence(const View &view, const FrameFormat &f) -{ - init(view.get_width(), view.get_height(), f); -} +const Tag Sequence::noclear_tag = "noclear"; -Sequence::Sequence(const Framebuffer &fbo, const FrameFormat &f) +Sequence::Sequence(unsigned w, unsigned h, const FrameFormat &f): + width(w), + height(h), + target_format(f) { - 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(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; } -Sequence::Step &Sequence::add_step(Tag tag, Renderable &r) +void Sequence::set_clear_enabled(bool c) { - steps.push_back(Step(tag, &r)); - return steps.back(); + clear_enabled = c; } -void Sequence::add_postprocessor(PostProcessor &pp) +void Sequence::set_clear_colors(const vector &c) +{ + clear_enabled = true; + clear_colors = c; +} + +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) @@ -108,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); @@ -116,9 +100,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 && 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 = (iget_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]) { + RenderTarget *source = target[0]; if(target_ms) - renderer.resolve_multisample(target[0]->get_framebuffer(), COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT); + { + renderer.resolve_multisample(); + source = target_ms; + } renderer.set_depth_test(0); renderer.set_stencil_test(0); @@ -148,11 +156,12 @@ void Sequence::render(Renderer &renderer, Tag tag) const for(unsigned i=0; iget_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); + unsigned j = 1-i%2; + renderer.set_framebuffer(i+1get_framebuffer() : out_fbo); + const Texture2D &color = source->get_target_texture(COLOR_ATTACHMENT); + const Texture2D &depth = source->get_target_texture(DEPTH_ATTACHMENT); + postproc[i]->render(renderer, color, depth); + source = target[j]; } } } @@ -174,7 +183,6 @@ void Sequence::set_debug_name(const string &name) Sequence::Step::Step(Tag t, Renderable *r): tag(t), lighting(0), - clipping(0), renderable(r) { } @@ -193,15 +201,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