fix(ViewService): Workaround for webvr polyfill behavior when using m…

…ultiple layers Changed _webvrRequestPresentHMD to pass only a single layer to vrDisplay.requestPresent
argonjs · Apr 27, 2017 · 7044f57 · 7044f57
1 parent 84661e8
commit 7044f57
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 11 deletions.
diff --git a/dist/argon.core.js b/dist/argon.core.js
@@ -18086,6 +18086,7 @@ $__System.register('1', ['2', '3', '3d', '4', '9', '10', 'a', '1d', '35', '2d',
                      * Automatically publish the viewport of the element during PresentationMode.EMBEDDED
                      */
                     this.autoPublishEmbeddedMode = true;
+                    this._layers = [];
                     this._subviews = [];
                     this._subviewPose = [];
                     this._subviewFrustum = [];
@@ -18318,7 +18319,7 @@ $__System.register('1', ['2', '3', '3d', '4', '9', '10', 'a', '1d', '35', '2d',
                 ViewService.prototype._updateViewport = function (viewport) {
                     var _this = this;
                     var viewportJSON = JSON.stringify(viewport);
-                    if (this.layers && this.autoStyleLayerElements) {
+                    if (this._layers.length && this.autoStyleLayerElements) {
                         requestAnimationFrame(function () {
                             var zIndex = -_this._layers.length;
                             for (var _i = 0, _a = _this._layers; _i < _a.length; _i++) {
@@ -18914,7 +18915,9 @@ $__System.register('1', ['2', '3', '3d', '4', '9', '10', 'a', '1d', '35', '2d',
                 DeviceService.prototype._webvrRequestPresentHMD = function () {
                     if (this._vrDisplay) {
                         var element = this.viewService.element;
-                        var layers = this.viewService.layers || [{ source: element.querySelector('canvas') || element.lastElementChild }];
+                        var layers = [{
+                            source: this.viewService.layers[0] && this.viewService.layers[0].source || element.querySelector('canvas') || element.lastElementChild
+                        }];
                         return this._vrDisplay.requestPresent(layers).catch(function (e) {
                             throw e;
                         });

diff --git a/dist/argon.js b/dist/argon.js
@@ -23666,6 +23666,7 @@ $__System.register('1', ['2', '3', '3d', '4', '9', '10', 'a', '1d', '35', '2d',
                      * Automatically publish the viewport of the element during PresentationMode.EMBEDDED
                      */
                     this.autoPublishEmbeddedMode = true;
+                    this._layers = [];
                     this._subviews = [];
                     this._subviewPose = [];
                     this._subviewFrustum = [];
@@ -23898,7 +23899,7 @@ $__System.register('1', ['2', '3', '3d', '4', '9', '10', 'a', '1d', '35', '2d',
                 ViewService.prototype._updateViewport = function (viewport) {
                     var _this = this;
                     var viewportJSON = JSON.stringify(viewport);
-                    if (this.layers && this.autoStyleLayerElements) {
+                    if (this._layers.length && this.autoStyleLayerElements) {
                         requestAnimationFrame(function () {
                             var zIndex = -_this._layers.length;
                             for (var _i = 0, _a = _this._layers; _i < _a.length; _i++) {
@@ -24494,7 +24495,9 @@ $__System.register('1', ['2', '3', '3d', '4', '9', '10', 'a', '1d', '35', '2d',
                 DeviceService.prototype._webvrRequestPresentHMD = function () {
                     if (this._vrDisplay) {
                         var element = this.viewService.element;
-                        var layers = this.viewService.layers || [{ source: element.querySelector('canvas') || element.lastElementChild }];
+                        var layers = [{
+                            source: this.viewService.layers[0] && this.viewService.layers[0].source || element.querySelector('canvas') || element.lastElementChild
+                        }];
                         return this._vrDisplay.requestPresent(layers).catch(function (e) {
                             throw e;
                         });

diff --git a/dist/argon.min.js b/dist/argon.min.js
diff --git a/src/device.ts b/src/device.ts
@@ -564,8 +564,12 @@ export class DeviceService {
         if (this._vrDisplay) {
             const element = this.viewService.element;
             const layers:VRLayer&{}[] = 
-                this.viewService.layers ||
-                [{source:element.querySelector('canvas') || <HTMLCanvasElement>element.lastElementChild}];
+                [{
+                    source:
+                        this.viewService.layers[0] && this.viewService.layers[0].source || 
+                        element.querySelector('canvas') || 
+                        <HTMLCanvasElement>element.lastElementChild
+                }];
             return this._vrDisplay.requestPresent(layers).catch((e)=>{
                 throw e;
             });

diff --git a/src/view.ts b/src/view.ts
@@ -212,7 +212,7 @@ export class ViewService {
         });
     }
 
-    private _layers:{source:HTMLElement}[]
+    private _layers:{source:HTMLElement}[] = [];
 
     public setLayers(layers:{source:HTMLElement}[]) {
         if (this._layers) { 
@@ -337,8 +337,8 @@ export class ViewService {
     // Updates the element, if necessary, and raise a view change event
     private _updateViewport(viewport:CanvasViewport) {
         const viewportJSON = JSON.stringify(viewport);
-
-        if (this.layers && this.autoStyleLayerElements) {
+        
+        if (this._layers.length && this.autoStyleLayerElements) {
             requestAnimationFrame(() => {
                 let zIndex = -this._layers.length;
                 for (const layer of this._layers) {