ohzi-core 12.5.2 → 12.7.0

package/src/loaders/AsyncAbstractLoader.js

@@ -1,160 +1,160 @@
-// @ts-check
-import { ResourceContainer } from '../ResourceContainer';
-
-class AsyncAbstractLoader
-{
-  /**
-   * @param {string} name
-   * @param {any[]} assets
-   * @param {Worker} worker
-   */
-  constructor(name, assets, worker)
-  {
-    this.resource_container = ResourceContainer;
-    this.assets = assets;
-    this.name = name;
-
-    this.worker = worker;
-
-    this.bound_on_message = this.on_message.bind(this);
-
-    this.__setup_worker();
-
-    this.assets_loaders = this.__setup_loaders();
-  }
-
-  load()
-  {
-    this.worker.postMessage({ type: 'load', loader_name: this.name });
-  }
-
-  is_loaded()
-  {
-    for (let i = 0; i < this.assets_loaders.length; i++)
-    {
-      const asset_loader = this.assets_loaders[i];
-
-      if (!asset_loader.has_finished)
-      {
-        return false;
-      }
-      else
-      {
-        if (asset_loader.has_error)
-        {
-          // Restore original url so the error message make more sense
-          asset_loader.url = asset_loader.original_url;
-
-          asset_loader.print_error();
-        }
-      }
-    }
-
-    return true;
-  }
-
-  get_progress()
-  {
-    return this.__get_loaded_bytes() / this.__get_total_bytes();
-  }
-
-  __get_loaded_bytes()
-  {
-    let loaded_bytes = 1;
-
-    for (let i = 0; i < this.assets_loaders.length; i++)
-    {
-      loaded_bytes += this.assets_loaders[i].loaded_bytes;
-    }
-
-    return loaded_bytes;
-  }
-
-  __get_total_bytes()
-  {
-    let total_bytes = 1;
-
-    for (let i = 0; i < this.assets_loaders.length; i++)
-    {
-      total_bytes += this.assets_loaders[i].total_bytes;
-    }
-
-    return total_bytes;
-  }
-
-  get_assets_names()
-  {
-    const names = [];
-
-    for (let i = 0; i < this.assets.length; i++)
-    {
-      const asset = this.assets[i];
-
-      names.push(asset.name);
-    }
-
-    return names;
-  }
-
-  static create_worker()
-  {
-    const worker = new Worker(
-      new URL('./assets_loader/AsyncAssetsLoaderWorker.js', import.meta.url),
-      { name: 'OHZI - AssetLoader', type: 'module' });
-
-    return worker;
-  }
-
-  __setup_worker()
-  {
-    this.worker.addEventListener('message', this.bound_on_message);
-
-    this.worker.postMessage({ type: 'assets', loader_name: this.name, data: this.assets });
-  }
-
-  /**
-   * @param {MessageEvent} e
-   */
-  on_message(e)
-  {
-    const message = e.data;
-
-    switch (message.type)
-    {
-    case `asset_loaded_${this.name}`:
-      this.__on_assets_loaded(message.data);
-      break;
-    }
-  }
-
-  /**
-   * @param {any} resources
-   */
-  __on_assets_loaded(resources)
-  {
-    this.worker.removeEventListener('message', this.bound_on_message);
-
-    for (let i = 0; i < this.assets_loaders.length; i++)
-    {
-      const asset_loader = this.assets_loaders[i];
-
-      // Save original url to show in a possible error
-      asset_loader.original_url = asset_loader.url;
-
-      asset_loader.url = resources[asset_loader.resource_id];
-
-      asset_loader.on_preloaded_finished(this.resource_container);
-    }
-  }
-
-  /**
-   * @returns {any[]}
-   */
-  __setup_loaders()
-  {
-    console.warn('Not implemented');
-    return [];
-  }
-}
-
-export { AsyncAbstractLoader };
+// @ts-check
+import { ResourceContainer } from '../ResourceContainer';
+
+class AsyncAbstractLoader
+{
+  /**
+   * @param {string} name
+   * @param {any[]} assets
+   * @param {Worker} worker
+   */
+  constructor(name, assets, worker)
+  {
+    this.resource_container = ResourceContainer;
+    this.assets = assets;
+    this.name = name;
+
+    this.worker = worker;
+
+    this.bound_on_message = this.on_message.bind(this);
+
+    this.__setup_worker();
+
+    this.assets_loaders = this.__setup_loaders();
+  }
+
+  load()
+  {
+    this.worker.postMessage({ type: 'load', loader_name: this.name });
+  }
+
+  is_loaded()
+  {
+    for (let i = 0; i < this.assets_loaders.length; i++)
+    {
+      const asset_loader = this.assets_loaders[i];
+
+      if (!asset_loader.has_finished)
+      {
+        return false;
+      }
+      else
+      {
+        if (asset_loader.has_error)
+        {
+          // Restore original url so the error message make more sense
+          asset_loader.url = asset_loader.original_url;
+
+          asset_loader.print_error();
+        }
+      }
+    }
+
+    return true;
+  }
+
+  get_progress()
+  {
+    return this.__get_loaded_bytes() / this.__get_total_bytes();
+  }
+
+  __get_loaded_bytes()
+  {
+    let loaded_bytes = 1;
+
+    for (let i = 0; i < this.assets_loaders.length; i++)
+    {
+      loaded_bytes += this.assets_loaders[i].loaded_bytes;
+    }
+
+    return loaded_bytes;
+  }
+
+  __get_total_bytes()
+  {
+    let total_bytes = 1;
+
+    for (let i = 0; i < this.assets_loaders.length; i++)
+    {
+      total_bytes += this.assets_loaders[i].total_bytes;
+    }
+
+    return total_bytes;
+  }
+
+  get_assets_names()
+  {
+    const names = [];
+
+    for (let i = 0; i < this.assets.length; i++)
+    {
+      const asset = this.assets[i];
+
+      names.push(asset.name);
+    }
+
+    return names;
+  }
+
+  static create_worker()
+  {
+    const worker = new Worker(
+      new URL('./assets_loader/AsyncAssetsLoaderWorker.js', import.meta.url),
+      { name: 'OHZI - AssetLoader', type: 'module' });
+
+    return worker;
+  }
+
+  __setup_worker()
+  {
+    this.worker.addEventListener('message', this.bound_on_message);
+
+    this.worker.postMessage({ type: 'assets', loader_name: this.name, data: this.assets });
+  }
+
+  /**
+   * @param {MessageEvent} e
+   */
+  on_message(e)
+  {
+    const message = e.data;
+
+    switch (message.type)
+    {
+    case `asset_loaded_${this.name}`:
+      this.__on_assets_loaded(message.data);
+      break;
+    }
+  }
+
+  /**
+   * @param {any} resources
+   */
+  __on_assets_loaded(resources)
+  {
+    this.worker.removeEventListener('message', this.bound_on_message);
+
+    for (let i = 0; i < this.assets_loaders.length; i++)
+    {
+      const asset_loader = this.assets_loaders[i];
+
+      // Save original url to show in a possible error
+      asset_loader.original_url = asset_loader.url;
+
+      asset_loader.url = resources[asset_loader.resource_id];
+
+      asset_loader.on_preloaded_finished(this.resource_container);
+    }
+  }
+
+  /**
+   * @returns {any[]}
+   */
+  __setup_loaders()
+  {
+    console.warn('Not implemented');
+    return [];
+  }
+}
+
+export { AsyncAbstractLoader };

