1 files changed, 28 insertions, 17 deletions

diff --git a/modules/mono/glue/Managed/Files/Basis.cs b/modules/mono/glue/Managed/Files/Basis.cs
index a5618cb28d..b318d96bb9 100644
--- a/modules/mono/glue/Managed/Files/Basis.cs
+++ b/modules/mono/glue/Managed/Files/Basis.cs
@@ -13,9 +13,9 @@ namespace Godot
     {
         private static readonly Basis identity = new Basis
         (
-            new Vector3(1f, 0f, 0f),
-            new Vector3(0f, 1f, 0f),
-            new Vector3(0f, 0f, 1f)
+            1f, 0f, 0f,
+            0f, 1f, 0f,
+            0f, 0f, 1f
         );
 
         private static readonly Basis[] orthoBases = {
@@ -159,9 +159,9 @@ namespace Godot
         {
             return new Basis
             (
-                new Vector3(xAxis.x, yAxis.x, zAxis.x),
-                new Vector3(xAxis.y, yAxis.y, zAxis.y),
-                new Vector3(xAxis.z, yAxis.z, zAxis.z)
+                xAxis.x, yAxis.x, zAxis.x,
+                xAxis.y, yAxis.y, zAxis.y,
+                xAxis.z, yAxis.z, zAxis.z
             );
         }
 
@@ -410,10 +410,12 @@ namespace Godot
             );
         }
 
-        public Quat Quat() {
+        public Quat Quat()
+        {
             real_t trace = _x[0] + _y[1] + _z[2];
 
-            if (trace > 0.0f) {
+            if (trace > 0.0f)
+            {
                 real_t s = Mathf.Sqrt(trace + 1.0f) * 2f;
                 real_t inv_s = 1f / s;
                 return new Quat(
@@ -424,7 +426,8 @@ namespace Godot
                 );
             }
 
-            if (_x[0] > _y[1] && _x[0] > _z[2]) {
+            if (_x[0] > _y[1] && _x[0] > _z[2])
+            {
                 real_t s = Mathf.Sqrt(_x[0] - _y[1] - _z[2] + 1.0f) * 2f;
                 real_t inv_s = 1f / s;
                 return new Quat(
@@ -435,7 +438,8 @@ namespace Godot
                 );
             }
 
-            if (_y[1] > _z[2]) {
+            if (_y[1] > _z[2])
+            {
                 real_t s = Mathf.Sqrt(-_x[0] + _y[1] - _z[2] + 1.0f) * 2f;
                 real_t inv_s = 1f / s;
                 return new Quat(
@@ -444,7 +448,9 @@ namespace Godot
                     (_y[2] + _z[1]) * inv_s,
                     (_x[2] - _z[0]) * inv_s
                 );
-            } else {
+            }
+            else
+            {
                 real_t s = Mathf.Sqrt(-_x[0] - _y[1] + _z[2] + 1.0f) * 2f;
                 real_t inv_s = 1f / s;
                 return new Quat(
@@ -502,8 +508,8 @@ namespace Godot
         {
             var axis_sq = 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);
+            real_t cosine = Mathf.Cos(phi);
+            real_t sine = Mathf.Sin(phi);
 
             _x = new Vector3
             (
@@ -529,12 +535,17 @@ namespace Godot
 
         public Basis(Vector3 xAxis, Vector3 yAxis, Vector3 zAxis)
         {
-            _x = xAxis;
-            _y = yAxis;
-            _z = zAxis;
+            _x = new Vector3(xAxis.x, yAxis.x, zAxis.x);
+            _y = new Vector3(xAxis.y, yAxis.y, zAxis.y);
+            _z = new Vector3(xAxis.z, yAxis.z, zAxis.z);
+            // Same as:
+            // SetAxis(0, xAxis);
+            // SetAxis(1, yAxis);
+            // SetAxis(2, zAxis);
+            // We need to assign the struct fields so we can't do that...
         }
 
-        public Basis(real_t xx, real_t xy, real_t xz, real_t yx, real_t yy, real_t yz, real_t zx, real_t zy, real_t zz)
+        internal Basis(real_t xx, real_t xy, real_t xz, real_t yx, real_t yy, real_t yz, real_t zx, real_t zy, real_t zz)
         {
             _x = new Vector3(xx, xy, xz);
             _y = new Vector3(yx, yy, yz);