@cesium/engine 22.3.0 → 23.0.0

package/Source/Shaders/BillboardCollectionVS.glsl

@@ -26,11 +26,11 @@ out vec4 v_textureCoordinateBounds;
 out vec4 v_originTextureCoordinateAndTranslate;
 out mat2 v_rotationMatrix;
 #endif
-out vec4 v_compressed;                                 // x: eyeDepth, y: applyTranslate & enableDepthCheck, z: dimensions, w: imageSize
+out vec4 v_compressed;             // x: eyeDepth, y: applyTranslate & enableDepthCheck, z: dimensions, w: imageSize
 
 out vec4 v_pickColor;
 out vec4 v_color;
-out float v_splitDirection;
+flat out vec2 v_splitDirectionAndEllipsoidDepthEC;  // x: splitDirection, y: ellipsoid depth in eye coordinates
 #ifdef SDF
 out vec4 v_outlineColor;
 out float v_outlineWidth;
@@ -219,32 +219,18 @@ void main()
     bool validAlignedAxis = false;
 #endif
 
-    vec4 pickColor;
-    vec4 color;
-
-    temp = compressedAttribute2.y;
-    temp = temp * SHIFT_RIGHT8;
-    pickColor.b = (temp - floor(temp)) * SHIFT_LEFT8;
-    temp = floor(temp) * SHIFT_RIGHT8;
-    pickColor.g = (temp - floor(temp)) * SHIFT_LEFT8;
-    pickColor.r = floor(temp);
-
-    temp = compressedAttribute2.x;
-    temp = temp * SHIFT_RIGHT8;
-    color.b = (temp - floor(temp)) * SHIFT_LEFT8;
-    temp = floor(temp) * SHIFT_RIGHT8;
-    color.g = (temp - floor(temp)) * SHIFT_LEFT8;
-    color.r = floor(temp);
+    vec4 color = czm_decodeRGB8(compressedAttribute2.x);
+    vec4 pickColor = czm_decodeRGB8(compressedAttribute2.y);
 
     temp = compressedAttribute2.z * SHIFT_RIGHT8;
     bool sizeInMeters = floor((temp - floor(temp)) * SHIFT_LEFT7) > 0.0;
     temp = floor(temp) * SHIFT_RIGHT8;
 
     pickColor.a = (temp - floor(temp)) * SHIFT_LEFT8;
-    pickColor /= 255.0;
+    pickColor.a /= 255.0;
 
     color.a = floor(temp);
-    color /= 255.0;
+    color.a /= 255.0;
 
     ///////////////////////////////////////////////////////////////////////////
 
@@ -322,13 +308,25 @@ void main()
     }
 #endif
 
