w00t w00t

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

@@ -169,6 +169,7 @@ __export(__webpack_require__(/*! ../src/glTF/glTFFileLoader */ "./src/glTF/glTFF
 /* WEBPACK VAR INJECTION */(function(global) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var Extensions = __webpack_require__(/*! ../src/glTF/2.0/Extensions */ "./src/glTF/2.0/Extensions/index.ts");
+var Interfaces = __webpack_require__(/*! ../src/glTF/2.0/glTFLoaderInterfaces */ "./src/glTF/2.0/glTFLoaderInterfaces.ts");
 var GLTF2 = __webpack_require__(/*! ../src/glTF/2.0 */ "./src/glTF/2.0/index.ts");
 exports.GLTF2 = GLTF2;
 /**
@@ -187,6 +188,10 @@ if (typeof globalObject !== "undefined") {
         BABYLON.GLTF2.Loader.Extensions[key] = Extensions[key];
         keys.push(key);
     }
+    for (var key in Interfaces) {
+        BABYLON.GLTF2.Loader[key] = Interfaces[key];
+        keys.push(key);
+    }
     for (var key in GLTF2) {
         // Prevent Reassignment.
         if (keys.indexOf(key) > -1) {

dist/preview release/loaders/babylon.glTF2FileLoader.min.js

@@ -169,6 +169,7 @@ __export(__webpack_require__(/*! ../src/glTF/glTFFileLoader */ "./src/glTF/glTFF
 /* WEBPACK VAR INJECTION */(function(global) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var Extensions = __webpack_require__(/*! ../src/glTF/2.0/Extensions */ "./src/glTF/2.0/Extensions/index.ts");
+var Interfaces = __webpack_require__(/*! ../src/glTF/2.0/glTFLoaderInterfaces */ "./src/glTF/2.0/glTFLoaderInterfaces.ts");
 var GLTF2 = __webpack_require__(/*! ../src/glTF/2.0 */ "./src/glTF/2.0/index.ts");
 exports.GLTF2 = GLTF2;
 /**
@@ -187,6 +188,10 @@ if (typeof globalObject !== "undefined") {
         BABYLON.GLTF2.Loader.Extensions[key] = Extensions[key];
         keys.push(key);
     }
+    for (var key in Interfaces) {
+        BABYLON.GLTF2.Loader[key] = Interfaces[key];
+        keys.push(key);
+    }
     for (var key in GLTF2) {
         // Prevent Reassignment.
         if (keys.indexOf(key) > -1) {

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

@@ -198,6 +198,7 @@ if (typeof globalObject !== "undefined") {
 /* WEBPACK VAR INJECTION */(function(global) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var Extensions = __webpack_require__(/*! ../src/glTF/2.0/Extensions */ "./src/glTF/2.0/Extensions/index.ts");
+var Interfaces = __webpack_require__(/*! ../src/glTF/2.0/glTFLoaderInterfaces */ "./src/glTF/2.0/glTFLoaderInterfaces.ts");
 var GLTF2 = __webpack_require__(/*! ../src/glTF/2.0 */ "./src/glTF/2.0/index.ts");
 exports.GLTF2 = GLTF2;
 /**
@@ -216,6 +217,10 @@ if (typeof globalObject !== "undefined") {
         BABYLON.GLTF2.Loader.Extensions[key] = Extensions[key];
         keys.push(key);
     }
+    for (var key in Interfaces) {
+        BABYLON.GLTF2.Loader[key] = Interfaces[key];
+        keys.push(key);
+    }
     for (var key in GLTF2) {
         // Prevent Reassignment.
         if (keys.indexOf(key) > -1) {

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

@@ -198,6 +198,7 @@ if (typeof globalObject !== "undefined") {
 /* WEBPACK VAR INJECTION */(function(global) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var Extensions = __webpack_require__(/*! ../src/glTF/2.0/Extensions */ "./src/glTF/2.0/Extensions/index.ts");
+var Interfaces = __webpack_require__(/*! ../src/glTF/2.0/glTFLoaderInterfaces */ "./src/glTF/2.0/glTFLoaderInterfaces.ts");
 var GLTF2 = __webpack_require__(/*! ../src/glTF/2.0 */ "./src/glTF/2.0/index.ts");
 exports.GLTF2 = GLTF2;
 /**
@@ -216,6 +217,10 @@ if (typeof globalObject !== "undefined") {
         BABYLON.GLTF2.Loader.Extensions[key] = Extensions[key];
         keys.push(key);
     }
+    for (var key in Interfaces) {
+        BABYLON.GLTF2.Loader[key] = Interfaces[key];
+        keys.push(key);
+    }
     for (var key in GLTF2) {
         // Prevent Reassignment.
         if (keys.indexOf(key) > -1) {

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

@@ -198,6 +198,7 @@ if (typeof globalObject !== "undefined") {
 /* WEBPACK VAR INJECTION */(function(global) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var Extensions = __webpack_require__(/*! ../src/glTF/2.0/Extensions */ "./src/glTF/2.0/Extensions/index.ts");
+var Interfaces = __webpack_require__(/*! ../src/glTF/2.0/glTFLoaderInterfaces */ "./src/glTF/2.0/glTFLoaderInterfaces.ts");
 var GLTF2 = __webpack_require__(/*! ../src/glTF/2.0 */ "./src/glTF/2.0/index.ts");
 exports.GLTF2 = GLTF2;
 /**
@@ -216,6 +217,10 @@ if (typeof globalObject !== "undefined") {
         BABYLON.GLTF2.Loader.Extensions[key] = Extensions[key];
         keys.push(key);
     }
+    for (var key in Interfaces) {
+        BABYLON.GLTF2.Loader[key] = Interfaces[key];
+        keys.push(key);
+    }
     for (var key in GLTF2) {
         // Prevent Reassignment.
         if (keys.indexOf(key) > -1) {

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

@@ -169,11 +169,11 @@ declare module BabylonViewer {
                 * Mainly used for help and errors
                 * @param subScreen the name of the subScreen. Those can be defined in the configuration object
                 */
-            showOverlayScreen(subScreen: string): Promise<Template> | Promise<string>;
+            showOverlayScreen(subScreen: string): Promise<string> | Promise<Template>;
             /**
                 * Hide the overlay screen.
                 */
-            hideOverlayScreen(): Promise<Template> | Promise<string>;
+            hideOverlayScreen(): Promise<string> | Promise<Template>;
             /**
                 * show the viewer (in case it was hidden)
                 *
@@ -190,11 +190,11 @@ declare module BabylonViewer {
                 * Show the loading screen.
                 * The loading screen can be configured using the configuration object
                 */
-            showLoadingScreen(): Promise<Template> | Promise<string>;
+            showLoadingScreen(): Promise<string> | Promise<Template>;
             /**
                 * Hide the loading screen
                 */
-            hideLoadingScreen(): Promise<Template> | Promise<string>;
+            hideLoadingScreen(): Promise<string> | Promise<Template>;
             dispose(): void;
             protected _onConfigurationLoaded(configuration: ViewerConfiguration): void;
     }
@@ -925,7 +925,7 @@ declare module BabylonViewer {
       * @param name the name of the custom optimizer configuration
       * @param upgrade set to true if you want to upgrade optimizer and false if you want to degrade
       */
-    export function getCustomOptimizerByName(name: string, upgrade?: boolean): typeof extendedUpgrade;
+    export function getCustomOptimizerByName(name: string, upgrade?: boolean): (sceneManager: SceneManager) => boolean;
     export function registerCustomOptimizer(name: string, optimizer: (sceneManager: SceneManager) => boolean): void;
 }
 declare module BabylonViewer {
@@ -1557,20 +1557,6 @@ declare module BabylonViewer {
     export function addLoaderPlugin(name: string, plugin: ILoaderPlugin): void;
 }
 declare module BabylonViewer {
-    /**
-        * A custom upgrade-oriented function configuration for the scene optimizer.
-        *
-        * @param viewer the viewer to optimize
-        */
-    export function extendedUpgrade(sceneManager: SceneManager): boolean;
-    /**
-        * A custom degrade-oriented function configuration for the scene optimizer.
-        *
-        * @param viewer the viewer to optimize
-        */
-    export function extendedDegrade(sceneManager: SceneManager): boolean;
-}
-declare module BabylonViewer {
     export interface IEnvironmentMapConfiguration {
             /**
                 * Environment map texture path in relative to the asset folder.

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

@@ -201,11 +201,11 @@ declare module 'babylonjs-viewer/viewer/defaultViewer' {
                 * Mainly used for help and errors
                 * @param subScreen the name of the subScreen. Those can be defined in the configuration object
                 */
-            showOverlayScreen(subScreen: string): Promise<Template> | Promise<string>;
+            showOverlayScreen(subScreen: string): Promise<string> | Promise<Template>;
             /**
                 * Hide the overlay screen.
                 */
-            hideOverlayScreen(): Promise<Template> | Promise<string>;
+            hideOverlayScreen(): Promise<string> | Promise<Template>;
             /**
                 * show the viewer (in case it was hidden)
                 *
@@ -222,11 +222,11 @@ declare module 'babylonjs-viewer/viewer/defaultViewer' {
                 * Show the loading screen.
                 * The loading screen can be configured using the configuration object
                 */
-            showLoadingScreen(): Promise<Template> | Promise<string>;
+            showLoadingScreen(): Promise<string> | Promise<Template>;
             /**
                 * Hide the loading screen
                 */
-            hideLoadingScreen(): Promise<Template> | Promise<string>;
+            hideLoadingScreen(): Promise<string> | Promise<Template>;
             dispose(): void;
             protected _onConfigurationLoaded(configuration: ViewerConfiguration): void;
     }
@@ -986,14 +986,13 @@ declare module 'babylonjs-viewer/templating/viewerTemplatePlugin' {
 }
 
 declare module 'babylonjs-viewer/optimizer/custom' {
-    import { extendedUpgrade } from "babylonjs-viewer/optimizer/custom/extended";
     import { SceneManager } from "babylonjs-viewer/managers/sceneManager";
     /**
       *
       * @param name the name of the custom optimizer configuration
       * @param upgrade set to true if you want to upgrade optimizer and false if you want to degrade
       */
-    export function getCustomOptimizerByName(name: string, upgrade?: boolean): typeof extendedUpgrade;
+    export function getCustomOptimizerByName(name: string, upgrade?: boolean): (sceneManager: SceneManager) => boolean;
     export function registerCustomOptimizer(name: string, optimizer: (sceneManager: SceneManager) => boolean): void;
 }
 
@@ -1664,22 +1663,6 @@ declare module 'babylonjs-viewer/loader/plugins' {
     export function addLoaderPlugin(name: string, plugin: ILoaderPlugin): void;
 }
 
-declare module 'babylonjs-viewer/optimizer/custom/extended' {
-    import { SceneManager } from 'babylonjs-viewer/managers/sceneManager';
-    /**
-        * A custom upgrade-oriented function configuration for the scene optimizer.
-        *
-        * @param viewer the viewer to optimize
-        */
-    export function extendedUpgrade(sceneManager: SceneManager): boolean;
-    /**
-        * A custom degrade-oriented function configuration for the scene optimizer.
-        *
-        * @param viewer the viewer to optimize
-        */
-    export function extendedDegrade(sceneManager: SceneManager): boolean;
-}
-
 declare module 'babylonjs-viewer/configuration/interfaces' {
     export * from 'babylonjs-viewer/configuration/interfaces/cameraConfiguration';
     export * from 'babylonjs-viewer/configuration/interfaces/colorGradingConfiguration';