Introduce a tilt (vertical angle) property to Object

[r2c2.git] / source / 3d / track.cpp

diff --git a/source/3d/track.cpp b/source/3d/track.cpp
index 793dec5888f9167e99f250ab3f86ceb529ce7ba3..92c15744e42f23fba386287146fa9a81336206e5 100644 (file)
--- a/source/3d/track.cpp
+++ b/source/3d/track.cpp
@@ -47,58 +47,28 @@ Track3D::~Track3D()
                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);
+       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();
 
-       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.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(Msp::GL::Renderer &renderer, const GL::Tag &) const
 {
-       renderer.matrix_stack() *= get_matrix();
+       renderer.matrix_stack() *= create_matrix();
 }
 
 void Track3D::link_changed(unsigned i, Track *trk)