@babylonjs/core 6.23.1 → 6.25.0

package/Gamepads/Controllers/viveController.js

@@ -1,115 +0,0 @@
-import { SceneLoader } from "../../Loading/sceneLoader.js";
-import { WebVRController } from "./webVRController.js";
-import { PoseEnabledControllerType, PoseEnabledControllerHelper } from "./poseEnabledController.js";
-/**
- * Vive Controller
- */
-export class ViveController extends WebVRController {
-    /**
-     * Creates a new ViveController from a gamepad
-     * @param vrGamepad the gamepad that the controller should be created from
-     */
-    constructor(vrGamepad) {
-        super(vrGamepad);
-        this.controllerType = PoseEnabledControllerType.VIVE;
-        this._invertLeftStickY = true;
-    }
-    /**
-     * Implements abstract method on WebVRController class, loading controller meshes and calling this.attachToMesh if successful.
-     * @param scene scene in which to add meshes
-     * @param meshLoaded optional callback function that will be called if the mesh loads successfully.
-     */
-    initControllerMesh(scene, meshLoaded) {
-        SceneLoader.ImportMesh("", ViveController.MODEL_BASE_URL, ViveController.MODEL_FILENAME, scene, (newMeshes) => {
-            /*
-            Parent Mesh name: ViveWand
-            - body
-            - r_gripper
-            - l_gripper
-            - menu_button
-            - system_button
-            - trackpad
-            - trigger
-            - LED
-            */
-            this._defaultModel = newMeshes[1];
-            this.attachToMesh(this._defaultModel);
-            if (meshLoaded) {
-                meshLoaded(this._defaultModel);
-            }
-        });
-    }
-    /**
-     * Fired when the left button on this controller is modified
-     */
-    get onLeftButtonStateChangedObservable() {
-        return this.onMainButtonStateChangedObservable;
-    }
-    /**
-     * Fired when the right button on this controller is modified
-     */
-    get onRightButtonStateChangedObservable() {
-        return this.onMainButtonStateChangedObservable;
-    }
-    /**
-     * Fired when the menu button on this controller is modified
-     */
-    get onMenuButtonStateChangedObservable() {
-        return this.onSecondaryButtonStateChangedObservable;
-    }
-    /**
-     * Called once for each button that changed state since the last frame
-     * Vive mapping:
-     * 0: touchpad
-     * 1: trigger
-     * 2: left AND right buttons
-     * 3: menu button
-     * @param buttonIdx Which button index changed
-     * @param state New state of the button
-     */
-    _handleButtonChange(buttonIdx, state) {
-        const notifyObject = state; //{ state: state, changes: changes };
-        switch (buttonIdx) {
-            case 0:
-                this.onPadStateChangedObservable.notifyObservers(notifyObject);
-                return;
-            case 1: // index trigger
-                if (this._defaultModel) {
-                    this._defaultModel.getChildren()[6].rotation.x = -notifyObject.value * 0.15;
-                }
-                this.onTriggerStateChangedObservable.notifyObservers(notifyObject);
-                return;
-            case 2: // left AND right button
-                this.onMainButtonStateChangedObservable.notifyObservers(notifyObject);
-                return;
-            case 3:
-                if (this._defaultModel) {
-                    if (notifyObject.pressed) {
-                        this._defaultModel.getChildren()[2].position.y = -0.001;
-                    }
-                    else {
-                        this._defaultModel.getChildren()[2].position.y = 0;
-                    }
-                }
-                this.onSecondaryButtonStateChangedObservable.notifyObservers(notifyObject);
-                return;
-        }
-    }
-}
-/**
- * Base Url for the controller model.
- */
-ViveController.MODEL_BASE_URL = "https://controllers.babylonjs.com/vive/";
-/**
- * File name for the controller model.
- */
-ViveController.MODEL_FILENAME = "wand.babylon";
-PoseEnabledControllerHelper._ControllerFactories.push({
-    canCreate: (gamepadInfo) => {
-        return gamepadInfo.id.toLowerCase().indexOf("openvr") !== -1;
-    },
-    create: (gamepadInfo) => {
-        return new ViveController(gamepadInfo);
-    },
-});
-//# sourceMappingURL=viveController.js.map

