Add support for integer vertex attributes

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

diff --git a/source/render/scene.cpp b/source/render/scene.cpp
index c0a4e1c517cb5306de1a073147ae83bbaf33eb5d..3c101b8a172cdba1fc421eecc5a182946bb3f308 100644 (file)
--- a/source/render/scene.cpp
+++ b/source/render/scene.cpp
@@ -1,6 +1,8 @@
 #include <msp/datafile/collection.h>
+#include <msp/fs/utils.h>
 #include "camera.h"
 #include "objectinstance.h"
+#include "occludedscene.h"
 #include "orderedscene.h"
 #include "renderer.h"
 #include "scene.h"
@@ -12,19 +14,13 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Scene::~Scene()
-{
-       for(vector<Renderable *>::iterator i=owned_data.begin(); i!=owned_data.end(); ++i)
-               delete *i;
-}
-
 bool Scene::setup_frustum(const Renderer &renderer) const
 {
        const Camera *camera = renderer.get_camera();
        if(!camera)
                return false;
 
-       culling_matrix = renderer.get_matrix();
+       culling_matrix = camera->get_view_matrix()*renderer.get_matrix();
 
        if(camera->is_orthographic())
        {
@@ -86,8 +82,7 @@ Scene::SceneRegistry &Scene::get_scene_registry()
                register_type<SimpleScene>("simple");
                register_type<ZSortedScene>("zsorted");
                register_type<OrderedScene>("ordered");
-               // TODO OccludedScene requires a collection as a constructor parameter
-               //register_type<OccludedScene>("occluded");
+               register_type<OccludedScene>("occluded");
        }
        return registry;
 }
@@ -109,6 +104,8 @@ Scene::Loader::Loader(Scene &s, Collection &c, ContentMap &m):
 
 void Scene::Loader::init()
 {
+       inst_counter = 0;
+
        add("object", &Loader::object);
        add("object", &Loader::object_tagged);
        add("scene", &Loader::scene);
@@ -123,10 +120,10 @@ void Scene::Loader::object_tagged(const string &n, const string &t)
 {
        RefPtr<ObjectInstance> inst = new ObjectInstance(get_collection().get<GL::Object>(n));
        load_sub(*inst);
-       obj.add(*inst);
+       get_collection().add(format("%s/%d.inst", FS::basename(get_source()), inst_counter++), inst.get());
        if(content && !t.empty())
                (*content)[t] = inst.get();
-       obj.owned_data.push_back(inst.release());
+       obj.add(*inst.release());
 }
 
 void Scene::Loader::scene(const string &n)