mage-engine 3.19.0 → 3.20.0

package/dist/mage.js

@@ -24,14 +24,14 @@ function _objectSpread2$1(target) {
   return target;
 }
 
-function _typeof$1(obj) {
+function _typeof(obj) {
   "@babel/helpers - typeof";
 
-  return _typeof$1 = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
+  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
     return typeof obj;
   } : function (obj) {
     return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-  }, _typeof$1(obj);
+  }, _typeof(obj);
 }
 
 function _classCallCheck(instance, Constructor) {
@@ -121,6 +121,23 @@ function _isNativeReflectConstruct() {
   }
 }
 
+function _construct(Parent, args, Class) {
+  if (_isNativeReflectConstruct()) {
+    _construct = Reflect.construct;
+  } else {
+    _construct = function _construct(Parent, args, Class) {
+      var a = [null];
+      a.push.apply(a, args);
+      var Constructor = Function.bind.apply(Parent, a);
+      var instance = new Constructor();
+      if (Class) _setPrototypeOf(instance, Class.prototype);
+      return instance;
+    };
+  }
+
+  return _construct.apply(null, arguments);
+}
+
 function _objectWithoutPropertiesLoose(source, excluded) {
   if (source == null) return {};
   var target = {};
@@ -53661,7 +53678,7 @@ var LABEL_DOMELEMENT_MISSING = "".concat(PREFIX, " Could not create Label, domEl
   function BaseScript(name) {
     _classCallCheck(this, BaseScript);
 
-    this.__name = name || this.contructor.name;
+    this.__name = name || this.constructor.name;
     this.hasStarted = false;
     this.options = {};
   }
@@ -53693,35 +53710,20 @@ var LABEL_DOMELEMENT_MISSING = "".concat(PREFIX, " Could not create Label, domEl
   }]);
 
   return BaseScript;
-}();/*!
- * hotkeys-js v3.7.2
- * A simple micro-library for defining and dispatching keyboard shortcuts. It has no dependencies.
- * 
- * Copyright (c) 2019 kenny wong <wowohoo@qq.com>
- * http://jaywcjlove.github.io/hotkeys
+}();/**! 
+ * hotkeys-js v3.9.4 
+ * A simple micro-library for defining and dispatching keyboard shortcuts. It has no dependencies. 
  * 
- * Licensed under the MIT license.
+ * Copyright (c) 2022 kenny wong <wowohoo@qq.com> 
+ * http://jaywcjlove.github.io/hotkeys 
+ * Licensed under the MIT license 
  */
 
-function _typeof(obj) {
-  if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
-    _typeof = function (obj) {
-      return typeof obj;
-    };
-  } else {
-    _typeof = function (obj) {
-      return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-    };
-  }
-
-  return _typeof(obj);
-}
-
 var isff = typeof navigator !== 'undefined' ? navigator.userAgent.toLowerCase().indexOf('firefox') > 0 : false; // 绑定事件
 
