maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[Mono] Rename LinearInterpolate to Lerp

Browse source
This commit is contained in:
Aaron Franke 2020-03-23 00:55:42 -04:00
parent 10273e9de6
commit ad3c3e1bbb
No known key found for this signature in database
GPG key ID: 40A1750B977E56BF
5 changed files with 51 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -306,16 +306,26 @@ namespace Godot
return res;
}
public Color LinearInterpolate(Color c, float t)
public Color Lerp(Color to, float weight)
{
var res = this;
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)
);
}
res.r += t * (c.r - r);
res.g += t * (c.g - g);
res.b += t * (c.b - b);
res.a += t * (c.a - a);
return res;
public Color Lerp(Color to, Color weight)
{
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)
);
}
public uint ToAbgr32()

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

@ -104,8 +104,8 @@ namespace Godot
Vector3 destinationLocation = transform.origin;
var interpolated = new Transform();
interpolated.basis.SetQuatScale(sourceRotation.Slerp(destinationRotation, c).Normalized(), sourceScale.LinearInterpolate(destinationScale, c));
interpolated.origin = sourceLocation.LinearInterpolate(destinationLocation, c);
interpolated.basis.SetQuatScale(sourceRotation.Slerp(destinationRotation, c).Normalized(), sourceScale.Lerp(destinationScale, c));
interpolated.origin = sourceLocation.Lerp(destinationLocation, c);
return interpolated;
}

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

@ -172,7 +172,7 @@ namespace Godot
if (dot > 0.9995f)
{
// Linearly interpolate to avoid numerical precision issues
v = v1.LinearInterpolate(v2, c).Normalized();
v = v1.Lerp(v2, c).Normalized();
}
else
{
@ -186,8 +186,8 @@ namespace Godot
Vector2 p2 = m.origin;
// Construct matrix
var res = new Transform2D(Mathf.Atan2(v.y, v.x), p1.LinearInterpolate(p2, c));
Vector2 scale = s1.LinearInterpolate(s2, c);
var res = new Transform2D(Mathf.Atan2(v.y, v.x), p1.Lerp(p2, c));
Vector2 scale = s1.Lerp(s2, c);
res.x *= scale;
res.y *= scale;

20
modules/mono/glue/GodotSharp/GodotSharp/Core/Vector2.cs
View file

@ -186,14 +186,22 @@ namespace Godot
return x * x + y * y;
}
public Vector2 LinearInterpolate(Vector2 b, real_t t)
public Vector2 Lerp(Vector2 to, real_t weight)
{
var res = this;
return new Vector2
(
Mathf.Lerp(x, to.x, weight),
Mathf.Lerp(y, to.y, weight)
);
}
res.x += t * (b.x - x);
res.y += t * (b.y - y);
return res;
public Vector2 Lerp(Vector2 to, Vector2 weight)
{
return new Vector2
(
Mathf.Lerp(x, to.x, weight.x),
Mathf.Lerp(y, to.y, weight.y)
);
}
public Vector2 MoveToward(Vector2 to, real_t delta)

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

@ -184,13 +184,23 @@ namespace Godot
return x2 + y2 + z2;
}
public Vector3 LinearInterpolate(Vector3 b, real_t t)
public Vector3 Lerp(Vector3 to, real_t weight)
{
return new Vector3
(
x + t * (b.x - x),
y + t * (b.y - y),
z + t * (b.z - z)
Mathf.Lerp(x, to.x, weight),
Mathf.Lerp(y, to.y, weight),
Mathf.Lerp(z, to.z, weight)
);
}
public Vector3 Lerp(Vector3 to, Vector3 weight)
{
return new Vector3
(
Mathf.Lerp(x, to.x, weight.x),
Mathf.Lerp(y, to.y, weight.y),
Mathf.Lerp(z, to.z, weight.z)
);
}