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 b78ad81becf8db1650f4b9d8a691269148743c4d..dadbf068c1b3ed9a6bf3772a71f51220df4b1876 100644 (file)
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -36,9 +36,7 @@ private:
        {
                SELECT,
                CATALOGUE,
-               MANIPULATE,
-               MANIPULATE_DONE,
-               MEASURE
+               TOOL
        };
 
        Msp::Graphics::SimpleGLWindow window;
@@ -63,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;
@@ -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();