diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-06-20 11:44:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-20 11:44:56 +0200 |
| commit | 671bd64e4a9984a6a308bc97d6de2eb3bc32fad8 (patch) | |
| tree | 8a4b1142bccb4264245430abee26b999bc6d9c9e /editor | |
| parent | 4fcc5891450a7dca9c8ebae6ff3765f5f060c442 (diff) | |
| parent | 45c24fd039f237fa9eed03d06ccf8b3738b223e3 (diff) | |
Merge pull request #49754 from aaronfranke/is-eq-approx-sub-opt
Fix sub-optimal uses of is_equal_approx
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/import/editor_import_collada.cpp | 4 | ||||
| -rw-r--r-- | editor/import/scene_importer_mesh.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/editor/import/editor_import_collada.cpp b/editor/import/editor_import_collada.cpp index 89731c8b7a..ddf89f077b 100644 --- a/editor/import/editor_import_collada.cpp +++ b/editor/import/editor_import_collada.cpp @@ -1544,7 +1544,7 @@ void ColladaImport::create_animation(int p_clip, bool p_make_tracks_in_all_bones } Vector3 s = xform.basis.get_scale(); - bool singular_matrix = Math::is_equal_approx(s.x, 0.0f) || Math::is_equal_approx(s.y, 0.0f) || Math::is_equal_approx(s.z, 0.0f); + bool singular_matrix = Math::is_zero_approx(s.x) || Math::is_zero_approx(s.y) || Math::is_zero_approx(s.z); Quaternion q = singular_matrix ? Quaternion() : xform.basis.get_rotation_quaternion(); Vector3 l = xform.origin; @@ -1595,7 +1595,7 @@ void ColladaImport::create_animation(int p_clip, bool p_make_tracks_in_all_bones xform = sk->get_bone_rest(nm.bone).affine_inverse() * xform; Vector3 s = xform.basis.get_scale(); - bool singular_matrix = Math::is_equal_approx(s.x, 0.0f) || Math::is_equal_approx(s.y, 0.0f) || Math::is_equal_approx(s.z, 0.0f); + bool singular_matrix = Math::is_zero_approx(s.x) || Math::is_zero_approx(s.y) || Math::is_zero_approx(s.z); Quaternion q = singular_matrix ? Quaternion() : xform.basis.get_rotation_quaternion(); Vector3 l = xform.origin; diff --git a/editor/import/scene_importer_mesh.cpp b/editor/import/scene_importer_mesh.cpp index e37be1d435..7a28677481 100644 --- a/editor/import/scene_importer_mesh.cpp +++ b/editor/import/scene_importer_mesh.cpp @@ -224,7 +224,7 @@ void EditorSceneImporterMesh::generate_lods() { } Surface::LOD lod; lod.distance = mesh_error; - if (Math::is_equal_approx(mesh_error, 0.0f)) { + if (Math::is_zero_approx(mesh_error)) { break; } if (new_len <= 0) { |