Make Scenes loadable from collection files too

diff --git a/source/resources/resources.cpp b/source/resources/resources.cpp
index e83f33eb529078f80c1bd08d426c40dc49a9a08e..b5093932c2516f44d7fd93c660aafe1e734eb93f 100644 (file)
--- a/source/resources/resources.cpp
+++ b/source/resources/resources.cpp
@@ -229,5 +229,19 @@ Program *Resources::create_program(const string &name)
        return 0;
 }
 
+
+Resources::Loader::Loader(Resources &r):
+       DerivedObjectLoader<Resources, Collection::Loader>(r)
+{
+       add("scene", &Loader::scene);
+}
+
+void Resources::Loader::scene(const string &name)
+{
+       Scene::GenericLoader ldr(obj);
+       load_sub_with(ldr);
+       obj.add(name, ldr.get_scene());
+}
+
 } // namespace GL
 } // namespace Msp

diff --git a/source/resources/resources.h b/source/resources/resources.h
index abda5cde7b29f8ee0756536e9acf918510a5333f..5861bbfb41259a8a910e87f55a2ad78498706c81 100644 (file)
--- a/source/resources/resources.h
+++ b/source/resources/resources.h
@@ -21,6 +21,16 @@ application-specific collection.
 */
 class Resources: virtual public DataFile::Collection
 {
+public:
+       class Loader: public DataFile::DerivedObjectLoader<Resources, Collection::Loader>
+       {
+       public:
+               Loader(Resources &);
+
+       private:
+               void scene(const std::string &);
+       };
+
 private:
        TextureFilter default_tex_filter;
        float default_tex_anisotropy;