blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

Mesh: Replace auto smooth with node group #108014

Merged
Hans Goudey merged 149 commits from HooglyBoogly/blender:refactor-mesh-corner-normals-lazy into main 2023-10-20 16:54:20 +02:00
Conversation 15 Commits 149 Files Changed 98 +5 -4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 29134a0b6f - Show all commits

9
source/blender/blenkernel/intern/mesh_normals.cc
View File

@ -484,6 +484,8 @@ blender::Span<blender::float3> Mesh::corner_normals() const
return this->runtime->corner_normals; return this->runtime->corner_normals;
} }
const Span<float3> vert_normals = this->vert_normals();
const Span<float3> poly_normals = this->poly_normals();
std::lock_guard lock{this->runtime->normals_mutex}; std::lock_guard lock{this->runtime->normals_mutex};
if (!this->runtime->corner_normals_dirty) { if (!this->runtime->corner_normals_dirty) {
BLI_assert(this->runtime->corner_normals.size() == this->totloop); BLI_assert(this->runtime->corner_normals.size() == this->totloop);
@ -497,11 +499,10 @@ blender::Span<blender::float3> Mesh::corner_normals() const
MutableSpan<float3> corner_normals = this->runtime->corner_normals; MutableSpan<float3> corner_normals = this->runtime->corner_normals;
switch (this->normal_domain_all_info()) { switch (this->normal_domain_all_info()) {
case ATTR_DOMAIN_POINT: { case ATTR_DOMAIN_POINT: {
array_utils::gather(this->vert_normals(), this->corner_verts(), corner_normals); array_utils::gather(vert_normals, this->corner_verts(), corner_normals);
break; break;
} }
case ATTR_DOMAIN_FACE: { case ATTR_DOMAIN_FACE: {
const Span<float3> poly_normals = this->poly_normals();
threading::parallel_for(poly_normals.index_range(), 1024, [&](const IndexRange range) { threading::parallel_for(poly_normals.index_range(), 1024, [&](const IndexRange range) {
for (const int i : range) { for (const int i : range) {
corner_normals.slice(polys[i]).fill(poly_normals[i]); corner_normals.slice(polys[i]).fill(poly_normals[i]);
@ -524,8 +525,8 @@ blender::Span<blender::float3> Mesh::corner_normals() const
this->corner_verts(), this->corner_verts(),
this->corner_edges(), this->corner_edges(),
{}, {},
this->vert_normals(), vert_normals,
this->poly_normals(), poly_normals,
sharp_edges, sharp_edges,
sharp_faces, sharp_faces,
custom_normals, custom_normals,