#include <msp/core/maputils.h>
-#include <msp/fs/stat.h>
#include <msp/gl/meshbuilder.h>
-#include <msp/gl/object.h>
-#include <msp/gl/program.h>
-#include <msp/gl/technique.h>
#include "catalogue.h"
#include "signaltype.h"
#include "tracktype.h"
Catalogue3D::Catalogue3D(Catalogue &c):
catalogue(c)
{
- add_type<GL::Material>().creator(&Catalogue3D::create<GL::Material>);
- add_type<GL::Mesh>().creator(&Catalogue3D::create<GL::Mesh>);
- add_type<GL::Object>().creator(&Catalogue3D::create2<GL::Object>);
- add_type<GL::Program>().creator(&Catalogue3D::create<GL::Program>);
- add_type<GL::Technique>().creator(&Catalogue3D::create2<GL::Technique>);
+ src.add_directory(".");
+ src.add_directory("data");
+ add_source(src);
catalogue.signal_object_added.connect(sigc::mem_fun(this, &Catalogue3D::object_added));
return *get_item(endpoint_meshes, &appearance);
}
-FS::Path Catalogue3D::locate_file(const string &name)
-{
- if(FS::exists(name))
- return name;
-
- FS::Path path = FS::Path("data")/name;
- if(FS::exists(path))
- return path;
-
- throw runtime_error("Can't locate "+name);
-}
-
-template<typename T>
-T *Catalogue3D::create(const string &name)
-{
- RefPtr<T> obj = new T;
- DataFile::load(*obj, locate_file(name).str());
- return obj.release();
-}
-
-template<typename T>
-T *Catalogue3D::create2(const string &name)
-{
- RefPtr<T> obj = new T;
- DataFile::load(*obj, locate_file(name).str(), *this);
- return obj.release();
-}
-
} // namespace R2C2