X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.h;h=2211de04987b031eb58fc83c4e289aae35140abb;hb=d0881a98a6240758ac1aeceaa9443d718ab1ad5c;hp=26df423ed731b3f461f912ee04b4c57e19fde08e;hpb=c4daf1cc6b53cae34e46d4125a993ceed500de1a;p=r2c2.git diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h index 26df423..2211de0 100644 --- a/source/libr2c2/layout.h +++ b/source/libr2c2/layout.h @@ -1,9 +1,11 @@ #ifndef LIBR2C2_LAYOUT_H_ #define LIBR2C2_LAYOUT_H_ +#include #include #include #include +#include #include #include "geometry.h" #include "sensor.h" @@ -30,18 +32,18 @@ class Layout public: class Loader: public Msp::DataFile::ObjectLoader { - private: - bool new_tracks; - public: Loader(Layout &); private: void beamgate(); + void clock(); void route(); - void signal(ArticleNumber); - void track(ArticleNumber); - void train(ArticleNumber, unsigned, const std::string &); - void turnout(unsigned, unsigned); + void signal(const std::string &); + void terrain(const std::string &); + void track(const std::string &); + void train(const std::string &, unsigned, const std::string &); + void turnout(unsigned); + void turnout2(unsigned, unsigned); void zone(); }; @@ -79,7 +81,7 @@ public: sigc::signal signal_train_removed; sigc::signal signal_block_reserved; sigc::signal signal_sensor_state_changed; - sigc::signal signal_emergency; + sigc::signal signal_emergency; private: Catalogue &catalogue; @@ -91,7 +93,7 @@ private: Storage sensors; std::map trains; Msp::Time::TimeStamp last_tick; - unsigned next_turnout_id; + unsigned next_turnout_addr; public: Layout(Catalogue &, Driver * = 0); @@ -100,7 +102,7 @@ public: Catalogue &get_catalogue() const { return catalogue; } bool has_driver() const { return driver; } Driver &get_driver() const; - const Clock &get_clock() const { return clock; } + Clock &get_clock() { return clock; } const std::string &get_base() const { return base; } void add(Object &); @@ -122,7 +124,7 @@ public: void remove(Sensor &); void remove(BeamGate &); - unsigned allocate_turnout_id(); + unsigned allocate_turnout_address(); Block &get_block(unsigned) const; void create_blocks(); @@ -139,8 +141,11 @@ public: const std::map &get_trains() const { return trains; } void remove_train(Train &); - void tick(); - void emergency(const std::string &); + void tick(float = 1.0f); +private: + void step(const Msp::Time::TimeDelta &); +public: + void emergency(Block *, const std::string &); void save(const std::string &) const; void save_dynamic(const std::string &) const;