#5912: Move EdgeRenderIndices struct to Brush class, since it's only …

…used privately. Remove unused file.
codereader · Mar 4, 2022 · 7b01318 · 7b01318
1 parent 2c4176d
commit 7b01318
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 59 deletions.
diff --git a/radiantcore/brush/Brush.h b/radiantcore/brush/Brush.h
@@ -4,8 +4,8 @@
 
 #include "Face.h"
 #include "SelectableComponents.h"
-#include "RenderableWireFrame.h"
 #include "Translatable.h"
+#include "render.h"
 #include "render/VertexCb.h"
 
 #include <sigc++/signal.h>
@@ -111,6 +111,20 @@ class Brush :
 	typedef std::vector<SelectableEdge> SelectableEdges;
 	SelectableEdges m_select_edges;
 
+    struct EdgeRenderIndices
+    {
+        RenderIndex first;
+        RenderIndex second;
+
+        EdgeRenderIndices()
+            : first(0), second(0)
+        {}
+
+        EdgeRenderIndices(const RenderIndex _first, const RenderIndex _second)
+            : first(_first), second(_second)
+        {}
+    };
+
 	// A list of all edge render indices, one for each unique edge
 	std::vector<EdgeRenderIndices> _edgeIndices;
 

diff --git a/radiantcore/brush/RenderableWireFrame.h b/radiantcore/brush/RenderableWireFrame.h
diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
@@ -745,7 +745,6 @@
     <ClInclude Include="..\..\radiantcore\brush\PlanePoints.h" />
     <ClInclude Include="..\..\radiantcore\brush\RenderableBrushVertices.h" />
     <ClInclude Include="..\..\radiantcore\brush\RenderableWinding.h" />
-    <ClInclude Include="..\..\radiantcore\brush\RenderableWireFrame.h" />
     <ClInclude Include="..\..\radiantcore\brush\SelectableComponents.h" />
     <ClInclude Include="..\..\radiantcore\brush\TextureMatrix.h" />
     <ClInclude Include="..\..\radiantcore\brush\TextureProjection.h" />

diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters
@@ -1845,9 +1845,6 @@
     <ClInclude Include="..\..\radiantcore\brush\PlanePoints.h">
       <Filter>src\brush</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiantcore\brush\RenderableWireFrame.h">
-      <Filter>src\brush</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiantcore\brush\SelectableComponents.h">
       <Filter>src\brush</Filter>
     </ClInclude>