archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

vgroup_modifiers: Removed (commented out, for now) addtionnal mapping/clamping options in WeightVGEdit mod, leaving the only curve mapping stuff.

Browse Source 
Also, updated all three modifiers with new foreachTexLink walking func.
This commit is contained in:
Bastien Montagne
2011-08-17 13:07:51 +00:00
parent 236a94268e
commit 58af2c36ac
6 changed files with 112 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
release/scripts/startup/bl_ui/properties_data_modifier.py
View File

@@ -779,31 +779,31 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
col.label(text="Default Weight:")
col.prop(md, "default_weight", text="")
layout.prop(md, "use_map")
if md.use_map:
split = layout.split()
col = split.column()
col.label("Input:")
col.label("Output:")
col = split.column()
col.prop(md, "map_input_low", text="Min")
col.prop(md, "map_output_low", text="Min")
col = split.column()
col.prop(md, "map_input_high", text="Max")
col.prop(md, "map_output_high", text="Max")
# layout.prop(md, "use_map")
# if md.use_map:
# split = layout.split()
# col = split.column()
# col.label("Input:")
# col.label("Output:")
# col = split.column()
# col.prop(md, "map_input_low", text="Min")
# col.prop(md, "map_output_low", text="Min")
# col = split.column()
# col.prop(md, "map_input_high", text="Max")
# col.prop(md, "map_output_high", text="Max")
layout.prop(md, "use_map_curve")
if md.use_map_curve:
col = layout.column()
col.template_curve_mapping(md, "map_curve")
layout.prop(md, "use_reverse")
# layout.prop(md, "use_reverse")
layout.prop(md, "use_clamp")
if md.use_clamp:
row = layout.row()
row.prop(md, "clamp_weight_min")
row.prop(md, "clamp_weight_max")
# layout.prop(md, "use_clamp")
# if md.use_clamp:
# row = layout.row()
# row.prop(md, "clamp_weight_min")
# row.prop(md, "clamp_weight_max")
row = layout.row()
row.prop(md, "use_add")

12
source/blender/makesdna/DNA_modifier_types.h
View File

