Merge pull request #11577 from CesiumGS/fix-polygon-holes

Fixes an issue with polygon hole rendering
CesiumGS · Nov 1, 2023 · aa90487 · aa90487
2 parents 397f0b6 + aa5049e
commit aa90487
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/packages/engine/Source/Core/PolygonGeometry.js b/packages/engine/Source/Core/PolygonGeometry.js
@@ -636,7 +636,7 @@ function createGeometryFromPositionsExtruded(
   }
 
   let outerRing = hierarchy.outerRing;
-  let tangentPlane = EllipsoidTangentPlane.fromPoints(outerRing, ellipsoid);
+  const tangentPlane = EllipsoidTangentPlane.fromPoints(outerRing, ellipsoid);
   let positions2D = tangentPlane.projectPointsOntoPlane(
     outerRing,
     createGeometryFromPositionsExtrudedPositions
@@ -664,8 +664,6 @@ function createGeometryFromPositionsExtruded(
   const holes = hierarchy.holes;
   for (i = 0; i < holes.length; i++) {
     let hole = holes[i];
-
-    tangentPlane = EllipsoidTangentPlane.fromPoints(hole, ellipsoid);
     positions2D = tangentPlane.projectPointsOntoPlane(
       hole,
       createGeometryFromPositionsExtrudedPositions
@@ -1331,7 +1329,7 @@ function getTangentPlane(rectangle, positions, ellipsoid) {
 }
 
 const scratchCartographicCyllindrical = new Cartographic();
-function createProjectTo2d(rectangle, ellipsoid) {
+function createProjectTo2d(rectangle, outerPositions, ellipsoid) {
   return (positions, results) => {
     // If the polygon positions span a large enough extent, use a specialized projection
     if (rectangle.height >= CesiumMath.PI || rectangle.width >= CesiumMath.PI) {
@@ -1360,7 +1358,10 @@ function createProjectTo2d(rectangle, ellipsoid) {
     }
 
     // Use a local tangent plane for smaller extents
-    const tangentPlane = EllipsoidTangentPlane.fromPoints(positions, ellipsoid);
+    const tangentPlane = EllipsoidTangentPlane.fromPoints(
+      outerPositions,
+      ellipsoid
+    );
     return tangentPlane.projectPointsOntoPlane(positions, results);
   };
 }
@@ -1466,7 +1467,7 @@ PolygonGeometry.createGeometry = function (polygonGeometry) {
   const results = PolygonGeometryLibrary.polygonsFromHierarchy(
     polygonHierarchy,
     hasTextureCoordinates,
-    createProjectTo2d(rectangle, ellipsoid),
+    createProjectTo2d(rectangle, outerPositions, ellipsoid),
     !perPositionHeight,
     ellipsoid,
     createSplitPolygons(rectangle, ellipsoid, arcType, perPositionHeight)