David Catuhe 7 years ago
parent
commit
5fc8c47575

File diff suppressed because it is too large
+ 1586 - 1586
Playground/babylon.d.txt


File diff suppressed because it is too large
+ 1826 - 1826
dist/preview release/babylon.d.ts


File diff suppressed because it is too large
+ 4 - 4
dist/preview release/babylon.js


+ 7 - 18
dist/preview release/babylon.max.js

@@ -6163,7 +6163,6 @@ var BABYLON;
             }
             }
             return img;
             return img;
         };
         };
-        //ANY
         Tools.LoadFile = function (url, callback, progressCallBack, database, useArrayBuffer, onError) {
         Tools.LoadFile = function (url, callback, progressCallBack, database, useArrayBuffer, onError) {
             url = Tools.CleanUrl(url);
             url = Tools.CleanUrl(url);
             url = Tools.PreprocessUrl(url);
             url = Tools.PreprocessUrl(url);
@@ -6204,30 +6203,20 @@ var BABYLON;
                     database.loadFileFromDB(url, callback, progressCallBack, noIndexedDB, useArrayBuffer);
                     database.loadFileFromDB(url, callback, progressCallBack, noIndexedDB, useArrayBuffer);
                 }
                 }
             };
             };
+            // If file and file input are set
             if (url.indexOf("file:") !== -1) {
             if (url.indexOf("file:") !== -1) {
                 var fileName = decodeURIComponent(url.substring(5).toLowerCase());
                 var fileName = decodeURIComponent(url.substring(5).toLowerCase());
                 if (BABYLON.FilesInput.FilesToLoad[fileName]) {
                 if (BABYLON.FilesInput.FilesToLoad[fileName]) {
                     Tools.ReadFile(BABYLON.FilesInput.FilesToLoad[fileName], callback, progressCallBack, useArrayBuffer);
                     Tools.ReadFile(BABYLON.FilesInput.FilesToLoad[fileName], callback, progressCallBack, useArrayBuffer);
-                }
-                else {
-                    var errorMessage = "File: " + fileName + " not found. Did you forget to provide it?";
-                    if (onError) {
-                        var e = new Error(errorMessage);
-                        onError(undefined, e);
-                    }
-                    else {
-                        Tools.Error(errorMessage);
-                    }
+                    return request;
                 }
                 }
             }
             }
+            // Caching all files
+            if (database && database.enableSceneOffline) {
+                database.openAsync(loadFromIndexedDB, noIndexedDB);
+            }
             else {
             else {
-                // Caching all files
-                if (database && database.enableSceneOffline) {
-                    database.openAsync(loadFromIndexedDB, noIndexedDB);
-                }
-                else {
-                    noIndexedDB();
-                }
+                noIndexedDB();
             }
             }
             return request;
             return request;
         };
         };

File diff suppressed because it is too large
+ 4 - 4
dist/preview release/babylon.worker.js


File diff suppressed because it is too large
+ 9277 - 9277
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.d.ts


File diff suppressed because it is too large
+ 4 - 4
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.js


+ 7 - 18
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.max.js

@@ -6163,7 +6163,6 @@ var BABYLON;
             }
             }
             return img;
             return img;
         };
         };
-        //ANY
         Tools.LoadFile = function (url, callback, progressCallBack, database, useArrayBuffer, onError) {
         Tools.LoadFile = function (url, callback, progressCallBack, database, useArrayBuffer, onError) {
             url = Tools.CleanUrl(url);
             url = Tools.CleanUrl(url);
             url = Tools.PreprocessUrl(url);
             url = Tools.PreprocessUrl(url);
@@ -6204,30 +6203,20 @@ var BABYLON;
                     database.loadFileFromDB(url, callback, progressCallBack, noIndexedDB, useArrayBuffer);
                     database.loadFileFromDB(url, callback, progressCallBack, noIndexedDB, useArrayBuffer);
                 }
                 }
             };
             };
+            // If file and file input are set
             if (url.indexOf("file:") !== -1) {
             if (url.indexOf("file:") !== -1) {
                 var fileName = decodeURIComponent(url.substring(5).toLowerCase());
                 var fileName = decodeURIComponent(url.substring(5).toLowerCase());
                 if (BABYLON.FilesInput.FilesToLoad[fileName]) {
                 if (BABYLON.FilesInput.FilesToLoad[fileName]) {
                     Tools.ReadFile(BABYLON.FilesInput.FilesToLoad[fileName], callback, progressCallBack, useArrayBuffer);
                     Tools.ReadFile(BABYLON.FilesInput.FilesToLoad[fileName], callback, progressCallBack, useArrayBuffer);
-                }
-                else {
-                    var errorMessage = "File: " + fileName + " not found. Did you forget to provide it?";
-                    if (onError) {
-                        var e = new Error(errorMessage);
-                        onError(undefined, e);
-                    }
-                    else {
-                        Tools.Error(errorMessage);
-                    }
+                    return request;
                 }
                 }
             }
             }
+            // Caching all files
+            if (database && database.enableSceneOffline) {
+                database.openAsync(loadFromIndexedDB, noIndexedDB);
+            }
             else {
             else {
-                // Caching all files
-                if (database && database.enableSceneOffline) {
-                    database.openAsync(loadFromIndexedDB, noIndexedDB);
-                }
-                else {
-                    noIndexedDB();
-                }
+                noIndexedDB();
             }
             }
             return request;
             return request;
         };
         };

+ 4 - 1
dist/preview release/gui/babylon.gui.js

@@ -1993,7 +1993,7 @@ var BABYLON;
                 }
                 }
             };
             };
             Container.prototype._processPicking = function (x, y, type, buttonIndex) {
             Container.prototype._processPicking = function (x, y, type, buttonIndex) {
-                if (!this.isHitTestVisible || !this.isVisible || this.notRenderable) {
+                if (!this.isVisible || this.notRenderable) {
                     return false;
                     return false;
                 }
                 }
                 if (!_super.prototype.contains.call(this, x, y)) {
                 if (!_super.prototype.contains.call(this, x, y)) {
@@ -2006,6 +2006,9 @@ var BABYLON;
                         return true;
                         return true;
                     }
                     }
                 }
                 }
+                if (!this.isHitTestVisible) {
+                    return false;
+                }
                 return this._processObservables(type, x, y, buttonIndex);
                 return this._processObservables(type, x, y, buttonIndex);
             };
             };
             Container.prototype._clipForChildren = function (context) {
             Container.prototype._clipForChildren = function (context) {

File diff suppressed because it is too large
+ 1 - 1
dist/preview release/gui/babylon.gui.min.js


+ 5 - 1
gui/src/controls/container.ts

@@ -175,7 +175,7 @@ module BABYLON.GUI {
         }
         }
 
 
         public _processPicking(x: number, y: number, type: number, buttonIndex: number): boolean {
         public _processPicking(x: number, y: number, type: number, buttonIndex: number): boolean {
-            if (!this.isHitTestVisible || !this.isVisible || this.notRenderable) {
+            if (!this.isVisible || this.notRenderable) {
                 return false;
                 return false;
             }
             }
 
 
@@ -191,6 +191,10 @@ module BABYLON.GUI {
                 }
                 }
             }
             }
 
 
+            if (!this.isHitTestVisible) {
+                return false;
+            }
+
             return this._processObservables(type, x, y, buttonIndex);
             return this._processObservables(type, x, y, buttonIndex);
         }
         }