X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmanipulator.h;h=965c21f51199d3b4461ae9609e7c17c9c0fef7e8;hb=7ff979d1c6c840993abb788f41a7ed95c231dae3;hp=66b5d1ae67065e7ee1f275af69c095d8e820127a;hpb=1ff06c5bc46a677fa389ef86c6b26664368f1653;p=r2c2.git diff --git a/source/designer/manipulator.h b/source/designer/manipulator.h index 66b5d1a..965c21f 100644 --- a/source/designer/manipulator.h +++ b/source/designer/manipulator.h @@ -1,10 +1,3 @@ -/* $Id$ - -This file is part of R²C² -Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa -Distributed under the GPL -*/ - #ifndef MANIPULATOR_H_ #define MANIPULATOR_H_ @@ -28,7 +21,7 @@ private: struct MTrack { R2C2::Track *track; - R2C2::Point pos; + R2C2::Vector pos; float rot; MTrack(R2C2::Track *); @@ -51,12 +44,12 @@ private: Msp::Graphics::EventSource &event_source; Selection &selection; std::vector tracks; - R2C2::Point center; + R2C2::Vector center; - R2C2::Point gpointer; + R2C2::Vector gpointer; int pointer_y; Mode mode; - R2C2::Point move_origin; + R2C2::Vector move_origin; float angle; float rot_origin; int elev_origin; @@ -69,7 +62,7 @@ public: void start_move(); void start_rotate(); void start_elevate(); - void start_extend(); + bool start_extend(); void duplicate(); void flatten(); void even_slope(bool =false); @@ -82,7 +75,7 @@ private: void update_tracks(); void update_neighbors(); void set_slope(TrackOrder &, float, float); - std::vector create_straight(const R2C2::Point &, float, float, float); + std::vector create_straight(const R2C2::Vector &, float, float, float); }; #endif