Generalize instancing to all Renderables

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

diff --git a/source/instancescene.cpp b/source/instancescene.cpp
index adaebbba3ef364b34522df0a49dad2802c990b2f..fb99dda881f83ca8630a4cfcba36e42b3ca5a51a 100644 (file)
--- a/source/instancescene.cpp
+++ b/source/instancescene.cpp
@@ -15,37 +15,25 @@ namespace GL {
 
 void InstanceScene::add(const Renderable &r)
 {
-       if(const ObjectInstance *oi = dynamic_cast<const ObjectInstance *>(&r))
-               objects[&oi->get_object()].insert(oi);
-       else
-               renderables.insert(&r);
+       renderables[r.get_instance_key()].insert(&r);
 }
 
 void InstanceScene::remove(const Renderable &r)
 {
-       if(const ObjectInstance *oi = dynamic_cast<const ObjectInstance *>(&r))
+       InstanceMap::iterator i = renderables.find(r.get_instance_key());
+       if(i!=renderables.end())
        {
-               ObjectMap::iterator i = objects.find(&oi->get_object());
-               if(i!=objects.end())
-               {
-                       i->second.erase(oi);
-                       if(i->second.empty())
-                               objects.erase(i);
-               }
+               i->second.erase(&r);
+               if(i->second.empty())
+                       renderables.erase(i);
        }
-       else
-               renderables.erase(&r);
 }
 
 void InstanceScene::render(Renderer &renderer, const Tag &tag) const
 {
-       // XXX Check that the object has this pass to avoid some unnecessary function calls
-       for(ObjectMap::const_iterator i=objects.begin(); i!=objects.end(); ++i)
-               for(InstanceSet::const_iterator j=i->second.begin(); j!=i->second.end(); ++j)
+       for(InstanceMap::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
+               for(RenderableSet::const_iterator j=i->second.begin(); j!=i->second.end(); ++j)
                        (*j)->render(renderer, tag);
-
-       for(RenderableSet::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-               (*i)->render(renderer, tag);
 }
 
 } // namespace GL