Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #34668 from aaronfranke/to-string

Browse source 
[Core] Reformat structure string operators
This commit is contained in:
Rémi Verschelde 2021-06-13 11:58:24 +02:00 • committed by GitHub
commit 600b4c9c7b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 90 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/mono/editor/bindings_generator.cpp
View file

@ -3053,28 +3053,25 @@ bool BindingsGenerator::_arg_default_value_from_variant(const Variant &p_val, Ar
break;
case Variant::PLANE: {
Plane plane = p_val.operator Plane();
r_iarg.default_argument = "new Plane(new Vector3(" + plane.normal.operator String() + "), " + rtos(plane.d) + ")";
r_iarg.default_argument = "new Plane(new Vector3" + plane.normal.operator String() + ", " + rtos(plane.d) + ")";
r_iarg.def_param_mode = ArgumentInterface::NULLABLE_VAL;
} break;
case Variant::AABB: {
AABB aabb = p_val.operator ::AABB();
r_iarg.default_argument = "new AABB(new Vector3(" + aabb.position.operator String() + "), new Vector3(" + aabb.position.operator String() + "))";
r_iarg.default_argument = "new AABB(new Vector3" + aabb.position.operator String() + ", new Vector3" + aabb.position.operator String() + ")";
r_iarg.def_param_mode = ArgumentInterface::NULLABLE_VAL;
} break;
case Variant::RECT2: {
Rect2 rect = p_val.operator Rect2();
r_iarg.default_argument = "new Rect2(new Vector2(" + rect.position.operator String() + "), new Vector2(" + rect.position.operator String() + "))";
r_iarg.default_argument = "new Rect2(new Vector2" + rect.position.operator String() + ", new Vector2" + rect.position.operator String() + ")";
r_iarg.def_param_mode = ArgumentInterface::NULLABLE_VAL;
} break;
case Variant::RECT2I: {
Rect2i rect = p_val.operator Rect2i();
r_iarg.default_argument = "new Rect2i(new Vector2i(" + rect.position.operator String() + "), new Vector2i(" + rect.position.operator String() + "))";
r_iarg.default_argument = "new Rect2i(new Vector2i" + rect.position.operator String() + ", new Vector2i" + rect.position.operator String() + ")";
r_iarg.def_param_mode = ArgumentInterface::NULLABLE_VAL;
} break;
case Variant::COLOR:
r_iarg.default_argument = "new %s(" + r_iarg.default_argument + ")";
r_iarg.def_param_mode = ArgumentInterface::NULLABLE_VAL;
break;
case Variant::VECTOR2:
case Variant::VECTOR2I:
case Variant::VECTOR3:

4
modules/mono/glue/GodotSharp/GodotSharp/Core/AABB.cs
View file

@ -676,7 +676,7 @@ namespace Godot
public override string ToString()
{
return String.Format("{0} - {1}", new object[]
return String.Format("{0}, {1}", new object[]
{
_position.ToString(),
_size.ToString()
@ -685,7 +685,7 @@ namespace Godot
public string ToString(string format)
{
return String.Format("{0} - {1}", new object[]
return String.Format("{0}, {1}", new object[]
{
_position.ToString(format),
_size.ToString(format)

18
modules/mono/glue/GodotSharp/GodotSharp/Core/Basis.cs
View file

@ -863,22 +863,16 @@ namespace Godot
public override string ToString()
{
return String.Format("({0}, {1}, {2})", new object[]
{
Row0.ToString(),
Row1.ToString(),
Row2.ToString()
});
return "[X: " + x.ToString() +
", Y: " + y.ToString() +
", Z: " + z.ToString() + "]";
}
public string ToString(string format)
{
return String.Format("({0}, {1}, {2})", new object[]
{
Row0.ToString(format),
Row1.ToString(format),
Row2.ToString(format)
});
return "[X: " + x.ToString(format) +
", Y: " + y.ToString(format) +
", Z: " + z.ToString(format) + "]";
}
}
}

4
modules/mono/glue/GodotSharp/GodotSharp/Core/Color.cs
View file

@ -1010,12 +1010,12 @@ namespace Godot
public override string ToString()
{
return String.Format("{0},{1},{2},{3}", r.ToString(), g.ToString(), b.ToString(), a.ToString());
return String.Format("({0}, {1}, {2}, {3})", r.ToString(), g.ToString(), b.ToString(), a.ToString());
}
public string ToString(string format)
{
return String.Format("{0},{1},{2},{3}", r.ToString(format), g.ToString(format), b.ToString(format), a.ToString(format));
return String.Format("({0}, {1}, {2}, {3})", r.ToString(format), g.ToString(format), b.ToString(format), a.ToString(format));
}
}
}

4
modules/mono/glue/GodotSharp/GodotSharp/Core/Plane.cs
View file

@ -355,7 +355,7 @@ namespace Godot
public override string ToString()
{
return String.Format("({0}, {1})", new object[]
return String.Format("{0}, {1}", new object[]
{
_normal.ToString(),
D.ToString()
@ -364,7 +364,7 @@ namespace Godot
public string ToString(string format)
{
return String.Format("({0}, {1})", new object[]
return String.Format("{0}, {1}", new object[]
{
_normal.ToString(format),
D.ToString(format)

4
modules/mono/glue/GodotSharp/GodotSharp/Core/Rect2.cs
View file

@ -405,7 +405,7 @@ namespace Godot
public override string ToString()
{
return String.Format("({0}, {1})", new object[]
return String.Format("{0}, {1}", new object[]
{
_position.ToString(),
_size.ToString()
@ -414,7 +414,7 @@ namespace Godot
public string ToString(string format)
{
return String.Format("({0}, {1})", new object[]
return String.Format("{0}, {1}", new object[]
{
_position.ToString(format),
_size.ToString(format)

18
modules/mono/glue/GodotSharp/GodotSharp/Core/Transform2D.cs
View file

@ -492,22 +492,16 @@ namespace Godot
public override string ToString()
{
return String.Format("({0}, {1}, {2})", new object[]
{
x.ToString(),
y.ToString(),
origin.ToString()
});
return "[X: " + x.ToString() +
", Y: " + y.ToString() +
", O: " + origin.ToString() + "]";
}
public string ToString(string format)
{
return String.Format("({0}, {1}, {2})", new object[]
{
x.ToString(format),
y.ToString(format),
origin.ToString(format)
});
return "[X: " + x.ToString(format) +
", Y: " + y.ToString(format) +
", O: " + origin.ToString(format) + "]";
}
}
}

18
modules/mono/glue/GodotSharp/GodotSharp/Core/Transform3D.cs
View file

@ -393,20 +393,18 @@ namespace Godot
public override string ToString()
{
return String.Format("{0} - {1}", new object[]
{
basis.ToString(),
origin.ToString()
});
return "[X: " + basis.x.ToString() +
", Y: " + basis.y.ToString() +
", Z: " + basis.z.ToString() +
", O: " + origin.ToString() + "]";
}
public string ToString(string format)
{
return String.Format("{0} - {1}", new object[]
{
basis.ToString(format),
origin.ToString(format)
});
return "[X: " + basis.x.ToString(format) +
", Y: " + basis.y.ToString(format) +
", Z: " + basis.z.ToString(format) +
", O: " + origin.ToString(format) + "]";
}
}
}