diff options
| author | PouleyKetchoupp <pouleyketchoup@gmail.com> | 2020-04-14 19:59:53 +0200 |
|---|---|---|
| committer | PouleyKetchoupp <pouleyketchoup@gmail.com> | 2021-10-25 18:22:12 -0700 |
| commit | daf7dcac7a9e0b4c26ba62ba9a700813d5abec9a (patch) | |
| tree | 3ab364852f8804d03e8f6334a792d18f523dfea3 /servers/physics_3d/godot_body_3d.h | |
| parent | 24fdedfe948a918b5a67846f7962f83ba0e59258 (diff) | |
| download | redot-engine-daf7dcac7a9e0b4c26ba62ba9a700813d5abec9a.tar.gz | |
Improved RigidDynamicBody linear/angular damping override
Damping values are now non-negative.
Add new properties linear_damp_mode and angular_damp_mode to set the way
RigidDynamicBody and PhysicalBone (2D & 3D) use damping values.
It can now be Combine (default) to add to the default/areas, or Replace
to override the value completely (current behavior).
Diffstat (limited to 'servers/physics_3d/godot_body_3d.h')
| -rw-r--r-- | servers/physics_3d/godot_body_3d.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/servers/physics_3d/godot_body_3d.h b/servers/physics_3d/godot_body_3d.h index 5acdab9d13..4993ea6a1b 100644 --- a/servers/physics_3d/godot_body_3d.h +++ b/servers/physics_3d/godot_body_3d.h @@ -55,8 +55,15 @@ class GodotBody3D : public GodotCollisionObject3D { real_t friction = 1.0; Vector3 inertia; - real_t linear_damp = -1.0; - real_t angular_damp = -1.0; + PhysicsServer3D::BodyDampMode linear_damp_mode = PhysicsServer3D::BODY_DAMP_MODE_COMBINE; + PhysicsServer3D::BodyDampMode angular_damp_mode = PhysicsServer3D::BODY_DAMP_MODE_COMBINE; + + real_t linear_damp = 0.0; + real_t angular_damp = 0.0; + + real_t total_linear_damp = 0.0; + real_t total_angular_damp = 0.0; + real_t gravity_scale = 1.0; uint16_t locked_axis = 0; @@ -83,9 +90,6 @@ class GodotBody3D : public GodotCollisionObject3D { Vector3 applied_force; Vector3 applied_torque; - real_t area_angular_damp = 0.0; - real_t area_linear_damp = 0.0; - SelfList<GodotBody3D> active_list; SelfList<GodotBody3D> mass_properties_update_list; SelfList<GodotBody3D> direct_state_query_list; @@ -285,7 +289,6 @@ public: _FORCE_INLINE_ const Vector3 &get_inv_inertia() const { return _inv_inertia; } _FORCE_INLINE_ const Basis &get_inv_inertia_tensor() const { return _inv_inertia_tensor; } _FORCE_INLINE_ real_t get_friction() const { return friction; } - _FORCE_INLINE_ const Vector3 &get_gravity() const { return gravity; } _FORCE_INLINE_ real_t get_bounce() const { return bounce; } void set_axis_lock(PhysicsServer3D::BodyAxis p_axis, bool lock); |