X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fcameracontroller.h;h=6d5270c1056039271c5f63d5fa9a3577b1ebd505;hb=a20b8421d002629a9f4d97c0c378e9f9cb29e292;hp=b18e2519d25aadecaff80eb4e8c345b7bc7ffb85;hpb=1ff06c5bc46a677fa389ef86c6b26664368f1653;p=r2c2.git

diff --git a/source/designer/cameracontroller.h b/source/designer/cameracontroller.h
index b18e251..6d5270c 100644
--- a/source/designer/cameracontroller.h
+++ b/source/designer/cameracontroller.h
@@ -1,17 +1,9 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2010 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #ifndef CAMERACONTROLLER_H_
 #define CAMERACONTROLLER_H_
 
-#include <msp/gbase/window.h>
+#include <msp/graphics/window.h>
 #include <msp/gl/camera.h>
-
-class Designer;
+#include "3d/view.h"
 
 /**
 Moves the camera based on keyboard and mouse events.  Controls are as follows:
@@ -38,7 +30,7 @@ private:
 		DISTANCE
 	};
 
-	Designer &designer;
+	R2C2::View3D &view;
 	Msp::Graphics::EventSource &event_source;
 	Msp::GL::Camera &camera;
 	int move_x;
@@ -48,7 +40,7 @@ private:
 	DragMode drag_mode;
 
 public:
-	CameraController(Designer &, Msp::Graphics::EventSource &, Msp::GL::Camera &);
+	CameraController(R2C2::View3D &, Msp::Graphics::EventSource &);
 
 	void top_down();
 	void set_look_direction(const Msp::GL::Vector3 &);