summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgnacio Roldán Etcheverry <neikeq@users.noreply.github.com>2022-09-02 22:37:16 +0200
committerGitHub <noreply@github.com>2022-09-02 22:37:16 +0200
commitdaec089c30ba5f7128eafa6b766abc1d8d3e8a72 (patch)
tree6e02080b83d9b6d39670574848935a0f911b0c08
parent3dd7321939c4fcdbbfc456e0acdc330f0d13caa3 (diff)
parent2c1593f7e4759123d35ff502be4e462b763d694a (diff)
Merge pull request #65251 from AlmightyLaxz/fix-real_t-double-csharp-compiling
Fixed GodotSharp build failing when real_t is double
-rw-r--r--modules/mono/glue/GodotSharp/GodotSharp/Core/Color.cs18
1 files changed, 9 insertions, 9 deletions
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Color.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Color.cs
index 33d8aef1a9..3483a04c83 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Color.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Color.cs
@@ -333,14 +333,14 @@ namespace Godot
/// <param name="to">The destination color for interpolation.</param>
/// <param name="weight">A value on the range of 0.0 to 1.0, representing the amount of interpolation.</param>
/// <returns>The resulting color of the interpolation.</returns>
- public Color Lerp(Color to, float weight)
+ public Color Lerp(Color to, real_t weight)
{
return new Color
(
- Mathf.Lerp(r, to.r, weight),
- Mathf.Lerp(g, to.g, weight),
- Mathf.Lerp(b, to.b, weight),
- Mathf.Lerp(a, to.a, weight)
+ (float)Mathf.Lerp(r, to.r, weight),
+ (float)Mathf.Lerp(g, to.g, weight),
+ (float)Mathf.Lerp(b, to.b, weight),
+ (float)Mathf.Lerp(a, to.a, weight)
);
}
@@ -355,10 +355,10 @@ namespace Godot
{
return new Color
(
- Mathf.Lerp(r, to.r, weight.r),
- Mathf.Lerp(g, to.g, weight.g),
- Mathf.Lerp(b, to.b, weight.b),
- Mathf.Lerp(a, to.a, weight.a)
+ (float)Mathf.Lerp(r, to.r, weight.r),
+ (float)Mathf.Lerp(g, to.g, weight.g),
+ (float)Mathf.Lerp(b, to.b, weight.b),
+ (float)Mathf.Lerp(a, to.a, weight.a)
);
}