New approach for displaying track state

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

diff --git a/source/designer/designer.h b/source/designer/designer.h
index b19eb66c2e87b39b4e0c2cec2787181fc21f06ce..02649cb24836b20ff6d3625bc48b3b3657123161 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>
@@ -24,7 +25,7 @@
 #include "manipulator.h"
 #include "measure.h"
 #include "selection.h"
-#include "trackwrap.h"
+#include "selectionwrap.h"
 
 class Toolbar;
 
@@ -41,8 +42,11 @@ private:
        };
 
        Msp::Graphics::SimpleGLWindow window;
+       Msp::Input::Keyboard keyboard;
+       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;
@@ -59,14 +63,14 @@ 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;
        CameraController *camera_ctl;
-       TrackWrap *track_wrap;
 
        Msp::Time::TimeStamp last_tick;
 
@@ -82,8 +86,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();
@@ -103,24 +105,21 @@ public:
        R2C2::Zone *get_current_zone() const { return cur_zone; }
        void add_selection_to_zone();
 
-       R2C2::Vector map_pointer_to_ground(int, int);
+       R2C2::Vector map_pointer_to_ground(const R2C2::Vector &);
 private:
        void tick();
-       void key_press(unsigned, unsigned, wchar_t);
-       void button_press(int, int, unsigned, unsigned);
-       void pointer_motion(int, int);
+       void key_press(unsigned);
+       void button_press(unsigned);
+       void axis_motion(unsigned, float, float);
        void apply_camera();
        void render();
-       void track_added(R2C2::Track &);
-       void track_removed(R2C2::Track &);
-       R2C2::Track *pick_track(int, int);
+       R2C2::Object *pick_object(const R2C2::Vector &);
        void update_track_icon(R2C2::Track3D &);
        void selection_changed();
        void manipulation_status(const std::string &);
        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 &);