refactor: use Three.LoadingManager to load assets (#78)

* refactor: use Three.LoadingManager to load assets

* chore: stage window case folder name

* chore: rename asset_bis to asset

* ci: rename engine CI

Author: fraxken

.github/workflows/workspace-engine.yml

@@ -1,4 +1,4 @@
-name: Mutex CI
+name: Engine CI
 
 on:
   push:

packages/engine/src/systems/GameInstance.ts

@@ -4,7 +4,7 @@ import * as THREE from "three";
 // Import Internal Dependencies
 import {
   type GameRenderer
-} from "./renderers/index.js";
+} from "./rendering/index.js";
 import {
   type Scene
 } from "./Scene.js";
@@ -26,7 +26,6 @@ import {
 export interface GameInstanceOptions {
   enableOnExit?: boolean;
 
-  loadingManager?: THREE.LoadingManager;
   scene: Scene;
   input?: Input;
   scheduler?: FixedTimeStep;
@@ -40,7 +39,7 @@ export interface GameInstanceOptions {
 export class GameInstance<T = THREE.WebGLRenderer> {
   renderer: GameRenderer<T>;
   input: Input;
-  loadingManager: THREE.LoadingManager;
+  loadingManager: THREE.LoadingManager = new THREE.LoadingManager();
   scheduler: FixedTimeStep;
   scene: Scene;
   audio: GlobalAudio;
@@ -55,7 +54,6 @@ export class GameInstance<T = THREE.WebGLRenderer> {
     options: GameInstanceOptions
   ) {
     const {
-      loadingManager = new THREE.LoadingManager(),
       scene,
       input = new Input(renderer.canvas, { enableOnExit: options.enableOnExit ?? false }),
       scheduler = new FixedTimeStep(options.clock),
@@ -64,7 +62,6 @@ export class GameInstance<T = THREE.WebGLRenderer> {
       globalsAdapter = new BrowserGlobalsAdapter()
     } = options;
 
-    this.loadingManager = loadingManager;
     this.renderer = renderer as unknown as GameRenderer<T>;
     this.scene = scene;
     this.input = input;
@@ -75,6 +72,14 @@ export class GameInstance<T = THREE.WebGLRenderer> {
     globalsAdapter.setGame(this);
   }
 
+  setLoadingManager(
+    manager: THREE.LoadingManager
+  ) {
+    this.loadingManager = manager;
+
+    return this;
+  }
+
   connect() {
     this.input.connect();
     this.#windowAdapter.addEventListener("resize", this.renderer.resize);

packages/engine/src/systems/Asset/Base.ts packages/engine/src/systems/asset/Base.tspackages/engine/src/systems/Asset/Base.ts renamed to packages/engine/src/systems/asset/Base.ts

@@ -18,8 +18,7 @@ export type AssetOnProgressCallback = (
 ) => void;
 
 export interface LoadAssetsOptions {
-  onLoad?: (asset: Asset) => void;
-  onProgress?: AssetOnProgressCallback;
+  onStart?: (asset: Asset) => void;
 }
 
 export class AssetManager {
@@ -89,20 +88,22 @@ export class AssetManager {
     if (assets.length === 0) {
       return;
     }
-    const max = assets.length;
-    const { onProgress, onLoad } = options;
 
-    for (let index = 0; index < max; index++) {
-      const asset = assets[index];
+    const { onStart } = options;
+
+    const loadAsset = async(asset: Asset): Promise<void> => {
       const loader = this.registry.getLoaderForType(asset.type);
       if (!loader) {
         throw new Error(`No loader registered for asset type: ${asset.type}`);
       }
 
-      onLoad?.(asset);
+      onStart?.(asset);
+
       const result = await loader(asset, context);
-      onProgress?.(index + 1, max);
       this.assets.set(asset.id, result);
-    }
+    };
+
+    const loadingPromises = assets.map((asset) => loadAsset(asset));
+    await Promise.all(loadingPromises);
   }
 }

…ages/engine/src/systems/Asset/Manager.ts …ages/engine/src/systems/asset/Manager.tspackages/engine/src/systems/Asset/Manager.ts renamed to packages/engine/src/systems/asset/Manager.ts packages/engine/src/systems/Asset/Manager.ts renamed to packages/engine/src/systems/asset/Manager.ts

@@ -12,7 +12,7 @@ export type {
 } from "./asset/Registry.js";
 
 export * from "./GameInstance.js";
-export * from "./renderers/index.js";
+export * from "./rendering/index.js";
 export * from "./Scene.js";
 
 export type {