diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-07-15 13:32:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-15 13:32:34 +0200 |
| commit | eb23e5254244815c56aeb34c9ed2e604c10933f0 (patch) | |
| tree | ad4ff2cd9dc61c8ec9c47c6c4f77f300c900850f /servers/physics_2d/physics_server_2d_sw.h | |
| parent | 47d460f2b7d51be411c018b0925ea86b6fec5a7b (diff) | |
| parent | cee814e4dfcd2c48fd319706b798ed8d76ef0c17 (diff) | |
Merge pull request #50314 from fabriceci/fix-2d-moving-platform-4
Fixing 2D moving platform logic
Diffstat (limited to 'servers/physics_2d/physics_server_2d_sw.h')
| -rw-r--r-- | servers/physics_2d/physics_server_2d_sw.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/physics_2d/physics_server_2d_sw.h b/servers/physics_2d/physics_server_2d_sw.h index 5002bf5fc8..f40b5a7c42 100644 --- a/servers/physics_2d/physics_server_2d_sw.h +++ b/servers/physics_2d/physics_server_2d_sw.h @@ -247,7 +247,7 @@ public: virtual void body_set_pickable(RID p_body, bool p_pickable) override; - virtual bool body_test_motion(RID p_body, const Transform2D &p_from, const Vector2 &p_motion, bool p_infinite_inertia, real_t p_margin = 0.08, MotionResult *r_result = nullptr, bool p_exclude_raycast_shapes = true) override; + virtual bool body_test_motion(RID p_body, const Transform2D &p_from, const Vector2 &p_motion, bool p_infinite_inertia, real_t p_margin = 0.08, MotionResult *r_result = nullptr, bool p_exclude_raycast_shapes = true, const Set<RID> &p_exclude = Set<RID>()) override; virtual int body_test_ray_separation(RID p_body, const Transform2D &p_transform, bool p_infinite_inertia, Vector2 &r_recover_motion, SeparationResult *r_results, int p_result_max, real_t p_margin = 0.08) override; // this function only works on physics process, errors and returns null otherwise |