#5338: Move the "focus all cameras" and "get active cam" functionalit…

…y to the CameraManager

include/icamera.h

@@ -7,27 +7,13 @@
 namespace camera
 {
 
-enum 
-{
-    CAMERA_PITCH = 0, // up / down
-    CAMERA_YAW = 1, // left / right
-    CAMERA_ROLL = 2, // fall over
-};
-
 /**
  * The "global" interface of DarkRadiant's camera module.
  */
 class ICameraManager :
 	public RegisterableModule
 {
 public:
-	/**
-	 * greebo: Sets the camera origin to the given <point> using the given <angles>.
-	 */
-	virtual void focusCamera(const Vector3& point, const Vector3& angles) = 0;
-
-	// A reference to the currently active view. Will throw a std::runtime_error if no camera is present
-	virtual ICameraView& getActiveView() = 0;
 };
 typedef std::shared_ptr<ICameraManager> ICameraPtr;
 

include/icameraview.h

@@ -8,6 +8,16 @@ template<typename Element>class BasicVector3;
 typedef BasicVector3<double> Vector3;
 class Matrix4;
 
+namespace camera
+{
+
+enum
+{
+	CAMERA_PITCH = 0, // up / down
+	CAMERA_YAW = 1, // left / right
+	CAMERA_ROLL = 2, // fall over
+};
+
 // Abstract class used when handling mouse events
 // see also: class IOrthoView in iorthoview.h
 class ICameraView :
@@ -58,9 +68,6 @@ class IFreeMoveView :
     virtual bool freeMoveEnabled() const = 0;
 };
 
-namespace camera
-{
-
 class ICameraViewManager :
 	public RegisterableModule
 {
@@ -80,6 +87,9 @@ class ICameraViewManager :
 	// Sets the position and angles of all active cameras to the given values
 	virtual void focusAllCameras(const Vector3& position, const Vector3& angles) = 0;
 
+	// A reference to the currently active view. Will throw a std::runtime_error if no camera is present
+	virtual ICameraView& getActiveView() = 0;
+
 	// Signal emitted when any camera position or angles changed
 	virtual sigc::signal<void>& signal_cameraChanged() = 0;
 };

radiant/camera/CamWnd.cpp

@@ -895,7 +895,7 @@ void CamWnd::update()
     queueDraw();
 }
 
-ICameraView& CamWnd::getCamera()
+camera::ICameraView& CamWnd::getCamera()
 {
     return *_camera;
 }

radiant/camera/CamWnd.h

@@ -38,8 +38,8 @@ namespace ui
 
 class CamWnd :
     public wxEvtHandler,
-    public ICameraView,
-    public IFreeMoveView,
+    public camera::ICameraView,
+    public camera::IFreeMoveView,
     public scene::Graph::Observer,
     public util::Noncopyable,
     public sigc::trackable,
@@ -119,7 +119,7 @@ class CamWnd :
     static void captureStates();
     static void releaseStates();
 
-    ICameraView& getCamera();
+    camera::ICameraView& getCamera();
 
     const Vector3& getCameraOrigin() const override;
     void setCameraOrigin(const Vector3& origin) override;

radiant/camera/GlobalCameraWndManager.cpp

@@ -266,23 +266,6 @@ void GlobalCameraWndManager::farClipPlaneOut(const cmd::ArgumentList& args)
 	doWithActiveCamWnd([](CamWnd& camWnd) { camWnd.farClipPlaneOut(); });
 }
 
-void GlobalCameraWndManager::focusCamera(const Vector3& point, const Vector3& angles)
-{
-	doWithActiveCamWnd([&](CamWnd& camWnd)
-	{
-		camWnd.setOriginAndAngles(point, angles);
-	});
-}
-
-ICameraView& GlobalCameraWndManager::getActiveView()
-{
-	auto camWnd = getActiveCamWnd();
-
-	if (!camWnd) throw std::runtime_error("No active camera view present");
-
-	return camWnd->getCamera();
-}
-
 // --------------- Keyboard movement methods ------------------------------------------
 
 void GlobalCameraWndManager::moveCameraCmd(const cmd::ArgumentList& args)

radiant/camera/GlobalCameraWndManager.h

@@ -63,11 +63,6 @@ class GlobalCameraWndManager :
 	// Resets the camera angles of the currently active Camera
 	void resetCameraAngles(const cmd::ArgumentList& args);
 
-	/** greebo: Sets the camera to the given point/angle.
-	 */
-	void focusCamera(const Vector3& point, const Vector3& angles) override;
-	ICameraView& getActiveView() override;
-
 	// Toggles between lighting and solid rendering mode (passes the call to the CameraSettings class)
 	void toggleLightingMode(const cmd::ArgumentList& args);
 

