godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Expose max_axis_index and max_axis_index for Vector2(i)

Browse Source 
Some cleanup with Vector3(i)'s methods so that it is consistent with Vector2, for example it returns enums internally (GDScript still gets ints).
This commit is contained in:
Aaron Franke
2019-11-28 03:48:51 -05:00
parent 543462eb29
commit 24f57886d0
18 changed files with 119 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/math/convex_hull.cpp
View File

@@ -606,9 +606,9 @@ private:
PagedAllocator<Face> face_pool;
LocalVector<Vertex *> original_vertices;
int32_t merge_stamp = 0;
int32_t min_axis = 0;
int32_t med_axis = 0;
int32_t max_axis = 0;
Vector3::Axis min_axis = Vector3::Axis::AXIS_X;
Vector3::Axis med_axis = Vector3::Axis::AXIS_X;
Vector3::Axis max_axis = Vector3::Axis::AXIS_X;
int32_t used_edge_pairs = 0;
int32_t max_used_edge_pairs = 0;
@@ -1585,12 +1585,12 @@ void ConvexHullInternal::compute(const Vector3 *p_coords, int32_t p_count) {
}
Vector3 s = aabb.size;
max_axis = s.max_axis();
min_axis = s.min_axis();
max_axis = s.max_axis_index();
min_axis = s.min_axis_index();
if (min_axis == max_axis) {
min_axis = (max_axis + 1) % 3;
min_axis = Vector3::Axis((max_axis + 1) % 3);
}
med_axis = 3 - max_axis - min_axis;
med_axis = Vector3::Axis(3 - max_axis - min_axis);
s /= real_t(10216);
if (((med_axis + 1) % 3) != max_axis) {