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

diff --git a/source/scene.cpp b/source/scene.cpp
index 59f30411..d95909e9 100644
--- a/source/scene.cpp
+++ b/source/scene.cpp
@@ -1,52 +1,13 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include "object.h"
-#include "objectinstance.h"
+#include "renderer.h"
 #include "scene.h"
 
-using namespace std;
-
 namespace Msp {
 namespace GL {
 
-void Scene::add(const Renderable &r)
-{
-	if(const ObjectInstance *oi=dynamic_cast<const ObjectInstance *>(&r))
-		objects[&oi->get_object()].insert(oi);
-	else
-		renderables.insert(&r);
-}
-
-void Scene::remove(const Renderable &r)
-{
-	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);
-}
-
 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);
-
-	for(set<const Renderable *>::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-		if((*i)->has_pass(tag))
-			(*i)->render(tag);
+	Renderer renderer(0);
+	render(renderer, tag);
 }
 
 } // namespace GL