X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Ftracktype.h;h=3923ab1ac35f28d2835c04b8ed7189d597023875;hb=dfe3dd563981883f3b7c826102fed33c7ff0d12d;hp=980e7b82c843a483ffcf34083117119a0ab57f0b;hpb=90790c9a28793d31b9ea38eea2f55652a0e9297b;p=r2c2.git

diff --git a/source/3d/tracktype.h b/source/3d/tracktype.h
index 980e7b8..3923ab1 100644
--- a/source/3d/tracktype.h
+++ b/source/3d/tracktype.h
@@ -1,46 +1,36 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2010 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
-#ifndef MARKLIN3D_TRACKTYPE_H_
-#define MARKLIN3D_TRACKTYPE_H_
+#ifndef R2C2_3D_TRACKTYPE_H_
+#define R2C2_3D_TRACKTYPE_H_
 
+#include <map>
 #include <msp/gl/mesh.h>
 #include <msp/gl/meshbuilder.h>
-#include <msp/gl/renderable.h>
-#include "libmarklin/profile.h"
-#include "libmarklin/tracktype.h"
+#include <msp/gl/object.h>
+#include "libr2c2/profile.h"
+#include "libr2c2/tracktype.h"
+#include "objecttype.h"
 
-namespace Marklin {
+namespace R2C2 {
 
-class Catalogue3D;
-
-class TrackType3D: public Msp::GL::Renderable
+class TrackType3D: public ObjectType3D
 {
 private:
-	const Catalogue3D &catalogue;
-	Msp::GL::Mesh ballast_mesh;
-	Msp::GL::Mesh rail_mesh;
-	std::vector<Msp::GL::Mesh *> path_meshes;
-	std::vector<Point> border;
-	float min_z;
-	float max_z;
+	Msp::GL::Mesh *mesh;
+	Msp::GL::Object *object;
+	bool own_data;
+	std::map<unsigned, Msp::GL::Mesh *> path_meshes;
 
 public:
-	TrackType3D(const Catalogue3D &, const TrackType &);
-
-	void get_bounds(float, Point &, Point &) const;
-	const Msp::GL::Mesh &get_path_mesh(unsigned) const;
+	TrackType3D(Catalogue3D &, const TrackType &);
+	~TrackType3D();
 
-	virtual void render(const Msp::GL::Tag &) const;
+	const Msp::GL::Object &get_object() const { return *object; }
+	const Msp::GL::Mesh &get_path_mesh(int, int) const;
 
 private:
-	void build_part(const TrackPart &, const Profile &, const Point &, Msp::GL::MeshBuilder &, unsigned &);
+	void build_part(const TrackPart &, const Profile &, const Vector &, bool, Msp::GL::MeshBuilder &, unsigned &);
+	void build_ties(const TrackPart &, const Profile &, float, float, const Vector &, Msp::GL::MeshBuilder &, unsigned &);
 };
 
-} // namespace Marklin
+} // namespace R2C2
 
 #endif