#5338: CamWnd has to implement both ICameraView and IFreeMoveView for…

… the moment being, otherwise the FreeMoveTool breaks

radiant/camera/CamWnd.cpp

@@ -925,6 +925,21 @@ void CamWnd::setCameraOrigin(const Vector3& origin)
     _camera.setCameraOrigin(origin);
 }
 
+const Vector3& CamWnd::getRightVector() const
+{
+    return _camera.getRightVector();
+}
+
+const Vector3& CamWnd::getUpVector() const
+{
+    return _camera.getUpVector();
+}
+
+const Vector3& CamWnd::getForwardVector() const
+{
+    return _camera.getForwardVector();
+}
+
 const Vector3& CamWnd::getCameraAngles() const
 {
     return _camera.getCameraAngles();
@@ -1011,7 +1026,7 @@ CameraMouseToolEvent CamWnd::createMouseEvent(const Vector2& point, const Vector
     Vector2 normalisedDeviceCoords = device_constrained(
         window_to_normalised_device(actualPoint, _camera.width, _camera.height));
 
-    return CameraMouseToolEvent(_camera, normalisedDeviceCoords, delta);
+    return CameraMouseToolEvent(*this, normalisedDeviceCoords, delta);
 }
 
 MouseTool::Result CamWnd::processMouseDownEvent(const MouseToolPtr& tool, const Vector2& point)

radiant/camera/CamWnd.h

@@ -37,6 +37,7 @@ namespace ui
 
 class CamWnd :
     public wxEvtHandler,
+    public ICameraView,
     public IFreeMoveView,
     public scene::Graph::Observer,
     public util::Noncopyable,
@@ -115,11 +116,15 @@ class CamWnd :
 
     Camera& getCamera();
 
-    const Vector3& getCameraOrigin() const;
-    void setCameraOrigin(const Vector3& origin);
+    const Vector3& getCameraOrigin() const override;
+    void setCameraOrigin(const Vector3& origin) override;
 
-    const Vector3& getCameraAngles() const;
-    void setCameraAngles(const Vector3& angles);
+    const Vector3& getRightVector() const override;
+    const Vector3& getUpVector() const override;
+    const Vector3& getForwardVector() const override;
+
+    const Vector3& getCameraAngles() const override;
+    void setCameraAngles(const Vector3& angles) override;
 
     const Frustum& getViewFrustum() const;