@cesium/engine 21.0.1 → 22.0.0

package/Source/Shaders/Model/EdgeVisibilityStageFS.js

@@ -0,0 +1,85 @@
+//This file is automatically rebuilt by the Cesium build process.
+export default "// CESIUM_REDIRECTED_COLOR_OUTPUT flag is used to avoid color attachment conflicts\n\
+// when shaders are processed by different rendering pipelines (e.g., OIT).\n\
+// Only declare MRT outputs when not in a derived shader context.\n\
+#if defined(HAS_EDGE_VISIBILITY_MRT) && !defined(CESIUM_REDIRECTED_COLOR_OUTPUT)\n\
+layout(location = 1) out vec4 out_id;        // edge id / metadata\n\
+layout(location = 2) out vec4 out_edgeDepth; // packed depth\n\
+#endif\n\
+\n\
+void edgeVisibilityStage(inout vec4 color, inout FeatureIds featureIds)\n\
+{\n\
+#ifdef HAS_EDGE_VISIBILITY\n\
+\n\
+    if (!u_isEdgePass) {\n\
+        return;\n\
+    }\n\
+    \n\
+    float edgeTypeInt = v_edgeType * 255.0;\n\
+    \n\
+    // Color code different edge types\n\
+    vec4 edgeColor = vec4(0.0);\n\
+    \n\
+    if (edgeTypeInt < 0.5) { // HIDDEN (0)\n\
+        edgeColor = vec4(0.0, 0.0, 0.0, 0.0); // Transparent for hidden edges\n\
+    }\n\
+    else if (edgeTypeInt > 0.5 && edgeTypeInt < 1.5) { // SILHOUETTE (1) - Conditional visibility\n\
+        // Proper silhouette detection using face normals\n\
+        vec3 normalA = normalize(v_faceNormalAView);\n\
+        vec3 normalB = normalize(v_faceNormalBView);\n\
+        \n\
+        // Calculate view direction using existing eye-space position varying (v_positionEC)\n\
+        vec3 viewDir = -normalize(v_positionEC);\n\
+        \n\
+        // Calculate dot products to determine triangle facing\n\
+        float dotA = dot(normalA, viewDir);\n\
+        float dotB = dot(normalB, viewDir);\n\
+        \n\
+        const float eps = 1e-3;\n\
+        bool frontA = dotA > eps;\n\
+        bool backA  = dotA < -eps;\n\
+        bool frontB = dotB > eps;\n\
+        bool backB  = dotB < -eps;\n\
+        \n\
+        // True silhouette: one triangle front-facing, other back-facing\n\
+        bool oppositeFacing = (frontA && backB) || (backA && frontB);\n\
+        \n\
+        // Exclude edges where both triangles are nearly grazing (perpendicular to view)\n\
+        // This handles the top-view cylinder case where both normals are ~horizontal\n\
+        bool bothNearGrazing = (abs(dotA) <= eps && abs(dotB) <= eps);\n\
+        \n\
+        if (!(oppositeFacing && !bothNearGrazing)) {\n\
+            discard; // Not a true silhouette edge\n\
+        } else {\n\
+            // True silhouette\n\
+            edgeColor = vec4(1.0, 0.0, 0.0, 1.0);\n\
+        }\n\
+    }\n\
+    else if (edgeTypeInt > 1.5 && edgeTypeInt < 2.5) { // HARD (2) - BRIGHT GREEN\n\
+        edgeColor = vec4(0.0, 1.0, 0.0, 1.0); // Extra bright green\n\
+    }\n\
+    else if (edgeTypeInt > 2.5 && edgeTypeInt < 3.5) { // REPEATED (3)\n\
+        edgeColor = vec4(0.0, 0.0, 1.0, 1.0);\n\
+    } else {\n\
+        edgeColor = vec4(0.0, 0.0, 0.0, 0.0);\n\
+    }\n\
+\n\
+    // Temporary color: white\n\
+    edgeColor = vec4(1.0, 1.0, 1.0, 1.0);\n\
+    color = edgeColor;\n\
+    \n\
+    #if defined(HAS_EDGE_VISIBILITY_MRT) && !defined(CESIUM_REDIRECTED_COLOR_OUTPUT)\n\
+        // Write edge metadata\n\
+        out_id = vec4(0.0);\n\
+        out_id.r = edgeTypeInt;                    // Edge type (0-3)\n\
+#ifdef HAS_EDGE_FEATURE_ID\n\
+        out_id.g = float(featureIds.featureId_0); // Feature ID if available\n\
+#else\n\
+        out_id.g = 0.0;\n\
+#endif\n\
+        // Pack depth into separate MRT attachment\n\
+        out_edgeDepth = czm_packDepth(gl_FragCoord.z);\n\
+    #endif\n\
+#endif\n\
+}\n\
+";

