X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Ftrack.h;h=641f234e232f4b926fa07936d85bd996ab092cd1;hb=7a36d396eded897c421424905b2c938d770df341;hp=660d1cff5fca9105a5d7dc04e03164c9b6cc56b2;hpb=449fb5de95ddb2ac9da4bd72a1c12150505d5549;p=r2c2.git

diff --git a/source/3d/track.h b/source/3d/track.h
index 660d1cf..641f234 100644
--- a/source/3d/track.h
+++ b/source/3d/track.h
@@ -1,50 +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_
+#ifndef R2C2_3D_TRACK_H_
+#define R2C2_3D_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 <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 R2C2 {
 
-namespace Marklin {
+class Endpoint3D;
+class Layout3D;
+class Path3D;
+class TrackType3D;
 
-class Track3D
+class Track3D: public Object3D, public Msp::GL::ObjectInstance, public sigc::trackable
 {
 private:
+	Layout3D &layout;
 	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;
-	unsigned quality;
+	const TrackType3D &type;
+	std::vector<Endpoint3D *> endpoints;
+	Path3D *path;
 
 public:
-	Track3D(Track &, unsigned);
+	Track3D(Layout3D &, Track &);
+	~Track3D();
 
+	Layout3D &get_layout() const { return layout; }
 	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_route(int) const;
+	const TrackType3D &get_type() const { return type; }
+	void get_bounds(const Angle &, Vector &, Vector &) const;
+	Path3D &get_path() { return *path; }
+
+	virtual Vector get_node() const;
+	virtual bool is_visible() const { return true; }
+
+	Msp::GL::Matrix create_matrix() const;
+	virtual void setup_render(Msp::GL::Renderer &, const Msp::GL::Tag &) const;
 private:
-	void prepare_render() const;
-	void build_object();
-	void build_part(const TrackPart &, Msp::GL::VertexArrayBuilder &, unsigned &);
+	void link_changed(unsigned, Track *);
 };
 
-} // namespace Marklin
+} // namespace R2C2
 
 #endif