@cesium/engine 18.3.1-ion.1 → 20.0.0

package/LICENSE.md

@@ -305,35 +305,42 @@ https://gist.github.com/banksean/300494
 >
 > THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-### NVIDIA GameWorks Graphics Samples
+### NVIDIA GameWorks FXAA Shader
 
-https://github.com/NVIDIAGameWorks/GraphicsSamples
+Original source (archived): https://archive.org/details/nvidiagame-works-graphics-samples-master
+Fork: https://github.com/lyntel/GraphicsSamples/blob/3d30817ebeeade64fe6a4fc3aa1fe4265c29b6fd/samples/es3-kepler/FXAA/FXAA3_11.h
 
-> Copyright 2016 NVIDIA Corporation
+> ----------------------------------------------------------------------------------
+> File:        es3-kepler\FXAA/FXAA3_11.h
+> SDK Version: v3.00 
+> Email:       gameworks@nvidia.com
+> Site:        http://developer.nvidia.com/
 >
-> BY DOWNLOADING THE SOFTWARE AND OTHER AVAILABLE MATERIALS, YOU ("DEVELOPER") AGREE TO BE BOUND BY THE FOLLOWING TERMS AND CONDITIONS
+> Copyright (c) 2014-2015, NVIDIA CORPORATION. All rights reserved.
 >
