X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Flayout.h;h=f2de127a0cc19d96117b4a63f3fb3be8c042921c;hb=9abaa89f495307c7e90cbef51ae0fedbaff001db;hp=9120af6356b2320018e05b7dadfaf3d1da5fedcd;hpb=48dff17ed3144d944965e7cb534e1f8fb92bd620;p=r2c2.git

diff --git a/source/3d/layout.h b/source/3d/layout.h
index 9120af6..f2de127 100644
--- a/source/3d/layout.h
+++ b/source/3d/layout.h
@@ -8,21 +8,30 @@ Distributed under the GPL
 #ifndef MARKLIN3D_LAYOUT_H_
 #define MARKLIN3D_LAYOUT_H_
 
+#include <sigc++/trackable.h>
 #include <msp/gl/scene.h>
 #include "libmarklin/layout.h"
 #include "catalogue.h"
-#include "track.h"
 
 namespace Marklin {
 
-class Layout3D
+class Track3D;
+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;
+	TrackMap tracks;
+	VehicleMap vehicles;
 	Msp::GL::Scene scene;
 	Msp::GL::Scene ep_scene;
+	Msp::GL::Scene path_scene;
 
 public:
 	Layout3D(Layout &);
@@ -32,16 +41,22 @@ public:
 
 	void add_track(Track3D &);
 	void remove_track(Track3D &);
-	const std::list<Track3D *> &get_tracks() const { return tracks; }
-	Track3D &get_track(const Track &) const;
+	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(Vehicle &) const;
+
 	Msp::GL::Scene &get_scene() { return scene; }
 	Msp::GL::Scene &get_endpoint_scene() { return ep_scene; }
+	Msp::GL::Scene &get_path_scene() { return path_scene; }
 
 private:
 	void track_added(Track &);
 	void track_removed(Track &);
+	void vehicle_added(Vehicle &);
 };
 
 } // namespace Marklin