Merge pull request #3839 from RaananW/playground-fix

Playground fix

Tools/Gulp/config.json

@@ -1691,7 +1691,8 @@
                 "moduleDeclaration": {
                     "name": "INSPECTOR",
                     "module": "babylonjs-inspector"
-                }
+                },
+                "extendsRoot": true
             }
         ],
         "build": {

Tools/Gulp/gulp-addModuleExports.js

@@ -7,7 +7,6 @@ var through = require('through2');
  */
 module.exports = function (varName, subModule, extendsRoot, externalUsingBabylon, noBabylonInit) {
     return through.obj(function (file, enc, cb) {
-
         if (typeof varName === 'string') {
             varName = {
                 name: varName,
@@ -18,10 +17,6 @@ module.exports = function (varName, subModule, extendsRoot, externalUsingBabylon
             }
         }
 
-        var optionalRequire = ''; /* `var globalObject = (typeof global !== 'undefined') ? global : ((typeof window !== 'undefined') ? window : this);
-var babylonDependency = (globalObject && globalObject.BABYLON) || BABYLON || (typeof require !== 'undefined' && require("babylonjs"));
-var BABYLON = babylonDependency;
-`;*/
         function moduleExportAddition(varName) {
 
             let base = subModule ? 'BABYLON' : varName.name;
@@ -36,11 +31,11 @@ var BABYLON = babylonDependency;
     else {
         root["${base}"]${(subModule && !extendsRoot) ? '["' + varName.name + '"]' : ''} = factory(root["BABYLON"]);
     }
-})(this, function(BABYLON) {
+})(this, function(${varName.name === 'BABYLON' || noBabylonInit ? '' : 'BABYLON'}) {
     ${String(file.contents)}
-    ${varName.name === 'BABYLON' ? `
+    ${varName.name === 'BABYLON' || varName.name === 'INSPECTOR' ? `
 var globalObject = (typeof global !== 'undefined') ? global : ((typeof window !== 'undefined') ? window : this);
-globalObject["${varName.name}"] = BABYLON` : ''}
+globalObject["${varName.name}"] = ${varName.name}` : ''}
     return ${base}${(subModule && !extendsRoot) ? '.' + varName.name : ''};
 });
 `;
@@ -77,9 +72,7 @@ globalObject["${varName.name}"] = BABYLON` : ''}
             return;
         }
 
-        if (noBabylonInit) {
-            optionalRequire = '';
-        }
+        var optionalRequire = '';
 
         try {
             if (externalUsingBabylon) {

Tools/Gulp/gulpfile.js

@@ -480,7 +480,7 @@ var buildExternalLibrary = function (library, settings, watch) {
                 sequence.push(
                     wpBuild
                         .pipe(rename(library.output.replace(".js", library.noBundleInName ? '.js' : ".bundle.js")))
-                        .pipe(addModuleExports(library.moduleDeclaration, false, false, true))
+                        .pipe(addModuleExports(library.moduleDeclaration, false, library.extendsRoot, true))
                         .pipe(uglify())
                         .pipe(optimisejs())
                         .pipe(gulp.dest(outputDirectory))

dist/preview release/babylon.max.js

@@ -26,7 +26,7 @@ var __extends = (this && this.__extends) || (function () {
     else {
         root["BABYLON"] = factory(root["BABYLON"]);
     }
-})(this, function(BABYLON) {
+})(this, function() {
     var BABYLON;
 (function (BABYLON) {
     /**
@@ -47414,7 +47414,7 @@ var BABYLON;
         };
         RuntimeAnimation.prototype._getCorrectLoopMode = function () {
             if (this._target && this._target.animationPropertiesOverride) {
-                return this._target.loopMode;
+                return this._target.animationPropertiesOverride.loopMode;
             }
             return this._animation.loopMode;
         };

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

@@ -26,7 +26,7 @@ var __extends = (this && this.__extends) || (function () {
     else {
         root["BABYLON"] = factory(root["BABYLON"]);
     }
-})(this, function(BABYLON) {
+})(this, function() {
     var BABYLON;
 (function (BABYLON) {
     /**
@@ -47414,7 +47414,7 @@ var BABYLON;
         };
         RuntimeAnimation.prototype._getCorrectLoopMode = function () {
             if (this._target && this._target.animationPropertiesOverride) {
-                return this._target.loopMode;
+                return this._target.animationPropertiesOverride.loopMode;
             }
             return this._animation.loopMode;
         };

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

@@ -47387,7 +47387,7 @@ var BABYLON;
         };
         RuntimeAnimation.prototype._getCorrectLoopMode = function () {
             if (this._target && this._target.animationPropertiesOverride) {
-                return this._target.loopMode;
+                return this._target.animationPropertiesOverride.loopMode;
             }
             return this._animation.loopMode;
         };

dist/preview release/es6.js

@@ -47387,7 +47387,7 @@ var BABYLON;
         };
         RuntimeAnimation.prototype._getCorrectLoopMode = function () {
             if (this._target && this._target.animationPropertiesOverride) {
-                return this._target.loopMode;
+                return this._target.animationPropertiesOverride.loopMode;
             }
             return this._animation.loopMode;
         };

dist/preview release/viewer/babylon.viewer.max.js

@@ -10,7 +10,7 @@
     else {
         root["BabylonViewer"] = factory(root["BABYLON"]);
     }
-})(this, function(BABYLON) {
+})(this, function() {
     var BabylonViewer =
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
@@ -109,7 +109,7 @@ var __extends = (this && this.__extends) || (function () {
     else {
         root["BABYLON"] = factory(root["BABYLON"]);
     }
-})(this, function(BABYLON) {
+})(this, function() {
     var BABYLON;
 (function (BABYLON) {
     /**
@@ -47497,7 +47497,7 @@ var BABYLON;
         };
         RuntimeAnimation.prototype._getCorrectLoopMode = function () {
             if (this._target && this._target.animationPropertiesOverride) {
-                return this._target.loopMode;
+                return this._target.animationPropertiesOverride.loopMode;
             }
             return this._animation.loopMode;
         };

dist/preview release/what's new.md

@@ -97,7 +97,7 @@
 - (Viewer) Disabling templates now work correctly ([RaananW](https://github.com/RaananW))
 - AMD "define" declaration is no longer anonymous ([RaananW](https://github.com/RaananW))
 - Collision worker didn't initialize instanced meshes correctly - [#3819](https://github.com/BabylonJS/Babylon.js/issues/3819) ([RaananW](https://github.com/RaananW))
-- postMessage calls in webworkers were fixed ([RaananW](https://github.com/RaananW))
+- postMessage calls in webworkers were fixed. ([RaananW](https://github.com/RaananW))
 - fixed WebCam Texture on Firefox and Edge - [#3825](https://github.com/BabylonJS/Babylon.js/issues/3825) ([sebavan](https://github.com/sebavan))
 
 ## Breaking changes