Rewrite CameraController to make use of mouse

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

diff --git a/source/designer/designer.h b/source/designer/designer.h
index e9ba62ae06ffbd4e25a598ca385a38a5d1a31dd2..3aeb08c10c792f5a990e282da2f0110c66fb85dd 100644 (file)
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -60,6 +60,7 @@ private:
        Marklin::Overlay3D *overlay;
        Msp::GL::Object *base_object;
        Marklin::Route *cur_route;
+       std::list<Marklin::Track *> new_tracks;
        Msp::GL::Pipeline *pipeline;
        Msp::GL::Camera camera;
        Msp::GL::Lighting lighting;
@@ -69,7 +70,7 @@ private:
        Selection selection;
        Manipulator manipulator;
        Measure measure;
-       CameraController camera_ctl;
+       CameraController *camera_ctl;
        TrackWrap track_wrap;
 
        Msp::Time::TimeStamp last_tick;
@@ -84,8 +85,9 @@ public:
        void save();
        void quit();
 
-       Marklin::Layout *get_layout() { return layout; }
-       Marklin::Layout3D *get_layout_3d() { return layout_3d; }
+       const Marklin::Catalogue &get_catalogue() const { return catalogue; }
+       Marklin::Layout &get_layout() { return *layout; }
+       Marklin::Layout3D &get_layout_3d() { return *layout_3d; }
        const Msp::GL::Camera &get_camera() const { return camera; }
        const Msp::GLtk::Resources &get_ui_resources() const { return ui_res; }
        Msp::GLtk::Root &get_root() const { return *root; }
@@ -107,6 +109,7 @@ private:
        void pointer_motion(int, int);
        void apply_camera();
        void render();
+       void track_added(Marklin::Track &);
        Marklin::Track3D *pick_track(int, int);
        void update_track_icon(Marklin::Track3D &);
        void selection_changed();
@@ -117,7 +120,6 @@ private:
        void turnout_id_accept(const std::string &);
        void sensor_id_accept(const std::string &);
        void route_name_accept(const std::string &);
-       void view_all();
        std::string tooltip(int, int);
        void show_route(const Marklin::Route *);
 };