Use asynchronous resource loading in desertpillars

[libs/gl.git] / demos / desertpillars / source / desertpillars.cpp

diff --git a/demos/desertpillars/source/desertpillars.cpp b/demos/desertpillars/source/desertpillars.cpp
index 542ade3b0a8164cb668926e8312bfc90121c67e2..53f0a86c72cee3c957b66c0f174a10036b983eab 100644 (file)
--- 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);
 }