mage-engine 3.23.5 → 3.23.7

package/dist/mage.js

@@ -54633,7 +54633,7 @@ if (typeof window !== 'undefined') {
   };
 
   window.hotkeys = hotkeys;
-}var DEFAULT_OPTIONS = {
+}var DEFAULT_OPTIONS$1 = {
   keyup: true,
   keydown: true
 };
@@ -54689,7 +54689,7 @@ var Keyboard = /*#__PURE__*/function (_EventDispatcher) {
         }
 
         this.combos.push(combo);
-        hotkeys(combo, DEFAULT_OPTIONS, handler);
+        hotkeys(combo, DEFAULT_OPTIONS$1, handler);
       }
     }
   }, {
@@ -55093,12 +55093,13 @@ var Config$1 = new Config();var Universe = /*#__PURE__*/function () {
     value: function toJSON() {
       var _this4 = this;
 
+      var parseJSON = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
       var elements = Object.keys(this.reality).map(function (k) {
         return _this4.get(k);
       }).filter(function (element) {
         return element.serializable && element.isMesh();
       }).map(function (element) {
-        return element.toJSON();
+        return element.toJSON(parseJSON);
       });
       return {
         elements: elements
@@ -56419,12 +56420,13 @@ var Physics$1 = new Physics();var Scene = /*#__PURE__*/function () {
   }, {
     key: "getHierarchy",
     value: function getHierarchy() {
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       return [{
-        element: this.toJSON(),
+        element: this.toJSON(options.parseJSON),
         children: [this.getCamera().getHierarchy()].concat(_toConsumableArray(this.elements.filter(function (e) {
           return !e.hasParent() && !e.isHelper() && e.isSerializable();
         }).map(function (e) {
-          return e.getHierarchy();
+          return e.getHierarchy(options);
         })))
       }];
     }
@@ -56655,6 +56657,10 @@ var MOUSE_UP = "mouseUp";
 var MOUSE_MOVE = "mouseMove";
 var ELEMENT_CLICK = "elementClick";
 var ELEMENT_DESELECT = "elementDeselect";
+var DEFAULT_OPTIONS = {
+  recursiveSearch: false,
+  selectTags: [DEFAULT_TAG]
+};
 
 var Mouse = /*#__PURE__*/function (_EventDispatcher) {
   _inherits(Mouse, _EventDispatcher);
@@ -56714,28 +56720,28 @@ var Mouse = /*#__PURE__*/function (_EventDispatcher) {
       return !!element;
     });
 
-    _defineProperty$1(_assertThisInitialized(_this), "elementHasTag", function (tag) {
+    _defineProperty$1(_assertThisInitialized(_this), "filterByTags", function (tags) {
       return function (_ref3) {
         var element = _ref3.element;
-        return element.hasTag(tag);
+        return tags.some(function (tag) {
+          return element.hasTag(tag);
+        });
       };
     });
 
     _defineProperty$1(_assertThisInitialized(_this), "getIntersections", function () {
-      var recursive = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-      var tag = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : DEFAULT_TAG;
+      var recursive = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _this.options.recursiveSearch;
+      var tags = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _this.options.selectTags;
 
       if (_this.hasRaycaster()) {
         _this.raycaster.setFromCamera(_this.mouse, Scene$1.getCameraBody());
 
-        return _this.raycaster.intersectObjects(Scene$1.getChildren(), recursive) // .filter(this.isIntersectionAMeshOrSprite)
-        .map(_this.parseIntersection).filter(_this.elementExists).filter(_this.elementHasTag(tag));
+        return _this.raycaster.intersectObjects(Scene$1.getChildren(), recursive).map(_this.parseIntersection).filter(_this.elementExists).filter(_this.filterByTags(tags));
       }
     });
 
     _defineProperty$1(_assertThisInitialized(_this), "onMouseDown", function (event) {
       if (!_this.enabled) return;
-      console.log("on mouse down");
       event.preventDefault();
 
       var mouseEvent = _this.parseMouseEvent(event);
@@ -56747,7 +56753,6 @@ var Mouse = /*#__PURE__*/function (_EventDispatcher) {
 
       var elements = _this.getIntersections();
 
-      console.log("clicked elements", elements);
       _this.elementClickEvent.elements = elements;
 
       if (!elements.length) {
@@ -56760,6 +56765,7 @@ var Mouse = /*#__PURE__*/function (_EventDispatcher) {
     _this.enabled = false;
     _this.mouseMoveIntersectionEnabled = false;
     _this.mouse = new Vector2();
+    _this.options = DEFAULT_OPTIONS;
     _this.mouseDownEvent = {
       type: MOUSE_DOWN
     };
@@ -56794,7 +56800,9 @@ var Mouse = /*#__PURE__*/function (_EventDispatcher) {
   }, {
     key: "enable",
     value: function enable() {
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       this.enabled = true;
+      this.options = _objectSpread2$1(_objectSpread2$1({}, DEFAULT_OPTIONS), options);
       this.createRayCaster();
       Scene$1.getDOMElement().addEventListener("mousemove", this.onMouseMove);
       Scene$1.getDOMElement().addEventListener("mousedown", this.onMouseDown);
@@ -56810,6 +56818,7 @@ var Mouse = /*#__PURE__*/function (_EventDispatcher) {
     value: function disable() {
       this.enabled = false;
       this.mouseMoveIntersectionEnabled = false;
+      this.options = DEFAULT_OPTIONS;
       document.removeEventListener("mouseup", this.onMouseUp);
       Scene$1.getDOMElement().removeEventListener("mousemove", this.onMouseMove);
       Scene$1.getDOMElement().removeEventListener("mousedown", this.onMouseDown);
@@ -57777,7 +57786,7 @@ function applyMiddleware() {
 
 var thunk = createThunkMiddleware();
 thunk.withExtraArgument = createThunkMiddleware;var name$1 = "mage-engine";
-var version$1 = "3.23.5";
+var version$1 = "3.23.7";
 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 = {
@@ -58401,6 +58410,7 @@ var INPUT_EVENTS = (_INPUT_EVENTS = {
   MOUSE_DOWN: MOUSE_DOWN,
   MOUSE_UP: MOUSE_UP
 }, _defineProperty$1(_INPUT_EVENTS, "MOUSE_DOWN", MOUSE_DOWN), _defineProperty$1(_INPUT_EVENTS, "MOUSE_MOVE", MOUSE_MOVE), _defineProperty$1(_INPUT_EVENTS, "ELEMENT_CLICK", ELEMENT_CLICK), _defineProperty$1(_INPUT_EVENTS, "ELEMENT_DESELECT", ELEMENT_DESELECT), _defineProperty$1(_INPUT_EVENTS, "GAMEPAD_CONNECTED_EVENT", GAMEPAD_CONNECTED_EVENT), _defineProperty$1(_INPUT_EVENTS, "GAMEPAD_DISCONNECTED_EVENT", GAMEPAD_DISCONNECTED_EVENT), _defineProperty$1(_INPUT_EVENTS, "BUTTON_PRESSED_EVENT", BUTTON_PRESSED_EVENT), _defineProperty$1(_INPUT_EVENTS, "BUTTON_RELEASED_EVENT", BUTTON_RELEASED_EVENT), _defineProperty$1(_INPUT_EVENTS, "AXIS_CHANGE_EVENT", AXIS_CHANGE_EVENT), _INPUT_EVENTS);
+var DEFAULT_ENABLE_OPTIONS = {};
 var Input = /*#__PURE__*/function (_EventDispatcher) {
   _inherits(Input, _EventDispatcher);
 
@@ -58427,11 +58437,13 @@ var Input = /*#__PURE__*/function (_EventDispatcher) {
   _createClass(Input, [{
     key: "enable",
     value: function enable() {
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : DEFAULT_ENABLE_OPTIONS;
+
       if (!this.enabled) {
         dispatch$8(inputEnabled());
-        this.enableGamepad();
-        this.enableKeyboard();
-        this.enableMouse();
+        this.enableGamepad(options.gamepad);
+        this.enableKeyboard(options.keyboard);
+        this.enableMouse(options.mouse);
         this.enabled = true;
       }
     }
@@ -58454,8 +58466,9 @@ var Input = /*#__PURE__*/function (_EventDispatcher) {
   }, {
     key: "enableGamepad",
     value: function enableGamepad() {
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       dispatch$8(gamepadEnabled());
-      this.gamepad.enable();
+      this.gamepad.enable(options);
       this.gamepad.addEventListener(GAMEPAD_CONNECTED_EVENT, this.propagate.bind(this));
       this.gamepad.addEventListener(GAMEPAD_DISCONNECTED_EVENT, this.propagate.bind(this));
       this.gamepad.addEventListener(BUTTON_RELEASED_EVENT, this.propagate.bind(this));
@@ -58466,16 +58479,18 @@ var Input = /*#__PURE__*/function (_EventDispatcher) {
   }, {
     key: "enableKeyboard",
     value: function enableKeyboard() {
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       dispatch$8(keyboardEnabled());
-      this.keyboard.enable();
+      this.keyboard.enable(options);
       this.keyboard.addEventListener(KEY_DOWN, this.propagate.bind(this));
       this.keyboard.addEventListener(KEY_UP, this.propagate.bind(this));
     }
   }, {
     key: "enableMouse",
     value: function enableMouse() {
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       dispatch$8(mouseEnabled());
-      this.mouse.enable();
+      this.mouse.enable(options);
       this.mouse.addEventListener(MOUSE_DOWN, this.propagate.bind(this));
       this.mouse.addEventListener(MOUSE_UP, this.propagate.bind(this));
       this.mouse.addEventListener(MOUSE_MOVE, this.propagate.bind(this));
@@ -59802,9 +59817,10 @@ var CascadeShadowMaps = /*#__PURE__*/function () {
   }, {
     key: "toJSON",
     value: function toJSON() {
+      var parseJSON = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
       return {
         lights: this.lights.map(function (l) {
-          return l.toJSON();
+          return l.toJSON(parseJSON);
         })
       };
     }
@@ -60007,6 +60023,21 @@ var prepareModel = function prepareModel(model) {
     setUpLightsAndShadows(mesh);
   });
   return model;
+};
+var serializeVector = function serializeVector(vector) {
+  return {
+    x: vector.x,
+    y: vector.y,
+    z: vector.z
+  };
+};
+var serializeQuaternion = function serializeQuaternion(quaternion) {
+  return {
+    x: quaternion.x,
+    y: quaternion.y,
+    z: quaternion.z,
+    w: quaternion.w
+  };
 };var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
 function getAugmentedNamespace(n) {
@@ -60370,10 +60401,13 @@ var tweenTo = function tweenTo(origin, target) {
   }, {
     key: "getHierarchy",
     value: function getHierarchy() {
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var _options$parseJSON = options.parseJSON,
+          parseJSON = _options$parseJSON === void 0 ? false : _options$parseJSON;
       return {
-        element: this.toJSON(),
+        element: this.toJSON(parseJSON),
         children: this.children.map(function (e) {
-          return e.getHierarchy();
+          return e.getHierarchy(options);
         })
       };
     }
@@ -60944,13 +60978,29 @@ var tweenTo = function tweenTo(origin, target) {
   }, {
     key: "toJSON",
     value: function toJSON() {
+      var parseJSON = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+
       if (this.isSerializable()) {
+        var position = this.getPosition();
+        var rotation = this.getRotation();
+        var scale = this.getScale();
+        var quaternion = this.getQuaternion();
+
+        var _this$getWorldTransfo = this.getWorldTransform(),
+            worldPosition = _this$getWorldTransfo.position,
+            worldRotation = _this$getWorldTransfo.rotation,
+            worldQuaternion = _this$getWorldTransfo.quaternion;
+
         return {
-          position: this.getPosition(),
-          rotation: this.getRotation(),
-          quaternion: this.getQuaternion(),
-          worldTransform: this.getWorldTransform(),
-          scale: this.getScale(),
+          position: parseJSON ? serializeVector(position) : position,
+          rotation: parseJSON ? serializeVector(rotation) : rotation,
+          quaternion: parseJSON ? serializeQuaternion(quaternion) : quaternion,
+          scale: parseJSON ? serializeVector(scale) : scale,
+          worldTransform: {
+            position: parseJSON ? serializeVector(worldPosition) : worldPosition,
+            rotation: parseJSON ? serializeVector(worldRotation) : worldRotation,
+            quaternion: parseJSON ? serializeQuaternion(worldQuaternion) : worldQuaternion
+          },
           entityType: this.getEntityType(),
           scripts: this.mapScriptsToJSON(),
           tags: this.getTags(),
@@ -61835,8 +61885,10 @@ var Element$1 = /*#__PURE__*/function (_Entity) {
   }, {
     key: "toJSON",
     value: function toJSON() {
+      var parseJSON = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+
       if (this.isSerializable()) {
-        return _objectSpread2$1(_objectSpread2$1({}, _get(_getPrototypeOf(Element.prototype), "toJSON", this).call(this)), {}, {
+        return _objectSpread2$1(_objectSpread2$1({}, _get(_getPrototypeOf(Element.prototype), "toJSON", this).call(this, parseJSON)), {}, {
           physics: {
             state: this.getPhysicsState(),
             options: this.getPhysicsOptions()
@@ -89588,16 +89640,17 @@ var Level = /*#__PURE__*/function (_EventDispatcher) {
   }, {
     key: "toJSON",
     value: function toJSON() {
-      return _objectSpread2$1(_objectSpread2$1({}, Lights$1.toJSON()), Universe$1.toJSON());
+      var parseJSON = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+      return _objectSpread2$1(_objectSpread2$1({}, Lights$1.toJSON(parseJSON)), Universe$1.toJSON(parseJSON));
     }
   }]);
 
   return Level;
-}(EventDispatcher);var index=/*#__PURE__*/Object.freeze({__proto__:null,getState:getState,createStore:createStore,dispatch:dispatch$8});var CURRENT_SCENE_NAME = 'CURRENT_SCENE_NAME';
-var STATE_SNAPSHOT = 'STATE_SNAPSHOT';
-var TIMESTAMP = 'TIMESTAMP';
-var CURRENT_SCENE_JSON = 'CURRENT_SCENE_JSON';
-var CURRENT_PATH = 'CURRENT_PATH';
+}(EventDispatcher);var index=/*#__PURE__*/Object.freeze({__proto__:null,getState:getState,createStore:createStore,dispatch:dispatch$8});var CURRENT_SCENE_NAME = "CURRENT_SCENE_NAME";
+var STATE_SNAPSHOT = "STATE_SNAPSHOT";
+var TIMESTAMP = "TIMESTAMP";
+var CURRENT_SCENE_JSON = "CURRENT_SCENE_JSON";
+var CURRENT_PATH = "CURRENT_PATH";
 var Storage = /*#__PURE__*/function () {
   function Storage() {
     _classCallCheck(this, Storage);
@@ -89606,13 +89659,17 @@ var Storage = /*#__PURE__*/function () {
   _createClass(Storage, [{
     key: "save",
     value: function save() {
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
       if (Storage.isLocalStorageAvailable()) {
         try {
           var state = getState();
           var timestamp = +new Date();
           var currentScene = GameRunner$1.getCurrentLevel();
           var currentPath = GameRunner$1.getCurrentPath();
-          var sceneJSON = currentScene.toJSON();
+          var _options$parseJSON = options.parseJSON,
+              parseJSON = _options$parseJSON === void 0 ? false : _options$parseJSON;
+          var sceneJSON = currentScene.toJSON(parseJSON);
           var sceneName = currentScene.name;
           localStorage.setItem(TIMESTAMP, timestamp);
           localStorage.setItem(CURRENT_SCENE_NAME, sceneName);
@@ -89673,7 +89730,7 @@ var Storage = /*#__PURE__*/function () {
   }], [{
     key: "isLocalStorageAvailable",
     value: function isLocalStorageAvailable() {
-      return window && window.localStorage && typeof window.localStorage.setItem === 'function' && typeof window.localStorage.getItem === 'function' && typeof window.localStorage.removeItem === 'function' && typeof window.localStorage.clear === 'function';
+      return window && window.localStorage && typeof window.localStorage.setItem === "function" && typeof window.localStorage.getItem === "function" && typeof window.localStorage.removeItem === "function" && typeof window.localStorage.clear === "function";
     }
   }]);
 
@@ -90622,7 +90679,8 @@ var Sound$1 = /*#__PURE__*/function (_Entity) {
   }, {
     key: "toJSON",
     value: function toJSON() {
-      return _objectSpread2$1(_objectSpread2$1({}, _get(_getPrototypeOf(Sound.prototype), "toJSON", this).call(this)), {}, {
+      var parseJSON = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+      return _objectSpread2$1(_objectSpread2$1({}, _get(_getPrototypeOf(Sound.prototype), "toJSON", this).call(this, parseJSON)), {}, {
         source: this.source,
         loop: this.loop,
         loopStart: this.loopStart,
@@ -91179,7 +91237,8 @@ var Sound = /*#__PURE__*/function (_Entity) {
   }, {
     key: "toJSON",
     value: function toJSON() {
-      return _objectSpread2$1(_objectSpread2$1({}, _get(_getPrototypeOf(Sound.prototype), "toJSON", this).call(this)), {}, {
+      var parseJSON = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+      return _objectSpread2$1(_objectSpread2$1({}, _get(_getPrototypeOf(Sound.prototype), "toJSON", this).call(this, parseJSON)), {}, {
         source: this.source,
         loop: this.loop,
         loopStart: this.loopStart,
@@ -91550,7 +91609,8 @@ var addHitBox = function addHitBox(element) {
   }, {
     key: "toJSON",
     value: function toJSON() {
-      return _objectSpread2$1(_objectSpread2$1({}, _get(_getPrototypeOf(Light.prototype), "toJSON", this).call(this)), {}, {
+      var parseJSON = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+      return _objectSpread2$1(_objectSpread2$1({}, _get(_getPrototypeOf(Light.prototype), "toJSON", this).call(this, parseJSON)), {}, {
         type: this.getEntityType(),
         color: this.getColor(),
         intensity: this.getIntensity(),
@@ -91889,7 +91949,8 @@ var SunLight = /*#__PURE__*/function (_Light) {
   }, {
     key: "toJSON",
     value: function toJSON() {
-      return _objectSpread2$1(_objectSpread2$1({}, _get(_getPrototypeOf(SunLight.prototype), "toJSON", this).call(this)), {}, {
+      var parseJSON = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+      return _objectSpread2$1(_objectSpread2$1({}, _get(_getPrototypeOf(SunLight.prototype), "toJSON", this).call(this, parseJSON)), {}, {
         target: this.getTarget(),
         bias: this.getBias(),
         mapSize: this.getMapSize(),
@@ -92120,8 +92181,8 @@ var PointLight = /*#__PURE__*/function (_Light) {
     }
   }, {
     key: "toJSON",
-    value: function toJSON() {
-      return _objectSpread2$1(_objectSpread2$1({}, _get(_getPrototypeOf(PointLight.prototype), "toJSON", this).call(this)), {}, {
+    value: function toJSON(parseJSON) {
+      return _objectSpread2$1(_objectSpread2$1({}, _get(_getPrototypeOf(PointLight.prototype), "toJSON", this).call(this, parseJSON)), {}, {
         distance: this.getDistance(),
         decay: this.getDecay(),
         bias: this.getBias(),
@@ -92418,7 +92479,8 @@ var SpotLight = /*#__PURE__*/function (_Light) {
   }, {
     key: "toJSON",
     value: function toJSON() {
-      return _objectSpread2$1(_objectSpread2$1({}, _get(_getPrototypeOf(SpotLight.prototype), "toJSON", this).call(this)), {}, {
+      var parseJSON = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+      return _objectSpread2$1(_objectSpread2$1({}, _get(_getPrototypeOf(SpotLight.prototype), "toJSON", this).call(this, parseJSON)), {}, {
         target: this.getTarget(),
         distance: this.getDistance(),
         decay: this.getDecay(),
@@ -92664,7 +92726,8 @@ var SpotLight = /*#__PURE__*/function (_Light) {
   }, {
     key: "toJSON",
     value: function toJSON() {
-      return _objectSpread2$1(_objectSpread2$1({}, _get(_getPrototypeOf(Light.prototype), "toJSON", this).call(this)), {}, {
+      var parseJSON = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+      return _objectSpread2$1(_objectSpread2$1({}, _get(_getPrototypeOf(Light.prototype), "toJSON", this).call(this, parseJSON)), {}, {
         type: this.getEntityType(),
         color: this.getColor(),
         intensity: this.getIntensity(),
@@ -92795,7 +92858,8 @@ var HemisphereLight = /*#__PURE__*/function (_Light) {
   }, {
     key: "toJSON",
     value: function toJSON() {
-      return _objectSpread2$1(_objectSpread2$1({}, _get(_getPrototypeOf(HemisphereLight.prototype), "toJSON", this).call(this)), {}, {
+      var parseJSON = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+      return _objectSpread2$1(_objectSpread2$1({}, _get(_getPrototypeOf(HemisphereLight.prototype), "toJSON", this).call(this, parseJSON)), {}, {
         color: this.getColor()
       });
     }

package/package.json

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