X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbloom.h;h=e6738b2f105d3903fcaa526f95e6d8f4f9a4b199;hb=9846a5c6e73b3a146084894a11550dbbf184a22a;hp=c02604afc0a281a918076190433f6e15ae2e4f1d;hpb=119d9819ac9e9a8d274d2410beffe54e470485a3;p=libs%2Fgl.git

diff --git a/source/bloom.h b/source/bloom.h
index c02604af..e6738b2f 100644
--- a/source/bloom.h
+++ b/source/bloom.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_BLOOM_H_
 #define MSP_GL_BLOOM_H_
 
@@ -12,6 +5,7 @@ Distributed under the LGPL
 #include "mesh.h"
 #include "postprocessor.h"
 #include "texture2d.h"
+#include "texturing.h"
 #include "program.h"
 #include "programdata.h"
 
@@ -32,9 +26,11 @@ private:
 	Framebuffer fbo;
 	Texture2D tex[2];
 	Program blur_shader;
+	ProgramData blur_shdata_common;
 	ProgramData blur_shdata[2];
 	Program combine_shader;
 	ProgramData combine_shdata;
+	Texturing combine_texturing;
 	Mesh quad;
 
 public:
@@ -48,7 +44,7 @@ public:
 	values mean more blurriness. */
 	void set_strength(float);
 
-	virtual void render(const Texture2D &);
+	virtual void render(const Texture2D &, const Texture2D &);
 };
 
 } // namespace GL