X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Ftracktype.h;h=0f6b30fa29a1241047d45f8892b07404355a25c3;hb=7a36d396eded897c421424905b2c938d770df341;hp=ab85d49ce88f1ba30bfe02d2975c917de65ad37d;hpb=47341c72a70e6cf9d8e963705a50197bbc20a87d;p=r2c2.git

diff --git a/source/3d/tracktype.h b/source/3d/tracktype.h
index ab85d49..0f6b30f 100644
--- a/source/3d/tracktype.h
+++ b/source/3d/tracktype.h
@@ -1,45 +1,39 @@
-/* $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 <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"
 
-namespace Marklin {
+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;
-	std::vector<Point> border;
+	Catalogue3D &catalogue;
+	Msp::GL::Mesh *mesh;
+	Msp::GL::Object *object;
+	std::vector<Msp::GL::Mesh *> path_meshes;
+	std::vector<Vector> border;
 	float min_z;
 	float max_z;
 
 public:
-	TrackType3D(const Catalogue3D &, const TrackType &);
-
-	void get_bounds(float, Point &, Point &) const;
+	TrackType3D(Catalogue3D &, const TrackType &);
+	~TrackType3D();
 
-	virtual void render(const Msp::GL::Tag &) const;
+	void get_bounds(const Angle &, Vector &, Vector &) const;
+	const Msp::GL::Object &get_object() const { return *object; }
+	const Msp::GL::Mesh &get_path_mesh(unsigned) const;
 
 private:
-	void build_part(const TrackPart &, const Profile &, const Point &, Msp::GL::MeshBuilder &, unsigned &);
-	//void optimize_border();
+	void build_part(const TrackPart &, const Profile &, const Vector &, bool, Msp::GL::MeshBuilder &, unsigned &);
 };
 
-} // namespace Marklin
+} // namespace R2C2
 
 #endif