Merge pull request #1153 from exokitxr/examples-fix

WebXR examples api update
exokitxr · Jun 1, 2019 · e060111 · e060111
2 parents 2cba31a + d770b5a
commit e060111
Show file tree

Hide file tree

Showing 27 changed files with 59 additions and 90 deletions.
diff --git a/examples/avatar_ml.html b/examples/avatar_ml.html
@@ -620,7 +620,8 @@ <h1>avatar_ml</h1>
             frameOfReferenceType: 'stage',
           });
 
-          const viewport = session.baseLayer.getViewport(frame.views[0]);
+          const {views} = frame.getViewerPose();
+          const viewport = session.baseLayer.getViewport(views[0]);
           const width = viewport.width;
           const height = viewport.height;
 

diff --git a/examples/bow_ml.html b/examples/bow_ml.html
@@ -856,7 +856,8 @@ <h1>bow_ml</h1>
           frameOfReferenceType: 'stage',
         });
 
-        const viewport = session.baseLayer.getViewport(frame.views[0]);
+        const {views} = frame.getViewerPose();
+        const viewport = session.baseLayer.getViewport(views[0]);
         const width = viewport.width;
         const height = viewport.height;
 

diff --git a/examples/browser.html b/examples/browser.html
@@ -429,7 +429,8 @@
           frameOfReferenceType: 'stage',
         });
 
-        const viewport = session.baseLayer.getViewport(frame.views[0]);
+        const {views} = frame.getViewerPose();
+        const viewport = session.baseLayer.getViewport(views[0]);
         const width = viewport.width;
         const height = viewport.height;
 

diff --git a/examples/controllers_xr.html b/examples/controllers_xr.html
@@ -143,7 +143,8 @@ <h1>shooter_ml</h1>
             frameOfReferenceType: 'stage',
           });
 
-          const viewport = session.baseLayer.getViewport(frame.views[0]);
+          const {views} = frame.getViewerPose();
+          const viewport = session.baseLayer.getViewport(views[0]);
           const width = viewport.width;
           const height = viewport.height;
 

diff --git a/examples/exobot.html b/examples/exobot.html
@@ -126,7 +126,8 @@ <h1>exobot</h1>
             frameOfReferenceType: 'stage',
           });
 
-          const viewport = session.baseLayer.getViewport(frame.views[0]);
+          const {views} = frame.getViewerPose();
+          const viewport = session.baseLayer.getViewport(views[0]);
           const width = viewport.width;
           const height = viewport.height;
 

diff --git a/examples/fakeDisplay.js b/examples/fakeDisplay.js
diff --git a/examples/geometry_client.html b/examples/geometry_client.html
@@ -1069,7 +1069,8 @@
         frameOfReferenceType: 'stage',
       });
 
-      const viewport = session.baseLayer.getViewport(frame.views[0]);
+      const {views} = frame.getViewerPose();
+      const viewport = session.baseLayer.getViewport(views[0]);
       const width = viewport.width;
       const height = viewport.height;
 

diff --git a/examples/geometry_ml.html b/examples/geometry_ml.html
@@ -903,7 +903,8 @@
         frameOfReferenceType: 'stage',
       });
 
-      const viewport = session.baseLayer.getViewport(frame.views[0]);
+      const {views} = frame.getViewerPose();
+      const viewport = session.baseLayer.getViewport(views[0]);
       const width = viewport.width;
       const height = viewport.height;
 

diff --git a/examples/graffiti_ml.html b/examples/graffiti_ml.html
@@ -493,7 +493,8 @@ <h1>graffiti_ml</h1>
         frameOfReferenceType: 'stage',
       });
 
-      const viewport = session.baseLayer.getViewport(frame.views[0]);
+      const {views} = frame.getViewerPose();
+      const viewport = session.baseLayer.getViewport(views[0]);
       const width = viewport.width;
       const height = viewport.height;
 

diff --git a/examples/hands_ml.html b/examples/hands_ml.html
@@ -338,7 +338,8 @@ <h1>hands_ml.html example</h1>
             frameOfReferenceType: 'stage',
           });
 
-          const viewport = session.baseLayer.getViewport(frame.views[0]);
+          const {views} = frame.getViewerPose();
+          const viewport = session.baseLayer.getViewport(views[0]);
           const width = viewport.width;
           const height = viewport.height;
 

