return false;
}
-Scene::SceneRegistry &Scene::get_scene_registry()
+Scene::GenericLoader::TypeRegistry &Scene::get_scene_registry()
{
- static SceneRegistry registry;
+ static Scene::GenericLoader::TypeRegistry registry;
static bool initialized = false;
if(!initialized)
{
}
+unsigned Scene::Loader::inline_counter = 0;
+
Scene::Loader::Loader(Scene &s, Collection &c, ContentMap *m):
DataFile::CollectionObjectLoader<Scene>(s, &c),
- content(m),
- inst_counter(0)
+ content(m)
{
add("object", &Loader::object);
add("object", &Loader::object_tagged);
add("scene", &Loader::scene);
+ add("scene", &Loader::scene_inline);
}
void Scene::Loader::object(const string &n)
{
RefPtr<ObjectInstance> inst = new ObjectInstance(get_collection().get<GL::Object>(n));
load_sub(*inst);
- get_collection().add(format("%s/%d.inst", FS::basename(get_source()), inst_counter++), inst.get());
+ get_collection().add(format("_scene_object_%d.inst", ++inline_counter), inst.get());
if(content && !t.empty())
(*content)[t] = inst.get();
obj.add(*inst.release());
obj.add(get_collection().get<Scene>(n));
}
-
-DataFile::Loader::ActionMap Scene::GenericLoader::shared_actions;
-
-Scene::GenericLoader::GenericLoader(DataFile::Collection &c):
- coll(c),
- scene(0),
- scene_loader(0)
-{
- set_actions(shared_actions);
-}
-
-Scene::GenericLoader::~GenericLoader()
-{
- delete scene;
- delete scene_loader;
-}
-
-void Scene::GenericLoader::init_actions()
-{
- add("type", &GenericLoader::type);
-}
-
-void Scene::GenericLoader::type(const DataFile::Symbol &sym)
+void Scene::Loader::scene_inline()
{
- get_scene_registry().invoke(sym.name, *this);
+ GenericLoader ldr(get_collection());
+ load_sub_with(ldr);
+ Scene *scene = ldr.store_object(get_collection(), format("_scene_%d.scene", ++inline_counter));
+ obj.add(*scene);
}
} // namespace GL