Refactor Designer::use_tool so tools don't need to take a set of objects

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

diff --git a/source/designer/designer.h b/source/designer/designer.h
index fd70358c56698b0ee923a478d1902becdce06e35..dadbf068c1b3ed9a6bf3772a71f51220df4b1876 100644 (file)
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -11,6 +11,7 @@
 #include <msp/gl/object.h>
 #include <msp/gl/pipeline.h>
 #include <msp/gltk/label.h>
+#include <msp/gltk/layout.h>
 #include <msp/gltk/resources.h>
 #include <msp/gltk/root.h>
 #include <msp/time/timestamp.h>
@@ -35,9 +36,7 @@ private:
        {
                SELECT,
                CATALOGUE,
-               MANIPULATE,
-               MANIPULATE_DONE,
-               MEASURE
+               TOOL
        };
 
        Msp::Graphics::SimpleGLWindow window;
@@ -45,6 +44,7 @@ private:
        Msp::Input::Mouse mouse;
        Msp::GLtk::Resources ui_res;
        Msp::GLtk::Root root;
+       Msp::GLtk::Layout *root_layout;
 
        std::vector<Toolbar *> toolbars;
        Msp::GLtk::Label *lbl_status;
@@ -61,13 +61,12 @@ private:
        Msp::GL::Object *base_object;
        R2C2::Route *cur_route;
        R2C2::Zone *cur_zone;
-       std::list<R2C2::Track *> new_tracks;
+       std::list<R2C2::Path3D *> highlight_paths;
 
        Mode mode;
        Selection selection;
        SelectionWrap sel_wrap;
-       Manipulator manipulator;
-       Measure measure;
+       Tool *cur_tool;
        CameraController *camera_ctl;
 
        Msp::Time::TimeStamp last_tick;
@@ -84,8 +83,6 @@ public:
        R2C2::Layout &get_layout() { return *layout; }
        R2C2::Layout3D &get_layout_3d() { return *layout_3d; }
        const CameraController &get_camera_controller() const { return *camera_ctl; }
-       const Msp::GLtk::Resources &get_ui_resources() const { return ui_res; }
-       Msp::GLtk::Root &get_root() { return root; }
 
        void new_track();
        void erase_tracks();
@@ -109,12 +106,14 @@ public:
 private:
        void tick();
        void key_press(unsigned);
+       template<typename T>
+       T *use_tool_with_selected_objects();
+       template<typename T>
+       T *use_tool();
+       void use_tool(Tool *);
        void button_press(unsigned);
-       void axis_motion(unsigned, float, float);
        void apply_camera();
        void render();
-       void object_added(R2C2::Object &);
-       void object_removed(R2C2::Object &);
        R2C2::Object *pick_object(const R2C2::Vector &);
        void update_track_icon(R2C2::Track3D &);
        void selection_changed();
@@ -122,7 +121,6 @@ private:
        void manipulation_done(bool);
        void measure_changed();
        void measure_done();
-       void arrange_toolbars();
        void track_properties_response(int);
        void route_name_accept(const std::string &);
        void svg_export_accept(const std::string &);