@cesium/engine 11.0.0 → 11.1.0

package/Source/Scene/Model/ClassificationModelDrawCommand.js

@@ -173,7 +173,7 @@ function initialize(drawCommand) {
     drawCommand._commandListDebugWireframe = createBatchCommands(
       drawCommand,
       derivedCommands,
-      drawCommand._commandListDebugWireframe
+      drawCommand._commandListDebugWireframe,
     );
 
     const commandList = drawCommand._commandListDebugWireframe;
@@ -204,14 +204,14 @@ function initialize(drawCommand) {
     drawCommand._commandListTerrain = createBatchCommands(
       drawCommand,
       derivedCommands,
-      drawCommand._commandListTerrain
+      drawCommand._commandListTerrain,
     );
 
     if (allowPicking) {
       drawCommand._commandListTerrainPicking = createPickCommands(
         drawCommand,
         derivedCommands,
-        drawCommand._commandListTerrainPicking
+        drawCommand._commandListTerrainPicking,
       );
     }
   }
@@ -227,14 +227,14 @@ function initialize(drawCommand) {
     drawCommand._commandList3DTiles = createBatchCommands(
       drawCommand,
       derivedCommands,
-      drawCommand._commandList3DTiles
+      drawCommand._commandList3DTiles,
     );
 
     if (allowPicking) {
       drawCommand._commandList3DTilesPicking = createPickCommands(
         drawCommand,
         derivedCommands,
-        drawCommand._commandList3DTilesPicking
+        drawCommand._commandList3DTilesPicking,
       );
     }
   }
@@ -423,7 +423,7 @@ Object.defineProperties(ClassificationModelDrawCommand.prototype, {
       this._boundingVolume = BoundingSphere.transform(
         boundingSphere,
         this._modelMatrix,
-        this._boundingVolume
+        this._boundingVolume,
       );
     },
   },
@@ -477,7 +477,7 @@ Object.defineProperties(ClassificationModelDrawCommand.prototype, {
  */
 ClassificationModelDrawCommand.prototype.pushCommands = function (
   frameState,
-  result
+  result,
 ) {
   const passes = frameState.passes;
   if (passes.render) {
@@ -509,7 +509,7 @@ ClassificationModelDrawCommand.prototype.pushCommands = function (
         this._commandListIgnoreShow = createBatchCommands(
           this,
           derivedCommands,
-          this._commandListIgnoreShow
+          this._commandListIgnoreShow,
         );
       }
 

package/Source/Scene/Model/ClassificationPipelineStage.js

@@ -37,14 +37,14 @@ const ClassificationPipelineStage = {
 ClassificationPipelineStage.process = function (
   renderResources,
   primitive,
-  frameState
+  frameState,
 ) {
   const shaderBuilder = renderResources.shaderBuilder;
 
   shaderBuilder.addDefine(
     "HAS_CLASSIFICATION",
     undefined,
-    ShaderDestination.BOTH
+    ShaderDestination.BOTH,
   );
 
   const runtimePrimitive = renderResources.runtimePrimitive;
@@ -57,12 +57,12 @@ ClassificationPipelineStage.process = function (
 function createClassificationBatches(primitive, runtimePrimitive) {
   const positionAttribute = ModelUtility.getAttributeBySemantic(
     primitive,
-    VertexAttributeSemantic.POSITION
+    VertexAttributeSemantic.POSITION,
   );
 
   if (!defined(positionAttribute)) {
     throw new RuntimeError(
-      "Primitives must have a position attribute to be used for classification."
+      "Primitives must have a position attribute to be used for classification.",
     );
   }
 
@@ -80,7 +80,7 @@ function createClassificationBatches(primitive, runtimePrimitive) {
   const featureIdAttribute = ModelUtility.getAttributeBySemantic(
     primitive,
     VertexAttributeSemantic.FEATURE_ID,
-    0
+    0,
   );
 
   // If there are no feature IDs, render the primitive in a single batch.

package/Source/Scene/Model/CustomShader.js

@@ -180,7 +180,7 @@ function CustomShader(options) {
    */
   this.translucencyMode = defaultValue(
     options.translucencyMode,
-    CustomShaderTranslucencyMode.INHERIT
+    CustomShaderTranslucencyMode.INHERIT,
   );
 
   /**
@@ -249,7 +249,7 @@ function buildUniformMap(customShader) {
       //>>includeStart('debug', pragmas.debug);
       if (type === UniformType.SAMPLER_CUBE) {
         throw new DeveloperError(
-          "CustomShader does not support samplerCube uniforms"
+          "CustomShader does not support samplerCube uniforms",
         );
       }
       //>>includeEnd('debug');
@@ -258,12 +258,12 @@ function buildUniformMap(customShader) {
         customShader._textureManager.loadTexture2D(uniformName, uniform.value);
         uniformMap[uniformName] = createUniformTexture2DFunction(
           customShader,
-          uniformName
+          uniformName,
         );
       } else {
         uniformMap[uniformName] = createUniformFunction(
           customShader,
-          uniformName
+          uniformName,
         );
       }
     }
@@ -275,7 +275,7 @@ function createUniformTexture2DFunction(customShader, uniformName) {
   return function () {
     return defaultValue(
       customShader._textureManager.getTexture(uniformName),
-      customShader._defaultTexture
+      customShader._defaultTexture,
     );
   };
 }
@@ -357,13 +357,13 @@ function validateVariableUsage(
   variableSet,
   incorrectVariable,
   correctVariable,
-  vertexOrFragment
+  vertexOrFragment,
 ) {
   if (variableSet.hasOwnProperty(incorrectVariable)) {
     const message = `${expandCoordinateAbbreviations(
-      incorrectVariable
+      incorrectVariable,
     )} is not available in the ${vertexOrFragment} shader. Did you mean ${expandCoordinateAbbreviations(
-      correctVariable
+      correctVariable,
     )} instead?`;
     throw new DeveloperError(message);
   }
@@ -413,7 +413,7 @@ CustomShader.prototype.setUniform = function (uniformName, value) {
   Check.defined("value", value);
   if (!defined(this.uniforms[uniformName])) {
     throw new DeveloperError(
-      `Uniform ${uniformName} must be declared in the CustomShader constructor.`
+      `Uniform ${uniformName} must be declared in the CustomShader constructor.`,
     );
   }
   //>>includeEnd('debug');

package/Source/Scene/Model/CustomShaderPipelineStage.js

@@ -69,7 +69,7 @@ const CustomShaderPipelineStage = {
 CustomShaderPipelineStage.process = function (
   renderResources,
   primitive,
-  frameState
+  frameState,
 ) {
   const { shaderBuilder, model, alphaOptions } = renderResources;
   const { customShader } = model;
@@ -109,7 +109,7 @@ CustomShaderPipelineStage.process = function (
     shaderBuilder.addDefine(
       "COMPUTE_POSITION_WC_CUSTOM_SHADER",
       undefined,
-      ShaderDestination.BOTH
+      ShaderDestination.BOTH,
     );
   }
 
@@ -117,7 +117,7 @@ CustomShaderPipelineStage.process = function (
     shaderBuilder.addDefine(
       "HAS_CUSTOM_VERTEX_SHADER",
       undefined,
-      ShaderDestination.VERTEX
+      ShaderDestination.VERTEX,
     );
   }
 
@@ -125,7 +125,7 @@ CustomShaderPipelineStage.process = function (
     shaderBuilder.addDefine(
       "HAS_CUSTOM_FRAGMENT_SHADER",
       undefined,
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
 
     // add defines like CUSTOM_SHADER_MODIFY_MATERIAL
@@ -133,7 +133,7 @@ CustomShaderPipelineStage.process = function (
     shaderBuilder.addDefine(
       shaderModeDefine,
       undefined,
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
   }
 
@@ -155,7 +155,7 @@ CustomShaderPipelineStage.process = function (
 
   renderResources.uniformMap = combine(
     renderResources.uniformMap,
-    customShader.uniformMap
+    customShader.uniformMap,
   );
 };
 
@@ -232,12 +232,12 @@ function generateVertexShaderLines(customShader, attributesByName) {
   const addToShader = getPrimitiveAttributesUsedInShader(
     attributesByName,
     primitiveAttributes,
-    false
+    false,
   );
   const needsDefault = getAttributesNeedingDefaults(
     attributesByName,
     primitiveAttributes,
-    false
+    false,
   );
 
   let vertexInitialization;
@@ -264,7 +264,7 @@ function generateVertexShaderLines(customShader, attributesByName) {
     if (!defined(attributeDefaults)) {
       CustomShaderPipelineStage._oneTimeWarning(
         "CustomShaderPipelineStage.incompatiblePrimitiveVS",
-        `Primitive is missing attribute ${variableName}, disabling custom vertex shader`
+        `Primitive is missing attribute ${variableName}, disabling custom vertex shader`,
       );
       // This primitive isn't compatible with the shader. Return early
       // to skip the vertex shader
@@ -296,7 +296,7 @@ function generatePositionBuiltins(customShader) {
   if (usedVariables.hasOwnProperty("positionWC")) {
     attributeFields.push(["vec3", "positionWC"]);
     initializationLines.push(
-      "fsInput.attributes.positionWC = attributes.positionWC;"
+      "fsInput.attributes.positionWC = attributes.positionWC;",
     );
   }
 
@@ -304,7 +304,7 @@ function generatePositionBuiltins(customShader) {
   if (usedVariables.hasOwnProperty("positionEC")) {
     attributeFields.push(["vec3", "positionEC"]);
     initializationLines.push(
-      "fsInput.attributes.positionEC = attributes.positionEC;"
+      "fsInput.attributes.positionEC = attributes.positionEC;",
     );
   }
 
@@ -329,12 +329,12 @@ function generateFragmentShaderLines(customShader, attributesByName) {
   const addToShader = getPrimitiveAttributesUsedInShader(
     attributesByName,
     primitiveAttributes,
-    true
+    true,
   );
   const needsDefault = getAttributesNeedingDefaults(
     attributesByName,
     primitiveAttributes,
-    true
+    true,
   );
 
   let fragmentInitialization;
@@ -362,7 +362,7 @@ function generateFragmentShaderLines(customShader, attributesByName) {
     if (!defined(attributeDefaults)) {
       CustomShaderPipelineStage._oneTimeWarning(
         "CustomShaderPipelineStage.incompatiblePrimitiveFS",
-        `Primitive is missing attribute ${variableName}, disabling custom fragment shader.`
+        `Primitive is missing attribute ${variableName}, disabling custom fragment shader.`,
       );
 
       // This primitive isn't compatible with the shader. Return early
@@ -381,9 +381,8 @@ function generateFragmentShaderLines(customShader, attributesByName) {
   return {
     enabled: true,
     attributeFields: attributeFields.concat(positionBuiltins.attributeFields),
-    initializationLines: positionBuiltins.initializationLines.concat(
-      initializationLines
-    ),
+    initializationLines:
+      positionBuiltins.initializationLines.concat(initializationLines),
   };
 }
 
@@ -406,7 +405,7 @@ const builtinAttributes = {
 function getPrimitiveAttributesUsedInShader(
   primitiveAttributes,
   shaderAttributeSet,
-  isFragmentShader
+  isFragmentShader,
 ) {
   const addToShader = {};
   for (const attributeName in primitiveAttributes) {
@@ -446,7 +445,7 @@ function getPrimitiveAttributesUsedInShader(
 function getAttributesNeedingDefaults(
   primitiveAttributes,
   shaderAttributeSet,
-  isFragmentShader
+  isFragmentShader,
 ) {
   const needDefaults = [];
   for (const attributeName in shaderAttributeSet) {
@@ -487,7 +486,7 @@ function generateShaderLines(customShader, primitive) {
   const vertexLines = generateVertexShaderLines(customShader, attributesByName);
   const fragmentLines = generateFragmentShaderLines(
     customShader,
-    attributesByName
+    attributesByName,
   );
 
   // positionWC must be computed in the vertex shader
@@ -513,7 +512,7 @@ function addVertexLinesToShader(shaderBuilder, vertexLines) {
   shaderBuilder.addStruct(
     structId,
     CustomShaderPipelineStage.STRUCT_NAME_ATTRIBUTES,
-    ShaderDestination.VERTEX
+    ShaderDestination.VERTEX,
   );
 
   const { attributeFields, initializationLines } = vertexLines;
@@ -528,36 +527,36 @@ function addVertexLinesToShader(shaderBuilder, vertexLines) {
   shaderBuilder.addStruct(
     structId,
     CustomShaderPipelineStage.STRUCT_NAME_VERTEX_INPUT,
-    ShaderDestination.VERTEX
+    ShaderDestination.VERTEX,
   );
   shaderBuilder.addStructField(
     structId,
     CustomShaderPipelineStage.STRUCT_NAME_ATTRIBUTES,
-    "attributes"
+    "attributes",
   );
   // Add FeatureIds struct from the Feature ID stage
   shaderBuilder.addStructField(
     structId,
     FeatureIdPipelineStage.STRUCT_NAME_FEATURE_IDS,
-    "featureIds"
+    "featureIds",
   );
   // Add Metadata struct from the metadata stage
   shaderBuilder.addStructField(
     structId,
     MetadataPipelineStage.STRUCT_NAME_METADATA,
-    "metadata"
+    "metadata",
   );
   // Add MetadataClass struct from the metadata stage
   shaderBuilder.addStructField(
     structId,
     MetadataPipelineStage.STRUCT_NAME_METADATA_CLASS,
-    "metadataClass"
+    "metadataClass",
   );
   // Add MetadataStatistics struct from the metadata stage
   shaderBuilder.addStructField(
     structId,
     MetadataPipelineStage.STRUCT_NAME_METADATA_STATISTICS,
-    "metadataStatistics"
+    "metadataStatistics",
   );
 
   const functionId =
@@ -565,7 +564,7 @@ function addVertexLinesToShader(shaderBuilder, vertexLines) {
   shaderBuilder.addFunction(
     functionId,
     CustomShaderPipelineStage.FUNCTION_SIGNATURE_INITIALIZE_INPUT_STRUCT_VS,
-    ShaderDestination.VERTEX
+    ShaderDestination.VERTEX,
   );
 
   shaderBuilder.addFunctionLines(functionId, initializationLines);
@@ -576,7 +575,7 @@ function addFragmentLinesToShader(shaderBuilder, fragmentLines) {
   shaderBuilder.addStruct(
     structId,
     CustomShaderPipelineStage.STRUCT_NAME_ATTRIBUTES,
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
 
   const { attributeFields, initializationLines } = fragmentLines;
@@ -589,36 +588,36 @@ function addFragmentLinesToShader(shaderBuilder, fragmentLines) {
   shaderBuilder.addStruct(
     structId,
     CustomShaderPipelineStage.STRUCT_NAME_FRAGMENT_INPUT,
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
   shaderBuilder.addStructField(
     structId,
     CustomShaderPipelineStage.STRUCT_NAME_ATTRIBUTES,
-    "attributes"
+    "attributes",
   );
   // Add FeatureIds struct from the Feature ID stage
   shaderBuilder.addStructField(
     structId,
     FeatureIdPipelineStage.STRUCT_NAME_FEATURE_IDS,
-    "featureIds"
+    "featureIds",
   );
   // Add Metadata struct from the metadata stage
   shaderBuilder.addStructField(
     structId,
     MetadataPipelineStage.STRUCT_NAME_METADATA,
-    "metadata"
+    "metadata",
   );
   // Add MetadataClass struct from the metadata stage
   shaderBuilder.addStructField(
     structId,
     MetadataPipelineStage.STRUCT_NAME_METADATA_CLASS,
-    "metadataClass"
+    "metadataClass",
   );
   // Add MetadataStatistics struct from the metadata stage
   shaderBuilder.addStructField(
     structId,
     MetadataPipelineStage.STRUCT_NAME_METADATA_STATISTICS,
-    "metadataStatistics"
+    "metadataStatistics",
   );
 
   const functionId =
@@ -626,7 +625,7 @@ function addFragmentLinesToShader(shaderBuilder, fragmentLines) {
   shaderBuilder.addFunction(
     functionId,
     CustomShaderPipelineStage.FUNCTION_SIGNATURE_INITIALIZE_INPUT_STRUCT_FS,
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
 
   shaderBuilder.addFunctionLines(functionId, initializationLines);
@@ -645,7 +644,7 @@ function addLinesToShader(shaderBuilder, customShader, generatedCode) {
     shaderLines.push(
       "#line 0",
       customShader.vertexShaderText,
-      CustomShaderStageVS
+      CustomShaderStageVS,
     );
 
     shaderBuilder.addVertexLines(shaderLines);
@@ -658,7 +657,7 @@ function addLinesToShader(shaderBuilder, customShader, generatedCode) {
     shaderLines.push(
       "#line 0",
       customShader.fragmentShaderText,
-      CustomShaderStageFS
+      CustomShaderStageFS,
     );
 
     shaderBuilder.addFragmentLines(shaderLines);

package/Source/Scene/Model/DequantizationPipelineStage.js

@@ -37,7 +37,7 @@ const DequantizationPipelineStage = {
 DequantizationPipelineStage.process = function (
   renderResources,
   primitive,
-  frameState
+  frameState,
 ) {
   const shaderBuilder = renderResources.shaderBuilder;
   const model = renderResources.model;
@@ -46,13 +46,13 @@ DequantizationPipelineStage.process = function (
   shaderBuilder.addDefine(
     "USE_DEQUANTIZATION",
     undefined,
-    ShaderDestination.VERTEX
+    ShaderDestination.VERTEX,
   );
 
   shaderBuilder.addFunction(
     DequantizationPipelineStage.FUNCTION_ID_DEQUANTIZATION_STAGE_VS,
     DequantizationPipelineStage.FUNCTION_SIGNATURE_DEQUANTIZATION_STAGE_VS,
-    ShaderDestination.VERTEX
+    ShaderDestination.VERTEX,
   );
 
   const attributes = primitive.attributes;
@@ -90,7 +90,7 @@ function addDequantizationUniforms(renderResources, attributeInfo) {
     shaderBuilder.addUniform(
       "float",
       normalizationRange,
-      ShaderDestination.VERTEX
+      ShaderDestination.VERTEX,
     );
     uniformMap[normalizationRange] = function () {
       return quantization.normalizationRange;
@@ -145,7 +145,7 @@ function updateDequantizationFunction(shaderBuilder, attributeInfo) {
 
   shaderBuilder.addFunctionLines(
     DequantizationPipelineStage.FUNCTION_ID_DEQUANTIZATION_STAGE_VS,
-    [line]
+    [line],
   );
 }
 

package/Source/Scene/Model/Extensions/Gpm/AnchorPointDirect.js

@@ -0,0 +1,61 @@
+import Check from "../../../../Core/Check.js";
+
+/**
+ * @typedef {object} AnchorPointDirect.ConstructorOptions
+ *
+ * Initialization options for the AnchorPointDirect constructor
+ *
+ * @property {Cartesian3} position  Anchor point geographic coordinates
+ * @property {Cartesian3} adjustmentParams The adjustment values in meters
+ */
+
+/**
+ * Metadata for one stored anchor point using direct storage.
+ *
+ * This reflects the `anchronPointDirect` definition of the
+ * {@link https://nsgreg.nga.mil/csmwg.jsp|NGA_gpm_local} glTF extension.
+ *
+ * @constructor
+ * @param {AnchorPointDirect.ConstructorOptions} options An object describing initialization options
+ * @experimental This feature is not final and is subject to change without Cesium's standard deprecation policy.
+ */
+function AnchorPointDirect(options) {
+  //>>includeStart('debug', pragmas.debug);
+  Check.typeOf.object("options.position", options.position);
+  Check.typeOf.object("options.adjustmentParams", options.adjustmentParams);
+  //>>includeEnd('debug');
+
+  this._position = options.position;
+  this._adjustmentParams = options.adjustmentParams;
+}
+
+Object.defineProperties(AnchorPointDirect.prototype, {
+  /**
+   * Anchor point geographic coordinates in meters as X/Easting, Y/Northing, Z/HAE
+   *
+   * @memberof AnchorPointDirect.prototype
+   * @type {Cartesian3}
+   * @readonly
+   */
+  position: {
+    get: function () {
+      return this._position;
+    },
+  },
+
+  /**
+   * The delta-x delta-y delta-z adjustment values in meters per anchor
+   * point.
+   *
+   * @memberof AnchorPointDirect.prototype
+   * @type {Cartesian3}
+   * @readonly
+   */
+  adjustmentParams: {
+    get: function () {
+      return this._adjustmentParams;
+    },
+  },
+});
+
+export default AnchorPointDirect;

package/Source/Scene/Model/Extensions/Gpm/AnchorPointIndirect.js

@@ -0,0 +1,77 @@
+import Check from "../../../../Core/Check.js";
+
+/**
+ * @typedef {object} AnchorPointIndirect.ConstructorOptions
+ *
+ * Initialization options for the AnchorPointIndirect constructor
+ *
+ * @property {Cartesian3} position  Anchor point geographic coordinates
+ * @property {Cartesian3} adjustmentParams The adjustment values in meters
+ * @property {Matrix3} covarianceMatrix The 3x3 covariance matrix
+ */
+
+/**
+ * Metadata for one stored anchor point.
+ *
+ * This reflects the `anchronPointIndirect` definition of the
+ * {@link https://nsgreg.nga.mil/csmwg.jsp|NGA_gpm_local} glTF extension.
+ *
+ * @constructor
+ * @param {AnchorPointIndirect.ConstructorOptions} options An object describing initialization options
+ * @experimental This feature is not final and is subject to change without Cesium's standard deprecation policy.
+ */
+function AnchorPointIndirect(options) {
+  //>>includeStart('debug', pragmas.debug);
+  Check.typeOf.object("options.position", options.position);
+  Check.typeOf.object("options.adjustmentParams", options.adjustmentParams);
+  Check.typeOf.object("options.covarianceMatrix", options.covarianceMatrix);
+  //>>includeEnd('debug');
+
+  this._position = options.position;
+  this._adjustmentParams = options.adjustmentParams;
+  this._covarianceMatrix = options.covarianceMatrix;
+}
+
+Object.defineProperties(AnchorPointIndirect.prototype, {
+  /**
+   * Anchor point geographic coordinates in meters as X/Easting, Y/Northing, Z/HAE
+   *
+   * @memberof AnchorPointIndirect.prototype
+   * @type {Cartesian3}
+   * @readonly
+   */
+  position: {
+    get: function () {
+      return this._position;
+    },
+  },
+
+  /**
+   * The delta-x delta-y delta-z adjustment values in meters per anchor
+   * point.
+   *
+   * @memberof AnchorPointIndirect.prototype
+   * @type {Cartesian3}
+   * @readonly
+   */
+  adjustmentParams: {
+    get: function () {
+      return this._adjustmentParams;
+    },
+  },
+
+  /**
+   * The 3x3 covariance matrix.
+   *
+   * @memberof AnchorPointIndirect.prototype
+   * @type {Matrix3}
+   * @readonly
+   */
+  covarianceMatrix: {
+    get: function () {
+      return this._covarianceMatrix;
+    },
+  },
+});
+
+export default AnchorPointIndirect;