X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Ftracktype.h;h=3923ab1ac35f28d2835c04b8ed7189d597023875;hb=862d8bea6d31e6fe9a60747e0b9559f77e72bf44;hp=10806470b28e5c74dbcd65c9081b28638768b0a8;hpb=754ac497179474d0266b55e881a084fef7d5d6a1;p=r2c2.git

diff --git a/source/3d/tracktype.h b/source/3d/tracktype.h
index 1080647..3923ab1 100644
--- a/source/3d/tracktype.h
+++ b/source/3d/tracktype.h
@@ -1,44 +1,34 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2010-2011  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #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/object.h>
 #include "libr2c2/profile.h"
 #include "libr2c2/tracktype.h"
+#include "objecttype.h"
 
 namespace R2C2 {
 
-class Catalogue3D;
-
-class TrackType3D
+class TrackType3D: public ObjectType3D
 {
 private:
-	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;
+	bool own_data;
+	std::map<unsigned, Msp::GL::Mesh *> path_meshes;
 
 public:
 	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;
+	const Msp::GL::Mesh &get_path_mesh(int, int) const;
 
 private:
-	void build_part(const TrackPart &, const Profile &, const Point &, bool, 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 R2C2