Style fixes, including:

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

diff --git a/source/3d/track.h b/source/3d/track.h
index a9154b7c6bbb628fb486d7d934601224a03a37ce..cf3c051ee22e381b17daf1f6c4b85cd65d91aee3 100644 (file)
--- a/source/3d/track.h
+++ b/source/3d/track.h
@@ -2,28 +2,19 @@
 #define MARKLIN3D_TRACK_H_
 
 #include <list>
+#include <msp/gl/color.h>
 #include <msp/gl/vertexarray.h>
 #include <msp/gl/vertexarraybuilder.h>
 #include "libmarklin/track.h"
 #include "libmarklin/trackpart.h"
-#include "misc.h"
 
 namespace Marklin {
 
 class Track3D
 {
-public:
-       Track3D(Track &, unsigned);
-       void set_color(const Color &c)  { color=c; }
-       void set_quality(unsigned);
-       void get_bounds(float, Point &, Point &) const;
-       Track &get_track() const { return track; }
-       void render();
-       void render_endpoints();
-       void render_route(int);
 private:
        Track        &track;
-       Color        color;
+       Msp::GL::Color color;
        std::vector<Point> border;
        Msp::GL::VertexArray varray;
        std::vector<unsigned> base_seq;
@@ -31,11 +22,21 @@ private:
        std::vector<std::vector<unsigned> > route_seq;
        unsigned quality;
 
-       void prepare_render();
+public:
+       Track3D(Track &, unsigned);
+
+       void set_color(const Msp::GL::Color &c)  { color=c; }
+       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;
+private:
+       void prepare_render() const;
        void build_object();
        void build_part(const TrackPart &, Msp::GL::VertexArrayBuilder &, unsigned &);
 };
-typedef std::list<Track3D *> Track3DSeq;
 
 } // namespace Marklin