Added custom gravity feature

erayzesen · Jan 13, 2025 · e630741 · e630741
1 parent e99b2e7
commit e630741
Show file tree

Hide file tree

Showing 45 changed files with 99 additions and 2 deletions.
diff --git a/.sconsign.dblite b/.sconsign.dblite
diff --git a/project/addons/quarkphysics/bin/libquarkphysics.linux.template_debug.x86_64.so b/project/addons/quarkphysics/bin/libquarkphysics.linux.template_debug.x86_64.so
diff --git a/src/QuarkPhysics/extensions/qplatformerbody.os b/src/QuarkPhysics/extensions/qplatformerbody.os
diff --git a/src/QuarkPhysics/extensions/qspatialhashing.os b/src/QuarkPhysics/extensions/qspatialhashing.os
diff --git a/src/QuarkPhysics/json/json.os b/src/QuarkPhysics/json/json.os
diff --git a/src/QuarkPhysics/qaabb.os b/src/QuarkPhysics/qaabb.os
diff --git a/src/QuarkPhysics/qareabody.os b/src/QuarkPhysics/qareabody.os
diff --git a/src/QuarkPhysics/qbody.cpp b/src/QuarkPhysics/qbody.cpp
@@ -58,6 +58,16 @@ bool QBody::GetIntegratedVelocitiesEnabled() {
 	return enableIntegratedVelocities;
 }
 
