X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.h;h=598c1aebd1baf7db5c26e342989874e16bfb1c81;hb=ae0600f7c3df5b6ef46992b1423888dd0e9a5026;hp=c72dd5c680068ed0432902b78b7567fda308d5c2;hpb=1d735b80482317fd930eb47ca255ab9f1f120a7d;p=r2c2.git

diff --git a/source/designer/designer.h b/source/designer/designer.h
index c72dd5c..598c1ae 100644
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -1,9 +1,20 @@
+/* $Id$
+
+This file is part of the MSP Märklin suite
+Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
+Distributed under the GPL
+*/
+
 #ifndef DESIGNER_H_
 #define DESIGNER_H_
 
 #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/gl/mesh.h>
 #include <msp/time/timestamp.h>
 #include "libmarklin/catalogue.h"
 #include "libmarklin/layout.h"
@@ -27,6 +38,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;
@@ -35,6 +49,7 @@ private:
 	Marklin::Layout3D  *layout_3d;
 	Marklin::Layout    *cat_layout;
 	Marklin::Layout3D  *cat_layout_3d;
+	Msp::GL::Mesh  *base_mesh;
 	Selection      *selection;
 	Manipulator    *manipulator;
 	Measure        *measure;
@@ -70,8 +85,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();