Add editable terrain objects

[r2c2.git] / source / libr2c2 / layout.h

diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h
index 204a60f6d90b9e64718386cbeb384c3f511fa570..498a45a94f7552ba4c36ddf222e938765d919494 100644 (file)
--- a/source/libr2c2/layout.h
+++ b/source/libr2c2/layout.h
@@ -7,10 +7,12 @@
 #include <msp/time/timestamp.h>
 #include "geometry.h"
 #include "sensor.h"
+#include "clock.h"
 
 namespace R2C2 {
 
 class ArticleNumber;
+class BeamGate;
 class Block;
 class Catalogue;
 class Driver;
@@ -28,18 +30,14 @@ class Layout
 public:
        class Loader: public Msp::DataFile::ObjectLoader<Layout>
        {
-       private:
-               bool new_tracks;
-
        public:
                Loader(Layout &);
        private:
+               void beamgate();
                void route();
-               void route(const std::string &);
                void signal(ArticleNumber);
-               void track(unsigned);
+               void terrain(ArticleNumber);
                void track(ArticleNumber);
-               void train(unsigned, unsigned, const std::string &);
                void train(ArticleNumber, unsigned, const std::string &);
                void turnout(unsigned, unsigned);
                void zone();
@@ -84,13 +82,14 @@ public:
 private:
        Catalogue &catalogue;
        Driver *driver;
+       Clock clock;
        std::string base;
        Storage<Object> objects;
        Storage<TrackChain> track_chains;
        Storage<Sensor> sensors;
        std::map<unsigned, Train *> trains;
        Msp::Time::TimeStamp last_tick;
-       unsigned next_turnout_id;
+       unsigned next_turnout_addr;
 
 public:
        Layout(Catalogue &, Driver * = 0);
@@ -99,6 +98,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; }
        const std::string &get_base() const { return base; }
 
        void add(Object &);
@@ -106,6 +106,7 @@ public:
        void add(TrackChain &);
        void add(Block &);
        void add(Sensor &);
+       void add(BeamGate &);
 
        template<typename T>
        const std::set<T *> &get_all() const;
@@ -117,8 +118,9 @@ public:
        void remove(Track &);
        void remove(TrackChain &);
        void remove(Sensor &);
+       void remove(BeamGate &);
 
-       unsigned allocate_turnout_id();
+       unsigned allocate_turnout_address();
 
        Block &get_block(unsigned) const;
        void create_blocks();