-> The materials available for download to Developers may include software in both sample source ("Source Code") and object code ("Object Code") versions, documentation ("Documentation"), certain art work ("Art Assets") and other materials (collectively, these materials referred to herein as "Materials"). Except as expressly indicated herein, all terms and conditions of this Agreement apply to all of the Materials.
->
-> Except as expressly set forth herein, NVIDIA owns all of the Materials and makes them available to Developer only under the terms and conditions set forth in this Agreement.
->
-> License: Subject to the terms of this Agreement, NVIDIA hereby grants to Developer a royalty-free, non-exclusive license to possess and to use the Materials. The following terms apply to the specified type of Material:
->
-> Source Code: Developer shall have the right to modify and create derivative works with the Source Code. Developer shall own any derivative works ("Derivatives") it creates to the Source Code, provided that Developer uses the Materials in accordance with the terms of this Agreement. Developer may distribute the Derivatives, provided that all NVIDIA copyright notices and trademarks are used properly and the Derivatives include the following statement: "This software contains source code provided by NVIDIA Corporation."
->
-> Object Code: Developer agrees not to disassemble, decompile or reverse engineer the Object Code versions of any of the Materials. Developer acknowledges that certain of the Materials provided in Object Code version may contain third party components that may be subject to restrictions, and expressly agrees not to attempt to modify or distribute such Materials without first receiving consent from NVIDIA.
->
-> Art Assets: Developer shall have the right to modify and create Derivatives of the Art Assets, but may not distribute any of the Art Assets or Derivatives created therefrom without NVIDIA's prior written consent.
->
-> Government End Users: If you are acquiring the Software on behalf of any unit or agency of the United States Government, the following provisions apply. The Government agrees the Software and documentation were developed at private expense and are provided with "RESTRICTED RIGHTS". Use, duplication, or disclosure by the Government is subject to restrictions as set forth in DFARS 227.7202-1(a) and 227.7202-3(a) (1995), DFARS 252.227-7013(c)(1)(ii) (Oct 1988), FAR 12.212(a)(1995), FAR 52.227-19, (June 1987) or FAR 52.227-14(ALT III) (June 1987),as amended from time to time. In the event that this License, or any part thereof, is deemed inconsistent with the minimum rights identified in the Restricted Rights provisions, the minimum rights shall prevail.
-> No Other License. No rights or licenses are granted by NVIDIA under this License, expressly or by implication, with respect to any proprietary information or patent, copyright, trade secret or other intellectual property right owned or controlled by NVIDIA, except as expressly provided in this License.
-> Term: This License is effective until terminated. NVIDIA may terminate this Agreement (and with it, all of Developer's right to the Materials) immediately upon written notice (which may include email) to Developer, with or without cause.
->
-> Support: NVIDIA has no obligation to support or to continue providing or updating any of the Materials.
->
-> No Warranty: THE SOFTWARE AND ANY OTHER MATERIALS PROVIDED BY NVIDIA TO DEVELOPER HEREUNDER ARE PROVIDED "AS IS." NVIDIA DISCLAIMS ALL WARRANTIES, EXPRESS, IMPLIED OR STATUTORY, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
->
-> LIMITATION OF LIABILITY: NVIDIA SHALL NOT BE LIABLE TO DEVELOPER, DEVELOPER'S CUSTOMERS, OR ANY OTHER PERSON OR ENTITY CLAIMING THROUGH OR UNDER DEVELOPER FOR ANY LOSS OF PROFITS, INCOME, SAVINGS, OR ANY OTHER CONSEQUENTIAL, INCIDENTAL, SPECIAL, PUNITIVE, DIRECT OR INDIRECT DAMAGES (WHETHER IN AN ACTION IN CONTRACT, TORT OR BASED ON A WARRANTY), EVEN IF NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS SHALL APPLY NOTWITHSTANDING ANY FAILURE OF THE ESSENTIAL PURPOSE OF ANY LIMITED REMEDY. IN NO EVENT SHALL NVIDIA'S AGGREGATE LIABILITY TO DEVELOPER OR ANY OTHER PERSON OR ENTITY CLAIMING THROUGH OR UNDER DEVELOPER EXCEED THE AMOUNT OF MONEY ACTUALLY PAID BY DEVELOPER TO NVIDIA FOR THE SOFTWARE OR ANY OTHER MATERIALS.
+> Redistribution and use in source and binary forms, with or without
+> modification, are permitted provided that the following conditions
+> are met:
+>  * Redistributions of source code must retain the above copyright
+>    notice, this list of conditions and the following disclaimer.
+>  * Redistributions in binary form must reproduce the above copyright
+>    notice, this list of conditions and the following disclaimer in the
+>    documentation and/or other materials provided with the distribution.
+>  * Neither the name of NVIDIA CORPORATION nor the names of its
+>    contributors may be used to endorse or promote products derived
+>    from this software without specific prior written permission.
+>
+> THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
+> EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+> IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+> PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+> CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+> EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+> PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+> PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+> OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+> (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+> OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ### jsep
 

package/Source/Core/Ellipsoid.js

@@ -254,6 +254,15 @@ Ellipsoid.MOON = Object.freeze(
   ),
 );
 
+/**
+ * An Ellipsoid instance initialized to a sphere with the mean radii of Mars.
+ * Source: https://epsg.io/104905
+ *
+ * @type {Ellipsoid}
+ * @constant
+ */
+Ellipsoid.MARS = Object.freeze(new Ellipsoid(3396190.0, 3396190.0, 3376200.0));
+
 Ellipsoid._default = Ellipsoid.WGS84;
 Object.defineProperties(Ellipsoid, {
   /**

package/Source/Core/ITwinPlatform.js

@@ -153,13 +153,17 @@ ITwinPlatform.apiEndpoint = new Resource({
  * @private
  *
  * @param {string} iModelId iModel id
+ * @param {string} [changesetId] The id of the changeset to filter results by. If not provided, exports from the latest available changesets will be returned.
  * @returns {Promise<GetExportsResponse>}
  *
  * @throws {RuntimeError} If the iTwin API request is not successful
  */
-ITwinPlatform.getExports = async function (iModelId) {
+ITwinPlatform.getExports = async function (iModelId, changesetId) {
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.string("iModelId", iModelId);
+  if (defined(changesetId)) {
+    Check.typeOf.string("changesetId", changesetId);
+  }
   if (
     !defined(ITwinPlatform.defaultAccessToken) &&
     !defined(ITwinPlatform.defaultShareKey)
@@ -191,6 +195,9 @@ ITwinPlatform.getExports = async function (iModelId) {
   if (typeof CESIUM_VERSION !== "undefined") {
     resource.appendQueryParameters({ clientVersion: CESIUM_VERSION });
   }
+  if (defined(changesetId) && changesetId !== "") {
+    resource.appendQueryParameters({ changesetId: changesetId });
+  }
 
   try {
     const response = await resource.fetchJson();

package/Source/Core/Ion.js

@@ -4,7 +4,7 @@ import Resource from "./Resource.js";
 
 let defaultTokenCredit;
 const defaultAccessToken =
-  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIwNDljNWFmZC03MzRlLTRiMDMtYWIwMi00Yjk4YWQ4NzQwZGEiLCJpZCI6MjU5LCJpYXQiOjE3NTEzNzkyMzR9.OTqPNs3UGNnT1LYkPTavV80wN8Es_YphpJgQcpdnqWc";
+  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI2NTEwZTU2Yi0wOGEyLTQyZjgtOTJjNi04Mzc2NGRlNzA4NTkiLCJpZCI6MjU5LCJpYXQiOjE3NTY4NDExOTJ9._Y3MIsYgGKTVTpkEpKPNT0cQSa_hUocY0DdH7h0U-xM";
 /**
  * Default settings for accessing the Cesium ion API.
  *

package/Source/Core/IonResource.js

@@ -199,15 +199,8 @@ IonResource.prototype._makeRequest = function (options) {
     return Resource.prototype._makeRequest.call(this, options);
   }
 
-  if (!defined(options.headers)) {
-    options.headers = {};
-  }
+  addClientHeaders(options);
   options.headers.Authorization = `Bearer ${this._ionEndpoint.accessToken}`;
-  options.headers["X-Cesium-Client"] = "CesiumJS";
-  /* global CESIUM_VERSION */
-  if (typeof CESIUM_VERSION !== "undefined") {
-    options.headers["X-Cesium-Client-Version"] = CESIUM_VERSION;
-  }
 
   return Resource.prototype._makeRequest.call(this, options);
 };
@@ -233,9 +226,22 @@ IonResource._createEndpointResource = function (assetId, options) {
     resourceOptions.queryParameters = { access_token: accessToken };
   }
 
+  addClientHeaders(resourceOptions);
+
   return server.getDerivedResource(resourceOptions);
 };
 
+function addClientHeaders(options) {
+  if (!defined(options.headers)) {
+    options.headers = {};
+  }
+  options.headers["X-Cesium-Client"] = "CesiumJS";
+  /* global CESIUM_VERSION */
+  if (typeof CESIUM_VERSION !== "undefined") {
+    options.headers["X-Cesium-Client-Version"] = CESIUM_VERSION;
+  }
+}
+
 function retryCallback(that, error) {
   const ionRoot = that._ionRoot ?? that;
   const endpointResource = ionRoot._ionEndpointResource;

package/Source/Core/ScreenSpaceEventHandler.js

@@ -981,9 +981,9 @@ function handlePointerMove(screenSpaceEventHandler, event) {
 function ScreenSpaceEventHandler(element) {
   this._inputEvents = {};
   this._buttonDown = {
-    LEFT: false,
-    MIDDLE: false,
-    RIGHT: false,
+    [MouseButton.LEFT]: false,
+    [MouseButton.MIDDLE]: false,
+    [MouseButton.RIGHT]: false,
   };
   this._isPinching = false;
   this._isTouchHolding = false;

package/Source/Core/addAllToArray.js

@@ -0,0 +1,40 @@
+import defined from "./defined.js";
+
+/**
+ * Adds all elements from the given source array to the given target array.
+ *
+ * If the <code>source</code> is <code>null</code>, <code>undefined</code>,
+ * or empty, then nothing will be done. Otherwise, this has the same
+ * semantics as<br>
+ * <code>for (const s of source) target.push(s);</code><br>
+ * but is usually more efficient than a <code>for</code>-loop, and does not
+ * put the elements of the source on the stack, as it would be done with the
+ * spread operator or when using <code>target.push.apply(source)</code>.
+ *
+ * @function
+ * @private
+ *
+ * @param {Array} target The target array
+ * @param {Array|undefined} source The source array
+ *
+ * @example
+ * const target = [ 0, 1, 2 ];
+ * const source = [ 3, 4, 5 ];
+ * Cesium.addAllToArray(target, source);
+ * // The target is now [ 0, 1, 2, 3, 4, 5 ]
+ */
+function addAllToArray(target, source) {
+  if (!defined(source)) {
+    return;
+  }
+  const sourceLength = source.length;
+  if (sourceLength === 0) {
+    return;
+  }
+  const targetLength = target.length;
+  target.length += sourceLength;
+  for (let i = 0; i < sourceLength; i++) {
+    target[targetLength + i] = source[i];
+  }
+}
+export default addAllToArray;

package/Source/DataSources/StaticGroundGeometryPerMaterialBatch.js

@@ -23,24 +23,18 @@ function Batch(
   usingSphericalTextureCoordinates,
   zIndex,
 ) {
-  this.primitives = primitives; // scene level primitive collection
+  this.primitives = primitives; // scene level primitive collection (each Batch manages its own Primitive from this collection)
   this.classificationType = classificationType;
   this.appearanceType = appearanceType;
   this.materialProperty = materialProperty;
-  this.updaters = new AssociativeArray();
+  this.updaters = new AssociativeArray(); // GeometryUpdaters that manage the visual representation of the primitive.
   this.createPrimitive = true;
   this.primitive = undefined; // a GroundPrimitive encapsulating all the entities
-  this.oldPrimitive = undefined;
+  this.oldPrimitive = undefined; // a GroundPrimitive that is being replaced by the current primitive, but will still be shown until the current primitive is ready.
   this.geometry = new AssociativeArray();
   this.material = undefined;
   this.updatersWithAttributes = new AssociativeArray();
   this.attributes = new AssociativeArray();
-  this.invalidated = false;
-  this.removeMaterialSubscription =
-    materialProperty.definitionChanged.addEventListener(
-      Batch.prototype.onMaterialChanged,
-      this,
-    );
   this.subscriptions = new AssociativeArray();
   this.showsUpdated = new AssociativeArray();
   this.usingSphericalTextureCoordinates = usingSphericalTextureCoordinates;
@@ -48,10 +42,6 @@ function Batch(
   this.rectangleCollisionCheck = new RectangleCollisionChecker();
 }
 
-Batch.prototype.onMaterialChanged = function () {
-  this.invalidated = true;
-};
-
 Batch.prototype.overlapping = function (rectangle) {
   return this.rectangleCollisionCheck.collides(rectangle);
 };
@@ -71,6 +61,13 @@ Batch.prototype.isMaterial = function (updater) {
   return defined(material) && material.equals(updaterMaterial);
 };
 
+/**
+ * Adds an updater to the Batch, and signals for a new Primitive to be created on the next update.
+ * @param {JulianDate} time
+ * @param {GeometryUpdater} updater
+ * @param {GeometryInstance} geometryInstance
+ * @private
+ */
 Batch.prototype.add = function (time, updater, geometryInstance) {
   const id = updater.id;
   this.updaters.set(id, updater);
@@ -100,6 +97,13 @@ Batch.prototype.add = function (time, updater, geometryInstance) {
   this.createPrimitive = true;
 };
 
+/**
+ * Remove an updater from the Batch, and potentially signals for a new Primitive to be created
+ * on the next update.
+ * @param {GeometryUpdater} updater
+ * @returns true if the updater was removed, false if it was not found.
+ * @private
+ */
 Batch.prototype.remove = function (updater) {
   const id = updater.id;
   const geometryInstance = this.geometry.get(id);
@@ -120,6 +124,13 @@ Batch.prototype.remove = function (updater) {
   return false;
 };
 
+/**
+ * Update a Batch, creating a new primitive, if necessary, or swapping out an old primitive for a new one that's ready.
+ * A new primitive is created whenever an updater is added to or removed from a Batch.
+ * @param {JulianDate} time
+ * @returns a boolean indicating whether the Batch was updated.
+ * @private
+ */
 Batch.prototype.update = function (time) {
   let isUpdated = true;
   let primitive = this.primitive;
@@ -295,6 +306,10 @@ Batch.prototype.getBoundingSphere = function (updater, result) {
   return BoundingSphereState.DONE;
 };
 
+/**
+ * Removes a Batch's primitive (and oldPrimitive, if it exists).
+ * @private
+ */
 Batch.prototype.destroy = function () {
   const primitive = this.primitive;
   const primitives = this.primitives;
@@ -305,10 +320,11 @@ Batch.prototype.destroy = function () {
   if (defined(oldPrimitive)) {
     primitives.remove(oldPrimitive);
   }
-  this.removeMaterialSubscription();
 };
 
 /**
+ * A container of Batch objects of ground geometry primitives, where a Batch is grouped by material,
+ * texture coordinate type, and spatial overlap.
  * @private
  */
 function StaticGroundGeometryPerMaterialBatch(
@@ -316,12 +332,20 @@ function StaticGroundGeometryPerMaterialBatch(
   classificationType,
   appearanceType,
 ) {
-  this._items = [];
-  this._primitives = primitives;
+  this._items = []; // array of Batch objects, each containing representing a primitive and a set of updaters that manage the visual representation of the primitive.
+  this._primitives = primitives; // scene level primitive collection
   this._classificationType = classificationType;
   this._appearanceType = appearanceType;
 }
 
+/**
+ * Adds an geometry updater to a Batch. Tries to find a preexisting compatible Batch, or else creates a new Batch.
+ * Used by Visualizer classes to add and update (remove->add) a primitive's Updater set.
+ *
+ * @param {JulianDate} time
+ * @param {GeometryUpdater} updater A GeometryUpdater that manages the visual representation of a primitive.
+ * @private
+ */
 StaticGroundGeometryPerMaterialBatch.prototype.add = function (time, updater) {
   const items = this._items;
   const length = items.length;
@@ -361,21 +385,30 @@ StaticGroundGeometryPerMaterialBatch.prototype.add = function (time, updater) {
   items.push(batch);
 };
 
+/**
+ * Removes an updater from a Batch. Defers potential deletion until the next update.
+ * @param {GeometryUpdater} updater A GeometryUpdater that manages the visual representation of a primitive.
+ * @private
+ */
 StaticGroundGeometryPerMaterialBatch.prototype.remove = function (updater) {
   const items = this._items;
   const length = items.length;
   for (let i = length - 1; i >= 0; i--) {
     const item = items[i];
     if (item.remove(updater)) {
-      if (item.updaters.length === 0) {
-        items.splice(i, 1);
-        item.destroy();
-      }
+      // If the item is now empty, delete it (deferred until the next update,
+      // in case a new updater is added to the same item first).
       break;
     }
   }
 };
 
+/**
+ * Updates all the items (Batches) in the collection, and deletes any that are empty.
+ * @param {JulianDate} time
+ * @returns a boolean indicating whether any of the items (Batches) were updated.
+ * @private
+ */
 StaticGroundGeometryPerMaterialBatch.prototype.update = function (time) {
   let i;
   const items = this._items;
@@ -383,13 +416,8 @@ StaticGroundGeometryPerMaterialBatch.prototype.update = function (time) {
 
   for (i = length - 1; i >= 0; i--) {
     const item = items[i];
-    if (item.invalidated) {
+    if (item.updaters.length === 0) {
       items.splice(i, 1);
-      const updaters = item.updaters.values;
-      const updatersLength = updaters.length;
-      for (let h = 0; h < updatersLength; h++) {
-        this.add(time, updaters[h]);
-      }
       item.destroy();
     }
   }

package/Source/Renderer/Context.js

@@ -1415,6 +1415,10 @@ Context.prototype.draw = function (
   continueDraw(this, drawCommand, shaderProgram, uniformMap);
 };
 
+Context.prototype.beginFrame = function () {
+  // A no-op. Overridden when drawing to a SharedContext.
+};
+
 Context.prototype.endFrame = function () {
   const gl = this._gl;
   gl.useProgram(null);
@@ -1442,8 +1446,8 @@ Context.prototype.endFrame = function () {
  * @param {object} readState An object with the following properties:
  * @param {number} [readState.x=0] The x offset of the rectangle to read from.
  * @param {number} [readState.y=0] The y offset of the rectangle to read from.
- * @param {number} [readState.width=gl.drawingBufferWidth] The width of the rectangle to read from.
- * @param {number} [readState.height=gl.drawingBufferHeight] The height of the rectangle to read from.
+ * @param {number} [readState.width=this.drawingBufferWidth] The width of the rectangle to read from.
+ * @param {number} [readState.height=this.drawingBufferHeight] The height of the rectangle to read from.
  * @param {Framebuffer} [readState.framebuffer] The framebuffer to read from. If undefined, the read will be from the default framebuffer.
  * @returns {Uint8Array|Uint16Array|Float32Array|Uint32Array} The pixels in the specified rectangle.
  */
@@ -1453,8 +1457,8 @@ Context.prototype.readPixels = function (readState) {
   readState = readState ?? Frozen.EMPTY_OBJECT;
   const x = Math.max(readState.x ?? 0, 0);
   const y = Math.max(readState.y ?? 0, 0);
-  const width = readState.width ?? gl.drawingBufferWidth;
-  const height = readState.height ?? gl.drawingBufferHeight;
+  const width = readState.width ?? this.drawingBufferWidth;
+  const height = readState.height ?? this.drawingBufferHeight;
   const framebuffer = readState.framebuffer;
 
   //>>includeStart('debug', pragmas.debug);

package/Source/Renderer/Renderbuffer.js

@@ -21,10 +21,12 @@ function Renderbuffer(options) {
   const maximumRenderbufferSize = ContextLimits.maximumRenderbufferSize;
 
   const format = options.format ?? RenderbufferFormat.RGBA4;
-  const width = defined(options.width) ? options.width : gl.drawingBufferWidth;
+  const width = defined(options.width)
+    ? options.width
+    : context.drawingBufferWidth;
   const height = defined(options.height)
     ? options.height
-    : gl.drawingBufferHeight;
+    : context.drawingBufferHeight;
   const numSamples = options.numSamples ?? 1;
 
   //>>includeStart('debug', pragmas.debug);

package/Source/Renderer/Sampler.js

@@ -13,6 +13,7 @@ function Sampler(options) {
   options = options ?? Frozen.EMPTY_OBJECT;
 
   const {
+    wrapR = TextureWrap.CLAMP_TO_EDGE,
     wrapS = TextureWrap.CLAMP_TO_EDGE,
     wrapT = TextureWrap.CLAMP_TO_EDGE,
     minificationFilter = TextureMinificationFilter.LINEAR,
@@ -21,6 +22,10 @@ function Sampler(options) {
   } = options;
 
   //>>includeStart('debug', pragmas.debug);
+  if (!TextureWrap.validate(wrapR)) {
+    throw new DeveloperError("Invalid sampler.wrapR.");
+  }
+
   if (!TextureWrap.validate(wrapS)) {
     throw new DeveloperError("Invalid sampler.wrapS.");
   }
@@ -44,6 +49,7 @@ function Sampler(options) {
   );
   //>>includeEnd('debug');
 
+  this._wrapR = wrapR;
   this._wrapS = wrapS;
   this._wrapT = wrapT;
   this._minificationFilter = minificationFilter;
@@ -52,6 +58,11 @@ function Sampler(options) {
 }
 
 Object.defineProperties(Sampler.prototype, {
+  wrapR: {
+    get: function () {
+      return this._wrapR;
+    },
+  },
   wrapS: {
     get: function () {
       return this._wrapS;
@@ -84,6 +95,7 @@ Sampler.equals = function (left, right) {
     left === right ||
     (defined(left) &&
       defined(right) &&
+      left._wrapR === right._wrapR &&
       left._wrapS === right._wrapS &&
       left._wrapT === right._wrapT &&
       left._minificationFilter === right._minificationFilter &&
@@ -94,6 +106,7 @@ Sampler.equals = function (left, right) {
 
 Sampler.NEAREST = Object.freeze(
   new Sampler({
+    wrapR: TextureWrap.CLAMP_TO_EDGE,
     wrapS: TextureWrap.CLAMP_TO_EDGE,
     wrapT: TextureWrap.CLAMP_TO_EDGE,
     minificationFilter: TextureMinificationFilter.NEAREST,

package/Source/Renderer/ShaderBuilder.js

@@ -7,6 +7,7 @@ import ShaderProgram from "./ShaderProgram.js";
 import ShaderSource from "./ShaderSource.js";
 import ShaderStruct from "./ShaderStruct.js";
 import ShaderFunction from "./ShaderFunction.js";
+import addAllToArray from "../Core/addAllToArray.js";
 
 /**
  * An object that makes it easier to build the text of a {@link ShaderProgram}. This tracks GLSL code for both the vertex shader and the fragment shader.
@@ -413,7 +414,7 @@ ShaderBuilder.prototype.addVertexLines = function (lines) {
 
   const vertexLines = this._vertexShaderParts.shaderLines;
   if (Array.isArray(lines)) {
-    vertexLines.push.apply(vertexLines, lines);
+    addAllToArray(vertexLines, lines);
   } else {
     // Single string case
     vertexLines.push(lines);
@@ -448,7 +449,7 @@ ShaderBuilder.prototype.addFragmentLines = function (lines) {
 
   const fragmentLines = this._fragmentShaderParts.shaderLines;
   if (Array.isArray(lines)) {
-    fragmentLines.push.apply(fragmentLines, lines);
+    addAllToArray(fragmentLines, lines);
   } else {
     // Single string case
     fragmentLines.push(lines);
@@ -533,7 +534,7 @@ function generateStructLines(shaderBuilder) {
     structId = structIds[i];
     struct = shaderBuilder._structs[structId];
     structLines = struct.generateGlslLines();
-    vertexLines.push.apply(vertexLines, structLines);
+    addAllToArray(vertexLines, structLines);
   }
 
   structIds = shaderBuilder._fragmentShaderParts.structIds;
@@ -541,7 +542,7 @@ function generateStructLines(shaderBuilder) {
     structId = structIds[i];
     struct = shaderBuilder._structs[structId];
     structLines = struct.generateGlslLines();
-    fragmentLines.push.apply(fragmentLines, structLines);
+    addAllToArray(fragmentLines, structLines);
   }
 
   return {
@@ -576,7 +577,7 @@ function generateFunctionLines(shaderBuilder) {
     functionId = functionIds[i];
     func = shaderBuilder._functions[functionId];
     functionLines = func.generateGlslLines();
-    vertexLines.push.apply(vertexLines, functionLines);
+    addAllToArray(vertexLines, functionLines);
   }
 
   functionIds = shaderBuilder._fragmentShaderParts.functionIds;
@@ -584,7 +585,7 @@ function generateFunctionLines(shaderBuilder) {
     functionId = functionIds[i];
     func = shaderBuilder._functions[functionId];
     functionLines = func.generateGlslLines();
-    fragmentLines.push.apply(fragmentLines, functionLines);
+    addAllToArray(fragmentLines, functionLines);
   }
 
   return {