X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Flayout.h;h=8456fa8e7404d62fbcec19a0792e3b35cc56e56a;hb=d2dfed1a38c5e8487532e9055fad464cf54efd83;hp=76f1b91d7a3c21ee577c183c732f28151415df5e;hpb=d15ac13f2e170f155b4bbd124df48400c339b644;p=r2c2.git

diff --git a/source/3d/layout.h b/source/3d/layout.h
index 76f1b91..8456fa8 100644
--- a/source/3d/layout.h
+++ b/source/3d/layout.h
@@ -11,7 +11,7 @@
 
 namespace R2C2 {
 
-class Object3D;
+class Signal3D;
 class Track3D;
 class Vehicle3D;
 
@@ -20,12 +20,14 @@ class Layout3D: public sigc::trackable
 public:
 	typedef std::map<Track *, Track3D *> TrackMap;
 	typedef std::map<Vehicle *, Vehicle3D *> VehicleMap;
+	typedef std::map<Signal *, Signal3D *> SignalMap;
 
 private:
 	Layout &layout;
 	Catalogue3D catalogue;
 	TrackMap tracks;
 	VehicleMap vehicles;
+	SignalMap signals;
 	Msp::GL::InstanceScene scene;
 	Msp::GL::SimpleScene ep_scene;
 	Msp::GL::InstanceScene path_scene;
@@ -49,16 +51,18 @@ public:
 	void remove_vehicle(Vehicle3D &);
 	Vehicle3D &get_vehicle(Vehicle &) const;
 
+	void add_signal(Signal3D &);
+	void remove_signal(Signal3D &);
+	Signal3D &get_signal(Signal &) 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; }
 	const Msp::GL::Lighting &get_lighting() const { return lighting; }
 
 private:
-	void track_added(Track &);
-	void track_removed(Track &);
-	void vehicle_added(Vehicle &);
-	void vehicle_removed(Vehicle &);
+	void object_added(Object &);
+	void object_removed(Object &);
 };
 
 } // namespace R2C2