Cleanup|Client|World: Disabled more code related to “bledit”

IssueID #2197

doomsday/apps/client/include/client/clientsubsector.h

@@ -33,7 +33,7 @@
 
 #include "render/ilightsource.h"
 
-class Shard;
+//class Shard;
 
 namespace world {
 
@@ -142,7 +142,6 @@ class ClientSubsector : public Subsector, public ILightSource
      * @see Map::biasLastChangeOnFrame()
      */
     de::duint biasLastChangeOnFrame() const;
-#endif
 
     /**
      * Returns the geometry Shard for the specified @a mapElement and geometry
@@ -156,7 +155,6 @@ class ClientSubsector : public Subsector, public ILightSource
      */
     Shard &shard(MapElement &mapElement, de::dint geomId);
 
-#if 0
     /**
      * Shards owned by the Subsector should call this periodically to update
      * their bias lighting contributions.

doomsday/apps/client/include/render/shard.h

@@ -1,3 +1,5 @@
+#if 0
+
 /** @file shard.h  3D map geometry fragment.
  *
  * @authors Copyright © 2014 Daniel Swanson <danij@dengine.net>
@@ -95,3 +97,5 @@ class Shard
 };
 
 #endif  // DENG_CLIENT_RENDER_SHARD_H
+
+#endif

doomsday/apps/client/include/world/clientserverworld.h

@@ -31,7 +31,7 @@
 namespace world {
 class Map;
 #ifdef __CLIENT__
-class Hand;
+//class Hand;
 #endif
 }
 
@@ -140,6 +140,7 @@ class ClientServerWorld : public World
      */
     void endFrame();
 
+#if 0
     /**
      * Returns the hand of the "user" in the world. Used for manipulating elements
      * for the purposes of runtime map editing.
@@ -148,6 +149,7 @@ class ClientServerWorld : public World
      *                  written here if not @c nullptr.
      */
     world::Hand &hand(de::ddouble *distance = nullptr) const;
+#endif
 
 #endif  // __CLIENT__
 

doomsday/apps/client/include/world/grabbable.h

@@ -1,3 +1,5 @@
+#if 0
+
 /** @file grabbable.h  Grabbable.
  *
  * @authors Copyright © 2013 Daniel Swanson <danij@dengine.net>
@@ -188,3 +190,5 @@ class Grabbable
 }  // namespace world
 
 #endif // DENG_WORLD_GRABBABLE_H
+
+#endif

doomsday/apps/client/include/world/hand.h

@@ -1,3 +1,5 @@
+#if 0
+
 /** @file hand.h  Hand (metaphor) for the manipulation of "grabbables".
  *
  * @authors Copyright © 2013-2015 Daniel Swanson <danij@dengine.net>
@@ -173,3 +175,5 @@ class Hand : DENG2_OBSERVES(ClientServerWorld, FrameEnd)
 }  // namespace world
 
 #endif  // DENG_WORLD_HAND_H
+
+#endif

doomsday/apps/client/include/world/map.h

@@ -50,7 +50,7 @@
 #ifdef __CLIENT__
 #  include "world/clientserverworld.h"
 #  include "Generator"
-#  include "BiasSource"
+//#  include "BiasSource"
 #  include "Lumobj"
 #  include "render/skydrawable.h"
 #endif

doomsday/apps/client/src/client/clientsubsector.cpp

@@ -30,11 +30,11 @@
 #include "client/cledgeloop.h"
 
 #include "render/rend_main.h" // Rend_SkyLightColor(), useBias
-#include "BiasIllum"
-#include "BiasTracker"
+//#include "BiasIllum"
+//#include "BiasTracker"
 #include "LightDecoration"
 #include "MaterialAnimator"
-#include "Shard"
+//#include "Shard"
 #include "WallEdge"
 
 #include "misc/face.h"
@@ -156,7 +156,9 @@ DENG2_PIMPL(ClientSubsector)
     {
         MapElement *mapElement;
         dint geomId;
+#if 0
         std::unique_ptr<Shard> shard;
+#endif
 
         GeometryData(MapElement *mapElement, dint geomId)
             : mapElement(mapElement)
@@ -198,7 +200,9 @@ DENG2_PIMPL(ClientSubsector)
     std::unique_ptr<BoundaryData> boundaryData;
 
     GeometryGroups geomGroups;
+#if 0
     QHash<Shard *, GeometryData *> shardToGeomData; ///< Reverse lookup.
+#endif
 
     /// Subspaces in the neighborhood effecting environmental audio characteristics.
     typedef QSet<ConvexSubspace *> ReverbSubspaces;
@@ -711,6 +715,7 @@ DENG2_PIMPL(ClientSubsector)
         return *foundGroup->insert(geomId, new GeometryData(&mapElement, geomId));
     }
 
+#if 0
     /**
      * Find the GeometryData for the given @a shard.
      */
@@ -723,6 +728,7 @@ DENG2_PIMPL(ClientSubsector)
         }
         return nullptr;
     }
+#endif
 
     void addReverbSubspace(ConvexSubspace *subspace)
     {
@@ -1721,7 +1727,6 @@ static dint countIlluminationPoints(MapElement &mapElement, dint DENG2_DEBUG_ONL
     }
     return 0;
 }
-#endif
 
 Shard &ClientSubsector::shard(MapElement &mapElement, dint geomId)
 {
@@ -1742,7 +1747,6 @@ Shard *ClientSubsector::findShard(MapElement &mapElement, dint geomId)
     return nullptr;
 }
 
