X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Ftrack.h;h=93e3a0d37ab440d514d93a990fb465ac153fcc40;hb=9b68c21ebf8ce26d92246ecd4a392d2908b511f7;hp=fb662bf890cfd8fb1f90923bfdcdcda06869fe66;hpb=a861c2729a356173059177a0b800de2b31c9b49c;p=r2c2.git

diff --git a/source/3d/track.h b/source/3d/track.h
index fb662bf..93e3a0d 100644
--- a/source/3d/track.h
+++ b/source/3d/track.h
@@ -9,26 +9,28 @@ Distributed under the GPL
 #define MARKLIN3D_TRACK_H_
 
 #include <list>
-#include <msp/gl/color.h>
 #include <msp/gl/renderable.h>
 #include <msp/gl/vertexarray.h>
 #include <msp/gl/vertexarraybuilder.h>
 #include "libmarklin/track.h"
 #include "libmarklin/trackpart.h"
+#include "object.h"
 
 namespace Marklin {
 
 class Endpoint3D;
 class Layout3D;
+class Path3D;
 class TrackType3D;
 
-class Track3D: public Msp::GL::Renderable
+class Track3D: public Object3D, public Msp::GL::Renderable
 {
 private:
 	Layout3D &layout;
 	Track &track;
 	const TrackType3D &type;
 	std::vector<Endpoint3D *> endpoints;
+	Path3D *path;
 
 public:
 	Track3D(Layout3D &, Track &);
@@ -37,9 +39,12 @@ public:
 	Layout3D &get_layout() const { return layout; }
 	Track &get_track() const { return track; }
 	const TrackType3D &get_type() const { return type; }
-	void set_color(const Msp::GL::Color &) { }
 	void get_bounds(float, Point &, Point &) const;
+	Path3D &get_path() { return *path; }
 
+	virtual Point get_node() const;
+
+	void apply_matrix() const;
 	virtual void render(const Msp::GL::Tag &) const;
 };