Browse Source

removing errors

msDestiny14 4 năm trước cách đây
mục cha
commit
3e5932849e

+ 17 - 8
guiEditor/src/blockTools.ts

@@ -1,3 +1,12 @@
+import { Button } from "babylonjs-gui/2D/controls/button";
+import { Checkbox } from "babylonjs-gui/2D/controls/checkbox";
+import { ColorPicker } from "babylonjs-gui/2D/controls/colorpicker";
+import { Ellipse } from "babylonjs-gui/2D/controls/ellipse";
+import { Line } from "babylonjs-gui/2D/controls/line";
+import { Rectangle } from "babylonjs-gui/2D/controls/rectangle";
+import { Slider } from "babylonjs-gui/2D/controls/sliders/slider";
+import { TextBlock } from "babylonjs-gui/2D/controls/textBlock";
+
 export class BlockTools {
     public static GetGuiFromString(data: string) {
 
@@ -5,22 +14,22 @@ export class BlockTools {
         let element;
         switch (data) {
             case "Slider":
-                element = new BABYLON.GUI.Slider("Slider");
+                element = new Slider("Slider");
                 break;
             case "Checkbox":
-                element = new BABYLON.GUI.Checkbox("Checkbox");
+                element = new Checkbox("Checkbox");
                 break;
             case "ColorPicker":
-                element = new BABYLON.GUI.ColorPicker("ColorPicker");
+                element = new ColorPicker("ColorPicker");
                 break;
             case "Ellipse":
-                element = new BABYLON.GUI.Ellipse("Ellipse");
+                element = new Ellipse("Ellipse");
                 break;
             case "Rectangle":
-                element = new BABYLON.GUI.Rectangle("Rectangle");
+                element = new Rectangle("Rectangle");
                 break;
             case "Line":
-                element = new BABYLON.GUI.Line();
+                element = new Line();
                 element.x1 = 10;
                 element.y1 = 10;
                 element.x2 = 100;
@@ -29,11 +38,11 @@ export class BlockTools {
                 element.dash = [50, 10];
                 return element;
             case "Text":
-                element = new BABYLON.GUI.TextBlock("Textblock");
+                element = new TextBlock("Textblock");
                 element.text = "My Text";
                 return element;
             default:
-                element = BABYLON.GUI.Button.CreateSimpleButton("Button", "Click Me");
+                element = Button.CreateSimpleButton("Button", "Click Me");
                 break;
             }
         

+ 2 - 1
guiEditor/src/diagram/guiNode.ts

@@ -5,6 +5,7 @@ import { WorkbenchComponent, FramePortData } from './workbench';
 import { PropertyGuiLedger } from './propertyLedger';
 import * as React from 'react';
 import { GenericPropertyComponent } from './properties/genericNodePropertyComponent';
+import { Control } from 'babylonjs-gui/2D/controls/control';
 
 export class GUINode {
     private _x = 0;
@@ -99,7 +100,7 @@ export class GUINode {
         }
     }
 
-    public constructor(globalState: GlobalState, public guiNode: BABYLON.GUI.Control) {
+    public constructor(globalState: GlobalState, public guiNode: Control) {
         this._globalState = globalState;
         this._ownerCanvas = this._globalState.workbench;
         

+ 2 - 1
guiEditor/src/diagram/properties/propertyComponentProps.ts

@@ -1,6 +1,7 @@
+import { Control } from "babylonjs-gui/2D/controls/control";
 import { GlobalState } from "../../globalState";
 
 export interface IPropertyComponentProps {
     globalState: GlobalState;
-    guiBlock: BABYLON.GUI.Control;
+    guiBlock: Control;
 }

+ 4 - 8
guiEditor/src/diagram/properties/sliderGuiPropertyComponent.tsx

@@ -5,20 +5,16 @@ import { IPropertyComponentProps } from './propertyComponentProps';
 import { GeneralPropertyTabComponent } from './genericNodePropertyComponent';
 import { TextLineComponent } from '../../sharedComponents/textLineComponent';
 import { NumericInputComponent } from '../../sharedComponents/numericInputComponent';
-import { Color4 } from 'babylonjs';
+import { Slider } from "babylonjs-gui/2D/controls/sliders/slider";
+
 
 export class SliderPropertyTabComponent extends React.Component<IPropertyComponentProps> {
     constructor(props: IPropertyComponentProps) {
         super(props);
-        this.slider = this.props.guiBlock as BABYLON.GUI.Slider;
+        this.slider = this.props.guiBlock as Slider;
     }
 
-    private slider : BABYLON.GUI.Slider;
-
-    getColorString()
-    {
-        return Color4.FromHexString(this.slider.background);
-    }
+    private slider : Slider;
 
     render() {
         return (

+ 5 - 4
guiEditor/src/diagram/workbench.tsx

@@ -6,7 +6,8 @@ import { Nullable } from 'babylonjs/types';
 
 import { DataStorage } from 'babylonjs/Misc/dataStorage';
 
-import 'babylonjs-gui/2D/';
+import {Control} from 'babylonjs-gui/2D/controls/control';
+import { AdvancedDynamicTexture } from "babylonjs-gui/2D/advancedDynamicTexture";
 
 require("./graphCanvas.scss");
 
@@ -223,7 +224,7 @@ export class WorkbenchComponent extends React.Component<IWorkbenchComponentProps
         this._oldY = -1;
     }
 
-    findNodeFromGuiElement(guiElement: BABYLON.GUI.Control) {
+    findNodeFromGuiElement(guiElement: Control) {
        return this._guiNodes.filter(n => n.guiNode === guiElement)[0];
     }
 
@@ -236,7 +237,7 @@ export class WorkbenchComponent extends React.Component<IWorkbenchComponentProps
         this._svgCanvas.innerHTML = "";
     }
 
-    appendBlock(guiElement: BABYLON.GUI.Control) {
+    appendBlock(guiElement: Control) {
         var newGuiNode = new GUINode(this.props.globalState, guiElement);
         newGuiNode.appendVisual(this._graphCanvas, this);
         this._guiNodes.push(newGuiNode);
@@ -503,7 +504,7 @@ export class WorkbenchComponent extends React.Component<IWorkbenchComponentProps
         //camera.attachControl(true);
         
         // GUI
-        this.globalState.guiTexture = BABYLON.GUI.AdvancedDynamicTexture.CreateFullscreenUI("UI");
+        this.globalState.guiTexture = AdvancedDynamicTexture.CreateFullscreenUI("UI");
         scene.getEngine().onCanvasPointerOutObservable.clear();
         // Watch for browser/canvas resize events
         window.addEventListener("resize", function () {

+ 2 - 1
guiEditor/src/globalState.ts

@@ -7,9 +7,10 @@ import { Color4 } from 'babylonjs/Maths/math.color';
 import { GUINode } from './diagram/guiNode';
 import { Vector2 } from 'babylonjs/Maths/math.vector';
 import { FramePortData, WorkbenchComponent } from './diagram/workbench';
+import { AdvancedDynamicTexture } from "babylonjs-gui/2D/advancedDynamicTexture";
 
 export class GlobalState {
-    guiTexture: BABYLON.GUI.AdvancedDynamicTexture;
+    guiTexture: AdvancedDynamicTexture;
     hostElement: HTMLElement;
     hostDocument: HTMLDocument;
     hostWindow: Window;

+ 4 - 3
guiEditor/src/workbenchEditor.tsx

@@ -8,11 +8,12 @@ import { DataStorage } from 'babylonjs/Misc/dataStorage';
 import { Nullable } from 'babylonjs/types';
 import { BlockTools } from './blockTools';
 import { IEditorData } from './nodeLocationInfo';
-
 import { WorkbenchComponent } from './diagram/workbench';
 import { GUINode } from './diagram/guiNode';
 import { _TypeStore } from 'babylonjs/Misc/typeStore';
 import { MessageDialogComponent } from "./sharedComponents/messageDialog";
+import { Control } from "babylonjs-gui/2D/controls/control";
+import { Container } from "babylonjs-gui/2D/controls/container";
 
 require("./main.scss");
 
@@ -33,7 +34,7 @@ export class WorkbenchEditor extends React.Component<IGraphEditorProps, IGraphEd
     private _leftWidth = DataStorage.ReadNumber("LeftWidth", 200);
     private _rightWidth = DataStorage.ReadNumber("RightWidth", 300);
 
-    private _blocks = new Array<BABYLON.GUI.Container | BABYLON.GUI.Control>();
+    private _blocks = new Array<Container | Control>();
 
     private _onWidgetKeyUpPointer: any;
 
@@ -43,7 +44,7 @@ export class WorkbenchEditor extends React.Component<IGraphEditorProps, IGraphEd
      * Creates a node and recursivly creates its parent nodes from it's input
      * @param block 
      */
-    public createNodeFromObject(block: BABYLON.GUI.Control, recursion = true) {
+    public createNodeFromObject(block: Control, recursion = true) {
         if (this._blocks.indexOf(block) !== -1) {        
             return this._workbenchCanvas.nodes.filter(n => n.guiNode === block)[0];
         }