From 919eba04de19fbf5edbfdf3d4cbfec446645e5ac Mon Sep 17 00:00:00 2001 From: Andre Susano Pinto Date: Mon, 4 Aug 2008 13:12:35 +0000 Subject: SimpleDeform modifications: * Added "Lock axis" options on taper and strech/squash (suggested by ZanQdo) * Better control of deform factor (suggested by ZanQdo) * Added eModifierTypeFlag_AcceptsCVs (so it now accepts both curves and meshes) --- source/blender/blenkernel/intern/modifier.c | 15 ++-- source/blender/blenkernel/intern/simple_deform.c | 99 ++++++++---------------- 2 files changed, 42 insertions(+), 72 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 502be6b3af3..89de5ee9e45 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -7289,10 +7289,12 @@ static void simpledeformModifier_initData(ModifierData *md) SimpleDeformModifierData *smd = (SimpleDeformModifierData*) md; smd->mode = MOD_SIMPLEDEFORM_MODE_TWIST; - smd->origin = 0; - smd->factor[0] = 0.35; - smd->factor[1] = -1000.0; - smd->factor[2] = 1000.0; + smd->axis = 0; + + smd->origin = NULL; + smd->factor = 0.35; + smd->limit[0] = -1000.0f; + smd->limit[1] = 1000.0f; } static void simpledeformModifier_copyData(ModifierData *md, ModifierData *target) @@ -7301,8 +7303,10 @@ static void simpledeformModifier_copyData(ModifierData *md, ModifierData *target SimpleDeformModifierData *tsmd = (SimpleDeformModifierData*)target; tsmd->mode = smd->mode; + tsmd->axis = smd->axis; tsmd->origin= smd->origin; - memcpy(tsmd->factor, smd->factor, sizeof(tsmd->factor)); + tsmd->factor= smd->factor; + memcpy(tsmd->limit, smd->limit, sizeof(tsmd->limit)); } static void simpledeformModifier_deformVerts(ModifierData *md, Object *ob, DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) @@ -7681,6 +7685,7 @@ ModifierTypeInfo *modifierType_getInfo(ModifierType type) mti = INIT_TYPE(SimpleDeform); mti->type = eModifierTypeType_OnlyDeform; mti->flags = eModifierTypeFlag_AcceptsMesh + | eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_SupportsEditmode | eModifierTypeFlag_EnableInEditmode; mti->initData = simpledeformModifier_initData; diff --git a/source/blender/blenkernel/intern/simple_deform.c b/source/blender/blenkernel/intern/simple_deform.c index 86fef7208a1..20cba28ab5a 100644 --- a/source/blender/blenkernel/intern/simple_deform.c +++ b/source/blender/blenkernel/intern/simple_deform.c @@ -40,7 +40,9 @@ #include -static void axis_limit(int axis, const float limits[2], float *co, float *dcut) +//Clamps/Limits the given coordinate to: limits[0] <= co[axis] <= limits[1] +//The ammount of clamp is saved on dcut +static void axis_limit(int axis, const float limits[2], float co[3], float dcut[3]) { float val = co[axis]; if(limits[0] > val) val = limits[0]; @@ -50,10 +52,9 @@ static void axis_limit(int axis, const float limits[2], float *co, float *dcut) co[axis] = val; } -static void simpleDeform_tapperXY(const float factor, const float *dcut, float *co) +static void simpleDeform_taper(const float factor, const float dcut[3], float *co) { float x = co[0], y = co[1], z = co[2]; - float scale = z*factor; co[0] = x + x*scale; @@ -62,13 +63,13 @@ static void simpleDeform_tapperXY(const float factor, const float *dcut, float * if(dcut) { - co[0] += dcut[0]*scale; - co[1] += dcut[1]*scale; + co[0] += dcut[0]; + co[1] += dcut[1]; co[2] += dcut[2]; } } -static void simpleDeform_strech(const float factor, const float dcut[3], float *co) +static void simpleDeform_stretch(const float factor, const float dcut[3], float *co) { float x = co[0], y = co[1], z = co[2]; float scale; @@ -82,46 +83,9 @@ static void simpleDeform_strech(const float factor, const float dcut[3], float * if(dcut) { - co[0] += dcut[0]*scale; - co[1] += dcut[0]*scale; - co[2] += dcut[2]; - } -} - -static void simpleDeform_squash(const float factor, const float dcut[3], float *co) -{ - float x = co[0], y = co[1], z = co[2]; - float scale; - - scale = z*factor; - scale = -scale*scale; - - co[0] += x+x*scale; - co[1] += y+y*scale; - - if(dcut) - { - co[0] += dcut[0]*scale; - co[1] += dcut[0]*scale; - co[2] += dcut[2]; - } -} - -static void simpleDeform_tapperX(const float factor, const float *dcut, float *co) -{ - float x = co[0], y = co[1], z = co[2]; - - float scale = z*factor; - - co[0] = x+ x*scale; - co[1] = y; - co[2] = z; - - if(dcut) - { - co[0] += dcut[0]*scale; + co[0] += dcut[0]; co[1] += dcut[1]; - co[2] += dcut[2]; + co[2] += dcut[2]; } } @@ -179,6 +143,7 @@ void SimpleDeformModifier_do(SimpleDeformModifierData *smd, struct Object *ob, s int i; float (*ob2mod)[4] = NULL, (*mod2ob)[4] = NULL; float tmp_matrix[2][4][4]; + static const float lock_axis[2] = {0.0f, 0.0f}; int vgroup = get_named_vertexgroup_num(ob, smd->vgroup_name); @@ -205,41 +170,41 @@ void SimpleDeformModifier_do(SimpleDeformModifierData *smd, struct Object *ob, s { float co[3], dcut[3]; float weight = vertexgroup_get_vertex_weight(dvert, i, vgroup); + float factor = smd->factor; if(weight == 0) continue; if(ob2mod) Mat4MulVecfl(ob2mod, vertexCos[i]); - dcut[0] = dcut[1] = dcut[2] = 0.0f; VECCOPY(co, vertexCos[i]); + dcut[0] = dcut[1] = dcut[2] = 0.0f; + if(smd->axis & MOD_SIMPLEDEFORM_LOCK_AXIS_X) axis_limit(0, lock_axis, co, dcut); + if(smd->axis & MOD_SIMPLEDEFORM_LOCK_AXIS_Y) axis_limit(1, lock_axis, co, dcut); + switch(smd->mode) { case MOD_SIMPLEDEFORM_MODE_TWIST: - axis_limit(2, smd->factor+1, co, dcut); - simpleDeform_twist (smd->factor[0], dcut, co); - break; + axis_limit(2, smd->limit, co, dcut); + simpleDeform_twist(factor, dcut, co); + break; case MOD_SIMPLEDEFORM_MODE_BEND: - axis_limit(0, smd->factor+1, co, dcut); - simpleDeform_bend (smd->factor[0], dcut, co); - break; - - case MOD_SIMPLEDEFORM_MODE_TAPER_X: - axis_limit(2, smd->factor+1, co, dcut); - simpleDeform_tapperX (smd->factor[0], dcut, co); - break; - - case MOD_SIMPLEDEFORM_MODE_TAPER_XY: - axis_limit(2, smd->factor+1, co, dcut); - simpleDeform_tapperXY(smd->factor[0], dcut, co); - break; - - case MOD_SIMPLEDEFORM_MODE_STRECH_SQUASH: - axis_limit(2, smd->factor+1, co, dcut); - simpleDeform_strech(smd->factor[0], dcut, co); - break; + axis_limit(0, smd->limit, co, dcut); + simpleDeform_bend(factor, dcut, co); + break; + + case MOD_SIMPLEDEFORM_MODE_TAPER: + axis_limit(2, smd->limit, co, dcut); + simpleDeform_taper(factor, dcut, co); + break; + + + case MOD_SIMPLEDEFORM_MODE_STRETCH: + axis_limit(2, smd->limit, co, dcut); + simpleDeform_stretch(factor, dcut, co); + break; } //linear interpolation -- cgit v1.2.3