X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=demos%2Fdesertpillars%2Fsource%2Fdesertpillars.h;h=3171da8efb6e7288c9aa7e139b5d0c5894f70d67;hb=857e0a3f684fba4810260697a78a769dff514f1f;hp=18522a57ca324f0449d52d50d7b7cf892d3c3365;hpb=33577fd6ef75f1c3af77720fde351459727ca68c;p=libs%2Fgl.git

diff --git a/demos/desertpillars/source/desertpillars.h b/demos/desertpillars/source/desertpillars.h
index 18522a57..3171da8e 100644
--- a/demos/desertpillars/source/desertpillars.h
+++ b/demos/desertpillars/source/desertpillars.h
@@ -5,6 +5,7 @@
 #include <msp/core/application.h>
 #include <msp/datafile/directorysource.h>
 #include <msp/gl/camera.h>
+#include <msp/gl/device.h>
 #include <msp/gl/environmentmap.h>
 #include <msp/gl/objectinstance.h>
 #include <msp/gl/orderedscene.h>
@@ -16,7 +17,6 @@
 #include <msp/gl/technique.h>
 #include <msp/gl/windowview.h>
 #include <msp/graphics/display.h>
-#include <msp/graphics/glcontext.h>
 #include <msp/graphics/window.h>
 #include <msp/input/keyboard.h>
 #include <msp/time/timestamp.h>
@@ -27,7 +27,6 @@ private:
 	struct Options
 	{
 		Msp::Graphics::WindowOptions wnd_opts;
-		Msp::Graphics::GLOptions gl_opts;
 
 		Options();
 	};
@@ -38,7 +37,7 @@ private:
 		Msp::DataFile::DirectorySource source;
 
 	public:
-		Resources();
+		Resources(Msp::GL::ResourceManager *);
 	};
 
 	class MorphSphere: public Msp::GL::ObjectInstance
@@ -68,8 +67,9 @@ private:
 	Msp::Graphics::Display display;
 	Options opts;
 	Msp::Graphics::Window window;
-	Msp::Graphics::GLContext gl_ctx;
+	Msp::GL::Device gl_device;
 	Msp::Input::Keyboard keyboard;
+	Msp::GL::ResourceManager res_mgr;
 	Resources resources;
 
 	Msp::GL::WindowView view;
@@ -77,13 +77,8 @@ private:
 	Msp::GL::Camera camera;
 	const Msp::GL::Lighting &lighting;
 
-	std::unique_ptr<Msp::GL::Sky> sky;
-	std::unique_ptr<Msp::GL::Sequence> shadow_seq;
-	std::unique_ptr<Msp::GL::Sequence> shadow_seq_thsm;
-	std::unique_ptr<Msp::GL::ShadowMap> shadow_map;
 	std::unique_ptr<Msp::GL::Sequence> env_seq;
 	std::unique_ptr<Msp::GL::EnvironmentMap> env_map;
-	std::unique_ptr<Msp::GL::EnvironmentMap> global_env;
 	Msp::GL::OrderedScene content;
 
 	MorphSphere sphere;