Use DSA for binding textures if available

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

diff --git a/source/instancescene.cpp b/source/instancescene.cpp
index e3e63767243a1a88ba1ea98655bb480b6ad4584b..b533bae5fac75e843bf23604004e7169676a0513 100644 (file)
--- a/source/instancescene.cpp
+++ b/source/instancescene.cpp
@@ -1,48 +1,56 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2008, 2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "object.h"
 #include "objectinstance.h"
 #include "instancescene.h"
+#include "renderer.h"
 
 namespace Msp {
 namespace GL {
 
-void InstanceScene::add(const Renderable &r)
+void InstanceScene::add(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)
+void InstanceScene::remove(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(const Tag &tag) const
+void InstanceScene::setup_frame(Renderer &renderer)
+{
+       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)->setup_frame(renderer);
+}
+
+void InstanceScene::finish_frame()
 {
-       for(ObjectMap::const_iterator i=objects.begin(); i!=objects.end(); ++i)
-               i->first->render(i->second.begin(), i->second.end(), tag);
+       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)->finish_frame();
+}
 
-       for(RenderableSet::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-               (*i)->render(tag);
+void InstanceScene::render(Renderer &renderer, const Tag &tag) const
+{
+       if(setup_frustum(renderer))
+       {
+               for(InstanceMap::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
+                       for(RenderableSet::const_iterator j=i->second.begin(); j!=i->second.end(); ++j)
+                               if(!frustum_cull(**j))
+                                       renderer.render(**j, tag);
+       }
+       else
+       {
+               for(InstanceMap::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
+                       for(RenderableSet::const_iterator j=i->second.begin(); j!=i->second.end(); ++j)
+                               renderer.render(**j, tag);
+       }
 }
 
 } // namespace GL