From 9295181f840f78800c2d6f3b034f6437379fcfd2 Mon Sep 17 00:00:00 2001
From: Eric Wasylishen <ewasylishen@gmail.com>
Date: Sat, 9 Apr 2022 23:15:21 -0600
Subject: [PATCH] qbsp.hh: remove brush.hh include

---
 include/qbsp/brush.hh   | 1 +
 include/qbsp/map.hh     | 2 ++
 include/qbsp/qbsp.hh    | 6 ++----
 include/qbsp/winding.hh | 4 +++-
 qbsp/brush.cc           | 2 ++
 qbsp/csg4.cc            | 2 ++
 qbsp/exportobj.cc       | 1 +
 qbsp/map.cc             | 1 +
 qbsp/qbsp.cc            | 1 +
 qbsp/solidbsp.cc        | 1 +
 qbsp/surfaces.cc        | 2 ++
 11 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/include/qbsp/brush.hh b/include/qbsp/brush.hh
index 55083106..7157cab8 100644
--- a/include/qbsp/brush.hh
+++ b/include/qbsp/brush.hh
@@ -22,6 +22,7 @@
 #pragma once
 
 #include <qbsp/winding.hh>
+#include <qbsp/qbsp.hh>
 #include <common/aabb.hh>
 #include <optional>
 
diff --git a/include/qbsp/map.hh b/include/qbsp/map.hh
index 486e21f0..7cd7c71e 100644
--- a/include/qbsp/map.hh
+++ b/include/qbsp/map.hh
@@ -21,6 +21,8 @@
 
 #pragma once
 
+#include <qbsp/brush.hh>
+
 #include <common/parser.hh>
 #include "common/cmdlib.hh"
 
diff --git a/include/qbsp/qbsp.hh b/include/qbsp/qbsp.hh
index 2972fae2..ab54ec5d 100644
--- a/include/qbsp/qbsp.hh
+++ b/include/qbsp/qbsp.hh
@@ -40,6 +40,8 @@
 #include <cstring>
 #include <ctime>
 
+#include <qbsp/winding.hh>
+
 #include <common/bspfile.hh>
 #include <common/aabb.hh>
 #include <common/settings.hh>
@@ -236,9 +238,6 @@ extern settings::qbsp_settings options;
  */
 #define MAX_BSP_CLIPNODES 0xfff0
 
-// Various other geometry maximums
-constexpr size_t MAXEDGES = 64;
-
 // 0-2 are axial planes
 // 3-5 are non-axial planes snapped to the nearest
 #define PLANE_X 0
@@ -371,7 +370,6 @@ struct node_t
     bool opaque() const;
 };
 
-#include <qbsp/brush.hh>
 #include <qbsp/csg4.hh>
 #include <qbsp/solidbsp.hh>
 #include <qbsp/merge.hh>
diff --git a/include/qbsp/winding.hh b/include/qbsp/winding.hh
index e89de399..45c5043f 100644
--- a/include/qbsp/winding.hh
+++ b/include/qbsp/winding.hh
@@ -23,6 +23,8 @@
 
 #include "common/polylib.hh"
 
+constexpr size_t MAXEDGES = 64;
+
 using winding_t = polylib::winding_base_t<MAXEDGES>;
 
-winding_t BaseWindingForPlane(const qplane3d &p);
\ No newline at end of file
+winding_t BaseWindingForPlane(const qplane3d &p);
diff --git a/qbsp/brush.cc b/qbsp/brush.cc
index 003eaa76..6a09851e 100644
--- a/qbsp/brush.cc
+++ b/qbsp/brush.cc
@@ -23,6 +23,8 @@
 #include <cstring>
 #include <list>
 
+#include <qbsp/brush.hh>
+
 #include <qbsp/qbsp.hh>
 
 /*
diff --git a/qbsp/csg4.cc b/qbsp/csg4.cc
index 5dc65c36..b91013aa 100644
--- a/qbsp/csg4.cc
+++ b/qbsp/csg4.cc
@@ -22,6 +22,8 @@
 
 #include <qbsp/qbsp.hh>
 
+#include <qbsp/brush.hh>
+
 #include <atomic>
 #include <mutex>
 
diff --git a/qbsp/exportobj.cc b/qbsp/exportobj.cc
index 2d042895..fc51b5bb 100644
--- a/qbsp/exportobj.cc
+++ b/qbsp/exportobj.cc
@@ -19,6 +19,7 @@
 */
 
 #include <qbsp/qbsp.hh>
+#include <qbsp/brush.hh>
 #include <qbsp/wad.hh>
 
 #include <unordered_set>
diff --git a/qbsp/map.cc b/qbsp/map.cc
index 5048298d..ac85923e 100644
--- a/qbsp/map.cc
+++ b/qbsp/map.cc
@@ -33,6 +33,7 @@
 #include <fmt/ostream.h>
 
 #include <qbsp/qbsp.hh>
+#include <qbsp/brush.hh>
 #include <common/parser.hh>
 #include <common/fs.hh>
 #include <common/imglib.hh>
diff --git a/qbsp/qbsp.cc b/qbsp/qbsp.cc
index a1176646..ab64f2a6 100644
--- a/qbsp/qbsp.cc
+++ b/qbsp/qbsp.cc
@@ -28,6 +28,7 @@
 #include <common/fs.hh>
 #include <common/threads.hh>
 #include <common/settings.hh>
+#include <qbsp/brush.hh>
 #include <qbsp/qbsp.hh>
 #include <qbsp/wad.hh>
 #include <fmt/chrono.h>
diff --git a/qbsp/solidbsp.cc b/qbsp/solidbsp.cc
index 343c7324..0fbcec59 100644
--- a/qbsp/solidbsp.cc
+++ b/qbsp/solidbsp.cc
@@ -22,6 +22,7 @@
 #include <climits>
 
 #include <qbsp/qbsp.hh>
+#include <qbsp/brush.hh>
 
 #include <list>
 #include <atomic>
diff --git a/qbsp/surfaces.cc b/qbsp/surfaces.cc
index 9272b3cc..890fd280 100644
--- a/qbsp/surfaces.cc
+++ b/qbsp/surfaces.cc
@@ -20,6 +20,8 @@
 */
 
 #include <qbsp/qbsp.hh>
+#include <qbsp/brush.hh>
+
 #include <map>
 #include <list>