David Catuhe 7 years ago
parent
commit
383cb2bdeb
32 changed files with 32579 additions and 32564 deletions
  1. 9921 9920
      Playground/babylon.d.txt
  2. 2 2
      Tools/Gulp/config.json
  3. 6136 6136
      dist/preview release/babylon.d.ts
  4. 44 44
      dist/preview release/babylon.js
  5. 5 3
      dist/preview release/babylon.max.js
  6. 45 45
      dist/preview release/babylon.worker.js
  7. 16267 16267
      dist/preview release/customConfigurations/minimalGLTFViewer/babylon.d.ts
  8. 46 46
      dist/preview release/customConfigurations/minimalGLTFViewer/babylon.js
  9. 5 3
      dist/preview release/customConfigurations/minimalGLTFViewer/babylon.max.js
  10. 5 3
      dist/preview release/customConfigurations/minimalGLTFViewer/es6.js
  11. 5 3
      dist/preview release/es6.js
  12. 3 3
      dist/preview release/gui/babylon.gui.min.js
  13. 4 4
      dist/preview release/inspector/babylon.inspector.bundle.js
  14. 3 3
      dist/preview release/inspector/babylon.inspector.min.js
  15. 2 2
      dist/preview release/loaders/babylon.glTF1FileLoader.min.js
  16. 2 2
      dist/preview release/loaders/babylon.glTF2FileLoader.min.js
  17. 3 3
      dist/preview release/loaders/babylon.glTFFileLoader.min.js
  18. 1 1
      dist/preview release/loaders/babylon.objFileLoader.min.js
  19. 3 3
      dist/preview release/loaders/babylonjs.loaders.min.js
  20. 1 1
      dist/preview release/materialsLibrary/babylon.customMaterial.min.js
  21. 1 1
      dist/preview release/materialsLibrary/babylon.shadowOnlyMaterial.min.js
  22. 1 1
      dist/preview release/materialsLibrary/babylon.waterMaterial.min.js
  23. 3 3
      dist/preview release/materialsLibrary/babylonjs.materials.min.js
  24. 1 1
      dist/preview release/postProcessesLibrary/babylon.asciiArtPostProcess.min.js
  25. 1 1
      dist/preview release/postProcessesLibrary/babylon.digitalRainPostProcess.min.js
  26. 1 1
      dist/preview release/postProcessesLibrary/babylonjs.postProcess.min.js
  27. 1 1
      dist/preview release/serializers/babylon.glTF2Serializer.min.js
  28. 1 1
      dist/preview release/serializers/babylonjs.serializers.min.js
  29. 54 54
      dist/preview release/viewer/babylon.viewer.js
  30. 5 3
      dist/preview release/viewer/babylon.viewer.max.js
  31. 2 2
      src/Engine/babylon.engine.ts
  32. 5 1
      src/Materials/Textures/babylon.cubeTexture.ts

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


+ 2 - 2
Tools/Gulp/config.json

