Merge branch 'animation-rework'

[libs/gl.git] / source / postprocessor.cpp

diff --git a/source/postprocessor.cpp b/source/postprocessor.cpp
index 3c6fbebe89b5704b64a6fd1428a6259fc76f34bb..28ae71b0945b2ca28e04cf3de34d60e222a36646 100644 (file)
--- a/source/postprocessor.cpp
+++ b/source/postprocessor.cpp
@@ -20,6 +20,11 @@ const char fullscreen_vs_source[] =
 namespace Msp {
 namespace GL {
 
+void PostProcessor::render(Renderer &, const Texture2D &color, const Texture2D &depth)
+{
+       render(color, depth);
+}
+
 Shader &PostProcessor::get_fullscreen_vertex_shader()
 {
        static VertexShader shader(fullscreen_vs_source);
@@ -34,7 +39,7 @@ const Mesh &PostProcessor::get_fullscreen_quad()
 
 const Mesh &PostProcessor::create_fullscreen_quad()
 {
-       static Mesh mesh(GL::VERTEX2);
+       static Mesh mesh(VERTEX2);
        MeshBuilder builder(mesh);
        builder.begin(TRIANGLE_STRIP);
        builder.vertex(-1, 1);
@@ -45,5 +50,17 @@ const Mesh &PostProcessor::create_fullscreen_quad()
        return mesh;
 }
 
+
+PostProcessor::Template::Template():
+       size_divisor(1)
+{ }
+
+
+PostProcessor::Template::Loader::Loader(Template &t):
+       DataFile::ObjectLoader<Template>(t)
+{
+       add("size_divisor", &Template::size_divisor);
+}
+
 } // namespace GL
 } // namespace Msp