diff options
Diffstat (limited to 'servers/physics_2d')
| -rw-r--r-- | servers/physics_2d/physics_2d_server_sw.cpp | 2 | ||||
| -rw-r--r-- | servers/physics_2d/physics_2d_server_wrap_mt.h | 2 | ||||
| -rw-r--r-- | servers/physics_2d/space_2d_sw.cpp | 2 | ||||
| -rw-r--r-- | servers/physics_2d/space_2d_sw.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/servers/physics_2d/physics_2d_server_sw.cpp b/servers/physics_2d/physics_2d_server_sw.cpp index 6eb1106de8..c20d0d14a2 100644 --- a/servers/physics_2d/physics_2d_server_sw.cpp +++ b/servers/physics_2d/physics_2d_server_sw.cpp @@ -31,8 +31,8 @@ #include "broad_phase_2d_basic.h" #include "broad_phase_2d_hash_grid.h" #include "collision_solver_2d_sw.h" -#include "project_settings.h" #include "os/os.h" +#include "project_settings.h" #include "script_language.h" RID Physics2DServerSW::shape_create(ShapeType p_shape) { diff --git a/servers/physics_2d/physics_2d_server_wrap_mt.h b/servers/physics_2d/physics_2d_server_wrap_mt.h index 5b00416b61..8b6609d119 100644 --- a/servers/physics_2d/physics_2d_server_wrap_mt.h +++ b/servers/physics_2d/physics_2d_server_wrap_mt.h @@ -31,8 +31,8 @@ #define PHYSICS2DSERVERWRAPMT_H #include "command_queue_mt.h" -#include "project_settings.h" #include "os/thread.h" +#include "project_settings.h" #include "servers/physics_2d_server.h" #ifdef DEBUG_SYNC diff --git a/servers/physics_2d/space_2d_sw.cpp b/servers/physics_2d/space_2d_sw.cpp index c407a17bc6..a17d1f6a12 100644 --- a/servers/physics_2d/space_2d_sw.cpp +++ b/servers/physics_2d/space_2d_sw.cpp @@ -553,7 +553,7 @@ bool Space2DSW::test_body_motion(Body2DSW *p_body, const Transform2D &p_from, co const CollisionObject2DSW *col_obj = intersection_query_results[i]; int shape_idx = intersection_query_subindex_results[i]; - if (col_obj->is_shape_set_as_one_way_collision(j)) { + if (col_obj->is_shape_set_as_one_way_collision(shape_idx)) { cbk.valid_dir = body_shape_xform.get_axis(1).normalized(); cbk.valid_depth = p_margin; //only valid depth is the collision margin diff --git a/servers/physics_2d/space_2d_sw.h b/servers/physics_2d/space_2d_sw.h index c5bdfa3323..4bd81c054f 100644 --- a/servers/physics_2d/space_2d_sw.h +++ b/servers/physics_2d/space_2d_sw.h @@ -36,8 +36,8 @@ #include "body_pair_2d_sw.h" #include "broad_phase_2d_sw.h" #include "collision_object_2d_sw.h" -#include "project_settings.h" #include "hash_map.h" +#include "project_settings.h" #include "typedefs.h" class Physics2DDirectSpaceStateSW : public Physics2DDirectSpaceState { |