Skip to content

Commit bef8067

Browse files
authored
Merge pull request #104 from neogeek/hotfix/removed-lerp-inverse-lerp-internal-methods
[hotfix] Removed Lerp / InverseLerp internal methods.
2 parents 1d9826d + 98d0d68 commit bef8067

File tree

5 files changed

+8
-70
lines changed

5 files changed

+8
-70
lines changed

RhythmGameUtilities/Scripts/Common.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ public static class CommonInternal
77
{
88

99
[DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
10-
public static extern float LerpInternal(float a, float b, float t);
10+
public static extern float Lerp(float a, float b, float t);
1111

1212
[DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
13-
public static extern float InverseLerpInternal(float a, float b, float v);
13+
public static extern float InverseLerp(float a, float b, float v);
1414

1515
}
1616

@@ -25,7 +25,7 @@ public static class Common
2525
/// <param name="t">The value used for interpolation.</param>
2626
public static float Lerp(float a, float b, float t)
2727
{
28-
return CommonInternal.LerpInternal(a, b, t);
28+
return CommonInternal.Lerp(a, b, t);
2929
}
3030

3131
/// <summary>
@@ -36,7 +36,7 @@ public static float Lerp(float a, float b, float t)
3636
/// <param name="v">The value in the middle.</param>
3737
public static float InverseLerp(float a, float b, float v)
3838
{
39-
return CommonInternal.InverseLerpInternal(a, b, v);
39+
return CommonInternal.InverseLerp(a, b, v);
4040
}
4141

4242
}

UnityPackage/Scripts/Common.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ public static class CommonInternal
77
{
88

99
[DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
10-
public static extern float LerpInternal(float a, float b, float t);
10+
public static extern float Lerp(float a, float b, float t);
1111

1212
[DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
13-
public static extern float InverseLerpInternal(float a, float b, float v);
13+
public static extern float InverseLerp(float a, float b, float v);
1414

1515
}
1616

@@ -25,7 +25,7 @@ public static class Common
2525
/// <param name="t">The value used for interpolation.</param>
2626
public static float Lerp(float a, float b, float t)
2727
{
28-
return CommonInternal.LerpInternal(a, b, t);
28+
return CommonInternal.Lerp(a, b, t);
2929
}
3030

3131
/// <summary>
@@ -36,7 +36,7 @@ public static float Lerp(float a, float b, float t)
3636
/// <param name="v">The value in the middle.</param>
3737
public static float InverseLerp(float a, float b, float v)
3838
{
39-
return CommonInternal.InverseLerpInternal(a, b, v);
39+
return CommonInternal.InverseLerp(a, b, v);
4040
}
4141

4242
}

include/RhythmGameUtilities/CommonInternal.hpp

Lines changed: 0 additions & 27 deletions
This file was deleted.

include/RhythmGameUtilities/RhythmGameUtilities.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
#include "Audio.hpp"
44
#include "Common.hpp"
5-
#include "CommonInternal.hpp"
65
#include "Parsers.hpp"
76
#include "ParsersInternal.hpp"
87
#include "Utilities.hpp"

tests/RhythmGameUtilities/CommonInternal.cpp

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)