godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #50101 from nekomatata/remove-shape-query-result-3.x 

[3.x] Remove unused PhysicsShapeQueryResult & Physics2DShapeQueryResult
This commit is contained in:
Rémi Verschelde 2021-07-05 21:08:39 +02:00 committed by GitHub
parent 19359a9654 9eb6a43cff
commit 153b67419f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 2 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/classes/Physics2DShapeQueryParameters.xml
View File

@ -4,7 +4,7 @@
Parameters to be sent to a 2D shape physics query.
</brief_description>
<description>
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.
</description>
<tutorials>
</tutorials>

58
doc/classes/Physics2DShapeQueryResult.xml
View File

@ -1,58 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<class name="Physics2DShapeQueryResult" inherits="Reference" version="3.4">
<brief_description>
Result of a 2D shape query in [Physics2DServer].
</brief_description>
<description>
The result of a 2D shape query in [Physics2DServer]. See also [Physics2DShapeQueryParameters].
</description>
<tutorials>
</tutorials>
<methods>
<method name="get_result_count" qualifiers="const">
<return type="int">
</return>
<description>
Returns the number of objects that intersected with the shape.
</description>
</method>
<method name="get_result_object" qualifiers="const">
<return type="Object">
</return>
<argument index="0" name="idx" type="int">
</argument>
<description>
Returns the [Object] that intersected with the shape at index [code]idx[/code].
</description>
</method>
<method name="get_result_object_id" qualifiers="const">
<return type="int">
</return>
<argument index="0" name="idx" type="int">
</argument>
<description>
Returns the instance ID of the [Object] that intersected with the shape at index [code]idx[/code].
</description>
</method>
<method name="get_result_object_shape" qualifiers="const">
<return type="int">
</return>
<argument index="0" name="idx" type="int">
</argument>
<description>
Returns the child index of the object's [Shape] that intersected with the shape at index [code]idx[/code].
</description>
</method>
<method name="get_result_rid" qualifiers="const">
<return type="RID">
</return>
<argument index="0" name="idx" type="int">
</argument>
<description>
Returns the [RID] of the object that intersected with the shape at index [code]idx[/code].
</description>
</method>
</methods>
<constants>
</constants>
</class>

2
doc/classes/PhysicsShapeQueryParameters.xml
View File

@ -4,7 +4,7 @@
Parameters to be sent to a 3D shape physics query.
</brief_description>
<description>
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.
</description>
<tutorials>
</tutorials>

58
doc/classes/PhysicsShapeQueryResult.xml
View File

@ -1,58 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<class name="PhysicsShapeQueryResult" inherits="Reference" version="3.4">
<brief_description>
Result of a 3D shape query in [PhysicsServer].
</brief_description>
<description>
The result of a 3D shape query in [PhysicsServer]. See also [PhysicsShapeQueryParameters].
</description>
<tutorials>
</tutorials>
<methods>
<method name="get_result_count" qualifiers="const">
<return type="int">
</return>
<description>
Returns the number of objects that intersected with the shape.
</description>
</method>
<method name="get_result_object" qualifiers="const">
<return type="Object">
</return>
<argument index="0" name="idx" type="int">
</argument>
<description>
Returns the [Object] that intersected with the shape at index [code]idx[/code].
</description>
</method>
<method name="get_result_object_id" qualifiers="const">
<return type="int">
</return>
<argument index="0" name="idx" type="int">
</argument>
<description>
Returns the instance ID of the [Object] that intersected with the shape at index [code]idx[/code].
</description>
</method>
<method name="get_result_object_shape" qualifiers="const">
<return type="int">
</return>
<argument index="0" name="idx" type="int">
</argument>
<description>
Returns the child index of the object's [Shape] that intersected with the shape at index [code]idx[/code].
</description>
</method>
<method name="get_result_rid" qualifiers="const">
<return type="RID">
</return>
<argument index="0" name="idx" type="int">
</argument>
<description>
Returns the [RID] of the object that intersected with the shape at index [code]idx[/code].
</description>
</method>
</methods>
<constants>
</constants>
</class>

27
servers/physics_2d_server.cpp
View File

@ -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 {

22
servers/physics_2d_server.h
View File

@ -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<Physics2DDirectSpaceState::ShapeResult> 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 {

27
servers/physics_server.cpp
View File

@ -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 {

22
servers/physics_server.h
View File

@ -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<PhysicsDirectSpaceState::ShapeResult> 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 {

2
servers/register_server_types.cpp
View File

@ -175,14 +175,12 @@ void register_server_types() {
ClassDB::register_virtual_class<Physics2DDirectBodyState>();
ClassDB::register_virtual_class<Physics2DDirectSpaceState>();
ClassDB::register_virtual_class<Physics2DShapeQueryResult>();
ClassDB::register_class<Physics2DTestMotionResult>();
ClassDB::register_class<Physics2DShapeQueryParameters>();
ClassDB::register_class<PhysicsShapeQueryParameters>();
ClassDB::register_virtual_class<PhysicsDirectBodyState>();
ClassDB::register_virtual_class<PhysicsDirectSpaceState>();
ClassDB::register_virtual_class<PhysicsShapeQueryResult>();
ClassDB::register_class<PhysicsTestMotionResult>();
ScriptDebuggerRemote::resource_usage_func = _debugger_get_resource_usage;