kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

vgroup_modifiers: Now clamping output values to [0.0, 1.0] range (and added min/max mapping values for Prowimity modif).

Browse Source
This commit is contained in:
Bastien Montagne 2011-08-08 21:12:51 +00:00
parent ce20487fa7
commit e2c24bac6c
5 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -859,6 +859,10 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel):
row = layout.row()
row.prop(md, "proximity_geometry", expand=True)
row = layout.split()
row.prop(md, "min_dist")
row.prop(md, "max_dist")
# Common mask options…
layout.separator()
self.weight_vg_mask(layout, ob, md)

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

@ -921,6 +921,8 @@ typedef struct WeightVGProximityModifierData {
int mask_tex_mapping; /* How to map the texture! */
char mask_tex_uvlayer_name[32]; /* Name of the UV layer. */
float min_dist, max_dist; /* Distances mapping to 0.0/1.0 weights. */
/* Padding… */
int pad_i2;
} WeightVGProximityModifierData;

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

@ -2781,6 +2781,18 @@ static void rna_def_modifier_weightvgproximity(BlenderRNA *brna)
RNA_def_property_flag(prop, PROP_EDITABLE|PROP_ID_SELF_CHECK);
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
prop= RNA_def_property(srna, "min_dist", 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, "Lowest Dist", "Distance mapping to weight 0.0.");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop= RNA_def_property(srna, "max_dist", 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, "Highest Dist", "Distance mapping to weight 1.0.");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
/* Common masking properties. */
rna_def_modifier_weightvg_mask(brna, srna);
}

3
source/blender/modifiers/intern/MOD_weightvg_util.c
View File

@ -192,6 +192,9 @@ void weightvg_update_vg(MDeformVert *dvert, int defgrp_idx, int num, int *indice
MDeformVert *dv = &dvert[indices ? indices[i] : i];
MDeformWeight *newdw;
/* Never allow weights out of [0.0, 1.0] range. */
CLAMP(w, 0.0, 1.0);
/* Let’s first check to see if this vert is already in the weight group – if so
* let’s update it, or remove it if needed.
*/

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

@ -200,6 +200,27 @@ static float get_ob2ob_distance(const Object* ob, const Object* obr)
return len_v3v3(ob->obmat[3], obr->obmat[3]);
}
/**
* Maps distances to weights.
*/
void do_map(float *weights, const int nidx, const float min_d, const float max_d)
{
int i;
float b = min_d / (min_d - max_d);
float a = -b / min_d;
for (i = 0; i < nidx; i++)
weights[i] = a * weights[i] + b;
}
/*a min_d + b = 0.0*/
/*a max_d + b = 1.0*/
/*a min_d = -b*/
/*a = -b / min_d*/
/*max_d(-b/min_d) + b = 1.0*/
/*b((-max_d/min_d)+1.0) = 1.0*/
/*b = 1.0 / ((min_d-max_d)/min_d)*/
/*b = min_d/(min_d-max_d)*/
/**************************************
* Modifiers functions. *
**************************************/
@ -476,6 +497,9 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der
wmd->mask_defgrp_name, wmd->mask_texture, wmd->mask_tex_use_channel,
wmd->mask_tex_mapping, wmd->mask_tex_map_obj, wmd->mask_tex_uvlayer_name);
/* Map distances to weights. */
do_map(org_w, numIdx, wmd->min_dist, wmd->max_dist);
/* Update vgroup. Note we never add nor remove vertices from vgroup here. */
weightvg_update_vg(dvert, defgrp_idx, numIdx, indices, org_w, 0, 0.0f, 0, 0.0f);