diff --git a/doc/classes/Physics2DShapeQueryParameters.xml b/doc/classes/Physics2DShapeQueryParameters.xml index 6e4efb30f4c..400b97819b9 100644 --- a/doc/classes/Physics2DShapeQueryParameters.xml +++ b/doc/classes/Physics2DShapeQueryParameters.xml @@ -4,7 +4,7 @@ Parameters to be sent to a 2D shape physics query. - This class contains the shape and other parameters for 2D intersection/collision queries. See also [Physics2DShapeQueryResult]. + This class contains the shape and other parameters for 2D intersection/collision queries. diff --git a/doc/classes/Physics2DShapeQueryResult.xml b/doc/classes/Physics2DShapeQueryResult.xml deleted file mode 100644 index 8f08eaae812..00000000000 --- a/doc/classes/Physics2DShapeQueryResult.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - Result of a 2D shape query in [Physics2DServer]. - - - The result of a 2D shape query in [Physics2DServer]. See also [Physics2DShapeQueryParameters]. - - - - - - - - - Returns the number of objects that intersected with the shape. - - - - - - - - - Returns the [Object] that intersected with the shape at index [code]idx[/code]. - - - - - - - - - Returns the instance ID of the [Object] that intersected with the shape at index [code]idx[/code]. - - - - - - - - - Returns the child index of the object's [Shape] that intersected with the shape at index [code]idx[/code]. - - - - - - - - - Returns the [RID] of the object that intersected with the shape at index [code]idx[/code]. - - - - - - diff --git a/doc/classes/PhysicsShapeQueryParameters.xml b/doc/classes/PhysicsShapeQueryParameters.xml index 6eae72c2800..0898b9f2dab 100644 --- a/doc/classes/PhysicsShapeQueryParameters.xml +++ b/doc/classes/PhysicsShapeQueryParameters.xml @@ -4,7 +4,7 @@ Parameters to be sent to a 3D shape physics query. - This class contains the shape and other parameters for 3D intersection/collision queries. See also [PhysicsShapeQueryResult]. + This class contains the shape and other parameters for 3D intersection/collision queries. diff --git a/doc/classes/PhysicsShapeQueryResult.xml b/doc/classes/PhysicsShapeQueryResult.xml deleted file mode 100644 index 52214a674ff..00000000000 --- a/doc/classes/PhysicsShapeQueryResult.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - Result of a 3D shape query in [PhysicsServer]. - - - The result of a 3D shape query in [PhysicsServer]. See also [PhysicsShapeQueryParameters]. - - - - - - - - - Returns the number of objects that intersected with the shape. - - - - - - - - - Returns the [Object] that intersected with the shape at index [code]idx[/code]. - - - - - - - - - Returns the instance ID of the [Object] that intersected with the shape at index [code]idx[/code]. - - - - - - - - - Returns the child index of the object's [Shape] that intersected with the shape at index [code]idx[/code]. - - - - - - - - - Returns the [RID] of the object that intersected with the shape at index [code]idx[/code]. - - - - - - diff --git a/servers/physics_2d_server.cpp b/servers/physics_2d_server.cpp index de830d9a2dd..12f11a54362 100644 --- a/servers/physics_2d_server.cpp +++ b/servers/physics_2d_server.cpp @@ -406,33 +406,6 @@ void Physics2DDirectSpaceState::_bind_methods() { ClassDB::bind_method(D_METHOD("get_rest_info", "shape"), &Physics2DDirectSpaceState::_get_rest_info); } -int Physics2DShapeQueryResult::get_result_count() const { - return result.size(); -} -RID Physics2DShapeQueryResult::get_result_rid(int p_idx) const { - return result[p_idx].rid; -} -ObjectID Physics2DShapeQueryResult::get_result_object_id(int p_idx) const { - return result[p_idx].collider_id; -} -Object *Physics2DShapeQueryResult::get_result_object(int p_idx) const { - return result[p_idx].collider; -} -int Physics2DShapeQueryResult::get_result_object_shape(int p_idx) const { - return result[p_idx].shape; -} - -Physics2DShapeQueryResult::Physics2DShapeQueryResult() { -} - -void Physics2DShapeQueryResult::_bind_methods() { - ClassDB::bind_method(D_METHOD("get_result_count"), &Physics2DShapeQueryResult::get_result_count); - ClassDB::bind_method(D_METHOD("get_result_rid", "idx"), &Physics2DShapeQueryResult::get_result_rid); - ClassDB::bind_method(D_METHOD("get_result_object_id", "idx"), &Physics2DShapeQueryResult::get_result_object_id); - ClassDB::bind_method(D_METHOD("get_result_object", "idx"), &Physics2DShapeQueryResult::get_result_object); - ClassDB::bind_method(D_METHOD("get_result_object_shape", "idx"), &Physics2DShapeQueryResult::get_result_object_shape); -} - /////////////////////////////// Vector2 Physics2DTestMotionResult::get_motion() const { diff --git a/servers/physics_2d_server.h b/servers/physics_2d_server.h index 1241e6a4e41..8a2fd56a9e9 100644 --- a/servers/physics_2d_server.h +++ b/servers/physics_2d_server.h @@ -92,8 +92,6 @@ public: Physics2DDirectBodyState(); }; -class Physics2DShapeQueryResult; - //used for script class Physics2DShapeQueryParameters : public Reference { GDCLASS(Physics2DShapeQueryParameters, Reference); @@ -200,26 +198,6 @@ public: Physics2DDirectSpaceState(); }; -class Physics2DShapeQueryResult : public Reference { - GDCLASS(Physics2DShapeQueryResult, Reference); - - Vector result; - - friend class Physics2DDirectSpaceState; - -protected: - static void _bind_methods(); - -public: - int get_result_count() const; - RID get_result_rid(int p_idx) const; - ObjectID get_result_object_id(int p_idx) const; - Object *get_result_object(int p_idx) const; - int get_result_object_shape(int p_idx) const; - - Physics2DShapeQueryResult(); -}; - class Physics2DTestMotionResult; class Physics2DServer : public Object { diff --git a/servers/physics_server.cpp b/servers/physics_server.cpp index a13d61dc69b..695389e370d 100644 --- a/servers/physics_server.cpp +++ b/servers/physics_server.cpp @@ -354,33 +354,6 @@ void PhysicsDirectSpaceState::_bind_methods() { ClassDB::bind_method(D_METHOD("get_rest_info", "shape"), &PhysicsDirectSpaceState::_get_rest_info); } -int PhysicsShapeQueryResult::get_result_count() const { - return result.size(); -} -RID PhysicsShapeQueryResult::get_result_rid(int p_idx) const { - return result[p_idx].rid; -} -ObjectID PhysicsShapeQueryResult::get_result_object_id(int p_idx) const { - return result[p_idx].collider_id; -} -Object *PhysicsShapeQueryResult::get_result_object(int p_idx) const { - return result[p_idx].collider; -} -int PhysicsShapeQueryResult::get_result_object_shape(int p_idx) const { - return result[p_idx].shape; -} - -PhysicsShapeQueryResult::PhysicsShapeQueryResult() { -} - -void PhysicsShapeQueryResult::_bind_methods() { - ClassDB::bind_method(D_METHOD("get_result_count"), &PhysicsShapeQueryResult::get_result_count); - ClassDB::bind_method(D_METHOD("get_result_rid", "idx"), &PhysicsShapeQueryResult::get_result_rid); - ClassDB::bind_method(D_METHOD("get_result_object_id", "idx"), &PhysicsShapeQueryResult::get_result_object_id); - ClassDB::bind_method(D_METHOD("get_result_object", "idx"), &PhysicsShapeQueryResult::get_result_object); - ClassDB::bind_method(D_METHOD("get_result_object_shape", "idx"), &PhysicsShapeQueryResult::get_result_object_shape); -} - /////////////////////////////// Vector3 PhysicsTestMotionResult::get_motion() const { diff --git a/servers/physics_server.h b/servers/physics_server.h index 5740c821f7a..7d276f7c1ed 100644 --- a/servers/physics_server.h +++ b/servers/physics_server.h @@ -94,8 +94,6 @@ public: PhysicsDirectBodyState(); }; -class PhysicsShapeQueryResult; - class PhysicsShapeQueryParameters : public Reference { GDCLASS(PhysicsShapeQueryParameters, Reference); friend class PhysicsDirectSpaceState; @@ -194,26 +192,6 @@ public: PhysicsDirectSpaceState(); }; -class PhysicsShapeQueryResult : public Reference { - GDCLASS(PhysicsShapeQueryResult, Reference); - - Vector result; - - friend class PhysicsDirectSpaceState; - -protected: - static void _bind_methods(); - -public: - int get_result_count() const; - RID get_result_rid(int p_idx) const; - ObjectID get_result_object_id(int p_idx) const; - Object *get_result_object(int p_idx) const; - int get_result_object_shape(int p_idx) const; - - PhysicsShapeQueryResult(); -}; - class PhysicsTestMotionResult; class PhysicsServer : public Object { diff --git a/servers/register_server_types.cpp b/servers/register_server_types.cpp index cd4d39cd4bb..390e930f6b9 100644 --- a/servers/register_server_types.cpp +++ b/servers/register_server_types.cpp @@ -175,14 +175,12 @@ void register_server_types() { ClassDB::register_virtual_class(); ClassDB::register_virtual_class(); - ClassDB::register_virtual_class(); ClassDB::register_class(); ClassDB::register_class(); ClassDB::register_class(); ClassDB::register_virtual_class(); ClassDB::register_virtual_class(); - ClassDB::register_virtual_class(); ClassDB::register_class(); ScriptDebuggerRemote::resource_usage_func = _debugger_get_resource_usage;