X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=demos%2Fdesertpillars%2Fsource%2Fdesertpillars.cpp;fp=demos%2Fdesertpillars%2Fsource%2Fdesertpillars.cpp;h=53f0a86c72cee3c957b66c0f174a10036b983eab;hp=542ade3b0a8164cb668926e8312bfc90121c67e2;hb=0bdf0d7be74940dd60274608d577e58d86f76496;hpb=9b470da03c562de16b085428a7c5ed27bdebfb4e

diff --git a/demos/desertpillars/source/desertpillars.cpp b/demos/desertpillars/source/desertpillars.cpp
index 542ade3b..53f0a86c 100644
--- a/demos/desertpillars/source/desertpillars.cpp
+++ b/demos/desertpillars/source/desertpillars.cpp
@@ -25,6 +25,7 @@ DesertPillars::DesertPillars(int, char **):
 	window(display, opts.wnd_opts),
 	gl_ctx(window, opts.gl_opts),
 	keyboard(window),
+	resources(&res_mgr),
 	view(window, gl_ctx),
 	camera(resources.get<GL::Camera>("Camera.camera")),
 	lighting(resources.get<GL::Lighting>("Desert.lightn")),
@@ -123,6 +124,7 @@ void DesertPillars::tick()
 	flare.set_matrix(GL::Matrix::translation(p));
 
 	display.tick();
+	res_mgr.tick();
 	view.render();
 }
 
@@ -139,13 +141,15 @@ void DesertPillars::key_press(unsigned key)
 }
 
 
-DesertPillars::Resources::Resources()
+DesertPillars::Resources::Resources(GL::ResourceManager *rm)
 {
 	FS::Path base_dir = FS::get_sys_data_dir()/"demos"/"desertpillars"/"data";
 	source.add_directory(base_dir);
 	source.add_directory(base_dir/"textures");
 	source.add_directory(base_dir/"exported");
 	add_source(source);
+
+	set_resource_manager(rm);
 }