mage-engine 3.23.5 → 3.23.6

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);
       }
     }
   }, {
@@ -56655,6 +56655,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 +56718,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 +56751,6 @@ var Mouse = /*#__PURE__*/function (_EventDispatcher) {
 
       var elements = _this.getIntersections();
 
-      console.log("clicked elements", elements);
       _this.elementClickEvent.elements = elements;
 
       if (!elements.length) {
@@ -56760,6 +56763,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 +56798,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 +56816,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 +57784,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.6";
 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 +58408,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 +58435,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 +58464,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 +58477,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));

package/package.json

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