@babylonjs/core 5.0.0-beta.9 → 5.0.0-rc.2

package/DeviceInput/Helpers/eventFactory.js

@@ -1,5 +1,5 @@
 import { EventConstants } from "../../Events/deviceInputEvents.js";
-import { DeviceType, PointerInput } from "../InputDevices/deviceEnums.js";
+import { DeviceType, NativePointerInput, PointerInput } from "../InputDevices/deviceEnums.js";
 /**
  * Class to wrap DeviceInputSystem data into an event object
  */
@@ -15,7 +15,7 @@ var DeviceEventFactory = /** @class */ (function () {
      * @param currentState Current value for given input
      * @param deviceInputSystem Reference to DeviceInputSystem
      * @param elementToAttachTo HTMLElement to reference as target for inputs
-     * @returns IEvent object
+     * @returns IUIEvent object
      */
     DeviceEventFactory.CreateDeviceEvent = function (deviceType, deviceSlot, inputIndex, currentState, deviceInputSystem, elementToAttachTo) {
         switch (deviceType) {
@@ -40,11 +40,20 @@ var DeviceEventFactory = /** @class */ (function () {
      * @param currentState Current value for given input
      * @param deviceInputSystem Reference to DeviceInputSystem
      * @param elementToAttachTo HTMLElement to reference as target for inputs
-     * @returns IEvent object (Pointer)
+     * @returns IUIEvent object (Pointer)
      */
     DeviceEventFactory._createPointerEvent = function (deviceType, deviceSlot, inputIndex, currentState, deviceInputSystem, elementToAttachTo) {
         var evt = this._createMouseEvent(deviceType, deviceSlot, inputIndex, currentState, deviceInputSystem, elementToAttachTo);
-        evt.pointerId = deviceType === DeviceType.Mouse ? 1 : deviceSlot;
+        if (deviceType === DeviceType.Mouse) {
+            evt.deviceType = DeviceType.Mouse;
+            evt.pointerId = 1;
+            evt.pointerType = "mouse";
+        }
+        else {
+            evt.deviceType = DeviceType.Touch;
+            evt.pointerId = deviceSlot;
+            evt.pointerType = "touch";
+        }
         if (inputIndex === PointerInput.Move) {
             evt.type = "pointermove";
         }
@@ -62,7 +71,7 @@ var DeviceEventFactory = /** @class */ (function () {
      * @param currentState Current value for given input
      * @param deviceInputSystem Reference to DeviceInputSystem
      * @param elementToAttachTo HTMLElement to reference as target for inputs
-     * @returns IEvent object (Wheel)
+     * @returns IUIEvent object (Wheel)
      */
     DeviceEventFactory._createWheelEvent = function (deviceType, deviceSlot, inputIndex, currentState, deviceInputSystem, elementToAttachTo) {
         var evt = this._createMouseEvent(deviceType, deviceSlot, inputIndex, currentState, deviceInputSystem, elementToAttachTo);
@@ -81,27 +90,33 @@ var DeviceEventFactory = /** @class */ (function () {
      * @param currentState Current value for given input
      * @param deviceInputSystem Reference to DeviceInputSystem
      * @param elementToAttachTo HTMLElement to reference as target for inputs
-     * @returns IEvent object (Mouse)
+     * @returns IUIEvent object (Mouse)
      */
     DeviceEventFactory._createMouseEvent = function (deviceType, deviceSlot, inputIndex, currentState, deviceInputSystem, elementToAttachTo) {
         var evt = this._createEvent(elementToAttachTo);
         var pointerX = deviceInputSystem.pollInput(deviceType, deviceSlot, PointerInput.Horizontal);
         var pointerY = deviceInputSystem.pollInput(deviceType, deviceSlot, PointerInput.Vertical);
-        // If dealing with a change to the delta, grab values for event init
-        var movementX = inputIndex === PointerInput.DeltaHorizontal ? currentState : 0;
-        var movementY = inputIndex === PointerInput.DeltaVertical ? currentState : 0;
-        // Get offsets from container
-        var offsetX = inputIndex === PointerInput.DeltaHorizontal && elementToAttachTo ? movementX - elementToAttachTo.getBoundingClientRect().x : 0;
-        var offsetY = inputIndex === PointerInput.DeltaVertical && elementToAttachTo ? movementY - elementToAttachTo.getBoundingClientRect().y : 0;
+        // Handle offsets/deltas based on existence of HTMLElement
+        if (elementToAttachTo) {
+            evt.movementX = 0;
+            evt.movementY = 0;
+            evt.offsetX = evt.movementX - elementToAttachTo.getBoundingClientRect().x;
+            evt.offsetY = evt.movementY - elementToAttachTo.getBoundingClientRect().y;
+        }
+        else {
+            evt.movementX = deviceInputSystem.pollInput(deviceType, deviceSlot, NativePointerInput.DeltaHorizontal); // DeltaHorizontal
+            evt.movementY = deviceInputSystem.pollInput(deviceType, deviceSlot, NativePointerInput.DeltaVertical); // DeltaVertical
+            evt.offsetX = 0;
+            evt.offsetY = 0;
+        }
         this._checkNonCharacterKeys(evt, deviceInputSystem);
         evt.clientX = pointerX;
         evt.clientY = pointerY;
-        evt.movementX = movementX;
-        evt.movementY = movementY;
-        evt.offsetX = offsetX;
-        evt.offsetY = offsetY;
         evt.x = pointerX;
         evt.y = pointerY;
+        evt.deviceType = deviceType;
+        evt.deviceSlot = deviceSlot;
+        evt.inputIndex = inputIndex;
         return evt;
     };
     /**
@@ -115,6 +130,9 @@ var DeviceEventFactory = /** @class */ (function () {
     DeviceEventFactory._createKeyboardEvent = function (inputIndex, currentState, deviceInputSystem, elementToAttachTo) {
         var evt = this._createEvent(elementToAttachTo);
         this._checkNonCharacterKeys(evt, deviceInputSystem);
+        evt.deviceType = DeviceType.Keyboard;
+        evt.deviceSlot = 0;
+        evt.inputIndex = inputIndex;
         evt.type = currentState === 1 ? "keydown" : "keyup";
         evt.key = String.fromCharCode(inputIndex);
         evt.keyCode = inputIndex;

package/DeviceInput/Helpers/eventFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"eventFactory.js","sourceRoot":"","sources":["../../../../sourceES6/core/DeviceInput/Helpers/eventFactory.ts"],"names":[],"mappings":"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","sourcesContent":["\r\nimport { EventConstants, IEvent } from \"../../Events/deviceInputEvents\";\r\nimport { Nullable } from \"../../types\";\r\nimport { DeviceType, PointerInput } from \"../InputDevices/deviceEnums\";\r\nimport { IDeviceInputSystem } from \"../InputDevices/inputInterfaces\";\r\n\r\n/**\r\n * Class to wrap DeviceInputSystem data into an event object\r\n */\r\nexport class DeviceEventFactory {\r\n    /**\r\n     * Create device input events based on provided type and slot\r\n     *\r\n     * @param deviceType Type of device\r\n     * @param deviceSlot \"Slot\" or index that device is referenced in\r\n     * @param inputIndex Id of input to be checked\r\n     * @param currentState Current value for given input\r\n     * @param deviceInputSystem Reference to DeviceInputSystem\r\n     * @param elementToAttachTo HTMLElement to reference as target for inputs\r\n     * @returns IEvent object\r\n     */\r\n    public static CreateDeviceEvent(deviceType: DeviceType, deviceSlot: number, inputIndex: number, currentState: Nullable<number>, deviceInputSystem: IDeviceInputSystem, elementToAttachTo?: any): IEvent {\r\n        switch (deviceType) {\r\n            case DeviceType.Keyboard:\r\n                return this._createKeyboardEvent(inputIndex, currentState, deviceInputSystem, elementToAttachTo);\r\n            case DeviceType.Mouse:\r\n                if (inputIndex === PointerInput.MouseWheelX || inputIndex === PointerInput.MouseWheelY || inputIndex === PointerInput.MouseWheelZ) {\r\n                    return this._createWheelEvent(deviceType, deviceSlot, inputIndex, currentState, deviceInputSystem, elementToAttachTo);\r\n                }\r\n            case DeviceType.Touch:\r\n                return this._createPointerEvent(deviceType, deviceSlot, inputIndex, currentState, deviceInputSystem, elementToAttachTo);\r\n            default:\r\n                throw `Unable to generate event for device ${DeviceType[deviceType]}`;\r\n        }\r\n    }\r\n\r\n    /**\r\n     * Creates pointer event\r\n     *\r\n     * @param deviceType Type of device\r\n     * @param deviceSlot \"Slot\" or index that device is referenced in\r\n     * @param inputIndex Id of input to be checked\r\n     * @param currentState Current value for given input\r\n     * @param deviceInputSystem Reference to DeviceInputSystem\r\n     * @param elementToAttachTo HTMLElement to reference as target for inputs\r\n     * @returns IEvent object (Pointer)\r\n     */\r\n    private static _createPointerEvent(deviceType: DeviceType, deviceSlot: number, inputIndex: number, currentState: Nullable<number>, deviceInputSystem: IDeviceInputSystem, elementToAttachTo?: any): any {\r\n        const evt = this._createMouseEvent(deviceType, deviceSlot, inputIndex, currentState, deviceInputSystem, elementToAttachTo);\r\n\r\n        evt.pointerId = deviceType === DeviceType.Mouse ? 1 : deviceSlot;\r\n\r\n        if (inputIndex === PointerInput.Move) {\r\n            evt.type = \"pointermove\";\r\n        }\r\n        else if (inputIndex >= PointerInput.LeftClick && inputIndex <= PointerInput.RightClick) {\r\n            evt.type = (currentState === 1) ? \"pointerdown\" : \"pointerup\";\r\n            evt.button = inputIndex - 2;\r\n        }\r\n\r\n        return evt;\r\n    }\r\n\r\n    /**\r\n     * Create Mouse Wheel Event\r\n     * @param deviceType Type of device\r\n     * @param deviceSlot \"Slot\" or index that device is referenced in\r\n     * @param inputIndex Id of input to be checked\r\n     * @param currentState Current value for given input\r\n     * @param deviceInputSystem Reference to DeviceInputSystem\r\n     * @param elementToAttachTo HTMLElement to reference as target for inputs\r\n     * @returns IEvent object (Wheel)\r\n     */\r\n    private static _createWheelEvent(deviceType: DeviceType, deviceSlot: number, inputIndex: number, currentState: Nullable<number>, deviceInputSystem: IDeviceInputSystem, elementToAttachTo: any): any {\r\n        const evt = this._createMouseEvent(deviceType, deviceSlot, inputIndex, currentState, deviceInputSystem, elementToAttachTo);\r\n\r\n        evt.type = \"wheel\";\r\n        evt.deltaMode = EventConstants.DOM_DELTA_PIXEL;\r\n        evt.deltaX = (inputIndex === PointerInput.MouseWheelX) ? currentState : deviceInputSystem.pollInput(deviceType, deviceSlot, PointerInput.MouseWheelX);\r\n        evt.deltaY = (inputIndex === PointerInput.MouseWheelY) ? currentState : deviceInputSystem.pollInput(deviceType, deviceSlot, PointerInput.MouseWheelY);\r\n        evt.deltaZ = (inputIndex === PointerInput.MouseWheelZ) ? currentState : deviceInputSystem.pollInput(deviceType, deviceSlot, PointerInput.MouseWheelZ);\r\n\r\n        return evt;\r\n    }\r\n\r\n    /**\r\n     * Create Mouse Event\r\n     * @param deviceType Type of device\r\n     * @param deviceSlot \"Slot\" or index that device is referenced in\r\n     * @param inputIndex Id of input to be checked\r\n     * @param currentState Current value for given input\r\n     * @param deviceInputSystem Reference to DeviceInputSystem\r\n     * @param elementToAttachTo HTMLElement to reference as target for inputs\r\n     * @returns IEvent object (Mouse)\r\n     */\r\n    private static _createMouseEvent(deviceType: DeviceType, deviceSlot: number, inputIndex: number, currentState: Nullable<number>, deviceInputSystem: IDeviceInputSystem, elementToAttachTo?: any): any {\r\n        const evt = this._createEvent(elementToAttachTo);\r\n        const pointerX = deviceInputSystem.pollInput(deviceType, deviceSlot, PointerInput.Horizontal);\r\n        const pointerY = deviceInputSystem.pollInput(deviceType, deviceSlot, PointerInput.Vertical);\r\n        // If dealing with a change to the delta, grab values for event init\r\n        const movementX = inputIndex === PointerInput.DeltaHorizontal ? currentState : 0;\r\n        const movementY = inputIndex === PointerInput.DeltaVertical ? currentState : 0;\r\n        // Get offsets from container\r\n        const offsetX = inputIndex === PointerInput.DeltaHorizontal && elementToAttachTo ? movementX! - elementToAttachTo.getBoundingClientRect().x : 0;\r\n        const offsetY = inputIndex === PointerInput.DeltaVertical && elementToAttachTo ? movementY! - elementToAttachTo.getBoundingClientRect().y : 0;\r\n        this._checkNonCharacterKeys(evt, deviceInputSystem);\r\n\r\n        evt.clientX = pointerX;\r\n        evt.clientY = pointerY;\r\n        evt.movementX = movementX;\r\n        evt.movementY = movementY;\r\n        evt.offsetX = offsetX;\r\n        evt.offsetY = offsetY;\r\n        evt.x = pointerX;\r\n        evt.y = pointerY;\r\n\r\n        return evt;\r\n    }\r\n\r\n    /**\r\n     * Create Keyboard Event\r\n     * @param inputIndex Id of input to be checked\r\n     * @param currentState Current value for given input\r\n     * @param deviceInputSystem Reference to DeviceInputSystem\r\n     * @param elementToAttachTo HTMLElement to reference as target for inputs\r\n     * @returns IEvent object (Keyboard)\r\n     */\r\n    private static _createKeyboardEvent(inputIndex: number, currentState: Nullable<number>, deviceInputSystem: IDeviceInputSystem, elementToAttachTo?: any): any {\r\n        const evt = this._createEvent(elementToAttachTo);\r\n        this._checkNonCharacterKeys(evt, deviceInputSystem);\r\n\r\n        evt.type = currentState === 1 ? \"keydown\" : \"keyup\";\r\n        evt.key = String.fromCharCode(inputIndex);\r\n        evt.keyCode = inputIndex;\r\n\r\n        return evt;\r\n    }\r\n\r\n    /**\r\n     * Add parameters for non-character keys (Ctrl, Alt, Meta, Shift)\r\n     * @param evt Event object to add parameters to\r\n     * @param deviceInputSystem DeviceInputSystem to pull values from\r\n     */\r\n    private static _checkNonCharacterKeys(evt: any, deviceInputSystem: IDeviceInputSystem): void {\r\n        const isKeyboardActive = deviceInputSystem.isDeviceAvailable(DeviceType.Keyboard);\r\n        const altKey = isKeyboardActive && deviceInputSystem.pollInput(DeviceType.Keyboard, 0, 18) === 1;\r\n        const ctrlKey = isKeyboardActive && deviceInputSystem.pollInput(DeviceType.Keyboard, 0, 17) === 1;\r\n        const metaKey =\r\n            isKeyboardActive &&\r\n            (deviceInputSystem.pollInput(DeviceType.Keyboard, 0, 91) === 1 ||\r\n                deviceInputSystem.pollInput(DeviceType.Keyboard, 0, 92) === 1 ||\r\n                deviceInputSystem.pollInput(DeviceType.Keyboard, 0, 93) === 1);\r\n        const shiftKey = isKeyboardActive && deviceInputSystem.pollInput(DeviceType.Keyboard, 0, 16) === 1;\r\n\r\n        evt.altKey = altKey;\r\n        evt.ctrlKey = ctrlKey;\r\n        evt.metaKey = metaKey;\r\n        evt.shiftKey = shiftKey;\r\n    }\r\n\r\n    /**\r\n     * Create base event object\r\n     * @param elementToAttachTo Value to use as event target\r\n     * @returns\r\n     */\r\n    private static _createEvent(elementToAttachTo: any): any {\r\n        const evt: { [k: string]: any } = {};\r\n        evt.preventDefault = () => { };\r\n        evt.target = elementToAttachTo;\r\n\r\n        return evt;\r\n    }\r\n}"]}
+{"version":3,"file":"eventFactory.js","sourceRoot":"","sources":["../../../../sourceES6/core/DeviceInput/Helpers/eventFactory.ts"],"names":[],"mappings":"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","sourcesContent":["\r\nimport { EventConstants, IUIEvent } from \"../../Events/deviceInputEvents\";\r\nimport { Nullable } from \"../../types\";\r\nimport { DeviceType, NativePointerInput, PointerInput } from \"../InputDevices/deviceEnums\";\r\nimport { IDeviceInputSystem } from \"../InputDevices/inputInterfaces\";\r\n\r\n/**\r\n * Class to wrap DeviceInputSystem data into an event object\r\n */\r\nexport class DeviceEventFactory {\r\n    /**\r\n     * Create device input events based on provided type and slot\r\n     *\r\n     * @param deviceType Type of device\r\n     * @param deviceSlot \"Slot\" or index that device is referenced in\r\n     * @param inputIndex Id of input to be checked\r\n     * @param currentState Current value for given input\r\n     * @param deviceInputSystem Reference to DeviceInputSystem\r\n     * @param elementToAttachTo HTMLElement to reference as target for inputs\r\n     * @returns IUIEvent object\r\n     */\r\n    public static CreateDeviceEvent(deviceType: DeviceType, deviceSlot: number, inputIndex: number, currentState: Nullable<number>, deviceInputSystem: IDeviceInputSystem, elementToAttachTo?: any): IUIEvent {\r\n        switch (deviceType) {\r\n            case DeviceType.Keyboard:\r\n                return this._createKeyboardEvent(inputIndex, currentState, deviceInputSystem, elementToAttachTo);\r\n            case DeviceType.Mouse:\r\n                if (inputIndex === PointerInput.MouseWheelX || inputIndex === PointerInput.MouseWheelY || inputIndex === PointerInput.MouseWheelZ) {\r\n                    return this._createWheelEvent(deviceType, deviceSlot, inputIndex, currentState, deviceInputSystem, elementToAttachTo);\r\n                }\r\n            case DeviceType.Touch:\r\n                return this._createPointerEvent(deviceType, deviceSlot, inputIndex, currentState, deviceInputSystem, elementToAttachTo);\r\n            default:\r\n                throw `Unable to generate event for device ${DeviceType[deviceType]}`;\r\n        }\r\n    }\r\n\r\n    /**\r\n     * Creates pointer event\r\n     *\r\n     * @param deviceType Type of device\r\n     * @param deviceSlot \"Slot\" or index that device is referenced in\r\n     * @param inputIndex Id of input to be checked\r\n     * @param currentState Current value for given input\r\n     * @param deviceInputSystem Reference to DeviceInputSystem\r\n     * @param elementToAttachTo HTMLElement to reference as target for inputs\r\n     * @returns IUIEvent object (Pointer)\r\n     */\r\n    private static _createPointerEvent(deviceType: DeviceType, deviceSlot: number, inputIndex: number, currentState: Nullable<number>, deviceInputSystem: IDeviceInputSystem, elementToAttachTo?: any): any {\r\n        const evt = this._createMouseEvent(deviceType, deviceSlot, inputIndex, currentState, deviceInputSystem, elementToAttachTo);\r\n\r\n        if (deviceType === DeviceType.Mouse) {\r\n            evt.deviceType = DeviceType.Mouse;\r\n            evt.pointerId = 1;\r\n            evt.pointerType = \"mouse\";\r\n        }\r\n        else {\r\n            evt.deviceType = DeviceType.Touch;\r\n            evt.pointerId = deviceSlot;\r\n            evt.pointerType = \"touch\";\r\n        }\r\n\r\n        if (inputIndex === PointerInput.Move) {\r\n            evt.type = \"pointermove\";\r\n        }\r\n        else if (inputIndex >= PointerInput.LeftClick && inputIndex <= PointerInput.RightClick) {\r\n            evt.type = (currentState === 1) ? \"pointerdown\" : \"pointerup\";\r\n            evt.button = inputIndex - 2;\r\n        }\r\n\r\n        return evt;\r\n    }\r\n\r\n    /**\r\n     * Create Mouse Wheel Event\r\n     * @param deviceType Type of device\r\n     * @param deviceSlot \"Slot\" or index that device is referenced in\r\n     * @param inputIndex Id of input to be checked\r\n     * @param currentState Current value for given input\r\n     * @param deviceInputSystem Reference to DeviceInputSystem\r\n     * @param elementToAttachTo HTMLElement to reference as target for inputs\r\n     * @returns IUIEvent object (Wheel)\r\n     */\r\n    private static _createWheelEvent(deviceType: DeviceType, deviceSlot: number, inputIndex: number, currentState: Nullable<number>, deviceInputSystem: IDeviceInputSystem, elementToAttachTo: any): any {\r\n        const evt = this._createMouseEvent(deviceType, deviceSlot, inputIndex, currentState, deviceInputSystem, elementToAttachTo);\r\n\r\n        evt.type = \"wheel\";\r\n        evt.deltaMode = EventConstants.DOM_DELTA_PIXEL;\r\n        evt.deltaX = (inputIndex === PointerInput.MouseWheelX) ? currentState : deviceInputSystem.pollInput(deviceType, deviceSlot, PointerInput.MouseWheelX);\r\n        evt.deltaY = (inputIndex === PointerInput.MouseWheelY) ? currentState : deviceInputSystem.pollInput(deviceType, deviceSlot, PointerInput.MouseWheelY);\r\n        evt.deltaZ = (inputIndex === PointerInput.MouseWheelZ) ? currentState : deviceInputSystem.pollInput(deviceType, deviceSlot, PointerInput.MouseWheelZ);\r\n\r\n        return evt;\r\n    }\r\n\r\n    /**\r\n     * Create Mouse Event\r\n     * @param deviceType Type of device\r\n     * @param deviceSlot \"Slot\" or index that device is referenced in\r\n     * @param inputIndex Id of input to be checked\r\n     * @param currentState Current value for given input\r\n     * @param deviceInputSystem Reference to DeviceInputSystem\r\n     * @param elementToAttachTo HTMLElement to reference as target for inputs\r\n     * @returns IUIEvent object (Mouse)\r\n     */\r\n    private static _createMouseEvent(deviceType: DeviceType, deviceSlot: number, inputIndex: number, currentState: Nullable<number>, deviceInputSystem: IDeviceInputSystem, elementToAttachTo?: any): any {\r\n        const evt = this._createEvent(elementToAttachTo);\r\n        const pointerX = deviceInputSystem.pollInput(deviceType, deviceSlot, PointerInput.Horizontal);\r\n        const pointerY = deviceInputSystem.pollInput(deviceType, deviceSlot, PointerInput.Vertical);\r\n\r\n        // Handle offsets/deltas based on existence of HTMLElement\r\n        if (elementToAttachTo) {\r\n            evt.movementX = 0;\r\n            evt.movementY = 0;\r\n            evt.offsetX = evt.movementX - elementToAttachTo.getBoundingClientRect().x;\r\n            evt.offsetY = evt.movementY - elementToAttachTo.getBoundingClientRect().y;\r\n        }\r\n        else {\r\n            evt.movementX = deviceInputSystem.pollInput(deviceType, deviceSlot, NativePointerInput.DeltaHorizontal); // DeltaHorizontal\r\n            evt.movementY = deviceInputSystem.pollInput(deviceType, deviceSlot, NativePointerInput.DeltaVertical); // DeltaVertical\r\n            evt.offsetX = 0;\r\n            evt.offsetY = 0;\r\n        }\r\n        this._checkNonCharacterKeys(evt, deviceInputSystem);\r\n\r\n        evt.clientX = pointerX;\r\n        evt.clientY = pointerY;\r\n        evt.x = pointerX;\r\n        evt.y = pointerY;\r\n\r\n        evt.deviceType = deviceType;\r\n        evt.deviceSlot = deviceSlot;\r\n        evt.inputIndex = inputIndex;\r\n\r\n        return evt;\r\n    }\r\n\r\n    /**\r\n     * Create Keyboard Event\r\n     * @param inputIndex Id of input to be checked\r\n     * @param currentState Current value for given input\r\n     * @param deviceInputSystem Reference to DeviceInputSystem\r\n     * @param elementToAttachTo HTMLElement to reference as target for inputs\r\n     * @returns IEvent object (Keyboard)\r\n     */\r\n    private static _createKeyboardEvent(inputIndex: number, currentState: Nullable<number>, deviceInputSystem: IDeviceInputSystem, elementToAttachTo?: any): any {\r\n        const evt = this._createEvent(elementToAttachTo);\r\n        this._checkNonCharacterKeys(evt, deviceInputSystem);\r\n        evt.deviceType = DeviceType.Keyboard;\r\n        evt.deviceSlot = 0;\r\n        evt.inputIndex = inputIndex;\r\n\r\n        evt.type = currentState === 1 ? \"keydown\" : \"keyup\";\r\n        evt.key = String.fromCharCode(inputIndex);\r\n        evt.keyCode = inputIndex;\r\n\r\n        return evt;\r\n    }\r\n\r\n    /**\r\n     * Add parameters for non-character keys (Ctrl, Alt, Meta, Shift)\r\n     * @param evt Event object to add parameters to\r\n     * @param deviceInputSystem DeviceInputSystem to pull values from\r\n     */\r\n    private static _checkNonCharacterKeys(evt: any, deviceInputSystem: IDeviceInputSystem): void {\r\n        const isKeyboardActive = deviceInputSystem.isDeviceAvailable(DeviceType.Keyboard);\r\n        const altKey = isKeyboardActive && deviceInputSystem.pollInput(DeviceType.Keyboard, 0, 18) === 1;\r\n        const ctrlKey = isKeyboardActive && deviceInputSystem.pollInput(DeviceType.Keyboard, 0, 17) === 1;\r\n        const metaKey =\r\n            isKeyboardActive &&\r\n            (deviceInputSystem.pollInput(DeviceType.Keyboard, 0, 91) === 1 ||\r\n                deviceInputSystem.pollInput(DeviceType.Keyboard, 0, 92) === 1 ||\r\n                deviceInputSystem.pollInput(DeviceType.Keyboard, 0, 93) === 1);\r\n        const shiftKey = isKeyboardActive && deviceInputSystem.pollInput(DeviceType.Keyboard, 0, 16) === 1;\r\n\r\n        evt.altKey = altKey;\r\n        evt.ctrlKey = ctrlKey;\r\n        evt.metaKey = metaKey;\r\n        evt.shiftKey = shiftKey;\r\n    }\r\n\r\n    /**\r\n     * Create base event object\r\n     * @param elementToAttachTo Value to use as event target\r\n     * @returns\r\n     */\r\n    private static _createEvent(elementToAttachTo: any): any {\r\n        const evt: { [k: string]: any } = {};\r\n        evt.preventDefault = () => { };\r\n        evt.target = elementToAttachTo;\r\n\r\n        return evt;\r\n    }\r\n}"]}

package/DeviceInput/InputDevices/deviceEnums.d.ts

@@ -23,6 +23,31 @@ export declare enum DeviceType {
  * Enum for All Pointers (Touch/Mouse)
  */
 export declare enum PointerInput {
+    /** Horizontal Axis (Not used in events/observables; only in polling) */
+    Horizontal = 0,
+    /** Vertical Axis (Not used in events/observables; only in polling) */
+    Vertical = 1,
+    /** Left Click or Touch */
+    LeftClick = 2,
+    /** Middle Click */
+    MiddleClick = 3,
+    /** Right Click */
+    RightClick = 4,
+    /** Browser Back */
+    BrowserBack = 5,
+    /** Browser Forward */
+    BrowserForward = 6,
+    /** Mouse Wheel X */
+    MouseWheelX = 7,
+    /** Mouse Wheel Y */
+    MouseWheelY = 8,
+    /** Mouse Wheel Z */
+    MouseWheelZ = 9,
+    /** Used in events/observables to identify if x/y changes occurred */
+    Move = 12
+}
+/** @hidden */
+export declare enum NativePointerInput {
     /** Horizontal Axis */
     Horizontal = 0,
     /** Vertical Axis */
@@ -46,9 +71,7 @@ export declare enum PointerInput {
     /** Delta X */
     DeltaHorizontal = 10,
     /** Delta Y */
-    DeltaVertical = 11,
-    /** Move Catch-all */
-    Move = 12
+    DeltaVertical = 11
 }
 /**
  * Enum for Dual Shock Gamepad

package/DeviceInput/InputDevices/deviceEnums.js

@@ -26,9 +26,9 @@ export var DeviceType;
  */
 export var PointerInput;
 (function (PointerInput) {
-    /** Horizontal Axis */
+    /** Horizontal Axis (Not used in events/observables; only in polling) */
     PointerInput[PointerInput["Horizontal"] = 0] = "Horizontal";
-    /** Vertical Axis */
+    /** Vertical Axis (Not used in events/observables; only in polling) */
     PointerInput[PointerInput["Vertical"] = 1] = "Vertical";
     /** Left Click or Touch */
     PointerInput[PointerInput["LeftClick"] = 2] = "LeftClick";
@@ -46,13 +46,37 @@ export var PointerInput;
     PointerInput[PointerInput["MouseWheelY"] = 8] = "MouseWheelY";
     /** Mouse Wheel Z */
     PointerInput[PointerInput["MouseWheelZ"] = 9] = "MouseWheelZ";
-    /** Delta X */
-    PointerInput[PointerInput["DeltaHorizontal"] = 10] = "DeltaHorizontal";
-    /** Delta Y */
-    PointerInput[PointerInput["DeltaVertical"] = 11] = "DeltaVertical";
-    /** Move Catch-all */
+    /** Used in events/observables to identify if x/y changes occurred */
     PointerInput[PointerInput["Move"] = 12] = "Move";
 })(PointerInput || (PointerInput = {}));
+/** @hidden */
+export var NativePointerInput;
+(function (NativePointerInput) {
+    /** Horizontal Axis */
+    NativePointerInput[NativePointerInput["Horizontal"] = 0] = "Horizontal";
+    /** Vertical Axis */
+    NativePointerInput[NativePointerInput["Vertical"] = 1] = "Vertical";
+    /** Left Click or Touch */
+    NativePointerInput[NativePointerInput["LeftClick"] = 2] = "LeftClick";
+    /** Middle Click */
+    NativePointerInput[NativePointerInput["MiddleClick"] = 3] = "MiddleClick";
+    /** Right Click */
+    NativePointerInput[NativePointerInput["RightClick"] = 4] = "RightClick";
+    /** Browser Back */
+    NativePointerInput[NativePointerInput["BrowserBack"] = 5] = "BrowserBack";
+    /** Browser Forward */
+    NativePointerInput[NativePointerInput["BrowserForward"] = 6] = "BrowserForward";
+    /** Mouse Wheel X */
+    NativePointerInput[NativePointerInput["MouseWheelX"] = 7] = "MouseWheelX";
+    /** Mouse Wheel Y */
+    NativePointerInput[NativePointerInput["MouseWheelY"] = 8] = "MouseWheelY";
+    /** Mouse Wheel Z */
+    NativePointerInput[NativePointerInput["MouseWheelZ"] = 9] = "MouseWheelZ";
+    /** Delta X */
+    NativePointerInput[NativePointerInput["DeltaHorizontal"] = 10] = "DeltaHorizontal";
+    /** Delta Y */
+    NativePointerInput[NativePointerInput["DeltaVertical"] = 11] = "DeltaVertical";
+})(NativePointerInput || (NativePointerInput = {}));
 /**
  * Enum for Dual Shock Gamepad
  */

package/DeviceInput/InputDevices/deviceEnums.js.map

@@ -1 +1 @@
-{"version":3,"file":"deviceEnums.js","sourceRoot":"","sources":["../../../../sourceES6/core/DeviceInput/InputDevices/deviceEnums.ts"],"names":[],"mappings":"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","sourcesContent":["/**\r\n * Enum for Device Types\r\n */\r\nexport enum DeviceType {\r\n    /** Generic */\r\n    Generic = 0,\r\n    /** Keyboard */\r\n    Keyboard = 1,\r\n    /** Mouse */\r\n    Mouse = 2,\r\n    /** Touch Pointers */\r\n    Touch = 3,\r\n    /** PS4 Dual Shock */\r\n    DualShock = 4,\r\n    /** Xbox */\r\n    Xbox = 5,\r\n    /** Switch Controller */\r\n    Switch = 6,\r\n    /** PS5 DualSense */\r\n    DualSense = 7,\r\n}\r\n\r\n// Device Enums\r\n/**\r\n * Enum for All Pointers (Touch/Mouse)\r\n */\r\nexport enum PointerInput {\r\n    /** Horizontal Axis */\r\n    Horizontal = 0,\r\n    /** Vertical Axis */\r\n    Vertical = 1,\r\n    /** Left Click or Touch */\r\n    LeftClick = 2,\r\n    /** Middle Click */\r\n    MiddleClick = 3,\r\n    /** Right Click */\r\n    RightClick = 4,\r\n    /** Browser Back */\r\n    BrowserBack = 5,\r\n    /** Browser Forward */\r\n    BrowserForward = 6,\r\n    /** Mouse Wheel X */\r\n    MouseWheelX = 7,\r\n    /** Mouse Wheel Y */\r\n    MouseWheelY = 8,\r\n    /** Mouse Wheel Z */\r\n    MouseWheelZ = 9,\r\n    /** Delta X */\r\n    DeltaHorizontal = 10,\r\n    /** Delta Y */\r\n    DeltaVertical = 11,\r\n    /** Move Catch-all */\r\n    Move = 12,\r\n}\r\n\r\n/**\r\n * Enum for Dual Shock Gamepad\r\n */\r\nexport enum DualShockInput {\r\n    /** Cross */\r\n    Cross = 0,\r\n    /** Circle */\r\n    Circle = 1,\r\n    /** Square */\r\n    Square = 2,\r\n    /** Triangle */\r\n    Triangle = 3,\r\n    /** L1 */\r\n    L1 = 4,\r\n    /** R1 */\r\n    R1 = 5,\r\n    /** L2 */\r\n    L2 = 6,\r\n    /** R2 */\r\n    R2 = 7,\r\n    /** Share */\r\n    Share = 8,\r\n    /** Options */\r\n    Options = 9,\r\n    /** L3 */\r\n    L3 = 10,\r\n    /** R3 */\r\n    R3 = 11,\r\n    /** DPadUp */\r\n    DPadUp = 12,\r\n    /** DPadDown */\r\n    DPadDown = 13,\r\n    /** DPadLeft */\r\n    DPadLeft = 14,\r\n    /** DRight */\r\n    DPadRight = 15,\r\n    /** Home */\r\n    Home = 16,\r\n    /** TouchPad */\r\n    TouchPad = 17,\r\n    /** LStickXAxis */\r\n    LStickXAxis = 18,\r\n    /** LStickYAxis */\r\n    LStickYAxis = 19,\r\n    /** RStickXAxis */\r\n    RStickXAxis = 20,\r\n    /** RStickYAxis */\r\n    RStickYAxis = 21\r\n}\r\n\r\n/**\r\n * Enum for Dual Sense Gamepad\r\n */\r\n export enum DualSenseInput {\r\n    /** Cross */\r\n    Cross = 0,\r\n    /** Circle */\r\n    Circle = 1,\r\n    /** Square */\r\n    Square = 2,\r\n    /** Triangle */\r\n    Triangle = 3,\r\n    /** L1 */\r\n    L1 = 4,\r\n    /** R1 */\r\n    R1 = 5,\r\n    /** L2 */\r\n    L2 = 6,\r\n    /** R2 */\r\n    R2 = 7,\r\n    /** Create */\r\n    Create  = 8,\r\n    /** Options */\r\n    Options = 9,\r\n    /** L3 */\r\n    L3 = 10,\r\n    /** R3 */\r\n    R3 = 11,\r\n    /** DPadUp */\r\n    DPadUp = 12,\r\n    /** DPadDown */\r\n    DPadDown = 13,\r\n    /** DPadLeft */\r\n    DPadLeft = 14,\r\n    /** DRight */\r\n    DPadRight = 15,\r\n    /** Home */\r\n    Home = 16,\r\n    /** TouchPad */\r\n    TouchPad = 17,\r\n    /** LStickXAxis */\r\n    LStickXAxis = 18,\r\n    /** LStickYAxis */\r\n    LStickYAxis = 19,\r\n    /** RStickXAxis */\r\n    RStickXAxis = 20,\r\n    /** RStickYAxis */\r\n    RStickYAxis = 21\r\n}\r\n\r\n/**\r\n * Enum for Xbox Gamepad\r\n */\r\nexport enum XboxInput {\r\n    /** A */\r\n    A = 0,\r\n    /** B */\r\n    B = 1,\r\n    /** X */\r\n    X = 2,\r\n    /** Y */\r\n    Y = 3,\r\n    /** LB */\r\n    LB = 4,\r\n    /** RB */\r\n    RB = 5,\r\n    /** LT */\r\n    LT = 6,\r\n    /** RT */\r\n    RT = 7,\r\n    /** Back */\r\n    Back = 8,\r\n    /** Start */\r\n    Start = 9,\r\n    /** LS */\r\n    LS = 10,\r\n    /** RS */\r\n    RS = 11,\r\n    /** DPadUp */\r\n    DPadUp = 12,\r\n    /** DPadDown */\r\n    DPadDown = 13,\r\n    /** DPadLeft */\r\n    DPadLeft = 14,\r\n    /** DRight */\r\n    DPadRight = 15,\r\n    /** Home */\r\n    Home = 16,\r\n    /** LStickXAxis */\r\n    LStickXAxis = 17,\r\n    /** LStickYAxis */\r\n    LStickYAxis = 18,\r\n    /** RStickXAxis */\r\n    RStickXAxis = 19,\r\n    /** RStickYAxis */\r\n    RStickYAxis = 20\r\n}\r\n\r\n/**\r\n * Enum for Switch (Pro/JoyCon L+R) Gamepad\r\n */\r\nexport enum SwitchInput {\r\n    /** B */\r\n    B = 0,\r\n    /** A */\r\n    A = 1,\r\n    /** Y */\r\n    Y = 2,\r\n    /** X */\r\n    X = 3,\r\n    /** L */\r\n    L = 4,\r\n    /** R */\r\n    R = 5,\r\n    /** ZL */\r\n    ZL = 6,\r\n    /** ZR */\r\n    ZR = 7,\r\n    /** Minus */\r\n    Minus = 8,\r\n    /** Plus */\r\n    Plus = 9,\r\n    /** LS */\r\n    LS = 10,\r\n    /** RS */\r\n    RS = 11,\r\n    /** DPadUp */\r\n    DPadUp = 12,\r\n    /** DPadDown */\r\n    DPadDown = 13,\r\n    /** DPadLeft */\r\n    DPadLeft = 14,\r\n    /** DRight */\r\n    DPadRight = 15,\r\n    /** Home */\r\n    Home = 16,\r\n    /** Capture */\r\n    Capture = 17,\r\n    /** LStickXAxis */\r\n    LStickXAxis = 18,\r\n    /** LStickYAxis */\r\n    LStickYAxis = 19,\r\n    /** RStickXAxis */\r\n    RStickXAxis = 20,\r\n    /** RStickYAxis */\r\n    RStickYAxis = 21\r\n}"]}
+{"version":3,"file":"deviceEnums.js","sourceRoot":"","sources":["../../../../sourceES6/core/DeviceInput/InputDevices/deviceEnums.ts"],"names":[],"mappings":"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","sourcesContent":["/**\r\n * Enum for Device Types\r\n */\r\nexport enum DeviceType {\r\n    /** Generic */\r\n    Generic = 0,\r\n    /** Keyboard */\r\n    Keyboard = 1,\r\n    /** Mouse */\r\n    Mouse = 2,\r\n    /** Touch Pointers */\r\n    Touch = 3,\r\n    /** PS4 Dual Shock */\r\n    DualShock = 4,\r\n    /** Xbox */\r\n    Xbox = 5,\r\n    /** Switch Controller */\r\n    Switch = 6,\r\n    /** PS5 DualSense */\r\n    DualSense = 7,\r\n}\r\n\r\n// Device Enums\r\n/**\r\n * Enum for All Pointers (Touch/Mouse)\r\n */\r\nexport enum PointerInput {\r\n    /** Horizontal Axis (Not used in events/observables; only in polling) */\r\n    Horizontal = 0,\r\n    /** Vertical Axis (Not used in events/observables; only in polling) */\r\n    Vertical = 1,\r\n    /** Left Click or Touch */\r\n    LeftClick = 2,\r\n    /** Middle Click */\r\n    MiddleClick = 3,\r\n    /** Right Click */\r\n    RightClick = 4,\r\n    /** Browser Back */\r\n    BrowserBack = 5,\r\n    /** Browser Forward */\r\n    BrowserForward = 6,\r\n    /** Mouse Wheel X */\r\n    MouseWheelX = 7,\r\n    /** Mouse Wheel Y */\r\n    MouseWheelY = 8,\r\n    /** Mouse Wheel Z */\r\n    MouseWheelZ = 9,\r\n    /** Used in events/observables to identify if x/y changes occurred */\r\n    Move = 12,\r\n}\r\n\r\n/** @hidden */\r\nexport enum NativePointerInput {\r\n    /** Horizontal Axis */\r\n    Horizontal = PointerInput.Horizontal,\r\n    /** Vertical Axis */\r\n    Vertical = 1,\r\n    /** Left Click or Touch */\r\n    LeftClick = 2,\r\n    /** Middle Click */\r\n    MiddleClick = 3,\r\n    /** Right Click */\r\n    RightClick = 4,\r\n    /** Browser Back */\r\n    BrowserBack = 5,\r\n    /** Browser Forward */\r\n    BrowserForward = 6,\r\n    /** Mouse Wheel X */\r\n    MouseWheelX = 7,\r\n    /** Mouse Wheel Y */\r\n    MouseWheelY = 8,\r\n    /** Mouse Wheel Z */\r\n    MouseWheelZ = 9,\r\n    /** Delta X */\r\n    DeltaHorizontal = 10,\r\n    /** Delta Y */\r\n    DeltaVertical = 11,\r\n}\r\n\r\n/**\r\n * Enum for Dual Shock Gamepad\r\n */\r\nexport enum DualShockInput {\r\n    /** Cross */\r\n    Cross = 0,\r\n    /** Circle */\r\n    Circle = 1,\r\n    /** Square */\r\n    Square = 2,\r\n    /** Triangle */\r\n    Triangle = 3,\r\n    /** L1 */\r\n    L1 = 4,\r\n    /** R1 */\r\n    R1 = 5,\r\n    /** L2 */\r\n    L2 = 6,\r\n    /** R2 */\r\n    R2 = 7,\r\n    /** Share */\r\n    Share = 8,\r\n    /** Options */\r\n    Options = 9,\r\n    /** L3 */\r\n    L3 = 10,\r\n    /** R3 */\r\n    R3 = 11,\r\n    /** DPadUp */\r\n    DPadUp = 12,\r\n    /** DPadDown */\r\n    DPadDown = 13,\r\n    /** DPadLeft */\r\n    DPadLeft = 14,\r\n    /** DRight */\r\n    DPadRight = 15,\r\n    /** Home */\r\n    Home = 16,\r\n    /** TouchPad */\r\n    TouchPad = 17,\r\n    /** LStickXAxis */\r\n    LStickXAxis = 18,\r\n    /** LStickYAxis */\r\n    LStickYAxis = 19,\r\n    /** RStickXAxis */\r\n    RStickXAxis = 20,\r\n    /** RStickYAxis */\r\n    RStickYAxis = 21\r\n}\r\n\r\n/**\r\n * Enum for Dual Sense Gamepad\r\n */\r\n export enum DualSenseInput {\r\n    /** Cross */\r\n    Cross = 0,\r\n    /** Circle */\r\n    Circle = 1,\r\n    /** Square */\r\n    Square = 2,\r\n    /** Triangle */\r\n    Triangle = 3,\r\n    /** L1 */\r\n    L1 = 4,\r\n    /** R1 */\r\n    R1 = 5,\r\n    /** L2 */\r\n    L2 = 6,\r\n    /** R2 */\r\n    R2 = 7,\r\n    /** Create */\r\n    Create  = 8,\r\n    /** Options */\r\n    Options = 9,\r\n    /** L3 */\r\n    L3 = 10,\r\n    /** R3 */\r\n    R3 = 11,\r\n    /** DPadUp */\r\n    DPadUp = 12,\r\n    /** DPadDown */\r\n    DPadDown = 13,\r\n    /** DPadLeft */\r\n    DPadLeft = 14,\r\n    /** DRight */\r\n    DPadRight = 15,\r\n    /** Home */\r\n    Home = 16,\r\n    /** TouchPad */\r\n    TouchPad = 17,\r\n    /** LStickXAxis */\r\n    LStickXAxis = 18,\r\n    /** LStickYAxis */\r\n    LStickYAxis = 19,\r\n    /** RStickXAxis */\r\n    RStickXAxis = 20,\r\n    /** RStickYAxis */\r\n    RStickYAxis = 21\r\n}\r\n\r\n/**\r\n * Enum for Xbox Gamepad\r\n */\r\nexport enum XboxInput {\r\n    /** A */\r\n    A = 0,\r\n    /** B */\r\n    B = 1,\r\n    /** X */\r\n    X = 2,\r\n    /** Y */\r\n    Y = 3,\r\n    /** LB */\r\n    LB = 4,\r\n    /** RB */\r\n    RB = 5,\r\n    /** LT */\r\n    LT = 6,\r\n    /** RT */\r\n    RT = 7,\r\n    /** Back */\r\n    Back = 8,\r\n    /** Start */\r\n    Start = 9,\r\n    /** LS */\r\n    LS = 10,\r\n    /** RS */\r\n    RS = 11,\r\n    /** DPadUp */\r\n    DPadUp = 12,\r\n    /** DPadDown */\r\n    DPadDown = 13,\r\n    /** DPadLeft */\r\n    DPadLeft = 14,\r\n    /** DRight */\r\n    DPadRight = 15,\r\n    /** Home */\r\n    Home = 16,\r\n    /** LStickXAxis */\r\n    LStickXAxis = 17,\r\n    /** LStickYAxis */\r\n    LStickYAxis = 18,\r\n    /** RStickXAxis */\r\n    RStickXAxis = 19,\r\n    /** RStickYAxis */\r\n    RStickYAxis = 20\r\n}\r\n\r\n/**\r\n * Enum for Switch (Pro/JoyCon L+R) Gamepad\r\n */\r\nexport enum SwitchInput {\r\n    /** B */\r\n    B = 0,\r\n    /** A */\r\n    A = 1,\r\n    /** Y */\r\n    Y = 2,\r\n    /** X */\r\n    X = 3,\r\n    /** L */\r\n    L = 4,\r\n    /** R */\r\n    R = 5,\r\n    /** ZL */\r\n    ZL = 6,\r\n    /** ZR */\r\n    ZR = 7,\r\n    /** Minus */\r\n    Minus = 8,\r\n    /** Plus */\r\n    Plus = 9,\r\n    /** LS */\r\n    LS = 10,\r\n    /** RS */\r\n    RS = 11,\r\n    /** DPadUp */\r\n    DPadUp = 12,\r\n    /** DPadDown */\r\n    DPadDown = 13,\r\n    /** DPadLeft */\r\n    DPadLeft = 14,\r\n    /** DRight */\r\n    DPadRight = 15,\r\n    /** Home */\r\n    Home = 16,\r\n    /** Capture */\r\n    Capture = 17,\r\n    /** LStickXAxis */\r\n    LStickXAxis = 18,\r\n    /** LStickYAxis */\r\n    LStickYAxis = 19,\r\n    /** RStickXAxis */\r\n    RStickXAxis = 20,\r\n    /** RStickYAxis */\r\n    RStickYAxis = 21\r\n}"]}

package/DeviceInput/InputDevices/deviceSource.d.ts

@@ -1,7 +1,12 @@
-import { DeviceType } from './deviceEnums';
+import { DeviceType, PointerInput } from './deviceEnums';
 import { Observable } from '../../Misc/observable';
 import { DeviceInput } from './deviceTypes';
-import { IDeviceEvent, IDeviceInputSystem } from './inputInterfaces';
+import { IDeviceInputSystem } from './inputInterfaces';
+import { IUIEvent } from '../../Events/deviceInputEvents';
+/**
+ * Subset of DeviceInput that only handles pointers and keyboard
+ */
+declare type DeviceEventInput<T extends DeviceType> = T extends DeviceType.Keyboard | DeviceType.Generic ? number : T extends DeviceType.Mouse | DeviceType.Touch ? Exclude<PointerInput, PointerInput.Horizontal | PointerInput.Vertical> : never;
 /**
  * Class that handles all input for a specific device
  */
@@ -13,7 +18,9 @@ export declare class DeviceSource<T extends DeviceType> {
     /**
      * Observable to handle device input changes per device
      */
-    readonly onInputChangedObservable: Observable<IDeviceEvent>;
+    readonly onInputChangedObservable: Observable<IUIEvent & {
+        inputIndex: DeviceEventInput<T>;
+    }>;
     private readonly _deviceInputSystem;
     /**
      * Default Constructor
@@ -33,3 +40,4 @@ export declare class DeviceSource<T extends DeviceType> {
      */
     getInput(inputIndex: DeviceInput<T>): number;
 }
+export {};

package/DeviceInput/InputDevices/deviceSource.js.map

@@ -1 +1 @@
-{"version":3,"file":"deviceSource.js","sourceRoot":"","sources":["../../../../sourceES6/core/DeviceInput/InputDevices/deviceSource.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAInD;;GAEG;AACF;IAUG;;;;;OAKG;IACH,sBAAY,iBAAqC;IAC7C,qBAAqB;IACL,UAAsB;IACtC,mDAAmD;IACnC,UAAsB;QAAtB,2BAAA,EAAA,cAAsB;QAFtB,eAAU,GAAV,UAAU,CAAY;QAEtB,eAAU,GAAV,UAAU,CAAY;QAnB1C,iBAAiB;QACjB;;WAEG;QACa,6BAAwB,GAAG,IAAI,UAAU,EAAgB,CAAC;QAgBtE,IAAI,CAAC,kBAAkB,GAAG,iBAAiB,CAAC;IAChD,CAAC;IAED;;;;OAIG;IACI,+BAAQ,GAAf,UAAgB,UAA0B;QACtC,OAAO,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAC3F,CAAC;IACL,mBAAC;AAAD,CAAC,AAhCA,IAgCA","sourcesContent":["import { DeviceType } from './deviceEnums';\r\nimport { Observable } from '../../Misc/observable';\r\nimport { DeviceInput } from './deviceTypes';\r\nimport { IDeviceEvent, IDeviceInputSystem } from './inputInterfaces';\r\n\r\n/**\r\n * Class that handles all input for a specific device\r\n */\r\n export class DeviceSource<T extends DeviceType> {\r\n    // Public Members\r\n    /**\r\n     * Observable to handle device input changes per device\r\n     */\r\n    public readonly onInputChangedObservable = new Observable<IDeviceEvent>();\r\n\r\n    // Private Members\r\n    private readonly _deviceInputSystem: IDeviceInputSystem;\r\n\r\n    /**\r\n     * Default Constructor\r\n     * @param deviceInputSystem Reference to DeviceInputSystem\r\n     * @param deviceType Type of device\r\n     * @param deviceSlot \"Slot\" or index that device is referenced in\r\n     */\r\n    constructor(deviceInputSystem: IDeviceInputSystem,\r\n        /** Type of device */\r\n        public readonly deviceType: DeviceType,\r\n        /** \"Slot\" or index that device is referenced in */\r\n        public readonly deviceSlot: number = 0) {\r\n        this._deviceInputSystem = deviceInputSystem;\r\n    }\r\n\r\n    /**\r\n     * Get input for specific input\r\n     * @param inputIndex index of specific input on device\r\n     * @returns Input value from DeviceInputSystem\r\n     */\r\n    public getInput(inputIndex: DeviceInput<T>): number {\r\n        return this._deviceInputSystem.pollInput(this.deviceType, this.deviceSlot, inputIndex);\r\n    }\r\n}"]}
+{"version":3,"file":"deviceSource.js","sourceRoot":"","sources":["../../../../sourceES6/core/DeviceInput/InputDevices/deviceSource.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAanD;;GAEG;AACH;IAUI;;;;;OAKG;IACH,sBAAY,iBAAqC;IAC7C,qBAAqB;IACL,UAAsB;IACtC,mDAAmD;IACnC,UAAsB;QAAtB,2BAAA,EAAA,cAAsB;QAFtB,eAAU,GAAV,UAAU,CAAY;QAEtB,eAAU,GAAV,UAAU,CAAY;QAnB1C,iBAAiB;QACjB;;WAEG;QACa,6BAAwB,GAAG,IAAI,UAAU,EAAkD,CAAC;QAgBxG,IAAI,CAAC,kBAAkB,GAAG,iBAAiB,CAAC;IAChD,CAAC;IAED;;;;OAIG;IACI,+BAAQ,GAAf,UAAgB,UAA0B;QACtC,OAAO,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAC3F,CAAC;IACL,mBAAC;AAAD,CAAC,AAhCD,IAgCC","sourcesContent":["import { DeviceType, PointerInput } from './deviceEnums';\r\nimport { Observable } from '../../Misc/observable';\r\nimport { DeviceInput } from './deviceTypes';\r\nimport { IDeviceInputSystem } from './inputInterfaces';\r\nimport { IUIEvent } from '../../Events/deviceInputEvents';\r\n\r\n/**\r\n * Subset of DeviceInput that only handles pointers and keyboard\r\n */\r\ntype DeviceEventInput<T extends DeviceType> =\r\n    T extends DeviceType.Keyboard | DeviceType.Generic ? number :\r\n    T extends DeviceType.Mouse | DeviceType.Touch ? Exclude<PointerInput, PointerInput.Horizontal | PointerInput.Vertical> :\r\n    never;\r\n\r\n/**\r\n * Class that handles all input for a specific device\r\n */\r\nexport class DeviceSource<T extends DeviceType> {\r\n    // Public Members\r\n    /**\r\n     * Observable to handle device input changes per device\r\n     */\r\n    public readonly onInputChangedObservable = new Observable<IUIEvent & { inputIndex: DeviceEventInput<T> }>();\r\n\r\n    // Private Members\r\n    private readonly _deviceInputSystem: IDeviceInputSystem;\r\n\r\n    /**\r\n     * Default Constructor\r\n     * @param deviceInputSystem Reference to DeviceInputSystem\r\n     * @param deviceType Type of device\r\n     * @param deviceSlot \"Slot\" or index that device is referenced in\r\n     */\r\n    constructor(deviceInputSystem: IDeviceInputSystem,\r\n        /** Type of device */\r\n        public readonly deviceType: DeviceType,\r\n        /** \"Slot\" or index that device is referenced in */\r\n        public readonly deviceSlot: number = 0) {\r\n        this._deviceInputSystem = deviceInputSystem;\r\n    }\r\n\r\n    /**\r\n     * Get input for specific input\r\n     * @param inputIndex index of specific input on device\r\n     * @returns Input value from DeviceInputSystem\r\n     */\r\n    public getInput(inputIndex: DeviceInput<T>): number {\r\n        return this._deviceInputSystem.pollInput(this.deviceType, this.deviceSlot, inputIndex);\r\n    }\r\n}"]}

package/DeviceInput/InputDevices/deviceSourceManager.d.ts

@@ -2,30 +2,26 @@ import { Engine } from '../../Engines/engine';
 import { DeviceType } from './deviceEnums';
 import { Nullable } from '../../types';
 import { Observable } from '../../Misc/observable';
-import { IDeviceEvent } from './inputInterfaces';
 import { DeviceSource } from './deviceSource';
+import { IObservableManager } from './internalDeviceSourceManager';
 import { IDisposable } from '../../scene';
+import { IUIEvent } from '../../Events/deviceInputEvents';
 /**
  * Class to keep track of devices
  */
-export declare class DeviceSourceManager implements IDisposable {
+export declare class DeviceSourceManager implements IDisposable, IObservableManager {
     /**
      * Observable to be triggered when after a device is connected, any new observers added will be triggered against already connected devices
      */
     readonly onDeviceConnectedObservable: Observable<DeviceSource<DeviceType>>;
-    /**
-     * Observable to be triggered when a device's input is changed
-     */
-    readonly onInputChangedObservable: Observable<IDeviceEvent>;
     /**
      * Observable to be triggered when after a device is disconnected
      */
     readonly onDeviceDisconnectedObservable: Observable<DeviceSource<DeviceType>>;
     private _engine;
     private _onDisposeObserver;
-    private _getDeviceSource;
-    private _getDeviceSources;
-    private _getDevices;
+    private readonly _devices;
+    private readonly _firstDevice;
     /**
      * Gets a DeviceSource, given a type and slot
      * @param deviceType Type of Device
@@ -53,4 +49,11 @@ export declare class DeviceSourceManager implements IDisposable {
      * Dispose of DeviceSourceManager
      */
     dispose(): void;
+    /** @hidden */
+    _addDevice(deviceSource: DeviceSource<DeviceType>): void;
+    /** @hidden */
+    _removeDevice(deviceType: DeviceType, deviceSlot: number): void;
+    /** @hidden */
+    _onInputChanged(deviceType: DeviceType, deviceSlot: number, eventData: IUIEvent): void;
+    private _updateFirstDevices;
 }

package/DeviceInput/InputDevices/deviceSourceManager.js

@@ -1,3 +1,4 @@
+import { DeviceType } from './deviceEnums.js';
 import { Observable } from '../../Misc/observable.js';
 import { InternalDeviceSourceManager } from './internalDeviceSourceManager.js';
 /**
@@ -10,6 +11,9 @@ var DeviceSourceManager = /** @class */ (function () {
      */
     function DeviceSourceManager(engine) {
         var _this = this;
+        var numberOfDeviceTypes = Object.keys(DeviceType).length / 2;
+        this._devices = new Array(numberOfDeviceTypes);
+        this._firstDevice = new Array(numberOfDeviceTypes);
         this._engine = engine;
         if (!this._engine._deviceSourceManager) {
             this._engine._deviceSourceManager = new InternalDeviceSourceManager(engine);
@@ -21,12 +25,8 @@ var DeviceSourceManager = /** @class */ (function () {
                 _this.onDeviceConnectedObservable.notifyObserver(observer, device);
             });
         });
-        this.onInputChangedObservable = new Observable();
         this.onDeviceDisconnectedObservable = new Observable();
         this._engine._deviceSourceManager.registerManager(this);
-        this._getDeviceSource = this._engine._deviceSourceManager.getDeviceSource;
-        this._getDeviceSources = this._engine._deviceSourceManager.getDeviceSources;
-        this._getDevices = this._engine._deviceSourceManager.getDevices;
         this._onDisposeObserver = engine.onDisposeObservable.add(function () {
             _this.dispose();
         });
@@ -39,7 +39,16 @@ var DeviceSourceManager = /** @class */ (function () {
      * @returns DeviceSource
      */
     DeviceSourceManager.prototype.getDeviceSource = function (deviceType, deviceSlot) {
-        return this._getDeviceSource(deviceType, deviceSlot);
+        if (deviceSlot === undefined) {
+            if (this._firstDevice[deviceType] === undefined) {
+                return null;
+            }
+            deviceSlot = this._firstDevice[deviceType];
+        }
+        if (!this._devices[deviceType] || this._devices[deviceType][deviceSlot] === undefined) {
+            return null;
+        }
+        return this._devices[deviceType][deviceSlot];
     };
     /**
      * Gets an array of DeviceSource objects for a given device type
@@ -47,14 +56,19 @@ var DeviceSourceManager = /** @class */ (function () {
      * @returns All available DeviceSources of a given type
      */
     DeviceSourceManager.prototype.getDeviceSources = function (deviceType) {
-        return this._getDeviceSources(deviceType);
+        return this._devices[deviceType].filter(function (source) { return !!source; });
     };
     /**
      * Returns a read-only list of all available devices
      * @returns All available DeviceSources
      */
     DeviceSourceManager.prototype.getDevices = function () {
-        return this._getDevices();
+        var deviceArray = new Array();
+        for (var _i = 0, _a = this._devices; _i < _a.length; _i++) {
+            var deviceSet = _a[_i];
+            deviceArray.push.apply(deviceArray, deviceSet);
+        }
+        return deviceArray;
     };
     /**
      * Dispose of DeviceSourceManager
@@ -62,12 +76,7 @@ var DeviceSourceManager = /** @class */ (function () {
     DeviceSourceManager.prototype.dispose = function () {
         // Null out observable refs
         this.onDeviceConnectedObservable.clear();
-        this.onInputChangedObservable.clear();
         this.onDeviceDisconnectedObservable.clear();
-        // Null out function refs
-        this._getDeviceSource = function () { return null; };
-        this._getDeviceSources = function () { return []; };
-        this._getDevices = function () { return []; };
         if (this._engine._deviceSourceManager) {
             this._engine._deviceSourceManager.unregisterManager(this);
             if (--this._engine._deviceSourceManager._refCount < 1) {
@@ -77,6 +86,60 @@ var DeviceSourceManager = /** @class */ (function () {
         }
         this._engine.onDisposeObservable.remove(this._onDisposeObserver);
     };
+    // Hidden Functions
+    /** @hidden */
+    DeviceSourceManager.prototype._addDevice = function (deviceSource) {
+        if (!this._devices[deviceSource.deviceType]) {
+            this._devices[deviceSource.deviceType] = new Array();
+        }
+        if (!this._devices[deviceSource.deviceType][deviceSource.deviceSlot]) {
+            this._devices[deviceSource.deviceType][deviceSource.deviceSlot] = deviceSource;
+            this._updateFirstDevices(deviceSource.deviceType);
+        }
+        this.onDeviceConnectedObservable.notifyObservers(deviceSource);
+    };
+    /** @hidden */
+    DeviceSourceManager.prototype._removeDevice = function (deviceType, deviceSlot) {
+        var _a, _b;
+        var deviceSource = (_a = this._devices[deviceType]) === null || _a === void 0 ? void 0 : _a[deviceSlot]; // Grab local reference to use before removing from devices
+        this.onDeviceDisconnectedObservable.notifyObservers(deviceSource);
+        if ((_b = this._devices[deviceType]) === null || _b === void 0 ? void 0 : _b[deviceSlot]) {
+            delete this._devices[deviceType][deviceSlot];
+        }
+        // Even if we don't delete a device, we should still check for the first device as things may have gotten out of sync.
+        this._updateFirstDevices(deviceType);
+    };
+    /** @hidden */
+    DeviceSourceManager.prototype._onInputChanged = function (deviceType, deviceSlot, eventData) {
+        var _a, _b;
+        (_b = (_a = this._devices[deviceType]) === null || _a === void 0 ? void 0 : _a[deviceSlot]) === null || _b === void 0 ? void 0 : _b.onInputChangedObservable.notifyObservers(eventData);
+    };
+    // Private Functions
+    DeviceSourceManager.prototype._updateFirstDevices = function (type) {
+        switch (type) {
+            case DeviceType.Keyboard:
+            case DeviceType.Mouse:
+                this._firstDevice[type] = 0;
+                break;
+            case DeviceType.Touch:
+            case DeviceType.DualSense:
+            case DeviceType.DualShock:
+            case DeviceType.Xbox:
+            case DeviceType.Switch:
+            case DeviceType.Generic:
+                delete this._firstDevice[type];
+                var devices = this._devices[type];
+                if (devices) {
+                    for (var i = 0; i < devices.length; i++) {
+                        if (devices[i]) {
+                            this._firstDevice[type] = i;
+                            break;
+                        }
+                    }
+                }
+                break;
+        }
+    };
     return DeviceSourceManager;
 }());
 export { DeviceSourceManager };

package/DeviceInput/InputDevices/deviceSourceManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"deviceSourceManager.js","sourceRoot":"","sources":["../../../../sourceES6/core/DeviceInput/InputDevices/deviceSourceManager.ts"],"names":[],"mappings":"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","sourcesContent":["import { Engine } from '../../Engines/engine';\nimport { DeviceType } from './deviceEnums';\nimport { Nullable } from '../../types';\nimport { Observable, Observer } from '../../Misc/observable';\nimport { IDeviceEvent } from './inputInterfaces';\nimport { DeviceSource } from './deviceSource';\nimport { InternalDeviceSourceManager } from './internalDeviceSourceManager';\nimport { IDisposable } from '../../scene';\nimport { ThinEngine } from '../../Engines/thinEngine';\n\n/**\n * Class to keep track of devices\n */\nexport class DeviceSourceManager implements IDisposable {\n    // Public Members\n    /**\n     * Observable to be triggered when after a device is connected, any new observers added will be triggered against already connected devices\n     */\n    public readonly onDeviceConnectedObservable: Observable<DeviceSource<DeviceType>>;\n    /**\n     * Observable to be triggered when a device's input is changed\n     */\n    public readonly onInputChangedObservable: Observable<IDeviceEvent>;\n    /**\n     * Observable to be triggered when after a device is disconnected\n     */\n    public readonly onDeviceDisconnectedObservable: Observable<DeviceSource<DeviceType>>;\n\n    // Private Members\n    private _engine: Engine;\n    private _onDisposeObserver: Nullable<Observer<ThinEngine>>;\n\n    private _getDeviceSource: <T extends DeviceType>(deviceType: T, deviceSlot?: number) => Nullable<DeviceSource<T>>;\n    private _getDeviceSources: <T extends DeviceType>(deviceType: T) => ReadonlyArray<DeviceSource<T>>;\n    private _getDevices: () => ReadonlyArray<DeviceSource<DeviceType>>;\n\n    // Public Functions\n    /**\n     * Gets a DeviceSource, given a type and slot\n     * @param deviceType Type of Device\n     * @param deviceSlot Slot or ID of device\n     * @returns DeviceSource\n     */\n    public getDeviceSource<T extends DeviceType>(deviceType: T, deviceSlot?: number): Nullable<DeviceSource<T>> {\n        return this._getDeviceSource(deviceType, deviceSlot);\n    }\n\n    /**\n     * Gets an array of DeviceSource objects for a given device type\n     * @param deviceType Type of Device\n     * @returns All available DeviceSources of a given type\n     */\n    public getDeviceSources<T extends DeviceType>(deviceType: T): ReadonlyArray<DeviceSource<T>> {\n        return this._getDeviceSources(deviceType);\n    }\n\n    /**\n     * Returns a read-only list of all available devices\n     * @returns All available DeviceSources\n     */\n    public getDevices(): ReadonlyArray<DeviceSource<DeviceType>> {\n        return this._getDevices();\n    }\n\n    /**\n     * Default constructor\n     * @param engine Used to get canvas (if applicable)\n     */\n    constructor(engine: Engine) {\n        this._engine = engine;\n        if (!this._engine._deviceSourceManager) {\n            this._engine._deviceSourceManager = new InternalDeviceSourceManager(engine);\n        }\n        this._engine._deviceSourceManager._refCount++;\n\n        // Observables\n        this.onDeviceConnectedObservable = new Observable<DeviceSource<DeviceType>>((observer) => {\n            this.getDevices().forEach((device) => {\n                this.onDeviceConnectedObservable.notifyObserver(observer, device);\n            });\n        });\n        this.onInputChangedObservable = new Observable<IDeviceEvent>();\n        this.onDeviceDisconnectedObservable = new Observable<DeviceSource<DeviceType>>();\n\n        this._engine._deviceSourceManager.registerManager(this);\n\n        this._getDeviceSource = this._engine._deviceSourceManager.getDeviceSource;\n        this._getDeviceSources = this._engine._deviceSourceManager.getDeviceSources;\n        this._getDevices = this._engine._deviceSourceManager.getDevices;\n\n        this._onDisposeObserver = engine.onDisposeObservable.add(() => {\n            this.dispose();\n        });\n    }\n\n    /**\n     * Dispose of DeviceSourceManager\n     */\n    public dispose(): void {\n        // Null out observable refs\n        this.onDeviceConnectedObservable.clear();\n        this.onInputChangedObservable.clear();\n        this.onDeviceDisconnectedObservable.clear();\n        // Null out function refs\n        this._getDeviceSource = () => { return null; };\n        this._getDeviceSources = () => { return []; };\n        this._getDevices = () => { return []; };\n\n        if (this._engine._deviceSourceManager) {\n            this._engine._deviceSourceManager.unregisterManager(this);\n            if (--this._engine._deviceSourceManager._refCount < 1) {\n                this._engine._deviceSourceManager.dispose();\n                delete this._engine._deviceSourceManager;\n            }\n        }\n        this._engine.onDisposeObservable.remove(this._onDisposeObserver);\n    }\n}\n"]}
+{"version":3,"file":"deviceSourceManager.js","sourceRoot":"","sources":["../../../../sourceES6/core/DeviceInput/InputDevices/deviceSourceManager.ts"],"names":[],"mappings":"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","sourcesContent":["import { Engine } from '../../Engines/engine';\nimport { DeviceType } from './deviceEnums';\nimport { Nullable } from '../../types';\nimport { Observable, Observer } from '../../Misc/observable';\nimport { DeviceSource } from './deviceSource';\nimport { InternalDeviceSourceManager, IObservableManager } from './internalDeviceSourceManager';\nimport { IDisposable } from '../../scene';\nimport { ThinEngine } from '../../Engines/thinEngine';\nimport { IUIEvent } from '../../Events/deviceInputEvents';\n\n/**\n * Class to keep track of devices\n */\nexport class DeviceSourceManager implements IDisposable, IObservableManager {\n    // Public Members\n    /**\n     * Observable to be triggered when after a device is connected, any new observers added will be triggered against already connected devices\n     */\n    public readonly onDeviceConnectedObservable: Observable<DeviceSource<DeviceType>>;\n\n    /**\n     * Observable to be triggered when after a device is disconnected\n     */\n    public readonly onDeviceDisconnectedObservable: Observable<DeviceSource<DeviceType>>;\n\n    // Private Members\n    private _engine: Engine;\n    private _onDisposeObserver: Nullable<Observer<ThinEngine>>;\n    private readonly _devices: Array<Array<DeviceSource<DeviceType>>>;\n    private readonly _firstDevice: Array<number>;\n\n    // Public Functions\n    /**\n     * Gets a DeviceSource, given a type and slot\n     * @param deviceType Type of Device\n     * @param deviceSlot Slot or ID of device\n     * @returns DeviceSource\n     */\n    public getDeviceSource<T extends DeviceType>(deviceType: T, deviceSlot?: number): Nullable<DeviceSource<T>> {\n        if (deviceSlot === undefined) {\n            if (this._firstDevice[deviceType] === undefined) {\n                return null;\n            }\n\n            deviceSlot = this._firstDevice[deviceType];\n        }\n\n        if (!this._devices[deviceType] || this._devices[deviceType][deviceSlot] === undefined) {\n            return null;\n        }\n\n        return this._devices[deviceType][deviceSlot];\n    }\n    /**\n     * Gets an array of DeviceSource objects for a given device type\n     * @param deviceType Type of Device\n     * @returns All available DeviceSources of a given type\n     */\n    public getDeviceSources<T extends DeviceType>(deviceType: T): ReadonlyArray<DeviceSource<T>> {\n        return this._devices[deviceType].filter((source) => { return !!source; });\n    }\n\n    /**\n     * Returns a read-only list of all available devices\n     * @returns All available DeviceSources\n     */\n    public getDevices(): ReadonlyArray<DeviceSource<DeviceType>> {\n        const deviceArray = new Array<DeviceSource<DeviceType>>();\n        for (const deviceSet of this._devices) {\n            deviceArray.push.apply(deviceArray, deviceSet);\n        }\n\n        return deviceArray;\n    }\n\n    /**\n     * Default constructor\n     * @param engine Used to get canvas (if applicable)\n     */\n    constructor(engine: Engine) {\n        const numberOfDeviceTypes = Object.keys(DeviceType).length / 2;\n        this._devices = new Array<Array<DeviceSource<DeviceType>>>(numberOfDeviceTypes);\n        this._firstDevice = new Array<number>(numberOfDeviceTypes);\n        this._engine = engine;\n\n        if (!this._engine._deviceSourceManager) {\n            this._engine._deviceSourceManager = new InternalDeviceSourceManager(engine);\n        }\n        this._engine._deviceSourceManager._refCount++;\n\n        // Observables\n        this.onDeviceConnectedObservable = new Observable<DeviceSource<DeviceType>>((observer) => {\n            this.getDevices().forEach((device) => {\n                this.onDeviceConnectedObservable.notifyObserver(observer, device);\n            });\n        });\n        this.onDeviceDisconnectedObservable = new Observable<DeviceSource<DeviceType>>();\n\n        this._engine._deviceSourceManager.registerManager(this);\n\n        this._onDisposeObserver = engine.onDisposeObservable.add(() => {\n            this.dispose();\n        });\n    }\n\n    /**\n     * Dispose of DeviceSourceManager\n     */\n    public dispose(): void {\n        // Null out observable refs\n        this.onDeviceConnectedObservable.clear();\n        this.onDeviceDisconnectedObservable.clear();\n\n        if (this._engine._deviceSourceManager) {\n            this._engine._deviceSourceManager.unregisterManager(this);\n            if (--this._engine._deviceSourceManager._refCount < 1) {\n                this._engine._deviceSourceManager.dispose();\n                delete this._engine._deviceSourceManager;\n            }\n        }\n        this._engine.onDisposeObservable.remove(this._onDisposeObserver);\n    }\n\n    // Hidden Functions\n    /** @hidden */\n    public _addDevice(deviceSource: DeviceSource<DeviceType>): void {\n        if (!this._devices[deviceSource.deviceType]) {\n            this._devices[deviceSource.deviceType] = new Array<DeviceSource<DeviceType>>();\n        }\n\n        if (!this._devices[deviceSource.deviceType][deviceSource.deviceSlot]) {\n            this._devices[deviceSource.deviceType][deviceSource.deviceSlot] = deviceSource;\n            this._updateFirstDevices(deviceSource.deviceType);\n        }\n\n        this.onDeviceConnectedObservable.notifyObservers(deviceSource);\n    }\n\n    /** @hidden */\n    public _removeDevice(deviceType: DeviceType, deviceSlot: number): void {\n        const deviceSource = this._devices[deviceType]?.[deviceSlot]; // Grab local reference to use before removing from devices\n        this.onDeviceDisconnectedObservable.notifyObservers(deviceSource);\n        if (this._devices[deviceType]?.[deviceSlot]) {\n            delete this._devices[deviceType][deviceSlot];\n        }\n        // Even if we don't delete a device, we should still check for the first device as things may have gotten out of sync.\n        this._updateFirstDevices(deviceType);\n    }\n\n    /** @hidden */\n    public _onInputChanged(deviceType: DeviceType, deviceSlot: number, eventData: IUIEvent): void {\n        this._devices[deviceType]?.[deviceSlot]?.onInputChangedObservable.notifyObservers(eventData);\n    }\n\n    // Private Functions\n    private _updateFirstDevices(type: DeviceType): void {\n        switch (type) {\n            case DeviceType.Keyboard:\n            case DeviceType.Mouse:\n                this._firstDevice[type] = 0;\n                break;\n            case DeviceType.Touch:\n            case DeviceType.DualSense:\n            case DeviceType.DualShock:\n            case DeviceType.Xbox:\n            case DeviceType.Switch:\n            case DeviceType.Generic:\n                delete this._firstDevice[type];\n                const devices = this._devices[type];\n                if (devices) {\n                    for (let i = 0; i < devices.length; i++) {\n                        if (devices[i]) {\n                            this._firstDevice[type] = i;\n                            break;\n                        }\n                    }\n                }\n                break;\n        }\n    }\n}\n"]}

package/DeviceInput/InputDevices/deviceTypes.d.ts

@@ -2,4 +2,4 @@ import { DeviceType, PointerInput, DualShockInput, XboxInput, SwitchInput, DualS
 /**
  * Type to handle enforcement of inputs
  */
-export declare type DeviceInput<T extends DeviceType> = T extends DeviceType.Keyboard | DeviceType.Generic ? number : T extends DeviceType.Mouse | DeviceType.Touch ? PointerInput : T extends DeviceType.DualShock ? DualShockInput : T extends DeviceType.Xbox ? XboxInput : T extends DeviceType.Switch ? SwitchInput : T extends DeviceType.DualSense ? DualSenseInput : never;
+export declare type DeviceInput<T extends DeviceType> = T extends DeviceType.Keyboard | DeviceType.Generic ? number : T extends DeviceType.Mouse | DeviceType.Touch ? Exclude<PointerInput, PointerInput.Move> : T extends DeviceType.DualShock ? DualShockInput : T extends DeviceType.Xbox ? XboxInput : T extends DeviceType.Switch ? SwitchInput : T extends DeviceType.DualSense ? DualSenseInput : never;

package/DeviceInput/InputDevices/deviceTypes.js.map

@@ -1 +1 @@
-{"version":3,"file":"deviceTypes.js","sourceRoot":"","sources":["../../../../sourceES6/core/DeviceInput/InputDevices/deviceTypes.ts"],"names":[],"mappings":"","sourcesContent":["import { DeviceType, PointerInput, DualShockInput, XboxInput, SwitchInput, DualSenseInput } from './deviceEnums';\r\n\r\n/**\r\n * Type to handle enforcement of inputs\r\n */\r\nexport type DeviceInput<T extends DeviceType> =\r\n    T extends DeviceType.Keyboard | DeviceType.Generic ? number :\r\n    T extends DeviceType.Mouse | DeviceType.Touch ? PointerInput :\r\n    T extends DeviceType.DualShock ? DualShockInput :\r\n    T extends DeviceType.Xbox ? XboxInput :\r\n    T extends DeviceType.Switch ? SwitchInput :\r\n    T extends DeviceType.DualSense ? DualSenseInput :\r\n    never;"]}
+{"version":3,"file":"deviceTypes.js","sourceRoot":"","sources":["../../../../sourceES6/core/DeviceInput/InputDevices/deviceTypes.ts"],"names":[],"mappings":"","sourcesContent":["import { DeviceType, PointerInput, DualShockInput, XboxInput, SwitchInput, DualSenseInput } from './deviceEnums';\r\n\r\n/**\r\n * Type to handle enforcement of inputs\r\n */\r\nexport type DeviceInput<T extends DeviceType> =\r\n    T extends DeviceType.Keyboard | DeviceType.Generic ? number :\r\n    T extends DeviceType.Mouse | DeviceType.Touch ? Exclude<PointerInput, PointerInput.Move> :\r\n    T extends DeviceType.DualShock ? DualShockInput :\r\n    T extends DeviceType.Xbox ? XboxInput :\r\n    T extends DeviceType.Switch ? SwitchInput :\r\n    T extends DeviceType.DualSense ? DualSenseInput :\r\n    never;"]}