X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fcatalogue.cpp;h=4d7b4a83fea5f3835221198004c6b28dd9c80e37;hb=e621dd4120cb253417167b4295e436cee095ccb0;hp=994d5f4d82169aa4dd386471373576a365db7afa;hpb=7e382cc3cad8c4f6945b0c9d89e2ca917b42b740;p=r2c2.git

diff --git a/source/3d/catalogue.cpp b/source/3d/catalogue.cpp
index 994d5f4..4d7b4a8 100644
--- a/source/3d/catalogue.cpp
+++ b/source/3d/catalogue.cpp
@@ -1,33 +1,133 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-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 "signaltype.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_type<GL::Material>().creator(&Catalogue3D::create<GL::Material>);
+	add_type<GL::Mesh>().creator(&Catalogue3D::create<GL::Mesh>);
+	add_type<GL::Object>().creator(&Catalogue3D::create<GL::Object>);
+	add_type<GL::Program>().creator(&Catalogue3D::create<GL::Program>);
+	add_type<GL::Technique>().creator(&Catalogue3D::create<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));
+	catalogue.signal_signal_added.connect(sigc::mem_fun(this, &Catalogue3D::signal_added));
 
-Catalogue3D::Catalogue3D(const Catalogue &c):
-	catalogue(c)
+	const Catalogue::TrackMap &trks = catalogue.get_tracks();
+	for(Catalogue::TrackMap::const_iterator i=trks.begin(); i!=trks.end(); ++i)
+		track_added(*i->second);
+	const Catalogue::SignalMap &sigs = catalogue.get_signals();
+	for(Catalogue::SignalMap::const_iterator i=sigs.begin(); i!=sigs.end(); ++i)
+		signal_added(*i->second);
+
+	build_endpoint_mesh();
+}
+
+Catalogue3D::~Catalogue3D()
 {
-	const map<unsigned, TrackType *> &trks = catalogue.get_tracks();
-	for(map<unsigned, TrackType *>::const_iterator i=trks.begin(); i!=trks.end(); ++i)
-		tracks[i->second] = new TrackType3D(*this, *i->second);
+	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;
+	for(map<const SignalType *, SignalType3D *>::iterator i=signals.begin(); i!=signals.end(); ++i)
+		delete i->second;
 }
 
 const TrackType3D &Catalogue3D::get_track(const TrackType &tt) const
 {
-	map<const TrackType *, TrackType3D *>::const_iterator i = tracks.find(&tt);
-	if(i==tracks.end())
-		throw KeyError("Unknown track type");
+	return *get_item(tracks, &tt);
+}
+
+const VehicleType3D &Catalogue3D::get_vehicle(const VehicleType &vt) const
+{
+	return *get_item(vehicles, &vt);
+}
+
+const SignalType3D &Catalogue3D::get_signal(const SignalType &vt) const
+{
+	return *get_item(signals, &vt);
+}
+
+void Catalogue3D::track_added(const TrackType &track)
+{
+	tracks[&track] = new TrackType3D(*this, track);
+}
+
+void Catalogue3D::vehicle_added(const VehicleType &veh)
+{
+	vehicles[&veh] = new VehicleType3D(*this, veh);
+}
+
+void Catalogue3D::signal_added(const SignalType &sig)
+{
+	signals[&sig] = new SignalType3D(*this, sig);
+}
+
+void Catalogue3D::build_endpoint_mesh()
+{
+	const Profile &ballast_profile = catalogue.get_ballast_profile();
+	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 Vector &rail_min = rail_profile.get_min_coords();
+	const Vector &rail_max = rail_profile.get_max_coords();
+
+	float gauge = catalogue.get_gauge();
+
+	float width = max(max(-ballast_min.x, ballast_max.x)*2, gauge+(rail_max.x-rail_min.x)*2)+0.004;
+	float height = ballast_max.y-ballast_min.y+rail_max.y-rail_min.y+0.01;
+
+	GL::MeshBuilder bld(endpoint_mesh);
+	bld.normal(1, 0, 0);
+	bld.begin(GL::QUADS);
+	bld.vertex(0, width/2, 0);
+	bld.vertex(0, width/2, height);
+	bld.vertex(0, -width/2, height);
+	bld.vertex(0, -width/2, 0);
+	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 runtime_error("Can't locate "+name);
+}
 
-	return *i->second;
+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 Marklin
+} // namespace R2C2