blender/blender
148
474
Fork 699
Code Issues 6.7k Pull Requests 882 Projects 18 Wiki Activity

CurvesGeometry: Add initial vertex group support #106944

Merged
Falk David merged 24 commits from filedescriptor/blender:curves-deform-verts into main 2023-09-27 10:26:16 +02:00
Conversation 3 Commits 24 Files Changed 7 +17 -22
4 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c58e8d58a2 - Show all commits

1
source/blender/blenkernel/BKE_deform.h
View File

@ -301,6 +301,7 @@ namespace blender::bke {
VArray<float> varray_for_deform_verts(Span<MDeformVert> dverts, int defgroup_index);
filedescriptor marked this conversation as resolved Outdated
Hans Goudey commented 2023-09-25 18:35:05 +02:00
Outdated
Review
Copy Link
  • const int -> int
  • dvert_index -> defgroup_index/vgroup_index
- `const int` -> `int` - `dvert_index` -> `defgroup_index`/`vgroup_index`
VMutableArray<float> varray_for_mutable_deform_verts(MutableSpan<MDeformVert> dverts,
int defgroup_index);
void remove_defgroup_index(MutableSpan<MDeformVert> dverts, int defgroup_index);
} // namespace blender::bke
#endif

14
source/blender/blenkernel/intern/deform.cc
View File

@ -1767,6 +1767,20 @@ VMutableArray<float> varray_for_mutable_deform_verts(MutableSpan<MDeformVert> dv
{
return VMutableArray<float>::For<VArrayImpl_For_VertexWeights>(dverts, defgroup_index);
}
void remove_defgroup_index(MutableSpan<MDeformVert> dverts, const int defgroup_index)
{
threading::parallel_for(dverts.index_range(), 1024, [&](IndexRange range) {
for (MDeformVert &dvert : dverts.slice(range)) {
MDeformWeight *weight = BKE_defvert_find_index(&dvert, defgroup_index);
BKE_defvert_remove_group(&dvert, weight);
for (MDeformWeight &weight : MutableSpan(dvert.dw, dvert.totweight)) {
if (weight.def_nr > defgroup_index) {
weight.def_nr--;
}
}
}
});
}
} // namespace blender::bke

12
source/blender/blenkernel/intern/geometry_component_curves.cc
View File

@ -404,17 +404,7 @@ class CurvesVertexGroupsAttributeProvider final : public DynamicAttributesProvid
}
MutableSpan<MDeformVert> dverts = curves->deform_verts_for_write();
threading::parallel_for(dverts.index_range(), 1024, [&](IndexRange range) {
for (MDeformVert &dvert : dverts.slice(range)) {
MDeformWeight *weight = BKE_defvert_find_index(&dvert, index);
BKE_defvert_remove_group(&dvert, weight);
for (MDeformWeight &weight : MutableSpan(dvert.dw, dvert.totweight)) {
if (weight.def_nr > index) {
weight.def_nr--;
}
}
}
});
bke::remove_defgroup_index(dverts, index);
return true;
}

12
source/blender/blenkernel/intern/geometry_component_mesh.cc
View File

@ -931,17 +931,7 @@ class MeshVertexGroupsAttributeProvider final : public DynamicAttributesProvider
}
MutableSpan<MDeformVert> dverts = mesh->deform_verts_for_write();
threading::parallel_for(dverts.index_range(), 1024, [&](IndexRange range) {
for (MDeformVert &dvert : dverts.slice(range)) {
MDeformWeight *weight = BKE_defvert_find_index(&dvert, index);
BKE_defvert_remove_group(&dvert, weight);
for (MDeformWeight &weight : MutableSpan(dvert.dw, dvert.totweight)) {
if (weight.def_nr > index) {
weight.def_nr--;
}
}
}
});
bke::remove_defgroup_index(dverts, index);
return true;
}