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

diff --git a/source/3d/track.cpp b/source/3d/track.cpp
index baf3519..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,7 +8,7 @@ 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"
@@ -18,7 +18,7 @@ Distributed under the GPL
 using namespace std;
 using namespace Msp;
 
-namespace Marklin {
+namespace R2C2 {
 
 Track3D::Track3D(Layout3D &l, Track &t):
 	layout(l),
@@ -29,7 +29,7 @@ Track3D::Track3D(Layout3D &l, Track &t):
 	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));
 }
@@ -86,9 +86,9 @@ void Track3D::apply_matrix() const
 	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
@@ -104,4 +104,4 @@ void Track3D::render(const GL::Tag &tag) const
 	glPopName();
 }
 
-} // namespace Marklin
+} // namespace R2C2