#include <msp/datafile/objectloader.h>
#include <msp/time/timestamp.h>
#include "block.h"
+#include "geometry.h"
namespace R2C2 {
class Signal;
class Track;
class Train;
-class Vector;
class Vehicle;
class Zone;
public:
Loader(Layout &);
private:
- virtual void finish();
void route();
void route(const std::string &);
void signal(ArticleNumber);
void add_track(Track &);
const std::set<Track *> &get_tracks() const { return tracks; }
- Track *pick_track(const Vector &, const Vector &);
+ Track *pick_track(const Ray &);
void remove_track(Track &);
unsigned allocate_turnout_id();
void add_signal(Signal &);
const std::set<Signal *> &get_signals() const { return signals; }
- Signal *pick_signal(const Vector &, const Vector &);
+ Signal *pick_signal(const Ray &);
void remove_signal(Signal &);
- Object *pick_object(const Vector &, const Vector &);
+ Object *pick_object(const Ray &);
private:
template<typename T>
- static T *pick(const std::set<T *> &, const Vector &, const Vector &);
+ static T *pick(const std::set<T *> &, const Ray &);
public:
void add_block(Block &);