@cesium/engine 10.1.0 → 11.1.0

package/Source/Scene/createElevationBandMaterial.js

@@ -126,7 +126,7 @@ function preprocess(layers) {
       const height = CesiumMath.clamp(
         entryOrig.height,
         createElevationBandMaterial._minimumHeight,
-        createElevationBandMaterial._maximumHeight
+        createElevationBandMaterial._maximumHeight,
       );
 
       // premultiplied alpha
@@ -174,8 +174,8 @@ function preprocess(layers) {
         0,
         createNewEntry(
           createElevationBandMaterial._minimumHeight,
-          entries[0].color
-        )
+          entries[0].color,
+        ),
       );
     }
     if (extendUpwards) {
@@ -184,8 +184,8 @@ function preprocess(layers) {
         0,
         createNewEntry(
           createElevationBandMaterial._maximumHeight,
-          entries[entries.length - 1].color
-        )
+          entries[entries.length - 1].color,
+        ),
       );
     }
 
@@ -325,7 +325,7 @@ function createLayeredEntries(layers) {
           entry.height,
           prevEntryAccum,
           entryAccum,
-          scratchColorBelow
+          scratchColorBelow,
         );
 
         if (!defined(prevEntry)) {
@@ -349,7 +349,7 @@ function createLayeredEntries(layers) {
           entryAccum.height,
           prevEntry,
           entry,
-          scratchColorAbove
+          scratchColorAbove,
         );
 
         if (!defined(prevEntryAccum)) {
@@ -384,7 +384,7 @@ function createLayeredEntries(layers) {
           // Insert blank gap between last accum entry and first entry
           addEntry(
             prevEntryAccum.height,
-            createElevationBandMaterial._emptyColor
+            createElevationBandMaterial._emptyColor,
           );
           addEntry(entry.height, createElevationBandMaterial._emptyColor);
           addEntry(entry.height, entry.color);

package/Source/Scene/createGooglePhotorealistic3DTileset.js

@@ -44,7 +44,7 @@ async function createGooglePhotorealistic3DTileset(key, options) {
   options.cacheBytes = defaultValue(options.cacheBytes, 1536 * 1024 * 1024);
   options.maximumCacheOverflowBytes = defaultValue(
     options.maximumCacheOverflowBytes,
-    1024 * 1024 * 1024
+    1024 * 1024 * 1024,
   );
   options.enableCollision = defaultValue(options.enableCollision, true);
 

package/Source/Scene/createOsmBuildingsAsync.js

@@ -67,7 +67,7 @@ async function createOsmBuildingsAsync(options) {
   if (!defined(style)) {
     const color = defaultValue(
       options.defaultColor,
-      Color.WHITE
+      Color.WHITE,
     ).toCssColorString();
     style = new Cesium3DTileStyle({
       color: `Boolean(\${feature['cesium#color']}) ? color(\${feature['cesium#color']}) : ${color}`,

package/Source/Scene/createTangentSpaceDebugPrimitive.js

@@ -48,7 +48,7 @@ function createTangentSpaceDebugPrimitive(options) {
 
   const attributes = geometry.attributes;
   const modelMatrix = Matrix4.clone(
-    defaultValue(options.modelMatrix, Matrix4.IDENTITY)
+    defaultValue(options.modelMatrix, Matrix4.IDENTITY),
   );
   const length = defaultValue(options.length, 10000.0);
 
@@ -58,13 +58,13 @@ function createTangentSpaceDebugPrimitive(options) {
         geometry: GeometryPipeline.createLineSegmentsForVectors(
           geometry,
           "normal",
-          length
+          length,
         ),
         attributes: {
           color: new ColorGeometryInstanceAttribute(1.0, 0.0, 0.0, 1.0),
         },
         modelMatrix: modelMatrix,
-      })
+      }),
     );
   }
 
@@ -74,13 +74,13 @@ function createTangentSpaceDebugPrimitive(options) {
         geometry: GeometryPipeline.createLineSegmentsForVectors(
           geometry,
           "tangent",
-          length
+          length,
         ),
         attributes: {
           color: new ColorGeometryInstanceAttribute(0.0, 1.0, 0.0, 1.0),
         },
         modelMatrix: modelMatrix,
-      })
+      }),
     );
   }
 
