X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Ftrack.cpp;h=bd148a7c3f307cb65ede9c21d341bec7b979137a;hb=7a36d396eded897c421424905b2c938d770df341;hp=8b36b194220c0c3175da4c322e9b846e5112b656;hpb=f8a7788cee0261babfc4c804a58515aad6dfbc3d;p=r2c2.git

diff --git a/source/3d/track.cpp b/source/3d/track.cpp
index 8b36b19..bd148a7 100644
--- a/source/3d/track.cpp
+++ b/source/3d/track.cpp
@@ -1,13 +1,5 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2011 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <cmath>
 #include <msp/gl/matrix.h>
-#include <msp/gl/misc.h>
 #include <msp/gl/renderer.h>
 #include "libr2c2/tracktype.h"
 #include "endpoint.h"
@@ -55,20 +47,13 @@ Track3D::~Track3D()
 		delete *i;
 }
 
-void Track3D::get_bounds(float angle, Vector &minp, Vector &maxp) const
+void Track3D::get_bounds(const Angle &angle, Vector &minp, Vector &maxp) const
 {
 	type.get_bounds(angle-track.get_rotation(), minp, maxp);
 
-	float c = cos(-angle);
-	float s = sin(-angle);
-
-	const Vector &pos = track.get_position();
-	minp.x += c*pos.x-s*pos.y;
-	maxp.x += c*pos.x-s*pos.y;
-	minp.y += s*pos.x+c*pos.y;
-	maxp.y += s*pos.x+c*pos.y;
-	minp.z += pos.z;
-	maxp.z += pos.z;
+	Vector pos = rotated_vector(track.get_position(), -angle);
+	minp += pos;
+	maxp += pos;
 
 	float slope = track.get_slope();
 	if(slope>0)
@@ -79,26 +64,18 @@ void Track3D::get_bounds(float angle, Vector &minp, Vector &maxp) const
 
 Vector Track3D::get_node() const
 {
-	const Vector &pos = track.get_position();
 	Vector minp;
 	Vector maxp;
-	type.get_bounds(0, minp, maxp);
-	float rot = track.get_rotation();
-	float c = cos(rot);
-	float s = sin(rot);
+	type.get_bounds(Angle::zero(), minp, maxp);
 
-	Vector center((minp.x+maxp.x)/2, (minp.y+maxp.y)/2, 0);
-	return Vector(pos.x+c*center.x-s*center.y, pos.y+s*center.x+c*center.y, pos.z+0.02);
+	return track.get_position()+rotated_vector((minp+maxp)/2.0f, track.get_rotation())+Vector(0, 0, 0.02);
 }
 
-GL::Matrix Track3D::get_matrix() const
+GL::Matrix Track3D::create_matrix() const
 {
-	const Vector &pos = track.get_position();
-	float rot = track.get_rotation();
-
 	GL::Matrix matrix;
-	matrix.translate(pos.x, pos.y, pos.z);
-	matrix.rotate(rot, 0, 0, 1);
+	matrix.translate(track.get_position());
+	matrix.rotate(track.get_rotation(), 0, 0, 1);
 	matrix.rotate(track.get_slope()/track.get_type().get_total_length(), 0, -1, 0);
 
 	return matrix;
@@ -106,13 +83,7 @@ GL::Matrix Track3D::get_matrix() const
 
 void Track3D::setup_render(Msp::GL::Renderer &renderer, const GL::Tag &) const
 {
-	renderer.matrix_stack() *= get_matrix();
-	glPushName(reinterpret_cast<unsigned>(this));
-}
-
-void Track3D::finish_render(Msp::GL::Renderer &, const GL::Tag &) const
-{
-	glPopName();
+	renderer.matrix_stack() *= create_matrix();
 }
 
 void Track3D::link_changed(unsigned i, Track *trk)