mage-engine 3.23.34 → 3.23.35

package/dist/mage.js

@@ -55622,10 +55622,12 @@ var DEFAULT_MATERIAL_PROPERTIES = {
   // boolean
   VISIBLE: "visible" // boolean
 
-};
-var MATERIAL_PROPERTIES_MAP = (_MATERIAL_PROPERTIES_2 = {}, _defineProperty$1(_MATERIAL_PROPERTIES_2, MATERIALS.BASIC, [PROPERTIES.COLOR, PROPERTIES.COMBINE, // PROPERTIES.FOG,
+}; // Common properties that apply to all materials
+
+var COMMON_MATERIAL_PROPERTIES = [PROPERTIES.OPACITY, PROPERTIES.TRANSPARENT, PROPERTIES.VISIBLE, PROPERTIES.SIDE];
+var MATERIAL_PROPERTIES_MAP = (_MATERIAL_PROPERTIES_2 = {}, _defineProperty$1(_MATERIAL_PROPERTIES_2, MATERIALS.BASIC, [].concat(COMMON_MATERIAL_PROPERTIES, [PROPERTIES.COLOR, PROPERTIES.COMBINE, // PROPERTIES.FOG,
 PROPERTIES.LIGHT_MAP_INTENSITY, // float
-PROPERTIES.REFLECTIVITY, PROPERTIES.WIREFRAME, PROPERTIES.REFRACTION_RATIO]), _defineProperty$1(_MATERIAL_PROPERTIES_2, MATERIALS.LAMBERT, [PROPERTIES.AO_MAP_INTENSITY, // DONE
+PROPERTIES.REFLECTIVITY, PROPERTIES.WIREFRAME, PROPERTIES.REFRACTION_RATIO])), _defineProperty$1(_MATERIAL_PROPERTIES_2, MATERIALS.LAMBERT, [].concat(COMMON_MATERIAL_PROPERTIES, [PROPERTIES.AO_MAP_INTENSITY, // DONE
 PROPERTIES.BUMP_SCALE, // DONE
 PROPERTIES.COLOR, // DONE
 PROPERTIES.COMBINE, // DONE
@@ -55638,7 +55640,7 @@ PROPERTIES.LIGHT_MAP_INTENSITY, // DONE
 PROPERTIES.NORMAL_SCALE, PROPERTIES.REFLECTIVITY, // DONE
 PROPERTIES.REFRACTION_RATIO, // DONE
 PROPERTIES.WIREFRAME // DONE
-]), _defineProperty$1(_MATERIAL_PROPERTIES_2, MATERIALS.PHONG, [PROPERTIES.AO_MAP_INTENSITY, // DONE
+])), _defineProperty$1(_MATERIAL_PROPERTIES_2, MATERIALS.PHONG, [].concat(COMMON_MATERIAL_PROPERTIES, [PROPERTIES.AO_MAP_INTENSITY, // DONE
 PROPERTIES.BUMP_SCALE, // DONE
 PROPERTIES.COLOR, // DONE
 PROPERTIES.COMBINE, // DONE
@@ -55655,11 +55657,11 @@ PROPERTIES.REFRACTION_RATIO, // DONE
 PROPERTIES.SHININESS, // DONE
 PROPERTIES.SPECULAR, // DONE
 PROPERTIES.WIREFRAME // DONE
-]), _defineProperty$1(_MATERIAL_PROPERTIES_2, MATERIALS.DEPTH, [PROPERTIES.DISPLACEMENT_SCALE, // DONE
+])), _defineProperty$1(_MATERIAL_PROPERTIES_2, MATERIALS.DEPTH, [].concat(COMMON_MATERIAL_PROPERTIES, [PROPERTIES.DISPLACEMENT_SCALE, // DONE
 PROPERTIES.DISPLACEMENT_BIAS, // DONE
 // PROPERTIES.FOG, // DONE
 PROPERTIES.WIREFRAME // DONE
-]), _defineProperty$1(_MATERIAL_PROPERTIES_2, MATERIALS.STANDARD, [PROPERTIES.AO_MAP_INTENSITY, // DONE
+])), _defineProperty$1(_MATERIAL_PROPERTIES_2, MATERIALS.STANDARD, [].concat(COMMON_MATERIAL_PROPERTIES, [PROPERTIES.AO_MAP_INTENSITY, // DONE
 PROPERTIES.BUMP_SCALE, // DONE
 PROPERTIES.COLOR, // DONE
 PROPERTIES.COMBINE, // DONE
@@ -55675,7 +55677,7 @@ PROPERTIES.METALNESS, // done
 PROPERTIES.NORMAL_SCALE, // DONE
 PROPERTIES.ROUGHNESS, // DONE
 PROPERTIES.WIREFRAME // DONE
-]), _defineProperty$1(_MATERIAL_PROPERTIES_2, MATERIALS.THREE_TOON, [PROPERTIES.AO_MAP_INTENSITY, // DONE
+])), _defineProperty$1(_MATERIAL_PROPERTIES_2, MATERIALS.THREE_TOON, [].concat(COMMON_MATERIAL_PROPERTIES, [PROPERTIES.AO_MAP_INTENSITY, // DONE
 PROPERTIES.BUMP_SCALE, // DONE
 PROPERTIES.COLOR, // DONE
 PROPERTIES.DISPLACEMENT_SCALE, // DONE
@@ -55686,7 +55688,7 @@ PROPERTIES.EMISSIVE_INTENSITY, // DONE
 PROPERTIES.LIGHT_MAP_INTENSITY, // DONE
 PROPERTIES.NORMAL_SCALE, // done
 PROPERTIES.WIREFRAME // DONE
-]), _MATERIAL_PROPERTIES_2);
+])), _MATERIAL_PROPERTIES_2);
 var MATERIAL_TEXTURE_MAP$1 = (_MATERIAL_TEXTURE_MAP$1 = {}, _defineProperty$1(_MATERIAL_TEXTURE_MAP$1, MATERIALS.BASIC, [TEXTURES.ALPHA, TEXTURES.AO, TEXTURES.ENV, TEXTURES.LIGHT, TEXTURES.MAP, TEXTURES.SPECULAR]), _defineProperty$1(_MATERIAL_TEXTURE_MAP$1, MATERIALS.LAMBERT, [TEXTURES.ALPHA, // DONE
 TEXTURES.AO, // DONE
 TEXTURES.ENV, // DONE
@@ -58432,7 +58434,7 @@ function applyMiddleware() {
 
 var thunk = createThunkMiddleware();
 thunk.withExtraArgument = createThunkMiddleware;var name = "mage-engine";
-var version$1 = "3.23.34";
+var version$1 = "3.23.35";
 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 = {
@@ -62807,6 +62809,17 @@ var Element$1 = /*#__PURE__*/function (_Entity) {
     value: function getAOMapIntensity() {
       return extractMaterialProperty(this.getBody(), PROPERTIES.AO_MAP_INTENSITY);
     }
+  }, {
+    key: "setAoMapIntensity",
+    value: function setAoMapIntensity() {
+      var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : MATERIAL_PROPERTIES_DEFAULT_VALUES[PROPERTIES.AO_MAP_INTENSITY];
+
+      var _setAoMapIntensity = function _setAoMapIntensity(material) {
+        return material[PROPERTIES.AO_MAP_INTENSITY] = value;
+      };
+
+      applyMaterialChange(this.getBody(), _setAoMapIntensity);
+    }
   }, {
     key: "setEnvMapIntensity",
     value: function setEnvMapIntensity() {
@@ -94094,7 +94107,7 @@ var Importer = /*#__PURE__*/function () {
         element.setNormalScale();
         Object.keys(parsedTextures).forEach( /*#__PURE__*/function () {
           var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(textureType) {
-            var _parsedTextures$textu, id, options, assetPath, baseUrl, fullUrl;
+            var _parsedTextures$textu, id, options, assetPath;
 
             return regeneratorRuntime.wrap(function _callee$(_context) {
               while (1) {
@@ -94102,38 +94115,37 @@ var Importer = /*#__PURE__*/function () {
                   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
+                    // Images.loadAssetByPath will resolve the path using MAGE_ASSETS_BASE_URL
 
                     if (!(!Images$1.get(id) && assetPath)) {
-                      _context.next = 12;
+                      _context.next = 10;
                       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);
+                    _context.next = 5;
+                    return Images$1.loadAssetByPath(assetPath, id, Images$1.currentLevel);
 
-                  case 7:
-                    _context.next = 12;
+                  case 5:
+                    _context.next = 10;
                     break;
 
-                  case 9:
-                    _context.prev = 9;
+                  case 7:
+                    _context.prev = 7;
                     _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 10:
+                    element.setTexture(id, textureType, _objectSpread2$1(_objectSpread2$1({}, options), {}, {
+                      assetPath: assetPath
+                    }));
 
-                  case 13:
+                  case 11:
                   case "end":
                     return _context.stop();
                 }
               }
-            }, _callee, null, [[2, 9]]);
+            }, _callee, null, [[2, 7]]);
           }));
 
           return function (_x) {

package/package.json

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