@@ -90,13 +90,13 @@ function createTangentSpaceDebugPrimitive(options) {
         geometry: GeometryPipeline.createLineSegmentsForVectors(
           geometry,
           "bitangent",
-          length
+          length,
         ),
         attributes: {
           color: new ColorGeometryInstanceAttribute(0.0, 0.0, 1.0, 1.0),
         },
         modelMatrix: modelMatrix,
-      })
+      }),
     );
   }
 

package/Source/Scene/findContentMetadata.js

@@ -29,14 +29,14 @@ function findContentMetadata(tileset, contentHeader) {
   if (!defined(tileset.schema)) {
     findContentMetadata._oneTimeWarning(
       "findContentMetadata-missing-root-schema",
-      "Could not find a metadata schema for content metadata. For tilesets that contain external tilesets, make sure the schema is added to the root tileset.json."
+      "Could not find a metadata schema for content metadata. For tilesets that contain external tilesets, make sure the schema is added to the root tileset.json.",
     );
     return undefined;
   }
 
   const classes = defaultValue(
     tileset.schema.classes,
-    defaultValue.EMPTY_OBJECT
+    defaultValue.EMPTY_OBJECT,
   );
   if (defined(metadataJson.class)) {
     const contentClass = classes[metadataJson.class];

package/Source/Scene/findTileMetadata.js

@@ -31,14 +31,14 @@ function findTileMetadata(tileset, tileHeader) {
   if (!defined(tileset.schema)) {
     findTileMetadata._oneTimeWarning(
       "findTileMetadata-missing-root-schema",
-      "Could not find a metadata schema for tile metadata. For tilesets that contain external tilesets, make sure the schema is added to the root tileset.json."
+      "Could not find a metadata schema for tile metadata. For tilesets that contain external tilesets, make sure the schema is added to the root tileset.json.",
     );
     return undefined;
   }
 
   const classes = defaultValue(
     tileset.schema.classes,
-    defaultValue.EMPTY_OBJECT
+    defaultValue.EMPTY_OBJECT,
   );
   if (defined(metadataJson.class)) {
     const tileClass = classes[metadataJson.class];

package/Source/Scene/getBinaryAccessor.js

@@ -48,7 +48,7 @@ function getBinaryAccessor(accessor) {
         componentDatatype,
         buffer,
         byteOffset,
-        componentsPerAttribute * length
+        componentsPerAttribute * length,
       );
     },
   };

package/Source/Scene/getClipAndStyleCode.js

@@ -12,7 +12,7 @@ import Check from "../Core/Check.js";
 function getClipAndStyleCode(
   samplerUniformName,
   matrixUniformName,
-  styleUniformName
+  styleUniformName,
 ) {
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.string("samplerUniformName", samplerUniformName);

package/Source/Scene/getClippingFunction.js

@@ -22,7 +22,7 @@ function getClippingFunction(clippingPlaneCollection, context) {
   const textureResolution = ClippingPlaneCollection.getTextureResolution(
     clippingPlaneCollection,
     context,
-    textureResolutionScratch
+    textureResolutionScratch,
   );
   const width = textureResolution.x;
   const height = textureResolution.y;

package/Source/Scene/getMetadataClassProperty.js

@@ -0,0 +1,43 @@
+import defined from "../Core/defined.js";
+
+/**
+ * Return the `MetadataClassProperty` from the given schema that
+ * matches the given description.
+ *
+ * If the given schema is `undefined`, then `undefined` is returned.
+ * If the given `schemaId` is defined but does not match the ID
+ * of the given schema, then `undefined` is returned.
+ * If the given schema does not have a class with the given name,
+ * or the class does not have a property with the given name,
+ * then `undefined` is returned.
+ *
+ * Otherwise, the `MetadataClassProperty` is returned.
+ *
+ * @param {object} schema The schema object
+ * @param {string|undefined} schemaId The ID of the metadata schema
+ * @param {string} className The name of the metadata class
+ * @param {string} propertyName The name of the metadata property
+ * @returns {MetadataClassProperty|undefined}
+ * @private
+ */
+function getMetadataClassProperty(schema, schemaId, className, propertyName) {
+  if (!defined(schema)) {
+    return undefined;
+  }
+  if (defined(schemaId) && schema.id !== schemaId) {
+    return undefined;
+  }
+  const classes = schema.classes || {};
+  const metadataClass = classes[className];
+  if (!defined(metadataClass)) {
+    return undefined;
+  }
+  const properties = metadataClass.properties || {};
+  const metadataProperty = properties[propertyName];
+  if (!defined(metadataProperty)) {
+    return undefined;
+  }
+  return metadataProperty;
+}
+
+export default getMetadataClassProperty;

package/Source/Scene/parseBatchTable.js

@@ -47,14 +47,14 @@ function parseBatchTable(options) {
   const binaryBody = options.binaryBody;
   const parseAsPropertyAttributes = defaultValue(
     options.parseAsPropertyAttributes,
-    false
+    false,
   );
   const customAttributeOutput = options.customAttributeOutput;
 
   //>>includeStart('debug', pragmas.debug);
   if (parseAsPropertyAttributes && !defined(customAttributeOutput)) {
     throw new DeveloperError(
-      "customAttributeOutput is required when parsing batch table as property attributes"
+      "customAttributeOutput is required when parsing batch table as property attributes",
     );
   }
   //>>includeEnd('debug');
@@ -90,7 +90,7 @@ function parseBatchTable(options) {
       className,
       binaryProperties,
       binaryBody,
-      customAttributeOutput
+      customAttributeOutput,
     );
     transcodedSchema = attributeResults.transcodedSchema;
     const propertyAttribute = new PropertyAttribute({
@@ -104,7 +104,7 @@ function parseBatchTable(options) {
       featureCount,
       className,
       binaryProperties,
-      binaryBody
+      binaryBody,
     );
     transcodedSchema = binaryResults.transcodedSchema;
     const featureTableJson = binaryResults.featureTableJson;
@@ -163,7 +163,7 @@ function partitionProperties(batchTable) {
   if (defined(legacyHierarchy)) {
     parseBatchTable._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.",
     );
     hierarchyExtension = legacyHierarchy;
   } else if (defined(extensions)) {
@@ -220,7 +220,7 @@ function transcodeBinaryProperties(
   featureCount,
   className,
   binaryProperties,
-  binaryBody
+  binaryBody,
 ) {
   const classProperties = {};
   const featureTableProperties = {};
@@ -233,7 +233,7 @@ function transcodeBinaryProperties(
 
     if (!defined(binaryBody)) {
       throw new RuntimeError(
-        `Property ${propertyId} requires a batch table binary.`
+        `Property ${propertyId} requires a batch table binary.`,
       );
     }
 
@@ -246,13 +246,12 @@ function transcodeBinaryProperties(
 
     classProperties[propertyId] = transcodePropertyType(property);
 
-    bufferViewsTypedArrays[
-      bufferViewCount
-    ] = binaryAccessor.createArrayBufferView(
-      binaryBody.buffer,
-      binaryBody.byteOffset + property.byteOffset,
-      featureCount
-    );
+    bufferViewsTypedArrays[bufferViewCount] =
+      binaryAccessor.createArrayBufferView(
+        binaryBody.buffer,
+        binaryBody.byteOffset + property.byteOffset,
+        featureCount,
+      );
 
     bufferViewCount++;
   }
@@ -285,7 +284,7 @@ function transcodeBinaryPropertiesAsPropertyAttributes(
   className,
   binaryProperties,
   binaryBody,
-  customAttributeOutput
+  customAttributeOutput,
 ) {
   const classProperties = {};
   const propertyAttributeProperties = {};
@@ -302,7 +301,7 @@ function transcodeBinaryPropertiesAsPropertyAttributes(
     const property = binaryProperties[propertyId];
     if (!defined(binaryBody) && !defined(property.typedArray)) {
       throw new RuntimeError(
-        `Property ${propertyId} requires a batch table binary.`
+        `Property ${propertyId} requires a batch table binary.`,
       );
     }
 
@@ -346,7 +345,7 @@ function transcodeBinaryPropertiesAsPropertyAttributes(
       attributeTypedArray = binaryAccessor.createArrayBufferView(
         binaryBody.buffer,
         binaryBody.byteOffset + property.byteOffset,
-        featureCount
+        featureCount,
       );
     }
 
@@ -354,9 +353,8 @@ function transcodeBinaryPropertiesAsPropertyAttributes(
     attribute.name = customAttributeName;
     attribute.count = featureCount;
     attribute.type = property.type;
-    const componentDatatype = ComponentDatatype.fromTypedArray(
-      attributeTypedArray
-    );
+    const componentDatatype =
+      ComponentDatatype.fromTypedArray(attributeTypedArray);
     if (
       componentDatatype === ComponentDatatype.INT ||
       componentDatatype === ComponentDatatype.UNSIGNED_INT ||
@@ -364,13 +362,12 @@ function transcodeBinaryPropertiesAsPropertyAttributes(
     ) {
       parseBatchTable._oneTimeWarning(
         "Cast pnts property to floats",
-        `Point cloud property "${customAttributeName}" will be cast to a float array because INT, UNSIGNED_INT, and DOUBLE are not valid WebGL vertex attribute types. Some precision may be lost.`
+        `Point cloud property "${customAttributeName}" will be cast to a float array because INT, UNSIGNED_INT, and DOUBLE are not valid WebGL vertex attribute types. Some precision may be lost.`,
       );
       attributeTypedArray = new Float32Array(attributeTypedArray);
     }
-    attribute.componentDatatype = ComponentDatatype.fromTypedArray(
-      attributeTypedArray
-    );
+    attribute.componentDatatype =
+      ComponentDatatype.fromTypedArray(attributeTypedArray);
     attribute.typedArray = attributeTypedArray;
     customAttributeOutput.push(attribute);
 

package/Source/Scene/parseFeatureMetadataLegacy.js

@@ -60,7 +60,7 @@ function parseFeatureMetadataLegacy(options) {
           metadataTable: metadataTable,
           extras: featureTable.extras,
           extensions: featureTable.extensions,
-        })
+        }),
       );
     }
   }
@@ -80,7 +80,7 @@ function parseFeatureMetadataLegacy(options) {
           propertyTexture: transcodeToPropertyTexture(featureTexture),
           class: schema.classes[featureTexture.class],
           textures: options.textures,
-        })
+        }),
       );
     }
   }
@@ -119,7 +119,7 @@ function transcodeToPropertyTexture(featureTexture) {
       propertyTexture.properties[propertyId] = combine(
         oldProperty.texture,
         property,
-        true
+        true,
       );
     }
   }

package/Source/Scene/parseStructuralMetadata.js

@@ -52,7 +52,7 @@ function parseStructuralMetadata(options) {
           metadataTable: metadataTable,
           extras: propertyTable.extras,
           extensions: propertyTable.extensions,
-        })
+        }),
       );
     }
   }
