X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flauncher.h;h=f394f2927251dde43c72076f4eac1c176f3aa412;hb=94151737f2983ca7cade5be0e20c98fbc6f11eea;hp=f607c7bc64ead5fffa8a63eda6ac138a7be7ccff;hpb=35332818fc6bad98fe77831de2c51a11326e31aa;p=libs%2Fdemoscene.git

diff --git a/source/launcher.h b/source/launcher.h
index f607c7b..f394f29 100644
--- a/source/launcher.h
+++ b/source/launcher.h
@@ -4,7 +4,6 @@
 #include <msp/al/context.h>
 #include <msp/al/device.h>
 #include <msp/core/application.h>
-#include <msp/datafile/collection.h>
 #include <msp/graphics/display.h>
 #include <msp/graphics/glcontext.h>
 #include <msp/graphics/window.h>
@@ -12,6 +11,10 @@
 #include <msp/io/base.h>
 #include <msp/time/timedelta.h>
 #include <msp/time/timestamp.h>
+#include "resources.h"
+
+namespace Msp {
+namespace DemoScene {
 
 class Demo;
 class LaunchScreen;
@@ -23,6 +26,7 @@ protected:
 	{
 		Msp::Graphics::WindowOptions win_opts;
 		Msp::Graphics::WindowOptions fullscreen_opts;
+		Msp::Graphics::GLOptions gl_opts;
 		int start_fullscreen;
 		std::string frame_dump_fn;
 		float framerate;
@@ -57,7 +61,7 @@ public:
 	~LauncherBase();
 
 protected:
-	virtual Msp::DataFile::Collection &get_resources() = 0;
+	virtual Resources &get_resources() = 0;
 	virtual Demo *create_demo() = 0;
 	virtual void start();
 	virtual void tick();
@@ -81,4 +85,7 @@ protected:
 	virtual void exit(int c) { Msp::Application::exit(c); }
 };
 
+} // namespace DemoScene
+} // namespace Msp
+
 #endif