ソースを参照

deleteing code

Pamela Wolf 4 年 前
コミット
fb0981177d

+ 2 - 4
guiEditor/src/components/propertyTab/propertyTabComponent.tsx

@@ -25,7 +25,6 @@ import { Vector3LineComponent } from '../../sharedComponents/vector3LineComponen
 import { Vector4LineComponent } from '../../sharedComponents/vector4LineComponent';
 import { Observer } from 'babylonjs/Misc/observable';
 import { NodeMaterial } from 'babylonjs/Materials/Node/nodeMaterial';
-import { NodePort } from '../../diagram/nodePort';
 import { isFramePortData } from '../../diagram/workbench';
 import { OptionsLineComponent } from '../../sharedComponents/optionsLineComponent';
 import { NodeMaterialModes } from 'babylonjs/Materials/Node/Enums/nodeMaterialModes';
@@ -39,7 +38,6 @@ interface IPropertyTabComponentProps {
 
 interface IPropertyTabComponentState {
     currentNode: Nullable<GraphNode>;
-    currentNodePort: Nullable<NodePort>;
  }
 
 export class PropertyTabComponent extends React.Component<IPropertyTabComponentProps, IPropertyTabComponentState> {
@@ -49,7 +47,7 @@ export class PropertyTabComponent extends React.Component<IPropertyTabComponentP
     constructor(props: IPropertyTabComponentProps) {
         super(props);
 
-        this.state = { currentNode: null, currentNodePort: null };
+        this.state = { currentNode: null, };
 
         this._modeSelect = React.createRef();
     }
@@ -336,7 +334,7 @@ export class PropertyTabComponent extends React.Component<IPropertyTabComponentP
                             NODE MATERIAL EDITOR
                         </div>
                     </div>
-                    {this.state.currentNode?.renderProperties() || this.state.currentNodePort?.node.renderProperties()}
+                    {this.state.currentNode?.renderProperties()}
                 </div>
             );
         }

+ 1 - 3
guiEditor/src/diagram/graphNode.ts

@@ -8,8 +8,6 @@ import * as React from 'react';
 import { GenericPropertyComponent } from './properties/genericNodePropertyComponent';
 import { DisplayLedger } from './displayLedger';
 import { IDisplayManager } from './display/displayManager';
-import { NodePort } from './nodePort';
-
 export class GraphNode {
     private _visual: HTMLDivElement;
     private _header: HTMLDivElement;
@@ -25,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 | NodePort | FramePortData>>>;  
+    private _onSelectionChangedObserver: Nullable<Observer<Nullable<GraphNode | FramePortData>>>;  
     private _onSelectionBoxMovedObserver: Nullable<Observer<ClientRect | DOMRect>>;   
     private _onUpdateRequiredObserver: Nullable<Observer<void>>;  
     private _ownerCanvas: GraphCanvasComponent; 

ファイルの差分が大きいため隠しています
+ 0 - 197
guiEditor/src/diagram/nodePort.ts


+ 2 - 12
guiEditor/src/diagram/workbench.tsx

@@ -4,7 +4,6 @@ import { NodeMaterialBlock } from 'babylonjs/Materials/Node/nodeMaterialBlock';
 import { GraphNode } from './graphNode';
 import * as dagre from 'dagre';
 import { Nullable } from 'babylonjs/types';
-import { NodePort } from './nodePort';
 
 import { DataStorage } from 'babylonjs/Misc/dataStorage';
 import { IEditorData} from '../nodeLocationInfo';
@@ -55,7 +54,6 @@ export class GraphCanvasComponent extends React.Component<IGraphCanvasComponentP
     private _zoom = 1;
     private _selectedNodes: GraphNode[] = [];
     private _selectedGuiNodes: GraphNode[] = [];
-    private _selectedPort: Nullable<NodePort> = null;
     private _gridSize = 20;
     private _selectionBox: Nullable<HTMLDivElement> = null;    
     private _frameCandidate: Nullable<HTMLDivElement> = null;
@@ -127,10 +125,6 @@ export class GraphCanvasComponent extends React.Component<IGraphCanvasComponentP
         return this._selectedGuiNodes;
     }
 
-    public get selectedPort() {
-        return this._selectedPort;
-    }
-
     public get canvasContainer() {
         return this._graphCanvas;
     }
@@ -161,7 +155,6 @@ export class GraphCanvasComponent extends React.Component<IGraphCanvasComponentP
                 }); 
                 this._selectedNodes = [];
                 this._selectedGuiNodes = [];
-                this._selectedPort = null;
             } else {
                 if (selection instanceof GraphNode){
                     if (this._ctrlKeyIsPressed) {
@@ -173,14 +166,11 @@ export class GraphCanvasComponent extends React.Component<IGraphCanvasComponentP
                         this._selectedNodes = [selection];
                         this._selectedGuiNodes = [selection];
                     }
-                } else if(selection instanceof NodePort){
-                    this._selectedNodes = [];
-                    this._selectedGuiNodes = [];
-                    this._selectedPort = selection;
+                
                 } else {
                     this._selectedNodes = [];
                     this._selectedGuiNodes = [];
-                    //this._selectedPort = selection.port;
+
                 }
             }
         });