X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Ftrack.cpp;h=8b36b194220c0c3175da4c322e9b846e5112b656;hb=f8a7788cee0261babfc4c804a58515aad6dfbc3d;hp=5d31a4de93294f1c2ec46b815ad804aa09767c3b;hpb=460c64181aca1a134d74cb15ea4ad3bb4f275b60;p=r2c2.git diff --git a/source/3d/track.cpp b/source/3d/track.cpp index 5d31a4d..8b36b19 100644 --- a/source/3d/track.cpp +++ b/source/3d/track.cpp @@ -55,14 +55,14 @@ Track3D::~Track3D() delete *i; } -void Track3D::get_bounds(float angle, Point &minp, Point &maxp) const +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 Point &pos = track.get_position(); + 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; @@ -77,23 +77,23 @@ void Track3D::get_bounds(float angle, Point &minp, Point &maxp) const minp.z += slope; } -Point Track3D::get_node() const +Vector Track3D::get_node() const { - const Point &pos = track.get_position(); - Point minp; - Point maxp; + 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); - 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); + 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 Point &pos = track.get_position(); + const Vector &pos = track.get_position(); float rot = track.get_rotation(); GL::Matrix matrix;