diff --git a/RhythmGameUtilities/RhythmGameUtilities.csproj b/RhythmGameUtilities/RhythmGameUtilities.csproj index c16756d..aaf8eed 100644 --- a/RhythmGameUtilities/RhythmGameUtilities.csproj +++ b/RhythmGameUtilities/RhythmGameUtilities.csproj @@ -29,25 +29,16 @@ $(DefineConstants);LINUX_BUILD - - - PreserveNewest - - - - - - PreserveNewest - - - - - - PreserveNewest - + + - + + + diff --git a/RhythmGameUtilities/Scripts/Audio.cs b/RhythmGameUtilities/Scripts/Audio.cs index ab72001..f6a6191 100644 --- a/RhythmGameUtilities/Scripts/Audio.cs +++ b/RhythmGameUtilities/Scripts/Audio.cs @@ -7,22 +7,10 @@ namespace RhythmGameUtilities internal static class AudioInternal { -#if WINDOWS_BUILD || UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN - [DllImport("libRhythmGameUtilities.dll", CallingConvention = CallingConvention.Cdecl)] -#elif MACOS_BUILD || UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX - [DllImport("libRhythmGameUtilities.dylib", CallingConvention = CallingConvention.Cdecl)] -#elif LINUX_BUILD || UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX - [DllImport("libRhythmGameUtilities.so", CallingConvention = CallingConvention.Cdecl)] -#endif + [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)] public static extern IntPtr ConvertSamplesToWaveform(float[] samples, int size, int width, int height); -#if WINDOWS_BUILD || UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN - [DllImport("libRhythmGameUtilities.dll", CallingConvention = CallingConvention.Cdecl)] -#elif MACOS_BUILD || UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX - [DllImport("libRhythmGameUtilities.dylib", CallingConvention = CallingConvention.Cdecl)] -#elif LINUX_BUILD || UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX - [DllImport("libRhythmGameUtilities.so", CallingConvention = CallingConvention.Cdecl)] -#endif + [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)] public static extern void FreeWaveform(IntPtr waveform, int width); } diff --git a/RhythmGameUtilities/Scripts/Common.cs b/RhythmGameUtilities/Scripts/Common.cs index f217cd1..c529e1a 100644 --- a/RhythmGameUtilities/Scripts/Common.cs +++ b/RhythmGameUtilities/Scripts/Common.cs @@ -6,22 +6,10 @@ namespace RhythmGameUtilities public static class CommonInternal { -#if WINDOWS_BUILD || UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN - [DllImport("libRhythmGameUtilities.dll", CallingConvention = CallingConvention.Cdecl)] -#elif MACOS_BUILD || UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX - [DllImport("libRhythmGameUtilities.dylib", CallingConvention = CallingConvention.Cdecl)] -#elif LINUX_BUILD || UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX - [DllImport("libRhythmGameUtilities.so", CallingConvention = CallingConvention.Cdecl)] -#endif + [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)] public static extern float Lerp(float a, float b, float t); -#if WINDOWS_BUILD || UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN - [DllImport("libRhythmGameUtilities.dll", CallingConvention = CallingConvention.Cdecl)] -#elif MACOS_BUILD || UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX - [DllImport("libRhythmGameUtilities.dylib", CallingConvention = CallingConvention.Cdecl)] -#elif LINUX_BUILD || UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX - [DllImport("libRhythmGameUtilities.so", CallingConvention = CallingConvention.Cdecl)] -#endif + [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)] public static extern float InverseLerp(float a, float b, float v); } diff --git a/RhythmGameUtilities/Scripts/Parsers.cs b/RhythmGameUtilities/Scripts/Parsers.cs index 23898d4..5f88ac8 100644 --- a/RhythmGameUtilities/Scripts/Parsers.cs +++ b/RhythmGameUtilities/Scripts/Parsers.cs @@ -35,13 +35,7 @@ internal struct ChartSectionInternal internal static class ParsersInternal { -#if WINDOWS_BUILD || UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN - [DllImport("libRhythmGameUtilities.dll", CallingConvention = CallingConvention.Cdecl)] -#elif MACOS_BUILD || UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX - [DllImport("libRhythmGameUtilities.dylib", CallingConvention = CallingConvention.Cdecl)] -#elif LINUX_BUILD || UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX - [DllImport("libRhythmGameUtilities.so", CallingConvention = CallingConvention.Cdecl)] -#endif + [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)] public static extern IntPtr ParseSectionsFromChartInternal(string contents, out int size); } diff --git a/RhythmGameUtilities/Scripts/Utilities.cs b/RhythmGameUtilities/Scripts/Utilities.cs index 3d88189..26168f9 100644 --- a/RhythmGameUtilities/Scripts/Utilities.cs +++ b/RhythmGameUtilities/Scripts/Utilities.cs @@ -9,59 +9,23 @@ namespace RhythmGameUtilities internal static class UtilitiesInternal { -#if WINDOWS_BUILD || UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN - [DllImport("libRhythmGameUtilities.dll", CallingConvention = CallingConvention.Cdecl)] -#elif MACOS_BUILD || UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX - [DllImport("libRhythmGameUtilities.dylib", CallingConvention = CallingConvention.Cdecl)] -#elif LINUX_BUILD || UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX - [DllImport("libRhythmGameUtilities.so", CallingConvention = CallingConvention.Cdecl)] -#endif + [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)] public static extern float ConvertTickToPosition(int tick, int resolution); -#if WINDOWS_BUILD || UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN - [DllImport("libRhythmGameUtilities.dll", CallingConvention = CallingConvention.Cdecl)] -#elif MACOS_BUILD || UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX - [DllImport("libRhythmGameUtilities.dylib", CallingConvention = CallingConvention.Cdecl)] -#elif LINUX_BUILD || UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX - [DllImport("libRhythmGameUtilities.so", CallingConvention = CallingConvention.Cdecl)] -#endif + [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)] public static extern int ConvertSecondsToTicksInternal(float seconds, int resolution, int[] bpmChangesKeys, int[] bpmChangesValues, int bpmChangesSize); -#if WINDOWS_BUILD || UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN - [DllImport("libRhythmGameUtilities.dll", CallingConvention = CallingConvention.Cdecl)] -#elif MACOS_BUILD || UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX - [DllImport("libRhythmGameUtilities.dylib", CallingConvention = CallingConvention.Cdecl)] -#elif LINUX_BUILD || UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX - [DllImport("libRhythmGameUtilities.so", CallingConvention = CallingConvention.Cdecl)] -#endif + [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)] public static extern bool IsOnTheBeat(int bpm, float currentTime, float delta); -#if WINDOWS_BUILD || UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN - [DllImport("libRhythmGameUtilities.dll", CallingConvention = CallingConvention.Cdecl)] -#elif MACOS_BUILD || UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX - [DllImport("libRhythmGameUtilities.dylib", CallingConvention = CallingConvention.Cdecl)] -#elif LINUX_BUILD || UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX - [DllImport("libRhythmGameUtilities.so", CallingConvention = CallingConvention.Cdecl)] -#endif + [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)] public static extern int RoundUpToTheNearestMultiplier(int value, int multiplier); -#if WINDOWS_BUILD || UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN - [DllImport("libRhythmGameUtilities.dll", CallingConvention = CallingConvention.Cdecl)] -#elif MACOS_BUILD || UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX - [DllImport("libRhythmGameUtilities.dylib", CallingConvention = CallingConvention.Cdecl)] -#elif LINUX_BUILD || UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX - [DllImport("libRhythmGameUtilities.so", CallingConvention = CallingConvention.Cdecl)] -#endif + [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)] public static extern float CalculateAccuracyRatio(int position, int currentPosition, int delta); -#if WINDOWS_BUILD || UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN - [DllImport("libRhythmGameUtilities.dll", CallingConvention = CallingConvention.Cdecl)] -#elif MACOS_BUILD || UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX - [DllImport("libRhythmGameUtilities.dylib", CallingConvention = CallingConvention.Cdecl)] -#elif LINUX_BUILD || UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX - [DllImport("libRhythmGameUtilities.so", CallingConvention = CallingConvention.Cdecl)] -#endif + [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)] public static extern IntPtr CalculateBeatBarsInternal(int[] bpmChangesKeys, int[] bpmChangesValues, int bpmChangesSize, int resolution, int ts, bool includeHalfNotes, out int size); diff --git a/UnityPackage/Scripts/Audio.cs b/UnityPackage/Scripts/Audio.cs index ab72001..f6a6191 100644 --- a/UnityPackage/Scripts/Audio.cs +++ b/UnityPackage/Scripts/Audio.cs @@ -7,22 +7,10 @@ namespace RhythmGameUtilities internal static class AudioInternal { -#if WINDOWS_BUILD || UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN - [DllImport("libRhythmGameUtilities.dll", CallingConvention = CallingConvention.Cdecl)] -#elif MACOS_BUILD || UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX - [DllImport("libRhythmGameUtilities.dylib", CallingConvention = CallingConvention.Cdecl)] -#elif LINUX_BUILD || UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX - [DllImport("libRhythmGameUtilities.so", CallingConvention = CallingConvention.Cdecl)] -#endif + [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)] public static extern IntPtr ConvertSamplesToWaveform(float[] samples, int size, int width, int height); -#if WINDOWS_BUILD || UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN - [DllImport("libRhythmGameUtilities.dll", CallingConvention = CallingConvention.Cdecl)] -#elif MACOS_BUILD || UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX - [DllImport("libRhythmGameUtilities.dylib", CallingConvention = CallingConvention.Cdecl)] -#elif LINUX_BUILD || UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX - [DllImport("libRhythmGameUtilities.so", CallingConvention = CallingConvention.Cdecl)] -#endif + [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)] public static extern void FreeWaveform(IntPtr waveform, int width); } diff --git a/UnityPackage/Scripts/Common.cs b/UnityPackage/Scripts/Common.cs index f217cd1..c529e1a 100644 --- a/UnityPackage/Scripts/Common.cs +++ b/UnityPackage/Scripts/Common.cs @@ -6,22 +6,10 @@ namespace RhythmGameUtilities public static class CommonInternal { -#if WINDOWS_BUILD || UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN - [DllImport("libRhythmGameUtilities.dll", CallingConvention = CallingConvention.Cdecl)] -#elif MACOS_BUILD || UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX - [DllImport("libRhythmGameUtilities.dylib", CallingConvention = CallingConvention.Cdecl)] -#elif LINUX_BUILD || UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX - [DllImport("libRhythmGameUtilities.so", CallingConvention = CallingConvention.Cdecl)] -#endif + [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)] public static extern float Lerp(float a, float b, float t); -#if WINDOWS_BUILD || UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN - [DllImport("libRhythmGameUtilities.dll", CallingConvention = CallingConvention.Cdecl)] -#elif MACOS_BUILD || UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX - [DllImport("libRhythmGameUtilities.dylib", CallingConvention = CallingConvention.Cdecl)] -#elif LINUX_BUILD || UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX - [DllImport("libRhythmGameUtilities.so", CallingConvention = CallingConvention.Cdecl)] -#endif + [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)] public static extern float InverseLerp(float a, float b, float v); } diff --git a/UnityPackage/Scripts/Parsers.cs b/UnityPackage/Scripts/Parsers.cs index 23898d4..5f88ac8 100644 --- a/UnityPackage/Scripts/Parsers.cs +++ b/UnityPackage/Scripts/Parsers.cs @@ -35,13 +35,7 @@ internal struct ChartSectionInternal internal static class ParsersInternal { -#if WINDOWS_BUILD || UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN - [DllImport("libRhythmGameUtilities.dll", CallingConvention = CallingConvention.Cdecl)] -#elif MACOS_BUILD || UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX - [DllImport("libRhythmGameUtilities.dylib", CallingConvention = CallingConvention.Cdecl)] -#elif LINUX_BUILD || UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX - [DllImport("libRhythmGameUtilities.so", CallingConvention = CallingConvention.Cdecl)] -#endif + [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)] public static extern IntPtr ParseSectionsFromChartInternal(string contents, out int size); } diff --git a/UnityPackage/Scripts/Utilities.cs b/UnityPackage/Scripts/Utilities.cs index 3d88189..26168f9 100644 --- a/UnityPackage/Scripts/Utilities.cs +++ b/UnityPackage/Scripts/Utilities.cs @@ -9,59 +9,23 @@ namespace RhythmGameUtilities internal static class UtilitiesInternal { -#if WINDOWS_BUILD || UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN - [DllImport("libRhythmGameUtilities.dll", CallingConvention = CallingConvention.Cdecl)] -#elif MACOS_BUILD || UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX - [DllImport("libRhythmGameUtilities.dylib", CallingConvention = CallingConvention.Cdecl)] -#elif LINUX_BUILD || UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX - [DllImport("libRhythmGameUtilities.so", CallingConvention = CallingConvention.Cdecl)] -#endif + [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)] public static extern float ConvertTickToPosition(int tick, int resolution); -#if WINDOWS_BUILD || UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN - [DllImport("libRhythmGameUtilities.dll", CallingConvention = CallingConvention.Cdecl)] -#elif MACOS_BUILD || UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX - [DllImport("libRhythmGameUtilities.dylib", CallingConvention = CallingConvention.Cdecl)] -#elif LINUX_BUILD || UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX - [DllImport("libRhythmGameUtilities.so", CallingConvention = CallingConvention.Cdecl)] -#endif + [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)] public static extern int ConvertSecondsToTicksInternal(float seconds, int resolution, int[] bpmChangesKeys, int[] bpmChangesValues, int bpmChangesSize); -#if WINDOWS_BUILD || UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN - [DllImport("libRhythmGameUtilities.dll", CallingConvention = CallingConvention.Cdecl)] -#elif MACOS_BUILD || UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX - [DllImport("libRhythmGameUtilities.dylib", CallingConvention = CallingConvention.Cdecl)] -#elif LINUX_BUILD || UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX - [DllImport("libRhythmGameUtilities.so", CallingConvention = CallingConvention.Cdecl)] -#endif + [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)] public static extern bool IsOnTheBeat(int bpm, float currentTime, float delta); -#if WINDOWS_BUILD || UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN - [DllImport("libRhythmGameUtilities.dll", CallingConvention = CallingConvention.Cdecl)] -#elif MACOS_BUILD || UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX - [DllImport("libRhythmGameUtilities.dylib", CallingConvention = CallingConvention.Cdecl)] -#elif LINUX_BUILD || UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX - [DllImport("libRhythmGameUtilities.so", CallingConvention = CallingConvention.Cdecl)] -#endif + [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)] public static extern int RoundUpToTheNearestMultiplier(int value, int multiplier); -#if WINDOWS_BUILD || UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN - [DllImport("libRhythmGameUtilities.dll", CallingConvention = CallingConvention.Cdecl)] -#elif MACOS_BUILD || UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX - [DllImport("libRhythmGameUtilities.dylib", CallingConvention = CallingConvention.Cdecl)] -#elif LINUX_BUILD || UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX - [DllImport("libRhythmGameUtilities.so", CallingConvention = CallingConvention.Cdecl)] -#endif + [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)] public static extern float CalculateAccuracyRatio(int position, int currentPosition, int delta); -#if WINDOWS_BUILD || UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN - [DllImport("libRhythmGameUtilities.dll", CallingConvention = CallingConvention.Cdecl)] -#elif MACOS_BUILD || UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX - [DllImport("libRhythmGameUtilities.dylib", CallingConvention = CallingConvention.Cdecl)] -#elif LINUX_BUILD || UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX - [DllImport("libRhythmGameUtilities.so", CallingConvention = CallingConvention.Cdecl)] -#endif + [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)] public static extern IntPtr CalculateBeatBarsInternal(int[] bpmChangesKeys, int[] bpmChangesValues, int bpmChangesSize, int resolution, int ts, bool includeHalfNotes, out int size);