wip #809 @5

diff --git a/js/libs/fluidbook/fluidbook.3dflip.js b/js/libs/fluidbook/fluidbook.3dflip.js
index f7705e860ab0ee38e3425efd10e9b39bea952b64..81dcc155adb192a5b15c6994924a3cc351b0086d 100644 (file)
--- a/js/libs/fluidbook/fluidbook.3dflip.js
+++ b/js/libs/fluidbook/fluidbook.3dflip.js
@@ -49,6 +49,7 @@ function Fluidbook3DFlip(fluidbook) {
     }
     this.refreshTime = Math.round(1000 / this.maxFps);
     this.pixelRatio = window.devicePixelRatio * this.qualityRatio;
+    this.frames = 0;
 
     console.log('Quality ratio: ' + this.qualityRatio);
     console.log('Triangles: ' + this.triangles);
@@ -105,8 +106,8 @@ Fluidbook3DFlip.prototype = {
             light.position.set(2000, 0, 1.72503 * 10000);
             if (this.enableShadow) {
                 light.castShadow = true;
-                light.shadow.mapSize.width = 2048;  // default
-                light.shadow.mapSize.height = 2048; // default
+                light.shadow.mapSize.width = 1024;  // default
+                light.shadow.mapSize.height = 1024; // default
                 light.shadow.camera.near = near;
                 light.shadow.camera.far = far;
                 light.shadow.bias = -0.0075;

diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js
index b8ec743fad7051d9474ad9c91e6c161f6c4f241d..2228a846939ca5acf9da5e2c6efad600ca353614 100644 (file)
--- a/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@ -186,7 +186,7 @@ Fluidbook.prototype = {
         var $this = this;
         setTimeout(function () {
             $this._hideSplash();
-        }, 300);
+        }, 3000);
     },
     _hideSplash: function () {
         $("#main,#viewOverlay,#view").css('visibility', 'visible');
@@ -393,6 +393,7 @@ Fluidbook.prototype = {
                     $this.stats.track(0, page);
                 }
                 $this.zoom.resetZoom();
+
                 $this.hideSplash();
             }, true);
         }

diff --git a/js/libs/fluidbook/fluidbook.loader.js b/js/libs/fluidbook/fluidbook.loader.js
index 194917f955ecdb01a8b5baac0875333efd0348be..a338ab35355e8c34a1673c3e6f1866cc14884f8f 100644 (file)
--- a/js/libs/fluidbook/fluidbook.loader.js
+++ b/js/libs/fluidbook/fluidbook.loader.js
@@ -144,13 +144,16 @@ FluidbookLoader.prototype = {
             numPreloadAfter = 4;
             numPreloadBefore = 2;
         }
-        var max = Math.min(page + numPreloadAfter, this.fluidbook.getMaxPage());
+        var fmx = this.fluidbook.getMaxPage();
+        var max = Math.min(page + numPreloadAfter, fmx);
         var min = Math.max(1, page - numPreloadBefore);
-        this.toPreload = [];
+        this.toPreload = [1, fmx];
         for (var i = min; i <= max; i++) {
-            this.toPreload.push(i);
+            if(this.toPreload.indexOf(i)===-1) {
+                this.toPreload.push(i);
+            }
         }
-        this.preloaded=this.toPreload.slice(0);
+        this.preloaded = this.toPreload.slice(0);
         this.cleanPreloaded();
         this.preloadPages();
     },

diff --git a/js/libs/fluidbook/fluidbook.pagetransitions.js b/js/libs/fluidbook/fluidbook.pagetransitions.js
index cd0e94fa3433189041af808e56c952ed31108980..47d5ffcb538f0ffdd929c4a9b091d85e6f387012 100644 (file)
--- a/js/libs/fluidbook/fluidbook.pagetransitions.js
+++ b/js/libs/fluidbook/fluidbook.pagetransitions.js
@@ -282,7 +282,7 @@ FluidbookPageTransition.prototype = {
         if (d == undefined) {
             d = 1;
         }
-        $(this).trigger('fluidbook.page.change.start', [page, {transition: d, page: page, turningPages: turning.flip}]);
+        $(this.fluidbook).trigger('fluidbook.page.change.start', [page, {transition: d, page: page, turningPages: turning.flip}]);
         this.fluidbook.tooltip.hideTooltip();
         $(".axis_y").removeClass('axis_y');
         $(".axis_x").removeClass('axis_x');