UPBGE: Implement bending constraint distance UI option.

Previously the bending distance was fixed to 2, now the user is able to change its value in the UI.
UPBGE · Sep 28, 2017 · 5fde4ed · 5fde4ed
1 parent 6c7862b
commit 5fde4ed
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 2 deletions.
diff --git a/release/scripts/startup/bl_ui/properties_game.py b/release/scripts/startup/bl_ui/properties_game.py
@@ -149,6 +149,9 @@ def draw(self, context):
             col.prop(soft, "dynamic_friction", slider=True)
             col.prop(soft, "collision_margin", slider=True)
             col.prop(soft, "use_bending_constraints", text="Bending Constraints")
+            sub = col.column()
+            sub.active = soft.use_bending_constraints
+            sub.prop(soft, "bending_distance")
 
             col = split.column()
             col.prop(soft, "use_shape_match")

diff --git a/source/blender/blenkernel/intern/bullet.c b/source/blender/blenkernel/intern/bullet.c
@@ -84,6 +84,7 @@ BulletSoftBody *bsbNew(void)
 	bsb->collisionflags = 0;
 	//bsb->collisionflags = OB_BSB_COL_CL_RS + OB_BSB_COL_CL_SS;
 	bsb->numclusteriterations = 64;
+	bsb->bending_dist = 2;
 	bsb->welding = 0.f;
 
 	return bsb;

diff --git a/source/blender/blenloader/intern/versioning_upbge.c b/source/blender/blenloader/intern/versioning_upbge.c
@@ -35,6 +35,7 @@
 
 #include "DNA_genfile.h"
 #include "DNA_material_types.h"
+#include "DNA_object_force.h"
 #include "DNA_object_types.h"
 #include "DNA_camera_types.h"
 #include "DNA_sdna_types.h"
@@ -242,4 +243,14 @@ void blo_do_versions_upbge(FileData *fd, Library *lib, Main *main)
 			}
 		}
 	}
+
+	if (!MAIN_VERSION_UPBGE_ATLEAST(main, 2, 1)) {
+		if (!DNA_struct_elem_find(fd->filesdna, "BulletSoftBody", "int", "bending_dist")) {
+			for (Object *ob = main->object.first; ob; ob = ob->id.next) {
+				if (ob->bsoft) {
+					ob->bsoft->bending_dist = 2;
+				}
+			}
+		}
+	}
 }
diff --git a/source/blender/makesdna/DNA_object_force.h b/source/blender/makesdna/DNA_object_force.h
@@ -247,6 +247,7 @@ typedef struct BulletSoftBody {
 	float	kAHR;			/* Anchors hardness [0,1] */
 	int		collisionflags;	/* Vertex/Face or Signed Distance Field(SDF) or Clusters, Soft versus Soft or Rigid */
 	int		numclusteriterations;	/* number of iterations to refine collision clusters*/
+	int bending_dist; /* Bending constraint distance */
 	float	welding;		/* welding limit to remove duplicate/nearby vertices, 0.0..0.01 */
 	float   margin;			/* margin specific to softbody */
 } BulletSoftBody;

diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c
@@ -1540,7 +1540,12 @@ static void rna_def_game_softbody(BlenderRNA *brna)
 	RNA_def_property_int_sdna(prop, NULL, "numclusteriterations");
 	RNA_def_property_range(prop, 1, 1000);
 	RNA_def_property_ui_text(prop, "Cluster Iterations", "Number of cluster iterations");
-
+
+	prop = RNA_def_property(srna, "bending_distance", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "bending_dist");
+	RNA_def_property_range(prop, 1, 1000);
+	RNA_def_property_ui_text(prop, "Bending Distance", "Bending Constraint Distance");
+
 	/* Booleans */
 
 	prop = RNA_def_property(srna, "use_shape_match", PROP_BOOLEAN, PROP_NONE);

diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
@@ -441,7 +441,7 @@ bool CcdPhysicsController::CreateSoftbody()
 	psb->m_cfg.kAHR = m_cci.m_soft_kAHR; // Anchors hardness [0,1]
 
 	if (m_cci.m_gamesoftFlag & CCD_BSB_BENDING_CONSTRAINTS) {
-		psb->generateBendingConstraints(2, pm);
+		psb->generateBendingConstraints(m_cci.m_softBendingDistance, pm);
 	}
 
 	psb->m_cfg.piterations = m_cci.m_soft_piterations;

diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.h b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
@@ -236,6 +236,7 @@ struct CcdConstructionInfo {
 		m_angularDamping(0.1f),
 		m_margin(0.06f),
 		m_gamesoftFlag(0),
+		m_softBendingDistance(2),
 		m_soft_linStiff(1.0f),
 		m_soft_angStiff(1.0f),
 		m_soft_volume(1.0f),
@@ -312,6 +313,7 @@ struct CcdConstructionInfo {
 	unsigned char m_maxJumps;
 
 	int m_gamesoftFlag;
+	unsigned short m_softBendingDistance;
 	/// linear stiffness 0..1
 	float m_soft_linStiff;
 	/// angular stiffness 0..1

diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
@@ -2741,6 +2741,8 @@ void CcdPhysicsEnvironment::ConvertObject(BL_BlenderSceneConverter& converter, K
 			ci.m_margin = blenderobject->bsoft->margin;
 			ci.m_gamesoftFlag = blenderobject->bsoft->flag;
 
+			ci.m_softBendingDistance = blenderobject->bsoft->bending_dist;
+
 			ci.m_soft_linStiff = blenderobject->bsoft->linStiff;
 			ci.m_soft_angStiff = blenderobject->bsoft->angStiff; // angular stiffness 0..1
 			ci.m_soft_volume = blenderobject->bsoft->volume; // volume preservation 0..1
@@ -2780,6 +2782,8 @@ void CcdPhysicsEnvironment::ConvertObject(BL_BlenderSceneConverter& converter, K
 			ci.m_margin = 0.0f;
 			ci.m_gamesoftFlag = OB_BSB_BENDING_CONSTRAINTS | OB_BSB_SHAPE_MATCHING | OB_BSB_AERO_VPOINT;
 
+			ci.m_softBendingDistance = 2;
+
 			ci.m_soft_linStiff = 0.5f;
 			ci.m_soft_angStiff = 1.0f; // angular stiffness 0..1
 			ci.m_soft_volume = 1.0f; // volume preservation 0..1