package/Source/Shaders/Model/ModelFS.glsl

@@ -119,6 +119,11 @@ void main()
     atmosphereStage(color, attributes);
     #endif
 
+    #ifdef HAS_EDGE_VISIBILITY
+    edgeVisibilityStage(color, featureIds);
+    edgeDetectionStage(color, featureIds);
+    #endif
+
     #endif
     // When not picking metadata END
     //========================================================================

package/Source/Shaders/Model/ModelFS.js

@@ -119,6 +119,11 @@ void main()\n\
     #ifdef HAS_ATMOSPHERE\n\
     atmosphereStage(color, attributes);\n\
     #endif\n\
+\n\
+    #ifdef HAS_EDGE_VISIBILITY\n\
+    edgeVisibilityStage(color, featureIds);\n\
+    edgeDetectionStage(color, featureIds);\n\
+    #endif\n\
 \n\
     #endif\n\
     // When not picking metadata END\n\

package/Source/Shaders/Model/PrimitiveOutlineStageFS.glsl

@@ -13,4 +13,3 @@ void primitiveOutlineStage(inout czm_modelMaterial material) {
 
     material.diffuse = mix(material.diffuse, model_outlineColor.rgb, model_outlineColor.a * outlineness);
 }
-

package/Source/Shaders/Model/PrimitiveOutlineStageFS.js

@@ -14,5 +14,4 @@ export default "void primitiveOutlineStage(inout czm_modelMaterial material) {\n
 \n\
     material.diffuse = mix(material.diffuse, model_outlineColor.rgb, model_outlineColor.a * outlineness);\n\
 }\n\
-\n\
 ";

package/Source/Shaders/ShadowVolumeAppearanceFS.glsl

@@ -65,21 +65,6 @@ void main(void)
 #endif // SPHERICAL
 #endif // TEXTURE_COORDINATES
 
-#ifdef PICK
-#ifdef CULL_FRAGMENTS
-    // When classifying translucent geometry, logDepthOrDepth == 0.0
-    // indicates a region that should not be classified, possibly due to there
-    // being opaque pixels there in another buffer.
-    // Check for logDepthOrDepth != 0.0 to make sure this should be classified.
-    if (0.0 <= uv.x && uv.x <= 1.0 && 0.0 <= uv.y && uv.y <= 1.0 || logDepthOrDepth != 0.0) {
-        out_FragColor.a = 1.0; // 0.0 alpha leads to discard from ShaderSource.createPickFragmentShaderSource
-        czm_writeDepthClamp();
-    }
-#else // CULL_FRAGMENTS
-        out_FragColor.a = 1.0;
-#endif // CULL_FRAGMENTS
-#else // PICK
-
 #ifdef CULL_FRAGMENTS
     // When classifying translucent geometry, logDepthOrDepth == 0.0
     // indicates a region that should not be classified, possibly due to there
@@ -89,6 +74,13 @@ void main(void)
     }
 #endif
 
