[hotfix] Set methods to inline to prevent duplicate symbols.

RhythmGameUtilities/Scripts/Common.cs

@@ -7,10 +7,10 @@ public static class CommonInternal
     {
 
         [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Lerp(float a, float b, float t);
+        public static extern float LerpInternal(float a, float b, float t);
 
         [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float InverseLerp(float a, float b, float v);
+        public static extern float InverseLerpInternal(float a, float b, float v);
 
     }
 
@@ -25,7 +25,7 @@ public static class Common
         /// <param name="t">The value used for interpolation.</param>
         public static float Lerp(float a, float b, float t)
         {
-            return CommonInternal.Lerp(a, b, t);
+            return CommonInternal.LerpInternal(a, b, t);
         }
 
         /// <summary>
@@ -36,7 +36,7 @@ public static float Lerp(float a, float b, float t)
         /// <param name="v">The value in the middle.</param>
         public static float InverseLerp(float a, float b, float v)
         {
-            return CommonInternal.InverseLerp(a, b, v);
+            return CommonInternal.InverseLerpInternal(a, b, v);
         }
 
     }

RhythmGameUtilities/Scripts/Utilities.cs

@@ -8,20 +8,20 @@ internal static class UtilitiesInternal
     {
 
         [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float ConvertTickToPosition(int tick, int resolution);
+        public static extern float ConvertTickToPositionInternal(int tick, int resolution);
 
         [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
         public static extern int ConvertSecondsToTicksInternal(float seconds, int resolution, Tempo[] tempoChanges,
             int tempoChangesSize, TimeSignature[] timeSignatures, int timeSignaturesSize);
 
         [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
-        public static extern bool IsOnTheBeat(int bpm, float currentTime, float delta);
+        public static extern bool IsOnTheBeatInternal(int bpm, float currentTime, float delta);
 
         [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
-        public static extern int RoundUpToTheNearestMultiplier(int value, int multiplier);
+        public static extern int RoundUpToTheNearestMultiplierInternal(int value, int multiplier);
 
         [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float CalculateAccuracyRatio(int position, int currentPosition, int delta);
+        public static extern float CalculateAccuracyRatioInternal(int position, int currentPosition, int delta);
 
         [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
         public static extern IntPtr CalculateBeatBarsInternal(Tempo[] tempoChanges, int tempoChangesSize, int resolution,
@@ -42,7 +42,7 @@ public static class Utilities
         /// <param name="resolution">The resolution of the song.</param>
         public static float ConvertTickToPosition(int tick, int resolution)
         {
-            return UtilitiesInternal.ConvertTickToPosition(tick, resolution);
+            return UtilitiesInternal.ConvertTickToPositionInternal(tick, resolution);
         }
 
         /// <summary>
@@ -67,7 +67,7 @@ public static int ConvertSecondsToTicks(float seconds, int resolution, Tempo[] t
         /// <param name="delta">The plus/minus delta to test the current time against.</param>
         public static bool IsOnTheBeat(int bpm, float currentTime, float delta = 0.05f)
         {
-            return UtilitiesInternal.IsOnTheBeat(bpm, currentTime, delta);
+            return UtilitiesInternal.IsOnTheBeatInternal(bpm, currentTime, delta);
         }
 
         /// <summary>
@@ -77,7 +77,7 @@ public static bool IsOnTheBeat(int bpm, float currentTime, float delta = 0.05f)
         /// <param name="multiplier">The multiplier to round using.</param>
         public static int RoundUpToTheNearestMultiplier(int value, int multiplier)
         {
-            return UtilitiesInternal.RoundUpToTheNearestMultiplier(value, multiplier);
+            return UtilitiesInternal.RoundUpToTheNearestMultiplierInternal(value, multiplier);
         }
 
         public static BeatBar[] CalculateBeatBars(Tempo[] tempoChanges, int resolution = 192, int ts = 4,
@@ -140,7 +140,7 @@ public static BeatBar[] CalculateBeatBars(Tempo[] tempoChanges, int resolution =
         /// <param name="delta">The plus/minus delta to test the current position against.</param>
         public static float CalculateAccuracyRatio(int position, int currentPosition, int delta = 50)
         {
-            return UtilitiesInternal.CalculateAccuracyRatio(position, currentPosition, delta);
+            return UtilitiesInternal.CalculateAccuracyRatioInternal(position, currentPosition, delta);
         }
 
     }

UnityPackage/Scripts/Common.cs

@@ -7,10 +7,10 @@ public static class CommonInternal
     {
 
         [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Lerp(float a, float b, float t);
+        public static extern float LerpInternal(float a, float b, float t);
 
         [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float InverseLerp(float a, float b, float v);
+        public static extern float InverseLerpInternal(float a, float b, float v);
 
     }
 
@@ -25,7 +25,7 @@ public static class Common
         /// <param name="t">The value used for interpolation.</param>
         public static float Lerp(float a, float b, float t)
         {
-            return CommonInternal.Lerp(a, b, t);
+            return CommonInternal.LerpInternal(a, b, t);
         }
 
         /// <summary>
@@ -36,7 +36,7 @@ public static float Lerp(float a, float b, float t)
         /// <param name="v">The value in the middle.</param>
         public static float InverseLerp(float a, float b, float v)
         {
-            return CommonInternal.InverseLerp(a, b, v);
+            return CommonInternal.InverseLerpInternal(a, b, v);
         }
 
     }

UnityPackage/Scripts/Utilities.cs

@@ -8,20 +8,20 @@ internal static class UtilitiesInternal
     {
 
         [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float ConvertTickToPosition(int tick, int resolution);
+        public static extern float ConvertTickToPositionInternal(int tick, int resolution);
 
         [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
         public static extern int ConvertSecondsToTicksInternal(float seconds, int resolution, Tempo[] tempoChanges,
             int tempoChangesSize, TimeSignature[] timeSignatures, int timeSignaturesSize);
 
         [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
-        public static extern bool IsOnTheBeat(int bpm, float currentTime, float delta);
+        public static extern bool IsOnTheBeatInternal(int bpm, float currentTime, float delta);
 
         [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
-        public static extern int RoundUpToTheNearestMultiplier(int value, int multiplier);
+        public static extern int RoundUpToTheNearestMultiplierInternal(int value, int multiplier);
 
         [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float CalculateAccuracyRatio(int position, int currentPosition, int delta);
+        public static extern float CalculateAccuracyRatioInternal(int position, int currentPosition, int delta);
 
         [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
         public static extern IntPtr CalculateBeatBarsInternal(Tempo[] tempoChanges, int tempoChangesSize, int resolution,
@@ -42,7 +42,7 @@ public static class Utilities
         /// <param name="resolution">The resolution of the song.</param>
         public static float ConvertTickToPosition(int tick, int resolution)
         {
-            return UtilitiesInternal.ConvertTickToPosition(tick, resolution);
+            return UtilitiesInternal.ConvertTickToPositionInternal(tick, resolution);
         }
 
         /// <summary>
@@ -67,7 +67,7 @@ public static int ConvertSecondsToTicks(float seconds, int resolution, Tempo[] t
         /// <param name="delta">The plus/minus delta to test the current time against.</param>
         public static bool IsOnTheBeat(int bpm, float currentTime, float delta = 0.05f)
         {
-            return UtilitiesInternal.IsOnTheBeat(bpm, currentTime, delta);
+            return UtilitiesInternal.IsOnTheBeatInternal(bpm, currentTime, delta);
         }
 
         /// <summary>
@@ -77,7 +77,7 @@ public static bool IsOnTheBeat(int bpm, float currentTime, float delta = 0.05f)
         /// <param name="multiplier">The multiplier to round using.</param>
         public static int RoundUpToTheNearestMultiplier(int value, int multiplier)
         {
-            return UtilitiesInternal.RoundUpToTheNearestMultiplier(value, multiplier);
+            return UtilitiesInternal.RoundUpToTheNearestMultiplierInternal(value, multiplier);
         }
 
         public static BeatBar[] CalculateBeatBars(Tempo[] tempoChanges, int resolution = 192, int ts = 4,
@@ -140,7 +140,7 @@ public static BeatBar[] CalculateBeatBars(Tempo[] tempoChanges, int resolution =
         /// <param name="delta">The plus/minus delta to test the current position against.</param>
         public static float CalculateAccuracyRatio(int position, int currentPosition, int delta = 50)
         {
-            return UtilitiesInternal.CalculateAccuracyRatio(position, currentPosition, delta);
+            return UtilitiesInternal.CalculateAccuracyRatioInternal(position, currentPosition, delta);
         }
 
     }

include/RhythmGameUtilities/Common.hpp

@@ -51,7 +51,7 @@ extern "C"
  * @private
  */
 
-std::string Trim(const char *contents)
+inline std::string Trim(const char *contents)
 {
     return std::regex_replace(contents, std::regex("^\\s+|\\s+$"), "");
 }
@@ -64,7 +64,8 @@ std::string Trim(const char *contents)
  * @private
  */
 
-std::vector<std::string> Split(const char *contents, const char delimiter)
+inline std::vector<std::string> Split(const char *contents,
+                                      const char delimiter)
 {
     auto parts = std::vector<std::string>();
 
@@ -80,8 +81,8 @@ std::vector<std::string> Split(const char *contents, const char delimiter)
     return parts;
 }
 
-std::vector<std::string> FindAllMatches(const char *contents,
-                                        std::regex pattern)
+inline std::vector<std::string> FindAllMatches(const char *contents,
+                                               std::regex pattern)
 {
     auto currentMatch =
         std::cregex_iterator(contents, contents + strlen(contents), pattern);
@@ -101,8 +102,8 @@ std::vector<std::string> FindAllMatches(const char *contents,
     return matches;
 }
 
-std::vector<std::string> FindMatchGroups(const char *contents,
-                                         std::regex pattern)
+inline std::vector<std::string> FindMatchGroups(const char *contents,
+                                                std::regex pattern)
 {
     auto currentMatch =
         std::cregex_iterator(contents, contents + strlen(contents), pattern);

include/RhythmGameUtilities/CommonInternal.hpp

@@ -0,0 +1,27 @@
+#pragma once
+
+#include "Common.hpp"
+
+#ifdef _WIN32
+#define PACKAGE_API __declspec(dllexport)
+#else
+#define PACKAGE_API
+#endif
+
+namespace RhythmGameUtilities
+{
+
+extern "C"
+{
+    PACKAGE_API float LerpInternal(float a, float b, float t)
+    {
+        return Lerp(a, b, t);
+    }
+
+    PACKAGE_API float InverseLerpInternal(float a, float b, float v)
+    {
+        return InverseLerp(a, b, v);
+    }
+}
+
+} // namespace RhythmGameUtilities

include/RhythmGameUtilities/Enums/Difficulty.h

@@ -22,7 +22,7 @@ typedef enum Difficulty
 
 } DifficultyType;
 
-std::string ToString(Difficulty difficulty)
+inline std::string ToString(Difficulty difficulty)
 {
     switch (difficulty)
     {

include/RhythmGameUtilities/Enums/NamedSection.h

@@ -17,7 +17,7 @@ typedef enum NamedSection
     Events
 } NamedSectionType;
 
-std::string ToString(NamedSection namedSection)
+inline std::string ToString(NamedSection namedSection)
 {
     switch (namedSection)
     {

include/RhythmGameUtilities/Enums/TypeCode.h

@@ -22,7 +22,7 @@ typedef enum TypeCode
 
 } TypeCodeType;
 
-std::string ToString(TypeCode typeCode)
+inline std::string ToString(TypeCode typeCode)
 {
     switch (typeCode)
     {

include/RhythmGameUtilities/File.hpp

@@ -16,7 +16,7 @@ namespace RhythmGameUtilities
  * @public
  */
 
-std::vector<uint8_t> ReadBytesFromFile(const char *path)
+inline std::vector<uint8_t> ReadBytesFromFile(const char *path)
 {
     std::ifstream file(path, std::ios::binary | std::ios::ate);
 
@@ -43,7 +43,7 @@ std::vector<uint8_t> ReadBytesFromFile(const char *path)
  * @public
  */
 
-std::string ReadStringFromFile(const char *path)
+inline std::string ReadStringFromFile(const char *path)
 {
     std::ifstream file(path);
 

include/RhythmGameUtilities/Parsers.hpp

@@ -15,12 +15,6 @@
 
 #include "Common.hpp"
 
-#ifdef _WIN32
-#define PACKAGE_API __declspec(dllexport)
-#else
-#define PACKAGE_API
-#endif
-
 namespace RhythmGameUtilities
 {
 
@@ -45,8 +39,8 @@ std::regex CHART_SECTION_LINE_PATTERN("([^=]+)\\s*=([^\\r\\n]+)");
 
 std::regex JSON_VALUE_PATTERN("(\"[^\"]+\"|\\S+)");
 
-std::map<std::string,
-         std::vector<std::pair<std::string, std::vector<std::string>>>>
+inline std::map<std::string,
+                std::vector<std::pair<std::string, std::vector<std::string>>>>
 ParseSectionsFromChart(const char *contents)
 {
     auto matches = FindAllMatches(contents, CHART_SECTION_PATTERN);
@@ -93,7 +87,7 @@ ParseSectionsFromChart(const char *contents)
     return sections;
 }
 
-std::map<std::string, std::string> ParseMetaDataFromChartSection(
+inline std::map<std::string, std::string> ParseMetaDataFromChartSection(
     std::vector<std::pair<std::string, std::vector<std::string>>> section)
 {
     auto data = std::map<std::string, std::string>();
@@ -106,7 +100,7 @@ std::map<std::string, std::string> ParseMetaDataFromChartSection(
     return data;
 }
 
-std::vector<TimeSignature> ParseTimeSignatureChangesFromChartSection(
+inline std::vector<TimeSignature> ParseTimeSignatureChangesFromChartSection(
     std::vector<std::pair<std::string, std::vector<std::string>>> section)
 {
     auto timeSignaturesChanges = std::vector<TimeSignature>();
@@ -127,7 +121,7 @@ std::vector<TimeSignature> ParseTimeSignatureChangesFromChartSection(
     return timeSignaturesChanges;
 }
 
-std::vector<Tempo> ParseTempoChangesFromChartSection(
+inline std::vector<Tempo> ParseTempoChangesFromChartSection(
     std::vector<std::pair<std::string, std::vector<std::string>>> section)
 {
     auto tempoChanges = std::vector<Tempo>();
@@ -146,7 +140,7 @@ std::vector<Tempo> ParseTempoChangesFromChartSection(
     return tempoChanges;
 }
 
-std::vector<Note> ParseNotesFromChartSection(
+inline std::vector<Note> ParseNotesFromChartSection(
     std::vector<std::pair<std::string, std::vector<std::string>>> section)
 {
     auto notes = std::vector<Note>();
@@ -164,7 +158,7 @@ std::vector<Note> ParseNotesFromChartSection(
     return notes;
 }
 
-std::map<int, std::string> ParseLyricsFromChartSection(
+inline std::map<int, std::string> ParseLyricsFromChartSection(
     std::vector<std::pair<std::string, std::vector<std::string>>> section)
 {
     auto lyrics = std::map<int, std::string>();

include/RhythmGameUtilities/ParsersInternal.hpp

@@ -15,9 +15,8 @@ namespace RhythmGameUtilities
 
 extern "C"
 {
-    PACKAGE_API
-    ChartSectionInternal *ParseSectionsFromChartInternal(const char *contents,
-                                                         int *outSize)
+    PACKAGE_API ChartSectionInternal *
+    ParseSectionsFromChartInternal(const char *contents, int *outSize)
     {
         auto internalSections = ParseSectionsFromChart(contents);
 

include/RhythmGameUtilities/RhythmGameUtilities.cpp

@@ -2,6 +2,7 @@
 
 #include "Audio.hpp"
 #include "Common.hpp"
+#include "CommonInternal.hpp"
 #include "Parsers.hpp"
 #include "ParsersInternal.hpp"
 #include "Utilities.hpp"