X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.h;h=8348f60d3920d6ac276be5102571a000817cda16;hb=ca9d278f9472206ad9a01190dcef9f0eb1bcc274;hp=0e7fe45e26ba5e1dc4c726bf1e84a68c1f9ac34b;hpb=d15ac13f2e170f155b4bbd124df48400c339b644;p=r2c2.git

diff --git a/source/designer/designer.h b/source/designer/designer.h
index 0e7fe45..8348f60 100644
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -3,7 +3,7 @@
 
 #include <string>
 #include <msp/core/application.h>
-#include <msp/gbase/simplewindow.h>
+#include <msp/graphics/simplewindow.h>
 #include <msp/gl/camera.h>
 #include <msp/gl/font.h>
 #include <msp/gl/light.h>
@@ -24,11 +24,11 @@
 #include "manipulator.h"
 #include "measure.h"
 #include "selection.h"
-#include "trackwrap.h"
+#include "selectionwrap.h"
 
 class Toolbar;
 
-class Designer: public Msp::Application
+class Designer: public Msp::RegisteredApplication<Designer>
 {
 private:
 	enum Mode
@@ -41,6 +41,8 @@ private:
 	};
 
 	Msp::Graphics::SimpleGLWindow window;
+	Msp::Input::Keyboard keyboard;
+	Msp::Input::Mouse mouse;
 	Msp::GLtk::Resources ui_res;
 	Msp::GLtk::Root root;
 
@@ -63,15 +65,13 @@ private:
 
 	Mode mode;
 	Selection selection;
+	SelectionWrap sel_wrap;
 	Manipulator manipulator;
 	Measure measure;
 	CameraController *camera_ctl;
-	TrackWrap *track_wrap;
 
 	Msp::Time::TimeStamp last_tick;
 
-	static Msp::Application::RegApp<Designer> reg;
-
 public:
 	Designer(int, char **);
 	~Designer();
@@ -105,17 +105,17 @@ public:
 	R2C2::Zone *get_current_zone() const { return cur_zone; }
 	void add_selection_to_zone();
 
-	R2C2::Vector map_pointer_to_ground(int, int);
+	R2C2::Vector map_pointer_to_ground(const R2C2::Vector &);
 private:
 	void tick();
-	void key_press(unsigned, unsigned, wchar_t);
-	void button_press(int, int, unsigned, unsigned);
-	void pointer_motion(int, int);
+	void key_press(unsigned);
+	void button_press(unsigned);
+	void axis_motion(unsigned, float, float);
 	void apply_camera();
 	void render();
 	void track_added(R2C2::Track &);
 	void track_removed(R2C2::Track &);
-	R2C2::Track *pick_track(int, int);
+	R2C2::Object *pick_object(const R2C2::Vector &);
 	void update_track_icon(R2C2::Track3D &);
 	void selection_changed();
 	void manipulation_status(const std::string &);