diff --git a/examples/hello_ml.html b/examples/hello_ml.html
@@ -483,7 +483,8 @@ <h1>hello_ml</h1>
             frameOfReferenceType: 'stage',
           });
 
-          const viewport = session.baseLayer.getViewport(frame.views[0]);
+          const {views} = frame.getViewerPose();
+          const viewport = session.baseLayer.getViewport(views[0]);
           const width = viewport.width;
           const height = viewport.height;
 

diff --git a/examples/hello_xr.html b/examples/hello_xr.html
@@ -126,7 +126,8 @@
             frameOfReferenceType: 'stage',
           });
 
-          const viewport = session.baseLayer.getViewport(frame.views[0]);
+          const {views} = frame.getViewerPose();
+          const viewport = session.baseLayer.getViewport(views[0]);
           const width = viewport.width;
           const height = viewport.height;
           renderer.setSize(width * 2, height);

diff --git a/examples/imagetracking_ml.html b/examples/imagetracking_ml.html
@@ -273,7 +273,8 @@ <h1>imagetracking_ml</h1>
             frameOfReferenceType: 'stage',
           });
 
-          const viewport = session.baseLayer.getViewport(frame.views[0]);
+          const {views} = frame.getViewerPose();
+          const viewport = session.baseLayer.getViewport(views[0]);
           const width = viewport.width;
           const height = viewport.height;
 

diff --git a/examples/meshing_ml.html b/examples/meshing_ml.html
@@ -324,7 +324,8 @@ <h1>meshing_ml</h1>
             frameOfReferenceType: 'stage',
           });
 
-          const viewport = session.baseLayer.getViewport(frame.views[0]);
+          const {views} = frame.getViewerPose();
+          const viewport = session.baseLayer.getViewport(views[0]);
           const width = viewport.width;
           const height = viewport.height;
 

diff --git a/examples/meshing_raw_ml.html b/examples/meshing_raw_ml.html
@@ -260,7 +260,8 @@
             frameOfReferenceType: 'stage',
           });
 
-          const viewport = session.baseLayer.getViewport(frame.views[0]);
+          const {views} = frame.getViewerPose();
+          const viewport = session.baseLayer.getViewport(views[0]);
           const width = viewport.width;
           const height = viewport.height;
 

diff --git a/examples/microphone.html b/examples/microphone.html
@@ -241,7 +241,8 @@ <h1>microphone</h1>
             frameOfReferenceType: 'stage',
           });
 
-          const viewport = session.baseLayer.getViewport(frame.views[0]);
+          const {views} = frame.getViewerPose();
+          const viewport = session.baseLayer.getViewport(views[0]);
           const width = viewport.width;
           const height = viewport.height;
 

diff --git a/examples/minimap_ml.html b/examples/minimap_ml.html
@@ -454,7 +454,8 @@ <h1>minimap_ml</h1>
               frameOfReferenceType: 'stage',
             });
 
-            const viewport = session.baseLayer.getViewport(frame.views[0]);
+            const {views} = frame.getViewerPose();
+            const viewport = session.baseLayer.getViewport(views[0]);
             const width = viewport.width;
             const height = viewport.height;
 

diff --git a/examples/paint_ml.html b/examples/paint_ml.html
@@ -436,7 +436,8 @@ <h1>paint_ml</h1>
         frameOfReferenceType: 'stage',
       });
 
-      const viewport = session.baseLayer.getViewport(frame.views[0]);
+      const {views} = frame.getViewerPose();
+      const viewport = session.baseLayer.getViewport(views[0]);
       const width = viewport.width;
       const height = viewport.height;
 

diff --git a/examples/pathfinding_ml.html b/examples/pathfinding_ml.html
@@ -566,7 +566,8 @@ <h1>pathfinding_ml</h1>
             frameOfReferenceType: 'stage',
           });
 
-          const viewport = session.baseLayer.getViewport(frame.views[0]);
+          const {views} = frame.getViewerPose();
+          const viewport = session.baseLayer.getViewport(views[0]);
           const width = viewport.width;
           const height = viewport.height;
 

diff --git a/examples/planes_ml.html b/examples/planes_ml.html
@@ -299,7 +299,8 @@ <h1>planes_ml</h1>
             frameOfReferenceType: 'stage',
           });
 
