From 57c281557a98c1a6c0b07ba6c495c81d00e0418a Mon Sep 17 00:00:00 2001 From: Xavier Cho Date: Tue, 17 Apr 2018 07:53:27 +0900 Subject: [PATCH] #18051: Fix indentation issues introduced during clean up (cherry picked from commit 6b611e64316ed91b89822a3b660cdedc087a1da9) --- modules/mono/glue/cs_files/AABB.cs | 14 +++++++------- modules/mono/glue/cs_files/GD.cs | 4 ++-- modules/mono/glue/cs_files/Plane.cs | 2 +- modules/mono/glue/cs_files/StringExtensions.cs | 8 ++++---- modules/mono/glue/cs_files/Transform2D.cs | 2 +- modules/mono/glue/cs_files/Vector2.cs | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/mono/glue/cs_files/AABB.cs b/modules/mono/glue/cs_files/AABB.cs index f03d6403ef5..39f2d2ed51d 100644 --- a/modules/mono/glue/cs_files/AABB.cs +++ b/modules/mono/glue/cs_files/AABB.cs @@ -112,7 +112,7 @@ namespace Godot public Vector3 GetLongestAxis() { var axis = new Vector3(1f, 0f, 0f); - real_t max_size = size.x; + real_t max_size = size.x; if (size.y > max_size) { @@ -149,7 +149,7 @@ namespace Godot public real_t GetLongestAxisSize() { - real_t max_size = size.x; + real_t max_size = size.x; if (size.y > max_size) max_size = size.y; @@ -163,7 +163,7 @@ namespace Godot public Vector3 GetShortestAxis() { var axis = new Vector3(1f, 0f, 0f); - real_t max_size = size.x; + real_t max_size = size.x; if (size.y < max_size) { @@ -182,7 +182,7 @@ namespace Godot public Vector3.Axis GetShortestAxisIndex() { var axis = Vector3.Axis.X; - real_t max_size = size.x; + real_t max_size = size.x; if (size.y < max_size) { @@ -200,7 +200,7 @@ namespace Godot public real_t GetShortestAxisSize() { - real_t max_size = size.x; + real_t max_size = size.x; if (size.y < max_size) max_size = size.y; @@ -396,8 +396,8 @@ namespace Godot { Vector3 beg_1 = position; Vector3 beg_2 = with.position; - var end_1 = new Vector3(size.x, size.y, size.z) + beg_1; - var end_2 = new Vector3(with.size.x, with.size.y, with.size.z) + beg_2; + var end_1 = new Vector3(size.x, size.y, size.z) + beg_1; + var end_2 = new Vector3(with.size.x, with.size.y, with.size.z) + beg_2; var min = new Vector3( beg_1.x < beg_2.x ? beg_1.x : beg_2.x, diff --git a/modules/mono/glue/cs_files/GD.cs b/modules/mono/glue/cs_files/GD.cs index 2384bc14326..ec1534cb9af 100644 --- a/modules/mono/glue/cs_files/GD.cs +++ b/modules/mono/glue/cs_files/GD.cs @@ -135,7 +135,7 @@ namespace Godot if (increment > 0) { - int idx = 0; + int idx = 0; for (int i = from; i < to; i += increment) { ret[idx++] = i; @@ -143,7 +143,7 @@ namespace Godot } else { - int idx = 0; + int idx = 0; for (int i = from; i > to; i += increment) { ret[idx++] = i; diff --git a/modules/mono/glue/cs_files/Plane.cs b/modules/mono/glue/cs_files/Plane.cs index 1043738d7b4..8b925220295 100644 --- a/modules/mono/glue/cs_files/Plane.cs +++ b/modules/mono/glue/cs_files/Plane.cs @@ -80,7 +80,7 @@ namespace Godot if (Mathf.Abs(denom) <= Mathf.Epsilon) return new Vector3(); - Vector3 result = b.normal.Cross(c.normal) * d + + Vector3 result = b.normal.Cross(c.normal) * d + c.normal.Cross(normal) * b.d + normal.Cross(b.normal) * c.d; diff --git a/modules/mono/glue/cs_files/StringExtensions.cs b/modules/mono/glue/cs_files/StringExtensions.cs index ef817699120..21090fb68d5 100644 --- a/modules/mono/glue/cs_files/StringExtensions.cs +++ b/modules/mono/glue/cs_files/StringExtensions.cs @@ -141,12 +141,12 @@ namespace Godot // public static string Capitalize(this string instance) { - string aux = instance.Replace("_", " ").ToLower(); + string aux = instance.Replace("_", " ").ToLower(); var cap = string.Empty; for (int i = 0; i < aux.GetSliceCount(" "); i++) { - string slice = aux.GetSlicec(' ', i); + string slice = aux.GetSlicec(' ', i); if (slice.Length > 0) { slice = char.ToUpper(slice[0]) + slice.Substring(1); @@ -842,8 +842,8 @@ namespace Godot public static float[] SplitFloats(this string instance, string divisor, bool allow_empty = true) { var ret = new List(); - int from = 0; - int len = instance.Length; + int from = 0; + int len = instance.Length; while (true) { diff --git a/modules/mono/glue/cs_files/Transform2D.cs b/modules/mono/glue/cs_files/Transform2D.cs index fad3c861904..ff5259178b0 100644 --- a/modules/mono/glue/cs_files/Transform2D.cs +++ b/modules/mono/glue/cs_files/Transform2D.cs @@ -185,7 +185,7 @@ namespace Godot // Construct matrix var res = new Transform2D(Mathf.Atan2(v.y, v.x), p1.LinearInterpolate(p2, c)); - Vector2 scale = s1.LinearInterpolate(s2, c); + Vector2 scale = s1.LinearInterpolate(s2, c); res.x *= scale; res.y *= scale; diff --git a/modules/mono/glue/cs_files/Vector2.cs b/modules/mono/glue/cs_files/Vector2.cs index 7f8c342e6f6..cc2cda82fb6 100644 --- a/modules/mono/glue/cs_files/Vector2.cs +++ b/modules/mono/glue/cs_files/Vector2.cs @@ -100,7 +100,7 @@ namespace Godot public Vector2 Clamped(real_t length) { var v = this; - real_t l = Length(); + real_t l = Length(); if (l > 0 && length < l) {