diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-10 13:06:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-10 13:06:55 +0200 |
| commit | 9cc67b19b8803adf3cb12364f1e3faade7553ebb (patch) | |
| tree | e4741393cf3a0dd288bc2096c97471ea595340b0 /servers/physics_3d/collision_solver_3d_sat.cpp | |
| parent | 2d8d311b1280c78e1ae70900186d5ae22a488828 (diff) | |
| parent | ec7b481170dcd6a7b4cf0e6c1221e204ff7945f3 (diff) | |
Merge pull request #38613 from MCrafterzz/plane
Renamed plane's d to distance
Diffstat (limited to 'servers/physics_3d/collision_solver_3d_sat.cpp')
| -rw-r--r-- | servers/physics_3d/collision_solver_3d_sat.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/physics_3d/collision_solver_3d_sat.cpp b/servers/physics_3d/collision_solver_3d_sat.cpp index 5096b080ab..d663209f6d 100644 --- a/servers/physics_3d/collision_solver_3d_sat.cpp +++ b/servers/physics_3d/collision_solver_3d_sat.cpp @@ -194,7 +194,7 @@ static void _generate_contacts_face_face(const Vector3 *p_points_A, int p_point_ // calculate intersection Vector3 rel = edge1_A - edge0_A; real_t den = clip.normal.dot(rel); - real_t dist = -(clip.normal.dot(edge0_A) - clip.d) / den; + real_t dist = -(clip.normal.dot(edge0_A) - clip.distance) / den; Vector3 inters = edge0_A + rel * dist; ERR_FAIL_COND(dst_idx >= max_clip); |