bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

replace wave spesific enum with generic onces

Browse Source
This commit is contained in:
Campbell Barton 2012-01-04 05:24:01 +00:00
parent b1719ecf20
commit 520cb6f452
3 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -336,7 +336,7 @@ enum {
MOD_DISP_MAP_LOCAL,
MOD_DISP_MAP_GLOBAL,
MOD_DISP_MAP_OBJECT,
MOD_DISP_MAP_UV,
MOD_DISP_MAP_UV
};
typedef struct UVProjectModifierData {
@ -401,13 +401,6 @@ typedef struct CastModifierData {
short flag, type;
} CastModifierData;
enum {
MOD_WAV_MAP_LOCAL,
MOD_WAV_MAP_GLOBAL,
MOD_WAV_MAP_OBJECT,
MOD_WAV_MAP_UV,
};
/* WaveModifierData.flag */
#define MOD_WAVE_X (1<<1)
#define MOD_WAVE_Y (1<<2)

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

@ -1126,10 +1126,10 @@ static void rna_def_modifier_wave(BlenderRNA *brna)
PropertyRNA *prop;
static EnumPropertyItem prop_texture_coordinates_items[] = {
{MOD_WAV_MAP_LOCAL, "LOCAL", 0, "Local", ""},
{MOD_WAV_MAP_GLOBAL, "GLOBAL", 0, "Global", ""},
{MOD_WAV_MAP_OBJECT, "OBJECT", 0, "Object", ""},
{MOD_WAV_MAP_UV, "MAP_UV", 0, "UV", ""},
{MOD_DISP_MAP_LOCAL, "LOCAL", 0, "Local", ""},
{MOD_DISP_MAP_GLOBAL, "GLOBAL", 0, "Global", ""},
{MOD_DISP_MAP_OBJECT, "OBJECT", 0, "Object", ""},
{MOD_DISP_MAP_UV, "MAP_UV", 0, "UV", ""},
{0, NULL, 0, NULL, NULL}};
srna= RNA_def_struct(brna, "WaveModifier", "Modifier");

18
source/blender/modifiers/intern/MOD_wave.c
View File

@ -73,7 +73,7 @@ static void initData(ModifierData *md)
wmd->lifetime= 0.0f;
wmd->damp= 10.0f;
wmd->falloff= 0.0f;
wmd->texmapping = MOD_WAV_MAP_LOCAL;
wmd->texmapping = MOD_DISP_MAP_LOCAL;
wmd->defgrp_name[0] = 0;
}
@ -160,7 +160,7 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
/* ask for UV coordinates if we need them */
if(wmd->texture && wmd->texmapping == MOD_WAV_MAP_UV)
if(wmd->texture && wmd->texmapping == MOD_DISP_MAP_UV)
dataMask |= CD_MASK_MTFACE;
/* ask for vertexgroups if we need them */
@ -178,15 +178,15 @@ static void wavemod_get_texture_coords(WaveModifierData *wmd, Object *ob,
int i;
int texmapping = wmd->texmapping;
if(texmapping == MOD_WAV_MAP_OBJECT) {
if(texmapping == MOD_DISP_MAP_OBJECT) {
if(wmd->map_object)
invert_m4_m4(wmd->map_object->imat, wmd->map_object->obmat);
else /* if there is no map object, default to local */
texmapping = MOD_WAV_MAP_LOCAL;
texmapping = MOD_DISP_MAP_LOCAL;
}
/* UVs need special handling, since they come from faces */
if(texmapping == MOD_WAV_MAP_UV) {
if(texmapping == MOD_DISP_MAP_UV) {
if(CustomData_has_layer(&dm->faceData, CD_MTFACE)) {
MFace *mface = dm->getFaceArray(dm);
MFace *mf;
@ -236,18 +236,18 @@ static void wavemod_get_texture_coords(WaveModifierData *wmd, Object *ob,
MEM_freeN(done);
return;
} else /* if there are no UVs, default to local */
texmapping = MOD_WAV_MAP_LOCAL;
texmapping = MOD_DISP_MAP_LOCAL;
}
for(i = 0; i < numVerts; ++i, ++co, ++texco) {
switch(texmapping) {
case MOD_WAV_MAP_LOCAL:
case MOD_DISP_MAP_LOCAL:
copy_v3_v3(*texco, *co);
break;
case MOD_WAV_MAP_GLOBAL:
case MOD_DISP_MAP_GLOBAL:
mul_v3_m4v3(*texco, ob->obmat, *co);
break;
case MOD_WAV_MAP_OBJECT:
case MOD_DISP_MAP_OBJECT:
mul_v3_m4v3(*texco, ob->obmat, *co);
mul_m4_v3(wmd->map_object->imat, *texco);
break;