@cesium/engine 25.0.0 → 26.0.0

package/Source/Shaders/BufferPointMaterialFS.glsl

@@ -16,6 +16,7 @@ void main()
     float innerAlpha = 1.0 - smoothstep(innerLimit - delta, innerLimit, distanceToCenter);
 
     vec4 color = vec4(mix(v_outlineColor.rgb, v_color.rgb, innerAlpha), outerAlpha);
+    color.a *= mix(v_outlineColor.a, v_color.a, innerAlpha);
 
     if (color.a < 0.005)   // matches 0/255 and 1/255
     {

package/Source/Shaders/BufferPointMaterialFS.js

@@ -17,6 +17,7 @@ void main()\n\
     float innerAlpha = 1.0 - smoothstep(innerLimit - delta, innerLimit, distanceToCenter);\n\
 \n\
     vec4 color = vec4(mix(v_outlineColor.rgb, v_color.rgb, innerAlpha), outerAlpha);\n\
+    color.a *= mix(v_outlineColor.a, v_color.a, innerAlpha);\n\
 \n\
     if (color.a < 0.005)   // matches 0/255 and 1/255\n\
     {\n\

package/Source/Shaders/BufferPointMaterialVS.glsl

@@ -1,8 +1,12 @@
+#ifdef USE_FLOAT64
 in vec3 positionHigh;
 in vec3 positionLow;
+#else
+in vec3 position;
+#endif
 in vec4 pickColor;
-in vec3 showPixelSizeAndColor;
-in vec2 outlineWidthAndOutlineColor;
+in vec4 showPixelSizeColorAlpha;
+in vec3 outlineWidthColorAlpha;
 
 out vec4 v_pickColor;
 out vec4 v_color;
@@ -12,11 +16,13 @@ out float v_innerRadiusFrac;
 void main()
 {
     // Unpack attributes.
-    float show = showPixelSizeAndColor.x;
-    float pixelSize = showPixelSizeAndColor.y;
-    vec4 color = czm_decodeRGB8(showPixelSizeAndColor.z);
-    float outlineWidth = outlineWidthAndOutlineColor.x;
-    vec4 outlineColor = czm_decodeRGB8(outlineWidthAndOutlineColor.y);
+    float show = showPixelSizeColorAlpha.x;
+    float pixelSize = showPixelSizeColorAlpha.y;
+    vec4 color = czm_decodeRGB8(showPixelSizeColorAlpha.z);
+    float alpha = showPixelSizeColorAlpha.w;
+    float outlineWidth = outlineWidthColorAlpha.x;
+    vec4 outlineColor = czm_decodeRGB8(outlineWidthColorAlpha.y);
+    float outlineAlpha = outlineWidthColorAlpha.z;
 
     ///////////////////////////////////////////////////////////////////////////
 
@@ -25,8 +31,12 @@ void main()
 
     ///////////////////////////////////////////////////////////////////////////
 
+#ifdef USE_FLOAT64
     vec4 p = czm_translateRelativeToEye(positionHigh, positionLow);
     vec4 positionEC = czm_modelViewRelativeToEye * p;
+#else
+    vec4 positionEC = czm_modelView * vec4(position, 1.0);
+#endif
 
     ///////////////////////////////////////////////////////////////////////////
 
@@ -36,10 +46,10 @@ void main()
     v_pickColor = pickColor / 255.0;
 
     v_color = color;
-    v_color.a *= show;
+    v_color.a *= alpha * show;
 
     v_outlineColor = outlineColor;
-    v_outlineColor.a *= show;
+    v_outlineColor.a *= outlineAlpha * show;
 
     v_innerRadiusFrac = innerRadius / outerRadius;
 

package/Source/Shaders/BufferPointMaterialVS.js

@@ -1,9 +1,13 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "in vec3 positionHigh;\n\
+export default "#ifdef USE_FLOAT64\n\
+in vec3 positionHigh;\n\
 in vec3 positionLow;\n\
+#else\n\
+in vec3 position;\n\
+#endif\n\
 in vec4 pickColor;\n\
-in vec3 showPixelSizeAndColor;\n\
-in vec2 outlineWidthAndOutlineColor;\n\
+in vec4 showPixelSizeColorAlpha;\n\
+in vec3 outlineWidthColorAlpha;\n\
 \n\
 out vec4 v_pickColor;\n\
 out vec4 v_color;\n\
@@ -13,11 +17,13 @@ out float v_innerRadiusFrac;\n\
 void main()\n\
 {\n\
     // Unpack attributes.\n\
-    float show = showPixelSizeAndColor.x;\n\
-    float pixelSize = showPixelSizeAndColor.y;\n\
-    vec4 color = czm_decodeRGB8(showPixelSizeAndColor.z);\n\
-    float outlineWidth = outlineWidthAndOutlineColor.x;\n\
-    vec4 outlineColor = czm_decodeRGB8(outlineWidthAndOutlineColor.y);\n\
+    float show = showPixelSizeColorAlpha.x;\n\
+    float pixelSize = showPixelSizeColorAlpha.y;\n\
+    vec4 color = czm_decodeRGB8(showPixelSizeColorAlpha.z);\n\
+    float alpha = showPixelSizeColorAlpha.w;\n\
+    float outlineWidth = outlineWidthColorAlpha.x;\n\
+    vec4 outlineColor = czm_decodeRGB8(outlineWidthColorAlpha.y);\n\
+    float outlineAlpha = outlineWidthColorAlpha.z;\n\
 \n\
     ///////////////////////////////////////////////////////////////////////////\n\
 \n\
@@ -26,8 +32,12 @@ void main()\n\
 \n\
     ///////////////////////////////////////////////////////////////////////////\n\
 \n\
+#ifdef USE_FLOAT64\n\
     vec4 p = czm_translateRelativeToEye(positionHigh, positionLow);\n\
     vec4 positionEC = czm_modelViewRelativeToEye * p;\n\
+#else\n\
+    vec4 positionEC = czm_modelView * vec4(position, 1.0);\n\
+#endif\n\
 \n\
     ///////////////////////////////////////////////////////////////////////////\n\
 \n\
@@ -37,10 +47,10 @@ void main()\n\
     v_pickColor = pickColor / 255.0;\n\
 \n\
     v_color = color;\n\
-    v_color.a *= show;\n\
+    v_color.a *= alpha * show;\n\
 \n\
     v_outlineColor = outlineColor;\n\
-    v_outlineColor.a *= show;\n\
+    v_outlineColor.a *= outlineAlpha * show;\n\
 \n\
     v_innerRadiusFrac = innerRadius / outerRadius;\n\
 \n\

package/Source/Shaders/BufferPolygonMaterialVS.glsl

@@ -1,20 +1,29 @@
+#ifdef USE_FLOAT64
 in vec3 positionHigh;
 in vec3 positionLow;
+#else
+in vec3 position;
+#endif
 in vec4 pickColor;
-in vec2 showAndColor;
+in vec3 showColorAlpha;
 
 out vec4 v_pickColor;
 out vec4 v_color;
 
 void main()
 {
-    float show = showAndColor.x;
-    vec4 color = czm_decodeRGB8(showAndColor.y);
+    float show = showColorAlpha.x;
+    vec4 color = czm_decodeRGB8(showColorAlpha.y);
+    float alpha = showColorAlpha.z;
 
     ///////////////////////////////////////////////////////////////////////////
 
+#ifdef USE_FLOAT64
     vec4 p = czm_translateRelativeToEye(positionHigh, positionLow);
     vec4 positionEC = czm_modelViewRelativeToEye * p;
+#else
+    vec4 positionEC = czm_modelView * vec4(position, 1.0);
+#endif
 
     ///////////////////////////////////////////////////////////////////////////
 
@@ -24,7 +33,7 @@ void main()
     v_pickColor = pickColor / 255.0;
 
     v_color = color;
-    v_color.a *= show;
+    v_color.a *= alpha * show;
 
     gl_Position *= show;
 }

package/Source/Shaders/BufferPolygonMaterialVS.js

@@ -1,21 +1,30 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "in vec3 positionHigh;\n\
+export default "#ifdef USE_FLOAT64\n\
+in vec3 positionHigh;\n\
 in vec3 positionLow;\n\
+#else\n\
+in vec3 position;\n\
+#endif\n\
 in vec4 pickColor;\n\
-in vec2 showAndColor;\n\
+in vec3 showColorAlpha;\n\
 \n\
 out vec4 v_pickColor;\n\
 out vec4 v_color;\n\
 \n\
 void main()\n\
 {\n\
-    float show = showAndColor.x;\n\
-    vec4 color = czm_decodeRGB8(showAndColor.y);\n\
+    float show = showColorAlpha.x;\n\
+    vec4 color = czm_decodeRGB8(showColorAlpha.y);\n\
+    float alpha = showColorAlpha.z;\n\
 \n\
     ///////////////////////////////////////////////////////////////////////////\n\
 \n\
+#ifdef USE_FLOAT64\n\
     vec4 p = czm_translateRelativeToEye(positionHigh, positionLow);\n\
     vec4 positionEC = czm_modelViewRelativeToEye * p;\n\
+#else\n\
+    vec4 positionEC = czm_modelView * vec4(position, 1.0);\n\
+#endif\n\
 \n\
     ///////////////////////////////////////////////////////////////////////////\n\
 \n\
@@ -25,7 +34,7 @@ void main()\n\
     v_pickColor = pickColor / 255.0;\n\
 \n\
     v_color = color;\n\
-    v_color.a *= show;\n\
+    v_color.a *= alpha * show;\n\
 \n\
     gl_Position *= show;\n\
 }\n\

package/Source/Shaders/BufferPolylineMaterialVS.glsl

@@ -1,11 +1,18 @@
+#ifdef USE_FLOAT64
 in vec3 positionHigh;
 in vec3 positionLow;
 in vec3 prevPositionHigh;
 in vec3 prevPositionLow;
 in vec3 nextPositionHigh;
 in vec3 nextPositionLow;
+#else
+in vec3 position;
+in vec3 prevPosition;
+in vec3 nextPosition;
+#endif
 in vec4 pickColor;
 in vec4 showColorWidthAndTexCoord;
+in float alpha;
 
 out vec4 v_pickColor;
 out vec4 v_color;
@@ -26,11 +33,18 @@ void main()
     float expandDir = gl_VertexID % 2 == 1 ? 1.0 : -1.0;
     float polylineAngle;
 
+#ifdef USE_FLOAT64
     vec4 positionEC = czm_translateRelativeToEye(positionHigh, positionLow);
     vec4 prevPositionEC = czm_translateRelativeToEye(prevPositionHigh, prevPositionLow);
     vec4 nextPositionEC = czm_translateRelativeToEye(nextPositionHigh, nextPositionLow);
-
     vec4 positionWC = getPolylineWindowCoordinates(positionEC, prevPositionEC, nextPositionEC, expandDir, width, usePrevious, polylineAngle);
+#else
+    vec4 positionEC = czm_modelView * vec4(position, 1.0);
+    vec4 prevPositionEC = czm_modelView * vec4(prevPosition, 1.0);
+    vec4 nextPositionEC = czm_modelView * vec4(nextPosition, 1.0);
+    // Positions are already in eye space; use the EC variant to skip the redundant transform.
+    vec4 positionWC = getPolylineWindowCoordinatesEC(positionEC, prevPositionEC, nextPositionEC, expandDir, width, usePrevious, polylineAngle);
+#endif
 
     ///////////////////////////////////////////////////////////////////////////
 
@@ -39,7 +53,7 @@ void main()
     v_pickColor = pickColor / 255.0;
 
     v_color = color;
-    v_color.a *= show;
+    v_color.a *= alpha / 255.0 * show;
 
     v_st.s = texCoord;
     v_st.t = czm_writeNonPerspective(clamp(expandDir, 0.0, 1.0), gl_Position.w);

package/Source/Shaders/BufferPolylineMaterialVS.js

@@ -1,12 +1,19 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "in vec3 positionHigh;\n\
+export default "#ifdef USE_FLOAT64\n\
+in vec3 positionHigh;\n\
 in vec3 positionLow;\n\
 in vec3 prevPositionHigh;\n\
 in vec3 prevPositionLow;\n\
 in vec3 nextPositionHigh;\n\
 in vec3 nextPositionLow;\n\
+#else\n\
+in vec3 position;\n\
+in vec3 prevPosition;\n\
+in vec3 nextPosition;\n\
+#endif\n\
 in vec4 pickColor;\n\
 in vec4 showColorWidthAndTexCoord;\n\
+in float alpha;\n\
 \n\
 out vec4 v_pickColor;\n\
 out vec4 v_color;\n\
@@ -27,11 +34,18 @@ void main()\n\
     float expandDir = gl_VertexID % 2 == 1 ? 1.0 : -1.0;\n\
     float polylineAngle;\n\
 \n\
+#ifdef USE_FLOAT64\n\
     vec4 positionEC = czm_translateRelativeToEye(positionHigh, positionLow);\n\
     vec4 prevPositionEC = czm_translateRelativeToEye(prevPositionHigh, prevPositionLow);\n\
     vec4 nextPositionEC = czm_translateRelativeToEye(nextPositionHigh, nextPositionLow);\n\
-\n\
     vec4 positionWC = getPolylineWindowCoordinates(positionEC, prevPositionEC, nextPositionEC, expandDir, width, usePrevious, polylineAngle);\n\
+#else\n\
+    vec4 positionEC = czm_modelView * vec4(position, 1.0);\n\
+    vec4 prevPositionEC = czm_modelView * vec4(prevPosition, 1.0);\n\
+    vec4 nextPositionEC = czm_modelView * vec4(nextPosition, 1.0);\n\
+    // Positions are already in eye space; use the EC variant to skip the redundant transform.\n\
+    vec4 positionWC = getPolylineWindowCoordinatesEC(positionEC, prevPositionEC, nextPositionEC, expandDir, width, usePrevious, polylineAngle);\n\
+#endif\n\
 \n\
     ///////////////////////////////////////////////////////////////////////////\n\
 \n\
@@ -40,7 +54,7 @@ void main()\n\
     v_pickColor = pickColor / 255.0;\n\
 \n\
     v_color = color;\n\
-    v_color.a *= show;\n\
+    v_color.a *= alpha / 255.0 * show;\n\
 \n\
     v_st.s = texCoord;\n\
     v_st.t = czm_writeNonPerspective(clamp(expandDir, 0.0, 1.0), gl_Position.w);\n\

package/Source/Shaders/Builtin/Constants/passCesium3DTileEdgesDirect.glsl

@@ -0,0 +1,9 @@
+/**
+ * The automatic GLSL constant for {@link Pass#CESIUM_3D_TILE_EDGES_DIRECT}
+ *
+ * @name czm_passCesium3DTileEdgesDirect
+ * @glslConstant
+ *
+ * @see czm_pass
+ */
+const float czm_passCesium3DTileEdgesDirect = 12.0;

package/Source/Shaders/Builtin/Constants/passCesium3DTileEdgesDirect.js

@@ -0,0 +1,11 @@
+//This file is automatically rebuilt by the Cesium build process.
+export default "/**\n\
+ * The automatic GLSL constant for {@link Pass#CESIUM_3D_TILE_EDGES_DIRECT}\n\
+ *\n\
+ * @name czm_passCesium3DTileEdgesDirect\n\
+ * @glslConstant\n\
+ *\n\
+ * @see czm_pass\n\
+ */\n\
+const float czm_passCesium3DTileEdgesDirect = 12.0;\n\
+";

package/Source/Shaders/Builtin/Constants/passOverlay.glsl

@@ -6,4 +6,4 @@
  *
  * @see czm_pass
  */
-const float czm_passOverlay = 12.0;
+const float czm_passOverlay = 13.0;

package/Source/Shaders/Builtin/Constants/passOverlay.js

@@ -7,5 +7,5 @@ export default "/**\n\
  *\n\
  * @see czm_pass\n\
  */\n\
-const float czm_passOverlay = 12.0;\n\
+const float czm_passOverlay = 13.0;\n\
 ";

package/Source/Shaders/Builtin/CzmBuiltins.js

@@ -15,6 +15,7 @@ import czm_passCesium3DTile from './Constants/passCesium3DTile.js'
 import czm_passCesium3DTileClassification from './Constants/passCesium3DTileClassification.js'
 import czm_passCesium3DTileClassificationIgnoreShow from './Constants/passCesium3DTileClassificationIgnoreShow.js'
 import czm_passCesium3DTileEdges from './Constants/passCesium3DTileEdges.js'
+import czm_passCesium3DTileEdgesDirect from './Constants/passCesium3DTileEdgesDirect.js'
 import czm_passClassification from './Constants/passClassification.js'
 import czm_passCompute from './Constants/passCompute.js'
 import czm_passEnvironment from './Constants/passEnvironment.js'
@@ -158,6 +159,7 @@ export default {
     czm_passCesium3DTileClassification : czm_passCesium3DTileClassification,
     czm_passCesium3DTileClassificationIgnoreShow : czm_passCesium3DTileClassificationIgnoreShow,
     czm_passCesium3DTileEdges : czm_passCesium3DTileEdges,
+    czm_passCesium3DTileEdgesDirect : czm_passCesium3DTileEdgesDirect,
     czm_passClassification : czm_passClassification,
     czm_passCompute : czm_passCompute,
     czm_passEnvironment : czm_passEnvironment,

package/Source/Shaders/Model/EdgeVisibilityStageVS.glsl

@@ -5,7 +5,6 @@ void edgeVisibilityStageVS() {
     }
 
     v_edgeType = a_edgeType;
-    v_silhouetteNormalView = czm_normal * a_silhouetteNormal;
     v_faceNormalAView = czm_normal * a_faceNormalA;
     v_faceNormalBView = czm_normal * a_faceNormalB;
     v_edgeOffset = a_edgeOffset;

package/Source/Shaders/Model/EdgeVisibilityStageVS.js

@@ -6,7 +6,6 @@ void edgeVisibilityStageVS() {\n\
     }\n\
 \n\
     v_edgeType = a_edgeType;\n\
-    v_silhouetteNormalView = czm_normal * a_silhouetteNormal;\n\
     v_faceNormalAView = czm_normal * a_faceNormalA;\n\
     v_faceNormalBView = czm_normal * a_faceNormalB;\n\
     v_edgeOffset = a_edgeOffset;\n\