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

diff --git a/demos/desertpillars/source/desertpillars.h b/demos/desertpillars/source/desertpillars.h
index 18522a57..4e478099 100644
--- a/demos/desertpillars/source/desertpillars.h
+++ b/demos/desertpillars/source/desertpillars.h
@@ -36,9 +36,10 @@ private:
 	{
 	private:
 		Msp::DataFile::DirectorySource source;
+		Msp::GL::ResourceManager res_mgr;
 
 	public:
-		Resources();
+		Resources(Msp::GL::ResourceManager *);
 	};
 
 	class MorphSphere: public Msp::GL::ObjectInstance
@@ -70,6 +71,7 @@ private:
 	Msp::Graphics::Window window;
 	Msp::Graphics::GLContext gl_ctx;
 	Msp::Input::Keyboard keyboard;
+	Msp::GL::ResourceManager res_mgr;
 	Resources resources;
 
 	Msp::GL::WindowView view;
@@ -77,13 +79,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;