deleteing code

guiEditor/src/components/propertyTab/propertyTabComponent.tsx

@@ -30,7 +30,7 @@ import { Observer } from 'babylonjs/Misc/observable';
 import { NodeMaterial } from 'babylonjs/Materials/Node/nodeMaterial';
 import { FrameNodePort } from '../../diagram/frameNodePort';
 import { NodePort } from '../../diagram/nodePort';
-import { isFramePortData } from '../../diagram/graphCanvas';
+import { isFramePortData } from '../../diagram/workbench';
 import { OptionsLineComponent } from '../../sharedComponents/optionsLineComponent';
 import { NodeMaterialModes } from 'babylonjs/Materials/Node/Enums/nodeMaterialModes';
 import { PreviewType } from '../preview/previewType';

guiEditor/src/diagram/frameNodePort.ts

@@ -1,87 +1 @@
-import { NodePort } from "./nodePort";
-import { GraphNode } from './graphNode';
-import { FramePortPosition } from './graphFrame';
-import { GlobalState } from '../globalState';
-import { IDisplayManager } from './display/displayManager';
-import { Observable } from 'babylonjs/Misc/observable';
-import { Nullable } from 'babylonjs/types';
-import { NodeMaterialConnectionPoint } from 'babylonjs/Materials/Node/nodeMaterialBlockConnectionPoint';
-import { FramePortData, isFramePortData } from './graphCanvas';
-
-export class FrameNodePort extends NodePort {
-    private _parentFrameId: number;
-    private _isInput: boolean;
-    private _framePortPosition: FramePortPosition
-    private _framePortId: number;
-    private _onFramePortPositionChangedObservable = new Observable<FrameNodePort>();
-
-    public get parentFrameId () {
-        return this._parentFrameId;
-    }
-
-    public get onFramePortPositionChangedObservable() {
-        return this._onFramePortPositionChangedObservable;
-    }
-
-    public get isInput() {
-        return this._isInput;
-    }
-
-    public get framePortId() {
-        return this._framePortId;
-    }
-
-    public get framePortPosition() {
-        return this._framePortPosition;
-    }
-
-    public set framePortPosition(position: FramePortPosition) {
-        this._framePortPosition = position;
-        this.onFramePortPositionChangedObservable.notifyObservers(this);
-    }
-
-    public constructor(portContainer: HTMLElement, public connectionPoint: NodeMaterialConnectionPoint, public node: GraphNode, globalState: GlobalState, isInput: boolean, framePortId: number, parentFrameId: number) {
-        super(portContainer, connectionPoint,node, globalState);
-
-        this._parentFrameId = parentFrameId;
-        this._isInput = isInput;
-        this._framePortId = framePortId;
-
-        this._onSelectionChangedObserver = this._globalState.onSelectionChangedObservable.add((selection) => {
-            if (isFramePortData(selection) && (selection as FramePortData).port === this) {
-                this._img.classList.add("selected");
-            } else {
-                this._img.classList.remove("selected");
-            }
-        });
-
-        this.refresh();
-    }
-
-    public static CreateFrameNodePortElement(connectionPoint: NodeMaterialConnectionPoint, node: GraphNode, root: HTMLElement, 
-        displayManager: Nullable<IDisplayManager>, globalState: GlobalState, isInput: boolean, framePortId: number, parentFrameId: number) {
-        let portContainer = root.ownerDocument!.createElement("div");
-        let block = connectionPoint.ownerBlock;
-
-        portContainer.classList.add("portLine");
-        if(framePortId !== null) {
-            portContainer.dataset.framePortId = `${framePortId}`;
-        }
-        root.appendChild(portContainer);
-
-        if (!displayManager || displayManager.shouldDisplayPortLabels(block)) {
-            let portLabel = root.ownerDocument!.createElement("div");
-            portLabel.classList.add("port-label");
-            let portName = connectionPoint.displayName || connectionPoint.name;
-            if (connectionPoint.ownerBlock.isInput) {
-                portName = node.name;
-            }
-            portLabel.innerHTML = portName;       
-            portContainer.appendChild(portLabel);
-        }
-
-        return new FrameNodePort(portContainer, connectionPoint, node, globalState, isInput, framePortId, parentFrameId);
-    }
-
-} 
 

guiEditor/src/diagram/graphFrame.ts

@@ -1,5 +1,5 @@
 import { GraphNode } from './graphNode';
