X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fcameracontroller.h;h=5b6c3155314c74b2eb5b705aa90eabbeab67eee2;hb=95339ab1d15219938c7b2945f4f558dc162c9127;hp=682b59c9fed2170f791e04227ebcb72238f8b287;hpb=d15ac13f2e170f155b4bbd124df48400c339b644;p=r2c2.git

diff --git a/source/designer/cameracontroller.h b/source/designer/cameracontroller.h
index 682b59c..5b6c315 100644
--- a/source/designer/cameracontroller.h
+++ b/source/designer/cameracontroller.h
@@ -1,8 +1,10 @@
 #ifndef CAMERACONTROLLER_H_
 #define CAMERACONTROLLER_H_
 
-#include <msp/gbase/window.h>
+#include <msp/graphics/window.h>
 #include <msp/gl/camera.h>
+#include <msp/input/keyboard.h>
+#include <msp/input/mouse.h>
 #include "3d/view.h"
 
 /**
@@ -31,16 +33,19 @@ private:
 	};
 
 	R2C2::View3D &view;
-	Msp::Graphics::EventSource &event_source;
+	Msp::Input::Keyboard &keyboard;
+	Msp::Input::Mouse &mouse;
 	Msp::GL::Camera &camera;
 	int move_x;
 	int move_y;
 	int pointer_x;
 	int pointer_y;
+	bool shift_pressed;
+	bool ctrl_pressed;
 	DragMode drag_mode;
 
 public:
-	CameraController(R2C2::View3D &, Msp::Graphics::EventSource &);
+	CameraController(R2C2::View3D &, Msp::Input::Keyboard &, Msp::Input::Mouse &);
 
 	void top_down();
 	void set_look_direction(const Msp::GL::Vector3 &);
@@ -48,16 +53,16 @@ public:
 
 	void move(float, float);
 	void adjust_distance(float);
-	void rotate(float);
-	void pitch(float);
+	void rotate(const R2C2::Angle &);
+	void pitch(const R2C2::Angle &);
 
 	void tick(float);
 private:
-	void button_press(int, int, unsigned, unsigned);
-	void button_release(int, int, unsigned, unsigned);
-	void pointer_motion(int, int);
-	void key_press(unsigned, unsigned, wchar_t);
-	void key_release(unsigned, unsigned);
+	void button_press(unsigned);
+	void button_release(unsigned);
+	void axis_motion(unsigned, float, float);
+	void key_press(unsigned);
+	void key_release(unsigned);
 
 public:
 	/** Return the focus point, i.e. where the look ray intersects with ground. */