X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Feffects%2Fbloom.cpp;h=7795e191faa0ca6aca0ceb472bea430a5b067e5f;hb=92ad161ed948637c235e198510136f0dace2ca3e;hp=e3081d75a8d912e01948b077297389f88cc13478;hpb=6065f6622cc275dc0b20baaf7c267e71169d18f3;p=libs%2Fgl.git diff --git a/source/effects/bloom.cpp b/source/effects/bloom.cpp index e3081d75..7795e191 100644 --- a/source/effects/bloom.cpp +++ b/source/effects/bloom.cpp @@ -1,10 +1,10 @@ #include #include -#include "blend.h" #include "bloom.h" -#include "misc.h" +#include "mesh.h" #include "renderer.h" #include "resources.h" +#include "texture2d.h" using namespace std; @@ -68,11 +68,13 @@ void Bloom::render(Renderer &renderer, const Texture2D &src, const Texture2D &) { Renderer::Push push2(renderer); renderer.set_framebuffer(&target[i]->get_framebuffer()); + renderer.clear(0); renderer.set_texture("source", (i ? &target[0]->get_target_texture(COLOR_ATTACHMENT) : &src), &nearest_sampler); renderer.add_shader_data(blur_shdata[i]); quad.draw(renderer); } + renderer.clear(0); renderer.set_texture("source", &src, &nearest_sampler); renderer.set_texture("blurred", &target[1]->get_target_texture(COLOR_ATTACHMENT), &linear_sampler); renderer.set_shader_program(&combine_shader); @@ -93,11 +95,6 @@ void Bloom::set_debug_name(const string &name) } -Bloom::Template::Template(): - radius(2.0f), - strength(0.2f) -{ } - Bloom *Bloom::Template::create(unsigned width, unsigned height) const { RefPtr bloom = new Bloom(width/size_divisor, height/size_divisor);