+#ifdef PICK
+    out_FragColor.a = 1.0; // Explicitly set the alpha, otherwise this may be discarded by ShaderSource.createPickFragmentShaderSource
+#ifdef CULL_FRAGMENTS
+    czm_writeDepthClamp();
+#endif // CULL_FRAGMENTS
+#else // PICK
+
 #ifdef NORMAL_EC
     // Compute normal by sampling adjacent pixels in 2x2 block in screen space
     vec3 downUp = vectorFromOffset(eyeCoordinate, vec2(0.0, 1.0));

package/Source/Shaders/ShadowVolumeAppearanceFS.js

@@ -66,21 +66,6 @@ void main(void)\n\
 #endif // SPHERICAL\n\
 #endif // TEXTURE_COORDINATES\n\
 \n\
-#ifdef PICK\n\
-#ifdef CULL_FRAGMENTS\n\
-    // When classifying translucent geometry, logDepthOrDepth == 0.0\n\
-    // indicates a region that should not be classified, possibly due to there\n\
-    // being opaque pixels there in another buffer.\n\
-    // Check for logDepthOrDepth != 0.0 to make sure this should be classified.\n\
-    if (0.0 <= uv.x && uv.x <= 1.0 && 0.0 <= uv.y && uv.y <= 1.0 || logDepthOrDepth != 0.0) {\n\
-        out_FragColor.a = 1.0; // 0.0 alpha leads to discard from ShaderSource.createPickFragmentShaderSource\n\
-        czm_writeDepthClamp();\n\
-    }\n\
-#else // CULL_FRAGMENTS\n\
-        out_FragColor.a = 1.0;\n\
-#endif // CULL_FRAGMENTS\n\
-#else // PICK\n\
-\n\
 #ifdef CULL_FRAGMENTS\n\
     // When classifying translucent geometry, logDepthOrDepth == 0.0\n\
     // indicates a region that should not be classified, possibly due to there\n\
@@ -90,6 +75,13 @@ void main(void)\n\
     }\n\
 #endif\n\
 \n\
+#ifdef PICK\n\
+    out_FragColor.a = 1.0; // Explicitly set the alpha, otherwise this may be discarded by ShaderSource.createPickFragmentShaderSource\n\
+#ifdef CULL_FRAGMENTS\n\
+    czm_writeDepthClamp();\n\
+#endif // CULL_FRAGMENTS\n\
+#else // PICK\n\
+\n\
 #ifdef NORMAL_EC\n\
     // Compute normal by sampling adjacent pixels in 2x2 block in screen space\n\
     vec3 downUp = vectorFromOffset(eyeCoordinate, vec2(0.0, 1.0));\n\

package/Source/Workers/createVerticesFromCesium3DTilesTerrain.js

