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

diff --git a/source/3d/catalogue.cpp b/source/3d/catalogue.cpp
index 994d5f4..d84e2d0 100644
--- a/source/3d/catalogue.cpp
+++ b/source/3d/catalogue.cpp
@@ -1,33 +1,86 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2010 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
+#include <msp/core/maputils.h>
+#include <msp/gl/meshbuilder.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(const Catalogue &c):
+Catalogue3D::Catalogue3D(Catalogue &c):
 	catalogue(c)
 {
-	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);
+	src.add_directory(".");
+	src.add_directory("data");
+	add_source(src);
+
+	catalogue.signal_object_added.connect(sigc::mem_fun(this, &Catalogue3D::object_added));
+
+	const Catalogue::ObjectMap &objs = catalogue.get_all();
+	for(Catalogue::ObjectMap::const_iterator i=objs.begin(); i!=objs.end(); ++i)
+		object_added(*i->second);
+}
+
+Catalogue3D::~Catalogue3D()
+{
+	for(map<const ObjectType *, ObjectType3D *>::iterator i=objects.begin(); i!=objects.end(); ++i)
+		delete i->second;
+}
+
+void Catalogue3D::object_added(const ObjectType &ot)
+{
+	if(const TrackType *tt = dynamic_cast<const TrackType *>(&ot))
+	{
+		objects[&ot] = new TrackType3D(*this, *tt);
+		const TrackAppearance &appearance = tt->get_appearance();
+		if(!endpoint_meshes.count(&appearance))
+			build_endpoint_mesh(appearance);
+	}
+	else if(const SignalType *st = dynamic_cast<const SignalType *>(&ot))
+		objects[&ot] = new SignalType3D(*this, *st);
+	else if(const VehicleType *vt = dynamic_cast<const VehicleType *>(&ot))
+		objects[&ot] = new VehicleType3D(*this, *vt);
 }
 
-const TrackType3D &Catalogue3D::get_track(const TrackType &tt) const
+const ObjectType3D &Catalogue3D::get_3d(const ObjectType &ot) const
 {
-	map<const TrackType *, TrackType3D *>::const_iterator i = tracks.find(&tt);
-	if(i==tracks.end())
-		throw KeyError("Unknown track type");
+	return *get_item(objects, &ot);
+}
+
+void Catalogue3D::build_endpoint_mesh(const TrackAppearance &appearance)
+{
+	const Profile &ballast_profile = appearance.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 = appearance.get_rail_profile();
+	const Vector &rail_min = rail_profile.get_min_coords();
+	const Vector &rail_max = rail_profile.get_max_coords();
+
+	float gauge = appearance.get_gauge();
 
-	return *i->second;
+	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::Mesh *mesh = new GL::Mesh((GL::NORMAL3, GL::VERTEX3));
+	GL::MeshBuilder bld(*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();
+
+	endpoint_meshes[&appearance] = mesh;
+}
+
+const GL::Mesh &Catalogue3D::get_endpoint_mesh(const TrackAppearance &appearance) const
+{
+	return *get_item(endpoint_meshes, &appearance);
 }
 
-} // namespace Marklin
+} // namespace R2C2