|
@@ -52820,6 +52820,7 @@ var BABYLON;
|
|
|
if (!running) {
|
|
|
this._raiseOnAnimationEnd();
|
|
|
this.onAnimationEnd = null;
|
|
|
+ this.onAnimationEndObservable.clear();
|
|
|
}
|
|
|
return running;
|
|
|
};
|
|
@@ -88748,6 +88749,9 @@ var BABYLON;
|
|
|
if (webVROptions.createDeviceOrientationCamera === undefined) {
|
|
|
webVROptions.createDeviceOrientationCamera = true;
|
|
|
}
|
|
|
+ if (webVROptions.laserToggle === undefined) {
|
|
|
+ webVROptions.laserToggle = true;
|
|
|
+ }
|
|
|
if (webVROptions.defaultHeight === undefined) {
|
|
|
webVROptions.defaultHeight = 1.7;
|
|
|
}
|
|
@@ -88893,6 +88897,9 @@ var BABYLON;
|
|
|
//create easing functions
|
|
|
this._circleEase = new BABYLON.CircleEase();
|
|
|
this._circleEase.setEasingMode(BABYLON.EasingFunction.EASINGMODE_EASEINOUT);
|
|
|
+ if (this.webVROptions.floorMeshes) {
|
|
|
+ this.enableTeleportation({ floorMeshes: this.webVROptions.floorMeshes });
|
|
|
+ }
|
|
|
}
|
|
|
Object.defineProperty(VRExperienceHelper.prototype, "onEnteringVR", {
|
|
|
/** Return this.onEnteringVRObservable
|
|
@@ -89371,20 +89378,22 @@ var BABYLON;
|
|
|
if (controllerMesh) {
|
|
|
controller._interactionsEnabled = true;
|
|
|
controller._activatePointer();
|
|
|
- controller.webVRController.onMainButtonStateChangedObservable.add(function (stateObject) {
|
|
|
- // Enabling / disabling laserPointer
|
|
|
- if (_this._displayLaserPointer && stateObject.value === 1) {
|
|
|
- if (controller._activePointer) {
|
|
|
- controller._deactivatePointer();
|
|
|
- }
|
|
|
- else {
|
|
|
- controller._activatePointer();
|
|
|
- }
|
|
|
- if (_this.displayGaze) {
|
|
|
- controller._gazeTracker.isVisible = controller._activePointer;
|
|
|
+ if (this.webVROptions.laserToggle) {
|
|
|
+ controller.webVRController.onMainButtonStateChangedObservable.add(function (stateObject) {
|
|
|
+ // Enabling / disabling laserPointer
|
|
|
+ if (_this._displayLaserPointer && stateObject.value === 1) {
|
|
|
+ if (controller._activePointer) {
|
|
|
+ controller._deactivatePointer();
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ controller._activatePointer();
|
|
|
+ }
|
|
|
+ if (_this.displayGaze) {
|
|
|
+ controller._gazeTracker.isVisible = controller._activePointer;
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- });
|
|
|
+ });
|
|
|
+ }
|
|
|
controller.webVRController.onTriggerStateChangedObservable.add(function (stateObject) {
|
|
|
if (!controller._pointerDownOnMeshAsked) {
|
|
|
if (stateObject.value > _this._padSensibilityUp) {
|