@cesium/engine 22.3.0 → 23.0.0

package/Source/Scene/GltfSpzLoader.js

@@ -10,61 +10,57 @@ import { loadSpz } from "@spz-loader/core";
  * <p>
  * Implements the {@link ResourceLoader} interface.
  * </p>
- * @alias GltfSpzLoader
- * @constructor
- * @augments ResourceLoader
- * @param {object} options Object with the following properties:
- * @param {ResourceCache} options.resourceCache The {@link ResourceCache} (to avoid circular dependencies).
- * @param {object} options.gltf The glTF JSON.
- * @param {object} options.primitive The primitive containing the SPZ extension.
- * @param {object} options.spz The SPZ 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.
- * @param {string} [options.cacheKey] The cache key of the resource.
  *
  * @private
  */
-function GltfSpzLoader(options) {
-  options = options ?? Frozen.EMPTY_OBJECT;
-  const resourceCache = options.resourceCache;
-  const gltf = options.gltf;
-  const primitive = options.primitive;
-  const spz = options.spz;
-  const gltfResource = options.gltfResource;
-  const baseResource = options.baseResource;
-  const cacheKey = options.cacheKey;
-
-  //>>includeStart('debug', pragmas.debug);
-  Check.typeOf.func("options.resourceCache", resourceCache);
-  Check.typeOf.object("options.gltf", gltf);
-  Check.typeOf.object("options.primitive", primitive);
-  Check.typeOf.object("options.spz", spz);
-  Check.typeOf.object("options.gltfResource", gltfResource);
-  Check.typeOf.object("options.baseResource", baseResource);
-  //>>includeEnd('debug');
-
-  this._resourceCache = resourceCache;
-  this._gltfResource = gltfResource;
-  this._baseResource = baseResource;
-  this._gltf = gltf;
-  this._primitive = primitive;
-  this._spz = spz;
-  this._cacheKey = cacheKey;
-  this._bufferViewLoader = undefined;
-  this._bufferViewTypedArray = undefined;
-  this._decodePromise = undefined;
-  this._decodedData = undefined;
-  this._state = ResourceLoaderState.UNLOADED;
-  this._promise = undefined;
-  this._spzError = undefined;
-}
-
-if (defined(Object.create)) {
-  GltfSpzLoader.prototype = Object.create(ResourceLoader.prototype);
-  GltfSpzLoader.prototype.constructor = GltfSpzLoader;
-}
+class GltfSpzLoader extends ResourceLoader {
+  /**
+   * @param {object} options Object with the following properties:
+   * @param {ResourceCache} options.resourceCache The {@link ResourceCache} (to avoid circular dependencies).
+   * @param {object} options.gltf The glTF JSON.
+   * @param {object} options.primitive The primitive containing the SPZ extension.
+   * @param {object} options.spz The SPZ 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.
+   * @param {string} [options.cacheKey] The cache key of the resource.
+   */
+  constructor(options) {
+    super();
+
+    options = options ?? Frozen.EMPTY_OBJECT;
+    const resourceCache = options.resourceCache;
+    const gltf = options.gltf;
+    const primitive = options.primitive;
+    const spz = options.spz;
+    const gltfResource = options.gltfResource;
+    const baseResource = options.baseResource;
+    const cacheKey = options.cacheKey;
+
+    //>>includeStart('debug', pragmas.debug);
+    Check.typeOf.func("options.resourceCache", resourceCache);
+    Check.typeOf.object("options.gltf", gltf);
+    Check.typeOf.object("options.primitive", primitive);
+    Check.typeOf.object("options.spz", spz);
+    Check.typeOf.object("options.gltfResource", gltfResource);
+    Check.typeOf.object("options.baseResource", baseResource);
+    //>>includeEnd('debug');
+
+    this._resourceCache = resourceCache;
+    this._gltfResource = gltfResource;
+    this._baseResource = baseResource;
+    this._gltf = gltf;
+    this._primitive = primitive;
+    this._spz = spz;
+    this._cacheKey = cacheKey;
+    this._bufferViewLoader = undefined;
+    this._bufferViewTypedArray = undefined;
+    this._decodePromise = undefined;
+    this._decodedData = undefined;
+    this._state = ResourceLoaderState.UNLOADED;
+    this._promise = undefined;
+    this._spzError = undefined;
+  }
 
-Object.defineProperties(GltfSpzLoader.prototype, {
   /**
    * The cache key of the resource.
    * @memberof GltfSpzLoader.prototype
@@ -72,11 +68,10 @@ Object.defineProperties(GltfSpzLoader.prototype, {
    * @readonly
    * @private
    */
-  cacheKey: {
-    get: function () {
-      return this._cacheKey;
-    },
-  },
+  get cacheKey() {
+    return this._cacheKey;
+  }
+
   /**
    * The decoded SPZ data.
    * @memberof GltfSpzLoader.prototype
@@ -84,12 +79,82 @@ Object.defineProperties(GltfSpzLoader.prototype, {
    * @readonly
    * @private
    */
-  decodedData: {
-    get: function () {
-      return this._decodedData;
-    },
-  },
-});
+  get decodedData() {
+    return this._decodedData;
+  }
+
+  /**
+   * Loads the SPZ resource.
+   * @returns {Promise<Resource>} A promise that resolves to the resource when the SPZ is loaded.
+   * @private
+   */
+  async load() {
+    if (defined(this._promise)) {
+      return this._promise;
+    }
+
+    this._state = ResourceLoaderState.LOADING;
+    this._promise = loadResources(this);
+    return this._promise;
+  }
+
+  /**
+   * Processes the SPZ resource.
+   * @param {FrameState} frameState The frame state.
+   * @private
+   */
+  process(frameState) {
+    //>>includeStart('debug', pragmas.debug);
+    Check.typeOf.object("frameState", frameState);
+    //>>includeEnd('debug');
+
+    if (this._state === ResourceLoaderState.READY) {
+      return true;
+    }
+
+    if (this._state !== ResourceLoaderState.PROCESSING) {
+      return false;
+    }
+
+    if (defined(this._spzError)) {
+      handleError(this, this._spzError);
+    }
+
+    if (!defined(this._bufferViewTypedArray)) {
+      return false;
+    }
+
+    if (defined(this._decodePromise)) {
+      return false;
+    }
+
+    const decodePromise = loadSpz(this._bufferViewTypedArray, {
+      unpackOptions: { coordinateSystem: "UNSPECIFIED" },
+    });
+
+    if (!defined(decodePromise)) {
+      return false;
+    }
+
+    this._decodePromise = processDecode(this, decodePromise);
+  }
+
+  /**
+   * Unloads the SPZ resource and frees associated resources.
+   * @private
+   */
+  unload() {
+    if (defined(this._bufferViewLoader)) {
+      this._resourceCache.unload(this._bufferViewLoader);
+    }
+
+    this._bufferViewLoader = undefined;
+    this._bufferViewTypedArray = undefined;
+    this._decodedData = undefined;
+    this._gltf = undefined;
+    this._primitive = undefined;
+  }
+}
 
 async function loadResources(loader) {
   const resourceCache = loader._resourceCache;
@@ -119,21 +184,6 @@ async function loadResources(loader) {
   }
 }
 
