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

Merge pull request #44543 from Exxion/GD3D-collisions 

Fixes collisions in Godot 3D physics
This commit is contained in:
Rémi Verschelde 2020-12-20 17:35:54 +01:00 committed by GitHub
parent fc4d90e70d 583ab9ce7a
commit d3ff3dc6ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
servers/physics_3d/body_pair_3d_sw.cpp
View File

@ -367,8 +367,8 @@ void BodyPair3DSW::solve(real_t p_step) {
Vector3 jb = c.normal * (c.acc_bias_impulse - jbnOld);
A->apply_bias_impulse(c.rA + A->get_center_of_mass(), -jb, MAX_BIAS_ROTATION / p_step);
B->apply_bias_impulse(c.rB + B->get_center_of_mass(), jb, MAX_BIAS_ROTATION / p_step);
A->apply_bias_impulse(-jb, c.rA + A->get_center_of_mass(), MAX_BIAS_ROTATION / p_step);
B->apply_bias_impulse(jb, c.rB + B->get_center_of_mass(), MAX_BIAS_ROTATION / p_step);
crbA = A->get_biased_angular_velocity().cross(c.rA);
crbB = B->get_biased_angular_velocity().cross(c.rB);
@ -383,8 +383,8 @@ void BodyPair3DSW::solve(real_t p_step) {
Vector3 jb_com = c.normal * (c.acc_bias_impulse_center_of_mass - jbnOld_com);
A->apply_bias_impulse(A->get_center_of_mass(), -jb_com, 0.0f);
B->apply_bias_impulse(B->get_center_of_mass(), jb_com, 0.0f);
A->apply_bias_impulse(-jb_com, A->get_center_of_mass(), 0.0f);
B->apply_bias_impulse(jb_com, B->get_center_of_mass(), 0.0f);
}
c.active = true;