#include <msp/datafile/collection.h>
+#include <msp/fs/utils.h>
+#include <msp/strings/format.h>
#include "camera.h"
#include "objectinstance.h"
+#include "occludedscene.h"
#include "orderedscene.h"
#include "renderer.h"
#include "scene.h"
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())
{
return false;
}
-Scene::SceneRegistry &Scene::get_scene_registry()
+Scene::GenericLoader::TypeRegistry &Scene::get_scene_registry()
{
- static SceneRegistry registry;
+ static Scene::GenericLoader::TypeRegistry registry;
static bool initialized = false;
if(!initialized)
{
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;
}
-Scene::Loader::Loader(Scene &s, Collection &c):
- DataFile::CollectionObjectLoader<Scene>(s, &c),
- content(0)
-{
- init();
-}
-
-Scene::Loader::Loader(Scene &s, Collection &c, ContentMap &m):
+Scene::Loader::Loader(Scene &s, Collection &c, ContentMap *m):
DataFile::CollectionObjectLoader<Scene>(s, &c),
- content(&m)
-{
- init();
-}
-
-void Scene::Loader::init()
+ content(m),
+ inst_counter(0)
{
add("object", &Loader::object);
add("object", &Loader::object_tagged);
{
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)
obj.add(get_collection().get<Scene>(n));
}
-
-DataFile::Loader::ActionMap Scene::GenericLoader::shared_actions;
-
-Scene::GenericLoader::GenericLoader(DataFile::Collection &c):
- coll(c),
- scene(0),
- scene_loader(0)
-{
- set_actions(shared_actions);
-}
-
-Scene::GenericLoader::~GenericLoader()
-{
- delete scene;
- delete scene_loader;
-}
-
-void Scene::GenericLoader::init_actions()
-{
- add("type", &GenericLoader::type);
-}
-
-void Scene::GenericLoader::type(const DataFile::Symbol &sym)
-{
- get_scene_registry().invoke(sym.name, *this);
-}
-
} // namespace GL
} // namespace Msp