-function addEvent(object, event, method) {
+function addEvent(object, event, method, useCapture) {
   if (object.addEventListener) {
-    object.addEventListener(event, method, false);
+    object.addEventListener(event, method, useCapture);
   } else if (object.attachEvent) {
     object.attachEvent("on".concat(event), function () {
       method(window.event);
@@ -53776,7 +53778,7 @@ var _keyMap = {
   tab: 9,
   clear: 12,
   enter: 13,
-  "return": 13,
+  return: 13,
   esc: 27,
   escape: 27,
   space: 32,
@@ -53785,7 +53787,7 @@ var _keyMap = {
   right: 39,
   down: 40,
   del: 46,
-  "delete": 46,
+  delete: 46,
   ins: 45,
   insert: 45,
   home: 36,
@@ -53793,6 +53795,22 @@ var _keyMap = {
   pageup: 33,
   pagedown: 34,
   capslock: 20,
+  num_0: 96,
+  num_1: 97,
+  num_2: 98,
+  num_3: 99,
+  num_4: 100,
+  num_5: 101,
+  num_6: 102,
+  num_7: 103,
+  num_8: 104,
+  num_9: 105,
+  num_multiply: 106,
+  num_add: 107,
+  num_enter: 108,
+  num_subtract: 109,
+  num_decimal: 110,
+  num_divide: 111,
   '⇪': 20,
   ',': 188,
   '.': 190,
@@ -53848,6 +53866,8 @@ for (var k$1 = 1; k$1 < 20; k$1++) {
 
 var _downKeys = []; // 记录摁下的绑定键
 
+var winListendFocus = false; // window是否已经监听了focus事件
+
 var _scope = 'all'; // 默认热键范围
 
 var elementHasBindEvent = []; // 已绑定事件的节点记录
@@ -53879,7 +53899,7 @@ function filter$1(event) {
   var tagName = target.tagName;
   var flag = true; // ignore: isContentEditable === 'true', <input> and <textarea> when readOnly state is false, <select>
 
-  if (target.isContentEditable || tagName === 'TEXTAREA' || (tagName === 'INPUT' || tagName === 'TEXTAREA') && !target.readOnly) {
+  if (target.isContentEditable || (tagName === 'INPUT' || tagName === 'TEXTAREA' || tagName === 'SELECT') && !target.readOnly) {
     flag = false;
   }
 
@@ -53946,7 +53966,7 @@ function clearModifier(event) {
 
 function unbind(keysInfo) {
   // unbind(), unbind all keys
-  if (!keysInfo) {
+  if (typeof keysInfo === 'undefined') {
     Object.keys(_handlers).forEach(function (key) {
       return delete _handlers[key];
     });
@@ -53955,7 +53975,7 @@ function unbind(keysInfo) {
     keysInfo.forEach(function (info) {
       if (info.key) eachUnbind(info);
     });
-  } else if (_typeof(keysInfo) === 'object') {
+  } else if (typeof keysInfo === 'object') {
     // support like unbind({key: 'ctrl+a, ctrl+b', scope:'abc'})
     if (keysInfo.key) eachUnbind(keysInfo);
   } else if (typeof keysInfo === 'string') {
@@ -53999,21 +54019,20 @@ var eachUnbind = function eachUnbind(_ref) {
 
     if (!scope) scope = getScope();
     var mods = len > 1 ? getMods(_modifier, unbindKeys) : [];
-    _handlers[keyCode] = _handlers[keyCode].map(function (record) {
+    _handlers[keyCode] = _handlers[keyCode].filter(function (record) {
       // 通过函数判断，是否解除绑定，函数相等直接返回
       var isMatchingMethod = method ? record.method === method : true;
-
-      if (isMatchingMethod && record.scope === scope && compareArray(record.mods, mods)) {
-        return {};
-      }
-
-      return record;
+      return !(isMatchingMethod && record.scope === scope && compareArray(record.mods, mods));
     });
   });
 }; // 对监听对应快捷键的回调函数进行处理
 
 
-function eventHandler(event, handler, scope) {
+function eventHandler(event, handler, scope, element) {
+  if (handler.element !== element) {
+    return;
+  }
+
   var modifiersMatch; // 看它是否在当前范围
 
   if (handler.scope === scope || handler.scope === 'all') {
@@ -54040,7 +54059,7 @@ function eventHandler(event, handler, scope) {
 } // 处理keydown事件
 
 
-function dispatch$9(event) {
+function dispatch$9(event, element) {
   var asterisk = _handlers['*'];
   var key = event.keyCode || event.which || event.charCode; // 表单控件过滤 默认表单控件不触发快捷键
 
@@ -54068,6 +54087,14 @@ function dispatch$9(event) {
       _downKeys.push(keyNum);
     } else if (!event[keyName] && _downKeys.indexOf(keyNum) > -1) {
       _downKeys.splice(_downKeys.indexOf(keyNum), 1);
+    } else if (keyName === 'metaKey' && event[keyName] && _downKeys.length === 3) {
+      /**
+       * Fix if Command is pressed:
+       * ===============================
+       */
+      if (!(event.ctrlKey || event.shiftKey || event.altKey)) {
+        _downKeys = _downKeys.slice(_downKeys.indexOf(keyNum));
+      }
     }
   });
   /**
@@ -54089,6 +54116,26 @@ function dispatch$9(event) {
     if (Object.prototype.hasOwnProperty.call(_mods, e)) {
       _mods[e] = event[modifierMap[e]];
     }
+  }
+  /**
+   * https://github.com/jaywcjlove/hotkeys/pull/129
+   * This solves the issue in Firefox on Windows where hotkeys corresponding to special characters would not trigger.
+   * An example of this is ctrl+alt+m on a Swedish keyboard which is used to type μ.
+   * Browser support: https://caniuse.com/#feat=keyboardevent-getmodifierstate
+   */
+
+
+  if (event.getModifierState && !(event.altKey && !event.ctrlKey) && event.getModifierState('AltGraph')) {
+    if (_downKeys.indexOf(17) === -1) {
+      _downKeys.push(17);
+    }
+
+    if (_downKeys.indexOf(18) === -1) {
+      _downKeys.push(18);
+    }
+
+    _mods[17] = true;
+    _mods[18] = true;
   } // 获取范围 默认为 `all`
 
 
@@ -54097,7 +54144,7 @@ function dispatch$9(event) {
   if (asterisk) {
     for (var i = 0; i < asterisk.length; i++) {
       if (asterisk[i].scope === scope && (event.type === 'keydown' && asterisk[i].keydown || event.type === 'keyup' && asterisk[i].keyup)) {
-        eventHandler(event, asterisk[i], scope);
+        eventHandler(event, asterisk[i], scope, element);
       }
     }
   } // key 不在 _handlers 中返回
@@ -54119,7 +54166,7 @@ function dispatch$9(event) {
 
         if (_downKeysCurrent.sort().join('') === _downKeys.sort().join('')) {
           // 找到处理内容
-          eventHandler(event, record, scope);
+          eventHandler(event, record, scope, element);
         }
       }
     }
@@ -54143,7 +54190,8 @@ function hotkeys(key, option, method) {
   var i = 0;
   var keyup = false;
   var keydown = true;
-  var splitKey = '+'; // 对为设定范围的判断
+  var splitKey = '+';
+  var capture = false; // 对为设定范围的判断
 
   if (method === undefined && typeof option === 'function') {
     method = option;
@@ -54158,6 +54206,8 @@ function hotkeys(key, option, method) {
 
     if (option.keydown !== undefined) keydown = option.keydown; // eslint-disable-line
 
+    if (option.capture !== undefined) capture = option.capture; // eslint-disable-line
+
     if (typeof option.splitKey === 'string') splitKey = option.splitKey; // eslint-disable-line
   }
 
@@ -54184,7 +54234,8 @@ function hotkeys(key, option, method) {
       shortcut: keys[i],
       method: method,
       key: keys[i],
-      splitKey: splitKey
+      splitKey: splitKey,
+      element: element
     });
   } // 在全局document上设置快捷键
 
@@ -54192,18 +54243,36 @@ function hotkeys(key, option, method) {
   if (typeof element !== 'undefined' && !isElementBind(element) && window) {
     elementHasBindEvent.push(element);
     addEvent(element, 'keydown', function (e) {
-      dispatch$9(e);
-    });
-    addEvent(window, 'focus', function () {
-      _downKeys = [];
-    });
+      dispatch$9(e, element);
+    }, capture);
+
+    if (!winListendFocus) {
+      winListendFocus = true;
+      addEvent(window, 'focus', function () {
+        _downKeys = [];
+      }, capture);
+    }
+
     addEvent(element, 'keyup', function (e) {
-      dispatch$9(e);
+      dispatch$9(e, element);
       clearModifier(e);
-    });
+    }, capture);
   }
 }
 
+function trigger(shortcut) {
+  var scope = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'all';
+  Object.keys(_handlers).forEach(function (key) {
+    var data = _handlers[key].find(function (item) {
+      return item.scope === scope && item.shortcut === shortcut;
+    });
+
+    if (data && data.method) {
+      data.method();
+    }
+  });
+}
+
 var _api = {
   setScope: setScope,
   getScope: getScope,
@@ -54211,7 +54280,11 @@ var _api = {
   getPressedKeyCodes: getPressedKeyCodes,
   isPressed: isPressed,
   filter: filter$1,
-  unbind: unbind
+  trigger: trigger,
+  unbind: unbind,
+  keyMap: _keyMap,
+  modifier: _modifier,
+  modifierMap: modifierMap
 };
 
 for (var a in _api) {
@@ -54294,18 +54367,23 @@ var Keyboard = /*#__PURE__*/function (_EventDispatcher) {
   }, {
     key: "enable",
     value: function enable() {
+      var cb = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : function (f) {
+        return f;
+      };
       this.enabled = true;
-      window.addEventListener(KEY_DOWN, this.handleKeydown.bind(this));
-      window.addEventListener(KEY_UP, this.handleKeyup.bind(this));
-      window.addEventListener(KEY_PRESS, this.handleKeypress.bind(this));
+      this.register('*', cb);
+      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));
     }
   }, {
     key: "disable",
     value: function disable() {
       this.enabled = false;
-      window.removeEventListener(KEY_DOWN, this.handleKeydown.bind(this));
-      window.removeEventListener(KEY_UP, this.handleKeyup.bind(this));
-      window.removeEventListener(KEY_PRESS, this.handleKeypress.bind(this));
+      hotkeys.unbind();
+      window.removeEventListener(KEY_DOWN.toLowerCase(), this.handleKeydown.bind(this));
+      window.removeEventListener(KEY_UP.toLowerCase(), this.handleKeyup.bind(this));
+      window.removeEventListener(KEY_PRESS.toLowerCase(), this.handleKeypress.bind(this));
     }
   }, {
     key: "isPressed",
@@ -55937,7 +56015,7 @@ var DEFAULT_TAG = 'all';var Scene = /*#__PURE__*/function () {
       var name = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : generateRandomName('LevelName');
       var fog = Config$1.fog();
       this.scene = new Scene$2();
-      this.scene.name = name; // this.scene.overrideMaterial = null; // should be null by default, but it's not.
+      this.scene.name = name;
 
       if (fog.enabled) {
         this.fog(fog.color, fog.density);
@@ -57333,7 +57411,7 @@ function applyMiddleware() {
 
 var thunk = createThunkMiddleware();
 thunk.withExtraArgument = createThunkMiddleware;var name = "mage-engine";
-var version$1 = "3.19.0";
+var version$1 = "3.20.0";
 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 = {
@@ -57375,7 +57453,7 @@ var dependencies = {
 	"@babel/plugin-transform-runtime": "7.5.0",
 	"@babel/runtime": "7.5.0",
 	"between.js": "0.1.2-fix.2",
-	"hotkeys-js": "3.7.2",
+	"hotkeys-js": "3.9.4",
 	"html-to-image": "^1.9.0",
 	html2canvas: "^1.4.1",
 	inferno: "7.3.2",
@@ -58602,7 +58680,7 @@ if (!self.fetch) {
   self.Headers = Headers;
   self.Request = Request;
   self.Response = Response;
-}var _excluded$7 = ["wheels", "accelerationKey", "brakingKey", "rightKey", "leftKey", "debug"];
+}var _excluded$7 = ["wheels", "accelerationKey", "brakingKey", "rightKey", "leftKey", "debug", "autostart"];
 
 var BaseCar = /*#__PURE__*/function (_BaseScript) {
   _inherits(BaseCar, _BaseScript);
@@ -58628,7 +58706,9 @@ var BaseCar = /*#__PURE__*/function (_BaseScript) {
           _options$leftKey = options.leftKey,
           leftKey = _options$leftKey === void 0 ? 'a' : _options$leftKey;
           options.debug;
-          var physicsOptions = _objectWithoutProperties(options, _excluded$7);
+          var _options$autostart = options.autostart,
+          autostart = _options$autostart === void 0 ? true : _options$autostart,
+          physicsOptions = _objectWithoutProperties(options, _excluded$7);
 
       this.car = element;
       this.wheels = wheels;
@@ -58642,6 +58722,7 @@ var BaseCar = /*#__PURE__*/function (_BaseScript) {
       this.brakingKey = brakingKey;
       this.rightKey = rightKey;
       this.leftKey = leftKey;
+      this.engineStarted = autostart;
       Input$1.enable();
       Physics$1.addVehicle(this.car, _objectSpread2$1({
         wheels: wheels.map(function (w) {
@@ -58649,6 +58730,16 @@ var BaseCar = /*#__PURE__*/function (_BaseScript) {
         })
       }, physicsOptions));
     }
+  }, {
+    key: "startEngine",
+    value: function startEngine() {
+      this.engineStarted = true;
+    }
+  }, {
+    key: "stopEngine",
+    value: function stopEngine() {
+      this.engineStarted = false;
+    }
   }, {
     key: "handleInput",
     value: function handleInput() {
@@ -58665,8 +58756,10 @@ var BaseCar = /*#__PURE__*/function (_BaseScript) {
   }, {
     key: "update",
     value: function update(dt) {
-      this.handleInput();
-      this.sendCarUpdate();
+      if (this.engineStarted) {
+        this.handleInput();
+        this.sendCarUpdate();
+      }
     }
   }]);
 
@@ -58707,7 +58800,8 @@ var SmoothCarFollow = /*#__PURE__*/function (_BaseScript) {
           _options$distanceSnap = options.distanceSnapTime,
           distanceSnapTime = _options$distanceSnap === void 0 ? DEFAULT_DISTANCE_SNAP_TIME : _options$distanceSnap,
           _options$distanceMult = options.distanceMultiplier,
-          distanceMultiplier = _options$distanceMult === void 0 ? DEFAULT_DISTANCE_MULTIPLIER : _options$distanceMult;
+          distanceMultiplier = _options$distanceMult === void 0 ? DEFAULT_DISTANCE_MULTIPLIER : _options$distanceMult,
+          lerpFactor = options.lerpFactor;
       this.camera = camera;
       this.target = target;
       this.height = height;
@@ -58716,6 +58810,7 @@ var SmoothCarFollow = /*#__PURE__*/function (_BaseScript) {
       this.rotationSnapTime = rotationSnapTime;
       this.distanceSnapTime = distanceSnapTime;
       this.distanceMultiplier = distanceMultiplier;
+      this.lerpFactor = lerpFactor;
       this.lookAtVector = new Vector3$1(0, lookAtHeight, 0);
     }
   }, {
@@ -58731,9 +58826,9 @@ var SmoothCarFollow = /*#__PURE__*/function (_BaseScript) {
         var targetPosition = this.target.getPosition();
         var vector = new Vector3$1(x, y, z).negate().normalize().multiplyScalar(this.distance);
         vector.y = y + this.height;
-        var desiredPosition = targetPosition.add(vector); // const lerpFactor = 1 - Math.pow(0.1, dt);
-
-        cameraPosition.lerpVectors(cameraPosition, desiredPosition, dt);
+        var desiredPosition = targetPosition.add(vector);
+        var lerpFactor = this.lerpFactor || 1 - Math.pow(0.1, dt);
+        cameraPosition.lerpVectors(cameraPosition, desiredPosition, lerpFactor);
         this.camera.setPosition(cameraPosition);
         var lookAtTarget = new Vector3$1();
         lookAtTarget.copy(this.target.getPosition().add(this.lookAtVector));
@@ -58962,14 +59057,14 @@ var _bbox = new Box3();
 
 var _uniformArray = [];
 var _logArray = [];
-var DEFAULT_MAX_FAR = 100000;
+var DEFAULT_MAX_FAR = 5000;
 var DEFAULT_MODE = 'practical';
 var DEFAULT_SHADOWMAP_SIZE = 2048;
 var DEFAULT_CASCADE = 3;
 var DEFAULT_BIAS$3 = 0.000001;
 var DEFAULT_INTENSITY$5 = 1;
 var DEFAULT_NEAR$3 = 1;
-var DEFAULT_FAR$3 = 2000;
+var DEFAULT_FAR$3 = 1000;
 var DEFAULT_MARGIN = 200;
 var CascadeShadowMaps = /*#__PURE__*/function () {
   function CascadeShadowMaps(_ref) {
@@ -59304,33 +59399,30 @@ var CascadeShadowMaps = /*#__PURE__*/function () {
 }();var POINTLIGHT = 'pointlight';
 var AMBIENTLIGHT = 'ambientlight';
 var SUNLIGHT = 'sunlight';
-var SPOTLIGHT = 'spotlight';
-var HEMISPHERELIGHT = 'hemisphere';
-var TIME_TO_UPDATE = 5;
 var Lights = /*#__PURE__*/function () {
   function Lights() {
     _classCallCheck(this, Lights);
 
-    this.delayFactor = 0.1;
-    this.delayStep = 30;
-    this.holderRadius = 0.01;
-    this.holderSegments = 1;
-    this.numLights = 0;
-    this.map = {};
     this.lights = [];
     this.csm = undefined;
   }
 
   _createClass(Lights, [{
-    key: "isUsingCSM",
-    value: function isUsingCSM() {
+    key: "getLights",
+    value: function getLights() {
+      return this.lights;
+    }
+  }, {
+    key: "isUsingCascadeShadowMaps",
+    value: function isUsingCascadeShadowMaps() {
       return !!this.csm;
     }
   }, {
-    key: "setUpCSM",
-    value: function setUpCSM() {
+    key: "createCascadeShadowMaps",
+    value: function createCascadeShadowMaps() {
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       this.csm = new CascadeShadowMaps(options);
+      return this.csm;
     }
   }, {
     key: "add",
@@ -59340,17 +59432,9 @@ var Lights = /*#__PURE__*/function () {
   }, {
     key: "update",
     value: function update(dt) {
-      if (this.isUsingCSM()) {
+      if (this.isUsingCascadeShadowMaps()) {
         this.csm.update();
       }
-
-      var start = new Date();
-
-      for (var index in this.lights) {
-        var light = this.lights[index];
-        light.update(dt);
-        if (+new Date() - start > TIME_TO_UPDATE) break;
-      }
     }
   }, {
     key: "toJSON",
@@ -59447,7 +59531,7 @@ var ToonMaterial = /*#__PURE__*/function (_ShaderMaterial) {
 
   if (hasMaterial(mesh)) {
     var setUpMaterial = function setUpMaterial(material) {
-      if (Lights$1.isUsingCSM()) {
+      if (Lights$1.isUsingCascadeShadowMaps()) {
         Lights$1.csm.setupMaterial(material);
       }
 
@@ -59474,38 +59558,38 @@ var hasGeometry = function hasGeometry(mesh) {
 var processMaterial = function processMaterial(material, callback) {
   return Array.isArray(material) ? material.map(callback) : callback(material);
 };
-var changeMaterialByName = function changeMaterialByName(name, mesh, materialOptions) {
+var replaceMaterialByName = function replaceMaterialByName(name, mesh, materialOptions) {
   if (!hasMaterial(mesh)) return;
 
   switch (name) {
     case MATERIALS.LAMBERT:
-      return cloneMaterial(MeshLambertMaterial, mesh, materialOptions);
+      return replaceMaterial(MeshLambertMaterial, mesh, materialOptions);
 
     case MATERIALS.PHONG:
-      return cloneMaterial(MeshPhongMaterial, mesh, materialOptions);
+      return replaceMaterial(MeshPhongMaterial, mesh, materialOptions);
 
     case MATERIALS.DEPTH:
-      return cloneMaterial(MeshDepthMaterial, mesh, materialOptions);
+      return replaceMaterial(MeshDepthMaterial, mesh, materialOptions);
 
     case MATERIALS.STANDARD:
-      return cloneMaterial(MeshStandardMaterial, mesh, materialOptions);
+      return replaceMaterial(MeshStandardMaterial, mesh, materialOptions);
 
     case MATERIALS.TOON:
-      return cloneMaterial(ToonMaterial, mesh, materialOptions);
+      return replaceMaterial(ToonMaterial, mesh, materialOptions);
 
     case MATERIALS.THREE_TOON:
-      return cloneMaterial(MeshToonMaterial, mesh, materialOptions);
+      return replaceMaterial(MeshToonMaterial, mesh, materialOptions);
 
     case MATERIALS.BASIC:
     default:
-      return cloneMaterial(MeshBasicMaterial, mesh, materialOptions);
+      return replaceMaterial(MeshBasicMaterial, mesh, materialOptions);
   }
 };
 
-var cloneMaterial = function cloneMaterial(MeshMaterial, mesh) {
+var replaceMaterial = function replaceMaterial(MeshMaterial, mesh) {
   var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
 
-  var _cloneMaterial = function _cloneMaterial(material) {
+  var _replaceMaterial = function _replaceMaterial(material) {
     var clone = material.clone();
     var newMaterial = new MeshMaterial(_objectSpread2$1({
       map: clone.map,
@@ -59515,8 +59599,9 @@ var cloneMaterial = function cloneMaterial(MeshMaterial, mesh) {
     return newMaterial;
   };
 
-  mesh.material = processMaterial(mesh.material, _cloneMaterial);
+  mesh.material = processMaterial(mesh.material, _replaceMaterial);
   setUpLightsAndShadows(mesh);
+  return mesh.material;
 };
 
 var disposeTextures = function disposeTextures(mesh) {
@@ -59548,7 +59633,12 @@ var prepareModel = function prepareModel(model) {
     setUpLightsAndShadows(mesh);
   });
   return model;
-};var Entity = /*#__PURE__*/function (_EventDispatcher) {
+};var LOOPING = {
+  BOUNCE: 'bounce',
+  REPEAT: 'repeat',
+  NONE: false
+};
+var FUNCTIONS = _objectSpread2$1({}, Between.Easing);var easing=/*#__PURE__*/Object.freeze({__proto__:null,LOOPING:LOOPING,FUNCTIONS:FUNCTIONS});var Entity = /*#__PURE__*/function (_EventDispatcher) {
   _inherits(Entity, _EventDispatcher);
 
   var _super = _createSuper(Entity);
@@ -59577,7 +59667,7 @@ var prepareModel = function prepareModel(model) {
     });
 
     _defineProperty$1(_assertThisInitialized(_this), "addTag", function (tagName) {
-      if (!tagName) return;
+      if (!tagName) return false;
 
       if (!_this.hasTag(tagName)) {
         _this.tags.push(tagName);
@@ -59714,7 +59804,10 @@ var prepareModel = function prepareModel(model) {
     }
   }, {
     key: "setBody",
-    value: function setBody(body) {
+    value: function setBody() {
+      var _ref3 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+          body = _ref3.body;
+
       this.body = body;
     }
   }, {
@@ -59739,11 +59832,11 @@ var prepareModel = function prepareModel(model) {
 
       var container = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.getBody();
 
-      var _ref3 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
-          _ref3$waitForBody = _ref3.waitForBody,
-          waitForBody = _ref3$waitForBody === void 0 ? 0 : _ref3$waitForBody,
-          _ref3$waitForBodyMaxR = _ref3.waitForBodyMaxRetries,
-          waitForBodyMaxRetries = _ref3$waitForBodyMaxR === void 0 ? 1 : _ref3$waitForBodyMaxR;
+      var _ref4 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
+          _ref4$waitForBody = _ref4.waitForBody,
+          waitForBody = _ref4$waitForBody === void 0 ? 0 : _ref4$waitForBody,
+          _ref4$waitForBodyMaxR = _ref4.waitForBodyMaxRetries,
+          waitForBodyMaxRetries = _ref4$waitForBodyMaxR === void 0 ? 1 : _ref4$waitForBodyMaxR;
 
       if (this.hasBody()) {
         var _add = function _add(toAdd) {
@@ -59847,13 +59940,15 @@ var prepareModel = function prepareModel(model) {
     value: function removeTag(tagName) {
       if (tagName === DEFAULT_TAG) {
         console.log(TAG_CANT_BE_REMOVED);
-        return;
+        return false;
       }
 
       if (this.hasTag(tagName)) {
         this.tags.splice(this.tags.indexOf(tagName), 1);
+        return true;
       } else {
         console.log(TAG_NOT_EXISTING_REMOVAL);
+        return false;
       }
     }
   }, {
@@ -59898,10 +59993,10 @@ var prepareModel = function prepareModel(model) {
       var _this4 = this;
 
       if (this.hasScripts()) {
-        this.scripts.forEach(function (_ref4) {
-          var script = _ref4.script,
-              enabled = _ref4.enabled,
-              options = _ref4.options;
+        this.scripts.forEach(function (_ref5) {
+          var script = _ref5.script,
+              enabled = _ref5.enabled,
+              options = _ref5.options;
 
           if (enabled) {
             script.start(_this4, options);
@@ -59915,9 +60010,9 @@ var prepareModel = function prepareModel(model) {
     key: "update",
     value: function update(dt) {
       if (this.hasScripts()) {
-        this.scripts.forEach(function (_ref5) {
-          var script = _ref5.script,
-              enabled = _ref5.enabled;
+        this.scripts.forEach(function (_ref6) {
+          var script = _ref6.script,
+              enabled = _ref6.enabled;
 
           if (script && enabled) {
             script.update(dt);
@@ -59929,9 +60024,9 @@ var prepareModel = function prepareModel(model) {
     key: "onPhysicsUpdate",
     value: function onPhysicsUpdate(dt) {
       if (this.hasScripts()) {
-        this.scripts.forEach(function (_ref6) {
-          var script = _ref6.script,
-              enabled = _ref6.enabled;
+        this.scripts.forEach(function (_ref7) {
+          var script = _ref7.script,
+              enabled = _ref7.enabled;
 
           if (script && enabled) {
             script.physicsUpdate(dt);
@@ -60021,6 +60116,7 @@ var prepareModel = function prepareModel(model) {
         return script;
       } else {
         console.warn(SCRIPT_NOT_FOUND);
+        return false;
       }
     }
   }, {
@@ -60090,68 +60186,6 @@ var prepareModel = function prepareModel(model) {
     value: function getEntityType() {
       return this.entityType;
     }
-  }, {
-    key: "addLight",
-    // TODO: sounds should become entities
-    // addSound(name, options) {
-    //     const { autoplay = false, ...opts } = options;
-    //     this.isPlayingSound = autoplay;
-    //     this.sound = new Sound(name, {
-    //         autoplay,
-    //         ...opts
-    //     });
-    //     this.sound.setTarget(this);
-    //     return this.sound;
-    // }
-    // addDirectionalSound(name, options) {
-    //     const { autoplay = false, ...opts } = options;
-    //     this.isPlayingSound = autoplay;
-    //     this.sound = new DirectionalSound(name, {
-    //         autoplay,
-    //         ...opts
-    //     });
-    //     this.sound.setTarget(this);
-    //     return this.sound;
-    // }
-    // addAmbientSound(name, options) {
-    //     const { autoplay = false, ...opts } = options;
-    //     this.isPlayingSound = autoplay;
-    //     this.sound = new AmbientSound(name, {
-    //         body: this.body,
-    //         autoplay,
-    //         ...opts
-    //     });
-    //     return this.sound;
-    // }
-    value: function addLight(light) {
-      var _this$getPosition = this.getPosition(),
-          x = _this$getPosition.x,
-          y = _this$getPosition.y,
-          z = _this$getPosition.z;
-
-      light.setPosition({
-        x: x,
-        y: y,
-        z: z
-      });
-      this.light = light;
-    }
-  }, {
-    key: "playSound",
-    value: function playSound() {
-      if (this.sound && !this.isPlayingSound) {
-        this.sound.play();
-        this.isPlayingSound = true;
-      }
-    }
-  }, {
-    key: "stopSound",
-    value: function stopSound() {
-      if (this.sound && this.isPlayingSound) {
-        this.sound.stop();
-        this.isPlayingSound = false;
-      }
-    }
   }, {
     key: "getScale",
     value: function getScale() {
@@ -60186,10 +60220,10 @@ var prepareModel = function prepareModel(model) {
     key: "setPosition",
     value: function setPosition(where) {
       if (this.hasBody()) {
-        var _this$getPosition2 = this.getPosition(),
-            x = _this$getPosition2.x,
-            y = _this$getPosition2.y,
-            z = _this$getPosition2.z;
+        var _this$getPosition = this.getPosition(),
+            x = _this$getPosition.x,
+            y = _this$getPosition.y,
+            z = _this$getPosition.z;
 
         var position = _objectSpread2$1({
           x: x,
@@ -60237,13 +60271,13 @@ var prepareModel = function prepareModel(model) {
     }
   }, {
     key: "translate",
-    value: function translate(_ref7) {
-      var _ref7$x = _ref7.x,
-          x = _ref7$x === void 0 ? 0 : _ref7$x,
-          _ref7$y = _ref7.y,
-          y = _ref7$y === void 0 ? 0 : _ref7$y,
-          _ref7$z = _ref7.z,
-          z = _ref7$z === void 0 ? 0 : _ref7$z;
+    value: function translate(_ref8) {
+      var _ref8$x = _ref8.x,
+          x = _ref8$x === void 0 ? 0 : _ref8$x,
+          _ref8$y = _ref8.y,
+          y = _ref8$y === void 0 ? 0 : _ref8$y,
+          _ref8$z = _ref8.z,
+          z = _ref8$z === void 0 ? 0 : _ref8$z;
 
       if (this.hasBody()) {
         this.body.translateX(x);
@@ -60251,51 +60285,126 @@ var prepareModel = function prepareModel(model) {
         this.body.translateZ(z);
       }
     }
+  }, {
+    key: "scaleTo",
+    value: function scaleTo() {
+      var _this7 = this;
+
+      var scale = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.getScale();
+      var time = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 250;
+
+      var _ref9 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
+          _ref9$easing = _ref9.easing,
+          easing = _ref9$easing === void 0 ? FUNCTIONS.Linear.None : _ref9$easing,
+          _ref9$loop = _ref9.loop,
+          loop = _ref9$loop === void 0 ? LOOPING.NONE : _ref9$loop;
+
+      var _this$getScale = this.getScale(),
+          x = _this$getScale.x,
+          y = _this$getScale.y,
+          z = _this$getScale.z;
+
+      var targetScale = _objectSpread2$1({
+        x: x,
+        y: y,
+        z: z
+      }, scale);
+
+      return new Promise(function (resolve) {
+        var between = new Between({
+          x: x,
+          y: y,
+          z: z
+        }, targetScale).time(time).easing(easing);
+
+        if (loop) {
+          between.loop(loop);
+        }
+
+        between.on('update', function (value) {
+          return !_this7.isDisposed() && _this7.setScale(value);
+        }).on('complete', resolve);
+      });
+    }
   }, {
     key: "rotateTo",
     value: function rotateTo() {
-      var _this7 = this;
+      var _this8 = this;
 
       var rotation = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.getRotation();
       var time = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 250;
-      var easing = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : Between.Easing.Linear.None;
+
+      var _ref10 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
+          _ref10$easing = _ref10.easing,
+          easing = _ref10$easing === void 0 ? FUNCTIONS.Linear.None : _ref10$easing,
+          _ref10$loop = _ref10.loop,
+          loop = _ref10$loop === void 0 ? LOOPING.NONE : _ref10$loop;
 
       var _this$getRotation2 = this.getRotation(),
           x = _this$getRotation2.x,
           y = _this$getRotation2.y,
           z = _this$getRotation2.z;
 
+      var targetRotation = _objectSpread2$1({
+        x: x,
+        y: y,
+        z: z
+      }, rotation);
+
       return new Promise(function (resolve) {
-        return new Between({
+        var between = new Between({
           x: x,
           y: y,
           z: z
-        }, rotation).time(time).easing(easing).on('update', function (value) {
-          return !_this7.isDisposed() && _this7.setRotation(value);
+        }, targetRotation).time(time).easing(easing);
+
+        if (loop) {
+          between.loop(loop);
+        }
+
+        between.on('update', function (value) {
+          return !_this8.isDisposed() && _this8.setRotation(value);
         }).on('complete', resolve);
       });
     }
   }, {
     key: "goTo",
     value: function goTo() {
-      var _this8 = this;
+      var _this9 = this;
 
       var position = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.getPosition();
       var time = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 250;
-      var easing = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : Between.Easing.Linear.None;
 
-      var _this$getPosition3 = this.getPosition(),
-          x = _this$getPosition3.x,
-          y = _this$getPosition3.y,
-          z = _this$getPosition3.z;
+      var _ref11 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
+          _ref11$easing = _ref11.easing,
+          easing = _ref11$easing === void 0 ? FUNCTIONS.Linear.None : _ref11$easing,
+          _ref11$loop = _ref11.loop,
+          loop = _ref11$loop === void 0 ? LOOPING.NONE : _ref11$loop;
+
+      var _this$getPosition2 = this.getPosition(),
+          x = _this$getPosition2.x,
+          y = _this$getPosition2.y,
+          z = _this$getPosition2.z;
+
+      var targetPosition = _objectSpread2$1({
+        x: x,
+        y: y,
+        z: z
+      }, position);
 
       return new Promise(function (resolve) {
-        return new Between({
+        var between = new Between({
           x: x,
           y: y,
           z: z
-        }, position).time(time).easing(easing).on('update', function (value) {
-          return !_this8.isDisposed() && _this8.setPosition(value);
+        }, targetPosition).time(time).easing(easing);
+
+        if (loop) {
+          between.loop(loop);
+        }
+
+        between.on('update', function (value) {
+          return !_this9.isDisposed() && _this9.setPosition(value);
         }).on('complete', resolve);
       });
     }
@@ -60368,10 +60477,10 @@ var prepareModel = function prepareModel(model) {
   }, {
     key: "mapScriptsToJSON",
     value: function mapScriptsToJSON() {
-      this.scripts.reduce(function (acc, _ref8) {
-        var name = _ref8.name,
-            _ref8$options = _ref8.options,
-            options = _ref8$options === void 0 ? {} : _ref8$options;
+      this.scripts.reduce(function (acc, _ref12) {
+        var name = _ref12.name,
+            _ref12$options = _ref12.options,
+            options = _ref12$options === void 0 ? {} : _ref12$options;
         acc.names.push(name);
         acc.options.push(options);
         return acc;
@@ -60397,8 +60506,11 @@ var prepareModel = function prepareModel(model) {
   }], [{
     key: "create",
     value: function create() {
-      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-      return new this(options);
+      for (var _len = arguments.length, options = new Array(_len), _key = 0; _key < _len; _key++) {
+        options[_key] = arguments[_key];
+      }
+
+      return _construct(this, options);
     }
   }]);
 
@@ -60766,17 +60878,6 @@ var Element$1 = /*#__PURE__*/function (_Entity) {
   }
 
   _createClass(Element, [{
-    key: "getMaterialType",
-    value: function getMaterialType() {
-      return this.materialType;
-    }
-  }, {
-    key: "setMaterialType",
-    value: function setMaterialType() {
-      var materialType = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : MATERIALS.BASIC;
-      this.materialType = materialType;
-    }
-  }, {
     key: "addTag",
     value: function addTag(tag) {
       _get(_getPrototypeOf(Element.prototype), "addTag", this).call(this, tag);
@@ -61149,20 +61250,48 @@ var Element$1 = /*#__PURE__*/function (_Entity) {
         }
       }
     }
+  }, {
+    key: "getMaterial",
+    value: function getMaterial() {
+      if (hasMaterial(this.getBody())) {
+        return this.getBody().material;
+      }
+
+      var materials = [];
+      this.getBody().traverse(function (child) {
+        if (hasMaterial(child)) {
+          materials.push(child.material);
+        }
+      });
+      return materials;
+    }
+  }, {
+    key: "getMaterialType",
+    value: function getMaterialType() {
+      return this.materialType;
+    }
+  }, {
+    key: "setMaterialType",
+    value: function setMaterialType() {
+      var materialType = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : MATERIALS.BASIC;
+      this.materialType = materialType;
+    }
   }, {
     key: "setMaterialFromName",
     value: function setMaterialFromName(materialName) {
       var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       this.setMaterialType(materialName);
+      var newMaterials = [];
 
       if (hasMaterial(this.getBody())) {
-        changeMaterialByName(materialName, this.getBody(), options);
+        return replaceMaterialByName(materialName, this.getBody(), options);
       } else {
         this.getBody().traverse(function (child) {
           if (hasMaterial(child)) {
-            changeMaterialByName(materialName, child, options);
+            newMaterials.push(replaceMaterialByName(materialName, child, options));
           }
         });
+        return newMaterials;
       }
     }
   }, {
@@ -61310,8 +61439,11 @@ var Element$1 = /*#__PURE__*/function (_Entity) {
       name: name
     });
     _this.options = options;
+    var body = new PerspectiveCamera(fov, ratio, near, far);
 
-    _this.setBody(new PerspectiveCamera(fov, ratio, near, far));
+    _this.setBody({
+      body: body
+    });
 
     _this.setEntityType(ENTITY_TYPES.CAMERA);
 
@@ -69199,7 +69331,7 @@ var engine = new Video();var GLTFLoader = function () {
 
   function assignExtrasToUserData(object, gltfDef) {
     if (gltfDef.extras !== undefined) {
-      if (_typeof$1(gltfDef.extras) === 'object') {
+      if (_typeof(gltfDef.extras) === 'object') {
         Object.assign(object.userData, gltfDef.extras);
       } else {
         console.warn('THREE.GLTFLoader: Ignoring primitive type .extras, ' + gltfDef.extras);
@@ -74252,7 +74384,7 @@ var FBXTreeParser = /*#__PURE__*/function () {
       var name = materialNode.attrName;
       var type = materialNode.ShadingModel; // Case where FBX wraps shading model in property object.
 
-      if (_typeof$1(type) === 'object') {
+      if (_typeof(type) === 'object') {
         type = type.value;
       } // Ignore unused materials which don't have any connections.
 
@@ -82456,20 +82588,12 @@ var Light = /*#__PURE__*/function (_Entity) {
   }, {
     key: "toJSON",
     value: function toJSON() {
-      var _this$body$position = this.body.position,
-          x = _this$body$position.x,
-          y = _this$body$position.y,
-          z = _this$body$position.z;
-      return {
-        position: {
-          x: x,
-          y: y,
-          z: z
-        },
+      return _objectSpread2$1(_objectSpread2$1({}, _get(_getPrototypeOf(Light.prototype), "toJSON", this).call(this)), {}, {
+        type: this.getEntityType(),
         color: this.color,
         intensity: this.intensity,
         name: this.name
-      };
+      });
     }
   }]);
 
@@ -82534,9 +82658,13 @@ var SunLight = /*#__PURE__*/function (_Light) {
           intensity = _ref$intensity === void 0 ? DEFAULT_INTENSITY$4 : _ref$intensity;
 
       if (light) {
-        this.setBody(light);
+        this.setBody({
+          body: light
+        });
       } else {
-        this.setBody(new DirectionalLight(color, intensity));
+        this.setBody({
+          body: new DirectionalLight(color, intensity)
+        });
       }
 
       if (this.hasBody()) {
@@ -82572,9 +82700,11 @@ var SunLight = /*#__PURE__*/function (_Light) {
           _this$options2$bias = _this$options2.bias,
           bias = _this$options2$bias === void 0 ? DEFAULT_BIAS$2 : _this$options2$bias,
           _this$options2$fov = _this$options2.fov,
-          fov = _this$options2$fov === void 0 ? DEFAULT_FOV : _this$options2$fov;
+          fov = _this$options2$fov === void 0 ? DEFAULT_FOV : _this$options2$fov,
+          _this$options2$castSh = _this$options2.castShadow,
+          castShadow = _this$options2$castSh === void 0 ? true : _this$options2$castSh;
 
-      if (Config$1.lights().shadows) {
+      if (Config$1.lights().shadows && castShadow) {
         this.body.castShadow = true;
         var d = far / 1.5;
         this.body.shadow.mapSize.height = mapSize;
@@ -82642,13 +82772,6 @@ var SunLight = /*#__PURE__*/function (_Light) {
         });
       }
     }
-  }, {
-    key: "toJSON",
-    value: function toJSON() {
-      return _objectSpread2$1(_objectSpread2$1({}, _get(_getPrototypeOf(SunLight.prototype), "toJSON", this).call(this)), {}, {
-        type: SUNLIGHT
-      });
-    }
   }]);
 
   return SunLight;
@@ -82707,9 +82830,13 @@ var AmbientLight = /*#__PURE__*/function (_Light) {
           intensity = _ref$intensity === void 0 ? DEFAULT_INTENSITY$3 : _ref$intensity;
 
       if (light) {
-        this.setBody(light);
+        this.setBody({
+          body: light
+        });
       } else {
-        this.setBody(new AmbientLight$1(color, intensity));
+        this.setBody({
+          body: new AmbientLight$1(color, intensity)
+        });
       }
 
       if (this.hasBody()) {
@@ -82741,13 +82868,6 @@ var AmbientLight = /*#__PURE__*/function (_Light) {
         });
       }
     }
-  }, {
-    key: "toJSON",
-    value: function toJSON() {
-      return _objectSpread2$1(_objectSpread2$1({}, _get(_getPrototypeOf(AmbientLight.prototype), "toJSON", this).call(this)), {}, {
-        type: AMBIENTLIGHT
-      });
-    }
   }]);
 
   return AmbientLight;
@@ -82819,9 +82939,13 @@ var PointLight = /*#__PURE__*/function (_Light) {
           decay = _ref$decay === void 0 ? DEFAULT_DECAY : _ref$decay;
 
       if (light) {
-        this.setBody(light);
+        this.setBody({
+          body: light
+        });
       } else {
-        this.setBody(new PointLight$1(color, intensity, distance, decay));
+        this.setBody({
+          body: new PointLight$1(color, intensity, distance, decay)
+        });
       }
 
       if (this.hasBody()) {
@@ -82893,8 +83017,7 @@ var PointLight = /*#__PURE__*/function (_Light) {
     key: "toJSON",
     value: function toJSON() {
       return _objectSpread2$1(_objectSpread2$1({}, _get(_getPrototypeOf(PointLight.prototype), "toJSON", this).call(this)), {}, {
-        distance: this.distance,
-        type: POINTLIGHT
+        distance: this.distance
       });
     }
   }]);
@@ -90062,21 +90185,25 @@ var Label = /*#__PURE__*/function (_Element) {
           Images$1.add(id, texture);
         }
 
-        texture.image.src = dataUrl;
-        texture.image.height = height;
-        texture.image.width = width;
-        texture.needsUpdate = true;
+        if (texture.image.src !== dataUrl) {
+          texture.image.src = dataUrl;
+          texture.image.height = height;
+          texture.image.width = width;
+          texture.needsUpdate = true;
+        }
+
         return Promise.resolve(texture);
       };
     });
 
     _defineProperty$1(_assertThisInitialized(_this), "convertToPng", function (domElement) {
       return domElement ? toPng(domElement, {
-        cacheBust: true
+        cacheBust: false
       }) : Promise.reject(LABEL_DOMELEMENT_MISSING);
     });
 
-    var name = _this.options.name;
+    var _this$options$name = _this.options.name,
+        name = _this$options$name === void 0 ? generateRandomName('label') : _this$options$name;
     _this.Component = Component;
     _this.format = format;
     _this.width = _width;
@@ -90832,9 +90959,13 @@ var SpotLight = /*#__PURE__*/function (_Light) {
           intensity = _ref$intensity === void 0 ? DEFAULT_INTENSITY$1 : _ref$intensity;
 
       if (light) {
-        this.setBody(light);
+        this.setBody({
+          body: light
+        });
       } else {
-        this.setBody(new SpotLight$1(color, intensity));
+        this.setBody({
+          body: new SpotLight$1(color, intensity)
+        });
       }
 
       if (this.hasBody()) {
@@ -90930,13 +91061,6 @@ var SpotLight = /*#__PURE__*/function (_Light) {
         });
       }
     }
-  }, {
-    key: "toJSON",
-    value: function toJSON() {
-      return _objectSpread2$1(_objectSpread2$1({}, _get(_getPrototypeOf(SpotLight.prototype), "toJSON", this).call(this)), {}, {
-        type: SPOTLIGHT
-      });
-    }
   }]);
 
   return SpotLight;
@@ -90998,13 +91122,17 @@ var HemisphereLight = /*#__PURE__*/function (_Light) {
           intensity = _ref$intensity === void 0 ? DEFAULT_INTENSITY : _ref$intensity;
 
       if (light) {
-        this.setBody(light);
+        this.setBody({
+          body: light
+        });
       } else {
         var _color$sky = color.sky,
             sky = _color$sky === void 0 ? DEFAULT_SKY_COLOR : _color$sky,
             _color$ground = color.ground,
             ground = _color$ground === void 0 ? DEFAULT_GROUND_COLOR : _color$ground;
-        this.setBody(new HemisphereLight$1(sky, ground, intensity));
+        this.setBody({
+          body: new HemisphereLight$1(sky, ground, intensity)
+        });
       }
 
       if (this.hasBody()) {
@@ -91017,13 +91145,6 @@ var HemisphereLight = /*#__PURE__*/function (_Light) {
       this.helper = new HemisphereLightHelper(this.body, 2, GREEN);
       Scene$1.add(this.helper, null, false);
     }
-  }, {
-    key: "toJSON",
-    value: function toJSON() {
-      return _objectSpread2$1(_objectSpread2$1({}, _get(_getPrototypeOf(HemisphereLight.prototype), "toJSON", this).call(this)), {}, {
-        type: HEMISPHERELIGHT
-      });
-    }
   }]);
 
   return HemisphereLight;
@@ -92603,4 +92724,4 @@ var Shaders$1 = new Shaders();var Shader = function Shader(name, attributes, uni
   } else {
     this.instance = this.shader.instance;
   }
-};var constants = _objectSpread2$1(_objectSpread2$1({}, lib_constants), light_contants);export{AUDIO_RAMPS,AmbientLight,Atmosphere,Audio$1 as Audio,Axes,BUILTIN,BackgroundSound,BaseScript,Box,Camera,Color,Config$1 as Config,Controls$1 as Controls,Cube,CurveLine,Cylinder,DirectionalSound,ENTITY_EVENTS,ENTITY_TYPES,Element$1 as Element,Entity,EventDispatcher,FEATURES,Features$1 as Features,GameRunner$1 as GameRunner,Grid,HemisphereLight,INPUT_EVENTS,Images$1 as Images,Input$1 as Input,Label,LabelComponent,Level,LightLoader$1 as LightLoader,Lights$1 as Lights,Line,MeshLoader$1 as MeshLoader,Mirror,Models$1 as Models,Ocean,PALETTES,PARTICLES,constants$1 as PHYSICS_CONSTANTS,PHYSICS_EVENTS,ParticleEmitter,ParticleEmitterGroup,Particles$1 as Particles,index$1 as Partykals,Physics$1 as Physics,Plane,PointLight,PostProcessing$1 as PostProcessing,Proton,ProtonParticleEmitter,Provider,Router$1 as Router,Scene$1 as Scene,Scripts$1 as Scripts,Shader,Sky,Skybox,Sound,Sphere,SpotLight,Sprite,Stats$1 as Stats,SunLight,three_module as THREE,Universe$1 as Universe,Vector3$1 as Vector3,Water,author,connect,constants,createElement,functions,hitbox as hitboxUtils,index_esm as inferno,math,utils as physicsUtils,index$2 as rxjs,index as store,strings,uuid$1 as uuid,workers};
+};var constants = _objectSpread2$1(_objectSpread2$1({}, lib_constants), light_contants);export{AUDIO_RAMPS,AmbientLight,Atmosphere,Audio$1 as Audio,Axes,BUILTIN,BackgroundSound,BaseScript,Box,Camera,Color,Config$1 as Config,Controls$1 as Controls,Cube,CurveLine,Cylinder,DirectionalSound,ENTITY_EVENTS,ENTITY_TYPES,Element$1 as Element,Entity,EventDispatcher,FEATURES,Features$1 as Features,GameRunner$1 as GameRunner,Grid,HemisphereLight,INPUT_EVENTS,Images$1 as Images,Input$1 as Input,Label,LabelComponent,Level,LightLoader$1 as LightLoader,Lights$1 as Lights,Line,MeshLoader$1 as MeshLoader,Mirror,Models$1 as Models,Ocean,PALETTES,PARTICLES,constants$1 as PHYSICS_CONSTANTS,PHYSICS_EVENTS,ParticleEmitter,ParticleEmitterGroup,Particles$1 as Particles,index$1 as Partykals,Physics$1 as Physics,Plane,PointLight,PostProcessing$1 as PostProcessing,Proton,ProtonParticleEmitter,Provider,Router$1 as Router,Scene$1 as Scene,Scripts$1 as Scripts,Shader,Sky,Skybox,Sound,Sphere,SpotLight,Sprite,Stats$1 as Stats,SunLight,three_module as THREE,Universe$1 as Universe,Vector3$1 as Vector3,Water,author,connect,constants,createElement,easing,functions,hitbox as hitboxUtils,index_esm as inferno,math,utils as physicsUtils,index$2 as rxjs,index as store,strings,uuid$1 as uuid,workers};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mage-engine",
-    "version": "3.19.0",
+    "version": "3.20.0",
     "description": "A WebGL Javascript Game Engine, built on top of THREE.js and many other libraries.",
     "main": "dist/mage.js",
     "author": {
@@ -42,7 +42,7 @@
         "@babel/plugin-transform-runtime": "7.5.0",
         "@babel/runtime": "7.5.0",
         "between.js": "0.1.2-fix.2",
-        "hotkeys-js": "3.7.2",
+        "hotkeys-js": "3.9.4",
         "html-to-image": "^1.9.0",
         "html2canvas": "^1.4.1",
         "inferno": "7.3.2",