X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flauncher.cpp;h=aefa1be2b4b57b808f7379ee312bb9034d45b2dd;hb=77d0c7ac9e3ebe1cecaf0c84e1501d3b6459055f;hp=1563b70e2bdedcbba29e5564ddf7026dad3fddb0;hpb=35332818fc6bad98fe77831de2c51a11326e31aa;p=libs%2Fdemoscene.git

diff --git a/source/launcher.cpp b/source/launcher.cpp
index 1563b70..aefa1be 100644
--- a/source/launcher.cpp
+++ b/source/launcher.cpp
@@ -1,16 +1,21 @@
 #include <cmath>
 #include <msp/core/getopt.h>
+#include <msp/gl/pipelinetemplate.h>
 #include <msp/input/keys.h>
 #include <msp/io/console.h>
 #include <msp/io/file.h>
 #include <msp/strings/regex.h>
 #include <msp/time/utils.h>
 #include "demo.h"
+#include "filmgrain.h"
 #include "launcher.h"
 #include "launchscreen.h"
+#include "vignette.h"
 
 using namespace std;
-using namespace Msp;
+
+namespace Msp {
+namespace DemoScene {
 
 LauncherBase::Options::Options(Graphics::Display &dpy, int argc, char **argv):
 	start_fullscreen(-1),
@@ -100,6 +105,9 @@ LauncherBase::LauncherBase(int argc, char **argv):
 	gl_context.set_swap_interval(options.no_vsync ? 0 : 1);
 	window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &LauncherBase::exit), 0));
 	keyboard.signal_button_press.connect(sigc::bind_return(sigc::mem_fun(this, &LauncherBase::key_press), false));
+
+	GL::PipelineTemplate::register_postprocessor<FilmGrain>("film_grain");
+	GL::PipelineTemplate::register_postprocessor<Vignette>("vignette");
 }
 
 LauncherBase::~LauncherBase()
@@ -147,11 +155,13 @@ void LauncherBase::tick_demo()
 	display.tick();
 	demo->tick();
 
+#ifdef WITH_DEVELOPER
 	if(frame_dump)
 	{
 		glReadPixels(0, 0, window.get_width(), window.get_height(), GL_RGB, GL_UNSIGNED_BYTE, frame_dump_buffer);
 		frame_dump->write(frame_dump_buffer, frame_size);
 	}
+#endif
 }
 
 void LauncherBase::tick_launch_screen()
@@ -212,3 +222,6 @@ void LauncherBase::key_press(unsigned key)
 	else if(key==Input::KEY_ESC)
 		exit(0);
 }
+
+} // namespace DemoScene
+} // namespace Msp