X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbloom.cpp;h=ee7c76c3217bef3befc48e40b794d3f485cb4389;hb=d78f1335362f4c467ee2003d3c727169f788ce37;hp=7537b0a6a80711fdcb1ff6cfc9b005b60d27fecc;hpb=a525c632144d3dcefe373916bdde789727d2230d;p=libs%2Fgl.git

diff --git a/source/bloom.cpp b/source/bloom.cpp
index 7537b0a6..ee7c76c3 100644
--- a/source/bloom.cpp
+++ b/source/bloom.cpp
@@ -16,7 +16,9 @@ namespace GL {
 Bloom::Bloom(unsigned w, unsigned h):
 	blur_shader("bloom_blur.glsl"),
 	combine_shader("bloom_combine.glsl"),
-	quad(get_fullscreen_quad())
+	quad(get_fullscreen_quad()),
+	nearest_sampler(get_nearest_sampler()),
+	linear_sampler(get_linear_sampler())
 {
 	blur_shdata[0].uniform("delta", 1.0f/w, 0.0f);
 	blur_shdata[1].uniform("delta", 0.0f, 1.0f/h);
@@ -27,7 +29,7 @@ Bloom::Bloom(unsigned w, unsigned h):
 	common_shdata.uniform("source", 0);
 	common_shdata.uniform("blurred", 1);
 
-	combine_texturing.attach(1, target[1]->get_target_texture(RENDER_COLOR));
+	combine_texturing.attach(1, target[1]->get_target_texture(RENDER_COLOR), linear_sampler.get());
 
 	set_radius(2.0f);
 	set_strength(0.2f);
@@ -73,15 +75,37 @@ void Bloom::render(Renderer &renderer, const Texture2D &src, const Texture2D &)
 	{
 		BindRestore bind_fbo(target[i]->get_framebuffer());
 		Renderer::Push push2(renderer);
-		renderer.set_texture(i ? &target[0]->get_target_texture(RENDER_COLOR) : &src);
+		renderer.set_texture(i ? &target[0]->get_target_texture(RENDER_COLOR) : &src, nearest_sampler.get());
 		renderer.add_shader_data(blur_shdata[i]);
-		quad.draw(renderer);
+		quad->draw(renderer);
 	}
 
-	combine_texturing.attach(0, src);
+	combine_texturing.attach(0, src, nearest_sampler.get());
 	renderer.set_texturing(&combine_texturing);
 	renderer.set_shader_program(&combine_shader);
-	quad.draw(renderer);
+	quad->draw(renderer);
+}
+
+
+Bloom::Template::Template():
+	radius(2.0f),
+	strength(0.2f)
+{ }
+
+Bloom *Bloom::Template::create(unsigned width, unsigned height) const
+{
+	RefPtr<Bloom> bloom = new Bloom(width/size_divisor, height/size_divisor);
+	bloom->set_radius(radius);
+	bloom->set_strength(strength);
+	return bloom.release();
+}
+
+
+Bloom::Template::Loader::Loader(Template &t):
+	DataFile::DerivedObjectLoader<Template, PostProcessor::Template::Loader>(t)
+{
+	add("strength", &Template::strength);
+	add("radius", &Template::radius);
 }
 
 } // namespace GL