From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 22 Aug 2018 14:59:21 +0000 (+0200)
Subject: wip #809 @2
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=dca170b9d21e6d8306789dc40f3265bf1706a4b5;p=fluidbook-html5.git

wip #809 @2
---

diff --git a/js/libs/fluidbook/fluidbook.3dflip.js b/js/libs/fluidbook/fluidbook.3dflip.js
index a68e711f..4d648a90 100644
--- a/js/libs/fluidbook/fluidbook.3dflip.js
+++ b/js/libs/fluidbook/fluidbook.3dflip.js
@@ -25,18 +25,18 @@ function Fluidbook3DFlip(fluidbook) {
     this.enableLight = !this.lowPerf;
     this.enableShadow = !this.lowPerf && this.enableLight;
     this.antialias = false;
+    this.animationTime = parseFloat(this.fluidbook.datas.mobileTransitionDuration);
     if (this.veryLowPerf) {
         this.qualityRatio = .7;
         this.triangles = 1;
-        this.animationTime = parseFloat(this.fluidbook.datas.mobileTransitionDuration) / 1.5;
+        this.animationTime /= 1.5;
     } else if (this.lowPerf) {
         this.qualityRatio = 1.2;
         this.triangles = 2;
-        this.animationTime = parseFloat(this.fluidbook.datas.mobileTransitionDuration) / 1.25;
+        this.animationTime /= 1.25;
     } else {
         this.qualityRatio = 2;
         this.triangles = 5;
-        this.animationTime = parseFloat(this.fluidbook.datas.mobileTransitionDuration);
     }
     this.pixelRatio = window.devicePixelRatio * this.qualityRatio;
 
@@ -95,7 +95,6 @@ Fluidbook3DFlip.prototype = {
                 light.shadow.bias = -0.0075;
                 light.shadow.radius = 3;
             }
-
             this.scene.add(light);
         }
 
diff --git a/js/libs/fluidbook/fluidbook.loader.js b/js/libs/fluidbook/fluidbook.loader.js
index ae2dfb53..b37a2a6e 100644
--- a/js/libs/fluidbook/fluidbook.loader.js
+++ b/js/libs/fluidbook/fluidbook.loader.js
@@ -330,12 +330,16 @@ FluidbookLoader.prototype = {
         ctx.drawImage(this.backgrounds[page].get(0), 0, 0, d, d);
         // Draw the texts if necessary
         if (this.getVersionToLoad(page) === 'textasvector') {
-            ctx.drawImage(this.texts[page].get(0), 0, 0, d, d);
+            try {
+                ctx.drawImage(this.texts[page].get(0), 0, 0, d, d);
+            } catch (e) {
+
+            }
         }
 
         // Draw the shadow if necessary
         if (this.fluidbook.datas.shadeAlpha > 0) {
-            var sw = 1024 / 3;
+            var sw = 1024 * .25;
             var s, x;
             if (page % 2 === 0) {
                 // Left
@@ -346,7 +350,7 @@ FluidbookLoader.prototype = {
                 s = this.shadeRight;
                 x = 0;
             }
-            ctx.globalAlpha = this.fluidbook.datas.shadeAlpha / 100;
+            ctx.globalAlpha = 2 * this.fluidbook.datas.shadeAlpha / 100;
             ctx.drawImage(s.get(0), x, 0, sw, d);
             ctx.globalAlpha = 1;
         }
diff --git a/js/libs/fluidbook/fluidbook.support.js b/js/libs/fluidbook/fluidbook.support.js
index c16d110a..cc361661 100644
--- a/js/libs/fluidbook/fluidbook.support.js
+++ b/js/libs/fluidbook/fluidbook.support.js
@@ -22,7 +22,7 @@ function FluidbookSupport(fluidbook) {
             this.imagesVersion = true;
             break;
         case 'html5-desktop':
-            this.imagesVersion = this.iOS || this.android;
+            this.imagesVersion = this.iOS || this.android || this.IE > 0;
             break;
         default:
             this.imagesVersion = false;