diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-01-13 16:10:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-13 16:10:44 +0100 |
| commit | 0b409d89d04d4cfed9fb559df8a3b379aba6ea2b (patch) | |
| tree | 4e753cc811a27180dc88d7fadfdb1cf937b799ac /scene/3d/gpu_particles_collision_3d.cpp | |
| parent | 59495adb7c4b4dc2374a4a4d8cd0360ccf293a32 (diff) | |
| parent | af878716f2620fb9142b960253dc82f60ab23df2 (diff) | |
| download | redot-engine-0b409d89d04d4cfed9fb559df8a3b379aba6ea2b.tar.gz | |
Merge pull request #45136 from akien-mga/clang-format-11
CI: Update to clang-format 11 and apply ternary operator changes
Diffstat (limited to 'scene/3d/gpu_particles_collision_3d.cpp')
| -rw-r--r-- | scene/3d/gpu_particles_collision_3d.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/3d/gpu_particles_collision_3d.cpp b/scene/3d/gpu_particles_collision_3d.cpp index 145b5afbd0..97241be60f 100644 --- a/scene/3d/gpu_particles_collision_3d.cpp +++ b/scene/3d/gpu_particles_collision_3d.cpp @@ -293,11 +293,11 @@ void GPUParticlesCollisionSDF::_find_closest_distance(const Vector3 &p_pos, cons SGN(cb.cross(nor).dot(pb)) + SGN(ac.cross(nor).dot(pc)) < 2.0) ? - MIN(MIN( + MIN(MIN( Vector3_dot2(ba * CLAMP(ba.dot(pa) / Vector3_dot2(ba), 0.0, 1.0) - pa), Vector3_dot2(cb * CLAMP(cb.dot(pb) / Vector3_dot2(cb), 0.0, 1.0) - pb)), Vector3_dot2(ac * CLAMP(ac.dot(pc) / Vector3_dot2(ac), 0.0, 1.0) - pc)) : - nor.dot(pa) * nor.dot(pa) / Vector3_dot2(nor)); + nor.dot(pa) * nor.dot(pa) / Vector3_dot2(nor)); closest_distance = MIN(closest_distance, inside_d); } |
