blender
/
blender
137
410
Fork 592
Code Issues 6.3k Pull Requests 769 Projects 19 Wiki Activity

Mesh: Reduce custom normal calculation memory usage #107592

Merged
Hans Goudey merged 32 commits from HooglyBoogly/blender:corner-normals-refactor-storage into main 2023-05-10 14:41:16 +02:00
Conversation 5 Commits 32 Files Changed 4 +8 -33
3 changed files with 8 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a882816358 - Show all commits

1
source/blender/blenkernel/BKE_mesh.hh
View File

@ -68,6 +68,7 @@ struct NormalFanSpace {
float ref_alpha;
/** Reference angle, around vec_lnor, in [0, 2pi] range (0.0 marks that space as invalid). */
float ref_beta;
Vector<int> corners;
};
/**

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

@ -1085,6 +1085,7 @@ static void split_loop_nor_fan_do(LoopSplitTaskDataCommon *common_data,
NormalFanSpace *lnor_space = &lnors_spacearr->spaces[space_index];
normal_fan_space_define(lnor_space, lnor, vec_org, vec_curr, *edge_vectors);
lnor_space->corners = std::move(processed_corners);
edge_vectors->clear();
if (!clnors_data.is_empty()) {

39
source/blender/modifiers/intern/MOD_weighted_normal.cc
View File

@ -216,8 +216,6 @@ static void apply_weights_vertex_normal(WeightedNormalModifierData *wnmd,
Array<WeightedNormalDataAggregateItem> items_data;
if (keep_sharp) {
BLI_bitmap *done_loops = BLI_BITMAP_NEW(corner_verts.size(), __func__);
/* This will give us loop normal spaces,
* we do not actually care about computed loop_normals for now... */
loop_normals.reinitialize(corner_verts.size());
@ -237,40 +235,15 @@ static void apply_weights_vertex_normal(WeightedNormalModifierData *wnmd,
&lnors_spacearr,
loop_normals);
items_data = Array<WeightedNormalDataAggregateItem>(lnors_spacearr.spaces.size(),
WeightedNormalDataAggregateItem{});
WeightedNormalDataAggregateItem start_item{};
start_item.curr_strength = FACE_STRENGTH_WEAK;
/* In this first loop, we assign each WeightedNormalDataAggregateItem
* to its smooth fan of loops (aka lnor space). */
for (const int i : polys.index_range()) {
for (const int ml_index : polys[i]) {
if (BLI_BITMAP_TEST(done_loops, ml_index)) {
/* Smooth fan of this loop has already been processed, skip it. */
continue;
}
const int space_index = lnors_spacearr.corner_space_indices[ml_index];
WeightedNormalDataAggregateItem *itdt = &items_data[space_index];
itdt->curr_strength = FACE_STRENGTH_WEAK;
int fan_corner = lnors_spacearr.corner_group_lists[ml_index];
while (fan_corner != -1) {
BLI_BITMAP_ENABLE(done_loops, fan_corner);
fan_corner = lnors_spacearr.corner_group_lists[fan_corner];
}
}
}
MEM_freeN(done_loops);
items_data = Array<WeightedNormalDataAggregateItem>(lnors_spacearr.spaces.size(), start_item);
}
else {
items_data = Array<WeightedNormalDataAggregateItem>(verts_num,
WeightedNormalDataAggregateItem{});
if (use_face_influence) {
for (int item_index : items_data.index_range()) {
items_data[item_index].curr_strength = FACE_STRENGTH_WEAK;
}
}
WeightedNormalDataAggregateItem start_item{};
start_item.curr_strength = FACE_STRENGTH_WEAK;
items_data = Array<WeightedNormalDataAggregateItem>(verts_num, start_item);
}
wn_data->items_data = items_data;