New visual clue for type conversions (#15887)

BabylonJS · Nov 25, 2024 · 7803aa7 · 7803aa7
1 parent df383c9
commit 7803aa7
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 6 deletions.
diff --git a/packages/dev/core/src/Materials/Node/Blocks/Fragment/fragmentOutputBlock.ts b/packages/dev/core/src/Materials/Node/Blocks/Fragment/fragmentOutputBlock.ts
@@ -40,11 +40,11 @@ export class FragmentOutputBlock extends NodeMaterialBlock {
         super(name, NodeMaterialBlockTargets.Fragment, true);
 
         this.registerInput("rgba", NodeMaterialBlockConnectionPointTypes.Color4, true);
-        this.registerInput("rgb", NodeMaterialBlockConnectionPointTypes.AutoDetect, true);
+        this.registerInput("rgb", NodeMaterialBlockConnectionPointTypes.Color3, true);
         this.registerInput("a", NodeMaterialBlockConnectionPointTypes.Float, true);
-        this.rgb.addExcludedConnectionPointFromAllowedTypes(
-            NodeMaterialBlockConnectionPointTypes.Color3 | NodeMaterialBlockConnectionPointTypes.Vector3 | NodeMaterialBlockConnectionPointTypes.Float
-        );
+
+        this.rgb.acceptedConnectionPointTypes.push(NodeMaterialBlockConnectionPointTypes.Vector3);
+        this.rgb.acceptedConnectionPointTypes.push(NodeMaterialBlockConnectionPointTypes.Float);
     }
 
     /** Gets or sets a boolean indicating if content needs to be converted to gamma space */

diff --git a/packages/dev/core/src/Materials/Node/nodeMaterialBlock.ts b/packages/dev/core/src/Materials/Node/nodeMaterialBlock.ts
@@ -351,7 +351,12 @@ export class NodeMaterialBlock {
     public getFirstAvailableInput(forOutput: Nullable<NodeMaterialConnectionPoint> = null) {
         for (const input of this._inputs) {
             if (!input.connectedPoint) {
-                if (!forOutput || forOutput.type === input.type || input.type === NodeMaterialBlockConnectionPointTypes.AutoDetect) {
+                if (
+                    !forOutput ||
+                    forOutput.type === input.type ||
+                    input.type === NodeMaterialBlockConnectionPointTypes.AutoDetect ||
+                    input.acceptedConnectionPointTypes.indexOf(forOutput.type) !== -1
+                ) {
                     return input;
                 }
             }

diff --git a/packages/dev/sharedUiComponents/src/nodeGraphSystem/nodeLink.ts b/packages/dev/sharedUiComponents/src/nodeGraphSystem/nodeLink.ts
@@ -21,6 +21,7 @@ export class NodeLink {
     private _onSelectionChangedObserver: Nullable<Observer<Nullable<ISelectionChangedOptions>>>;
     private _isVisible = true;
     private _isTargetCandidate = false;
+    private _gradient: Nullable<SVGLinearGradientElement>;
 
     public onDisposedObservable = new Observable<NodeLink>();
 
@@ -130,7 +131,52 @@ export class NodeLink {
             this._path.setAttribute("d", `M${startX},${startY} C${startX + tangentLength},${startY} ${endX - tangentLength},${endY} ${endX},${endY}`);
             this._selectionPath.setAttribute("d", `M${startX},${startY} C${startX + tangentLength},${startY} ${endX - tangentLength},${endY} ${endX},${endY}`);
         }
-        this._path.setAttribute("stroke", this._portA.element.style.backgroundColor!);
+
+        // No red as it means no type yet
+        let extractedColorB = "";
+        if (this._portB) {
+            extractedColorB = this._portB?.element.style.backgroundColor.replace(/rgb\((\d+),\s*(\d+),\s*(\d+)\)/, "$1_$2_$3");
+            const splitComponents = extractedColorB.split("_").map((v) => parseInt(v));
+            if (splitComponents[0] > 0 && splitComponents[1] === 0 && splitComponents[2] === 0) {
+                extractedColorB = "";
+            }
+        }
+
+        if (extractedColorB && this._portA.element.style.backgroundColor !== this._portB?.element.style.backgroundColor) {
+            // Gradient
+            const svg = this._graphCanvas.svgCanvas;
+            const defs = svg.querySelector("defs") || svg.appendChild(document.createElementNS("http://www.w3.org/2000/svg", "defs"));
+
+            if (!this._gradient) {
+                this._gradient = document.createElementNS("http://www.w3.org/2000/svg", "linearGradient");
+                defs.appendChild(this._gradient);
+                const stop1 = document.createElementNS("http://www.w3.org/2000/svg", "stop");
+                this._gradient.appendChild(stop1);
+                const stop2 = document.createElementNS("http://www.w3.org/2000/svg", "stop");
+                this._gradient.appendChild(stop2);
+            }
+
+            const stop1 = this._gradient.children[0] as SVGStopElement;
+            const stop2 = this._gradient.children[1] as SVGStopElement;
+
+            const gradientId = `linkGradient_${this._portA.element.style.backgroundColor.replace(/rgb\((\d+),\s*(\d+),\s*(\d+)\)/, "$1_$2_$3")}_${extractedColorB}`;
+            this._gradient.id = gradientId;
+
+            this._gradient.setAttribute("x1", startX < endX ? "0" : "1");
+            this._gradient.setAttribute("y1", "0");
+            this._gradient.setAttribute("x2", startX < endX ? "1" : "0");
+            this._gradient.setAttribute("y2", "0");
+
+            stop1.setAttribute("offset", "0%");
+            stop1.setAttribute("stop-color", this._portA.element.style.backgroundColor!);
+
+            stop2.setAttribute("offset", "100%");
+            stop2.setAttribute("stop-color", this._portB?.element.style.backgroundColor!);
+
+            this._path.setAttribute("stroke", `url(#${gradientId})`);
+        } else {
+            this._path.setAttribute("stroke", this._portA.element.style.backgroundColor!);
+        }
     }
 
     public get path() {
@@ -258,6 +304,12 @@ export class NodeLink {
             this._selectionPath.parentElement.removeChild(this._selectionPath);
         }
 
+        if (this._gradient) {
+            if (this._gradient.parentElement) {
+                this._gradient.parentElement.removeChild(this._gradient);
+            }
+        }
+
         if (this._nodeB) {
             this._nodeA.links.splice(this._nodeA.links.indexOf(this), 1);
             this._nodeB.links.splice(this._nodeB.links.indexOf(this), 1);