Distributed under the LGPL
*/
+#include "object.h"
+#include "objectinstance.h"
#include "scene.h"
-using namespace std;
-
namespace Msp {
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))
+ {
+ ObjectMap::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 Tag &tag) const
{
- for(set<const Renderable *, Compare>::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
- if((*i)->has_pass(tag))
- (*i)->render(tag);
-}
+ for(ObjectMap::const_iterator i=objects.begin(); i!=objects.end(); ++i)
+ i->first->render(i->second.begin(), i->second.end(), tag);
-
-bool Scene::Compare::operator()(const Renderable *a, const Renderable *b) const
-{
- if(a->get_order()!=b->get_order())
- return a->get_order()<b->get_order();
- return a<b;
+ for(RenderableSet::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
+ (*i)->render(tag);
}
} // namespace GL