X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Flayout.h;h=1e189bd1ce0eedd88a0541672e9d58f60e6f6efc;hb=e621dd4120cb253417167b4295e436cee095ccb0;hp=6dbdb7bcb62ebd760c970a35c7b0a376d0d4b289;hpb=495c54e187ddbb7514c983e1829a69d82ccad5f3;p=r2c2.git

diff --git a/source/3d/layout.h b/source/3d/layout.h
index 6dbdb7b..1e189bd 100644
--- a/source/3d/layout.h
+++ b/source/3d/layout.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2011 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #ifndef R2C2_3D_LAYOUT_H_
 #define R2C2_3D_LAYOUT_H_
 
@@ -18,7 +11,7 @@ Distributed under the GPL
 
 namespace R2C2 {
 
-class Object3D;
+class Signal3D;
 class Track3D;
 class Vehicle3D;
 
@@ -27,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;
@@ -56,6 +51,10 @@ 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; }
@@ -66,6 +65,8 @@ private:
 	void track_removed(Track &);
 	void vehicle_added(Vehicle &);
 	void vehicle_removed(Vehicle &);
+	void signal_added(Signal &);
+	void signal_removed(Signal &);
 };
 
 } // namespace R2C2