entangled-worlds-orbiters-shared 2.9.0 → 2.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "entangled-worlds-orbiters-shared",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "description": "Shared library for entangled worlds orbiters - contains core world rendering, moons system, and UI components",
   "type": "module",
   "main": "src/index.js",

package/src/loaders/cubeMapLoader.js

@@ -56,25 +56,47 @@ function detectExtension(faceKeys) {
   return 'ktx2'; // default assumption
 }
 
+// How many faces may be in flight at once. Not six: the KTX2 worker pool three.js gives us holds
+// four transcoder workers, each carrying its own copy of the basis wasm, and that same pool also
+// serves body textures and GLBs. Asking for all six together spawned every worker and queued the
+// other loaders behind the whole sky; measured on cold fetches it was no faster than three.
+const FACES_IN_FLIGHT = 3;
+
 // Load KTX2 faces and create skybox mesh
 async function loadFacesKTX2(faceKeys, renderer) {
   const loader = getKTX2LoaderForRenderer(renderer);
+  const anisotropy = Math.min(8, renderer.capabilities.getMaxAnisotropy());
+
+  const loadFace = async face => {
+    const tex = await loader.loadAsync(faceKeys[face]);
+    tex.flipY = false;
+    tex.wrapS = THREE.ClampToEdgeWrapping;
+    tex.wrapT = THREE.ClampToEdgeWrapping;
+    tex.anisotropy = anisotropy;
+    return { face, tex };
+  };
+
+  // Faces overlap instead of chaining. Awaiting each one in turn made every face wait on the
+  // previous face's download *and* its transcode, so the sky arrived six round trips deep.
+  const settled = [];
+  for (let i = 0; i < FACE_ORDER.length; i += FACES_IN_FLIGHT) {
+    const wave = FACE_ORDER.slice(i, i + FACES_IN_FLIGHT).map(face => loadFace(face));
+    settled.push(...await Promise.allSettled(wave));
+  }
+
+  // allSettled, not all: a bare Promise.all rejects on the first failure and leaks the faces that
+  // land after it. Settle every face first, then dispose everything that arrived before rethrowing.
   const loaded = [];
-  
-  for (const face of FACE_ORDER) {
-    const url = faceKeys[face];
-    try {
-      const tex = await loader.loadAsync(url);
-      tex.flipY = false;
-      tex.wrapS = THREE.ClampToEdgeWrapping;
-      tex.wrapT = THREE.ClampToEdgeWrapping;
-      tex.anisotropy = Math.min(8, renderer.capabilities.getMaxAnisotropy());
-      loaded.push({ face, tex });
-    } catch (e) {
-      // Dispose already loaded textures on failure
-      loaded.forEach(f => f.tex.dispose?.());
-      throw e;
-    }
+  let failure = null;
+  for (const result of settled) {
+    if (result.status === 'fulfilled') loaded.push(result.value);
+    else if (!failure) failure = result.reason;
+  }
+
+  if (failure) {
+    // Dispose already loaded textures on failure
+    loaded.forEach(f => f.tex.dispose?.());
+    throw failure;
   }
   
   const size = 500;