X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fscene.cpp;h=1e72d5dca36285f5664eb8151668fb107a5d0a0e;hb=b617c5d7b5283ad260a77f01e42e6170cabbc03d;hp=59f3041187d29a13b40315a4f3a0eaf70e3fc5f9;hpb=b8b06a0ff96763ba7e188d9fcacbd8c0e3dcd515;p=libs%2Fgl.git

diff --git a/source/scene.cpp b/source/scene.cpp
index 59f30411..1e72d5dc 100644
--- a/source/scene.cpp
+++ b/source/scene.cpp
@@ -9,14 +9,12 @@ Distributed under the LGPL
 #include "objectinstance.h"
 #include "scene.h"
 
-using namespace std;
-
 namespace Msp {
 namespace GL {
 
 void Scene::add(const Renderable &r)
 {
-	if(const ObjectInstance *oi=dynamic_cast<const ObjectInstance *>(&r))
+	if(const ObjectInstance *oi = dynamic_cast<const ObjectInstance *>(&r))
 		objects[&oi->get_object()].insert(oi);
 	else
 		renderables.insert(&r);
@@ -24,9 +22,9 @@ void Scene::add(const Renderable &r)
 
 void Scene::remove(const Renderable &r)
 {
-	if(const ObjectInstance *oi=dynamic_cast<const ObjectInstance *>(&r))
+	if(const ObjectInstance *oi = dynamic_cast<const ObjectInstance *>(&r))
 	{
-		map<const Object *, set<const ObjectInstance *> >::iterator i=objects.find(&oi->get_object());
+		ObjectMap::iterator i = objects.find(&oi->get_object());
 		if(i!=objects.end())
 		{
 			i->second.erase(oi);
@@ -40,13 +38,11 @@ void Scene::remove(const Renderable &r)
 
 void Scene::render(const Tag &tag) const
 {
-	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);
+	for(ObjectMap::const_iterator i=objects.begin(); i!=objects.end(); ++i)
+		i->first->render(i->second.begin(), i->second.end(), tag);
 
-	for(set<const Renderable *>::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-		if((*i)->has_pass(tag))
-			(*i)->render(tag);
+	for(RenderableSet::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
+		(*i)->render(tag);
 }
 
 } // namespace GL