griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Nodes: Weight drag link search for Math nodes

Browse Source 
As @hooglyboogly suggested in D13680, this patch adds weighting
to the search results. Dragging from a vector/rgba socket weights
the Vector Math node higher than a float Math node, and vice versa.

Reviewed By: HooglyBoogly

Differential Revision: https://developer.blender.org/D13691
This commit is contained in:
Charlie Jolly
2021-12-31 02:32:28 +00:00
committed by Charlie Jolly
parent 0aa7315608
commit 71468f475b
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/nodes/shader/nodes/node_shader_math.cc
View File

@@ -70,11 +70,15 @@ static void sh_node_math_gather_link_searches(GatherLinkSearchOpParams &params)
/* Expose first Value socket. */
if (params.node_tree().typeinfo->validate_link(
static_cast<eNodeSocketDatatype>(params.other_socket().type), SOCK_FLOAT)) {
const int weight = ELEM(params.other_socket().type, SOCK_FLOAT, SOCK_BOOLEAN, SOCK_INT) ? 0 :
-1;
for (const EnumPropertyItem *item = rna_enum_node_math_items; item->identifier != nullptr;
item++) {
if (item->name != nullptr && item->identifier != "") {
params.add_item(IFACE_(item->name),
SocketSearchOp{"Value", (NodeMathOperation)item->value});
params.add_item(
IFACE_(item->name), SocketSearchOp{"Value", (NodeMathOperation)item->value}, weight);
}
}
}

8
source/blender/nodes/shader/nodes/node_shader_vector_math.cc
View File

@@ -64,6 +64,8 @@ static void sh_node_vector_math_gather_link_searches(GatherLinkSearchOpParams &p
return;
}
const int weight = ELEM(params.other_socket().type, SOCK_VECTOR, SOCK_RGBA) ? 0 : -1;
for (const EnumPropertyItem *item = rna_enum_node_vec_math_items; item->identifier != nullptr;
item++) {
if (item->name != nullptr && item->identifier != "") {
@@ -72,11 +74,13 @@ static void sh_node_vector_math_gather_link_searches(GatherLinkSearchOpParams &p
NODE_VECTOR_MATH_DISTANCE,
NODE_VECTOR_MATH_DOT_PRODUCT)) {
params.add_item(IFACE_(item->name),
SocketSearchOp{"Value", (NodeVectorMathOperation)item->value});
SocketSearchOp{"Value", (NodeVectorMathOperation)item->value},
weight);
}
else {
params.add_item(IFACE_(item->name),
SocketSearchOp{"Vector", (NodeVectorMathOperation)item->value});
SocketSearchOp{"Vector", (NodeVectorMathOperation)item->value},
weight);
}
}
}