aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorHein-Pieter van Braam2018-02-27 16:00:41 +0100
committerHein-Pieter van Braam2018-02-27 17:52:18 +0100
commit4e1d19b20ca405e3574f9fdcb49ec1333e618b2b (patch)
treec58154be0079f25d80e0a409033c5cbcf2f96618 /modules
parentd7430ef0774a169bdb9be7f0c54586ec0b0c7d92 (diff)
downloadgodot-4e1d19b20ca405e3574f9fdcb49ec1333e618b2b.tar.gz
godot-4e1d19b20ca405e3574f9fdcb49ec1333e618b2b.tar.zst
godot-4e1d19b20ca405e3574f9fdcb49ec1333e618b2b.zip
Revert "[Mono] Basis values now marshalled in the correct order."
This reverts commit 9173819b71cb33709454299d03bd8b9cbaf9ba63. The fixes for these issues aren't quite baked yet. Taking them out of 3.0.2
Diffstat (limited to 'modules')
-rw-r--r--modules/mono/glue/cs_files/Basis.cs6
-rw-r--r--modules/mono/mono_gd/gd_mono_marshal.h6
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 c6cdc069e..ea92b1641 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, yx, zx);
- this.y = new Vector3(xy, yy, zy);
- this.z = new Vector3(xz, yz, zz);
+ this.x = new Vector3(xx, xy, xz);
+ this.y = new Vector3(yx, yy, yz);
+ this.z = new Vector3(zx, zy, 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 8fd437223..6572408ab 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[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.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.origin.x, m_in.origin.y, m_in.origin.z \
};
#define MARSHALLED_IN_Transform(m_in, m_out) Transform m_out( \