X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2F3d%2Ftrack.cpp;h=92c15744e42f23fba386287146fa9a81336206e5;hb=107a7f787d406f1f664c4986557f9a896e0845ea;hp=c8bf0e6309211c1308bd6a56bbba803934e37ac5;hpb=d91ab10fd78ef29272282b020fa4e08063cb4808;p=r2c2.git

diff --git a/source/3d/track.cpp b/source/3d/track.cpp
index c8bf0e6..92c1574 100644
--- a/source/3d/track.cpp
+++ b/source/3d/track.cpp
@@ -1,13 +1,6 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2010 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"
 #include "layout.h"
@@ -31,8 +24,16 @@ Track3D::Track3D(Layout3D &l, Track &t):
 	layout.get_scene().add(*this);
 
 	const vector<TrackType::Endpoint> &type_eps = track.get_type().get_endpoints();
+	const vector<Track *> &links = track.get_links();
 	for(unsigned i=0; i<type_eps.size(); ++i)
-		endpoints.push_back(new Endpoint3D(*this, i));
+	{
+		if(!links[i] || links[i]>&track)
+			endpoints.push_back(new Endpoint3D(*this, i));
+		else
+			endpoints.push_back(0);
+	}
+
+	track.signal_link_changed.connect(sigc::mem_fun(this, &Track3D::link_changed));
 }
 
 Track3D::~Track3D()
@@ -46,66 +47,42 @@ Track3D::~Track3D()
 		delete *i;
 }
 
-void Track3D::get_bounds(float angle, Point &minp, Point &maxp) const
+Vector Track3D::get_node() const
 {
-	type.get_bounds(angle-track.get_rotation(), minp, maxp);
-
-	float c = cos(-angle);
-	float s = sin(-angle);
+	Geometry::BoundingBox<float, 3> bbox = track.get_type().get_shape()->get_axis_aligned_bounding_box();
+	const Vector &minp = bbox.get_minimum_point();
+	const Vector &maxp = bbox.get_maximum_point();
 
-	const Point &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;
-
-	float slope = track.get_slope();
-	if(slope>0)
-		maxp.z += slope;
-	else
-		minp.z += slope;
+	return track.get_position()+rotated_vector((minp+maxp)/2.0f, track.get_rotation())+Vector(0, 0, 0.02);
 }
 
-Point Track3D::get_node() const
+GL::Matrix Track3D::create_matrix() const
 {
-	const Point &pos = track.get_position();
-	Point minp;
-	Point maxp;
-	type.get_bounds(0, minp, maxp);
-	float rot = track.get_rotation();
-	float c = cos(rot);
-	float s = sin(rot);
-
-	Point center((minp.x+maxp.x)/2, (minp.y+maxp.y)/2, 0);
-	return Point(pos.x+c*center.x-s*center.y, pos.y+s*center.x+c*center.y, pos.z+0.02);
-}
-
-GL::Matrix Track3D::get_matrix() const
-{
-	const Point &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.rotate(track.get_slope()/track.get_type().get_total_length(), 0, -1, 0);
+	matrix.translate(track.get_position());
+	matrix.rotate(track.get_rotation(), 0, 0, 1);
+	matrix.rotate(track.get_tilt(), 0, -1, 0);
 
 	return matrix;
 }
 
-void Track3D::setup_render(const GL::Tag &) const
+void Track3D::setup_render(Msp::GL::Renderer &renderer, const GL::Tag &) const
 {
-	GL::MatrixStack::modelview().push();
-	GL::MatrixStack::modelview() *= get_matrix();
-	glPushName(reinterpret_cast<unsigned>(this));
+	renderer.matrix_stack() *= create_matrix();
 }
 
-void Track3D::finish_render(const GL::Tag &) const
+void Track3D::link_changed(unsigned i, Track *trk)
 {
-	glPopName();
-	GL::MatrixStack::modelview().pop();
+	if(!trk || trk>&track)
+	{
+		if(!endpoints[i])
+			endpoints[i] = new Endpoint3D(*this, i);
+	}
+	else if(endpoints[i])
+	{
+		delete endpoints[i];
+		endpoints[i] = 0;
+	}
 }
 
 } // namespace R2C2