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

PBVH: Specialize node bounds update, expose functions

Browse Source 
Similar to previous commits (7332a1eb90), use three separate
functions for updating the bounds of different PBVH types. This avoids
the use of the vertex iteration macro. Also make the functions reusable,
so they can be called directly after a brush update in the future.
This commit is contained in:
Hans Goudey
2023-12-04 07:55:32 -05:00
parent 869ea79da0
commit e9f4f8b52a
2 changed files with 57 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/BKE_pbvh_api.hh
View File

@@ -657,4 +657,8 @@ void node_update_visibility_mesh(Span<bool> hide_vert, PBVHNode &node);
void node_update_visibility_grids(const BitGroupVector<> &grid_hidden, PBVHNode &node);
void node_update_visibility_bmesh(PBVHNode &node);
void update_node_bounds_mesh(Span<float3> positions, PBVHNode &node);
void update_node_bounds_grids(const CCGKey &key, Span<CCGElem *> grids, PBVHNode &node);
void update_node_bounds_bmesh(PBVHNode &node);
} // namespace blender::bke::pbvh

64
source/blender/blenkernel/intern/pbvh.cc
View File

@@ -133,27 +133,69 @@ void BBC_update_centroid(BBC *bbc)
}
}
namespace blender::bke::pbvh {
void update_node_bounds_mesh(const Span<float3> positions, PBVHNode &node)
{
BB vb;
BB_reset(&vb);
for (const int vert : node.vert_indices) {
BB_expand(&vb, positions[vert]);
}
node.vb = vb;
}
void update_node_bounds_grids(const CCGKey &key, const Span<CCGElem *> grids, PBVHNode &node)
{
BB vb;
BB_reset(&vb);
for (const int grid : node.prim_indices) {
for (const int i : IndexRange(key.grid_area)) {
BB_expand(&vb, CCG_elem_offset_co(&key, grids[grid], i));
}
}
node.vb = vb;
}
void update_node_bounds_bmesh(PBVHNode &node)
{
BB vb;
BB_reset(&vb);
for (const BMVert *vert : node.bm_unique_verts) {
BB_expand(&vb, vert->co);
}
for (const BMVert *vert : node.bm_other_verts) {
BB_expand(&vb, vert->co);
}
node.vb = vb;
}
} // namespace blender::bke::pbvh
/* Not recursive */
static void update_node_vb(PBVH *pbvh, PBVHNode *node)
{
BB vb;
BB_reset(&vb);
using namespace blender::bke::pbvh;
if (node->flag & PBVH_Leaf) {
PBVHVertexIter vd;
BKE_pbvh_vertex_iter_begin (pbvh, node, vd, PBVH_ITER_ALL) {
BB_expand(&vb, vd.co);
switch (pbvh->header.type) {
case PBVH_FACES:
update_node_bounds_mesh(pbvh->vert_positions, *node);
break;
case PBVH_GRIDS:
update_node_bounds_grids(pbvh->gridkey, pbvh->subdiv_ccg->grids, *node);
break;
case PBVH_BMESH:
update_node_bounds_bmesh(*node);
break;
}
BKE_pbvh_vertex_iter_end;
}
else {
BB vb;
BB_reset(&vb);
BB_expand_with_bb(&vb, &pbvh->nodes[node->children_offset].vb);
BB_expand_with_bb(&vb, &pbvh->nodes[node->children_offset + 1].vb);
node->vb = vb;
}
node->vb = vb;
}
// void BKE_pbvh_node_BB_reset(PBVHNode *node)