blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Nodes: Improve link drag search for Math and Vector Math nodes 

Exposes math operations via rna emums.

This uses the rna enum to build the search list.

Differential Revision: https://developer.blender.org/D13680
This commit is contained in:
Charlie Jolly 2021-12-28 11:39:18 +00:00
parent 6d7dbdbb44
commit 0b73b2c6cf
2 changed files with 66 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,8 @@
#include "NOD_math_functions.hh"
#include "NOD_socket_search_link.hh"
#include "RNA_enum_types.h"
/* **************** SCALAR MATH ******************** */
namespace blender::nodes::node_shader_math_cc {
@ -45,15 +47,36 @@ static void sh_node_math_declare(NodeDeclarationBuilder &b)
b.add_output<decl::Float>(N_("Value"));
};
class SocketSearchOp {
public:
std::string socket_name;
NodeMathOperation mode = NODE_MATH_ADD;
void operator()(LinkSearchOpParams &params)
{
bNode &node = params.add_node("ShaderNodeMath");
node.custom1 = mode;
params.update_and_connect_available_socket(node, socket_name);
}
};
static void sh_node_math_gather_link_searches(GatherLinkSearchOpParams &params)
{
/* For now, do something very basic (only exposing "Add", and a single "Value" socket). */
const NodeDeclaration &declaration = *params.node_type().fixed_declaration;
if (params.in_out() == SOCK_OUT) {
search_link_ops_for_declarations(params, declaration.outputs());
return;
}
/* Expose first Value socket. */
if (params.node_tree().typeinfo->validate_link(
static_cast<eNodeSocketDatatype>(params.other_socket().type), SOCK_FLOAT)) {
params.add_item(IFACE_("Value"), [](LinkSearchOpParams &params) {
bNode &node = params.add_node("ShaderNodeMath");
params.update_and_connect_available_socket(node, "Value");
});
for (const EnumPropertyItem *item = rna_enum_node_math_items; item->identifier != nullptr;
item++) {
if (item->name != nullptr) {
params.add_item(IFACE_(item->name),
SocketSearchOp{"Value", (NodeMathOperation)item->value});
}
}
}
}

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

@ -26,6 +26,8 @@
#include "NOD_math_functions.hh"
#include "NOD_socket_search_link.hh"
#include "RNA_enum_types.h"
namespace blender::nodes::node_shader_vector_math_cc {
static void sh_node_vector_math_declare(NodeDeclarationBuilder &b)
@ -39,15 +41,44 @@ static void sh_node_vector_math_declare(NodeDeclarationBuilder &b)
b.add_output<decl::Float>(N_("Value"));
};
class SocketSearchOp {
public:
std::string socket_name;
NodeVectorMathOperation mode = NODE_VECTOR_MATH_ADD;
void operator()(LinkSearchOpParams &params)
{
bNode &node = params.add_node("ShaderNodeVectorMath");
node.custom1 = mode;
params.update_and_connect_available_socket(node, socket_name);
}
};
static void sh_node_vector_math_gather_link_searches(GatherLinkSearchOpParams &params)
{
/* For now, do something very basic (only exposing "Add", and a single "Vector" socket). */
if (params.node_tree().typeinfo->validate_link(
static_cast<eNodeSocketDatatype>(params.other_socket().type), SOCK_VECTOR)) {
params.add_item(IFACE_("Vector"), [](LinkSearchOpParams &params) {
bNode &node = params.add_node("ShaderNodeVectorMath");
params.update_and_connect_available_socket(node, "Vector");
});
if (!ELEM(params.other_socket().type,
SOCK_FLOAT,
SOCK_BOOLEAN,
SOCK_INT,
SOCK_VECTOR,
SOCK_RGBA)) {
return;
}
for (const EnumPropertyItem *item = rna_enum_node_vec_math_items; item->identifier != nullptr;
item++) {
if (item->name != nullptr) {
if ((params.in_out() == SOCK_OUT) && ELEM(item->value,
NODE_VECTOR_MATH_LENGTH,
NODE_VECTOR_MATH_DISTANCE,
NODE_VECTOR_MATH_DOT_PRODUCT)) {
params.add_item(IFACE_(item->name),
SocketSearchOp{"Value", (NodeVectorMathOperation)item->value});
}
else {
params.add_item(IFACE_(item->name),
SocketSearchOp{"Vector", (NodeVectorMathOperation)item->value});
}
}
}
}