Rearrange texture bind calls to keep them closer to where they're needed

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

diff --git a/source/scene.cpp b/source/scene.cpp
index c28192d407fe529ae2e258700d32243cee654e32..ad9dcd151110724a62581f1a7190de332b3ea86e 100644 (file)
--- a/source/scene.cpp
+++ b/source/scene.cpp
@@ -1,12 +1,7 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include "object.h"
-#include "objectinstance.h"
+#include <msp/datafile/collection.h>
+#include "animatedobject.h"
+#include "camera.h"
+#include "renderer.h"
 #include "scene.h"
 
 using namespace std;
@@ -14,37 +9,72 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-void Scene::add(const Renderable &r)
+Scene::~Scene()
 {
-       if(const ObjectInstance *oi=dynamic_cast<const ObjectInstance *>(&r))
-               objects[&oi->get_object()].insert(oi);
-       else
-               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::render(const Tag &tag) const
 {
-       if(const ObjectInstance *oi=dynamic_cast<const ObjectInstance *>(&r))
-       {
-               map<const Object *, set<const ObjectInstance *> >::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);
+       Renderer renderer(0);
+       render(renderer, tag);
 }
 
-void Scene::render(const Tag &tag) const
+bool Scene::setup_frustum(const Renderer &renderer) const
 {
-       for(map<const Object *, set<const ObjectInstance *> >::const_iterator i=objects.begin(); i!=objects.end(); ++i)
-               i->first->render(i->second.begin(), i->second.end(), tag);
+       const Camera *camera = renderer.get_camera();
+       if(!camera)
+               return false;
+
+       culling_matrix = renderer.get_matrix();
+
+       float y = tan(camera->get_field_of_view()/2.0f);
+       float s = sqrt(y*y+1);
+       frustum_edges[0] = Vector4(0, 1/s, y/s, 0);
+       frustum_edges[1] = Vector4(0, -1/s, y/s, 0);
 
-       for(set<const Renderable *>::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-               (*i)->render(tag);
+       float x = y*camera->get_aspect();
+       s = sqrt(x*x+1);
+       frustum_edges[2] = Vector4(1/s, 0, x/s, 0);
+       frustum_edges[3] = Vector4(-1/s, 0, x/s, 0);
+
+       frustum_edges[4] = Vector4(0, 0, -1, -camera->get_far_clip());
+       frustum_edges[5] = Vector4(0, 0, 1, camera->get_near_clip());
+
+       return true;
+}
+
+bool Scene::frustum_cull(const Renderable &renderable) const
+{
+       const Matrix *matrix = renderable.get_matrix();
+       const Geometry::BoundingSphere<float, 3> *bsphere = renderable.get_bounding_sphere();
+       if(!matrix || !bsphere)
+               return false;
+
+       Vector4 center = culling_matrix*(*matrix*compose(bsphere->get_center(), 1.0f));
+       float radius = bsphere->get_radius();
+
+       for(unsigned i=0; i<6; ++i)
+               if(inner_product(center, frustum_edges[i])>radius)
+                       return true;
+
+       return false;
+}
+
+
+Scene::Loader::Loader(Scene &s, Collection &c):
+       DataFile::CollectionObjectLoader<Scene>(s, &c)
+{
+       add("object", &Loader::object);
+}
+
+void Scene::Loader::object(const string &n)
+{
+       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