mage-engine 3.23.36 → 3.23.37

package/dist/mage.js

@@ -56083,6 +56083,11 @@ const extractBoundingSphere = body => {
   return body.geometry.boundingSphere;
 };
 const extractBiggestBoundingSphere = body => {
+  if (!body || typeof body.traverse !== 'function') {
+    console.warn('[Mage] extractBiggestBoundingSphere received invalid body');
+    return null;
+  }
+
   const spheres = [];
   body.traverse(child => {
     if (child.geometry) {
@@ -58130,7 +58135,7 @@ function applyMiddleware() {
 
 var thunk = createThunkMiddleware();
 thunk.withExtraArgument = createThunkMiddleware;var name = "mage-engine";
-var version$1 = "3.23.36";
+var version$1 = "3.23.37";
 var description = "A WebGL Javascript Game Engine, built on top of THREE.js and many other libraries.";
 var main = "dist/mage.js";
 var author$1 = {
@@ -60610,6 +60615,11 @@ const disposeGeometry = mesh => {
   }
 };
 const prepareModel = model => {
+  if (!model || typeof model.traverse !== 'function') {
+    console.warn('[Mage] prepareModel received invalid model object:', model);
+    return null; // Return null for invalid models
+  }
+
   setUpLightsAndShadows(model);
   model.traverse(mesh => {
     setUpLightsAndShadows(mesh);
@@ -62725,7 +62735,13 @@ let Element$1 = /*#__PURE__*/function (_Entity) {
 
           texture.wrapS = textureOptions.wrap;
           texture.wrapT = textureOptions.wrap;
-          texture.repeat.set(textureOptions.repeat.x, textureOptions.repeat.y);
+          texture.repeat.set(textureOptions.repeat.x, textureOptions.repeat.y); // Set sRGB encoding for color textures (map, emissiveMap, specularMap)
+          // This is required for textures to display with correct colors
+
+          if (textureType === TEXTURES.MAP || textureType === TEXTURES.EMISSIVE || textureType === TEXTURES.SPECULAR) {
+            texture.encoding = sRGBEncoding;
+          }
+
           material[textureType] = texture;
           material.needsUpdate = true;
         };
@@ -80631,10 +80647,16 @@ function parallelTraverse(a, b, callback) {
 };
 const FULL_STOP = ".";
 
-const DEFAULTbuildObjectLoader = () => ({
-  tracer: new RequirementsTracer(),
-  loader: new ObjectLoader()
-});
+const DEFAULTbuildObjectLoader = () => {
+  const loader = new ObjectLoader(); // Add setOptions for compatibility with the loader interface
+
+  loader.setOptions = () => {};
+
+  return {
+    tracer: new RequirementsTracer(),
+    loader
+  };
+};
 
 const loaders = {
   [EXTENSIONS.JSON]: DEFAULTbuildObjectLoader,
@@ -80733,11 +80755,22 @@ const getLoaderFromExtension = (extension, options) => {
   };
 };
 
-const glbParser = _ref => {
-  let {
+const glbParser = gltf => {
+  // GLTF/GLB loader returns { scene, animations, ... }
+  if (!gltf || !gltf.scene) {
+    var _gltf$constructor;
+
+    console.error('[Mage] GLB parser received invalid GLTF object:', {
+      type: gltf === null || gltf === void 0 ? void 0 : (_gltf$constructor = gltf.constructor) === null || _gltf$constructor === void 0 ? void 0 : _gltf$constructor.name,
+      keys: gltf ? Object.keys(gltf) : []
+    });
+    return null;
+  }
+
+  const {
     scene,
     animations
-  } = _ref;
+  } = gltf;
   scene.traverse(object => {
     if (object.isMesh) {
       object.castShadow = true;
@@ -80749,28 +80782,60 @@ const glbParser = _ref => {
   };
 };
 
-const gltfParser = _ref2 => {
-  let {
-    scene,
-    animations
-  } = _ref2;
+const gltfParser = gltf => {
+  // GLTF loader returns { scene, animations, ... }
+  if (!gltf || !gltf.scene) {
+    var _gltf$constructor2;
+
+    console.error('[Mage] GLTF parser received invalid GLTF object:', {
+      type: gltf === null || gltf === void 0 ? void 0 : (_gltf$constructor2 = gltf.constructor) === null || _gltf$constructor2 === void 0 ? void 0 : _gltf$constructor2.name,
+      keys: gltf ? Object.keys(gltf) : []
+    });
+    return null;
+  }
+
   return {
-    scene,
-    animations
+    scene: gltf.scene,
+    animations: gltf.animations
   };
 };
 
-const defaultParser = scene => ({
-  scene
-});
+const defaultParser = scene => {
+  // Validate the scene is a proper THREE.js object
+  if (!scene || typeof scene.traverse !== 'function') {
+    var _scene$constructor;
 
-const colladaParser = _ref3 => {
-  let {
+    console.error('[Mage] Default parser received invalid scene object:', {
+      type: scene === null || scene === void 0 ? void 0 : (_scene$constructor = scene.constructor) === null || _scene$constructor === void 0 ? void 0 : _scene$constructor.name,
+      isObject3D: scene === null || scene === void 0 ? void 0 : scene.isObject3D,
+      keys: scene ? Object.keys(scene) : []
+    });
+    return null;
+  }
+
+  return {
+    scene
+  };
+};
+
+const colladaParser = collada => {
+  // Collada loader returns { animations, scene, ... }
+  if (!collada || !collada.scene) {
+    var _collada$constructor;
+
+    console.error('[Mage] Collada parser received invalid object:', {
+      type: collada === null || collada === void 0 ? void 0 : (_collada$constructor = collada.constructor) === null || _collada$constructor === void 0 ? void 0 : _collada$constructor.name,
+      keys: collada ? Object.keys(collada) : []
+    });
+    return null;
+  }
+
+  const {
     animations,
     scene,
     rawSceneData,
     buildVisualScene
-  } = _ref3;
+  } = collada;
   scene.traverse(node => {
     if (node.isSkinnedMesh) {
       node.frustumCulled = false;
@@ -80785,6 +80850,18 @@ const colladaParser = _ref3 => {
 };
 
 const fbxParser = scene => {
+  // Validate the FBX loader returned a proper THREE.js object
+  if (!scene || typeof scene.traverse !== 'function') {
+    var _scene$constructor2;
+
+    console.error('[Mage] FBX parser received invalid scene object:', {
+      type: scene === null || scene === void 0 ? void 0 : (_scene$constructor2 = scene.constructor) === null || _scene$constructor2 === void 0 ? void 0 : _scene$constructor2.name,
+      isObject3D: scene === null || scene === void 0 ? void 0 : scene.isObject3D,
+      keys: scene ? Object.keys(scene) : []
+    });
+    return null;
+  }
+
   scene.traverse(node => {
     if (node.isSkinnedMesh) {
       processMaterial(node.material, material => material.skinning = true);
@@ -80846,40 +80923,64 @@ let Models = /*#__PURE__*/function (_EventDispatcher) {
     _defineProperty$1(_assertThisInitialized(_this), "create", function (name) {
       let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       const builtAssetId = buildAssetId(name, _this.currentLevel);
+      const modelData = _this.map[name] || _this.map[builtAssetId];
+
+      if (!modelData) {
+        console.warn(`[Mage] Model "${name}" not found in map. Available: ${Object.keys(_this.map).join(', ')}`);
+        return false;
+      }
+
       const {
         scene,
         animations,
         extension
-      } = _this.map[name] || _this.map[builtAssetId] || {};
+      } = modelData; // Validate that scene is a valid THREE.js object with required methods
 
-      if (scene) {
-        const elementOptions = {
-          name,
-          builtAssetId,
-          ...options
-        };
-        let model = scene.clone();
+      if (!scene || typeof scene.clone !== 'function' || typeof scene.traverse !== 'function') {
+        console.warn(`[Mage] Model "${name}" has invalid scene object. Got:`, Object.keys(modelData));
+        return false;
+      }
+
+      const elementOptions = {
+        name,
+        builtAssetId,
+        ...options
+      };
+      let model;
+      const useSkeletonClone = extension !== EXTENSIONS.COLLADA && hasAnimations(animations);
 
-        if (extension !== EXTENSIONS.COLLADA && hasAnimations(animations)) {
-          // we have no idea how to clone collada for the time being
+      try {
+        if (useSkeletonClone) {
           model = SkeletonUtils.clone(scene);
+        } else {
+          model = scene.clone();
         }
+      } catch (cloneError) {
+        console.error(`[Mage] Error cloning model "${name}":`, cloneError);
+        return false;
+      } // Validate the cloned model
 
-        const element = new Element$1({
-          body: prepareModel(model),
-          ...elementOptions
-        });
-        element.setEntityType(ENTITY_TYPES.MODEL.TYPE);
-        element.setEntitySubtype(ENTITY_TYPES.MODEL.SUBTYPES.DEFAULT);
 
-        if (hasAnimations(animations)) {
-          element.addAnimationHandler(animations);
-        }
+      const preparedBody = prepareModel(model);
+
+      if (!preparedBody) {
+        console.warn(`[Mage] Model "${name}" failed to prepare after cloning`);
+        return false;
+      } // IMPORTANT: body must come AFTER elementOptions spread to ensure
+      // our preparedBody is used, not any 'body' property from saved options
+
+
+      const element = new Element$1({ ...elementOptions,
+        body: preparedBody
+      });
+      element.setEntityType(ENTITY_TYPES.MODEL.TYPE);
+      element.setEntitySubtype(ENTITY_TYPES.MODEL.SUBTYPES.DEFAULT);
 
-        return element;
+      if (hasAnimations(animations)) {
+        element.addAnimationHandler(animations);
       }
 
-      return false;
+      return element;
     });
 
     _defineProperty$1(_assertThisInitialized(_this), "storeModel", (name, model, extension) => {
@@ -80910,8 +81011,23 @@ let Models = /*#__PURE__*/function (_EventDispatcher) {
         return Promise.resolve();
       }
 
-      const path = _this.models[name];
-      return _this.loadAssetByPath(path, name, options);
+      const modelConfig = _this.models[name]; // Support both string paths and objects with path + dependencies
+      // String format: "models/mymodel.fbx"
+      // Object format: { path: "models/mymodel.fbx", dependencies: { texture: "textures/tex.png" } }
+
+      if (typeof modelConfig === "string") {
+        return _this.loadAssetByPath(modelConfig, name, options);
+      } else if (modelConfig && typeof modelConfig === "object") {
+        const {
+          path,
+          dependencies = {}
+        } = modelConfig;
+        return _this.loadAssetByPath(path, name, { ...options,
+          ...dependencies
+        });
+      }
+
+      return Promise.resolve();
     });
 
     _defineProperty$1(_assertThisInitialized(_this), "loadAssetByPath", function (path, name) {
@@ -80928,10 +81044,10 @@ let Models = /*#__PURE__*/function (_EventDispatcher) {
         tracer
       } = getLoaderFromExtension(extension, options);
       const parser = getModelParserFromExtension(extension);
-      tracer.addEventListener(REQUIREMENTS_EVENTS.MISSING, _ref4 => {
+      tracer.addEventListener(REQUIREMENTS_EVENTS.MISSING, _ref => {
         let {
           requirements
-        } = _ref4;
+        } = _ref;
 
         _this.dispatchEvent({
           type: `${REQUIREMENTS_EVENTS.MISSING}:${name}`,
@@ -93974,15 +94090,44 @@ let Sky = /*#__PURE__*/function (_Element) {
 
       for (const elementData of elements) {
         try {
-          if (elementData.entitySubType === ENTITY_TYPES.MODEL.TYPE) {
+          // Check entityType for models (entitySubType would be MODEL.SUBTYPE.DEFAULT)
+          if (elementData.entityType === ENTITY_TYPES.MODEL.TYPE) {
             const {
-              options: modelOptions
+              options: modelOptions = {}
             } = elementData;
             const {
               name,
+              assetPath,
+              dependencies = {},
               ...rest
             } = modelOptions;
-            await Importer.completeElementCreation(Models$1.create(name, rest), elementData, options);
+
+            if (!name) {
+              console.warn(`[Mage] Model element missing name in options:`, elementData);
+              continue;
+            } // Load the model first if it's not already loaded
+            // This handles page refresh in the editor where models need to be reloaded
+
+
+            if (assetPath) {
+              const loadResult = await Models$1.loadAssetByPath(assetPath, name, dependencies);
+
+              if (!loadResult) {
+                console.warn(`[Mage] Failed to load model "${name}" from ${assetPath}`);
+              }
+            }
+
+            const model = Models$1.create(name, {
+              assetPath,
+              dependencies,
+              ...rest
+            });
+
+            if (model) {
+              await Importer.completeElementCreation(model, elementData, options);
+            } else {
+              console.warn(`[Mage] Could not create model "${name}" - check assetPath: ${assetPath}`);
+            }
           } else {
             switch (elementData.entitySubType) {
               case ENTITY_TYPES.MESH.SUBTYPES.CUBE:

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mage-engine",
-    "version": "3.23.36",
+    "version": "3.23.37",
     "description": "A WebGL Javascript Game Engine, built on top of THREE.js and many other libraries.",
     "main": "dist/mage.js",
     "author": {