package/src/loaders/AsyncAudiosLoader.js

@@ -1,34 +1,34 @@
-import { AudioLoader } from '../resource_loader/AudioLoader';
-import { AsyncAbstractLoader } from './AsyncAbstractLoader';
-
-class AsyncAudiosLoader extends AsyncAbstractLoader
-{
-  constructor(scene_name, assets, worker)
-  {
-    super(scene_name, assets, worker);
-  }
-
-  // Called from parent
-  __setup_loaders()
-  {
-    const loaders = [];
-
-    for (let i = 0; i < this.assets.length; i++)
-    {
-      const asset_data = this.assets[i];
-
-      loaders.push(new AudioLoader(
-        asset_data.name,
-        asset_data.url,
-        asset_data.loop,
-        asset_data.volume,
-        asset_data.size,
-        asset_data.positional
-      ));
-    }
-
-    return loaders;
-  }
-}
-
-export { AsyncAudiosLoader };
+import { AudioLoader } from '../resource_loader/AudioLoader';
+import { AsyncAbstractLoader } from './AsyncAbstractLoader';
+
+class AsyncAudiosLoader extends AsyncAbstractLoader
+{
+  constructor(scene_name, assets, worker)
+  {
+    super(scene_name, assets, worker);
+  }
+
+  // Called from parent
+  __setup_loaders()
+  {
+    const loaders = [];
+
+    for (let i = 0; i < this.assets.length; i++)
+    {
+      const asset_data = this.assets[i];
+
+      loaders.push(new AudioLoader(
+        asset_data.name,
+        asset_data.url,
+        asset_data.loop,
+        asset_data.volume,
+        asset_data.size,
+        asset_data.positional
+      ));
+    }
+
+    return loaders;
+  }
+}
+
+export { AsyncAudiosLoader };

