@cesium/engine 2.1.0 → 2.2.0

package/Source/Scene/BufferLoader.js

@@ -50,19 +50,6 @@ if (defined(Object.create)) {
 }
 
 Object.defineProperties(BufferLoader.prototype, {
-  /**
-   * A promise that resolves to the resource when the resource is ready, or undefined if the resource hasn't started loading.
-   *
-   * @memberof BufferLoader.prototype
-   *
-   * @type {Promise<BufferLoader>|undefined}
-   * @readonly
-   */
-  promise: {
-    get: function () {
-      return this._promise;
-    },
-  },
   /**
    * The cache key of the resource.
    *
@@ -70,6 +57,7 @@ Object.defineProperties(BufferLoader.prototype, {
    *
    * @type {string}
    * @readonly
+   * @private
    */
   cacheKey: {
     get: function () {
@@ -83,6 +71,7 @@ Object.defineProperties(BufferLoader.prototype, {
    *
    * @type {Uint8Array}
    * @readonly
+   * @private
    */
   typedArray: {
     get: function () {
@@ -96,35 +85,41 @@ Object.defineProperties(BufferLoader.prototype, {
  * @returns {Promise<BufferLoader>} A promise which resolves to the loader when the resource loading is completed.
  * @private
  */
-BufferLoader.prototype.load = function () {
+BufferLoader.prototype.load = async function () {
+  if (defined(this._promise)) {
+    return this._promise;
+  }
+
   if (defined(this._typedArray)) {
     this._promise = Promise.resolve(this);
-  } else {
-    this._promise = loadExternalBuffer(this);
+    return this._promise;
   }
+
+  this._promise = loadExternalBuffer(this);
   return this._promise;
 };
 
-function loadExternalBuffer(bufferLoader) {
+async function loadExternalBuffer(bufferLoader) {
   const resource = bufferLoader._resource;
   bufferLoader._state = ResourceLoaderState.LOADING;
-  return BufferLoader._fetchArrayBuffer(resource)
-    .then(function (arrayBuffer) {
-      if (bufferLoader.isDestroyed()) {
-        return;
-      }
-      bufferLoader._typedArray = new Uint8Array(arrayBuffer);
-      bufferLoader._state = ResourceLoaderState.READY;
-      return bufferLoader;
-    })
-    .catch(function (error) {
-      if (bufferLoader.isDestroyed()) {
-        return;
-      }
-      bufferLoader._state = ResourceLoaderState.FAILED;
-      const errorMessage = `Failed to load external buffer: ${resource.url}`;
-      return Promise.reject(bufferLoader.getError(errorMessage, error));
-    });
+  try {
+    const arrayBuffer = await BufferLoader._fetchArrayBuffer(resource);
+    if (bufferLoader.isDestroyed()) {
+      return;
+    }
+
+    bufferLoader._typedArray = new Uint8Array(arrayBuffer);
+    bufferLoader._state = ResourceLoaderState.READY;
+    return bufferLoader;
+  } catch (error) {
+    if (bufferLoader.isDestroyed()) {
+      return;
+    }
+
+    bufferLoader._state = ResourceLoaderState.FAILED;
+    const errorMessage = `Failed to load external buffer: ${resource.url}`;
+    throw bufferLoader.getError(errorMessage, error);
+  }
 }
 
 /**