fixing playground and viewer-build

Tools/Gulp/gulp-addModuleExports.js

@@ -34,26 +34,20 @@ module.exports = function (varName, config) {
 
             let dependenciesDefinition = `var amdDependencies = [];`;
             let functionVariables = '';
+            let requireText = '';
+            let amdText = '';
+            let afterInitText = '';
             if (config.dependencies) {
                 config.dependencies.forEach(dep => {
                     if (functionVariables) functionVariables += ',';
                     functionVariables += dep.name;
+                    requireText += `        ${dep.optional ? ' try { ' : ''} ${dep.name} = ${dep.name} || require("${dep.module}"); ${dep.optional ? ' } catch(e) {} ' : ''}
+`;
+                    amdText += `        ${dep.optional ? ' if(require.specified && require.specified("' + dep.module + '"))' : ''} amdDependencies.push("${dep.module}");
+`;
                     dependenciesDefinition += `
-    var ${dep.name} = root. ${dep.name};
-    if(!${dep.name}) {
-        if(typeof exports === 'object') {
-            ${dep.optional ? ' try { ' : ''} ${dep.name} = require("${dep.module}"); ${dep.optional ? ' } catch(e) {} ' : ''}
-        } else if(typeof define === 'function' && define.amd) {
-            ${dep.optional ? ' if(require.specified && require.specified("' + dep.module + '"))' : ''} amdDependencies.push("${dep.module}");
-        }
-    } else {
-        if(typeof define === 'function' && define.amd) {
-            if(!(require.specified && require.specified("' + dep.module + '"))) {
-                try { define("${dep.module}", [], function () { return ${dep.name}; }); } catch(e) { }
-            }
-            amdDependencies.push("${dep.module}");
-        }
-    }
+    var ${dep.name} = root.${dep.name};`;
+                    afterInitText += `  ${dep.name} = ${dep.name} || this.${dep.name};
 `
                 });
 
@@ -63,17 +57,21 @@ module.exports = function (varName, config) {
 
             return `\n\n(function universalModuleDefinition(root, factory) {
     ${dependenciesDefinition}
-    if(typeof exports === 'object' && typeof module === 'object')
+    if(typeof exports === 'object' && typeof module === 'object') {
+${requireText}
         module.exports = factory(${functionVariables});
-    else if(typeof define === 'function' && define.amd)
+    } else if(typeof define === 'function' && define.amd) {
+${amdText}
         define("${varName.module}", amdDependencies, factory);
-    else if(typeof exports === 'object')
+    } else if(typeof exports === 'object') {
+${requireText}
         exports["${varName.module}"] = factory(${functionVariables});
-    else {
+    } else {
         root["${base}"]${(config.subModule && !config.extendsRoot) ? '["' + varName.name + '"]' : ''} = factory(${functionVariables});
     }
 })(this, function(${functionVariables}) {
-    ${String(file.contents)}
+${afterInitText}
+${String(file.contents)}
     ${varName.name === 'BABYLON' || varName.name === 'INSPECTOR' ? `
 var globalObject = (typeof global !== 'undefined') ? global : ((typeof window !== 'undefined') ? window : this);
 globalObject["${varName.name}"] = ${varName.name}` : ''}

dist/preview release/babylon.max.js

@@ -4,49 +4,31 @@ var __extends=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__p
 
 (function universalModuleDefinition(root, factory) {
     var amdDependencies = [];
-    var CANNON = root. CANNON;
-    if(!CANNON) {
-        if(typeof exports === 'object') {
-             try {  CANNON = require("cannon");  } catch(e) {} 
-        } else if(typeof define === 'function' && define.amd) {
-             if(require.specified && require.specified("cannon")) amdDependencies.push("cannon");
-        }
-    } else {
-        if(typeof define === 'function' && define.amd) {
-            if(!(require.specified && require.specified("' + dep.module + '"))) {
-                try { define("cannon", [], function () { return CANNON; }); } catch(e) { }
-            }
-            amdDependencies.push("cannon");
-        }
-    }
-
-    var OIMO = root. OIMO;
-    if(!OIMO) {
-        if(typeof exports === 'object') {
-             try {  OIMO = require("oimo");  } catch(e) {} 
-        } else if(typeof define === 'function' && define.amd) {
-             if(require.specified && require.specified("oimo")) amdDependencies.push("oimo");
-        }
-    } else {
-        if(typeof define === 'function' && define.amd) {
-            if(!(require.specified && require.specified("' + dep.module + '"))) {
-                try { define("oimo", [], function () { return OIMO; }); } catch(e) { }
-            }
-            amdDependencies.push("oimo");
-        }
-    }
+    var CANNON = root.CANNON;
+    var OIMO = root.OIMO;
+    if(typeof exports === 'object' && typeof module === 'object') {
+         try {  CANNON = CANNON || require("cannon");  } catch(e) {} 
+         try {  OIMO = OIMO || require("oimo");  } catch(e) {} 
 
-    if(typeof exports === 'object' && typeof module === 'object')
         module.exports = factory(CANNON,OIMO);
-    else if(typeof define === 'function' && define.amd)
+    } else if(typeof define === 'function' && define.amd) {
+         if(require.specified && require.specified("cannon")) amdDependencies.push("cannon");
+         if(require.specified && require.specified("oimo")) amdDependencies.push("oimo");
+
         define("babylonjs", amdDependencies, factory);
-    else if(typeof exports === 'object')
+    } else if(typeof exports === 'object') {
+         try {  CANNON = CANNON || require("cannon");  } catch(e) {} 
+         try {  OIMO = OIMO || require("oimo");  } catch(e) {} 
+
         exports["babylonjs"] = factory(CANNON,OIMO);
-    else {
+    } else {
         root["BABYLON"] = factory(CANNON,OIMO);
     }
 })(this, function(CANNON,OIMO) {
-    "use strict";
+  CANNON = CANNON || this.CANNON;
+  OIMO = OIMO || this.OIMO;
+
+"use strict";
 var BABYLON;
 (function (BABYLON) {
     /**
@@ -15120,6 +15102,7 @@ var BABYLON;
             this.releaseEffects();
             // Unbind
             this.unbindAllAttributes();
+            this._boundUniforms = [];
             if (this._dummyFramebuffer) {
                 this._gl.deleteFramebuffer(this._dummyFramebuffer);
             }
@@ -47864,7 +47847,7 @@ var BABYLON;
          * @param loop defines if animations must loop
          * @param speedRatio defines the ratio to apply to animation speed (1 by default)
          * @param from defines the from key (optional)
-         * @param from defines the to key (optional)
+         * @param to defines the to key (optional)
          * @returns the current animation group
          */
         AnimationGroup.prototype.start = function (loop, speedRatio, from, to) {

dist/preview release/customConfigurations/minimalGLTFViewer/babylon.max.js

@@ -4,49 +4,31 @@ var __extends=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__p
 
 (function universalModuleDefinition(root, factory) {
     var amdDependencies = [];
-    var CANNON = root. CANNON;
-    if(!CANNON) {
-        if(typeof exports === 'object') {
-             try {  CANNON = require("cannon");  } catch(e) {} 
-        } else if(typeof define === 'function' && define.amd) {
-             if(require.specified && require.specified("cannon")) amdDependencies.push("cannon");
-        }
-    } else {
-        if(typeof define === 'function' && define.amd) {
-            if(!(require.specified && require.specified("' + dep.module + '"))) {
-                try { define("cannon", [], function () { return CANNON; }); } catch(e) { }
-            }
-            amdDependencies.push("cannon");
-        }
-    }
-
-    var OIMO = root. OIMO;
-    if(!OIMO) {
-        if(typeof exports === 'object') {
-             try {  OIMO = require("oimo");  } catch(e) {} 
-        } else if(typeof define === 'function' && define.amd) {
-             if(require.specified && require.specified("oimo")) amdDependencies.push("oimo");
-        }
-    } else {
-        if(typeof define === 'function' && define.amd) {
-            if(!(require.specified && require.specified("' + dep.module + '"))) {
-                try { define("oimo", [], function () { return OIMO; }); } catch(e) { }
-            }
-            amdDependencies.push("oimo");
-        }
-    }
+    var CANNON = root.CANNON;
+    var OIMO = root.OIMO;
+    if(typeof exports === 'object' && typeof module === 'object') {
+         try {  CANNON = CANNON || require("cannon");  } catch(e) {} 
+         try {  OIMO = OIMO || require("oimo");  } catch(e) {} 
 
-    if(typeof exports === 'object' && typeof module === 'object')
         module.exports = factory(CANNON,OIMO);
-    else if(typeof define === 'function' && define.amd)
+    } else if(typeof define === 'function' && define.amd) {
+         if(require.specified && require.specified("cannon")) amdDependencies.push("cannon");
+         if(require.specified && require.specified("oimo")) amdDependencies.push("oimo");
+
         define("babylonjs", amdDependencies, factory);
-    else if(typeof exports === 'object')
+    } else if(typeof exports === 'object') {
+         try {  CANNON = CANNON || require("cannon");  } catch(e) {} 
+         try {  OIMO = OIMO || require("oimo");  } catch(e) {} 
+
         exports["babylonjs"] = factory(CANNON,OIMO);
-    else {
+    } else {
         root["BABYLON"] = factory(CANNON,OIMO);
     }
 })(this, function(CANNON,OIMO) {
-    "use strict";
+  CANNON = CANNON || this.CANNON;
+  OIMO = OIMO || this.OIMO;
+
+"use strict";
 var BABYLON;
 (function (BABYLON) {
     /**
@@ -15120,6 +15102,7 @@ var BABYLON;
             this.releaseEffects();
             // Unbind
             this.unbindAllAttributes();
+            this._boundUniforms = [];
             if (this._dummyFramebuffer) {
                 this._gl.deleteFramebuffer(this._dummyFramebuffer);
             }
@@ -47864,7 +47847,7 @@ var BABYLON;
          * @param loop defines if animations must loop
          * @param speedRatio defines the ratio to apply to animation speed (1 by default)
          * @param from defines the from key (optional)
-         * @param from defines the to key (optional)
+         * @param to defines the to key (optional)
          * @returns the current animation group
          */
         AnimationGroup.prototype.start = function (loop, speedRatio, from, to) {

dist/preview release/customConfigurations/minimalGLTFViewer/es6.js

@@ -15074,6 +15074,7 @@ var BABYLON;
             this.releaseEffects();
             // Unbind
             this.unbindAllAttributes();
+            this._boundUniforms = [];
             if (this._dummyFramebuffer) {
                 this._gl.deleteFramebuffer(this._dummyFramebuffer);
             }
@@ -47818,7 +47819,7 @@ var BABYLON;
          * @param loop defines if animations must loop
          * @param speedRatio defines the ratio to apply to animation speed (1 by default)
          * @param from defines the from key (optional)
-         * @param from defines the to key (optional)
+         * @param to defines the to key (optional)
          * @returns the current animation group
          */
         AnimationGroup.prototype.start = function (loop, speedRatio, from, to) {

dist/preview release/es6.js

@@ -15074,6 +15074,7 @@ var BABYLON;
             this.releaseEffects();
             // Unbind
             this.unbindAllAttributes();
+            this._boundUniforms = [];
             if (this._dummyFramebuffer) {
                 this._gl.deleteFramebuffer(this._dummyFramebuffer);
             }
@@ -47818,7 +47819,7 @@ var BABYLON;
          * @param loop defines if animations must loop
          * @param speedRatio defines the ratio to apply to animation speed (1 by default)
          * @param from defines the from key (optional)
-         * @param from defines the to key (optional)
+         * @param to defines the to key (optional)
          * @returns the current animation group
          */
         AnimationGroup.prototype.start = function (loop, speedRatio, from, to) {

dist/preview release/gui/babylon.gui.js

@@ -4,33 +4,26 @@ var __extends=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__p
 
 (function universalModuleDefinition(root, factory) {
     var amdDependencies = [];
-    var BABYLON = root. BABYLON;
-    if(!BABYLON) {
-        if(typeof exports === 'object') {
-             BABYLON = require("babylonjs"); 
-        } else if(typeof define === 'function' && define.amd) {
-             amdDependencies.push("babylonjs");
-        }
-    } else {
-        if(typeof define === 'function' && define.amd) {
-            if(!(require.specified && require.specified("' + dep.module + '"))) {
-                try { define("babylonjs", [], function () { return BABYLON; }); } catch(e) { }
-            }
-            amdDependencies.push("babylonjs");
-        }
-    }
+    var BABYLON = root.BABYLON;
+    if(typeof exports === 'object' && typeof module === 'object') {
+         BABYLON = BABYLON || require("babylonjs"); 
 
-    if(typeof exports === 'object' && typeof module === 'object')
         module.exports = factory(BABYLON);
-    else if(typeof define === 'function' && define.amd)
+    } else if(typeof define === 'function' && define.amd) {
+         amdDependencies.push("babylonjs");
+
         define("babylonjs-gui", amdDependencies, factory);
-    else if(typeof exports === 'object')
+    } else if(typeof exports === 'object') {
+         BABYLON = BABYLON || require("babylonjs"); 
+
         exports["babylonjs-gui"] = factory(BABYLON);
-    else {
+    } else {
         root["BABYLON"]["GUI"] = factory(BABYLON);
     }
 })(this, function(BABYLON) {
-    "use strict";
+  BABYLON = BABYLON || this.BABYLON;
+
+"use strict";
 /// <reference path="../../dist/preview release/babylon.d.ts"/>
 
 var BABYLON;

dist/preview release/loaders/babylonjs.loaders.js

@@ -4,33 +4,26 @@ var __extends=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__p
 
 (function universalModuleDefinition(root, factory) {
     var amdDependencies = [];
-    var BABYLON = root. BABYLON;
-    if(!BABYLON) {
-        if(typeof exports === 'object') {
-             BABYLON = require("babylonjs"); 
-        } else if(typeof define === 'function' && define.amd) {
-             amdDependencies.push("babylonjs");
-        }
-    } else {
-        if(typeof define === 'function' && define.amd) {
-            if(!(require.specified && require.specified("' + dep.module + '"))) {
-                try { define("babylonjs", [], function () { return BABYLON; }); } catch(e) { }
-            }
-            amdDependencies.push("babylonjs");
-        }
-    }
+    var BABYLON = root.BABYLON;
+    if(typeof exports === 'object' && typeof module === 'object') {
+         BABYLON = BABYLON || require("babylonjs"); 
 
-    if(typeof exports === 'object' && typeof module === 'object')
         module.exports = factory(BABYLON);
-    else if(typeof define === 'function' && define.amd)
+    } else if(typeof define === 'function' && define.amd) {
+         amdDependencies.push("babylonjs");
+
         define("babylonjs-loaders", amdDependencies, factory);
-    else if(typeof exports === 'object')
+    } else if(typeof exports === 'object') {
+         BABYLON = BABYLON || require("babylonjs"); 
+
         exports["babylonjs-loaders"] = factory(BABYLON);
-    else {
+    } else {
         root["BABYLON"] = factory(BABYLON);
     }
 })(this, function(BABYLON) {
-    "use strict";
+  BABYLON = BABYLON || this.BABYLON;
+
+"use strict";
 
 var BABYLON;
 (function (BABYLON) {

dist/preview release/materialsLibrary/babylonjs.materials.js

@@ -4,33 +4,26 @@ var __extends=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__p
 
 (function universalModuleDefinition(root, factory) {
     var amdDependencies = [];
-    var BABYLON = root. BABYLON;
-    if(!BABYLON) {
-        if(typeof exports === 'object') {
-             BABYLON = require("babylonjs"); 
-        } else if(typeof define === 'function' && define.amd) {
-             amdDependencies.push("babylonjs");
-        }
-    } else {
-        if(typeof define === 'function' && define.amd) {
-            if(!(require.specified && require.specified("' + dep.module + '"))) {
-                try { define("babylonjs", [], function () { return BABYLON; }); } catch(e) { }
-            }
-            amdDependencies.push("babylonjs");
-        }
-    }
+    var BABYLON = root.BABYLON;
+    if(typeof exports === 'object' && typeof module === 'object') {
+         BABYLON = BABYLON || require("babylonjs"); 
 
-    if(typeof exports === 'object' && typeof module === 'object')
         module.exports = factory(BABYLON);
-    else if(typeof define === 'function' && define.amd)
+    } else if(typeof define === 'function' && define.amd) {
+         amdDependencies.push("babylonjs");
+
         define("babylonjs-materials", amdDependencies, factory);
-    else if(typeof exports === 'object')
+    } else if(typeof exports === 'object') {
+         BABYLON = BABYLON || require("babylonjs"); 
+
         exports["babylonjs-materials"] = factory(BABYLON);
-    else {
+    } else {
         root["BABYLON"] = factory(BABYLON);
     }
 })(this, function(BABYLON) {
-    "use strict";
+  BABYLON = BABYLON || this.BABYLON;
+
+"use strict";
 
 
 var BABYLON;

dist/preview release/postProcessesLibrary/babylonjs.postProcess.js

@@ -4,33 +4,26 @@ var __extends=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__p
 
 (function universalModuleDefinition(root, factory) {
     var amdDependencies = [];
-    var BABYLON = root. BABYLON;
-    if(!BABYLON) {
-        if(typeof exports === 'object') {
-             BABYLON = require("babylonjs"); 
-        } else if(typeof define === 'function' && define.amd) {
-             amdDependencies.push("babylonjs");
-        }
-    } else {
-        if(typeof define === 'function' && define.amd) {
-            if(!(require.specified && require.specified("' + dep.module + '"))) {
-                try { define("babylonjs", [], function () { return BABYLON; }); } catch(e) { }
-            }
-            amdDependencies.push("babylonjs");
-        }
-    }
+    var BABYLON = root.BABYLON;
+    if(typeof exports === 'object' && typeof module === 'object') {
+         BABYLON = BABYLON || require("babylonjs"); 
 
-    if(typeof exports === 'object' && typeof module === 'object')
         module.exports = factory(BABYLON);
-    else if(typeof define === 'function' && define.amd)
+    } else if(typeof define === 'function' && define.amd) {
+         amdDependencies.push("babylonjs");
+
         define("babylonjs-post-process", amdDependencies, factory);
-    else if(typeof exports === 'object')
+    } else if(typeof exports === 'object') {
+         BABYLON = BABYLON || require("babylonjs"); 
+
         exports["babylonjs-post-process"] = factory(BABYLON);
-    else {
+    } else {
         root["BABYLON"] = factory(BABYLON);
     }
 })(this, function(BABYLON) {
-    "use strict";
+  BABYLON = BABYLON || this.BABYLON;
+
+"use strict";
 
 
 

dist/preview release/proceduralTexturesLibrary/babylonjs.proceduralTextures.js

@@ -4,33 +4,26 @@ var __extends=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__p
 
 (function universalModuleDefinition(root, factory) {
     var amdDependencies = [];
-    var BABYLON = root. BABYLON;
-    if(!BABYLON) {
-        if(typeof exports === 'object') {
-             BABYLON = require("babylonjs"); 
-        } else if(typeof define === 'function' && define.amd) {
-             amdDependencies.push("babylonjs");
-        }
-    } else {
-        if(typeof define === 'function' && define.amd) {
-            if(!(require.specified && require.specified("' + dep.module + '"))) {
-                try { define("babylonjs", [], function () { return BABYLON; }); } catch(e) { }
-            }
-            amdDependencies.push("babylonjs");
-        }
-    }
+    var BABYLON = root.BABYLON;
+    if(typeof exports === 'object' && typeof module === 'object') {
+         BABYLON = BABYLON || require("babylonjs"); 
 
-    if(typeof exports === 'object' && typeof module === 'object')
         module.exports = factory(BABYLON);
-    else if(typeof define === 'function' && define.amd)
+    } else if(typeof define === 'function' && define.amd) {
+         amdDependencies.push("babylonjs");
+
         define("babylonjs-procedural-textures", amdDependencies, factory);
-    else if(typeof exports === 'object')
+    } else if(typeof exports === 'object') {
+         BABYLON = BABYLON || require("babylonjs"); 
+
         exports["babylonjs-procedural-textures"] = factory(BABYLON);
-    else {
+    } else {
         root["BABYLON"] = factory(BABYLON);
     }
 })(this, function(BABYLON) {
-    "use strict";
+  BABYLON = BABYLON || this.BABYLON;
+
+"use strict";
 
 
 var BABYLON;

dist/preview release/serializers/babylonjs.serializers.js

@@ -4,33 +4,26 @@ var __extends=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__p
 
 (function universalModuleDefinition(root, factory) {
     var amdDependencies = [];
-    var BABYLON = root. BABYLON;
-    if(!BABYLON) {
-        if(typeof exports === 'object') {
-             BABYLON = require("babylonjs"); 
-        } else if(typeof define === 'function' && define.amd) {
-             amdDependencies.push("babylonjs");
-        }
-    } else {
-        if(typeof define === 'function' && define.amd) {
-            if(!(require.specified && require.specified("' + dep.module + '"))) {
-                try { define("babylonjs", [], function () { return BABYLON; }); } catch(e) { }
-            }
-            amdDependencies.push("babylonjs");
-        }
-    }
+    var BABYLON = root.BABYLON;
+    if(typeof exports === 'object' && typeof module === 'object') {
+         BABYLON = BABYLON || require("babylonjs"); 
 
-    if(typeof exports === 'object' && typeof module === 'object')
         module.exports = factory(BABYLON);
-    else if(typeof define === 'function' && define.amd)
+    } else if(typeof define === 'function' && define.amd) {
+         amdDependencies.push("babylonjs");
+
         define("babylonjs-serializers", amdDependencies, factory);
-    else if(typeof exports === 'object')
+    } else if(typeof exports === 'object') {
+         BABYLON = BABYLON || require("babylonjs"); 
+
         exports["babylonjs-serializers"] = factory(BABYLON);
-    else {
+    } else {
         root["BABYLON"] = factory(BABYLON);
     }
 })(this, function(BABYLON) {
-    "use strict";
+  BABYLON = BABYLON || this.BABYLON;
+
+"use strict";
 
 var BABYLON;
 (function (BABYLON) {