mage-engine 3.23.7 → 3.23.9

package/dist/mage.js

@@ -53958,7 +53958,7 @@ var STATE_MACHINE_NOT_AVAILABLE = "".concat(PREFIX, " State Machine is not enabl
 var EFFECT_COULD_NOT_BE_CREATED = "".concat(PREFIX, "  Could not create requested effect.");
 var EFFECT_UNAVAILABLE = "".concat(PREFIX, "  Requested effect is not available.");
 var SCRIPT_NOT_FOUND = "".concat(PREFIX, " Could not find desired script.");
-var KEYBOARD_COMBO_ALREADY_REGISTERED = "".concat(PREFIX, " Keyboard combo already registered.");
+var KEYBOARD_COMBO_IS_INVALID = "".concat(PREFIX, " Keyboard combo is not valid.");
 var PHYSICS_ELEMENT_CANT_BE_REMOVED = "".concat(PREFIX, " This element can't be removed from physics world.");
 var PHYSICS_ELEMENT_ALREADY_STORED = "".concat(PREFIX, " This element has already been added to the world.");
 var ASSETS_AUDIO_LOAD_FAIL = "".concat(PREFIX, " Could not load audio.");
@@ -54633,13 +54633,15 @@ if (typeof window !== 'undefined') {
   };
 
   window.hotkeys = hotkeys;
-}var DEFAULT_OPTIONS$1 = {
+}var HOTKEYS_DEFAULT_OPTIONS = {
   keyup: true,
   keydown: true
 };
-var KEY_PRESS = 'keyPress';
-var KEY_DOWN = 'keyDown';
-var KEY_UP = 'keyUp';
+var COMBINATION_DIVIDER = ",";
+var KEY_PRESS = "keyPress";
+var KEY_DOWN = "keyDown";
+var KEY_UP = "keyUp";
+var KEY_COMBO = "keyCombo";
 
 var Keyboard = /*#__PURE__*/function (_EventDispatcher) {
   _inherits(Keyboard, _EventDispatcher);
@@ -54653,6 +54655,13 @@ var Keyboard = /*#__PURE__*/function (_EventDispatcher) {
 
     _this = _super.call(this);
 
+    _defineProperty$1(_assertThisInitialized(_this), "handleCombo", function (event) {
+      _this.dispatchEvent({
+        type: KEY_COMBO,
+        event: event
+      });
+    });
+
     _defineProperty$1(_assertThisInitialized(_this), "handleKeydown", function (event) {
       _this.dispatchEvent({
         type: KEY_DOWN,
@@ -54680,26 +54689,29 @@ var Keyboard = /*#__PURE__*/function (_EventDispatcher) {
   }
 
   _createClass(Keyboard, [{
-    key: "register",
-    value: function register(combo, handler) {
+    key: "listenTo",
+    value: function listenTo() {
+      var combos = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+
       if (this.enabled) {
-        if (this.combos.includes(combo)) {
-          console.warn(KEYBOARD_COMBO_ALREADY_REGISTERED);
-          return;
+        if (!(combos instanceof Array) || !combos.length) {
+          console.warn(KEYBOARD_COMBO_IS_INVALID);
         }
 
-        this.combos.push(combo);
-        hotkeys(combo, DEFAULT_OPTIONS$1, handler);
+        var parsedCombos = combos.join(COMBINATION_DIVIDER);
+        hotkeys(parsedCombos, HOTKEYS_DEFAULT_OPTIONS, this.handleCombo);
       }
     }
   }, {
     key: "enable",
     value: function enable() {
-      var cb = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : function (f) {
-        return f;
-      };
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       this.enabled = true;
-      this.register('*', cb);
+
+      if (options.combos) {
+        this.listenTo(options.combos);
+      }
+
       window.addEventListener(KEY_DOWN.toLowerCase(), this.handleKeydown.bind(this));
       window.addEventListener(KEY_UP.toLowerCase(), this.handleKeyup.bind(this));
       window.addEventListener(KEY_PRESS.toLowerCase(), this.handleKeypress.bind(this));
@@ -56423,7 +56435,7 @@ var Physics$1 = new Physics();var Scene = /*#__PURE__*/function () {
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       return [{
         element: this.toJSON(options.parseJSON),
-        children: [this.getCamera().getHierarchy()].concat(_toConsumableArray(this.elements.filter(function (e) {
+        children: [this.getCamera().getHierarchy(options)].concat(_toConsumableArray(this.elements.filter(function (e) {
           return !e.hasParent() && !e.isHelper() && e.isSerializable();
         }).map(function (e) {
           return e.getHierarchy(options);
@@ -57786,7 +57798,7 @@ function applyMiddleware() {
 
 var thunk = createThunkMiddleware();
 thunk.withExtraArgument = createThunkMiddleware;var name$1 = "mage-engine";
-var version$1 = "3.23.7";
+var version$1 = "3.23.9";
 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 = {
@@ -58404,9 +58416,9 @@ var Gamepad = /*#__PURE__*/function (_EventDispatcher) {
   return Gamepad;
 }(EventDispatcher);var _INPUT_EVENTS;
 var INPUT_EVENTS = (_INPUT_EVENTS = {
-  KEY_PRESS: KEY_PRESS,
   KEY_DOWN: KEY_DOWN,
   KEY_UP: KEY_UP,
+  KEY_COMBO: KEY_COMBO,
   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);
@@ -58484,6 +58496,7 @@ var Input = /*#__PURE__*/function (_EventDispatcher) {
       this.keyboard.enable(options);
       this.keyboard.addEventListener(KEY_DOWN, this.propagate.bind(this));
       this.keyboard.addEventListener(KEY_UP, this.propagate.bind(this));
+      this.keyboard.addEventListener(KEY_COMBO, this.propagate.bind(this));
     }
   }, {
     key: "enableMouse",
@@ -60038,6 +60051,13 @@ var serializeQuaternion = function serializeQuaternion(quaternion) {
     z: quaternion.z,
     w: quaternion.w
   };
+};
+var serializeColor = function serializeColor(color) {
+  return {
+    r: color.r,
+    g: color.g,
+    b: color.b
+  };
 };var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
 function getAugmentedNamespace(n) {
@@ -61888,6 +61908,7 @@ var Element$1 = /*#__PURE__*/function (_Entity) {
       var parseJSON = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
 
       if (this.isSerializable()) {
+        var color = this.getColor();
         return _objectSpread2$1(_objectSpread2$1({}, _get(_getPrototypeOf(Element.prototype), "toJSON", this).call(this, parseJSON)), {}, {
           physics: {
             state: this.getPhysicsState(),
@@ -61897,7 +61918,7 @@ var Element$1 = /*#__PURE__*/function (_Entity) {
           textures: this.textures,
           materialType: this.getMaterialType(),
           opacity: this.opacity,
-          color: this.getColor()
+          color: parseJSON ? serializeColor(color) : color
         });
       }
     }
@@ -61984,8 +62005,8 @@ var Element$1 = /*#__PURE__*/function (_Entity) {
     key: "randomColor",
     value: function randomColor() {
       var asNumber = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-      var letters = '0123456789ABCDEF'.split('');
-      var color = '';
+      var letters = "0123456789ABCDEF".split("");
+      var color = "";
 
       for (var i = 0; i < 6; i++) {
         color += letters[Math.floor(Math.random() * 16)];

package/package.json

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