package/Gamepads/Controllers/viveController.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"viveController.js","sourceRoot":"","sources":["../../../../../dev/core/src/Gamepads/Controllers/viveController.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Scene } from \"../../scene\";\r\nimport type { AbstractMesh } from \"../../Meshes/abstractMesh\";\r\nimport { SceneLoader } from \"../../Loading/sceneLoader\";\r\nimport { WebVRController } from \"./webVRController\";\r\nimport type { ExtendedGamepadButton } from \"./poseEnabledController\";\r\nimport { PoseEnabledControllerType, PoseEnabledControllerHelper } from \"./poseEnabledController\";\r\nimport type { Observable } from \"../../Misc/observable\";\r\n\r\n/**\r\n * Vive Controller\r\n */\r\nexport class ViveController extends WebVRController {\r\n    /**\r\n     * Base Url for the controller model.\r\n     */\r\n    public static MODEL_BASE_URL: string = \"https://controllers.babylonjs.com/vive/\";\r\n    /**\r\n     * File name for the controller model.\r\n     */\r\n    public static MODEL_FILENAME: string = \"wand.babylon\";\r\n\r\n    /**\r\n     * Creates a new ViveController from a gamepad\r\n     * @param vrGamepad the gamepad that the controller should be created from\r\n     */\r\n    constructor(vrGamepad: any) {\r\n        super(vrGamepad);\r\n        this.controllerType = PoseEnabledControllerType.VIVE;\r\n        this._invertLeftStickY = true;\r\n    }\r\n\r\n    /**\r\n     * Implements abstract method on WebVRController class, loading controller meshes and calling this.attachToMesh if successful.\r\n     * @param scene scene in which to add meshes\r\n     * @param meshLoaded optional callback function that will be called if the mesh loads successfully.\r\n     */\r\n    public initControllerMesh(scene: Scene, meshLoaded?: (mesh: AbstractMesh) => void) {\r\n        SceneLoader.ImportMesh(\"\", ViveController.MODEL_BASE_URL, ViveController.MODEL_FILENAME, scene, (newMeshes) => {\r\n            /*\r\n            Parent Mesh name: ViveWand\r\n            - body\r\n            - r_gripper\r\n            - l_gripper\r\n            - menu_button\r\n            - system_button\r\n            - trackpad\r\n            - trigger\r\n            - LED\r\n            */\r\n            this._defaultModel = newMeshes[1];\r\n            this.attachToMesh(this._defaultModel);\r\n            if (meshLoaded) {\r\n                meshLoaded(this._defaultModel);\r\n            }\r\n        });\r\n    }\r\n\r\n    /**\r\n     * Fired when the left button on this controller is modified\r\n     */\r\n    public get onLeftButtonStateChangedObservable(): Observable<ExtendedGamepadButton> {\r\n        return this.onMainButtonStateChangedObservable;\r\n    }\r\n\r\n    /**\r\n     * Fired when the right button on this controller is modified\r\n     */\r\n    public get onRightButtonStateChangedObservable(): Observable<ExtendedGamepadButton> {\r\n        return this.onMainButtonStateChangedObservable;\r\n    }\r\n\r\n    /**\r\n     * Fired when the menu button on this controller is modified\r\n     */\r\n    public get onMenuButtonStateChangedObservable(): Observable<ExtendedGamepadButton> {\r\n        return this.onSecondaryButtonStateChangedObservable;\r\n    }\r\n\r\n    /**\r\n     * Called once for each button that changed state since the last frame\r\n     * Vive mapping:\r\n     * 0: touchpad\r\n     * 1: trigger\r\n     * 2: left AND right buttons\r\n     * 3: menu button\r\n     * @param buttonIdx Which button index changed\r\n     * @param state New state of the button\r\n     */\r\n    protected _handleButtonChange(buttonIdx: number, state: ExtendedGamepadButton) {\r\n        const notifyObject = state; //{ state: state, changes: changes };\r\n        switch (buttonIdx) {\r\n            case 0:\r\n                this.onPadStateChangedObservable.notifyObservers(notifyObject);\r\n                return;\r\n            case 1: // index trigger\r\n                if (this._defaultModel) {\r\n                    (<AbstractMesh>this._defaultModel.getChildren()[6]).rotation.x = -notifyObject.value * 0.15;\r\n                }\r\n                this.onTriggerStateChangedObservable.notifyObservers(notifyObject);\r\n                return;\r\n            case 2: // left AND right button\r\n                this.onMainButtonStateChangedObservable.notifyObservers(notifyObject);\r\n                return;\r\n            case 3:\r\n                if (this._defaultModel) {\r\n                    if (notifyObject.pressed) {\r\n                        (<AbstractMesh>this._defaultModel.getChildren()[2]).position.y = -0.001;\r\n                    } else {\r\n                        (<AbstractMesh>this._defaultModel.getChildren()[2]).position.y = 0;\r\n                    }\r\n                }\r\n                this.onSecondaryButtonStateChangedObservable.notifyObservers(notifyObject);\r\n                return;\r\n        }\r\n    }\r\n}\r\n\r\nPoseEnabledControllerHelper._ControllerFactories.push({\r\n    canCreate: (gamepadInfo) => {\r\n        return gamepadInfo.id.toLowerCase().indexOf(\"openvr\") !== -1;\r\n    },\r\n    create: (gamepadInfo) => {\r\n        return new ViveController(gamepadInfo);\r\n    },\r\n});\r\n"]}

