X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Ftrack.h;h=adc046b9fc13c9b53f069d16ff4f10b75225c4b4;hb=2fe7cbcb761487bc7409b93b372da6f8ab3c581e;hp=a9154b7c6bbb628fb486d7d934601224a03a37ce;hpb=52cbe8d99669f843f8f75c51128e2748584dd03a;p=r2c2.git

diff --git a/source/3d/track.h b/source/3d/track.h
index a9154b7..adc046b 100644
--- a/source/3d/track.h
+++ b/source/3d/track.h
@@ -1,41 +1,49 @@
+/* $Id$
+
+This file is part of the MSP Märklin suite
+Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
+Distributed under the GPL
+*/
+
 #ifndef MARKLIN3D_TRACK_H_
 #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;
+	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;
 
-	void prepare_render();
+public:
+	Track3D(Track &, unsigned);
+
+	Track &get_track() const { return track; }
+	void set_color(const Msp::GL::Color &);
+	void set_quality(unsigned);
+	void get_bounds(float, Point &, Point &) const;
+	void render() const;
+	void render_endpoints() const;
+	void render_path(int) const;
+private:
+	void prepare_render(bool) const;
 	void build_object();
 	void build_part(const TrackPart &, Msp::GL::VertexArrayBuilder &, unsigned &);
 };
-typedef std::list<Track3D *> Track3DSeq;
 
 } // namespace Marklin