+ s.signal_state_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Layout::sensor_state_changed), sigc::ref(s)));
+ s.signal_state_changed.connect(sigc::bind<0>(signal_sensor_state_changed, sigc::ref(s)));
+ }
+}
+
+void Layout::add(BeamGate &g)
+{
+ add(static_cast<Object &>(g));
+ add(static_cast<Sensor &>(g));
+}
+
+template<>
+const set<Object *> &Layout::get_all<Object>() const
+{
+ return objects.get();
+}
+
+template<>
+const set<Track *> &Layout::get_all<Track>() const
+{
+ return objects.get<Track>();
+}
+
+template<>
+const set<Signal *> &Layout::get_all<Signal>() const
+{
+ return objects.get<Signal>();
+}
+
+template<>
+const set<Vehicle *> &Layout::get_all<Vehicle>() const
+{
+ return objects.get<Vehicle>();
+}
+
+template<>
+const set<Terrain *> &Layout::get_all<Terrain>() const
+{
+ return objects.get<Terrain>();
+}
+
+template<>
+const set<TrackChain *> &Layout::get_all<TrackChain>() const
+{
+ return track_chains.get();
+}
+
+template<>
+const set<Block *> &Layout::get_all<Block>() const
+{
+ return track_chains.get<Block>();
+}
+
+template<>
+const set<Route *> &Layout::get_all<Route>() const
+{
+ return track_chains.get<Route>();
+}
+
+template<>
+const set<Zone *> &Layout::get_all<Zone>() const
+{
+ return track_chains.get<Zone>();
+}
+
+template<>
+const set<Sensor *> &Layout::get_all<Sensor>() const
+{
+ return sensors.get<Sensor>();
+}
+
+template<>
+const set<TrackCircuit *> &Layout::get_all<TrackCircuit>() const
+{
+ return sensors.get<TrackCircuit>();
+}
+
+template<>
+const set<BeamGate *> &Layout::get_all<BeamGate>() const
+{
+ return sensors.get<BeamGate>();
+}
+
+template<typename T>
+T *Layout::pick(const Ray &ray)
+{
+ const set<Object *> &objs = objects.get();
+ T *closest = 0;
+ float distance = -1;
+ for(set<Object *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
+ if(T *t = dynamic_cast<T *>(*i))
+ {
+ float d = -1;
+ if(t->collide_ray(ray, &d))
+ if(!closest || d<distance)
+ {
+ closest = t;
+ distance = d;
+ }
+ }
+
+ return closest;
+}
+
+template Object *Layout::pick<Object>(const Ray &);
+template Track *Layout::pick<Track>(const Ray &);
+template Signal *Layout::pick<Signal>(const Ray &);
+template Vehicle *Layout::pick<Vehicle>(const Ray &);
+
+void Layout::remove(Object &o)
+{
+ if(objects.erase(o))
+ signal_object_removed.emit(o);
+}
+
+void Layout::remove(Track &t)
+{
+ if(objects.erase(t))
+ {
+ // Blocks must be recreated first