naming convention

src/XR/features/WebXRControllerPointerSelection.ts

@@ -388,7 +388,7 @@ export class WebXRControllerPointerSelection extends WebXRAbstractFeature {
                 }
             });
 
-            controllerData.onButtonChangedObserver = controllerData.selectionComponent.onButtonStateChanged.add((component) => {
+            controllerData.onButtonChangedObserver = controllerData.selectionComponent.onButtonStateChangedObservable.add((component) => {
                 if (component.changes.pressed) {
                     const pressed = component.changes.pressed.current;
                     if (controllerData.pick) {
@@ -409,7 +409,7 @@ export class WebXRControllerPointerSelection extends WebXRAbstractFeature {
         if (!controllerData) { return; }
         if (controllerData.selectionComponent) {
             if (controllerData.onButtonChangedObserver) {
-                controllerData.selectionComponent.onButtonStateChanged.remove(controllerData.onButtonChangedObserver);
+                controllerData.selectionComponent.onButtonStateChangedObservable.remove(controllerData.onButtonChangedObserver);
             }
         }
         if (controllerData.onFrameObserver) {

src/XR/features/WebXRControllerTeleportation.ts

@@ -341,7 +341,7 @@ export class WebXRMotionControllerTeleportation extends WebXRAbstractFeature {
                     if (!mainComponent) {
                         return;
                     }
-                    controllerData.onButtonChangedObserver = mainComponent.onButtonStateChanged.add(() => {
+                    controllerData.onButtonChangedObserver = mainComponent.onButtonStateChangedObservable.add(() => {
                         // did "pressed" changed?
                         if (mainComponent.changes.pressed) {
                             if (mainComponent.changes.pressed.current) {
@@ -374,13 +374,13 @@ export class WebXRMotionControllerTeleportation extends WebXRAbstractFeature {
                         }
                     });
                 } else {
-                    controllerData.onButtonChangedObserver = movementController.onButtonStateChanged.add(() => {
+                    controllerData.onButtonChangedObserver = movementController.onButtonStateChangedObservable.add(() => {
                         if (this._currentTeleportationControllerId === controllerData.xrController.uniqueId && controllerData.teleportationState.forward && !movementController.touched) {
                             this._teleportForward(xrController.uniqueId);
                         }
                     });
                     // use thumbstick (or touchpad if thumbstick not available)
-                    controllerData.onAxisChangedObserver = movementController.onAxisValueChanged.add((axesData) => {
+                    controllerData.onAxisChangedObserver = movementController.onAxisValueChangedObservable.add((axesData) => {
                         if (axesData.y <= 0.7 && controllerData.teleportationState.backwards) {
                             //if (this._currentTeleportationControllerId === controllerData.xrController.uniqueId) {
                             controllerData.teleportationState.backwards = false;
@@ -462,10 +462,10 @@ export class WebXRMotionControllerTeleportation extends WebXRAbstractFeature {
         if (!controllerData) { return; }
         if (controllerData.teleportationComponent) {
             if (controllerData.onAxisChangedObserver) {
-                controllerData.teleportationComponent.onAxisValueChanged.remove(controllerData.onAxisChangedObserver);
+                controllerData.teleportationComponent.onAxisValueChangedObservable.remove(controllerData.onAxisChangedObserver);
             }
             if (controllerData.onButtonChangedObserver) {
-                controllerData.teleportationComponent.onButtonStateChanged.remove(controllerData.onButtonChangedObserver);
+                controllerData.teleportationComponent.onButtonStateChangedObservable.remove(controllerData.onButtonChangedObserver);
             }
         }
         // remove from the map

src/XR/motionController/webXRControllerComponent.ts

@@ -80,12 +80,12 @@ export class WebXRControllerComponent implements IDisposable {
      * Observers registered here will be triggered when the state of a button changes
      * State change is either pressed / touched / value
      */
-    public onButtonStateChanged: Observable<WebXRControllerComponent> = new Observable();
+    public onButtonStateChangedObservable: Observable<WebXRControllerComponent> = new Observable();
     /**
      * If axes are available for this component (like a touchpad or thumbstick) the observers will be notified when
      * the axes data changes
      */
-    public onAxisValueChanged: Observable<{ x: number, y: number }> = new Observable();
+    public onAxisValueChangedObservable: Observable<{ x: number, y: number }> = new Observable();
 
     private _currentValue: number = 0;
     private _touched: boolean = false;
@@ -257,11 +257,11 @@ export class WebXRControllerComponent implements IDisposable {
 
         if (buttonUpdated) {
             this._hasChanges = true;
-            this.onButtonStateChanged.notifyObservers(this);
+            this.onButtonStateChangedObservable.notifyObservers(this);
         }
         if (axesUpdate) {
             this._hasChanges = true;
-            this.onAxisValueChanged.notifyObservers(this._axes);
+            this.onAxisValueChangedObservable.notifyObservers(this._axes);
         }
     }
 
@@ -269,7 +269,7 @@ export class WebXRControllerComponent implements IDisposable {
      * Dispose this component
      */
     public dispose(): void {
-        this.onAxisValueChanged.clear();
-        this.onButtonStateChanged.clear();
+        this.onAxisValueChangedObservable.clear();
+        this.onButtonStateChangedObservable.clear();
     }
 }

src/XR/motionController/webXRHTCViveMotionController.ts

@@ -43,7 +43,7 @@ export class WebXRHTCViveMotionController extends WebXRAbstractMotionController
         this.getComponentIds().forEach((id) => {
             const comp = id && this.getComponent(id);
             if (comp) {
-                comp.onButtonStateChanged.add((component) => {
+                comp.onButtonStateChangedObservable.add((component) => {
 
                     if (!this.rootMesh || this.disableAnimation) { return; }
 

src/XR/motionController/webXRMicrosoftMixedRealityController.ts

@@ -118,7 +118,7 @@ export class WebXRMicrosoftMixedRealityController extends WebXRAbstractMotionCon
                 if (buttonMap.valueMesh && buttonMap.pressedMesh && buttonMap.unpressedMesh) {
                     const comp = this.getComponent(id);
                     if (comp) {
-                        comp.onButtonStateChanged.add((component) => {
+                        comp.onButtonStateChangedObservable.add((component) => {
                             this._lerpTransform(buttonMap, component.value);
                         }, undefined, true);
                     }
@@ -153,7 +153,7 @@ export class WebXRMicrosoftMixedRealityController extends WebXRAbstractMotionCon
 
                 if (axisMap.valueMesh && axisMap.minMesh && axisMap.maxMesh) {
                     if (comp) {
-                        comp.onAxisValueChanged.add((axisValues) => {
+                        comp.onAxisValueChangedObservable.add((axisValues) => {
                             const value = axis === "x-axis" ? axisValues.x : axisValues.y;
                             this._lerpTransform(axisMap, value, true);
                         }, undefined, true);

src/XR/motionController/webXROculusTouchMotionController.ts

@@ -53,7 +53,7 @@ export class WebXROculusTouchMotionController extends WebXRAbstractMotionControl
         this.getComponentIds().forEach((id) => {
             const comp = id && this.getComponent(id);
             if (comp) {
-                comp.onButtonStateChanged.add((component) => {
+                comp.onButtonStateChangedObservable.add((component) => {
 
                     if (!this.rootMesh || this.disableAnimation) { return; }