Merge pull request #16326 from NathanWarden/fix_basis_mono

[Mono] Basis values now marshalled in the correct order.
godotengine · Feb 18, 2018 · 6e200b1 · 6e200b1
2 parents dad47d8 + 0cc4de1
commit 6e200b1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/modules/mono/glue/cs_files/Basis.cs b/modules/mono/glue/cs_files/Basis.cs
@@ -452,9 +452,9 @@ public Basis(Vector3 xAxis, Vector3 yAxis, Vector3 zAxis)
 
         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
@@ -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(                                   \