Add View3D class to bundle Layout3D with a camera and a pipeline

[r2c2.git] / source / designer / cameracontroller.h

diff --git a/source/designer/cameracontroller.h b/source/designer/cameracontroller.h
index b18e2519d25aadecaff80eb4e8c345b7bc7ffb85..a2ef86d6bef45f96a0c36ad5631d682637aae675 100644 (file)
--- a/source/designer/cameracontroller.h
+++ b/source/designer/cameracontroller.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of R²C²
-Copyright © 2010 Mikkosoft Productions, Mikko Rasa
+Copyright © 2010-2011 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -10,8 +10,7 @@ Distributed under the GPL
 
 #include <msp/gbase/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 +37,7 @@ private:
                DISTANCE
        };
 
-       Designer &designer;
+       R2C2::View3D &view;
        Msp::Graphics::EventSource &event_source;
        Msp::GL::Camera &camera;
        int move_x;
@@ -48,7 +47,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 &);