X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fscene.cpp;h=f233a09b31ea39324324db15c11586b789e8be99;hb=5ae4b0008b25072b5716f0cb585133315625a661;hp=1e72d5dca36285f5664eb8151668fb107a5d0a0e;hpb=b617c5d7b5283ad260a77f01e42e6170cabbc03d;p=libs%2Fgl.git

diff --git a/source/scene.cpp b/source/scene.cpp
index 1e72d5dc..f233a09b 100644
--- a/source/scene.cpp
+++ b/source/scene.cpp
@@ -1,48 +1,65 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include "object.h"
-#include "objectinstance.h"
+#include <msp/datafile/collection.h>
+#include "animatedobject.h"
+#include "culler.h"
+#include "renderer.h"
 #include "scene.h"
 
+using namespace std;
+
 namespace Msp {
 namespace GL {
 
-void Scene::add(const Renderable &r)
+Scene::~Scene()
 {
-	if(const ObjectInstance *oi = dynamic_cast<const ObjectInstance *>(&r))
-		objects[&oi->get_object()].insert(oi);
-	else
-		renderables.insert(&r);
+	for(list<Renderable *>::iterator i=owned_data.begin(); i!=owned_data.end(); ++i)
+		delete *i;
 }
 
-void Scene::remove(const Renderable &r)
+void Scene::add_culler(Culler &c)
 {
-	if(const ObjectInstance *oi = dynamic_cast<const ObjectInstance *>(&r))
-	{
-		ObjectMap::iterator i = objects.find(&oi->get_object());
-		if(i!=objects.end())
-		{
-			i->second.erase(oi);
-			if(i->second.empty())
-				objects.erase(i);
-		}
-	}
-	else
-		renderables.erase(&r);
+	cullers.push_back(&c);
+}
+
+void Scene::remove_culler(Culler &c)
+{
+	list<Culler *>::iterator i = find(cullers.begin(), cullers.end(), &c);
+	if(i!=cullers.end())
+		cullers.erase(i);
 }
 
 void Scene::render(const Tag &tag) const
 {
-	for(ObjectMap::const_iterator i=objects.begin(); i!=objects.end(); ++i)
-		i->first->render(i->second.begin(), i->second.end(), tag);
+	Renderer renderer(0);
+	render(renderer, tag);
+}
+
+void Scene::setup_cullers(const Renderer &renderer) const
+{
+	for(list<Culler *>::const_iterator i=cullers.begin(); i!=cullers.end(); ++i)
+		(*i)->setup_pass(renderer);
+}
+
+bool Scene::cull(const Renderer &renderer, const Renderable &renderable) const
+{
+	for(list<Culler *>::const_iterator i=cullers.begin(); i!=cullers.end(); ++i)
+		if((*i)->cull(renderer, renderable))
+			return true;
+	return false;
+}
+
 
-	for(RenderableSet::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-		(*i)->render(tag);
+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