X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmanipulator.h;h=fa8598db186f7ebb55126777cd4a3cf375902720;hb=02fe62e0026dd25fd3ff4d5172c0ff097b7c68c9;hp=2ed49fb1a754bf8a2f1caf6e336896a78aafc7be;hpb=c0c5a34d1056eabdebd350da3534e24c902c0dac;p=r2c2.git diff --git a/source/designer/manipulator.h b/source/designer/manipulator.h index 2ed49fb..fa8598d 100644 --- a/source/designer/manipulator.h +++ b/source/designer/manipulator.h @@ -9,7 +9,6 @@ Distributed under the GPL #define MANIPULATOR_H_ #include -#include "3d/track.h" class Designer; class Selection; @@ -42,14 +41,6 @@ private: TrackOrder(Marklin::Track *t, bool r): track(t), rev(r) { } }; - struct TrackWrap - { - Marklin::Point pos; - float rot; - float width; - float height; - }; - public: sigc::signal signal_status; sigc::signal signal_done; @@ -60,10 +51,6 @@ private: std::vector tracks; Marklin::Point center; - std::list wrap; - Marklin::Point wrap_pos; - float wrap_rot; - Marklin::Point gpointer; int pointer_y; Mode mode; @@ -85,10 +72,9 @@ public: void cancel(); void button_press(int, int, float, float, unsigned); void pointer_motion(int, int, float, float); - void render(); private: void selection_changed(); - void update_wrap(); + void update_tracks(); void update_neighbors(); void set_slope(TrackOrder &, float, float); };