X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fscene.cpp;h=fee81dc20c931b807c0e1b74828fb7533c056341;hb=aa9884e69bc543682d1fe36ec5d054fdf11bcfac;hp=28b794b035c5b3da61bf4cd9e92363607a5b771a;hpb=97015ec7bddd26aa746f5227e4109b7d32438cca;p=libs%2Fgl.git

diff --git a/source/scene.cpp b/source/scene.cpp
index 28b794b0..fee81dc2 100644
--- a/source/scene.cpp
+++ b/source/scene.cpp
@@ -1,48 +1,20 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#include "object.h"
-#include "objectinstance.h"
+#include "renderer.h"
 #include "scene.h"
 
 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))
-	{
-		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);
-}
-
 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);
-
-	for(RenderableSet::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-		(*i)->render(tag);
+	Renderer renderer(0);
+	render(renderer, tag);
 }
 
 } // namespace GL