radiant/camera/tools/CameraMouseToolEvent.h

@@ -11,20 +11,20 @@ class CameraMouseToolEvent :
     public MouseToolEvent
 {
 private:
-    ICameraView& _view;
+    camera::ICameraView& _view;
 
 public:
-    CameraMouseToolEvent(ICameraView& view, const Vector2& devicePos) :
+    CameraMouseToolEvent(camera::ICameraView& view, const Vector2& devicePos) :
         MouseToolEvent(view, devicePos),
         _view(view)
     {}
 
-    CameraMouseToolEvent(ICameraView& view, const Vector2& devicePos, const Vector2& delta) :
+    CameraMouseToolEvent(camera::ICameraView& view, const Vector2& devicePos, const Vector2& delta) :
         MouseToolEvent(view, devicePos, delta),
         _view(view)
     {}
 
-    ICameraView& getView()
+    camera::ICameraView& getView()
     {
         return _view;
     }

radiant/camera/tools/FreeMoveTool.h

@@ -34,7 +34,7 @@ class FreeMoveTool :
     {
         try
         {
-            auto& freeMoveView = dynamic_cast<IFreeMoveView&>(ev.getInteractiveView());
+            auto& freeMoveView = dynamic_cast<camera::IFreeMoveView&>(ev.getInteractiveView());
 
             if (getCameraSettings()->toggleFreelook())
             {
@@ -75,7 +75,7 @@ class FreeMoveTool :
     {
         try
         {
-            auto& freeMoveView = dynamic_cast<IFreeMoveView&>(ev.getInteractiveView());
+            auto& freeMoveView = dynamic_cast<camera::IFreeMoveView&>(ev.getInteractiveView());
 
             // MouseUp events are ignored when in toggle mode
             // In non-toggle mode, we just reset the freelook status to disabled
@@ -99,7 +99,7 @@ class FreeMoveTool :
     {
         try
         {
-            auto& freeMoveView = dynamic_cast<IFreeMoveView&>(view);
+            auto& freeMoveView = dynamic_cast<camera::IFreeMoveView&>(view);
 
             if (freeMoveView.freeMoveEnabled())
             {

radiant/camera/tools/JumpToObjectTool.h

@@ -45,7 +45,7 @@ class JumpToObjectTool :
 
                 // Focus the view at the center of the found AABB
                 // Set the camera and the views to the given point
-                GlobalCameraWndManager().focusCamera(found.origin, camEvent.getView().getCameraAngles());
+                GlobalCameraManager().focusAllCameras(found.origin, camEvent.getView().getCameraAngles());
                 GlobalXYWndManager().setOrigin(found.origin);
             }
 

radiant/camera/tools/PanViewTool.h

@@ -34,7 +34,7 @@ class PanViewTool :
 	{
 		try
 		{
-			auto& freeMoveView = dynamic_cast<IFreeMoveView&>(ev.getInteractiveView());
+			auto& freeMoveView = dynamic_cast<camera::IFreeMoveView&>(ev.getInteractiveView());
 
 			// Don't operate when the camera is already in free look mode
 			if (freeMoveView.freeMoveEnabled())
@@ -57,7 +57,7 @@ class PanViewTool :
 		{
 			// We use capture mode, so xy event will contain the delta only
 			CameraMouseToolEvent& camEvent = dynamic_cast<CameraMouseToolEvent&>(ev);
-			ICameraView& view = camEvent.getView();
+			auto& view = camEvent.getView();
 
 			const float strafespeed = GlobalCamera().getCameraStrafeSpeed();
 

radiant/ui/entitylist/EntityList.cpp

@@ -7,7 +7,7 @@
 #include "registry/Widgets.h"
 #include "entitylib.h"
 #include "iselectable.h"
-#include "icamera.h"
+#include "icameraview.h"
 #include "i18n.h"
 
 #include "wxutil/TreeView.h"
@@ -343,7 +343,7 @@ void EntityList::onSelection(wxDataViewEvent& ev)
 				Vector3 angles(0, 0, 0);
 				angles[camera::CAMERA_PITCH] = -30;
 
-				GlobalCameraWndManager().focusCamera(origin, angles);
+				GlobalCameraManager().focusAllCameras(origin, angles);
 			}
 
 			// Now reactivate the callbacks

radiantcore/camera/CameraManager.cpp

@@ -42,6 +42,16 @@ void CameraManager::focusAllCameras(const Vector3& position, const Vector3& angl
 	}
 }
 
+camera::ICameraView& CameraManager::getActiveView()
+{
+	if (_cameras.empty())
+	{
+		throw std::runtime_error("No active camera view present");
+	}
+
+	return *_cameras.front();
+}
+
 sigc::signal<void>& CameraManager::signal_cameraChanged()
 {
 	return _sigCameraChanged;

radiantcore/camera/CameraManager.h

@@ -30,6 +30,8 @@ class CameraManager :
 
 	void focusAllCameras(const Vector3& position, const Vector3& angles) override;
 
+	ICameraView& getActiveView() override;
+
 	sigc::signal<void>& signal_cameraChanged() override;
 
 	void onCameraViewChanged();

radiantcore/map/Map.cpp

@@ -244,7 +244,7 @@ sigc::signal<void>& Map::signal_modifiedChanged()
 void Map::focusViews(const Vector3& point, const Vector3& angles)
 {
     // Set the camera and the views to the given point
-    GlobalCameraWndManager().focusCamera(point, angles);
+    GlobalCameraManager().focusAllCameras(point, angles);
     GlobalXYWndManager().setOrigin(point);
 }
 

radiantcore/map/MapPosition.cpp

@@ -1,7 +1,7 @@
 #include "MapPosition.h"
 
 #include "ientity.h"
-#include "icamera.h"
+#include "icameraview.h"
 #include "itextstream.h"
 #include "string/string.h"
 #include "map/Map.h"
@@ -115,7 +115,7 @@ void MapPosition::store(const cmd::ArgumentList& args)
 
     try
     {
-        auto& cameraView = GlobalCameraWndManager().getActiveView();
+        auto& cameraView = GlobalCameraManager().getActiveView();
 
         _position = cameraView.getCameraOrigin();
         _angle = cameraView.getCameraAngles();

radiantcore/map/MapPositionManager.cpp

@@ -2,7 +2,7 @@
 
 #include "maplib.h"
 #include "ientity.h"
-#include "icamera.h"
+#include "icameraview.h"
 #include "gamelib.h"
 #include "ieventmanager.h"
 #include "iregistry.h"
@@ -183,7 +183,7 @@ void MapPositionManager::saveLastCameraPosition(const scene::IMapRootNodePtr& ro
 
 	try
 	{
-		auto& camView = GlobalCameraWndManager().getActiveView();
+		auto& camView = GlobalCameraManager().getActiveView();
 
 		root->setProperty(LAST_CAM_POSITION_KEY, string::to_string(camView.getCameraOrigin()));
 		root->setProperty(LAST_CAM_ANGLE_KEY, string::to_string(camView.getCameraAngles()));

radiantcore/map/PointFile.cpp

@@ -4,7 +4,7 @@
 #include "igl.h"
 #include "iscenegraph.h"
 #include "itextstream.h"
-#include "icamera.h"
+#include "icameraview.h"
 #include "iorthoview.h"
 #include <fstream>
 #include <iostream>
@@ -129,7 +129,7 @@ void PointFile::advance(bool forward)
 
 	try
 	{
-		auto& cam = GlobalCameraWndManager().getActiveView();
+		auto& cam = GlobalCameraManager().getActiveView();
 
 		cam.setCameraOrigin(_points[_curPos].vertex);
 

radiantcore/map/RegionManager.cpp

@@ -3,7 +3,7 @@
 #include "i18n.h"
 #include "brush/TexDef.h"
 #include "ibrush.h"
-#include "icamera.h"
+#include "icameraview.h"
 #include "iorthoview.h"
 #include "ientity.h"
 #include "ieclass.h"
@@ -171,7 +171,7 @@ void RegionManager::addRegionBrushes()
 
     try
     {
-        auto& camView = GlobalCameraWndManager().getActiveView();
+        auto& camView = GlobalCameraManager().getActiveView();
 
         // Obtain the camera origin = player start point
         Vector3 camOrigin = camView.getCameraOrigin();

radiantcore/selection/clipboard/Clipboard.cpp

@@ -3,7 +3,7 @@
 #include "i18n.h"
 #include "iselection.h"
 #include "igrid.h"
-#include "icamera.h"
+#include "icameraview.h"
 #include "imapformat.h"
 #include "iclipboard.h"
 
@@ -73,7 +73,7 @@ void pasteToCamera(const cmd::ArgumentList& args)
 {
 	try
 	{
-		auto& camWnd = GlobalCameraWndManager().getActiveView();
+		auto& camWnd = GlobalCameraManager().getActiveView();
 
 		UndoableCommand undo("pasteToCamera");
 		pasteToMap();