瀏覽代碼

Associated with #6012

David Catuhe 6 年之前
父節點
當前提交
83b0f65e9b

+ 2 - 5
nodeEditor/src/components/diagram/defaultNodeModel.ts

@@ -23,7 +23,7 @@ export class DefaultNodeModel extends NodeModel {
         super(key);
     }
 
-    prepare(options: NodeCreationOptions, nodes: Array<DefaultNodeModel>, model: DiagramModel, graphEditor: GraphEditor, filterInputs: string[]) {
+    prepare(options: NodeCreationOptions, nodes: Array<DefaultNodeModel>, model: DiagramModel, graphEditor: GraphEditor) {
         this.block = options.nodeMaterialBlock || null;
 
         if (!options.nodeMaterialBlock) {
@@ -38,11 +38,8 @@ export class DefaultNodeModel extends NodeModel {
 
         // Create input ports and nodes if they exist
         options.nodeMaterialBlock._inputs.forEach((connection) => {
-            if (filterInputs.length > 0 && filterInputs.indexOf(connection.name) === -1) {
-                return;
-            }
 
-            var inputPort = new DefaultPortModel(connection.name + "-input", "input");
+            var inputPort = new DefaultPortModel(connection.name, "input");
             inputPort.connection = connection;
             this.addPort(inputPort)
 

+ 2 - 2
nodeEditor/src/components/diagram/generic/genericNodeModel.tsx

@@ -37,8 +37,8 @@ export class GenericNodeModel extends DefaultNodeModel {
         super("generic");
     }
 
-    prepare(options: NodeCreationOptions, nodes: Array<DefaultNodeModel>, model: DiagramModel, graphEditor: GraphEditor, filterInputs: string[]) {
-        super.prepare(options, nodes, model, graphEditor, filterInputs);
+    prepare(options: NodeCreationOptions, nodes: Array<DefaultNodeModel>, model: DiagramModel, graphEditor: GraphEditor) {
+        super.prepare(options, nodes, model, graphEditor);
     }
 
     renderProperties(globalState: GlobalState) {

+ 2 - 2
nodeEditor/src/components/diagram/light/lightNodeModel.tsx

@@ -38,10 +38,10 @@ export class LightNodeModel extends DefaultNodeModel {
         );
     }
 
-    prepare(options: NodeCreationOptions, nodes: Array<DefaultNodeModel>, model: DiagramModel, graphEditor: GraphEditor, filterInputs: string[]) {
+    prepare(options: NodeCreationOptions, nodes: Array<DefaultNodeModel>, model: DiagramModel, graphEditor: GraphEditor) {
         this._block = options.nodeMaterialBlock as LightBlock;
 
-        super.prepare(options, nodes, model, graphEditor, filterInputs);
+        super.prepare(options, nodes, model, graphEditor);
     }
 
 }

+ 2 - 2
nodeEditor/src/components/diagram/texture/textureNodeModel.tsx

@@ -38,10 +38,10 @@ export class TextureNodeModel extends DefaultNodeModel {
         );
     }
 
-    prepare(options: NodeCreationOptions, nodes: Array<DefaultNodeModel>, model: DiagramModel, graphEditor: GraphEditor, filterInputs: string[]) {
+    prepare(options: NodeCreationOptions, nodes: Array<DefaultNodeModel>, model: DiagramModel, graphEditor: GraphEditor) {
         this._block = options.nodeMaterialBlock as TextureBlock;
 
-        super.prepare(options, nodes, model, graphEditor, filterInputs);
+        super.prepare(options, nodes, model, graphEditor);
     }
 
 }

+ 1 - 6
nodeEditor/src/graphEditor.tsx

@@ -93,16 +93,11 @@ export class GraphEditor extends React.Component<IGraphEditorProps> {
 
         // Create new node in the graph
         var newNode: DefaultNodeModel;
-        var filterInputs = [];
        
         if (options.nodeMaterialBlock instanceof TextureBlock) {
             newNode = new TextureNodeModel();
-            filterInputs.push("uv");
         } else if (options.nodeMaterialBlock instanceof LightBlock) {
             newNode = new LightNodeModel();
-            filterInputs.push("worldPosition");
-            filterInputs.push("worldNormal");
-            filterInputs.push("cameraPosition");
         } else if (options.nodeMaterialBlock instanceof InputBlock) {
             newNode = new InputNodeModel();
         } else {
@@ -117,7 +112,7 @@ export class GraphEditor extends React.Component<IGraphEditorProps> {
         this._model.addAll(newNode);
 
         if (options.nodeMaterialBlock) {
-            newNode.prepare(options, this._nodes, this._model, this, filterInputs);
+            newNode.prepare(options, this._nodes, this._model, this);
         }
 
         return newNode;

+ 1 - 1
src/Materials/Node/nodeMaterial.ts

@@ -373,7 +373,7 @@ export class NodeMaterial extends PushMaterial {
         if (this.ignoreAlpha) {
             return false;
         }
-        return (this.alpha < 1.0) || this._sharedData.hints.needAlphaBlending;
+        return (this.alpha < 1.0) || (this._sharedData && this._sharedData.hints.needAlphaBlending);
     }
 
     /**