blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Cleanup: Use C++ types for multi input socket sorting 

The algorithm used is still quite inefficient, but at least the code
is easier to read and a little bit simpler now.
This commit is contained in:
Hans Goudey 2021-12-06 17:12:46 -05:00
parent aa23e870ec
commit 78ae587649
4 changed files with 35 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/editors/space_node/drawnode.cc
View File

@ -3529,11 +3529,11 @@ bool node_link_bezier_handles(const View2D *v2d,
vec[0][0] = link.fromsock->locx;
vec[0][1] = link.fromsock->locy;
if (link.fromsock->flag & SOCK_MULTI_INPUT) {
node_link_calculate_multi_input_position(link.fromsock->locx,
link.fromsock->locy,
link.fromsock->total_inputs - 1,
link.fromsock->total_inputs,
vec[0]);
const float2 position = node_link_calculate_multi_input_position(
{link.fromsock->locx, link.fromsock->locy},
link.fromsock->total_inputs - 1,
link.fromsock->total_inputs);
copy_v2_v2(vec[0], position);
}
fromreroute = (link.fromnode && link.fromnode->type == NODE_REROUTE);
}
@ -3548,11 +3548,11 @@ bool node_link_bezier_handles(const View2D *v2d,
vec[3][0] = link.tosock->locx;
vec[3][1] = link.tosock->locy;
if (!(link.tonode->flag & NODE_HIDDEN) && link.tosock->flag & SOCK_MULTI_INPUT) {
node_link_calculate_multi_input_position(link.tosock->locx,
link.tosock->locy,
link.multi_input_socket_index,
link.tosock->total_inputs,
vec[3]);
const float2 position = node_link_calculate_multi_input_position(
{link.tosock->locx, link.tosock->locy},
link.multi_input_socket_index,
link.tosock->total_inputs);
copy_v2_v2(vec[3], position);
}
toreroute = (link.tonode && link.tonode->type == NODE_REROUTE);
}

15
source/blender/editors/space_node/node_edit.cc
View File

@ -111,15 +111,14 @@ float node_socket_calculate_height(const bNodeSocket &socket)
return sock_height;
}
void node_link_calculate_multi_input_position(const float socket_x,
const float socket_y,
const int index,
const int total_inputs,
float r[2])
float2 node_link_calculate_multi_input_position(const float2 &socket_position,
const int index,
const int total_inputs)
{
float offset = (total_inputs * NODE_MULTI_INPUT_LINK_GAP - NODE_MULTI_INPUT_LINK_GAP) * 0.5;
r[0] = socket_x - NODE_SOCKSIZE * 0.5f;
r[1] = socket_y - offset + (index * NODE_MULTI_INPUT_LINK_GAP);
const float offset = (total_inputs * NODE_MULTI_INPUT_LINK_GAP - NODE_MULTI_INPUT_LINK_GAP) *
0.5f;
return {socket_position.x - NODE_SOCKSIZE * 0.5f,
socket_position.y - offset + index * NODE_MULTI_INPUT_LINK_GAP};
}
static void compo_tag_output_nodes(bNodeTree *nodetree, int recalc_flags)

8
source/blender/editors/space_node/node_intern.hh
View File

@ -93,11 +93,9 @@ ENUM_OPERATORS(NodeResizeDirection, NODE_RESIZE_LEFT);
blender::float2 space_node_group_offset(const SpaceNode &snode);
float node_socket_calculate_height(const bNodeSocket &socket);
void node_link_calculate_multi_input_position(const float socket_x,
const float socket_y,
const int index,
const int total_inputs,
float r[2]);
blender::float2 node_link_calculate_multi_input_position(const blender::float2 &socket_position,
int index,
int total_inputs);
int node_get_colorid(bNode &node);
int node_get_resize_cursor(NodeResizeDirection directions);

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

@ -440,17 +440,6 @@ struct LinkAndPosition {
float2 multi_socket_position;
};
static int compare_link_by_y_position(const void *a, const void *b)
{
const LinkAndPosition *link_and_position_a = *(const LinkAndPosition **)a;
const LinkAndPosition *link_and_position_b = *(const LinkAndPosition **)b;
BLI_assert(link_and_position_a->link->tosock == link_and_position_b->link->tosock);
const float link_a_y = link_and_position_a->multi_socket_position[1];
const float link_b_y = link_and_position_b->multi_socket_position[1];
return link_a_y > link_b_y ? 1 : -1;
}
void sort_multi_input_socket_links(SpaceNode &snode,
bNode &node,
bNodeLink *drag_link,
@ -460,50 +449,34 @@ void sort_multi_input_socket_links(SpaceNode &snode,
if (!(socket->flag & SOCK_MULTI_INPUT)) {
continue;
}
/* The total is calculated in #node_update_nodetree, which runs before this draw step. */
int total_inputs = socket->total_inputs + 1;
struct LinkAndPosition **input_links = (LinkAndPosition **)MEM_malloc_arrayN(
total_inputs, sizeof(LinkAndPosition *), __func__);
Vector<LinkAndPosition, 8> links;
int index = 0;
LISTBASE_FOREACH (bNodeLink *, link, &snode.edittree->links) {
if (link->tosock == socket) {
struct LinkAndPosition *link_and_position = (LinkAndPosition *)MEM_callocN(
sizeof(struct LinkAndPosition), __func__);
link_and_position->link = link;
node_link_calculate_multi_input_position(link->tosock->locx,
link->tosock->locy,
link->multi_input_socket_index,
link->tosock->total_inputs,
link_and_position->multi_socket_position);
input_links[index] = link_and_position;
index++;
links.append(
{link,
node_link_calculate_multi_input_position({link->tosock->locx, link->tosock->locy},
link->multi_input_socket_index,
link->tosock->total_inputs)});
}
}
if (drag_link) {
LinkAndPosition *link_and_position = (LinkAndPosition *)MEM_callocN(sizeof(LinkAndPosition),
__func__);
link_and_position->link = drag_link;
LinkAndPosition link_and_position{};
link_and_position.link = drag_link;
if (cursor) {
link_and_position->multi_socket_position = *cursor;
link_and_position.multi_socket_position = *cursor;
}
input_links[index] = link_and_position;
index++;
links.append(link_and_position);
}
qsort(input_links, index, sizeof(bNodeLink *), compare_link_by_y_position);
std::sort(links.begin(), links.end(), [](const LinkAndPosition a, const LinkAndPosition b) {
return a.multi_socket_position.y < b.multi_socket_position.y;
});
for (int i = 0; i < index; i++) {
input_links[i]->link->multi_input_socket_index = i;
for (const int i : links.index_range()) {
links[i].link->multi_input_socket_index = i;
}
for (int i = 0; i < index; i++) {
if (input_links[i]) {
MEM_freeN(input_links[i]);
}
}
MEM_freeN(input_links);
}
}