@@ -803,15 +803,15 @@ typedef struct WeightVGEditModifierData {
float default_weight; /* Weight for vertices not in vgroup. */
/* Mapping stuff. */
float map_org_min, map_org_max;
float map_new_min, map_new_max;
float map_org_min, map_org_max; /* Deprecated, keeping for file compatibility for now... */
float map_new_min, map_new_max; /* Deprecated, keeping for file compatibility for now... */
struct CurveMapping *cmap_curve; /* The custom mapping curve! */
/* The add/remove vertices weight thresholds. */
float add_threshold, rem_threshold;
/* Clamping options. */
float clamp_weight_min, clamp_weight_max;
float clamp_weight_min, clamp_weight_max; /* Deprecated, keeping for file compatibility for now... */
/* Masking options. */
float mask_constant; /* The global “influence”, if no vgroup nor tex is used as mask. */
@@ -832,17 +832,17 @@ typedef struct WeightVGEditModifierData {
/* WeightVGEdit flags. */
/* Use parametric mapping. */
#define MOD_WVG_EDIT_MAP (1 << 0)
//#define MOD_WVG_EDIT_MAP (1 << 0)
/* Use curve mapping. */
#define MOD_WVG_EDIT_CMAP (1 << 1)
/* Reverse weights (in the [0.0, 1.0] standard range). */
#define MOD_WVG_EDIT_REVERSE_WEIGHTS (1 << 2)
//#define MOD_WVG_EDIT_REVERSE_WEIGHTS (1 << 2)
/* Add vertices with higher weight than threshold to vgroup. */
#define MOD_WVG_EDIT_ADD2VG (1 << 3)
/* Remove vertices with lower weight than threshold from vgroup. */
#define MOD_WVG_EDIT_REMFVG (1 << 4)
/* Clamp weights. */
#define MOD_WVG_EDIT_CLAMP (1 << 5)
//#define MOD_WVG_EDIT_CLAMP (1 << 5)
typedef struct WeightVGMixModifierData {
ModifierData modifier;

92
source/blender/makesrna/intern/rna_modifier.c
View File

@@ -2565,20 +2565,20 @@ static void rna_def_modifier_weightvgedit(BlenderRNA *brna)
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_WeightVGModifier_vgroup_set");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop= RNA_def_property(srna, "use_map", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "edit_flags", MOD_WVG_EDIT_MAP);
RNA_def_property_ui_text(prop, "Map", "Map vertex group weights.");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
/* prop= RNA_def_property(srna, "use_map", PROP_BOOLEAN, PROP_NONE);*/
/* RNA_def_property_boolean_sdna(prop, NULL, "edit_flags", MOD_WVG_EDIT_MAP);*/
/* RNA_def_property_ui_text(prop, "Map", "Map vertex group weights.");*/
/* RNA_def_property_update(prop, 0, "rna_Modifier_update");*/
prop= RNA_def_property(srna, "use_map_curve", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "edit_flags", MOD_WVG_EDIT_CMAP);
RNA_def_property_ui_text(prop, "Curve Map", "Map vertex group weights with a curve.");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop= RNA_def_property(srna, "use_reverse", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "edit_flags", MOD_WVG_EDIT_REVERSE_WEIGHTS);
RNA_def_property_ui_text(prop, "Reverse", "Reverse vertex group weights.");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
/* prop= RNA_def_property(srna, "use_reverse", PROP_BOOLEAN, PROP_NONE);*/
/* RNA_def_property_boolean_sdna(prop, NULL, "edit_flags", MOD_WVG_EDIT_REVERSE_WEIGHTS);*/
/* RNA_def_property_ui_text(prop, "Reverse", "Reverse vertex group weights.");*/
/* RNA_def_property_update(prop, 0, "rna_Modifier_update");*/
prop= RNA_def_property(srna, "use_add", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "edit_flags", MOD_WVG_EDIT_ADD2VG);
@@ -2592,10 +2592,10 @@ static void rna_def_modifier_weightvgedit(BlenderRNA *brna)
"from vgroup.");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop= RNA_def_property(srna, "use_clamp", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "edit_flags", MOD_WVG_EDIT_CLAMP);
RNA_def_property_ui_text(prop, "Clamp", "Clamp vertex group weights.");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
/* prop= RNA_def_property(srna, "use_clamp", PROP_BOOLEAN, PROP_NONE);*/
/* RNA_def_property_boolean_sdna(prop, NULL, "edit_flags", MOD_WVG_EDIT_CLAMP);*/
/* RNA_def_property_ui_text(prop, "Clamp", "Clamp vertex group weights.");*/
/* RNA_def_property_update(prop, 0, "rna_Modifier_update");*/
prop= RNA_def_property(srna, "default_weight", PROP_FLOAT, PROP_NONE);
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
@@ -2604,33 +2604,33 @@ static void rna_def_modifier_weightvgedit(BlenderRNA *brna)
"it is not in the vgroup.");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop= RNA_def_property(srna, "map_input_low", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "map_org_min");
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
RNA_def_property_ui_range(prop, -100000.0, 100000.0, 10, 0);
RNA_def_property_ui_text(prop, "Input Low Weight", "Low input mapping value.");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
/* prop= RNA_def_property(srna, "map_input_low", PROP_FLOAT, PROP_NONE);*/
/* RNA_def_property_float_sdna(prop, NULL, "map_org_min");*/
/* RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);*/
/* RNA_def_property_ui_range(prop, -100000.0, 100000.0, 10, 0);*/
/* RNA_def_property_ui_text(prop, "Input Low Weight", "Low input mapping value.");*/
/* RNA_def_property_update(prop, 0, "rna_Modifier_update");*/
prop= RNA_def_property(srna, "map_input_high", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "map_org_max");
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
RNA_def_property_ui_range(prop, -100000.0, 100000.0, 10, 0);
RNA_def_property_ui_text(prop, "Input High Weight", "High input mapping value.");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
/* prop= RNA_def_property(srna, "map_input_high", PROP_FLOAT, PROP_NONE);*/
/* RNA_def_property_float_sdna(prop, NULL, "map_org_max");*/
/* RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);*/
/* RNA_def_property_ui_range(prop, -100000.0, 100000.0, 10, 0);*/
/* RNA_def_property_ui_text(prop, "Input High Weight", "High input mapping value.");*/
/* RNA_def_property_update(prop, 0, "rna_Modifier_update");*/
prop= RNA_def_property(srna, "map_output_low", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "map_new_min");
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
RNA_def_property_ui_range(prop, -100000.0, 100000.0, 10, 0);
RNA_def_property_ui_text(prop, "Output Low Weight", "Low output mapping value.");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
/* prop= RNA_def_property(srna, "map_output_low", PROP_FLOAT, PROP_NONE);*/
/* RNA_def_property_float_sdna(prop, NULL, "map_new_min");*/
/* RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);*/
/* RNA_def_property_ui_range(prop, -100000.0, 100000.0, 10, 0);*/
/* RNA_def_property_ui_text(prop, "Output Low Weight", "Low output mapping value.");*/
/* RNA_def_property_update(prop, 0, "rna_Modifier_update");*/
prop= RNA_def_property(srna, "map_output_high", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "map_new_max");
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
RNA_def_property_ui_range(prop, -100000.0, 100000.0, 10, 0);
RNA_def_property_ui_text(prop, "Output High Weight", "High output mapping value.");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
/* prop= RNA_def_property(srna, "map_output_high", PROP_FLOAT, PROP_NONE);*/
/* RNA_def_property_float_sdna(prop, NULL, "map_new_max");*/
/* RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);*/
/* RNA_def_property_ui_range(prop, -100000.0, 100000.0, 10, 0);*/
/* RNA_def_property_ui_text(prop, "Output High Weight", "High output mapping value.");*/
/* RNA_def_property_update(prop, 0, "rna_Modifier_update");*/
prop= RNA_def_property(srna, "map_curve", PROP_POINTER, PROP_NONE);
RNA_def_property_pointer_sdna(prop, NULL, "cmap_curve");
@@ -2653,17 +2653,17 @@ static void rna_def_modifier_weightvgedit(BlenderRNA *brna)
"to be removed from the vgroup.");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop= RNA_def_property(srna, "clamp_weight_min", PROP_FLOAT, PROP_NONE);
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
RNA_def_property_ui_range(prop, -100000.0, 100000.0, 10, 0);
RNA_def_property_ui_text(prop, "Min Weight", "Lowest weight a vertex can get.");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
/* prop= RNA_def_property(srna, "clamp_weight_min", PROP_FLOAT, PROP_NONE);*/
/* RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);*/
/* RNA_def_property_ui_range(prop, -100000.0, 100000.0, 10, 0);*/
/* RNA_def_property_ui_text(prop, "Min Weight", "Lowest weight a vertex can get.");*/
/* RNA_def_property_update(prop, 0, "rna_Modifier_update");*/
prop= RNA_def_property(srna, "clamp_weight_max", PROP_FLOAT, PROP_NONE);
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
RNA_def_property_ui_range(prop, -100000.0, 100000.0, 10, 0);
RNA_def_property_ui_text(prop, "Max Weight", "Highest weight a vertex can get.");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
/* prop= RNA_def_property(srna, "clamp_weight_max", PROP_FLOAT, PROP_NONE);*/
/* RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);*/
/* RNA_def_property_ui_range(prop, -100000.0, 100000.0, 10, 0);*/
/* RNA_def_property_ui_text(prop, "Max Weight", "Highest weight a vertex can get.");*/
/* RNA_def_property_update(prop, 0, "rna_Modifier_update");*/
/* Common masking properties. */
rna_def_modifier_weightvg_mask(brna, srna);

