X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fgeometry.h;h=dc29212735fa806b8c9fb79668c20bb5a735a19c;hb=0a2bd90a3d4f5e7333eba59f29e4a0fbcb11175e;hp=09044e35886d6ccf1df13d5d0c5b5d77a0acca0d;hpb=7a36d396eded897c421424905b2c938d770df341;p=r2c2.git

diff --git a/source/libr2c2/geometry.h b/source/libr2c2/geometry.h
index 09044e3..dc29212 100644
--- a/source/libr2c2/geometry.h
+++ b/source/libr2c2/geometry.h
@@ -5,6 +5,8 @@
 #include <vector>
 #include <msp/geometry/affinetransformation.h>
 #include <msp/geometry/angle.h>
+#include <msp/geometry/ray.h>
+#include <msp/geometry/shape.h>
 #include <msp/linal/vector.h>
 
 namespace R2C2 {
@@ -24,13 +26,15 @@ inline Vector rotated_vector(const Vector &v, const Angle &a)
 inline Vector vector_at_angle(const Angle &a)
 { return rotated_vector(Vector(1, 0, 0), a); }
 
-struct TrackPoint
-{
-	Vector pos;
-	Angle dir;
-	float grade;
+typedef Msp::Geometry::Shape<float, 3> Shape;
+typedef Msp::Geometry::Ray<float, 3> Ray;
+typedef Msp::Geometry::BoundingBox<float, 3> BoundingBox;
 
-	TrackPoint(): grade(0) { }
+struct OrientedPoint
+{
+	Vector position;
+	Angle rotation;
+	Angle tilt;
 };
 
 } // namespace R2C2