diff --git a/doc/classes/PhysicsDirectSpaceState2D.xml b/doc/classes/PhysicsDirectSpaceState2D.xml index d4cb073d15d..588887d4916 100644 --- a/doc/classes/PhysicsDirectSpaceState2D.xml +++ b/doc/classes/PhysicsDirectSpaceState2D.xml @@ -21,7 +21,7 @@ - + diff --git a/doc/classes/PhysicsDirectSpaceState3D.xml b/doc/classes/PhysicsDirectSpaceState3D.xml index f7bc74d9ad8..b9f2a12245f 100644 --- a/doc/classes/PhysicsDirectSpaceState3D.xml +++ b/doc/classes/PhysicsDirectSpaceState3D.xml @@ -21,7 +21,7 @@ - + diff --git a/servers/physics_server_2d.cpp b/servers/physics_server_2d.cpp index f9a8d5f156f..4ad83ef3278 100644 --- a/servers/physics_server_2d.cpp +++ b/servers/physics_server_2d.cpp @@ -409,17 +409,17 @@ Vector PhysicsDirectSpaceState2D::_cast_motion(const Ref PhysicsDirectSpaceState2D::_collide_shape(const Ref &p_shape_query, int p_max_results) { - ERR_FAIL_COND_V(!p_shape_query.is_valid(), Array()); +TypedArray PhysicsDirectSpaceState2D::_collide_shape(const Ref &p_shape_query, int p_max_results) { + ERR_FAIL_COND_V(!p_shape_query.is_valid(), TypedArray()); Vector ret; ret.resize(p_max_results * 2); int rc = 0; bool res = collide_shape(p_shape_query->get_parameters(), ret.ptrw(), p_max_results, rc); if (!res) { - return TypedArray(); + return TypedArray(); } - TypedArray r; + TypedArray r; r.resize(rc * 2); for (int i = 0; i < rc * 2; i++) { r[i] = ret[i]; diff --git a/servers/physics_server_2d.h b/servers/physics_server_2d.h index 3e254e610e4..56ec94ba9fb 100644 --- a/servers/physics_server_2d.h +++ b/servers/physics_server_2d.h @@ -120,7 +120,7 @@ class PhysicsDirectSpaceState2D : public Object { TypedArray _intersect_point(const Ref &p_point_query, int p_max_results = 32); TypedArray _intersect_shape(const Ref &p_shape_query, int p_max_results = 32); Vector _cast_motion(const Ref &p_shape_query); - TypedArray _collide_shape(const Ref &p_shape_query, int p_max_results = 32); + TypedArray _collide_shape(const Ref &p_shape_query, int p_max_results = 32); Dictionary _get_rest_info(const Ref &p_shape_query); protected: diff --git a/servers/physics_server_3d.cpp b/servers/physics_server_3d.cpp index c9cf8f99af7..9495ce2262c 100644 --- a/servers/physics_server_3d.cpp +++ b/servers/physics_server_3d.cpp @@ -429,17 +429,17 @@ Vector PhysicsDirectSpaceState3D::_cast_motion(const Ref PhysicsDirectSpaceState3D::_collide_shape(const Ref &p_shape_query, int p_max_results) { - ERR_FAIL_COND_V(!p_shape_query.is_valid(), Array()); +TypedArray PhysicsDirectSpaceState3D::_collide_shape(const Ref &p_shape_query, int p_max_results) { + ERR_FAIL_COND_V(!p_shape_query.is_valid(), TypedArray()); Vector ret; ret.resize(p_max_results * 2); int rc = 0; bool res = collide_shape(p_shape_query->get_parameters(), ret.ptrw(), p_max_results, rc); if (!res) { - return TypedArray(); + return TypedArray(); } - TypedArray r; + TypedArray r; r.resize(rc * 2); for (int i = 0; i < rc * 2; i++) { r[i] = ret[i]; diff --git a/servers/physics_server_3d.h b/servers/physics_server_3d.h index 2c7ebeea66e..0275aee8188 100644 --- a/servers/physics_server_3d.h +++ b/servers/physics_server_3d.h @@ -125,7 +125,7 @@ private: TypedArray _intersect_point(const Ref &p_point_query, int p_max_results = 32); TypedArray _intersect_shape(const Ref &p_shape_query, int p_max_results = 32); Vector _cast_motion(const Ref &p_shape_query); - TypedArray _collide_shape(const Ref &p_shape_query, int p_max_results = 32); + TypedArray _collide_shape(const Ref &p_shape_query, int p_max_results = 32); Dictionary _get_rest_info(const Ref &p_shape_query); protected: