X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fscene.cpp;h=517158f056108943a7c6a2c47902e194799f5348;hb=4edd75061a1e24572bd672fb72e1bc1838008ce7;hp=2ef2ea786cbe0428ee087f52ca8cd5f0e64410b1;hpb=4324df6e3d807d35e02e828320e436c509275520;p=libs%2Fgl.git

diff --git a/source/scene.cpp b/source/scene.cpp
index 2ef2ea78..517158f0 100644
--- 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,27 +7,36 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-void Scene::add(const Renderable &r)
+void Scene::add_culler(Culler &c)
+{
+	cullers.push_back(&c);
+}
+
+void Scene::remove_culler(Culler &c)
 {
-	renderables.insert(&r);
+	list<Culler *>::iterator i = find(cullers.begin(), cullers.end(), &c);
+	if(i!=cullers.end())
+		cullers.erase(i);
 }
 
-void Scene::remove(const Renderable &r)
+void Scene::render(const Tag &tag) const
 {
-	renderables.erase(&r);
+	Renderer renderer(0);
+	render(renderer, tag);
 }
 
-void Scene::render() const
+void Scene::setup_cullers(const Renderer &renderer) const
 {
-	for(set<const Renderable *>::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-		(*i)->render();
+	for(list<Culler *>::const_iterator i=cullers.begin(); i!=cullers.end(); ++i)
+		(*i)->setup_frame(renderer);
 }
 
-void Scene::render(const string &pn) const
+bool Scene::cull(const Renderer &renderer, const Renderable &renderable) const
 {
-	for(set<const Renderable *>::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-		if((*i)->has_pass(pn))
-			(*i)->render(pn);
+	for(list<Culler *>::const_iterator i=cullers.begin(); i!=cullers.end(); ++i)
+		if((*i)->cull(renderer, renderable))
+			return true;
+	return false;
 }
 
 } // namespace GL