package/src/loaders/AsyncObjectsLoader.js

@@ -1,44 +1,44 @@
-// @ts-check
-import { GLTFDRACOLoader } from '../resource_loader/GLTFDRACOLoader';
-import { GLTFLoader } from '../resource_loader/GLTFLoader';
-import { ResourceContainer } from '../ResourceContainer';
-import { AsyncAbstractLoader } from './AsyncAbstractLoader';
-
-class AsyncObjectsLoader extends AsyncAbstractLoader
-{
-  /**
-   * @param {string} scene_name
-   * @param {any[]} assets
-   * @param {Worker} worker
-   */
-  constructor(scene_name, assets, worker)
-  {
-    super(scene_name, assets, worker);
-  }
-
-  // Called from parent
-  __setup_loaders()
-  {
-    const loaders = [];
-
-    for (let i = 0; i < this.assets.length; i++)
-    {
-      const asset_data = this.assets[i];
-
-      if (asset_data.draco)
-      {
-        const draco_loader = ResourceContainer.get('draco_loader');
-
-        loaders.push(new GLTFDRACOLoader(asset_data.name, asset_data.url, draco_loader, asset_data.size));
-      }
-      else
-      {
-        loaders.push(new GLTFLoader(asset_data.name, asset_data.url, asset_data.size));
-      }
-    }
-
-    return loaders;
-  }
-}
-
-export { AsyncObjectsLoader };
+// @ts-check
+import { GLTFDRACOLoader } from '../resource_loader/GLTFDRACOLoader';
+import { GLTFLoader } from '../resource_loader/GLTFLoader';
+import { ResourceContainer } from '../ResourceContainer';
+import { AsyncAbstractLoader } from './AsyncAbstractLoader';
+
+class AsyncObjectsLoader extends AsyncAbstractLoader
+{
+  /**
+   * @param {string} scene_name
+   * @param {any[]} assets
+   * @param {Worker} worker
+   */
+  constructor(scene_name, assets, worker)
+  {
+    super(scene_name, assets, worker);
+  }
+
+  // Called from parent
+  __setup_loaders()
+  {
+    const loaders = [];
+
+    for (let i = 0; i < this.assets.length; i++)
+    {
+      const asset_data = this.assets[i];
+
+      if (asset_data.draco)
+      {
+        const draco_loader = ResourceContainer.get('draco_loader');
+
+        loaders.push(new GLTFDRACOLoader(asset_data.name, asset_data.url, draco_loader, asset_data.size));
+      }
+      else
+      {
+        loaders.push(new GLTFLoader(asset_data.name, asset_data.url, asset_data.size));
+      }
+    }
+
+    return loaders;
+  }
+}
+
+export { AsyncObjectsLoader };

package/src/loaders/AsyncTexturesLoader.js

