Map Renderer|Client: Use a viewer-local QBitArray for flagging visibl…

…e BSP leafs; cleanup

doomsday/client/include/render/r_main.h

@@ -161,6 +161,18 @@ void R_ClearViewData(void);
  */
 void R_BeginFrame(void);
 
+/**
+ * Returns @c true iff the BSP leaf is marked as visible for the current frame.
+ * @see markVisible()
+ */
+bool R_ViewerBspLeafIsVisible(BspLeaf const &bspLeaf);
+
+/**
+ * Mark the BSP leaf as visible for the current frame.
+ * @see isVisible()
+ */
+void R_ViewerBspLeafMarkVisible(BspLeaf const &bspLeaf, bool yes = true);
+
 /// @return  Distance in map space units between the lumobj and viewer.
 double R_ViewerLumobjDistance(int idx);
 

doomsday/client/include/world/bspleaf.h

@@ -371,18 +371,6 @@ class BspLeaf : public de::MapElement
      */
     void setLastSpriteProjectFrame(int newFrame);
 
-    /**
-     * Returns @c true iff the BSP leaf is marked as visible for the current frame.
-     * @see markVisible()
-     */
-    bool isVisible() const;
-
-    /**
-     * Mark the BSP leaf as visible for the current frame.
-     * @see isVisible()
-     */
-    void markVisible(bool yes = true);
-
 #endif // __CLIENT__
 
 private:

doomsday/client/src/render/r_fakeradio.cpp

@@ -224,9 +224,6 @@ void Rend_RadioInitForMap(Map &map)
      *    shadow edges cross one of the BSP leaf's edges (not parallel),
      *    link the line to the BspLeaf.
      */