@@ -274,10 +274,10 @@
             "files": [
                 "../../src/Particles/babylon.particle.js",
                 "../../src/Particles/babylon.particleSystem.js",
+                "../../src/Particles/EmitterTypes/babylon.IParticleEmitterType.js",
                 "../../src/Particles/EmitterTypes/babylon.boxParticleEmitter.js",
                 "../../src/Particles/EmitterTypes/babylon.coneParticleEmitter.js",
-                "../../src/Particles/EmitterTypes/babylon.sphereParticleEmitter.js",
-                "../../src/Particles/EmitterTypes/babylon.IParticleEmitterType.js"
+                "../../src/Particles/EmitterTypes/babylon.sphereParticleEmitter.js"
             ],
             "dependUpon": [
                 "core"

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


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


+ 5 - 3
dist/preview release/babylon.max.js

@@ -13669,7 +13669,7 @@ var BABYLON;
             }
             else if (isDDS) {
                 if (files && files.length === 6) {
-                    this._cascadeLoadFiles(rootUrl, scene, function (imgs) {
+                    this._cascadeLoadFiles(scene, function (imgs) {
                         var info;
                         var loadMipmap = false;
                         var width = 0;
@@ -15013,7 +15013,7 @@ var BABYLON;
             };
             this._loadFile(url, onload, undefined, undefined, true, onerror);
         };
-        Engine.prototype._cascadeLoadFiles = function (rootUrl, scene, onfinish, files, onError) {
+        Engine.prototype._cascadeLoadFiles = function (scene, onfinish, files, onError) {
             if (onError === void 0) { onError = null; }
             var loadedFiles = [];
             loadedFiles._internalCount = 0;
@@ -57584,7 +57584,9 @@ var BABYLON;
             configurable: true
         });
         CubeTexture.CreateFromImages = function (files, scene, noMipmap) {
-            return new CubeTexture("", scene, null, noMipmap, files);
+            var rootUrlKey = "";
+            files.forEach(function (url) { return rootUrlKey += url; });
+            return new CubeTexture(rootUrlKey, scene, null, noMipmap, files);
         };
         CubeTexture.CreateFromPrefilteredData = function (url, scene, forcedExtension) {
             if (forcedExtension === void 0) { forcedExtension = null; }

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


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


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


+ 5 - 3
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.max.js

@@ -13669,7 +13669,7 @@ var BABYLON;
             }
             else if (isDDS) {
                 if (files && files.length === 6) {
-                    this._cascadeLoadFiles(rootUrl, scene, function (imgs) {
+                    this._cascadeLoadFiles(scene, function (imgs) {
                         var info;
                         var loadMipmap = false;
                         var width = 0;
@@ -15013,7 +15013,7 @@ var BABYLON;
             };
             this._loadFile(url, onload, undefined, undefined, true, onerror);
         };
-        Engine.prototype._cascadeLoadFiles = function (rootUrl, scene, onfinish, files, onError) {
+        Engine.prototype._cascadeLoadFiles = function (scene, onfinish, files, onError) {
             if (onError === void 0) { onError = null; }
             var loadedFiles = [];
             loadedFiles._internalCount = 0;
@@ -56918,7 +56918,9 @@ var BABYLON;
             configurable: true
         });
         CubeTexture.CreateFromImages = function (files, scene, noMipmap) {
-            return new CubeTexture("", scene, null, noMipmap, files);
+            var rootUrlKey = "";
+            files.forEach(function (url) { return rootUrlKey += url; });
+            return new CubeTexture(rootUrlKey, scene, null, noMipmap, files);
         };
         CubeTexture.CreateFromPrefilteredData = function (url, scene, forcedExtension) {
             if (forcedExtension === void 0) { forcedExtension = null; }

+ 5 - 3
dist/preview release/customConfigurations/minimalGLTFViewer/es6.js

@@ -13655,7 +13655,7 @@ var BABYLON;
             }
             else if (isDDS) {
                 if (files && files.length === 6) {
-                    this._cascadeLoadFiles(rootUrl, scene, function (imgs) {
+                    this._cascadeLoadFiles(scene, function (imgs) {
                         var info;
                         var loadMipmap = false;
                         var width = 0;
@@ -14999,7 +14999,7 @@ var BABYLON;
             };
             this._loadFile(url, onload, undefined, undefined, true, onerror);
         };
-        Engine.prototype._cascadeLoadFiles = function (rootUrl, scene, onfinish, files, onError) {
+        Engine.prototype._cascadeLoadFiles = function (scene, onfinish, files, onError) {
             if (onError === void 0) { onError = null; }
             var loadedFiles = [];
             loadedFiles._internalCount = 0;
@@ -56904,7 +56904,9 @@ var BABYLON;
             configurable: true
         });
         CubeTexture.CreateFromImages = function (files, scene, noMipmap) {
-            return new CubeTexture("", scene, null, noMipmap, files);
+            var rootUrlKey = "";
+            files.forEach(function (url) { return rootUrlKey += url; });
+            return new CubeTexture(rootUrlKey, scene, null, noMipmap, files);
         };
         CubeTexture.CreateFromPrefilteredData = function (url, scene, forcedExtension) {
             if (forcedExtension === void 0) { forcedExtension = null; }

+ 5 - 3
dist/preview release/es6.js

@@ -13655,7 +13655,7 @@ var BABYLON;
             }
             else if (isDDS) {
                 if (files && files.length === 6) {
-                    this._cascadeLoadFiles(rootUrl, scene, function (imgs) {
+                    this._cascadeLoadFiles(scene, function (imgs) {
                         var info;
                         var loadMipmap = false;
                         var width = 0;
@@ -14999,7 +14999,7 @@ var BABYLON;
             };
             this._loadFile(url, onload, undefined, undefined, true, onerror);
         };
-        Engine.prototype._cascadeLoadFiles = function (rootUrl, scene, onfinish, files, onError) {
+        Engine.prototype._cascadeLoadFiles = function (scene, onfinish, files, onError) {
             if (onError === void 0) { onError = null; }
             var loadedFiles = [];
             loadedFiles._internalCount = 0;
@@ -57570,7 +57570,9 @@ var BABYLON;
             configurable: true
         });
         CubeTexture.CreateFromImages = function (files, scene, noMipmap) {
-            return new CubeTexture("", scene, null, noMipmap, files);
+            var rootUrlKey = "";
+            files.forEach(function (url) { return rootUrlKey += url; });
+            return new CubeTexture(rootUrlKey, scene, null, noMipmap, files);
         };
         CubeTexture.CreateFromPrefilteredData = function (url, scene, forcedExtension) {
             if (forcedExtension === void 0) { forcedExtension = null; }

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


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


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


File diff suppressed because it is too large
+ 2 - 2
dist/preview release/loaders/babylon.glTF1FileLoader.min.js


File diff suppressed because it is too large
+ 2 - 2
dist/preview release/loaders/babylon.glTF2FileLoader.min.js


File diff suppressed because it is too large
+ 3 - 3
dist/preview release/loaders/babylon.glTFFileLoader.min.js


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


File diff suppressed because it is too large
+ 3 - 3
dist/preview release/loaders/babylonjs.loaders.min.js


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


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


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


File diff suppressed because it is too large
+ 3 - 3
dist/preview release/materialsLibrary/babylonjs.materials.min.js


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


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


File diff suppressed because it is too large
+ 1 - 1
dist/preview release/postProcessesLibrary/babylonjs.postProcess.min.js


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


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


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


+ 5 - 3
dist/preview release/viewer/babylon.viewer.max.js

@@ -13742,7 +13742,7 @@ var BABYLON;
             }
             else if (isDDS) {
                 if (files && files.length === 6) {
-                    this._cascadeLoadFiles(rootUrl, scene, function (imgs) {
+                    this._cascadeLoadFiles(scene, function (imgs) {
                         var info;
                         var loadMipmap = false;
                         var width = 0;
@@ -15086,7 +15086,7 @@ var BABYLON;
             };
             this._loadFile(url, onload, undefined, undefined, true, onerror);
         };
-        Engine.prototype._cascadeLoadFiles = function (rootUrl, scene, onfinish, files, onError) {
+        Engine.prototype._cascadeLoadFiles = function (scene, onfinish, files, onError) {
             if (onError === void 0) { onError = null; }
             var loadedFiles = [];
             loadedFiles._internalCount = 0;
@@ -57657,7 +57657,9 @@ var BABYLON;
             configurable: true
         });
         CubeTexture.CreateFromImages = function (files, scene, noMipmap) {
-            return new CubeTexture("", scene, null, noMipmap, files);
+            var rootUrlKey = "";
+            files.forEach(function (url) { return rootUrlKey += url; });
+            return new CubeTexture(rootUrlKey, scene, null, noMipmap, files);
         };
         CubeTexture.CreateFromPrefilteredData = function (url, scene, forcedExtension) {
             if (forcedExtension === void 0) { forcedExtension = null; }

+ 2 - 2
src/Engine/babylon.engine.ts

@@ -4268,7 +4268,7 @@
                 }, undefined, undefined, true, onerror);
             } else if (isDDS) {
                 if (files && files.length === 6) {
-                    this._cascadeLoadFiles(rootUrl,
+                    this._cascadeLoadFiles(
                         scene,
                         imgs => {
                             var info: DDSInfo | undefined;
@@ -5883,7 +5883,7 @@
             this._loadFile(url, onload, undefined, undefined, true, onerror);
         }
 
-        private _cascadeLoadFiles(rootUrl: string, scene: Nullable<Scene>, onfinish: (images: (string | ArrayBuffer)[]) => void, files: string[], onError: Nullable<(message?: string, exception?: any) => void> = null): void {
+        private _cascadeLoadFiles(scene: Nullable<Scene>, onfinish: (images: (string | ArrayBuffer)[]) => void, files: string[], onError: Nullable<(message?: string, exception?: any) => void> = null): void {
             var loadedFiles: (string | ArrayBuffer)[] = [];
             (<any>loadedFiles)._internalCount = 0;
 

+ 5 - 1
src/Materials/Textures/babylon.cubeTexture.ts

@@ -39,7 +39,11 @@
         private _prefiltered: boolean;
 
         public static CreateFromImages(files: string[], scene: Scene, noMipmap?: boolean) {
-            return new CubeTexture("", scene, null, noMipmap, files);
+            let rootUrlKey = "";
+            
+            files.forEach(url => rootUrlKey += url);
+
+            return new CubeTexture(rootUrlKey, scene, null, noMipmap, files);
         }
 
         public static CreateFromPrefilteredData(url: string, scene: Scene, forcedExtension: any = null) {