Add an internal layout to Catalogue for selecting tracks

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

diff --git a/source/designer/designer.h b/source/designer/designer.h
index 1407d50d6fb1fc2dcf0ab2ac1b738bbfa655b941..37a4a1e6524456c88ce90dbc74c408a2489abc96 100644 (file)
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -10,9 +10,7 @@ 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/font.h>
 #include <msp/gl/light.h>
 #include <msp/gl/lighting.h>
@@ -26,11 +24,11 @@ Distributed under the GPL
 #include "libmarklin/layout.h"
 #include "3d/layout.h"
 #include "3d/track.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
@@ -45,11 +43,7 @@ private:
                INPUT
        };
 
-       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;
 
@@ -58,7 +52,6 @@ private:
        Msp::Time::TimeStamp tooltip_timeout;
 
        Marklin::Catalogue catalogue;
-       Marklin::Layout *cat_layout;
        Marklin::Layout3D *cat_layout_3d;
        std::string filename;
        Marklin::Layout *layout;
@@ -70,9 +63,9 @@ private:
        Msp::GL::Light light;
 
        Mode mode;
-       Selection *selection;
-       Manipulator *manipulator;
-       Measure *measure;
+       Selection selection;
+       Manipulator manipulator;
+       Measure measure;
        Input *input;
 
        float cam_yaw;