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

diff --git a/source/3d/catalogue.cpp b/source/3d/catalogue.cpp
index 994d5f4..54341c1 100644
--- a/source/3d/catalogue.cpp
+++ b/source/3d/catalogue.cpp
@@ -5,6 +5,7 @@ Copyright © 2010 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
+#include <msp/gl/meshbuilder.h>
 #include "catalogue.h"
 #include "tracktype.h"
 
@@ -13,12 +14,26 @@ using namespace Msp;
 
 namespace Marklin {
 
-Catalogue3D::Catalogue3D(const Catalogue &c):
-	catalogue(c)
+Catalogue3D::Catalogue3D(Catalogue &c):
+	catalogue(c),
+	endpoint_mesh((GL::NORMAL3, GL::VERTEX3))
 {
+	catalogue.signal_track_added.connect(sigc::mem_fun(this, &Catalogue3D::track_added));
+
 	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);
+		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();
+}
+
+Catalogue3D::~Catalogue3D()
+{
+	for(map<const TrackType *, TrackType3D *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+		delete i->second;
 }
 
 const TrackType3D &Catalogue3D::get_track(const TrackType &tt) const
@@ -30,4 +45,34 @@ const TrackType3D &Catalogue3D::get_track(const TrackType &tt) const
 	return *i->second;
 }
 
+void Catalogue3D::track_added(const TrackType &track)
+{
+	tracks[&track] = new TrackType3D(*this, track);
+}
+
+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 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();
+
+	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();
+}
+
 } // namespace Marklin