@cesium/engine 2.0.0 → 2.2.0

package/Source/Scene/ResourceCache.js

@@ -50,7 +50,7 @@ function CacheEntry(resourceLoader) {
  * Gets a resource from the cache. If the resource exists its reference count is
  * incremented. Otherwise, if no resource loader exists, undefined is returned.
  *
- * @param {String} cacheKey The cache key of the resource.
+ * @param {string} cacheKey The cache key of the resource.
  *
  * @returns {ResourceLoader|undefined} The resource.
  * @private
@@ -69,20 +69,17 @@ ResourceCache.get = function (cacheKey) {
 };
 
 /**
- * Loads a resource and adds it to the cache.
+ * Adds it to the cache.
  *
- * @param {Object} options Object with the following properties:
- * @param {ResourceLoader} options.resourceLoader The resource.
+ * @param {ResourceLoader} resourceLoader The resource.
+ * @returns {ResourceLoader} The resource.
  *
- * @exception {DeveloperError} Resource with this cacheKey is already in the cach
+ * @exception {DeveloperError} Resource with this cacheKey is already in the cache
  * @private
  */
-ResourceCache.load = function (options) {
-  options = defaultValue(options, defaultValue.EMPTY_OBJECT);
-  const resourceLoader = options.resourceLoader;
-
+ResourceCache.add = function (resourceLoader) {
   //>>includeStart('debug', pragmas.debug);
-  Check.typeOf.object("options.resourceLoader", resourceLoader);
+  Check.typeOf.object("resourceLoader", resourceLoader);
   //>>includeEnd('debug');
 
   const cacheKey = resourceLoader.cacheKey;
@@ -99,7 +96,7 @@ ResourceCache.load = function (options) {
 
   ResourceCache.cacheEntries[cacheKey] = new CacheEntry(resourceLoader);
 
-  resourceLoader.load();
+  return resourceLoader;
 };
 
 /**
@@ -136,18 +133,18 @@ ResourceCache.unload = function (resourceLoader) {
 };
 
 /**
- * Loads a schema from the cache.
+ * Gets an existing schema loader from the cache, or creates a new loader if one does not already exist.
  *
- * @param {Object} options Object with the following properties:
- * @param {Object} [options.schema] An object that explicitly defines a schema JSON. Mutually exclusive with options.resource.
+ * @param {object} options Object with the following properties:
+ * @param {object} [options.schema] An object that explicitly defines a schema JSON. Mutually exclusive with options.resource.
  * @param {Resource} [options.resource] The {@link Resource} pointing to the schema JSON. Mutually exclusive with options.schema.
  *
- * @returns {MetadataSchemaLoader} The schema resource.
+ * @returns {MetadataSchemaLoader} The cached schema resource.
  *
  * @exception {DeveloperError} One of options.schema and options.resource must be defined.
  * @private
  */
-ResourceCache.loadSchema = function (options) {
+ResourceCache.getSchemaLoader = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
   const schema = options.schema;
   const resource = options.resource;
@@ -176,25 +173,21 @@ ResourceCache.loadSchema = function (options) {
     cacheKey: cacheKey,
   });
 
-  ResourceCache.load({
-    resourceLoader: schemaLoader,
-  });
-
-  return schemaLoader;
+  return ResourceCache.add(schemaLoader);
 };
 
 /**
- * Load an embedded buffer from the cache.
+ * Gets an existing embedded buffer loader from the cache, or creates a new loader if one does not already exist.
  *
- * @param {Object} options Object with the following properties:
+ * @param {object} options Object with the following properties:
  * @param {Resource} options.parentResource The {@link Resource} containing the embedded buffer.
- * @param {Number} options.bufferId A unique identifier of the embedded buffer within the parent resource.
+ * @param {number} options.bufferId A unique identifier of the embedded buffer within the parent resource.
  * @param {Uint8Array} [options.typedArray] The typed array containing the embedded buffer contents.
  *
- * @returns {BufferLoader} The buffer loader.
+ * @returns {BufferLoader} The cached buffer loader.
  * @private
  */
-ResourceCache.loadEmbeddedBuffer = function (options) {
+ResourceCache.getEmbeddedBufferLoader = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
   const parentResource = options.parentResource;
   const bufferId = options.bufferId;
@@ -224,23 +217,19 @@ ResourceCache.loadEmbeddedBuffer = function (options) {
     cacheKey: cacheKey,
   });
 
-  ResourceCache.load({
-    resourceLoader: bufferLoader,
-  });
-
-  return bufferLoader;
+  return ResourceCache.add(bufferLoader);
 };
 
 /**
- * Loads an external buffer from the cache.
+ * Gets an existing external buffer from loader the cache, or creates a new loader if one does not already exist.
  *
- * @param {Object} options Object with the following properties:
+ * @param {object} options Object with the following properties:
  * @param {Resource} options.resource The {@link Resource} pointing to the external buffer.
  *
- * @returns {BufferLoader} The buffer loader.
+ * @returns {BufferLoader} The cached buffer loader.
  * @private
  */
-ResourceCache.loadExternalBuffer = function (options) {
+ResourceCache.getExternalBufferLoader = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
   const resource = options.resource;
 
@@ -262,26 +251,22 @@ ResourceCache.loadExternalBuffer = function (options) {
     cacheKey: cacheKey,
   });
 
-  ResourceCache.load({
-    resourceLoader: bufferLoader,
-  });
-
-  return bufferLoader;
+  return ResourceCache.add(bufferLoader);
 };
 
 /**
- * Loads a glTF JSON from the cache.
+ * Gets an existing glTF JSON loader from the cache, or creates a new loader if one does not already exist.
  *
- * @param {Object} options Object with the following properties:
+ * @param {object} options Object with the following properties:
  * @param {Resource} options.gltfResource The {@link Resource} containing the glTF.
  * @param {Resource} options.baseResource The {@link Resource} that paths in the glTF JSON are relative to.
  * @param {Uint8Array} [options.typedArray] The typed array containing the glTF contents.
- * @param {Object} [options.gltfJson] The parsed glTF JSON contents.
+ * @param {object} [options.gltfJson] The parsed glTF JSON contents.
  *
- * @returns {GltfJsonLoader} The glTF JSON.
+ * @returns {GltfJsonLoader} The cached glTF JSON loader.
  * @private
  */
