Merge pull request #105 from neogeek/hotfix/code-cleanup

[hotfix] Code cleanup

Author: neogeek

.clang-tidy

@@ -1 +1,3 @@
-Checks: '-*,clang-analyzer-*,-clang-analyzer-cplusplus*'
+Checks: 'performance-*,modernize-*,readability-*,-readability-identifier-length'
+CheckOptions:
+  UnusedIncludes: Strict

.clangd

@@ -2,3 +2,8 @@ CompileFlags:
   Add:
     - '-std=c++17'
     - '-Iinclude'
+Diagnostics:
+  UnusedIncludes: Strict
+  ClangTidy:
+    Add: [performance-*, modernize-*, readability-*]
+    Remove: [readability-identifier-length]

.vscode/c_cpp_properties.json

@@ -13,7 +13,7 @@
       "name": "Win32",
       "includePath": ["${workspaceFolder}/**", "${workspaceFolder}/include"],
       "defines": [],
-      "compilerPath": "C:/Program Files/Microsoft Visual Studio/2022/Preview/VC/Tools/MSVC/14.40.33617/bin/Hostx64/x64/cl.exe",
+      "compilerPath": "${env:VCINSTALLDIR}/bin/Hostx64/x64/cl.exe",
       "cStandard": "c17",
       "cppStandard": "c++17",
       "intelliSenseMode": "windows-msvc-x64"

compile_flags.txt

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <algorithm>
 #include <cmath>
 
 #ifdef _WIN32
@@ -23,10 +24,10 @@ extern "C"
      * @public
      */
 
-    PACKAGE_API int **ConvertSamplesToWaveform(float *samples, int size,
+    PACKAGE_API int **ConvertSamplesToWaveform(const float *samples, int size,
                                                int width, int height)
     {
-        auto waveform = new int *[width];
+        auto *waveform = new int *[width];
 
         auto step = floor(size / width);
         auto amp = height / 2;
@@ -35,24 +36,17 @@ extern "C"
         {
             waveform[x] = new int[height];
 
-            auto min = 1.0f;
-            auto max = -1.0f;
+            auto min = 1.0F;
+            auto max = -1.0F;
 
             for (auto j = 0; j < step; j += 1)
             {
-                auto index = static_cast<int>(x * step + j);
+                auto index = static_cast<int>((x * step) + j);
 
                 auto datum = samples[index];
 
-                if (datum < min)
-                {
-                    min = datum;
-                }
-
-                if (datum > max)
-                {
-                    max = datum;
-                }
+                min = std::min(datum, min);
+                max = std::max(datum, max);
             }
 
             auto minY = static_cast<int>((1 + min) * amp);

include/RhythmGameUtilities/Audio.hpp

@@ -26,7 +26,7 @@ extern "C"
 
     PACKAGE_API float Lerp(float a, float b, float t)
     {
-        return (1 - t) * a + b * t;
+        return ((1 - t) * a) + (b * t);
     }
 
     /**
@@ -40,7 +40,7 @@ extern "C"
 
     PACKAGE_API float InverseLerp(float a, float b, float v)
     {
-        return std::clamp(((v - a) / (b - a)), 0.0f, 1.0f);
+        return std::clamp(((v - a) / (b - a)), 0.0F, 1.0F);
     }
 }
 
@@ -82,7 +82,7 @@ inline std::vector<std::string> Split(const char *contents,
 }
 
 inline std::vector<std::string> FindAllMatches(const char *contents,
-                                               std::regex pattern)
+                                               const std::regex &pattern)
 {
     auto currentMatch =
         std::cregex_iterator(contents, contents + strlen(contents), pattern);
@@ -103,14 +103,14 @@ inline std::vector<std::string> FindAllMatches(const char *contents,
 }
 
 inline std::vector<std::string> FindMatchGroups(const char *contents,
-                                                std::regex pattern)
+                                                const std::regex &pattern)
 {
     auto currentMatch =
         std::cregex_iterator(contents, contents + strlen(contents), pattern);
 
     auto matches = std::vector<std::string>();
 
-    auto match = *currentMatch;
+    const auto &match = *currentMatch;
 
     for (auto i = 0; i < match.size(); i += 1)
     {

include/RhythmGameUtilities/Common.hpp

@@ -7,7 +7,6 @@ namespace RhythmGameUtilities
 
 typedef enum Difficulty
 {
-
     // Easy Difficulty
     Easy,
 
@@ -19,7 +18,6 @@ typedef enum Difficulty
 
     // Expert Difficulty
     Expert
-
 } DifficultyType;
 
 inline std::string ToString(Difficulty difficulty)

include/RhythmGameUtilities/Enums/Difficulty.h renamed to include/RhythmGameUtilities/Enums/Difficulty.hpp

@@ -7,7 +7,6 @@ namespace RhythmGameUtilities
 
 typedef enum TypeCode
 {
-
     /// BPM Marker
     BPM_Marker,
 
@@ -19,7 +18,6 @@ typedef enum TypeCode
 
     /// Event Marker
     EventMarker
-
 } TypeCodeType;
 
 inline std::string ToString(TypeCode typeCode)

include/RhythmGameUtilities/Enums/NamedSection.h renamed to include/RhythmGameUtilities/Enums/NamedSection.hpp

@@ -22,7 +22,7 @@ inline std::vector<uint8_t> ReadBytesFromFile(const char *path)
 
     if (!file.is_open())
     {
-        std::cerr << "Failed to open " << path << "." << std::endl;
+        std::cerr << "Failed to open " << path << ".\n";
     }
 
     auto fileSize = file.tellg();
@@ -49,13 +49,13 @@ inline std::string ReadStringFromFile(const char *path)
 
     if (!file)
     {
-        std::cerr << "Failed to open " << path << "." << std::endl;
+        std::cerr << "Failed to open " << path << ".\n";
 
         return "";
     }
 
-    return std::string((std::istreambuf_iterator<char>(file)),
-                       std::istreambuf_iterator<char>());
+    return {(std::istreambuf_iterator<char>(file)),
+            std::istreambuf_iterator<char>()};
 }
 
 } // namespace RhythmGameUtilities