From de68bee886c7e903ea99ebb45429f83d3038dbbe Mon Sep 17 00:00:00 2001
From: Eric Wasylishen <ewasylishen@gmail.com>
Date: Sun, 3 Jul 2022 21:36:17 -0600
Subject: [PATCH] qbsp: move tree_t to tree.hh

---
 include/qbsp/portals.hh |  8 +-------
 include/qbsp/tree.hh    | 14 ++++++++++++++
 qbsp/brushbsp.cc        |  1 +
 qbsp/outside.cc         |  1 +
 qbsp/portals.cc         |  1 +
 qbsp/prtfile.cc         |  1 +
 6 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/include/qbsp/portals.hh b/include/qbsp/portals.hh
index 598f0a7e..7de46844 100644
--- a/include/qbsp/portals.hh
+++ b/include/qbsp/portals.hh
@@ -29,6 +29,7 @@
 #include <memory>
 
 struct side_t;
+struct tree_t;
 
 struct portal_t
 {
@@ -43,13 +44,6 @@ struct portal_t
     face_t *face[2]; // output face in bsp file
 };
 
-struct tree_t
-{
-    std::unique_ptr<node_t> headnode;
-    node_t outside_node = {}; // portals outside the world face this
-    aabb3d bounds;
-};
-
 struct portalstats_t {
     std::atomic<int> c_tinyportals;
 };
diff --git a/include/qbsp/tree.hh b/include/qbsp/tree.hh
index ce4b9c4f..fb4fc093 100644
--- a/include/qbsp/tree.hh
+++ b/include/qbsp/tree.hh
@@ -21,7 +21,21 @@
 
 #pragma once
 
+#include <qbsp/qbsp.hh>
+#include <qbsp/brush.hh>
+
+#include <common/qvec.hh>
+
+#include <memory>
+
 struct node_t;
 
+struct tree_t
+{
+    std::unique_ptr<node_t> headnode;
+    node_t outside_node = {}; // portals outside the world face this
+    aabb3d bounds;
+};
+
 void DetailToSolid(node_t *node);
 void PruneNodes(node_t *node);
diff --git a/qbsp/brushbsp.cc b/qbsp/brushbsp.cc
index 5f0c8b3e..fbbd7d85 100644
--- a/qbsp/brushbsp.cc
+++ b/qbsp/brushbsp.cc
@@ -29,6 +29,7 @@
 #include <qbsp/map.hh>
 #include <qbsp/portals.hh>
 #include <qbsp/qbsp.hh>
+#include <qbsp/tree.hh>
 
 #include <list>
 #include <atomic>
diff --git a/qbsp/outside.cc b/qbsp/outside.cc
index 96cd775e..96683f81 100644
--- a/qbsp/outside.cc
+++ b/qbsp/outside.cc
@@ -24,6 +24,7 @@
 #include <qbsp/map.hh>
 #include <qbsp/portals.hh>
 #include <qbsp/qbsp.hh>
+#include <qbsp/tree.hh>
 
 #include <climits>
 #include <vector>
diff --git a/qbsp/portals.cc b/qbsp/portals.cc
index b8a3e5b7..be2f4a7d 100644
--- a/qbsp/portals.cc
+++ b/qbsp/portals.cc
@@ -27,6 +27,7 @@
 #include <qbsp/brushbsp.hh>
 #include <qbsp/qbsp.hh>
 #include <qbsp/outside.hh>
+#include <qbsp/tree.hh>
 
 #include <atomic>
 
diff --git a/qbsp/prtfile.cc b/qbsp/prtfile.cc
index 5aef2c4f..70b018a2 100644
--- a/qbsp/prtfile.cc
+++ b/qbsp/prtfile.cc
@@ -24,6 +24,7 @@
 #include <qbsp/map.hh>
 #include <qbsp/portals.hh>
 #include <qbsp/qbsp.hh>
+#include <qbsp/tree.hh>
 
 #include <fstream>
 #include <fmt/ostream.h>