Build

dist/preview release/babylon.max.js

@@ -109191,7 +109191,7 @@ var BABYLON;
             this._tmpMatrix = new BABYLON.Matrix();
             this._frameObserver = helper._sessionManager.onXRFrameObservable.add(function () {
                 if (!helper._sessionManager._currentXRFrame || !helper._sessionManager._currentXRFrame.getDevicePose) {
-                    return false;
+                    return;
                 }
                 var xrFrame = helper._sessionManager._currentXRFrame;
                 var inputSources = helper._sessionManager._xrSession.getInputSources();

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

@@ -109158,7 +109158,7 @@ var BABYLON;
             this._tmpMatrix = new BABYLON.Matrix();
             this._frameObserver = helper._sessionManager.onXRFrameObservable.add(function () {
                 if (!helper._sessionManager._currentXRFrame || !helper._sessionManager._currentXRFrame.getDevicePose) {
-                    return false;
+                    return;
                 }
                 var xrFrame = helper._sessionManager._currentXRFrame;
                 var inputSources = helper._sessionManager._xrSession.getInputSources();

dist/preview release/es6.js

@@ -109158,7 +109158,7 @@ var BABYLON;
             this._tmpMatrix = new BABYLON.Matrix();
             this._frameObserver = helper._sessionManager.onXRFrameObservable.add(function () {
                 if (!helper._sessionManager._currentXRFrame || !helper._sessionManager._currentXRFrame.getDevicePose) {
-                    return false;
+                    return;
                 }
                 var xrFrame = helper._sessionManager._currentXRFrame;
                 var inputSources = helper._sessionManager._xrSession.getInputSources();

dist/preview release/loaders/babylon.glTF1FileLoader.js

@@ -164,9 +164,9 @@ __export(__webpack_require__(/*! ../src/glTF/1.0 */ "./src/glTF/1.0/index.ts"));
 
 /***/ }),
 
-/***/ "./src/glTF/1.0/GLTF1Loader.ts":
+/***/ "./src/glTF/1.0/glTF1Loader.ts":
 /*!*************************************!*\
-  !*** ./src/glTF/1.0/GLTF1Loader.ts ***!
+  !*** ./src/glTF/1.0/glTF1Loader.ts ***!
   \*************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
@@ -1715,7 +1715,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var glTFLoaderExtension_1 = __webpack_require__(/*! ./glTFLoaderExtension */ "./src/glTF/1.0/glTFLoaderExtension.ts");
 var glTFLoaderUtils_1 = __webpack_require__(/*! ./glTFLoaderUtils */ "./src/glTF/1.0/glTFLoaderUtils.ts");
 var glTFLoaderInterfaces_1 = __webpack_require__(/*! ./glTFLoaderInterfaces */ "./src/glTF/1.0/glTFLoaderInterfaces.ts");
-var GLTF1Loader_1 = __webpack_require__(/*! ./GLTF1Loader */ "./src/glTF/1.0/GLTF1Loader.ts");
+var glTF1Loader_1 = __webpack_require__(/*! ./glTF1Loader */ "./src/glTF/1.0/glTF1Loader.ts");
 var BinaryExtensionBufferName = "binary_glTF";
 /** @hidden */
 var GLTFBinaryExtension = /** @class */ (function (_super) {
@@ -1729,7 +1729,7 @@ var GLTFBinaryExtension = /** @class */ (function (_super) {
             return false;
         }
         this._bin = data.bin;
-        onSuccess(GLTF1Loader_1.GLTFLoaderBase.CreateRuntime(data.json, scene, rootUrl));
+        onSuccess(glTF1Loader_1.GLTFLoaderBase.CreateRuntime(data.json, scene, rootUrl));
         return true;
     };
     GLTFBinaryExtension.prototype.loadBufferAsync = function (gltfRuntime, id, onSuccess, onError) {
@@ -1771,7 +1771,7 @@ var GLTFBinaryExtension = /** @class */ (function (_super) {
     return GLTFBinaryExtension;
 }(glTFLoaderExtension_1.GLTFLoaderExtension));
 exports.GLTFBinaryExtension = GLTFBinaryExtension;
-GLTF1Loader_1.GLTF1Loader.RegisterExtension(new GLTFBinaryExtension());
+glTF1Loader_1.GLTF1Loader.RegisterExtension(new GLTFBinaryExtension());
 
 
 /***/ }),
@@ -1786,7 +1786,7 @@ GLTF1Loader_1.GLTF1Loader.RegisterExtension(new GLTFBinaryExtension());
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var GLTF1Loader_1 = __webpack_require__(/*! ./GLTF1Loader */ "./src/glTF/1.0/GLTF1Loader.ts");
+var glTF1Loader_1 = __webpack_require__(/*! ./glTF1Loader */ "./src/glTF/1.0/glTF1Loader.ts");
 /** @hidden */
 var GLTFLoaderExtension = /** @class */ (function () {
     function GLTFLoaderExtension(name) {
@@ -1859,7 +1859,7 @@ var GLTFLoaderExtension = /** @class */ (function () {
                 if (!onSuccess) {
                     return;
                 }
-                onSuccess(GLTF1Loader_1.GLTFLoaderBase.CreateRuntime(data.json, scene, rootUrl));
+                onSuccess(glTF1Loader_1.GLTFLoaderBase.CreateRuntime(data.json, scene, rootUrl));
             });
         });
     };
@@ -1876,7 +1876,7 @@ var GLTFLoaderExtension = /** @class */ (function () {
         GLTFLoaderExtension.ApplyExtensions(function (loaderExtension) {
             return loaderExtension.loadBufferAsync(gltfRuntime, id, onSuccess, onError, onProgress);
         }, function () {
-            GLTF1Loader_1.GLTFLoaderBase.LoadBufferAsync(gltfRuntime, id, onSuccess, onError, onProgress);
+            glTF1Loader_1.GLTFLoaderBase.LoadBufferAsync(gltfRuntime, id, onSuccess, onError, onProgress);
         });
     };
     GLTFLoaderExtension.LoadTextureAsync = function (gltfRuntime, id, onSuccess, onError) {
@@ -1890,33 +1890,33 @@ var GLTFLoaderExtension = /** @class */ (function () {
         GLTFLoaderExtension.ApplyExtensions(function (loaderExtension) {
             return loaderExtension.loadShaderStringAsync(gltfRuntime, id, onSuccess, onError);
         }, function () {
-            GLTF1Loader_1.GLTFLoaderBase.LoadShaderStringAsync(gltfRuntime, id, onSuccess, onError);
+            glTF1Loader_1.GLTFLoaderBase.LoadShaderStringAsync(gltfRuntime, id, onSuccess, onError);
         });
     };
     GLTFLoaderExtension.LoadMaterialAsync = function (gltfRuntime, id, onSuccess, onError) {
         GLTFLoaderExtension.ApplyExtensions(function (loaderExtension) {
             return loaderExtension.loadMaterialAsync(gltfRuntime, id, onSuccess, onError);
         }, function () {
-            GLTF1Loader_1.GLTFLoaderBase.LoadMaterialAsync(gltfRuntime, id, onSuccess, onError);
+            glTF1Loader_1.GLTFLoaderBase.LoadMaterialAsync(gltfRuntime, id, onSuccess, onError);
         });
     };
     GLTFLoaderExtension.LoadTextureBufferAsync = function (gltfRuntime, id, onSuccess, onError) {
         GLTFLoaderExtension.ApplyExtensions(function (loaderExtension) {
             return loaderExtension.loadTextureBufferAsync(gltfRuntime, id, onSuccess, onError);
         }, function () {
-            GLTF1Loader_1.GLTFLoaderBase.LoadTextureBufferAsync(gltfRuntime, id, onSuccess, onError);
+            glTF1Loader_1.GLTFLoaderBase.LoadTextureBufferAsync(gltfRuntime, id, onSuccess, onError);
         });
     };
     GLTFLoaderExtension.CreateTextureAsync = function (gltfRuntime, id, buffer, onSuccess, onError) {
         GLTFLoaderExtension.ApplyExtensions(function (loaderExtension) {
             return loaderExtension.createTextureAsync(gltfRuntime, id, buffer, onSuccess, onError);
         }, function () {
-            GLTF1Loader_1.GLTFLoaderBase.CreateTextureAsync(gltfRuntime, id, buffer, onSuccess, onError);
+            glTF1Loader_1.GLTFLoaderBase.CreateTextureAsync(gltfRuntime, id, buffer, onSuccess, onError);
         });
     };
     GLTFLoaderExtension.ApplyExtensions = function (func, defaultFunc) {
-        for (var extensionName in GLTF1Loader_1.GLTF1Loader.Extensions) {
-            var loaderExtension = GLTF1Loader_1.GLTF1Loader.Extensions[extensionName];
+        for (var extensionName in glTF1Loader_1.GLTF1Loader.Extensions) {
+            var loaderExtension = glTF1Loader_1.GLTF1Loader.Extensions[extensionName];
             if (func(loaderExtension)) {
                 return;
             }
@@ -2306,7 +2306,7 @@ var __extends = (this && this.__extends) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 var _1 = __webpack_require__(/*! . */ "./src/glTF/1.0/index.ts");
 var babylonjs_1 = __webpack_require__(/*! babylonjs */ "babylonjs");
-var GLTF1Loader_1 = __webpack_require__(/*! ./GLTF1Loader */ "./src/glTF/1.0/GLTF1Loader.ts");
+var glTF1Loader_1 = __webpack_require__(/*! ./glTF1Loader */ "./src/glTF/1.0/glTF1Loader.ts");
 /** @hidden */
 var GLTFMaterialsCommonExtension = /** @class */ (function (_super) {
     __extends(GLTFMaterialsCommonExtension, _super);
@@ -2420,7 +2420,7 @@ var GLTFMaterialsCommonExtension = /** @class */ (function (_super) {
     return GLTFMaterialsCommonExtension;
 }(_1.GLTFLoaderExtension));
 exports.GLTFMaterialsCommonExtension = GLTFMaterialsCommonExtension;
-GLTF1Loader_1.GLTF1Loader.RegisterExtension(new GLTFMaterialsCommonExtension());
+glTF1Loader_1.GLTF1Loader.RegisterExtension(new GLTFMaterialsCommonExtension());
 
 
 /***/ }),
@@ -2439,7 +2439,7 @@ function __export(m) {
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 __export(__webpack_require__(/*! ./glTFBinaryExtension */ "./src/glTF/1.0/glTFBinaryExtension.ts"));
-__export(__webpack_require__(/*! ./GLTF1Loader */ "./src/glTF/1.0/GLTF1Loader.ts"));
+__export(__webpack_require__(/*! ./glTF1Loader */ "./src/glTF/1.0/glTF1Loader.ts"));
 __export(__webpack_require__(/*! ./glTFLoaderExtension */ "./src/glTF/1.0/glTFLoaderExtension.ts"));
 __export(__webpack_require__(/*! ./glTFLoaderInterfaces */ "./src/glTF/1.0/glTFLoaderInterfaces.ts"));
 __export(__webpack_require__(/*! ./glTFLoaderUtils */ "./src/glTF/1.0/glTFLoaderUtils.ts"));

dist/preview release/loaders/babylon.glTFFileLoader.js

@@ -169,9 +169,9 @@ __export(__webpack_require__(/*! ../src/glTF/2.0 */ "./src/glTF/2.0/index.ts"));
 
 /***/ }),
 
-/***/ "./src/glTF/1.0/GLTF1Loader.ts":
+/***/ "./src/glTF/1.0/glTF1Loader.ts":
 /*!*************************************!*\
-  !*** ./src/glTF/1.0/GLTF1Loader.ts ***!
+  !*** ./src/glTF/1.0/glTF1Loader.ts ***!
   \*************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
@@ -1720,7 +1720,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var glTFLoaderExtension_1 = __webpack_require__(/*! ./glTFLoaderExtension */ "./src/glTF/1.0/glTFLoaderExtension.ts");
 var glTFLoaderUtils_1 = __webpack_require__(/*! ./glTFLoaderUtils */ "./src/glTF/1.0/glTFLoaderUtils.ts");
 var glTFLoaderInterfaces_1 = __webpack_require__(/*! ./glTFLoaderInterfaces */ "./src/glTF/1.0/glTFLoaderInterfaces.ts");
-var GLTF1Loader_1 = __webpack_require__(/*! ./GLTF1Loader */ "./src/glTF/1.0/GLTF1Loader.ts");
+var glTF1Loader_1 = __webpack_require__(/*! ./glTF1Loader */ "./src/glTF/1.0/glTF1Loader.ts");
 var BinaryExtensionBufferName = "binary_glTF";
 /** @hidden */
 var GLTFBinaryExtension = /** @class */ (function (_super) {
@@ -1734,7 +1734,7 @@ var GLTFBinaryExtension = /** @class */ (function (_super) {
             return false;
         }
         this._bin = data.bin;
-        onSuccess(GLTF1Loader_1.GLTFLoaderBase.CreateRuntime(data.json, scene, rootUrl));
+        onSuccess(glTF1Loader_1.GLTFLoaderBase.CreateRuntime(data.json, scene, rootUrl));
         return true;
     };
     GLTFBinaryExtension.prototype.loadBufferAsync = function (gltfRuntime, id, onSuccess, onError) {
@@ -1776,7 +1776,7 @@ var GLTFBinaryExtension = /** @class */ (function (_super) {
     return GLTFBinaryExtension;
 }(glTFLoaderExtension_1.GLTFLoaderExtension));
 exports.GLTFBinaryExtension = GLTFBinaryExtension;
-GLTF1Loader_1.GLTF1Loader.RegisterExtension(new GLTFBinaryExtension());
+glTF1Loader_1.GLTF1Loader.RegisterExtension(new GLTFBinaryExtension());
 
 
 /***/ }),
@@ -1791,7 +1791,7 @@ GLTF1Loader_1.GLTF1Loader.RegisterExtension(new GLTFBinaryExtension());
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var GLTF1Loader_1 = __webpack_require__(/*! ./GLTF1Loader */ "./src/glTF/1.0/GLTF1Loader.ts");
+var glTF1Loader_1 = __webpack_require__(/*! ./glTF1Loader */ "./src/glTF/1.0/glTF1Loader.ts");
 /** @hidden */
 var GLTFLoaderExtension = /** @class */ (function () {
     function GLTFLoaderExtension(name) {
@@ -1864,7 +1864,7 @@ var GLTFLoaderExtension = /** @class */ (function () {
                 if (!onSuccess) {
                     return;
                 }
-                onSuccess(GLTF1Loader_1.GLTFLoaderBase.CreateRuntime(data.json, scene, rootUrl));
+                onSuccess(glTF1Loader_1.GLTFLoaderBase.CreateRuntime(data.json, scene, rootUrl));
             });
         });
     };
@@ -1881,7 +1881,7 @@ var GLTFLoaderExtension = /** @class */ (function () {
         GLTFLoaderExtension.ApplyExtensions(function (loaderExtension) {
             return loaderExtension.loadBufferAsync(gltfRuntime, id, onSuccess, onError, onProgress);
         }, function () {
-            GLTF1Loader_1.GLTFLoaderBase.LoadBufferAsync(gltfRuntime, id, onSuccess, onError, onProgress);
+            glTF1Loader_1.GLTFLoaderBase.LoadBufferAsync(gltfRuntime, id, onSuccess, onError, onProgress);
         });
     };
     GLTFLoaderExtension.LoadTextureAsync = function (gltfRuntime, id, onSuccess, onError) {
@@ -1895,33 +1895,33 @@ var GLTFLoaderExtension = /** @class */ (function () {
         GLTFLoaderExtension.ApplyExtensions(function (loaderExtension) {
             return loaderExtension.loadShaderStringAsync(gltfRuntime, id, onSuccess, onError);
         }, function () {
-            GLTF1Loader_1.GLTFLoaderBase.LoadShaderStringAsync(gltfRuntime, id, onSuccess, onError);
+            glTF1Loader_1.GLTFLoaderBase.LoadShaderStringAsync(gltfRuntime, id, onSuccess, onError);
         });
     };
     GLTFLoaderExtension.LoadMaterialAsync = function (gltfRuntime, id, onSuccess, onError) {
         GLTFLoaderExtension.ApplyExtensions(function (loaderExtension) {
             return loaderExtension.loadMaterialAsync(gltfRuntime, id, onSuccess, onError);
         }, function () {
-            GLTF1Loader_1.GLTFLoaderBase.LoadMaterialAsync(gltfRuntime, id, onSuccess, onError);
+            glTF1Loader_1.GLTFLoaderBase.LoadMaterialAsync(gltfRuntime, id, onSuccess, onError);
         });
     };
     GLTFLoaderExtension.LoadTextureBufferAsync = function (gltfRuntime, id, onSuccess, onError) {
         GLTFLoaderExtension.ApplyExtensions(function (loaderExtension) {
             return loaderExtension.loadTextureBufferAsync(gltfRuntime, id, onSuccess, onError);
         }, function () {
-            GLTF1Loader_1.GLTFLoaderBase.LoadTextureBufferAsync(gltfRuntime, id, onSuccess, onError);
+            glTF1Loader_1.GLTFLoaderBase.LoadTextureBufferAsync(gltfRuntime, id, onSuccess, onError);
         });
     };
     GLTFLoaderExtension.CreateTextureAsync = function (gltfRuntime, id, buffer, onSuccess, onError) {
         GLTFLoaderExtension.ApplyExtensions(function (loaderExtension) {
             return loaderExtension.createTextureAsync(gltfRuntime, id, buffer, onSuccess, onError);
         }, function () {
-            GLTF1Loader_1.GLTFLoaderBase.CreateTextureAsync(gltfRuntime, id, buffer, onSuccess, onError);
+            glTF1Loader_1.GLTFLoaderBase.CreateTextureAsync(gltfRuntime, id, buffer, onSuccess, onError);
         });
     };
     GLTFLoaderExtension.ApplyExtensions = function (func, defaultFunc) {
-        for (var extensionName in GLTF1Loader_1.GLTF1Loader.Extensions) {
-            var loaderExtension = GLTF1Loader_1.GLTF1Loader.Extensions[extensionName];
+        for (var extensionName in glTF1Loader_1.GLTF1Loader.Extensions) {
+            var loaderExtension = glTF1Loader_1.GLTF1Loader.Extensions[extensionName];
             if (func(loaderExtension)) {
                 return;
             }
@@ -2311,7 +2311,7 @@ var __extends = (this && this.__extends) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 var _1 = __webpack_require__(/*! . */ "./src/glTF/1.0/index.ts");
 var babylonjs_1 = __webpack_require__(/*! babylonjs */ "babylonjs");
-var GLTF1Loader_1 = __webpack_require__(/*! ./GLTF1Loader */ "./src/glTF/1.0/GLTF1Loader.ts");
+var glTF1Loader_1 = __webpack_require__(/*! ./glTF1Loader */ "./src/glTF/1.0/glTF1Loader.ts");
 /** @hidden */
 var GLTFMaterialsCommonExtension = /** @class */ (function (_super) {
     __extends(GLTFMaterialsCommonExtension, _super);
@@ -2425,7 +2425,7 @@ var GLTFMaterialsCommonExtension = /** @class */ (function (_super) {
     return GLTFMaterialsCommonExtension;
 }(_1.GLTFLoaderExtension));
 exports.GLTFMaterialsCommonExtension = GLTFMaterialsCommonExtension;
-GLTF1Loader_1.GLTF1Loader.RegisterExtension(new GLTFMaterialsCommonExtension());
+glTF1Loader_1.GLTF1Loader.RegisterExtension(new GLTFMaterialsCommonExtension());
 
 
 /***/ }),
@@ -2444,7 +2444,7 @@ function __export(m) {
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 __export(__webpack_require__(/*! ./glTFBinaryExtension */ "./src/glTF/1.0/glTFBinaryExtension.ts"));
-__export(__webpack_require__(/*! ./GLTF1Loader */ "./src/glTF/1.0/GLTF1Loader.ts"));
+__export(__webpack_require__(/*! ./glTF1Loader */ "./src/glTF/1.0/glTF1Loader.ts"));
 __export(__webpack_require__(/*! ./glTFLoaderExtension */ "./src/glTF/1.0/glTFLoaderExtension.ts"));
 __export(__webpack_require__(/*! ./glTFLoaderInterfaces */ "./src/glTF/1.0/glTFLoaderInterfaces.ts"));
 __export(__webpack_require__(/*! ./glTFLoaderUtils */ "./src/glTF/1.0/glTFLoaderUtils.ts"));

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

@@ -1313,9 +1313,9 @@ if (babylonjs_1.SceneLoader) {
 
 /***/ }),
 
-/***/ "./src/glTF/1.0/GLTF1Loader.ts":
+/***/ "./src/glTF/1.0/glTF1Loader.ts":
 /*!*************************************!*\
-  !*** ./src/glTF/1.0/GLTF1Loader.ts ***!
+  !*** ./src/glTF/1.0/glTF1Loader.ts ***!
   \*************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
@@ -2864,7 +2864,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var glTFLoaderExtension_1 = __webpack_require__(/*! ./glTFLoaderExtension */ "./src/glTF/1.0/glTFLoaderExtension.ts");
 var glTFLoaderUtils_1 = __webpack_require__(/*! ./glTFLoaderUtils */ "./src/glTF/1.0/glTFLoaderUtils.ts");
 var glTFLoaderInterfaces_1 = __webpack_require__(/*! ./glTFLoaderInterfaces */ "./src/glTF/1.0/glTFLoaderInterfaces.ts");
-var GLTF1Loader_1 = __webpack_require__(/*! ./GLTF1Loader */ "./src/glTF/1.0/GLTF1Loader.ts");
+var glTF1Loader_1 = __webpack_require__(/*! ./glTF1Loader */ "./src/glTF/1.0/glTF1Loader.ts");
 var BinaryExtensionBufferName = "binary_glTF";
 /** @hidden */
 var GLTFBinaryExtension = /** @class */ (function (_super) {
@@ -2878,7 +2878,7 @@ var GLTFBinaryExtension = /** @class */ (function (_super) {
             return false;
         }
         this._bin = data.bin;
-        onSuccess(GLTF1Loader_1.GLTFLoaderBase.CreateRuntime(data.json, scene, rootUrl));
+        onSuccess(glTF1Loader_1.GLTFLoaderBase.CreateRuntime(data.json, scene, rootUrl));
         return true;
     };
     GLTFBinaryExtension.prototype.loadBufferAsync = function (gltfRuntime, id, onSuccess, onError) {
@@ -2920,7 +2920,7 @@ var GLTFBinaryExtension = /** @class */ (function (_super) {
     return GLTFBinaryExtension;
 }(glTFLoaderExtension_1.GLTFLoaderExtension));
 exports.GLTFBinaryExtension = GLTFBinaryExtension;
-GLTF1Loader_1.GLTF1Loader.RegisterExtension(new GLTFBinaryExtension());
+glTF1Loader_1.GLTF1Loader.RegisterExtension(new GLTFBinaryExtension());
 
 
 /***/ }),
@@ -2935,7 +2935,7 @@ GLTF1Loader_1.GLTF1Loader.RegisterExtension(new GLTFBinaryExtension());
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var GLTF1Loader_1 = __webpack_require__(/*! ./GLTF1Loader */ "./src/glTF/1.0/GLTF1Loader.ts");
+var glTF1Loader_1 = __webpack_require__(/*! ./glTF1Loader */ "./src/glTF/1.0/glTF1Loader.ts");
 /** @hidden */
 var GLTFLoaderExtension = /** @class */ (function () {
     function GLTFLoaderExtension(name) {
@@ -3008,7 +3008,7 @@ var GLTFLoaderExtension = /** @class */ (function () {
                 if (!onSuccess) {
                     return;
                 }
-                onSuccess(GLTF1Loader_1.GLTFLoaderBase.CreateRuntime(data.json, scene, rootUrl));
+                onSuccess(glTF1Loader_1.GLTFLoaderBase.CreateRuntime(data.json, scene, rootUrl));
             });
         });
     };
@@ -3025,7 +3025,7 @@ var GLTFLoaderExtension = /** @class */ (function () {
         GLTFLoaderExtension.ApplyExtensions(function (loaderExtension) {
             return loaderExtension.loadBufferAsync(gltfRuntime, id, onSuccess, onError, onProgress);
         }, function () {
-            GLTF1Loader_1.GLTFLoaderBase.LoadBufferAsync(gltfRuntime, id, onSuccess, onError, onProgress);
+            glTF1Loader_1.GLTFLoaderBase.LoadBufferAsync(gltfRuntime, id, onSuccess, onError, onProgress);
         });
     };
     GLTFLoaderExtension.LoadTextureAsync = function (gltfRuntime, id, onSuccess, onError) {
@@ -3039,33 +3039,33 @@ var GLTFLoaderExtension = /** @class */ (function () {
         GLTFLoaderExtension.ApplyExtensions(function (loaderExtension) {
             return loaderExtension.loadShaderStringAsync(gltfRuntime, id, onSuccess, onError);
         }, function () {
-            GLTF1Loader_1.GLTFLoaderBase.LoadShaderStringAsync(gltfRuntime, id, onSuccess, onError);
+            glTF1Loader_1.GLTFLoaderBase.LoadShaderStringAsync(gltfRuntime, id, onSuccess, onError);
         });
     };
     GLTFLoaderExtension.LoadMaterialAsync = function (gltfRuntime, id, onSuccess, onError) {
         GLTFLoaderExtension.ApplyExtensions(function (loaderExtension) {
             return loaderExtension.loadMaterialAsync(gltfRuntime, id, onSuccess, onError);
         }, function () {
-            GLTF1Loader_1.GLTFLoaderBase.LoadMaterialAsync(gltfRuntime, id, onSuccess, onError);
+            glTF1Loader_1.GLTFLoaderBase.LoadMaterialAsync(gltfRuntime, id, onSuccess, onError);
         });
     };
     GLTFLoaderExtension.LoadTextureBufferAsync = function (gltfRuntime, id, onSuccess, onError) {
         GLTFLoaderExtension.ApplyExtensions(function (loaderExtension) {
             return loaderExtension.loadTextureBufferAsync(gltfRuntime, id, onSuccess, onError);
         }, function () {
-            GLTF1Loader_1.GLTFLoaderBase.LoadTextureBufferAsync(gltfRuntime, id, onSuccess, onError);
+            glTF1Loader_1.GLTFLoaderBase.LoadTextureBufferAsync(gltfRuntime, id, onSuccess, onError);
         });
     };
     GLTFLoaderExtension.CreateTextureAsync = function (gltfRuntime, id, buffer, onSuccess, onError) {
         GLTFLoaderExtension.ApplyExtensions(function (loaderExtension) {
             return loaderExtension.createTextureAsync(gltfRuntime, id, buffer, onSuccess, onError);
         }, function () {
-            GLTF1Loader_1.GLTFLoaderBase.CreateTextureAsync(gltfRuntime, id, buffer, onSuccess, onError);
+            glTF1Loader_1.GLTFLoaderBase.CreateTextureAsync(gltfRuntime, id, buffer, onSuccess, onError);
         });
     };
     GLTFLoaderExtension.ApplyExtensions = function (func, defaultFunc) {
-        for (var extensionName in GLTF1Loader_1.GLTF1Loader.Extensions) {
-            var loaderExtension = GLTF1Loader_1.GLTF1Loader.Extensions[extensionName];
+        for (var extensionName in glTF1Loader_1.GLTF1Loader.Extensions) {
+            var loaderExtension = glTF1Loader_1.GLTF1Loader.Extensions[extensionName];
             if (func(loaderExtension)) {
                 return;
             }
@@ -3455,7 +3455,7 @@ var __extends = (this && this.__extends) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 var _1 = __webpack_require__(/*! . */ "./src/glTF/1.0/index.ts");
 var babylonjs_1 = __webpack_require__(/*! babylonjs */ "babylonjs");
-var GLTF1Loader_1 = __webpack_require__(/*! ./GLTF1Loader */ "./src/glTF/1.0/GLTF1Loader.ts");
+var glTF1Loader_1 = __webpack_require__(/*! ./glTF1Loader */ "./src/glTF/1.0/glTF1Loader.ts");
 /** @hidden */
 var GLTFMaterialsCommonExtension = /** @class */ (function (_super) {
     __extends(GLTFMaterialsCommonExtension, _super);
@@ -3569,7 +3569,7 @@ var GLTFMaterialsCommonExtension = /** @class */ (function (_super) {
     return GLTFMaterialsCommonExtension;
 }(_1.GLTFLoaderExtension));
 exports.GLTFMaterialsCommonExtension = GLTFMaterialsCommonExtension;
-GLTF1Loader_1.GLTF1Loader.RegisterExtension(new GLTFMaterialsCommonExtension());
+glTF1Loader_1.GLTF1Loader.RegisterExtension(new GLTFMaterialsCommonExtension());
 
 
 /***/ }),
@@ -3588,7 +3588,7 @@ function __export(m) {
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 __export(__webpack_require__(/*! ./glTFBinaryExtension */ "./src/glTF/1.0/glTFBinaryExtension.ts"));
-__export(__webpack_require__(/*! ./GLTF1Loader */ "./src/glTF/1.0/GLTF1Loader.ts"));
+__export(__webpack_require__(/*! ./glTF1Loader */ "./src/glTF/1.0/glTF1Loader.ts"));
 __export(__webpack_require__(/*! ./glTFLoaderExtension */ "./src/glTF/1.0/glTFLoaderExtension.ts"));
 __export(__webpack_require__(/*! ./glTFLoaderInterfaces */ "./src/glTF/1.0/glTFLoaderInterfaces.ts"));
 __export(__webpack_require__(/*! ./glTFLoaderUtils */ "./src/glTF/1.0/glTFLoaderUtils.ts"));

dist/preview release/loaders/babylonjs.loaders.module.d.ts

@@ -347,7 +347,7 @@ declare module 'babylonjs-loaders/src/glTF/glTFFileLoader' {
 
 declare module 'babylonjs-loaders/src/glTF/1.0' {
     export * from "babylonjs-loaders/src/glTF/1.0/glTFBinaryExtension";
-    export * from "babylonjs-loaders/src/glTF/1.0/GLTF1Loader";
+    export * from "babylonjs-loaders/src/glTF/1.0/glTF1Loader";
     export * from "babylonjs-loaders/src/glTF/1.0/glTFLoaderExtension";
     export * from "babylonjs-loaders/src/glTF/1.0/glTFLoaderInterfaces";
     export * from "babylonjs-loaders/src/glTF/1.0/glTFLoaderUtils";
@@ -543,7 +543,7 @@ declare module 'babylonjs-loaders/src/glTF/1.0/glTFBinaryExtension' {
     }
 }
 
-declare module 'babylonjs-loaders/src/glTF/1.0/GLTF1Loader' {
+declare module 'babylonjs-loaders/src/glTF/1.0/glTF1Loader' {
     import { IGLTFRuntime } from "babylonjs-loaders/src/glTF/1.0/glTFLoaderInterfaces";
     import { Nullable, Skeleton, Material, AbstractMesh, Texture, Scene, SceneLoaderProgressEvent, IParticleSystem, AnimationGroup } from "babylonjs";
     import { IGLTFLoader, GLTFLoaderState, IGLTFLoaderData } from "babylonjs-loaders/src/glTF/glTFFileLoader";

dist/preview release/viewer/babylon.viewer.d.ts

@@ -1478,7 +1478,6 @@ declare module BabylonViewer {
     }
 }
 declare module BabylonViewer {
-<<<<<<< HEAD
     export interface IModelConfiguration {
             id?: string;
             url?: string;
@@ -1543,8 +1542,6 @@ declare module BabylonViewer {
                     progressiveLoading?: boolean;
             };
     }
-=======
->>>>>>> upstream/master
 }
 declare module BabylonViewer {
     /**
@@ -1560,11 +1557,6 @@ declare module BabylonViewer {
     export function addLoaderPlugin(name: string, plugin: ILoaderPlugin): void;
 }
 declare module BabylonViewer {
-<<<<<<< HEAD
-=======
-}
-declare module BabylonViewer {
->>>>>>> upstream/master
     export interface IEnvironmentMapConfiguration {
             /**
                 * Environment map texture path in relative to the asset folder.
@@ -1589,42 +1581,6 @@ declare module BabylonViewer {
     }
 }
 declare module BabylonViewer {
-<<<<<<< HEAD
-=======
-    /**
-        * The EventManager is in charge of registering user interctions with the viewer.
-        * It is used in the TemplateManager
-        */
-    export class EventManager {
-            constructor(_templateManager: TemplateManager);
-            /**
-                * Register a new callback to a specific template.
-                * The best example for the usage can be found in the DefaultViewer
-                *
-                * @param templateName the templateName to register the event to
-                * @param callback The callback to be executed
-                * @param eventType the type of event to register
-                * @param selector an optional selector. if not defined the parent object in the template will be selected
-                */
-            registerCallback(templateName: string, callback: (eventData: EventCallback) => void, eventType?: string, selector?: string): void;
-            /**
-                * This will remove a registered event from the defined template.
-                * Each one of the variables apart from the template name are optional, but one must be provided.
-                *
-                * @param templateName the templateName
-                * @param callback the callback to remove (optional)
-                * @param eventType the event type to remove (optional)
-                * @param selector the selector from which to remove the event (optional)
-                */
-            unregisterCallback(templateName: string, callback: (eventData: EventCallback) => void, eventType?: string, selector?: string): void;
-            /**
-                * Dispose the event manager
-                */
-            dispose(): void;
-    }
-}
-declare module BabylonViewer {
->>>>>>> upstream/master
     /**
         * The EventManager is in charge of registering user interctions with the viewer.
         * It is used in the TemplateManager
@@ -1706,7 +1662,6 @@ declare module BabylonViewer {
     }
 }
 declare module BabylonViewer {
-<<<<<<< HEAD
     /**
         * Defines an animation to be applied to a model (translation, scale or rotation).
         */
@@ -1735,8 +1690,6 @@ declare module BabylonViewer {
     }
 }
 declare module BabylonViewer {
-=======
->>>>>>> upstream/master
     export class TelemetryLoaderPlugin implements ILoaderPlugin {
         onInit(loader: BABYLON.ISceneLoaderPlugin | BABYLON.ISceneLoaderPluginAsync, model: ViewerModel): void;
         onLoaded(model: ViewerModel): void;
@@ -2042,34 +1995,6 @@ declare module BabylonViewer {
     }
 }
 declare module BabylonViewer {
-    /**
-        * Defines an animation to be applied to a model (translation, scale or rotation).
-        */
-    export interface IModelAnimationConfiguration {
-            /**
-                * Time of animation, in seconds
-                */
-            time?: number;
-            /**
-                * Scale to apply
-                */
-            scaling?: {
-                    x: number;
-                    y: number;
-                    z: number;
-            };
-            /**
-                * Easing function to apply
-                */
-            easingFunction?: number;
-            /**
-                * An Easing mode to apply to the easing function
-                * See BABYLON.EasingFunction
-                */
-            easingMode?: number;
-    }
-}
-declare module BabylonViewer {
     export interface IObserversConfiguration {
         onEngineInit?: string;
         onSceneInit?: string;

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

@@ -1576,7 +1576,6 @@ declare module 'babylonjs-viewer/managers/sceneManager' {
 }
 
 declare module 'babylonjs-viewer/configuration/interfaces/modelConfiguration' {
-<<<<<<< HEAD
     import { IModelAnimationConfiguration } from "babylonjs-viewer/configuration/interfaces/modelAnimationConfiguration";
     export interface IModelConfiguration {
             id?: string;
@@ -1642,9 +1641,6 @@ declare module 'babylonjs-viewer/configuration/interfaces/modelConfiguration' {
                     progressiveLoading?: boolean;
             };
     }
-=======
-    
->>>>>>> upstream/master
 }
 
 declare module 'babylonjs-viewer/loader/plugins' {
@@ -1796,7 +1792,6 @@ declare module 'babylonjs-viewer/labs/viewerLabs' {
     }
 }
 
-<<<<<<< HEAD
 declare module 'babylonjs-viewer/configuration/interfaces/modelAnimationConfiguration' {
     /**
         * Defines an animation to be applied to a model (translation, scale or rotation).
@@ -1826,8 +1821,6 @@ declare module 'babylonjs-viewer/configuration/interfaces/modelAnimationConfigur
     }
 }
 
-=======
->>>>>>> upstream/master
 declare module 'babylonjs-viewer/loader/plugins/telemetryLoaderPlugin' {
     import { ILoaderPlugin } from "babylonjs-viewer/loader/plugins/loaderPlugin";
     import { ViewerModel } from "babylonjs-viewer/model/viewerModel";
@@ -2156,35 +2149,6 @@ declare module 'babylonjs-viewer/configuration/interfaces/lightConfiguration' {
     }
 }
 
-declare module 'babylonjs-viewer/configuration/interfaces/modelAnimationConfiguration' {
-    /**
-        * Defines an animation to be applied to a model (translation, scale or rotation).
-        */
-    export interface IModelAnimationConfiguration {
-            /**
-                * Time of animation, in seconds
-                */
-            time?: number;
-            /**
-                * Scale to apply
-                */
-            scaling?: {
-                    x: number;
-                    y: number;
-                    z: number;
-            };
-            /**
-                * Easing function to apply
-                */
-            easingFunction?: number;
-            /**
-                * An Easing mode to apply to the easing function
-                * See BABYLON.EasingFunction
-                */
-            easingMode?: number;
-    }
-}
-
 declare module 'babylonjs-viewer/configuration/interfaces/observersConfiguration' {
     export interface IObserversConfiguration {
         onEngineInit?: string;