5 files changed, 45 insertions, 26 deletions
diff --git a/modules/mono/glue/Managed/Files/Basis.cs b/modules/mono/glue/Managed/Files/Basis.cs
index d02dbe545f..9cc31a0557 100644
--- a/modules/mono/glue/Managed/Files/Basis.cs
+++ b/modules/mono/glue/Managed/Files/Basis.cs
@@ -575,31 +575,29 @@ namespace Godot
 
         public Basis(Vector3 axis, real_t phi)
         {
-            var axis_sq = new Vector3(axis.x * axis.x, axis.y * axis.y, axis.z * axis.z);
-
+            Vector3 axisSq = new Vector3(axis.x * axis.x, axis.y * axis.y, axis.z * axis.z);
             real_t cosine = Mathf.Cos(phi);
-            real_t sine = Mathf.Sin(phi);
-
-            Row0 = new Vector3
-            (
-                axis_sq.x + cosine * (1.0f - axis_sq.x),
-                axis.x * axis.y * (1.0f - cosine) - axis.z * sine,
-                axis.z * axis.x * (1.0f - cosine) + axis.y * sine
-            );
+            Row0.x = axisSq.x + cosine * (1.0f - axisSq.x);
+            Row1.y = axisSq.y + cosine * (1.0f - axisSq.y);
+            Row2.z = axisSq.z + cosine * (1.0f - axisSq.z);
 
-            Row1 = new Vector3
-            (
-                axis.x * axis.y * (1.0f - cosine) + axis.z * sine,
-                axis_sq.y + cosine * (1.0f - axis_sq.y),
-                axis.y * axis.z * (1.0f - cosine) - axis.x * sine
-            );
-
-            Row2 = new Vector3
-            (
-                axis.z * axis.x * (1.0f - cosine) - axis.y * sine,
-                axis.y * axis.z * (1.0f - cosine) + axis.x * sine,
-                axis_sq.z + cosine * (1.0f - axis_sq.z)
-            );
+            real_t sine = Mathf.Sin(phi);
+            real_t t = 1.0f - cosine;
+
+            real_t xyzt = axis.x * axis.y * t;
+            real_t zyxs = axis.z * sine;
+            Row0.y = xyzt - zyxs;
+            Row1.x = xyzt + zyxs;
+
+            xyzt = axis.x * axis.z * t;
+            zyxs = axis.y * sine;
+            Row0.z = xyzt + zyxs;
+            Row2.x = xyzt - zyxs;
+
+            xyzt = axis.y * axis.z * t;
+            zyxs = axis.x * sine;
+            Row1.z = xyzt - zyxs;
+            Row2.y = xyzt + zyxs;
         }
 
         public Basis(Vector3 column0, Vector3 column1, Vector3 column2)
diff --git a/modules/mono/glue/Managed/Files/Mathf.cs b/modules/mono/glue/Managed/Files/Mathf.cs
index ff26c7fddf..2d8c63fe7f 100644
--- a/modules/mono/glue/Managed/Files/Mathf.cs
+++ b/modules/mono/glue/Managed/Files/Mathf.cs
@@ -44,9 +44,9 @@ namespace Godot
             return (real_t)Math.Atan(s);
         }
 
-        public static real_t Atan2(real_t x, real_t y)
+        public static real_t Atan2(real_t y, real_t x)
         {
-            return (real_t)Math.Atan2(x, y);
+            return (real_t)Math.Atan2(y, x);
         }
 
         public static Vector2 Cartesian2Polar(real_t x, real_t y)
@@ -210,6 +210,11 @@ namespace Godot
             return a < b ? a : b;
         }
 
+        public static real_t MoveToward(real_t from, real_t to, real_t delta)
+        {
+            return Abs(to - from) <= delta ? to : from + Sign(to - from) * delta;
+        }
+
         public static int NearestPo2(int value)
         {
             value--;
diff --git a/modules/mono/glue/Managed/Files/Vector2.cs b/modules/mono/glue/Managed/Files/Vector2.cs
index bb1950e1a8..a7f26283a7 100644
--- a/modules/mono/glue/Managed/Files/Vector2.cs
+++ b/modules/mono/glue/Managed/Files/Vector2.cs
@@ -186,6 +186,14 @@ namespace Godot
             return res;
         }
 
+        public Vector2 MoveToward(Vector2 to, real_t delta)
+        {
+            var v = this;
+            var vd = to - v;
+            var len = vd.Length();
+            return len <= delta || len < Mathf.Epsilon ? to : v + vd / len * delta;
+        }
+
         public Vector2 Normalized()
         {
             var v = this;
diff --git a/modules/mono/glue/Managed/Files/Vector3.cs b/modules/mono/glue/Managed/Files/Vector3.cs
index 283cb6341a..16803ae55c 100644
--- a/modules/mono/glue/Managed/Files/Vector3.cs
+++ b/modules/mono/glue/Managed/Files/Vector3.cs
@@ -190,6 +190,14 @@ namespace Godot
             );
         }
 
+        public Vector3 MoveToward(Vector3 to, real_t delta)
+        {
+            var v = this;
+            var vd = to - v;
+            var len = vd.Length();
+            return len <= delta || len < Mathf.Epsilon ? to : v + vd / len * delta;
+        }
+
         public Axis MaxAxis()
         {
             return x < y ? (y < z ? Axis.Z : Axis.Y) : (x < z ? Axis.Z : Axis.X);
diff --git a/modules/mono/glue/base_object_glue.cpp b/modules/mono/glue/base_object_glue.cpp
index 7385014a53..75b2dfce9a 100644
--- a/modules/mono/glue/base_object_glue.cpp
+++ b/modules/mono/glue/base_object_glue.cpp
@@ -166,7 +166,7 @@ MonoArray *godot_icall_DynamicGodotObject_SetMemberList(Object *p_ptr) {
 	int i = 0;
 	for (List<PropertyInfo>::Element *E = property_list.front(); E; E = E->next()) {
 		MonoString *boxed = GDMonoMarshal::mono_string_from_godot(E->get().name);
-		mono_array_set(result, MonoString *, i, boxed);
+		mono_array_setref(result, i, boxed);
 		i++;
 	}