Display the total length of selected tracks in status bar

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

diff --git a/source/designer/designer.h b/source/designer/designer.h
index 1407d50d6fb1fc2dcf0ab2ac1b738bbfa655b941..a43906043da391e681622a11d98b26b7b9fa9240 100644 (file)
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -10,9 +10,8 @@ Distributed under the GPL
 
 #include <string>
 #include <msp/core/application.h>
-#include <msp/gbase/display.h>
-#include <msp/gbase/window.h>
-#include <msp/gbase/glcontext.h>
+#include <msp/gbase/simplewindow.h>
+#include <msp/gl/camera.h>
 #include <msp/gl/font.h>
 #include <msp/gl/light.h>
 #include <msp/gl/lighting.h>
@@ -25,12 +24,13 @@ Distributed under the GPL
 #include "libmarklin/catalogue.h"
 #include "libmarklin/layout.h"
 #include "3d/layout.h"
+#include "3d/overlay.h"
 #include "3d/track.h"
+#include "cameracontroller.h"
+#include "manipulator.h"
+#include "measure.h"
+#include "selection.h"
 
-class Input;
-class Manipulator;
-class Measure;
-class Selection;
 class Toolbar;
 
 class Designer: public Msp::Application
@@ -41,52 +41,34 @@ private:
                SELECT,
                CATALOGUE,
                MANIPULATE,
-               MEASURE,
-               INPUT
+               MEASURE
        };
 
-       Msp::Graphics::Display *dpy;
-       Msp::Graphics::Window *wnd;
-       Msp::Graphics::GLContext *glc;
-       unsigned screen_w;
-       unsigned screen_h;
+       Msp::Graphics::SimpleGLWindow window;
        Msp::GLtk::Resources ui_res;
        Msp::GLtk::Root *root;
 
        Toolbar *toolbar;
-       Msp::GLtk::Label *lbl_tooltip;
-       Msp::Time::TimeStamp tooltip_timeout;
+       Msp::GLtk::Label *lbl_status;
 
        Marklin::Catalogue catalogue;
-       Marklin::Layout *cat_layout;
        Marklin::Layout3D *cat_layout_3d;
        std::string filename;
        Marklin::Layout *layout;
        Marklin::Layout3D *layout_3d;
+       Marklin::Overlay3D *overlay;
        Msp::GL::Object *base_object;
        Marklin::Route *cur_route;
        Msp::GL::Pipeline *pipeline;
+       Msp::GL::Camera camera;
        Msp::GL::Lighting lighting;
        Msp::GL::Light light;
 
        Mode mode;
-       Selection *selection;
-       Manipulator *manipulator;
-       Measure *measure;
-       Input *input;
-
-       float cam_yaw;
-       float cam_pitch;
-       Marklin::Point cam_pos;
-
-       bool shift;
-       int move_x;
-       int move_y;
-       int zoom;
-       int rotate;
-       int pitch;
-       int pointer_x;
-       int pointer_y;
+       Selection selection;
+       Manipulator manipulator;
+       Measure measure;
+       CameraController camera_ctl;
 
        Msp::Time::TimeStamp last_tick;
 
@@ -102,34 +84,40 @@ public:
 
        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; }
-       void edit_route(Marklin::Route &);
+
+       void new_track();
+       void set_turnout_id();
+       void set_sensor_id();
+       void rename_route();
+
+       void edit_route(Marklin::Route *);
        Marklin::Route *get_current_route() const { return cur_route; }
        void add_selection_to_route();
 
-       void map_pointer_coords(int, int, float &, float &);
+       Marklin::Point map_pointer_coords(int, int);
 private:
        void tick();
        void key_press(unsigned, unsigned, wchar_t);
-       void key_release(unsigned, unsigned);
        void button_press(int, int, unsigned, unsigned);
        void pointer_motion(int, int);
-       void project_3d();
        void apply_camera();
        void render();
        Marklin::Track3D *pick_track(int, int);
-       void update_track_color(Marklin::Track3D &);
+       void update_track_icon(Marklin::Track3D &);
+       void selection_changed();
        void manipulation_status(const std::string &);
        void manipulation_done(bool);
        void measure_changed();
        void measure_done();
-       void set_tooltip(int, int, const std::string &);
-       void clear_tooltip();
-       void save_accept();
-       void turnout_id_accept();
-       void sensor_id_accept();
-       void input_dismiss();
+       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 *);
 };
 
 #endif