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

Merge pull request #76088 from rburing/contact_points_global_3d 

PhysicsDirectBodyState3D: report contact points using global coordinates
This commit is contained in:
Rémi Verschelde 2023-05-10 09:09:17 +02:00 committed by GitHub
parent 081808be49 15b8cb9d9c
commit 769d8a7bbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/classes/PhysicsDirectBodyState2D.xml
View File

@ -127,7 +127,7 @@
<return type="Vector2" />
<param index="0" name="contact_idx" type="int" />
<description>
Returns the contact position in the collider.
Returns the position of the contact point on the collider in the global coordinate system.
</description>
</method>
<method name="get_contact_collider_shape" qualifiers="const">
@ -169,7 +169,7 @@
<return type="Vector2" />
<param index="0" name="contact_idx" type="int" />
<description>
Returns the local position of the contact point.
Returns the position of the contact point on the body in the global coordinate system.
</description>
</method>
<method name="get_contact_local_shape" qualifiers="const">

4
doc/classes/PhysicsDirectBodyState3D.xml
View File

@ -127,7 +127,7 @@
<return type="Vector3" />
<param index="0" name="contact_idx" type="int" />
<description>
Returns the contact position in the collider.
Returns the position of the contact point on the collider in the global coordinate system.
</description>
</method>
<method name="get_contact_collider_shape" qualifiers="const">
@ -169,7 +169,7 @@
<return type="Vector3" />
<param index="0" name="contact_idx" type="int" />
<description>
Returns the local position of the contact point.
Returns the position of the contact point on the body in the global coordinate system.
</description>
</method>
<method name="get_contact_local_shape" qualifiers="const">

8
servers/physics_3d/godot_body_pair_3d.cpp
View File

@ -354,6 +354,8 @@ bool GodotBodyPair3D::pre_solve(real_t p_step) {
bool do_process = false;
const Vector3 &offset_A = A->get_transform().get_origin();
const Basis &basis_A = A->get_transform().basis;
const Basis &basis_B = B->get_transform().basis;
@ -382,7 +384,6 @@ bool GodotBodyPair3D::pre_solve(real_t p_step) {
#ifdef DEBUG_ENABLED
if (space->is_debugging_contacts()) {
const Vector3 &offset_A = A->get_transform().get_origin();
space->add_debug_contact(global_A + offset_A);
space->add_debug_contact(global_B + offset_A);
}
@ -410,14 +411,13 @@ bool GodotBodyPair3D::pre_solve(real_t p_step) {
if (A->can_report_contacts() || B->can_report_contacts()) {
Vector3 crB = B->get_angular_velocity().cross(c.rB) + B->get_linear_velocity();
Vector3 crA = A->get_angular_velocity().cross(c.rA) + A->get_linear_velocity();
Vector3 wlB = global_B - offset_B;
if (A->can_report_contacts()) {
A->add_contact(global_A, -c.normal, depth, shape_A, crA, wlB, shape_B, B->get_instance_id(), B->get_self(), crB, c.acc_impulse);
A->add_contact(global_A + offset_A, -c.normal, depth, shape_A, crA, global_B + offset_A, shape_B, B->get_instance_id(), B->get_self(), crB, c.acc_impulse);
}
if (B->can_report_contacts()) {
B->add_contact(wlB, c.normal, depth, shape_B, crB, global_A, shape_A, A->get_instance_id(), A->get_self(), crA, -c.acc_impulse);
B->add_contact(global_B + offset_A, c.normal, depth, shape_B, crB, global_A + offset_A, shape_A, A->get_instance_id(), A->get_self(), crA, -c.acc_impulse);
}
}