Listen to vrdisplayconnect/vrdisplaydisconnect to enter/exit VR when a headset is plugged/unplugged (#2900)

t push -f dmarcos# Date:      Tue Jul 25 17:49:24 2017 -0700

Author: dmarcos

src/core/scene/a-scene.js

@@ -117,11 +117,22 @@ module.exports.AScene = registerElement('a-scene', {
         this.onVRPresentChangeBound = bind(this.onVRPresentChange, this);
         window.addEventListener('vrdisplaypresentchange', this.onVRPresentChangeBound);
 
+        // bind functions
+        this.enterVRBound = function () { self.enterVR(); };
+        this.exitVRBound = function () { self.exitVR(); };
+        this.exitVRTrueBound = function () { self.exitVR(true); };
+
         // Enter VR on `vrdisplayactivate` (e.g. putting on Rift headset).
-        window.addEventListener('vrdisplayactivate', function () { self.enterVR(); });
+        window.addEventListener('vrdisplayactivate', this.enterVRBound);
 
         // Exit VR on `vrdisplaydeactivate` (e.g. taking off Rift headset).
-        window.addEventListener('vrdisplaydeactivate', function () { self.exitVR(); });
+        window.addEventListener('vrdisplaydeactivate', this.exitVRBound);
+
+        // Enter VR on `vrdisplayconnect` (e.g. plugging on Rift headset).
+        window.addEventListener('vrdisplayconnect', this.enterVRBound);
+
+        // Exit VR on `vrdisplaydisconnect` (e.g. unplugging Rift headset).
+        window.addEventListener('vrdisplaydisconnect', this.exitVRTrueBound);
       },
       writable: window.debug
     },
@@ -165,6 +176,10 @@ module.exports.AScene = registerElement('a-scene', {
         scenes.splice(sceneIndex, 1);
 
         window.removeEventListener('vrdisplaypresentchange', this.onVRPresentChangeBound);
+        window.removeEventListener('vrdisplayactivate', this.enterVRBound);
+        window.removeEventListener('vrdisplaydeactivate', this.exitVRBound);
+        window.removeEventListener('vrdisplayconnect', this.enterVRBound);
+        window.removeEventListener('vrdisplaydisconnect', this.exitVRTrueBound);
       }
     },
 
@@ -249,7 +264,8 @@ module.exports.AScene = registerElement('a-scene', {
             throw new Error('Failed to enter VR mode (`requestPresent`).');
           }
         }
-      }
+      },
+      writable: window.debug
     },
      /**
      * Call `exitPresent` if WebVR or WebVR polyfill.
@@ -298,7 +314,8 @@ module.exports.AScene = registerElement('a-scene', {
             throw new Error('Failed to exit VR mode (`exitPresent`).');
           }
         }
-      }
+      },
+      writable: window.debug
     },
 
     /**

tests/core/scene/a-scene.test.js

@@ -60,6 +60,36 @@ suite('a-scene (without renderer)', function () {
     });
   });
 
+  suite('vrdisplayconnect', function () {
+    test('tells A-Frame about entering VR when the headset is connected', function (done) {
+      var event;
+      var sceneEl = this.el;
+      var enterVRStub = this.sinon.stub(sceneEl, 'enterVR');
+      sceneEl.effect = {requestPresent: function () { return Promise.resolve(); }};
+      event = new CustomEvent('vrdisplayconnect');
+      window.dispatchEvent(event);
+      process.nextTick(function () {
+        assert.ok(enterVRStub.called);
+        done();
+      });
+    });
+  });
+
+  suite('vrdisplaydisconnect', function () {
+    test('tells A-Frame about entering VR when the headset is disconnected', function (done) {
+      var event;
+      var sceneEl = this.el;
+      var exitVRStub = this.sinon.stub(sceneEl, 'exitVR');
+      sceneEl.effect = {requestPresent: function () { return Promise.resolve(); }};
+      event = new CustomEvent('vrdisplaydisconnect');
+      window.dispatchEvent(event);
+      process.nextTick(function () {
+        assert.ok(exitVRStub.calledWith(true));
+        done();
+      });
+    });
+  });
+
   suite('vrdisplaypresentchange', function () {
     test('tells A-Frame about entering VR if now presenting', function (done) {
       var event;