#5231: Create IRegionManager interface, for use in the XYWnd class. M…

…ore refactoring.

include/iorthoview.h

@@ -7,6 +7,8 @@ template<typename Element>
 class BasicVector3;
 typedef BasicVector3<double> Vector3;
 
+const char* const RKEY_HIGHER_ENTITY_PRIORITY = "user/ui/xyview/higherEntitySelectionPriority";
+
 // Possible types of the orthogonal view window
 enum EViewType
 {

include/iregion.h

@@ -0,0 +1,36 @@
+#pragma once
+
+#include "imodule.h"
+#include "math/AABB.h"
+
+namespace map
+{
+
+class IRegionManager :
+	public RegisterableModule
+{
+public:
+	virtual ~IRegionManager() {}
+
+	/** 
+	 ' greebo: Stores the corners coordinates of the currently active
+	 * region into the given <regionMin>, <regionMax> vectors.
+	 * If regioning is inactive, the maximum possible bounds are returned.
+	 */
+	virtual AABB getRegionBounds() = 0;
+};
+
+} // namespace
+
+const char* const MODULE_REGION_MANAGER = "RegionManager";
+
+inline map::IRegionManager& GlobalRegionManager()
+{
+	// Cache the reference locally
+	static map::IRegionManager& _module(
+		*std::static_pointer_cast<map::IRegionManager>(
+			module::GlobalModuleRegistry().getModule(MODULE_REGION_MANAGER)
+		)
+	);
+	return _module;
+}

include/iselection.h

@@ -310,6 +310,9 @@ class SelectionSystem :
 	 * Note: the struct is defined in selectionlib.h.
 	 */
 	virtual const selection::WorkZone& getWorkZone() = 0;
+
+	// Returns the center point of the current selection
+	virtual Vector3 getCurrentSelectionCenter() = 0;
 };
 
 const char* const MODULE_SELECTIONSYSTEM("SelectionSystem");

radiant/xyview/GlobalXYWnd.cpp

@@ -10,7 +10,6 @@
 #include "registry/registry.h"
 
 #include "module/StaticModule.h"
-#include "selection/algorithm/General.h"
 #include "camera/GlobalCamera.h"
 #include "wxutil/MouseButton.h"
 
