Chris_Blackbourn/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests 1 Activity

WIP: uv-simple-select #1

Closed
Chris Blackbourn wants to merge 182 commits from uv-simple-select into main
pull from: uv-simple-select
merge into: Chris_Blackbourn:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 182 Files Changed 881 +46 -24
1 changed files with 46 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 51bbcba3ff - Show all commits

72
source/blender/nodes/function/nodes/node_fn_compare.cc
View File

@ -93,7 +93,7 @@ static void node_init(bNodeTree * /*tree*/, bNode *node)
class SocketSearchOp { class SocketSearchOp {
public: public:
std::string socket_name; const StringRef socket_name;
eNodeSocketDatatype data_type; eNodeSocketDatatype data_type;
NodeCompareOperation operation; NodeCompareOperation operation;
NodeCompareMode mode = NODE_COMPARE_MODE_ELEMENT; NodeCompareMode mode = NODE_COMPARE_MODE_ELEMENT;
@ -107,40 +107,62 @@ class SocketSearchOp {
} }
}; };
static void node_gather_link_searches(GatherLinkSearchOpParams &params) static std::optional<eNodeSocketDatatype> get_compare_type_for_operation(
const eNodeSocketDatatype type, const NodeCompareOperation operation)
{ {
const eNodeSocketDatatype type = static_cast<eNodeSocketDatatype>(params.other_socket().type); switch (type) {
if (!ELEM(type, SOCK_BOOLEAN, SOCK_FLOAT, SOCK_RGBA, SOCK_VECTOR, SOCK_INT, SOCK_STRING)) { case SOCK_BOOLEAN:
return; if (ELEM(operation, NODE_COMPARE_COLOR_BRIGHTER, NODE_COMPARE_COLOR_DARKER)) {
return SOCK_RGBA;
}
return SOCK_INT;
case SOCK_INT:
case SOCK_FLOAT:
case SOCK_VECTOR:
if (ELEM(operation, NODE_COMPARE_COLOR_BRIGHTER, NODE_COMPARE_COLOR_DARKER)) {
return SOCK_RGBA;
}
return type;
case SOCK_RGBA:
if (!ELEM(operation,
NODE_COMPARE_COLOR_BRIGHTER,
NODE_COMPARE_COLOR_DARKER,
NODE_COMPARE_EQUAL,
NODE_COMPARE_NOT_EQUAL)) {
return SOCK_VECTOR;
}
return type;
case SOCK_STRING:
if (!ELEM(operation, NODE_COMPARE_EQUAL, NODE_COMPARE_NOT_EQUAL)) {
return std::nullopt;
}
return type;
default:
BLI_assert_unreachable();
return std::nullopt;
}
} }
const eNodeSocketDatatype mode_type = (type == SOCK_BOOLEAN) ? SOCK_INT : type; static void node_gather_link_searches(GatherLinkSearchOpParams &params)
const bool string_type = (type == SOCK_STRING); {
const eNodeSocketDatatype type = eNodeSocketDatatype(params.other_socket().type);
const std::string socket_name = params.in_out() == SOCK_IN ? "A" : "Result"; if (!ELEM(type, SOCK_INT, SOCK_BOOLEAN, SOCK_FLOAT, SOCK_VECTOR, SOCK_RGBA, SOCK_STRING)) {
return;
}
const StringRef socket_name = params.in_out() == SOCK_IN ? "A" : "Result";
for (const EnumPropertyItem *item = rna_enum_node_compare_operation_items; for (const EnumPropertyItem *item = rna_enum_node_compare_operation_items;
item->identifier != nullptr; item->identifier != nullptr;
item++) { item++) {
if (item->name != nullptr && item->identifier[0] != '\0') { if (item->name != nullptr && item->identifier[0] != '\0') {
if (!string_type && const NodeCompareOperation operation = NodeCompareOperation(item->value);
ELEM(item->value, NODE_COMPARE_COLOR_BRIGHTER, NODE_COMPARE_COLOR_DARKER)) { if (const std::optional<eNodeSocketDatatype> fixed_type = get_compare_type_for_operation(
params.add_item(IFACE_(item->name), type, operation)) {
SocketSearchOp{socket_name, params.add_item(IFACE_(item->name), SocketSearchOp{socket_name, *fixed_type, operation});
SOCK_RGBA,
static_cast<NodeCompareOperation>(item->value)});
}
else if ((!string_type) ||
(string_type && ELEM(item->value, NODE_COMPARE_EQUAL, NODE_COMPARE_NOT_EQUAL))) {
params.add_item(IFACE_(item->name),
SocketSearchOp{socket_name,
mode_type,
static_cast<NodeCompareOperation>(item->value)});
} }
} }
} }
/* Add Angle socket. */
if (!string_type && params.in_out() == SOCK_IN) { if (params.in_out() != SOCK_IN && type != SOCK_STRING) {
params.add_item( params.add_item(
IFACE_("Angle"), IFACE_("Angle"),
SocketSearchOp{ SocketSearchOp{