Merge remote-tracking branch 'upstream/master'

Tools/Gulp/gulpfile.js

@@ -1425,4 +1425,4 @@ gulp.task("typescript-all", gulp.series("typescript", "typescript-libraries", "n
 /**
  * The default task, concat and min the main BJS files.
  */
-gulp.task("default", gulp.series("typescript-all", "intellisense", "typedoc-all", "tests-unit", "tests-validation-virtualscreen", "tests-validation-browserstack"));
+gulp.task("default", gulp.series("typescript-all", "intellisense", "typedoc-all", "tests-unit", "tests-modules", "tests-validation-virtualscreen", "tests-validation-browserstack"));

dist/preview release/babylon.max.js

@@ -57407,8 +57407,21 @@ var BABYLON;
                 this.activeSubSystems = new Array();
             }
             if (this.preWarmCycles) {
-                for (var index = 0; index < this.preWarmCycles; index++) {
-                    this.animate(true);
+                var noiseTextureAsProcedural_1 = this.noiseTexture;
+                if (noiseTextureAsProcedural_1 && noiseTextureAsProcedural_1.onGeneratedObservable) {
+                    noiseTextureAsProcedural_1.onGeneratedObservable.addOnce(function () {
+                        setTimeout(function () {
+                            for (var index = 0; index < _this.preWarmCycles; index++) {
+                                _this.animate(true);
+                                noiseTextureAsProcedural_1.render();
+                            }
+                        });
+                    });
+                }
+                else {
+                    for (var index = 0; index < this.preWarmCycles; index++) {
+                        this.animate(true);
+                    }
                 }
             }
         };
@@ -74640,6 +74653,10 @@ var BABYLON;
             _this.isEnabled = true;
             _this._currentRefreshId = -1;
             _this._refreshRate = 1;
+            /**
+             * Event raised when the texture is generated
+             */
+            _this.onGeneratedObservable = new BABYLON.Observable();
             _this._vertexBuffers = {};
             _this._uniforms = new Array();
             _this._samplers = new Array();
@@ -74942,6 +74959,7 @@ var BABYLON;
             if (this.onGenerated) {
                 this.onGenerated();
             }
+            this.onGeneratedObservable.notifyObservers(this);
         };
         ProceduralTexture.prototype.clone = function () {
             var textureSize = this.getSize();

dist/preview release/babylon.no-module.max.js

@@ -57374,8 +57374,21 @@ var BABYLON;
                 this.activeSubSystems = new Array();
             }
             if (this.preWarmCycles) {
-                for (var index = 0; index < this.preWarmCycles; index++) {
-                    this.animate(true);
+                var noiseTextureAsProcedural_1 = this.noiseTexture;
+                if (noiseTextureAsProcedural_1 && noiseTextureAsProcedural_1.onGeneratedObservable) {
+                    noiseTextureAsProcedural_1.onGeneratedObservable.addOnce(function () {
+                        setTimeout(function () {
+                            for (var index = 0; index < _this.preWarmCycles; index++) {
+                                _this.animate(true);
+                                noiseTextureAsProcedural_1.render();
+                            }
+                        });
+                    });
+                }
+                else {
+                    for (var index = 0; index < this.preWarmCycles; index++) {
+                        this.animate(true);
+                    }
                 }
             }
         };
@@ -74607,6 +74620,10 @@ var BABYLON;
             _this.isEnabled = true;
             _this._currentRefreshId = -1;
             _this._refreshRate = 1;
+            /**
+             * Event raised when the texture is generated
+             */
+            _this.onGeneratedObservable = new BABYLON.Observable();
             _this._vertexBuffers = {};
             _this._uniforms = new Array();
             _this._samplers = new Array();
@@ -74909,6 +74926,7 @@ var BABYLON;
             if (this.onGenerated) {
                 this.onGenerated();
             }
+            this.onGeneratedObservable.notifyObservers(this);
         };
         ProceduralTexture.prototype.clone = function () {
             var textureSize = this.getSize();

dist/preview release/es6.js

@@ -57374,8 +57374,21 @@ var BABYLON;
                 this.activeSubSystems = new Array();
             }
             if (this.preWarmCycles) {
-                for (var index = 0; index < this.preWarmCycles; index++) {
-                    this.animate(true);
+                var noiseTextureAsProcedural_1 = this.noiseTexture;
+                if (noiseTextureAsProcedural_1 && noiseTextureAsProcedural_1.onGeneratedObservable) {
+                    noiseTextureAsProcedural_1.onGeneratedObservable.addOnce(function () {
+                        setTimeout(function () {
+                            for (var index = 0; index < _this.preWarmCycles; index++) {
+                                _this.animate(true);
+                                noiseTextureAsProcedural_1.render();
+                            }
+                        });
+                    });
+                }
+                else {
+                    for (var index = 0; index < this.preWarmCycles; index++) {
+                        this.animate(true);
+                    }
                 }
             }
         };
@@ -74607,6 +74620,10 @@ var BABYLON;
             _this.isEnabled = true;
             _this._currentRefreshId = -1;
             _this._refreshRate = 1;
