Browse Source

[shgraph] improved style

Clement Espeute 1 year ago
parent
commit
f026f7381a
2 changed files with 3 additions and 9 deletions
  1. 3 1
      hide/view/shadereditor/Box.hx
  2. 0 8
      hrt/shgraph/nodes/Sampler.hx

+ 3 - 1
hide/view/shadereditor/Box.hx

@@ -236,9 +236,11 @@ class Box {
 			var propWidth = (p.width() > 0 ? p.width() : this.width);
 			var fObject = editor.foreignObject(prop, (this.width - propWidth) / 2, 5, propWidth, p.height());
 			p.appendTo(fObject);
-			propsHeight += Std.int(p.outerHeight()) + 5;
+			propsHeight += Std.int(p.outerHeight()) + 1;
 		}
 
+		propsHeight += 10;
+
 		refreshHeight();
 	}
 

+ 0 - 8
hrt/shgraph/nodes/Sampler.hx

@@ -30,10 +30,6 @@ class Sampler extends ShaderNodeHxsl {
 		@sginput var texture : Sampler2D;
 		@sginput(calculatedUV) var uv : Vec2;
 		@sgoutput var RGBA : Vec4;
-		@sgoutput var R : Float;
-		@sgoutput var G : Float;
-		@sgoutput var B : Float;
-		@sgoutput var A : Float;
 
 		@sgconst var wrap : Int;
 		@sgconst var filter : Int;
@@ -53,10 +49,6 @@ class Sampler extends ShaderNodeHxsl {
 				uv2 = (floor( size * uv2 ) + 0.5) / size ;
 			}
 			RGBA = texture.get(uv2);
-			R = RGBA.r;
-			G = RGBA.g;
-			B = RGBA.b;
-			A = RGBA.a;
 		}
 	}