X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fscene.cpp;h=f233a09b31ea39324324db15c11586b789e8be99;hb=de5d710b87879d6a0b06407da096ec505f8b7679;hp=3f0261f4d467af0c3bad85d1d01a572b51346420;hpb=7533ecca549e09eab5ef229292de8908370c395c;p=libs%2Fgl.git

diff --git a/source/scene.cpp b/source/scene.cpp
index 3f0261f4..f233a09b 100644
--- a/source/scene.cpp
+++ b/source/scene.cpp
@@ -1,3 +1,5 @@
+#include <msp/datafile/collection.h>
+#include "animatedobject.h"
 #include "culler.h"
 #include "renderer.h"
 #include "scene.h"
@@ -7,6 +9,12 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+Scene::~Scene()
+{
+	for(list<Renderable *>::iterator i=owned_data.begin(); i!=owned_data.end(); ++i)
+		delete *i;
+}
+
 void Scene::add_culler(Culler &c)
 {
 	cullers.push_back(&c);
@@ -39,5 +47,20 @@ bool Scene::cull(const Renderer &renderer, const Renderable &renderable) const
 	return false;
 }
 
+
+Scene::Loader::Loader(Scene &s, Collection &c):
+	DataFile::CollectionObjectLoader<Scene>(s, &c)
+{
+	add("object", &Loader::object);
+}
+
+void Scene::Loader::object(const string &n)
+{
+	RefPtr<AnimatedObject> anob = new AnimatedObject(get_collection().get<GL::Object>(n));
+	load_sub(*anob);
+	obj.add(*anob);
+	obj.owned_data.push_back(anob.release());
+}
+
 } // namespace GL
 } // namespace Msp