+            /**
+             * Event raised when the texture is generated
+             */
+            _this.onGeneratedObservable = new BABYLON.Observable();
             _this._vertexBuffers = {};
             _this._uniforms = new Array();
             _this._samplers = new Array();
@@ -74909,6 +74926,7 @@ var BABYLON;
             if (this.onGenerated) {
                 this.onGenerated();
             }
+            this.onGeneratedObservable.notifyObservers(this);
         };
         ProceduralTexture.prototype.clone = function () {
             var textureSize = this.getSize();

dist/preview release/inspector/babylon.inspector.module.d.ts

@@ -835,7 +835,6 @@ declare module 'babylonjs-inspector/tabs/GLTFTab' {
     import { Inspector } from "babylonjs-inspector/Inspector";
     import { Tab } from "babylonjs-inspector/tabs/Tab";
     import { TabBar } from "babylonjs-inspector/tabs/TabBar";
-    import "babylonjs-gltf2interface";
     export class GLTFTab extends Tab {
         static readonly IsSupported: boolean;
         /** @hidden */

dist/preview release/typedocValidationBaseline.json

@@ -1,7 +1,7 @@
 {
-  "errors": 3753,
+  "errors": 3752,
   "babylon.typedoc.json": {
-    "errors": 3753,
+    "errors": 3752,
     "AnimationGroup": {
       "Constructor": {
         "new AnimationGroup": {
@@ -11570,11 +11570,6 @@
             "MissingText": true
           }
         },
-        "onGenerated": {
-          "Comments": {
-            "MissingText": true
-          }
-        },
         "refreshRate": {
           "Comments": {
             "MissingText": true

inspector/src/tabs/GLTFTab.ts

@@ -9,9 +9,10 @@ import { Inspector } from "../Inspector";
 import { Tab } from "./Tab";
 import { TabBar } from "./TabBar";
 
-import "babylonjs-gltf2interface";
 import * as Split from "Split";
 
+import {} from "babylonjs-gltf2interface";
+
 export class GLTFTab extends Tab {
     private static _LoaderDefaults: any = null;
     private static _ValidationResults: Nullable<IGLTFValidationResults> = null;

inspector/webpack.config.js

@@ -39,12 +39,6 @@ module.exports = {
             commonjs2: "babylonjs-gui",
             amd: "babylonjs-gui"
         },
-        "babylonjs-gltf2interface": {
-            root: "BABYLON",
-            commonjs: "babylonjs-gltf2interface",
-            commonjs2: "babylonjs-gltf2interface",
-            amd: "babylonjs-gltf2interface"
-        },
         "babylonjs-loaders": {
             root: "BABYLON",
             commonjs: "babylonjs-loaders",

src/Materials/Textures/Procedurals/babylon.proceduralTexture.ts

@@ -12,8 +12,16 @@
         private _currentRefreshId = -1;
         private _refreshRate = 1;
 
+        /**
+         * Callback called when the texture is generated
+         */
         public onGenerated: () => void;
 
+        /**
+         * Event raised when the texture is generated
+         */
+        public onGeneratedObservable = new Observable<ProceduralTexture>();
+
         private _vertexBuffers: { [key: string]: Nullable<VertexBuffer> } = {};
         private _indexBuffer: Nullable<WebGLBuffer>;
         /** get the internal effect */
@@ -417,6 +425,8 @@
             if (this.onGenerated) {
                 this.onGenerated();
             }
+
+            this.onGeneratedObservable.notifyObservers(this);
         }
 
         public clone(): ProceduralTexture {

src/Particles/babylon.particleSystem.ts

@@ -1030,8 +1030,21 @@
             }
 
             if (this.preWarmCycles) {
-                for (var index = 0; index < this.preWarmCycles; index++) {
-                    this.animate(true);
+                let noiseTextureAsProcedural = this.noiseTexture as ProceduralTexture;
+
+                if (noiseTextureAsProcedural && noiseTextureAsProcedural.onGeneratedObservable) {
+                    noiseTextureAsProcedural.onGeneratedObservable.addOnce(() => {
+                        setTimeout(() => {
+                            for (var index = 0; index < this.preWarmCycles; index++) {
+                                this.animate(true);
+                                noiseTextureAsProcedural.render();
+                            }    
+                        });
+                    });
+                } else { 
+                    for (var index = 0; index < this.preWarmCycles; index++) {
+                        this.animate(true);
+                    }
                 }
             }
         }

tests/modules/typescript-webpack/webpack.config.js

@@ -11,7 +11,7 @@ module.exports = {
         alias: {
             "babylonjs": __dirname + '/../../../dist/preview release/babylon.max.js',
             "babylonjs-gui": __dirname + '/../../../dist/preview release/gui/babylon.gui.js',
-            "babylonjs-inspector": __dirname + '/../../../dist/preview release/inspector/babylon.inspector.js',
+            "babylonjs-inspector": __dirname + '/../../../dist/preview release/inspector/babylon.inspector.bundle.js',
             "babylonjs-loaders": __dirname + '/../../../dist/preview release/loaders/babylonjs.loaders.js',
             "babylonjs-serializers": __dirname + '/../../../dist/preview release/serializers/babylonjs.serializers.js',
         }