Fixed|BSP Builder: Space partitioner incorrectly assigned sectors adj…

…oining map hacks

When building line segments along the partitioning half-plane it is
not simply the self-referencing state of the intercepted map line
which is important when choosing a sector. Rather, it is the lines
from which a sector will be chosen whose self-referencing state is
important.

The older "previous sector" kludge which achieved limited success at
fixing this has now been removed.

This commit fixes a variety of maps such as; not fully deep water in
TNT MAP31; sunken barrels in AV MAP15; dark nukege in KSutra MAP13.

doomsday/client/include/world/bsp/hplane.h

@@ -28,8 +28,6 @@
 
 #include <QList>
 
-#include <de/mathutil.h> // M_InverseAngle
-
 #include <de/Vector>
 
 #include "world/bsp/linesegment.h"
@@ -59,19 +57,18 @@ class HPlane
      */
     class Intercept
     {
-    public: /// @todo make private:
-        // True if this intersection was on a self-referencing line.
-        bool selfRef;
-
-        /// Sector on each side of the vertex (along the partition), or @c 0
-        /// if that direction is "closed" (i.e., the intercept point is along
-        /// a map line that has no Sector on the relevant side).
-        Sector *before;
-        Sector *after;
-        bool meetAtVertex;
-
     public:
-        Intercept(double distance, LineSegment::Side &lineSeg, int edge,
+        /**
+         * Construct a new intercept.
+         *
+         * @param distance      Distance from the origin of the partition line.
+         * @param lineSeg       The intercepted line segment.
+         * @param edge          Relative edge of the line segment nearest to the
+         *                      interception point.
+         * @param meetAtVertex  @c true= consider the interception incident with
+         *                      nearest edge.
+         */
+        Intercept(double distance, LineSegmentSide &lineSeg, int edge,
                   bool meetAtVertex);
 
         bool operator < (Intercept const &other) const {
@@ -93,7 +90,12 @@ class HPlane
         /**
          * Returns the intercepted line segment.
          */
-        LineSegment::Side &lineSegment() const;
+        LineSegmentSide &lineSegment() const;
+
+        inline bool lineSegmentIsSelfReferencing() const {
+            LineSegmentSide &seg = lineSegment();
+            return seg.hasMapLine() && seg.mapLine().isSelfReferencing();
+        }
 
         /**
          * Returns the identifier for the relevant edge of the intercepted
@@ -110,16 +112,33 @@ class HPlane
             return lineSegment().vertex(lineSegmentEdge());
         }
 
+        Sector *before() const;
+        Sector *after() const;
+
+        LineSegmentSide *beforeLineSegment() const;
+        LineSegmentSide *afterLineSegment() const;
+
+        bool meetAtVertex() const;
+
 #ifdef DENG_DEBUG
         void debugPrint() const;
 #endif
 
+        friend class HPlane;
+
     private:
+        /// Sector on each side of the vertex (along the partition), or @c 0
+        /// if that direction is "closed" (i.e., the intercept point is along
+        /// a map line that has no Sector on the relevant side).
+        LineSegmentSide *_before;
+        LineSegmentSide *_after;
+        bool _meetAtVertex;
+
         /// Distance along the half-plane relative to the origin.
         double _distance;
 
         // The intercepted line segment and edge identifier.
-        LineSegment::Side *_lineSeg;
+        LineSegmentSide *_lineSeg;
         int _edge;
     };
 
@@ -136,7 +155,7 @@ class HPlane
      *
      * @param newLineSeg  The "new" line segment to configure using.
      */
-    void configure(LineSegment::Side const &newLineSeg);
+    void configure(LineSegmentSide const &newLineSeg);
 
     /**
      * Perform intersection of the half-plane with the specified @a lineSeg
@@ -150,7 +169,7 @@ class HPlane
      * @return  Distance to intersection point along the half-plane (relative
      *          to the origin).
      */
-    double intersect(LineSegment::Side const &lineSeg, int edge);
+    double intersect(LineSegmentSide const &lineSeg, int edge);
 
     /**
      * Perform intersection of the half-plane with the specified @a lineSeg.
@@ -171,7 +190,7 @@ class HPlane
      *
      * @return  The resultant new intercept; otherwise @a 0.
      */
-    Intercept *intercept(LineSegment::Side const &lineSeg, int edge,
+    Intercept *intercept(LineSegmentSide const &lineSeg, int edge,
                          bool meetAtVertex, EdgeTips const &edgeTips);
 
     /**
@@ -222,7 +241,7 @@ class HPlane
      *
      * @see angle()
      */
-    inline coord_t inverseAngle() const { return M_InverseAngle(angle()); }
+    coord_t inverseAngle() const;
 
     /**
      * Returns the logical @em slopetype for the partition line (which, is determined
@@ -238,7 +257,7 @@ class HPlane
      * chosen as the half-plane partition. May return @c 0 (if no map line was
      * attributed).
      */
-    LineSegment::Side *lineSegment() const;
+    LineSegmentSide *lineSegment() const;
 
     /**
      * Calculate @em perpendicular distances from one or both of the vertexe(s)
@@ -254,7 +273,7 @@ class HPlane
      * @param fromDist  Perpendicular distance from the "from" vertex. Can be @c 0.
      * @param toDist    Perpendicular distance from the "to" vertex. Can be @c 0.
      */
-    void distance(LineSegment::Side const &lineSegment, coord_t *fromDist = 0,
+    void distance(LineSegmentSide const &lineSegment, coord_t *fromDist = 0,
                   coord_t *toDist = 0) const;
 
     /**
@@ -270,7 +289,7 @@ class HPlane
      *
      * @return LineRelationship between the partition line and the line segment.
      */
-    LineRelationship relationship(LineSegment::Side const &lineSegment,
+    LineRelationship relationship(LineSegmentSide const &lineSegment,
                                   coord_t *retFromDist, coord_t *retToDist) const;
 
     /**
@@ -283,10 +302,17 @@ class HPlane
      */
     Intercepts const &intercepts() const;
 
+    /**
+     * Returns the current number of half-plane intercepts.
+     */
+    inline int interceptCount() const { return intercepts().count(); }
+
 private:
     DENG2_PRIVATE(d)
 };
 
+typedef HPlane::Intercept HPlaneIntercept;
+
 } // namespace bsp
 } // namespace de
 

doomsday/client/include/world/bsp/linesegment.h

@@ -163,6 +163,9 @@ class LineSegment
          */
         bool hasMapSide() const;
 
+        /// @copydoc hasMapSide()
+        inline bool hasMapLine() { return hasMapSide(); }
+
         /**
          * Returns the map LineSide attributed to "this" side of the line segment.
          *
@@ -559,6 +562,8 @@ class LineSegment
     DENG2_PRIVATE(d)
 };
 
+typedef LineSegment::Side LineSegmentSide;
+
 } // namespace bsp
 } // namespace de