#include <msp/strings/format.h>
#include "blend.h"
#include "bloom.h"
-#include "meshbuilder.h"
#include "misc.h"
+#include "shader.h"
#include "tests.h"
#include "texunit.h"
namespace {
-static const char blur_vs[]=
- "varying vec2 texcoord;\n"
- "void main()\n"
- "{\n"
- " gl_Position = vec4(gl_Vertex.xy*2.0-1.0, 0.0, 1.0);\n"
- " texcoord = gl_Vertex.xy;\n"
- "}";
-
static const char blur_fs[]=
"uniform sampler2D source;\n"
"uniform vec2 delta;\n"
" gl_FragColor += texture2D(source, texcoord+delta*float(i-size))*factors[i];\n"
"}";
-static const char combine_vs[]=
- "varying vec2 texcoord;\n"
- "void main()\n"
- "{\n"
- " gl_Position = vec4(gl_Vertex.xy*2.0-1.0, 0.0, 1.0);\n"
- " texcoord = gl_Vertex.xy;\n"
- "}";
-
static const char combine_fs[]=
"uniform sampler2D source;\n"
"uniform sampler2D blurred;\n"
namespace GL {
Bloom::Bloom(unsigned w, unsigned h):
- blur_shader(blur_vs, blur_fs),
- blur_shdata_common(blur_shader),
- blur_shdata_x(blur_shader),
- blur_shdata_y(blur_shader),
- combine_shader(combine_vs, combine_fs),
- combine_shdata(combine_shader),
- quad(VERTEX2)
+ quad(get_fullscreen_quad())
{
- int loc = blur_shader.get_uniform_location("delta");
- blur_shdata_x.uniform(loc, 1.0f/w, 0.0f);
- blur_shdata_y.uniform(loc, 0.0f, 1.0f/h);
+ blur_shader.attach_shader(get_fullscreen_vertex_shader());
+ blur_shader.attach_shader_owned(new Shader(FRAGMENT_SHADER, blur_fs));
+ blur_shader.link();
+
+ combine_shader.attach_shader(get_fullscreen_vertex_shader());
+ combine_shader.attach_shader_owned(new Shader(FRAGMENT_SHADER, combine_fs));
+ combine_shader.link();
+
+ blur_shdata[0].uniform("delta", 1.0f/w, 0.0f);
+ blur_shdata[1].uniform("delta", 0.0f, 1.0f/h);
blur_shdata_common.uniform("source", 0);
for(unsigned i=0; i<2; ++i)
set_radius(2.0f);
set_strength(0.2f);
-
- MeshBuilder mbld(quad);
- mbld.begin(TRIANGLE_STRIP);
- mbld.vertex(0, 1);
- mbld.vertex(0, 0);
- mbld.vertex(1, 1);
- mbld.vertex(1, 0);
- mbld.end();
}
void Bloom::set_radius(float r)
{
if(r<=0.0f)
- throw InvalidParameterValue("Radius must be positive");
+ throw out_of_range("Bloom::set_radius");
int size = min(static_cast<int>(r*3.0f), 9);
blur_shdata_common.uniform("size", size);
r = 2*r*r;
for(int i=-size; i<=size; ++i)
sum += (factors[size+i] = exp(-i*i/r));
-
for(int i=0; i<=size*2; ++i)
- blur_shdata_common.uniform(format("factors[%d]", i), factors[i]/sum);
+ factors[i] /= sum;
+
+ blur_shdata_common.uniform1_array("factors[0]", size*2+1, &factors.front());
}
void Bloom::set_strength(float s)
{
if(s<0.0f || s>1.0f)
- throw InvalidParameterValue("Strength must be in the range [0.0, 1.0]");
+ throw out_of_range("Bloom::set_strength");
combine_shdata.uniform("strength", s);
}
{
Bind bind_tex(i ? tex[0] : src);
fbo.attach(COLOR_ATTACHMENT0, tex[i], 0);
- (i ? blur_shdata_y : blur_shdata_x).apply();
+ blur_shdata[i].apply();
quad.draw();
}
}