diff options
| author | Nathan Warden | 2018-02-02 16:45:30 -0500 |
|---|---|---|
| committer | Hein-Pieter van Braam | 2018-02-19 22:13:45 +0100 |
| commit | 9173819b71cb33709454299d03bd8b9cbaf9ba63 (patch) | |
| tree | cc6cb4088e7d64f74c14c69f4cb4d0d2670e35d4 /modules | |
| parent | 8787850286ab1f04b4fbe5a5f2fe5a72b130775d (diff) | |
| download | godot-9173819b71cb33709454299d03bd8b9cbaf9ba63.tar.gz godot-9173819b71cb33709454299d03bd8b9cbaf9ba63.tar.zst godot-9173819b71cb33709454299d03bd8b9cbaf9ba63.zip | |
[Mono] Basis values now marshalled in the correct order.
(cherry picked from commit 0cc4de1f24bf1fee89cb64cd11ae245be0ea3d98)
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/mono/glue/cs_files/Basis.cs | 6 | ||||
| -rw-r--r-- | modules/mono/mono_gd/gd_mono_marshal.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/mono/glue/cs_files/Basis.cs b/modules/mono/glue/cs_files/Basis.cs index ea92b1641..c6cdc069e 100644 --- a/modules/mono/glue/cs_files/Basis.cs +++ b/modules/mono/glue/cs_files/Basis.cs @@ -452,9 +452,9 @@ namespace Godot public Basis(float xx, float xy, float xz, float yx, float yy, float yz, float zx, float zy, float zz) { - this.x = new Vector3(xx, xy, xz); - this.y = new Vector3(yx, yy, yz); - this.z = new Vector3(zx, zy, zz); + this.x = new Vector3(xx, yx, zx); + this.y = new Vector3(xy, yy, zy); + this.z = new Vector3(xz, yz, zz); } public static Basis operator *(Basis left, Basis right) diff --git a/modules/mono/mono_gd/gd_mono_marshal.h b/modules/mono/mono_gd/gd_mono_marshal.h index 6572408ab..8fd437223 100644 --- a/modules/mono/mono_gd/gd_mono_marshal.h +++ b/modules/mono/mono_gd/gd_mono_marshal.h @@ -195,9 +195,9 @@ Dictionary mono_object_to_Dictionary(MonoObject *p_dict); // Transform #define MARSHALLED_OUT_Transform(m_in, m_out) real_t m_out[12] = { \ - m_in.basis[0].x, m_in.basis[0].y, m_in.basis[0].z, \ - m_in.basis[1].x, m_in.basis[1].y, m_in.basis[1].z, \ - m_in.basis[2].x, m_in.basis[2].y, m_in.basis[2].z, \ + m_in.basis[0].x, m_in.basis[1].x, m_in.basis[2].x, \ + m_in.basis[0].y, m_in.basis[1].y, m_in.basis[2].y, \ + m_in.basis[0].z, m_in.basis[1].z, m_in.basis[2].z, \ m_in.origin.x, m_in.origin.y, m_in.origin.z \ }; #define MARSHALLED_IN_Transform(m_in, m_out) Transform m_out( \ |