diff options
| author | kleonc <9283098+kleonc@users.noreply.github.com> | 2024-09-20 00:18:54 +0200 |
|---|---|---|
| committer | Spartan322 <Megacake1234@gmail.com> | 2024-11-01 18:10:51 -0400 |
| commit | 00ee33b2f9efdcf28c690501593f76ed38a609f5 (patch) | |
| tree | c31184a0f6b9aeda0ae65fb15524e582d109093d | |
| parent | 6d320063717c02cab8b1eb81ccbbfe204946ced8 (diff) | |
| download | redot-engine-00ee33b2f9efdcf28c690501593f76ed38a609f5.tar.gz | |
Fix C# operator *(Transform3D, AABB)
(cherry picked from commit 3bfadeff25c5d86a65a17ee172465e626c9741ba)
| -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 3155f83a04..857e851e1d 100644 --- a/core/math/basis.h +++ b/core/math/basis.h @@ -43,11 +43,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; |