Rename Point to Vector

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

diff --git a/source/designer/manipulator.h b/source/designer/manipulator.h
index 9e17384e4ee39b90c178d8e55c402e81bc9ec601..d8c3986a6161db02dd1bea7a84bd44a8e09d6841 100644 (file)
--- a/source/designer/manipulator.h
+++ b/source/designer/manipulator.h
@@ -1,87 +1,88 @@
+/* $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_
 
 #include <sigc++/sigc++.h>
-#include "3d/track.h"
 
 class Designer;
 class Selection;
 
 class Manipulator
 {
-public:
-       sigc::signal<void, const std::string &> signal_status;
-       sigc::signal<void, bool> signal_done;
-
-       Manipulator(Designer &);
-       void set_selection(Selection *);
-       void start_move();
-       void start_rotate();
-       void start_elevate();
-       void duplicate();
-       void flatten();
-       void even_slope(bool =false);
-       void cancel();
-       void button_press(int, int, float, float, unsigned);
-       void pointer_motion(int, int, float, float);
-       void render();
 private:
        enum Mode
        {
                NONE,
                MOVE,
                ROTATE,
-               ELEVATE
+               ELEVATE,
+               EXTEND
        };
 
        struct MTrack
        {
-               Marklin::Track *track;
-               Marklin::Point pos;
+               R2C2::Track *track;
+               R2C2::Vector pos;
                float rot;
 
-               MTrack(Marklin::Track *);
+               MTrack(R2C2::Track *);
        };
 
        struct TrackOrder
        {
-               Marklin::Track *track;
+               R2C2::Track *track;
                bool rev;
 
-               TrackOrder(Marklin::Track *t, bool r): track(t), rev(r) { }
+               TrackOrder(R2C2::Track *t, bool r): track(t), rev(r) { }
        };
 
-       struct TrackWrap
-       {
-               Marklin::Point pos;
-               float rot;
-               float width;
-               float height;
-       };
+public:
+       sigc::signal<void, const std::string &> signal_status;
+       sigc::signal<void, bool> signal_done;
 
-       Designer   &designer;
-       Selection  *selection;
+private:
+       Designer &designer;
+       Msp::Graphics::EventSource &event_source;
+       Selection &selection;
        std::vector<MTrack> tracks;
-       Marklin::Point center;
+       R2C2::Vector center;
 
-       std::list<TrackWrap> wrap;
-       Marklin::Point wrap_pos;
-       float wrap_rot;
+       R2C2::Vector gpointer;
+       int pointer_y;
+       Mode mode;
+       R2C2::Vector move_origin;
+       float angle;
+       float rot_origin;
+       int elev_origin;
+       std::set<R2C2::Track *> neighbors;
+       std::vector<R2C2::Track *> extend_tracks;
 
-       Marklin::Point gpointer;
-       int            pointer_y;
-       Mode           mode;
-       Marklin::Point move_origin;
-       float          angle;
-       float          rot_origin;
-       int            elev_origin;
-       std::set<Marklin::Track *> neighbors;
-       sigc::connection selection_changed_conn;
+public:
+       Manipulator(Designer &, Msp::Graphics::EventSource &, Selection &);
 
+       void start_move();
+       void start_rotate();
+       void start_elevate();
+       bool start_extend();
+       void duplicate();
+       void flatten();
+       void even_slope(bool =false);
+       void connect();
+       void cancel();
+private:
+       void button_press(int, int, unsigned, unsigned);
+       void pointer_motion(int, int);
        void selection_changed();
-       void update_wrap();
+       void update_tracks();
        void update_neighbors();
        void set_slope(TrackOrder &, float, float);
+       std::vector<R2C2::Track *> create_straight(const R2C2::Vector &, float, float, float);
 };
 
 #endif