@cesium/engine 10.1.0 → 11.1.0

package/Source/Scene/Cesium3DTileBatchTable.js

@@ -37,7 +37,7 @@ function Cesium3DTileBatchTable(
   featuresLength,
   batchTableJson,
   batchTableBinary,
-  colorChangedCallback
+  colorChangedCallback,
 ) {
   /**
    * @readonly
@@ -56,17 +56,16 @@ function Cesium3DTileBatchTable(
   this._batchTableHierarchy = initializeHierarchy(
     this,
     batchTableJson,
-    batchTableBinary
+    batchTableBinary,
   );
 
   const binaryProperties = getBinaryProperties(
     featuresLength,
     properties,
-    batchTableBinary
-  );
-  this._binaryPropertiesByteLength = countBinaryPropertyMemory(
-    binaryProperties
+    batchTableBinary,
   );
+  this._binaryPropertiesByteLength =
+    countBinaryPropertyMemory(binaryProperties);
   this._batchTableBinaryProperties = binaryProperties;
 
   this._content = content;
@@ -139,7 +138,7 @@ function initializeHierarchy(batchTable, jsonHeader, binaryBody) {
   if (defined(legacyHierarchy)) {
     Cesium3DTileBatchTable._deprecationWarning(
       "batchTableHierarchyExtension",
-      "The batch table HIERARCHY property has been moved to an extension. Use extensions.3DTILES_batch_table_hierarchy instead."
+      "The batch table HIERARCHY property has been moved to an extension. Use extensions.3DTILES_batch_table_hierarchy instead.",
     );
     batchTable._extensions["3DTILES_batch_table_hierarchy"] = legacyHierarchy;
     hierarchy = legacyHierarchy;
@@ -173,7 +172,7 @@ function getBinaryProperties(featuresLength, properties, binaryBody) {
         }
         if (!defined(binaryBody)) {
           throw new RuntimeError(
-            `Property ${name} requires a batch table binary.`
+            `Property ${name} requires a batch table binary.`,
           );
         }
 
@@ -183,7 +182,7 @@ function getBinaryProperties(featuresLength, properties, binaryBody) {
         const typedArray = binaryAccessor.createArrayBufferView(
           binaryBody.buffer,
           binaryBody.byteOffset + byteOffset,
-          featuresLength
+          featuresLength,
         );
 
         if (!defined(binaryProperties)) {
@@ -220,7 +219,7 @@ function countBinaryPropertyMemory(binaryProperties) {
 Cesium3DTileBatchTable.getBinaryProperties = function (
   featuresLength,
   batchTableJson,
-  batchTableBinary
+  batchTableBinary,
 ) {
   return getBinaryProperties(featuresLength, batchTableJson, batchTableBinary);
 };
@@ -269,7 +268,7 @@ Cesium3DTileBatchTable.prototype.applyStyle = function (style) {
     const color = defined(style.color)
       ? defaultValue(
           style.color.evaluateColor(feature, scratchColor),
-          DEFAULT_COLOR_VALUE
+          DEFAULT_COLOR_VALUE,
         )
       : DEFAULT_COLOR_VALUE;
     const show = defined(style.show)
@@ -303,7 +302,7 @@ function checkBatchId(batchId, featuresLength) {
   if (!defined(batchId) || batchId < 0 || batchId >= featuresLength) {
     throw new DeveloperError(
       `batchId is required and must be between zero and featuresLength - 1 (${featuresLength}` -
-        +")."
+        +").",
     );
   }
 }
@@ -378,7 +377,7 @@ Cesium3DTileBatchTable.prototype.getPropertyIds = function (batchId, results) {
   if (defined(this._batchTableHierarchy)) {
     results.push.apply(
       results,
-      this._batchTableHierarchy.getPropertyIds(batchId, scratchPropertyIds)
+      this._batchTableHierarchy.getPropertyIds(batchId, scratchPropertyIds),
     );
   }
 
@@ -390,7 +389,7 @@ Cesium3DTileBatchTable.prototype.getPropertyIds = function (batchId, results) {
  */
 Cesium3DTileBatchTable.prototype.getPropertyBySemantic = function (
   batchId,
-  name
+  name,
 ) {
   // Cesium 3D Tiles 1.0 formats do not have semantics
   return undefined;
@@ -417,7 +416,7 @@ Cesium3DTileBatchTable.prototype.getProperty = function (batchId, name) {
   if (defined(this._batchTableHierarchy)) {
     const hierarchyProperty = this._batchTableHierarchy.getProperty(
       batchId,
-      name
+      name,
     );
     if (defined(hierarchyProperty)) {
       return hierarchyProperty;
@@ -491,7 +490,7 @@ function getGlslComputeSt(batchTable) {
 Cesium3DTileBatchTable.prototype.getVertexShaderCallback = function (
   handleTranslucent,
   batchIdAttributeName,
-  diffuseAttributeOrUniformName
+  diffuseAttributeOrUniformName,
 ) {
   if (this.featuresLength === 0) {
     return;
@@ -504,7 +503,7 @@ Cesium3DTileBatchTable.prototype.getVertexShaderCallback = function (
     const renamedSource = modifyDiffuse(
       source,
       diffuseAttributeOrUniformName,
-      false
+      false,
     );
     let newMain;
 
@@ -636,7 +635,7 @@ function modifyDiffuse(source, diffuseAttributeOrUniformName, applyHighlight) {
   //   uniform vec3 u_diffuseColor;
   //   uniform sampler2D diffuseTexture;
   let regex = new RegExp(
-    `(uniform|attribute|in)\\s+(vec[34]|sampler2D)\\s+${diffuseAttributeOrUniformName};`
+    `(uniform|attribute|in)\\s+(vec[34]|sampler2D)\\s+${diffuseAttributeOrUniformName};`,
   );
   const uniformMatch = source.match(regex);
 
@@ -716,7 +715,7 @@ function modifyDiffuse(source, diffuseAttributeOrUniformName, applyHighlight) {
 Cesium3DTileBatchTable.prototype.getFragmentShaderCallback = function (
   handleTranslucent,
   diffuseAttributeOrUniformName,
-  hasPremultipliedAlpha
+  hasPremultipliedAlpha,
 ) {
   if (this.featuresLength === 0) {
     return;
@@ -784,43 +783,44 @@ Cesium3DTileBatchTable.prototype.getFragmentShaderCallback = function (
   };
 };
 
-Cesium3DTileBatchTable.prototype.getClassificationFragmentShaderCallback = function () {
-  if (this.featuresLength === 0) {
-    return;
-  }
-  return function (source) {
-    source = ShaderSource.replaceMain(source, "tile_main");
-    if (ContextLimits.maximumVertexTextureImageUnits > 0) {
-      // When VTF is supported, per-feature show/hide already happened in the fragment shader
-      source +=
-        "uniform sampler2D tile_pickTexture;\n" +
-        "in vec2 tile_featureSt; \n" +
-        "in vec4 tile_featureColor; \n" +
-        "void main() \n" +
-        "{ \n" +
-        "    tile_main(); \n" +
-        "    out_FragColor = tile_featureColor; \n" +
-        "    out_FragColor.rgb *= out_FragColor.a; \n" +
-        "}";
-    } else {
-      source +=
-        "uniform sampler2D tile_batchTexture; \n" +
-        "uniform sampler2D tile_pickTexture;\n" +
-        "in vec2 tile_featureSt; \n" +
-        "void main() \n" +
-        "{ \n" +
-        "    tile_main(); \n" +
-        "    vec4 featureProperties = texture(tile_batchTexture, tile_featureSt); \n" +
-        "    if (featureProperties.a == 0.0) { \n" + // show: alpha == 0 - false, non-zero - true
-        "        discard; \n" +
-        "    } \n" +
-        "    out_FragColor = featureProperties; \n" +
-        "    out_FragColor.rgb *= out_FragColor.a; \n" +
-        "} \n";
+Cesium3DTileBatchTable.prototype.getClassificationFragmentShaderCallback =
+  function () {
+    if (this.featuresLength === 0) {
+      return;
     }
-    return source;
+    return function (source) {
+      source = ShaderSource.replaceMain(source, "tile_main");
+      if (ContextLimits.maximumVertexTextureImageUnits > 0) {
+        // When VTF is supported, per-feature show/hide already happened in the fragment shader
+        source +=
+          "uniform sampler2D tile_pickTexture;\n" +
+          "in vec2 tile_featureSt; \n" +
+          "in vec4 tile_featureColor; \n" +
+          "void main() \n" +
+          "{ \n" +
+          "    tile_main(); \n" +
+          "    out_FragColor = tile_featureColor; \n" +
+          "    out_FragColor.rgb *= out_FragColor.a; \n" +
+          "}";
+      } else {
+        source +=
+          "uniform sampler2D tile_batchTexture; \n" +
+          "uniform sampler2D tile_pickTexture;\n" +
+          "in vec2 tile_featureSt; \n" +
+          "void main() \n" +
+          "{ \n" +
+          "    tile_main(); \n" +
+          "    vec4 featureProperties = texture(tile_batchTexture, tile_featureSt); \n" +
+          "    if (featureProperties.a == 0.0) { \n" + // show: alpha == 0 - false, non-zero - true
+          "        discard; \n" +
+          "    } \n" +
+          "    out_FragColor = featureProperties; \n" +
+          "    out_FragColor.rgb *= out_FragColor.a; \n" +
+          "} \n";
+      }
+      return source;
+    };
   };
-};
 
 function getColorBlend(batchTable) {
   const tileset = batchTable._content.tileset;
@@ -853,7 +853,7 @@ Cesium3DTileBatchTable.prototype.getUniformMapCallback = function () {
         // PERFORMANCE_IDEA: we could also use a custom shader that avoids the texture read.
         return defaultValue(
           that._batchTexture.batchTexture,
-          that._batchTexture.defaultTexture
+          that._batchTexture.defaultTexture,
         );
       },
       tile_textureDimensions: function () {
@@ -888,7 +888,7 @@ const StyleCommandsNeeded = {
 
 Cesium3DTileBatchTable.prototype.addDerivedCommands = function (
   frameState,
-  commandStart
+  commandStart,
 ) {
   const commandList = frameState.commandList;
   const commandEnd = commandList.length;
@@ -938,7 +938,7 @@ Cesium3DTileBatchTable.prototype.addDerivedCommands = function (
           if (!defined(derivedCommands.zback)) {
             derivedCommands.zback = deriveZBackfaceCommand(
               frameState.context,
-              originalCommand
+              originalCommand,
             );
           }
           tileset._backfaceCommands.push(derivedCommands.zback);
@@ -951,7 +951,7 @@ Cesium3DTileBatchTable.prototype.addDerivedCommands = function (
           if (command.renderState.depthMask) {
             derivedCommands.stencil = deriveStencilCommand(
               originalCommand,
-              tile._selectionDepth
+              tile._selectionDepth,
             );
           } else {
             // Ignore if tile does not write depth
@@ -1043,7 +1043,7 @@ function deriveOpaqueCommand(command) {
 function getLogDepthPolygonOffsetFragmentShaderProgram(context, shaderProgram) {
   let shader = context.shaderCache.getDerivedShaderProgram(
     shaderProgram,
-    "zBackfaceLogDepth"
+    "zBackfaceLogDepth",
   );
   if (!defined(shader)) {
     const fs = shaderProgram.fragmentShaderSource.clone();
@@ -1057,7 +1057,7 @@ function getLogDepthPolygonOffsetFragmentShaderProgram(context, shaderProgram) {
         vertexShaderSource: shaderProgram.vertexShaderSource,
         fragmentShaderSource: fs,
         attributeLocations: shaderProgram._attributeLocations,
-      }
+      },
     );
   }
 
@@ -1103,7 +1103,7 @@ function deriveZBackfaceCommand(context, command) {
   // tiles to disappear.
   derivedCommand.shaderProgram = getLogDepthPolygonOffsetFragmentShaderProgram(
     context,
-    command.shaderProgram
+    command.shaderProgram,
   );
   return derivedCommand;
 }

package/Source/Scene/Cesium3DTileContentFactory.js

@@ -18,7 +18,7 @@ const Cesium3DTileContentFactory = {
       tile,
       resource,
       arrayBuffer,
-      byteOffset
+      byteOffset,
     );
   },
   pnts: function (tileset, tile, resource, arrayBuffer, byteOffset) {
@@ -27,7 +27,7 @@ const Cesium3DTileContentFactory = {
       tile,
       resource,
       arrayBuffer,
-      byteOffset
+      byteOffset,
     );
   },
   i3dm: function (tileset, tile, resource, arrayBuffer, byteOffset) {
@@ -36,7 +36,7 @@ const Cesium3DTileContentFactory = {
       tile,
       resource,
       arrayBuffer,
-      byteOffset
+      byteOffset,
     );
   },
   cmpt: function (tileset, tile, resource, arrayBuffer, byteOffset) {
@@ -47,7 +47,7 @@ const Cesium3DTileContentFactory = {
       resource,
       arrayBuffer,
       byteOffset,
-      Cesium3DTileContentFactory
+      Cesium3DTileContentFactory,
     );
   },
   externalTileset: function (tileset, tile, resource, json) {
@@ -59,7 +59,7 @@ const Cesium3DTileContentFactory = {
       tile,
       resource,
       arrayBuffer,
-      byteOffset
+      byteOffset,
     );
   },
   vctr: function (tileset, tile, resource, arrayBuffer, byteOffset) {
@@ -68,7 +68,7 @@ const Cesium3DTileContentFactory = {
       tile,
       resource,
       arrayBuffer,
-      byteOffset
+      byteOffset,
     );
   },
   subt: function (tileset, tile, resource, arrayBuffer, byteOffset) {
@@ -78,7 +78,7 @@ const Cesium3DTileContentFactory = {
       resource,
       undefined,
       arrayBuffer,
-      byteOffset
+      byteOffset,
     );
   },
   subtreeJson: function (tileset, tile, resource, json) {

package/Source/Scene/Cesium3DTileFeature.js

@@ -361,7 +361,7 @@ Cesium3DTileFeature.prototype.getPropertyInherited = function (name) {
   return Cesium3DTileFeature.getPropertyInherited(
     this._content,
     this._batchId,
-    name
+    name,
   );
 };
 

package/Source/Scene/Cesium3DTileFeatureTable.js

@@ -18,7 +18,7 @@ function getTypedArrayFromBinary(
   componentType,
   componentLength,
   count,
-  byteOffset
+  byteOffset,
 ) {
   const cachedTypedArrays = featureTable._cachedTypedArrays;
   let typedArray = cachedTypedArrays[semantic];
@@ -27,7 +27,7 @@ function getTypedArrayFromBinary(
       componentType,
       featureTable.buffer.buffer,
       featureTable.buffer.byteOffset + byteOffset,
-      count * componentLength
+      count * componentLength,
     );
     cachedTypedArrays[semantic] = typedArray;
   }
@@ -47,7 +47,7 @@ function getTypedArrayFromArray(featureTable, semantic, componentType, array) {
 Cesium3DTileFeatureTable.prototype.getGlobalProperty = function (
   semantic,
   componentType,
-  componentLength
+  componentLength,
 ) {
   const jsonValue = this.json[semantic];
   if (!defined(jsonValue)) {
@@ -63,7 +63,7 @@ Cesium3DTileFeatureTable.prototype.getGlobalProperty = function (
       componentType,
       componentLength,
       1,
-      jsonValue.byteOffset
+      jsonValue.byteOffset,
     );
   }
 
@@ -77,7 +77,7 @@ Cesium3DTileFeatureTable.prototype.hasProperty = function (semantic) {
 Cesium3DTileFeatureTable.prototype.getPropertyArray = function (
   semantic,
   componentType,
-  componentLength
+  componentLength,
 ) {
   const jsonValue = this.json[semantic];
   if (!defined(jsonValue)) {
@@ -94,7 +94,7 @@ Cesium3DTileFeatureTable.prototype.getPropertyArray = function (
       componentType,
       componentLength,
       this.featuresLength,
-      jsonValue.byteOffset
+      jsonValue.byteOffset,
     );
   }
 
@@ -106,7 +106,7 @@ Cesium3DTileFeatureTable.prototype.getProperty = function (
   componentType,
   componentLength,
   featureId,
-  result
+  result,
 ) {
   const jsonValue = this.json[semantic];
   if (!defined(jsonValue)) {
@@ -116,7 +116,7 @@ Cesium3DTileFeatureTable.prototype.getProperty = function (
   const typedArray = this.getPropertyArray(
     semantic,
     componentType,
-    componentLength
+    componentLength,
   );
 
   if (componentLength === 1) {

package/Source/Scene/Cesium3DTileOptimizations.js

@@ -67,7 +67,7 @@ Cesium3DTileOptimizations.checkChildrenWithinParent = function (tile) {
       const axis = Cartesian3.subtract(
         childOrientedBoundingBox.center,
         orientedBoundingBox.center,
-        scratchAxis
+        scratchAxis,
       );
       const axisLength = Cartesian3.magnitude(axis);
       Cartesian3.divideByScalar(axis, axisLength, axis);

package/Source/Scene/Cesium3DTilePointFeature.js

@@ -46,7 +46,7 @@ function Cesium3DTilePointFeature(
   batchId,
   billboard,
   label,
-  polyline
+  polyline,
 ) {
   this._content = content;
   this._billboard = billboard;
@@ -416,7 +416,7 @@ Object.defineProperties(Cesium3DTilePointFeature.prototype, {
       const ellipsoid = this._content.tileset.ellipsoid;
       const cart = ellipsoid.cartesianToCartographic(
         this._billboard.position,
-        scratchCartographic
+        scratchCartographic,
       );
       cart.height = cart.height - offset + value;
       const newPosition = ellipsoid.cartographicToCartesian(cart);
@@ -465,7 +465,7 @@ Object.defineProperties(Cesium3DTilePointFeature.prototype, {
     set: function (value) {
       this._polyline.material.uniforms.color = Color.clone(
         value,
-        this._polyline.material.uniforms.color
+        this._polyline.material.uniforms.color,
       );
     },
   },
@@ -654,19 +654,19 @@ function setBillboardImage(feature) {
 
   const newColor = defaultValue(
     feature._color,
-    Cesium3DTilePointFeature.defaultColor
+    Cesium3DTilePointFeature.defaultColor,
   );
   const newOutlineColor = defaultValue(
     feature._pointOutlineColor,
-    Cesium3DTilePointFeature.defaultPointOutlineColor
+    Cesium3DTilePointFeature.defaultPointOutlineColor,
   );
   const newOutlineWidth = defaultValue(
     feature._pointOutlineWidth,
-    Cesium3DTilePointFeature.defaultPointOutlineWidth
+    Cesium3DTilePointFeature.defaultPointOutlineWidth,
   );
   const newPointSize = defaultValue(
     feature._pointSize,
-    Cesium3DTilePointFeature.defaultPointSize
+    Cesium3DTilePointFeature.defaultPointSize,
   );
 
   const currentColor = feature._billboardColor;
@@ -686,7 +686,7 @@ function setBillboardImage(feature) {
   feature._billboardColor = Color.clone(newColor, feature._billboardColor);
   feature._billboardOutlineColor = Color.clone(
     newOutlineColor,
-    feature._billboardOutlineColor
+    feature._billboardOutlineColor,
   );
   feature._billboardOutlineWidth = newOutlineWidth;
   feature._billboardSize = newPointSize;
@@ -708,8 +708,8 @@ function setBillboardImage(feature) {
       cssColor,
       cssOutlineColor,
       newOutlineWidth,
-      newPointSize
-    )
+      newPointSize,
+    ),
   );
 }
 
@@ -781,7 +781,7 @@ Cesium3DTilePointFeature.prototype.getPropertyInherited = function (name) {
   return Cesium3DTileFeature.getPropertyInherited(
     this._content,
     this._batchId,
-    name
+    name,
   );
 };