Always update program uniforms if uniform names have changed

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

diff --git a/source/scene.cpp b/source/scene.cpp
index 607166d5d32f285e35879ff62134891a9c8e5a42..f233a09b31ea39324324db15c11586b789e8be99 100644 (file)
--- a/source/scene.cpp
+++ b/source/scene.cpp
@@ -1,10 +1,7 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#include <msp/datafile/collection.h>
+#include "animatedobject.h"
+#include "culler.h"
+#include "renderer.h"
 #include "scene.h"
 
 using namespace std;
@@ -12,29 +9,57 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-void Scene::add(const Renderable &r)
+Scene::~Scene()
 {
-       renderables.insert(&r);
+       for(list<Renderable *>::iterator i=owned_data.begin(); i!=owned_data.end(); ++i)
+               delete *i;
 }
 
-void Scene::remove(const Renderable &r)
+void Scene::add_culler(Culler &c)
 {
-       renderables.erase(&r);
+       cullers.push_back(&c);
+}
+
+void Scene::remove_culler(Culler &c)
+{
+       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::cull(const Renderer &renderer, const Renderable &renderable) const
+{
+       for(list<Culler *>::const_iterator i=cullers.begin(); i!=cullers.end(); ++i)
+               if((*i)->cull(renderer, renderable))
+                       return true;
+       return false;
 }
 
 
-bool Scene::Compare::operator()(const Renderable *a, const Renderable *b) const
+Scene::Loader::Loader(Scene &s, Collection &c):
+       DataFile::CollectionObjectLoader<Scene>(s, &c)
+{
+       add("object", &Loader::object);
+}
+
+void Scene::Loader::object(const string &n)
 {
-       if(a->get_order()!=b->get_order())
-               return a->get_order()<b->get_order();
-       return a<b;
+       RefPtr<AnimatedObject> anob = new AnimatedObject(get_collection().get<GL::Object>(n));
+       load_sub(*anob);
+       obj.add(*anob);
+       obj.owned_data.push_back(anob.release());
 }
 
 } // namespace GL