+    v_splitDirectionAndEllipsoidDepthEC.y = czm_infinity;
+    vec3 ellipsoidCenter = czm_view[3].xyz;
+    vec3 rayDirection = normalize(positionEC.xyz);
+    czm_ray ray = czm_ray(vec3(0.0), rayDirection);
+    vec3 ellipsoid_inverseRadii = czm_ellipsoidInverseRadii;
+    czm_raySegment intersection = czm_rayEllipsoidIntersectionInterval(ray, ellipsoidCenter, ellipsoid_inverseRadii);
+
+    if (!czm_isEmpty(intersection))
+    {
+        v_splitDirectionAndEllipsoidDepthEC.y = intersection.start;
+    }
+
     v_compressed.y = enableDepthCheck;
 
 #ifdef VS_THREE_POINT_DEPTH_CHECK
 if (lengthSq < (u_threePointDepthTestDistance * u_threePointDepthTestDistance) && (enableDepthCheck == 1.0)) {
     float depthsilon = 10.0;
     vec2 depthOrigin;
-    // Horizontal origin for labels comes from a special attribute. If that value is 0, this is a billboard - use the regular origin. 
+    // Horizontal origin for labels comes from a special attribute. If that value is 0, this is a billboard - use the regular origin.
     // Otherwise, transform the label origin to -1, 0, 1 (right, center, left).
     depthOrigin.x = floor(compressedAttribute2.w - (temp2 * SHIFT_LEFT2));
     depthOrigin.x = czm_branchFreeTernary(depthOrigin.x == 0.0, origin.x, depthOrigin.x - 2.0);
@@ -414,23 +412,16 @@ if (lengthSq < (u_threePointDepthTestDistance * u_threePointDepthTestDistance) &
 #endif
 
 #ifdef SDF
-    vec4 outlineColor;
+    vec4 outlineColor = czm_decodeRGB8(sdf.x);
     float outlineWidth;
 
-    temp = sdf.x;
-    temp = temp * SHIFT_RIGHT8;
-    outlineColor.b = (temp - floor(temp)) * SHIFT_LEFT8;
-    temp = floor(temp) * SHIFT_RIGHT8;
-    outlineColor.g = (temp - floor(temp)) * SHIFT_LEFT8;
-    outlineColor.r = floor(temp);
-
     temp = sdf.y;
     temp = temp * SHIFT_RIGHT8;
     float temp3 = (temp - floor(temp)) * SHIFT_LEFT8;
     temp = floor(temp) * SHIFT_RIGHT8;
     outlineWidth = (temp - floor(temp)) * SHIFT_LEFT8;
     outlineColor.a = floor(temp);
-    outlineColor /= 255.0;
+    outlineColor.a /= 255.0;
 
     v_outlineWidth = outlineWidth / 255.0;
     v_outlineColor = outlineColor;
@@ -441,5 +432,5 @@ if (lengthSq < (u_threePointDepthTestDistance * u_threePointDepthTestDistance) &
 
     v_color = color;
     v_color.a *= translucency;
-    v_splitDirection = splitDirection;
+    v_splitDirectionAndEllipsoidDepthEC.x = splitDirection;
 }

package/Source/Shaders/BillboardCollectionVS.js

@@ -27,11 +27,11 @@ out vec4 v_textureCoordinateBounds;\n\
 out vec4 v_originTextureCoordinateAndTranslate;\n\
 out mat2 v_rotationMatrix;\n\
 #endif\n\
-out vec4 v_compressed;                                 // x: eyeDepth, y: applyTranslate & enableDepthCheck, z: dimensions, w: imageSize\n\
+out vec4 v_compressed;             // x: eyeDepth, y: applyTranslate & enableDepthCheck, z: dimensions, w: imageSize\n\
 \n\
 out vec4 v_pickColor;\n\
 out vec4 v_color;\n\
-out float v_splitDirection;\n\
+flat out vec2 v_splitDirectionAndEllipsoidDepthEC;  // x: splitDirection, y: ellipsoid depth in eye coordinates\n\
 #ifdef SDF\n\
 out vec4 v_outlineColor;\n\
 out float v_outlineWidth;\n\
@@ -220,32 +220,18 @@ void main()\n\
     bool validAlignedAxis = false;\n\
 #endif\n\
 \n\
-    vec4 pickColor;\n\
-    vec4 color;\n\
-\n\
-    temp = compressedAttribute2.y;\n\
-    temp = temp * SHIFT_RIGHT8;\n\
-    pickColor.b = (temp - floor(temp)) * SHIFT_LEFT8;\n\
-    temp = floor(temp) * SHIFT_RIGHT8;\n\
-    pickColor.g = (temp - floor(temp)) * SHIFT_LEFT8;\n\
-    pickColor.r = floor(temp);\n\
-\n\
-    temp = compressedAttribute2.x;\n\
-    temp = temp * SHIFT_RIGHT8;\n\
-    color.b = (temp - floor(temp)) * SHIFT_LEFT8;\n\
-    temp = floor(temp) * SHIFT_RIGHT8;\n\
-    color.g = (temp - floor(temp)) * SHIFT_LEFT8;\n\
-    color.r = floor(temp);\n\
+    vec4 color = czm_decodeRGB8(compressedAttribute2.x);\n\
+    vec4 pickColor = czm_decodeRGB8(compressedAttribute2.y);\n\
 \n\
     temp = compressedAttribute2.z * SHIFT_RIGHT8;\n\
     bool sizeInMeters = floor((temp - floor(temp)) * SHIFT_LEFT7) > 0.0;\n\
     temp = floor(temp) * SHIFT_RIGHT8;\n\
 \n\
     pickColor.a = (temp - floor(temp)) * SHIFT_LEFT8;\n\
-    pickColor /= 255.0;\n\
+    pickColor.a /= 255.0;\n\
 \n\
     color.a = floor(temp);\n\
-    color /= 255.0;\n\
+    color.a /= 255.0;\n\
 \n\
     ///////////////////////////////////////////////////////////////////////////\n\
 \n\
@@ -322,6 +308,18 @@ void main()\n\
         enableDepthCheck = 0.0;\n\
     }\n\
 #endif\n\
+\n\
+    v_splitDirectionAndEllipsoidDepthEC.y = czm_infinity;\n\
+    vec3 ellipsoidCenter = czm_view[3].xyz;\n\
+    vec3 rayDirection = normalize(positionEC.xyz);\n\
+    czm_ray ray = czm_ray(vec3(0.0), rayDirection);\n\
+    vec3 ellipsoid_inverseRadii = czm_ellipsoidInverseRadii;\n\
+    czm_raySegment intersection = czm_rayEllipsoidIntersectionInterval(ray, ellipsoidCenter, ellipsoid_inverseRadii);\n\
+\n\
+    if (!czm_isEmpty(intersection))\n\
+    {\n\
+        v_splitDirectionAndEllipsoidDepthEC.y = intersection.start;\n\
+    }\n\
 \n\
     v_compressed.y = enableDepthCheck;\n\
 \n\
@@ -329,7 +327,7 @@ void main()\n\
 if (lengthSq < (u_threePointDepthTestDistance * u_threePointDepthTestDistance) && (enableDepthCheck == 1.0)) {\n\
     float depthsilon = 10.0;\n\
     vec2 depthOrigin;\n\
-    // Horizontal origin for labels comes from a special attribute. If that value is 0, this is a billboard - use the regular origin. \n\
+    // Horizontal origin for labels comes from a special attribute. If that value is 0, this is a billboard - use the regular origin.\n\
     // Otherwise, transform the label origin to -1, 0, 1 (right, center, left).\n\
     depthOrigin.x = floor(compressedAttribute2.w - (temp2 * SHIFT_LEFT2));\n\
     depthOrigin.x = czm_branchFreeTernary(depthOrigin.x == 0.0, origin.x, depthOrigin.x - 2.0);\n\
@@ -415,15 +413,8 @@ if (lengthSq < (u_threePointDepthTestDistance * u_threePointDepthTestDistance) &
 #endif\n\
 \n\
 #ifdef SDF\n\
-    vec4 outlineColor;\n\
+    vec4 outlineColor = czm_decodeRGB8(sdf.x);\n\
     float outlineWidth;\n\
-\n\
-    temp = sdf.x;\n\
-    temp = temp * SHIFT_RIGHT8;\n\
-    outlineColor.b = (temp - floor(temp)) * SHIFT_LEFT8;\n\
-    temp = floor(temp) * SHIFT_RIGHT8;\n\
-    outlineColor.g = (temp - floor(temp)) * SHIFT_LEFT8;\n\
-    outlineColor.r = floor(temp);\n\
 \n\
     temp = sdf.y;\n\
     temp = temp * SHIFT_RIGHT8;\n\
@@ -431,7 +422,7 @@ if (lengthSq < (u_threePointDepthTestDistance * u_threePointDepthTestDistance) &
     temp = floor(temp) * SHIFT_RIGHT8;\n\
     outlineWidth = (temp - floor(temp)) * SHIFT_LEFT8;\n\
     outlineColor.a = floor(temp);\n\
-    outlineColor /= 255.0;\n\
+    outlineColor.a /= 255.0;\n\
 \n\
     v_outlineWidth = outlineWidth / 255.0;\n\
     v_outlineColor = outlineColor;\n\
@@ -442,6 +433,6 @@ if (lengthSq < (u_threePointDepthTestDistance * u_threePointDepthTestDistance) &
 \n\
     v_color = color;\n\
     v_color.a *= translucency;\n\
-    v_splitDirection = splitDirection;\n\
+    v_splitDirectionAndEllipsoidDepthEC.x = splitDirection;\n\
 }\n\
 ";

package/Source/Shaders/Builtin/CzmBuiltins.js

@@ -72,6 +72,7 @@ import czm_computeGroundAtmosphereScattering from './Functions/computeGroundAtmo
 import czm_computePosition from './Functions/computePosition.js'
 import czm_computeScattering from './Functions/computeScattering.js'
 import czm_cosineAndSine from './Functions/cosineAndSine.js'
+import czm_decodeRGB8 from './Functions/decodeRGB8.js'
 import czm_decompressTextureCoordinates from './Functions/decompressTextureCoordinates.js'
 import czm_depthClamp from './Functions/depthClamp.js'
 import czm_eastNorthUpToEyeCoordinates from './Functions/eastNorthUpToEyeCoordinates.js'
@@ -130,6 +131,7 @@ import czm_transpose from './Functions/transpose.js'
 import czm_unpackClippingExtents from './Functions/unpackClippingExtents.js'
 import czm_unpackDepth from './Functions/unpackDepth.js'
 import czm_unpackFloat from './Functions/unpackFloat.js'
+import czm_unpackTexture from './Functions/unpackTexture.js'
 import czm_unpackUint from './Functions/unpackUint.js'
 import czm_valueTransform from './Functions/valueTransform.js'
 import czm_vertexLogDepth from './Functions/vertexLogDepth.js'
@@ -212,6 +214,7 @@ export default {
     czm_computePosition : czm_computePosition,
     czm_computeScattering : czm_computeScattering,
     czm_cosineAndSine : czm_cosineAndSine,
+    czm_decodeRGB8 : czm_decodeRGB8,
     czm_decompressTextureCoordinates : czm_decompressTextureCoordinates,
     czm_depthClamp : czm_depthClamp,
     czm_eastNorthUpToEyeCoordinates : czm_eastNorthUpToEyeCoordinates,
@@ -270,6 +273,7 @@ export default {
     czm_unpackClippingExtents : czm_unpackClippingExtents,
     czm_unpackDepth : czm_unpackDepth,
     czm_unpackFloat : czm_unpackFloat,
+    czm_unpackTexture : czm_unpackTexture,
     czm_unpackUint : czm_unpackUint,
     czm_valueTransform : czm_valueTransform,
     czm_vertexLogDepth : czm_vertexLogDepth,

package/Source/Shaders/Builtin/Functions/decodeRGB8.glsl

@@ -0,0 +1,22 @@
+/**
+ * Decodes RGB values packed into a single float at 8-bit precision. Encoded
+ * representation is equivalent to 0xFFFFFF in JavaScript.
+ *
+ * @name czm_decodeRGB8
+ * @glslFunction
+ *
+ * @param {float} encoded Float-encoded RGB values.
+ * @returns {vec4} Decoded RGB values.
+ */
+vec4 czm_decodeRGB8(float encoded) {
+    const float SHIFT_RIGHT16 = 1.0 / 65536.0;
+    const float SHIFT_RIGHT8 = 1.0 / 256.0;
+    const float SHIFT_LEFT16 = 65536.0;
+    const float SHIFT_LEFT8 = 256.0;
+
+    vec4 color = vec4(255.0);
+    color.r = floor(encoded * SHIFT_RIGHT16);
+    color.g = floor((encoded - color.r * SHIFT_LEFT16) * SHIFT_RIGHT8);
+    color.b = floor(encoded - color.r * SHIFT_LEFT16 - color.g * SHIFT_LEFT8);
+    return color / 255.0;
+}

package/Source/Shaders/Builtin/Functions/decodeRGB8.js

@@ -0,0 +1,24 @@
+//This file is automatically rebuilt by the Cesium build process.
+export default "/**\n\
+ * Decodes RGB values packed into a single float at 8-bit precision. Encoded\n\
+ * representation is equivalent to 0xFFFFFF in JavaScript.\n\
+ *\n\
+ * @name czm_decodeRGB8\n\
+ * @glslFunction\n\
+ *\n\
+ * @param {float} encoded Float-encoded RGB values.\n\
+ * @returns {vec4} Decoded RGB values.\n\
+ */\n\
+vec4 czm_decodeRGB8(float encoded) {\n\
+    const float SHIFT_RIGHT16 = 1.0 / 65536.0;\n\
+    const float SHIFT_RIGHT8 = 1.0 / 256.0;\n\
+    const float SHIFT_LEFT16 = 65536.0;\n\
+    const float SHIFT_LEFT8 = 256.0;\n\
+\n\
+    vec4 color = vec4(255.0);\n\
+    color.r = floor(encoded * SHIFT_RIGHT16);\n\
+    color.g = floor((encoded - color.r * SHIFT_LEFT16) * SHIFT_RIGHT8);\n\
+    color.b = floor(encoded - color.r * SHIFT_LEFT16 - color.g * SHIFT_LEFT8);\n\
+    return color / 255.0;\n\
+}\n\
+";

package/Source/Shaders/Builtin/Functions/unpackTexture.glsl

@@ -0,0 +1,35 @@
+/**
+ * Useful for reinterpreting texture data as higher-precision values.
+ * Only works correctly in WebGL 2, which supports the uint type and bitwise operations.
+ *
+ * @param {float|vec2|vec3|vec4} 1-4 values from a texture lookup (RGBA channels), normalized to [0.0, 1.0].
+ * @return {uint} Raw bits as an unsigned integer.
+*/
+uint czm_unpackTexture(float packedValue) {
+    float rounded = czm_round(packedValue * 255.0);
+    return uint(rounded);
+}
+
+uint czm_unpackTexture(vec2 packedValue) {
+    vec2 rounded = czm_round(packedValue * 255.0);
+    uint byte0 = uint(rounded.x);
+    uint byte1 = uint(rounded.y);
+    return byte0 | (byte1 << 8);
+}
+
+uint czm_unpackTexture(vec3 packedValue) {
+    vec3 rounded = czm_round(packedValue * 255.0);
+    uint byte0 = uint(rounded.x);
+    uint byte1 = uint(rounded.y);
+    uint byte2 = uint(rounded.z);
+    return byte0 | (byte1 << 8) | (byte2 << 16);
+}
+
+uint czm_unpackTexture(vec4 packedValue) {
+    vec4 rounded = czm_round(packedValue * 255.0);
+    uint byte0 = uint(rounded.x);
+    uint byte1 = uint(rounded.y);
+    uint byte2 = uint(rounded.z);
+    uint byte3 = uint(rounded.w);
+    return byte0 | (byte1 << 8) | (byte2 << 16) | (byte3 << 24);
+}

package/Source/Shaders/Builtin/Functions/unpackTexture.js

@@ -0,0 +1,37 @@
+//This file is automatically rebuilt by the Cesium build process.
+export default "/**\n\
+ * Useful for reinterpreting texture data as higher-precision values.\n\
+ * Only works correctly in WebGL 2, which supports the uint type and bitwise operations.\n\
+ *\n\
+ * @param {float|vec2|vec3|vec4} 1-4 values from a texture lookup (RGBA channels), normalized to [0.0, 1.0].\n\
+ * @return {uint} Raw bits as an unsigned integer.\n\
+*/\n\
+uint czm_unpackTexture(float packedValue) {\n\
+    float rounded = czm_round(packedValue * 255.0);\n\
+    return uint(rounded);\n\
+}\n\
+\n\
+uint czm_unpackTexture(vec2 packedValue) {\n\
+    vec2 rounded = czm_round(packedValue * 255.0);\n\
+    uint byte0 = uint(rounded.x);\n\
+    uint byte1 = uint(rounded.y);\n\
+    return byte0 | (byte1 << 8);\n\
+}\n\
+\n\
+uint czm_unpackTexture(vec3 packedValue) {\n\
+    vec3 rounded = czm_round(packedValue * 255.0);\n\
+    uint byte0 = uint(rounded.x);\n\
+    uint byte1 = uint(rounded.y);\n\
+    uint byte2 = uint(rounded.z);\n\
+    return byte0 | (byte1 << 8) | (byte2 << 16);\n\
+}\n\
+\n\
+uint czm_unpackTexture(vec4 packedValue) {\n\
+    vec4 rounded = czm_round(packedValue * 255.0);\n\
+    uint byte0 = uint(rounded.x);\n\
+    uint byte1 = uint(rounded.y);\n\
+    uint byte2 = uint(rounded.z);\n\
+    uint byte3 = uint(rounded.w);\n\
+    return byte0 | (byte1 << 8) | (byte2 << 16) | (byte3 << 24);\n\
+}\n\
+";

package/Source/Shaders/CubeMapPanoramaVS.glsl

@@ -0,0 +1,11 @@
+uniform mat3 u_cubeMapPanoramaTransform;
+
+in vec3 position;
+out vec3 v_texCoord;
+
+void main()
+{
+    vec3 p = czm_viewRotation * (u_cubeMapPanoramaTransform * (czm_entireFrustum.y * position));
+    gl_Position = czm_projection * vec4(p, 1.0);
+    v_texCoord = position.xyz;
+}

package/Source/Shaders/CubeMapPanoramaVS.js

@@ -0,0 +1,13 @@
+//This file is automatically rebuilt by the Cesium build process.
+export default "uniform mat3 u_cubeMapPanoramaTransform;\n\
+\n\
+in vec3 position;\n\
+out vec3 v_texCoord;\n\
+\n\
+void main()\n\
+{\n\
+    vec3 p = czm_viewRotation * (u_cubeMapPanoramaTransform * (czm_entireFrustum.y * position));\n\
+    gl_Position = czm_projection * vec4(p, 1.0);\n\
+    v_texCoord = position.xyz;\n\
+}\n\
+";

package/Source/Shaders/Model/MetadataStageFS.glsl

@@ -1,9 +1,10 @@
 void metadataStage(
+  FeatureIds featureIds,
   out Metadata metadata,
   out MetadataClass metadataClass,
   out MetadataStatistics metadataStatistics,
   ProcessedAttributes attributes
   )
 {
-  initializeMetadata(metadata, metadataClass, metadataStatistics, attributes);
+  initializeMetadata(featureIds, metadata, metadataClass, metadataStatistics, attributes);
 }

package/Source/Shaders/Model/MetadataStageFS.js

@@ -1,11 +1,12 @@
 //This file is automatically rebuilt by the Cesium build process.
 export default "void metadataStage(\n\
+  FeatureIds featureIds,\n\
   out Metadata metadata,\n\
   out MetadataClass metadataClass,\n\
   out MetadataStatistics metadataStatistics,\n\
   ProcessedAttributes attributes\n\
   )\n\
 {\n\
-  initializeMetadata(metadata, metadataClass, metadataStatistics, attributes);\n\
+  initializeMetadata(featureIds, metadata, metadataClass, metadataStatistics, attributes);\n\
 }\n\
 ";

package/Source/Shaders/Model/MetadataStageVS.glsl

@@ -1,10 +1,11 @@
 void metadataStage(
+  FeatureIds featureIds,
   out Metadata metadata,
   out MetadataClass metadataClass,
   out MetadataStatistics metadataStatistics,
   ProcessedAttributes attributes
   )
 {
-  initializeMetadata(metadata, metadataClass, metadataStatistics, attributes);
+  initializeMetadata(featureIds, metadata, metadataClass, metadataStatistics, attributes);
   setMetadataVaryings();
 }

package/Source/Shaders/Model/MetadataStageVS.js

@@ -1,12 +1,13 @@
 //This file is automatically rebuilt by the Cesium build process.
 export default "void metadataStage(\n\
+  FeatureIds featureIds,\n\
   out Metadata metadata,\n\
   out MetadataClass metadataClass,\n\
   out MetadataStatistics metadataStatistics,\n\
   ProcessedAttributes attributes\n\
   )\n\
 {\n\
-  initializeMetadata(metadata, metadataClass, metadataStatistics, attributes);\n\
+  initializeMetadata(featureIds, metadata, metadataClass, metadataStatistics, attributes);\n\
   setMetadataVaryings();\n\
 }\n\
 ";

package/Source/Shaders/Model/ModelFS.glsl

@@ -29,7 +29,7 @@ SelectedFeature selectedFeature;
 
 void main()
 {
-    #ifdef PRIMITIVE_TYPE_POINTS
+    #if defined(PRIMITIVE_TYPE_POINTS) && defined(HAS_POINT_DIAMETER)
     // Render points as circles
     float distanceToCenter = length(gl_PointCoord - vec2(0.5));
     if (distanceToCenter > 0.5) {
@@ -59,7 +59,7 @@ void main()
     Metadata metadata;
     MetadataClass metadataClass;
     MetadataStatistics metadataStatistics;
-    metadataStage(metadata, metadataClass, metadataStatistics, attributes);
+    metadataStage(featureIds, metadata, metadataClass, metadataStatistics, attributes);
 
     //========================================================================
     // When not picking metadata START

package/Source/Shaders/Model/ModelFS.js

@@ -30,7 +30,7 @@ SelectedFeature selectedFeature;\n\
 \n\
 void main()\n\
 {\n\
-    #ifdef PRIMITIVE_TYPE_POINTS\n\
+    #if defined(PRIMITIVE_TYPE_POINTS) && defined(HAS_POINT_DIAMETER)\n\
     // Render points as circles\n\
     float distanceToCenter = length(gl_PointCoord - vec2(0.5));\n\
     if (distanceToCenter > 0.5) {\n\
@@ -60,7 +60,7 @@ void main()\n\
     Metadata metadata;\n\
     MetadataClass metadataClass;\n\
     MetadataStatistics metadataStatistics;\n\
-    metadataStage(metadata, metadataClass, metadataStatistics, attributes);\n\
+    metadataStage(featureIds, metadata, metadataClass, metadataStatistics, attributes);\n\
 \n\
     //========================================================================\n\
     // When not picking metadata START\n\

package/Source/Shaders/Model/ModelVS.glsl

@@ -95,7 +95,7 @@ void main()
     Metadata metadata;
     MetadataClass metadataClass;
     MetadataStatistics metadataStatistics;
-    metadataStage(metadata, metadataClass, metadataStatistics, attributes);
+    metadataStage(featureIds, metadata, metadataClass, metadataStatistics, attributes);
 
     #ifdef HAS_VERTICAL_EXAGGERATION
     verticalExaggerationStage(attributes);
@@ -147,7 +147,7 @@ void main()
         #else
         gl_PointSize = 1.0;
         #endif
-        
+
         gl_PointSize *= show;
     #endif
 

package/Source/Shaders/Model/ModelVS.js

@@ -96,7 +96,7 @@ void main()\n\
     Metadata metadata;\n\
     MetadataClass metadataClass;\n\
     MetadataStatistics metadataStatistics;\n\
-    metadataStage(metadata, metadataClass, metadataStatistics, attributes);\n\
+    metadataStage(featureIds, metadata, metadataClass, metadataStatistics, attributes);\n\
 \n\
     #ifdef HAS_VERTICAL_EXAGGERATION\n\
     verticalExaggerationStage(attributes);\n\
@@ -148,7 +148,7 @@ void main()\n\
         #else\n\
         gl_PointSize = 1.0;\n\
         #endif\n\
-        \n\
+\n\
         gl_PointSize *= show;\n\
     #endif\n\
 \n\

package/Source/Shaders/PointPrimitiveCollectionVS.glsl

@@ -46,45 +46,14 @@ void main()
 
     ///////////////////////////////////////////////////////////////////////////
 
-    vec4 color;
-    vec4 outlineColor;
-    vec4 pickColor;
-
-    // compressedAttribute0.z => pickColor.rgb
-
-    temp = compressedAttribute0.z * SHIFT_RIGHT8;
-    pickColor.b = (temp - floor(temp)) * SHIFT_LEFT8;
-    temp = floor(temp) * SHIFT_RIGHT8;
-    pickColor.g = (temp - floor(temp)) * SHIFT_LEFT8;
-    pickColor.r = floor(temp);
-
-    // compressedAttribute0.x => color.rgb
-
-    temp = compressedAttribute0.x * SHIFT_RIGHT8;
-    color.b = (temp - floor(temp)) * SHIFT_LEFT8;
-    temp = floor(temp) * SHIFT_RIGHT8;
-    color.g = (temp - floor(temp)) * SHIFT_LEFT8;
-    color.r = floor(temp);
-
-    // compressedAttribute0.y => outlineColor.rgb
-
-    temp = compressedAttribute0.y * SHIFT_RIGHT8;
-    outlineColor.b = (temp - floor(temp)) * SHIFT_LEFT8;
-    temp = floor(temp) * SHIFT_RIGHT8;
-    outlineColor.g = (temp - floor(temp)) * SHIFT_LEFT8;
-    outlineColor.r = floor(temp);
-
-    // compressedAttribute0.w => color.a, outlineColor.a, pickColor.a
-
-    temp = compressedAttribute0.w * SHIFT_RIGHT8;
-    pickColor.a = (temp - floor(temp)) * SHIFT_LEFT8;
-    pickColor = pickColor / 255.0;
-
-    temp = floor(temp) * SHIFT_RIGHT8;
-    outlineColor.a = (temp - floor(temp)) * SHIFT_LEFT8;
-    outlineColor /= 255.0;
-    color.a = floor(temp);
-    color /= 255.0;
+    vec4 color = czm_decodeRGB8(compressedAttribute0.x);
+    vec4 outlineColor = czm_decodeRGB8(compressedAttribute0.y);
+    vec4 pickColor = czm_decodeRGB8(compressedAttribute0.z);
+    vec4 alphaPacked = czm_decodeRGB8(compressedAttribute0.w);
+
+    color.a = alphaPacked.x;
+    outlineColor.a = alphaPacked.y;
+    pickColor.a = alphaPacked.z;
 
     ///////////////////////////////////////////////////////////////////////////
 

package/Source/Shaders/PointPrimitiveCollectionVS.js

@@ -47,45 +47,14 @@ void main()\n\
 \n\
     ///////////////////////////////////////////////////////////////////////////\n\
 \n\
-    vec4 color;\n\
-    vec4 outlineColor;\n\
-    vec4 pickColor;\n\
-\n\
-    // compressedAttribute0.z => pickColor.rgb\n\
-\n\
-    temp = compressedAttribute0.z * SHIFT_RIGHT8;\n\
-    pickColor.b = (temp - floor(temp)) * SHIFT_LEFT8;\n\
-    temp = floor(temp) * SHIFT_RIGHT8;\n\
-    pickColor.g = (temp - floor(temp)) * SHIFT_LEFT8;\n\
-    pickColor.r = floor(temp);\n\
-\n\
-    // compressedAttribute0.x => color.rgb\n\
-\n\
-    temp = compressedAttribute0.x * SHIFT_RIGHT8;\n\
-    color.b = (temp - floor(temp)) * SHIFT_LEFT8;\n\
-    temp = floor(temp) * SHIFT_RIGHT8;\n\
-    color.g = (temp - floor(temp)) * SHIFT_LEFT8;\n\
-    color.r = floor(temp);\n\
-\n\
-    // compressedAttribute0.y => outlineColor.rgb\n\
-\n\
-    temp = compressedAttribute0.y * SHIFT_RIGHT8;\n\
-    outlineColor.b = (temp - floor(temp)) * SHIFT_LEFT8;\n\
-    temp = floor(temp) * SHIFT_RIGHT8;\n\
-    outlineColor.g = (temp - floor(temp)) * SHIFT_LEFT8;\n\
-    outlineColor.r = floor(temp);\n\
-\n\
-    // compressedAttribute0.w => color.a, outlineColor.a, pickColor.a\n\
-\n\
-    temp = compressedAttribute0.w * SHIFT_RIGHT8;\n\
-    pickColor.a = (temp - floor(temp)) * SHIFT_LEFT8;\n\
-    pickColor = pickColor / 255.0;\n\
-\n\
-    temp = floor(temp) * SHIFT_RIGHT8;\n\
-    outlineColor.a = (temp - floor(temp)) * SHIFT_LEFT8;\n\
-    outlineColor /= 255.0;\n\
-    color.a = floor(temp);\n\
-    color /= 255.0;\n\
+    vec4 color = czm_decodeRGB8(compressedAttribute0.x);\n\
+    vec4 outlineColor = czm_decodeRGB8(compressedAttribute0.y);\n\
+    vec4 pickColor = czm_decodeRGB8(compressedAttribute0.z);\n\
+    vec4 alphaPacked = czm_decodeRGB8(compressedAttribute0.w);\n\
+\n\
+    color.a = alphaPacked.x;\n\
+    outlineColor.a = alphaPacked.y;\n\
+    pickColor.a = alphaPacked.z;\n\
 \n\
     ///////////////////////////////////////////////////////////////////////////\n\
 \n\