@@ -0,0 +1,46 @@
+import Cesium3DTilesTerrainGeometryProcessor from "../Core/Cesium3DTilesTerrainGeometryProcessor.js";
+import createTaskProcessorWorker from "./createTaskProcessorWorker.js";
+
+/**
+ * @private
+ *
+ * @param {Cesium3DTilesTerrainGeometryProcessor.CreateMeshOptions} options An object describing options for mesh creation.
+ * @param {ArrayBuffer[]} transferableObjects An array of buffers that can be transferred back to the main thread.
+ * @returns {Promise<object>} A promise that resolves to an object containing selected info from the created TerrainMesh.
+ */
+function createVerticesFromCesium3DTilesTerrain(options, transferableObjects) {
+  const meshPromise = Cesium3DTilesTerrainGeometryProcessor.createMesh(options);
+  return meshPromise.then(function (mesh) {
+    const verticesBuffer = mesh.vertices.buffer;
+    const indicesBuffer = mesh.indices.buffer;
+    const westIndicesBuffer = mesh.westIndicesSouthToNorth.buffer;
+    const southIndicesBuffer = mesh.southIndicesEastToWest.buffer;
+    const eastIndicesBuffer = mesh.eastIndicesNorthToSouth.buffer;
+    const northIndicesBuffer = mesh.northIndicesWestToEast.buffer;
+
+    transferableObjects.push(
+      verticesBuffer,
+      indicesBuffer,
+      westIndicesBuffer,
+      southIndicesBuffer,
+      eastIndicesBuffer,
+      northIndicesBuffer,
+    );
+
+    return {
+      verticesBuffer: verticesBuffer,
+      indicesBuffer: indicesBuffer,
+      vertexCountWithoutSkirts: mesh.vertexCountWithoutSkirts,
+      indexCountWithoutSkirts: mesh.indexCountWithoutSkirts,
+      encoding: mesh.encoding,
+      westIndicesBuffer: westIndicesBuffer,
+      southIndicesBuffer: southIndicesBuffer,
+      eastIndicesBuffer: eastIndicesBuffer,
+      northIndicesBuffer: northIndicesBuffer,
+    };
+  });
+}
+
+export default createTaskProcessorWorker(
+  createVerticesFromCesium3DTilesTerrain,
+);

package/Source/Workers/upsampleVerticesFromCesium3DTilesTerrain.js

@@ -0,0 +1,55 @@
+import Cesium3DTilesTerrainGeometryProcessor from "../Core/Cesium3DTilesTerrainGeometryProcessor.js";
+import createTaskProcessorWorker from "./createTaskProcessorWorker.js";
+
+/**
+ * @private
+ * @param {Cesium3DTilesTerrainGeometryProcessor.UpsampleMeshOptions} options An object describing options for mesh upsampling.
+ * @param {ArrayBuffer[]} transferableObjects An array of buffers that can be transferred back to the main thread.
+ * @returns {TerrainMeshProxy} An object containing selected info from the upsampled TerrainMesh.
+ */
+
+function upsampleVerticesFromCesium3DTilesTerrain(
+  options,
+  transferableObjects,
+) {
+  const mesh = Cesium3DTilesTerrainGeometryProcessor.upsampleMesh(options);
+
+  const verticesBuffer = mesh.vertices.buffer;
+  const indicesBuffer = mesh.indices.buffer;
+  const westIndicesBuffer = mesh.westIndicesSouthToNorth.buffer;
+  const southIndicesBuffer = mesh.southIndicesEastToWest.buffer;
+  const eastIndicesBuffer = mesh.eastIndicesNorthToSouth.buffer;
+  const northIndicesBuffer = mesh.northIndicesWestToEast.buffer;
+
+  transferableObjects.push(
+    verticesBuffer,
+    indicesBuffer,
+    westIndicesBuffer,
+    southIndicesBuffer,
+    eastIndicesBuffer,
+    northIndicesBuffer,
+  );
+
+  /** @type {TerrainMeshProxy} */
+  const result = {
+    verticesBuffer: verticesBuffer,
+    indicesBuffer: indicesBuffer,
+    vertexCountWithoutSkirts: mesh.vertexCountWithoutSkirts,
+    indexCountWithoutSkirts: mesh.indexCountWithoutSkirts,
+    encoding: mesh.encoding,
+    westIndicesBuffer: westIndicesBuffer,
+    southIndicesBuffer: southIndicesBuffer,
+    eastIndicesBuffer: eastIndicesBuffer,
+    northIndicesBuffer: northIndicesBuffer,
+    minimumHeight: mesh.minimumHeight,
+    maximumHeight: mesh.maximumHeight,
+    boundingSphere: mesh.boundingSphere3D,
+    orientedBoundingBox: mesh.orientedBoundingBox,
+    horizonOcclusionPoint: mesh.horizonOcclusionPoint,
+  };
+  return result;
+}
+
+export default createTaskProcessorWorker(
+  upsampleVerticesFromCesium3DTilesTerrain,
+);