X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Frotatetool.cpp;h=858b2230b0c0acf7925123ddbdb92ec4d4f4aa0b;hb=03a22611772265b539f826f1f8bc482e71ca4a99;hp=5931e831d3cc17d829841026497f5cb03cdb97d2;hpb=678982e7ddb22bb5fd44ce448d1c5cbf646b2573;p=r2c2.git diff --git a/source/designer/rotatetool.cpp b/source/designer/rotatetool.cpp index 5931e83..858b223 100644 --- a/source/designer/rotatetool.cpp +++ b/source/designer/rotatetool.cpp @@ -4,15 +4,13 @@ using namespace std; using namespace Msp; using namespace R2C2; -RotateTool::RotateTool(Designer &d, Input::Mouse &m, const set &o): - Manipulator(d, m, o), +RotateTool::RotateTool(Designer &d, Input::Keyboard &k, Input::Mouse &m, const set &o): + Manipulator(d, k, m, o), origin(Geometry::atan2(ground_pointer.y-center.y, ground_pointer.x-center.x)) { } -void RotateTool::axis_motion(unsigned axis, float value, float rel) +void RotateTool::pointer_motion() { - Manipulator::axis_motion(axis, value, rel); - Angle a = Geometry::atan2(ground_pointer.y-center.y, ground_pointer.x-center.x); angle += a-origin; origin = a;