-import { GraphCanvasComponent, FramePortData } from './graphCanvas';
+import { GraphCanvasComponent, FramePortData } from './workbench';
 import { Nullable } from 'babylonjs/types';
 import { Observer, Observable } from 'babylonjs/Misc/observable';
 import { NodeLink } from './nodeLink';

guiEditor/src/diagram/graphNode.ts

@@ -2,15 +2,13 @@ import { NodeMaterialBlock } from 'babylonjs/Materials/Node/nodeMaterialBlock';
 import { GlobalState } from '../globalState';
 import { Nullable } from 'babylonjs/types';
 import { Observer } from 'babylonjs/Misc/observable';
-import { NodeMaterialConnectionPoint } from 'babylonjs/Materials/Node/nodeMaterialBlockConnectionPoint';
-import { GraphCanvasComponent, FramePortData } from './graphCanvas';
-import { PropertyGuiLedger, PropertyLedger } from './propertyLedger';
+import { GraphCanvasComponent, FramePortData } from './workbench';
+import { PropertyGuiLedger } from './propertyLedger';
 import * as React from 'react';
 import { GenericPropertyComponent } from './properties/genericNodePropertyComponent';
 import { DisplayLedger } from './displayLedger';
 import { IDisplayManager } from './display/displayManager';
 import { NodePort } from './nodePort';
