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

Blender v4.5 release

Author: XiaoFFGe

locale/po/zh_HANS.po

@@ -145,6 +145,10 @@ msgid "Collision Mask"
 msgstr "碰撞遮罩"
 
 
+msgid "Change the speed of the simulation for this rigid body"
+msgstr "更改此刚体的模拟速度"
+
+
 msgctxt "Operator"
 msgid "Selected Build Collision Mask"
 msgstr "从选择构建遮罩"

scripts/startup/bl_operators/rigidbody.py

@@ -350,8 +350,6 @@ def execute(self, context):
         return {'FINISHED'}
 
 # 从选择构建遮罩
-
-
 class BuildCollisionMaskFromRigidBody(Operator):
     """Selected Build collision mask from rigid body"""
     bl_idname = "rigidbody.build_collision_mask"

scripts/startup/bl_ui/properties_physics_rigidbody.py

@@ -374,14 +374,16 @@ def draw(self, context):
         # col = layout.column(align=True)
         # col.label(text="Activation:")
         # XXX: settings such as activate on collision/etc.
+        
+        col = flow.column()
+        col.prop(rbo, "time_scale", text="Time Scale")
 
         col = flow.column()
         col.prop(rbo, "linear_damping", text="Damping Translation")
 
         col = flow.column()
         col.prop(rbo, "angular_damping", text="Rotation")
 
-
 class PHYSICS_PT_rigid_body_dynamics_deactivation(PHYSICS_PT_rigidbody_panel, Panel):
     bl_label = "Deactivation"
     bl_parent_id = "PHYSICS_PT_rigid_body_dynamics"

source/blender/blenkernel/BKE_blender_version.h

@@ -19,15 +19,15 @@
 /** Blender major and minor version. */
 #define BLENDER_VERSION 405
 /** Blender patch version for bug-fix releases. */
-#define BLENDER_VERSION_PATCH 10
+#define BLENDER_VERSION_PATCH 11
 /** Blender release cycle stage: alpha/beta/rc/release. */
 #define BLENDER_VERSION_CYCLE release
 /** Blender release type suffix. LTS or blank. */
 #define BLENDER_VERSION_SUFFIX release
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION
-#define BLENDER_FILE_SUBVERSION 102
+#define BLENDER_FILE_SUBVERSION 110
 
 /* Minimum Blender version that supports reading file written with the current
  * version. Older Blender versions will test this and cancel loading the file, showing a warning to

source/blender/blenkernel/intern/rigidbody.cc

@@ -1259,6 +1259,7 @@ RigidBodyOb *BKE_rigidbody_create_object(Scene *scene, Object *ob, short type)
   /* set default settings */
   rbo->type = type;
 
+  rbo->time_scale = 1.0f;
   rbo->mass = 1.0f;
 
   rbo->friction = 0.5f;    /* best when non-zero. 0.5 is Bullet default */
@@ -2096,6 +2097,22 @@ static void rigidbody_update_simulation_post_step(Depsgraph *depsgraph, RigidBod
   FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN (rbw->group, ob) {
     Base *base = BKE_view_layer_base_find(view_layer, ob);
     RigidBodyOb *rbo = ob->rigidbody_object;
+
+    /* Apply per-rigidbody time scale for active objects. */
+    if (rbo && rbo->type == RBO_TYPE_ACTIVE && rbo->shared->physics_object &&
+        !compare_ff(rbo->time_scale, 1.0f, FLT_EPSILON))
+    {
+      float lin_vel[3], ang_vel[3];
+      RB_body_get_linear_velocity(static_cast<rbRigidBody *>(rbo->shared->physics_object), lin_vel);
+      RB_body_get_angular_velocity(static_cast<rbRigidBody *>(rbo->shared->physics_object), ang_vel);
+
+      mul_v3_fl(lin_vel, rbo->time_scale);
+      mul_v3_fl(ang_vel, rbo->time_scale);
+
+      RB_body_set_linear_velocity(static_cast<rbRigidBody *>(rbo->shared->physics_object), lin_vel);
+      RB_body_set_angular_velocity(static_cast<rbRigidBody *>(rbo->shared->physics_object), ang_vel);
+    }
+
     /* Reset kinematic state for transformed objects. */
     if (rbo && base && (base->flag & BASE_SELECTED) && (G.moving & G_TRANSFORM_OBJ) &&
         rbo->shared->physics_object)

source/blender/makesdna/DNA_rigidbody_types.h

@@ -143,6 +143,8 @@ typedef struct RigidBodyOb {
   struct ListBase xf_no_collision_objects;
 
   /* Physics Parameters */
+  /** Used to speed up or slow down the simulation for this rigid body. */
+  float time_scale;
   /** How much object 'weighs' (i.e. absolute 'amount of stuff' it holds). */
   float mass;
 
@@ -170,7 +172,7 @@ typedef struct RigidBodyOb {
   float pos[3];
   char _pad1[4];
 
-  char _pad2[16]; /* 为将来使用保留的填充字节 */
+  char _pad2[12]; /* 为将来使用保留的填充字节 */
 
   /** This pointer is shared between all evaluated copies. */
   struct RigidBodyOb_Shared *shared;

source/blender/makesrna/intern/rna_rigidbody.cc

@@ -363,6 +363,13 @@ static void rna_RigidBodyOb_disabled_set(PointerRNA *ptr, bool value)
 #  endif
 }
 
+static void rna_RigidBodyOb_time_scale_set(PointerRNA *ptr, float value)
+{
+  RigidBodyOb *rbo = (RigidBodyOb *)ptr->data;
+
+  rbo->time_scale = value;
+}
+
 static void rna_RigidBodyOb_mass_set(PointerRNA *ptr, float value)
 {
   RigidBodyOb *rbo = (RigidBodyOb *)ptr->data;
@@ -1192,6 +1199,15 @@ static void rna_def_rigidbody_object(BlenderRNA *brna)
   RNA_def_property_update(prop, NC_OBJECT | ND_POINTCACHE, "rna_RigidBodyOb_reset");
 
   /* Physics Parameters */
+  prop = RNA_def_property(srna, "time_scale", PROP_FLOAT, PROP_NONE);
+  RNA_def_property_float_sdna(prop, nullptr, "time_scale");
+  RNA_def_property_range(prop, 0.0f, 100.0f);
+  RNA_def_property_ui_range(prop, 0.0f, 10.0f, 1, 3);
+  RNA_def_property_float_default(prop, 1.0f);
+  RNA_def_property_float_funcs(prop, nullptr, "rna_RigidBodyOb_time_scale_set", nullptr);
+  RNA_def_property_ui_text(prop, "Time Scale", "Change the speed of the simulation for this rigid body");
+  RNA_def_property_update(prop, NC_OBJECT | ND_POINTCACHE, "rna_RigidBodyOb_reset");
+
   prop = RNA_def_property(srna, "mass", PROP_FLOAT, PROP_UNIT_MASS);
   RNA_def_property_float_sdna(prop, nullptr, "mass");
   RNA_def_property_range(prop, 0.001f, FLT_MAX); /* range must always be positive (and non-zero) */