X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fcatalogue.h;h=ecac7ddca27b97ca05ac3a71c8c37fecdb0fd56f;hb=e621dd4120cb253417167b4295e436cee095ccb0;hp=caf104e5ef146bcb9ec844dd963037bf41294ab7;hpb=8dce175e31941c2f6e92ce52204e9b61a071d4f9;p=r2c2.git

diff --git a/source/3d/catalogue.h b/source/3d/catalogue.h
index caf104e..ecac7dd 100644
--- a/source/3d/catalogue.h
+++ b/source/3d/catalogue.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2010 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #ifndef R2C2_3D_CATALOGUE_H_
 #define R2C2_3D_CATALOGUE_H_
 
@@ -16,6 +9,7 @@ Distributed under the GPL
 
 namespace R2C2 {
 
+class SignalType3D;
 class TrackType3D;
 class VehicleType3D;
 
@@ -25,8 +19,7 @@ private:
 	Catalogue &catalogue;
 	std::map<const TrackType *, TrackType3D *> tracks;
 	std::map<const VehicleType *, VehicleType3D *> vehicles;
-	Msp::GL::Material ballast_material;
-	Msp::GL::Material rail_material;
+	std::map<const SignalType *, SignalType3D *> signals;
 	Msp::GL::Mesh endpoint_mesh;
 
 public:
@@ -36,12 +29,12 @@ public:
 	const Catalogue &get_catalogue() const { return catalogue; }
 	const TrackType3D &get_track(const TrackType &) const;
 	const VehicleType3D &get_vehicle(const VehicleType &) const;
-	const Msp::GL::Material &get_ballast_material() const { return ballast_material; }
-	const Msp::GL::Material &get_rail_material() const { return rail_material; }
+	const SignalType3D &get_signal(const SignalType &) const;
 	const Msp::GL::Mesh &get_endpoint_mesh() const { return endpoint_mesh; }
 private:
 	void track_added(const TrackType &);
 	void vehicle_added(const VehicleType &);
+	void signal_added(const SignalType &);
 	void build_endpoint_mesh();
 
 	Msp::FS::Path locate_file(const std::string &);