Make use of the mspmath library

[r2c2.git] / source / designer / manipulator.h

diff --git a/source/designer/manipulator.h b/source/designer/manipulator.h
index 12e551bb7a1da125a7c3365f4806271b5d561d2c..1c46af6b6fd4c4eeae53bd197c87a198723f9acc 100644 (file)
--- a/source/designer/manipulator.h
+++ b/source/designer/manipulator.h
@@ -2,6 +2,7 @@
 #define MANIPULATOR_H_
 
 #include <sigc++/sigc++.h>
+#include "libr2c2/geometry.h"
 
 class Designer;
 class Selection;
@@ -22,7 +23,7 @@ private:
        {
                R2C2::Object *object;
                R2C2::Vector pos;
-               float rot;
+               R2C2::Angle rot;
 
                MObject(R2C2::Object *);
        };
@@ -50,8 +51,8 @@ private:
        R2C2::Vector gpointer;
        Mode mode;
        R2C2::Vector move_origin;
-       float angle;
-       float rot_origin;
+       R2C2::Angle angle;
+       R2C2::Angle rot_origin;
        float elev_origin;
        std::set<R2C2::Object *> neighbors;
        std::vector<R2C2::Track *> extend_tracks;
@@ -75,7 +76,7 @@ private:
        void update_objects();
        void update_neighbors();
        void set_slope(TrackOrder &, float, float);
-       std::vector<R2C2::Track *> create_straight(const R2C2::Vector &, float, float, float);
+       std::vector<R2C2::Track *> create_straight(const R2C2::Vector &, const R2C2::Angle &, float, float);
 };
 
 #endif