Rename Point to Vector

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

diff --git a/source/3d/catalogue.cpp b/source/3d/catalogue.cpp
index 8641013fe3559256a052644267aaf77d7e0869b7..3f3aa6cfd1590632fb7f2be3f48873ced9e63644 100644 (file)
--- a/source/3d/catalogue.cpp
+++ b/source/3d/catalogue.cpp
@@ -1,11 +1,15 @@
 /* $Id$
 
 This file is part of R²C²
-Copyright © 2010 Mikkosoft Productions, Mikko Rasa
+Copyright © 2010-2011  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"
@@ -19,6 +23,12 @@ 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));
 
@@ -26,9 +36,6 @@ Catalogue3D::Catalogue3D(Catalogue &c):
        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();
 }
 
@@ -71,12 +78,12 @@ void Catalogue3D::vehicle_added(const VehicleType &veh)
 void Catalogue3D::build_endpoint_mesh()
 {
        const Profile &ballast_profile = catalogue.get_ballast_profile();
-       const Point &ballast_min = ballast_profile.get_min_coords();
-       const Point &ballast_max = ballast_profile.get_max_coords();
+       const Vector &ballast_min = ballast_profile.get_min_coords();
+       const Vector &ballast_max = ballast_profile.get_max_coords();
 
        const Profile &rail_profile = catalogue.get_rail_profile();
-       const Point &rail_min = rail_profile.get_min_coords();
-       const Point &rail_max = rail_profile.get_max_coords();
+       const Vector &rail_min = rail_profile.get_min_coords();
+       const Vector &rail_max = rail_profile.get_max_coords();
 
        float gauge = catalogue.get_gauge();
 
@@ -93,4 +100,32 @@ void Catalogue3D::build_endpoint_mesh()
        bld.end();
 }
 
+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