浏览代码

removing warnings

msDestiny14 4 年之前
父节点
当前提交
8ad5af9934

+ 3 - 6
guiEditor/src/components/nodeList/nodeListComponent.tsx

@@ -3,14 +3,11 @@ import * as React from "react";
 import { GlobalState } from '../../globalState';
 import { GlobalState } from '../../globalState';
 import { LineContainerComponent } from '../../sharedComponents/lineContainerComponent';
 import { LineContainerComponent } from '../../sharedComponents/lineContainerComponent';
 import { DraggableLineComponent } from '../../sharedComponents/draggableLineComponent';
 import { DraggableLineComponent } from '../../sharedComponents/draggableLineComponent';
-import { NodeMaterialModes } from 'babylonjs/Materials/Node/Enums/nodeMaterialModes';
 import { Observer } from 'babylonjs/Misc/observable';
 import { Observer } from 'babylonjs/Misc/observable';
 import { Nullable } from 'babylonjs/types';
 import { Nullable } from 'babylonjs/types';
-import { DraggableLineWithButtonComponent } from '../../sharedComponents/draggableLineWithButtonComponent';
-import { LineWithFileButtonComponent } from '../../sharedComponents/lineWithFileButtonComponent';
-import { Tools } from 'babylonjs/Misc/tools';
-const addButton = require("../../../imgs/add.svg");
-const deleteButton = require('../../../imgs/delete.svg');
+
+//const addButton = require("../../../imgs/add.svg");
+//const deleteButton = require('../../../imgs/delete.svg');
 
 
 require("./nodeList.scss");
 require("./nodeList.scss");
 
 

+ 2 - 4
guiEditor/src/diagram/graphNode.ts

@@ -1,4 +1,3 @@
-import { NodeMaterialBlock } from 'babylonjs/Materials/Node/nodeMaterialBlock';
 import { GlobalState } from '../globalState';
 import { GlobalState } from '../globalState';
 import { Nullable } from 'babylonjs/types';
 import { Nullable } from 'babylonjs/types';
 import { Observer } from 'babylonjs/Misc/observable';
 import { Observer } from 'babylonjs/Misc/observable';
@@ -6,7 +5,6 @@ import { WorkbenchComponent, FramePortData } from './workbench';
 import { PropertyGuiLedger } from './propertyLedger';
 import { PropertyGuiLedger } from './propertyLedger';
 import * as React from 'react';
 import * as React from 'react';
 import { GenericPropertyComponent } from './properties/genericNodePropertyComponent';
 import { GenericPropertyComponent } from './properties/genericNodePropertyComponent';
-import { DisplayLedger } from './displayLedger';
 import { IDisplayManager } from './display/displayManager';
 import { IDisplayManager } from './display/displayManager';
 export class GUINode {
 export class GUINode {
     private _visual: HTMLDivElement;
     private _visual: HTMLDivElement;
@@ -311,9 +309,9 @@ export class GUINode {
         // notify frame observers that this node is being deleted
         // notify frame observers that this node is being deleted
         this._globalState.onGraphNodeRemovalObservable.notifyObservers(this);
         this._globalState.onGraphNodeRemovalObservable.notifyObservers(this);
 
 
-        /*if (this._onSelectionChangedObserver) {
+        if (this._onSelectionChangedObserver) {
             this._globalState.onSelectionChangedObservable.remove(this._onSelectionChangedObserver);
             this._globalState.onSelectionChangedObservable.remove(this._onSelectionChangedObserver);
-        }*/
+        }
 
 
         if (this._onUpdateRequiredObserver) {
         if (this._onUpdateRequiredObserver) {
             this._globalState.onUpdateRequiredObservable.remove(this._onUpdateRequiredObserver);
             this._globalState.onUpdateRequiredObservable.remove(this._onUpdateRequiredObserver);

+ 1 - 26
guiEditor/src/graphEditor.tsx

@@ -1,14 +1,10 @@
 import * as React from "react";
 import * as React from "react";
 import { GlobalState } from './globalState';
 import { GlobalState } from './globalState';
-
-import { NodeMaterialBlock } from 'babylonjs/Materials/Node/nodeMaterialBlock';
 import { NodeListComponent } from './components/nodeList/nodeListComponent';
 import { NodeListComponent } from './components/nodeList/nodeListComponent';
 import { PropertyTabComponent } from './components/propertyTab/propertyTabComponent';
 import { PropertyTabComponent } from './components/propertyTab/propertyTabComponent';
 import { Portal } from './portal';
 import { Portal } from './portal';
 import { LogComponent, LogEntry } from './components/log/logComponent';
 import { LogComponent, LogEntry } from './components/log/logComponent';
 import { DataStorage } from 'babylonjs/Misc/dataStorage';
 import { DataStorage } from 'babylonjs/Misc/dataStorage';
-import { NodeMaterialBlockConnectionPointTypes } from 'babylonjs/Materials/Node/Enums/nodeMaterialBlockConnectionPointTypes';
-import { InputBlock } from 'babylonjs/Materials/Node/Blocks/Input/inputBlock';
 import { Nullable } from 'babylonjs/types';
 import { Nullable } from 'babylonjs/types';
 import { MessageDialogComponent } from './sharedComponents/messageDialog';
 import { MessageDialogComponent } from './sharedComponents/messageDialog';
 import { BlockTools } from './blockTools';
 import { BlockTools } from './blockTools';
@@ -199,21 +195,6 @@ export class GraphEditor extends React.Component<IGraphEditorProps, IGraphEditor
         }, false);
         }, false);
     }
     }
 
 
-    reconnectNewNodes(nodeIndex: number, newNodes:GUINode[], sourceNodes:GUINode[], done: boolean[]) {
-        if (done[nodeIndex]) {
-            return;
-        }
-
-        const currentNode = newNodes[nodeIndex];
-        const block = currentNode.guiNode;
-        const sourceNode = sourceNodes[nodeIndex];
-
-
-        currentNode.refresh();
-
-        done[nodeIndex] = true;
-    }
-
     pasteSelection(copiedNodes: GUINode[], currentX: number, currentY: number, selectNew = false) {
     pasteSelection(copiedNodes: GUINode[], currentX: number, currentY: number, selectNew = false) {
 
 
         let originalNode: Nullable<GUINode> = null;
         let originalNode: Nullable<GUINode> = null;
@@ -240,7 +221,7 @@ export class GraphEditor extends React.Component<IGraphEditorProps, IGraphEditor
                 return;
                 return;
             }
             }
 
 
-            let newNode = this.createNodeFromObject(clone, false);
+            //let newNode = this.createNodeFromObject(clone, false);
 
 
             let x = 0;
             let x = 0;
             let y = 0;
             let y = 0;
@@ -264,12 +245,6 @@ export class GraphEditor extends React.Component<IGraphEditorProps, IGraphEditor
             }*/
             }*/
         }
         }
 
 
-        // Relink
-        let done = new Array<boolean>(newNodes.length);
-        for (var index = 0; index < newNodes.length; index++) {
-            this.reconnectNewNodes(index, newNodes, copiedNodes, done);
-        }
-
         return newNodes;
         return newNodes;
     }
     }