@cesium/engine 11.0.0 → 12.0.0

package/Source/Scene/Model/Model3DTileContent.js

@@ -152,6 +152,25 @@ Object.defineProperties(Model3DTileContent.prototype, {
   },
 });
 
+/**
+ * Returns the object that was created for the given extension.
+ *
+ * The given name may be the name of a glTF extension, like `"EXT_example_extension"`.
+ * If the specified extension was present in the root of the underlying glTF asset,
+ * and a loder for the specified extension has processed the extension data, then
+ * this will return the model representation of the extension.
+ *
+ * @param {string} extensionName The name of the extension
+ * @returns {object|undefined} The object, or `undefined`
+ *
+ * @private
+ */
+Model3DTileContent.prototype.getExtension = function (extensionName) {
+  const model = this._model;
+  const extension = model.getExtension(extensionName);
+  return extension;
+};
+
 Model3DTileContent.prototype.getFeature = function (featureId) {
   const model = this._model;
   const featureTableId = model.featureTableId;
@@ -159,7 +178,7 @@ Model3DTileContent.prototype.getFeature = function (featureId) {
   //>>includeStart('debug', pragmas.debug);
   if (!defined(featureTableId)) {
     throw new DeveloperError(
-      "No feature ID set is selected. Make sure Cesium3DTileset.featureIdLabel or Cesium3DTileset.instanceFeatureIdLabel is defined"
+      "No feature ID set is selected. Make sure Cesium3DTileset.featureIdLabel or Cesium3DTileset.instanceFeatureIdLabel is defined",
     );
   }
   //>>includeEnd('debug');
@@ -169,7 +188,7 @@ Model3DTileContent.prototype.getFeature = function (featureId) {
   //>>includeStart('debug', pragmas.debug);
   if (!defined(featureTable)) {
     throw new DeveloperError(
-      "No feature table found for the selected feature ID set"
+      "No feature table found for the selected feature ID set",
     );
   }
   //>>includeEnd('debug');
@@ -180,7 +199,7 @@ Model3DTileContent.prototype.getFeature = function (featureId) {
     throw new DeveloperError(
       `featureId is required and must be between 0 and featuresLength - 1 (${
         featuresLength - 1
-      }).`
+      }).`,
     );
   }
   //>>includeEnd('debug');
@@ -244,6 +263,11 @@ Model3DTileContent.prototype.update = function (tileset, frameState) {
         : undefined;
   }
 
+  const tilesetEnvironmentMapManager = tileset.environmentMapManager;
+  if (model.environmentMapManager !== tilesetClippingPlanes) {
+    model._environmentMapManager = tilesetEnvironmentMapManager;
+  }
+
   // If the model references a different ClippingPlaneCollection from the tileset,
   // update the model to use the new ClippingPlaneCollection.
   if (
@@ -309,7 +333,7 @@ Model3DTileContent.fromGltf = async function (tileset, tile, resource, gltf) {
     tileset,
     tile,
     content,
-    additionalOptions
+    additionalOptions,
   );
 
   const classificationType = tileset.vectorClassificationOnly
@@ -329,7 +353,7 @@ Model3DTileContent.fromB3dm = async function (
   tile,
   resource,
   arrayBuffer,
-  byteOffset
+  byteOffset,
 ) {
   const content = new Model3DTileContent(tileset, tile, resource);
 
@@ -343,7 +367,7 @@ Model3DTileContent.fromB3dm = async function (
     tileset,
     tile,
     content,
-    additionalOptions
+    additionalOptions,
   );
 
   const classificationType = tileset.vectorClassificationOnly
@@ -363,7 +387,7 @@ Model3DTileContent.fromI3dm = async function (
   tile,
   resource,
   arrayBuffer,
-  byteOffset
+  byteOffset,
 ) {
   const content = new Model3DTileContent(tileset, tile, resource);
 
@@ -377,7 +401,7 @@ Model3DTileContent.fromI3dm = async function (
     tileset,
     tile,
     content,
-    additionalOptions
+    additionalOptions,
   );
 
   const model = await Model.fromI3dm(modelOptions);
@@ -391,7 +415,7 @@ Model3DTileContent.fromPnts = async function (
   tile,
   resource,
   arrayBuffer,
-  byteOffset
+  byteOffset,
 ) {
   const content = new Model3DTileContent(tileset, tile, resource);
 
@@ -405,7 +429,7 @@ Model3DTileContent.fromPnts = async function (
     tileset,
     tile,
     content,
-    additionalOptions
+    additionalOptions,
   );
   const model = await Model.fromPnts(modelOptions);
   content._model = model;
@@ -417,7 +441,7 @@ Model3DTileContent.fromGeoJson = async function (
   tileset,
   tile,
   resource,
-  geoJson
+  geoJson,
 ) {
   const content = new Model3DTileContent(tileset, tile, resource);
 
@@ -430,7 +454,7 @@ Model3DTileContent.fromGeoJson = async function (
     tileset,
     tile,
     content,
-    additionalOptions
+    additionalOptions,
   );
   const model = await Model.fromGeoJson(modelOptions);
   content._model = model;
@@ -463,7 +487,7 @@ Model3DTileContent.prototype.pick = function (ray, frameState, result) {
     verticalExaggeration,
     relativeHeight,
     Ellipsoid.WGS84,
-    result
+    result,
   );
 };
 

package/Source/Scene/Model/ModelAnimationChannel.js

@@ -280,12 +280,12 @@ ModelAnimationChannel.prototype.animate = function (time) {
     ) {
       runtimeNode[path] = spline.evaluate(
         localAnimationTime,
-        scratchCartesian3
+        scratchCartesian3,
       );
     } else if (path === AnimatedPropertyType.ROTATION) {
       runtimeNode[path] = spline.evaluate(
         localAnimationTime,
-        scratchQuaternion
+        scratchQuaternion,
       );
     }
   }

package/Source/Scene/Model/ModelAnimationCollection.js

@@ -174,7 +174,7 @@ ModelAnimationCollection.prototype.add = function (options) {
   //>>includeStart('debug', pragmas.debug);
   if (!model.ready) {
     throw new DeveloperError(
-      "Animations are not loaded.  Wait for Model.ready to be true."
+      "Animations are not loaded.  Wait for Model.ready to be true.",
     );
   }
   //>>includeEnd('debug');
@@ -184,7 +184,7 @@ ModelAnimationCollection.prototype.add = function (options) {
   //>>includeStart('debug', pragmas.debug);
   if (!defined(options.name) && !defined(options.index)) {
     throw new DeveloperError(
-      "Either options.name or options.index must be defined."
+      "Either options.name or options.index must be defined.",
     );
   }
 
@@ -258,7 +258,7 @@ ModelAnimationCollection.prototype.addAll = function (options) {
   //>>includeStart('debug', pragmas.debug);
   if (!model.ready) {
     throw new DeveloperError(
-      "Animations are not loaded.  Wait for Model.ready to be true."
+      "Animations are not loaded.  Wait for Model.ready to be true.",
     );
   }
 
@@ -371,7 +371,7 @@ ModelAnimationCollection.prototype.get = function (index) {
 
   if (index >= this._runtimeAnimations.length || index < 0) {
     throw new DeveloperError(
-      "index must be valid within the range of the collection"
+      "index must be valid within the range of the collection",
     );
   }
   //>>includeEnd('debug');
@@ -384,7 +384,7 @@ const animationsToRemove = [];
 function createAnimationRemovedFunction(
   modelAnimationCollection,
   model,
-  animation
+  animation,
 ) {
   return function () {
     modelAnimationCollection.animationRemoved.raiseEvent(model, animation);
@@ -428,7 +428,7 @@ ModelAnimationCollection.prototype.update = function (frameState) {
       runtimeAnimation._computedStartTime = JulianDate.addSeconds(
         defaultValue(runtimeAnimation.startTime, sceneTime),
         runtimeAnimation.delay,
-        new JulianDate()
+        new JulianDate(),
       );
     }
 
@@ -450,7 +450,7 @@ ModelAnimationCollection.prototype.update = function (frameState) {
     if (duration !== 0.0) {
       const seconds = JulianDate.secondsDifference(
         reachedStopTime ? stopTime : sceneTime,
-        startTime
+        startTime,
       );
       delta = defined(runtimeAnimation._animationTime)
         ? runtimeAnimation._animationTime(duration, seconds)
@@ -511,7 +511,7 @@ ModelAnimationCollection.prototype.update = function (frameState) {
       localAnimationTime = CesiumMath.clamp(
         localAnimationTime,
         runtimeAnimation.localStartTime,
-        runtimeAnimation.localStopTime
+        runtimeAnimation.localStopTime,
       );
 
       runtimeAnimation.animate(localAnimationTime);
@@ -542,7 +542,7 @@ ModelAnimationCollection.prototype.update = function (frameState) {
     const animationToRemove = animationsToRemove[j];
     runtimeAnimations.splice(runtimeAnimations.indexOf(animationToRemove), 1);
     frameState.afterRender.push(
-      createAnimationRemovedFunction(this, model, animationToRemove)
+      createAnimationRemovedFunction(this, model, animationToRemove),
     );
   }
   animationsToRemove.length = 0;

package/Source/Scene/Model/ModelArticulation.js

@@ -184,7 +184,7 @@ ModelArticulation.prototype.apply = function () {
 
   let articulationMatrix = Matrix4.clone(
     Matrix4.IDENTITY,
-    scratchArticulationMatrix
+    scratchArticulationMatrix,
   );
 
   let i;
@@ -205,7 +205,7 @@ ModelArticulation.prototype.apply = function () {
     const transform = Matrix4.multiplyTransformation(
       node.originalTransform,
       articulationMatrix,
-      scratchNodeMatrix
+      scratchNodeMatrix,
     );
     node.transform = transform;
   }

package/Source/Scene/Model/ModelArticulationStage.js

@@ -155,7 +155,7 @@ Object.defineProperties(ModelArticulationStage.prototype, {
         !CesiumMath.equalsEpsilon(
           this._currentValue,
           value,
-          articulationEpsilon
+          articulationEpsilon,
         )
       ) {
         this._currentValue = value;
@@ -194,21 +194,21 @@ ModelArticulationStage.prototype.applyStageToMatrix = function (result) {
     case ArticulationStageType.XROTATE:
       rotation = Matrix3.fromRotationX(
         CesiumMath.toRadians(value),
-        scratchArticulationRotation
+        scratchArticulationRotation,
       );
       result = Matrix4.multiplyByMatrix3(result, rotation, result);
       break;
     case ArticulationStageType.YROTATE:
       rotation = Matrix3.fromRotationY(
         CesiumMath.toRadians(value),
-        scratchArticulationRotation
+        scratchArticulationRotation,
       );
       result = Matrix4.multiplyByMatrix3(result, rotation, result);
       break;
     case ArticulationStageType.ZROTATE:
       rotation = Matrix3.fromRotationZ(
         CesiumMath.toRadians(value),
-        scratchArticulationRotation
+        scratchArticulationRotation,
       );
       result = Matrix4.multiplyByMatrix3(result, rotation, result);
       break;

package/Source/Scene/Model/ModelClippingPlanesPipelineStage.js

@@ -36,7 +36,7 @@ const textureResolutionScratch = new Cartesian2();
 ModelClippingPlanesPipelineStage.process = function (
   renderResources,
   model,
-  frameState
+  frameState,
 ) {
   const clippingPlanes = model.clippingPlanes;
   const context = frameState.context;
@@ -45,20 +45,20 @@ ModelClippingPlanesPipelineStage.process = function (
   shaderBuilder.addDefine(
     "HAS_CLIPPING_PLANES",
     undefined,
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
 
   shaderBuilder.addDefine(
     "CLIPPING_PLANES_LENGTH",
     clippingPlanes.length,
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
 
   if (clippingPlanes.unionClippingRegions) {
     shaderBuilder.addDefine(
       "UNION_CLIPPING_REGIONS",
       undefined,
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
   }
 
@@ -66,42 +66,42 @@ ModelClippingPlanesPipelineStage.process = function (
     shaderBuilder.addDefine(
       "USE_CLIPPING_PLANES_FLOAT_TEXTURE",
       undefined,
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
   }
 
   const textureResolution = ClippingPlaneCollection.getTextureResolution(
     clippingPlanes,
     context,
-    textureResolutionScratch
+    textureResolutionScratch,
   );
 
   shaderBuilder.addDefine(
     "CLIPPING_PLANES_TEXTURE_WIDTH",
     textureResolution.x,
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
 
   shaderBuilder.addDefine(
     "CLIPPING_PLANES_TEXTURE_HEIGHT",
     textureResolution.y,
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
 
   shaderBuilder.addUniform(
     "sampler2D",
     "model_clippingPlanes",
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
   shaderBuilder.addUniform(
     "vec4",
     "model_clippingPlanesEdgeStyle",
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
   shaderBuilder.addUniform(
     "mat4",
     "model_clippingPlanesMatrix",
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
 
   shaderBuilder.addFragmentLines(ModelClippingPlanesStageFS);

package/Source/Scene/Model/ModelClippingPolygonsPipelineStage.js

@@ -35,7 +35,7 @@ const ModelClippingPolygonsPipelineStage = {
 ModelClippingPolygonsPipelineStage.process = function (
   renderResources,
   model,
-  frameState
+  frameState,
 ) {
   const clippingPolygons = model.clippingPolygons;
   const shaderBuilder = renderResources.shaderBuilder;
@@ -43,33 +43,33 @@ ModelClippingPolygonsPipelineStage.process = function (
   shaderBuilder.addDefine(
     "ENABLE_CLIPPING_POLYGONS",
     undefined,
-    ShaderDestination.BOTH
+    ShaderDestination.BOTH,
   );
 
   if (clippingPolygons.inverse) {
     shaderBuilder.addDefine(
       "CLIPPING_INVERSE",
       undefined,
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
   }
 
   shaderBuilder.addDefine(
     "CLIPPING_POLYGON_REGIONS_LENGTH",
     clippingPolygons.extentsCount,
-    ShaderDestination.BOTH
+    ShaderDestination.BOTH,
   );
 
   shaderBuilder.addUniform(
     "sampler2D",
     "model_clippingDistance",
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
 
   shaderBuilder.addUniform(
     "sampler2D",
     "model_clippingExtents",
-    ShaderDestination.VERTEX
+    ShaderDestination.VERTEX,
   );
 
   shaderBuilder.addVarying("vec2", "v_clippingPosition");

package/Source/Scene/Model/ModelColorPipelineStage.js

@@ -37,14 +37,14 @@ const ModelColorPipelineStage = {
 ModelColorPipelineStage.process = function (
   renderResources,
   model,
-  frameState
+  frameState,
 ) {
   const shaderBuilder = renderResources.shaderBuilder;
 
   shaderBuilder.addDefine(
     "HAS_MODEL_COLOR",
     undefined,
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
   shaderBuilder.addFragmentLines(ModelColorStageFS);
 
@@ -69,7 +69,7 @@ ModelColorPipelineStage.process = function (
   shaderBuilder.addUniform(
     "vec4",
     ModelColorPipelineStage.COLOR_UNIFORM_NAME,
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
   stageUniforms[ModelColorPipelineStage.COLOR_UNIFORM_NAME] = function () {
     return model.color;
@@ -79,20 +79,19 @@ ModelColorPipelineStage.process = function (
   shaderBuilder.addUniform(
     "float",
     ModelColorPipelineStage.COLOR_BLEND_UNIFORM_NAME,
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
-  stageUniforms[
-    ModelColorPipelineStage.COLOR_BLEND_UNIFORM_NAME
-  ] = function () {
-    return ColorBlendMode.getColorBlend(
-      model.colorBlendMode,
-      model.colorBlendAmount
-    );
-  };
+  stageUniforms[ModelColorPipelineStage.COLOR_BLEND_UNIFORM_NAME] =
+    function () {
+      return ColorBlendMode.getColorBlend(
+        model.colorBlendMode,
+        model.colorBlendAmount,
+      );
+    };
 
   renderResources.uniformMap = combine(
     stageUniforms,
-    renderResources.uniformMap
+    renderResources.uniformMap,
   );
 };
 

package/Source/Scene/Model/ModelDrawCommand.js

@@ -299,7 +299,7 @@ Object.defineProperties(ModelDrawCommand.prototype, {
       this._boundingVolume = BoundingSphere.transform(
         this.runtimePrimitive.boundingSphere,
         this._modelMatrix,
-        this._boundingVolume
+        this._boundingVolume,
       );
     },
   },
@@ -413,7 +413,7 @@ function updateModelMatrix2D(drawCommand, frameState) {
   const modelMatrix = drawCommand._modelMatrix;
   drawCommand._modelMatrix2D = Matrix4.clone(
     modelMatrix,
-    drawCommand._modelMatrix2D
+    drawCommand._modelMatrix2D,
   );
 
   // Change the translation's y-component so it appears on the opposite side
@@ -427,7 +427,7 @@ function updateModelMatrix2D(drawCommand, frameState) {
   drawCommand._boundingVolume2D = BoundingSphere.transform(
     drawCommand.runtimePrimitive.boundingSphere,
     drawCommand._modelMatrix2D,
-    drawCommand._boundingVolume2D
+    drawCommand._boundingVolume2D,
   );
 }
 
@@ -537,7 +537,7 @@ ModelDrawCommand.prototype.pushCommands = function (frameState, result) {
         pushCommand(
           tileset._backfaceCommands,
           this._skipLodBackfaceCommand,
-          use2D
+          use2D,
         );
       }
 
@@ -578,7 +578,7 @@ ModelDrawCommand.prototype.pushCommands = function (frameState, result) {
  */
 ModelDrawCommand.prototype.pushSilhouetteCommands = function (
   frameState,
-  result
+  result,
 ) {
   const use2D = shouldUse2DCommands(this, frameState);
   pushCommand(result, this._silhouetteColorCommand, use2D);