#5231: Extend brush interface to avoid having to reference the actual…

… Brush.h header in the MapExporter.
codereader · May 23, 2020 · 9b583da · 9b583da
1 parent 4870b02
commit 9b583da
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/include/ibrush.h b/include/ibrush.h
@@ -202,6 +202,9 @@ class IBrush
 
 	// Classify this brush against the given plane, used by clipper and CSG algorithms
 	virtual BrushSplitType classifyPlane(const Plane3& plane) const = 0;
+
+	// Method used internally to recalculate the brush windings
+	virtual void evaluateBRep() const = 0;
 };
 
 // Forward-declare the Brush object, only accessible from main binary

diff --git a/radiant/brush/Brush.h b/radiant/brush/Brush.h
@@ -211,7 +211,7 @@ class Brush :
 
 	BrushSplitType classifyPlane(const Plane3& plane) const override;
 
-	void evaluateBRep() const;
+	void evaluateBRep() const override;
 
     void transformChanged();
     void evaluateTransform();

diff --git a/radiant/map/algorithm/MapExporter.cpp b/radiant/map/algorithm/MapExporter.cpp
@@ -9,7 +9,6 @@
 #include "imapresource.h"
 #include "imap.h"
 #include "igroupnode.h"
-#include "../../brush/Brush.h"
 
 #include "registry/registry.h"
 #include "string/string.h"
@@ -271,9 +270,9 @@ void MapExporter::recalculateBrushWindings()
 {
 	_root->foreachNode([] (const scene::INodePtr& child)->bool
 	{
-		Brush* brush = Node_getBrush(child);
+		auto* brush = Node_getIBrush(child);
 
-		if (brush != NULL)
+		if (brush != nullptr)
 		{
 			brush->evaluateBRep();
 		}