X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fscene.cpp;h=d95909e9a10ebd59035d44ddcda7714a44106793;hp=c28192d407fe529ae2e258700d32243cee654e32;hb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;hpb=e759062876ee7fc81d1c2f40818d5bf97898d53d

diff --git a/source/scene.cpp b/source/scene.cpp
index c28192d4..d95909e9 100644
--- a/source/scene.cpp
+++ b/source/scene.cpp
@@ -1,50 +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)
-		i->first->render(i->second.begin(), i->second.end(), tag);
-
-	for(set<const Renderable *>::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-		(*i)->render(tag);
+	Renderer renderer(0);
+	render(renderer, tag);
 }
 
 } // namespace GL