[Bf-blender-cvs] [368b56c9a13] master: GPencil: Split Weight modifier in two to make more consistent
Antonio Vazquez
noreply at git.blender.org
Wed Sep 22 15:56:27 CEST 2021
Commit: 368b56c9a132f7a37c638d16fc4c263d211bc4ed
Author: Antonio Vazquez
Date: Wed Sep 22 15:50:38 2021 +0200
Branches: master
https://developer.blender.org/rB368b56c9a132f7a37c638d16fc4c263d211bc4ed
GPencil: Split Weight modifier in two to make more consistent
The old modifier had two modes, but it is better to keep separated as meshes.
The UI has changed to be more consistent, including a new column type of modifiers.
Note: The logic has not changed with the previous version of the modifier, just is a split on two modifiers..
Reviewed By: mendio, pablovazquez
Differential Revision: https://developer.blender.org/D12586
===================================================================
M source/blender/editors/space_outliner/outliner_draw.c
M source/blender/gpencil_modifiers/CMakeLists.txt
M source/blender/gpencil_modifiers/MOD_gpencil_modifiertypes.h
M source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
A source/blender/gpencil_modifiers/intern/MOD_gpencilweight_angle.c
R066 source/blender/gpencil_modifiers/intern/MOD_gpencilweight.c source/blender/gpencil_modifiers/intern/MOD_gpencilweight_proximity.c
M source/blender/makesdna/DNA_gpencil_modifier_defaults.h
M source/blender/makesdna/DNA_gpencil_modifier_types.h
M source/blender/makesdna/intern/dna_defaults.c
M source/blender/makesrna/intern/rna_gpencil_modifier.c
===================================================================
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index c06a1010168..7cdfb553da5 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -2358,7 +2358,10 @@ TreeElementIcon tree_element_get_icon(TreeStoreElem *tselem, TreeElement *te)
case eGpencilModifierType_Texture:
data.icon = ICON_TEXTURE;
break;
- case eGpencilModifierType_Weight:
+ case eGpencilModifierType_WeightProximity:
+ data.icon = ICON_MOD_VERTEX_WEIGHT;
+ break;
+ case eGpencilModifierType_WeightAngle:
data.icon = ICON_MOD_VERTEX_WEIGHT;
break;
diff --git a/source/blender/gpencil_modifiers/CMakeLists.txt b/source/blender/gpencil_modifiers/CMakeLists.txt
index adf68e534bb..eb1f61b1862 100644
--- a/source/blender/gpencil_modifiers/CMakeLists.txt
+++ b/source/blender/gpencil_modifiers/CMakeLists.txt
@@ -69,7 +69,8 @@ set(SRC
intern/MOD_gpencilthick.c
intern/MOD_gpenciltime.c
intern/MOD_gpenciltint.c
- intern/MOD_gpencilweight.c
+ intern/MOD_gpencilweight_proximity.c
+ intern/MOD_gpencilweight_angle.c
MOD_gpencil_lineart.h
MOD_gpencil_modifiertypes.h
diff --git a/source/blender/gpencil_modifiers/MOD_gpencil_modifiertypes.h b/source/blender/gpencil_modifiers/MOD_gpencil_modifiertypes.h
index 043186155b7..d9285f44a37 100644
--- a/source/blender/gpencil_modifiers/MOD_gpencil_modifiertypes.h
+++ b/source/blender/gpencil_modifiers/MOD_gpencil_modifiertypes.h
@@ -44,7 +44,8 @@ extern GpencilModifierTypeInfo modifierType_Gpencil_Armature;
extern GpencilModifierTypeInfo modifierType_Gpencil_Time;
extern GpencilModifierTypeInfo modifierType_Gpencil_Multiply;
extern GpencilModifierTypeInfo modifierType_Gpencil_Texture;
-extern GpencilModifierTypeInfo modifierType_Gpencil_Weight;
+extern GpencilModifierTypeInfo modifierType_Gpencil_WeightProximity;
+extern GpencilModifierTypeInfo modifierType_Gpencil_WeightAngle;
extern GpencilModifierTypeInfo modifierType_Gpencil_Lineart;
extern GpencilModifierTypeInfo modifierType_Gpencil_Dash;
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
index 5eb1eeab780..df78ac8110e 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
@@ -63,7 +63,8 @@ void gpencil_modifier_type_init(GpencilModifierTypeInfo *types[])
INIT_GP_TYPE(Time);
INIT_GP_TYPE(Multiply);
INIT_GP_TYPE(Texture);
- INIT_GP_TYPE(Weight);
+ INIT_GP_TYPE(WeightAngle);
+ INIT_GP_TYPE(WeightProximity);
INIT_GP_TYPE(Lineart);
INIT_GP_TYPE(Dash);
#undef INIT_GP_TYPE
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilweight.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilweight_angle.c
similarity index 59%
copy from source/blender/gpencil_modifiers/intern/MOD_gpencilweight.c
copy to source/blender/gpencil_modifiers/intern/MOD_gpencilweight_angle.c
index 686023a36d4..2c0f3d2d8ad 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilweight.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilweight_angle.c
@@ -58,11 +58,11 @@
static void initData(GpencilModifierData *md)
{
- WeightGpencilModifierData *gpmd = (WeightGpencilModifierData *)md;
+ WeightAngleGpencilModifierData *gpmd = (WeightAngleGpencilModifierData *)md;
BLI_assert(MEMCMP_STRUCT_AFTER_IS_ZERO(gpmd, modifier));
- MEMCPY_STRUCT_AFTER(gpmd, DNA_struct_default_get(WeightGpencilModifierData), modifier);
+ MEMCPY_STRUCT_AFTER(gpmd, DNA_struct_default_get(WeightAngleGpencilModifierData), modifier);
}
static void copyData(const GpencilModifierData *md, GpencilModifierData *target)
@@ -70,31 +70,6 @@ static void copyData(const GpencilModifierData *md, GpencilModifierData *target)
BKE_gpencil_modifier_copydata_generic(md, target);
}
-/* Calc distance between point and target object. */
-static float calc_point_weight_by_distance(Object *ob,
- WeightGpencilModifierData *mmd,
- const float dist_max,
- const float dist_min,
- bGPDspoint *pt)
-{
- float weight;
- float gvert[3];
- mul_v3_m4v3(gvert, ob->obmat, &pt->x);
- float dist = len_v3v3(mmd->object->obmat[3], gvert);
-
- if (dist > dist_max) {
- weight = 0.0f;
- }
- else if (dist <= dist_max && dist > dist_min) {
- weight = (dist_max - dist) / max_ff((dist_max - dist_min), 0.0001f);
- }
- else {
- weight = 1.0f;
- }
-
- return weight;
-}
-
/* change stroke thickness */
static void deformStroke(GpencilModifierData *md,
Depsgraph *UNUSED(depsgraph),
@@ -103,9 +78,8 @@ static void deformStroke(GpencilModifierData *md,
bGPDframe *UNUSED(gpf),
bGPDstroke *gps)
{
- WeightGpencilModifierData *mmd = (WeightGpencilModifierData *)md;
+ WeightAngleGpencilModifierData *mmd = (WeightAngleGpencilModifierData *)md;
const int def_nr = BKE_object_defgroup_name_index(ob, mmd->vgname);
- const eWeightGpencilModifierMode mode = mmd->mode;
if (!is_stroke_affected_by_modifier(ob,
mmd->layername,
@@ -122,8 +96,6 @@ static void deformStroke(GpencilModifierData *md,
return;
}
- const float dist_max = MAX2(mmd->dist_start, mmd->dist_end);
- const float dist_min = MIN2(mmd->dist_start, mmd->dist_end);
const int target_def_nr = BKE_object_defgroup_name_index(ob, mmd->target_vgname);
if (target_def_nr == -1) {
@@ -157,38 +129,24 @@ static void deformStroke(GpencilModifierData *md,
continue;
}
- switch (mode) {
- case GP_WEIGHT_MODE_DISTANCE: {
- if (mmd->object) {
- bGPDspoint *pt = &gps->points[i];
- weight_pt = calc_point_weight_by_distance(ob, mmd, dist_max, dist_min, pt);
- }
- break;
- }
- case GP_WEIGHT_MODE_ANGLE: {
- /* Special case for single points. */
- if (gps->totpoints == 1) {
- weight_pt = 1.0f;
- break;
- }
-
- bGPDspoint *pt1 = (i > 0) ? &gps->points[i] : &gps->points[i + 1];
- bGPDspoint *pt2 = (i > 0) ? &gps->points[i - 1] : &gps->points[i];
- float fpt1[3], fpt2[3];
- mul_v3_m4v3(fpt1, ob->obmat, &pt1->x);
- mul_v3_m4v3(fpt2, ob->obmat, &pt2->x);
-
- float vec[3];
- sub_v3_v3v3(vec, fpt1, fpt2);
- float angle = angle_on_axis_v3v3_v3(vec_ref, vec, axis);
- /* Use sin to get a value between 0 and 1. */
- weight_pt = 1.0f - sin(angle);
- break;
- }
- default:
- break;
+ /* Special case for single points. */
+ if (gps->totpoints == 1) {
+ weight_pt = 1.0f;
+ break;
}
+ bGPDspoint *pt1 = (i > 0) ? &gps->points[i] : &gps->points[i + 1];
+ bGPDspoint *pt2 = (i > 0) ? &gps->points[i - 1] : &gps->points[i];
+ float fpt1[3], fpt2[3];
+ mul_v3_m4v3(fpt1, ob->obmat, &pt1->x);
+ mul_v3_m4v3(fpt2, ob->obmat, &pt2->x);
+
+ float vec[3];
+ sub_v3_v3v3(vec, fpt1, fpt2);
+ float angle = angle_on_axis_v3v3_v3(vec_ref, vec, axis);
+ /* Use sin to get a value between 0 and 1. */
+ weight_pt = 1.0f - sin(angle);
+
/* Invert weight if required. */
if (mmd->flag & GP_WEIGHT_INVERT_OUTPUT) {
weight_pt = 1.0f - weight_pt;
@@ -198,7 +156,7 @@ static void deformStroke(GpencilModifierData *md,
if (dvert != NULL) {
MDeformWeight *dw = BKE_defvert_ensure_index(dvert, target_def_nr);
if (dw) {
- dw->weight = (mmd->flag & GP_WEIGHT_BLEND_DATA) ? dw->weight * weight_pt : weight_pt;
+ dw->weight = (mmd->flag & GP_WEIGHT_MULTIPLY_DATA) ? dw->weight * weight_pt : weight_pt;
CLAMP(dw->weight, mmd->min_weight, 1.0f);
}
}
@@ -223,75 +181,42 @@ static void bakeModifier(struct Main *UNUSED(bmain),
static void foreachIDLink(GpencilModifierData *md, Object *ob, IDWalkFunc walk, void *userData)
{
- WeightGpencilModifierData *mmd = (WeightGpencilModifierData *)md;
+ WeightAngleGpencilModifierData *mmd = (WeightAngleGpencilModifierData *)md;
walk(userData, ob, (ID **)&mmd->material, IDWALK_CB_USER);
- walk(userData, ob, (ID **)&mmd->object, IDWALK_CB_NOP);
-}
-
-static void updateDepsgraph(GpencilModifierData *md,
- const ModifierUpdateDepsgraphContext *ctx,
- const int UNUSED(mode))
-{
- WeightGpencilModifierData *mmd = (WeightGpencilModifierData *)md;
- if (mmd->object != NULL) {
- DEG_add_object_relation(
- ctx->node, mmd->object, DEG_OB_COMP_TRANSFORM, "GPencil Weight Modifier");
- }
- DEG_add_object_relation(
- ctx->node, ctx->object, DEG_OB_COMP_TRANSFORM, "GPencil Weight Modifier");
}
static bool isDisabled(GpencilModifierData *md, int UNUSED(userRenderParams))
{
- WeightGpencilModifierData *mmd = (WeightGpencilModifierData *)md;
+ WeightAngleGpencilModifierData *mmd = (WeightAngleGpencilModifierData *)md;
return (mmd->target_vgname[0] == '\0');
}
-static void distance_panel_draw(const bContext *UNUSED(C), Panel *panel)
-{
- PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL);
-
- uiLayout *layout = panel->layout;
- uiLayoutSetPropSep(layout, true);
-
- uiItemR(layout, ptr, "object", 0, NULL, ICON_CUBE);
- uiLayout *sub = uiLayoutColumn(layout, true);
- uiItemR(sub, ptr, "distance_start", 0, NULL, ICON_NONE);
- uiItemR(sub, ptr, "distance_end", 0, "End", ICON_NONE);
-}
-
-static void panel_draw(const bContext *C, Panel *panel)
+static void panel_draw(const bContext *UNUSED(C), Panel *panel)
{
+ uiLayout *row, *sub;
uiLayout *layout = panel->layout;
PointerRNA ob_ptr;
PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, &ob_ptr);
uiLayoutSetPropSep(layout, true);
- uiItemR(layout, ptr, "mode", 0, NULL, ICON_NONE);
-
- const eWeightGpencilModifierMode mode = RNA_enum_get(ptr, "mode");
-
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list