[Bf-blender-cvs] [54186c5] cloth-improvements: Set better default values for the new mass-spring model

[Luca Rood]

Commit: 54186c5aa982c0b7fea8ebea20c51e7732e5abbe
Author: Luca Rood
Date:   Wed Dec 7 22:14:56 2016 -0200
Branches: cloth-improvements
https://developer.blender.org/rB54186c5aa982c0b7fea8ebea20c51e7732e5abbe

Set better default values for the new mass-spring model

===================================================================

M	source/blender/blenkernel/intern/cloth.c
M	source/blender/physics/intern/BPH_mass_spring.cpp

===================================================================

diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c
index b356524..c017fdc 100644
--- a/source/blender/blenkernel/intern/cloth.c
+++ b/source/blender/blenkernel/intern/cloth.c
@@ -87,18 +87,18 @@ void cloth_init(ClothModifierData *clmd )
 	clmd->sim_parms->gravity[0] = 0.0;
 	clmd->sim_parms->gravity[1] = 0.0;
 	clmd->sim_parms->gravity[2] = -9.81;
-	clmd->sim_parms->tension = 15.0;
-	clmd->sim_parms->compression = 15.0;
-	clmd->sim_parms->max_tension = 15.0;
-	clmd->sim_parms->max_compression = 15.0;
-	clmd->sim_parms->shear = 5.0;
-	clmd->sim_parms->max_shear = 5.0;
-	clmd->sim_parms->bending = 0.5;
-	clmd->sim_parms->max_bend = 0.5;
+	clmd->sim_parms->tension = 50.0;
+	clmd->sim_parms->compression = 50.0;
+	clmd->sim_parms->max_tension = 50.0;
+	clmd->sim_parms->max_compression = 50.0;
+	clmd->sim_parms->shear = 0.1;
+	clmd->sim_parms->max_shear = 0.1;
+	clmd->sim_parms->bending = 0.05;
+	clmd->sim_parms->max_bend = 0.05;
 	clmd->sim_parms->bending_damping = 0.5;
 	clmd->sim_parms->tension_damp = 5.0;
 	clmd->sim_parms->compression_damp = 5.0;
-	clmd->sim_parms->shear_damp = 5.0;
+	clmd->sim_parms->shear_damp = 1.0;
 	clmd->sim_parms->Cvi = 1.0;
 	clmd->sim_parms->mass = 0.3f;
 	clmd->sim_parms->stepsPerFrame = 5;
diff --git a/source/blender/physics/intern/BPH_mass_spring.cpp b/source/blender/physics/intern/BPH_mass_spring.cpp
index 9537694..36794f1 100644
--- a/source/blender/physics/intern/BPH_mass_spring.cpp
+++ b/source/blender/physics/intern/BPH_mass_spring.cpp
@@ -433,7 +433,7 @@ BLI_INLINE void cloth_calc_spring_force(ClothModifierData *clmd, ClothSpring *s,
 		s->flags |= CLOTH_SPRING_FLAG_NEEDED;
 		
 		scaling = parms->bending + s->stiffness * fabsf(parms->max_bend - parms->bending);
-		k = scaling * s->restlen;
+		k = scaling * s->restlen * 0.1f; /* multiplying by 0.1, just to scale the forces to more reasonable values */
 		
 		BPH_mass_spring_force_spring_angular(data, s->ij, s->kl, s->pa, s->pb, s->la, s->lb,
                                              s->restang, k, parms->bending_damping);