-ResourceCache.loadGltfJson = function (options) {
+ResourceCache.getGltfJsonLoader = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
   const gltfResource = options.gltfResource;
   const baseResource = options.baseResource;
@@ -311,26 +296,22 @@ ResourceCache.loadGltfJson = function (options) {
     cacheKey: cacheKey,
   });
 
-  ResourceCache.load({
-    resourceLoader: gltfJsonLoader,
-  });
-
-  return gltfJsonLoader;
+  return ResourceCache.add(gltfJsonLoader);
 };
 
 /**
- * Loads a glTF buffer view from the cache.
+ * Gets an existing glTF buffer view from the cache, or creates a new loader if one does not already exist.
  *
- * @param {Object} options Object with the following properties:
- * @param {Object} options.gltf The glTF JSON.
- * @param {Number} options.bufferViewId The bufferView ID.
+ * @param {object} options Object with the following properties:
+ * @param {object} options.gltf The glTF JSON.
+ * @param {number} options.bufferViewId The bufferView ID.
  * @param {Resource} options.gltfResource The {@link Resource} containing the glTF.
  * @param {Resource} options.baseResource The {@link Resource} that paths in the glTF JSON are relative to.
  *
- * @returns {GltfBufferViewLoader} The buffer view loader.
+ * @returns {GltfBufferViewLoader} The cached buffer view loader.
  * @private
  */
-ResourceCache.loadBufferView = function (options) {
+ResourceCache.getBufferViewLoader = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
   const gltf = options.gltf;
   const bufferViewId = options.bufferViewId;
@@ -365,26 +346,22 @@ ResourceCache.loadBufferView = function (options) {
     cacheKey: cacheKey,
   });
 
