X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finstancescene.cpp;h=ffbfa558f42e4bf2ad35f799579c2b438544e91d;hb=6afbace895a7bbcf216ab8e48280ea0303ab5892;hp=adaebbba3ef364b34522df0a49dad2802c990b2f;hpb=25c81b4953dd38993250321b9407ce8b0139cbeb;p=libs%2Fgl.git

diff --git a/source/instancescene.cpp b/source/instancescene.cpp
index adaebbba..ffbfa558 100644
--- a/source/instancescene.cpp
+++ b/source/instancescene.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2008, 2010-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "object.h"
 #include "objectinstance.h"
 #include "instancescene.h"
@@ -15,37 +8,25 @@ namespace GL {
 
 void InstanceScene::add(const Renderable &r)
 {
-	if(const ObjectInstance *oi = dynamic_cast<const ObjectInstance *>(&r))
-		objects[&oi->get_object()].insert(oi);
-	else
-		renderables.insert(&r);
+	renderables[r.get_instance_key()].insert(&r);
 }
 
 void InstanceScene::remove(const Renderable &r)
 {
-	if(const ObjectInstance *oi = dynamic_cast<const ObjectInstance *>(&r))
+	InstanceMap::iterator i = renderables.find(r.get_instance_key());
+	if(i!=renderables.end())
 	{
-		ObjectMap::iterator i = objects.find(&oi->get_object());
-		if(i!=objects.end())
-		{
-			i->second.erase(oi);
-			if(i->second.empty())
-				objects.erase(i);
-		}
+		i->second.erase(&r);
+		if(i->second.empty())
+			renderables.erase(i);
 	}
-	else
-		renderables.erase(&r);
 }
 
 void InstanceScene::render(Renderer &renderer, const Tag &tag) const
 {
-	// XXX Check that the object has this pass to avoid some unnecessary function calls
-	for(ObjectMap::const_iterator i=objects.begin(); i!=objects.end(); ++i)
-		for(InstanceSet::const_iterator j=i->second.begin(); j!=i->second.end(); ++j)
+	for(InstanceMap::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
+		for(RenderableSet::const_iterator j=i->second.begin(); j!=i->second.end(); ++j)
 			(*j)->render(renderer, tag);
-
-	for(RenderableSet::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-		(*i)->render(renderer, tag);
 }
 
 } // namespace GL