Render tracks through GL::Objects

[r2c2.git] / source / 3d / catalogue.cpp

diff --git a/source/3d/catalogue.cpp b/source/3d/catalogue.cpp
index 1068feafdfa87a1933c538e06d5921049107a9b5..c3b9e1f3693fdafa18ab4b326090a7f67586c6c5 100644 (file)
--- a/source/3d/catalogue.cpp
+++ b/source/3d/catalogue.cpp
@@ -1,12 +1,15 @@
 /* $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 "libmarklin/locotype.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"
@@ -14,22 +17,25 @@ Distributed under the GPL
 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_loco_added.connect(sigc::mem_fun(this, &Catalogue3D::loco_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();
 }
 
@@ -37,6 +43,8 @@ Catalogue3D::~Catalogue3D()
 {
        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
@@ -62,9 +70,9 @@ void Catalogue3D::track_added(const TrackType &track)
        tracks[&track] = new TrackType3D(*this, track);
 }
 
-void Catalogue3D::loco_added(const LocoType &loco)
+void Catalogue3D::vehicle_added(const VehicleType &veh)
 {
-       vehicles[&loco] = new VehicleType3D(*this, loco);
+       vehicles[&veh] = new VehicleType3D(*this, veh);
 }
 
 void Catalogue3D::build_endpoint_mesh()
@@ -92,4 +100,32 @@ void Catalogue3D::build_endpoint_mesh()
        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