Refactor|World|SectorCluster: Moved SectorCluster out of Sector

skyjake · Apr 24, 2014 · 8678ec9 · 8678ec9
1 parent 22d7b61
commit 8678ec9
Show file tree

Hide file tree

Showing 39 changed files with 508 additions and 456 deletions.
diff --git a/doomsday/client/client.pro b/doomsday/client/client.pro
@@ -158,6 +158,7 @@ DENG_CONVENIENCE_HEADERS += \
     include/Plane \
     include/Polyobj \
     include/Sector \
+    include/SectorCluster \
     include/SettingsRegister \
     include/SkyFixEdge \
     include/Sprite \
@@ -466,6 +467,7 @@ DENG_HEADERS += \
     include/world/propertyvalue.h \
     include/world/reject.h \
     include/world/sector.h \
+    include/world/sectorcluster.h \
     include/world/surface.h \
     include/world/thinkers.h \
     include/world/vertex.h \

diff --git a/doomsday/client/include/SectorCluster b/doomsday/client/include/SectorCluster
@@ -0,0 +1 @@
+#include "world/sectorcluster.h"
diff --git a/doomsday/client/include/render/rend_main.h b/doomsday/client/include/render/rend_main.h
@@ -1,7 +1,7 @@
-/** @file render/rend_main.h Core of the rendering subsystem.
+/** @file rend_main.h Core of the rendering subsystem.
  *
  * @authors Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
- * @authors Copyright © 2006-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2006-2014 Daniel Swanson <danij@dengine.net>
  *
  * @par License
  * GPL: http://www.gnu.org/licenses/gpl.html
@@ -26,12 +26,14 @@
 
 #include "dd_types.h"
 #include "def_main.h"
-#include "Sector"
 #include "MaterialVariantSpec"
 #include "WallEdge"
 #include <de/Vector>
 #include <de/Matrix>
 
+class Sector;
+class SectorCluster;
+
 namespace de {
 class Map;
 }

diff --git a/doomsday/client/include/world/bspleaf.h b/doomsday/client/include/world/bspleaf.h
@@ -1,7 +1,7 @@
 /** @file bspleaf.h  World map BSP leaf.
  *
  * @authors Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
- * @authors Copyright © 2006-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2006-2014 Daniel Swanson <danij@dengine.net>
  *
  * @par License
  * GPL: http://www.gnu.org/licenses/gpl.html
@@ -35,6 +35,7 @@
 #include <de/Vector>
 #include <QSet>
 
+class SectorCluster;
 struct polyobj_s;
 #ifdef __CLIENT__
 class BiasDigest;

diff --git a/doomsday/client/include/world/map.h b/doomsday/client/include/world/map.h
@@ -25,7 +25,6 @@
 
 #include "Line"
 #include "Polyobj"
-#include "Sector"
 
 #ifdef __CLIENT__
 #  include "client/clmobjhash.h"
@@ -50,6 +49,8 @@
 class BspLeaf;
 class BspNode;
 class Plane;
+class Sector;
+class SectorCluster;
 class Surface;
 class Vertex;
 
@@ -124,7 +125,7 @@ class Map
 #endif
 
     /*
-     * Linked-element lists/sets:
+     * Linked-element lists:
      */
     typedef Mesh::Vertexes   Vertexes;
     typedef QList<Line *>    Lines;

diff --git a/doomsday/client/include/world/p_object.h b/doomsday/client/include/world/p_object.h
@@ -1,7 +1,7 @@
-/** @file p_object.h World map objects.
+/** @file p_object.h  World map objects.
  *
  * @authors Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
- * @authors Copyright © 2005-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2005-2014 Daniel Swanson <danij@dengine.net>
  * @authors Copyright © 2006 Jamie Jones <jamie_jones_au@yahoo.com.au>
  *
  * @par License
@@ -31,12 +31,12 @@
 #  include "ModelDef"
 #  include "Sprite"
 #endif
-#include "Sector"
 #include <de/Vector>
 #include <de/aabox.h>
 
 class BspLeaf;
 class Plane;
+class SectorCluster;
 
 // This macro can be used to calculate a mobj-specific 'random' number.
 #define MOBJ_TO_ID(mo)          ( (long)(mo)->thinker.id * 48 + ((unsigned long)(mo)/1000) )