Merge pull request #45 from brianpeiris/fix-firefox-aquarium

Fix aquarium in Firefox. Only enable multiview when VR is supported

Author: toji

aquarium/aquarium.js

@@ -60,6 +60,7 @@ var g_putCount = 0;
 
 var g_frameData;
 var g_vrUi;
+var g_vrSupported = false;
 
 var g_multiviewFb;        // multiview framebuffer.
 var g_multiviewViewFb;    // single views inside the multiview framebuffer.
@@ -536,7 +537,7 @@ function createProgramFromTags(
 
   var vs = getScriptText(vertexTagId);
 
-  if (multiview) {
+  if (g_vrSupported && multiview) {
     // Replace shader code to get ESSL3 shader code and enable multiview (huge hack, do not do this at home kids)
 
     var vsPrefix = ["#version 300 es"];
@@ -991,7 +992,7 @@ function initialize() {
   });
 
   var particleSystem = new tdl.particles.ParticleSystem(
-      gl, null, math.pseudoRandom);
+      gl, null, math.pseudoRandom, g_vrSupported);
   setupBubbles(particleSystem);
   var bubbleTimer = 0;
   var bubbleIndex = 0;
@@ -2273,6 +2274,7 @@ $(function(){
             vrButton = addButton("Enter VR", "E", vrButtonURL, onRequestPresent);
             g_vrUi = new Ui(gl, g_numFish);
             g_vrUi.load("./vr_assets/ui/config.js");
+            g_vrSupported = true;
           }
         });
         navigator.xr.addEventListener('devicechange', onDeviceChange);

tdl/particles.js

@@ -275,7 +275,8 @@ tdl.particles.CORNERS_ = [
  */
 tdl.particles.ParticleSystem = function(gl,
                                           opt_clock,
-                                          opt_randomFunction) {
+                                          opt_randomFunction,
+                                          opt_vrSupported) {
   this.gl = gl;
 
   // Entities which can be drawn -- emitters or OneShots
@@ -325,7 +326,7 @@ tdl.particles.ParticleSystem = function(gl,
   };
 
   var multiviewShaders = [];
-  if (gl.getExtension('OVR_multiview2')) {
+  if (opt_vrSupported && gl.getExtension('OVR_multiview2')) {
     multiviewShaders.push(new tdl.shader.Shader(gl,
                                                 makeShaderSourceMultiview('vs', tdl.particles.SHADER_STRINGS[0]),
                                                 makeShaderSourceMultiview('fs', tdl.particles.SHADER_STRINGS[2])));