@cesium/engine 10.0.0 → 11.0.0

package/Source/Scene/ImageBasedLighting.js

@@ -4,7 +4,7 @@ import defined from "../Core/defined.js";
 import defaultValue from "../Core/defaultValue.js";
 import destroyObject from "../Core/destroyObject.js";
 import DeveloperError from "../Core/DeveloperError.js";
-import OctahedralProjectedCubeMap from "./OctahedralProjectedCubeMap.js";
+import SpecularEnvironmentCubeMap from "./SpecularEnvironmentCubeMap.js";
 
 /**
  * Properties for managing image-based lighting on tilesets and models.
@@ -84,8 +84,8 @@ function ImageBasedLighting(options) {
 
   // The specular environment map texture is created in update();
   this._specularEnvironmentMaps = options.specularEnvironmentMaps;
-  this._specularEnvironmentMapAtlas = undefined;
-  this._specularEnvironmentMapAtlasDirty = true;
+  this._specularEnvironmentCubeMap = undefined;
+  this._specularEnvironmentCubeMapDirty = true;
   this._specularEnvironmentMapLoaded = false;
   this._previousSpecularEnvironmentMapLoaded = false;
 
@@ -186,8 +186,8 @@ Object.defineProperties(ImageBasedLighting.prototype, {
    * </p>
    *
    * These values can be obtained by preprocessing the environment map using the <code>cmgen</code> tool of
-   * {@link https://github.com/google/filament/releases|Google's Filament project}. This will also generate a KTX file that can be
-   * supplied to {@link Model#specularEnvironmentMaps}.
+   * {@link https://github.com/google/filament/releases|Google's Filament project}.
+   * Be sure to use the <code>--no-mirror</code> option in <code>cmgen</code>.
    *
    * @memberof ImageBasedLighting.prototype
    *
@@ -226,8 +226,8 @@ Object.defineProperties(ImageBasedLighting.prototype, {
     },
     set: function (value) {
       if (value !== this._specularEnvironmentMaps) {
-        this._specularEnvironmentMapAtlasDirty =
-          this._specularEnvironmentMapAtlasDirty ||
+        this._specularEnvironmentCubeMapDirty =
+          this._specularEnvironmentCubeMapDirty ||
           value !== this._specularEnvironmentMaps;
         this._specularEnvironmentMapLoaded = false;
       }
@@ -299,16 +299,16 @@ Object.defineProperties(ImageBasedLighting.prototype, {
   },
 
   /**
-   * The texture atlas for the specular environment maps.
+   * The cube map for the specular environment maps.
    *
    * @memberof ImageBasedLighting.prototype
-   * @type {OctahedralProjectedCubeMap}
+   * @type {SpecularEnvironmentCubeMap}
    *
    * @private
    */
