@cesium/engine 11.0.0 → 12.0.0

package/Source/Scene/Model/GeoJsonLoader.js

@@ -272,7 +272,7 @@ function createLinesPrimitive(features, toLocal, frameState) {
   const featureIdsTypedArray = new Float32Array(vertexCount);
   const indicesTypedArray = IndexDatatype.createTypedArray(
     vertexCount,
-    indexCount
+    indexCount,
   );
   const indexDatatype = IndexDatatype.fromTypedArray(indicesTypedArray);
 
@@ -280,13 +280,13 @@ function createLinesPrimitive(features, toLocal, frameState) {
   const localMin = new Cartesian3(
     Number.POSITIVE_INFINITY,
     Number.POSITIVE_INFINITY,
-    Number.POSITIVE_INFINITY
+    Number.POSITIVE_INFINITY,
   );
 
   const localMax = new Cartesian3(
     Number.NEGATIVE_INFINITY,
     Number.NEGATIVE_INFINITY,
-    Number.NEGATIVE_INFINITY
+    Number.NEGATIVE_INFINITY,
   );
 
   let vertexCounter = 0;
@@ -310,12 +310,12 @@ function createLinesPrimitive(features, toLocal, frameState) {
           cartographic.y,
           cartographic.z,
           Ellipsoid.WGS84,
-          scratchCartesian
+          scratchCartesian,
         );
         const localCartesian = Matrix4.multiplyByPoint(
           toLocal,
           globalCartesian,
-          scratchCartesian
+          scratchCartesian,
         );
 
         Cartesian3.minimumByComponent(localMin, localCartesian, localMin);
@@ -426,13 +426,13 @@ function createPointsPrimitive(features, toLocal, frameState) {
   const localMin = new Cartesian3(
     Number.POSITIVE_INFINITY,
     Number.POSITIVE_INFINITY,
-    Number.POSITIVE_INFINITY
+    Number.POSITIVE_INFINITY,
   );
 
   const localMax = new Cartesian3(
     Number.NEGATIVE_INFINITY,
     Number.NEGATIVE_INFINITY,
-    Number.NEGATIVE_INFINITY
+    Number.NEGATIVE_INFINITY,
   );
 
   let vertexCounter = 0;
@@ -452,12 +452,12 @@ function createPointsPrimitive(features, toLocal, frameState) {
         cartographic.y,
         cartographic.z,
         Ellipsoid.WGS84,
-        scratchCartesian
+        scratchCartesian,
       );
       const localCartesian = Matrix4.multiplyByPoint(
         toLocal,
         globalCartesian,
-        scratchCartesian
+        scratchCartesian,
       );
 
       Cartesian3.minimumByComponent(localMin, localCartesian, localMin);
@@ -548,7 +548,7 @@ function parse(geoJson, frameState) {
     const feature = features[i];
     const featureProperties = defaultValue(
       feature.properties,
-      defaultValue.EMPTY_OBJECT
+      defaultValue.EMPTY_OBJECT,
     );
     for (const propertyId in featureProperties) {
       if (featureProperties.hasOwnProperty(propertyId)) {
@@ -593,13 +593,13 @@ function parse(geoJson, frameState) {
   const cartographicMin = new Cartesian3(
     Number.POSITIVE_INFINITY,
     Number.POSITIVE_INFINITY,
-    Number.POSITIVE_INFINITY
+    Number.POSITIVE_INFINITY,
   );
 
   const cartographicMax = new Cartesian3(
     Number.NEGATIVE_INFINITY,
     Number.NEGATIVE_INFINITY,
-    Number.NEGATIVE_INFINITY
+    Number.NEGATIVE_INFINITY,
   );
 
   let hasLines = false;
@@ -617,12 +617,12 @@ function parse(geoJson, frameState) {
           Cartesian3.minimumByComponent(
             cartographicMin,
             line[k],
-            cartographicMin
+            cartographicMin,
           );
           Cartesian3.maximumByComponent(
             cartographicMax,
             line[k],
-            cartographicMax
+            cartographicMax,
           );
         }
       }
@@ -643,19 +643,19 @@ function parse(geoJson, frameState) {
   const cartographicCenter = Cartesian3.midpoint(
     cartographicMin,
     cartographicMax,
-    new Cartesian3()
+    new Cartesian3(),
   );
   const ecefCenter = Cartesian3.fromDegrees(
     cartographicCenter.x,
     cartographicCenter.y,
     cartographicCenter.z,
     Ellipsoid.WGS84,
-    new Cartesian3()
+    new Cartesian3(),
   );
   const toGlobal = Transforms.eastNorthUpToFixedFrame(
     ecefCenter,
     Ellipsoid.WGS84,
-    new Matrix4()
+    new Matrix4(),
   );
   const toLocal = Matrix4.inverseTransformation(toGlobal, new Matrix4());
 

package/Source/Scene/Model/GeometryPipelineStage.js

@@ -61,7 +61,7 @@ const GeometryPipelineStage = {
 GeometryPipelineStage.process = function (
   renderResources,
   primitive,
-  frameState
+  frameState,
 ) {
   const { shaderBuilder, model } = renderResources;
 
@@ -70,12 +70,12 @@ GeometryPipelineStage.process = function (
   shaderBuilder.addStruct(
     GeometryPipelineStage.STRUCT_ID_PROCESSED_ATTRIBUTES_VS,
     "ProcessedAttributes",
-    ShaderDestination.VERTEX
+    ShaderDestination.VERTEX,
   );
   shaderBuilder.addStruct(
     GeometryPipelineStage.STRUCT_ID_PROCESSED_ATTRIBUTES_FS,
     "ProcessedAttributes",
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
 
   // The Feature struct is always added since it's required for compilation.
@@ -83,7 +83,7 @@ GeometryPipelineStage.process = function (
   shaderBuilder.addStruct(
     SelectedFeatureIdPipelineStage.STRUCT_ID_SELECTED_FEATURE,
     SelectedFeatureIdPipelineStage.STRUCT_NAME_SELECTED_FEATURE,
-    ShaderDestination.BOTH
+    ShaderDestination.BOTH,
   );
 
   // This initialization function is only needed in the vertex shader,
@@ -92,7 +92,7 @@ GeometryPipelineStage.process = function (
   shaderBuilder.addFunction(
     GeometryPipelineStage.FUNCTION_ID_INITIALIZE_ATTRIBUTES,
     GeometryPipelineStage.FUNCTION_SIGNATURE_INITIALIZE_ATTRIBUTES,
-    ShaderDestination.VERTEX
+    ShaderDestination.VERTEX,
   );
 
   // Positions in other coordinate systems need more variables
@@ -101,12 +101,12 @@ GeometryPipelineStage.process = function (
   shaderBuilder.addStructField(
     GeometryPipelineStage.STRUCT_ID_PROCESSED_ATTRIBUTES_FS,
     "vec3",
-    "positionWC"
+    "positionWC",
   );
   shaderBuilder.addStructField(
     GeometryPipelineStage.STRUCT_ID_PROCESSED_ATTRIBUTES_FS,
     "vec3",
-    "positionEC"
+    "positionEC",
   );
 
   // Though they have identical signatures, the implementation is different
@@ -115,12 +115,12 @@ GeometryPipelineStage.process = function (
   shaderBuilder.addFunction(
     GeometryPipelineStage.FUNCTION_ID_SET_DYNAMIC_VARYINGS_VS,
     GeometryPipelineStage.FUNCTION_SIGNATURE_SET_DYNAMIC_VARYINGS,
-    ShaderDestination.VERTEX
+    ShaderDestination.VERTEX,
   );
   shaderBuilder.addFunction(
     GeometryPipelineStage.FUNCTION_ID_SET_DYNAMIC_VARYINGS_FS,
     GeometryPipelineStage.FUNCTION_SIGNATURE_SET_DYNAMIC_VARYINGS,
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
 
   // .pnts point clouds store sRGB color rather than linear color
@@ -128,7 +128,7 @@ GeometryPipelineStage.process = function (
     shaderBuilder.addDefine(
       "HAS_SRGB_COLOR",
       undefined,
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
   }
 
@@ -150,13 +150,13 @@ GeometryPipelineStage.process = function (
   for (let i = 0; i < length; i++) {
     const attribute = primitive.attributes[i];
     const attributeLocationCount = AttributeType.getAttributeLocationCount(
-      attribute.type
+      attribute.type,
     );
 
     //>>includeStart('debug', pragmas.debug);
     if (!defined(attribute.buffer) && !defined(attribute.constant)) {
       throw new DeveloperError(
-        "Attributes must be provided as a Buffer or constant value"
+        "Attributes must be provided as a Buffer or constant value",
       );
     }
     //>>includeEnd('debug');
@@ -180,7 +180,7 @@ GeometryPipelineStage.process = function (
       index,
       attributeLocationCount,
       use2D,
-      instanced
+      instanced,
     );
   }
 
@@ -200,7 +200,7 @@ function processAttribute(
   attributeIndex,
   attributeLocationCount,
   use2D,
-  instanced
+  instanced,
 ) {
   const shaderBuilder = renderResources.shaderBuilder;
   const attributeInfo = ModelUtility.getAttributeInfo(attribute);
@@ -215,14 +215,14 @@ function processAttribute(
       renderResources,
       attribute,
       attributeIndex,
-      attributeLocationCount
+      attributeLocationCount,
     );
   } else {
     addAttributeToRenderResources(
       renderResources,
       attribute,
       attributeIndex,
-      modifyFor2D
+      modifyFor2D,
     );
   }
 
@@ -267,7 +267,7 @@ function addAttributeToRenderResources(
   renderResources,
   attribute,
   attributeIndex,
-  modifyFor2D
+  modifyFor2D,
 ) {
   const { quantization, semantic, setIndex } = attribute;
   const { type, componentDatatype } = defined(quantization)
@@ -324,7 +324,7 @@ function addMatrixAttributeToRenderResources(
   renderResources,
   attribute,
   attributeIndex,
-  columnCount
+  columnCount,
 ) {
   const { quantization, normalized } = attribute;
   const { type, componentDatatype } = defined(quantization)
@@ -336,9 +336,8 @@ function addMatrixAttributeToRenderResources(
   // componentsPerColumn is either 2, 3, or 4
   const componentsPerColumn = componentCount / columnCount;
 
-  const componentSizeInBytes = ComponentDatatype.getSizeInBytes(
-    componentDatatype
-  );
+  const componentSizeInBytes =
+    ComponentDatatype.getSizeInBytes(componentDatatype);
 
   const columnLengthInBytes = componentsPerColumn * componentSizeInBytes;
 
@@ -444,7 +443,7 @@ function updateAttributesStruct(shaderBuilder, attributeInfo, use2D) {
 function updateInitializeAttributesFunction(
   shaderBuilder,
   attributeInfo,
-  use2D
+  use2D,
 ) {
   const functionId = GeometryPipelineStage.FUNCTION_ID_INITIALIZE_ATTRIBUTES;
   const variableName = attributeInfo.variableName;
@@ -518,12 +517,12 @@ function handleBitangents(shaderBuilder, attributes) {
   shaderBuilder.addStructField(
     GeometryPipelineStage.STRUCT_ID_PROCESSED_ATTRIBUTES_VS,
     "vec3",
-    "bitangentMC"
+    "bitangentMC",
   );
   shaderBuilder.addStructField(
     GeometryPipelineStage.STRUCT_ID_PROCESSED_ATTRIBUTES_FS,
     "vec3",
-    "bitangentEC"
+    "bitangentEC",
   );
 }
 

package/Source/Scene/Model/I3dmLoader.js

@@ -79,17 +79,17 @@ function I3dmLoader(options) {
   const asynchronous = defaultValue(options.asynchronous, true);
   const incrementallyLoadTextures = defaultValue(
     options.incrementallyLoadTextures,
-    true
+    true,
   );
   const upAxis = defaultValue(options.upAxis, Axis.Y);
   const forwardAxis = defaultValue(options.forwardAxis, Axis.X);
   const loadAttributesAsTypedArray = defaultValue(
     options.loadAttributesAsTypedArray,
-    false
+    false,
   );
   const loadIndicesForWireframe = defaultValue(
     options.loadIndicesForWireframe,
-    false
+    false,
   );
   const loadPrimitiveOutline = defaultValue(options.loadPrimitiveOutline, true);
   const enablePick = defaultValue(options.enablePick, false);
@@ -207,7 +207,7 @@ I3dmLoader.prototype.load = function () {
   // Generate the feature table.
   const featureTable = new Cesium3DTileFeatureTable(
     featureTableJson,
-    featureTableBinary
+    featureTableBinary,
   );
   this._featureTable = featureTable;
 
@@ -216,7 +216,7 @@ I3dmLoader.prototype.load = function () {
   featureTable.featuresLength = instancesLength;
   if (!defined(instancesLength)) {
     throw new RuntimeError(
-      "Feature table global property: INSTANCES_LENGTH must be defined"
+      "Feature table global property: INSTANCES_LENGTH must be defined",
     );
   }
   this._instancesLength = instancesLength;
@@ -225,7 +225,7 @@ I3dmLoader.prototype.load = function () {
   const rtcCenter = featureTable.getGlobalProperty(
     "RTC_CENTER",
     ComponentDatatype.FLOAT,
-    3
+    3,
   );
   if (defined(rtcCenter)) {
     this._transform = Matrix4.fromTranslation(Cartesian3.fromArray(rtcCenter));
@@ -324,7 +324,7 @@ I3dmLoader.prototype.process = function (frameState) {
   components.transform = Matrix4.multiplyTransformation(
     this._transform,
     components.transform,
-    components.transform
+    components.transform,
   );
 
   createInstances(this, components, frameState);
@@ -385,7 +385,7 @@ function createInstances(loader, components, frameState) {
   const rtcCenter = featureTable.getGlobalProperty(
     "RTC_CENTER",
     ComponentDatatype.FLOAT,
-    3
+    3,
   );
 
   const eastNorthUp = featureTable.getGlobalProperty("EAST_NORTH_UP");
@@ -438,7 +438,7 @@ function createInstances(loader, components, frameState) {
       Cartesian3.subtract(
         instancePositions[i],
         positionBoundingSphere.center,
-        positionScratch
+        positionScratch,
       );
 
       translationTypedArray[3 * i + 0] = positionScratch.x;
@@ -449,7 +449,7 @@ function createInstances(loader, components, frameState) {
     // Set the center of the bounding sphere as the RTC center transform.
     const centerTransform = Matrix4.fromTranslation(
       positionBoundingSphere.center,
-      transformScratch
+      transformScratch,
     );
 
     // Combine the center transform and the CESIUM_RTC transform from the glTF.
@@ -458,7 +458,7 @@ function createInstances(loader, components, frameState) {
     components.transform = Matrix4.multiplyTransformation(
       centerTransform,
       components.transform,
-      components.transform
+      components.transform,
     );
   }
 
@@ -470,7 +470,7 @@ function createInstances(loader, components, frameState) {
       Cartesian3.add(
         instancePosition,
         Cartesian3.unpack(rtcCenter),
-        instancePosition
+        instancePosition,
       );
     }
 
@@ -486,7 +486,7 @@ function createInstances(loader, components, frameState) {
         instanceNormalRight,
         instanceNormalForward,
         instanceRotation,
-        instanceTransform
+        instanceTransform,
       );
       Quaternion.pack(instanceQuaternion, instanceQuaternionArray, 0);
       rotationTypedArray[4 * i + 0] = instanceQuaternionArray[0];
@@ -509,7 +509,7 @@ function createInstances(loader, components, frameState) {
       "BATCH_ID",
       ComponentDatatype.UNSIGNED_SHORT,
       1,
-      i
+      i,
     );
     if (!defined(batchId)) {
       // If BATCH_ID semantic is undefined, batchId is just the instance number
@@ -676,35 +676,35 @@ function getPositions(featureTable, instancesLength) {
     return featureTable.getPropertyArray(
       "POSITION",
       ComponentDatatype.FLOAT,
-      3
+      3,
     );
   } else if (featureTable.hasProperty("POSITION_QUANTIZED")) {
     // Handle quantized positions.
     const quantizedPositions = featureTable.getPropertyArray(
       "POSITION_QUANTIZED",
       ComponentDatatype.UNSIGNED_SHORT,
-      3
+      3,
     );
 
     const quantizedVolumeOffset = featureTable.getGlobalProperty(
       "QUANTIZED_VOLUME_OFFSET",
       ComponentDatatype.FLOAT,
-      3
+      3,
     );
     if (!defined(quantizedVolumeOffset)) {
       throw new RuntimeError(
-        "Global property: QUANTIZED_VOLUME_OFFSET must be defined for quantized positions."
+        "Global property: QUANTIZED_VOLUME_OFFSET must be defined for quantized positions.",
       );
     }
 
     const quantizedVolumeScale = featureTable.getGlobalProperty(
       "QUANTIZED_VOLUME_SCALE",
       ComponentDatatype.FLOAT,
-      3
+      3,
     );
     if (!defined(quantizedVolumeScale)) {
       throw new RuntimeError(
-        "Global property: QUANTIZED_VOLUME_SCALE must be defined for quantized positions."
+        "Global property: QUANTIZED_VOLUME_SCALE must be defined for quantized positions.",
       );
     }
 
@@ -723,7 +723,7 @@ function getPositions(featureTable, instancesLength) {
     // eslint-disable-next-line no-else-return
   } else {
     throw new RuntimeError(
-      "Either POSITION or POSITION_QUANTIZED must be defined for each instance."
+      "Either POSITION or POSITION_QUANTIZED must be defined for each instance.",
     );
   }
 }
@@ -739,7 +739,7 @@ function processRotation(
   instanceNormalRight,
   instanceNormalForward,
   instanceRotation,
-  instanceTransform
+  instanceTransform,
 ) {
   // Get the instance rotation
   const normalUp = featureTable.getProperty(
@@ -747,20 +747,20 @@ function processRotation(
     ComponentDatatype.FLOAT,
     3,
     i,
-    propertyScratch1
+    propertyScratch1,
   );
   const normalRight = featureTable.getProperty(
     "NORMAL_RIGHT",
     ComponentDatatype.FLOAT,
     3,
     i,
-    propertyScratch2
+    propertyScratch2,
   );
   let hasCustomOrientation = false;
   if (defined(normalUp)) {
     if (!defined(normalRight)) {
       throw new RuntimeError(
-        "To define a custom orientation, both NORMAL_UP and NORMAL_RIGHT must be defined."
+        "To define a custom orientation, both NORMAL_UP and NORMAL_RIGHT must be defined.",
       );
     }
     Cartesian3.unpack(normalUp, 0, instanceNormalUp);
@@ -772,39 +772,39 @@ function processRotation(
       ComponentDatatype.UNSIGNED_SHORT,
       2,
       i,
-      propertyScratch1
+      propertyScratch1,
     );
     const octNormalRight = featureTable.getProperty(
       "NORMAL_RIGHT_OCT32P",
       ComponentDatatype.UNSIGNED_SHORT,
       2,
       i,
-      propertyScratch2
+      propertyScratch2,
     );
     if (defined(octNormalUp)) {
       if (!defined(octNormalRight)) {
         throw new RuntimeError(
-          "To define a custom orientation with oct-encoded vectors, both NORMAL_UP_OCT32P and NORMAL_RIGHT_OCT32P must be defined."
+          "To define a custom orientation with oct-encoded vectors, both NORMAL_UP_OCT32P and NORMAL_RIGHT_OCT32P must be defined.",
         );
       }
       AttributeCompression.octDecodeInRange(
         octNormalUp[0],
         octNormalUp[1],
         65535,
-        instanceNormalUp
+        instanceNormalUp,
       );
       AttributeCompression.octDecodeInRange(
         octNormalRight[0],
         octNormalRight[1],
         65535,
-        instanceNormalRight
+        instanceNormalRight,
       );
       hasCustomOrientation = true;
     } else if (eastNorthUp) {
       Transforms.eastNorthUpToFixedFrame(
         instancePosition,
         Ellipsoid.WGS84,
-        instanceTransform
+        instanceTransform,
       );
       Matrix4.getMatrix3(instanceTransform, instanceRotation);
     } else {
@@ -815,21 +815,21 @@ function processRotation(
     Cartesian3.cross(
       instanceNormalRight,
       instanceNormalUp,
-      instanceNormalForward
+      instanceNormalForward,
     );
     Cartesian3.normalize(instanceNormalForward, instanceNormalForward);
     Matrix3.setColumn(
       instanceRotation,
       0,
       instanceNormalRight,
-      instanceRotation
+      instanceRotation,
     );
     Matrix3.setColumn(instanceRotation, 1, instanceNormalUp, instanceRotation);
     Matrix3.setColumn(
       instanceRotation,
       2,
       instanceNormalForward,
-      instanceRotation
+      instanceRotation,
     );
   }
   Quaternion.fromRotationMatrix(instanceRotation, instanceQuaternion);
@@ -841,7 +841,7 @@ function processScale(featureTable, i, instanceScale) {
     "SCALE",
     ComponentDatatype.FLOAT,
     1,
-    i
+    i,
   );
   if (defined(scale)) {
     Cartesian3.multiplyByScalar(instanceScale, scale, instanceScale);
@@ -851,7 +851,7 @@ function processScale(featureTable, i, instanceScale) {
     ComponentDatatype.FLOAT,
     3,
     i,
-    propertyScratch1
+    propertyScratch1,
   );
   if (defined(nonUniformScale)) {
     instanceScale.x *= nonUniformScale[0];