entangled-worlds-orbiters-shared 1.0.5 → 1.0.7

package/package.json

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

package/src/config/index.js

@@ -4,7 +4,8 @@ export {
   getTextureOptions, 
   getDefaultTexture, 
   getSkyboxOptions, 
-  getDefaultSkybox 
+  getDefaultSkybox,
+  getTextureFallbackUrl
 } from './textureConfig.js';
 
 // runtime base helpers
@@ -12,4 +13,4 @@ export {
   setPublicBase,
   getPublicBase,
   resolvePublicUrl
-} from './env.js';
+} from './env.js';

package/src/config/textureConfig.js

@@ -4,6 +4,32 @@
  */
 import { resolvePublicUrl } from './env.js';
 
+function buildTextureUrl(baseUrl, categoryPath, value) {
+  if (!value) return null;
+  if (/^https?:\/\//i.test(value)) return value;
+  if (value.startsWith('/')) return resolvePublicUrl(value);
+  const prefix = `${baseUrl || ''}${categoryPath || ''}`;
+  return resolvePublicUrl(`${prefix}/${value}`);
+}
+
+function findTextureItem(textureConfig, category, textureUrl) {
+  if (!textureUrl || !textureConfig) return null;
+  const categoryConfig = textureConfig.textures?.[category];
+  if (!categoryConfig || !categoryConfig.items) return null;
+  const baseUrl = textureConfig.baseUrl || '/default';
+  const categoryPath = categoryConfig.basePath || `/${category}`;
+
+  for (const item of categoryConfig.items) {
+    const resolved = buildTextureUrl(baseUrl, categoryPath, item.filename || item.id);
+    if (!resolved) continue;
+    if (resolved === textureUrl) {
+      return { item, baseUrl, categoryPath };
+    }
+  }
+
+  return null;
+}
+
 let cachedConfig = null;
 let configPromise = null;
 let lastConfigUrl = null;
@@ -85,8 +111,10 @@ export async function getTextureOptions(category, config = null) {
 
   categoryConfig.items.forEach(item => {
     const key = item.label || item.id;
-    const relativePath = `${baseUrl}${categoryPath}/${item.filename || item.id}`;
-    options[key] = resolvePublicUrl(relativePath);
+    const resolved = buildTextureUrl(baseUrl, categoryPath, item.filename || item.id);
+    if (resolved) {
+      options[key] = resolved;
+    }
   });
 
   return options;
@@ -123,6 +151,21 @@ export async function getDefaultTexture(category, config = null) {
   return null;
 }
 
+/**
+ * Return the configured fallback URL for a given texture if defined.
+ * @param {string} category - Texture category (clouds, moons, etc.)
+ * @param {string} textureUrl - Resolved texture URL
+ * @param {Object|null} config - Optional texture config override
+ * @returns {string|null} Resolved fallback texture URL or null
+ */
+export function getTextureFallbackUrl(category, textureUrl, config = null) {
+  const textureConfig = config || cachedConfig;
+  if (!textureConfig) return null;
+  const found = findTextureItem(textureConfig, category, textureUrl);
+  if (!found || !found.item?.fallback) return null;
+  return buildTextureUrl(found.baseUrl, found.categoryPath, found.item.fallback);
+}
+
 /**
  * Get texture by ID within a category
  * @param {string} category - Texture category

package/src/moons/moonsGeneration.js

@@ -1,10 +1,10 @@
 import * as THREE from 'three';
 import { loadTexture } from '../loaders/bodyTextureLoader.js';
-import { getPublicBase } from '../config/env.js';
+import { resolvePublicUrl } from '../config/env.js';
 
-// Resolve public herbarium base (strip trailing slash)
-const HERBARIUM_BASE = getPublicBase();
-function moonTexPath(file) { return `${HERBARIUM_BASE}/default/textures/moons/${file}`; }
+function moonTexPath(file) {
+  return resolvePublicUrl(`default/textures/moons/${file}`);
+}
 export const DEFAULT_MOON_TEX_KTX2 = moonTexPath('moon-equirectangular.ktx2');
 export const DEFAULT_MOON_TEX_PNG = moonTexPath('moon-equirectangular.png');
 
@@ -13,6 +13,7 @@ export async function generateMoons({
   orbitRadius = 1.5,
   textureKTX2 = DEFAULT_MOON_TEX_KTX2,
   texturePNG = DEFAULT_MOON_TEX_PNG,
+  textureFallback = null,
   useTexture = true,
   // NEW: seed for deterministic positioning
   seed = null, // if provided, ensures consistent moon positions
@@ -90,15 +91,8 @@ export async function generateMoons({
     try { sharedTexture = await buildUvGridTexture(); usedUvGrid = true; } catch(_) {}
   } else if (useTexture) {
     // Use textureKey if provided, otherwise fall back to default textures
-    let primaryTexture = textureKey || textureKTX2;
-    const fallbackTexture = texturePNG;
-    
-    // Resolve textureKey to absolute URL if it's relative
-    if (textureKey && textureKey.startsWith('/')) {
-      primaryTexture = `${HERBARIUM_BASE}${textureKey}`;
-    } else if (textureKey) {
-      primaryTexture = textureKey; // already absolute
-    }
+    let primaryTexture = textureKey ? resolvePublicUrl(textureKey) : textureKTX2;
+    const fallbackTexture = textureFallback || texturePNG;
     
     try {
       sharedTexture = await loadTexture(primaryTexture);

package/src/moons/moonsManager.js

@@ -29,6 +29,7 @@ export class MoonsManager {
       seed = null, // seed for deterministic positioning
       textureKey = null, // NEW: specific texture key/path to use
       moonColor = '#ffffff', // NEW: moon color
+      textureFallback = null,
     } = opts;
 
     let newGroup = null;
@@ -41,6 +42,7 @@ export class MoonsManager {
         useTexture,
         seed,
         textureKey, // Pass texture key for custom moon textures
+        textureFallback,
         moonColor, // Pass moon color to generator
       });
     } catch (e) {