@@ -68,7 +68,7 @@ function parseStructuralMetadata(options) {
           propertyTexture: propertyTexture,
           class: schema.classes[propertyTexture.class],
           textures: options.textures,
-        })
+        }),
       );
     }
   }
@@ -83,7 +83,7 @@ function parseStructuralMetadata(options) {
           name: propertyAttribute.name,
           class: schema.classes[propertyAttribute.class],
           propertyAttribute: propertyAttribute,
-        })
+        }),
       );
     }
   }

package/Source/Scene/processVoxelProperties.js

@@ -15,13 +15,8 @@ import ShaderDestination from "../Renderer/ShaderDestination.js";
 function processVoxelProperties(renderResources, primitive) {
   const { shaderBuilder } = renderResources;
 
-  const {
-    names,
-    types,
-    componentTypes,
-    minimumValues,
-    maximumValues,
-  } = primitive._provider;
+  const { names, types, componentTypes, minimumValues, maximumValues } =
+    primitive._provider;
 
   const attributeLength = types.length;
   const hasStatistics = defined(minimumValues) && defined(maximumValues);
@@ -29,14 +24,14 @@ function processVoxelProperties(renderResources, primitive) {
   shaderBuilder.addDefine(
     "METADATA_COUNT",
     attributeLength,
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
 
   if (hasStatistics) {
     shaderBuilder.addDefine(
       "STATISTICS",
       undefined,
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
   }
 
@@ -49,7 +44,7 @@ function processVoxelProperties(renderResources, primitive) {
     shaderBuilder.addStruct(
       propertyStatisticsStructId,
       propertyStatisticsStructName,
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
     const glslType = getGlslType(type);
     shaderBuilder.addStructField(propertyStatisticsStructId, glslType, "min");
@@ -63,7 +58,7 @@ function processVoxelProperties(renderResources, primitive) {
   shaderBuilder.addStruct(
     statisticsStructId,
     statisticsStructName,
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
   for (let i = 0; i < attributeLength; i++) {
     const name = names[i];
@@ -72,7 +67,7 @@ function processVoxelProperties(renderResources, primitive) {
     shaderBuilder.addStructField(
       statisticsStructId,
       propertyStructName,
-      propertyFieldName
+      propertyFieldName,
     );
   }
 
@@ -83,12 +78,12 @@ function processVoxelProperties(renderResources, primitive) {
   shaderBuilder.addStruct(
     metadataStructId,
     metadataStructName,
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
   shaderBuilder.addStructField(
     metadataStructId,
     statisticsStructName,
-    statisticsFieldName
+    statisticsFieldName,
   );
   for (let i = 0; i < attributeLength; i++) {
     const name = names[i];
@@ -107,27 +102,27 @@ function processVoxelProperties(renderResources, primitive) {
     shaderBuilder.addStruct(
       voxelPropertyStructId,
       voxelPropertyStructName,
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
     shaderBuilder.addStructField(
       voxelPropertyStructId,
       glslType,
-      "partialDerivativeLocal"
+      "partialDerivativeLocal",
     );
     shaderBuilder.addStructField(
       voxelPropertyStructId,
       glslType,
-      "partialDerivativeWorld"
+      "partialDerivativeWorld",
     );
     shaderBuilder.addStructField(
       voxelPropertyStructId,
       glslType,
-      "partialDerivativeView"
+      "partialDerivativeView",
     );
     shaderBuilder.addStructField(
       voxelPropertyStructId,
       glslType,
-      "partialDerivativeValid"
+      "partialDerivativeValid",
     );
   }
 
@@ -138,7 +133,7 @@ function processVoxelProperties(renderResources, primitive) {
   shaderBuilder.addStruct(
     voxelStructId,
     voxelStructName,
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
   for (let i = 0; i < attributeLength; i++) {
     const name = names[i];
@@ -163,17 +158,17 @@ function processVoxelProperties(renderResources, primitive) {
   shaderBuilder.addStruct(
     fragmentInputStructId,
     fragmentInputStructName,
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
   shaderBuilder.addStructField(
     fragmentInputStructId,
     metadataStructName,
-    metadataFieldName
+    metadataFieldName,
   );
   shaderBuilder.addStructField(
     fragmentInputStructId,
     voxelStructName,
-    voxelFieldName
+    voxelFieldName,
   );
 
   // Properties struct
@@ -183,7 +178,7 @@ function processVoxelProperties(renderResources, primitive) {
   shaderBuilder.addStruct(
     propertiesStructId,
     propertiesStructName,
-    ShaderDestination.FRAGMENT
+    ShaderDestination.FRAGMENT,
   );
   for (let i = 0; i < attributeLength; i++) {
     const name = names[i];
@@ -200,7 +195,7 @@ function processVoxelProperties(renderResources, primitive) {
     shaderBuilder.addFunction(
       functionId,
       `${propertiesStructName} clearProperties()`,
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
     shaderBuilder.addFunctionLines(functionId, [
       `${propertiesStructName} ${propertiesFieldName};`,
@@ -225,7 +220,7 @@ function processVoxelProperties(renderResources, primitive) {
     shaderBuilder.addFunction(
       functionId,
       `${propertiesStructName} sumProperties(${propertiesStructName} propertiesA, ${propertiesStructName} propertiesB)`,
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
     shaderBuilder.addFunctionLines(functionId, [
       `${propertiesStructName} ${propertiesFieldName};`,
@@ -247,7 +242,7 @@ function processVoxelProperties(renderResources, primitive) {
     shaderBuilder.addFunction(
       functionId,
       `${propertiesStructName} scaleProperties(${propertiesStructName} ${propertiesFieldName}, float scale)`,
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
     shaderBuilder.addFunctionLines(functionId, [
       `${propertiesStructName} scaledProperties = ${propertiesFieldName};`,
@@ -267,7 +262,7 @@ function processVoxelProperties(renderResources, primitive) {
     shaderBuilder.addFunction(
       functionId,
       `${propertiesStructName} mixProperties(${propertiesStructName} propertiesA, ${propertiesStructName} propertiesB, float mixFactor)`,
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
     shaderBuilder.addFunctionLines(functionId, [
       `${propertiesStructName} ${propertiesFieldName};`,
@@ -289,7 +284,7 @@ function processVoxelProperties(renderResources, primitive) {
     shaderBuilder.addFunction(
       functionId,
       `void copyPropertiesToMetadata(in ${propertiesStructName} ${propertiesFieldName}, inout ${metadataStructName} ${metadataFieldName})`,
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
     for (let i = 0; i < attributeLength; i++) {
       const name = names[i];
@@ -305,7 +300,7 @@ function processVoxelProperties(renderResources, primitive) {
     shaderBuilder.addFunction(
       functionId,
       `void setStatistics(inout ${statisticsStructName} ${statisticsFieldName})`,
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
     for (let i = 0; i < attributeLength; i++) {
       const name = names[i];
@@ -317,10 +312,10 @@ function processVoxelProperties(renderResources, primitive) {
         const maximumValue = maximumValues[i][j];
         shaderBuilder.addFunctionLines(functionId, [
           `${statisticsFieldName}.${name}.min${glslField} = ${getGlslNumberAsFloat(
-            minimumValue
+            minimumValue,
           )};`,
           `${statisticsFieldName}.${name}.max${glslField} = ${getGlslNumberAsFloat(
-            maximumValue
+            maximumValue,
           )};`,
         ]);
       }
@@ -333,7 +328,7 @@ function processVoxelProperties(renderResources, primitive) {
     shaderBuilder.addFunction(
       functionId,
       `${propertiesStructName} getPropertiesFromMegatextureAtUv(vec2 texcoord)`,
-      ShaderDestination.FRAGMENT
+      ShaderDestination.FRAGMENT,
     );
     shaderBuilder.addFunctionLines(functionId, [
       `${propertiesStructName} ${propertiesFieldName};`,

package/Source/Shaders/Builtin/CzmBuiltins.js

@@ -103,6 +103,7 @@ import czm_nearFarScalar from './Functions/nearFarScalar.js'
 import czm_octDecode from './Functions/octDecode.js'
 import czm_packDepth from './Functions/packDepth.js'
 import czm_pbrLighting from './Functions/pbrLighting.js'
+import czm_pbrNeutralTonemapping from './Functions/pbrNeutralTonemapping.js'
 import czm_phong from './Functions/phong.js'
 import czm_planeDistance from './Functions/planeDistance.js'
 import czm_pointAlongRay from './Functions/pointAlongRay.js'
@@ -112,7 +113,6 @@ import czm_readDepth from './Functions/readDepth.js'
 import czm_readNonPerspective from './Functions/readNonPerspective.js'
 import czm_reverseLogDepth from './Functions/reverseLogDepth.js'
 import czm_round from './Functions/round.js'
-import czm_sampleOctahedralProjection from './Functions/sampleOctahedralProjection.js'
 import czm_saturation from './Functions/saturation.js'
 import czm_shadowDepthCompare from './Functions/shadowDepthCompare.js'
 import czm_shadowVisibility from './Functions/shadowVisibility.js'
@@ -241,6 +241,7 @@ export default {
     czm_octDecode : czm_octDecode,
     czm_packDepth : czm_packDepth,
     czm_pbrLighting : czm_pbrLighting,
+    czm_pbrNeutralTonemapping : czm_pbrNeutralTonemapping,
     czm_phong : czm_phong,
     czm_planeDistance : czm_planeDistance,
     czm_pointAlongRay : czm_pointAlongRay,
@@ -250,7 +251,6 @@ export default {
     czm_readNonPerspective : czm_readNonPerspective,
     czm_reverseLogDepth : czm_reverseLogDepth,
     czm_round : czm_round,
-    czm_sampleOctahedralProjection : czm_sampleOctahedralProjection,
     czm_saturation : czm_saturation,
     czm_shadowDepthCompare : czm_shadowDepthCompare,
     czm_shadowVisibility : czm_shadowVisibility,