Index: source/blender/makesrna/intern/rna_cloth.c =================================================================== --- source/blender/makesrna/intern/rna_cloth.c (revision 47947) +++ source/blender/makesrna/intern/rna_cloth.c (working copy) @@ -101,6 +101,17 @@ settings->max_struct = value; } +static void rna_ClothSettings_max_sewing_set(struct PointerRNA *ptr, float value) +{ + ClothSimSettings *settings = (ClothSimSettings*)ptr->data; + + /* check for clipping */ + if (value < 0.0f) + value = 0.0f; + + settings->max_sewing = value; +} + static void rna_ClothSettings_mass_vgroup_get(PointerRNA *ptr, char *value) { ClothSimSettings *sim = (ClothSimSettings *)ptr->data; @@ -119,6 +130,24 @@ rna_object_vgroup_name_index_set(ptr, value, &sim->vgroup_mass); } +static void rna_ClothSettings_shrink_vgroup_get(PointerRNA *ptr, char *value) +{ + ClothSimSettings *sim = (ClothSimSettings*)ptr->data; + rna_object_vgroup_name_index_get(ptr, value, sim->vgroup_shrink); +} + +static int rna_ClothSettings_shrink_vgroup_length(PointerRNA *ptr) +{ + ClothSimSettings *sim = (ClothSimSettings*)ptr->data; + return rna_object_vgroup_name_index_length(ptr, sim->vgroup_shrink); +} + +static void rna_ClothSettings_shrink_vgroup_set(PointerRNA *ptr, const char *value) +{ + ClothSimSettings *sim = (ClothSimSettings*)ptr->data; + rna_object_vgroup_name_index_set(ptr, value, &sim->vgroup_shrink); +} + static void rna_ClothSettings_struct_vgroup_get(PointerRNA *ptr, char *value) { ClothSimSettings *sim = (ClothSimSettings *)ptr->data; @@ -338,6 +367,24 @@ "Quality of the simulation in steps per frame (higher is better quality but slower)"); RNA_def_property_update(prop, 0, "rna_cloth_update"); + prop = RNA_def_property(srna, "vertex_group_shrink", PROP_STRING, PROP_NONE); + RNA_def_property_string_funcs(prop, "rna_ClothSettings_shrink_vgroup_get", "rna_ClothSettings_shrink_vgroup_length", + "rna_ClothSettings_shrink_vgroup_set"); + RNA_def_property_ui_text(prop, "Shrink Vertex Group", "Vertex Group for shrinking cloth"); + RNA_def_property_update(prop, 0, "rna_cloth_update"); + + prop = RNA_def_property(srna, "shrink_min", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "shrink_min"); + RNA_def_property_range(prop, 0.0f, 1.0f); + RNA_def_property_ui_text(prop, "Shrink Factor Min", "min amount to shrink cloth by"); + RNA_def_property_update(prop, 0, "rna_cloth_update"); + + prop = RNA_def_property(srna, "shrink_max", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "shrink_max"); + RNA_def_property_range(prop, 0.0f, 1.0f); + RNA_def_property_ui_text(prop, "Shrink Factor Max", "max amount to shrink cloth by"); + RNA_def_property_update(prop, 0, "rna_cloth_update"); + /* springs */ prop = RNA_def_property(srna, "use_stiffness_scale", PROP_BOOLEAN, PROP_NONE); @@ -367,6 +414,13 @@ RNA_def_property_ui_text(prop, "Structural Stiffness Maximum", "Maximum structural stiffness value"); RNA_def_property_update(prop, 0, "rna_cloth_update"); + prop = RNA_def_property(srna, "sewing_force_max", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "max_sewing"); + RNA_def_property_range(prop, 0.0f, 10000.0f); + RNA_def_property_float_funcs(prop, NULL, "rna_ClothSettings_max_sewing_set", NULL); + RNA_def_property_ui_text(prop, "Sewing Force Maximum", "Maximum sewing force"); + RNA_def_property_update(prop, 0, "rna_cloth_update"); + prop = RNA_def_property(srna, "vertex_group_structural_stiffness", PROP_STRING, PROP_NONE); RNA_def_property_string_funcs(prop, "rna_ClothSettings_struct_vgroup_get", "rna_ClothSettings_struct_vgroup_length", @@ -389,6 +443,11 @@ RNA_def_property_ui_text(prop, "Bending Stiffness Maximum", "Maximum bending stiffness value"); RNA_def_property_update(prop, 0, "rna_cloth_update"); + prop = RNA_def_property(srna, "use_sewing_springs", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "flags", CLOTH_SIMSETTINGS_FLAG_SEW); + RNA_def_property_ui_text(prop, "Sew Cloth", "Pulls loose edges together"); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); + prop = RNA_def_property(srna, "vertex_group_bending", PROP_STRING, PROP_NONE); RNA_def_property_string_funcs(prop, "rna_ClothSettings_bend_vgroup_get", "rna_ClothSettings_bend_vgroup_length", "rna_ClothSettings_bend_vgroup_set"); Index: source/blender/blenkernel/intern/implicit.c =================================================================== --- source/blender/blenkernel/intern/implicit.c (revision 47947) +++ source/blender/blenkernel/intern/implicit.c (working copy) @@ -1234,7 +1234,7 @@ } // calculate force of structural + shear springs - if ((s->type & CLOTH_SPRING_TYPE_STRUCTURAL) || (s->type & CLOTH_SPRING_TYPE_SHEAR)) { + if ((s->type & CLOTH_SPRING_TYPE_STRUCTURAL) || (s->type & CLOTH_SPRING_TYPE_SHEAR) || (s->type & CLOTH_SPRING_TYPE_SEWING) ) { if (length > L || no_compress) { s->flags |= CLOTH_SPRING_FLAG_NEEDED; @@ -1245,7 +1245,16 @@ k = scaling / (clmd->sim_parms->avg_spring_len + FLT_EPSILON); // TODO: verify, half verified (couldn't see error) - mul_fvector_S(stretch_force, dir, k*(length-L)); + if(s->type & CLOTH_SPRING_TYPE_SEWING) { + // sewing springs usually have a large distance at first so clamp the force so we don't get tunnelling through colission objects + float force = k*(length-L); + if(force > clmd->sim_parms->max_sewing) { + force = clmd->sim_parms->max_sewing; + } + mul_fvector_S(stretch_force, dir, force); + } else { + mul_fvector_S(stretch_force, dir, k*(length-L)); + } VECADD(s->f, s->f, stretch_force); Index: source/blender/blenkernel/intern/cloth.c =================================================================== --- source/blender/blenkernel/intern/cloth.c (revision 47947) +++ source/blender/blenkernel/intern/cloth.c (working copy) @@ -129,6 +129,9 @@ clmd->sim_parms->preroll = 0; clmd->sim_parms->maxspringlen = 10; clmd->sim_parms->vgroup_mass = 0; + clmd->sim_parms->vgroup_shrink = 0; + clmd->sim_parms->shrink_min = 0.0f; /* min amount the fabric will shrink by 0.0 = no shrinking, 1.0 = shrink to nothing*/ + clmd->sim_parms->shrink_max = 1.0f; /* max amount the fabric will shrink by 0.0 = no shrinking, 1.0 = shrink to nothing*/ clmd->sim_parms->avg_spring_len = 0.0; clmd->sim_parms->presets = 2; /* cotton as start setting */ clmd->sim_parms->timescale = 1.0f; /* speed factor, describes how fast cloth moves */ @@ -762,6 +765,7 @@ ((clmd->sim_parms->vgroup_mass>0) || (clmd->sim_parms->vgroup_struct>0)|| (clmd->sim_parms->vgroup_bend>0) || + (clmd->sim_parms->vgroup_shrink>0) || (clmd->coll_parms->vgroup_selfcol>0))); } @@ -825,6 +829,17 @@ verts->flags |= CLOTH_VERT_FLAG_NOSELFCOLL; } } + + if (clmd->sim_parms->vgroup_shrink > 0 ) + { + if ( dvert->dw[j].def_nr == (clmd->sim_parms->vgroup_shrink-1)) + { + verts->shrink_factor = clmd->sim_parms->shrink_min*(1.0f-dvert->dw[j].weight)+clmd->sim_parms->shrink_max*dvert->dw [j].weight; // linear interpolation between min and max shrink factor based on weight + } + } + else { + verts->shrink_factor = clmd->sim_parms->shrink_min; + } /* // for later if ( dvert->dw[j].def_nr == (clmd->sim_parms->vgroup_weight-1)) @@ -1066,6 +1081,7 @@ unsigned int numverts = (unsigned int)dm->getNumVerts (dm); unsigned int numedges = (unsigned int)dm->getNumEdges (dm); unsigned int numfaces = (unsigned int)dm->getNumTessFaces (dm); + float shrink_factor; MEdge *medge = dm->getEdgeArray (dm); MFace *mface = dm->getTessFaceArray (dm); int index2 = 0; // our second vertex index @@ -1101,15 +1117,26 @@ if ( spring ) { spring->ij = MIN2(medge[i].v1, medge[i].v2); spring->kl = MAX2(medge[i].v2, medge[i].v1); - spring->restlen = len_v3v3(cloth->verts[spring->kl].xrest, cloth->verts[spring->ij].xrest); + if(clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_SEW && medge[i].flag & ME_LOOSEEDGE) { + // handle sewing (loose edges will be pulled together) + spring->restlen = 0.0f; + spring->stiffness = 1.0f; + spring->type = CLOTH_SPRING_TYPE_SEWING; + } else { + if(clmd->sim_parms->vgroup_shrink > 0) + shrink_factor = 1.0f - ((cloth->verts[spring->ij].shrink_factor + cloth->verts[spring->kl].shrink_factor) / 2.0f); + else + shrink_factor = 1.0f - clmd->sim_parms->shrink_min; + spring->restlen = len_v3v3(cloth->verts[spring->kl].xrest, cloth->verts[spring->ij].xrest) * shrink_factor; + spring->stiffness = (cloth->verts[spring->kl].struct_stiff + cloth->verts[spring->ij].struct_stiff) / 2.0f; + spring->type = CLOTH_SPRING_TYPE_STRUCTURAL; + } clmd->sim_parms->avg_spring_len += spring->restlen; cloth->verts[spring->ij].avg_spring_len += spring->restlen; cloth->verts[spring->kl].avg_spring_len += spring->restlen; cloth->verts[spring->ij].spring_count++; cloth->verts[spring->kl].spring_count++; - spring->type = CLOTH_SPRING_TYPE_STRUCTURAL; spring->flags = 0; - spring->stiffness = (cloth->verts[spring->kl].struct_stiff + cloth->verts[spring->ij].struct_stiff) / 2.0f; struct_springs++; BLI_linklist_prepend ( &cloth->springs, spring ); @@ -1142,7 +1169,11 @@ spring->ij = MIN2(mface[i].v1, mface[i].v3); spring->kl = MAX2(mface[i].v3, mface[i].v1); - spring->restlen = len_v3v3(cloth->verts[spring->kl].xrest, cloth->verts[spring->ij].xrest); + if(clmd->sim_parms->vgroup_shrink > 0) + shrink_factor = 1.0f - ((cloth->verts[spring->ij].shrink_factor + cloth->verts[spring->kl].shrink_factor) / 2.0f); + else + shrink_factor = 1.0f - clmd->sim_parms->shrink_min; + spring->restlen = len_v3v3(cloth->verts[spring->kl].xrest, cloth->verts[spring->ij].xrest) * shrink_factor; spring->type = CLOTH_SPRING_TYPE_SHEAR; spring->stiffness = (cloth->verts[spring->kl].shear_stiff + cloth->verts[spring->ij].shear_stiff) / 2.0f; @@ -1163,7 +1194,11 @@ spring->ij = MIN2(mface[i].v2, mface[i].v4); spring->kl = MAX2(mface[i].v4, mface[i].v2); - spring->restlen = len_v3v3(cloth->verts[spring->kl].xrest, cloth->verts[spring->ij].xrest); + if(clmd->sim_parms->vgroup_shrink > 0) + shrink_factor = 1.0f - ((cloth->verts[spring->ij].shrink_factor + cloth->verts[spring->kl].shrink_factor) / 2.0f); + else + shrink_factor = 1.0f - clmd->sim_parms->shrink_min; + spring->restlen = len_v3v3(cloth->verts[spring->kl].xrest, cloth->verts[spring->ij].xrest) * shrink_factor; spring->type = CLOTH_SPRING_TYPE_SHEAR; spring->stiffness = (cloth->verts[spring->kl].shear_stiff + cloth->verts[spring->ij].shear_stiff) / 2.0f; Index: source/blender/blenkernel/BKE_cloth.h =================================================================== --- source/blender/blenkernel/BKE_cloth.h (revision 47947) +++ source/blender/blenkernel/BKE_cloth.h (working copy) @@ -109,6 +109,7 @@ float bend_stiff; float shear_stiff; int spring_count; /* how many springs attached? */ + float shrink_factor; /* how much to shrink this cloth */ } ClothVertex; @@ -152,7 +153,8 @@ CLOTH_SIMSETTINGS_FLAG_TEARING = ( 1 << 4 ),// true if tearing is enabled CLOTH_SIMSETTINGS_FLAG_SCALING = ( 1 << 8 ), /* is advanced scaling active? */ CLOTH_SIMSETTINGS_FLAG_CCACHE_EDIT = (1 << 12), /* edit cache in editmode */ - CLOTH_SIMSETTINGS_FLAG_NO_SPRING_COMPRESS = (1 << 13) /* don't allow spring compression */ + CLOTH_SIMSETTINGS_FLAG_NO_SPRING_COMPRESS = (1 << 13), /* don't allow spring compression */ + CLOTH_SIMSETTINGS_FLAG_SEW = (1 << 14), /* pull ends of loose edges together */ } CLOTH_SIMSETTINGS_FLAGS; /* COLLISION FLAGS */ @@ -166,7 +168,8 @@ CLOTH_SPRING_TYPE_STRUCTURAL = (1 << 1), CLOTH_SPRING_TYPE_SHEAR = (1 << 2), CLOTH_SPRING_TYPE_BENDING = (1 << 3), - CLOTH_SPRING_TYPE_GOAL = (1 << 4) + CLOTH_SPRING_TYPE_GOAL = (1 << 4), + CLOTH_SPRING_TYPE_SEWING = (1 << 5) // added by thesleepless@gmail.com for sewing edges } CLOTH_SPRING_TYPES; /* SPRING FLAGS */ Index: source/blender/makesdna/DNA_cloth_types.h =================================================================== --- source/blender/makesdna/DNA_cloth_types.h (revision 47947) +++ source/blender/makesdna/DNA_cloth_types.h (working copy) @@ -58,6 +58,7 @@ float max_bend; /* max bending scaling value, min is "bending" */ float max_struct; /* max structural scaling value, min is "structural" */ float max_shear; /* max shear scaling value, UNUSED */ + float max_sewing; /* max sewing force */ float avg_spring_len; /* used for normalized springs */ float timescale; /* parameter how fast cloth runs */ float maxgoal; /* see SB */ @@ -70,6 +71,8 @@ float velocity_smooth; /* smoothing of velocities for hair */ float collider_friction; /* friction with colliders */ float vel_damping; /* damp the velocity to speed up getting to the resting position */ + float shrink_min; /* min amount to shrink cloth by 0.0f (no shrink) - 1.0f (shrink to nothing) */ + float shrink_max; /* max amount to shrink cloth by 0.0f (no shrink) - 1.0f (shrink to nothing) */ int stepsPerFrame; /* Number of time steps per frame. */ int flags; /* flags, see CSIMSETT_FLAGS enum above. */ @@ -79,10 +82,11 @@ short vgroup_bend; /* vertex group for scaling bending stiffness */ short vgroup_mass; /* optional vertexgroup name for assigning weight.*/ short vgroup_struct; /* vertex group for scaling structural stiffness */ + short vgroup_shrink; /* vertex group for shrinking cloth */ short shapekey_rest; /* vertex group for scaling structural stiffness */ short presets; /* used for presets on GUI */ short reset; - short pad; + char pad[4]; struct EffectorWeights *effector_weights; } ClothSimSettings; Index: release/scripts/startup/bl_ui/properties_physics_cloth.py =================================================================== --- release/scripts/startup/bl_ui/properties_physics_cloth.py (revision 47947) +++ release/scripts/startup/bl_ui/properties_physics_cloth.py (working copy) @@ -79,6 +79,16 @@ col.prop(cloth, "structural_stiffness", text="Structural") col.prop(cloth, "bending_stiffness", text="Bending") + col.label(text="Sewing:") + col.prop(cloth, "use_sewing_springs", text="Use Sewing Springs") + col.prop(cloth, "sewing_force_max", text="Sewing Force") + + sub = col.column() + col.label(text="Shrinking:") + col.prop_search(cloth, "vertex_group_shrink", ob, "vertex_groups", text="") + col.prop(cloth, "shrink_min", text="Min") + col.prop(cloth, "shrink_max", text="Max") + col = split.column() col.label(text="Damping:")