-  ResourceCache.load({
-    resourceLoader: bufferViewLoader,
-  });
-
-  return bufferViewLoader;
+  return ResourceCache.add(bufferViewLoader);
 };
 
 /**
- * Loads Draco data from the cache.
+ * Gets an existing Draco data from the cache, or creates a new loader if one does not already exist.
  *
- * @param {Object} options Object with the following properties:
- * @param {Object} options.gltf The glTF JSON.
- * @param {Object} options.draco The Draco extension object.
+ * @param {object} options Object with the following properties:
+ * @param {object} options.gltf The glTF JSON.
+ * @param {object} options.draco The Draco extension object.
  * @param {Resource} options.gltfResource The {@link Resource} containing the glTF.
  * @param {Resource} options.baseResource The {@link Resource} that paths in the glTF JSON are relative to.
  *
- * @returns {GltfDracoLoader} The Draco loader.
+ * @returns {GltfDracoLoader} The cached Draco loader.
  * @private
  */
-ResourceCache.loadDraco = function (options) {
+ResourceCache.getDracoLoader = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
   const gltf = options.gltf;
   const draco = options.draco;
@@ -419,37 +396,33 @@ ResourceCache.loadDraco = function (options) {
     cacheKey: cacheKey,
   });
 
-  ResourceCache.load({
-    resourceLoader: dracoLoader,
-  });
-
-  return dracoLoader;
+  return ResourceCache.add(dracoLoader);
 };
 
 /**
- * Loads a glTF vertex buffer from the cache.
+ * Gets an existing glTF vertex buffer from the cache, or creates a new loader if one does not already exist.
  *
- * @param {Object} options Object with the following properties:
- * @param {Object} options.gltf The glTF JSON.
+ * @param {object} options Object with the following properties:
+ * @param {object} options.gltf The glTF JSON.
  * @param {Resource} options.gltfResource The {@link Resource} containing the glTF.
  * @param {Resource} options.baseResource The {@link Resource} that paths in the glTF JSON are relative to.
  * @param {FrameState} options.frameState The frame state.
- * @param {Number} [options.bufferViewId] The bufferView ID corresponding to the vertex buffer.
- * @param {Object} [options.draco] The Draco extension object.
- * @param {String} [options.attributeSemantic] The attribute semantic, e.g. POSITION or NORMAL.
- * @param {Number} [options.accessorId] The accessor ID.
- * @param {Boolean} [options.asynchronous=true] Determines if WebGL resource creation will be spread out over several frames or block until all WebGL resources are created.
- * @param {Boolean} [options.dequantize=false] Determines whether or not the vertex buffer will be dequantized on the CPU.
- * @param {Boolean} [options.loadBuffer=false] Load vertex buffer as a GPU vertex buffer.
- * @param {Boolean} [options.loadTypedArray=false] Load vertex buffer as a typed array.
+ * @param {number} [options.bufferViewId] The bufferView ID corresponding to the vertex buffer.
+ * @param {object} [options.draco] The Draco extension object.
+ * @param {string} [options.attributeSemantic] The attribute semantic, e.g. POSITION or NORMAL.
+ * @param {number} [options.accessorId] The accessor ID.
+ * @param {boolean} [options.asynchronous=true] Determines if WebGL resource creation will be spread out over several frames or block until all WebGL resources are created.
+ * @param {boolean} [options.dequantize=false] Determines whether or not the vertex buffer will be dequantized on the CPU.
+ * @param {boolean} [options.loadBuffer=false] Load vertex buffer as a GPU vertex buffer.
+ * @param {boolean} [options.loadTypedArray=false] Load vertex buffer as a typed array.
  * @exception {DeveloperError} One of options.bufferViewId and options.draco must be defined.
  * @exception {DeveloperError} When options.draco is defined options.attributeSemantic must also be defined.
  * @exception {DeveloperError} When options.draco is defined options.accessorId must also be defined.
  *
- * @returns {GltfVertexBufferLoader} The vertex buffer loader.
+ * @returns {GltfVertexBufferLoader} The cached vertex buffer loader.
  * @private
  */