-import { Vector2 } from 'babylonjs';
 
 export class GraphNode {
     private _visual: HTMLDivElement;

guiEditor/src/diagram/guiNode.ts

@@ -3,7 +3,7 @@ import { GlobalState } from '../globalState';
 import { Nullable } from 'babylonjs/types';
 import { Observer } from 'babylonjs/Misc/observable';
 import { NodeMaterialConnectionPoint } from 'babylonjs/Materials/Node/nodeMaterialBlockConnectionPoint';
-import { GraphCanvasComponent, FramePortData } from './graphCanvas';
+import { GraphCanvasComponent, FramePortData } from './workbench';
 import { PropertyLedger } from './propertyLedger';
 import * as React from 'react';
 import { GenericPropertyComponent } from './properties/genericNodePropertyComponent';

guiEditor/src/diagram/nodePort.ts

@@ -10,7 +10,7 @@ import { GraphNode } from './graphNode';
 import { NodeLink } from './nodeLink';
 import { GraphFrame } from './graphFrame';
 import { FrameNodePort } from './frameNodePort';
-import { FramePortData } from './graphCanvas';
+import { FramePortData } from './workbench';
 
 export class NodePort {
     protected _element: HTMLDivElement;

guiEditor/src/diagram/properties/frameNodePortPropertyComponent.tsx

@@ -1,78 +0,0 @@
-
-import * as React from "react";
-import { LineContainerComponent } from '../../sharedComponents/lineContainerComponent';
-import { GlobalState } from '../../globalState';
-import { TextInputLineComponent } from '../../sharedComponents/textInputLineComponent';
-import { ButtonLineComponent } from '../../sharedComponents/buttonLineComponent';
-import { FramePortPosition, GraphFrame } from '../graphFrame';
-import { Nullable } from 'babylonjs/types';
-import { Observer } from 'babylonjs/Misc/observable';
-import { FrameNodePort } from '../frameNodePort';
-import { NodePort } from '../nodePort';
-import { GraphNode } from '../graphNode';
-import { NodeLink } from '../nodeLink';
-import { FramePortData, isFramePortData } from '../graphCanvas';
-
-export interface IFrameNodePortPropertyTabComponentProps {
-    globalState: GlobalState
-    frameNodePort: FrameNodePort;
-    frame: GraphFrame;
-}
-
-export class FrameNodePortPropertyTabComponent extends React.Component<IFrameNodePortPropertyTabComponentProps, { port: FrameNodePort }> {
-    private _onFramePortPositionChangedObserver: Nullable<Observer<FrameNodePort>>;
-    private _onSelectionChangedObserver: Nullable<Observer<Nullable<GraphFrame | NodePort | GraphNode | NodeLink | FramePortData>>>;
-
-    constructor(props: IFrameNodePortPropertyTabComponentProps) {
-        super(props);
-        this.state = {
-            port: this.props.frameNodePort
-        }
-
-        const _this = this;
-        this._onSelectionChangedObserver = this.props.globalState.onSelectionChangedObservable.add((selection) => {
-            if (isFramePortData(selection)) {
-                selection.port.onFramePortPositionChangedObservable.clear();
-                _this._onFramePortPositionChangedObserver = selection.port.onFramePortPositionChangedObservable.add((port: FrameNodePort) => {
-                    _this.setState({ port: port });
-                });
-
-                _this.setState({ port: selection.port });
-            }
-        });
-
-        this._onFramePortPositionChangedObserver = this.props.frameNodePort.onFramePortPositionChangedObservable.add((port: FrameNodePort) => {
-            _this.setState({ port: port });
-        });
-    }
-
-    componentWillUnmount() {
-        this.props.frameNodePort.onFramePortPositionChangedObservable.remove(this._onFramePortPositionChangedObserver);
-        this.props.globalState.onSelectionChangedObservable.remove(this._onSelectionChangedObserver);
-    }
-
-    render() {
-        return (
-            <div id="propertyTab">
-                <div id="header">
-                    <img id="logo" src="https://www.babylonjs.com/Assets/logo-babylonjs-social-twitter.png" />
-                    <div id="title">
-                        NODE MATERIAL EDITOR
-                </div>
-                </div>
-                <div>
-                    <LineContainerComponent title="GENERAL">
-                        <TextInputLineComponent globalState={this.props.globalState} label="Port Name" propertyName="portName" target={this.props.frameNodePort} />
-                        {this.props.frameNodePort.framePortPosition !== FramePortPosition.Top && <ButtonLineComponent label="Move Port Up" onClick={() => {
-                            this.props.frame.moveFramePortUp(this.props.frameNodePort);
-                        }} />}
-
-                        {this.props.frameNodePort.framePortPosition !== FramePortPosition.Bottom && <ButtonLineComponent label="Move Port Down" onClick={() => {
-                            this.props.frame.moveFramePortDown(this.props.frameNodePort);
-                        }} />}
-                    </LineContainerComponent>
-                </div>
-            </div>
-        );
-    }
-}

guiEditor/src/diagram/properties/nodePortPropertyComponent.tsx

@@ -9,7 +9,7 @@ import { Observer } from 'babylonjs/Misc/observable';
 import { NodePort } from '../nodePort';
 import { GraphNode } from '../graphNode';
 import { NodeLink } from '../nodeLink';
-import { FramePortData } from '../graphCanvas';
+import { FramePortData } from '../workbench';
 import { CheckBoxLineComponent } from '../../sharedComponents/checkBoxLineComponent';
 import { TextLineComponent } from '../../sharedComponents/textLineComponent';
 

guiEditor/src/diagram/graphCanvas.tsx

@@ -1,18 +1,14 @@
 import * as React from "react";
 import { GlobalState } from '../globalState';
 import { NodeMaterialBlock } from 'babylonjs/Materials/Node/nodeMaterialBlock';
-import { NodeMaterialBlockConnectionPointTypes } from 'babylonjs/Materials/Node/Enums/nodeMaterialBlockConnectionPointTypes';
 import { GraphNode } from './graphNode';
 import * as dagre from 'dagre';
 import { Nullable } from 'babylonjs/types';
 import { NodePort } from './nodePort';
-import { NodeMaterialConnectionPoint, NodeMaterialConnectionPointDirection, NodeMaterialConnectionPointCompatibilityStates } from 'babylonjs/Materials/Node/nodeMaterialBlockConnectionPoint';
-import { Vector2 } from 'babylonjs/Maths/math.vector';
-import { FragmentOutputBlock } from 'babylonjs/Materials/Node/Blocks/Fragment/fragmentOutputBlock';
-import { InputBlock } from 'babylonjs/Materials/Node/Blocks/Input/inputBlock';
+
 import { DataStorage } from 'babylonjs/Misc/dataStorage';
-import { IEditorData, IFrameData } from '../nodeLocationInfo';
-import { FrameNodePort } from './frameNodePort';
+import { IEditorData} from '../nodeLocationInfo';
+
 import { Button } from 'babylonjs-gui/2D/controls/button';
 import { Engine } from 'babylonjs/Engines/engine';
 import { Scene } from 'babylonjs/scene';
@@ -26,12 +22,11 @@ export interface IGraphCanvasComponentProps {
 }
 
 export type FramePortData = {
-    port: FrameNodePort
 }
 
 export const isFramePortData = (variableToCheck: any): variableToCheck is FramePortData => {
     if (variableToCheck) {
-        return (variableToCheck as FramePortData).port !== undefined;
+        return (variableToCheck as FramePortData) !== undefined;
     }
     else return false;
 }
@@ -61,7 +56,6 @@ export class GraphCanvasComponent extends React.Component<IGraphCanvasComponentP
     private _selectedNodes: GraphNode[] = [];
     private _selectedGuiNodes: GraphNode[] = [];
     private _selectedPort: Nullable<NodePort> = null;
-    private _candidatePort: Nullable<NodePort | FrameNodePort> = null;
     private _gridSize = 20;
     private _selectionBox: Nullable<HTMLDivElement> = null;    
     private _frameCandidate: Nullable<HTMLDivElement> = null;
@@ -191,9 +185,6 @@ export class GraphCanvasComponent extends React.Component<IGraphCanvasComponentP
             }
         });
 