package/Gamepads/Controllers/webVRController.d.ts

@@ -1,85 +0,0 @@
-import { Observable } from "../../Misc/observable";
-import type { Scene } from "../../scene";
-import type { AbstractMesh } from "../../Meshes/abstractMesh";
-import type { ExtendedGamepadButton, MutableGamepadButton } from "./poseEnabledController";
-import { PoseEnabledController } from "./poseEnabledController";
-import type { StickValues, GamepadButtonChanges } from "../../Gamepads/gamepad";
-import type { Nullable } from "../../types";
-/**
- * Defines the WebVRController object that represents controllers tracked in 3D space
- * @deprecated Use WebXR instead
- */
-export declare abstract class WebVRController extends PoseEnabledController {
-    /**
-     * Internal, the default controller model for the controller
-     */
-    protected _defaultModel: Nullable<AbstractMesh>;
-    /**
-     * Fired when the trigger state has changed
-     */
-    onTriggerStateChangedObservable: Observable<ExtendedGamepadButton>;
-    /**
-     * Fired when the main button state has changed
-     */
-    onMainButtonStateChangedObservable: Observable<ExtendedGamepadButton>;
-    /**
-     * Fired when the secondary button state has changed
-     */
-    onSecondaryButtonStateChangedObservable: Observable<ExtendedGamepadButton>;
-    /**
-     * Fired when the pad state has changed
-     */
-    onPadStateChangedObservable: Observable<ExtendedGamepadButton>;
-    /**
-     * Fired when controllers stick values have changed
-     */
-    onPadValuesChangedObservable: Observable<StickValues>;
-    /**
-     * Array of button available on the controller
-     */
-    protected _buttons: Array<MutableGamepadButton>;
-    private _onButtonStateChange;
-    /**
-     * Fired when a controller button's state has changed
-     * @param callback the callback containing the button that was modified
-     */
-    onButtonStateChange(callback: (controlledIndex: number, buttonIndex: number, state: ExtendedGamepadButton) => void): void;
-    /**
-     * X and Y axis corresponding to the controllers joystick
-     */
-    pad: StickValues;
-    /**
-     * 'left' or 'right', see https://w3c.github.io/gamepad/extensions.html#gamepadhand-enum
-     */
-    hand: string;
-    /**
-     * The default controller model for the controller
-     */
-    get defaultModel(): Nullable<AbstractMesh>;
-    /**
-     * Creates a new WebVRController from a gamepad
-     * @param vrGamepad the gamepad that the WebVRController should be created from
-     */
-    constructor(vrGamepad: any);
-    /**
-     * Updates the state of the controller and mesh based on the current position and rotation of the controller
-     */
-    update(): void;
-    /**
-     * Function to be called when a button is modified
-     */
-    protected abstract _handleButtonChange(buttonIdx: number, value: ExtendedGamepadButton, changes: GamepadButtonChanges): void;
-    /**
-     * Loads a mesh and attaches it to the controller
-     * @param scene the scene the mesh should be added to
-     * @param meshLoaded callback for when the mesh has been loaded
-     */
-    abstract initControllerMesh(scene: Scene, meshLoaded?: (mesh: AbstractMesh) => void): void;
-    private _setButtonValue;
-    private _changes;
-    private _checkChanges;
-    /**
-     * Disposes of th webVRController
-     */
-    dispose(): void;
-}

