diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2011-09-05 20:16:00 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2011-09-05 20:16:00 +0400 |
| commit | 4393df93202198b5eaaff438e18060c66b98928d (patch) | |
| tree | e6f045ff5c0e5a6e676cf93cf8bc6c4c41431b50 /source/blender/makesdna/DNA_modifier_types.h | |
| parent | cc906e0e2a1de9b19c6cefa1167332f348bb9e0f (diff) | |
VGroup Modifiers: added mapping options to proximity and edit.
*Added Smooth/Sharp/Root/etc. mappings to WeightVGEdit modifier, in addition to custom curve one.
*Added Smooth/Sharp/Root/etc. mappings to WeightVGProximity modifier, without the custom curve one!
*Factorized the common mapping code into MOD_weightvg_util.
Diffstat (limited to 'source/blender/makesdna/DNA_modifier_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 1714ae2a018..c4eef981669 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -795,8 +795,8 @@ typedef struct WeightVGEditModifierData { char defgrp_name[32]; /* Name of vertex group to edit. */ - short edit_flags; /* using MOD_WVG_EDIT_* flags */ - short pad1; + short edit_flags; /* Using MOD_WVG_EDIT_* flags. */ + short mapping_mode; /* Using MOD_WVG_MAPPING_* defines. */ float default_weight; /* Weight for vertices not in vgroup. */ /* Mapping stuff. */ @@ -817,6 +817,7 @@ typedef struct WeightVGEditModifierData { /* How to map the texture (using MOD_DISP_MAP_* constants). */ int mask_tex_mapping; char mask_tex_uvlayer_name[32]; /* Name of the UV layer. */ + /* Padding… */ int pad_i1; } WeightVGEditModifierData; @@ -825,7 +826,7 @@ typedef struct WeightVGEditModifierData { /* Use parametric mapping. */ //#define MOD_WVG_EDIT_MAP (1 << 0) /* Use curve mapping. */ -#define MOD_WVG_EDIT_CMAP (1 << 1) +//#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) /* Add vertices with higher weight than threshold to vgroup. */ @@ -848,7 +849,7 @@ typedef struct WeightVGMixModifierData { char mix_mode; /* How second vgroups weights affect first ones */ char mix_set; /* What vertices to affect. */ - char pad[6]; + char pad_c1[6]; /* Masking options. */ float mask_constant; /* The global "influence", if no vgroup nor tex is used as mask. */ @@ -861,8 +862,9 @@ typedef struct WeightVGMixModifierData { struct Object *mask_tex_map_obj; /* Name of the map object. */ int mask_tex_mapping; /* How to map the texture! */ char mask_tex_uvlayer_name[32]; /* Name of the UV layer. */ + /* Padding… */ - int pad2; + int pad_i1; } WeightVGMixModifierData; /* How second vgroup's weights affect first ones. */ @@ -910,8 +912,11 @@ typedef struct WeightVGProximityModifierData { float min_dist, max_dist; /* Distances mapping to 0.0/1.0 weights. */ + /* Put here to avoid breaking existing struct... */ + short mapping_mode; /* Using MOD_WVG_MAPPING_* defines. */ + /* Padding... */ - int pad; + short pad_s1; } WeightVGProximityModifierData; /* Modes of proximity weighting. */ @@ -929,6 +934,18 @@ typedef struct WeightVGProximityModifierData { #define MOD_WVG_PROXIMITY_GEOM_FACES (1 << 2) /* Defines common to all WeightVG modifiers. */ +/* Mapping modes. */ +#define MOD_WVG_MAPPING_NONE 0 +#define MOD_WVG_MAPPING_CURVE 1 +#define MOD_WVG_MAPPING_SHARP 2 /* PROP_SHARP */ +#define MOD_WVG_MAPPING_SMOOTH 3 /* PROP_SMOOTH */ +#define MOD_WVG_MAPPING_ROOT 4 /* PROP_ROOT */ +/* PROP_LIN not used (same as NONE, here...). */ +/* PROP_CONST not used. */ +#define MOD_WVG_MAPPING_SPHERE 7 /* PROP_SPHERE */ +#define MOD_WVG_MAPPING_RANDOM 8 /* PROP_RANDOM */ +#define MOD_WVG_MAPPING_STEP 9 /* Median Step. */ + /* Tex channel to be used as mask. */ #define MOD_WVG_MASK_TEX_USE_INT 1 #define MOD_WVG_MASK_TEX_USE_RED 2 |