Client: Improving SoC in the edge components

Moved map coordinate space origin from EdgeAttribs to implementors
of WorldEdge, added flag WallSpec::NoEdgeDivisions.

doomsday/client/include/render/skyfixedge.h

@@ -67,6 +67,11 @@ class SkyFixEdge : public WorldEdge
      */
     SkyFixEdge(HEdge &hedge, FixType fixType, int edge, float materialOffsetS = 0);
 
+    /**
+     * Returns the origin of the edge in the map coordinate space.
+     */
+    Vector2d const &origin() const;
+
     /// Implement IEdge.
     bool isValid() const;
 

doomsday/client/include/render/walledge.h

@@ -86,6 +86,11 @@ class WallEdge : public WorldEdge
         return at(index);
     }
 
+    /**
+     * Returns the origin of the edge in the map coordinate space.
+     */
+    Vector2d const &origin() const;
+
     WallSpec const &spec() const;
 
     Line::Side &mapSide() const;

doomsday/client/include/render/wallspec.h

@@ -62,8 +62,11 @@ class WallSpec
         /// Do not apply angle based light level deltas.
         NoLightDeltas         = 0x080,
 
+        /// Do not intercept edges with neighboring geometries.
+        NoEdgeDivisions       = 0x100,
+
         /// Do not smooth edge normals.
-        NoEdgeNormalSmoothing = 0x100,
+        NoEdgeNormalSmoothing = 0x200,
 
         DefaultFlags = ForceOpaque | SkyClip
     };

doomsday/client/src/render/rend_fakeradio.cpp