package/Gamepads/Controllers/webVRController.js

@@ -1,122 +0,0 @@
-import { Observable } from "../../Misc/observable.js";
-import { PoseEnabledController } from "./poseEnabledController.js";
-/**
- * Defines the WebVRController object that represents controllers tracked in 3D space
- * @deprecated Use WebXR instead
- */
-export class WebVRController extends PoseEnabledController {
-    /**
-     * Fired when a controller button's state has changed
-     * @param callback the callback containing the button that was modified
-     */
-    onButtonStateChange(callback) {
-        this._onButtonStateChange = callback;
-    }
-    /**
-     * The default controller model for the controller
-     */
-    get defaultModel() {
-        return this._defaultModel;
-    }
-    /**
-     * Creates a new WebVRController from a gamepad
-     * @param vrGamepad the gamepad that the WebVRController should be created from
-     */
-    constructor(vrGamepad) {
-        super(vrGamepad);
-        // Observables
-        /**
-         * Fired when the trigger state has changed
-         */
-        this.onTriggerStateChangedObservable = new Observable();
-        /**
-         * Fired when the main button state has changed
-         */
-        this.onMainButtonStateChangedObservable = new Observable();
-        /**
-         * Fired when the secondary button state has changed
-         */
-        this.onSecondaryButtonStateChangedObservable = new Observable();
-        /**
-         * Fired when the pad state has changed
-         */
-        this.onPadStateChangedObservable = new Observable();
-        /**
-         * Fired when controllers stick values have changed
-         */
-        this.onPadValuesChangedObservable = new Observable();
-        /**
-         * X and Y axis corresponding to the controllers joystick
-         */
-        this.pad = { x: 0, y: 0 };
-        // avoid GC, store state in a tmp object
-        this._changes = {
-            pressChanged: false,
-            touchChanged: false,
-            valueChanged: false,
-            changed: false,
-        };
-        this._buttons = new Array(vrGamepad.buttons.length);
-        this.hand = vrGamepad.hand;
-    }
-    /**
-     * Updates the state of the controller and mesh based on the current position and rotation of the controller
-     */
-    update() {
-        super.update();
-        for (let index = 0; index < this._buttons.length; index++) {
-            this._setButtonValue(this.browserGamepad.buttons[index], this._buttons[index], index);
-        }
-        if (this.leftStick.x !== this.pad.x || this.leftStick.y !== this.pad.y) {
-            this.pad.x = this.leftStick.x;
-            this.pad.y = this.leftStick.y;
-            this.onPadValuesChangedObservable.notifyObservers(this.pad);
-        }
-    }
-    _setButtonValue(newState, currentState, buttonIndex) {
-        if (!newState) {
-            newState = {
-                pressed: false,
-                touched: false,
-                value: 0,
-            };
-        }
-        if (!currentState) {
-            this._buttons[buttonIndex] = {
-                pressed: newState.pressed,
-                touched: newState.touched,
-                value: newState.value,
-            };
-            return;
-        }
-        this._checkChanges(newState, currentState);
-        if (this._changes.changed) {
-            this._onButtonStateChange && this._onButtonStateChange(this.index, buttonIndex, newState);
-            this._handleButtonChange(buttonIndex, newState, this._changes);
-        }
-        this._buttons[buttonIndex].pressed = newState.pressed;
-        this._buttons[buttonIndex].touched = newState.touched;
-        // oculus triggers are never 0, thou not touched.
-        this._buttons[buttonIndex].value = newState.value < 0.00000001 ? 0 : newState.value;
-    }
-    _checkChanges(newState, currentState) {
-        this._changes.pressChanged = newState.pressed !== currentState.pressed;
-        this._changes.touchChanged = newState.touched !== currentState.touched;
-        this._changes.valueChanged = newState.value !== currentState.value;
-        this._changes.changed = this._changes.pressChanged || this._changes.touchChanged || this._changes.valueChanged;
-        return this._changes;
-    }
-    /**
-     * Disposes of th webVRController
-     */
-    dispose() {
-        super.dispose();
-        this._defaultModel = null;
-        this.onTriggerStateChangedObservable.clear();
-        this.onMainButtonStateChangedObservable.clear();
-        this.onSecondaryButtonStateChangedObservable.clear();
-        this.onPadStateChangedObservable.clear();
-        this.onPadValuesChangedObservable.clear();
-    }
-}
-//# sourceMappingURL=webVRController.js.map

