diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-09-20 16:06:56 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-09-20 16:06:56 +0200 |
| commit | 5070db2575ed7c77e8fcd5acd422fc7613300a61 (patch) | |
| tree | 8b32a45d7082949ba7cda3c1ee8e52049bcd8dd6 | |
| parent | 2834342a78bcdd5d0219839859b4a7baa513326c (diff) | |
| parent | 3bfadeff25c5d86a65a17ee172465e626c9741ba (diff) | |
| download | redot-engine-5070db2575ed7c77e8fcd5acd422fc7613300a61.tar.gz | |
Merge pull request #97208 from kleonc/transform3d_aabb_multiplication_fix_csharp
Fix C# `operator *(Transform3D, Aabb)`
| -rw-r--r-- | core/math/basis.h | 8 | ||||
| -rw-r--r-- | modules/mono/glue/GodotSharp/GodotSharp/Core/Transform3D.cs | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/core/math/basis.h b/core/math/basis.h index 5c1a5fbdda..236d666103 100644 --- a/core/math/basis.h +++ b/core/math/basis.h @@ -41,11 +41,11 @@ struct [[nodiscard]] Basis { Vector3(0, 0, 1) }; - _FORCE_INLINE_ const Vector3 &operator[](int p_axis) const { - return rows[p_axis]; + _FORCE_INLINE_ const Vector3 &operator[](int p_row) const { + return rows[p_row]; } - _FORCE_INLINE_ Vector3 &operator[](int p_axis) { - return rows[p_axis]; + _FORCE_INLINE_ Vector3 &operator[](int p_row) { + return rows[p_row]; } void invert(); diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Transform3D.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Transform3D.cs index 0f534d477f..0dc143edea 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Transform3D.cs +++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Transform3D.cs @@ -468,8 +468,8 @@ namespace Godot { for (int j = 0; j < 3; j++) { - real_t e = transform.Basis[i][j] * min[j]; - real_t f = transform.Basis[i][j] * max[j]; + real_t e = transform.Basis[j][i] * min[j]; + real_t f = transform.Basis[j][i] * max[j]; if (e < f) { tmin[i] += e; |