X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fscene.cpp;h=1e72d5dca36285f5664eb8151668fb107a5d0a0e;hp=607166d5d32f285e35879ff62134891a9c8e5a42;hb=b617c5d7b5283ad260a77f01e42e6170cabbc03d;hpb=6a135773515b020ea3f163a11d06150ae5c0e69f

diff --git a/source/scene.cpp b/source/scene.cpp
index 607166d5..1e72d5dc 100644
--- a/source/scene.cpp
+++ b/source/scene.cpp
@@ -5,36 +5,44 @@ Copyright © 2007  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include "object.h"
+#include "objectinstance.h"
 #include "scene.h"
 
-using namespace std;
-
 namespace Msp {
 namespace GL {
 
 void Scene::add(const Renderable &r)
 {
-	renderables.insert(&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)
 {
-	renderables.erase(&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(set<const Renderable *, Compare>::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-		if((*i)->has_pass(tag))
-			(*i)->render(tag);
-}
+	for(ObjectMap::const_iterator i=objects.begin(); i!=objects.end(); ++i)
+		i->first->render(i->second.begin(), i->second.end(), tag);
 
-
-bool Scene::Compare::operator()(const Renderable *a, const Renderable *b) const
-{
-	if(a->get_order()!=b->get_order())
-		return a->get_order()<b->get_order();
-	return a<b;
+	for(RenderableSet::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
+		(*i)->render(tag);
 }
 
 } // namespace GL