mage-engine 3.22.8 → 3.23.1

package/dist/mage.js

@@ -600,7 +600,7 @@ function mapFilterValues(collection, iteratee, predicate) {
  */
 
 
-var path$1 = function (props) {
+var path = function (props) {
   return function (object) {
     var e_2, _a;
 
@@ -2527,7 +2527,7 @@ function () {
         var resolvedContext = state.context;
         var isInState = stateIn ? isString$4(stateIn) && isStateId(stateIn) ? // Check if in state by ID
         state.matches(toStateValue(this.getStateNodeById(stateIn).path, this.delimiter)) : // Check if in state by relative grandparent
-        matchesState(toStateValue(stateIn, this.delimiter), path$1(this.path.slice(0, -2))(state.value)) : true;
+        matchesState(toStateValue(stateIn, this.delimiter), path(this.path.slice(0, -2))(state.value)) : true;
         var guardPassed = false;
 
         try {
@@ -55242,6 +55242,22 @@ var isLevelName = function isLevelName(level) {
 
     _classCallCheck(this, Images);
 
+    _defineProperty$1(this, "getLoaderByType", function (type) {
+      switch (type) {
+        case _this.LOADERS.IMAGE:
+          return _this.imageLoader;
+
+        case _this.LOADERS.TEXTURE:
+          return _this.textureLoader;
+
+        case _this.LOADERS.CUBE_TEXTURE:
+          return _this.cubeTexturesLoader;
+
+        default:
+          return null;
+      }
+    });
+
     _defineProperty$1(this, "setCurrentLevel", function (level) {
       _this.currentLevel = level;
     });
@@ -55255,51 +55271,58 @@ var isLevelName = function isLevelName(level) {
       var textures = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var cubeTextures = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       var level = arguments.length > 3 ? arguments[3] : undefined;
-      // extending assets images with our defaults
       _this.images = images;
       _this.textures = textures;
       _this.cubeTextures = cubeTextures;
 
       if (!_this.areThereImagesToLoad()) {
-        return Promise.resolve('images');
+        return Promise.resolve("images");
       }
 
       var promises = Object.keys(_this.textures).map(function (name) {
-        return _this.loadSingleTexture(name, level);
+        return _this.loadTextureByName(name, level);
       }).concat(Object.keys(_this.images).map(function (name) {
-        return _this.loadSingleImage(name, level);
+        return _this.loadImageByName(name, level);
       })).concat(Object.keys(_this.cubeTextures).map(function (cubeTexture) {
-        return _this.loadSingleCubeTexture(cubeTexture, level);
+        return _this.loadCubeTextureByName(cubeTexture, level);
       }));
       return Promise.all(promises);
     });
 
-    _defineProperty$1(this, "loadSingleImage", function (name, level) {
-      var id = buildAssetId(name, level);
+    _defineProperty$1(this, "loadImageByName", function (name, level) {
       var path = _this.images[name];
-      return new Promise(function (resolve, reject) {
-        try {
-          _this.imageLoader.load(path, function (image) {
-            _this.add(id, image);
+      return _this.loadAssetByPath(path, name, level, _this.LOADERS.IMAGE);
+    });
 
-            resolve(image);
-          }, function () {}, resolve);
-        } catch (e) {
-          console.log(ERROR_LOADING_TEXTURE, name, path);
-          reject();
-        }
-      });
+    _defineProperty$1(this, "loadTextureByName", function (name, level) {
+      var path = _this.textures[name];
+
+      _this.loadAssetByPath(path, name, level, _this.LOADERS.TEXTURE);
+    });
+
+    _defineProperty$1(this, "loadCubeTextureByName", function (name, level) {
+      var paths = _this.cubeTextures[name];
+
+      if (!paths instanceof Array) {
+        console.log(CUBE_TEXTURES_NOT_LIST);
+        return Promise.reject();
+      }
+
+      return _this.loadAssetByPath(paths, name, level, _this.LOADERS.CUBE_TEXTURE);
     });
 
-    _defineProperty$1(this, "loadSingleTexture", function (name, level) {
+    _defineProperty$1(this, "loadAssetByPath", function (path, name, level) {
+      var loaderType = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : _this.LOADERS.TEXTURE;
       var id = buildAssetId(name, level);
-      var path = _this.textures[name];
+
+      var loader = _this.getLoaderByType(loaderType);
+
       return new Promise(function (resolve, reject) {
         try {
-          _this.loader.load(path, function (texture) {
-            _this.add(id, texture);
+          loader.load(path, function (asset) {
+            _this.add(id, asset);
 
-            resolve(texture);
+            resolve(asset);
           }, function () {}, function () {
             console.log(ERROR_LOADING_TEXTURE, name, path);
             resolve();
@@ -55311,36 +55334,11 @@ var isLevelName = function isLevelName(level) {
       });
     });
 
-    _defineProperty$1(this, "loadSingleCubeTexture", function (name, level) {
-      var id = buildAssetId(name, level);
-      var paths = _this.cubeTextures[name];
-      return new Promise(function (resolve, reject) {
-        try {
-          if (paths instanceof Array) {
-            _this.cubeTexturesLoader.load(paths, function (texture) {
-              _this.add(id, texture);
-
-              resolve(texture);
-            }, function () {}, function () {
-              console.log(ERROR_LOADING_TEXTURE, name, paths);
-              resolve();
-            });
-          } else {
-            console.log(CUBE_TEXTURES_NOT_LIST);
-            reject();
-          }
-        } catch (e) {
-          console.log(ERROR_LOADING_TEXTURE, name, path);
-          reject();
-        }
-      });
-    });
-
     this.defaults = {};
     this.imagesDefault = {};
     this.map = {};
     this.numImages = 0;
-    this.loader = new TextureLoader();
+    this.textureLoader = new TextureLoader();
     this.imageLoader = new ImageLoader();
     this.cubeTexturesLoader = new CubeTextureLoader();
     this.images = {};
@@ -55367,6 +55365,15 @@ var isLevelName = function isLevelName(level) {
         this.map[id] = image;
       }
     }
+  }, {
+    key: "LOADERS",
+    get: function get() {
+      return {
+        IMAGE: "image",
+        TEXTURE: "texture",
+        CUBE_TEXTURE: "cubeTexture"
+      };
+    }
   }]);
 
   return Images;
@@ -57770,7 +57777,7 @@ function applyMiddleware() {
 
 var thunk = createThunkMiddleware();
 thunk.withExtraArgument = createThunkMiddleware;var name$1 = "mage-engine";
-var version$1 = "3.22.8";
+var version$1 = "3.23.1";
 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 = {
@@ -68804,10 +68811,10 @@ var Audio = /*#__PURE__*/function () {
     _defineProperty$1(this, "loadAssetByName", function (name, level) {
       var path = _this.audioAssets[name];
       var id = buildAssetId(name, level);
-      return _this.loadAsset(path, id);
+      return _this.loadAssetByPath(path, id);
     });
 
-    _defineProperty$1(this, "loadAsset", function (path, id) {
+    _defineProperty$1(this, "loadAssetByPath", function (path, id) {
       var request = new XMLHttpRequest();
       return new Promise(function (resolve) {
         request.open("GET", path, true);
@@ -79141,19 +79148,34 @@ var OBJMTLLoader = /*#__PURE__*/function () {
   return OBJMTLLoader;
 }();var _loaders;
 var EXTENSIONS = {
-  JSON: 'json',
-  GLB: 'glb',
-  GLTF: 'gltf',
+  JSON: "json",
+  GLB: "glb",
+  GLTF: "gltf",
   // COLLADA: 'dae',
-  FBX: 'fbx',
-  OBJ: 'obj'
+  FBX: "fbx",
+  OBJ: "obj"
 };
-var FULL_STOP = '.';
+var FULL_STOP = ".";
 var loaders = (_loaders = {}, _defineProperty$1(_loaders, EXTENSIONS.JSON, ObjectLoader), _defineProperty$1(_loaders, EXTENSIONS.GLB, GLTFLoader), _defineProperty$1(_loaders, EXTENSIONS.GLTF, GLTFLoader), _defineProperty$1(_loaders, EXTENSIONS.FBX, FBXLoader), _defineProperty$1(_loaders, EXTENSIONS.OBJ, OBJMTLLoader), _loaders);
 var loaderInstances = {};
 
+var isURL = function isURL(path) {
+  try {
+    var url = new URL(path);
+    return url;
+  } catch (_) {
+    return false;
+  }
+};
+
 var extractExtension = function extractExtension(path) {
-  return path.split(FULL_STOP).slice(-1).pop();
+  var url = isURL(path);
+
+  var _extract = function _extract(s) {
+    return s.split(FULL_STOP).slice(-1).pop();
+  };
+
+  return url ? _extract(url.pathname) : _extract(path);
 };
 
 var getLoaderFromExtension = function getLoaderFromExtension(extension) {
@@ -79257,8 +79279,9 @@ var Models = function Models() {
 
   _defineProperty$1(this, "get", function (name) {
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    var builtAssetId = buildAssetId(name, _this.currentLevel);
 
-    var _ref4 = _this.map[name] || _this.map[buildAssetId(name, _this.currentLevel)] || {},
+    var _ref4 = _this.map[name] || _this.map[builtAssetId] || {},
         scene = _ref4.scene,
         animations = _ref4.animations,
         extension = _ref4.extension;
@@ -79297,14 +79320,14 @@ var Models = function Models() {
 
   _defineProperty$1(this, "loadModels", function (models, level) {
     _this.models = models;
-    var keys = Object.keys(_this.models);
+    var keys = Object.keys(models);
 
     if (!keys.length) {
-      return Promise.resolve('models');
+      return Promise.resolve("models");
     }
 
     return Promise.all(keys.map(function (name) {
-      return _this.loadSingleFile(name, level);
+      return _this.loadAssetByName(name, level);
     })).catch(function (e) {
       console.log(ASSETS_MODEL_LOAD_FAIL);
       console.log(e);
@@ -79312,8 +79335,16 @@ var Models = function Models() {
     });
   });
 
-  _defineProperty$1(this, "loadSingleFile", function (name, level) {
+  _defineProperty$1(this, "loadAssetByName", function (name, level) {
+    if (!_this.models[name]) {
+      return Promise.resolve();
+    }
+
     var path = _this.models[name];
+    return _this.loadAssetByPath(path, name, level);
+  });
+
+  _defineProperty$1(this, "loadAssetByPath", function (path, name, level) {
     var id = buildAssetId(name, level);
     var extension = extractExtension(path);
     var loader = getLoaderFromExtension(extension);
@@ -79326,7 +79357,7 @@ var Models = function Models() {
           _this.storeModel(id, parsedModel, extension);
         }
 
-        resolve();
+        resolve(parsedModel);
       });
     });
   });

package/package.json

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