]> _ Git - fluidbook-html5.git/commitdiff
fix #2432 @0.5
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Thu, 13 Dec 2018 14:11:45 +0000 (15:11 +0100)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Thu, 13 Dec 2018 14:11:45 +0000 (15:11 +0100)
js/libs/fluidbook/fluidbook.3dflip.js

index efa1d340d66cb4c019a4cbab2aebdc3c231eb0c4..3fd5856b02f3ac07afcb2a9677f27e47f49bf4e8 100644 (file)
@@ -58,6 +58,9 @@ Fluidbook3DFlip.prototype = {
             var gl = canvas.getContext('webgl') || canvas.getContext('experimental-webgl');
             var debugInfo = gl.getExtension('WEBGL_debug_renderer_info');
             var renderer = gl.getParameter(debugInfo.UNMASKED_RENDERER_WEBGL);
+            var rawrenderer = renderer;
+
+            console.log(renderer);
 
             var m = /\((.*)\)/.exec(renderer);
             if (m.length > 0) {
@@ -72,14 +75,14 @@ Fluidbook3DFlip.prototype = {
                 }
             });
 
-            if (this.fluidbook.datas.gpusc[renderer] !== undefined) {
-                this.benchmark = this.fluidbook.datas.gpusc[renderer];
+            if (this.fluidbook.datas.gupsc[renderer] !== undefined && this.fluidbook.datas.gupsc[renderer] !== null) {
+                this.benchmark = this.fluidbook.datas.gupsc[renderer];
                 cb();
             } else {
                 $.ajax({
                     url: "https://workshop.fluidbook.com/services/gup",
                     dataType: 'json',
-                    data: {gup: btoa(renderer)},
+                    data: {gup: btoa(renderer), rgup: btoa(rawrenderer)},
                     success: function (data) {
                         $this.benchmark = parseInt(data);
                         cb();
@@ -89,6 +92,7 @@ Fluidbook3DFlip.prototype = {
                 });
             }
         } catch (e) {
+            console.log(e);
             cb();
         }
     },