X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fscene.cpp;h=517158f056108943a7c6a2c47902e194799f5348;hb=4edd75061a1e24572bd672fb72e1bc1838008ce7;hp=59f3041187d29a13b40315a4f3a0eaf70e3fc5f9;hpb=b8b06a0ff96763ba7e188d9fcacbd8c0e3dcd515;p=libs%2Fgl.git

diff --git a/source/scene.cpp b/source/scene.cpp
index 59f30411..517158f0 100644
--- a/source/scene.cpp
+++ b/source/scene.cpp
@@ -1,12 +1,5 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include "object.h"
-#include "objectinstance.h"
+#include "culler.h"
+#include "renderer.h"
 #include "scene.h"
 
 using namespace std;
@@ -14,39 +7,36 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-void Scene::add(const Renderable &r)
+void Scene::add_culler(Culler &c)
 {
-	if(const ObjectInstance *oi=dynamic_cast<const ObjectInstance *>(&r))
-		objects[&oi->get_object()].insert(oi);
-	else
-		renderables.insert(&r);
+	cullers.push_back(&c);
 }
 
-void Scene::remove(const Renderable &r)
+void Scene::remove_culler(Culler &c)
 {
-	if(const ObjectInstance *oi=dynamic_cast<const ObjectInstance *>(&r))
-	{
-		map<const Object *, set<const ObjectInstance *> >::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);
+	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(map<const Object *, set<const ObjectInstance *> >::const_iterator i=objects.begin(); i!=objects.end(); ++i)
-		if(i->first->has_pass(tag))
-			i->first->render(i->second.begin(), i->second.end(), tag);
+	Renderer renderer(0);
+	render(renderer, tag);
+}
 
-	for(set<const Renderable *>::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-		if((*i)->has_pass(tag))
-			(*i)->render(tag);
+void Scene::setup_cullers(const Renderer &renderer) const
+{
+	for(list<Culler *>::const_iterator i=cullers.begin(); i!=cullers.end(); ++i)
+		(*i)->setup_frame(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;
 }
 
 } // namespace GL