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

Cleanup: Use functional style cast for node socket type enum

Browse Source
This commit is contained in:
Hans Goudey
2025-05-28 15:47:26 -04:00
parent fbace1066d
commit c725bf324d
13 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/node_tree_field_inferencing.cc
View File

@@ -25,7 +25,7 @@ using nodes::SocketDeclaration;
static bool is_field_socket_type(const bNodeSocket &socket)
{
return nodes::socket_type_supports_fields((eNodeSocketDatatype)socket.typeinfo->type);
return nodes::socket_type_supports_fields(eNodeSocketDatatype(socket.typeinfo->type));
}
static bool all_dangling_reroutes(const Span<const bNodeSocket *> sockets)

2
source/blender/compositor/intern/shader_node.cc
View File

@@ -73,7 +73,7 @@ static void populate_gpu_node_stack(DSocket socket, GPUNodeStack &stack)
zero_v4(stack.vec);
stack.sockettype = socket->type;
stack.type = gpu_type_from_socket_type(static_cast<eNodeSocketDatatype>(socket->type));
stack.type = gpu_type_from_socket_type(eNodeSocketDatatype(socket->type));
stack.hasinput = socket->is_logically_linked();
stack.hasoutput = socket->is_logically_linked();

4
source/blender/editors/space_node/link_drag_search.cc
View File

