Nightly

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

@@ -833,6 +833,8 @@ declare module BABYLON.GUI {
             protected _transformedPosition: BABYLON.Vector2;
             /** @hidden */
             _linkedMesh: BABYLON.Nullable<BABYLON.AbstractMesh>;
+            protected _isEnabled: boolean;
+            protected _disabledColor: string;
             /** @hidden */
             _tag: any;
             /** Gets or sets a boolean indicating if the control can be hit with pointer events */
@@ -1058,6 +1060,10 @@ declare module BABYLON.GUI {
             readonly centerX: number;
             /** Gets the center coordinate on Y axis */
             readonly centerY: number;
+            /** Gets or sets if control is Enabled*/
+            isEnabled: boolean;
+            /** Gets or sets background color of control if it's disabled*/
+            disabledColor: string;
             /**
                 * Creates a new control
                 * @param name defines the name of the control

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

@@ -935,6 +935,8 @@ declare module 'babylonjs-gui/2D/controls/control' {
             protected _transformedPosition: Vector2;
             /** @hidden */
             _linkedMesh: Nullable<AbstractMesh>;
+            protected _isEnabled: boolean;
+            protected _disabledColor: string;
             /** @hidden */
             _tag: any;
             /** Gets or sets a boolean indicating if the control can be hit with pointer events */
@@ -1160,6 +1162,10 @@ declare module 'babylonjs-gui/2D/controls/control' {
             readonly centerX: number;
             /** Gets the center coordinate on Y axis */
             readonly centerY: number;
+            /** Gets or sets if control is Enabled*/
+            isEnabled: boolean;
+            /** Gets or sets background color of control if it's disabled*/
+            disabledColor: string;
             /**
                 * Creates a new control
                 * @param name defines the name of the control
@@ -3433,6 +3439,8 @@ declare module BABYLON.GUI {
             protected _transformedPosition: BABYLON.Vector2;
             /** @hidden */
             _linkedMesh: BABYLON.Nullable<BABYLON.AbstractMesh>;
+            protected _isEnabled: boolean;
+            protected _disabledColor: string;
             /** @hidden */
             _tag: any;
             /** Gets or sets a boolean indicating if the control can be hit with pointer events */
@@ -3658,6 +3666,10 @@ declare module BABYLON.GUI {
             readonly centerX: number;
             /** Gets the center coordinate on Y axis */
             readonly centerY: number;
+            /** Gets or sets if control is Enabled*/
+            isEnabled: boolean;
+            /** Gets or sets background color of control if it's disabled*/
+            disabledColor: string;
             /**
                 * Creates a new control
                 * @param name defines the name of the control

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

@@ -168,11 +168,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)
                 *
@@ -189,11 +189,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;
     }
@@ -924,7 +924,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 {
@@ -1558,20 +1558,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 {
 }
 declare module BabylonViewer {
     export interface IEnvironmentMapConfiguration {

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

@@ -200,11 +200,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)
                 *
@@ -221,11 +221,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;
     }
@@ -985,14 +985,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;
 }
 
@@ -1663,22 +1662,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';