@babylonjs/core 5.0.0-beta.8 → 5.0.0-beta.9

package/DeviceInput/InputDevices/deviceSourceManager.d.ts

@@ -4,10 +4,11 @@ import { Nullable } from '../../types';
 import { Observable } from '../../Misc/observable';
 import { IDeviceEvent } from './inputInterfaces';
 import { DeviceSource } from './deviceSource';
+import { IDisposable } from '../../scene';
 /**
  * Class to keep track of devices
  */
-export declare class DeviceSourceManager {
+export declare class DeviceSourceManager implements IDisposable {
     /**
      * Observable to be triggered when after a device is connected, any new observers added will be triggered against already connected devices
      */
@@ -20,22 +21,36 @@ export declare class DeviceSourceManager {
      * Observable to be triggered when after a device is disconnected
      */
     readonly onDeviceDisconnectedObservable: Observable<DeviceSource<DeviceType>>;
-    private _deviceSourceManager;
+    private _engine;
+    private _onDisposeObserver;
+    private _getDeviceSource;
+    private _getDeviceSources;
+    private _getDevices;
     /**
      * Gets a DeviceSource, given a type and slot
+     * @param deviceType Type of Device
+     * @param deviceSlot Slot or ID of device
+     * @returns DeviceSource
      */
-    getDeviceSource: <T extends DeviceType>(deviceType: T, deviceSlot?: number) => Nullable<DeviceSource<T>>;
+    getDeviceSource<T extends DeviceType>(deviceType: T, deviceSlot?: number): Nullable<DeviceSource<T>>;
     /**
      * Gets an array of DeviceSource objects for a given device type
+     * @param deviceType Type of Device
+     * @returns All available DeviceSources of a given type
      */
-    getDeviceSources: <T extends DeviceType>(deviceType: T) => ReadonlyArray<DeviceSource<T>>;
+    getDeviceSources<T extends DeviceType>(deviceType: T): ReadonlyArray<DeviceSource<T>>;
     /**
      * Returns a read-only list of all available devices
+     * @returns All available DeviceSources
      */
-    getDevices: () => ReadonlyArray<DeviceSource<DeviceType>>;
+    getDevices(): ReadonlyArray<DeviceSource<DeviceType>>;
     /**
      * Default constructor
      * @param engine Used to get canvas (if applicable)
      */
     constructor(engine: Engine);
+    /**
+     * Dispose of DeviceSourceManager
+     */
+    dispose(): void;
 }

package/DeviceInput/InputDevices/deviceSourceManager.js

@@ -1,3 +1,4 @@
+import { Observable } from '../../Misc/observable.js';
 import { InternalDeviceSourceManager } from './internalDeviceSourceManager.js';
 /**
  * Class to keep track of devices
@@ -8,14 +9,74 @@ var DeviceSourceManager = /** @class */ (function () {
      * @param engine Used to get canvas (if applicable)
      */
     function DeviceSourceManager(engine) {
-        this._deviceSourceManager = InternalDeviceSourceManager._Create(engine);
-        this.onDeviceConnectedObservable = this._deviceSourceManager.onDeviceConnectedObservable;
-        this.onInputChangedObservable = this._deviceSourceManager.onInputChangedObservable;
-        this.onDeviceDisconnectedObservable = this._deviceSourceManager.onDeviceDisconnectedObservable;
-        this.getDeviceSource = this._deviceSourceManager.getDeviceSource;
-        this.getDeviceSources = this._deviceSourceManager.getDeviceSources;
-        this.getDevices = this._deviceSourceManager.getDevices;
+        var _this = this;
+        this._engine = engine;
+        if (!this._engine._deviceSourceManager) {
+            this._engine._deviceSourceManager = new InternalDeviceSourceManager(engine);
+        }
+        this._engine._deviceSourceManager._refCount++;
+        // Observables
+        this.onDeviceConnectedObservable = new Observable(function (observer) {
+            _this.getDevices().forEach(function (device) {
+                _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();
+        });
     }
+    // Public Functions
+    /**
+     * Gets a DeviceSource, given a type and slot
+     * @param deviceType Type of Device
+     * @param deviceSlot Slot or ID of device
+     * @returns DeviceSource
+     */
+    DeviceSourceManager.prototype.getDeviceSource = function (deviceType, deviceSlot) {
+        return this._getDeviceSource(deviceType, deviceSlot);
+    };
+    /**
+     * Gets an array of DeviceSource objects for a given device type
+     * @param deviceType Type of Device
+     * @returns All available DeviceSources of a given type
+     */
+    DeviceSourceManager.prototype.getDeviceSources = function (deviceType) {
+        return this._getDeviceSources(deviceType);
+    };
+    /**
+     * Returns a read-only list of all available devices
+     * @returns All available DeviceSources
+     */
+    DeviceSourceManager.prototype.getDevices = function () {
+        return this._getDevices();
+    };
+    /**
+     * Dispose of DeviceSourceManager
+     */
+    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) {
+                this._engine._deviceSourceManager.dispose();
+                delete this._engine._deviceSourceManager;
+            }
+        }
+        this._engine.onDisposeObservable.remove(this._onDisposeObserver);
+    };
     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":"AAMA,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAE5E;;GAEG;AACH;IAkCI;;;OAGG;IACH,6BAAY,MAAc;QACtB,IAAI,CAAC,oBAAoB,GAAG,2BAA2B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAExE,IAAI,CAAC,2BAA2B,GAAG,IAAI,CAAC,oBAAoB,CAAC,2BAA2B,CAAC;QACzF,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC,oBAAoB,CAAC,wBAAwB,CAAC;QACnF,IAAI,CAAC,8BAA8B,GAAG,IAAI,CAAC,oBAAoB,CAAC,8BAA8B,CAAC;QAC/F,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC;QACjE,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,CAAC;QACnE,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC;IAC3D,CAAC;IACL,0BAAC;AAAD,CAAC,AAhDD,IAgDC","sourcesContent":["import { Engine } from '../../Engines/engine';\nimport { DeviceType } from './deviceEnums';\nimport { Nullable } from '../../types';\nimport { Observable } from '../../Misc/observable';\nimport { IDeviceEvent } from './inputInterfaces';\nimport { DeviceSource } from './deviceSource';\nimport { InternalDeviceSourceManager } from './internalDeviceSourceManager';\n\n/**\n * Class to keep track of devices\n */\nexport class DeviceSourceManager {\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 _deviceSourceManager: InternalDeviceSourceManager;\n\n    // Public Functions\n    /**\n     * Gets a DeviceSource, given a type and slot\n     */\n    public getDeviceSource: <T extends DeviceType>(deviceType: T, deviceSlot?: number) => Nullable<DeviceSource<T>>;\n\n    /**\n     * Gets an array of DeviceSource objects for a given device type\n     */\n    public getDeviceSources: <T extends DeviceType>(deviceType: T) => ReadonlyArray<DeviceSource<T>>;\n\n    /**\n     * Returns a read-only list of all available devices\n     */\n    public getDevices: () => ReadonlyArray<DeviceSource<DeviceType>>;\n\n    /**\n     * Default constructor\n     * @param engine Used to get canvas (if applicable)\n     */\n    constructor(engine: Engine) {\n        this._deviceSourceManager = InternalDeviceSourceManager._Create(engine);\n\n        this.onDeviceConnectedObservable = this._deviceSourceManager.onDeviceConnectedObservable;\n        this.onInputChangedObservable = this._deviceSourceManager.onInputChangedObservable;\n        this.onDeviceDisconnectedObservable = this._deviceSourceManager.onDeviceDisconnectedObservable;\n        this.getDeviceSource = this._deviceSourceManager.getDeviceSource;\n        this.getDeviceSources = this._deviceSourceManager.getDeviceSources;\n        this.getDevices = this._deviceSourceManager.getDevices;\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 { 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"]}

package/DeviceInput/InputDevices/internalDeviceSourceManager.d.ts

@@ -8,23 +8,28 @@ import { Engine } from '../../Engines/engine';
 declare module "../../Engines/engine" {
     interface Engine {
         /** @hidden */
-        _deviceSourceManager: InternalDeviceSourceManager;
+        _deviceSourceManager?: InternalDeviceSourceManager;
     }
 }
 /** @hidden */
+export interface IObservableManager {
+    onDeviceConnectedObservable: Observable<DeviceSource<DeviceType>>;
+    onInputChangedObservable: Observable<IDeviceEvent>;
+    onDeviceDisconnectedObservable: Observable<DeviceSource<DeviceType>>;
+}
+/** @hidden */
 export declare class InternalDeviceSourceManager implements IDisposable {
-    readonly onDeviceConnectedObservable: Observable<DeviceSource<DeviceType>>;
-    readonly onInputChangedObservable: Observable<IDeviceEvent>;
-    readonly onDeviceDisconnectedObservable: Observable<DeviceSource<DeviceType>>;
     private readonly _devices;
     private readonly _firstDevice;
     private readonly _deviceInputSystem;
-    private _oninputChangedObserver;
-    static _Create(engine: Engine): InternalDeviceSourceManager;
-    private constructor();
-    getDeviceSource: <T extends DeviceType>(deviceType: T, deviceSlot?: number | undefined) => Nullable<DeviceSource<T>>;
-    getDeviceSources: <T extends DeviceType>(deviceType: T) => readonly DeviceSource<T>[];
-    getDevices: () => ReadonlyArray<DeviceSource<DeviceType>>;
+    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

package/DeviceInput/InputDevices/internalDeviceSourceManager.js

@@ -1,5 +1,4 @@
 import { DeviceType } from './deviceEnums.js';
-import { Observable } from '../../Misc/observable.js';
 import { NativeDeviceInputSystem } from './nativeDeviceInputSystem.js';
 import { WebDeviceInputSystem } from './webDeviceInputSystem.js';
 import { DeviceSource } from './deviceSource.js';
@@ -7,16 +6,8 @@ import { DeviceSource } from './deviceSource.js';
 var InternalDeviceSourceManager = /** @class */ (function () {
     function InternalDeviceSourceManager(engine) {
         var _this = this;
-        // Public Members
-        this.onDeviceConnectedObservable = new Observable(function (observer) {
-            _this.getDevices().forEach(function (device) {
-                if (device) {
-                    _this.onDeviceConnectedObservable.notifyObserver(observer, device);
-                }
-            });
-        });
-        this.onInputChangedObservable = new Observable();
-        this.onDeviceDisconnectedObservable = new Observable();
+        this._registeredManagers = new Array();
+        this._refCount = 0;
         // Public Functions
         this.getDeviceSource = function (deviceType, deviceSlot) {
             if (deviceSlot === undefined) {
@@ -28,11 +19,6 @@ var InternalDeviceSourceManager = /** @class */ (function () {
             if (!_this._devices[deviceType] || _this._devices[deviceType][deviceSlot] === undefined) {
                 return null;
             }
-            if (!_this._oninputChangedObserver) {
-                _this._oninputChangedObserver = _this.onInputChangedObservable.add(function (eventData) {
-                    _this._devices[eventData.deviceType][eventData.deviceSlot].onInputChangedObservable.notifyObservers(eventData);
-                });
-            }
             return _this._devices[deviceType][deviceSlot];
         };
         this.getDeviceSources = function (deviceType) {
@@ -45,6 +31,15 @@ var InternalDeviceSourceManager = /** @class */ (function () {
             });
             return deviceArray;
         };
+        this.registerManager = function (manager) {
+            _this._registeredManagers.push(manager);
+        };
+        this.unregisterManager = function (manager) {
+            var idx = _this._registeredManagers.indexOf(manager);
+            if (idx > -1) {
+                _this._registeredManagers.splice(idx, 1);
+            }
+        };
         var numberOfDeviceTypes = Object.keys(DeviceType).length / 2;
         this._devices = new Array(numberOfDeviceTypes);
         this._firstDevice = new Array(numberOfDeviceTypes);
@@ -56,29 +51,28 @@ var InternalDeviceSourceManager = /** @class */ (function () {
         }
         this._deviceInputSystem.onDeviceConnected = function (deviceType, deviceSlot) {
             _this._addDevice(deviceType, deviceSlot);
-            _this.onDeviceConnectedObservable.notifyObservers(_this.getDeviceSource(deviceType, deviceSlot));
+            var deviceSource = _this.getDeviceSource(deviceType, deviceSlot);
+            for (var _i = 0, _a = _this._registeredManagers; _i < _a.length; _i++) {
+                var manager = _a[_i];
+                manager.onDeviceConnectedObservable.notifyObservers(deviceSource);
+            }
         };
         this._deviceInputSystem.onDeviceDisconnected = function (deviceType, deviceSlot) {
-            var device = _this.getDeviceSource(deviceType, deviceSlot); // Grab local reference to use before removing from devices
+            var deviceSource = _this.getDeviceSource(deviceType, deviceSlot); // Grab local reference to use before removing from devices
             _this._removeDevice(deviceType, deviceSlot);
-            _this.onDeviceDisconnectedObservable.notifyObservers(device);
+            for (var _i = 0, _a = _this._registeredManagers; _i < _a.length; _i++) {
+                var manager = _a[_i];
+                manager.onDeviceDisconnectedObservable.notifyObservers(deviceSource);
+            }
         };
         this._deviceInputSystem.onInputChanged = function (deviceEvent) {
-            _this.onInputChangedObservable.notifyObservers(deviceEvent);
+            for (var _i = 0, _a = _this._registeredManagers; _i < _a.length; _i++) {
+                var manager = _a[_i];
+                manager.onInputChangedObservable.notifyObservers(deviceEvent);
+            }
         };
     }
-    InternalDeviceSourceManager._Create = function (engine) {
-        if (!engine._deviceSourceManager) {
-            engine._deviceSourceManager = new InternalDeviceSourceManager(engine);
-            engine.onDisposeObservable.add(function () {
-                engine._deviceSourceManager.dispose();
-            });
-        }
-        return engine._deviceSourceManager;
-    };
     InternalDeviceSourceManager.prototype.dispose = function () {
-        this.onDeviceConnectedObservable.clear();
-        this.onDeviceDisconnectedObservable.clear();
         this._deviceInputSystem.dispose();
     };
     // Private Functions

package/DeviceInput/InputDevices/internalDeviceSourceManager.js.map

@@ -1 +1 @@
-{"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 { Nullable } from '../../types';\r\nimport { Observable, Observer } 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 class InternalDeviceSourceManager implements IDisposable {\r\n    // Public Members\r\n    public readonly onDeviceConnectedObservable = new Observable<DeviceSource<DeviceType>>((observer) => {\r\n        this.getDevices().forEach((device) => {\r\n            if (device) {\r\n                this.onDeviceConnectedObservable.notifyObserver(observer, device);\r\n            }\r\n        });\r\n    });\r\n\r\n    public readonly onInputChangedObservable = new Observable<IDeviceEvent>();\r\n\r\n    public readonly onDeviceDisconnectedObservable = new Observable<DeviceSource<DeviceType>>();\r\n\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 _oninputChangedObserver: Nullable<Observer<IDeviceEvent>>;\r\n\r\n    public static _Create(engine: Engine): InternalDeviceSourceManager {\r\n        if (!engine._deviceSourceManager) {\r\n            engine._deviceSourceManager = new InternalDeviceSourceManager(engine);\r\n\r\n            engine.onDisposeObservable.add(() => {\r\n                engine._deviceSourceManager.dispose();\r\n            });\r\n        }\r\n        return engine._deviceSourceManager;\r\n    }\r\n\r\n    private 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            this.onDeviceConnectedObservable.notifyObservers(this.getDeviceSource(deviceType, deviceSlot)!);\r\n        };\r\n\r\n        this._deviceInputSystem.onDeviceDisconnected = (deviceType, deviceSlot) => {\r\n            const device = this.getDeviceSource(deviceType, deviceSlot)!; // Grab local reference to use before removing from devices\r\n            this._removeDevice(deviceType, deviceSlot);\r\n            this.onDeviceDisconnectedObservable.notifyObservers(device);\r\n        };\r\n\r\n        this._deviceInputSystem.onInputChanged = (deviceEvent) => {\r\n            this.onInputChangedObservable.notifyObservers(deviceEvent);\r\n        };\r\n    }\r\n\r\n    // Public Functions\r\n    public 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        if (!this._oninputChangedObserver) {\r\n            this._oninputChangedObserver = this.onInputChangedObservable.add((eventData) => {\r\n                this._devices[eventData.deviceType][eventData.deviceSlot].onInputChangedObservable.notifyObservers(eventData);\r\n            });\r\n        }\r\n\r\n        return this._devices[deviceType][deviceSlot];\r\n    }\r\n\r\n    public 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 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 dispose(): void {\r\n        this.onDeviceConnectedObservable.clear();\r\n        this.onDeviceDisconnectedObservable.clear();\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 { 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"]}

package/DeviceInput/InputDevices/webDeviceInputSystem.d.ts

@@ -25,6 +25,7 @@ export declare class WebDeviceInputSystem implements IDeviceInputSystem {
     private _pointerWheelEvent;
     private _pointerBlurEvent;
     private _wheelEventName;
+    private _eventsAttached;
     private _mouseId;
     private readonly _isUsingFirefox;
     private _activeTouchIds;
@@ -53,9 +54,13 @@ export declare class WebDeviceInputSystem implements IDeviceInputSystem {
      */
     dispose(): void;
     /**
-     * Configures events to work with an engine's active element
+     * Enable listening for user input events
      */
-    private _configureEvents;
+    private _enableEvents;
+    /**
+     * Disable listening for user input events
+     */
+    private _disableEvents;
     /**
      * Checks for existing connections to devices and register them, if necessary
      * Currently handles gamepads and mouse
@@ -118,8 +123,4 @@ export declare class WebDeviceInputSystem implements IDeviceInputSystem {
      * @returns DeviceType interpreted from event
      */
     private _getPointerType;
-    /**
-     * Remove events from active input element
-     */
-    private _removeEvents;
 }

package/DeviceInput/InputDevices/webDeviceInputSystem.js

@@ -7,6 +7,7 @@ var MAX_POINTER_INPUTS = Object.keys(PointerInput).length / 2;
 /** @hidden */
 var WebDeviceInputSystem = /** @class */ (function () {
     function WebDeviceInputSystem(engine) {
+        var _this = this;
         // Private Members
         this._inputs = [];
         this._keyboardActive = false;
@@ -20,6 +21,7 @@ var WebDeviceInputSystem = /** @class */ (function () {
         this._pointerUpEvent = function (evt) { };
         this._pointerWheelEvent = function (evt) { };
         this._pointerBlurEvent = function (evt) { };
+        this._eventsAttached = false;
         this._mouseId = -1;
         this._isUsingFirefox = DomManagement.IsNavigatorAvailable() && navigator.userAgent && navigator.userAgent.indexOf("Firefox") !== -1;
         this._maxTouchPoints = 0;
@@ -31,7 +33,13 @@ var WebDeviceInputSystem = /** @class */ (function () {
         this.onDeviceConnected = function (deviceType, deviceSlot) { };
         this.onDeviceDisconnected = function (deviceType, deviceSlot) { };
         this.onInputChanged = function (deviceEvent) { };
-        this._configureEvents();
+        this._enableEvents();
+        // Set callback to enable event handler switching when inputElement changes
+        if (!this._engine._onEngineViewChanged) {
+            this._engine._onEngineViewChanged = function () {
+                _this._enableEvents();
+            };
+        }
     }
     Object.defineProperty(WebDeviceInputSystem.prototype, "onDeviceConnected", {
         get: function () {
@@ -90,26 +98,39 @@ var WebDeviceInputSystem = /** @class */ (function () {
      * Dispose of all the eventlisteners
      */
     WebDeviceInputSystem.prototype.dispose = function () {
-        // Observables
+        // Callbacks
         this.onDeviceConnected = function () { };
         this.onDeviceDisconnected = function () { };
         this.onInputChanged = function () { };
+        delete this._engine._onEngineViewChanged;
         if (this._elementToAttachTo) {
-            this._removeEvents();
-            // Gamepad Events
-            window.removeEventListener("gamepadconnected", this._gamepadConnectedEvent);
-            window.removeEventListener("gamepaddisconnected", this._gamepadDisconnectedEvent);
+            this._disableEvents();
         }
     };
     /**
-     * Configures events to work with an engine's active element
+     * Enable listening for user input events
      */
-    WebDeviceInputSystem.prototype._configureEvents = function () {
-        var inputElement = this._engine.getInputElement();
-        if (inputElement && this._elementToAttachTo !== inputElement) {
-            // If the engine's input element has changed, unregister events from previous element
-            if (this._elementToAttachTo) {
-                this._removeEvents();
+    WebDeviceInputSystem.prototype._enableEvents = function () {
+        var inputElement = this === null || this === void 0 ? void 0 : this._engine.getInputElement();
+        if (inputElement && (!this._eventsAttached || this._elementToAttachTo !== inputElement)) {
+            // Remove events before adding to avoid double events or simultaneous events on multiple canvases
+            this._disableEvents();
+            // If the inputs array has already been created, zero it out to before setting up events
+            if (this._inputs) {
+                for (var _i = 0, _a = this._inputs; _i < _a.length; _i++) {
+                    var inputs = _a[_i];
+                    if (inputs) {
+                        for (var deviceSlotKey in inputs) {
+                            var deviceSlot = +deviceSlotKey;
+                            var device = inputs[deviceSlot];
+                            if (device) {
+                                for (var inputIndex = 0; inputIndex < device.length; inputIndex++) {
+                                    device[inputIndex] = 0;
+                                }
+                            }
+                        }
+                    }
+                }
             }
             this._elementToAttachTo = inputElement;
             // Set tab index for the inputElement to the engine's canvasTabIndex, if and only if the element's tab index is -1
@@ -117,10 +138,36 @@ var WebDeviceInputSystem = /** @class */ (function () {
             this._handleKeyActions();
             this._handlePointerActions();
             this._handleGamepadActions();
+            this._eventsAttached = true;
             // Check for devices that are already connected but aren't registered. Currently, only checks for gamepads and mouse
             this._checkForConnectedDevices();
         }
     };
+    /**
+     * Disable listening for user input events
+     */
+    WebDeviceInputSystem.prototype._disableEvents = function () {
+        if (this._elementToAttachTo) {
+            // Blur Events
+            this._elementToAttachTo.removeEventListener("blur", this._keyboardBlurEvent);
+            this._elementToAttachTo.removeEventListener("blur", this._pointerBlurEvent);
+            // Keyboard Events
+            this._elementToAttachTo.removeEventListener("keydown", this._keyboardDownEvent);
+            this._elementToAttachTo.removeEventListener("keyup", this._keyboardUpEvent);
+            // Pointer Events
+            this._elementToAttachTo.removeEventListener(this._eventPrefix + "move", this._pointerMoveEvent);
+            this._elementToAttachTo.removeEventListener(this._eventPrefix + "down", this._pointerDownEvent);
+            this._elementToAttachTo.removeEventListener(this._eventPrefix + "up", this._pointerUpEvent);
+            this._elementToAttachTo.removeEventListener(this._wheelEventName, this._pointerWheelEvent);
+            // Gamepad Events
+            window.removeEventListener("gamepadconnected", this._gamepadConnectedEvent);
+            window.removeEventListener("gamepaddisconnected", this._gamepadDisconnectedEvent);
+        }
+        if (this._pointerInputClearObserver) {
+            this._engine.onEndFrameObservable.remove(this._pointerInputClearObserver);
+        }
+        this._eventsAttached = false;
+    };
     /**
      * Checks for existing connections to devices and register them, if necessary
      * Currently handles gamepads and mouse
@@ -269,7 +316,8 @@ var WebDeviceInputSystem = /** @class */ (function () {
      */
     WebDeviceInputSystem.prototype._handlePointerActions = function () {
         var _this = this;
-        this._maxTouchPoints = (DomManagement.IsNavigatorAvailable() && navigator.maxTouchPoints) || 0;
+        // If maxTouchPoints is defined, use that value.  Otherwise, allow for a minimum for supported gestures like pinch
+        this._maxTouchPoints = (DomManagement.IsNavigatorAvailable() && navigator.maxTouchPoints) || 2;
         if (!this._activeTouchIds) {
             this._activeTouchIds = new Array(this._maxTouchPoints);
         }
@@ -623,25 +671,6 @@ var WebDeviceInputSystem = /** @class */ (function () {
         }
         return deviceType;
     };
-    /**
-     * Remove events from active input element
-     */
-    WebDeviceInputSystem.prototype._removeEvents = function () {
-        // Blur Events
-        this._elementToAttachTo.removeEventListener("blur", this._keyboardBlurEvent);
-        this._elementToAttachTo.removeEventListener("blur", this._pointerBlurEvent);
-        // Keyboard Events
-        this._elementToAttachTo.removeEventListener("keydown", this._keyboardDownEvent);
-        this._elementToAttachTo.removeEventListener("keyup", this._keyboardUpEvent);
-        // Pointer Events
-        this._elementToAttachTo.removeEventListener(this._eventPrefix + "move", this._pointerMoveEvent);
-        this._elementToAttachTo.removeEventListener(this._eventPrefix + "down", this._pointerDownEvent);
-        this._elementToAttachTo.removeEventListener(this._eventPrefix + "up", this._pointerUpEvent);
-        this._elementToAttachTo.removeEventListener(this._wheelEventName, this._pointerWheelEvent);
-        if (this._pointerInputClearObserver) {
-            this._engine.onEndFrameObservable.remove(this._pointerInputClearObserver);
-        }
-    };
     return WebDeviceInputSystem;
 }());
 export { WebDeviceInputSystem };