-
-    AABoxd bounds;
-
     foreach(Line *line, map.lines())
     {
         if(!Rend_RadioLineCastsShadow(*line)) continue;
@@ -236,14 +233,15 @@ void Rend_RadioInitForMap(Map &map)
         {
             LineSide &side = line->side(i);
 
-            if(!side.hasSector() || !side.hasSections()) continue;
+            if(!side.hasSector()) continue;
+            if(!side.hasSections()) continue;
 
-            Vertex &vtx0 = line->vertex(i);
-            Vertex &vtx1 = line->vertex(i^1);
-            LineOwner &vo0 = line->vertexOwner(i)->next();
-            LineOwner &vo1 = line->vertexOwner(i^1)->prev();
+            Vertex const &vtx0 = line->vertex(i);
+            Vertex const &vtx1 = line->vertex(i^1);
+            LineOwner const &vo0 = line->vertexOwner(i)->next();
+            LineOwner const &vo1 = line->vertexOwner(i^1)->prev();
 
-            V2d_CopyBox(bounds.arvec2, line->aaBox().arvec2);
+            AABoxd bounds = line->aaBox();
 
             // Use the extended points, they are wider than inoffsets.
             Vector2d point = vtx0.origin() + vo0.extendedShadowOffset();

doomsday/client/src/render/r_main.cpp

@@ -21,6 +21,10 @@
 #include <cmath>
 #include <cstring>
 
+#ifdef __CLIENT__
+#include <QBitArray>
+#endif
+
 #include "de_base.h"
 #include "de_console.h"
 #include "de_system.h"
@@ -99,6 +103,7 @@ boolean loInited;
 static coord_t *luminousDist;
 static byte *luminousClipped;
 static uint *luminousOrder;
+static QBitArray bspLeafsVisible;
 #endif
 
 int psp3d;
@@ -1091,7 +1096,8 @@ DENG_EXTERN_C void R_RenderPlayerView(int num)
 
     // Too early? Game has not configured the view window?
     viewdata_t *vd = &viewDataOfConsole[num];
-    if(vd->window.size.width == 0 || vd->window.size.height == 0) return;
+    if(vd->window.size.width == 0 || vd->window.size.height == 0)
+        return;
 
     // Setup for rendering the frame.
     R_SetupFrame(player);
@@ -1304,6 +1310,18 @@ void R_ClearViewData()
     M_Free(luminousOrder); luminousOrder = 0;
 }
 
+bool R_ViewerBspLeafIsVisible(BspLeaf const &bspLeaf)
+{
+    DENG2_ASSERT(bspLeaf.indexInMap() != MapElement::NoIndex);
+    return bspLeafsVisible.testBit(bspLeaf.indexInMap());
+}
+
+void R_ViewerBspLeafMarkVisible(BspLeaf const &bspLeaf, bool yes)
+{
+    DENG2_ASSERT(bspLeaf.indexInMap() != MapElement::NoIndex);
+    bspLeafsVisible.setBit(bspLeaf.indexInMap(), yes);
+}
+
 double R_ViewerLumobjDistance(int idx)
 {
     /// @todo Do not assume the current map.
@@ -1359,6 +1377,10 @@ void R_BeginFrame()
     Rend_ProjectorReset();
 
     Map &map = App_World().map();
+
+    bspLeafsVisible.resize(map.bspLeafCount());
+    bspLeafsVisible.fill(false);
+
     int numLuminous = map.lumobjCount();
     if(!(numLuminous > 0)) return;
 

doomsday/client/src/render/rend_fakeradio.cpp

@@ -1292,8 +1292,11 @@ void Rend_RadioBspLeafEdges(BspLeaf &bspLeaf)
 {
     DENG_ASSERT(bspLeaf.hasCluster());
 
-    if(!rendFakeRadio || levelFullBright)
-        return;
+    if(!rendFakeRadio) return;
+
+    if(levelFullBright) return;
+
+    if(bspLeaf.shadowLines().isEmpty()) return;
 
     static int doPlaneSize = 0;
     static byte *doPlanes = 0;

doomsday/client/src/render/rend_main.cpp

@@ -2496,7 +2496,7 @@ static void drawCurrentLeaf()
     BspLeaf *leaf = currentBspLeaf;
 
     // Mark the leaf as visible for this frame.
-    leaf->markVisible();
+    R_ViewerBspLeafMarkVisible(*leaf);
 
     markLeafFrontFacingWalls();
 
@@ -3172,7 +3172,7 @@ static int drawMobjBBox(thinker_t *th, void * /*context*/)
     if(mo == ddPlayers[consolePlayer].shared.mo)
         return false; // Continue iteration.
     // Is it vissible?
-    if(!Mobj_IsLinked(*mo) || !Mobj_BspLeafAtOrigin(*mo).isVisible())
+    if(!Mobj_IsLinked(*mo) || !R_ViewerBspLeafIsVisible(Mobj_BspLeafAtOrigin(*mo)))
         return false; // Continue iteration.
 
     ddouble const distToEye = (eyeOrigin - Mobj_Origin(*mo)).length();

doomsday/client/src/render/rend_particle.cpp

@@ -321,7 +321,7 @@ static int populateSortBuffer(ptcgen_t *gen, void *parameters)
             continue;
 
         // Is the particle's sector visible?
-        if(!pt->bspLeaf->isVisible())
+        if(!R_ViewerBspLeafIsVisible(*pt->bspLeaf))
             continue; // No; this particle can't be seen.
 
         // Don't allow zero distance.

doomsday/client/src/world/blockmap.cpp

@@ -466,7 +466,7 @@ bool Blockmap::link(CellBlock const &cellBlock_, void *elem)
     for(cell.y = cellBlock.min.y; cell.y < cellBlock.max.y; ++cell.y)
     for(cell.x = cellBlock.min.x; cell.x < cellBlock.max.x; ++cell.x)
     {
-        Instance::Node *node = d->findLeaf(cell);
+        Instance::Node *node = d->findLeaf(cell, true/* can create*/);
         if(!node) continue;
 
         if(CellData *cellData = node->leafData)

doomsday/client/src/world/bspleaf.cpp

@@ -87,8 +87,6 @@ DENG2_PIMPL(BspLeaf)
     Lumobjs lumobjs;                ///< Linked lumobjs (not owned).
     ShadowLines shadowLines;        ///< Linked map lines for fake radio shadowing.
     AudioEnvironmentFactors reverb; ///< Cached characteristics.
-
-    bool visible;                   ///< @c true= marked as visible for the current frame.
 #endif // __CLIENT__
 
     /// Used by legacy algorithms to prevent repeated processing.
@@ -102,7 +100,6 @@ DENG2_PIMPL(BspLeaf)
           fanBase(0),
           needUpdateFanBase(true),
           addSpriteCount(0),
-          visible(false),
 #endif
           validCount(0)
     {
@@ -678,13 +675,4 @@ void BspLeaf::setLastSpriteProjectFrame(int newFrameCount)
     d->addSpriteCount = newFrameCount;
 }
 
-bool BspLeaf::isVisible() const
-{
-    return d->visible;
-}
-
-void BspLeaf::markVisible(bool yes)
-{
-    d->visible = yes;
-}
 #endif // __CLIENT__