Bladeren bron

refresh box to match node color type

Jed974 4 jaren geleden
bovenliggende
commit
5c14b31e43
2 gewijzigde bestanden met toevoegingen van 4 en 1 verwijderingen
  1. 1 0
      hide/view/shadereditor/ShaderEditor.hx
  2. 3 1
      hrt/shgraph/nodes/Combine.hx

+ 1 - 0
hide/view/shadereditor/ShaderEditor.hx

@@ -974,6 +974,7 @@ class ShaderEditor extends hide.view.Graph {
 				currentLink.removeClass("draft");
 				currentLink.removeClass("draft");
 				currentLink = null;
 				currentLink = null;
 				launchCompileShader();
 				launchCompileShader();
+				refreshBox(endLinkBox);
 				return true;
 				return true;
 			} else {
 			} else {
 				error("This edge creates a cycle.");
 				error("This edge creates a cycle.");

+ 3 - 1
hrt/shgraph/nodes/Combine.hx

@@ -41,13 +41,15 @@ class Combine extends ShaderNode {
 	}
 	}
 
 
 	override public function computeOutputs() {
 	override public function computeOutputs() {
-		numberOutputs = 1;
+		numberOutputs = 0;
 		if (a != null && !a.isEmpty()) {
 		if (a != null && !a.isEmpty()) {
 			numberOutputs = 4;
 			numberOutputs = 4;
 		} else if (b != null && !b.isEmpty()) {
 		} else if (b != null && !b.isEmpty()) {
 			numberOutputs = 3;
 			numberOutputs = 3;
 		} else if (g != null && !g.isEmpty()) {
 		} else if (g != null && !g.isEmpty()) {
 			numberOutputs = 2;
 			numberOutputs = 2;
+		} else if (r != null && !r.isEmpty()) {
+			numberOutputs = 1;
 		}
 		}
 		if (numberOutputs == 1) {
 		if (numberOutputs == 1) {
 			addOutput("output", TFloat);
 			addOutput("output", TFloat);