X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmanipulator.h;h=d39735fb86fedf40a2e561b838a269a45741d84d;hb=64d23de66c33d0f77454c3db2e40cccc18f7851b;hp=12e551bb7a1da125a7c3365f4806271b5d561d2c;hpb=679c37910ab4d8030b3c09f6591381789b14a5f0;p=r2c2.git diff --git a/source/designer/manipulator.h b/source/designer/manipulator.h index 12e551b..d39735f 100644 --- a/source/designer/manipulator.h +++ b/source/designer/manipulator.h @@ -2,6 +2,7 @@ #define MANIPULATOR_H_ #include +#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 neighbors; std::vector extend_tracks; @@ -74,8 +75,8 @@ private: void selection_changed(); void update_objects(); void update_neighbors(); - void set_slope(TrackOrder &, float, float); - std::vector create_straight(const R2C2::Vector &, float, float, float); + void set_slope(TrackOrder &, float, const R2C2::Angle &); + std::vector create_straight(const R2C2::Vector &, const R2C2::Angle &, float, float); }; #endif