Fixed|World: Linking planes for render hacks

The logic for linking planes with matching heights was incorrect. IssueID #2370
skyjake · Feb 23, 2020 · f1b553a · f1b553a
1 parent e58a089
commit f1b553a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/doomsday/apps/client/include/client/clientsubsector.h b/doomsday/apps/client/include/client/clientsubsector.h
@@ -248,10 +248,11 @@ class ClientSubsector : public Subsector, public ILightSource
 
 //- Visual Planes (mapped) --------------------------------------------------------------
 
-    enum VisPlaneLinkMode {
-        LinkWhenLowerThanTarget  = 0x1,
-        LinkWhenHigherThanTarget = 0x2,
-        LinkAlways               = 0x3,
+    enum VisPlaneLinkMode { // flags
+        LinkWhenLowerThanTarget     = 0x1,
+        LinkWhenHigherThanTarget    = 0x2,
+        LinkWhenDifferentThanTarget = 0x3,
+        LinkAlways                  = 0x4,
     };
 
     void linkVisPlane(int planeIndex, ClientSubsector &target, VisPlaneLinkMode linkMode);

diff --git a/doomsday/apps/client/src/client/clientsubsector.cpp b/doomsday/apps/client/src/client/clientsubsector.cpp
@@ -400,13 +400,13 @@ DENG2_PIMPL(ClientSubsector)
             if (!visp->target) continue; // Not linked to anything.
 
             // The actual height of the plane.
-            const double planeZ = self().sector().plane(planeIdx).heightSmoothed();
+            const coord_t planeZ  = self().sector().plane(planeIdx).heightSmoothed();
+            const coord_t targetZ = visp->target->visPlane(planeIdx).heightSmoothed();
 
-            if ((visp->linkMode == LinkAlways) ||
-                (visp->linkMode == LinkWhenLowerThanTarget &&
-                 planeZ < visp->target->visPlane(planeIdx).heightSmoothed()) ||
-                (visp->linkMode == LinkWhenHigherThanTarget &&
-                 planeZ > visp->target->visPlane(planeIdx).heightSmoothed()))
+            if ( visp->linkMode == LinkAlways ||
+                (visp->linkMode == LinkWhenDifferentThanTarget && !fequal(planeZ, targetZ)) ||
+                (visp->linkMode == LinkWhenLowerThanTarget     && planeZ < targetZ) ||
+                (visp->linkMode == LinkWhenHigherThanTarget    && planeZ > targetZ))
             {
                 linkVisPlane(planeIdx, visp->target);
             }