-        props.globalState.onCandidatePortSelectedObservable.add(port => {
-            this._candidatePort = port;
-        });
 
         props.globalState.onGridSizeChanged.add(() => {
             this.gridSize = DataStorage.ReadNumber("GridSize", 20);
@@ -273,13 +264,6 @@ export class GraphCanvasComponent extends React.Component<IGraphCanvasComponentP
         this._svgCanvas.innerHTML = "";
     }
 
-    connectPorts(pointA: NodeMaterialConnectionPoint, pointB: NodeMaterialConnectionPoint) {
-        var blockA = pointA.ownerBlock;
-        var blockB = pointB.ownerBlock;
-        var nodeA = this.findNodeFromBlock(blockA);
-        var nodeB = this.findNodeFromBlock(blockB);
-
-    }
 
 
     appendBlock(block: NodeMaterialBlock) {

guiEditor/src/globalState.ts

@@ -12,7 +12,7 @@ import { NodePort } from './diagram/nodePort';
 import { NodeLink } from './diagram/nodeLink';
 import { GraphFrame } from './diagram/graphFrame';
 import { FrameNodePort } from './diagram/frameNodePort';
-import { FramePortData } from './diagram/graphCanvas';
+import { FramePortData } from './diagram/workbench';
 import { NodeMaterialModes } from 'babylonjs/Materials/Node/Enums/nodeMaterialModes';
 
 export class GlobalState {

guiEditor/src/graphEditor.tsx

@@ -17,7 +17,7 @@ import { IEditorData } from './nodeLocationInfo';
 import { PreviewMeshControlComponent } from './components/preview/previewMeshControlComponent';
 import { PreviewAreaComponent } from './components/preview/previewAreaComponent';
 import { SerializationTools } from './serializationTools';
-import { GraphCanvasComponent } from './diagram/graphCanvas';
+import { GraphCanvasComponent } from './diagram/workbench';
 import { GraphNode } from './diagram/graphNode';
 import * as ReactDOM from 'react-dom';
 import { IInspectorOptions } from "babylonjs/Debug/debugLayer";
@@ -92,14 +92,6 @@ export class GraphEditor extends React.Component<IGraphEditorProps, IGraphEditor
         // Graph
         const node = this._graphCanvas.appendBlock(block);
 
-        // Links
-        if (block.inputs.length && recursion) {
-            for (var input of block.inputs) {
-                if (input.isConnected) {
-                    this._graphCanvas.connectPorts(input.connectedPoint!, input);
-                }
-            }
-        }
 
         return node;
     }
@@ -260,7 +252,6 @@ export class GraphEditor extends React.Component<IGraphEditorProps, IGraphEditor
                 sourceInput._connectedPoint!.connectTo(currentInput);
             }
 
-            this._graphCanvas.connectPorts(currentInput.connectedPoint!, currentInput);
         }
 
         currentNode.refresh();
@@ -384,17 +375,7 @@ export class GraphEditor extends React.Component<IGraphEditorProps, IGraphEditor
         material.attachedBlocks.forEach((n: any) => {
             this.createNodeFromObject(n, true);
         });
-
-        // Links
-        material.attachedBlocks.forEach((n: any) => {
-            if (n.inputs.length) {
-                for (var input of n.inputs) {
-                    if (input.isConnected) {
-                        this._graphCanvas.connectPorts(input.connectedPoint!, input);
-                    }
-                }
-            }
-        });           
+          
     }
 
     showWaitScreen() {