package/Gamepads/Controllers/webVRController.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"webVRController.js","sourceRoot":"","sources":["../../../../../dev/core/src/Gamepads/Controllers/webVRController.ts"],"names":[],"mappings":"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","sourcesContent":["import { Observable } from \"../../Misc/observable\";\r\nimport type { Scene } from \"../../scene\";\r\nimport type { AbstractMesh } from \"../../Meshes/abstractMesh\";\r\nimport type { ExtendedGamepadButton, MutableGamepadButton } from \"./poseEnabledController\";\r\nimport { PoseEnabledController } from \"./poseEnabledController\";\r\nimport type { StickValues, GamepadButtonChanges } from \"../../Gamepads/gamepad\";\r\nimport type { Nullable } from \"../../types\";\r\n\r\n/**\r\n * Defines the WebVRController object that represents controllers tracked in 3D space\r\n * @deprecated Use WebXR instead\r\n */\r\nexport abstract class WebVRController extends PoseEnabledController {\r\n    /**\r\n     * Internal, the default controller model for the controller\r\n     */\r\n    protected _defaultModel: Nullable<AbstractMesh>;\r\n\r\n    // Observables\r\n    /**\r\n     * Fired when the trigger state has changed\r\n     */\r\n    public onTriggerStateChangedObservable = new Observable<ExtendedGamepadButton>();\r\n    /**\r\n     * Fired when the main button state has changed\r\n     */\r\n    public onMainButtonStateChangedObservable = new Observable<ExtendedGamepadButton>();\r\n    /**\r\n     * Fired when the secondary button state has changed\r\n     */\r\n    public onSecondaryButtonStateChangedObservable = new Observable<ExtendedGamepadButton>();\r\n    /**\r\n     * Fired when the pad state has changed\r\n     */\r\n    public onPadStateChangedObservable = new Observable<ExtendedGamepadButton>();\r\n    /**\r\n     * Fired when controllers stick values have changed\r\n     */\r\n    public onPadValuesChangedObservable = new Observable<StickValues>();\r\n\r\n    /**\r\n     * Array of button available on the controller\r\n     */\r\n    protected _buttons: Array<MutableGamepadButton>;\r\n\r\n    private _onButtonStateChange: (controlledIndex: number, buttonIndex: number, state: ExtendedGamepadButton) => void;\r\n\r\n    /**\r\n     * Fired when a controller button's state has changed\r\n     * @param callback the callback containing the button that was modified\r\n     */\r\n    public onButtonStateChange(callback: (controlledIndex: number, buttonIndex: number, state: ExtendedGamepadButton) => void) {\r\n        this._onButtonStateChange = callback;\r\n    }\r\n\r\n    /**\r\n     * X and Y axis corresponding to the controllers joystick\r\n     */\r\n    public pad: StickValues = { x: 0, y: 0 };\r\n\r\n    /**\r\n     * 'left' or 'right', see https://w3c.github.io/gamepad/extensions.html#gamepadhand-enum\r\n     */\r\n    public hand: string;\r\n\r\n    /**\r\n     * The default controller model for the controller\r\n     */\r\n    public get defaultModel(): Nullable<AbstractMesh> {\r\n        return this._defaultModel;\r\n    }\r\n\r\n    /**\r\n     * Creates a new WebVRController from a gamepad\r\n     * @param vrGamepad the gamepad that the WebVRController should be created from\r\n     */\r\n    constructor(vrGamepad: any) {\r\n        super(vrGamepad);\r\n        this._buttons = new Array<ExtendedGamepadButton>(vrGamepad.buttons.length);\r\n        this.hand = vrGamepad.hand;\r\n    }\r\n\r\n    /**\r\n     * Updates the state of the controller and mesh based on the current position and rotation of the controller\r\n     */\r\n    public update() {\r\n        super.update();\r\n        for (let index = 0; index < this._buttons.length; index++) {\r\n            this._setButtonValue(this.browserGamepad.buttons[index], this._buttons[index], index);\r\n        }\r\n        if (this.leftStick.x !== this.pad.x || this.leftStick.y !== this.pad.y) {\r\n            this.pad.x = this.leftStick.x;\r\n            this.pad.y = this.leftStick.y;\r\n            this.onPadValuesChangedObservable.notifyObservers(this.pad);\r\n        }\r\n    }\r\n\r\n    /**\r\n     * Function to be called when a button is modified\r\n     */\r\n    protected abstract _handleButtonChange(buttonIdx: number, value: ExtendedGamepadButton, changes: GamepadButtonChanges): void;\r\n\r\n    /**\r\n     * Loads a mesh and attaches it to the controller\r\n     * @param scene the scene the mesh should be added to\r\n     * @param meshLoaded callback for when the mesh has been loaded\r\n     */\r\n    public abstract initControllerMesh(scene: Scene, meshLoaded?: (mesh: AbstractMesh) => void): void;\r\n\r\n    private _setButtonValue(newState: ExtendedGamepadButton, currentState: ExtendedGamepadButton, buttonIndex: number) {\r\n        if (!newState) {\r\n            newState = {\r\n                pressed: false,\r\n                touched: false,\r\n                value: 0,\r\n            };\r\n        }\r\n        if (!currentState) {\r\n            this._buttons[buttonIndex] = {\r\n                pressed: newState.pressed,\r\n                touched: newState.touched,\r\n                value: newState.value,\r\n            };\r\n            return;\r\n        }\r\n        this._checkChanges(newState, currentState);\r\n        if (this._changes.changed) {\r\n            this._onButtonStateChange && this._onButtonStateChange(this.index, buttonIndex, newState);\r\n\r\n            this._handleButtonChange(buttonIndex, newState, this._changes);\r\n        }\r\n        this._buttons[buttonIndex].pressed = newState.pressed;\r\n        this._buttons[buttonIndex].touched = newState.touched;\r\n        // oculus triggers are never 0, thou not touched.\r\n        this._buttons[buttonIndex].value = newState.value < 0.00000001 ? 0 : newState.value;\r\n    }\r\n\r\n    // avoid GC, store state in a tmp object\r\n    private _changes: GamepadButtonChanges = {\r\n        pressChanged: false,\r\n        touchChanged: false,\r\n        valueChanged: false,\r\n        changed: false,\r\n    };\r\n\r\n    private _checkChanges(newState: ExtendedGamepadButton, currentState: ExtendedGamepadButton) {\r\n        this._changes.pressChanged = newState.pressed !== currentState.pressed;\r\n        this._changes.touchChanged = newState.touched !== currentState.touched;\r\n        this._changes.valueChanged = newState.value !== currentState.value;\r\n        this._changes.changed = this._changes.pressChanged || this._changes.touchChanged || this._changes.valueChanged;\r\n        return this._changes;\r\n    }\r\n\r\n    /**\r\n     * Disposes of th webVRController\r\n     */\r\n    public dispose(): void {\r\n        super.dispose();\r\n\r\n        this._defaultModel = null;\r\n\r\n        this.onTriggerStateChangedObservable.clear();\r\n        this.onMainButtonStateChangedObservable.clear();\r\n        this.onSecondaryButtonStateChangedObservable.clear();\r\n        this.onPadStateChangedObservable.clear();\r\n        this.onPadValuesChangedObservable.clear();\r\n    }\r\n}\r\n"]}

