Allow copying of Uniforms and ProgramData

[libs/gl.git] / source / scene.cpp

diff --git a/source/scene.cpp b/source/scene.cpp
index 59f3041187d29a13b40315a4f3a0eaf70e3fc5f9..28b794b035c5b3da61bf4cd9e92363607a5b771a 100644 (file)
--- a/source/scene.cpp
+++ b/source/scene.cpp
@@ -9,8 +9,6 @@ Distributed under the LGPL
 #include "objectinstance.h"
 #include "scene.h"
 
-using namespace std;
-
 namespace Msp {
 namespace GL {
 
@@ -26,7 +24,7 @@ void Scene::remove(const Renderable &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