Change terminology to better distinguish routes on the layout from paths across track...

[r2c2.git] / source / 3d / track.h

diff --git a/source/3d/track.h b/source/3d/track.h
index 7131877de8174688e4fff8801d759bcf4c8b9a43..adc046b9fc13c9b53f069d16ff4f10b75225c4b4 100644 (file)
--- a/source/3d/track.h
+++ b/source/3d/track.h
@@ -20,27 +20,27 @@ namespace Marklin {
 class Track3D
 {
 private:
-       Track        &track;
+       Track &track;
        Msp::GL::Color color;
        std::vector<Point> border;
        Msp::GL::VertexArray varray;
        std::vector<unsigned> base_seq;
        std::vector<unsigned> rail_seq;
-       std::vector<std::vector<unsigned> > route_seq;
+       std::vector<std::vector<unsigned> > path_seq;
        unsigned quality;
 
 public:
        Track3D(Track &, unsigned);
 
-       void set_color(const Msp::GL::Color &c)  { color=c; }
+       Track &get_track() const { return track; }
+       void set_color(const Msp::GL::Color &);
        void set_quality(unsigned);
        void get_bounds(float, Point &, Point &) const;
-       Track &get_track() const { return track; }
        void render() const;
        void render_endpoints() const;
-       void render_route(int) const;
+       void render_path(int) const;
 private:
-       void prepare_render() const;
+       void prepare_render(bool) const;
        void build_object();
        void build_part(const TrackPart &, Msp::GL::VertexArrayBuilder &, unsigned &);
 };