diff options
Diffstat (limited to 'source/blender/modifiers/intern/MOD_cast.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_cast.c | 92 |
1 files changed, 52 insertions, 40 deletions
diff --git a/source/blender/modifiers/intern/MOD_cast.c b/source/blender/modifiers/intern/MOD_cast.c index 6ca3a82dd0e..15940112527 100644 --- a/source/blender/modifiers/intern/MOD_cast.c +++ b/source/blender/modifiers/intern/MOD_cast.c @@ -86,7 +86,7 @@ static int isDisabled(ModifierData *md, int UNUSED(useRenderParams)) flag = cmd->flag & (MOD_CAST_X|MOD_CAST_Y|MOD_CAST_Z); - if((cmd->fac == 0.0f) || flag == 0) return 1; + if ((cmd->fac == 0.0f) || flag == 0) return 1; return 0; } @@ -97,7 +97,7 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md) CustomDataMask dataMask = 0; /* ask for vertexgroups if we need them */ - if(cmd->defgrp_name[0]) dataMask |= CD_MASK_MDEFORMVERT; + if (cmd->defgrp_name[0]) dataMask |= CD_MASK_MDEFORMVERT; return dataMask; } @@ -157,7 +157,7 @@ static void sphere_do( * space), by default, but if the user defined a control object, * we use its location, transformed to ob's local space */ if (ctrl_ob) { - if(flag & MOD_CAST_USE_OB_TRANSFORM) { + if (flag & MOD_CAST_USE_OB_TRANSFORM) { invert_m4_m4(ctrl_ob->imat, ctrl_ob->obmat); mult_m4_m4m4(mat, ctrl_ob->imat, ob->obmat); invert_m4_m4(imat, mat); @@ -178,14 +178,14 @@ static void sphere_do( * only those vertices should be affected */ modifier_get_vgroup(ob, dm, cmd->defgrp_name, &dvert, &defgrp_index); - if(flag & MOD_CAST_SIZE_FROM_RADIUS) { + if (flag & MOD_CAST_SIZE_FROM_RADIUS) { len = cmd->radius; } else { len = cmd->size; } - if(len <= 0) { + if (len <= 0) { for (i = 0; i < numVerts; i++) { len += len_v3v3(center, vertexCos[i]); } @@ -207,10 +207,11 @@ static void sphere_do( float weight; copy_v3_v3(tmp_co, vertexCos[i]); - if(ctrl_ob) { - if(flag & MOD_CAST_USE_OB_TRANSFORM) { + if (ctrl_ob) { + if (flag & MOD_CAST_USE_OB_TRANSFORM) { mul_m4_v3(mat, tmp_co); - } else { + } + else { sub_v3_v3(tmp_co, center); } } @@ -239,10 +240,11 @@ static void sphere_do( if (flag & MOD_CAST_Z) tmp_co[2] = fac*vec[2]*len + facm*tmp_co[2]; - if(ctrl_ob) { - if(flag & MOD_CAST_USE_OB_TRANSFORM) { + if (ctrl_ob) { + if (flag & MOD_CAST_USE_OB_TRANSFORM) { mul_m4_v3(imat, tmp_co); - } else { + } + else { add_v3_v3(tmp_co, center); } } @@ -257,10 +259,11 @@ static void sphere_do( float tmp_co[3]; copy_v3_v3(tmp_co, vertexCos[i]); - if(ctrl_ob) { - if(flag & MOD_CAST_USE_OB_TRANSFORM) { + if (ctrl_ob) { + if (flag & MOD_CAST_USE_OB_TRANSFORM) { mul_m4_v3(mat, tmp_co); - } else { + } + else { sub_v3_v3(tmp_co, center); } } @@ -283,10 +286,11 @@ static void sphere_do( if (flag & MOD_CAST_Z) tmp_co[2] = fac*vec[2]*len + facm*tmp_co[2]; - if(ctrl_ob) { - if(flag & MOD_CAST_USE_OB_TRANSFORM) { + if (ctrl_ob) { + if (flag & MOD_CAST_USE_OB_TRANSFORM) { mul_m4_v3(imat, tmp_co); - } else { + } + else { add_v3_v3(tmp_co, center); } } @@ -329,7 +333,7 @@ static void cuboid_do( modifier_get_vgroup(ob, dm, cmd->defgrp_name, &dvert, &defgrp_index); if (ctrl_ob) { - if(flag & MOD_CAST_USE_OB_TRANSFORM) { + if (flag & MOD_CAST_USE_OB_TRANSFORM) { invert_m4_m4(ctrl_ob->imat, ctrl_ob->obmat); mult_m4_m4m4(mat, ctrl_ob->imat, ob->obmat); invert_m4_m4(imat, mat); @@ -339,17 +343,19 @@ static void cuboid_do( mul_v3_m4v3(center, ob->imat, ctrl_ob->obmat[3]); } - if((flag & MOD_CAST_SIZE_FROM_RADIUS) && has_radius) { - for(i = 0; i < 3; i++) { + if ((flag & MOD_CAST_SIZE_FROM_RADIUS) && has_radius) { + for (i = 0; i < 3; i++) { min[i] = -cmd->radius; max[i] = cmd->radius; } - } else if(!(flag & MOD_CAST_SIZE_FROM_RADIUS) && cmd->size > 0) { - for(i = 0; i < 3; i++) { + } + else if (!(flag & MOD_CAST_SIZE_FROM_RADIUS) && cmd->size > 0) { + for (i = 0; i < 3; i++) { min[i] = -cmd->size; max[i] = cmd->size; } - } else { + } + else { /* get bound box */ /* We can't use the object's bound box because other modifiers * may have changed the vertex data. */ @@ -406,10 +412,11 @@ static void cuboid_do( float tmp_co[3]; copy_v3_v3(tmp_co, vertexCos[i]); - if(ctrl_ob) { - if(flag & MOD_CAST_USE_OB_TRANSFORM) { + if (ctrl_ob) { + if (flag & MOD_CAST_USE_OB_TRANSFORM) { mul_m4_v3(mat, tmp_co); - } else { + } + else { sub_v3_v3(tmp_co, center); } } @@ -421,7 +428,7 @@ static void cuboid_do( } for (j = 0; j < dvert[i].totweight; ++j) { - if(dvert[i].dw[j].def_nr == defgrp_index) { + if (dvert[i].dw[j].def_nr == defgrp_index) { dw = &dvert[i].dw[j]; break; } @@ -482,10 +489,11 @@ static void cuboid_do( if (flag & MOD_CAST_Z) tmp_co[2] = facm * tmp_co[2] + fac * tmp_co[2] * fbb; - if(ctrl_ob) { - if(flag & MOD_CAST_USE_OB_TRANSFORM) { + if (ctrl_ob) { + if (flag & MOD_CAST_USE_OB_TRANSFORM) { mul_m4_v3(imat, tmp_co); - } else { + } + else { add_v3_v3(tmp_co, center); } } @@ -502,10 +510,11 @@ static void cuboid_do( float tmp_co[3]; copy_v3_v3(tmp_co, vertexCos[i]); - if(ctrl_ob) { - if(flag & MOD_CAST_USE_OB_TRANSFORM) { + if (ctrl_ob) { + if (flag & MOD_CAST_USE_OB_TRANSFORM) { mul_m4_v3(mat, tmp_co); - } else { + } + else { sub_v3_v3(tmp_co, center); } } @@ -550,10 +559,11 @@ static void cuboid_do( if (flag & MOD_CAST_Z) tmp_co[2] = facm * tmp_co[2] + fac * tmp_co[2] * fbb; - if(ctrl_ob) { - if(flag & MOD_CAST_USE_OB_TRANSFORM) { + if (ctrl_ob) { + if (flag & MOD_CAST_USE_OB_TRANSFORM) { mul_m4_v3(imat, tmp_co); - } else { + } + else { add_v3_v3(tmp_co, center); } } @@ -576,11 +586,12 @@ static void deformVerts(ModifierData *md, Object *ob, if (cmd->type == MOD_CAST_TYPE_CUBOID) { cuboid_do(cmd, ob, dm, vertexCos, numVerts); - } else { /* MOD_CAST_TYPE_SPHERE or MOD_CAST_TYPE_CYLINDER */ + } + else { /* MOD_CAST_TYPE_SPHERE or MOD_CAST_TYPE_CYLINDER */ sphere_do(cmd, ob, dm, vertexCos, numVerts); } - if(dm != derivedData) + if (dm != derivedData) dm->release(dm); } @@ -593,11 +604,12 @@ static void deformVertsEM( if (cmd->type == MOD_CAST_TYPE_CUBOID) { cuboid_do(cmd, ob, dm, vertexCos, numVerts); - } else { /* MOD_CAST_TYPE_SPHERE or MOD_CAST_TYPE_CYLINDER */ + } + else { /* MOD_CAST_TYPE_SPHERE or MOD_CAST_TYPE_CYLINDER */ sphere_do(cmd, ob, dm, vertexCos, numVerts); } - if(dm != derivedData) + if (dm != derivedData) dm->release(dm); } |