diff options
| author | fabriceci <fabricecipolla@gmail.com> | 2022-01-26 22:21:16 +0100 |
|---|---|---|
| committer | fabriceci <fabricecipolla@gmail.com> | 2022-01-26 23:09:30 +0100 |
| commit | cc3c4d6323112abc65cf034a3be3289bad19e22e (patch) | |
| tree | d958b8afaa193bc1c007a34b9d13e3f53b01af7d /scene/3d/physics_body_3d.h | |
| parent | 9df9dc77a396bcdfe362365e9511de80c1e94fc0 (diff) | |
| download | redot-engine-cc3c4d6323112abc65cf034a3be3289bad19e22e.tar.gz | |
Revert #53174 (applying the delta in move and collide), rename rec_vel to distance and improve the doc description
Diffstat (limited to 'scene/3d/physics_body_3d.h')
| -rw-r--r-- | scene/3d/physics_body_3d.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/3d/physics_body_3d.h b/scene/3d/physics_body_3d.h index 65a763b21e..67dc7382c3 100644 --- a/scene/3d/physics_body_3d.h +++ b/scene/3d/physics_body_3d.h @@ -50,11 +50,11 @@ protected: uint16_t locked_axis = 0; - Ref<KinematicCollision3D> _move(const Vector3 &p_linear_velocity, bool p_test_only = false, real_t p_margin = 0.001, int p_max_collisions = 1); + Ref<KinematicCollision3D> _move(const Vector3 &p_distance, bool p_test_only = false, real_t p_margin = 0.001, int p_max_collisions = 1); public: bool move_and_collide(const PhysicsServer3D::MotionParameters &p_parameters, PhysicsServer3D::MotionResult &r_result, bool p_test_only = false, bool p_cancel_sliding = true); - bool test_move(const Transform3D &p_from, const Vector3 &p_linear_velocity, const Ref<KinematicCollision3D> &r_collision = Ref<KinematicCollision3D>(), real_t p_margin = 0.001, int p_max_collisions = 1); + bool test_move(const Transform3D &p_from, const Vector3 &p_distance, const Ref<KinematicCollision3D> &r_collision = Ref<KinematicCollision3D>(), real_t p_margin = 0.001, int p_max_collisions = 1); void set_axis_lock(PhysicsServer3D::BodyAxis p_axis, bool p_lock); bool get_axis_lock(PhysicsServer3D::BodyAxis p_axis) const; |