@cesium/engine 20.0.1 → 20.0.2-ion.0

package/Source/Scene/BatchTableHierarchy.js

@@ -6,7 +6,7 @@ import ComponentDatatype from "../Core/ComponentDatatype.js";
 import defined from "../Core/defined.js";
 import DeveloperError from "../Core/DeveloperError.js";
 import getBinaryAccessor from "./getBinaryAccessor.js";
-import RuntimeError from "../Core/RuntimeError.js";
+import Cesium3DTileBatchTable from "./Cesium3DTileBatchTable.js";
 
 /**
  * Object for handling the <code>3DTILES_batch_table_hierarchy</code> extension
@@ -127,7 +127,7 @@ function initialize(hierarchy, hierarchyJson, binaryBody) {
   for (i = 0; i < classesLength; ++i) {
     const classInstancesLength = classes[i].length;
     const properties = classes[i].instances;
-    const binaryProperties = getBinaryProperties(
+    const binaryProperties = Cesium3DTileBatchTable.getBinaryProperties(
       classInstancesLength,
       properties,
       binaryBody,
@@ -154,54 +154,6 @@ function initialize(hierarchy, hierarchyJson, binaryBody) {
   hierarchy._byteLength = byteLength;
 }
 
-function getBinaryProperties(featuresLength, properties, binaryBody) {
-  let binaryProperties;
-  for (const name in properties) {
-    if (properties.hasOwnProperty(name)) {
-      const property = properties[name];
-      const byteOffset = property.byteOffset;
-      if (defined(byteOffset)) {
-        // This is a binary property
-        const componentType = property.componentType;
-        const type = property.type;
-        if (!defined(componentType)) {
-          throw new RuntimeError("componentType is required.");
-        }
-        if (!defined(type)) {
-          throw new RuntimeError("type is required.");
-        }
-        if (!defined(binaryBody)) {
-          throw new RuntimeError(
-            `Property ${name} requires a batch table binary.`,
-          );
-        }
-
-        const binaryAccessor = getBinaryAccessor(property);
-        const componentCount = binaryAccessor.componentsPerAttribute;
-        const classType = binaryAccessor.classType;
-        const typedArray = binaryAccessor.createArrayBufferView(
-          binaryBody.buffer,
-          binaryBody.byteOffset + byteOffset,
-          featuresLength,
-        );
-
-        if (!defined(binaryProperties)) {
-          binaryProperties = {};
-        }
-
-        // Store any information needed to access the binary data, including the typed array,
-        // componentCount (e.g. a VEC4 would be 4), and the type used to pack and unpack (e.g. Cartesian4).
-        binaryProperties[name] = {
-          typedArray: typedArray,
-          componentCount: componentCount,
-          type: classType,
-        };
-      }
-    }
-  }
-  return binaryProperties;
-}
-
 function countBinaryPropertyMemory(binaryProperties) {
   let byteLength = 0;
   for (const name in binaryProperties) {

package/Source/Scene/PntsParser.js

@@ -5,6 +5,7 @@ import combine from "../Core/combine.js";
 import ComponentDatatype from "../Core/ComponentDatatype.js";
 import defined from "../Core/defined.js";
 import getJsonFromTypedArray from "../Core/getJsonFromTypedArray.js";
+import oneTimeWarning from "../Core/oneTimeWarning.js";
 import RuntimeError from "../Core/RuntimeError.js";
 import AttributeType from "./AttributeType.js";
 import Cesium3DTileFeatureTable from "./Cesium3DTileFeatureTable.js";
@@ -185,9 +186,73 @@ PntsParser.parse = function (arrayBuffer, byteOffset) {
     parsedContent.batchTableBinary = batchTableBinary;
   }
 
+  // Handle the case that binary body references are contained in the
+  // batch table without a batch table binary being present
+  removeInvalidBinaryBodyReferences(parsedContent);
+
   return parsedContent;
 };
 
+/**
+ * Remove all invalid binary body references from the batch table
+ * JSON of the given parsed content.
+ *
+ * This is a workaround for gracefully handling the invalid PNTS
+ * files that may have been created by the point cloud tiler.
+ * See https://github.com/CesiumGS/cesium/issues/12872
+ *
+ * When the batch table JSON is undefined, nothing will be done.
+ * When the batch table binary is defined, nothing will be done
+ * (assuming that any binary body references are valid - this is
+ * not checked here).
+ *
+ * Otherwise, this will remove all binary body references from the
+ * batch table JSON that are not resolved from draco via the
+ * `parsedContent.draco.batchTableProperties`.
+ *
+ * If any (invalid) binary body reference is found (and removed),
+ * a one-time warning will be printed.
+ *
+ * @param {object} parsedContent The parsed content
+ */
+function removeInvalidBinaryBodyReferences(parsedContent) {
+  const batchTableJson = parsedContent.batchTableJson;
+  if (!defined(batchTableJson)) {
+    return;
+  }
+  const batchTableBinary = parsedContent.batchTableBinary;
+  if (defined(batchTableBinary)) {
+    return;
+  }
+  const dracoBatchTablePropertyNames = Object.keys(
+    parsedContent.draco?.batchTableProperties ?? {},
+  );
+
+  // Collect the names of all binary body references (identified
+  // by the property having a `byteOffset`) that have not been
+  // resolved via the parsedContent.draco.batchTableProperties
+  const invalidBinaryBodyReferenceNames = [];
+  for (const name of Object.keys(batchTableJson)) {
+    const property = batchTableJson[name];
+    const byteOffset = property.byteOffset;
+    if (defined(byteOffset)) {
+      if (!dracoBatchTablePropertyNames.includes(name)) {
+        invalidBinaryBodyReferenceNames.push(name);
+      }
+    }
+  }
+
+  // If there have been invalid binary body references, print
+  // a one-time warning for each of them, and delete them.
+  for (const name of invalidBinaryBodyReferenceNames) {
+    oneTimeWarning(
+      `PntsParser-invalidBinaryBodyReference`,
+      `The point cloud data contained a binary property ${name} that could not be resolved - skipping`,
+    );
+    delete batchTableJson[name];
+  }
+}
+
 function parseDracoProperties(featureTable, batchTableJson) {
   const featureTableJson = featureTable.json;
   let dracoBuffer;

package/index.d.ts

@@ -39434,6 +39434,29 @@ export type PickedMetadataInfo = {
     classProperty: MetadataClassProperty;
 };
 
+/**
+ * Remove all invalid binary body references from the batch table
+ * JSON of the given parsed content.
+ *
+ * This is a workaround for gracefully handling the invalid PNTS
+ * files that may have been created by the point cloud tiler.
+ * See https://github.com/CesiumGS/cesium/issues/12872
+ *
+ * When the batch table JSON is undefined, nothing will be done.
+ * When the batch table binary is defined, nothing will be done
+ * (assuming that any binary body references are valid - this is
+ * not checked here).
+ *
+ * Otherwise, this will remove all binary body references from the
+ * batch table JSON that are not resolved from draco via the
+ * `parsedContent.draco.batchTableProperties`.
+ *
+ * If any (invalid) binary body reference is found (and removed),
+ * a one-time warning will be printed.
+ * @param parsedContent - The parsed content
+ */
+export function removeInvalidBinaryBodyReferences(parsedContent: any): void;
+
 /**
  * Options for performing point attenuation based on geometric error when rendering
  * point clouds using 3D Tiles.

package/index.js

@@ -1,4 +1,4 @@
-globalThis.CESIUM_VERSION = "1.133.1";
+globalThis.CESIUM_VERSION = "1.133.2-ion";
 export { default as AutomaticUniforms } from './Source/Renderer/AutomaticUniforms.js';
 export { default as Buffer } from './Source/Renderer/Buffer.js';
 export { default as BufferUsage } from './Source/Renderer/BufferUsage.js';
@@ -841,7 +841,6 @@ export { default as parseFeatureMetadataLegacy } from './Source/Scene/parseFeatu
 export { default as parseStructuralMetadata } from './Source/Scene/parseStructuralMetadata.js';
 export { default as preprocess3DTileContent } from './Source/Scene/preprocess3DTileContent.js';
 export { default as processVoxelProperties } from './Source/Scene/processVoxelProperties.js';
-export { default as _shadersCzmBuiltins } from './Source/Shaders/Builtin/CzmBuiltins.js';
 export { default as _shadersAllMaterialAppearanceFS } from './Source/Shaders/Appearances/AllMaterialAppearanceFS.js';
 export { default as _shadersAllMaterialAppearanceVS } from './Source/Shaders/Appearances/AllMaterialAppearanceVS.js';
 export { default as _shadersBasicMaterialAppearanceFS } from './Source/Shaders/Appearances/BasicMaterialAppearanceFS.js';
@@ -856,6 +855,7 @@ export { default as _shadersPolylineColorAppearanceVS } from './Source/Shaders/A
 export { default as _shadersPolylineMaterialAppearanceVS } from './Source/Shaders/Appearances/PolylineMaterialAppearanceVS.js';
 export { default as _shadersTexturedMaterialAppearanceFS } from './Source/Shaders/Appearances/TexturedMaterialAppearanceFS.js';
 export { default as _shadersTexturedMaterialAppearanceVS } from './Source/Shaders/Appearances/TexturedMaterialAppearanceVS.js';
+export { default as _shadersCzmBuiltins } from './Source/Shaders/Builtin/CzmBuiltins.js';
 export { default as _shadersAspectRampMaterial } from './Source/Shaders/Materials/AspectRampMaterial.js';
 export { default as _shadersBumpMapMaterial } from './Source/Shaders/Materials/BumpMapMaterial.js';
 export { default as _shadersCheckerboardMaterial } from './Source/Shaders/Materials/CheckerboardMaterial.js';
@@ -875,6 +875,32 @@ export { default as _shadersSlopeRampMaterial } from './Source/Shaders/Materials
 export { default as _shadersStripeMaterial } from './Source/Shaders/Materials/StripeMaterial.js';
 export { default as _shadersWater } from './Source/Shaders/Materials/Water.js';
 export { default as _shadersWaterMaskMaterial } from './Source/Shaders/Materials/WaterMaskMaterial.js';
+export { default as _shadersAcesTonemappingStage } from './Source/Shaders/PostProcessStages/AcesTonemappingStage.js';
+export { default as _shadersAdditiveBlend } from './Source/Shaders/PostProcessStages/AdditiveBlend.js';
+export { default as _shadersAmbientOcclusionGenerate } from './Source/Shaders/PostProcessStages/AmbientOcclusionGenerate.js';
+export { default as _shadersAmbientOcclusionModulate } from './Source/Shaders/PostProcessStages/AmbientOcclusionModulate.js';
+export { default as _shadersBlackAndWhite } from './Source/Shaders/PostProcessStages/BlackAndWhite.js';
+export { default as _shadersBloomComposite } from './Source/Shaders/PostProcessStages/BloomComposite.js';
+export { default as _shadersBrightPass } from './Source/Shaders/PostProcessStages/BrightPass.js';
+export { default as _shadersBrightness } from './Source/Shaders/PostProcessStages/Brightness.js';
+export { default as _shadersCompositeTranslucentClassification } from './Source/Shaders/PostProcessStages/CompositeTranslucentClassification.js';
+export { default as _shadersContrastBias } from './Source/Shaders/PostProcessStages/ContrastBias.js';
+export { default as _shadersDepthOfField } from './Source/Shaders/PostProcessStages/DepthOfField.js';
+export { default as _shadersDepthView } from './Source/Shaders/PostProcessStages/DepthView.js';
+export { default as _shadersDepthViewPacked } from './Source/Shaders/PostProcessStages/DepthViewPacked.js';
+export { default as _shadersEdgeDetection } from './Source/Shaders/PostProcessStages/EdgeDetection.js';
+export { default as _shadersFXAA } from './Source/Shaders/PostProcessStages/FXAA.js';
+export { default as _shadersFilmicTonemapping } from './Source/Shaders/PostProcessStages/FilmicTonemapping.js';
+export { default as _shadersGaussianBlur1D } from './Source/Shaders/PostProcessStages/GaussianBlur1D.js';
+export { default as _shadersLensFlare } from './Source/Shaders/PostProcessStages/LensFlare.js';
+export { default as _shadersModifiedReinhardTonemapping } from './Source/Shaders/PostProcessStages/ModifiedReinhardTonemapping.js';
+export { default as _shadersNightVision } from './Source/Shaders/PostProcessStages/NightVision.js';
+export { default as _shadersPassThrough } from './Source/Shaders/PostProcessStages/PassThrough.js';
+export { default as _shadersPassThroughDepth } from './Source/Shaders/PostProcessStages/PassThroughDepth.js';
+export { default as _shadersPbrNeutralTonemapping } from './Source/Shaders/PostProcessStages/PbrNeutralTonemapping.js';
+export { default as _shadersPointCloudEyeDomeLighting } from './Source/Shaders/PostProcessStages/PointCloudEyeDomeLighting.js';
+export { default as _shadersReinhardTonemapping } from './Source/Shaders/PostProcessStages/ReinhardTonemapping.js';
+export { default as _shadersSilhouette } from './Source/Shaders/PostProcessStages/Silhouette.js';
 export { default as _shadersAtmosphereStageFS } from './Source/Shaders/Model/AtmosphereStageFS.js';
 export { default as _shadersAtmosphereStageVS } from './Source/Shaders/Model/AtmosphereStageVS.js';
 export { default as _shadersCPUStylingStageFS } from './Source/Shaders/Model/CPUStylingStageFS.js';
@@ -909,32 +935,6 @@ export { default as _shadersPrimitiveOutlineStageVS } from './Source/Shaders/Mod
 export { default as _shadersSelectedFeatureIdStageCommon } from './Source/Shaders/Model/SelectedFeatureIdStageCommon.js';
 export { default as _shadersSkinningStageVS } from './Source/Shaders/Model/SkinningStageVS.js';
 export { default as _shadersVerticalExaggerationStageVS } from './Source/Shaders/Model/VerticalExaggerationStageVS.js';
-export { default as _shadersAcesTonemappingStage } from './Source/Shaders/PostProcessStages/AcesTonemappingStage.js';
-export { default as _shadersAdditiveBlend } from './Source/Shaders/PostProcessStages/AdditiveBlend.js';
-export { default as _shadersAmbientOcclusionGenerate } from './Source/Shaders/PostProcessStages/AmbientOcclusionGenerate.js';
-export { default as _shadersAmbientOcclusionModulate } from './Source/Shaders/PostProcessStages/AmbientOcclusionModulate.js';
-export { default as _shadersBlackAndWhite } from './Source/Shaders/PostProcessStages/BlackAndWhite.js';
-export { default as _shadersBloomComposite } from './Source/Shaders/PostProcessStages/BloomComposite.js';
-export { default as _shadersBrightPass } from './Source/Shaders/PostProcessStages/BrightPass.js';
-export { default as _shadersBrightness } from './Source/Shaders/PostProcessStages/Brightness.js';
-export { default as _shadersCompositeTranslucentClassification } from './Source/Shaders/PostProcessStages/CompositeTranslucentClassification.js';
-export { default as _shadersContrastBias } from './Source/Shaders/PostProcessStages/ContrastBias.js';
-export { default as _shadersDepthOfField } from './Source/Shaders/PostProcessStages/DepthOfField.js';
-export { default as _shadersDepthView } from './Source/Shaders/PostProcessStages/DepthView.js';
-export { default as _shadersDepthViewPacked } from './Source/Shaders/PostProcessStages/DepthViewPacked.js';
-export { default as _shadersEdgeDetection } from './Source/Shaders/PostProcessStages/EdgeDetection.js';
-export { default as _shadersFXAA } from './Source/Shaders/PostProcessStages/FXAA.js';
-export { default as _shadersFilmicTonemapping } from './Source/Shaders/PostProcessStages/FilmicTonemapping.js';
-export { default as _shadersGaussianBlur1D } from './Source/Shaders/PostProcessStages/GaussianBlur1D.js';
-export { default as _shadersLensFlare } from './Source/Shaders/PostProcessStages/LensFlare.js';
-export { default as _shadersModifiedReinhardTonemapping } from './Source/Shaders/PostProcessStages/ModifiedReinhardTonemapping.js';
-export { default as _shadersNightVision } from './Source/Shaders/PostProcessStages/NightVision.js';
-export { default as _shadersPassThrough } from './Source/Shaders/PostProcessStages/PassThrough.js';
-export { default as _shadersPassThroughDepth } from './Source/Shaders/PostProcessStages/PassThroughDepth.js';
-export { default as _shadersPbrNeutralTonemapping } from './Source/Shaders/PostProcessStages/PbrNeutralTonemapping.js';
-export { default as _shadersPointCloudEyeDomeLighting } from './Source/Shaders/PostProcessStages/PointCloudEyeDomeLighting.js';
-export { default as _shadersReinhardTonemapping } from './Source/Shaders/PostProcessStages/ReinhardTonemapping.js';
-export { default as _shadersSilhouette } from './Source/Shaders/PostProcessStages/Silhouette.js';
 export { default as _shadersIntersectBox } from './Source/Shaders/Voxels/IntersectBox.js';
 export { default as _shadersIntersectClippingPlanes } from './Source/Shaders/Voxels/IntersectClippingPlanes.js';
 export { default as _shadersIntersectCylinder } from './Source/Shaders/Voxels/IntersectCylinder.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cesium/engine",
-  "version": "20.0.1",
+  "version": "20.0.2-ion.0",
   "description": "CesiumJS is a JavaScript library for creating 3D globes and 2D maps in a web browser without a plugin.",
   "keywords": [
     "3D",