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

Merge pull request #18868 from bruvzg/clang_6_workaround 

Workaround for clang 6.0.0 / Xcode 9.3 release (-O3) build bug.
This commit is contained in:
Rémi Verschelde 2018-05-16 23:16:43 +02:00 committed by GitHub
parent a404ceb128 b68222e4e7
commit 97b1e8b517
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
servers/physics/collision_solver_sat.cpp
View File

@ -341,26 +341,26 @@ public:
min_B -= (max_A - min_A) * 0.5; min_B -= (max_A - min_A) * 0.5;
max_B += (max_A - min_A) * 0.5; max_B += (max_A - min_A) * 0.5;
real_t dmin = min_B - (min_A + max_A) * 0.5; min_B -= (min_A + max_A) * 0.5;
real_t dmax = max_B - (min_A + max_A) * 0.5; max_B -= (min_A + max_A) * 0.5;
if (dmin > 0.0 || dmax < 0.0) { if (min_B > 0.0 || max_B < 0.0) {
separator_axis = axis; separator_axis = axis;
return false; // doesn't contain 0 return false; // doesn't contain 0
} }
//use the smallest depth //use the smallest depth
dmin = Math::abs(dmin); min_B = -min_B;
if (dmax < dmin) { if (max_B < min_B) {
if (dmax < best_depth) { if (max_B < best_depth) {
best_depth = dmax; best_depth = max_B;
best_axis = axis; best_axis = axis;
} }
} else { } else {
if (dmin < best_depth) { if (min_B < best_depth) {
best_depth = dmin; best_depth = min_B;
best_axis = -axis; // keep it as A axis best_axis = -axis; // keep it as A axis
} }
} }