X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.h;h=c2c949eb409e706243db867eeb0115c2467c6934;hb=de09cba1d12af38ff2e7e4312d67624fe63bf0e4;hp=6e4e78d0e71fa7d8b3a1f4e9f1b1ebc2f59ea0ce;hpb=540e931ec79129c8776f48434ff5b230b53337f1;p=r2c2.git diff --git a/source/designer/designer.h b/source/designer/designer.h index 6e4e78d..c2c949e 100644 --- a/source/designer/designer.h +++ b/source/designer/designer.h @@ -10,6 +10,9 @@ Distributed under the GPL #include #include +#include +#include +#include #include #include #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();