asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #97208 from kleonc/transform3d_aabb_multiplication_fix_csharp

Browse source 
Fix C# `operator *(Transform3D, Aabb)`
This commit is contained in:
Rémi Verschelde 2024-09-20 16:06:56 +02:00
commit 5070db2575
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/math/basis.h
View file

@ -41,11 +41,11 @@ struct [[nodiscard]] Basis {
Vector3(0, 0, 1) Vector3(0, 0, 1)
}; };
_FORCE_INLINE_ const Vector3 &operator[](int p_axis) const { _FORCE_INLINE_ const Vector3 &operator[](int p_row) const {
return rows[p_axis]; return rows[p_row];
} }
_FORCE_INLINE_ Vector3 &operator[](int p_axis) { _FORCE_INLINE_ Vector3 &operator[](int p_row) {
return rows[p_axis]; return rows[p_row];
} }
void invert(); void invert();

4
modules/mono/glue/GodotSharp/GodotSharp/Core/Transform3D.cs
View file

@ -468,8 +468,8 @@ namespace Godot
{ {
for (int j = 0; j < 3; j++) for (int j = 0; j < 3; j++)
{ {
real_t e = transform.Basis[i][j] * min[j]; real_t e = transform.Basis[j][i] * min[j];
real_t f = transform.Basis[i][j] * max[j]; real_t f = transform.Basis[j][i] * max[j];
if (e < f) if (e < f)
{ {
tmin[i] += e; tmin[i] += e;