Ticket #2692: TerrainRenderer.cpp.patch

source/renderer/TerrainRenderer.cpp

@@ -579 +579 @@
     std::vector<CPatchRData*>& visiblePatches = m->visiblePatches[cullGroup];
 
     CBoundingBoxAligned scissor;
+    CVector4D v[8];
     for (size_t i = 0; i < visiblePatches.size(); ++i)
     {
         CPatchRData* data = visiblePatches[i];
@@ -586 +587 @@
         if (waterBounds.IsEmpty())
             continue;
 
-        CVector4D v1 = viewproj.Transform(CVector4D(waterBounds[0].X, waterBounds[1].Y, waterBounds[0].Z, 1.0f));
-        CVector4D v2 = viewproj.Transform(CVector4D(waterBounds[1].X, waterBounds[1].Y, waterBounds[0].Z, 1.0f));
-        CVector4D v3 = viewproj.Transform(CVector4D(waterBounds[0].X, waterBounds[1].Y, waterBounds[1].Z, 1.0f));
-        CVector4D v4 = viewproj.Transform(CVector4D(waterBounds[1].X, waterBounds[1].Y, waterBounds[1].Z, 1.0f));
-        CBoundingBoxAligned screenBounds;
-        #define ADDBOUND(v1, v2, v3, v4) \
-            if (v1.Z >= -v1.W) \
-                screenBounds += CVector3D(v1.X, v1.Y, v1.Z) * (1.0f / v1.W); \
-            else \
-            { \
-                float t = v1.Z + v1.W; \
-                if (v2.Z > -v2.W) \
-                { \
-                    CVector4D c2 = v1 + (v2 - v1) * (t / (t - (v2.Z + v2.W))); \
-                    screenBounds += CVector3D(c2.X, c2.Y, c2.Z) * (1.0f / c2.W); \
-                } \
-                if (v3.Z > -v3.W) \
-                { \
-                    CVector4D c3 = v1 + (v3 - v1) * (t / (t - (v3.Z + v3.W))); \
-                    screenBounds += CVector3D(c3.X, c3.Y, c3.Z) * (1.0f / c3.W); \
-                } \
-                if (v4.Z > -v4.W) \
-                { \
-                    CVector4D c4 = v1 + (v4 - v1) * (t / (t - (v4.Z + v4.W))); \
-                    screenBounds += CVector3D(c4.X, c4.Y, c4.Z) * (1.0f / c4.W); \
-                } \
-            }
-        ADDBOUND(v1, v2, v3, v4);
-        ADDBOUND(v2, v1, v3, v4);
-        ADDBOUND(v3, v1, v2, v4);
-        ADDBOUND(v4, v1, v2, v3);
-        #undef ADDBOUND
-        if (screenBounds[0].X >= 1.0f || screenBounds[1].X <= -1.0f || screenBounds[0].Y >= 1.0f || screenBounds[1].Y <= -1.0f)
+        for (int it = 0; it < 8; ++it)
+        {
+            v[it] = CVector4D(waterBounds[it & 1].X, waterBounds[(it >> 1) & 1].Y, waterBounds[(it >> 2) & 1].Z, 1.0f);
+            v[it] = viewproj.Transform(v[it]);
+            v[it] /= v[it].W;
+        }
+
+        CBoundingBoxAligned screenBounds(CVector3D(v[0].X, v[0].Y, v[0].Z), CVector3D(v[1].X, v[1].Y, v[1].Z));
+        for (int it = 2; it < 8; ++it)
+            screenBounds += CVector3D(v[it].X, v[it].Y, v[it].Z);
+
+        if (screenBounds[0].X >= 1.0f || screenBounds[1].X <= -1.0f ||
+            screenBounds[0].Y >= 1.0f || screenBounds[1].Y <= -1.0f)
             continue;
+
         scissor += screenBounds;
     }
+
     return CBoundingBoxAligned(CVector3D(clamp(scissor[0].X, -1.0f, 1.0f), clamp(scissor[0].Y, -1.0f, 1.0f), -1.0f),
                   CVector3D(clamp(scissor[1].X, -1.0f, 1.0f), clamp(scissor[1].Y, -1.0f, 1.0f), 1.0f));
 }