Add inline data items to the collection

[libs/gl.git] / source / render / scene.cpp

diff --git a/source/render/scene.cpp b/source/render/scene.cpp
index 70a9e94b6c354d2519b5b49041b085dd3fd70497..d916def84a95448a2dcababd938f3de16bc89322 100644 (file)
--- a/source/render/scene.cpp
+++ b/source/render/scene.cpp
@@ -1,6 +1,8 @@
 #include <msp/datafile/collection.h>
+#include <msp/fs/utils.h>
 #include "camera.h"
 #include "objectinstance.h"
+#include "occludedscene.h"
 #include "orderedscene.h"
 #include "renderer.h"
 #include "scene.h"
@@ -12,12 +14,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Scene::~Scene()
-{
-       for(vector<Renderable *>::iterator i=owned_data.begin(); i!=owned_data.end(); ++i)
-               delete *i;
-}
-
 bool Scene::setup_frustum(const Renderer &renderer) const
 {
        const Camera *camera = renderer.get_camera();
@@ -86,8 +82,7 @@ Scene::SceneRegistry &Scene::get_scene_registry()
                register_type<SimpleScene>("simple");
                register_type<ZSortedScene>("zsorted");
                register_type<OrderedScene>("ordered");
-               // TODO OccludedScene requires a collection as a constructor parameter
-               //register_type<OccludedScene>("occluded");
+               register_type<OccludedScene>("occluded");
        }
        return registry;
 }
@@ -123,10 +118,10 @@ void Scene::Loader::object_tagged(const string &n, const string &t)
 {
        RefPtr<ObjectInstance> inst = new ObjectInstance(get_collection().get<GL::Object>(n));
        load_sub(*inst);
-       obj.add(*inst);
+       get_collection().add(format("%s/%d.inst", FS::basename(get_source()), inst_counter++), inst.get());
        if(content && !t.empty())
                (*content)[t] = inst.get();
-       obj.owned_data.push_back(inst.release());
+       obj.add(*inst.release());
 }
 
 void Scene::Loader::scene(const string &n)