mage-engine 3.23.24 → 3.23.26

package/dist/mage.js

@@ -34,6 +34,42 @@ function _typeof(obj) {
   }, _typeof(obj);
 }
 
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+  try {
+    var info = gen[key](arg);
+    var value = info.value;
+  } catch (error) {
+    reject(error);
+    return;
+  }
+
+  if (info.done) {
+    resolve(value);
+  } else {
+    Promise.resolve(value).then(_next, _throw);
+  }
+}
+
+function _asyncToGenerator(fn) {
+  return function () {
+    var self = this,
+        args = arguments;
+    return new Promise(function (resolve, reject) {
+      var gen = fn.apply(self, args);
+
+      function _next(value) {
+        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+      }
+
+      function _throw(err) {
+        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+      }
+
+      _next(undefined);
+    });
+  };
+}
+
 function _classCallCheck(instance, Constructor) {
   if (!(instance instanceof Constructor)) {
     throw new TypeError("Cannot call a class as a function");
@@ -55040,7 +55076,7 @@ var createElementFromSelector = function createElementFromSelector(selector) {
   }
 
   return element;
-};var getWindow = function getWindow() {
+};var getWindow$1 = function getWindow() {
   try {
     var win = window || global.window;
     return win;
@@ -55160,7 +55196,7 @@ var Config = /*#__PURE__*/function () {
   }, {
     key: "getWindowSize",
     value: function getWindowSize() {
-      var win = getWindow();
+      var win = getWindow$1();
       if (!win) return false;
       var height = win.innerHeight;
       var width = win.innerWidth;
@@ -55767,19 +55803,21 @@ var isLevelName = function isLevelName(level) {
 
       var loader = _this.getLoaderByType(loaderType);
 
-      return new Promise(function (resolve, reject) {
+      return new Promise(function (resolve) {
         try {
           loader.load(path, function (asset) {
             _this.add(id, asset);
 
             resolve(asset);
-          }, function () {}, function () {
-            console.log(ERROR_LOADING_TEXTURE, name, path);
-            resolve();
+          }, function () {}, function (error) {
+            // Log warning but resolve anyway to allow other assets to continue loading
+            console.warn("[Mage] ".concat(ERROR_LOADING_TEXTURE), name, path, (error === null || error === void 0 ? void 0 : error.message) || "");
+            resolve(null);
           });
         } catch (e) {
-          console.log(ERROR_LOADING_TEXTURE, name, path);
-          reject();
+          // Log warning but resolve anyway to allow other assets to continue loading
+          console.warn("[Mage] ".concat(ERROR_LOADING_TEXTURE), name, path, (e === null || e === void 0 ? void 0 : e.message) || "");
+          resolve(null);
         }
       });
     });
@@ -56950,7 +56988,7 @@ var Physics$1 = new Physics();var Scene = /*#__PURE__*/function () {
   }, {
     key: "listenToResizeEvent",
     value: function listenToResizeEvent() {
-      var win = getWindow();
+      var win = getWindow$1();
 
       if (win) {
         win.addEventListener("resize", this.onResize);
@@ -56959,7 +56997,7 @@ var Physics$1 = new Physics();var Scene = /*#__PURE__*/function () {
   }, {
     key: "stopResizeListener",
     value: function stopResizeListener() {
-      var win = getWindow();
+      var win = getWindow$1();
 
       if (win) {
         win.removeEventListener("resize", this.onResize);
@@ -58259,7 +58297,7 @@ function applyMiddleware() {
 
 var thunk = createThunkMiddleware();
 thunk.withExtraArgument = createThunkMiddleware;var name = "mage-engine";
-var version$1 = "3.23.24";
+var version$1 = "3.23.26";
 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 = {
@@ -62716,10 +62754,12 @@ var Element$1 = /*#__PURE__*/function (_Entity) {
     }
   }, {
     key: "recordTexture",
-    value: function recordTexture(id, type, options) {
+    value: function recordTexture(id, type, options, assetPath) {
+      // assetPath is the relative path like "textures/mytexture.png"
       this.textures.set(type, {
         id: id,
-        options: options
+        options: options,
+        assetPath: assetPath
       });
     }
   }, {
@@ -62740,15 +62780,22 @@ var Element$1 = /*#__PURE__*/function (_Entity) {
           y: 1
         } : _options$repeat,
             _options$wrap = options.wrap,
-            wrap = _options$wrap === void 0 ? RepeatWrapping$1 : _options$wrap;
+            wrap = _options$wrap === void 0 ? RepeatWrapping$1 : _options$wrap,
+            assetPath = options.assetPath;
         var textureOptions = {
           repeat: repeat,
           wrap: wrap
         };
-        this.recordTexture(textureId, textureType, textureOptions);
+        this.recordTexture(textureId, textureType, textureOptions, assetPath);
 
         var applyTextureTo = function applyTextureTo(material) {
           var texture = Images$1.get(textureId);
+
+          if (!texture) {
+            console.warn("[Mage] Texture not found: ".concat(textureId));
+            return;
+          }
+
           texture.wrapS = textureOptions.wrap;
           texture.wrapT = textureOptions.wrap;
           texture.repeat.set(textureOptions.repeat.x, textureOptions.repeat.y);
@@ -70167,6 +70214,75 @@ var createConnect = function (ref) {
 };
 var connect = createConnect();var BaseUI = function BaseUI() {
   return null;
+};/**
+ * Environment configuration module for mage-engine.
+ * Centralizes all environment variables and their default values.
+ *
+ * Usage:
+ *   import env from './env';
+ *   const baseUrl = env.MAGE_ASSETS_BASE_URL;
+ */
+
+/**
+ * Safe window access - returns undefined in non-browser environments
+ */
+var getWindow = function getWindow() {
+  return typeof window !== "undefined" ? window : undefined;
+};
+/**
+ * Gets an environment variable from the window object with a fallback default.
+ * @param {string} key - The environment variable name
+ * @param {any} defaultValue - Default value if not set
+ * @returns {any} - The environment variable value or default
+ */
+
+
+var getEnv = function getEnv(key) {
+  var defaultValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
+  var win = getWindow();
+  return win && win[key] !== undefined ? win[key] : defaultValue;
+};
+/**
+ * Environment variables with their default values.
+ * These are accessed as getters so they're evaluated at access time,
+ * not at module load time (important for variables set after page load).
+ */
+
+
+var env = {
+  /**
+   * Base URL for loading assets (textures, models, audio).
+   * Set by mage-studio editor or deployed builds.
+   * Default: empty string (paths used as-is for backwards compatibility)
+   */
+  get MAGE_ASSETS_BASE_URL() {
+    return getEnv("MAGE_ASSETS_BASE_URL", "");
+  },
+
+  /**
+   * Enable debug mode for verbose logging.
+   * Default: false
+   */
+  get MAGE_DEBUG() {
+    return getEnv("MAGE_DEBUG", false);
+  },
+
+  /**
+   * Current project ID (set by mage-studio).
+   * Default: empty string
+   */
+  get MAGE_PROJECT_ID() {
+    return getEnv("MAGE_PROJECT_ID", "");
+  },
+
+  /**
+   * Current build ID (set by deployed builds).
+   * Default: empty string
+   */
+  get MAGE_BUILD_ID() {
+    return getEnv("MAGE_BUILD_ID", "");
+  }
+
 };var TIME_FOR_UPDATE = 5;
 var VOLUME = 2;
 var DEFAULT_AUDIO_NODE_VOLUME = 5;
@@ -70176,6 +70292,48 @@ var AUDIO_RAMPS = {
   LINEAR: "LINEAR",
   EXPONENTIAL: "EXPONENTIAL"
 };
+/**
+ * Checks if a path is an absolute URL.
+ * @param {string} path - The path to check
+ * @returns {boolean} - True if path is an absolute URL
+ */
+
+var isURL$1 = function isURL(path) {
+  try {
+    new URL(path);
+    return true;
+  } catch (_) {
+    return false;
+  }
+};
+/**
+ * Resolves an asset path to a full URL.
+ * If path is already an absolute URL, returns it as-is.
+ * If path is relative and MAGE_ASSETS_BASE_URL is set, prepends the base URL.
+ * @param {string} path - The asset path (relative or absolute)
+ * @returns {string} - The resolved full URL
+ */
+
+
+var resolveAssetPath$1 = function resolveAssetPath(path) {
+  // If it's already an absolute URL, use it as-is
+  if (isURL$1(path)) {
+    return path;
+  } // If MAGE_ASSETS_BASE_URL is set, prepend it to the relative path
+
+
+  var baseUrl = env.MAGE_ASSETS_BASE_URL;
+
+  if (baseUrl) {
+    // Remove leading slash from path if present to avoid double slashes
+    var cleanPath = path.startsWith("/") ? path.slice(1) : path;
+    return "".concat(baseUrl, "/").concat(cleanPath);
+  } // Fallback: return the path as-is (for backwards compatibility)
+
+
+  return path;
+};
+
 var Audio = /*#__PURE__*/function () {
   function Audio() {
     var _this = this;
@@ -70213,21 +70371,30 @@ var Audio = /*#__PURE__*/function () {
     });
 
     _defineProperty$1(this, "loadAssetByPath", function (path, id) {
+      // Resolve the path using MAGE_ASSETS_BASE_URL if available
+      var resolvedPath = resolveAssetPath$1(path);
       var request = new XMLHttpRequest();
       return new Promise(function (resolve) {
-        request.open("GET", path, true);
+        request.open("GET", resolvedPath, true);
         request.responseType = "arraybuffer";
 
         request.onreadystatechange = function (e) {
-          if (request.readyState === 4 && request.status === 200) {
-            _this.context.decodeAudioData(request.response, function (buffer) {
-              _this.buffersMap[id] = buffer;
-              resolve();
-            }, function () {
+          if (request.readyState === 4) {
+            if (request.status === 200) {
+              _this.context.decodeAudioData(request.response, function (buffer) {
+                _this.buffersMap[id] = buffer;
+                resolve();
+              }, function () {
+                _this.buffersMap[id] = null;
+                console.error(ASSETS_AUDIO_FILE_LOAD_FAIL);
+                resolve();
+              });
+            } else {
+              // Handle HTTP errors (404, etc.) - log warning and continue
+              console.warn("[Mage] Failed to load audio \"".concat(id, "\" from ").concat(resolvedPath, ": HTTP ").concat(request.status));
               _this.buffersMap[id] = null;
-              console.error(ASSETS_AUDIO_FILE_LOAD_FAIL);
               resolve();
-            });
+            }
           }
         };
 
@@ -80710,6 +80877,33 @@ var isURL = function isURL(path) {
     return false;
   }
 };
+/**
+ * Resolves an asset path to a full URL.
+ * If path is already an absolute URL, returns it as-is.
+ * If path is relative and MAGE_ASSETS_BASE_URL is set, prepends the base URL.
+ * @param {string} path - The asset path (relative or absolute)
+ * @returns {string} - The resolved full URL
+ */
+
+
+var resolveAssetPath = function resolveAssetPath(path) {
+  // If it's already an absolute URL, use it as-is
+  if (isURL(path)) {
+    return path;
+  } // If MAGE_ASSETS_BASE_URL is set, prepend it to the relative path
+
+
+  var baseUrl = env.MAGE_ASSETS_BASE_URL;
+
+  if (baseUrl) {
+    // Remove leading slash from path if present to avoid double slashes
+    var cleanPath = path.startsWith("/") ? path.slice(1) : path;
+    return "".concat(baseUrl, "/").concat(cleanPath);
+  } // Fallback: return the path as-is (for backwards compatibility)
+
+
+  return path;
+};
 
 var extractExtension = function extractExtension(path) {
   var url = isURL(path);
@@ -80916,7 +81110,9 @@ var Models = /*#__PURE__*/function (_EventDispatcher) {
     _defineProperty$1(_assertThisInitialized(_this), "loadAssetByPath", function (path, name) {
       var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       var level = options.level;
-      var id = buildAssetId(name, level);
+      var id = buildAssetId(name, level); // Resolve the path using MAGE_ASSETS_BASE_URL if available
+
+      var resolvedPath = resolveAssetPath(path);
       var extension = extractExtension(path);
 
       var _getLoaderFromExtensi = getLoaderFromExtension(extension, options),
@@ -80933,7 +81129,7 @@ var Models = /*#__PURE__*/function (_EventDispatcher) {
         });
       });
       return new Promise(function (resolve) {
-        loader.load(path, function (model) {
+        loader.load(resolvedPath, function (model) {
           var parsedModel = parser(model);
 
           if (parsedModel) {
@@ -80941,7 +81137,11 @@ var Models = /*#__PURE__*/function (_EventDispatcher) {
           }
 
           resolve(parsedModel);
-        }, NOOP, NOOP);
+        }, NOOP, function (error) {
+          // Log error but resolve anyway to allow other assets to continue loading
+          console.warn("[Mage] Failed to load model \"".concat(name, "\" from ").concat(resolvedPath, ":"), (error === null || error === void 0 ? void 0 : error.message) || error);
+          resolve(null);
+        });
       });
     });
 
@@ -93686,7 +93886,7 @@ var Importer = /*#__PURE__*/function () {
           _ref$options = _ref.options,
           options = _ref$options === void 0 ? {} : _ref$options;
 
-      if (getWindow() && url) {
+      if (getWindow$1() && url) {
         return fetch$1(url).then(function (res) {
           return res.json();
         }).then(function (data) {
@@ -93782,12 +93982,54 @@ var Importer = /*#__PURE__*/function () {
       if (elementData.textures) {
         var parsedTextures = JSON.parse(elementData.textures);
         element.setNormalScale();
-        Object.keys(parsedTextures).forEach(function (textureType) {
-          var _parsedTextures$textu = parsedTextures[textureType],
-              id = _parsedTextures$textu.id,
-              options = _parsedTextures$textu.options;
-          element.setTexture(id, textureType, options);
-        });
+        Object.keys(parsedTextures).forEach( /*#__PURE__*/function () {
+          var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(textureType) {
+            var _parsedTextures$textu, id, options, assetPath, baseUrl, fullUrl;
+
+            return regeneratorRuntime.wrap(function _callee$(_context) {
+              while (1) {
+                switch (_context.prev = _context.next) {
+                  case 0:
+                    _parsedTextures$textu = parsedTextures[textureType], id = _parsedTextures$textu.id, options = _parsedTextures$textu.options, assetPath = _parsedTextures$textu.assetPath; // If texture not already loaded and we have an assetPath, load it first
+                    // assetPath is relative like "textures/mytexture.png"
+                    // The actual URL is resolved based on the assets base URL
+
+                    if (!(!Images$1.get(id) && assetPath)) {
+                      _context.next = 12;
+                      break;
+                    }
+
+                    _context.prev = 2;
+                    // Use the assets base URL from env to build full URL
+                    baseUrl = env.MAGE_ASSETS_BASE_URL;
+                    fullUrl = baseUrl ? "".concat(baseUrl, "/").concat(assetPath) : assetPath;
+                    _context.next = 7;
+                    return Images$1.loadAssetByPath(fullUrl, id, Images$1.currentLevel);
+
+                  case 7:
+                    _context.next = 12;
+                    break;
+
+                  case 9:
+                    _context.prev = 9;
+                    _context.t0 = _context["catch"](2);
+                    console.warn("[Mage] Failed to load texture: ".concat(id, " from ").concat(assetPath));
+
+                  case 12:
+                    element.setTexture(id, textureType, options);
+
+                  case 13:
+                  case "end":
+                    return _context.stop();
+                }
+              }
+            }, _callee, null, [[2, 9]]);
+          }));
+
+          return function (_x) {
+            return _ref2.apply(this, arguments);
+          };
+        }());
       } // setting shadow properties
 
 
@@ -95449,7 +95691,7 @@ var createPromiseWorker = function createPromiseWorker(task, message) {
     value: function _export() {
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
-      if (getWindow()) {
+      if (getWindow$1()) {
         // only exporting the current level, each level needs to be instantiated to export it
         var level = GameRunner$1.getCurrentLevel();
         var content = JSON.stringify(level.toJSON());

package/package.json

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