X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fgeometry.h;h=67c541211fcd93c7655318dc33e6953e6e85fb28;hb=e75f12451201fb6540ad2155e8796c2b5aee8d4c;hp=48bbd49eeb98736b5274dbd50ec91d723649b8be;hpb=1ff06c5bc46a677fa389ef86c6b26664368f1653;p=r2c2.git diff --git a/source/libr2c2/geometry.h b/source/libr2c2/geometry.h index 48bbd49..67c5412 100644 --- a/source/libr2c2/geometry.h +++ b/source/libr2c2/geometry.h @@ -1,10 +1,3 @@ -/* $Id$ - -This file is part of R²C² -Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa -Distributed under the GPL -*/ - #ifndef LIBR2C2_GEOMETRY_H_ #define LIBR2C2_GEOMETRY_H_ @@ -13,21 +6,21 @@ Distributed under the GPL namespace R2C2 { -struct Point +struct Vector { float x, y, z; - Point(): x(0), y(0), z(0) { } - Point(float x_, float y_): x(x_), y(y_), z(0) { } - Point(float x_, float y_, float z_): x(x_), y(y_), z(z_) { } + Vector(): x(0), y(0), z(0) { } + Vector(float x_, float y_): x(x_), y(y_), z(0) { } + Vector(float x_, float y_, float z_): x(x_), y(y_), z(z_) { } }; -inline float distance(const Point &p, const Point &q) +inline float distance(const Vector &p, const Vector &q) { return sqrt((p.x-q.x)*(p.x-q.x) + (p.y-q.y)*(p.y-q.y) + (p.z-q.z)*(p.z-q.z)); } struct TrackPoint { - Point pos; + Vector pos; float dir; float grade;