@@ -1,70 +1,81 @@
-
-import { AsyncTextureLoader } from '../resource_loader/AsyncTextureLoader';
-import { BasisLoader } from '../resource_loader/BasisLoader';
-import { CubemapLoader } from '../resource_loader/CubemapLoader';
-import { RGBETextureLoader } from '../resource_loader/RGBETextureLoader';
-import { ResourceContainer } from '../ResourceContainer';
-import { AsyncAbstractLoader } from './AsyncAbstractLoader';
-
-class AsyncTexturesLoader extends AsyncAbstractLoader
-{
-  constructor(scene_name, assets, worker)
-  {
-    super(scene_name, assets, worker);
-  }
-
-  // Called from parent
-  __setup_loaders()
-  {
-    const loaders = [];
-
-    for (let i = 0; i < this.assets.length; i++)
-    {
-      const asset_data = this.assets[i];
-
-      switch (asset_data.kind)
-      {
-      case 'regular':
-        loaders.push(new AsyncTextureLoader(
-          asset_data.name,
-          asset_data.url,
-          asset_data.size
-        ));
-
-        break;
-      case 'basis':
-        loaders.push(new BasisLoader(
-          asset_data.name,
-          asset_data.url,
-          ResourceContainer.get('basis_loader'),
-          asset_data.size
-        ));
-
-        break;
-      case 'hdr':
-        loaders.push(new RGBETextureLoader(
-          asset_data.name,
-          asset_data.url,
-          asset_data.size
-        ));
-
-        break;
-      case 'cubemap':
-        loaders.push(new CubemapLoader(
-          asset_data.name,
-          asset_data.url,
-          asset_data.extension,
-          asset_data.size
-        ));
-
-        break;
-      default:
-        break;
-      }
-    }
-
-    return loaders;
-  }
-}
-
-export { AsyncTexturesLoader };
+import { AsyncTextureLoader } from '../resource_loader/AsyncTextureLoader';
+import { BasisLoader } from '../resource_loader/BasisLoader';
+import { CubemapLoader } from '../resource_loader/CubemapLoader';
+import { HDRCubeTextureLoader } from '../resource_loader/HDRCubeTextureLoader';
+import { RGBETextureLoader } from '../resource_loader/RGBETextureLoader';
+import { ResourceContainer } from '../ResourceContainer';
+import { AsyncAbstractLoader } from './AsyncAbstractLoader';
+
+class AsyncTexturesLoader extends AsyncAbstractLoader
+{
+  constructor(scene_name, assets, worker)
+  {
+    super(scene_name, assets, worker);
+  }
+
+  // Called from parent
+  __setup_loaders()
+  {
+    const loaders = [];
+
+    for (let i = 0; i < this.assets.length; i++)
+    {
+      const asset_data = this.assets[i];
+
+      switch (asset_data.kind)
+      {
+      case 'regular':
+        loaders.push(new AsyncTextureLoader(
+          asset_data.name,
+          asset_data.url,
+          asset_data.size,
+          asset_data.flipY,
+          asset_data.premultiplyAlpha,
+          asset_data.colorSpaceConversion
+        ));
+
+        break;
+      case 'basis':
+        loaders.push(new BasisLoader(
+          asset_data.name,
+          asset_data.url,
+          ResourceContainer.get('basis_loader'),
+          asset_data.size
+        ));
+
+        break;
+      case 'hdr':
+        loaders.push(new RGBETextureLoader(
+          asset_data.name,
+          asset_data.url,
+          asset_data.size
+        ));
+
+        break;
+      case 'cubemap':
+        loaders.push(new CubemapLoader(
+          asset_data.name,
+          asset_data.url,
+          asset_data.extension,
+          asset_data.size
+        ));
+        break;
+      case 'cubemap_hdr':
+        loaders.push(new HDRCubeTextureLoader(
+          asset_data.name,
+          asset_data.url,
+          asset_data.extension,
+          asset_data.size
+        ));
+
+        break;
+      default:
+        break;
+      }
+    }
+
+    return loaders;
+  }
+}
+
+export { AsyncTexturesLoader };