X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fscene.cpp;fp=source%2Frender%2Fscene.cpp;h=4b7aee1a8574499b59c169b976fd34cf7dc22feb;hb=29f0d4ada51ff65c424398546e01e2884dba6ef3;hp=75d1859bdd4995d8c42d8c0aa6f4b9ca747d7928;hpb=ffeb9a14765703d3d2e73cec751f5099e0d4c341;p=libs%2Fgl.git diff --git a/source/render/scene.cpp b/source/render/scene.cpp index 75d1859b..4b7aee1a 100644 --- a/source/render/scene.cpp +++ b/source/render/scene.cpp @@ -89,10 +89,11 @@ Scene::GenericLoader::TypeRegistry &Scene::get_scene_registry() } +unsigned Scene::Loader::inline_counter = 0; + Scene::Loader::Loader(Scene &s, Collection &c, ContentMap *m): DataFile::CollectionObjectLoader(s, &c), - content(m), - inst_counter(0) + content(m) { add("object", &Loader::object); add("object", &Loader::object_tagged); @@ -108,7 +109,7 @@ void Scene::Loader::object_tagged(const string &n, const string &t) { RefPtr inst = new ObjectInstance(get_collection().get(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());