@@ -183,8 +183,8 @@ static void search_link_ops_for_asset_metadata(const bNodeTree &node_tree,
if (socket_type == nullptr) {
continue;
}
eNodeSocketDatatype from = (eNodeSocketDatatype)socket.type;
eNodeSocketDatatype to = (eNodeSocketDatatype)socket_type->type;
eNodeSocketDatatype from = eNodeSocketDatatype(socket.type);
eNodeSocketDatatype to = eNodeSocketDatatype(socket_type->type);
if (socket.in_out == SOCK_OUT) {
std::swap(from, to);
}

10
source/blender/editors/space_node/node_relationships.cc
View File

@@ -2490,14 +2490,14 @@ void node_insert_on_link_flags(Main &bmain, SpaceNode &snode, bool is_new_node)
if (!node_to_insert->is_reroute()) {
/* Ignore main sockets when the types don't match. */
if (best_input != nullptr && ntree.typeinfo->validate_link != nullptr &&
!ntree.typeinfo->validate_link(static_cast<eNodeSocketDatatype>(old_link->fromsock->type),
static_cast<eNodeSocketDatatype>(best_input->type)))
!ntree.typeinfo->validate_link(eNodeSocketDatatype(old_link->fromsock->type),
eNodeSocketDatatype(best_input->type)))
{
best_input = nullptr;
}
if (best_output != nullptr && ntree.typeinfo->validate_link != nullptr &&
!ntree.typeinfo->validate_link(static_cast<eNodeSocketDatatype>(best_output->type),
static_cast<eNodeSocketDatatype>(old_link->tosock->type)))
!ntree.typeinfo->validate_link(eNodeSocketDatatype(best_output->type),
eNodeSocketDatatype(old_link->tosock->type)))
{
best_output = nullptr;
}
@@ -2550,7 +2550,7 @@ void node_insert_on_link_flags(Main &bmain, SpaceNode &snode, bool is_new_node)
static int get_main_socket_priority(const bNodeSocket *socket)
{
switch ((eNodeSocketDatatype)socket->type) {
switch (eNodeSocketDatatype(socket->type)) {
case SOCK_CUSTOM:
return 0;
case SOCK_BOOLEAN:

4
source/blender/nodes/function/nodes/node_fn_boolean_math.cc
View File

@@ -55,8 +55,8 @@ static void node_label(const bNodeTree * /*tree*/,
static void node_gather_link_searches(GatherLinkSearchOpParams &params)
{
if (!params.node_tree().typeinfo->validate_link(
static_cast<eNodeSocketDatatype>(params.other_socket().type), SOCK_BOOLEAN))
if (!params.node_tree().typeinfo->validate_link(eNodeSocketDatatype(params.other_socket().type),
SOCK_BOOLEAN))
{
return;
}

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

@@ -77,7 +77,7 @@ static void node_update(bNodeTree *ntree, bNode *node)
LISTBASE_FOREACH (bNodeSocket *, socket, &node->inputs) {
bke::node_set_socket_availability(
*ntree, *socket, socket->type == (eNodeSocketDatatype)data->data_type);
*ntree, *socket, socket->type == eNodeSocketDatatype(data->data_type));
}
bke::node_set_socket_availability(

2
source/blender/nodes/function/nodes/node_fn_hash_value.cc
View File

@@ -43,7 +43,7 @@ static void node_init(bNodeTree * /*tree*/, bNode *node)
static const mf::MultiFunction *get_multi_function(const bNode &bnode)
{
const eNodeSocketDatatype socket_type = static_cast<eNodeSocketDatatype>(bnode.custom1);
const eNodeSocketDatatype socket_type = eNodeSocketDatatype(bnode.custom1);
static auto exec_preset = mf::build::exec_presets::AllSpanOrSingle();

4
source/blender/nodes/function/nodes/node_fn_match_string.cc
View File

@@ -101,8 +101,8 @@ static void node_build_multi_function(NodeMultiFunctionBuilder &builder)
static void node_gather_link_searches(GatherLinkSearchOpParams &params)
{
if (params.in_out() == SOCK_IN) {
if (params.node_tree().typeinfo->validate_link(
static_cast<eNodeSocketDatatype>(params.other_socket().type), SOCK_STRING))
if (params.node_tree().typeinfo->validate_link(eNodeSocketDatatype(params.other_socket().type),
SOCK_STRING))
{
for (const EnumPropertyItem *item = rna_enum_node_match_string_items;
item->identifier != nullptr;

2
source/blender/nodes/shader/materialx/node_parser.cc
View File

@@ -31,7 +31,7 @@ NodeItem NodeParser::compute_full()
{
NodeItem res = empty();
if (socket_out_ && !NodeItem::is_convertible((eNodeSocketDatatype)socket_out_->type, to_type_)) {
if (socket_out_ && !NodeItem::is_convertible(eNodeSocketDatatype(socket_out_->type), to_type_)) {
return res;
}

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

@@ -43,8 +43,8 @@ class SocketSearchOp {
static void sh_node_math_gather_link_searches(GatherLinkSearchOpParams &params)
{
if (!params.node_tree().typeinfo->validate_link(
static_cast<eNodeSocketDatatype>(params.other_socket().type), SOCK_FLOAT))
if (!params.node_tree().typeinfo->validate_link(eNodeSocketDatatype(params.other_socket().type),
SOCK_FLOAT))
{
return;
}

6
source/blender/nodes/shader/nodes/node_shader_mix.cc
View File

@@ -150,7 +150,7 @@ static void sh_node_mix_label(const bNodeTree * /*ntree*/,
static int sh_node_mix_ui_class(const bNode *node)
{
const NodeShaderMix &storage = node_storage(*node);
const eNodeSocketDatatype data_type = static_cast<eNodeSocketDatatype>(storage.data_type);
const eNodeSocketDatatype data_type = eNodeSocketDatatype(storage.data_type);
switch (data_type) {
case SOCK_VECTOR:
@@ -165,7 +165,7 @@ static int sh_node_mix_ui_class(const bNode *node)
static void sh_node_mix_update(bNodeTree *ntree, bNode *node)
{
const NodeShaderMix &storage = node_storage(*node);
const eNodeSocketDatatype data_type = static_cast<eNodeSocketDatatype>(storage.data_type);
const eNodeSocketDatatype data_type = eNodeSocketDatatype(storage.data_type);
bNodeSocket *sock_factor = static_cast<bNodeSocket *>(node->inputs.first);
bNodeSocket *sock_factor_vec = static_cast<bNodeSocket *>(sock_factor->next);
@@ -374,7 +374,7 @@ static int gpu_shader_mix(GPUMaterial *mat,
const bool is_vector_mode = storage.data_type == SOCK_VECTOR;
const int blend_type = storage.blend_type;
const char *name = gpu_shader_get_name(
(eNodeSocketDatatype)storage.data_type, is_non_uniform, blend_type);
eNodeSocketDatatype(storage.data_type), is_non_uniform, blend_type);
if (name == nullptr) {
return 0;

4
source/blender/nodes/shader/nodes/node_shader_tex_sky.cc
View File

@@ -291,8 +291,8 @@ static void node_gather_link_searches(GatherLinkSearchOpParams &params)
search_link_ops_for_declarations(params, declaration.outputs);
return;
}
if (params.node_tree().typeinfo->validate_link(
static_cast<eNodeSocketDatatype>(params.other_socket().type), SOCK_FLOAT))
if (params.node_tree().typeinfo->validate_link(eNodeSocketDatatype(params.other_socket().type),
SOCK_FLOAT))
{
params.add_item(IFACE_("Vector"), [](LinkSearchOpParams &params) {
bNode &node = params.add_node("ShaderNodeTexSky");

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

@@ -52,8 +52,8 @@ class SocketSearchOp {
static void sh_node_vector_math_gather_link_searches(GatherLinkSearchOpParams &params)
{
if (!params.node_tree().typeinfo->validate_link(
static_cast<eNodeSocketDatatype>(params.other_socket().type), SOCK_VECTOR))
if (!params.node_tree().typeinfo->validate_link(eNodeSocketDatatype(params.other_socket().type),
SOCK_VECTOR))
{
return;
}