@cesium/engine 22.2.0 → 22.3.0

package/Source/Renderer/ContextLimits.js

@@ -10,6 +10,7 @@ const ContextLimits = {
   _maximumTextureImageUnits: 0,
   _maximumRenderbufferSize: 0,
   _maximumTextureSize: 0,
+  _maximum3DTextureSize: 0,
   _maximumVaryingVectors: 0,
   _maximumVertexAttributes: 0,
   _maximumVertexTextureImageUnits: 0,
@@ -31,11 +32,13 @@ const ContextLimits = {
 Object.defineProperties(ContextLimits, {
   /**
    * The maximum number of texture units that can be used from the vertex and fragment
-   * shader with this WebGL implementation.  The minimum is eight.  If both shaders access the
-   * same texture unit, this counts as two texture units.
+   * shader with this WebGL implementation.
+   * If both shaders access the same texture unit, this counts as two texture units.
+   * The minimum in WebGL2 contexts is 32, or 8 in WebGL1 contexts.
    * @memberof ContextLimits
    * @type {number}
-   * @see {@link https://www.khronos.org/opengles/sdk/docs/man/xhtml/glGet.xml|glGet} with <code>MAX_COMBINED_TEXTURE_IMAGE_UNITS</code>.
+   * @see {@link https://registry.khronos.org/OpenGL-Refpages/es3.0/html/glGet.xhtml|glGet in OpenGL ES 3.0} with <code>MAX_COMBINED_TEXTURE_IMAGE_UNITS</code>.
+   * @see {@link https://registry.khronos.org/OpenGL-Refpages/es2.0/xhtml/glGet.xml|glGet in OpenGL ES 2.0} for WebGL1 contexts.
    */
   maximumCombinedTextureImageUnits: {
     get: function () {
@@ -45,10 +48,12 @@ Object.defineProperties(ContextLimits, {
 
   /**
    * The approximate maximum cube map width and height supported by this WebGL implementation.
-   * The minimum is 16, but most desktop and laptop implementations will support much larger sizes like 8,192.
+   * The minimum in WebGL2 contexts is 2048, but most desktop and laptop implementations will support much larger sizes like 8192.
+   * The minimum in WebGL1 contexts is 16.
    * @memberof ContextLimits
    * @type {number}
-   * @see {@link https://www.khronos.org/opengles/sdk/docs/man/xhtml/glGet.xml|glGet} with <code>MAX_CUBE_MAP_TEXTURE_SIZE</code>.
+   * @see {@link https://registry.khronos.org/OpenGL-Refpages/es3.0/html/glGet.xhtml|glGet in OpenGL ES 3.0} with <code>MAX_CUBE_MAP_TEXTURE_SIZE</code>.
+   * @see {@link https://registry.khronos.org/OpenGL-Refpages/es2.0/xhtml/glGet.xml|glGet in OpenGL ES 2.0} for WebGL1 contexts.
    */
   maximumCubeMapSize: {
     get: function () {
@@ -58,10 +63,12 @@ Object.defineProperties(ContextLimits, {
 
   /**
    * The maximum number of <code>vec4</code>, <code>ivec4</code>, and <code>bvec4</code>
-   * uniforms that can be used by a fragment shader with this WebGL implementation.  The minimum is 16.
+   * uniforms that can be used by a fragment shader with this WebGL implementation.
+   * The minimum in WebGL2 contexts is 224, or 16 in WebGL1 contexts.
    * @memberof ContextLimits
    * @type {number}
-   * @see {@link https://www.khronos.org/opengles/sdk/docs/man/xhtml/glGet.xml|glGet} with <code>MAX_FRAGMENT_UNIFORM_VECTORS</code>.
+   * @see {@link https://registry.khronos.org/OpenGL-Refpages/es3.0/html/glGet.xhtml|glGet in OpenGL ES 3.0} with <code>MAX_FRAGMENT_UNIFORM_VECTORS</code>.
+   * @see {@link https://registry.khronos.org/OpenGL-Refpages/es2.0/xhtml/glGet.xml|glGet in OpenGL ES 2.0} for WebGL1 contexts.
    */
   maximumFragmentUniformVectors: {
     get: function () {
@@ -70,10 +77,12 @@ Object.defineProperties(ContextLimits, {
   },
 
   /**
-   * The maximum number of texture units that can be used from the fragment shader with this WebGL implementation.  The minimum is eight.
+   * The maximum number of texture units that can be used from the fragment shader with this WebGL implementation.
+   * The minimum in WebGL2 contexts is 16, or 8 in WebGL1 contexts.
    * @memberof ContextLimits
    * @type {number}
-   * @see {@link https://www.khronos.org/opengles/sdk/docs/man/xhtml/glGet.xml|glGet} with <code>MAX_TEXTURE_IMAGE_UNITS</code>.
+   * @see {@link https://registry.khronos.org/OpenGL-Refpages/es3.0/html/glGet.xhtml|glGet in OpenGL ES 3.0} with <code>MAX_TEXTURE_IMAGE_UNITS</code>.
+   * @see {@link https://registry.khronos.org/OpenGL-Refpages/es2.0/xhtml/glGet.xml|glGet in OpenGL ES 2.0} for WebGL1 contexts.
    */
   maximumTextureImageUnits: {
     get: function () {
@@ -83,10 +92,12 @@ Object.defineProperties(ContextLimits, {
 
   /**
    * The maximum renderbuffer width and height supported by this WebGL implementation.
-   * The minimum is 16, but most desktop and laptop implementations will support much larger sizes like 8,192.
+   * The minimum in WebGL2 contexts is 2048, but most desktop and laptop implementations will support much larger sizes like 8192.
+   * The minimum in WebGL1 contexts is 1.
    * @memberof ContextLimits
    * @type {number}
-   * @see {@link https://www.khronos.org/opengles/sdk/docs/man/xhtml/glGet.xml|glGet} with <code>MAX_RENDERBUFFER_SIZE</code>.
+   * @see {@link https://registry.khronos.org/OpenGL-Refpages/es3.0/html/glGet.xhtml|glGet in OpenGL ES 3.0} with <code>MAX_RENDERBUFFER_SIZE</code>.
+   * @see {@link https://registry.khronos.org/OpenGL-Refpages/es2.0/xhtml/glGet.xml|glGet in OpenGL ES 2.0} for WebGL1 contexts.
    */
   maximumRenderbufferSize: {
     get: function () {
@@ -96,10 +107,12 @@ Object.defineProperties(ContextLimits, {
 
   /**
    * The approximate maximum texture width and height supported by this WebGL implementation.
-   * The minimum is 64, but most desktop and laptop implementations will support much larger sizes like 8,192.
+   * The minimum in WebGL2 contexts is 2048, but most desktop and laptop implementations will support much larger sizes like 8192.
+   * The minimum in WebGL1 contexts is 64.
    * @memberof ContextLimits
    * @type {number}
-   * @see {@link https://www.khronos.org/opengles/sdk/docs/man/xhtml/glGet.xml|glGet} with <code>MAX_TEXTURE_SIZE</code>.
+   * @see {@link https://registry.khronos.org/OpenGL-Refpages/es3.0/html/glGet.xhtml|glGet in OpenGL ES 3.0} with <code>MAX_TEXTURE_SIZE</code>.
+   * @see {@link https://registry.khronos.org/OpenGL-Refpages/es2.0/xhtml/glGet.xml|glGet in OpenGL ES 2.0} for WebGL1 contexts.
    */
   maximumTextureSize: {
     get: function () {
@@ -107,12 +120,27 @@ Object.defineProperties(ContextLimits, {
     },
   },
 
+  /**
+   * The approximate maximum texture width, height, and depth supported by this WebGL2 implementation.
+   * The minimum is 256, but most desktop and laptop implementations will support much larger sizes like 2048.
+   * 3D textures are not supported in WebGL1 contexts.
+   * @memberof ContextLimits
+   * @type {number}
+   * @see {@link https://registry.khronos.org/OpenGL-Refpages/es3.0/html/glGet.xhtml|glGet in OpenGL ES 3.0} with <code>MAX_3D_TEXTURE_SIZE</code>.
+   */
+  maximum3DTextureSize: {
+    get: function () {
+      return ContextLimits._maximum3DTextureSize;
+    },
+  },
+
   /**
    * The maximum number of <code>vec4</code> varying variables supported by this WebGL implementation.
-   * The minimum is eight.  Matrices and arrays count as multiple <code>vec4</code>s.
+   * The minimum is 15 in WebGL2 contexts, or 8 in WebGL1 contexts. Matrices and arrays count as multiple <code>vec4</code>s.
    * @memberof ContextLimits
    * @type {number}
-   * @see {@link https://www.khronos.org/opengles/sdk/docs/man/xhtml/glGet.xml|glGet} with <code>MAX_VARYING_VECTORS</code>.
+   * @see {@link https://registry.khronos.org/OpenGL-Refpages/es3.0/html/glGet.xhtml|glGet in OpenGL ES 3.0} with <code>MAX_VARYING_VECTORS</code>.
+   * @see {@link https://registry.khronos.org/OpenGL-Refpages/es2.0/xhtml/glGet.xml|glGet in OpenGL ES 2.0} for WebGL1 contexts.
    */
   maximumVaryingVectors: {
     get: function () {
@@ -121,10 +149,12 @@ Object.defineProperties(ContextLimits, {
   },
 
   /**
-   * The maximum number of <code>vec4</code> vertex attributes supported by this WebGL implementation.  The minimum is eight.
+   * The maximum number of <code>vec4</code> vertex attributes supported by this WebGL implementation.
+   * The minimum is 16 in WebGL2 contexts, or 8 in WebGL1 contexts.
    * @memberof ContextLimits
    * @type {number}
-   * @see {@link https://www.khronos.org/opengles/sdk/docs/man/xhtml/glGet.xml|glGet} with <code>MAX_VERTEX_ATTRIBS</code>.
+   * @see {@link https://registry.khronos.org/OpenGL-Refpages/es3.0/html/glGet.xhtml|glGet in OpenGL ES 3.0} with <code>MAX_VERTEX_ATTRIBS</code>.
+   * @see {@link https://registry.khronos.org/OpenGL-Refpages/es2.0/xhtml/glGet.xml|glGet in OpenGL ES 2.0} for WebGL1 contexts.
    */
   maximumVertexAttributes: {
     get: function () {
@@ -134,10 +164,11 @@ Object.defineProperties(ContextLimits, {
 
   /**
    * The maximum number of texture units that can be used from the vertex shader with this WebGL implementation.
-   * The minimum is zero, which means the GL does not support vertex texture fetch.
+   * The minimum is 16 in WebGL2 contexts, or 0 in WebGL1 contexts.
    * @memberof ContextLimits
    * @type {number}
-   * @see {@link https://www.khronos.org/opengles/sdk/docs/man/xhtml/glGet.xml|glGet} with <code>MAX_VERTEX_TEXTURE_IMAGE_UNITS</code>.
+   * @see {@link https://registry.khronos.org/OpenGL-Refpages/es3.0/html/glGet.xhtml|glGet in OpenGL ES 3.0} with <code>MAX_VERTEX_TEXTURE_IMAGE_UNITS</code>.
+   * @see {@link https://registry.khronos.org/OpenGL-Refpages/es2.0/xhtml/glGet.xml|glGet in OpenGL ES 2.0} for WebGL1 contexts.
    */
   maximumVertexTextureImageUnits: {
     get: function () {
@@ -147,10 +178,12 @@ Object.defineProperties(ContextLimits, {
 
   /**
    * The maximum number of <code>vec4</code>, <code>ivec4</code>, and <code>bvec4</code>
-   * uniforms that can be used by a vertex shader with this WebGL implementation.  The minimum is 16.
+   * uniforms that can be used by a vertex shader with this WebGL implementation.
+   * The minimum is 256 in WebGL2 contexts, or 128 in WebGL1 contexts.
    * @memberof ContextLimits
    * @type {number}
-   * @see {@link https://www.khronos.org/opengles/sdk/docs/man/xhtml/glGet.xml|glGet} with <code>MAX_VERTEX_UNIFORM_VECTORS</code>.
+   * @see {@link https://registry.khronos.org/OpenGL-Refpages/es3.0/html/glGet.xhtml|glGet in OpenGL ES 3.0} with <code>MAX_VERTEX_UNIFORM_VECTORS</code>.
+   * @see {@link https://registry.khronos.org/OpenGL-Refpages/es2.0/xhtml/glGet.xml|glGet in OpenGL ES 2.0} for WebGL1 contexts.
    */
   maximumVertexUniformVectors: {
     get: function () {
@@ -159,10 +192,10 @@ Object.defineProperties(ContextLimits, {
   },
 
   /**
-   * The minimum aliased line width, in pixels, supported by this WebGL implementation.  It will be at most one.
+   * The minimum aliased line width, in pixels, supported by this WebGL implementation. It will be at most one.
+   * @see {@link https://registry.khronos.org/OpenGL-Refpages/es3.0/html/glGet.xhtml|glGet in OpenGL ES 3.0} with <code>ALIASED_LINE_WIDTH_RANGE</code>.
    * @memberof ContextLimits
    * @type {number}
-   * @see {@link https://www.khronos.org/opengles/sdk/docs/man/xhtml/glGet.xml|glGet} with <code>ALIASED_LINE_WIDTH_RANGE</code>.
    */
   minimumAliasedLineWidth: {
     get: function () {
@@ -171,10 +204,10 @@ Object.defineProperties(ContextLimits, {
   },
 
   /**
-   * The maximum aliased line width, in pixels, supported by this WebGL implementation.  It will be at least one.
+   * The maximum aliased line width, in pixels, supported by this WebGL implementation. It will be at least one.
+   * @see {@link https://registry.khronos.org/OpenGL-Refpages/es3.0/html/glGet.xhtml|glGet in OpenGL ES 3.0} with <code>ALIASED_LINE_WIDTH_RANGE</code>.
    * @memberof ContextLimits
    * @type {number}
-   * @see {@link https://www.khronos.org/opengles/sdk/docs/man/xhtml/glGet.xml|glGet} with <code>ALIASED_LINE_WIDTH_RANGE</code>.
    */
   maximumAliasedLineWidth: {
     get: function () {
@@ -183,10 +216,10 @@ Object.defineProperties(ContextLimits, {
   },
 
   /**
-   * The minimum aliased point size, in pixels, supported by this WebGL implementation.  It will be at most one.
+   * The minimum aliased point size, in pixels, supported by this WebGL implementation. It will be at most one.
+   * @see {@link https://registry.khronos.org/OpenGL-Refpages/es3.0/html/glGet.xhtml|glGet in OpenGL ES 3.0} with <code>ALIASED_POINT_SIZE_RANGE</code>.
    * @memberof ContextLimits
    * @type {number}
-   * @see {@link https://www.khronos.org/opengles/sdk/docs/man/xhtml/glGet.xml|glGet} with <code>ALIASED_POINT_SIZE_RANGE</code>.
    */
   minimumAliasedPointSize: {
     get: function () {
@@ -195,10 +228,10 @@ Object.defineProperties(ContextLimits, {
   },
 
   /**
-   * The maximum aliased point size, in pixels, supported by this WebGL implementation.  It will be at least one.
+   * The maximum aliased point size, in pixels, supported by this WebGL implementation. It will be at least one.
+   * @see {@link https://registry.khronos.org/OpenGL-Refpages/es3.0/html/glGet.xhtml|glGet in OpenGL ES 3.0} with <code>ALIASED_POINT_SIZE_RANGE</code>.
    * @memberof ContextLimits
    * @type {number}
-   * @see {@link https://www.khronos.org/opengles/sdk/docs/man/xhtml/glGet.xml|glGet} with <code>ALIASED_POINT_SIZE_RANGE</code>.
    */
   maximumAliasedPointSize: {
     get: function () {
@@ -207,10 +240,10 @@ Object.defineProperties(ContextLimits, {
   },
 
   /**
-   * The maximum supported width of the viewport.  It will be at least as large as the visible width of the associated canvas.
+   * The maximum supported width of the viewport. It will be at least as large as the visible width of the associated canvas.
+   * @see {@link https://registry.khronos.org/OpenGL-Refpages/es3.0/html/glGet.xhtml|glGet in OpenGL ES 3.0} with <code>MAX_VIEWPORT_DIMS</code>.
    * @memberof ContextLimits
    * @type {number}
-   * @see {@link https://www.khronos.org/opengles/sdk/docs/man/xhtml/glGet.xml|glGet} with <code>MAX_VIEWPORT_DIMS</code>.
    */
   maximumViewportWidth: {
     get: function () {
@@ -219,10 +252,10 @@ Object.defineProperties(ContextLimits, {
   },
 
   /**
-   * The maximum supported height of the viewport.  It will be at least as large as the visible height of the associated canvas.
+   * The maximum supported height of the viewport. It will be at least as large as the visible height of the associated canvas.
+   * @see {@link https://registry.khronos.org/OpenGL-Refpages/es3.0/html/glGet.xhtml|glGet in OpenGL ES 3.0} with <code>MAX_VIEWPORT_DIMS</code>.
    * @memberof ContextLimits
    * @type {number}
-   * @see {@link https://www.khronos.org/opengles/sdk/docs/man/xhtml/glGet.xml|glGet} with <code>MAX_VIEWPORT_DIMS</code>.
    */
   maximumViewportHeight: {
     get: function () {

package/Source/Renderer/ShaderSource.js

@@ -153,14 +153,11 @@ function getBuiltinsAndAutomaticUniforms(shaderSource) {
 }
 
 function combineShader(shaderSource, isFragmentShader, context) {
-  let i;
-  let length;
-
   // Combine shader sources, generally for pseudo-polymorphism, e.g., czm_getMaterial.
   let combinedSources = "";
   const sources = shaderSource.sources;
   if (defined(sources)) {
-    for (i = 0, length = sources.length; i < length; ++i) {
+    for (let i = 0; i < sources.length; ++i) {
       // #line needs to be on its own line.
       combinedSources += `\n#line 0\n${sources[i]}`;
     }
@@ -225,30 +222,34 @@ function combineShader(shaderSource, isFragmentShader, context) {
   let result = "";
 
   const extensionsLength = extensions.length;
-  for (i = 0; i < extensionsLength; i++) {
+  for (let i = 0; i < extensionsLength; i++) {
     result += extensions[i];
   }
 
   if (isFragmentShader) {
-    // If high precision isn't support replace occurrences of highp with mediump
-    // The highp keyword is not always available on older mobile devices
+    // If high precision isn't supported, replace occurrences of highp with mediump.
+    // The highp keyword is not always available on older mobile devices.
     // See https://developer.mozilla.org/en-US/docs/Web/API/WebGL_API/WebGL_best_practices#In_WebGL_1_highp_float_support_is_optional_in_fragment_shaders
-    result +=
-      "\
-#ifdef GL_FRAGMENT_PRECISION_HIGH\n\
-    precision highp float;\n\
-    precision highp int;\n\
-#else\n\
-    precision mediump float;\n\
-    precision mediump int;\n\
-    #define highp mediump\n\
-#endif\n\n";
+    result += `
+#ifdef GL_FRAGMENT_PRECISION_HIGH
+    precision highp float;
+    precision highp int;
+#else
+    precision mediump float;
+    precision mediump int;
+    #define highp mediump
+#endif
+`;
+  }
+
+  if (context.webgl2) {
+    result += `precision highp sampler3D;\n\n`;
   }
 
   // Prepend #defines for uber-shaders
   const defines = shaderSource.defines;
   if (defined(defines)) {
-    for (i = 0, length = defines.length; i < length; ++i) {
+    for (let i = 0, length = defines.length; i < length; ++i) {
       const define = defines[i];
       if (define.length !== 0) {
         result += `#define ${define}\n`;

package/Source/Renderer/Texture.js

@@ -398,7 +398,7 @@ function loadBufferSource(texture, source) {
  * @param {number} xOffset The texel x coordinate of the lower left corner of the subregion of the texture to be updated.
  * @param {number} yOffset The texel y coordinate of the lower left corner of the subregion of the texture to be updated.
  * @param {number} width The width of the source data, in pixels.
- * @param {number} width The height of the source data, in pixels.
+ * @param {number} height The height of the source data, in pixels.
  *
  * @private
  */

package/Source/Renderer/Texture3D.js

@@ -68,7 +68,8 @@ function Texture3D(options) {
     sampler = new Sampler(),
   } = options;
 
-  if (!context.webgl2) {
+  // 3D textures are not supported in a WebGL1 context. But we allow a stub context for testing.
+  if (!context.webgl2 && !defined(context.options.getWebGLStub)) {
     throw new DeveloperError(
       "WebGL1 does not support texture3D. Please use a WebGL2 context.",
     );
@@ -113,25 +114,25 @@ function Texture3D(options) {
 
   Check.typeOf.number.greaterThan("width", width, 0);
 
-  if (width > ContextLimits.maximumTextureSize) {
+  if (width > ContextLimits.maximum3DTextureSize) {
     throw new DeveloperError(
-      `Width must be less than or equal to the maximum texture3D size (${ContextLimits.maximumTextureSize}).  Check maximumTextureSize.`,
+      `Width must be less than or equal to the maximum texture3D size (${ContextLimits.maximum3DTextureSize}).  Check maximum3DTextureSize.`,
     );
   }
 
   Check.typeOf.number.greaterThan("height", height, 0);
 
-  if (height > ContextLimits.maximumTextureSize) {
+  if (height > ContextLimits.maximum3DTextureSize) {
     throw new DeveloperError(
-      `Height must be less than or equal to the maximum texture3D size (${ContextLimits.maximumTextureSize}).  Check maximumTextureSize.`,
+      `Height must be less than or equal to the maximum texture3D size (${ContextLimits.maximum3DTextureSize}).  Check maximum3DTextureSize.`,
     );
   }
 
   Check.typeOf.number.greaterThan("depth", depth, 0);
 
-  if (depth > ContextLimits.maximumTextureSize) {
+  if (depth > ContextLimits.maximum3DTextureSize) {
     throw new DeveloperError(
-      `Depth must be less than or equal to the maximum texture3D size (${ContextLimits.maximumTextureSize}).  Check maximumTextureSize.`,
+      `Depth must be less than or equal to the maximum texture3D size (${ContextLimits.maximum3DTextureSize}).  Check maximum3DTextureSize.`,
     );
   }
 
@@ -333,6 +334,164 @@ function loadBufferSource(texture3D, source) {
   }
 }
 
+/**
+ * Copy new image data into this texture, from a source object with width, height, depth, and arrayBufferView properties.
+ * @param {object} options Object with the following properties:
+ * @param {object} options.source The source object with width, height, depth, and arrayBufferView properties.
+ * @param {number} [options.xOffset=0] The offset in the x direction within the texture to copy into.
+ * @param {number} [options.yOffset=0] The offset in the y direction within the texture to copy into.
+ * @param {number} [options.zOffset=0] The offset in the z direction within the texture to copy into.
+ * @param {boolean} [options.skipColorSpaceConversion=false] If true, any custom gamma or color profiles in the texture will be ignored.
+ *
+ * @exception {DeveloperError} Unsupported copyFrom with a compressed texture pixel format.
+ * @exception {DeveloperError} xOffset must be greater than or equal to zero.
+ * @exception {DeveloperError} yOffset must be greater than or equal to zero.
+ * @exception {DeveloperError} zOffset must be greater than or equal to zero.
+ * @exception {DeveloperError} xOffset + source.width must be less than or equal to width.
+ * @exception {DeveloperError} yOffset + source.height must be less than or equal to height.
+ * @exception {DeveloperError} zOffset + source.depth must be less than or equal to depth.
+ * @exception {DeveloperError} This texture was destroyed, i.e., destroy() was called.
+ * @private
+ * @example
+ * texture.copyFrom({
+ *  source: {
+ *   width : 1,
+ *   height : 1,
+ *   depth : 1,
+ *   arrayBufferView : new Uint8Array([255, 0, 0, 255])
+ *  }
+ * });
+ */
+Texture3D.prototype.copyFrom = function (options) {
+  options = options ?? Frozen.EMPTY_OBJECT;
+
+  const { source, xOffset = 0, yOffset = 0, zOffset = 0 } = options;
+
+  //>>includeStart('debug', pragmas.debug);
+  Check.defined("options.source", source);
+  Check.defined("options.source.arrayBufferView", source.arrayBufferView);
+  if (PixelFormat.isCompressedFormat(this._pixelFormat)) {
+    throw new DeveloperError(
+      "Unsupported copyFrom with a compressed texture pixel format.",
+    );
+  }
+  Check.typeOf.number.greaterThanOrEquals("xOffset", xOffset, 0);
+  Check.typeOf.number.greaterThanOrEquals("yOffset", yOffset, 0);
+  Check.typeOf.number.greaterThanOrEquals("zOffset", zOffset, 0);
+  Check.typeOf.number.lessThanOrEquals(
+    "xOffset + options.source.width",
+    xOffset + source.width,
+    this._width,
+  );
+  Check.typeOf.number.lessThanOrEquals(
+    "yOffset + options.source.height",
+    yOffset + source.height,
+    this._height,
+  );
+  Check.typeOf.number.lessThanOrEquals(
+    "zOffset + options.source.depth",
+    zOffset + source.depth,
+    this._depth,
+  );
+  //>>includeEnd('debug');
+
+  const context = this._context;
+  const gl = context._gl;
+  const target = this._textureTarget;
+
+  gl.activeTexture(gl.TEXTURE0);
+  gl.bindTexture(target, this._texture);
+
+  const { width, height, depth } = source;
+  let uploaded = false;
+  if (!this._initialized) {
+    if (
+      xOffset === 0 &&
+      yOffset === 0 &&
+      zOffset === 0 &&
+      width === this._width &&
+      height === this._height &&
+      depth === this._depth
+    ) {
+      loadBufferSource(this, source);
+      uploaded = true;
+    } else {
+      gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, false);
+      gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, false);
+      loadNull(this);
+    }
+    this._initialized = true;
+  }
+
+  if (!uploaded) {
+    loadPartialBufferSource(
+      this,
+      source.arrayBufferView,
+      xOffset,
+      yOffset,
+      zOffset,
+      width,
+      height,
+      depth,
+    );
+  }
+
+  gl.bindTexture(target, null);
+};
+
+/**
+ * Load texel data from a buffer into part of a 3D texture
+ *
+ * @param {Texture3D} texture3D The texture3D to which texel values will be loaded.
+ * @param {TypedArray} arrayBufferView The texel values to be loaded into the texture3D.
+ * @param {number} xOffset The texel x coordinate of the lower left corner of the subregion of the texture to be updated.
+ * @param {number} yOffset The texel y coordinate of the lower left corner of the subregion of the texture to be updated.
+ * @param {number} zOffset The texel z coordinate of the lower left corner of the subregion of the texture to be updated.
+ * @param {number} width The width of the source data, in pixels.
+ * @param {number} height The height of the source data, in pixels.
+ * @param {number} depth The depth of the source data, in pixels.
+ *
+ * @private
+ */
+function loadPartialBufferSource(
+  texture3D,
+  arrayBufferView,
+  xOffset,
+  yOffset,
+  zOffset,
+  width,
+  height,
+  depth,
+) {
+  const context = texture3D._context;
+  const gl = context._gl;
+
+  const { pixelFormat, pixelDatatype } = texture3D;
+
+  const unpackAlignment = PixelFormat.alignmentInBytes(
+    pixelFormat,
+    pixelDatatype,
+    width,
+  );
+  gl.pixelStorei(gl.UNPACK_ALIGNMENT, unpackAlignment);
+  gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, false);
+  gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, false);
+
+  gl.texSubImage3D(
+    texture3D._textureTarget,
+    0,
+    xOffset,
+    yOffset,
+    zOffset,
+    width,
+    height,
+    depth,
+    pixelFormat,
+    PixelDatatype.toWebGLConstant(pixelDatatype, context),
+    arrayBufferView,
+  );
+}
+
 /**
  * Compute a dimension of the image for the next mip level.
  *

package/Source/Renderer/TextureAtlas.js

@@ -641,7 +641,7 @@ async function resolveImage(image, id) {
  *        or a URL to an Image, or a Promise for an image, or a function that creates an image.
  * @param {number} width A number specifying the width of the texture. If undefined, the image width will be used.
  * @param {number} height A number specifying the height of the texture. If undefined, the image height will be used.
- * @returns {Promise<number>} A Promise that resolves to the image region index, or -1 if resources are in the process of being destroyed.
+ * @returns {Promise<number> | number} The image region index or a promise that resolves to it. -1 is returned if resources are in the process of being destroyed.
  */
 TextureAtlas.prototype.addImage = function (id, image, width, height) {
   //>>includeStart('debug', pragmas.debug);
@@ -657,7 +657,7 @@ TextureAtlas.prototype.addImage = function (id, image, width, height) {
   }
   if (defined(index)) {
     // This image has already been added and resolved
-    return Promise.resolve(index);
+    return index;
   }
 
   index = this._nextIndex++;

package/Source/Scene/Appearance.js

@@ -28,7 +28,7 @@ import CullFace from "./CullFace.js";
  * @see PolylineColorAppearance
  * @see PolylineMaterialAppearance
  *
- * @demo {@link https://sandcastle.cesium.com/index.html?src=Geometry%20and%20Appearances.html|Geometry and Appearances Demo}
+ * @demo {@link https://sandcastle.cesium.com/index.html?id=geometry-and-appearances|Geometry and Appearances Demo}
  */
 function Appearance(options) {
   options = options ?? Frozen.EMPTY_OBJECT;

package/Source/Scene/ArcGisMapService.js

@@ -4,7 +4,7 @@ import Resource from "../Core/Resource.js";
 
 let defaultTokenCredit;
 const defaultAccessToken =
-  "AAPTxy8BH1VEsoebNVZXo8HurEOF051kAEKlhkOhBEc9BmT-YXumqp4JkvycMs8ZG2hKk2SGBrZlhKMqjDAD5-6Bfkm_qv2ikp3Q3QSZyA_gQmxc8WOi5Z38wPaDHFE06ozG_AMTUg2bOPx2B64azLZ2U4MPzYI01EWp4tZnTgEKEBA2S5ip51CE6gSm0glwVGSEMFb3jjJkxH2JvjWM8eU2sTTihBKpJWxbQYppczgBsdw.AT1_YjTi2kjL";
+  "AAPTxy8BH1VEsoebNVZXo8HurEOF051kAEKlhkOhBEc9BmQBN5OwMQnvqcM3GTdzwDusCXj4eE5jKKONHLoPEAvNXnML4d2_ObFMHiYtbS6gOWoNlH6cNDium9FLGy4eRBK7mcDQKdokYzlY27y-WPo25dgjAfx6C0rbvGsk0yn7FHPv8yDcsW5frQhhXIJ48lW5UcbIlpxY_j-Im5MJfxgIQuUA_m0tvy4rxbkTMNS26yA.AT1_DJvNEaWq";
 /**
  * Default options for accessing the ArcGIS image tile service.
  *

package/Source/Scene/Billboard.js

@@ -93,7 +93,7 @@ import isDataUri from "../Core/isDataUri.js";
  * @param {Billboard.ConstructorOptions} options Object describing initialization options
  * @param {BillboardCollection} billboardCollection Instance of BillboardCollection
  *
- * @demo {@link https://sandcastle.cesium.com/index.html?src=Billboards.html|Cesium Sandcastle Billboard Demo}
+ * @demo {@link https://sandcastle.cesium.com/index.html?id=billboards|Cesium Sandcastle Billboard Demo}
  */
 function Billboard(options, billboardCollection) {
   options = options ?? Frozen.EMPTY_OBJECT;

package/Source/Scene/BillboardCollection.js

@@ -130,7 +130,7 @@ const attributeLocationsInstanced = {
  * @see Billboard
  * @see LabelCollection
  *
- * @demo {@link https://sandcastle.cesium.com/index.html?src=Billboards.html|Cesium Sandcastle Billboard Demo}
+ * @demo {@link https://sandcastle.cesium.com/index.html?id=billboards|Cesium Sandcastle Billboard Demo}
  *
  * @example
  * // Create a billboard collection with two billboards

package/Source/Scene/BillboardTexture.js

@@ -199,7 +199,10 @@ BillboardTexture.prototype.loadImage = async function (
   let index;
   const atlas = this._billboardCollection.textureAtlas;
   try {
-    index = await atlas.addImage(id, image, width, height);
+    index = atlas.addImage(id, image, width, height);
+    if (index instanceof Promise) {
+      index = await index;
+    }
   } catch (error) {
     // There was an error loading the image
     billboardTexture._loadState = BillboardLoadState.ERROR;

package/Source/Scene/Camera.js

@@ -63,8 +63,8 @@ import SceneMode from "./SceneMode.js";
  *
  * @param {Scene} scene The scene.
  *
- * @demo {@link https://sandcastle.cesium.com/index.html?src=Camera.html|Cesium Sandcastle Camera Demo}
- * @demo {@link https://sandcastle.cesium.com/index.html?src=Camera%20Tutorial.html|Cesium Sandcastle Camera Tutorial Example}
+ * @demo {@link https://sandcastle.cesium.com/index.html?id=camera|Cesium Sandcastle Camera Demo}
+ * @demo {@link https://sandcastle.cesium.com/index.html?id=camera-tutorial|Cesium Sandcastle Camera Tutorial Example}
  * @demo {@link https://cesium.com/learn/cesiumjs-learn/cesiumjs-camera|Camera Tutorial}
  *
  * @example
@@ -3005,6 +3005,17 @@ function getPickRayOrthographic(camera, windowPosition, result) {
 
   Cartesian3.clone(camera.directionWC, result.direction);
 
+  // Account for wrap-around in 2D infinite scroll mode
+  if (
+    camera._mode === SceneMode.SCENE2D &&
+    camera._scene.mapMode2D === MapMode2D.INFINITE_SCROLL
+  ) {
+    const maxHorizontal = camera._maxCoord.x;
+    origin.y =
+      CesiumMath.mod(origin.y + maxHorizontal, 2.0 * maxHorizontal) -
+      maxHorizontal;
+  }
+
   return result;
 }
 

package/Source/Scene/ClippingPlaneCollection.js

@@ -41,8 +41,8 @@ import ClippingPlane from "./ClippingPlane.js";
  * @param {Color} [options.edgeColor=Color.WHITE] The color applied to highlight the edge along which an object is clipped.
  * @param {number} [options.edgeWidth=0.0] The width, in pixels, of the highlight applied to the edge along which an object is clipped.
  *
- * @demo {@link https://sandcastle.cesium.com/?src=3D%20Tiles%20Clipping%20Planes.html|Clipping 3D Tiles and glTF models.}
- * @demo {@link https://sandcastle.cesium.com/?src=Terrain%20Clipping%20Planes.html|Clipping the Globe.}
+ * @demo {@link https://sandcastle.cesium.com/?id=3d-tiles-clipping-planes|Clipping 3D Tiles and glTF models.}
+ * @demo {@link https://sandcastle.cesium.com/?id=terrain-clipping-planes|Clipping the Globe.}
  *
  * @example
  * // This clipping plane's distance is positive, which means its normal

package/Source/Scene/CloudCollection.js

@@ -86,8 +86,8 @@ const COLOR_INDEX = CumulusCloud.COLOR_INDEX;
  * @see CloudCollection#remove
  * @see CumulusCloud
  *
- * @demo {@link https://sandcastle.cesium.com/index.html?src=Clouds.html|Cesium Sandcastle Clouds Demo}
- * @demo {@link https://sandcastle.cesium.com/index.html?src=Cloud%20Parameters.html|Cesium Sandcastle Cloud Parameters Demo}
+ * @demo {@link https://sandcastle.cesium.com/index.html?id=clouds|Cesium Sandcastle Clouds Demo}
+ * @demo {@link https://sandcastle.cesium.com/index.html?id=cloud-parameters|Cesium Sandcastle Cloud Parameters Demo}
  *
  * @example
  * // Create a cloud collection with two cumulus clouds