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

diff --git a/source/3d/track.h b/source/3d/track.h
index 93e3a0d..9b70b63 100644
--- a/source/3d/track.h
+++ b/source/3d/track.h
@@ -1,36 +1,26 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
-#ifndef MARKLIN3D_TRACK_H_
-#define MARKLIN3D_TRACK_H_
+#ifndef R2C2_3D_TRACK_H_
+#define R2C2_3D_TRACK_H_
 
 #include <list>
-#include <msp/gl/renderable.h>
-#include <msp/gl/vertexarray.h>
-#include <msp/gl/vertexarraybuilder.h>
-#include "libmarklin/track.h"
-#include "libmarklin/trackpart.h"
+#include <sigc++/trackable.h>
+#include <msp/gl/matrix.h>
+#include <msp/gl/objectinstance.h>
+#include "libr2c2/track.h"
+#include "libr2c2/trackpart.h"
 #include "object.h"
 
-namespace Marklin {
+namespace R2C2 {
 
 class Endpoint3D;
-class Layout3D;
 class Path3D;
 class TrackType3D;
 
-class Track3D: public Object3D, public Msp::GL::Renderable
+class Track3D: public Object3D, public Msp::GL::ObjectInstance
 {
 private:
-	Layout3D &layout;
 	Track &track;
 	const TrackType3D &type;
 	std::vector<Endpoint3D *> endpoints;
-	Path3D *path;
 
 public:
 	Track3D(Layout3D &, Track &);
@@ -39,15 +29,15 @@ public:
 	Layout3D &get_layout() const { return layout; }
 	Track &get_track() const { return track; }
 	const TrackType3D &get_type() const { return type; }
-	void get_bounds(float, Point &, Point &) const;
-	Path3D &get_path() { return *path; }
 
-	virtual Point get_node() const;
+	virtual Vector get_node() const;
+	virtual bool is_visible() const { return true; }
 
-	void apply_matrix() const;
-	virtual void render(const Msp::GL::Tag &) const;
+	virtual void setup_render(Msp::GL::Renderer &, const Msp::GL::Tag &) const;
+private:
+	void link_changed(unsigned, Track *);
 };
 
-} // namespace Marklin
+} // namespace R2C2
 
 #endif