Minor fixes, courtesy of Apple's compiler

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

diff --git a/source/scene.cpp b/source/scene.cpp
index 607166d5d32f285e35879ff62134891a9c8e5a42..3f0261f4d467af0c3bad85d1d01a572b51346420 100644 (file)
--- a/source/scene.cpp
+++ b/source/scene.cpp
@@ -1,10 +1,5 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#include "culler.h"
+#include "renderer.h"
 #include "scene.h"
 
 using namespace std;
@@ -12,29 +7,36 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-void Scene::add(const Renderable &r)
+void Scene::add_culler(Culler &c)
 {
-       renderables.insert(&r);
+       cullers.push_back(&c);
 }
 
-void Scene::remove(const Renderable &r)
+void Scene::remove_culler(Culler &c)
 {
-       renderables.erase(&r);
+       list<Culler *>::iterator i = find(cullers.begin(), cullers.end(), &c);
+       if(i!=cullers.end())
+               cullers.erase(i);
 }
 
 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);
+       Renderer renderer(0);
+       render(renderer, tag);
 }
 
+void Scene::setup_cullers(const Renderer &renderer) const
+{
+       for(list<Culler *>::const_iterator i=cullers.begin(); i!=cullers.end(); ++i)
+               (*i)->setup_pass(renderer);
+}
 
-bool Scene::Compare::operator()(const Renderable *a, const Renderable *b) const
+bool Scene::cull(const Renderer &renderer, const Renderable &renderable) const
 {
-       if(a->get_order()!=b->get_order())
-               return a->get_order()<b->get_order();
-       return a<b;
+       for(list<Culler *>::const_iterator i=cullers.begin(); i!=cullers.end(); ++i)
+               if((*i)->cull(renderer, renderable))
+                       return true;
+       return false;
 }
 
 } // namespace GL