/* $Id$
-This file is part of the MSP Märklin suite
+This file is part of R²C²
Copyright © 2010 Mikkosoft Productions, Mikko Rasa
Distributed under the GPL
*/
+#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 "tracktype.h"
#include "vehicletype.h"
using namespace std;
using namespace Msp;
-namespace Marklin {
+namespace R2C2 {
Catalogue3D::Catalogue3D(Catalogue &c):
catalogue(c),
endpoint_mesh((GL::NORMAL3, GL::VERTEX3))
{
+ add_creator<GL::Material>(&Catalogue3D::create<GL::Material>);
+ add_creator<GL::Mesh>(&Catalogue3D::create<GL::Mesh>);
+ add_creator<GL::Object>(&Catalogue3D::create2<GL::Object>);
+ add_creator<GL::Program>(&Catalogue3D::create<GL::Program>);
+ add_creator<GL::Technique>(&Catalogue3D::create2<GL::Technique>);
+
catalogue.signal_track_added.connect(sigc::mem_fun(this, &Catalogue3D::track_added));
catalogue.signal_vehicle_added.connect(sigc::mem_fun(this, &Catalogue3D::vehicle_added));
- const map<unsigned, TrackType *> &trks = catalogue.get_tracks();
- for(map<unsigned, TrackType *>::const_iterator i=trks.begin(); i!=trks.end(); ++i)
+ const Catalogue::TrackMap &trks = catalogue.get_tracks();
+ for(Catalogue::TrackMap::const_iterator i=trks.begin(); i!=trks.end(); ++i)
track_added(*i->second);
- ballast_material.set_diffuse(GL::Color(0.25, 0.25, 0.25));
- rail_material.set_diffuse(GL::Color(0.85, 0.85, 0.85));
-
build_endpoint_mesh();
}
{
for(map<const TrackType *, TrackType3D *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
delete i->second;
+ for(map<const VehicleType *, VehicleType3D *>::iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
+ delete i->second;
}
const TrackType3D &Catalogue3D::get_track(const TrackType &tt) const
bld.end();
}
-} // namespace Marklin
+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 Exception("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