@@ -1088,7 +1088,7 @@ void Rend_RadioWallSection(WallEdge const &leftEdge, WallEdge const &rightEdge,
 
     coord_t const lineLength    = side.line().length();
     coord_t const sectionOffset = leftEdge.mapSideOffset();
-    coord_t const sectionWidth  = de::abs(Vector2d(rightEdge.origin - leftEdge.origin).length());
+    coord_t const sectionWidth  = de::abs(Vector2d(rightEdge.origin() - leftEdge.origin()).length());
 
     LineSideRadioData &frData = Rend_RadioDataForLineSide(side);
 

doomsday/client/src/render/rend_main.cpp

@@ -1301,7 +1301,7 @@ static void wallSectionLightLevelDeltas(WallEdge const &leftEdge, WallEdge const
         // vertical edges of this wall section.
         coord_t const lineLength = leftEdge.mapSide().line().length();
         coord_t const sectionOffset = leftEdge.mapSideOffset();
-        coord_t const sectionWidth = de::abs(Vector2d(rightEdge.origin - leftEdge.origin).length());
+        coord_t const sectionWidth = de::abs(Vector2d(rightEdge.origin() - leftEdge.origin()).length());
 
         float deltaDiff = rightDelta - leftDelta;
         rightDelta = leftDelta + ((sectionOffset + sectionWidth) / lineLength) * deltaDiff;
@@ -1455,7 +1455,7 @@ static void writeWallSection(HEdge &hedge, int section,
         parm.materialScale       = &materialScale;
 
         parm.isWall = true;
-        parm.wall.sectionWidth   = de::abs(Vector2d(rightEdge.origin - leftEdge.origin).length());
+        parm.wall.sectionWidth   = de::abs(Vector2d(rightEdge.origin() - leftEdge.origin()).length());
         parm.wall.leftEdge       = &leftEdge;
         parm.wall.rightEdge      = &rightEdge;
 

doomsday/client/src/render/skyfixedge.cpp

@@ -79,7 +79,7 @@ void SkyFixEdge::Event::setDistance(coord_t distance)
 
 Vector3d SkyFixEdge::Event::origin() const
 {
-    return Vector3d(d->owner.origin, d->distance);
+    return Vector3d(d->owner.origin(), d->distance);
 }
 
 DENG2_PIMPL(SkyFixEdge)
@@ -190,14 +190,18 @@ DENG2_PIMPL(SkyFixEdge)
 };
 
 SkyFixEdge::SkyFixEdge(HEdge &hedge, FixType fixType, int edge, float materialOffsetS)
-    : WorldEdge(EdgeAttribs(edge? hedge.twin().origin() : hedge.origin(),
-                            Vector2f(materialOffsetS, 0))),
+    : WorldEdge(EdgeAttribs(Vector2f(materialOffsetS, 0))),
       d(new Instance(this, hedge, fixType, edge))
 {
     /// @todo Defer until necessary.
     d->prepare();
 }
 
+Vector2d const &SkyFixEdge::origin() const
+{
+    return (d->edge? d->hedge->twin() : *d->hedge).origin();
+}
+
 bool SkyFixEdge::isValid() const
 {
     return d->isValid;

doomsday/client/src/render/walledge.cpp

@@ -76,7 +76,7 @@ void WallEdge::Event::setDistance(double newDistance)
 
 Vector3d WallEdge::Event::origin() const
 {
-    return Vector3d(d->owner.origin, distance());
+    return Vector3d(d->owner.origin(), distance());
 }
 
 static bool eventSorter(WorldEdge::Event *a, WorldEdge::Event *b)
@@ -207,7 +207,7 @@ DENG2_PIMPL(WallEdge), public IHPlane
         // Any work to do?
         if(!needSortEvents) return;
 
-        qSort(events.begin(), events.top(), eventSorter);
+        qSort(events.begin(), events.end(), eventSorter);
         needSortEvents = false;
     }
 
@@ -273,14 +273,10 @@ DENG2_PIMPL(WallEdge), public IHPlane
     {
         DENG_ASSERT(top > bottom);
 
-        // Retrieve the bottom owner node.
+        // Retrieve the vertex owner node.
         LineOwner *base = mapSide->line().vertexOwner(*mapVertex);
         if(!base) return;
 
-        // Check for neighborhood division?
-        if(spec.section == Line::Side::Middle && mapSide->back().hasSector())
-            return;
-
         Sector const *frontSec = mapSide->sectorPtr();
         LineOwner *own = base;
         bool stopScan = false;
@@ -433,7 +429,7 @@ DENG2_PIMPL(WallEdge), public IHPlane
         coord_t const hi = top.distance();
 
         // Add intecepts for neighbor planes?
-        if(!de::fequal(hi, lo))
+        if(!spec.flags.testFlag(WallSpec::NoEdgeDivisions) && !de::fequal(hi, lo))
         {
             configure(Partition(mapVertex->origin(), Vector2d(0, hi - lo)));
 
@@ -467,8 +463,7 @@ DENG2_PIMPL(WallEdge), public IHPlane
 };
 
 WallEdge::WallEdge(WallSpec const &spec, HEdge &hedge, int edge)
-    : WorldEdge(EdgeAttribs((edge? hedge.twin() : hedge.vertex()).origin(),
-                            Vector2f(hedge.lineOffset() + (edge? hedge.length() : 0), 0))),
+    : WorldEdge(EdgeAttribs(Vector2f(hedge.lineOffset() + (edge? hedge.length() : 0), 0))),
       d(new Instance(this, spec, &hedge.lineSide(), edge,
                            hedge.lineOffset() + (edge? hedge.length() : 0),
                            edge? &hedge.twin().vertex() : &hedge.vertex()))
@@ -479,9 +474,9 @@ WallEdge::WallEdge(WallSpec const &spec, HEdge &hedge, int edge)
     d->prepare();
 }
 
-bool WallEdge::isValid() const
+Vector2d const &WallEdge::origin() const
 {
-    return d->isValid;
+    return d->mapVertex->origin();
 }
 
 WallSpec const &WallEdge::spec() const
@@ -525,6 +520,11 @@ WallEdge::Event const &WallEdge::at(EventIndex index) const
     return *events().at(index);
 }
 
+bool WallEdge::isValid() const
+{
+    return d->isValid;
+}
+
 WallEdge::Event const &WallEdge::first() const
 {
     return at(0);

doomsday/client/src/render/wallspec.cpp

@@ -50,7 +50,10 @@ WallSpec WallSpec::fromMapSide(Line::Side const &side, int section) // static
     WallSpec spec(section);
 
     if(side.line().definesPolyobj() || isTwoSidedMiddle)
+    {
         spec.flags &= ~WallSpec::ForceOpaque;
+        spec.flags |= WallSpec::NoEdgeDivisions;
+    }
 
     if(isTwoSidedMiddle)
     {