+bool QBody::GetCustomGravityEnabled()
+{
+    return enableCustomGravity;
+}
+
+QVector QBody::GetCustomGravity()
+{
+    return customGravity;
+}
+
 QBody *QBody::SetVelocityLimit(float value)
 {
 	velocityLimit=value;
@@ -125,6 +135,18 @@ QBody *QBody::SetIntegratedVelocitiesEnabled(bool value) {
 	return this;
 }
 
+QBody *QBody::SetCustomGravityEnabled(bool value)
+{
+	enableCustomGravity=value;
+    return this;
+}
+
+QBody *QBody::SetCustomGravity(QVector value)
+{
+	customGravity=value;
+    return this;
+}
+
 QBody *QBody::AddMesh(QMesh *mesh) {
 	_meshes.push_back(mesh);
 	mesh->ownerBody=this;

diff --git a/src/QuarkPhysics/qbody.h b/src/QuarkPhysics/qbody.h
@@ -99,6 +99,8 @@ class QBody{
 	bool enabled=true;
 	float velocityLimit=0.0f;
 	bool enableIntegratedVelocities=true;
+	bool enableCustomGravity=false;
+	QVector customGravity=QVector::Zero();
 
 	//Material Properties;
 
@@ -357,6 +359,16 @@ class QBody{
 		 */
 		bool GetIntegratedVelocitiesEnabled();
 
+		/**
+		 * Returns whether a specific custom gravity value, defined using the SetCustomGravity() method, will be applied to the body instead of the gravity defined for the physics world.
+		 */
+		bool GetCustomGravityEnabled();
+
+		/*
+			Returns the gravity vector specifically defined for the body.
+		*/
+		QVector GetCustomGravity();
+
 
 
 		//General Set Methods
@@ -568,9 +580,25 @@ class QBody{
 
 		/**
 		 * Sets whether the application of gravity and various velocity integrators necessary for the body's movement in the physics world is enabled. It is set to true by default. Typically, it is disabled for specific body objects that require manual control.
+		 * @param value A value to set
+		 * @return A pointer to the body itself.
 		 */
 		QBody *SetIntegratedVelocitiesEnabled(bool value);
 
+		/**
+		 * Sets whether a specific custom gravity value, defined using the SetCustomGravity() method, will be applied to the body instead of the gravity defined for the physics world.
+		 * @param value A value to set
+		 * @return A pointer to the body itself.
+		 */
+		QBody *SetCustomGravityEnabled(bool value);
+
+		/**
+		 * Sets whether a specific custom gravity value, defined using the SetCustomGravity() method, will be applied to the body instead of the gravity defined for the physics world.
+		 * @param value A value to set
+		 * @return A pointer to the body itself.
+		 */
+		QBody *SetCustomGravity(QVector value);
+
 
 		//Mesh Methods
 		/** Adds a mesh to the body.

diff --git a/src/QuarkPhysics/qbody.os b/src/QuarkPhysics/qbody.os
diff --git a/src/QuarkPhysics/qbroadphase.os b/src/QuarkPhysics/qbroadphase.os
diff --git a/src/QuarkPhysics/qcollision.os b/src/QuarkPhysics/qcollision.os
diff --git a/src/QuarkPhysics/qgizmos.os b/src/QuarkPhysics/qgizmos.os
diff --git a/src/QuarkPhysics/qjoint.os b/src/QuarkPhysics/qjoint.os
diff --git a/src/QuarkPhysics/qmanifold.os b/src/QuarkPhysics/qmanifold.os
diff --git a/src/QuarkPhysics/qmesh.os b/src/QuarkPhysics/qmesh.os
diff --git a/src/QuarkPhysics/qobjectpool.os b/src/QuarkPhysics/qobjectpool.os
diff --git a/src/QuarkPhysics/qparticle.os b/src/QuarkPhysics/qparticle.os
diff --git a/src/QuarkPhysics/qraycast.os b/src/QuarkPhysics/qraycast.os
diff --git a/src/QuarkPhysics/qrigidbody.cpp b/src/QuarkPhysics/qrigidbody.cpp
@@ -149,7 +149,13 @@ void QRigidBody::Update()
 	//Verlet Integration
 	if(isKinematic==false && enableIntegratedVelocities==true){
 		position+=vel-(vel*airFriction);
-		position+=(world->GetGravity()*mass*ts);
+
+		if(enableCustomGravity){
+			position+=(customGravity*mass*ts);
+		}else{
+			position+=(world->GetGravity()*mass*ts);
+		}
+
 		rotation+=rotVel-(rotVel*airFriction);
 	}
 	//Position Forces

diff --git a/src/QuarkPhysics/qrigidbody.os b/src/QuarkPhysics/qrigidbody.os
diff --git a/src/QuarkPhysics/qsoftbody.cpp b/src/QuarkPhysics/qsoftbody.cpp
@@ -118,7 +118,11 @@ void QSoftBody::Update()
 			if(enableIntegratedVelocities==true ){
 				particle->ApplyForce(vel-(vel*airFriction) );
 				if(!(particle->GetIsInternal()==true && enablePassivationOfInternalSprings==true) ){
-					particle->ApplyForce(mass*world->GetGravity()*ts);
+					if (enableCustomGravity){
+						particle->ApplyForce(mass*customGravity*ts);
+					}else{
+						particle->ApplyForce(mass*world->GetGravity()*ts);
+					}
 				}
 			}
 			particle->ApplyForce(particle->GetForce());

diff --git a/src/QuarkPhysics/qsoftbody.os b/src/QuarkPhysics/qsoftbody.os
diff --git a/src/QuarkPhysics/qspring.os b/src/QuarkPhysics/qspring.os
diff --git a/src/QuarkPhysics/quarkphysics.os b/src/QuarkPhysics/quarkphysics.os
diff --git a/src/QuarkPhysics/qvector.os b/src/QuarkPhysics/qvector.os
diff --git a/src/QuarkPhysics/qworld.os b/src/QuarkPhysics/qworld.os
diff --git a/src/qareabody_node.os b/src/qareabody_node.os
diff --git a/src/qbody_node.cpp b/src/qbody_node.cpp
@@ -93,6 +93,8 @@ void QBodyNode::_bind_methods() {
      ClassDB::bind_method(D_METHOD("get_enabled"),&QBodyNode::get_enabled );
      ClassDB::bind_method(D_METHOD("get_velocity_limit"),&QBodyNode::get_velocity_limit );
      ClassDB::bind_method(D_METHOD("get_integrated_velocities_enabled"),&QBodyNode::get_integrated_velocities_enabled );
+     ClassDB::bind_method(D_METHOD("get_custom_gravity_enabled"),&QBodyNode::get_custom_gravity_enabled );
+     ClassDB::bind_method(D_METHOD("get_custom_gravity"),&QBodyNode::get_custom_gravity );
 
      //Set
      ClassDB::bind_method(D_METHOD("set_body_position","value","with_previous_position"),&QBodyNode::set_body_position );
@@ -117,6 +119,8 @@ void QBodyNode::_bind_methods() {
      ClassDB::bind_method(D_METHOD("set_enabled","value"),&QBodyNode::set_enabled );
      ClassDB::bind_method(D_METHOD("set_velocity_limit","value"),&QBodyNode::set_velocity_limit );
      ClassDB::bind_method(D_METHOD("set_integrated_velocities_enabled","value"),&QBodyNode::set_integrated_velocities_enabled );
+     ClassDB::bind_method(D_METHOD("set_custom_gravity_enabled","value"),&QBodyNode::set_custom_gravity_enabled );
+     ClassDB::bind_method(D_METHOD("set_custom_gravity","value"),&QBodyNode::set_custom_gravity );
      ClassDB::bind_method(D_METHOD("wake_up"),&QBodyNode::wake_up );
 
      ClassDB::bind_method(D_METHOD("add_mesh_node","mesh_node"),&QBodyNode::add_mesh_node );
@@ -131,6 +135,8 @@ void QBodyNode::_bind_methods() {
      ADD_PROPERTY( PropertyInfo(Variant::INT, "mode", PROPERTY_HINT_ENUM, "Dynamic,Static"),"set_mode","get_mode" );
      ADD_PROPERTY( PropertyInfo(Variant::BOOL, "can_sleep"),"set_can_sleep","get_can_sleep" );
      ADD_PROPERTY( PropertyInfo(Variant::FLOAT, "velocity_limit"),"set_velocity_limit","get_velocity_limit" );
+     ADD_PROPERTY( PropertyInfo(Variant::BOOL, "use_custom_gravity"),"set_custom_gravity_enabled","get_custom_gravity_enabled" );
+     ADD_PROPERTY( PropertyInfo(Variant::VECTOR2, "custom_gravity"),"set_custom_gravity","get_custom_gravity" );
 
      ADD_GROUP("Physics Properties","");
      ADD_PROPERTY( PropertyInfo(Variant::FLOAT, "mass"),"set_mass","get_mass" );
@@ -283,6 +289,17 @@ bool QBodyNode::get_integrated_velocities_enabled() {
 	return bodyObject->GetIntegratedVelocitiesEnabled();
 }
 
+bool QBodyNode::get_custom_gravity_enabled()
+{
+    return bodyObject->GetCustomGravityEnabled();
+}
+
+Vector2 QBodyNode::get_custom_gravity()
+{
+    QVector customGravity=bodyObject->GetCustomGravity();
+    return Vector2(customGravity.x,customGravity.y);
+}
+
 //SET METHODS
 
 QBodyNode *QBodyNode::set_body_position(Vector2 value, bool with_previous_position) {
@@ -410,6 +427,18 @@ QBodyNode *QBodyNode::set_integrated_velocities_enabled(bool value) {
 	return this;
 }
 
+QBodyNode *QBodyNode::set_custom_gravity_enabled(bool value)
+{
+    bodyObject->SetCustomGravityEnabled(value);
+    return this;
+}
+
+QBodyNode *QBodyNode::set_custom_gravity(Vector2 value)
+{
+    bodyObject->SetCustomGravity(QVector(value.x,value.y) );
+    return this;
+}
+
 QBodyNode *QBodyNode::wake_up() {
     bodyObject->WakeUp();
 	return this;

diff --git a/src/qbody_node.h b/src/qbody_node.h
@@ -138,6 +138,10 @@ class QBodyNode: public Node2D{
 
     bool get_integrated_velocities_enabled();
 
+    bool get_custom_gravity_enabled();
+
+    Vector2 get_custom_gravity();
+
     //Set Methods
 
     QBodyNode *set_body_position(Vector2 value,bool with_previous_position=true);
@@ -186,6 +190,10 @@ class QBodyNode: public Node2D{
 
     QBodyNode *set_integrated_velocities_enabled(bool value);
 
+    QBodyNode *set_custom_gravity_enabled(bool value);
+
+    QBodyNode *set_custom_gravity(Vector2 value);
+
     //Sleeping
 
     QBodyNode *wake_up();

diff --git a/src/qbody_node.os b/src/qbody_node.os
diff --git a/src/qjoint_object.os b/src/qjoint_object.os
diff --git a/src/qmesh_advanced_node.os b/src/qmesh_advanced_node.os
diff --git a/src/qmesh_circle_node.os b/src/qmesh_circle_node.os
diff --git a/src/qmesh_node.os b/src/qmesh_node.os
diff --git a/src/qmesh_polygon_node.os b/src/qmesh_polygon_node.os
diff --git a/src/qmesh_rect_node.os b/src/qmesh_rect_node.os
diff --git a/src/qparticle_object.os b/src/qparticle_object.os
diff --git a/src/qplatformerbody_node.os b/src/qplatformerbody_node.os
diff --git a/src/qraycast_object.os b/src/qraycast_object.os
diff --git a/src/qrigidbody_node.os b/src/qrigidbody_node.os
diff --git a/src/qsoftbody_node.os b/src/qsoftbody_node.os
diff --git a/src/qspring_object.os b/src/qspring_object.os
diff --git a/src/qworld_node.os b/src/qworld_node.os
diff --git a/src/register_types.os b/src/register_types.os