-- Leo's gemini proxy

-- Connecting to git.thebackupbox.net:1965...

-- Connected

-- Sending request

-- Meta line: 20 text/gemini

repo: janusweb
action: commit
revision:
path_from:
revision_from: 240c3eaefa2bdceeee05926e8542fe84c689419a:
path_to:
revision_to:

commit 240c3eaefa2bdceeee05926e8542fe84c689419a
Author: James Baicoianu <james_github@baicoianu.com>
Date:   Sun Jan 22 00:37:23 2017 -0800

    Handle "Enter VR" button more reliably

diff --git a/scripts/janusplayer.js b/scripts/janusplayer.js

--- a/scripts/janusplayer.js
+++ b/scripts/janusplayer.js
@@ -79,15 +79,7 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
       elation.events.add(this.engine.client.container, 'mousedown', elation.bind(this, this.updateMouseStatus));
       elation.events.add(this.engine.client.container, 'mouseup', elation.bind(this, this.updateMouseStatus));

-      if (navigator.getVRDisplays) {
-        this.vrbutton = elation.ui.button({classname: 'janusweb_vr', label: 'Enter VR'});
-        this.engine.client.buttons.add('vr', this.vrbutton);
-        elation.events.add(this.vrbutton, 'ui_button_click', elation.bind(this, function(ev) { this.engine.client.toggleVR(ev); }));
-        elation.events.add(this.engine.client.view, elation.bind(this, function(ev) {
-          var vrdisplay = ev.data;
-          elation.events.add(ev.data, 'vrdisplaypresentchange', elation.bind(this, function() { this.vrbutton.label = (vrdisplay && vrdisplay.isPresenting ? 'Exit' : 'Enter') + ' VR'; }));
-        }));
-      }
+      this.updateVRButton();
     }
     this.createChildren = function() {
       elation.engine.things.janusplayer.extendclass.createChildren.call(this);
@@ -110,6 +102,19 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
       this.engine.systems.controls.deactivateContext('janusplayer');
       elation.engine.things.janusplayer.extendclass.disable.call(this);
     }
+    this.updateVRButton = function() {
+      if (this.engine.client.view.vrdisplay) {
+        if (!this.vrbutton) {
+          this.vrbutton = elation.ui.button({classname: 'janusweb_vr', label: 'Enter VR'});
+          this.engine.client.buttons.add('vr', this.vrbutton);
+          elation.events.add(this.vrbutton, 'ui_button_click', elation.bind(this, function(ev) { this.engine.client.toggleVR(ev); }));
+          elation.events.add(this.engine.client.view, elation.bind(this, function(ev) {
+            var vrdisplay = ev.data;
+            elation.events.add(ev.data, 'vrdisplaypresentchange', elation.bind(this, function() { this.vrbutton.label = (vrdisplay && vrdisplay.isPresenting ? 'Exit' : 'Enter') + ' VR'; }));
+          }));
+        }
+      }
+    }
     this.activateVOIP = function(ev) {
       var on = (ev.value == 1);
       if (on) {
@@ -118,6 +123,12 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
         this.voip.stop();
       }
     }
+    this.updateHMD = function(vrdevice) {
+      if (vrdevice && !this.vrbutton) {
+        this.updateVRButton();
+      }
+      elation.engine.things.janusplayer.extendclass.updateHMD.call(this, vrdevice);
+    }
     this.handleVOIPStart = function() {
       this.voipbutton.addclass('state_recording');
       elation.events.fire('janusvr_voip_start');

-- Response ended

-- Page fetched on Sun Jun 2 15:16:46 2024