blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

Geometry Nodes: Uniform mode in Shortest Edge Paths node #114733

Closed
Iliya Katushenock wants to merge 9 commits from mod_moder:tmp_speedup_uniform_shortest_edge_paths into main
pull from: mod_moder:tmp_speedup_uniform_shortest_edge_paths
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 3 Commits 9 Files Changed 1 +21 -19
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
source/blender/nodes/geometry/nodes/node_geo_input_shortest_edge_paths.cc
View File

@ -56,29 +56,31 @@ static void shortest_paths(const Mesh &mesh,
}
});
while (!queue.empty()) {
const float cost_i = queue.top().first;
const int vert_i = queue.top().second;
queue.pop();
if (visited[vert_i]) {
continue;
}
visited[vert_i] = true;
for (const int index : vert_to_edge.offsets[vert_i]) {
const int edge_i = vert_to_edge.data[index];
const int neighbor_vert_i = other_vertex[index];
if (visited[neighbor_vert_i]) {
devirtualize_varray(input_cost, [&](auto input_cost) {
while (!queue.empty()) {
const float cost_i = queue.top().first;
const int vert_i = queue.top().second;
queue.pop();
if (visited[vert_i]) {
continue;
}
const float edge_cost = std::max(0.0f, input_cost[edge_i]);
const float new_neighbor_cost = cost_i + edge_cost;
if (new_neighbor_cost < r_cost[neighbor_vert_i]) {
r_cost[neighbor_vert_i] = new_neighbor_cost;
r_next_index[neighbor_vert_i] = vert_i;
queue.emplace(new_neighbor_cost, neighbor_vert_i);
visited[vert_i] = true;
for (const int index : vert_to_edge.offsets[vert_i]) {
const int edge_i = vert_to_edge.data[index];
const int neighbor_vert_i = other_vertex[index];
if (visited[neighbor_vert_i]) {
continue;
}
const float edge_cost = std::max(0.0f, input_cost[edge_i]);
const float new_neighbor_cost = cost_i + edge_cost;
if (new_neighbor_cost < r_cost[neighbor_vert_i]) {
r_cost[neighbor_vert_i] = new_neighbor_cost;
r_next_index[neighbor_vert_i] = vert_i;
queue.emplace(new_neighbor_cost, neighbor_vert_i);
}
}
}
}
});
}
class ShortestEdgePathsNextVertFieldInput final : public bke::MeshFieldInput {