@cesium/engine 9.2.0 → 10.0.0

package/Source/Scene/SceneTransforms.js

@@ -4,6 +4,7 @@ import Cartesian3 from "../Core/Cartesian3.js";
 import Cartesian4 from "../Core/Cartesian4.js";
 import Cartographic from "../Core/Cartographic.js";
 import defined from "../Core/defined.js";
+import deprecationWarning from "../Core/deprecationWarning.js";
 import DeveloperError from "../Core/DeveloperError.js";
 import CesiumMath from "../Core/Math.js";
 import Matrix4 from "../Core/Matrix4.js";
@@ -26,6 +27,32 @@ const scratchViewport = new BoundingRectangle();
 const scratchWindowCoord0 = new Cartesian2();
 const scratchWindowCoord1 = new Cartesian2();
 
+/**
+ * Transforms a position in world (WGS84 or alternative ellipsoid) coordinates to window coordinates.  This is commonly used to place an
+ * HTML element at the same screen position as an object in the scene.
+ *
+ * @param {Scene} scene The scene.
+ * @param {Cartesian3} position The position in world (WGS84 or alternative ellipsoid) coordinates.
+ * @param {Cartesian2} [result] An optional object to return the input position transformed to window coordinates.
+ * @returns {Cartesian2|undefined} The modified result parameter or a new Cartesian2 instance if one was not provided.  This may be <code>undefined</code> if the input position is near the center of the ellipsoid.
+ *
+ * @example
+ * // Output the window position of longitude/latitude (0, 0) every time the mouse moves.
+ * const position = Cesium.Cartesian3.fromDegrees(0.0, 0.0);
+ * const handler = new Cesium.ScreenSpaceEventHandler(scene.canvas);
+ * handler.setInputAction(function(movement) {
+ *     console.log(Cesium.SceneTransforms.worldToWindowCoordinates(scene, position));
+ * }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
+ */
+SceneTransforms.worldToWindowCoordinates = function (scene, position, result) {
+  return SceneTransforms.worldWithEyeOffsetToWindowCoordinates(
+    scene,
+    position,
+    Cartesian3.ZERO,
+    result
+  );
+};
+
 /**
  * Transforms a position in WGS84 coordinates to window coordinates.  This is commonly used to place an
  * HTML element at the same screen position as an object in the scene.
@@ -33,12 +60,12 @@ const scratchWindowCoord1 = new Cartesian2();
  * @param {Scene} scene The scene.
  * @param {Cartesian3} position The position in WGS84 (world) coordinates.
  * @param {Cartesian2} [result] An optional object to return the input position transformed to window coordinates.
- * @returns {Cartesian2} The modified result parameter or a new Cartesian2 instance if one was not provided.  This may be <code>undefined</code> if the input position is near the center of the ellipsoid.
+ * @returns {Cartesian2|undefined} The modified result parameter or a new Cartesian2 instance if one was not provided.  This may be <code>undefined</code> if the input position is near the center of the ellipsoid.
  *
  * @example
  * // Output the window position of longitude/latitude (0, 0) every time the mouse moves.
  * const scene = widget.scene;
- * const ellipsoid = scene.globe.ellipsoid;
+ * const ellipsoid = scene.ellipsoid;
  * const position = Cesium.Cartesian3.fromDegrees(0.0, 0.0);
  * const handler = new Cesium.ScreenSpaceEventHandler(scene.canvas);
  * handler.setInputAction(function(movement) {
@@ -46,12 +73,11 @@ const scratchWindowCoord1 = new Cartesian2();
  * }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
  */
 SceneTransforms.wgs84ToWindowCoordinates = function (scene, position, result) {
-  return SceneTransforms.wgs84WithEyeOffsetToWindowCoordinates(
-    scene,
-    position,
-    Cartesian3.ZERO,
-    result
+  deprecationWarning(
+    "SceneTransforms.wgs84ToWindowCoordinates",
+    "SceneTransforms.wgs84ToWindowCoordinates has been deprecated. It will be removed in 1.21. Use SceneTransforms.worldToWindowCoordinates instead."
   );
+  return SceneTransforms.worldToWindowCoordinates(scene, position, result);
 };
 
 const scratchCartesian4 = new Cartesian4();
@@ -98,7 +124,7 @@ const scratchCameraPosition = new Cartesian3();
 /**
  * @private
  */
-SceneTransforms.wgs84WithEyeOffsetToWindowCoordinates = function (
+SceneTransforms.worldWithEyeOffsetToWindowCoordinates = function (
   scene,
   position,
   eyeOffset,
@@ -115,7 +141,7 @@ SceneTransforms.wgs84WithEyeOffsetToWindowCoordinates = function (
 
   // Transform for 3D, 2D, or Columbus view
   const frameState = scene.frameState;
-  const actualPosition = SceneTransforms.computeActualWgs84Position(
+  const actualPosition = SceneTransforms.computeActualEllipsoidPosition(
     frameState,
     position,
     actualPositionScratch
@@ -265,30 +291,28 @@ SceneTransforms.wgs84WithEyeOffsetToWindowCoordinates = function (
 };
 
 /**
- * Transforms a position in WGS84 coordinates to drawing buffer coordinates.  This may produce different
- * results from SceneTransforms.wgs84ToWindowCoordinates when the browser zoom is not 100%, or on high-DPI displays.
+ * Transforms a position in world coordinates to drawing buffer coordinates.  This may produce different
+ * results from SceneTransforms.worldToWindowCoordinates when the browser zoom is not 100%, or on high-DPI displays.
  *
  * @param {Scene} scene The scene.
- * @param {Cartesian3} position The position in WGS84 (world) coordinates.
+ * @param {Cartesian3} position The position in world (WGS84 or alternative ellipsoid) coordinates.
  * @param {Cartesian2} [result] An optional object to return the input position transformed to window coordinates.
- * @returns {Cartesian2} The modified result parameter or a new Cartesian2 instance if one was not provided.  This may be <code>undefined</code> if the input position is near the center of the ellipsoid.
+ * @returns {Cartesian2|undefined} The modified result parameter or a new Cartesian2 instance if one was not provided.  This may be <code>undefined</code> if the input position is near the center of the ellipsoid.
  *
  * @example
  * // Output the window position of longitude/latitude (0, 0) every time the mouse moves.
- * const scene = widget.scene;
- * const ellipsoid = scene.globe.ellipsoid;
  * const position = Cesium.Cartesian3.fromDegrees(0.0, 0.0);
  * const handler = new Cesium.ScreenSpaceEventHandler(scene.canvas);
  * handler.setInputAction(function(movement) {
- *     console.log(Cesium.SceneTransforms.wgs84ToWindowCoordinates(scene, position));
+ *     console.log(Cesium.SceneTransforms.worldToDrawingBufferCoordinates(scene, position));
  * }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
  */
-SceneTransforms.wgs84ToDrawingBufferCoordinates = function (
+SceneTransforms.worldToDrawingBufferCoordinates = function (
   scene,
   position,
   result
 ) {
-  result = SceneTransforms.wgs84ToWindowCoordinates(scene, position, result);
+  result = SceneTransforms.worldToWindowCoordinates(scene, position, result);
   if (!defined(result)) {
     return undefined;
   }
@@ -296,13 +320,47 @@ SceneTransforms.wgs84ToDrawingBufferCoordinates = function (
   return SceneTransforms.transformWindowToDrawingBuffer(scene, result, result);
 };
 
+/**
+ * Transforms a position in world coordinates to drawing buffer coordinates.  This may produce different
+ * results from SceneTransforms.wgs84ToWindowCoordinates when the browser zoom is not 100%, or on high-DPI displays.
+ *
+ * @param {Scene} scene The scene.
+ * @param {Cartesian3} position The position in world (WGS84 or alternative ellipsoid) coordinates.
+ * @param {Cartesian2} [result] An optional object to return the input position transformed to window coordinates.
+ * @returns {Cartesian2|undefined} The modified result parameter or a new Cartesian2 instance if one was not provided.  This may be <code>undefined</code> if the input position is near the center of the ellipsoid.
+ *
+ * @example
+ * // Output the window position of longitude/latitude (0, 0) every time the mouse moves.
+ * const position = Cesium.Cartesian3.fromDegrees(0.0, 0.0);
+ * const handler = new Cesium.ScreenSpaceEventHandler(scene.canvas);
+ * handler.setInputAction(function(movement) {
+ *     console.log(Cesium.SceneTransforms.wgs84ToWindowCoordinates(scene, position));
+ * }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
+ */
+SceneTransforms.wgs84ToDrawingBufferCoordinates = function (
+  scene,
+  position,
+  result
+) {
+  deprecationWarning(
+    "SceneTransforms.wgs84ToDrawingBufferCoordinates",
+    "SceneTransforms.wgs84ToDrawingBufferCoordinates has been deprecated. It will be removed in 1.21. Use SceneTransforms.worldToDrawingBufferCoordinates instead."
+  );
+
+  return SceneTransforms.worldToDrawingBufferCoordinates(
+    scene,
+    position,
+    result
+  );
+};
+
 const projectedPosition = new Cartesian3();
 const positionInCartographic = new Cartographic();
 
 /**
  * @private
  */
-SceneTransforms.computeActualWgs84Position = function (
+SceneTransforms.computeActualEllipsoidPosition = function (
   frameState,
   position,
   result
@@ -398,7 +456,7 @@ const scratchWorldCoords = new Cartesian4();
 /**
  * @private
  */
-SceneTransforms.drawingBufferToWgs84Coordinates = function (
+SceneTransforms.drawingBufferToWorldCoordinates = function (
   scene,
   drawingBufferPosition,
   depth,

package/Source/Scene/SceneTransitioner.js

@@ -627,7 +627,7 @@ function morphFromColumbusViewTo2D(transitioner, duration) {
 
   if (duration > 0.0) {
     Cartesian3.clone(Cartesian3.ZERO, scratchCVTo2DEndPos);
-    endPos.z = 5.0 * scene.mapProjection.ellipsoid.maximumRadius;
+    endPos.z = 5.0 * scene.ellipsoid.maximumRadius;
   } else {
     Cartesian3.clone(startPos, scratchCVTo2DEndPos);
 
@@ -1050,7 +1050,7 @@ function complete2DCallback(camera2D) {
 
     const camera = scene.camera;
     Cartesian3.clone(camera2D.position, camera.position);
-    camera.position.z = scene.mapProjection.ellipsoid.maximumRadius * 2.0;
+    camera.position.z = scene.ellipsoid.maximumRadius * 2.0;
     Cartesian3.clone(camera2D.direction, camera.direction);
     Cartesian3.clone(camera2D.up, camera.up);
     Cartesian3.cross(camera.direction, camera.up, camera.right);

package/Source/Scene/ScreenSpaceCameraController.js

@@ -216,33 +216,46 @@ function ScreenSpaceCameraController(scene) {
     eventType: CameraEventType.LEFT_DRAG,
     modifier: KeyboardEventModifier.SHIFT,
   };
+
+  const ellipsoid = defaultValue(scene.ellipsoid, Ellipsoid.default);
+
   /**
-   * The minimum height the camera must be before picking the terrain or scene content instead of the ellipsoid.
+   * The minimum height the camera must be before picking the terrain or scene content instead of the ellipsoid. Defaults to scene.ellipsoid.minimumRadius * 0.025 when another ellipsoid than WGS84 is used.
    * @type {number}
-   * @default 150000.0
+   * @default 150000.0 or scene.ellipsoid.minimumRadius * 0.025
    */
-  this.minimumPickingTerrainHeight = 150000.0;
+  this.minimumPickingTerrainHeight = Ellipsoid.WGS84.equals(ellipsoid)
+    ? 150000.0
+    : ellipsoid.minimumRadius * 0.025;
   this._minimumPickingTerrainHeight = this.minimumPickingTerrainHeight;
   /**
-   * The minimum distance the camera must be before testing for collision with terrain when zoom with inertia.
+   * The minimum distance the camera must be before testing for collision with terrain when zoom with inertia. Default to scene.ellipsoid.minimumRadius * 0.00063 when another ellipsoid than WGS84 is used.
    * @type {number}
-   * @default 4000.0
+   * @default 4000.0 or scene.ellipsoid.minimumRadius * 0.00063
    */
-  this.minimumPickingTerrainDistanceWithInertia = 4000.0;
+  this.minimumPickingTerrainDistanceWithInertia = Ellipsoid.WGS84.equals(
+    ellipsoid
+  )
+    ? 4000.0
+    : ellipsoid.minimumRadius * 0.00063;
   /**
-   * The minimum height the camera must be before testing for collision with terrain.
+   * The minimum height the camera must be before testing for collision with terrain. Default to scene.ellipsoid.minimumRadius * 0.0025 when another ellipsoid than WGS84 is used.
    * @type {number}
-   * @default 15000.0
+   * @default 15000.0 or scene.ellipsoid.minimumRadius * 0.0025.
    */
-  this.minimumCollisionTerrainHeight = 15000.0;
+  this.minimumCollisionTerrainHeight = Ellipsoid.WGS84.equals(ellipsoid)
+    ? 15000.0
+    : ellipsoid.minimumRadius * 0.0025;
   this._minimumCollisionTerrainHeight = this.minimumCollisionTerrainHeight;
   /**
    * The minimum height the camera must be before switching from rotating a track ball to
-   * free look when clicks originate on the sky or in space.
+   * free look when clicks originate on the sky or in space. Defaults to ellipsoid.minimumRadius * 1.175 when another ellipsoid than WGS84 is used.
    * @type {number}
-   * @default 7500000.0
+   * @default 7500000.0 or scene.ellipsoid.minimumRadius * 1.175
    */
-  this.minimumTrackBallHeight = 7500000.0;
+  this.minimumTrackBallHeight = Ellipsoid.WGS84.equals(ellipsoid)
+    ? 7500000.0
+    : ellipsoid.minimumRadius * 1.175;
   this._minimumTrackBallHeight = this.minimumTrackBallHeight;
   /**
    * When disabled, the values of <code>maximumZoomDistance</code> and <code>minimumZoomDistance</code> are ignored.
@@ -253,7 +266,7 @@ function ScreenSpaceCameraController(scene) {
 
   this._scene = scene;
   this._globe = undefined;
-  this._ellipsoid = undefined;
+  this._ellipsoid = ellipsoid;
 
   this._lastGlobeHeight = 0.0;
 
@@ -920,7 +933,7 @@ function handleZoom(
 
   if ((!sameStartPosition && zoomOnVector) || zoomingOnVector) {
     let ray;
-    const zoomMouseStart = SceneTransforms.wgs84ToWindowCoordinates(
+    const zoomMouseStart = SceneTransforms.worldToWindowCoordinates(
       scene,
       object._zoomWorldPosition,
       scratchZoomOffset
@@ -2861,14 +2874,13 @@ function adjustHeightForTerrain(controller, cameraChanged) {
 
   const scene = controller._scene;
   const mode = scene.mode;
-  const globe = scene.globe;
 
   if (mode === SceneMode.SCENE2D || mode === SceneMode.MORPHING) {
     return;
   }
 
   const camera = scene.camera;
-  const ellipsoid = defaultValue(globe?.ellipsoid, Ellipsoid.WGS84);
+  const ellipsoid = defaultValue(scene.ellipsoid, Ellipsoid.WGS84);
   const projection = scene.mapProjection;
 
   let transform;
@@ -2967,9 +2979,7 @@ ScreenSpaceCameraController.prototype.update = function () {
     this._ellipsoid = Ellipsoid.UNIT_SPHERE;
   } else {
     this._globe = globe;
-    this._ellipsoid = defined(this._globe)
-      ? this._globe.ellipsoid
-      : scene.mapProjection.ellipsoid;
+    this._ellipsoid = defaultValue(scene.ellipsoid, Ellipsoid.default);
   }
 
   const { verticalExaggeration, verticalExaggerationRelativeHeight } = scene;

package/Source/Scene/SkyBox.js

@@ -1,3 +1,4 @@
+import buildModuleUrl from "../Core/buildModuleUrl.js";
 import BoxGeometry from "../Core/BoxGeometry.js";
 import Cartesian3 from "../Core/Cartesian3.js";
 import defaultValue from "../Core/defaultValue.js";
@@ -249,4 +250,29 @@ SkyBox.prototype.destroy = function () {
   this._cubeMap = this._cubeMap && this._cubeMap.destroy();
   return destroyObject(this);
 };
+
+function getDefaultSkyBoxUrl(suffix) {
+  return buildModuleUrl(`Assets/Textures/SkyBox/tycho2t3_80_${suffix}.jpg`);
+}
+
+/**
+ * Creates a skybox instance with the default starmap for the Earth.
+ * @return {SkyBox} The default skybox for the Earth
+ *
+ * @example
+ * viewer.scene.skyBox = Cesium.SkyBox.createEarthSkyBox();
+ */
+SkyBox.createEarthSkyBox = function () {
+  return new SkyBox({
+    sources: {
+      positiveX: getDefaultSkyBoxUrl("px"),
+      negativeX: getDefaultSkyBoxUrl("mx"),
+      positiveY: getDefaultSkyBoxUrl("py"),
+      negativeY: getDefaultSkyBoxUrl("my"),
+      positiveZ: getDefaultSkyBoxUrl("pz"),
+      negativeZ: getDefaultSkyBoxUrl("mz"),
+    },
+  });
+};
+
 export default SkyBox;

package/Source/Scene/Sun.js

@@ -267,7 +267,7 @@ Sun.prototype.update = function (frameState, passState, useHdr) {
     BoundingSphere.clone(boundingVolume2D, drawCommand.boundingVolume);
   }
 
-  const position = SceneTransforms.computeActualWgs84Position(
+  const position = SceneTransforms.computeActualEllipsoidPosition(
     frameState,
     sunPosition,
     scratchCartesian4

package/Source/Shaders/Builtin/CzmBuiltins.js

@@ -74,7 +74,7 @@ import czm_decompressTextureCoordinates from './Functions/decompressTextureCoord
 import czm_depthClamp from './Functions/depthClamp.js'
 import czm_eastNorthUpToEyeCoordinates from './Functions/eastNorthUpToEyeCoordinates.js'
 import czm_ellipsoidContainsPoint from './Functions/ellipsoidContainsPoint.js'
-import czm_ellipsoidWgs84TextureCoordinates from './Functions/ellipsoidWgs84TextureCoordinates.js'
+import czm_ellipsoidTextureCoordinates from './Functions/ellipsoidTextureCoordinates.js'
 import czm_equalsEpsilon from './Functions/equalsEpsilon.js'
 import czm_eyeOffset from './Functions/eyeOffset.js'
 import czm_eyeToWindowCoordinates from './Functions/eyeToWindowCoordinates.js'
@@ -212,7 +212,7 @@ export default {
     czm_depthClamp : czm_depthClamp,
     czm_eastNorthUpToEyeCoordinates : czm_eastNorthUpToEyeCoordinates,
     czm_ellipsoidContainsPoint : czm_ellipsoidContainsPoint,
-    czm_ellipsoidWgs84TextureCoordinates : czm_ellipsoidWgs84TextureCoordinates,
+    czm_ellipsoidTextureCoordinates : czm_ellipsoidTextureCoordinates,
     czm_equalsEpsilon : czm_equalsEpsilon,
     czm_eyeOffset : czm_eyeOffset,
     czm_eyeToWindowCoordinates : czm_eyeToWindowCoordinates,

package/Source/Shaders/Builtin/Functions/ellipsoidTextureCoordinates.glsl

@@ -0,0 +1,10 @@
+/**
+ * Approximate uv coordinates based on the ellipsoid normal.
+ *
+ * @name czm_ellipsoidTextureCoordinates
+ * @glslFunction
+ */
+vec2 czm_ellipsoidTextureCoordinates(vec3 normal)
+{
+    return vec2(atan(normal.y, normal.x) * czm_oneOverTwoPi + 0.5, asin(normal.z) * czm_oneOverPi + 0.5);
+}

package/Source/Shaders/Builtin/Functions/{ellipsoidWgs84TextureCoordinates.js → ellipsoidTextureCoordinates.js}

@@ -1,11 +1,11 @@
 //This file is automatically rebuilt by the Cesium build process.
 export default "/**\n\
- * DOC_TBA\n\
+ * Approximate uv coordinates based on the ellipsoid normal.\n\
  *\n\
- * @name czm_ellipsoidWgs84TextureCoordinates\n\
+ * @name czm_ellipsoidTextureCoordinates\n\
  * @glslFunction\n\
  */\n\
-vec2 czm_ellipsoidWgs84TextureCoordinates(vec3 normal)\n\
+vec2 czm_ellipsoidTextureCoordinates(vec3 normal)\n\
 {\n\
     return vec2(atan(normal.y, normal.x) * czm_oneOverTwoPi + 0.5, asin(normal.z) * czm_oneOverPi + 0.5);\n\
 }\n\

package/Source/Shaders/Builtin/Structs/materialInput.glsl

@@ -10,7 +10,7 @@
  * @property {vec3} normalEC Unperturbed surface normal in eye coordinates.
  * @property {mat3} tangentToEyeMatrix Matrix for converting a tangent space normal to eye space.
  * @property {vec3} positionToEyeEC Vector from the fragment to the eye in eye coordinates.  The magnitude is the distance in meters from the fragment to the eye.
- * @property {float} height The height of the terrain in meters above or below the WGS84 ellipsoid.  Only available for globe materials.
+ * @property {float} height The height of the terrain in meters above or below the ellipsoid.  Only available for globe materials.
  * @property {float} slope The slope of the terrain in radians.  0 is flat; pi/2 is vertical.  Only available for globe materials.
  * @property {float} aspect The aspect of the terrain in radians.  0 is East, pi/2 is North, pi is West, 3pi/2 is South.  Only available for globe materials.
  */

package/Source/Shaders/Builtin/Structs/materialInput.js

@@ -11,7 +11,7 @@ export default "/**\n\
  * @property {vec3} normalEC Unperturbed surface normal in eye coordinates.\n\
  * @property {mat3} tangentToEyeMatrix Matrix for converting a tangent space normal to eye space.\n\
  * @property {vec3} positionToEyeEC Vector from the fragment to the eye in eye coordinates.  The magnitude is the distance in meters from the fragment to the eye.\n\
- * @property {float} height The height of the terrain in meters above or below the WGS84 ellipsoid.  Only available for globe materials.\n\
+ * @property {float} height The height of the terrain in meters above or below the ellipsoid.  Only available for globe materials.\n\
  * @property {float} slope The slope of the terrain in radians.  0 is flat; pi/2 is vertical.  Only available for globe materials.\n\
  * @property {float} aspect The aspect of the terrain in radians.  0 is East, pi/2 is North, pi is West, 3pi/2 is South.  Only available for globe materials.\n\
  */\n\

package/Source/Shaders/Builtin/Structs/modelMaterial.glsl

@@ -10,6 +10,7 @@
  * @name czm_modelMaterial
  * @glslStruct
  *
+ * @property {vec4} baseColor The base color of the material.
  * @property {vec3} diffuse Incoming light that scatters evenly in all directions.
  * @property {float} alpha Alpha of this material. 0.0 is completely transparent; 1.0 is completely opaque.
  * @property {vec3} specular Color of reflected light at normal incidence in PBR materials. This is sometimes referred to as f0 in the literature.
@@ -19,6 +20,7 @@
  * @property {vec3} emissive Light emitted by the material equally in all directions. The default is vec3(0.0), which emits no light.
  */
 struct czm_modelMaterial {
+    vec4 baseColor;
     vec3 diffuse;
     float alpha;
     vec3 specular;

package/Source/Shaders/Builtin/Structs/modelMaterial.js

@@ -11,6 +11,7 @@ export default "/**\n\
  * @name czm_modelMaterial\n\
  * @glslStruct\n\
  *\n\
+ * @property {vec4} baseColor The base color of the material.\n\
  * @property {vec3} diffuse Incoming light that scatters evenly in all directions.\n\
  * @property {float} alpha Alpha of this material. 0.0 is completely transparent; 1.0 is completely opaque.\n\
  * @property {vec3} specular Color of reflected light at normal incidence in PBR materials. This is sometimes referred to as f0 in the literature.\n\
@@ -20,6 +21,7 @@ export default "/**\n\
  * @property {vec3} emissive Light emitted by the material equally in all directions. The default is vec3(0.0), which emits no light.\n\
  */\n\
 struct czm_modelMaterial {\n\
+    vec4 baseColor;\n\
     vec3 diffuse;\n\
     float alpha;\n\
     vec3 specular;\n\

package/Source/Shaders/EllipsoidFS.glsl

@@ -12,7 +12,7 @@ vec4 computeEllipsoidColor(czm_ray ray, float intersection, float side)
     vec3 normalMC = geodeticNormal * side;              // normalized surface normal (always facing the viewer) in model coordinates
     vec3 normalEC = normalize(czm_normal * normalMC);   // normalized surface normal in eye coordinates
 
-    vec2 st = czm_ellipsoidWgs84TextureCoordinates(sphericalNormal);
+    vec2 st = czm_ellipsoidTextureCoordinates(sphericalNormal);
     vec3 positionToEyeEC = -positionEC;
 
     czm_materialInput materialInput;

package/Source/Shaders/EllipsoidFS.js

@@ -13,7 +13,7 @@ vec4 computeEllipsoidColor(czm_ray ray, float intersection, float side)\n\
     vec3 normalMC = geodeticNormal * side;              // normalized surface normal (always facing the viewer) in model coordinates\n\
     vec3 normalEC = normalize(czm_normal * normalMC);   // normalized surface normal in eye coordinates\n\
 \n\
-    vec2 st = czm_ellipsoidWgs84TextureCoordinates(sphericalNormal);\n\
+    vec2 st = czm_ellipsoidTextureCoordinates(sphericalNormal);\n\
     vec3 positionToEyeEC = -positionEC;\n\
 \n\
     czm_materialInput materialInput;\n\

package/Source/Shaders/GlobeFS.glsl

@@ -374,8 +374,8 @@ void main()
     {
         mat3 enuToEye = czm_eastNorthUpToEyeCoordinates(v_positionMC, normalEC);
 
-        vec2 ellipsoidTextureCoordinates = czm_ellipsoidWgs84TextureCoordinates(normalMC);
-        vec2 ellipsoidFlippedTextureCoordinates = czm_ellipsoidWgs84TextureCoordinates(normalMC.zyx);
+        vec2 ellipsoidTextureCoordinates = czm_ellipsoidTextureCoordinates(normalMC);
+        vec2 ellipsoidFlippedTextureCoordinates = czm_ellipsoidTextureCoordinates(normalMC.zyx);
 
         vec2 textureCoordinates = mix(ellipsoidTextureCoordinates, ellipsoidFlippedTextureCoordinates, czm_morphTime * smoothstep(0.9, 0.95, normalMC.z));
 

package/Source/Shaders/GlobeFS.js

@@ -375,8 +375,8 @@ void main()\n\
     {\n\
         mat3 enuToEye = czm_eastNorthUpToEyeCoordinates(v_positionMC, normalEC);\n\
 \n\
-        vec2 ellipsoidTextureCoordinates = czm_ellipsoidWgs84TextureCoordinates(normalMC);\n\
-        vec2 ellipsoidFlippedTextureCoordinates = czm_ellipsoidWgs84TextureCoordinates(normalMC.zyx);\n\
+        vec2 ellipsoidTextureCoordinates = czm_ellipsoidTextureCoordinates(normalMC);\n\
+        vec2 ellipsoidFlippedTextureCoordinates = czm_ellipsoidTextureCoordinates(normalMC.zyx);\n\
 \n\
         vec2 textureCoordinates = mix(ellipsoidTextureCoordinates, ellipsoidFlippedTextureCoordinates, czm_morphTime * smoothstep(0.9, 0.95, normalMC.z));\n\
 \n\

package/Source/Shaders/Model/MaterialStageFS.glsl

@@ -65,7 +65,11 @@ NormalInfo getNormalInfo(ProcessedAttributes attributes)
     #ifdef HAS_NORMAL_TEXTURE
         mat3 tbn = mat3(tangent, bitangent, geometryNormal);
         vec3 normalSample = texture(u_normalTexture, normalTexCoords).rgb;
-        vec3 normal = normalize(tbn * (2.0 * normalSample - 1.0));
+        normalSample = 2.0 * normalSample - 1.0;
+        #ifdef HAS_NORMAL_TEXTURE_SCALE
+            normalSample.xy *= u_normalTextureScale;
+        #endif
+        vec3 normal = normalize(tbn * normalSample);
     #else
         vec3 normal = geometryNormal;
     #endif
@@ -105,10 +109,12 @@ vec3 getNormalFromTexture(ProcessedAttributes attributes, vec3 geometryNormal)
     #endif
 
     mat3 tbn = mat3(t, b, geometryNormal);
-    vec3 n = texture(u_normalTexture, normalTexCoords).rgb;
-    vec3 textureNormal = normalize(tbn * (2.0 * n - 1.0));
-
-    return textureNormal;
+    vec3 normalSample = texture(u_normalTexture, normalTexCoords).rgb;
+    normalSample = 2.0 * normalSample - 1.0;
+    #ifdef HAS_NORMAL_TEXTURE_SCALE
+        normalSample.xy *= u_normalTextureScale;
+    #endif
+    return normalize(tbn * normalSample);
 }
 #endif
 
@@ -131,10 +137,12 @@ vec3 getClearcoatNormalFromTexture(ProcessedAttributes attributes, vec3 geometry
     #endif
 
     mat3 tbn = mat3(t, b, geometryNormal);
-    vec3 n = texture(u_clearcoatNormalTexture, normalTexCoords).rgb;
-    vec3 textureNormal = normalize(tbn * (2.0 * n - 1.0));
-
-    return textureNormal;
+    vec3 normalSample = texture(u_clearcoatNormalTexture, normalTexCoords).rgb;
+    normalSample = 2.0 * normalSample - 1.0;
+    #ifdef HAS_CLEARCOAT_NORMAL_TEXTURE_SCALE
+        normalSample.xy *= u_clearcoatNormalTextureScale;
+    #endif
+    return normalize(tbn * normalSample);
 }
 #endif
 
@@ -288,12 +296,12 @@ float setMetallicRoughness(inout czm_modelMaterial material)
 
     // dielectrics use f0 = 0.04, metals use albedo as f0
     const vec3 REFLECTANCE_DIELECTRIC = vec3(0.04);
-    vec3 f0 = mix(REFLECTANCE_DIELECTRIC, material.diffuse, metalness);
+    vec3 f0 = mix(REFLECTANCE_DIELECTRIC, material.baseColor.rgb, metalness);
 
     material.specular = f0;
 
     // diffuse only applies to dielectrics.
-    material.diffuse = material.diffuse * (1.0 - f0) * (1.0 - metalness);
+    material.diffuse = mix(material.baseColor.rgb, vec3(0.0), metalness);
 
     // roughness is authored as perceptual roughness
     // square it to get material roughness
@@ -341,7 +349,7 @@ void setSpecular(inout czm_modelMaterial material, in float metalness)
     material.specularWeight = specularWeight;
     vec3 f0 = material.specular;
     vec3 dielectricSpecularF0 = min(f0 * specularColorFactor, vec3(1.0));
-    material.specular = mix(dielectricSpecularF0, material.diffuse, metalness);
+    material.specular = mix(dielectricSpecularF0, material.baseColor.rgb, metalness);
 }
 #endif
 #ifdef USE_ANISOTROPY
@@ -450,6 +458,7 @@ void materialStage(inout czm_modelMaterial material, ProcessedAttributes attribu
         baseColorWithAlpha *= color;
     #endif
 
+    material.baseColor = baseColorWithAlpha;
     material.diffuse = baseColorWithAlpha.rgb;
     material.alpha = baseColorWithAlpha.a;
 

package/Source/Shaders/Model/MaterialStageFS.js

@@ -66,7 +66,11 @@ NormalInfo getNormalInfo(ProcessedAttributes attributes)\n\
     #ifdef HAS_NORMAL_TEXTURE\n\
         mat3 tbn = mat3(tangent, bitangent, geometryNormal);\n\
         vec3 normalSample = texture(u_normalTexture, normalTexCoords).rgb;\n\
-        vec3 normal = normalize(tbn * (2.0 * normalSample - 1.0));\n\
+        normalSample = 2.0 * normalSample - 1.0;\n\
+        #ifdef HAS_NORMAL_TEXTURE_SCALE\n\
+            normalSample.xy *= u_normalTextureScale;\n\
+        #endif\n\
+        vec3 normal = normalize(tbn * normalSample);\n\
     #else\n\
         vec3 normal = geometryNormal;\n\
     #endif\n\
@@ -106,10 +110,12 @@ vec3 getNormalFromTexture(ProcessedAttributes attributes, vec3 geometryNormal)\n
     #endif\n\
 \n\
     mat3 tbn = mat3(t, b, geometryNormal);\n\
-    vec3 n = texture(u_normalTexture, normalTexCoords).rgb;\n\
-    vec3 textureNormal = normalize(tbn * (2.0 * n - 1.0));\n\
-\n\
-    return textureNormal;\n\
+    vec3 normalSample = texture(u_normalTexture, normalTexCoords).rgb;\n\
+    normalSample = 2.0 * normalSample - 1.0;\n\
+    #ifdef HAS_NORMAL_TEXTURE_SCALE\n\
+        normalSample.xy *= u_normalTextureScale;\n\
+    #endif\n\
+    return normalize(tbn * normalSample);\n\
 }\n\
 #endif\n\
 \n\
@@ -132,10 +138,12 @@ vec3 getClearcoatNormalFromTexture(ProcessedAttributes attributes, vec3 geometry
     #endif\n\
 \n\
     mat3 tbn = mat3(t, b, geometryNormal);\n\
-    vec3 n = texture(u_clearcoatNormalTexture, normalTexCoords).rgb;\n\
-    vec3 textureNormal = normalize(tbn * (2.0 * n - 1.0));\n\
-\n\
-    return textureNormal;\n\
+    vec3 normalSample = texture(u_clearcoatNormalTexture, normalTexCoords).rgb;\n\
+    normalSample = 2.0 * normalSample - 1.0;\n\
+    #ifdef HAS_CLEARCOAT_NORMAL_TEXTURE_SCALE\n\
+        normalSample.xy *= u_clearcoatNormalTextureScale;\n\
+    #endif\n\
+    return normalize(tbn * normalSample);\n\
 }\n\
 #endif\n\
 \n\
@@ -289,12 +297,12 @@ float setMetallicRoughness(inout czm_modelMaterial material)\n\
 \n\
     // dielectrics use f0 = 0.04, metals use albedo as f0\n\
     const vec3 REFLECTANCE_DIELECTRIC = vec3(0.04);\n\
-    vec3 f0 = mix(REFLECTANCE_DIELECTRIC, material.diffuse, metalness);\n\
+    vec3 f0 = mix(REFLECTANCE_DIELECTRIC, material.baseColor.rgb, metalness);\n\
 \n\
     material.specular = f0;\n\
 \n\
     // diffuse only applies to dielectrics.\n\
-    material.diffuse = material.diffuse * (1.0 - f0) * (1.0 - metalness);\n\
+    material.diffuse = mix(material.baseColor.rgb, vec3(0.0), metalness);\n\
 \n\
     // roughness is authored as perceptual roughness\n\
     // square it to get material roughness\n\
@@ -342,7 +350,7 @@ void setSpecular(inout czm_modelMaterial material, in float metalness)\n\
     material.specularWeight = specularWeight;\n\
     vec3 f0 = material.specular;\n\
     vec3 dielectricSpecularF0 = min(f0 * specularColorFactor, vec3(1.0));\n\
-    material.specular = mix(dielectricSpecularF0, material.diffuse, metalness);\n\
+    material.specular = mix(dielectricSpecularF0, material.baseColor.rgb, metalness);\n\
 }\n\
 #endif\n\
 #ifdef USE_ANISOTROPY\n\
@@ -451,6 +459,7 @@ void materialStage(inout czm_modelMaterial material, ProcessedAttributes attribu
         baseColorWithAlpha *= color;\n\
     #endif\n\
 \n\
+    material.baseColor = baseColorWithAlpha;\n\
     material.diffuse = baseColorWithAlpha.rgb;\n\
     material.alpha = baseColorWithAlpha.a;\n\
 \n\