Add framework for generating simple meshes for vehicles

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

diff --git a/source/designer/designer.h b/source/designer/designer.h
index 7ab3d1dc3a03cd3bad7a5fb7ee49875d50ecbbde..90d0d3717286cc629cc40d4b48750746fbbd3e8e 100644 (file)
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -47,7 +47,7 @@ private:
 
        Msp::Graphics::SimpleGLWindow window;
        Msp::GLtk::Resources ui_res;
-       Msp::GLtk::Root *root;
+       Msp::GLtk::Root root;
 
        Toolbar *toolbar;
        Msp::GLtk::Label *lbl_status;
@@ -70,7 +70,7 @@ private:
        Selection selection;
        Manipulator manipulator;
        Measure measure;
-       CameraController *camera_ctl;
+       CameraController camera_ctl;
        TrackWrap track_wrap;
 
        Msp::Time::TimeStamp last_tick;
@@ -88,9 +88,9 @@ public:
        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 CameraController &get_camera_controller() const { return camera_ctl; }
        const Msp::GLtk::Resources &get_ui_resources() const { return ui_res; }
-       Msp::GLtk::Root &get_root() const { return *root; }
+       Msp::GLtk::Root &get_root() { return root; }
 
        void new_track();
        void set_turnout_id();
@@ -101,7 +101,7 @@ public:
        Marklin::Route *get_current_route() const { return cur_route; }
        void add_selection_to_route();
 
-       Marklin::Point map_pointer_coords(int, int);
+       Marklin::Point map_pointer_to_ground(int, int);
 private:
        void tick();
        void key_press(unsigned, unsigned, wchar_t);