Skip to content

Commit 059cee8

Browse files
committed
Ugly hack to fix WebXR Viewer viewports on iOS
1 parent 63c3360 commit 059cee8

File tree

6 files changed

+6
-5
lines changed

6 files changed

+6
-5
lines changed

Build/webxr.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -902,7 +902,7 @@
902902
leftRect.w = (viewport.width / glLayer.framebufferWidth) * (glLayer.framebufferWidth / this.canvas.width);
903903
leftRect.h = (viewport.height / glLayer.framebufferHeight) * (glLayer.framebufferHeight / this.canvas.height);
904904
}
905-
} else if (view.eye === 'right') {
905+
} else if (view.eye === 'right' && viewport.width != 0 && viewport.height != 0) {
906906
eyeCount = 2;
907907
if (viewport) {
908908
rightRect.x = (viewport.x / glLayer.framebufferWidth) * (glLayer.framebufferWidth / this.canvas.width);

Packages/webxr/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111
### Fixed
1212
- OnDisable in WebXRController.
1313
- Depth and Stencil clear issue in Handheld AR.
14+
- Ugly hack to fix WebXR Viewer viewports on iOS.
1415

1516
## [0.5.1] - 2020-12-26
1617
### Fixed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -902,7 +902,7 @@
902902
leftRect.w = (viewport.width / glLayer.framebufferWidth) * (glLayer.framebufferWidth / this.canvas.width);
903903
leftRect.h = (viewport.height / glLayer.framebufferHeight) * (glLayer.framebufferHeight / this.canvas.height);
904904
}
905-
} else if (view.eye === 'right') {
905+
} else if (view.eye === 'right' && viewport.width != 0 && viewport.height != 0) {
906906
eyeCount = 2;
907907
if (viewport) {
908908
rightRect.x = (viewport.x / glLayer.framebufferWidth) * (glLayer.framebufferWidth / this.canvas.width);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -902,7 +902,7 @@
902902
leftRect.w = (viewport.width / glLayer.framebufferWidth) * (glLayer.framebufferWidth / this.canvas.width);
903903
leftRect.h = (viewport.height / glLayer.framebufferHeight) * (glLayer.framebufferHeight / this.canvas.height);
904904
}
905-
} else if (view.eye === 'right') {
905+
} else if (view.eye === 'right' && viewport.width != 0 && viewport.height != 0) {
906906
eyeCount = 2;
907907
if (viewport) {
908908
rightRect.x = (viewport.x / glLayer.framebufferWidth) * (glLayer.framebufferWidth / this.canvas.width);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -902,7 +902,7 @@
902902
leftRect.w = (viewport.width / glLayer.framebufferWidth) * (glLayer.framebufferWidth / this.canvas.width);
903903
leftRect.h = (viewport.height / glLayer.framebufferHeight) * (glLayer.framebufferHeight / this.canvas.height);
904904
}
905-
} else if (view.eye === 'right') {
905+
} else if (view.eye === 'right' && viewport.width != 0 && viewport.height != 0) {
906906
eyeCount = 2;
907907
if (viewport) {
908908
rightRect.x = (viewport.x / glLayer.framebufferWidth) * (glLayer.framebufferWidth / this.canvas.width);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -902,7 +902,7 @@
902902
leftRect.w = (viewport.width / glLayer.framebufferWidth) * (glLayer.framebufferWidth / this.canvas.width);
903903
leftRect.h = (viewport.height / glLayer.framebufferHeight) * (glLayer.framebufferHeight / this.canvas.height);
904904
}
905-
} else if (view.eye === 'right') {
905+
} else if (view.eye === 'right' && viewport.width != 0 && viewport.height != 0) {
906906
eyeCount = 2;
907907
if (viewport) {
908908
rightRect.x = (viewport.x / glLayer.framebufferWidth) * (glLayer.framebufferWidth / this.canvas.width);

0 commit comments

Comments
 (0)