diff options
| author | David Snopek <dsnopek@gmail.com> | 2024-06-25 09:42:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-25 09:42:55 -0500 |
| commit | 7d7799b56ed7dfdae1454f246a98cf35601cc053 (patch) | |
| tree | 5f6385831fb7de70386c761907d9f4eb023155f6 /src/variant | |
| parent | 90c6ea2a126a4238d87b3f9472ca16cf84e76102 (diff) | |
| parent | e0d363aad8e2204fe8ca4b6937ef2ad74a7b293b (diff) | |
| download | redot-cpp-7d7799b56ed7dfdae1454f246a98cf35601cc053.tar.gz | |
Merge pull request #1504 from Repiteo/pre-commit-hooks
Replace legacy hooks with `pre-commit` Python tool
Diffstat (limited to 'src/variant')
| -rw-r--r-- | src/variant/basis.cpp | 2 | ||||
| -rw-r--r-- | src/variant/color.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/variant/basis.cpp b/src/variant/basis.cpp index 8d4176e..200cd06 100644 --- a/src/variant/basis.cpp +++ b/src/variant/basis.cpp @@ -816,7 +816,7 @@ void Basis::get_axis_angle(Vector3 &r_axis, real_t &r_angle) const { return; } // As we have reached here there are no singularities so we can handle normally. - double s = Math::sqrt((rows[2][1] - rows[1][2]) * (rows[2][1] - rows[1][2]) + (rows[0][2] - rows[2][0]) * (rows[0][2] - rows[2][0]) + (rows[1][0] - rows[0][1]) * (rows[1][0] - rows[0][1])); // Used to normalise. + double s = Math::sqrt((rows[2][1] - rows[1][2]) * (rows[2][1] - rows[1][2]) + (rows[0][2] - rows[2][0]) * (rows[0][2] - rows[2][0]) + (rows[1][0] - rows[0][1]) * (rows[1][0] - rows[0][1])); // Used to normalize. if (Math::abs(s) < CMP_EPSILON) { // Prevent divide by zero, should not happen if matrix is orthogonal and should be caught by singularity test above. diff --git a/src/variant/color.cpp b/src/variant/color.cpp index 28224a2..4e3b870 100644 --- a/src/variant/color.cpp +++ b/src/variant/color.cpp @@ -192,7 +192,7 @@ void Color::set_hsv(float p_h, float p_s, float p_v, float p_alpha) { a = p_alpha; if (p_s == 0.0f) { - // Achromatic (grey) + // Achromatic (gray) r = g = b = p_v; return; } |