52
source/blender/modifiers/intern/MOD_weightvgedit.c
View File

@@ -61,18 +61,18 @@
static void initData(ModifierData *md)
{
WeightVGEditModifierData *wmd = (WeightVGEditModifierData*) md;
wmd->edit_flags = MOD_WVG_EDIT_CLAMP;
wmd->edit_flags = 0;
wmd->default_weight = 0.0f;
wmd->map_org_min = 0.0f;
wmd->map_org_max = 1.0f;
wmd->map_new_min = 0.0f;
wmd->map_new_max = 1.0f;
/* wmd->map_org_min = 0.0f;*/
/* wmd->map_org_max = 1.0f;*/
/* wmd->map_new_min = 0.0f;*/
/* wmd->map_new_max = 1.0f;*/
wmd->cmap_curve = curvemapping_add(1, 0.0, 0.0, 1.0, 1.0);
curvemapping_initialize(wmd->cmap_curve);
wmd->clamp_weight_min = 0.0f;
wmd->clamp_weight_max = 1.0f;
/* wmd->clamp_weight_min = 0.0f;*/
/* wmd->clamp_weight_max = 1.0f;*/
wmd->add_threshold = 0.01f;
wmd->rem_threshold = 0.01f;
@@ -98,14 +98,14 @@ static void copyData(ModifierData *md, ModifierData *target)
twmd->edit_flags = wmd->edit_flags;
twmd->default_weight = wmd->default_weight;
twmd->map_org_min = wmd->map_org_min;
twmd->map_org_max = wmd->map_org_max;
twmd->map_new_min = wmd->map_new_min;
twmd->map_new_max = wmd->map_new_max;
/* twmd->map_org_min = wmd->map_org_min;*/
/* twmd->map_org_max = wmd->map_org_max;*/
/* twmd->map_new_min = wmd->map_new_min;*/
/* twmd->map_new_max = wmd->map_new_max;*/
twmd->cmap_curve = curvemapping_copy(wmd->cmap_curve);
twmd->clamp_weight_min = wmd->clamp_weight_min;
twmd->clamp_weight_max = wmd->clamp_weight_max;
/* twmd->clamp_weight_min = wmd->clamp_weight_min;*/
/* twmd->clamp_weight_max = wmd->clamp_weight_max;*/
twmd->add_threshold = wmd->add_threshold;
twmd->rem_threshold = wmd->rem_threshold;
@@ -161,6 +161,11 @@ static void foreachIDLink(ModifierData *md, Object *ob, IDWalkFunc walk, void *u
foreachObjectLink(md, ob, (ObjectWalkFunc)walk, userData);
}
static void foreachTexLink(ModifierData *md, Object *ob, TexWalkFunc walk, void *userData)
{
walk(userData, ob, md, "mask_texture");
}
static void updateDepgraph(ModifierData *md, DagForest *forest, struct Scene *UNUSED(scene),
Object *UNUSED(ob), DagNode *obNode)
{
@@ -203,12 +208,12 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der
char rel_ret = 0; /* Boolean, whether we have to release ret dm or not, when not using it! */
float *mapf = NULL; /* Cache for mapping factors. */
/* Flags. */
char do_map = wmd->edit_flags & MOD_WVG_EDIT_MAP;
/* char do_map = wmd->edit_flags & MOD_WVG_EDIT_MAP;*/
char do_cmap = wmd->edit_flags & MOD_WVG_EDIT_CMAP;
char do_rev = wmd->edit_flags & MOD_WVG_EDIT_REVERSE_WEIGHTS;
/* char do_rev = wmd->edit_flags & MOD_WVG_EDIT_REVERSE_WEIGHTS;*/
char do_add = wmd->edit_flags & MOD_WVG_EDIT_ADD2VG;
char do_rem = wmd->edit_flags & MOD_WVG_EDIT_REMFVG;
char do_clamp = wmd->edit_flags & MOD_WVG_EDIT_CLAMP;
/* char do_clamp = wmd->edit_flags & MOD_WVG_EDIT_CLAMP;*/
/* Get number of verts. */
numVerts = dm->getNumVerts(dm);
@@ -281,6 +286,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der
}
}
/* Do mapping. */
#if 0
if (do_map) {
/* This mapping is a simple func: a*in + b.
* with a = (out_min - out_max)/(in_min - in_max)
@@ -299,10 +305,11 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der
}
new_w[i] = (mapf[0] * new_w[i]) + mapf[1];
}
#endif
if (do_cmap)
new_w[i] = curvemapping_evaluateF(wmd->cmap_curve, 0, new_w[i]);
if (do_rev)
new_w[i] = (-1.0 * new_w[i]) + 1.0;
/* if (do_rev)*/
/* new_w[i] = (-1.0 * new_w[i]) + 1.0;*/
}
/* Do masking. */
@@ -311,10 +318,10 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der
wmd->mask_tex_mapping, wmd->mask_tex_map_obj, wmd->mask_tex_uvlayer_name);
/* Do clamping. */
if (do_clamp) {
for (i = 0; i < numVerts; i++)
CLAMP(org_w[i], wmd->clamp_weight_min, wmd->clamp_weight_max);
}
/* if (do_clamp) {*/
/* for (i = 0; i < numVerts; i++)*/
/* CLAMP(org_w[i], wmd->clamp_weight_min, wmd->clamp_weight_max);*/
/* }*/
/* Update/add/remove from vgroup. */
weightvg_update_vg(dvert, defgrp_idx, numVerts, NULL, org_w, do_add, wmd->add_threshold,
@@ -365,5 +372,6 @@ ModifierTypeInfo modifierType_WeightVGEdit = {
/* dependsOnNormals */ NULL,
/* foreachObjectLink */ foreachObjectLink,
/* foreachIDLink */ foreachIDLink,
/* foreachTexLink */ foreachTexLink,
};

6
source/blender/modifiers/intern/MOD_weightvgmix.c
View File

@@ -191,6 +191,11 @@ static void foreachIDLink(ModifierData *md, Object *ob, IDWalkFunc walk, void *u
foreachObjectLink(md, ob, (ObjectWalkFunc)walk, userData);
}
static void foreachTexLink(ModifierData *md, Object *ob, TexWalkFunc walk, void *userData)
{
walk(userData, ob, md, "mask_texture");
}
static void updateDepgraph(ModifierData *md, DagForest *forest, struct Scene *UNUSED(scene),
Object *UNUSED(ob), DagNode *obNode)
{
@@ -457,5 +462,6 @@ ModifierTypeInfo modifierType_WeightVGMix = {
/* dependsOnNormals */ NULL,
/* foreachObjectLink */ foreachObjectLink,
/* foreachIDLink */ foreachIDLink,
/* foreachTexLink */ foreachTexLink,
};

6
source/blender/modifiers/intern/MOD_weightvgproximity.c
View File

@@ -298,6 +298,11 @@ static void foreachIDLink(ModifierData *md, Object *ob, IDWalkFunc walk, void *u
foreachObjectLink(md, ob, (ObjectWalkFunc)walk, userData);
}
static void foreachTexLink(ModifierData *md, Object *ob, TexWalkFunc walk, void *userData)
{
walk(userData, ob, md, "mask_texture");
}
static void updateDepgraph(ModifierData *md, DagForest *forest, struct Scene *UNUSED(scene),
Object *UNUSED(ob), DagNode *obNode)
{
@@ -550,5 +555,6 @@ ModifierTypeInfo modifierType_WeightVGProximity = {
/* dependsOnNormals */ NULL,
/* foreachObjectLink */ foreachObjectLink,
/* foreachIDLink */ foreachIDLink,
/* foreachTexLink */ foreachTexLink,
};