entangled-worlds-orbiters-shared 1.0.6 → 1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "entangled-worlds-orbiters-shared",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "Shared library for entangled worlds orbiters - contains core world rendering, moons system, and UI components",
   "type": "module",
   "main": "src/index.js",
@@ -35,15 +35,23 @@
     "three-stdlib": "^2.34.0"
   },
   "devDependencies": {
+    "@eslint/js": "^10.0.1",
+    "eslint": "^10.0.0",
+    "globals": "^17.3.0",
     "three": "^0.166.1",
     "three-stdlib": "^2.34.0"
   },
   "repository": {
     "type": "git",
-    "url": "git@github.com:plantasia-space-org/entangled-worlds-orbiters-shared.git"
+    "url": "git+ssh://git@github.com/plantasia-space-org/entangled-worlds-orbiters-shared.git"
   },
   "bugs": {
     "url": "https://github.com/plantasia-space-org/entangled-worlds-orbiters-shared/issues"
   },
-  "homepage": "https://github.com/plantasia-space-org/entangled-worlds-orbiters-shared#readme"
+  "homepage": "https://github.com/plantasia-space-org/entangled-worlds-orbiters-shared#readme",
+  "scripts": {
+    "lint": "eslint .",
+    "lint:strict": "eslint . --max-warnings=0",
+    "lint:fallback": "node scripts/lint.js"
+  }
 }

package/src/arrow-ui/GUI.js

@@ -213,7 +213,7 @@ export default class GUI {
 
 		}
 
-		// eslint-disable-next-line no-console
+		 
 		console.error( `gui.add failed
 	property:`, property, `
 	object:`, object, `

package/src/arrow-ui/NumberController.js

@@ -280,7 +280,7 @@ export default class NumberController extends Controller {
 		const setValueFromX = clientX => {
 			const rect = this.$slider.getBoundingClientRect();
 			const x = Math.max( rect.left, Math.min( clientX, rect.right ) );
-			let value = map( x, rect.left, rect.right, this._min, this._max );
+			const value = map( x, rect.left, rect.right, this._min, this._max );
 			this._snapClampSetValue( value );
 		};
 

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/loaders/glbLoader.js

@@ -10,7 +10,7 @@ function getSharedKTX2Loader(renderer) {
   return loader;
 }
 
-export async function loadGLB(url, { retries = 3, signal, onProgress, applyFlags } = {}) {
+export async function loadGLB(url, { retries = 3, signal, onProgress, applyFlags, withCredentials = false } = {}) {
   const renderer = window.__EW_RENDERER;
   if (!renderer) throw new Error('Renderer not ready for KTX2');
 
@@ -18,7 +18,8 @@ export async function loadGLB(url, { retries = 3, signal, onProgress, applyFlags
   while (attempt < retries) {
     try {
       const loader = new GLTFLoader()
-        .setCrossOrigin('anonymous')
+        .setCrossOrigin(withCredentials ? 'use-credentials' : 'anonymous')
+        .setWithCredentials(Boolean(withCredentials))
         .setKTX2Loader(getSharedKTX2Loader(renderer));
 
       const root = await new Promise((resolve, reject) => {

package/src/moons/moonsGeneration.js

@@ -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,8 +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 ? resolvePublicUrl(textureKey) : textureKTX2;
-    const fallbackTexture = texturePNG;
+    const 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) {

package/src/world/worldGLB.js

@@ -1,7 +1,7 @@
 import { loadGLB } from '../loaders/glbLoader.js';
 
-export async function makeGLB({ modelUrl, flags, retries = 3 }) {
+export async function makeGLB({ modelUrl, flags, retries = 3, withCredentials = false } = {}) {
   if (!modelUrl) throw new Error('modelUrl is required');
-  const obj = await loadGLB(modelUrl, { retries, applyFlags: flags });
+  const obj = await loadGLB(modelUrl, { retries, applyFlags: flags, withCredentials });
   return obj;
 }

package/src/world/worldManager.js

@@ -42,7 +42,11 @@ export class WorldManager {
       if (this.customCreators.has(mode)) {
         obj = await this.customCreators.get(mode)({ flags: this.flags, ...args });
       } else if (mode === 2) {
-        obj = await makeGLB({ modelUrl: args.modelUrl, flags: this.flags });
+        obj = await makeGLB({
+          modelUrl: args.modelUrl,
+          flags: this.flags,
+          withCredentials: Boolean(args.withCredentials),
+        });
       } else if (mode === 3) {
         obj = await makeNormalSphere({ flags: this.flags, ...args });
       } else {

package/src/world/worldTexture.js

@@ -22,7 +22,7 @@ if (typeof window !== 'undefined') {
   }
 }
 
-let WT_LOGGED_FIRST_CALL = false;
+const WT_LOGGED_FIRST_CALL = false;
 
 export const EARTH_RADIUS_UNITS = 0.5; // scene units