From d086f6aa5c26d445aef1ebd04e6c8501f6189d91 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 7 Mar 2016 11:24:03 +1100 Subject: Shrink Wrap modifier: invert vgroup option D1839 from @Orgold --- source/blender/blenkernel/BKE_shrinkwrap.h | 1 + source/blender/blenkernel/intern/shrinkwrap.c | 11 +++++++++++ source/blender/makesdna/DNA_modifier_types.h | 2 ++ source/blender/makesrna/intern/rna_modifier.c | 5 +++++ 4 files changed, 19 insertions(+) (limited to 'source/blender') diff --git a/source/blender/blenkernel/BKE_shrinkwrap.h b/source/blender/blenkernel/BKE_shrinkwrap.h index 070f5c762db..d2ab4f3164c 100644 --- a/source/blender/blenkernel/BKE_shrinkwrap.h +++ b/source/blender/blenkernel/BKE_shrinkwrap.h @@ -67,6 +67,7 @@ typedef struct ShrinkwrapCalcData { struct MDeformVert *dvert; //Pointer to mdeform array int vgroup; //Vertex group num + bool invert_vgroup; /* invert vertex group influence */ struct DerivedMesh *target; //mesh we are shrinking to struct SpaceTransform local2target; //transform to move between local and target space diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c index bbed4ccfae7..d40d83aa4eb 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.c +++ b/source/blender/blenkernel/intern/shrinkwrap.c @@ -96,6 +96,11 @@ static void shrinkwrap_calc_nearest_vertex(ShrinkwrapCalcData *calc) float *co = calc->vertexCos[i]; float tmp_co[3]; float weight = defvert_array_find_weight_safe(calc->dvert, i, calc->vgroup); + + if (calc->invert_vgroup) { + weight = 1.0f - weight; + } + if (weight == 0.0f) { continue; } @@ -411,6 +416,11 @@ static void shrinkwrap_calc_nearest_surface_point(ShrinkwrapCalcData *calc) float *co = calc->vertexCos[i]; float tmp_co[3]; float weight = defvert_array_find_weight_safe(calc->dvert, i, calc->vgroup); + + if (calc->invert_vgroup) { + weight = 1.0f - weight; + } + if (weight == 0.0f) continue; /* Convert the vertex to tree coordinates */ @@ -480,6 +490,7 @@ void shrinkwrapModifier_deform(ShrinkwrapModifierData *smd, Object *ob, DerivedM calc.ob = ob; calc.numVerts = numVerts; calc.vertexCos = vertexCos; + calc.invert_vgroup = (smd->shrinkOpts & MOD_SHRINKWRAP_INVERT_VGROUP) != 0; /* DeformVertex */ calc.vgroup = defgroup_name_index(calc.ob, calc.smd->vgroup_name); diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index d00e5d574fa..c2159510937 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -825,6 +825,8 @@ enum { MOD_SHRINKWRAP_CULL_TARGET_BACKFACE = (1 << 4), MOD_SHRINKWRAP_KEEP_ABOVE_SURFACE = (1 << 5), /* distance is measure to the front face of the target */ + + MOD_SHRINKWRAP_INVERT_VGROUP = (1 << 6), }; /* Shrinkwrap->projAxis */ diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 961bbfe80e7..571d7fb5447 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -3043,6 +3043,11 @@ static void rna_def_modifier_shrinkwrap(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "shrinkOpts", MOD_SHRINKWRAP_KEEP_ABOVE_SURFACE); RNA_def_property_ui_text(prop, "Keep Above Surface", ""); RNA_def_property_update(prop, 0, "rna_Modifier_update"); + + prop = RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "shrinkOpts", MOD_SHRINKWRAP_INVERT_VGROUP); + RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence"); + RNA_def_property_update(prop, 0, "rna_Modifier_update"); } static void rna_def_modifier_fluidsim(BlenderRNA *brna) -- cgit v1.2.3