renaming to GUINode

guiEditor/src/components/propertyTab/propertyTabComponent.tsx

@@ -10,7 +10,7 @@ import { Tools } from 'babylonjs/Misc/tools';
 import { SerializationTools } from '../../serializationTools';
 import { CheckBoxLineComponent } from '../../sharedComponents/checkBoxLineComponent';
 import { DataStorage } from 'babylonjs/Misc/dataStorage';
-import { GraphNode } from '../../diagram/graphNode';
+import { GUINode } from '../../diagram/graphNode';
 import { SliderLineComponent } from '../../sharedComponents/sliderLineComponent';
 
 import { TextLineComponent } from '../../sharedComponents/textLineComponent';
@@ -38,7 +38,7 @@ interface IPropertyTabComponentProps {
 }
 
 interface IPropertyTabComponentState {
-    currentNode: Nullable<GraphNode>;
+    currentNode: Nullable<GUINode>;
  }
 
 export class PropertyTabComponent extends React.Component<IPropertyTabComponentProps, IPropertyTabComponentState> {
@@ -55,7 +55,7 @@ export class PropertyTabComponent extends React.Component<IPropertyTabComponentP
 
     componentDidMount() {
         this.props.globalState.onSelectionChangedObservable.add((selection) => {
-            if (selection instanceof GraphNode) {
+            if (selection instanceof GUINode) {
                 this.setState({ currentNode: selection});
             } else {
                 this.setState({ currentNode: null });

guiEditor/src/diagram/graphNode.ts

@@ -8,7 +8,7 @@ import * as React from 'react';
 import { GenericPropertyComponent } from './properties/genericNodePropertyComponent';
 import { DisplayLedger } from './displayLedger';
 import { IDisplayManager } from './display/displayManager';
-export class GraphNode {
+export class GUINode {
     private _visual: HTMLDivElement;
     private _header: HTMLDivElement;
     private _connections: HTMLDivElement;
@@ -23,7 +23,7 @@ export class GraphNode {
     private _mouseStartPointX: Nullable<number> = null;
     private _mouseStartPointY: Nullable<number> = null    
     private _globalState: GlobalState;
-    private _onSelectionChangedObserver: Nullable<Observer<Nullable<GraphNode | FramePortData>>>;  
+    private _onSelectionChangedObserver: Nullable<Observer<Nullable<GUINode | FramePortData>>>;  
     private _onSelectionBoxMovedObserver: Nullable<Observer<ClientRect | DOMRect>>;   
     private _onUpdateRequiredObserver: Nullable<Observer<void>>;  
     private _ownerCanvas: WorkbenchComponent; 

guiEditor/src/diagram/workbench.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { GlobalState } from '../globalState';
 import { NodeMaterialBlock } from 'babylonjs/Materials/Node/nodeMaterialBlock';
-import { GraphNode } from './graphNode';
+import { GUINode } from './graphNode';
 import * as dagre from 'dagre';
 import { Nullable } from 'babylonjs/types';
 
@@ -40,8 +40,8 @@ export class WorkbenchComponent extends React.Component<IWorkbenchComponentProps
     private _frameContainer: HTMLDivElement;
     private _svgCanvas: HTMLElement;
     private _rootContainer: HTMLDivElement;
-    private _nodes: GraphNode[] = [];
-    private _guiNodes: GraphNode[] = [];
+    private _nodes: GUINode[] = [];
+    private _guiNodes: GUINode[] = [];
     private _mouseStartPointX: Nullable<number> = null;
     private _mouseStartPointY: Nullable<number> = null
     private _dropPointX = 0;
@@ -51,8 +51,8 @@ export class WorkbenchComponent extends React.Component<IWorkbenchComponentProps
     private _x = 0;
     private _y = 0;
     private _zoom = 1;
-    private _selectedNodes: GraphNode[] = [];
-    private _selectedGuiNodes: GraphNode[] = [];
+    private _selectedNodes: GUINode[] = [];
+    private _selectedGuiNodes: GUINode[] = [];
     private _gridSize = 20;
     private _selectionBox: Nullable<HTMLDivElement> = null;    
     private _frameCandidate: Nullable<HTMLDivElement> = null;
@@ -157,7 +157,7 @@ export class WorkbenchComponent extends React.Component<IWorkbenchComponentProps
                 this._selectedNodes = [];
                 this._selectedGuiNodes = [];
             } else {
-                if (selection instanceof GraphNode){
+                if (selection instanceof GUINode){
                     if (this._ctrlKeyIsPressed) {
                         if (this._selectedNodes.indexOf(selection) === -1) {
                             this._selectedNodes.push(selection);
@@ -259,7 +259,7 @@ export class WorkbenchComponent extends React.Component<IWorkbenchComponentProps
 
 
     appendBlock(block: NodeMaterialBlock) {
-        let newNode = new GraphNode(block, this.props.globalState, null);
+        let newNode = new GUINode(block, this.props.globalState, null);
 
         newNode.appendVisual(this._graphCanvas, this);
 
@@ -619,7 +619,7 @@ export class WorkbenchComponent extends React.Component<IWorkbenchComponentProps
         });
 
         var fakeNodeMaterialBlock = new NodeMaterialBlock("Button");
-        var newGuiNode = new GraphNode(fakeNodeMaterialBlock, this.globalState, button1);
+        var newGuiNode = new GUINode(fakeNodeMaterialBlock, this.globalState, button1);
         newGuiNode.appendVisual(this._graphCanvas, this);
         this._guiNodes.push(newGuiNode);
 
@@ -636,7 +636,7 @@ export class WorkbenchComponent extends React.Component<IWorkbenchComponentProps
         slider1.onPointerUpObservable.add(function() {
         });
         var fakeNodeMaterialBlock = new NodeMaterialBlock("Slider");
-        var newGuiNode = new GraphNode(fakeNodeMaterialBlock, this.globalState, slider1);
+        var newGuiNode = new GUINode(fakeNodeMaterialBlock, this.globalState, slider1);
         newGuiNode.appendVisual(this._graphCanvas, this);
         this._guiNodes.push(newGuiNode);
 

guiEditor/src/globalState.ts

@@ -6,7 +6,7 @@ import { NodeMaterialBlock } from 'babylonjs/Materials/Node/nodeMaterialBlock';
 import { PreviewType } from './components/preview/previewType';
 import { DataStorage } from 'babylonjs/Misc/dataStorage';
 import { Color4 } from 'babylonjs/Maths/math.color';
-import { GraphNode } from './diagram/graphNode';
+import { GUINode } from './diagram/graphNode';
 import { Vector2 } from 'babylonjs/Maths/math.vector';
 import { FramePortData, WorkbenchComponent } from './diagram/workbench';
 import { NodeMaterialModes } from 'babylonjs/Materials/Node/Enums/nodeMaterialModes';
@@ -17,7 +17,7 @@ export class GlobalState {
     hostElement: HTMLElement;
     hostDocument: HTMLDocument;
     hostWindow: Window;
-    onSelectionChangedObservable = new Observable<Nullable<GraphNode | FramePortData>>();
+    onSelectionChangedObservable = new Observable<Nullable<GUINode | FramePortData>>();
     onRebuildRequiredObservable = new Observable<void>();
     onBuiltObservable = new Observable<void>();
     onResetRequiredObservable = new Observable<void>();
@@ -36,10 +36,10 @@ export class GlobalState {
     onCandidateLinkMoved = new Observable<Nullable<Vector2>>();
     onSelectionBoxMoved = new Observable<ClientRect | DOMRect>();
     onImportFrameObservable = new Observable<any>();
-    onGraphNodeRemovalObservable = new Observable<GraphNode>();
-    onGetNodeFromBlock: (block: NodeMaterialBlock) => GraphNode;
+    onGraphNodeRemovalObservable = new Observable<GUINode>();
+    onGetNodeFromBlock: (block: NodeMaterialBlock) => GUINode;
     onGridSizeChanged = new Observable<void>();
-    onExposePortOnFrameObservable = new Observable<GraphNode>();
+    onExposePortOnFrameObservable = new Observable<GUINode>();
     previewType: PreviewType;
     previewFile: File;
     listOfCustomPreviewFiles: File[] = [];

guiEditor/src/graphEditor.tsx

@@ -18,7 +18,7 @@ import { PreviewMeshControlComponent } from './components/preview/previewMeshCon
 import { PreviewAreaComponent } from './components/preview/previewAreaComponent';
 import { SerializationTools } from './serializationTools';
 import { WorkbenchComponent } from './diagram/workbench';
-import { GraphNode } from './diagram/graphNode';
+import { GUINode } from './diagram/graphNode';
 import * as ReactDOM from 'react-dom';
 import { IInspectorOptions } from "babylonjs/Debug/debugLayer";
 import { _TypeStore } from 'babylonjs/Misc/typeStore';
@@ -200,7 +200,7 @@ export class GraphEditor extends React.Component<IGraphEditorProps, IGraphEditor
                     return;
                 }
     
-                let selectedItem = selectedItems[0] as GraphNode;
+                let selectedItem = selectedItems[0] as GUINode;
     
                 if (!selectedItem.block) {
                     return;
@@ -216,7 +216,7 @@ export class GraphEditor extends React.Component<IGraphEditorProps, IGraphEditor
         }, false);
     }
 
-    reconnectNewNodes(nodeIndex: number, newNodes:GraphNode[], sourceNodes:GraphNode[], done: boolean[]) {
+    reconnectNewNodes(nodeIndex: number, newNodes:GUINode[], sourceNodes:GUINode[], done: boolean[]) {
         if (done[nodeIndex]) {
             return;
         }
@@ -258,11 +258,11 @@ export class GraphEditor extends React.Component<IGraphEditorProps, IGraphEditor
         done[nodeIndex] = true;
     }
 
-    pasteSelection(copiedNodes: GraphNode[], currentX: number, currentY: number, selectNew = false) {
+    pasteSelection(copiedNodes: GUINode[], currentX: number, currentY: number, selectNew = false) {
 
-        let originalNode: Nullable<GraphNode> = null;
+        let originalNode: Nullable<GUINode> = null;
 
-        let newNodes:GraphNode[] = [];
+        let newNodes:GUINode[] = [];
 
         // Copy to prevent recursive side effects while creating nodes.
         copiedNodes = copiedNodes.slice();
@@ -458,7 +458,7 @@ export class GraphEditor extends React.Component<IGraphEditorProps, IGraphEditor
 
     emitNewBlock(event: React.DragEvent<HTMLDivElement>) {
         var data = event.dataTransfer.getData("babylonjs-material-node") as string;
-        let newNode: GraphNode;
+        let newNode: GUINode;
         
         //new code for gui editor.