Merge pull request #11005 from PolygonalSun/PolygonalSun/safari-context

Fixed Context code to omit Safari
BabylonJS · Sep 8, 2021 · 3cc0378 · 3cc0378
2 parents 56e5fa7 + dd0dd70
commit 3cc0378
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/Cameras/Inputs/BaseCameraPointersInput.ts b/src/Cameras/Inputs/BaseCameraPointersInput.ts
@@ -33,6 +33,7 @@ export abstract class BaseCameraPointersInput implements ICameraInput<Camera> {
     protected _buttonsPressed: number;
 
     private _currentActiveButton: number = -1;
+    private _usingSafari = Tools.IsSafari();
 
     /**
      * Defines the buttons associated with the input to handle camera move.
@@ -64,6 +65,7 @@ export abstract class BaseCameraPointersInput implements ICameraInput<Camera> {
         this._pointerInput = (p, s) => {
             var evt = <IPointerEvent>p.event;
             let isTouch = evt.pointerType === "touch";
+            let ignoreContext = isTouch || this._usingSafari;
 
             if (engine.isInVRExclusivePointerMode) {
                 return;
@@ -131,7 +133,7 @@ export abstract class BaseCameraPointersInput implements ICameraInput<Camera> {
                 }
             } else if (p.type === PointerEventTypes.POINTERDOUBLETAP) {
                 this.onDoubleTap(evt.pointerType);
-            } else if (p.type === PointerEventTypes.POINTERUP && srcElement) {
+            } else if (srcElement && (p.type === PointerEventTypes.POINTERUP || (p.type === PointerEventTypes.POINTERMOVE && p.event.button === this._currentActiveButton && this._currentActiveButton !== -1 && !ignoreContext))) {
                 try {
                     srcElement.releasePointerCapture(evt.pointerId);
                 } catch (e) {

diff --git a/src/Cameras/Inputs/freeCameraMouseInput.ts b/src/Cameras/Inputs/freeCameraMouseInput.ts
@@ -44,6 +44,7 @@ export class FreeCameraMouseInput implements ICameraInput<FreeCamera> {
     public _allowCameraRotation = true;
 
     private _currentActiveButton: number = -1;
+    private _usingSafari = Tools.IsSafari();
 
     /**
      * Manage the mouse inputs to control the movement of a free camera.
@@ -109,7 +110,7 @@ export class FreeCameraMouseInput implements ICameraInput<FreeCamera> {
                     if (engine.isPointerLock && this._onMouseMove) {
                         this._onMouseMove(p.event);
                     }
-                } else if (p.type === PointerEventTypes.POINTERUP && srcElement) {
+                } else if (srcElement && (p.type === PointerEventTypes.POINTERUP || (p.type === PointerEventTypes.POINTERMOVE && p.event.button === this._currentActiveButton && this._currentActiveButton !== -1 && !this._usingSafari))) {
                     try {
                         srcElement.releasePointerCapture(evt.pointerId);
                     } catch (e) {