X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Ftracktype.h;fp=source%2F3d%2Ftracktype.h;h=3c06c58d8234047d7b198f2d0f9a68cfb1744f4a;hb=d91ab10fd78ef29272282b020fa4e08063cb4808;hp=7bf1b2d5b9241ab931afefe140ec242366afa6e1;hpb=8dce175e31941c2f6e92ce52204e9b61a071d4f9;p=r2c2.git

diff --git a/source/3d/tracktype.h b/source/3d/tracktype.h
index 7bf1b2d..3c06c58 100644
--- a/source/3d/tracktype.h
+++ b/source/3d/tracktype.h
@@ -10,7 +10,7 @@ Distributed under the GPL
 
 #include <msp/gl/mesh.h>
 #include <msp/gl/meshbuilder.h>
-#include <msp/gl/renderable.h>
+#include <msp/gl/object.h>
 #include "libr2c2/profile.h"
 #include "libr2c2/tracktype.h"
 
@@ -18,26 +18,25 @@ namespace R2C2 {
 
 class Catalogue3D;
 
-class TrackType3D: public Msp::GL::Renderable
+class TrackType3D
 {
 private:
-	const Catalogue3D &catalogue;
-	Msp::GL::Mesh ballast_mesh;
-	Msp::GL::Mesh rail_mesh;
+	Catalogue3D &catalogue;
+	Msp::GL::Mesh mesh;
+	Msp::GL::Object object;
 	std::vector<Msp::GL::Mesh *> path_meshes;
 	std::vector<Point> border;
 	float min_z;
 	float max_z;
 
 public:
-	TrackType3D(const Catalogue3D &, const TrackType &);
+	TrackType3D(Catalogue3D &, const TrackType &);
 	~TrackType3D();
 
 	void get_bounds(float, Point &, Point &) const;
+	const Msp::GL::Object &get_object() const { return object; }
 	const Msp::GL::Mesh &get_path_mesh(unsigned) const;
 
-	virtual void render(const Msp::GL::Tag &) const;
-
 private:
 	void build_part(const TrackPart &, const Profile &, const Point &, Msp::GL::MeshBuilder &, unsigned &);
 };