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

GPv3: Opacity modifier #116946

Merged
Lukas Tönne merged 52 commits from LukasTonne/blender:gp3-opacity-modifier into main 2024-01-16 16:56:22 +01:00
Conversation 8 Commits 52 Files Changed 11 +9 -14
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit abd248fa5e - Show all commits

23
source/blender/modifiers/intern/MOD_grease_pencil_opacity.cc
View File

@ -97,9 +97,7 @@ static void modify_stroke_color(const GreasePencilOpacityModifierData &omd,
const bke::AttributeReader<float> vgroup_weights = attributes.lookup_or_default<float>(
LukasTonne marked this conversation as resolved Outdated
Hans Goudey commented 2024-01-16 16:04:58 +01:00
Outdated
Review
Copy Link

Use the * operator overload to just store the VArray directly here

Use the * operator overload to just store the VArray directly here
omd.influence.vertex_group_name, bke::AttrDomain::Point, 1.0f);
for (const int64_t i : curves_mask.index_range()) {
const int64_t curve_i = curves_mask[i];
curves_mask.foreach_index(GrainSize(512), [&](const int64_t curve_i) {
const IndexRange points = points_by_curve[curve_i];
for (const int64_t point_i : points) {
const float curve_input = points.size() >= 2 ?
@ -127,7 +125,7 @@ static void modify_stroke_color(const GreasePencilOpacityModifierData &omd,
1.0f);
LukasTonne marked this conversation as resolved Outdated
Pratik Borhade commented 2024-01-13 07:45:35 +01:00
Outdated
Review
Copy Link

remove this and pass vgroup_weight to clamp fn? 😅

remove this and pass `vgroup_weight` to clamp fn? 😅
Lukas Tönne commented 2024-01-16 14:46:34 +01:00
Outdated
Review
Copy Link

Haha yeah, this is the result of me trying to make sense of the logic of the old modifier.

Haha yeah, this is the result of me trying to make sense of the logic of the old modifier.
}
}
}
});
opacities.finish();
}
@ -148,9 +146,7 @@ static void modify_fill_color(const GreasePencilOpacityModifierData &omd,
bke::AttributeReader<float> vgroup_weights = attributes.lookup_or_default<float>(
omd.influence.vertex_group_name, bke::AttrDomain::Point, 1.0f);
for (const int64_t i : curves_mask.index_range()) {
const int64_t curve_i = curves_mask[i];
curves_mask.foreach_index(GrainSize(512), [&](int64_t curve_i) {
if (use_vgroup_opacity) {
/* Use the first stroke point as vertex weight. */
const IndexRange points = points_by_curve[curve_i];
@ -162,7 +158,7 @@ static void modify_fill_color(const GreasePencilOpacityModifierData &omd,
else {
fill_opacities.span[curve_i] = std::clamp(omd.color_factor, 0.0f, 1.0f);
}
}
});
fill_opacities.finish();
}
@ -177,11 +173,10 @@ static void modify_hardness(const GreasePencilOpacityModifierData &omd,
return;
}
for (const int64_t i : curves_mask.index_range()) {
const int64_t curve_i = curves_mask[i];
curves_mask.foreach_index(GrainSize(512), [&](int64_t curve_i) {
hardnesses.span[curve_i] = std::clamp(
hardnesses.span[curve_i] * omd.hardness_factor, 0.0f, 1.0f);
}
});
hardnesses.finish();
}
@ -231,9 +226,9 @@ static void modify_geometry_set(ModifierData *md,
*grease_pencil, omd->influence, mask_memory);
Vector<Drawing *> drawings = modifier::greasepencil::get_drawings_for_write(
*grease_pencil, layer_mask, frame);
for (Drawing *drawing : drawings) {
modify_curves(md, ctx, drawing->strokes_for_write());
}
threading::parallel_for_each(drawings.index_range(), [&](int64_t i) {
modify_curves(md, ctx, drawings[i]->strokes_for_write());
});
}
static void panel_draw(const bContext *C, Panel *panel)