-          const viewport = session.baseLayer.getViewport(frame.views[0]);
+          const {views} = frame.getViewerPose();
+          const viewport = session.baseLayer.getViewport(views[0]);
           const width = viewport.width;
           const height = viewport.height;
 

diff --git a/examples/radar_ml.html b/examples/radar_ml.html
@@ -276,7 +276,8 @@ <h1>radar_ml</h1>
             frameOfReferenceType: 'stage',
           });
 
-          const viewport = session.baseLayer.getViewport(frame.views[0]);
+          const {views} = frame.getViewerPose();
+          const viewport = session.baseLayer.getViewport(views[0]);
           const width = viewport.width;
           const height = viewport.height;
 

diff --git a/examples/realitytab.html b/examples/realitytab.html
@@ -82,13 +82,14 @@
           frameOfReferenceType: 'stage',
         });
 
-        const viewport = session.baseLayer.getViewport(frame.views[0]);
+        const {views} = frame.getViewerPose();
+        const viewport = session.baseLayer.getViewport(views[0]);
         // const width = viewport.width;
         const height = viewport.height;
         const fullWidth = (() => {
           let result = 0;
-          for (let i = 0; i < frame.views.length; i++) {
-            result += session.baseLayer.getViewport(frame.views[i]).width;
+          for (let i = 0; i < views.length; i++) {
+            result += session.baseLayer.getViewport(views[i]).width;
           }
           return result;
         })();

diff --git a/examples/realitytabs.html b/examples/realitytabs.html
@@ -1687,7 +1687,9 @@
 const moves = [null, null];
 
 window.addEventListener('click', () => {
-  renderer.domElement.requestPointerLock();
+  if (fakeXrDisplay) {
+    renderer.domElement.requestPointerLock();
+  }
 });
 window.addEventListener('mousedown', e => {
   if (window.document.pointerLockElement) {
@@ -2728,12 +2730,13 @@
             frameOfReferenceType: 'stage',
           });
 
-          const viewport = session.renderState.baseLayer.getViewport(frame.views[0]);
+          const {views} = frame.getViewerPose();
+          const viewport = session.renderState.baseLayer.getViewport(views[0]);
           const height = viewport.height;
           const fullWidth = (() => {
             let result = 0;
-            for (let i = 0; i < frame.views.length; i++) {
-              result += session.renderState.baseLayer.getViewport(frame.views[i]).width;
+            for (let i = 0; i < views.length; i++) {
+              result += session.renderState.baseLayer.getViewport(views[i]).width;
             }
             return result;
           })();

diff --git a/examples/shooter_ml.html b/examples/shooter_ml.html
@@ -309,7 +309,8 @@ <h1>shooter_ml</h1>
             frameOfReferenceType: 'stage',
           });
 
-          const viewport = session.baseLayer.getViewport(frame.views[0]);
+          const {views} = frame.getViewerPose();
+          const viewport = session.baseLayer.getViewport(views[0]);
           const width = viewport.width;
           const height = viewport.height;
 

diff --git a/examples/sword_ml.html b/examples/sword_ml.html
@@ -268,7 +268,8 @@ <h1>sword_ml</h1>
             frameOfReferenceType: 'stage',
           });
 
-          const viewport = session.baseLayer.getViewport(frame.views[0]);
+          const {views} = frame.getViewerPose();
+          const viewport = session.baseLayer.getViewport(views[0]);
           const width = viewport.width;
           const height = viewport.height;
 

diff --git a/examples/text.html b/examples/text.html
@@ -152,7 +152,8 @@
           frameOfReferenceType: 'stage',
         });
 
-        const viewport = session.baseLayer.getViewport(frame.views[0]);
+        const {views} = frame.getViewerPose();
+        const viewport = session.baseLayer.getViewport(views[0]);
         const width = viewport.width;
         const height = viewport.height;
 

diff --git a/examples/trackers.html b/examples/trackers.html
@@ -93,7 +93,8 @@
             frameOfReferenceType: 'stage',
           });
 
-          const viewport = session.baseLayer.getViewport(frame.views[0]);
+          const {views} = frame.getViewerPose();
+          const viewport = session.baseLayer.getViewport(views[0]);
           const width = viewport.width;
           const height = viewport.height;
           renderer.setSize(width * 2, height);