X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Fsequence.cpp;h=f2a88a51f760ab6ccc6fc9e5c17062ab460824ae;hp=7a964c870d39e2bbe40a9cbf4a2571d1e1f40843;hb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;hpb=006bdb4f8660098fc524dcca80b24c943c65b249 diff --git a/source/render/sequence.cpp b/source/render/sequence.cpp index 7a964c87..f2a88a51 100644 --- a/source/render/sequence.cpp +++ b/source/render/sequence.cpp @@ -1,10 +1,9 @@ -#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" @@ -13,24 +12,10 @@ using namespace std; namespace Msp { namespace GL { -Sequence::Sequence(): - width(0), - height(0), - target{0, 0}, - target_ms(0), - clear_enabled(false), - clear_depth(1.0f), - clear_stencil(0) -{ } - Sequence::Sequence(unsigned w, unsigned h, const FrameFormat &f): width(w), height(h), - target_format(f), - target_ms(0), - clear_enabled(false), - clear_depth(1.0f), - clear_stencil(0) + target_format(f) { if(target_format.empty()) throw invalid_argument("Sequence::Sequence"); @@ -174,7 +159,7 @@ void Sequence::render(Renderer &renderer, Tag tag) const 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);