-ResourceCache.loadVertexBuffer = function (options) {
+ResourceCache.getVertexBufferLoader = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
   const gltf = options.gltf;
   const gltfResource = options.gltfResource;
@@ -539,18 +512,7 @@ ResourceCache.loadVertexBuffer = function (options) {
     loadTypedArray: loadTypedArray,
   });
 
-  ResourceCache.load({
-    resourceLoader: vertexBufferLoader,
-  });
-
-  const promise = ResourceCache.statistics.addGeometryLoader(
-    vertexBufferLoader
-  );
-
-  // Needed for unit testing
-  ResourceCache.cacheEntries[cacheKey]._statisticsPromise = promise;
-
-  return vertexBufferLoader;
+  return ResourceCache.add(vertexBufferLoader);
 };
 
 function hasDracoCompression(draco, semantic) {
@@ -562,22 +524,22 @@ function hasDracoCompression(draco, semantic) {
 }
 
 /**
- * Loads a glTF index buffer from the cache.
+ * Gets an existing glTF index buffer from the cache, or creates a new loader if one does not already exist.
  *
- * @param {Object} options Object with the following properties:
- * @param {Object} options.gltf The glTF JSON.
- * @param {Number} options.accessorId The accessor ID corresponding to the index buffer.
+ * @param {object} options Object with the following properties:
+ * @param {object} options.gltf The glTF JSON.
+ * @param {number} options.accessorId The accessor ID corresponding to the index buffer.
  * @param {Resource} options.gltfResource The {@link Resource} containing the glTF.
  * @param {Resource} options.baseResource The {@link Resource} that paths in the glTF JSON are relative to.
  * @param {FrameState} options.frameState The frame state.
- * @param {Object} [options.draco] The Draco extension object.
- * @param {Boolean} [options.asynchronous=true] Determines if WebGL resource creation will be spread out over several frames or block until all WebGL resources are created.
- * @param {Boolean} [options.loadBuffer=false] Load index buffer as a GPU index buffer.
- * @param {Boolean} [options.loadTypedArray=false] Load index buffer as a typed array.
- * @returns {GltfIndexBufferLoader} The index buffer loader.
+ * @param {object} [options.draco] The Draco extension object.
+ * @param {boolean} [options.asynchronous=true] Determines if WebGL resource creation will be spread out over several frames or block until all WebGL resources are created.
+ * @param {boolean} [options.loadBuffer=false] Load index buffer as a GPU index buffer.
+ * @param {boolean} [options.loadTypedArray=false] Load index buffer as a typed array.
+ * @returns {GltfIndexBufferLoader} The cached index buffer loader.
  * @private
  */
-ResourceCache.loadIndexBuffer = function (options) {
+ResourceCache.getIndexBufferLoader = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
   const gltf = options.gltf;
   const accessorId = options.accessorId;
@@ -631,30 +593,22 @@ ResourceCache.loadIndexBuffer = function (options) {
     loadTypedArray: loadTypedArray,
   });
 
-  ResourceCache.load({
-    resourceLoader: indexBufferLoader,
-  });
-  const promise = ResourceCache.statistics.addGeometryLoader(indexBufferLoader);
-
-  // Needed for unit testing
-  ResourceCache.cacheEntries[cacheKey]._statisticsPromise = promise;
-
-  return indexBufferLoader;
+  return ResourceCache.add(indexBufferLoader);
 };
 
 /**
- * Loads a glTF image from the cache.
+ * Gets an existing glTF image from the cache, or creates a new loader if one does not already exist.
  *
- * @param {Object} options Object with the following properties:
- * @param {Object} options.gltf The glTF JSON.
- * @param {Number} options.imageId The image ID.
+ * @param {object} options Object with the following properties:
+ * @param {object} options.gltf The glTF JSON.
+ * @param {number} options.imageId The image ID.
  * @param {Resource} options.gltfResource The {@link Resource} containing the glTF.
  * @param {Resource} options.baseResource The {@link Resource} that paths in the glTF JSON are relative to.
  *
- * @returns {GltfImageLoader} The image loader.
+ * @returns {GltfImageLoader} The cached image loader.
  * @private
  */
