X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Ftrack.cpp;h=401dd2d9634956a15d645047881663e1d355c44c;hb=1ff06c5bc46a677fa389ef86c6b26664368f1653;hp=a5c5dbf62a166904a5e3203d28b53af8a637284c;hpb=bc8ac89bbe774bb133b758416182aa18e5e0a5a5;p=r2c2.git

diff --git a/source/3d/track.cpp b/source/3d/track.cpp
index a5c5dbf..401dd2d 100644
--- a/source/3d/track.cpp
+++ b/source/3d/track.cpp
@@ -1,6 +1,6 @@
 /* $Id$
 
-This file is part of the MSP Märklin suite
+This file is part of R²C²
 Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
@@ -8,32 +8,36 @@ Distributed under the GPL
 #include <cmath>
 #include <msp/gl/matrix.h>
 #include <msp/gl/misc.h>
-#include "libmarklin/tracktype.h"
+#include "libr2c2/tracktype.h"
 #include "endpoint.h"
 #include "layout.h"
+#include "path.h"
 #include "track.h"
 #include "tracktype.h"
 
 using namespace std;
 using namespace Msp;
 
-namespace Marklin {
+namespace R2C2 {
 
 Track3D::Track3D(Layout3D &l, Track &t):
 	layout(l),
 	track(t),
-	type(layout.get_catalogue().get_track(track.get_type()))
+	type(layout.get_catalogue().get_track(track.get_type())),
+	path(new Path3D(*this))
 {
 	layout.add_track(*this);
 	layout.get_scene().add(*this);
 
-	const vector<Endpoint> &type_eps = track.get_type().get_endpoints();
+	const vector<TrackType::Endpoint> &type_eps = track.get_type().get_endpoints();
 	for(unsigned i=0; i<type_eps.size(); ++i)
 		endpoints.push_back(new Endpoint3D(*this, i));
 }
 
 Track3D::~Track3D()
 {
+	delete path;
+
 	layout.remove_track(*this);
 	layout.get_scene().remove(*this);
 
@@ -77,16 +81,21 @@ Point Track3D::get_node() const
 	return Point(pos.x+c*center.x-s*center.y, pos.y+s*center.x+c*center.y, pos.z+0.02);
 }
 
-void Track3D::render(const GL::Tag &tag) const
+void Track3D::apply_matrix() const
 {
-	GL::PushMatrix push_mat;
-
 	const Point &pos = track.get_position();
 	float rot = track.get_rotation();
 
-	glTranslatef(pos.x, pos.y, pos.z);
-	glRotatef(rot*180/M_PI, 0, 0, 1);
-	glRotatef(track.get_slope()/track.get_type().get_total_length()*180/M_PI, 0, -1, 0);
+	GL::translate(pos.x, pos.y, pos.z);
+	GL::rotate(rot*180/M_PI, 0, 0, 1);
+	GL::rotate(track.get_slope()/track.get_type().get_total_length()*180/M_PI, 0, -1, 0);
+}
+
+void Track3D::render(const GL::Tag &tag) const
+{
+	GL::PushMatrix push_mat;
+
+	apply_matrix();
 
 	glPushName(reinterpret_cast<unsigned>(this));
 
@@ -95,4 +104,4 @@ void Track3D::render(const GL::Tag &tag) const
 	glPopName();
 }
 
-} // namespace Marklin
+} // namespace R2C2