Explorar el Código

remove latest BABYLON.

sebavan hace 6 años
padre
commit
3efe3ec287

+ 6 - 6
inspector/src/components/actionTabs/tabs/propertyGrids/gui/commonControlPropertyGridComponent.tsx

@@ -50,15 +50,15 @@ export class CommonControlPropertyGridComponent extends React.Component<ICommonC
         const control = this.props.control;
 
         var horizontalOptions = [
-            { label: "Left", value: BABYLON.GUI.Control.HORIZONTAL_ALIGNMENT_LEFT },
-            { label: "Right", value: BABYLON.GUI.Control.HORIZONTAL_ALIGNMENT_RIGHT },
-            { label: "Center", value: BABYLON.GUI.Control.HORIZONTAL_ALIGNMENT_CENTER },
+            { label: "Left", value: Control.HORIZONTAL_ALIGNMENT_LEFT },
+            { label: "Right", value: Control.HORIZONTAL_ALIGNMENT_RIGHT },
+            { label: "Center", value: Control.HORIZONTAL_ALIGNMENT_CENTER },
         ];
 
         var verticalOptions = [
-            { label: "Top", value: BABYLON.GUI.Control.VERTICAL_ALIGNMENT_TOP },
-            { label: "Bottom", value: BABYLON.GUI.Control.VERTICAL_ALIGNMENT_BOTTOM },
-            { label: "Center", value: BABYLON.GUI.Control.VERTICAL_ALIGNMENT_CENTER },
+            { label: "Top", value: Control.VERTICAL_ALIGNMENT_TOP },
+            { label: "Bottom", value: Control.VERTICAL_ALIGNMENT_BOTTOM },
+            { label: "Center", value: Control.VERTICAL_ALIGNMENT_CENTER },
         ];
 
         return (

+ 5 - 5
inspector/src/components/actionTabs/tabs/propertyGrids/gui/imagePropertyGridComponent.tsx

@@ -24,11 +24,11 @@ export class ImagePropertyGridComponent extends React.Component<IImagePropertyGr
         const image = this.props.image;
 
         var stretchOptions = [
-            { label: "None", value: BABYLON.GUI.Image.STRETCH_NONE },
-            { label: "Fill", value: BABYLON.GUI.Image.STRETCH_FILL },
-            { label: "Uniform", value: BABYLON.GUI.Image.STRETCH_UNIFORM },
-            { label: "Extend", value: BABYLON.GUI.Image.STRETCH_EXTEND },
-            { label: "NinePatch", value: BABYLON.GUI.Image.STRETCH_NINE_PATCH }
+            { label: "None", value: Image.STRETCH_NONE },
+            { label: "Fill", value: Image.STRETCH_FILL },
+            { label: "Uniform", value: Image.STRETCH_UNIFORM },
+            { label: "Extend", value: Image.STRETCH_EXTEND },
+            { label: "NinePatch", value: Image.STRETCH_NINE_PATCH }
         ];
 
         return (

+ 11 - 10
inspector/src/components/actionTabs/tabs/propertyGrids/gui/textBlockPropertyGridComponent.tsx

@@ -2,7 +2,8 @@ import * as React from "react";
 import { Observable } from "babylonjs/Misc/observable";
 import { PropertyChangedEvent } from "../../../../propertyChangedEvent";
 import { CommonControlPropertyGridComponent } from "./commonControlPropertyGridComponent";
-import { TextBlock } from "babylonjs-gui/2D/controls/textBlock";
+import { TextBlock, TextWrapping } from "babylonjs-gui/2D/controls/textBlock";
+import { Control } from "babylonjs-gui/2D/controls/control";
 import { LineContainerComponent } from "../../../lineContainerComponent";
 import { TextInputLineComponent } from "../../../lines/textInputLineComponent";
 import { LockObject } from "../lockObject";
@@ -25,21 +26,21 @@ export class TextBlockPropertyGridComponent extends React.Component<ITextBlockPr
         const textBlock = this.props.textBlock;
 
         var horizontalOptions = [
-            { label: "Left", value: BABYLON.GUI.Control.HORIZONTAL_ALIGNMENT_LEFT },
-            { label: "Right", value: BABYLON.GUI.Control.HORIZONTAL_ALIGNMENT_RIGHT },
-            { label: "Center", value: BABYLON.GUI.Control.HORIZONTAL_ALIGNMENT_CENTER },
+            { label: "Left", value: Control.HORIZONTAL_ALIGNMENT_LEFT },
+            { label: "Right", value: Control.HORIZONTAL_ALIGNMENT_RIGHT },
+            { label: "Center", value: Control.HORIZONTAL_ALIGNMENT_CENTER },
         ];
 
         var verticalOptions = [
-            { label: "Top", value: BABYLON.GUI.Control.VERTICAL_ALIGNMENT_TOP },
-            { label: "Bottom", value: BABYLON.GUI.Control.VERTICAL_ALIGNMENT_BOTTOM },
-            { label: "Center", value: BABYLON.GUI.Control.VERTICAL_ALIGNMENT_CENTER },
+            { label: "Top", value: Control.VERTICAL_ALIGNMENT_TOP },
+            { label: "Bottom", value: Control.VERTICAL_ALIGNMENT_BOTTOM },
+            { label: "Center", value: Control.VERTICAL_ALIGNMENT_CENTER },
         ];
 
         var wrappingOptions = [
-            { label: "Clip", value: BABYLON.GUI.TextWrapping.Clip },
-            { label: "Ellipsis", value: BABYLON.GUI.TextWrapping.Ellipsis },
-            { label: "Word wrap", value: BABYLON.GUI.TextWrapping.WordWrap },
+            { label: "Clip", value: TextWrapping.Clip },
+            { label: "Ellipsis", value: TextWrapping.Ellipsis },
+            { label: "Word wrap", value: TextWrapping.WordWrap },
         ];
 
         return (

+ 8 - 7
inspector/src/components/actionTabs/tabs/tools/gltfComponent.tsx

@@ -8,6 +8,7 @@ import { OptionsLineComponent } from "../../lines/optionsLineComponent";
 import { MessageLineComponent } from "../../lines/messageLineComponent";
 import { faCheck, faTimesCircle } from "@fortawesome/free-solid-svg-icons";
 import { TextLineComponent } from "../../lines/textLineComponent";
+import { GLTFLoaderCoordinateSystemMode, GLTFLoaderAnimationStartMode } from "babylonjs-loaders/glTF/index";
 
 interface IGLTFComponentProps {
     scene: Scene,
@@ -34,12 +35,12 @@ export class GLTFComponent extends React.Component<IGLTFComponentProps> {
         const loaderState = this.props.globalState.glTFLoaderDefaults;
 
         if (loaderState["animationStartMode"] === undefined) {
-            loaderState["animationStartMode"] = BABYLON.GLTFLoaderAnimationStartMode.FIRST;
+            loaderState["animationStartMode"] = GLTFLoaderAnimationStartMode.FIRST;
         }
         loaderState["capturePerformanceCounters"] = loaderState["capturePerformanceCounters"] || false;
         loaderState["compileMaterials"] = loaderState["compileMaterials"] || false;
         loaderState["compileShadowGenerators"] = loaderState["compileShadowGenerators"] || false;
-        loaderState["coordinateSystemMode"] = loaderState["coordinateSystemMode"] || BABYLON.GLTFLoaderCoordinateSystemMode.AUTO;
+        loaderState["coordinateSystemMode"] = loaderState["coordinateSystemMode"] || GLTFLoaderCoordinateSystemMode.AUTO;
         loaderState["loggingEnabled"] = loaderState["loggingEnabled"] || false;
         loaderState["transparencyAsCoverage"] = loaderState["transparencyAsCoverage"] || false;
         loaderState["useClipPlane"] = loaderState["useClipPlane"] || false;
@@ -96,14 +97,14 @@ export class GLTFComponent extends React.Component<IGLTFComponentProps> {
         const loaderState = this.props.globalState.glTFLoaderDefaults;
 
         var animationStartMode = [
-            { label: "None", value: BABYLON.GLTFLoaderAnimationStartMode.NONE },
-            { label: "First", value: BABYLON.GLTFLoaderAnimationStartMode.FIRST },
-            { label: "ALL", value: BABYLON.GLTFLoaderAnimationStartMode.ALL }
+            { label: "None", value: GLTFLoaderAnimationStartMode.NONE },
+            { label: "First", value: GLTFLoaderAnimationStartMode.FIRST },
+            { label: "ALL", value: GLTFLoaderAnimationStartMode.ALL }
         ];
 
         var coordinateSystemMode = [
-            { label: "Auto", value: BABYLON.GLTFLoaderCoordinateSystemMode.AUTO },
-            { label: "Right handed", value: BABYLON.GLTFLoaderCoordinateSystemMode.FORCE_RIGHT_HANDED }
+            { label: "Auto", value: GLTFLoaderCoordinateSystemMode.AUTO },
+            { label: "Right handed", value: GLTFLoaderCoordinateSystemMode.FORCE_RIGHT_HANDED }
         ];
 
         return (