Merge pull request #72 from De-Panther/remove_old_ar_hack

Removed old AR Overlay hack

Author: De-Panther

Build/webxr.js

@@ -134,7 +134,6 @@
     this.isARSupported = false;
     this.isVRSupported = false;
     this.onInputEvent = null;
-    this.waitingHandheldARHack = false;
     this.BrowserObject = null;
     this.JSEventsObject = null;
     this.init();
@@ -186,32 +185,15 @@
 
   XRManager.prototype.onRequestARSession = function () {
     if (!this.isARSupported) return;
-    // The window on Chrome for Android lose focus when asking permissions.
-    // A popup is opened and the Canvas is painted with the last frame.
-    // We want to make sure that the Canvas is transparent when entering Handheld AR Session.
-    this.waitingHandheldARHack = true;
-    var thisXRMananger = this;
-    var tempRender = function () {
-      thisXRMananger.ctx.clearColor(0, 0, 0, 0);
-      thisXRMananger.ctx.clear(thisXRMananger.ctx.COLOR_BUFFER_BIT | thisXRMananger.ctx.DEPTH_BUFFER_BIT);
-      if (thisXRMananger.waitingHandheldARHack)
-      {
-        window.requestAnimationFrame( tempRender );
-      }
-    }
-    window.requestAnimationFrame( tempRender );
     navigator.xr.requestSession('immersive-ar', {
       requiredFeatures: ['local-floor'], // TODO: Get this value from Unity
       optionalFeatures: ['hand-tracking', 'hit-test']
     }).then(async (session) => {
-      this.waitingHandheldARHack = false;
       session.isImmersive = true;
       session.isInSession = true;
       session.isAR = true;
       this.xrSession = session;
       this.onSessionStarted(session);
-    }).catch((error) => {
-      thisXRMananger.waitingHandheldARHack = false;
     });
   }
 
@@ -422,9 +404,7 @@
             func(time);
           });
         } else {
-          if (!thisXRMananger.waitingHandheldARHack) {
-            window.requestAnimationFrame(func);
-          }
+          window.requestAnimationFrame(func);
         }
       };
 

Packages/webxr/Hidden~/WebGLTemplates/WebXR/webxr.js

@@ -134,7 +134,6 @@
     this.isARSupported = false;
     this.isVRSupported = false;
     this.onInputEvent = null;
-    this.waitingHandheldARHack = false;
     this.BrowserObject = null;
     this.JSEventsObject = null;
     this.init();
@@ -186,32 +185,15 @@
 
   XRManager.prototype.onRequestARSession = function () {
     if (!this.isARSupported) return;
-    // The window on Chrome for Android lose focus when asking permissions.
-    // A popup is opened and the Canvas is painted with the last frame.
-    // We want to make sure that the Canvas is transparent when entering Handheld AR Session.
-    this.waitingHandheldARHack = true;
-    var thisXRMananger = this;
-    var tempRender = function () {
-      thisXRMananger.ctx.clearColor(0, 0, 0, 0);
-      thisXRMananger.ctx.clear(thisXRMananger.ctx.COLOR_BUFFER_BIT | thisXRMananger.ctx.DEPTH_BUFFER_BIT);
-      if (thisXRMananger.waitingHandheldARHack)
-      {
-        window.requestAnimationFrame( tempRender );
-      }
-    }
-    window.requestAnimationFrame( tempRender );
     navigator.xr.requestSession('immersive-ar', {
       requiredFeatures: ['local-floor'], // TODO: Get this value from Unity
       optionalFeatures: ['hand-tracking', 'hit-test']
     }).then(async (session) => {
-      this.waitingHandheldARHack = false;
       session.isImmersive = true;
       session.isInSession = true;
       session.isAR = true;
       this.xrSession = session;
       this.onSessionStarted(session);
-    }).catch((error) => {
-      thisXRMananger.waitingHandheldARHack = false;
     });
   }
 
@@ -422,9 +404,7 @@
             func(time);
           });
         } else {
-          if (!thisXRMananger.waitingHandheldARHack) {
-            window.requestAnimationFrame(func);
-          }
+          window.requestAnimationFrame(func);
         }
       };
 

Packages/webxr/Hidden~/WebGLTemplates/WebXRFullView/webxr.js

@@ -134,7 +134,6 @@
     this.isARSupported = false;
     this.isVRSupported = false;
     this.onInputEvent = null;
-    this.waitingHandheldARHack = false;
     this.BrowserObject = null;
     this.JSEventsObject = null;
     this.init();
@@ -186,32 +185,15 @@
 
   XRManager.prototype.onRequestARSession = function () {
     if (!this.isARSupported) return;
-    // The window on Chrome for Android lose focus when asking permissions.
-    // A popup is opened and the Canvas is painted with the last frame.
-    // We want to make sure that the Canvas is transparent when entering Handheld AR Session.
-    this.waitingHandheldARHack = true;
-    var thisXRMananger = this;
-    var tempRender = function () {
-      thisXRMananger.ctx.clearColor(0, 0, 0, 0);
-      thisXRMananger.ctx.clear(thisXRMananger.ctx.COLOR_BUFFER_BIT | thisXRMananger.ctx.DEPTH_BUFFER_BIT);
-      if (thisXRMananger.waitingHandheldARHack)
-      {
-        window.requestAnimationFrame( tempRender );
-      }
-    }
-    window.requestAnimationFrame( tempRender );
     navigator.xr.requestSession('immersive-ar', {
       requiredFeatures: ['local-floor'], // TODO: Get this value from Unity
       optionalFeatures: ['hand-tracking', 'hit-test']
     }).then(async (session) => {
-      this.waitingHandheldARHack = false;
       session.isImmersive = true;
       session.isInSession = true;
       session.isAR = true;
       this.xrSession = session;
       this.onSessionStarted(session);
-    }).catch((error) => {
-      thisXRMananger.waitingHandheldARHack = false;
     });
   }
 
@@ -422,9 +404,7 @@
             func(time);
           });
         } else {
-          if (!thisXRMananger.waitingHandheldARHack) {
-            window.requestAnimationFrame(func);
-          }
+          window.requestAnimationFrame(func);
         }
       };