-ResourceCache.loadImage = function (options) {
+ResourceCache.getImageLoader = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
   const gltf = options.gltf;
   const imageId = options.imageId;
@@ -689,29 +643,25 @@ ResourceCache.loadImage = function (options) {
     cacheKey: cacheKey,
   });
 
-  ResourceCache.load({
-    resourceLoader: imageLoader,
-  });
-
-  return imageLoader;
+  return ResourceCache.add(imageLoader);
 };
 
 /**
- * Loads a glTF texture from the cache.
+ * Gets an existing glTF texture from the cache, or creates a new loader if one does not already exist.
  *
- * @param {Object} options Object with the following properties:
- * @param {Object} options.gltf The glTF JSON.
- * @param {Object} options.textureInfo The texture info object.
+ * @param {object} options Object with the following properties:
+ * @param {object} options.gltf The glTF JSON.
+ * @param {object} options.textureInfo The texture info object.
  * @param {Resource} options.gltfResource The {@link Resource} containing the glTF.
  * @param {Resource} options.baseResource The {@link Resource} that paths in the glTF JSON are relative to.
  * @param {SupportedImageFormats} options.supportedImageFormats The supported image formats.
  * @param {FrameState} options.frameState The frame state.
- * @param {Boolean} [options.asynchronous=true] Determines if WebGL resource creation will be spread out over several frames or block until all WebGL resources are created.
+ * @param {boolean} [options.asynchronous=true] Determines if WebGL resource creation will be spread out over several frames or block until all WebGL resources are created.
  *
- * @returns {GltfTextureLoader} The texture loader.
+ * @returns {GltfTextureLoader} The cached texture loader.
  * @private
  */
-ResourceCache.loadTexture = function (options) {
+ResourceCache.getTextureLoader = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
   const gltf = options.gltf;
   const textureInfo = options.textureInfo;
@@ -755,15 +705,7 @@ ResourceCache.loadTexture = function (options) {
     asynchronous: asynchronous,
   });
 
