Merge pull request #144 from delapuente/issue-124-add-toggle-vr-key

Adding a key for quick VR/normal toggle

Author: delapuente

Assets/WebGLTemplates/WebVR/webvr.js

@@ -20,6 +20,7 @@
   var sitStand = mat4.create();
   var gamepads = [];
   var vrGamepads = [];
+  var toggleVRKeyName = '';
 
   if ('serviceWorker' in navigator && 'isSecureContext' in window && !window.isSecureContext) {
     console.warn('The site is insecure; Service Workers will not work and the site will not be recognized as a PWA');
@@ -63,6 +64,11 @@
         vrDisplay.requestAnimationFrame(onAnimate);
       }
     }
+
+    // Handle quick VR/normal toggling.
+    if (msg.detail.indexOf('ConfigureToggleVRKeyName') === 0) {
+      toggleVRKeyName = msg.detail.split(':')[1];
+    }
   }
 
   function onToggleVR() {
@@ -317,13 +323,20 @@
     });
   }
 
+  function onKeyUp(evt) {
+    if (toggleVRKeyName && toggleVRKeyName === evt.key) {
+      onToggleVR();
+    }
+  }
+
   // Monkeypatch `rAF` so that we can render at the VR display's framerate.
   window.requestAnimationFrame = onRequestAnimationFrame;
 
   window.addEventListener('resize', onResize, true);
   window.addEventListener('vrdisplaypresentchange', onResize, false);
   window.addEventListener('vrdisplayactivate', onRequestPresent, false);
   window.addEventListener('vrdisplaydeactivate', onExitPresent, false);
+  window.addEventListener('keyup', onKeyUp, false);
   document.addEventListener('UnityLoaded', onUnityLoaded, false);
   document.addEventListener('Unity', onUnity);
   entervrButton.addEventListener('click', onToggleVR, false);

Assets/WebVR/Models/Materials.meta

@@ -10,5 +10,9 @@ mergeInto(LibraryManager.library, {
 
   PostRender: function () {
     document.dispatchEvent(new CustomEvent('Unity', {detail: 'PostRender'}));
+  },
+
+  ConfigureToggleVRKeyName: function (keyName) {
+    document.dispatchEvent(new CustomEvent('Unity', {detail: 'ConfigureToggleVRKeyName:' + Pointer_stringify(keyName)}));
   }
 });

Assets/WebVR/Plugins/WebGL/webvr.jslib

@@ -284,8 +284,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 2330d5cea21bb564e97ad081f15487d9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  leftHandObj: {fileID: 0}
-  rightHandObj: {fileID: 0}
+  leftHandObject: {fileID: 0}
+  rightHandObject: {fileID: 0}
+  toggleVRKeyName: v
 --- !u!124 &124144808855090856
 Behaviour:
   m_ObjectHideFlags: 1