-#if 0
 /**
  * @todo This could be enhanced so that only the lights on the right side of the
  * surface are taken into consideration.

doomsday/apps/client/src/render/rend_main.cpp

@@ -37,14 +37,14 @@
 #include "BspLeaf"
 #include "Contact"
 #include "ConvexSubspace"
-#include "Hand"
+//#include "Hand"
 #include "client/clientsubsector.h"
 #include "client/clskyplane.h"
-#include "BiasIllum"
-#include "HueCircleVisual"
+//#include "BiasIllum"
+//#include "HueCircleVisual"
 #include "LightDecoration"
 #include "Lumobj"
-#include "Shard"
+//#include "Shard"
 #include "SkyFixEdge"
 #include "TriangleStripBuilder"
 #include "WallEdge"
@@ -6463,7 +6463,9 @@ void Rend_Register()
     fx::Bloom::consoleRegister();
     fx::Vignette::consoleRegister();
     fx::LensFlares::consoleRegister();
+#if 0
     Shard::consoleRegister();
+#endif
     VR_ConsoleRegister();
 }
 

doomsday/apps/client/src/render/shard.cpp

@@ -1,3 +1,5 @@
+#if 0
+
 /** @file shard.cpp  3D map geometry shard.
  *
  * @authors Copyright © 2014 Daniel Swanson <danij@dengine.net>
@@ -142,3 +144,5 @@ void Shard::consoleRegister() // static
     C_VAR_INT("rend-dev-bias-affected", &devUpdateBiasContributors, CVF_NO_ARCHIVE, 0, 1);
 #endif
 }
+
+#endif

doomsday/apps/client/src/world/base/clientserverworld.cpp

@@ -78,8 +78,8 @@
 #  include "client/cledgeloop.h"
 #  include "client/clientsubsector.h"
 
-#  include "Hand"
-#  include "HueCircle"
+//#  include "Hand"
+//#  include "HueCircle"
 #  include "Lumobj"
 
 #  include "render/viewports.h"  // R_ResetViewer
@@ -308,9 +308,11 @@ DENG2_PIMPL(ClientServerWorld)
     Record fallbackMapInfo;      ///< Used when no effective MapInfo definition.
 
     timespan_t time = 0;         ///< World-wide time.
+#if 0
 #ifdef __CLIENT__
     std::unique_ptr<Hand> hand;  ///< For map editing/manipulation.
 #endif
+#endif // 0
 
     Impl(Public *i) : Base(i)
     {
@@ -769,13 +771,15 @@ DENG2_PIMPL(ClientServerWorld)
     }
 
 #ifdef __CLIENT__
+#if 0
     void updateHandOrigin()
     {
         DENG2_ASSERT(hand != nullptr && self().hasMap());
 
         viewdata_t const *viewData = &::viewPlayer->viewport();
         hand->setOrigin(viewData->current.origin + viewData->frontVec.xzy() * handDistance);
     }
+#endif // 0
 
     DENG2_PIMPL_AUDIENCE(FrameBegin)
     DENG2_PIMPL_AUDIENCE(FrameEnd)
@@ -914,6 +918,7 @@ void ClientServerWorld::tick(timespan_t elapsed)
 }
 
 #ifdef __CLIENT__
+#if 0
 Hand &ClientServerWorld::hand(ddouble *distance) const
 {
     // Time to create the hand?
@@ -932,6 +937,7 @@ Hand &ClientServerWorld::hand(ddouble *distance) const
     }
     return *d->hand;
 }
+#endif // 0
 
 void ClientServerWorld::beginFrame(bool resetNextViewer)
 {
@@ -941,19 +947,19 @@ void ClientServerWorld::beginFrame(bool resetNextViewer)
 
 void ClientServerWorld::endFrame()
 {
+#if 0
     if(hasMap() && d->hand)
     {
         d->updateHandOrigin();
 
-#if 0
         // If the HueCircle is active update the current edit color.
         if(HueCircle *hueCircle = SBE_HueCircle())
         {
             viewdata_t const *viewData = &viewPlayer->viewport();
             d->hand->setEditColor(hueCircle->colorAt(viewData->frontVec));
         }
-#endif
     }
+#endif
 
     // Notify interested parties that the current frame has ended.
     DENG2_FOR_AUDIENCE2(FrameEnd, i) i->worldSystemFrameEnds();

doomsday/apps/client/src/world/base/map.cpp

@@ -62,7 +62,7 @@
 #  include "Contact"
 #  include "ContactSpreader"
 
-#  include "BiasTracker"
+//#  include "BiasTracker"
 #  include "LightDecoration"
 #  include "Lumobj"
 #  include "WallEdge"

doomsday/apps/client/src/world/base/polyobj.cpp

@@ -32,7 +32,7 @@
 #ifdef __CLIENT__
 #  include "client/clientsubsector.h"
 
-#  include "Shard"
+//#  include "Shard"
 #  include "render/rend_main.h"  // useBias
 #endif
 

doomsday/apps/client/src/world/grabbable.cpp

@@ -1,3 +1,5 @@
+#if 0
+
 /** @file grabbable.cpp  Grabbable.
  *
  * @authors Copyright © 2013 Daniel Swanson <danij@dengine.net>
@@ -83,3 +85,5 @@ void Grabbable::setLock(bool enable)
 }
 
 }  // namespace world
+
+#endif

doomsday/apps/client/src/world/hand.cpp

@@ -1,3 +1,5 @@
+#if 0
+
 /** @file hand.cpp  Hand (metaphor) for the manipulation of "grabbables".
  *
  * @authors Copyright © 2013 Daniel Swanson <danij@dengine.net>
@@ -301,3 +303,5 @@ void Hand::worldSystemFrameEnds()
 }
 
 }  // namespace world
+
+#endif