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

package/DeviceInput/InputDevices/inputInterfaces.d.ts

@@ -1,32 +1,7 @@
-import { IEvent } from "../../Events/deviceInputEvents";
+import { IUIEvent } from "../../Events/deviceInputEvents";
 import { IDisposable } from "../../scene";
 import { Nullable } from "../../types";
 import { DeviceType } from "./deviceEnums";
-/**
- * Interface for Observables in DeviceInputSystem
- */
-export interface IDeviceEvent extends IEvent {
-    /**
-     * Device type
-     */
-    deviceType: DeviceType;
-    /**
-     * Device slot
-     */
-    deviceSlot: number;
-    /**
-     * Input array index
-     */
-    inputIndex: number;
-    /**
-     * Previous state of given input
-     */
-    previousState: Nullable<number>;
-    /**
-     * Current state of given input
-     */
-    currentState: Nullable<number>;
-}
 /**
  * Interface for NativeInput object
  */
@@ -42,7 +17,7 @@ export interface INativeInput extends IDisposable {
     /**
      * Callback for when input is changed on a device
      */
-    onInputChanged: (deviceType: DeviceType, deviceSlot: number, inputIndex: number, previousState: Nullable<number>, currentState: Nullable<number>, eventData?: any) => void;
+    onInputChanged: (deviceType: DeviceType, deviceSlot: number, inputIndex: number, currentState: Nullable<number>) => void;
     /**
      * Checks for current device input value, given an id and input index.
      * @param deviceType Type of device
@@ -73,7 +48,7 @@ export interface IDeviceInputSystem extends IDisposable {
     /**
      * Callback for when an input is changed
      */
-    onInputChanged: (deviceEvent: IDeviceEvent) => void;
+    onInputChanged: (deviceType: DeviceType, deviceSlot: number, eventData: IUIEvent) => 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

package/DeviceInput/InputDevices/inputInterfaces.js.map

@@ -1 +1 @@
-{"version":3,"file":"inputInterfaces.js","sourceRoot":"","sources":["../../../../sourceES6/core/DeviceInput/InputDevices/inputInterfaces.ts"],"names":[],"mappings":"","sourcesContent":["import { IEvent } from \"../../Events/deviceInputEvents\";\r\nimport { IDisposable } from \"../../scene\";\r\nimport { Nullable } from \"../../types\";\r\nimport { DeviceType } from \"./deviceEnums\";\r\n\r\n/**\r\n * Interface for Observables in DeviceInputSystem\r\n */\r\nexport interface IDeviceEvent extends IEvent {\r\n    /**\r\n     * Device type\r\n     */\r\n    deviceType: DeviceType;\r\n    /**\r\n     * Device slot\r\n     */\r\n    deviceSlot: number;\r\n    /**\r\n     * Input array index\r\n     */\r\n    inputIndex: number;\r\n    /**\r\n     * Previous state of given input\r\n     */\r\n    previousState: Nullable<number>;\r\n    /**\r\n     * Current state of given input\r\n     */\r\n    currentState: Nullable<number>;\r\n}\r\n\r\n/**\r\n * Interface for NativeInput object\r\n */\r\nexport interface INativeInput extends IDisposable {\r\n    /**\r\n     * Callback for when a device is connected\r\n     */\r\n    onDeviceConnected: (deviceType: DeviceType, deviceSlot: number) => void;\r\n\r\n    /**\r\n     * Callback for when a device is disconnected\r\n     */\r\n    onDeviceDisconnected: (deviceType: DeviceType, deviceSlot: number) => void;\r\n\r\n    /**\r\n     * Callback for when input is changed on a device\r\n     */\r\n    onInputChanged: (deviceType: DeviceType, deviceSlot: number, inputIndex: number, previousState: Nullable<number>, currentState: Nullable<number>, eventData?: any) => void;\r\n\r\n    /**\r\n     * Checks for current device input value, given an id and input index.\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     * @returns Current value of input\r\n     */\r\n    pollInput(deviceType: DeviceType, deviceSlot: number, inputIndex: number): number;\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    isDeviceAvailable(deviceType: DeviceType): boolean;\r\n}\r\n\r\n/**\r\n * Interface for DeviceInputSystem implementations (JS and Native)\r\n */\r\nexport interface IDeviceInputSystem extends IDisposable {\r\n    // Callbacks\r\n    /**\r\n     * Callback for when a device is connected\r\n     */\r\n    onDeviceConnected: (deviceType: DeviceType, deviceSlot: number) => void;\r\n\r\n    /**\r\n     * Callback for when a device is disconnected\r\n     */\r\n    onDeviceDisconnected: (deviceType: DeviceType, deviceSlot: number) => void;\r\n\r\n    /**\r\n     * Callback for when an input is changed\r\n     */\r\n    onInputChanged: (deviceEvent: IDeviceEvent) => void;\r\n\r\n    // 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    pollInput(deviceType: DeviceType, deviceSlot: number, inputIndex: number): number;\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    isDeviceAvailable(deviceType: DeviceType): boolean;\r\n}"]}
+{"version":3,"file":"inputInterfaces.js","sourceRoot":"","sources":["../../../../sourceES6/core/DeviceInput/InputDevices/inputInterfaces.ts"],"names":[],"mappings":"","sourcesContent":["import { IUIEvent } from \"../../Events/deviceInputEvents\";\r\nimport { IDisposable } from \"../../scene\";\r\nimport { Nullable } from \"../../types\";\r\nimport { DeviceType } from \"./deviceEnums\";\r\n\r\n/**\r\n * Interface for NativeInput object\r\n */\r\nexport interface INativeInput extends IDisposable {\r\n    /**\r\n     * Callback for when a device is connected\r\n     */\r\n    onDeviceConnected: (deviceType: DeviceType, deviceSlot: number) => void;\r\n\r\n    /**\r\n     * Callback for when a device is disconnected\r\n     */\r\n    onDeviceDisconnected: (deviceType: DeviceType, deviceSlot: number) => void;\r\n\r\n    /**\r\n     * Callback for when input is changed on a device\r\n     */\r\n    onInputChanged: (deviceType: DeviceType, deviceSlot: number, inputIndex: number, currentState: Nullable<number>) => void;\r\n\r\n    /**\r\n     * Checks for current device input value, given an id and input index.\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     * @returns Current value of input\r\n     */\r\n    pollInput(deviceType: DeviceType, deviceSlot: number, inputIndex: number): number;\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    isDeviceAvailable(deviceType: DeviceType): boolean;\r\n}\r\n\r\n/**\r\n * Interface for DeviceInputSystem implementations (JS and Native)\r\n */\r\nexport interface IDeviceInputSystem extends IDisposable {\r\n    // Callbacks\r\n    /**\r\n     * Callback for when a device is connected\r\n     */\r\n    onDeviceConnected: (deviceType: DeviceType, deviceSlot: number) => void;\r\n\r\n    /**\r\n     * Callback for when a device is disconnected\r\n     */\r\n    onDeviceDisconnected: (deviceType: DeviceType, deviceSlot: number) => void;\r\n\r\n    /**\r\n     * Callback for when an input is changed\r\n     */\r\n    onInputChanged: (deviceType: DeviceType, deviceSlot: number, eventData: IUIEvent) => void;\r\n\r\n    // 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    pollInput(deviceType: DeviceType, deviceSlot: number, inputIndex: number): number;\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    isDeviceAvailable(deviceType: DeviceType): boolean;\r\n}\r\n"]}

package/DeviceInput/InputDevices/internalDeviceSourceManager.d.ts

@@ -1,10 +1,9 @@
 import { IDisposable } from '../../scene';
 import { DeviceType } from './deviceEnums';
-import { Nullable } from '../../types';
 import { Observable } from '../../Misc/observable';
-import { IDeviceEvent } from './inputInterfaces';
 import { DeviceSource } from './deviceSource';
 import { Engine } from '../../Engines/engine';
+import { IUIEvent } from '../../Events/deviceInputEvents';
 declare module "../../Engines/engine" {
     interface Engine {
         /** @hidden */
@@ -14,38 +13,19 @@ declare module "../../Engines/engine" {
 /** @hidden */
 export interface IObservableManager {
     onDeviceConnectedObservable: Observable<DeviceSource<DeviceType>>;
-    onInputChangedObservable: Observable<IDeviceEvent>;
     onDeviceDisconnectedObservable: Observable<DeviceSource<DeviceType>>;
+    _onInputChanged(deviceType: DeviceType, deviceSlot: number, eventData: IUIEvent): void;
+    _addDevice(deviceSource: DeviceSource<DeviceType>): void;
+    _removeDevice(deviceType: DeviceType, deviceSlot: number): void;
 }
 /** @hidden */
 export declare class InternalDeviceSourceManager implements IDisposable {
     private readonly _devices;
-    private readonly _firstDevice;
     private readonly _deviceInputSystem;
     private readonly _registeredManagers;
     _refCount: number;
     constructor(engine: Engine);
-    readonly getDeviceSource: <T extends DeviceType>(deviceType: T, deviceSlot?: number | undefined) => Nullable<DeviceSource<T>>;
-    readonly getDeviceSources: <T extends DeviceType>(deviceType: T) => readonly DeviceSource<T>[];
-    readonly getDevices: () => ReadonlyArray<DeviceSource<DeviceType>>;
     readonly registerManager: (manager: IObservableManager) => void;
     readonly unregisterManager: (manager: IObservableManager) => void;
     dispose(): void;
-    /**
-     * Function to add device name to device list
-     * @param deviceType Enum specifying device type
-     * @param deviceSlot "Slot" or index that device is referenced in
-     */
-    private _addDevice;
-    /**
-     * Function to remove device name to device list
-     * @param deviceType Enum specifying device type
-     * @param deviceSlot "Slot" or index that device is referenced in
-     */
-    private _removeDevice;
-    /**
-     * Updates array storing first connected device of each type
-     * @param type Type of Device
-     */
-    private _updateFirstDevices;
 }

package/DeviceInput/InputDevices/internalDeviceSourceManager.js

@@ -9,29 +9,14 @@ var InternalDeviceSourceManager = /** @class */ (function () {
         this._registeredManagers = new Array();
         this._refCount = 0;
         // Public Functions
-        this.getDeviceSource = function (deviceType, deviceSlot) {
-            if (deviceSlot === undefined) {
-                if (_this._firstDevice[deviceType] === undefined) {
-                    return null;
+        this.registerManager = function (manager) {
+            for (var deviceType = 0; deviceType < _this._devices.length; deviceType++) {
+                var device = _this._devices[deviceType];
+                for (var deviceSlotKey in device) {
+                    var deviceSlot = +deviceSlotKey;
+                    manager._addDevice(new DeviceSource(_this._deviceInputSystem, deviceType, deviceSlot));
                 }
-                deviceSlot = _this._firstDevice[deviceType];
-            }
-            if (!_this._devices[deviceType] || _this._devices[deviceType][deviceSlot] === undefined) {
-                return null;
             }
-            return _this._devices[deviceType][deviceSlot];
-        };
-        this.getDeviceSources = function (deviceType) {
-            return _this._devices[deviceType].filter(function (source) { return !!source; });
-        };
-        this.getDevices = function () {
-            var deviceArray = new Array();
-            _this._devices.forEach(function (deviceSet) {
-                deviceArray.push.apply(deviceArray, deviceSet);
-            });
-            return deviceArray;
-        };
-        this.registerManager = function (manager) {
             _this._registeredManagers.push(manager);
         };
         this.unregisterManager = function (manager) {
@@ -42,7 +27,6 @@ var InternalDeviceSourceManager = /** @class */ (function () {
         };
         var numberOfDeviceTypes = Object.keys(DeviceType).length / 2;
         this._devices = new Array(numberOfDeviceTypes);
-        this._firstDevice = new Array(numberOfDeviceTypes);
         if (typeof _native !== 'undefined') {
             this._deviceInputSystem = (_native.DeviceInputSystem) ? new NativeDeviceInputSystem(new _native.DeviceInputSystem()) : new NativeDeviceInputSystem();
         }
@@ -50,88 +34,40 @@ var InternalDeviceSourceManager = /** @class */ (function () {
             this._deviceInputSystem = new WebDeviceInputSystem(engine);
         }
         this._deviceInputSystem.onDeviceConnected = function (deviceType, deviceSlot) {
-            _this._addDevice(deviceType, deviceSlot);
-            var deviceSource = _this.getDeviceSource(deviceType, deviceSlot);
+            if (!_this._devices[deviceType]) {
+                _this._devices[deviceType] = new Array();
+            }
+            if (!_this._devices[deviceType][deviceSlot]) {
+                _this._devices[deviceType][deviceSlot] = deviceSlot;
+            }
             for (var _i = 0, _a = _this._registeredManagers; _i < _a.length; _i++) {
                 var manager = _a[_i];
-                manager.onDeviceConnectedObservable.notifyObservers(deviceSource);
+                var deviceSource = new DeviceSource(_this._deviceInputSystem, deviceType, deviceSlot);
+                manager._addDevice(deviceSource);
             }
         };
         this._deviceInputSystem.onDeviceDisconnected = function (deviceType, deviceSlot) {
-            var deviceSource = _this.getDeviceSource(deviceType, deviceSlot); // Grab local reference to use before removing from devices
-            _this._removeDevice(deviceType, deviceSlot);
-            for (var _i = 0, _a = _this._registeredManagers; _i < _a.length; _i++) {
-                var manager = _a[_i];
-                manager.onDeviceDisconnectedObservable.notifyObservers(deviceSource);
+            var _a;
+            if ((_a = _this._devices[deviceType]) === null || _a === void 0 ? void 0 : _a[deviceSlot]) {
+                delete _this._devices[deviceType][deviceSlot];
+            }
+            for (var _i = 0, _b = _this._registeredManagers; _i < _b.length; _i++) {
+                var manager = _b[_i];
+                manager._removeDevice(deviceType, deviceSlot);
             }
         };
-        this._deviceInputSystem.onInputChanged = function (deviceEvent) {
-            for (var _i = 0, _a = _this._registeredManagers; _i < _a.length; _i++) {
-                var manager = _a[_i];
-                manager.onInputChangedObservable.notifyObservers(deviceEvent);
+        this._deviceInputSystem.onInputChanged = function (deviceType, deviceSlot, eventData) {
+            if (eventData) {
+                for (var _i = 0, _a = _this._registeredManagers; _i < _a.length; _i++) {
+                    var manager = _a[_i];
+                    manager._onInputChanged(deviceType, deviceSlot, eventData);
+                }
             }
         };
     }
     InternalDeviceSourceManager.prototype.dispose = function () {
         this._deviceInputSystem.dispose();
     };
-    // Private Functions
-    /**
-     * Function to add device name to device list
-     * @param deviceType Enum specifying device type
-     * @param deviceSlot "Slot" or index that device is referenced in
-     */
-    InternalDeviceSourceManager.prototype._addDevice = function (deviceType, deviceSlot) {
-        if (!this._devices[deviceType]) {
-            this._devices[deviceType] = new Array();
-        }
-        if (!this._devices[deviceType][deviceSlot]) {
-            this._devices[deviceType][deviceSlot] = new DeviceSource(this._deviceInputSystem, deviceType, deviceSlot);
-            this._updateFirstDevices(deviceType);
-        }
-    };
-    /**
-     * Function to remove device name to device list
-     * @param deviceType Enum specifying device type
-     * @param deviceSlot "Slot" or index that device is referenced in
-     */
-    InternalDeviceSourceManager.prototype._removeDevice = function (deviceType, deviceSlot) {
-        var _a;
-        if ((_a = this._devices[deviceType]) === null || _a === void 0 ? void 0 : _a[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);
-    };
-    /**
-     * Updates array storing first connected device of each type
-     * @param type Type of Device
-     */
-    InternalDeviceSourceManager.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 InternalDeviceSourceManager;
 }());
 export { InternalDeviceSourceManager };

package/DeviceInput/InputDevices/internalDeviceSourceManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"internalDeviceSourceManager.js","sourceRoot":"","sources":["../../../../sourceES6/core/DeviceInput/InputDevices/internalDeviceSourceManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAoB9C,cAAc;AACd;IAUI,qCAAmB,MAAc;QAAjC,iBAiCC;QArCgB,wBAAmB,GAAG,IAAI,KAAK,EAAsB,CAAC;QAEhE,cAAS,GAAG,CAAC,CAAC;QAqCrB,mBAAmB;QACH,oBAAe,GAAG,UAAuB,UAAa,EAAE,UAAmB;YACvF,IAAI,UAAU,KAAK,SAAS,EAAE;gBAC1B,IAAI,KAAI,CAAC,YAAY,CAAC,UAAU,CAAC,KAAK,SAAS,EAAE;oBAC7C,OAAO,IAAI,CAAC;iBACf;gBAED,UAAU,GAAG,KAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;aAC9C;YAED,IAAI,CAAC,KAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,KAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,KAAK,SAAS,EAAE;gBACnF,OAAO,IAAI,CAAC;aACf;YAED,OAAO,KAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,CAAC;QACjD,CAAC,CAAA;QAEe,qBAAgB,GAAG,UAAuB,UAAa;YACnE,OAAO,KAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,UAAC,MAAM,IAAO,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9E,CAAC,CAAA;QAEe,eAAU,GAAG;YACzB,IAAM,WAAW,GAAG,IAAI,KAAK,EAA4B,CAAC;YAC1D,KAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAC,SAAS;gBAC5B,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;YACnD,CAAC,CAAC,CAAC;YAEH,OAAO,WAAW,CAAC;QACvB,CAAC,CAAA;QAEe,oBAAe,GAAG,UAAC,OAA2B;YAC1D,KAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC3C,CAAC,CAAA;QAEe,sBAAiB,GAAG,UAAC,OAA2B;YAC5D,IAAM,GAAG,GAAG,KAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAEtD,IAAI,GAAG,GAAG,CAAC,CAAC,EAAE;gBACV,KAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;aAC3C;QACL,CAAC,CAAA;QA1EG,IAAM,mBAAmB,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QAC/D,IAAI,CAAC,QAAQ,GAAG,IAAI,KAAK,CAAkC,mBAAmB,CAAC,CAAC;QAChF,IAAI,CAAC,YAAY,GAAG,IAAI,KAAK,CAAS,mBAAmB,CAAC,CAAC;QAE3D,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE;YAChC,IAAI,CAAC,kBAAkB,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI,uBAAuB,CAAC,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,uBAAuB,EAAE,CAAC;SACxJ;aACI;YACD,IAAI,CAAC,kBAAkB,GAAG,IAAI,oBAAoB,CAAC,MAAM,CAAC,CAAC;SAC9D;QAED,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,GAAG,UAAC,UAAU,EAAE,UAAU;YAC/D,KAAI,CAAC,UAAU,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;YACxC,IAAM,YAAY,GAAG,KAAI,CAAC,eAAe,CAAC,UAAU,EAAE,UAAU,CAAE,CAAC;YACnE,KAAsB,UAAwB,EAAxB,KAAA,KAAI,CAAC,mBAAmB,EAAxB,cAAwB,EAAxB,IAAwB,EAAE;gBAA3C,IAAM,OAAO,SAAA;gBACd,OAAO,CAAC,2BAA2B,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;aACrE;QACL,CAAC,CAAC;QAEF,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,GAAG,UAAC,UAAU,EAAE,UAAU;YAClE,IAAM,YAAY,GAAG,KAAI,CAAC,eAAe,CAAC,UAAU,EAAE,UAAU,CAAE,CAAC,CAAC,2DAA2D;YAC/H,KAAI,CAAC,aAAa,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;YAC3C,KAAsB,UAAwB,EAAxB,KAAA,KAAI,CAAC,mBAAmB,EAAxB,cAAwB,EAAxB,IAAwB,EAAE;gBAA3C,IAAM,OAAO,SAAA;gBACd,OAAO,CAAC,8BAA8B,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;aACxE;QACL,CAAC,CAAC;QAEF,IAAI,CAAC,kBAAkB,CAAC,cAAc,GAAG,UAAC,WAAW;YACjD,KAAsB,UAAwB,EAAxB,KAAA,KAAI,CAAC,mBAAmB,EAAxB,cAAwB,EAAxB,IAAwB,EAAE;gBAA3C,IAAM,OAAO,SAAA;gBACd,OAAO,CAAC,wBAAwB,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;aACjE;QACL,CAAC,CAAC;IACN,CAAC;IA4CM,6CAAO,GAAd;QACI,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC;IACtC,CAAC;IAED,oBAAoB;IACpB;;;;OAIG;IACK,gDAAU,GAAlB,UAAmB,UAAsB,EAAE,UAAkB;QACzD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;YAC5B,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,IAAI,KAAK,EAA4B,CAAC;SACrE;QAED,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,EAAE;YACxC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,kBAAkB,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;YAC1G,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC;SACxC;IACL,CAAC;IAED;;;;OAIG;IACK,mDAAa,GAArB,UAAsB,UAAsB,EAAE,UAAkB;;QAC5D,IAAI,MAAA,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,0CAAG,UAAU,CAAC,EAAE;YACzC,OAAO,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,CAAC;SAChD;QACD,sHAAsH;QACtH,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC;IACzC,CAAC;IAED;;;OAGG;IACK,yDAAmB,GAA3B,UAA4B,IAAgB;QACxC,QAAQ,IAAI,EAAE;YACV,KAAK,UAAU,CAAC,QAAQ,CAAC;YACzB,KAAK,UAAU,CAAC,KAAK;gBACjB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC5B,MAAM;YACV,KAAK,UAAU,CAAC,KAAK,CAAC;YACtB,KAAK,UAAU,CAAC,SAAS,CAAC;YAC1B,KAAK,UAAU,CAAC,SAAS,CAAC;YAC1B,KAAK,UAAU,CAAC,IAAI,CAAC;YACrB,KAAK,UAAU,CAAC,MAAM,CAAC;YACvB,KAAK,UAAU,CAAC,OAAO;gBACnB,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;gBAC/B,IAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBACpC,IAAI,OAAO,EAAE;oBACT,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;wBACrC,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE;4BACZ,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;4BAC5B,MAAM;yBACT;qBACJ;iBACJ;gBACD,MAAM;SACb;IACL,CAAC;IACL,kCAAC;AAAD,CAAC,AAtJD,IAsJC","sourcesContent":["import { IDisposable } from '../../scene';\r\nimport { DeviceType } from './deviceEnums';\r\nimport { Nullable } from '../../types';\r\nimport { Observable } from '../../Misc/observable';\r\nimport { IDeviceEvent, IDeviceInputSystem } from './inputInterfaces';\r\nimport { NativeDeviceInputSystem } from './nativeDeviceInputSystem';\r\nimport { WebDeviceInputSystem } from './webDeviceInputSystem';\r\nimport { DeviceSource } from './deviceSource';\r\nimport { INative } from '../../Engines/Native/nativeInterfaces';\r\nimport { Engine } from '../../Engines/engine';\r\n\r\ndeclare const _native: INative;\r\n\r\ndeclare module \"../../Engines/engine\" {\r\n    interface Engine {\r\n        /** @hidden */\r\n        _deviceSourceManager?: InternalDeviceSourceManager;\r\n    }\r\n}\r\n\r\n/** @hidden */\r\nexport interface IObservableManager {\r\n    onDeviceConnectedObservable: Observable<DeviceSource<DeviceType>>;\r\n    onInputChangedObservable: Observable<IDeviceEvent>;\r\n    onDeviceDisconnectedObservable: Observable<DeviceSource<DeviceType>>;\r\n}\r\n\r\n/** @hidden */\r\nexport class InternalDeviceSourceManager implements IDisposable {\r\n    // Private Members\r\n    private readonly _devices: Array<Array<DeviceSource<DeviceType>>>;\r\n    private readonly _firstDevice: Array<number>;\r\n    private readonly _deviceInputSystem: IDeviceInputSystem;\r\n\r\n    private readonly _registeredManagers = new Array<IObservableManager>();\r\n\r\n    public _refCount = 0;\r\n\r\n    public constructor(engine: Engine) {\r\n        const numberOfDeviceTypes = Object.keys(DeviceType).length / 2;\r\n        this._devices = new Array<Array<DeviceSource<DeviceType>>>(numberOfDeviceTypes);\r\n        this._firstDevice = new Array<number>(numberOfDeviceTypes);\r\n\r\n        if (typeof _native !== 'undefined') {\r\n            this._deviceInputSystem = (_native.DeviceInputSystem) ? new NativeDeviceInputSystem(new _native.DeviceInputSystem()) : new NativeDeviceInputSystem();\r\n        }\r\n        else {\r\n            this._deviceInputSystem = new WebDeviceInputSystem(engine);\r\n        }\r\n\r\n        this._deviceInputSystem.onDeviceConnected = (deviceType, deviceSlot) => {\r\n            this._addDevice(deviceType, deviceSlot);\r\n            const deviceSource = this.getDeviceSource(deviceType, deviceSlot)!;\r\n            for (const manager of this._registeredManagers) {\r\n                manager.onDeviceConnectedObservable.notifyObservers(deviceSource);\r\n            }\r\n        };\r\n\r\n        this._deviceInputSystem.onDeviceDisconnected = (deviceType, deviceSlot) => {\r\n            const deviceSource = this.getDeviceSource(deviceType, deviceSlot)!; // Grab local reference to use before removing from devices\r\n            this._removeDevice(deviceType, deviceSlot);\r\n            for (const manager of this._registeredManagers) {\r\n                manager.onDeviceDisconnectedObservable.notifyObservers(deviceSource);\r\n            }\r\n        };\r\n\r\n        this._deviceInputSystem.onInputChanged = (deviceEvent) => {\r\n            for (const manager of this._registeredManagers) {\r\n                manager.onInputChangedObservable.notifyObservers(deviceEvent);\r\n            }\r\n        };\r\n    }\r\n\r\n    // Public Functions\r\n    public readonly getDeviceSource = <T extends DeviceType>(deviceType: T, deviceSlot?: number): Nullable<DeviceSource<T>> => {\r\n        if (deviceSlot === undefined) {\r\n            if (this._firstDevice[deviceType] === undefined) {\r\n                return null;\r\n            }\r\n\r\n            deviceSlot = this._firstDevice[deviceType];\r\n        }\r\n\r\n        if (!this._devices[deviceType] || this._devices[deviceType][deviceSlot] === undefined) {\r\n            return null;\r\n        }\r\n\r\n        return this._devices[deviceType][deviceSlot];\r\n    }\r\n\r\n    public readonly getDeviceSources = <T extends DeviceType>(deviceType: T): ReadonlyArray<DeviceSource<T>> => {\r\n        return this._devices[deviceType].filter((source) => { return !!source; });\r\n    }\r\n\r\n    public readonly getDevices = (): ReadonlyArray<DeviceSource<DeviceType>> => {\r\n        const deviceArray = new Array<DeviceSource<DeviceType>>();\r\n        this._devices.forEach((deviceSet) => {\r\n            deviceArray.push.apply(deviceArray, deviceSet);\r\n        });\r\n\r\n        return deviceArray;\r\n    }\r\n\r\n    public readonly registerManager = (manager: IObservableManager): void => {\r\n        this._registeredManagers.push(manager);\r\n    }\r\n\r\n    public readonly unregisterManager = (manager: IObservableManager): void => {\r\n        const idx = this._registeredManagers.indexOf(manager);\r\n\r\n        if (idx > -1) {\r\n            this._registeredManagers.splice(idx, 1);\r\n        }\r\n    }\r\n\r\n    public dispose(): void {\r\n        this._deviceInputSystem.dispose();\r\n    }\r\n\r\n    // Private Functions\r\n    /**\r\n     * Function to add device name to device list\r\n     * @param deviceType Enum specifying device type\r\n     * @param deviceSlot \"Slot\" or index that device is referenced in\r\n     */\r\n    private _addDevice(deviceType: DeviceType, deviceSlot: number): void {\r\n        if (!this._devices[deviceType]) {\r\n            this._devices[deviceType] = new Array<DeviceSource<DeviceType>>();\r\n        }\r\n\r\n        if (!this._devices[deviceType][deviceSlot]) {\r\n            this._devices[deviceType][deviceSlot] = new DeviceSource(this._deviceInputSystem, deviceType, deviceSlot);\r\n            this._updateFirstDevices(deviceType);\r\n        }\r\n    }\r\n\r\n    /**\r\n     * Function to remove device name to device list\r\n     * @param deviceType Enum specifying device type\r\n     * @param deviceSlot \"Slot\" or index that device is referenced in\r\n     */\r\n    private _removeDevice(deviceType: DeviceType, deviceSlot: number): void {\r\n        if (this._devices[deviceType]?.[deviceSlot]) {\r\n            delete this._devices[deviceType][deviceSlot];\r\n        }\r\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.\r\n        this._updateFirstDevices(deviceType);\r\n    }\r\n\r\n    /**\r\n     * Updates array storing first connected device of each type\r\n     * @param type Type of Device\r\n     */\r\n    private _updateFirstDevices(type: DeviceType): void {\r\n        switch (type) {\r\n            case DeviceType.Keyboard:\r\n            case DeviceType.Mouse:\r\n                this._firstDevice[type] = 0;\r\n                break;\r\n            case DeviceType.Touch:\r\n            case DeviceType.DualSense:\r\n            case DeviceType.DualShock:\r\n            case DeviceType.Xbox:\r\n            case DeviceType.Switch:\r\n            case DeviceType.Generic:\r\n                delete this._firstDevice[type];\r\n                const devices = this._devices[type];\r\n                if (devices) {\r\n                    for (let i = 0; i < devices.length; i++) {\r\n                        if (devices[i]) {\r\n                            this._firstDevice[type] = i;\r\n                            break;\r\n                        }\r\n                    }\r\n                }\r\n                break;\r\n        }\r\n    }\r\n}\r\n"]}
+{"version":3,"file":"internalDeviceSourceManager.js","sourceRoot":"","sources":["../../../../sourceES6/core/DeviceInput/InputDevices/internalDeviceSourceManager.ts"],"names":[],"mappings":"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","sourcesContent":["import { IDisposable } from '../../scene';\r\nimport { DeviceType } from './deviceEnums';\r\nimport { Observable } from '../../Misc/observable';\r\nimport { IDeviceInputSystem } from './inputInterfaces';\r\nimport { NativeDeviceInputSystem } from './nativeDeviceInputSystem';\r\nimport { WebDeviceInputSystem } from './webDeviceInputSystem';\r\nimport { DeviceSource } from './deviceSource';\r\nimport { INative } from '../../Engines/Native/nativeInterfaces';\r\nimport { Engine } from '../../Engines/engine';\r\nimport { IUIEvent } from '../../Events/deviceInputEvents';\r\n\r\ndeclare const _native: INative;\r\n\r\ndeclare module \"../../Engines/engine\" {\r\n    interface Engine {\r\n        /** @hidden */\r\n        _deviceSourceManager?: InternalDeviceSourceManager;\r\n    }\r\n}\r\n\r\n/** @hidden */\r\nexport interface IObservableManager {\r\n    onDeviceConnectedObservable: Observable<DeviceSource<DeviceType>>;\r\n    onDeviceDisconnectedObservable: Observable<DeviceSource<DeviceType>>;\r\n\r\n    // Functions\r\n    _onInputChanged(deviceType: DeviceType, deviceSlot: number, eventData: IUIEvent): void;\r\n    _addDevice(deviceSource: DeviceSource<DeviceType>): void;\r\n    _removeDevice(deviceType: DeviceType, deviceSlot: number): void;\r\n}\r\n\r\n/** @hidden */\r\nexport class InternalDeviceSourceManager implements IDisposable {\r\n    // Private Members\r\n    // This is a master list of all device type/slot combos\r\n    private readonly _devices: Array<Array<number>>;\r\n\r\n    private readonly _deviceInputSystem: IDeviceInputSystem;\r\n\r\n    private readonly _registeredManagers = new Array<IObservableManager>();\r\n\r\n    public _refCount = 0;\r\n\r\n    public constructor(engine: Engine) {\r\n        const numberOfDeviceTypes = Object.keys(DeviceType).length / 2;\r\n        this._devices = new Array<Array<number>>(numberOfDeviceTypes);\r\n\r\n        if (typeof _native !== 'undefined') {\r\n            this._deviceInputSystem = (_native.DeviceInputSystem) ? new NativeDeviceInputSystem(new _native.DeviceInputSystem()) : new NativeDeviceInputSystem();\r\n        }\r\n        else {\r\n            this._deviceInputSystem = new WebDeviceInputSystem(engine);\r\n        }\r\n\r\n        this._deviceInputSystem.onDeviceConnected = (deviceType, deviceSlot) => {\r\n            if (!this._devices[deviceType]) {\r\n                this._devices[deviceType] = new Array<number>();\r\n            }\r\n\r\n            if (!this._devices[deviceType][deviceSlot]) {\r\n                this._devices[deviceType][deviceSlot] = deviceSlot;\r\n            }\r\n            for (const manager of this._registeredManagers) {\r\n                const deviceSource = new DeviceSource(this._deviceInputSystem, deviceType, deviceSlot);\r\n                manager._addDevice(deviceSource);\r\n            }\r\n        };\r\n\r\n        this._deviceInputSystem.onDeviceDisconnected = (deviceType, deviceSlot) => {\r\n            if (this._devices[deviceType]?.[deviceSlot]) {\r\n                delete this._devices[deviceType][deviceSlot];\r\n            }\r\n            for (const manager of this._registeredManagers) {\r\n                manager._removeDevice(deviceType, deviceSlot);\r\n            }\r\n        };\r\n\r\n        this._deviceInputSystem.onInputChanged = (deviceType: DeviceType, deviceSlot: number, eventData: IUIEvent) => {\r\n            if (eventData) {\r\n                for (const manager of this._registeredManagers) {\r\n                    manager._onInputChanged(deviceType, deviceSlot, eventData);\r\n                }\r\n            }\r\n        };\r\n    }\r\n\r\n    // Public Functions\r\n    public readonly registerManager = (manager: IObservableManager): void => {\r\n        for (let deviceType = 0; deviceType < this._devices.length; deviceType++) {\r\n            const device = this._devices[deviceType];\r\n            for (const deviceSlotKey in device) {\r\n                const deviceSlot = +deviceSlotKey;\r\n                manager._addDevice(new DeviceSource(this._deviceInputSystem, deviceType, deviceSlot));\r\n            }\r\n        }\r\n        this._registeredManagers.push(manager);\r\n    }\r\n\r\n    public readonly unregisterManager = (manager: IObservableManager): void => {\r\n        const idx = this._registeredManagers.indexOf(manager);\r\n\r\n        if (idx > -1) {\r\n            this._registeredManagers.splice(idx, 1);\r\n        }\r\n    }\r\n\r\n    public dispose(): void {\r\n        this._deviceInputSystem.dispose();\r\n    }\r\n}\r\n"]}

package/DeviceInput/InputDevices/nativeDeviceInputSystem.d.ts

@@ -1,10 +1,11 @@
+import { IUIEvent } from "../../Events/deviceInputEvents";
 import { DeviceType } from "./deviceEnums";
-import { IDeviceEvent, IDeviceInputSystem, INativeInput } from "./inputInterfaces";
+import { IDeviceInputSystem, INativeInput } from "./inputInterfaces";
 /** @hidden */
 export declare class NativeDeviceInputSystem implements IDeviceInputSystem {
     onDeviceConnected: (deviceType: DeviceType, deviceSlot: number) => void;
     onDeviceDisconnected: (deviceType: DeviceType, deviceSlot: number) => void;
-    onInputChanged: (deviceEvent: IDeviceEvent) => void;
+    onInputChanged: (deviceType: DeviceType, deviceSlot: number, eventData: IUIEvent) => void;
     private readonly _nativeInput;
     constructor(nativeInput?: INativeInput);
     /**

package/DeviceInput/InputDevices/nativeDeviceInputSystem.js

@@ -1,12 +1,12 @@
 import { DeviceEventFactory } from "../Helpers/eventFactory.js";
-import { DeviceType, PointerInput } from "./deviceEnums.js";
+import { DeviceType, NativePointerInput, PointerInput } from "./deviceEnums.js";
 /** @hidden */
 var NativeDeviceInputSystem = /** @class */ (function () {
     function NativeDeviceInputSystem(nativeInput) {
         var _this = this;
         this.onDeviceConnected = function (deviceType, deviceSlot) { };
         this.onDeviceDisconnected = function (deviceType, deviceSlot) { };
-        this.onInputChanged = function (deviceEvent) { };
+        this.onInputChanged = function (deviceType, deviceSlot, eventData) { };
         this._nativeInput = nativeInput || this._createDummyNativeInput();
         this._nativeInput.onDeviceConnected = function (deviceType, deviceSlot) {
             _this.onDeviceConnected(deviceType, deviceSlot);
@@ -14,16 +14,10 @@ var NativeDeviceInputSystem = /** @class */ (function () {
         this._nativeInput.onDeviceDisconnected = function (deviceType, deviceSlot) {
             _this.onDeviceDisconnected(deviceType, deviceSlot);
         };
-        this._nativeInput.onInputChanged = function (deviceType, deviceSlot, inputIndex, previousState, currentState, eventData) {
-            var idx = (inputIndex === PointerInput.Horizontal || inputIndex === PointerInput.Vertical || inputIndex === PointerInput.DeltaHorizontal || inputIndex === PointerInput.DeltaVertical) ? PointerInput.Move : inputIndex;
-            var evt = DeviceEventFactory.CreateDeviceEvent(deviceType, deviceSlot, inputIndex, currentState, _this);
-            var deviceEvent = evt;
-            deviceEvent.deviceType = deviceType;
-            deviceEvent.deviceSlot = deviceSlot;
-            deviceEvent.inputIndex = idx;
-            deviceEvent.previousState = previousState;
-            deviceEvent.currentState = currentState;
-            _this.onInputChanged(deviceEvent);
+        this._nativeInput.onInputChanged = function (deviceType, deviceSlot, inputIndex, currentState) {
+            var idx = (inputIndex === NativePointerInput.Horizontal || inputIndex === NativePointerInput.Vertical || inputIndex === NativePointerInput.DeltaHorizontal || inputIndex === NativePointerInput.DeltaVertical) ? PointerInput.Move : inputIndex;
+            var evt = DeviceEventFactory.CreateDeviceEvent(deviceType, deviceSlot, idx, currentState, _this);
+            _this.onInputChanged(deviceType, deviceSlot, evt);
         };
     }
     // Public functions
@@ -62,7 +56,7 @@ var NativeDeviceInputSystem = /** @class */ (function () {
         var nativeInput = {
             onDeviceConnected: function (deviceType, deviceSlot) { },
             onDeviceDisconnected: function (deviceType, deviceSlot) { },
-            onInputChanged: function (deviceType, deviceSlot, inputIndex, previousState, currentState, eventData) { },
+            onInputChanged: function (deviceType, deviceSlot, inputIndex, currentState) { },
             pollInput: function () { return 0; },
             isDeviceAvailable: function () { return false; },
             dispose: function () { },

package/DeviceInput/InputDevices/nativeDeviceInputSystem.js.map

@@ -1 +1 @@
-{"version":3,"file":"nativeDeviceInputSystem.js","sourceRoot":"","sources":["../../../../sourceES6/core/DeviceInput/InputDevices/nativeDeviceInputSystem.ts"],"names":[],"mappings":"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","sourcesContent":["import { Nullable } from \"../../types\";\r\nimport { DeviceEventFactory } from \"../Helpers/eventFactory\";\r\nimport { DeviceType, PointerInput } 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 idx = (inputIndex === PointerInput.Horizontal || inputIndex === PointerInput.Vertical || inputIndex === PointerInput.DeltaHorizontal || inputIndex === PointerInput.DeltaVertical) ? PointerInput.Move : inputIndex;\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 = idx;\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}"]}
+{"version":3,"file":"nativeDeviceInputSystem.js","sourceRoot":"","sources":["../../../../sourceES6/core/DeviceInput/InputDevices/nativeDeviceInputSystem.ts"],"names":[],"mappings":"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","sourcesContent":["import { IUIEvent } from \"../../Events/deviceInputEvents\";\r\nimport { Nullable } from \"../../types\";\r\nimport { DeviceEventFactory } from \"../Helpers/eventFactory\";\r\nimport { DeviceType, NativePointerInput, PointerInput } from \"./deviceEnums\";\r\nimport { 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 = (deviceType: DeviceType, deviceSlot: number, eventData: IUIEvent) => { };\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, currentState) => {\r\n            const idx = (inputIndex === NativePointerInput.Horizontal || inputIndex === NativePointerInput.Vertical || inputIndex === NativePointerInput.DeltaHorizontal || inputIndex === NativePointerInput.DeltaVertical) ? PointerInput.Move : inputIndex;\r\n            const evt = DeviceEventFactory.CreateDeviceEvent(deviceType, deviceSlot, idx, currentState, this);\r\n\r\n            this.onInputChanged(deviceType, deviceSlot, evt);\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, currentState: Nullable<number>) => { },\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/InputDevices/webDeviceInputSystem.d.ts

@@ -1,13 +1,14 @@
 import { Engine } from "../../Engines/engine";
+import { IUIEvent } from "../../Events/deviceInputEvents";
 import { DeviceType } from "./deviceEnums";
-import { IDeviceEvent, IDeviceInputSystem } from "./inputInterfaces";
+import { IDeviceInputSystem } from "./inputInterfaces";
 /** @hidden */
 export declare class WebDeviceInputSystem implements IDeviceInputSystem {
     /** onDeviceConnected property */
     set onDeviceConnected(callback: (deviceType: DeviceType, deviceSlot: number) => void);
     get onDeviceConnected(): (deviceType: DeviceType, deviceSlot: number) => void;
     onDeviceDisconnected: (deviceType: DeviceType, deviceSlot: number) => void;
-    onInputChanged: (deviceEvent: IDeviceEvent) => void;
+    onInputChanged: (deviceType: DeviceType, deviceSlot: number, eventData: IUIEvent) => void;
     private _inputs;
     private _gamepads;
     private _keyboardActive;
@@ -22,6 +23,7 @@ export declare class WebDeviceInputSystem implements IDeviceInputSystem {
     private _pointerMoveEvent;
     private _pointerDownEvent;
     private _pointerUpEvent;
+    private _pointerCancelEvent;
     private _pointerWheelEvent;
     private _pointerBlurEvent;
     private _wheelEventName;