-/**
- * Loads the SPZ resource.
- * @returns {Promise<Resource>} A promise that resolves to the resource when the SPZ is loaded.
- * @private
- */
-GltfSpzLoader.prototype.load = async function () {
-  if (defined(this._promise)) {
-    return this._promise;
-  }
-
-  this._state = ResourceLoaderState.LOADING;
-  this._promise = loadResources(this);
-  return this._promise;
-};
-
 function handleError(spzLoader, error) {
   spzLoader.unload();
   spzLoader._state = ResourceLoaderState.FAILED;
@@ -164,61 +214,4 @@ async function processDecode(loader, decodePromise) {
   }
 }
 
-/**
- * Processes the SPZ resource.
- * @param {FrameState} frameState The frame state.
- * @private
- */
-GltfSpzLoader.prototype.process = function (frameState) {
-  //>>includeStart('debug', pragmas.debug);
-  Check.typeOf.object("frameState", frameState);
-  //>>includeEnd('debug');
-
-  if (this._state === ResourceLoaderState.READY) {
-    return true;
-  }
-
-  if (this._state !== ResourceLoaderState.PROCESSING) {
-    return false;
-  }
-
-  if (defined(this._spzError)) {
-    handleError(this, this._spzError);
-  }
-
-  if (!defined(this._bufferViewTypedArray)) {
-    return false;
-  }
-
-  if (defined(this._decodePromise)) {
-    return false;
-  }
-
-  const decodePromise = loadSpz(this._bufferViewTypedArray, {
-    unpackOptions: { coordinateSystem: "UNSPECIFIED" },
-  });
-
-  if (!defined(decodePromise)) {
-    return false;
-  }
-
-  this._decodePromise = processDecode(this, decodePromise);
-};
-
-/**
- * Unloads the SPZ resource and frees associated resources.
- * @private
- */
-GltfSpzLoader.prototype.unload = function () {
-  if (defined(this._bufferViewLoader)) {
-    this._resourceCache.unload(this._bufferViewLoader);
-  }
-
-  this._bufferViewLoader = undefined;
-  this._bufferViewTypedArray = undefined;
-  this._decodedData = undefined;
-  this._gltf = undefined;
-  this._primitive = undefined;
-};
-
 export default GltfSpzLoader;