@babylonjs/core 5.0.0-beta.3 → 5.0.0-beta.4

package/DeviceInput/{Implementations → InputDevices}/nativeDeviceInputSystem.js

@@ -1,8 +1,8 @@
 import { DeviceEventFactory } from "../Helpers/eventFactory.js";
-import { DeviceType } from "../InputDevices/deviceEnums.js";
+import { DeviceType } from "./deviceEnums.js";
 /** @hidden */
-var NativeDeviceInputSystemImpl = /** @class */ (function () {
-    function NativeDeviceInputSystemImpl(nativeInput) {
+var NativeDeviceInputSystem = /** @class */ (function () {
+    function NativeDeviceInputSystem(nativeInput) {
         var _this = this;
         this.onDeviceConnected = function (deviceType, deviceSlot) { };
         this.onDeviceDisconnected = function (deviceType, deviceSlot) { };
@@ -25,12 +25,6 @@ var NativeDeviceInputSystemImpl = /** @class */ (function () {
             _this.onInputChanged(deviceEvent);
         };
     }
-    /**
-     * Configures events to work with an engine's active element
-     */
-    NativeDeviceInputSystemImpl.prototype.configureEvents = function () {
-        // Do nothing
-    };
     // Public functions
     /**
      * Checks for current device input value, given an id and input index. Throws exception if requested device not initialized.
@@ -39,7 +33,7 @@ var NativeDeviceInputSystemImpl = /** @class */ (function () {
      * @param inputIndex Id of input to be checked
      * @returns Current value of input
      */
-    NativeDeviceInputSystemImpl.prototype.pollInput = function (deviceType, deviceSlot, inputIndex) {
+    NativeDeviceInputSystem.prototype.pollInput = function (deviceType, deviceSlot, inputIndex) {
         return this._nativeInput.pollInput(deviceType, deviceSlot, inputIndex);
     };
     /**
@@ -47,14 +41,14 @@ var NativeDeviceInputSystemImpl = /** @class */ (function () {
      * @param deviceType Type of device to check for
      * @returns bool with status of device's existence
      */
-    NativeDeviceInputSystemImpl.prototype.isDeviceAvailable = function (deviceType) {
+    NativeDeviceInputSystem.prototype.isDeviceAvailable = function (deviceType) {
         //TODO: FIx native side first
         return (deviceType === DeviceType.Mouse || deviceType === DeviceType.Touch);
     };
     /**
      * Dispose of all the observables
      */
-    NativeDeviceInputSystemImpl.prototype.dispose = function () {
+    NativeDeviceInputSystem.prototype.dispose = function () {
         this.onDeviceConnected = function () { };
         this.onDeviceDisconnected = function () { };
         this.onInputChanged = function () { };
@@ -63,7 +57,7 @@ var NativeDeviceInputSystemImpl = /** @class */ (function () {
      * For versions of BabylonNative that don't have the NativeInput plugin initialized, create a dummy version
      * @returns Object with dummy functions
      */
-    NativeDeviceInputSystemImpl.prototype._createDummyNativeInput = function () {
+    NativeDeviceInputSystem.prototype._createDummyNativeInput = function () {
         var nativeInput = {
             onDeviceConnected: function (deviceType, deviceSlot) { },
             onDeviceDisconnected: function (deviceType, deviceSlot) { },
@@ -74,7 +68,7 @@ var NativeDeviceInputSystemImpl = /** @class */ (function () {
         };
         return nativeInput;
     };
-    return NativeDeviceInputSystemImpl;
+    return NativeDeviceInputSystem;
 }());
-export { NativeDeviceInputSystemImpl };
+export { NativeDeviceInputSystem };
 //# sourceMappingURL=nativeDeviceInputSystem.js.map

package/DeviceInput/InputDevices/nativeDeviceInputSystem.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"nativeDeviceInputSystem.js","sourceRoot":"","sources":["../../../../sourceES6/core/DeviceInput/InputDevices/nativeDeviceInputSystem.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAG3C,cAAc;AACd;IAOI,iCAAmB,WAA0B;QAA7C,iBAuBC;QA7BM,sBAAiB,GAAG,UAAC,UAAsB,EAAE,UAAkB,IAAO,CAAC,CAAC;QACxE,yBAAoB,GAAG,UAAC,UAAsB,EAAE,UAAkB,IAAO,CAAC,CAAC;QAC3E,mBAAc,GAAG,UAAC,WAAyB,IAAO,CAAC,CAAC;QAKvD,IAAI,CAAC,YAAY,GAAG,WAAW,IAAI,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAElE,IAAI,CAAC,YAAY,CAAC,iBAAiB,GAAG,UAAC,UAAU,EAAE,UAAU;YACzD,KAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QACnD,CAAC,CAAC;QAEF,IAAI,CAAC,YAAY,CAAC,oBAAoB,GAAG,UAAC,UAAU,EAAE,UAAU;YAC5D,KAAI,CAAC,oBAAoB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QACtD,CAAC,CAAC;QAEF,IAAI,CAAC,YAAY,CAAC,cAAc,GAAG,UAAC,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,YAAY,EAAE,SAAS;YAC1G,IAAM,GAAG,GAAG,kBAAkB,CAAC,iBAAiB,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,KAAI,CAAC,CAAC;YAEzG,IAAI,WAAW,GAAG,GAAmB,CAAC;YACtC,WAAW,CAAC,UAAU,GAAG,UAAU,CAAC;YACpC,WAAW,CAAC,UAAU,GAAG,UAAU,CAAC;YACpC,WAAW,CAAC,UAAU,GAAG,UAAU,CAAC;YACpC,WAAW,CAAC,aAAa,GAAG,aAAa,CAAC;YAC1C,WAAW,CAAC,YAAY,GAAG,YAAY,CAAC;YAExC,KAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QACrC,CAAC,CAAC;IACN,CAAC;IAED,mBAAmB;IACnB;;;;;;OAMG;IACI,2CAAS,GAAhB,UAAiB,UAAsB,EAAE,UAAkB,EAAE,UAAkB;QAC3E,OAAO,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IAC3E,CAAC;IAED;;;;OAIG;IACI,mDAAiB,GAAxB,UAAyB,UAAsB;QAC3C,6BAA6B;QAC7B,OAAO,CAAC,UAAU,KAAK,UAAU,CAAC,KAAK,IAAI,UAAU,KAAK,UAAU,CAAC,KAAK,CAAC,CAAC;IAChF,CAAC;IAED;;OAEG;IACI,yCAAO,GAAd;QACI,IAAI,CAAC,iBAAiB,GAAG,cAAQ,CAAC,CAAC;QACnC,IAAI,CAAC,oBAAoB,GAAG,cAAQ,CAAC,CAAC;QACtC,IAAI,CAAC,cAAc,GAAG,cAAQ,CAAC,CAAC;IACpC,CAAC;IAED;;;OAGG;IACK,yDAAuB,GAA/B;QACI,IAAI,WAAW,GAAG;YACd,iBAAiB,EAAE,UAAC,UAAsB,EAAE,UAAkB,IAAO,CAAC;YACtE,oBAAoB,EAAE,UAAC,UAAsB,EAAE,UAAkB,IAAO,CAAC;YACzE,cAAc,EAAE,UAAC,UAAsB,EAAE,UAAkB,EAAE,UAAkB,EAAE,aAA+B,EAAE,YAA8B,EAAE,SAAe,IAAO,CAAC;YACzK,SAAS,EAAE,cAAQ,OAAO,CAAC,CAAC,CAAC,CAAC;YAC9B,iBAAiB,EAAE,cAAQ,OAAO,KAAK,CAAC,CAAC,CAAC;YAC1C,OAAO,EAAE,cAAQ,CAAC;SACrB,CAAC;QAEF,OAAO,WAAW,CAAC;IACvB,CAAC;IACL,8BAAC;AAAD,CAAC,AA/ED,IA+EC","sourcesContent":["import { Nullable } from \"../../types\";\r\nimport { DeviceEventFactory } from \"../Helpers/eventFactory\";\r\nimport { DeviceType } from \"./deviceEnums\";\r\nimport { IDeviceEvent, IDeviceInputSystem, INativeInput } from \"./inputInterfaces\";\r\n\r\n/** @hidden */\r\nexport class NativeDeviceInputSystem implements IDeviceInputSystem {\r\n    public onDeviceConnected = (deviceType: DeviceType, deviceSlot: number) => { };\r\n    public onDeviceDisconnected = (deviceType: DeviceType, deviceSlot: number) => { };\r\n    public onInputChanged = (deviceEvent: IDeviceEvent) => { };\r\n\r\n    private readonly _nativeInput: INativeInput;\r\n\r\n    public constructor(nativeInput?: INativeInput) {\r\n        this._nativeInput = nativeInput || this._createDummyNativeInput();\r\n\r\n        this._nativeInput.onDeviceConnected = (deviceType, deviceSlot) => {\r\n            this.onDeviceConnected(deviceType, deviceSlot);\r\n        };\r\n\r\n        this._nativeInput.onDeviceDisconnected = (deviceType, deviceSlot) => {\r\n            this.onDeviceDisconnected(deviceType, deviceSlot);\r\n        };\r\n\r\n        this._nativeInput.onInputChanged = (deviceType, deviceSlot, inputIndex, previousState, currentState, eventData) => {\r\n            const evt = DeviceEventFactory.CreateDeviceEvent(deviceType, deviceSlot, inputIndex, currentState, this);\r\n\r\n            let deviceEvent = evt as IDeviceEvent;\r\n            deviceEvent.deviceType = deviceType;\r\n            deviceEvent.deviceSlot = deviceSlot;\r\n            deviceEvent.inputIndex = inputIndex;\r\n            deviceEvent.previousState = previousState;\r\n            deviceEvent.currentState = currentState;\r\n\r\n            this.onInputChanged(deviceEvent);\r\n        };\r\n    }\r\n\r\n    // Public functions\r\n    /**\r\n     * Checks for current device input value, given an id and input index. Throws exception if requested device not initialized.\r\n     * @param deviceType Enum specifiying device type\r\n     * @param deviceSlot \"Slot\" or index that device is referenced in\r\n     * @param inputIndex Id of input to be checked\r\n     * @returns Current value of input\r\n     */\r\n    public pollInput(deviceType: DeviceType, deviceSlot: number, inputIndex: number): number {\r\n        return this._nativeInput.pollInput(deviceType, deviceSlot, inputIndex);\r\n    }\r\n\r\n    /**\r\n     * Check for a specific device in the DeviceInputSystem\r\n     * @param deviceType Type of device to check for\r\n     * @returns bool with status of device's existence\r\n     */\r\n    public isDeviceAvailable(deviceType: DeviceType): boolean {\r\n        //TODO: FIx native side first\r\n        return (deviceType === DeviceType.Mouse || deviceType === DeviceType.Touch);\r\n    }\r\n\r\n    /**\r\n     * Dispose of all the observables\r\n     */\r\n    public dispose(): void {\r\n        this.onDeviceConnected = () => { };\r\n        this.onDeviceDisconnected = () => { };\r\n        this.onInputChanged = () => { };\r\n    }\r\n\r\n    /**\r\n     * For versions of BabylonNative that don't have the NativeInput plugin initialized, create a dummy version\r\n     * @returns Object with dummy functions\r\n     */\r\n    private _createDummyNativeInput() {\r\n        let nativeInput = {\r\n            onDeviceConnected: (deviceType: DeviceType, deviceSlot: number) => { },\r\n            onDeviceDisconnected: (deviceType: DeviceType, deviceSlot: number) => { },\r\n            onInputChanged: (deviceType: DeviceType, deviceSlot: number, inputIndex: number, previousState: Nullable<number>, currentState: Nullable<number>, eventData?: any) => { },\r\n            pollInput: () => { return 0; },\r\n            isDeviceAvailable: () => { return false; },\r\n            dispose: () => { },\r\n        };\r\n\r\n        return nativeInput;\r\n    }\r\n}"]}

package/DeviceInput/{Implementations → InputDevices}/webDeviceInputSystem.d.ts

@@ -1,8 +1,8 @@
 import { Engine } from "../../Engines/engine";
-import { DeviceType } from "../InputDevices/deviceEnums";
-import { IDeviceEvent, IDeviceInputSystem } from "../Interfaces/inputInterfaces";
+import { DeviceType } from "./deviceEnums";
+import { IDeviceEvent, IDeviceInputSystem } from "./inputInterfaces";
 /** @hidden */
-export declare class WebDeviceInputSystemImpl implements IDeviceInputSystem {
+export declare class WebDeviceInputSystem implements IDeviceInputSystem {
     /** onDeviceConnected property */
     set onDeviceConnected(callback: (deviceType: DeviceType, deviceSlot: number) => void);
     get onDeviceConnected(): (deviceType: DeviceType, deviceSlot: number) => void;
@@ -13,8 +13,8 @@ export declare class WebDeviceInputSystemImpl implements IDeviceInputSystem {
     private _keyboardActive;
     private _pointerActive;
     private _elementToAttachTo;
-    private _engine;
-    private _usingSafari;
+    private readonly _engine;
+    private readonly _usingSafari;
     private _onDeviceConnected;
     private _keyboardDownEvent;
     private _keyboardUpEvent;
@@ -26,22 +26,14 @@ export declare class WebDeviceInputSystemImpl implements IDeviceInputSystem {
     private _pointerBlurEvent;
     private _wheelEventName;
     private _mouseId;
-    private _isUsingFirefox;
+    private readonly _isUsingFirefox;
     private _activeTouchIds;
-    private _rollingTouchId;
+    private _maxTouchPoints;
     private _pointerInputClearObserver;
     private _gamepadConnectedEvent;
     private _gamepadDisconnectedEvent;
-    /** Max number of keycodes */
-    static MAX_KEYCODES: number;
-    /** Max number of pointer inputs */
-    static MAX_POINTER_INPUTS: number;
     private _eventPrefix;
     constructor(engine: Engine);
-    /**
-     * Configures events to work with an engine's active element
-     */
-    configureEvents(): void;
     /**
      * Checks for current device input value, given an id and input index. Throws exception if requested device not initialized.
      * @param deviceType Enum specifiying device type
@@ -60,6 +52,10 @@ export declare class WebDeviceInputSystemImpl implements IDeviceInputSystem {
      * Dispose of all the eventlisteners
      */
     dispose(): void;
+    /**
+     * Configures events to work with an engine's active element
+     */
+    private _configureEvents;
     /**
      * Checks for existing connections to devices and register them, if necessary
      * Currently handles gamepads and mouse

package/DeviceInput/{Implementations → InputDevices}/webDeviceInputSystem.js

@@ -1,9 +1,12 @@
+import { DomManagement } from "../../Misc/domManagement.js";
 import { Tools } from "../../Misc/tools.js";
 import { DeviceEventFactory } from "../Helpers/eventFactory.js";
-import { DeviceType, PointerInput } from "../InputDevices/deviceEnums.js";
+import { DeviceType, PointerInput } from "./deviceEnums.js";
+var MAX_KEYCODES = 255;
+var MAX_POINTER_INPUTS = Object.keys(PointerInput).length / 2;
 /** @hidden */
-var WebDeviceInputSystemImpl = /** @class */ (function () {
-    function WebDeviceInputSystemImpl(engine) {
+var WebDeviceInputSystem = /** @class */ (function () {
+    function WebDeviceInputSystem(engine) {
         // Private Members
         this._inputs = [];
         this._keyboardActive = false;
@@ -18,10 +21,8 @@ var WebDeviceInputSystemImpl = /** @class */ (function () {
         this._pointerWheelEvent = function (evt) { };
         this._pointerBlurEvent = function (evt) { };
         this._mouseId = -1;
-        this._isUsingFirefox = navigator && navigator.userAgent && navigator.userAgent.indexOf("Firefox") !== -1;
-        // Array to store active Pointer ID values; prevents issues with negative pointerIds
-        this._activeTouchIds = [];
-        this._rollingTouchId = 0; // Rolling ID number to assign; emulates Chrome assignment
+        this._isUsingFirefox = DomManagement.IsNavigatorAvailable() && navigator.userAgent && navigator.userAgent.indexOf("Firefox") !== -1;
+        this._maxTouchPoints = 0;
         this._pointerInputClearObserver = null;
         this._gamepadConnectedEvent = function (evt) { };
         this._gamepadDisconnectedEvent = function (evt) { };
@@ -30,9 +31,9 @@ var WebDeviceInputSystemImpl = /** @class */ (function () {
         this.onDeviceConnected = function (deviceType, deviceSlot) { };
         this.onDeviceDisconnected = function (deviceType, deviceSlot) { };
         this.onInputChanged = function (deviceEvent) { };
-        this.configureEvents();
+        this._configureEvents();
     }
-    Object.defineProperty(WebDeviceInputSystemImpl.prototype, "onDeviceConnected", {
+    Object.defineProperty(WebDeviceInputSystem.prototype, "onDeviceConnected", {
         get: function () {
             return this._onDeviceConnected;
         },
@@ -55,26 +56,6 @@ var WebDeviceInputSystemImpl = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    /**
-     * Configures events to work with an engine's active element
-     */
-    WebDeviceInputSystemImpl.prototype.configureEvents = function () {
-        var inputElement = this._engine.getInputElement();
-        if (inputElement && this._elementToAttachTo !== inputElement) {
-            // If the engine's input element has changed, unregister events from previous element
-            if (this._elementToAttachTo) {
-                this._removeEvents();
-            }
-            this._elementToAttachTo = inputElement;
-            // Set tab index for the inputElement to the engine's canvasTabIndex, if and only if the element's tab index is -1
-            this._elementToAttachTo.tabIndex = (this._elementToAttachTo.tabIndex !== -1) ? this._elementToAttachTo.tabIndex : this._engine.canvasTabIndex;
-            this._handleKeyActions();
-            this._handlePointerActions();
-            this._handleGamepadActions();
-            // Check for devices that are already connected but aren't registered. Currently, only checks for gamepads and mouse
-            this._checkForConnectedDevices();
-        }
-    };
     // Public functions
     /**
      * Checks for current device input value, given an id and input index. Throws exception if requested device not initialized.
@@ -83,7 +64,7 @@ var WebDeviceInputSystemImpl = /** @class */ (function () {
      * @param inputIndex Id of input to be checked
      * @returns Current value of input
      */
-    WebDeviceInputSystemImpl.prototype.pollInput = function (deviceType, deviceSlot, inputIndex) {
+    WebDeviceInputSystem.prototype.pollInput = function (deviceType, deviceSlot, inputIndex) {
         var device = this._inputs[deviceType][deviceSlot];
         if (!device) {
             throw "Unable to find device " + DeviceType[deviceType];
@@ -102,13 +83,13 @@ var WebDeviceInputSystemImpl = /** @class */ (function () {
      * @param deviceType Type of device to check for
      * @returns bool with status of device's existence
      */
-    WebDeviceInputSystemImpl.prototype.isDeviceAvailable = function (deviceType) {
+    WebDeviceInputSystem.prototype.isDeviceAvailable = function (deviceType) {
         return (this._inputs[deviceType] !== undefined);
     };
     /**
      * Dispose of all the eventlisteners
      */
-    WebDeviceInputSystemImpl.prototype.dispose = function () {
+    WebDeviceInputSystem.prototype.dispose = function () {
         // Observables
         this.onDeviceConnected = function () { };
         this.onDeviceDisconnected = function () { };
@@ -120,11 +101,31 @@ var WebDeviceInputSystemImpl = /** @class */ (function () {
             window.removeEventListener("gamepaddisconnected", this._gamepadDisconnectedEvent);
         }
     };
+    /**
+     * Configures events to work with an engine's active element
+     */
+    WebDeviceInputSystem.prototype._configureEvents = function () {
+        var inputElement = this._engine.getInputElement();
+        if (inputElement && this._elementToAttachTo !== inputElement) {
+            // If the engine's input element has changed, unregister events from previous element
+            if (this._elementToAttachTo) {
+                this._removeEvents();
+            }
+            this._elementToAttachTo = inputElement;
+            // Set tab index for the inputElement to the engine's canvasTabIndex, if and only if the element's tab index is -1
+            this._elementToAttachTo.tabIndex = (this._elementToAttachTo.tabIndex !== -1) ? this._elementToAttachTo.tabIndex : this._engine.canvasTabIndex;
+            this._handleKeyActions();
+            this._handlePointerActions();
+            this._handleGamepadActions();
+            // Check for devices that are already connected but aren't registered. Currently, only checks for gamepads and mouse
+            this._checkForConnectedDevices();
+        }
+    };
     /**
      * Checks for existing connections to devices and register them, if necessary
      * Currently handles gamepads and mouse
      */
-    WebDeviceInputSystemImpl.prototype._checkForConnectedDevices = function () {
+    WebDeviceInputSystem.prototype._checkForConnectedDevices = function () {
         if (navigator.getGamepads) {
             var gamepads = navigator.getGamepads();
             for (var _i = 0, gamepads_1 = gamepads; _i < gamepads_1.length; _i++) {
@@ -146,7 +147,7 @@ var WebDeviceInputSystemImpl = /** @class */ (function () {
      * Add a gamepad to the DeviceInputSystem
      * @param gamepad A single DOM Gamepad object
      */
-    WebDeviceInputSystemImpl.prototype._addGamePad = function (gamepad) {
+    WebDeviceInputSystem.prototype._addGamePad = function (gamepad) {
         var deviceType = this._getGamepadDeviceType(gamepad.id);
         var deviceSlot = gamepad.index;
         this._registerDevice(deviceType, deviceSlot, gamepad.buttons.length + gamepad.axes.length);
@@ -160,9 +161,9 @@ var WebDeviceInputSystemImpl = /** @class */ (function () {
      * @param currentX Current X at point of adding
      * @param currentY Current Y at point of adding
      */
-    WebDeviceInputSystemImpl.prototype._addPointerDevice = function (deviceType, deviceSlot, currentX, currentY) {
+    WebDeviceInputSystem.prototype._addPointerDevice = function (deviceType, deviceSlot, currentX, currentY) {
         this._pointerActive = true;
-        this._registerDevice(deviceType, deviceSlot, WebDeviceInputSystemImpl.MAX_POINTER_INPUTS);
+        this._registerDevice(deviceType, deviceSlot, MAX_POINTER_INPUTS);
         var pointer = this._inputs[deviceType][deviceSlot]; /* initialize our pointer position immediately after registration */
         pointer[0] = currentX;
         pointer[1] = currentY;
@@ -173,7 +174,7 @@ var WebDeviceInputSystemImpl = /** @class */ (function () {
      * @param deviceSlot "Slot" or index that device is referenced in
      * @param numberOfInputs Number of input entries to create for given device
      */
-    WebDeviceInputSystemImpl.prototype._registerDevice = function (deviceType, deviceSlot, numberOfInputs) {
+    WebDeviceInputSystem.prototype._registerDevice = function (deviceType, deviceSlot, numberOfInputs) {
         if (deviceSlot === undefined) {
             throw "Unable to register device " + DeviceType[deviceType] + " to undefined slot.";
         }
@@ -194,7 +195,7 @@ var WebDeviceInputSystemImpl = /** @class */ (function () {
      * @param deviceType Enum specifiying device type
      * @param deviceSlot "Slot" or index that device is referenced in
      */
-    WebDeviceInputSystemImpl.prototype._unregisterDevice = function (deviceType, deviceSlot) {
+    WebDeviceInputSystem.prototype._unregisterDevice = function (deviceType, deviceSlot) {
         if (this._inputs[deviceType][deviceSlot]) {
             delete this._inputs[deviceType][deviceSlot];
             this.onDeviceDisconnected(deviceType, deviceSlot);
@@ -203,12 +204,12 @@ var WebDeviceInputSystemImpl = /** @class */ (function () {
     /**
      * Handle all actions that come from keyboard interaction
      */
-    WebDeviceInputSystemImpl.prototype._handleKeyActions = function () {
+    WebDeviceInputSystem.prototype._handleKeyActions = function () {
         var _this = this;
         this._keyboardDownEvent = (function (evt) {
             if (!_this._keyboardActive) {
                 _this._keyboardActive = true;
-                _this._registerDevice(DeviceType.Keyboard, 0, WebDeviceInputSystemImpl.MAX_KEYCODES);
+                _this._registerDevice(DeviceType.Keyboard, 0, MAX_KEYCODES);
             }
             var kbKey = _this._inputs[DeviceType.Keyboard][0];
             if (kbKey) {
@@ -225,7 +226,7 @@ var WebDeviceInputSystemImpl = /** @class */ (function () {
         this._keyboardUpEvent = (function (evt) {
             if (!_this._keyboardActive) {
                 _this._keyboardActive = true;
-                _this._registerDevice(DeviceType.Keyboard, 0, WebDeviceInputSystemImpl.MAX_KEYCODES);
+                _this._registerDevice(DeviceType.Keyboard, 0, MAX_KEYCODES);
             }
             var kbKey = _this._inputs[DeviceType.Keyboard][0];
             if (kbKey) {
@@ -264,8 +265,15 @@ var WebDeviceInputSystemImpl = /** @class */ (function () {
     /**
      * Handle all actions that come from pointer interaction
      */
-    WebDeviceInputSystemImpl.prototype._handlePointerActions = function () {
+    WebDeviceInputSystem.prototype._handlePointerActions = function () {
         var _this = this;
+        this._maxTouchPoints = (DomManagement.IsNavigatorAvailable() && navigator.maxTouchPoints) || 0;
+        if (!this._activeTouchIds) {
+            this._activeTouchIds = new Array(this._maxTouchPoints);
+        }
+        for (var i = 0; i < this._maxTouchPoints; i++) {
+            this._activeTouchIds[i] = -1;
+        }
         this._pointerMoveEvent = (function (evt) {
             var deviceType = _this._getPointerType(evt);
             var deviceSlot = (deviceType === DeviceType.Mouse) ? 0 : _this._activeTouchIds.indexOf(evt.pointerId);
@@ -330,8 +338,16 @@ var WebDeviceInputSystemImpl = /** @class */ (function () {
             var deviceType = _this._getPointerType(evt);
             var deviceSlot = (deviceType === DeviceType.Mouse) ? 0 : evt.pointerId;
             if (deviceType === DeviceType.Touch) {
-                deviceSlot = _this._rollingTouchId++;
-                _this._activeTouchIds[deviceSlot] = evt.pointerId;
+                var idx = _this._activeTouchIds.indexOf(-1);
+                if (idx >= 0) {
+                    deviceSlot = idx;
+                    _this._activeTouchIds[idx] = evt.pointerId;
+                }
+                else {
+                    // We can't find an open slot to store new pointer so just return (can only support max number of touches)
+                    Tools.Warn("Max number of touches exceeded.  Ignoring touches in excess of " + _this._maxTouchPoints);
+                    return;
+                }
             }
             if (!_this._inputs[deviceType]) {
                 _this._inputs[deviceType] = {};
@@ -339,6 +355,9 @@ var WebDeviceInputSystemImpl = /** @class */ (function () {
             if (!_this._inputs[deviceType][deviceSlot]) {
                 _this._addPointerDevice(deviceType, deviceSlot, evt.clientX, evt.clientY);
             }
+            else if (deviceType === DeviceType.Touch) {
+                _this.onDeviceConnected(deviceType, deviceSlot);
+            }
             var pointer = _this._inputs[deviceType][deviceSlot];
             if (pointer) {
                 var previousHorizontal = pointer[PointerInput.Horizontal];
@@ -400,6 +419,14 @@ var WebDeviceInputSystemImpl = /** @class */ (function () {
             var _a, _b, _c, _d, _e;
             var deviceType = _this._getPointerType(evt);
             var deviceSlot = (deviceType === DeviceType.Mouse) ? 0 : _this._activeTouchIds.indexOf(evt.pointerId);
+            if (deviceType === DeviceType.Touch) {
+                if (deviceSlot === -1) {
+                    return;
+                }
+                else {
+                    _this._activeTouchIds[deviceSlot] = -1;
+                }
+            }
             var pointer = (_a = _this._inputs[deviceType]) === null || _a === void 0 ? void 0 : _a[deviceSlot];
             if (pointer && pointer[evt.button + 2] !== 0) {
                 var previousHorizontal = pointer[PointerInput.Horizontal];
@@ -433,11 +460,8 @@ var WebDeviceInputSystemImpl = /** @class */ (function () {
                     _this._elementToAttachTo.releasePointerCapture(evt.pointerId);
                 }
                 _this.onInputChanged(deviceEvent);
-                // We don't want to unregister the mouse because we may miss input data when a mouse is moving after a click
-                if (deviceType !== DeviceType.Mouse) {
-                    var idToRemove = _this._activeTouchIds.indexOf(evt.pointerId);
-                    delete _this._activeTouchIds[idToRemove];
-                    _this._unregisterDevice(deviceType, deviceSlot);
+                if (deviceType === DeviceType.Touch) {
+                    _this.onDeviceDisconnected(deviceType, deviceSlot);
                 }
             }
         });
@@ -497,7 +521,7 @@ var WebDeviceInputSystemImpl = /** @class */ (function () {
                     if ((_d = (_c = _this._elementToAttachTo).hasPointerCapture) === null || _d === void 0 ? void 0 : _d.call(_c, pointerId)) {
                         _this._elementToAttachTo.releasePointerCapture(pointerId);
                     }
-                    if (((_e = pointer[deviceSlot]) === null || _e === void 0 ? void 0 : _e[PointerInput.LeftClick]) === 1) {
+                    if (pointerId !== -1 && ((_e = pointer[deviceSlot]) === null || _e === void 0 ? void 0 : _e[PointerInput.LeftClick]) === 1) {
                         pointer[deviceSlot][PointerInput.LeftClick] = 0;
                         var evt_3 = DeviceEventFactory.CreateDeviceEvent(DeviceType.Touch, pointerId, PointerInput.LeftClick, 1, _this, _this._elementToAttachTo);
                         var deviceEvent = evt_3;
@@ -507,11 +531,10 @@ var WebDeviceInputSystemImpl = /** @class */ (function () {
                         deviceEvent.currentState = pointer[deviceSlot][PointerInput.LeftClick];
                         deviceEvent.previousState = 1;
                         _this.onInputChanged(deviceEvent);
-                        _this._unregisterDevice(DeviceType.Touch, deviceSlot);
+                        _this._activeTouchIds[deviceSlot] = -1;
+                        _this.onDeviceDisconnected(DeviceType.Touch, deviceSlot);
                     }
                 }
-                // Clear all active touches
-                while (_this._activeTouchIds.pop() !== undefined) { }
             }
         });
         this._pointerWheelEvent = (function (evt) {
@@ -522,7 +545,7 @@ var WebDeviceInputSystemImpl = /** @class */ (function () {
             }
             if (!_this._inputs[deviceType][deviceSlot]) {
                 _this._pointerActive = true;
-                _this._registerDevice(deviceType, deviceSlot, WebDeviceInputSystemImpl.MAX_POINTER_INPUTS);
+                _this._registerDevice(deviceType, deviceSlot, MAX_POINTER_INPUTS);
             }
             var pointer = _this._inputs[deviceType][deviceSlot];
             if (pointer) {
@@ -576,7 +599,7 @@ var WebDeviceInputSystemImpl = /** @class */ (function () {
     /**
      * Handle all actions that come from gamepad interaction
      */
-    WebDeviceInputSystemImpl.prototype._handleGamepadActions = function () {
+    WebDeviceInputSystem.prototype._handleGamepadActions = function () {
         var _this = this;
         this._gamepadConnectedEvent = (function (evt) {
             _this._addGamePad(evt.gamepad);
@@ -598,7 +621,7 @@ var WebDeviceInputSystemImpl = /** @class */ (function () {
      * @param deviceSlot "Slot" or index that device is referenced in
      * @param inputIndex Id of input to be checked
      */
-    WebDeviceInputSystemImpl.prototype._updateDevice = function (deviceType, deviceSlot, inputIndex) {
+    WebDeviceInputSystem.prototype._updateDevice = function (deviceType, deviceSlot, inputIndex) {
         // Gamepads
         var gp = navigator.getGamepads()[deviceSlot];
         if (gp && deviceType === this._gamepads[deviceSlot]) {
@@ -616,7 +639,7 @@ var WebDeviceInputSystemImpl = /** @class */ (function () {
      * @param deviceName Name of Device from DeviceInputSystem
      * @returns DeviceType enum value
      */
-    WebDeviceInputSystemImpl.prototype._getGamepadDeviceType = function (deviceName) {
+    WebDeviceInputSystem.prototype._getGamepadDeviceType = function (deviceName) {
         if (deviceName.indexOf("054c") !== -1 && deviceName.indexOf("0ce6") === -1) { // DualShock 4 Gamepad
             return DeviceType.DualShock;
         }
@@ -633,7 +656,7 @@ var WebDeviceInputSystemImpl = /** @class */ (function () {
      * @param evt PointerEvent to evaluate
      * @returns DeviceType interpreted from event
      */
-    WebDeviceInputSystemImpl.prototype._getPointerType = function (evt) {
+    WebDeviceInputSystem.prototype._getPointerType = function (evt) {
         var deviceType = DeviceType.Mouse;
         if (evt.pointerType === "touch" || evt.pointerType === "pen" || evt.touches) {
             deviceType = DeviceType.Touch;
@@ -643,7 +666,7 @@ var WebDeviceInputSystemImpl = /** @class */ (function () {
     /**
      * Remove events from active input element
      */
-    WebDeviceInputSystemImpl.prototype._removeEvents = function () {
+    WebDeviceInputSystem.prototype._removeEvents = function () {
         // Blur Events
         this._elementToAttachTo.removeEventListener("blur", this._keyboardBlurEvent);
         this._elementToAttachTo.removeEventListener("blur", this._pointerBlurEvent);
@@ -663,11 +686,7 @@ var WebDeviceInputSystemImpl = /** @class */ (function () {
             }
         }
     };
-    /** Max number of keycodes */
-    WebDeviceInputSystemImpl.MAX_KEYCODES = 255;
-    /** Max number of pointer inputs */
-    WebDeviceInputSystemImpl.MAX_POINTER_INPUTS = Object.keys(PointerInput).length / 2;
-    return WebDeviceInputSystemImpl;
+    return WebDeviceInputSystem;
 }());
-export { WebDeviceInputSystemImpl };
+export { WebDeviceInputSystem };
 //# sourceMappingURL=webDeviceInputSystem.js.map