Merge pull request #8 from XiaoFFGe/blender-v4.5-release

Blender v4.5 release

Author: XiaoFFGe

locale/po/zh_HANS.po

@@ -149,6 +149,10 @@ msgid "Change the speed of the simulation for this rigid body"
 msgstr "更改此刚体的模拟速度"
 
 
+msgid "Influence of global gravity on this rigid body (0 = no gravity, 1 = full gravity)"
+msgstr "局重力对该刚体的影响（0 = 无重力，1 = 完全重力）"
+
+
 msgctxt "Operator"
 msgid "Selected Build Collision Mask"
 msgstr "从选择构建遮罩"

scripts/startup/bl_ui/properties_physics_rigidbody.py

@@ -376,7 +376,10 @@ def draw(self, context):
         # XXX: settings such as activate on collision/etc.
 
         col = flow.column()
-        col.prop(rbo, "time_scale", text="Time Scale")
+        col.prop(rbo, "time_scale", text="Speed")
+
+        col = flow.column()
+        col.prop(rbo, "gravity", text="Gravity")
 
         col = flow.column()
         col.prop(rbo, "linear_damping", text="Damping Translation")

source/blender/blenkernel/intern/rigidbody.cc

@@ -1273,6 +1273,8 @@ RigidBodyOb *BKE_rigidbody_create_object(Scene *scene, Object *ob, short type)
   rbo->lin_damping = 0.04f;
   rbo->ang_damping = 0.1f;
 
+  rbo->gravity = 1.0f; /* full gravity influence by default */
+
   rbo->col_groups = 0;
 
   /* use triangle meshes for passive objects
@@ -2014,13 +2016,38 @@ static void rigidbody_update_external_forces(Depsgraph *depsgraph,
                                              Scene *scene,
                                              RigidBodyWorld *rbw)
 {
+  /* get world gravity */
+  float world_gravity[3];
+  if (rbw->shared->runtime->physics_world) {
+    RB_dworld_get_gravity(rbw->shared->runtime->physics_world, world_gravity);
+  }
+  else {
+    zero_v3(world_gravity);
+  }
+
   FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN (rbw->group, ob) {
     /* only update if rigid body exists */
     RigidBodyOb *rbo = ob->rigidbody_object;
     if (ob->type != OB_MESH || rbo->shared->physics_object == nullptr) {
       continue;
     }
 
+    /* Apply per-body gravity weight */
+    if (rbo->type == RBO_TYPE_ACTIVE && (rbo->flag & RBO_FLAG_DISABLED) == 0 &&
+        rbo->gravity != 1.0f && !is_zero_v3(world_gravity))
+    {
+      float gravity_force[3];
+      float mass = RB_body_get_mass(static_cast<rbRigidBody *>(rbo->shared->physics_object));
+      /* Calculate the additional gravity force needed to achieve the desired gravity influence */
+      /* If gravity < 1.0, we need to reduce the effective gravity */
+      /* If gravity > 1.0, we need to increase the effective gravity */
+      float gravity_factor = rbo->gravity - 1.0f;
+      copy_v3_v3(gravity_force, world_gravity);
+      mul_v3_fl(gravity_force, gravity_factor * mass);
+      RB_body_apply_central_force(static_cast<rbRigidBody *>(rbo->shared->physics_object),
+                                  gravity_force);
+    }
+
     /* update influence of effectors - but don't do it on an effector */
     /* only dynamic bodies need effector update */
     if (rbo->type == RBO_TYPE_ACTIVE &&

source/blender/makesdna/DNA_rigidbody_types.h

@@ -161,6 +161,9 @@ typedef struct RigidBodyOb {
   /** Damping for angular velocities. */
   float ang_damping;
 
+  /** Gravity influence for this rigid body (0.0 - 1.0). */
+  float gravity;
+
   /** Deactivation threshold for linear velocities. */
   float lin_sleep_thresh;
   /** Deactivation threshold for angular velocities. */
@@ -172,7 +175,7 @@ typedef struct RigidBodyOb {
   float pos[3];
   char _pad1[4];
 
-  char _pad2[12]; /* 为将来使用保留的填充字节 */
+  char _pad2[8]; /* 为将来使用保留的填充字节 */
 
   /** This pointer is shared between all evaluated copies. */
   struct RigidBodyOb_Shared *shared;

source/blender/makesrna/intern/rna_rigidbody.cc

@@ -1279,6 +1279,14 @@ static void rna_def_rigidbody_object(BlenderRNA *brna)
       prop, "Angular Damping", "Amount of angular velocity that is lost over time");
   RNA_def_property_update(prop, NC_OBJECT | ND_POINTCACHE, "rna_RigidBodyOb_reset");
 
+  prop = RNA_def_property(srna, "gravity", PROP_FLOAT, PROP_FACTOR);
+  RNA_def_property_float_sdna(prop, nullptr, "gravity");
+  RNA_def_property_range(prop, 0.0f, 1.0f);
+  RNA_def_property_float_default(prop, 1.0f);
+  RNA_def_property_ui_text(
+      prop, "Gravity", "Influence of global gravity on this rigid body (0 = no gravity, 1 = full gravity)");
+  RNA_def_property_update(prop, NC_OBJECT | ND_POINTCACHE, "rna_RigidBodyOb_reset");
+
   /* Collision Parameters - Surface Parameters */
   prop = RNA_def_property(srna, "friction", PROP_FLOAT, PROP_FACTOR);
   RNA_def_property_float_sdna(prop, nullptr, "friction");