From a4d463d28daa8787202a5401ad02e61a3e14b8d9 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Thu, 13 Dec 2018 15:11:45 +0100 Subject: [PATCH] fix #2432 @0.5 --- js/libs/fluidbook/fluidbook.3dflip.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.3dflip.js b/js/libs/fluidbook/fluidbook.3dflip.js index efa1d340..3fd5856b 100644 --- a/js/libs/fluidbook/fluidbook.3dflip.js +++ b/js/libs/fluidbook/fluidbook.3dflip.js @@ -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(); } }, -- 2.39.5