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

Merge pull request #56071 from great90/master

This commit is contained in:
Rémi Verschelde 2021-12-20 10:08:51 +01:00 committed by GitHub
parent 8485d0c53a 10c91f8116
commit 1e3d896d19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/math/aabb.cpp
View File

@ -286,14 +286,14 @@ int AABB::get_longest_axis_index() const {
Vector3 AABB::get_shortest_axis() const { Vector3 AABB::get_shortest_axis() const {
Vector3 axis(1, 0, 0); Vector3 axis(1, 0, 0);
real_t max_size = size.x; real_t min_size = size.x;
if (size.y < max_size) { if (size.y < min_size) {
axis = Vector3(0, 1, 0); axis = Vector3(0, 1, 0);
max_size = size.y; min_size = size.y;
} }
if (size.z < max_size) { if (size.z < min_size) {
axis = Vector3(0, 0, 1); axis = Vector3(0, 0, 1);
} }
@ -302,14 +302,14 @@ Vector3 AABB::get_shortest_axis() const {
int AABB::get_shortest_axis_index() const { int AABB::get_shortest_axis_index() const {
int axis = 0; int axis = 0;
real_t max_size = size.x; real_t min_size = size.x;
if (size.y < max_size) { if (size.y < min_size) {
axis = 1; axis = 1;
max_size = size.y; min_size = size.y;
} }
if (size.z < max_size) { if (size.z < min_size) {
axis = 2; axis = 2;
} }