Take z coordinate into account when computing points on tracks

[r2c2.git] / source / libmarklin / train.h

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index e749a8336a09de542d0b6f0d3815b0f9437d121d..bacb246f4dfd5f68a4dee346aa92abf5a85bebcf 100644 (file)
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -16,8 +16,10 @@ Distributed under the GPL
 namespace Marklin {
 
 class Locomotive;
+class Route;
 class Sensor;
 class TrafficManager;
+class Turnout;
 
 class Train: public sigc::trackable
 {
@@ -26,10 +28,13 @@ public:
        {
        public:
                Loader(Train &);
+       private:
+               void real_speed(unsigned, float, float);
        };
 
        sigc::signal<void, const std::string &> signal_name_changed;
        sigc::signal<void, unsigned> signal_target_speed_changed;
+       sigc::signal<void, const Route *> signal_route_changed;
        sigc::signal<void, const std::string &> signal_status_changed;
 
 private:
@@ -41,12 +46,23 @@ private:
                BlockRef(Block *s, unsigned e): block(s), entry(e) { }
        };
 
+       struct RealSpeed
+       {
+               float speed;
+               float weight;
+
+               RealSpeed();
+               void add(float, float);
+       };
+
        TrafficManager &trfc_mgr;
        std::string name;
        Locomotive &loco;
        std::list<BlockRef> cur_blocks;
        std::list<BlockRef> rsv_blocks;
+       Block *pending_block;
        unsigned target_speed;
+       const Route *route;
        Msp::Time::TimeStamp try_reserve;
        std::string status;
 
@@ -54,8 +70,7 @@ private:
        float travel_dist;
        unsigned travel_speed;
        bool pure_speed;
-       float speed_scale;
-       float speed_scale_weight;
+       std::vector<RealSpeed> real_speed;
 
        Track *cur_track;
        unsigned cur_track_ep;
@@ -68,9 +83,11 @@ public:
        void set_name(const std::string &);
        void set_speed(unsigned);
        void set_reverse(bool);
+       void set_route(const Route *);
        const std::string &get_name() const { return name; }
        Locomotive &get_locomotive() const { return loco; }
        unsigned get_target_speed() const { return target_speed; }
+       const Route *get_route() const { return route; }
        const std::string &get_status() const { return status; }
        const Point &get_position() const { return pos; }
        void place(Block *, unsigned);
@@ -80,10 +97,12 @@ public:
 private:
        void locomotive_reverse_changed(bool);
        void sensor_event(bool, Sensor *);
-       void turnout_route_changing(unsigned, Turnout *);
-       void turnout_route_changed(unsigned, Turnout *);
+       void turnout_path_changing(unsigned, Turnout *);
+       void turnout_path_changed(unsigned, Turnout *);
        unsigned reserve_more();
        void update_speed();
+       float get_real_speed(unsigned) const;
+       unsigned find_speed(float) const;
        void set_status(const std::string &);
        void set_position(const Block::Endpoint &);
        void release_reserved_blocks();