}
}
-Track *Layout::pick_track(const Vector &start, const Vector &ray)
+Track *Layout::pick_track(const Ray &ray)
{
- return pick(tracks, start, ray);
+ return pick(tracks, ray);
}
void Layout::remove_track(Track &t)
signal_signal_added.emit(s);
}
-Signal *Layout::pick_signal(const Vector &start, const Vector &ray)
+Signal *Layout::pick_signal(const Ray &ray)
{
- return pick(signals, start, ray);
+ return pick(signals, ray);
}
void Layout::remove_signal(Signal &s)
signal_signal_removed.emit(s);
}
-Object *Layout::pick_object(const Vector &start, const Vector &ray)
+Object *Layout::pick_object(const Ray &ray)
{
- if(Object *obj = pick_track(start, ray))
+ if(Object *obj = pick_track(ray))
return obj;
- else if((obj = pick_signal(start, ray)))
+ else if((obj = pick_signal(ray)))
return obj;
return 0;
}
template<typename T>
-T *Layout::pick(const set<T *> &objs, const Vector &start, const Vector &ray)
+T *Layout::pick(const set<T *> &objs, const Ray &ray)
{
for(typename set<T *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
- if((*i)->collide_ray(start, ray))
+ if((*i)->collide_ray(ray))
return *i;
return 0;
add("train", static_cast<void (Loader::*)(unsigned, unsigned, const std::string &)>(&Loader::train));
}
-void Layout::Loader::finish()
-{
- for(set<Track *>::iterator i=obj.tracks.begin(); i!=obj.tracks.end(); ++i)
- (*i)->check_slope();
-}
-
void Layout::Loader::route()
{
Route *rte = new Route(obj);