-  specularEnvironmentMapAtlas: {
+  specularEnvironmentCubeMap: {
     get: function () {
-      return this._specularEnvironmentMapAtlas;
+      return this._specularEnvironmentCubeMap;
     },
   },
 
@@ -337,30 +337,30 @@ Object.defineProperties(ImageBasedLighting.prototype, {
   useSpecularEnvironmentMaps: {
     get: function () {
       return (
-        (defined(this._specularEnvironmentMapAtlas) &&
-          this._specularEnvironmentMapAtlas.ready) ||
+        (defined(this._specularEnvironmentCubeMap) &&
+          this._specularEnvironmentCubeMap.ready) ||
         this._useDefaultSpecularMaps
       );
     },
   },
 });
 
-function createSpecularEnvironmentMapAtlas(imageBasedLighting, context) {
-  if (!OctahedralProjectedCubeMap.isSupported(context)) {
+function createSpecularEnvironmentCubeMap(imageBasedLighting, context) {
+  if (!SpecularEnvironmentCubeMap.isSupported(context)) {
     return;
   }
 
-  imageBasedLighting._specularEnvironmentMapAtlas =
-    imageBasedLighting._specularEnvironmentMapAtlas &&
-    imageBasedLighting._specularEnvironmentMapAtlas.destroy();
+  imageBasedLighting._specularEnvironmentCubeMap =
+    imageBasedLighting._specularEnvironmentCubeMap &&
+    imageBasedLighting._specularEnvironmentCubeMap.destroy();
 
   if (defined(imageBasedLighting._specularEnvironmentMaps)) {
-    const atlas = new OctahedralProjectedCubeMap(
+    const cubeMap = new SpecularEnvironmentCubeMap(
       imageBasedLighting._specularEnvironmentMaps
     );
-    imageBasedLighting._specularEnvironmentMapAtlas = atlas;
+    imageBasedLighting._specularEnvironmentCubeMap = cubeMap;
 
-    imageBasedLighting._removeErrorListener = atlas.errorEvent.addEventListener(
+    imageBasedLighting._removeErrorListener = cubeMap.errorEvent.addEventListener(
       (error) => {
         console.error(`Error loading specularEnvironmentMaps: ${error}`);
       }
@@ -428,23 +428,23 @@ ImageBasedLighting.prototype.update = function (frameState) {
 
   this._previousSpecularEnvironmentMapLoaded = this._specularEnvironmentMapLoaded;
 
-  if (this._specularEnvironmentMapAtlasDirty) {
-    createSpecularEnvironmentMapAtlas(this, context);
-    this._specularEnvironmentMapAtlasDirty = false;
+  if (this._specularEnvironmentCubeMapDirty) {
+    createSpecularEnvironmentCubeMap(this, context);
+    this._specularEnvironmentCubeMapDirty = false;
   }
 
-  if (defined(this._specularEnvironmentMapAtlas)) {
-    this._specularEnvironmentMapAtlas.update(frameState);
-    if (this._specularEnvironmentMapAtlas.ready) {
+  if (defined(this._specularEnvironmentCubeMap)) {
+    this._specularEnvironmentCubeMap.update(frameState);
+    if (this._specularEnvironmentCubeMap.ready) {
       this._specularEnvironmentMapLoaded = true;
     }
   }
 
-  const recompileWithDefaultAtlas =
-    !defined(this._specularEnvironmentMapAtlas) &&
+  const recompileWithDefaultCubeMap =
+    !defined(this._specularEnvironmentCubeMap) &&
     defined(frameState.specularEnvironmentMaps) &&
     !this._useDefaultSpecularMaps;
-  const recompileWithoutDefaultAtlas =
+  const recompileWithoutDefaultCubeMap =
     !defined(frameState.specularEnvironmentMaps) &&
     this._useDefaultSpecularMaps;
 
@@ -458,13 +458,13 @@ ImageBasedLighting.prototype.update = function (frameState) {
 
   this._shouldRegenerateShaders =
     this._shouldRegenerateShaders ||
-    recompileWithDefaultAtlas ||
-    recompileWithoutDefaultAtlas ||
+    recompileWithDefaultCubeMap ||
+    recompileWithoutDefaultCubeMap ||
     recompileWithDefaultSHCoeffs ||
     recompileWithoutDefaultSHCoeffs;
 
   this._useDefaultSpecularMaps =
-    !defined(this._specularEnvironmentMapAtlas) &&
+    !defined(this._specularEnvironmentCubeMap) &&
     defined(frameState.specularEnvironmentMaps);
   this._useDefaultSphericalHarmonics =
     !defined(this._sphericalHarmonicCoefficients) &&
@@ -503,9 +503,9 @@ ImageBasedLighting.prototype.isDestroyed = function () {
  * @private
  */
 ImageBasedLighting.prototype.destroy = function () {
-  this._specularEnvironmentMapAtlas =
-    this._specularEnvironmentMapAtlas &&
-    this._specularEnvironmentMapAtlas.destroy();
+  this._specularEnvironmentCubeMap =
+    this._specularEnvironmentCubeMap &&
+    this._specularEnvironmentCubeMap.destroy();
   this._removeErrorListener =
     this._removeErrorListener && this._removeErrorListener();
   return destroyObject(this);

package/Source/Scene/Label.js

@@ -102,8 +102,8 @@ function parseFont(label) {
  * @property {Cartesian2} [backgroundPadding=new Cartesian2(7, 5)] A {@link Cartesian2} Specifying the horizontal and vertical background padding in pixels.
  * @property {Cartesian2} [pixelOffset=Cartesian2.ZERO] A {@link Cartesian2} specifying the pixel offset in screen space from the origin of this label.
  * @property {Cartesian3} [eyeOffset=Cartesian3.ZERO] A {@link Cartesian3} specifying the 3D Cartesian offset applied to this label in eye coordinates.
- * @property {HorizontalOrigin} [horizontalOrigin=HorizontalOrigin.CENTER] A {@link HorizontalOrigin} specifying the horizontal origin of this label.
- * @property {VerticalOrigin} [verticalOrigin=VerticalOrigin.CENTER] A {@link VerticalOrigin} specifying the vertical origin of this label.
+ * @property {HorizontalOrigin} [horizontalOrigin=HorizontalOrigin.LEFT] A {@link HorizontalOrigin} specifying the horizontal origin of this label.
+ * @property {VerticalOrigin} [verticalOrigin=VerticalOrigin.BASELINE] A {@link VerticalOrigin} specifying the vertical origin of this label.
  * @property {HeightReference} [heightReference=HeightReference.NONE] A {@link HeightReference} specifying the height reference of this label.
  * @property {Color} [fillColor=Color.WHITE] A {@link Color} specifying the fill color of the label.
  * @property {Color} [outlineColor=Color.BLACK] A {@link Color} specifying the outline color of the label.

package/Source/Scene/Material.js

@@ -34,6 +34,7 @@ import SlopeRampMaterial from "../Shaders/Materials/SlopeRampMaterial.js";
 import StripeMaterial from "../Shaders/Materials/StripeMaterial.js";
 import TextureMagnificationFilter from "../Renderer/TextureMagnificationFilter.js";
 import TextureMinificationFilter from "../Renderer/TextureMinificationFilter.js";
+import WaterMaskMaterial from "../Shaders/Materials/WaterMaskMaterial.js";
 import WaterMaterial from "../Shaders/Materials/Water.js";
 
 /**
@@ -219,6 +220,11 @@ import WaterMaterial from "../Shaders/Materials/Water.js";
  *      <li><code>heights</code>: image of heights sorted from lowest to highest.</li>
  *      <li><code>colors</code>: image of colors at the corresponding heights.</li>
  * </ul>
+ * <li>WaterMask</li>
+ * <ul>
+ *      <li><code>waterColor</code>: diffuse color and alpha for the areas covered by water.</li>
+ *      <li><code>landColor</code>: diffuse color and alpha for the areas covered by land.</li>
+ * </ul>
  * </ul>
  * </ul>
  * </div>
@@ -233,7 +239,6 @@ import WaterMaterial from "../Shaders/Materials/Water.js";
  * @param {TextureMinificationFilter} [options.minificationFilter=TextureMinificationFilter.LINEAR] The {@link TextureMinificationFilter} to apply to this material's textures.
  * @param {TextureMagnificationFilter} [options.magnificationFilter=TextureMagnificationFilter.LINEAR] The {@link TextureMagnificationFilter} to apply to this material's textures.
  * @param {object} options.fabric The fabric JSON used to generate the material.
- *ructor
  *
  * @exception {DeveloperError} fabric: uniform has invalid type.
  * @exception {DeveloperError} fabric: uniforms and materials cannot share the same property.
@@ -245,7 +250,6 @@ import WaterMaterial from "../Shaders/Materials/Water.js";
  * @exception {DeveloperError} strict: shader source does not use material.
  *
  * @see {@link https://github.com/CesiumGS/cesium/wiki/Fabric|Fabric wiki page} for a more detailed options of Fabric.
- *
  * @demo {@link https://sandcastle.cesium.com/index.html?src=Materials.html|Cesium Sandcastle Materials Demo}
  *
  * @example
@@ -1739,4 +1743,22 @@ Material._materialCache.addMaterial(Material.ElevationBandType, {
   translucent: true,
 });
 
+/**
+ * Gets the name of the water mask material.
+ * @type {string}
+ * @readonly
+ */
+Material.WaterMaskType = "WaterMask";
+Material._materialCache.addMaterial(Material.WaterMaskType, {
+  fabric: {
+    type: Material.WaterMaskType,
+    source: WaterMaskMaterial,
+    uniforms: {
+      waterColor: new Color(1.0, 1.0, 1.0, 1.0),
+      landColor: new Color(0.0, 0.0, 0.0, 0.0),
+    },
+  },
+  translucent: false,
+});
+
 export default Material;

package/Source/Scene/Model/ImageBasedLightingPipelineStage.js

@@ -2,7 +2,7 @@ import combine from "../../Core/combine.js";
 import defined from "../../Core/defined.js";
 import ImageBasedLightingStageFS from "../../Shaders/Model/ImageBasedLightingStageFS.js";
 import ShaderDestination from "../../Renderer/ShaderDestination.js";
-import OctahedralProjectedCubeMap from "../OctahedralProjectedCubeMap.js";
+import SpecularEnvironmentCubeMap from "../SpecularEnvironmentCubeMap.js";
 
 const ImageBasedLightingPipelineStage = {
   name: "ImageBasedLightingPipelineStage", // Helps with debugging
@@ -34,7 +34,7 @@ ImageBasedLightingPipelineStage.process = function (
     ShaderDestination.FRAGMENT
   );
 
-  if (OctahedralProjectedCubeMap.isSupported(frameState.context)) {
+  if (SpecularEnvironmentCubeMap.isSupported(frameState.context)) {
     const addMatrix =
       imageBasedLighting.useSphericalHarmonics ||
       imageBasedLighting.useSpecularEnvironmentMaps ||
@@ -72,8 +72,8 @@ ImageBasedLightingPipelineStage.process = function (
     }
 
     if (
-      defined(imageBasedLighting.specularEnvironmentMapAtlas) &&
-      imageBasedLighting.specularEnvironmentMapAtlas.ready
+      defined(imageBasedLighting.specularEnvironmentCubeMap) &&
+      imageBasedLighting.specularEnvironmentCubeMap.ready
     ) {
       shaderBuilder.addDefine(
         "SPECULAR_IBL",
@@ -86,15 +86,10 @@ ImageBasedLightingPipelineStage.process = function (
         ShaderDestination.FRAGMENT
       );
       shaderBuilder.addUniform(
-        "sampler2D",
+        "samplerCube",
         "model_specularEnvironmentMaps",
         ShaderDestination.FRAGMENT
       );
-      shaderBuilder.addUniform(
-        "vec2",
-        "model_specularEnvironmentMapsSize",
-        ShaderDestination.FRAGMENT
-      );
       shaderBuilder.addUniform(
         "float",
         "model_specularEnvironmentMapsMaximumLOD",
@@ -138,13 +133,10 @@ ImageBasedLightingPipelineStage.process = function (
       return imageBasedLighting.sphericalHarmonicCoefficients;
     },
     model_specularEnvironmentMaps: function () {
-      return imageBasedLighting.specularEnvironmentMapAtlas.texture;
-    },
-    model_specularEnvironmentMapsSize: function () {
-      return imageBasedLighting.specularEnvironmentMapAtlas.texture.dimensions;
+      return imageBasedLighting.specularEnvironmentCubeMap.texture;
     },
     model_specularEnvironmentMapsMaximumLOD: function () {
-      return imageBasedLighting.specularEnvironmentMapAtlas.maximumMipmapLevel;
+      return imageBasedLighting.specularEnvironmentCubeMap.maximumMipmapLevel;
     },
   };
 

package/Source/Scene/Model/Model.js

@@ -2251,7 +2251,7 @@ function updatePickIds(model) {
 
 // Matrix3 is a row-major constructor.
 // The same constructor in GLSL will produce the transpose of this.
-const yUpToZUp = new Matrix3(-1, 0, 0, 0, 0, 1, 0, -1, 0);
+const yUpToZUp = new Matrix3(1, 0, 0, 0, 0, 1, 0, -1, 0);
 
 function updateReferenceMatrices(model, frameState) {
   const modelMatrix = defined(model._clampedModelMatrix)

package/Source/Scene/PointPrimitive.js

@@ -11,6 +11,7 @@ import Matrix4 from "../Core/Matrix4.js";
 import NearFarScalar from "../Core/NearFarScalar.js";
 import SceneMode from "./SceneMode.js";
 import SceneTransforms from "./SceneTransforms.js";
+import SplitDirection from "./SplitDirection.js";
 
 /**
  * <div class="notice">
@@ -117,6 +118,11 @@ function PointPrimitive(options, pointPrimitiveCollection) {
   this._pointPrimitiveCollection = pointPrimitiveCollection;
   this._dirty = false;
   this._index = -1; //Used only by PointPrimitiveCollection
+
+  this._splitDirection = defaultValue(
+    options.splitDirection,
+    SplitDirection.NONE
+  );
 }
 
 const SHOW_INDEX = (PointPrimitive.SHOW_INDEX = 0);
@@ -129,7 +135,8 @@ const SCALE_BY_DISTANCE_INDEX = (PointPrimitive.SCALE_BY_DISTANCE_INDEX = 6);
 const TRANSLUCENCY_BY_DISTANCE_INDEX = (PointPrimitive.TRANSLUCENCY_BY_DISTANCE_INDEX = 7);
 const DISTANCE_DISPLAY_CONDITION_INDEX = (PointPrimitive.DISTANCE_DISPLAY_CONDITION_INDEX = 8);
 const DISABLE_DEPTH_DISTANCE_INDEX = (PointPrimitive.DISABLE_DEPTH_DISTANCE_INDEX = 9);
-PointPrimitive.NUMBER_OF_PROPERTIES = 10;
+const SPLIT_DIRECTION_INDEX = (PointPrimitive.SPLIT_DIRECTION_INDEX = 10);
+PointPrimitive.NUMBER_OF_PROPERTIES = 11;
 
 function makeDirty(pointPrimitive, propertyChanged) {
   const pointPrimitiveCollection = pointPrimitive._pointPrimitiveCollection;
@@ -486,6 +493,24 @@ Object.defineProperties(PointPrimitive.prototype, {
       }
     },
   },
+
+  /**
+   * The {@link SplitDirection} to apply to this point.
+   * @memberof PointPrimitive.prototype
+   * @type {SplitDirection}
+   * @default {@link SplitDirection.NONE}
+   */
+  splitDirection: {
+    get: function () {
+      return this._splitDirection;
+    },
+    set: function (value) {
+      if (this._splitDirection !== value) {
+        this._splitDirection = value;
+        makeDirty(this, SPLIT_DIRECTION_INDEX);
+      }
+    },
+  },
 });
 
 PointPrimitive.prototype.getPickId = function (context) {
@@ -660,7 +685,8 @@ PointPrimitive.prototype.equals = function (other) {
         this._distanceDisplayCondition,
         other._distanceDisplayCondition
       ) &&
-      this._disableDepthTestDistance === other._disableDepthTestDistance)
+      this._disableDepthTestDistance === other._disableDepthTestDistance &&
+      this._splitDirection === other._splitDirection)
   );
 };
 

package/Source/Scene/PointPrimitiveCollection.js

@@ -38,6 +38,7 @@ const DISTANCE_DISPLAY_CONDITION_INDEX =
   PointPrimitive.DISTANCE_DISPLAY_CONDITION_INDEX;
 const DISABLE_DEPTH_DISTANCE_INDEX =
   PointPrimitive.DISABLE_DEPTH_DISTANCE_INDEX;
+const SPLIT_DIRECTION_INDEX = PointPrimitive.SPLIT_DIRECTION_INDEX;
 const NUMBER_OF_PROPERTIES = PointPrimitive.NUMBER_OF_PROPERTIES;
 
 const attributeLocations = {
@@ -46,7 +47,7 @@ const attributeLocations = {
   compressedAttribute0: 2, // color, outlineColor, pick color
   compressedAttribute1: 3, // show, translucency by distance, some free space
   scaleByDistance: 4,
-  distanceDisplayConditionAndDisableDepth: 5,
+  distanceDisplayConditionAndDisableDepthAndSplitDirection: 5,
 };
 
 /**
@@ -492,8 +493,9 @@ function createVAF(context, numberOfPointPrimitives, buffersUsage) {
         usage: buffersUsage[SCALE_BY_DISTANCE_INDEX],
       },
       {
-        index: attributeLocations.distanceDisplayConditionAndDisableDepth,
-        componentsPerAttribute: 3,
+        index:
+          attributeLocations.distanceDisplayConditionAndDisableDepthAndSplitDirection,
+        componentsPerAttribute: 4,
         componentDatatype: ComponentDatatype.FLOAT,
         usage: buffersUsage[DISTANCE_DISPLAY_CONDITION_INDEX],
       },
@@ -665,7 +667,7 @@ function writeScaleByDistance(
   writer(i, near, nearValue, far, farValue);
 }
 
-function writeDistanceDisplayConditionAndDepthDisable(
+function writeDistanceDisplayConditionAndDepthDisableAndSplitDirection(
   pointPrimitiveCollection,
   context,
   vafWriters,
@@ -673,7 +675,10 @@ function writeDistanceDisplayConditionAndDepthDisable(
 ) {
   const i = pointPrimitive._index;
   const writer =
-    vafWriters[attributeLocations.distanceDisplayConditionAndDisableDepth];
+    vafWriters[
+      attributeLocations
+        .distanceDisplayConditionAndDisableDepthAndSplitDirection
+    ];
   let near = 0.0;
   let far = Number.MAX_VALUE;
 
@@ -697,7 +702,12 @@ function writeDistanceDisplayConditionAndDepthDisable(
     }
   }
 
-  writer(i, near, far, disableDepthTestDistance);
+  let direction = 0.0;
+  const split = pointPrimitive.splitDirection;
+  if (defined(split)) {
+    direction = split;
+  }
+  writer(i, near, far, disableDepthTestDistance, direction);
 }
 
 function writePointPrimitive(
@@ -730,7 +740,7 @@ function writePointPrimitive(
     vafWriters,
     pointPrimitive
   );
-  writeDistanceDisplayConditionAndDepthDisable(
+  writeDistanceDisplayConditionAndDepthDisableAndSplitDirection(
     pointPrimitiveCollection,
     context,
     vafWriters,
@@ -925,9 +935,12 @@ PointPrimitiveCollection.prototype.update = function (frameState) {
 
     if (
       properties[DISTANCE_DISPLAY_CONDITION_INDEX] ||
-      properties[DISABLE_DEPTH_DISTANCE_INDEX]
+      properties[DISABLE_DEPTH_DISTANCE_INDEX] ||
+      properties[SPLIT_DIRECTION_INDEX]
     ) {
-      writers.push(writeDistanceDisplayConditionAndDepthDisable);
+      writers.push(
+        writeDistanceDisplayConditionAndDepthDisableAndSplitDirection
+      );
     }
 
     const numWriters = writers.length;

package/Source/Scene/PostProcessStageCollection.js

@@ -12,7 +12,7 @@ import TextureWrap from "../Renderer/TextureWrap.js";
 import PassThrough from "../Shaders/PostProcessStages/PassThrough.js";
 import PostProcessStageLibrary from "./PostProcessStageLibrary.js";
 import PostProcessStageTextureCache from "./PostProcessStageTextureCache.js";
-import Tonemapper from "./Tonemapper.js";
+import Tonemapper, { validateTonemapper } from "./Tonemapper.js";
 
 const stackScratch = [];
 
@@ -41,11 +41,12 @@ function PostProcessStageCollection() {
   // Some shaders, such as the atmosphere and ground atmosphere, output values slightly over 1.0.
   this._autoExposureEnabled = false;
   this._autoExposure = PostProcessStageLibrary.createAutoExposureStage();
+  this._exposure = 1.0;
   this._tonemapping = undefined;
   this._tonemapper = undefined;
 
-  // set tonemapper and tonemapping
-  this.tonemapper = Tonemapper.ACES;
+  // set tonemapper and tonemapping using the setter
+  this.tonemapper = Tonemapper.PBR_NEUTRAL;
 
   const tonemapping = this._tonemapping;
 
@@ -313,11 +314,14 @@ Object.defineProperties(PostProcessStageCollection.prototype, {
   },
 
   /**
-   * Gets and sets the tonemapping algorithm used when rendering with high dynamic range.
+   * Specifies the tonemapping algorithm used when rendering with high dynamic range.
+   * {@link https://sandcastle.cesium.com/?src=High%20Dynamic%20Range.html|Sandcastle Demo}
    *
+   * @example viewer.scene.postProcessStages.tonemapper = Cesium.Tonemapper.ACES;
+   *
+   * @default Tonemapper.PBR_NEUTRAL
    * @memberof PostProcessStageCollection.prototype
    * @type {Tonemapper}
-   * @private
    */
   tonemapper: {
     get: function () {
@@ -328,7 +332,7 @@ Object.defineProperties(PostProcessStageCollection.prototype, {
         return;
       }
       //>>includeStart('debug', pragmas.debug);
-      if (!Tonemapper.validate(value)) {
+      if (!validateTonemapper(value)) {
         throw new DeveloperError("tonemapper was set to an invalid value.");
       }
       //>>includeEnd('debug');
@@ -339,26 +343,31 @@ Object.defineProperties(PostProcessStageCollection.prototype, {
       }
 
       const useAutoExposure = this._autoExposureEnabled;
-      let tonemapper;
+      let tonemapping;
 
       switch (value) {
         case Tonemapper.REINHARD:
-          tonemapper = PostProcessStageLibrary.createReinhardTonemappingStage(
+          tonemapping = PostProcessStageLibrary.createReinhardTonemappingStage(
             useAutoExposure
           );
           break;
         case Tonemapper.MODIFIED_REINHARD:
-          tonemapper = PostProcessStageLibrary.createModifiedReinhardTonemappingStage(
+          tonemapping = PostProcessStageLibrary.createModifiedReinhardTonemappingStage(
             useAutoExposure
           );
           break;
         case Tonemapper.FILMIC:
-          tonemapper = PostProcessStageLibrary.createFilmicTonemappingStage(
+          tonemapping = PostProcessStageLibrary.createFilmicTonemappingStage(
+            useAutoExposure
+          );
+          break;
+        case Tonemapper.PBR_NEUTRAL:
+          tonemapping = PostProcessStageLibrary.createPbrNeutralTonemappingStage(
             useAutoExposure
           );
           break;
         default:
-          tonemapper = PostProcessStageLibrary.createAcesTonemappingStage(
+          tonemapping = PostProcessStageLibrary.createAcesTonemappingStage(
             useAutoExposure
           );
           break;
@@ -366,22 +375,43 @@ Object.defineProperties(PostProcessStageCollection.prototype, {
 
       if (useAutoExposure) {
         const autoexposure = this._autoExposure;
-        tonemapper.uniforms.autoExposure = function () {
+        tonemapping.uniforms.autoExposure = function () {
           return autoexposure.outputTexture;
         };
+      } else {
+        tonemapping.uniforms.exposure = this._exposure;
       }
 
       this._tonemapper = value;
-      this._tonemapping = tonemapper;
+      this._tonemapping = tonemapping;
 
       if (defined(this._stageNames)) {
-        this._stageNames[tonemapper.name] = tonemapper;
-        tonemapper._textureCache = this._textureCache;
+        this._stageNames[tonemapping.name] = tonemapping;
+        tonemapping._textureCache = this._textureCache;
       }
 
       this._textureCacheDirty = true;
     },
   },
+
+  /**
+   * Control the exposure when HDR is on. Less than 1.0 makes the tonemapping darker while greater than 1.0 makes it brighter.
+   *
+   * @example viewer.scene.postProcessStages.exposure = 1.0;
+   *
+   * @default 1.0
+   * @memberof PostProcessStageCollection.prototype
+   * @type {number}
+   */
+  exposure: {
+    get: function () {
+      return this._exposure;
+    },
+    set: function (value) {
+      this._tonemapping.uniforms.exposure = value;
+      this._exposure = value;
+    },
+  },
 });
 
 function removeStages(collection) {

package/Source/Scene/PostProcessStageLibrary.js

@@ -14,6 +14,7 @@ import DepthOfField from "../Shaders/PostProcessStages/DepthOfField.js";
 import DepthView from "../Shaders/PostProcessStages/DepthView.js";
 import EdgeDetection from "../Shaders/PostProcessStages/EdgeDetection.js";
 import FilmicTonemapping from "../Shaders/PostProcessStages/FilmicTonemapping.js";
+import PbrNeutralTonemapping from "../Shaders/PostProcessStages/PbrNeutralTonemapping.js";
 import FXAA from "../Shaders/PostProcessStages/FXAA.js";
 import GaussianBlur1D from "../Shaders/PostProcessStages/GaussianBlur1D.js";
 import LensFlare from "../Shaders/PostProcessStages/LensFlare.js";
@@ -669,6 +670,7 @@ PostProcessStageLibrary.createAcesTonemappingStage = function (
     fragmentShader: fs,
     uniforms: {
       autoExposure: undefined,
+      exposure: 1.0,
     },
   });
 };
@@ -689,6 +691,28 @@ PostProcessStageLibrary.createFilmicTonemappingStage = function (
     fragmentShader: fs,
     uniforms: {
       autoExposure: undefined,
+      exposure: 1.0,
+    },
+  });
+};
+
+/**
+ * Creates a post-process stage that applies filmic tonemapping operator.
+ * @param {boolean} useAutoExposure Whether or not to use auto-exposure.
+ * @return {PostProcessStage} A post-process stage that applies filmic tonemapping operator.
+ * @private
+ */
+PostProcessStageLibrary.createPbrNeutralTonemappingStage = function (
+  useAutoExposure
+) {
+  let fs = useAutoExposure ? "#define AUTO_EXPOSURE\n" : "";
+  fs += PbrNeutralTonemapping;
+  return new PostProcessStage({
+    name: "czm_pbr_neutral",
+    fragmentShader: fs,
+    uniforms: {
+      autoExposure: undefined,
+      exposure: 1.0,
     },
   });
 };
@@ -709,6 +733,7 @@ PostProcessStageLibrary.createReinhardTonemappingStage = function (
     fragmentShader: fs,
     uniforms: {
       autoExposure: undefined,
+      exposure: 1.0,
     },
   });
 };
@@ -730,6 +755,7 @@ PostProcessStageLibrary.createModifiedReinhardTonemappingStage = function (
     uniforms: {
       white: Color.WHITE,
       autoExposure: undefined,
+      exposure: 1.0,
     },
   });
 };