diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-09 11:15:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-09 11:15:43 +0100 |
| commit | 23531207a5cde7d67692b667606ac3f6e8638853 (patch) | |
| tree | b442467cf4c4b3f1a3cbe97032d85dae81e2e04b /scene/3d/physics_body.h | |
| parent | de932a528512a6312e08ba6926b658a577168f9d (diff) | |
| parent | 557d38cad3db98967c71a031298e703e3b5ed3c2 (diff) | |
Merge pull request #36008 from AndreaCatania/physical_bone_impr
Skeleton animates physical bones
Diffstat (limited to 'scene/3d/physics_body.h')
| -rw-r--r-- | scene/3d/physics_body.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/scene/3d/physics_body.h b/scene/3d/physics_body.h index 05bcbe22f0..6a1e803eaf 100644 --- a/scene/3d/physics_body.h +++ b/scene/3d/physics_body.h @@ -562,8 +562,6 @@ private: Skeleton *parent_skeleton; Transform body_offset; Transform body_offset_inverse; - bool static_body; - bool _internal_static_body; bool simulate_physics; bool _internal_simulate_physics; int bone_id; @@ -613,9 +611,6 @@ public: void set_body_offset(const Transform &p_offset); const Transform &get_body_offset() const; - void set_static_body(bool p_static); - bool is_static_body(); - void set_simulate_physics(bool p_simulate); bool get_simulate_physics(); bool is_simulating_physics(); @@ -641,16 +636,15 @@ public: void apply_central_impulse(const Vector3 &p_impulse); void apply_impulse(const Vector3 &p_pos, const Vector3 &p_impulse); + void reset_physics_simulation_state(); + void reset_to_rest_position(); + PhysicalBone(); ~PhysicalBone(); private: void update_bone_id(); void update_offset(); - void reset_to_rest_position(); - - void _reset_physics_simulation_state(); - void _reset_staticness_state(); void _start_physics_simulation(); void _stop_physics_simulation(); |