Convert designer to use mspgbase instead of sdl

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

diff --git a/source/designer/designer.h b/source/designer/designer.h
index 6e4e78d0e71fa7d8b3a1f4e9f1b1ebc2f59ea0ce..c2c949eb409e706243db867eeb0115c2467c6934 100644 (file)
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -10,6 +10,9 @@ 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/gl/font.h>
 #include <msp/time/timestamp.h>
 #include "libmarklin/catalogue.h"
@@ -34,6 +37,9 @@ private:
                INPUT
        };
 
+       Msp::Graphics::Display *dpy;
+       Msp::Graphics::Window *wnd;
+       Msp::Graphics::GLContext *glc;
        unsigned       screen_w;
        unsigned       screen_h;
        Msp::GL::Font  *font;
@@ -77,8 +83,8 @@ private:
        void tick();
        void key_press(unsigned, unsigned, wchar_t);
        void key_release(unsigned, unsigned);
-       void button_press(int, int, float, float, unsigned);
-       void pointer_motion(int, int, float, float);
+       void button_press(int, int, unsigned, unsigned);
+       void pointer_motion(int, int);
        void project_3d();
        void apply_camera();
        void render();