entangled-worlds-orbiters-shared 2.8.0 → 2.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "entangled-worlds-orbiters-shared",
-  "version": "2.8.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/public/config/textures.json

@@ -11,6 +11,7 @@
         {
           "id": "water-drops",
           "filename": "18-water-drops.ktx2",
+          "still": "thumbs/18-water-drops.jpg",
           "label": "Water Drops",
           "description": "Atmospheric water droplets",
           "tags": ["atmospheric", "water", "natural"]
@@ -18,6 +19,7 @@
         {
           "id": "scream-1",
           "filename": "17-scream.ktx2",
+          "still": "thumbs/17-scream.jpg",
           "label": "Scream",
           "description": "Abstract screaming patterns",
           "tags": ["abstract", "artistic"]
@@ -25,6 +27,7 @@
         {
           "id": "scream-2",
           "filename": "16-scream.ktx2",
+          "still": "thumbs/16-scream.jpg",
           "label": "Scream Alt",
           "description": "Alternative screaming patterns",
           "tags": ["abstract", "artistic"]
@@ -32,6 +35,7 @@
         {
           "id": "neon-lights-1",
           "filename": "15-neon-lights.ktx2",
+          "still": "thumbs/15-neon-lights.jpg",
           "label": "Neon Lights",
           "description": "Electric neon lighting effects",
           "tags": ["electric", "urban", "artificial"]
@@ -39,6 +43,7 @@
         {
           "id": "neon-lights-2",
           "filename": "14-neon-lights.ktx2",
+          "still": "thumbs/14-neon-lights.jpg",
           "label": "Neon Lights Alt",
           "description": "Alternative neon lighting",
           "tags": ["electric", "urban", "artificial"]
@@ -46,6 +51,7 @@
         {
           "id": "neon-lights-3",
           "filename": "13-neon-lights.ktx2",
+          "still": "thumbs/13-neon-lights.jpg",
           "label": "Neon Lights Pro",
           "description": "Professional neon effects",
           "tags": ["electric", "urban", "artificial"]
@@ -53,6 +59,7 @@
         {
           "id": "marble-1",
           "filename": "12-marble.ktx2",
+          "still": "thumbs/12-marble.jpg",
           "label": "Marble",
           "description": "Natural marble patterns",
           "tags": ["stone", "natural", "elegant"]
@@ -60,6 +67,7 @@
         {
           "id": "marble-2",
           "filename": "11-marble.ktx2",
+          "still": "thumbs/11-marble.jpg",
           "label": "Marble Alt",
           "description": "Alternative marble texture",
           "tags": ["stone", "natural", "elegant"]
@@ -67,6 +75,7 @@
         {
           "id": "isolines-1",
           "filename": "10-isolines.ktx2",
+          "still": "thumbs/10-isolines.jpg",
           "label": "Isolines",
           "description": "Topographic isolines",
           "tags": ["geometric", "lines", "technical"]
@@ -74,6 +83,7 @@
         {
           "id": "isolines-2",
           "filename": "09-isolines.ktx2",
+          "still": "thumbs/09-isolines.jpg",
           "label": "Isolines Alt",
           "description": "Alternative isolines pattern",
           "tags": ["geometric", "lines", "technical"]
@@ -81,6 +91,7 @@
         {
           "id": "fordite-1",
           "filename": "08-fordite.ktx2",
+          "still": "thumbs/08-fordite.jpg",
           "label": "Fordite",
           "description": "Industrial fordite patterns",
           "tags": ["industrial", "layered", "colorful"]
@@ -88,6 +99,7 @@
         {
           "id": "fordite-2",
           "filename": "07-fordite.ktx2",
+          "still": "thumbs/07-fordite.jpg",
           "label": "Fordite Alt",
           "description": "Alternative fordite texture",
           "tags": ["industrial", "layered", "colorful"]
@@ -95,6 +107,7 @@
         {
           "id": "entangled-1",
           "filename": "06-entangled.ktx2",
+          "still": "thumbs/06-entangled.jpg",
           "label": "Entangled",
           "description": "Quantum entangled patterns",
           "tags": ["quantum", "abstract", "complex"]
@@ -102,6 +115,7 @@
         {
           "id": "entangled-2",
           "filename": "05-entangled.ktx2",
+          "still": "thumbs/05-entangled.jpg",
           "label": "Entangled Alt",
           "description": "Alternative entangled patterns",
           "tags": ["quantum", "abstract", "complex"]
@@ -109,6 +123,7 @@
         {
           "id": "clouds-1",
           "filename": "04-clouds.ktx2",
+          "still": "thumbs/04-clouds.jpg",
           "label": "Clouds",
           "description": "Natural cloud formations",
           "tags": ["natural", "atmospheric", "default"]
@@ -116,6 +131,7 @@
         {
           "id": "clouds-2",
           "filename": "03-clouds.ktx2",
+          "still": "thumbs/03-clouds.jpg",
           "label": "Clouds Alt",
           "description": "Alternative cloud patterns",
           "tags": ["natural", "atmospheric"]
@@ -123,6 +139,7 @@
         {
           "id": "cave-art-1",
           "filename": "02-cave-art.ktx2",
+          "still": "thumbs/02-cave-art.jpg",
           "label": "Cave Art",
           "description": "Ancient cave paintings",
           "tags": ["ancient", "artistic", "historic"]
@@ -130,6 +147,7 @@
         {
           "id": "cave-art-2",
           "filename": "01-cave-art.ktx2",
+          "still": "thumbs/01-cave-art.jpg",
           "label": "Cave Art Alt",
           "description": "Alternative cave art patterns",
           "tags": ["ancient", "artistic", "historic"]
@@ -144,14 +162,16 @@
         {
           "id": "electric-moon",
           "filename": "moon-equirectangular.ktx2",
+          "still": "thumbs/moon-equirectangular.jpg",
           "label": "Electric Moon",
           "description": "Standard lunar surface texture",
           "tags": ["lunar", "realistic", "default"],
-          "fallback": "moon-equirectangular.jpg"
+          "fallback": "moon-equirectangular.png"
         },
         {
           "id": "earth-moon",
           "filename": "2k_moon.ktx2",
+          "still": "thumbs/2k_moon.jpg",
           "label": "Earth Moon",
           "description": "Realistic Earth satellite texture",
           "tags": ["lunar", "earth", "satellite"],
@@ -160,6 +180,7 @@
         {
           "id": "crater-lines",
           "filename": "crater-lines.ktx2",
+          "still": "thumbs/crater-lines.jpg",
           "label": "Crater Lines",
           "description": "Linear crater formations across the lunar surface",
           "tags": ["craters", "lunar", "pattern"],
@@ -168,6 +189,7 @@
         {
           "id": "moon-dust",
           "filename": "moon-dust.ktx2",
+          "still": "thumbs/moon-dust.jpg",
           "label": "Moon Dust",
           "description": "Fine dust texture inspired by lunar regolith",
           "tags": ["dust", "surface", "regolith"],
@@ -176,6 +198,7 @@
         {
           "id": "lunar-scepter",
           "filename": "lunar-scepter.ktx2",
+          "still": "thumbs/lunar-scepter.jpg",
           "label": "Lunar Scepter",
           "description": "Sharp, vertical ridge texture reminiscent of lunar highlands",
           "tags": ["ridges", "highlands", "lunar"],
@@ -184,6 +207,7 @@
         {
           "id": "satin-moon",
           "filename": "satin-moon.ktx2",
+          "still": "thumbs/satin-moon.jpg",
           "label": "Satin Moon",
           "description": "Smooth satin-like lunar surface",
           "tags": ["smooth", "lunar", "texture"],
@@ -192,6 +216,7 @@
         {
           "id": "impact-craters",
           "filename": "impact-craters.ktx2",
+          "still": "thumbs/impact-craters.jpg",
           "label": "Impact Craters",
           "description": "Dense field of lunar craters",
           "tags": ["craters", "impact", "texture"],
@@ -200,6 +225,7 @@
         {
           "id": "eclipse-dots",
           "filename": "eclipse-dots.ktx2",
+          "still": "thumbs/eclipse-dots.jpg",
           "label": "Eclipse Dots",
           "description": "Pattern of scattered dots inspired by lunar eclipses",
           "tags": ["dots", "eclipse", "pattern"],
@@ -208,6 +234,7 @@
         {
           "id": "shadow-dots",
           "filename": "shadow-dots.ktx2",
+          "still": "thumbs/shadow-dots.jpg",
           "label": "Shadow Dots",
           "description": "Dot textures evoking shadows over the lunar surface",
           "tags": ["dots", "shadows", "surface"],
@@ -216,6 +243,7 @@
         {
           "id": "moonrise",
           "filename": "moonrise.ktx2",
+          "still": "thumbs/moonrise.jpg",
           "label": "Moonrise",
           "description": "Atmospheric gradient evoking moonrise",
           "tags": ["moonrise", "gradient", "lunar"],
@@ -224,6 +252,7 @@
         {
           "id": "midnight-moon",
           "filename": "midnight-moon.ktx2",
+          "still": "thumbs/midnight-moon.jpg",
           "label": "Midnight Moon",
           "description": "Dark-toned lunar surface texture",
           "tags": ["midnight", "dark", "lunar"],
@@ -232,6 +261,7 @@
         {
           "id": "pale-orbit",
           "filename": "pale-orbit.ktx2",
+          "still": "thumbs/pale-orbit.jpg",
           "label": "Pale Orbit",
           "description": "Light lunar surface with subtle orbital tones",
           "tags": ["orbit", "pale", "surface"],
@@ -240,6 +270,7 @@
         {
           "id": "tidal-glow",
           "filename": "tidal-glow.ktx2",
+          "still": "thumbs/tidal-glow.jpg",
           "label": "Tidal Glow",
           "description": "Soft glowing lunar texture reflecting tidal pull",
           "tags": ["glow", "tidal", "lunar"],
@@ -248,6 +279,7 @@
         {
           "id": "silver-glow",
           "filename": "silver-glow.ktx2",
+          "still": "thumbs/silver-glow.jpg",
           "label": "Silver Glow",
           "description": "Bright silver surface with reflective highlights",
           "tags": ["silver", "glow", "lunar"],

package/src/config/index.js

@@ -1,8 +1,9 @@
 // Configuration exports
 export { 
-  loadTextureConfig, 
-  getTextureOptions, 
-  getDefaultTexture, 
+  loadTextureConfig,
+  getTextureOptions,
+  getTextureChoices,
+  getDefaultTexture,
   getSkyboxOptions, 
   getDefaultSkybox,
   getTextureFallbackUrl

package/src/config/textureConfig.js

@@ -91,33 +91,59 @@ export async function loadTextureConfig(configUrl = null, useCache = true) {
 }
 
 /**
- * Get texture options for a specific category (clouds, moons, etc.)
- * @param {string} category - Texture category (clouds, moons, skyboxes)
+ * @typedef {Object} TextureChoice
+ * @property {string} id      Catalogue id.
+ * @property {string} label   Human-readable name.
+ * @property {string} url     Resolved texture URL (the .ktx2 the world renders).
+ * @property {string|null} still  Resolved URL of the item's picture — a small thumbnail suitable
+ *   for showing the texture in a picker. `null` when the catalogue names none.
+ *
+ * Every catalogue item IS a picture, so a chooser should show it rather than its name. `still` is
+ * read straight from the catalogue and never derived from `filename`: the stills do not share one
+ * extension, and a wrong guess fails silently (a broken `<img>` just shows nothing).
+ */
+
+/**
+ * Get the full choice records for a category (clouds, moons, etc.) — label, texture URL, and the
+ * picture to show for it. The single resolution point for a category's items; `getTextureOptions`
+ * is the flat `{ label: url }` projection of this.
+ * @param {string} category - Texture category (clouds, moons)
  * @param {Object} config - Optional pre-loaded config object
- * @returns {Promise<Object>} Options object suitable for dropdown option lists
+ * @returns {Promise<TextureChoice[]>} Choice records in catalogue order
  */
-export async function getTextureOptions(category, config = null) {
+export async function getTextureChoices(category, config = null) {
   const textureConfig = config || await loadTextureConfig();
   const categoryConfig = textureConfig.textures[category];
-  
+
   if (!categoryConfig) {
     console.warn(`[TextureConfig] Category '${category}' not found`);
-    return {};
+    return [];
   }
 
-  const options = {};
   const baseUrl = textureConfig.baseUrl || '/default';
   const categoryPath = categoryConfig.basePath || `/${category}`;
 
-  categoryConfig.items.forEach(item => {
-    const key = item.label || item.id;
-    const resolved = buildTextureUrl(baseUrl, categoryPath, item.filename || item.id);
-    if (resolved) {
-      options[key] = resolved;
-    }
+  return (categoryConfig.items || []).flatMap(item => {
+    const url = buildTextureUrl(baseUrl, categoryPath, item.filename || item.id);
+    if (!url) return [];
+    return [{
+      id: item.id,
+      label: item.label || item.id,
+      url,
+      still: item.still ? buildTextureUrl(baseUrl, categoryPath, item.still) : null,
+    }];
   });
+}
 
-  return options;
+/**
+ * Get texture options for a specific category (clouds, moons, etc.)
+ * @param {string} category - Texture category (clouds, moons, skyboxes)
+ * @param {Object} config - Optional pre-loaded config object
+ * @returns {Promise<Object>} Options object suitable for dropdown option lists
+ */
+export async function getTextureOptions(category, config = null) {
+  const choices = await getTextureChoices(category, config);
+  return Object.fromEntries(choices.map(c => [c.label, c.url]));
 }
 
 /**

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;