package/Gamepads/Controllers/windowsMotionController.d.ts

@@ -1,212 +0,0 @@
-import { Observable } from "../../Misc/observable";
-import type { Scene } from "../../scene";
-import type { AbstractMesh } from "../../Meshes/abstractMesh";
-import { Ray } from "../../Culling/ray";
-import { WebVRController } from "./webVRController";
-import type { ExtendedGamepadButton } from "./poseEnabledController";
-import type { StickValues } from "../../Gamepads/gamepad";
-/**
- * Defines the WindowsMotionController object that the state of the windows motion controller
- */
-export declare class WindowsMotionController extends WebVRController {
-    /**
-     * The base url used to load the left and right controller models
-     */
-    static MODEL_BASE_URL: string;
-    /**
-     * The name of the left controller model file
-     */
-    static MODEL_LEFT_FILENAME: string;
-    /**
-     * The name of the right controller model file
-     */
-    static MODEL_RIGHT_FILENAME: string;
-    /**
-     * The controller name prefix for this controller type
-     */
-    static readonly GAMEPAD_ID_PREFIX: string;
-    /**
-     * The controller id pattern for this controller type
-     */
-    private static readonly GAMEPAD_ID_PATTERN;
-    private _loadedMeshInfo;
-    protected readonly _mapping: {
-        buttons: string[];
-        buttonMeshNames: {
-            trigger: string;
-            menu: string;
-            grip: string;
-            thumbstick: string;
-            trackpad: string;
-        };
-        buttonObservableNames: {
-            trigger: string;
-            menu: string;
-            grip: string;
-            thumbstick: string;
-            trackpad: string;
-        };
-        axisMeshNames: string[];
-        pointingPoseMeshName: string;
-    };
-    /**
-     * Fired when the trackpad on this controller is clicked
-     */
-    onTrackpadChangedObservable: Observable<ExtendedGamepadButton>;
-    /**
-     * Fired when the trackpad on this controller is modified
-     */
-    onTrackpadValuesChangedObservable: Observable<StickValues>;
-    /**
-     * The current x and y values of this controller's trackpad
-     */
-    trackpad: StickValues;
-    /**
-     * Creates a new WindowsMotionController from a gamepad
-     * @param vrGamepad the gamepad that the controller should be created from
-     */
-    constructor(vrGamepad: any);
-    /**
-     * Fired when the trigger on this controller is modified
-     */
-    get onTriggerButtonStateChangedObservable(): Observable<ExtendedGamepadButton>;
-    /**
-     * Fired when the menu button on this controller is modified
-     */
-    get onMenuButtonStateChangedObservable(): Observable<ExtendedGamepadButton>;
-    /**
-     * Fired when the grip button on this controller is modified
-     */
-    get onGripButtonStateChangedObservable(): Observable<ExtendedGamepadButton>;
-    /**
-     * Fired when the thumbstick button on this controller is modified
-     */
-    get onThumbstickButtonStateChangedObservable(): Observable<ExtendedGamepadButton>;
-    /**
-     * Fired when the touchpad button on this controller is modified
-     */
-    get onTouchpadButtonStateChangedObservable(): Observable<ExtendedGamepadButton>;
-    /**
-     * Fired when the touchpad values on this controller are modified
-     */
-    get onTouchpadValuesChangedObservable(): Observable<StickValues>;
-    protected _updateTrackpad(): void;
-    /**
-     * Called once per frame by the engine.
-     */
-    update(): void;
-    /**
-     * Called once for each button that changed state since the last frame
-     * @param buttonIdx Which button index changed
-     * @param state New state of the button
-     */
-    protected _handleButtonChange(buttonIdx: number, state: ExtendedGamepadButton): void;
-    /**
-     * Moves the buttons on the controller mesh based on their current state
-     * @param buttonName the name of the button to move
-     * @param buttonValue the value of the button which determines the buttons new position
-     */
-    protected _lerpButtonTransform(buttonName: string, buttonValue: number): void;
-    /**
-     * Moves the axis on the controller mesh based on its current state
-     * @param axis the index of the axis
-     * @param axisValue the value of the axis which determines the meshes new position
-     * @internal
-     */
-    protected _lerpAxisTransform(axis: number, axisValue: number): void;
-    /**
-     * Implements abstract method on WebVRController class, loading controller meshes and calling this.attachToMesh if successful.
-     * @param scene scene in which to add meshes
-     * @param meshLoaded optional callback function that will be called if the mesh loads successfully.
-     * @param forceDefault
-     */
-    initControllerMesh(scene: Scene, meshLoaded?: (mesh: AbstractMesh) => void, forceDefault?: boolean): void;
-    /**
-     * Takes a list of meshes (as loaded from the glTF file) and finds the root node, as well as nodes that
-     * can be transformed by button presses and axes values, based on this._mapping.
-     *
-     * @param scene scene in which the meshes exist
-     * @param meshes list of meshes that make up the controller model to process
-     * @returns structured view of the given meshes, with mapping of buttons and axes to meshes that can be transformed.
-     */
-    private _processModel;
-    private _createMeshInfo;
-    /**
-     * Gets the ray of the controller in the direction the controller is pointing
-     * @param length the length the resulting ray should be
-     * @returns a ray in the direction the controller is pointing
-     */
-    getForwardRay(length?: number): Ray;
-    /**
-     * Disposes of the controller
-     */
-    dispose(): void;
-}
-/**
- * This class represents a new windows motion controller in XR.
- */
-export declare class XRWindowsMotionController extends WindowsMotionController {
-    /**
-     * Changing the original WIndowsMotionController mapping to fir the new mapping
-     */
-    protected readonly _mapping: {
-        buttons: string[];
-        buttonMeshNames: {
-            trigger: string;
-            menu: string;
-            grip: string;
-            thumbstick: string;
-            trackpad: string;
-        };
-        buttonObservableNames: {
-            trigger: string;
-            menu: string;
-            grip: string;
-            thumbstick: string;
-            trackpad: string;
-        };
-        axisMeshNames: string[];
-        pointingPoseMeshName: string;
-    };
-    /**
-     * Construct a new XR-Based windows motion controller
-     *
-     * @param gamepadInfo the gamepad object from the browser
-     */
-    constructor(gamepadInfo: any);
-    /**
-     * holds the thumbstick values (X,Y)
-     */
-    thumbstickValues: StickValues;
-    /**
-     * Fired when the thumbstick on this controller is clicked
-     */
-    onThumbstickStateChangedObservable: Observable<ExtendedGamepadButton>;
-    /**
-     * Fired when the thumbstick on this controller is modified
-     */
-    onThumbstickValuesChangedObservable: Observable<StickValues>;
-    /**
-     * Fired when the touchpad button on this controller is modified
-     */
-    onTrackpadChangedObservable: Observable<ExtendedGamepadButton>;
-    /**
-     * Fired when the touchpad values on this controller are modified
-     */
-    onTrackpadValuesChangedObservable: Observable<StickValues>;
-    /**
-     * Fired when the thumbstick button on this controller is modified
-     * here to prevent breaking changes
-     */
-    get onThumbstickButtonStateChangedObservable(): Observable<ExtendedGamepadButton>;
-    /**
-     * updating the thumbstick(!) and not the trackpad.
-     * This is named this way due to the difference between WebVR and XR and to avoid
-     * changing the parent class.
-     */
-    protected _updateTrackpad(): void;
-    /**
-     * Disposes the class with joy
-     */
-    dispose(): void;
-}