X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Ftrack.cpp;h=549bc156ba6dce2de6babcb6db4889441ce4b221;hb=3dfcd6a470a96dc7b6f2f100e604c7f0db6da00c;hp=793dec5888f9167e99f250ab3f86ceb529ce7ba3;hpb=d15ac13f2e170f155b4bbd124df48400c339b644;p=r2c2.git

diff --git a/source/3d/track.cpp b/source/3d/track.cpp
index 793dec5..549bc15 100644
--- a/source/3d/track.cpp
+++ b/source/3d/track.cpp
@@ -14,13 +14,11 @@ using namespace Msp;
 namespace R2C2 {
 
 Track3D::Track3D(Layout3D &l, Track &t):
-	GL::ObjectInstance(l.get_catalogue().get_track(t.get_type()).get_object()),
-	layout(l),
+	Object3D(l, t),
+	GL::ObjectInstance(l.get_catalogue().get_3d(t.get_type()).get_object()),
 	track(t),
-	type(layout.get_catalogue().get_track(track.get_type())),
-	path(new Path3D(*this))
+	type(layout.get_catalogue().get_3d(track.get_type()))
 {
-	layout.add_track(*this);
 	layout.get_scene().add(*this);
 
 	const vector<TrackType::Endpoint> &type_eps = track.get_type().get_endpoints();
@@ -38,67 +36,24 @@ Track3D::Track3D(Layout3D &l, Track &t):
 
 Track3D::~Track3D()
 {
-	delete path;
-
-	layout.remove_track(*this);
 	layout.get_scene().remove(*this);
 
 	for(vector<Endpoint3D *>::iterator i=endpoints.begin(); i!=endpoints.end(); ++i)
 		delete *i;
 }
 
-void Track3D::get_bounds(float 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;
-
-	float slope = track.get_slope();
-	if(slope>0)
-		maxp.z += slope;
-	else
-		minp.z += slope;
-}
-
 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);
-
-	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);
-}
-
-GL::Matrix Track3D::get_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.rotate(track.get_slope()/track.get_type().get_total_length(), 0, -1, 0);
+	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();
 
-	return matrix;
+	return matrix*((minp+maxp)/2.0f+Vector(0, 0, 0.02));
 }
 
 void Track3D::setup_render(Msp::GL::Renderer &renderer, const GL::Tag &) const
 {
-	renderer.matrix_stack() *= get_matrix();
+	renderer.matrix_stack() *= matrix;
 }
 
 void Track3D::link_changed(unsigned i, Track *trk)