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

diff --git a/source/scene.cpp b/source/scene.cpp
index 2ef2ea78..28b794b0 100644
--- a/source/scene.cpp
+++ b/source/scene.cpp
@@ -5,34 +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
+void Scene::render(const Tag &tag) const
 {
-	for(set<const Renderable *>::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-		(*i)->render();
-}
+	for(ObjectMap::const_iterator i=objects.begin(); i!=objects.end(); ++i)
+		i->first->render(i->second.begin(), i->second.end(), tag);
 
-void Scene::render(const string &pn) const
-{
-	for(set<const Renderable *>::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-		if((*i)->has_pass(pn))
-			(*i)->render(pn);
+	for(RenderableSet::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
+		(*i)->render(tag);
 }
 
 } // namespace GL