Map Renderer|SectionEdge: SectionEdge can now be used for Polyobj sec…

…tions also
skyjake · May 2, 2013 · 5a89319 · 5a89319
1 parent 59ae4be
commit 5a89319
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 19 deletions.
diff --git a/doomsday/client/include/map/hedge.h b/doomsday/client/include/map/hedge.h
@@ -51,12 +51,6 @@ class SectionEdge
 
     void prepare(coord_t bottom, coord_t top);
 
-    void configure() {
-        _firstIntercept = &wallDivs.first();
-        _lastIntercept = &wallDivs.last();
-        _interceptCount = wallDivs.count();
-    }
-
     int divisionCount() const { return _interceptCount - 2; }
 
     de::WallDivs::Intercept &firstDivision() const;

diff --git a/doomsday/client/src/render/rend_main.cpp b/doomsday/client/src/render/rend_main.cpp
@@ -2010,16 +2010,7 @@ static bool writeWallSections2(HEdge &hedge, int sections)
     return opaque;
 }
 
-static void prepareSectionEdgePolyobj(SectionEdge &edge, HEdge &hedge, int section,
-    coord_t bottom, coord_t top, int right)
-{
-    DENG2_UNUSED3(hedge, section, right);
-    edge.wallDivs.intercept(bottom); // First node.
-    edge.wallDivs.intercept(top); // Last node.
-    edge.configure();
-}
-
-static bool prepareSectionEdgesPolyobj(HEdge &hedge, int section,
+static bool preparePolyobjSectionEdges(HEdge &hedge, int section,
     SectionEdge &leftEdge, SectionEdge &rightEdge, Vector2f &materialOrigin)
 {
     BspLeaf *leaf = currentBspLeaf;
@@ -2031,8 +2022,8 @@ static bool prepareSectionEdgesPolyobj(HEdge &hedge, int section,
 
     if(!visible) return false;
 
-    prepareSectionEdgePolyobj(leftEdge, hedge, section, bottom, top, false /*left edge */);
-    prepareSectionEdgePolyobj(rightEdge, hedge, section, bottom, top, true /*right edge */);
+    leftEdge.prepare(bottom, top);
+    rightEdge.prepare(bottom, top);
 
     return true;
 }
@@ -2055,7 +2046,7 @@ static bool writeWallSections2Polyobj(HEdge &hedge, int sections)
     Vector2f materialOrigin;
     bool opaque = false;
 
-    if(prepareSectionEdgesPolyobj(hedge, section, leftEdge, rightEdge, materialOrigin))
+    if(preparePolyobjSectionEdges(hedge, section, leftEdge, rightEdge, materialOrigin))
     {
         opaque = writeWallSection(leftEdge, rightEdge, materialOrigin,
                                   hedge, hedge.biasSurfaceForGeometryGroup(section));