@@ -603,8 +602,9 @@ Vector3 XYWndManager::getFocusPosition()
 {
 	Vector3 position(0,0,0);
 
-	if (GlobalSelectionSystem().countSelected() != 0) {
-		position = selection::algorithm::getCurrentSelectionCenter();
+	if (GlobalSelectionSystem().countSelected() != 0) 
+	{
+		position = GlobalSelectionSystem().getCurrentSelectionCenter();
 	}
 	else {
 		CamWndPtr cam = GlobalCamera().getActiveCamWnd();

radiant/xyview/XYWnd.cpp

@@ -7,24 +7,20 @@
 #include "imainframe.h"
 #include "ientity.h"
 #include "igrid.h"
+#include "iregion.h"
 #include "iuimanager.h"
 
 #include "wxutil/MouseButton.h"
 #include "wxutil/GLWidget.h"
 #include "string/string.h"
 #include "selectionlib.h"
 
-#include "brush/TexDef.h"
 #include "ibrush.h"
 #include "camera/GlobalCamera.h"
 #include "camera/CameraSettings.h"
 #include "ui/ortho/OrthoContextMenu.h"
 #include "ui/overlay/Overlay.h"
 #include "ui/texturebrowser/TextureBrowser.h"
-#include "map/RegionManager.h"
-#include "map/Map.h"
-#include "selection/algorithm/General.h"
-#include "selection/algorithm/Primitives.h"
 #include "registry/registry.h"
 #include "selection/Device.h"
 #include "selection/SelectionTest.h"
@@ -604,9 +600,10 @@ Vector4 XYWnd::getWindowCoordinates() {
     double h = (_height / 2 / _scale);
 
     // Query the region minimum/maximum vectors
-    Vector3 regionMin;
-    Vector3 regionMax;
-    GlobalRegion().getMinMax(regionMin, regionMax);
+    auto regionBounds = GlobalRegionManager().getRegionBounds();
+
+    Vector3 regionMin = regionBounds.origin - regionBounds.extents;
+    Vector3 regionMax = regionBounds.origin + regionBounds.extents;
 
     double xb = _origin[nDim1] - w;
     // Constrain this value to the region minimum

radiant/xyview/tools/ClipperTool.cpp

@@ -3,8 +3,8 @@
 #include "i18n.h"
 #include "igrid.h"
 #include "iclipper.h"
+#include "iselection.h"
 #include "imainframe.h"
-#include "selection/algorithm/General.h"
 #include "XYMouseToolEvent.h"
 
 namespace ui
@@ -123,7 +123,7 @@ bool ClipperTool::alwaysReceivesMoveEvents()
 void ClipperTool::dropClipPoint(XYMouseToolEvent& event)
 {
     Vector3 point = event.getWorldPos();
-    Vector3 mid = selection::algorithm::getCurrentSelectionCenter();
+    Vector3 mid = GlobalSelectionSystem().getCurrentSelectionCenter();
 
     GlobalClipper().setViewType(static_cast<EViewType>(event.getViewType()));
     int nDim = (GlobalClipper().getViewType() == YZ) ? 0 : ((GlobalClipper().getViewType() == XZ) ? 1 : 2);

radiantcore/map/RegionManager.cpp

@@ -38,12 +38,11 @@
 namespace map
 {
 
-    namespace
-	{
-        typedef std::shared_ptr<RegionManager> RegionManagerPtr;
-        const std::string GKEY_PLAYER_START_ECLASS = "/mapFormat/playerStartPoint";
-        const char* const MODULE_REGION_MANAGER = "RegionManager";
-    }
+namespace
+{
+    typedef std::shared_ptr<RegionManager> RegionManagerPtr;
+    const std::string GKEY_PLAYER_START_ECLASS = "/mapFormat/playerStartPoint";
+}
 
 RegionManager::RegionManager() :
     _active(false)
@@ -104,6 +103,17 @@ void RegionManager::getMinMax(Vector3& regionMin, Vector3& regionMax) const {
     }
 }
 
+AABB RegionManager::getRegionBounds()
+{
+    if (isEnabled())
+    {
+        return _bounds;
+    }
+
+    // Set the region bounds to the maximum available size
+    return AABB(Vector3(0, 0, 0), Vector3(_worldMax, _worldMax, _worldMax));
+}
+
 void RegionManager::setRegion(const AABB& aabb, bool autoEnable) {
     _bounds = aabb;
 
@@ -470,10 +480,4 @@ AABB RegionManager::getVisibleBounds()
 
 module::StaticModule<RegionManager> staticRegionManagerModule;
 
-} // namespace map
-
-map::RegionManager& GlobalRegion()
-{
-	return *std::static_pointer_cast<map::RegionManager>(
-        module::GlobalModuleRegistry().getModule(map::MODULE_REGION_MANAGER));
-}
+} // namespace

radiantcore/map/RegionManager.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <list>
-#include "imodule.h"
+#include "iregion.h"
 #include "icommandsystem.h"
 #include "math/AABB.h"
 #include "math/Vector2.h"
@@ -23,10 +23,11 @@
  * the file together with an info_player_start entity.
  * The info_player_start is placed at the current camera position.
  */
-namespace map {
+namespace map
+{
 
 class RegionManager :
-	public RegisterableModule
+	public IRegionManager
 {
 	// TRUE, if regioning is active
 	bool _active;
@@ -72,6 +73,7 @@ class RegionManager :
 	 *
 	 * Note: If region is inactive, the maximum possible bounds are returned.
 	 */
+	AABB getRegionBounds() override;
 	void getMinMax(Vector3& regionMin, Vector3& regionMax) const;
 
 	/** greebo: Sets the region bounds according to the given <aabb>
@@ -91,9 +93,9 @@ class RegionManager :
 	void setRegionFromXY(Vector2 topLeft, Vector2 lowerRight);
 
 	// RegisterableModule
-	virtual const std::string& getName() const override;
-	virtual const StringSet& getDependencies() const override;
-	virtual void initialiseModule(const ApplicationContext& ctx) override;
+	const std::string& getName() const override;
+	const StringSet& getDependencies() const override;
+	void initialiseModule(const ApplicationContext& ctx) override;
 
 private:
 	/** greebo: Adds the bounding brushes that enclose the current region.
@@ -153,7 +155,4 @@ class RegionManager :
 	AABB getVisibleBounds();
 };
 
-} // namespace map
-
-// Use this to call the non-static member methods.
-map::RegionManager& GlobalRegion();
+} // namespace

radiantcore/selection/RadiantSelectionSystem.cpp

@@ -29,11 +29,6 @@
 namespace selection
 {
 
-namespace
-{
-    const std::string RKEY_HIGHER_ENTITY_PRIORITY = "user/ui/xyview/higherEntitySelectionPriority";
-}
-
 // --------- RadiantSelectionSystem Implementation ------------------------------------------
 
 RadiantSelectionSystem::RadiantSelectionSystem() :
@@ -939,6 +934,11 @@ const WorkZone& RadiantSelectionSystem::getWorkZone()
     return _workZone;
 }
 
+Vector3 RadiantSelectionSystem::getCurrentSelectionCenter()
+{
+    return algorithm::getCurrentSelectionCenter();
+}
+
 /* greebo: Renders the currently active manipulator by setting the render state and
  * calling the manipulator's render method
  */

radiantcore/selection/RadiantSelectionSystem.h

@@ -147,6 +147,7 @@ class RadiantSelectionSystem :
 	void onManipulationCancelled() override;
 
 	const WorkZone& getWorkZone() override;
+	Vector3 getCurrentSelectionCenter() override;
 
 	void renderSolid(RenderableCollector& collector, const VolumeTest& volume) const override;
 	void renderWireframe(RenderableCollector& collector, const VolumeTest& volume) const override;

tools/msvc/include.vcxproj

@@ -164,6 +164,7 @@
     <ClInclude Include="..\..\include\ipath.h" />
     <ClInclude Include="..\..\include\ipreferencesystem.h" />
     <ClInclude Include="..\..\include\iradiant.h" />
+    <ClInclude Include="..\..\include\iregion.h" />
     <ClInclude Include="..\..\include\iregistry.h" />
     <ClInclude Include="..\..\include\irender.h" />
     <ClInclude Include="..\..\include\irenderable.h" />