X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Flayout.h;h=54269bc8b42e1d43e32bb56a9e41591a5d313a89;hb=9b05c573a38639827697fe393d55b7c76f5bde45;hp=f09603de5b00dad0d9ad06178a7e1eef71d98aa0;hpb=f79b3fd58999a73a4a28663b46fdd96c58167a18;p=r2c2.git

diff --git a/source/3d/layout.h b/source/3d/layout.h
index f09603d..54269bc 100644
--- a/source/3d/layout.h
+++ b/source/3d/layout.h
@@ -20,11 +20,15 @@ class Vehicle3D;
 
 class Layout3D: public sigc::trackable
 {
+public:
+	typedef std::map<Track *, Track3D *> TrackMap;
+	typedef std::map<Vehicle *, Vehicle3D *> VehicleMap;
+
 private:
 	Layout &layout;
 	Catalogue3D catalogue;
-	std::list<Track3D *> tracks;
-	std::list<Vehicle3D *> vehicles;
+	TrackMap tracks;
+	VehicleMap vehicles;
 	Msp::GL::Scene scene;
 	Msp::GL::Scene ep_scene;
 	Msp::GL::Scene path_scene;
@@ -37,13 +41,13 @@ public:
 
 	void add_track(Track3D &);
 	void remove_track(Track3D &);
-	const std::list<Track3D *> &get_tracks() const { return tracks; }
+	const TrackMap &get_tracks() const { return tracks; }
 	Track3D &get_track(Track &) const;
 	Track3D *pick_track(float, float, float) const;
 
 	void add_vehicle(Vehicle3D &);
 	void remove_vehicle(Vehicle3D &);
-	Vehicle3D &get_vehicle(const Vehicle &) const;
+	Vehicle3D &get_vehicle(Vehicle &) const;
 
 	Msp::GL::Scene &get_scene() { return scene; }
 	Msp::GL::Scene &get_endpoint_scene() { return ep_scene; }
@@ -53,6 +57,7 @@ private:
 	void track_added(Track &);
 	void track_removed(Track &);
 	void vehicle_added(Vehicle &);
+	void vehicle_removed(Vehicle &);
 };
 
 } // namespace Marklin