-  ResourceCache.load({
-    resourceLoader: textureLoader,
-  });
-  const promise = ResourceCache.statistics.addTextureLoader(textureLoader);
-
-  // Needed for unit testing
-  ResourceCache.cacheEntries[cacheKey]._statisticsPromise = promise;
-
-  return textureLoader;
+  return ResourceCache.add(textureLoader);
 };
 
 /**

package/Source/Scene/ResourceCacheKey.js

@@ -118,11 +118,11 @@ function getSamplerCacheKey(gltf, textureInfo) {
 /**
  * Gets the schema cache key.
  *
- * @param {Object} options Object with the following properties:
- * @param {Object} [options.schema] An object that explicitly defines a schema JSON. Mutually exclusive with options.resource.
+ * @param {object} options Object with the following properties:
+ * @param {object} [options.schema] An object that explicitly defines a schema JSON. Mutually exclusive with options.resource.
  * @param {Resource} [options.resource] The {@link Resource} pointing to the schema JSON. Mutually exclusive with options.schema.
  *
- * @returns {String} The schema cache key.
+ * @returns {string} The schema cache key.
  *
  * @exception {DeveloperError} One of options.schema and options.resource must be defined.
  * @private
@@ -149,10 +149,10 @@ ResourceCacheKey.getSchemaCacheKey = function (options) {
 /**
  * Gets the external buffer cache key.
  *
- * @param {Object} options Object with the following properties:
+ * @param {object} options Object with the following properties:
  * @param {Resource} options.resource The {@link Resource} pointing to the external buffer.
  *
- * @returns {String} The external buffer cache key.
+ * @returns {string} The external buffer cache key.
  * @private
  */
 ResourceCacheKey.getExternalBufferCacheKey = function (options) {
@@ -169,11 +169,11 @@ ResourceCacheKey.getExternalBufferCacheKey = function (options) {
 /**
  * Gets the embedded buffer cache key.
  *
- * @param {Object} options Object with the following properties:
+ * @param {object} options Object with the following properties:
  * @param {Resource} options.parentResource The {@link Resource} containing the embedded buffer.
- * @param {Number} options.bufferId A unique identifier of the embedded buffer within the parent resource.
+ * @param {number} options.bufferId A unique identifier of the embedded buffer within the parent resource.
  *
- * @returns {String} The embedded buffer cache key.
+ * @returns {string} The embedded buffer cache key.
  * @private
  */
 ResourceCacheKey.getEmbeddedBufferCacheKey = function (options) {
@@ -195,10 +195,10 @@ ResourceCacheKey.getEmbeddedBufferCacheKey = function (options) {
 /**
  * Gets the glTF cache key.
  *
- * @param {Object} options Object with the following properties:
+ * @param {object} options Object with the following properties:
  * @param {Resource} options.gltfResource The {@link Resource} containing the glTF.
  *
- * @returns {String} The glTF cache key.
+ * @returns {string} The glTF cache key.
  * @private
  */
 ResourceCacheKey.getGltfCacheKey = function (options) {
@@ -215,13 +215,13 @@ ResourceCacheKey.getGltfCacheKey = function (options) {
 /**
  * Gets the buffer view cache key.
  *
- * @param {Object} options Object with the following properties:
- * @param {Object} options.gltf The glTF JSON.
- * @param {Number} options.bufferViewId The bufferView ID.
+ * @param {object} options Object with the following properties:
+ * @param {object} options.gltf The glTF JSON.
+ * @param {number} options.bufferViewId The bufferView ID.
  * @param {Resource} options.gltfResource The {@link Resource} containing the glTF.
  * @param {Resource} options.baseResource The {@link Resource} that paths in the glTF JSON are relative to.
  *
- * @returns {String} The buffer view cache key.
+ * @returns {string} The buffer view cache key.
  * @private
  */
 ResourceCacheKey.getBufferViewCacheKey = function (options) {
@@ -261,13 +261,13 @@ ResourceCacheKey.getBufferViewCacheKey = function (options) {
 /**
  * Gets the Draco cache key.
  *
- * @param {Object} options Object with the following properties:
- * @param {Object} options.gltf The glTF JSON.
- * @param {Object} options.draco The Draco extension object.
+ * @param {object} options Object with the following properties:
+ * @param {object} options.gltf The glTF JSON.
+ * @param {object} options.draco The Draco extension object.
  * @param {Resource} options.gltfResource The {@link Resource} containing the glTF.
  * @param {Resource} options.baseResource The {@link Resource} that paths in the glTF JSON are relative to.
  *
- * @returns {String} The Draco cache key.
+ * @returns {string} The Draco cache key.
  * @private
  */
 ResourceCacheKey.getDracoCacheKey = function (options) {
@@ -290,21 +290,21 @@ ResourceCacheKey.getDracoCacheKey = function (options) {
 /**
  * Gets the vertex buffer cache key.
  *
- * @param {Object} options Object with the following properties:
- * @param {Object} options.gltf The glTF JSON.
+ * @param {object} options Object with the following properties:
+ * @param {object} options.gltf The glTF JSON.
  * @param {Resource} options.gltfResource The {@link Resource} containing the glTF.
  * @param {Resource} options.baseResource The {@link Resource} that paths in the glTF JSON are relative to.
  * @param {FrameState} options.frameState The frame state.
- * @param {Number} [options.bufferViewId] The bufferView ID corresponding to the vertex buffer.
- * @param {Object} [options.draco] The Draco extension object.
- * @param {String} [options.attributeSemantic] The attribute semantic, e.g. POSITION or NORMAL.
- * @param {Boolean} [options.dequantize=false] Determines whether or not the vertex buffer will be dequantized on the CPU.
- * @param {Boolean} [options.loadBuffer=false] Load vertex buffer as a GPU vertex buffer.
- * @param {Boolean} [options.loadTypedArray=false] Load vertex buffer as a typed array.
+ * @param {number} [options.bufferViewId] The bufferView ID corresponding to the vertex buffer.
+ * @param {object} [options.draco] The Draco extension object.
+ * @param {string} [options.attributeSemantic] The attribute semantic, e.g. POSITION or NORMAL.
+ * @param {boolean} [options.dequantize=false] Determines whether or not the vertex buffer will be dequantized on the CPU.
+ * @param {boolean} [options.loadBuffer=false] Load vertex buffer as a GPU vertex buffer.
+ * @param {boolean} [options.loadTypedArray=false] Load vertex buffer as a typed array.
  * @exception {DeveloperError} One of options.bufferViewId and options.draco must be defined.
  * @exception {DeveloperError} When options.draco is defined options.attributeSemantic must also be defined.
  *
- * @returns {String} The vertex buffer cache key.
+ * @returns {string} The vertex buffer cache key.
  * @private
  */
 ResourceCacheKey.getVertexBufferCacheKey = function (options) {
@@ -405,17 +405,17 @@ function hasDracoCompression(draco, semantic) {
 /**
  * Gets the index buffer cache key.
  *
- * @param {Object} options Object with the following properties:
- * @param {Object} options.gltf The glTF JSON.
- * @param {Number} options.accessorId The accessor ID corresponding to the index buffer.
+ * @param {object} options Object with the following properties:
+ * @param {object} options.gltf The glTF JSON.
+ * @param {number} options.accessorId The accessor ID corresponding to the index buffer.
  * @param {Resource} options.gltfResource The {@link Resource} containing the glTF.
  * @param {Resource} options.baseResource The {@link Resource} that paths in the glTF JSON are relative to.
  * @param {FrameState} options.frameState The frame state.
- * @param {Object} [options.draco] The Draco extension object.
- * @param {Boolean} [options.loadBuffer=false] Load index buffer as a GPU index buffer.
- * @param {Boolean} [options.loadTypedArray=false] Load index buffer as a typed array.
+ * @param {object} [options.draco] The Draco extension object.
+ * @param {boolean} [options.loadBuffer=false] Load index buffer as a GPU index buffer.
+ * @param {boolean} [options.loadTypedArray=false] Load index buffer as a typed array.
  *
- * @returns {String} The index buffer cache key.
+ * @returns {string} The index buffer cache key.
  * @private
  */
 ResourceCacheKey.getIndexBufferCacheKey = function (options) {
@@ -484,13 +484,13 @@ ResourceCacheKey.getIndexBufferCacheKey = function (options) {
 /**
  * Gets the image cache key.
  *
- * @param {Object} options Object with the following properties:
- * @param {Object} options.gltf The glTF JSON.
- * @param {Number} options.imageId The image ID.
+ * @param {object} options Object with the following properties:
+ * @param {object} options.gltf The glTF JSON.
+ * @param {number} options.imageId The image ID.
  * @param {Resource} options.gltfResource The {@link Resource} containing the glTF.
  * @param {Resource} options.baseResource The {@link Resource} that paths in the glTF JSON are relative to.
  *
- * @returns {String} The image cache key.
+ * @returns {string} The image cache key.
  * @private
  */
 ResourceCacheKey.getImageCacheKey = function (options) {
@@ -520,15 +520,15 @@ ResourceCacheKey.getImageCacheKey = function (options) {
 /**
  * Gets the texture cache key.
  *
- * @param {Object} options Object with the following properties:
- * @param {Object} options.gltf The glTF JSON.
- * @param {Object} options.textureInfo The texture info object.
+ * @param {object} options Object with the following properties:
+ * @param {object} options.gltf The glTF JSON.
+ * @param {object} options.textureInfo The texture info object.
  * @param {Resource} options.gltfResource The {@link Resource} containing the glTF.
  * @param {Resource} options.baseResource The {@link Resource} that paths in the glTF JSON are relative to.
  * @param {SupportedImageFormats} options.supportedImageFormats The supported image formats.
  * @param {FrameState} options.frameState The frame state.
  *
- * @returns {String} The texture cache key.
+ * @returns {string} The texture cache key.
  * @private
  */
 ResourceCacheKey.getTextureCacheKey = function (options) {