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

diff --git a/source/scene.cpp b/source/scene.cpp
index 2ef2ea78..59f30411 100644
--- a/source/scene.cpp
+++ b/source/scene.cpp
@@ -5,6 +5,8 @@ Copyright © 2007  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include "object.h"
+#include "objectinstance.h"
 #include "scene.h"
 
 using namespace std;
@@ -14,25 +16,37 @@ 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))
+	{
+		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
+void Scene::render(const Tag &tag) const
 {
-	for(set<const Renderable *>::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-		(*i)->render();
-}
+	for(map<const Object *, set<const ObjectInstance *> >::const_iterator i=objects.begin(); i!=objects.end(); ++i)
+		if(i->first->has_pass(tag))
+			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);
+		if((*i)->has_pass(tag))
+			(*i)->render(tag);
 }
 
 } // namespace GL