Format code with clang-format

I thought that I had a formatter enabled in my IDE already, but apparently I don't. Add the .clang-format file so that CLion uses ClangFormat and format every file so that my C++ code looks way less embarrassing.
meisekimiu · Jun 12, 2024 · 5119c03 · 5119c03
1 parent c632330
commit 5119c03
Show file tree

Hide file tree

Showing 108 changed files with 2,851 additions and 2,941 deletions.
diff --git a/.clang-format b/.clang-format
diff --git a/src/audio/AudioDevice.h b/src/audio/AudioDevice.h
@@ -6,13 +6,16 @@
 #include "Stream.h"
 
 namespace Adagio {
-    template<class SampleType, class StreamType>
-    class AudioDevice {
-    public:
-        virtual void playSample(const Sample &sample, AudioLibrary<SampleType, StreamType> &audioLibrary) = 0;
+template <class SampleType, class StreamType> class AudioDevice {
+public:
+  virtual void
+  playSample(const Sample &sample,
+             AudioLibrary<SampleType, StreamType> &audioLibrary) = 0;
 
-        virtual void playStream(const Stream &stream, AudioLibrary<SampleType, StreamType> &audioLibrary) = 0;
-    };
-}
+  virtual void
+  playStream(const Stream &stream,
+             AudioLibrary<SampleType, StreamType> &audioLibrary) = 0;
+};
+} // namespace Adagio
 
-#endif //GL_ADAGIO_AUDIODEVICE_H
+#endif // GL_ADAGIO_AUDIODEVICE_H
diff --git a/src/audio/AudioLibrary.h b/src/audio/AudioLibrary.h
@@ -7,42 +7,36 @@
 #include "Stream.h"
 
 namespace Adagio {
-    template<class SampleType, class StreamType>
-    class AudioLibrary {
-    public:
-        explicit AudioLibrary(AssetLoader<SampleType, AudioMetadata> *sampleLoader,
-                              AssetLoader<StreamType, AudioMetadata> *streamLoader) : sampleLibrary(sampleLoader),
-                                                                                      streamLibrary(streamLoader) {
-        }
-
-        Sample loadSample(const std::string &resource) {
-            return Sample(sampleLibrary.load(resource));
-        }
-
-        SampleType useSample(const Sample &sample) {
-            return sampleLibrary.useResource(sample);
-        }
-
-        Stream loadStream(const std::string &resource) {
-            return Stream(streamLibrary.load(resource));
-        }
-
-        StreamType useStream(const Stream &stream) {
-            return streamLibrary.useResource(stream);
-        }
-
-        void unload(Sample &sample) {
-            sampleLibrary.unload(sample);
-        }
-
-        void unload(Stream &stream) {
-            streamLibrary.unload(stream);
-        }
-
-    private:
-        ResourceLibrary<SampleType, AudioMetadata, AudioHandle> sampleLibrary;
-        ResourceLibrary<StreamType, AudioMetadata, AudioHandle> streamLibrary;
-    };
-}
-
-#endif //GL_ADAGIO_AUDIOLIBRARY_H
+template <class SampleType, class StreamType> class AudioLibrary {
+public:
+  explicit AudioLibrary(AssetLoader<SampleType, AudioMetadata> *sampleLoader,
+                        AssetLoader<StreamType, AudioMetadata> *streamLoader)
+      : sampleLibrary(sampleLoader), streamLibrary(streamLoader) {}
+
+  Sample loadSample(const std::string &resource) {
+    return Sample(sampleLibrary.load(resource));
+  }
+
+  SampleType useSample(const Sample &sample) {
+    return sampleLibrary.useResource(sample);
+  }
+
+  Stream loadStream(const std::string &resource) {
+    return Stream(streamLibrary.load(resource));
+  }
+
+  StreamType useStream(const Stream &stream) {
+    return streamLibrary.useResource(stream);
+  }
+
+  void unload(Sample &sample) { sampleLibrary.unload(sample); }
+
+  void unload(Stream &stream) { streamLibrary.unload(stream); }
+
+private:
+  ResourceLibrary<SampleType, AudioMetadata, AudioHandle> sampleLibrary;
+  ResourceLibrary<StreamType, AudioMetadata, AudioHandle> streamLibrary;
+};
+} // namespace Adagio
+
+#endif // GL_ADAGIO_AUDIOLIBRARY_H
diff --git a/src/audio/AudioMetadata.h b/src/audio/AudioMetadata.h
@@ -2,10 +2,10 @@
 #define GL_ADAGIO_AUDIOMETADATA_H
 
 namespace Adagio {
-    typedef unsigned int AudioHandle;
-    
-    struct AudioMetadata {
-        double duration;
-    };
-}
-#endif //GL_ADAGIO_AUDIOMETADATA_H
+typedef unsigned int AudioHandle;
+
+struct AudioMetadata {
+  double duration;
+};
+} // namespace Adagio
+#endif // GL_ADAGIO_AUDIOMETADATA_H
diff --git a/src/audio/AudioService.h b/src/audio/AudioService.h
@@ -6,29 +6,24 @@
 #include "AudioMetadata.h"
 
 namespace Adagio {
-    typedef unsigned int AudioHandle;
+typedef unsigned int AudioHandle;
 
-    template<class SampleType, class StreamType>
-    class AudioService {
-    public:
-        explicit AudioService(AudioDevice<SampleType, StreamType> *audioPlayer,
-                              AudioLibrary<SampleType, StreamType> *audioLibrary) {
-            audioDevice = audioPlayer;
-            this->audioLibrary = audioLibrary;
-        }
+template <class SampleType, class StreamType> class AudioService {
+public:
+  explicit AudioService(AudioDevice<SampleType, StreamType> *audioPlayer,
+                        AudioLibrary<SampleType, StreamType> *audioLibrary) {
+    audioDevice = audioPlayer;
+    this->audioLibrary = audioLibrary;
+  }
 
-        void play(Sample sample) {
-            audioDevice->playSample(sample, *audioLibrary);
-        }
+  void play(Sample sample) { audioDevice->playSample(sample, *audioLibrary); }
 
-        void play(Stream stream) {
-            audioDevice->playStream(stream, *audioLibrary);
-        }
+  void play(Stream stream) { audioDevice->playStream(stream, *audioLibrary); }
 
-    private:
-        AudioDevice<SampleType, StreamType> *audioDevice;
-        AudioLibrary<SampleType, StreamType> *audioLibrary;
-    };
-}
+private:
+  AudioDevice<SampleType, StreamType> *audioDevice;
+  AudioLibrary<SampleType, StreamType> *audioLibrary;
+};
+} // namespace Adagio
 
-#endif //GL_ADAGIO_AUDIOSERVICE_H
+#endif // GL_ADAGIO_AUDIOSERVICE_H
diff --git a/src/audio/Sample.h b/src/audio/Sample.h
@@ -5,12 +5,10 @@
 #include "AudioMetadata.h"
 
 namespace Adagio {
-    struct Sample : public Asset<AudioHandle, AudioMetadata> {
-        Sample(const Asset<AudioHandle, AudioMetadata> &&asset) : Asset(asset.handle, asset.getSecretId(),
-                                                                        asset.getMetadata()) {
+struct Sample : public Asset<AudioHandle, AudioMetadata> {
+  explicit Sample(const Asset<AudioHandle, AudioMetadata> &&asset)
+      : Asset(asset.handle, asset.getSecretId(), asset.getMetadata()) {}
+};
+} // namespace Adagio
 
-        }
-    };
-}
-
-#endif //GL_ADAGIO_SAMPLE_H
+#endif // GL_ADAGIO_SAMPLE_H
diff --git a/src/audio/Stream.h b/src/audio/Stream.h
@@ -5,11 +5,11 @@
 #include "AudioMetadata.h"
 
 namespace Adagio {
-    struct Stream : public Asset<AudioHandle, AudioMetadata> {
-        Stream(Asset<AudioHandle, AudioMetadata> &&asset) : Asset<AudioHandle, AudioMetadata>(asset.handle,
-                                                                                              asset.getSecretId(),
-                                                                                              asset.getMetadata()) {}
-    };
-}
+struct Stream : public Asset<AudioHandle, AudioMetadata> {
+  explicit Stream(Asset<AudioHandle, AudioMetadata> &&asset)
+      : Asset<AudioHandle, AudioMetadata>(asset.handle, asset.getSecretId(),
+                                          asset.getMetadata()) {}
+};
+} // namespace Adagio
 
-#endif //GL_ADAGIO_STREAM_H
+#endif // GL_ADAGIO_STREAM_H
diff --git a/src/backends/raylib/RaylibGraphicsDevice.cpp b/src/backends/raylib/RaylibGraphicsDevice.cpp
@@ -1,36 +1,38 @@
 #include "RaylibGraphicsDevice.h"
 
 void RaylibGraphicsDevice::begin() {
-    ClearBackground({clearColor.r, clearColor.g, clearColor.b, clearColor.a});
-    BeginDrawing();
+  ClearBackground({clearColor.r, clearColor.g, clearColor.b, clearColor.a});
+  BeginDrawing();
 }
 
-void RaylibGraphicsDevice::end() {
-    EndDrawing();
-}
+void RaylibGraphicsDevice::end() { EndDrawing(); }
 
 void RaylibGraphicsDevice::setClearColor(const Adagio::Color &color) {
-    clearColor = color;
+  clearColor = color;
 }
 
 static Rectangle AdagioRectToRaylibRect(const Adagio::RectF &rect) {
-    return {rect.x(), rect.y(), rect.width(), rect.height()};
+  return {rect.x(), rect.y(), rect.width(), rect.height()};
 }
 
-void
-RaylibGraphicsDevice::drawTexture(Adagio::Texture2D &texture, const Adagio::RectF &source, const Adagio::RectF &dest,
-                                  const Adagio::Vector2d &origin, float rotation, const Adagio::Color &tint) {
-    RaylibTexture raylibTex = textureManager.useTexture(texture);
-    DrawTexturePro(raylibTex, AdagioRectToRaylibRect(source), AdagioRectToRaylibRect(dest),
-                   {static_cast<float>(origin.x), static_cast<float>(origin.y)}, rotation,
-                   {tint.r, tint.g, tint.b, tint.a});
+void RaylibGraphicsDevice::drawTexture(Adagio::Texture2D &texture,
+                                       const Adagio::RectF &source,
+                                       const Adagio::RectF &dest,
+                                       const Adagio::Vector2d &origin,
+                                       float rotation,
+                                       const Adagio::Color &tint) {
+  RaylibTexture raylibTex = textureManager.useTexture(texture);
+  DrawTexturePro(raylibTex, AdagioRectToRaylibRect(source),
+                 AdagioRectToRaylibRect(dest),
+                 {static_cast<float>(origin.x), static_cast<float>(origin.y)},
+                 rotation, {tint.r, tint.g, tint.b, tint.a});
 }
 
 Adagio::AbstractTextureManager *RaylibGraphicsDevice::getTextureManager() {
-    return &textureManager;
+  return &textureManager;
 }
 
-void RaylibGraphicsDevice::drawText(Font &font, const char *text, const Adagio::Vector2d &position, float fontSize,
-                                    float spacing, const Adagio::Color &tint) {
-
-}
+void RaylibGraphicsDevice::drawText(Font &font, const char *text,
+                                    const Adagio::Vector2d &position,
+                                    float fontSize, float spacing,
+                                    const Adagio::Color &tint) {}
diff --git a/src/backends/raylib/RaylibGraphicsDevice.h b/src/backends/raylib/RaylibGraphicsDevice.h
@@ -1,33 +1,34 @@
 #ifndef GL_ADAGIO_RAYLIBGRAPHICSDEVICE_H
 #define GL_ADAGIO_RAYLIBGRAPHICSDEVICE_H
 
-#include "raylib.h"
-#include "RaylibTextureLoader.h"
 #include "../../graphics/GraphicsDevice.h"
+#include "RaylibTextureLoader.h"
+#include "raylib.h"
 
 typedef Texture2D RaylibTexture;
 
 class RaylibGraphicsDevice : public Adagio::GraphicsDevice {
 private:
-    RaylibTextureLoader loader;
-    Adagio::TextureManager<RaylibTexture> textureManager{&loader};
-    Adagio::Color clearColor{0, 0, 0, 255};
-public:
-    void begin() override;
+  RaylibTextureLoader loader;
+  Adagio::TextureManager<RaylibTexture> textureManager{&loader};
+  Adagio::Color clearColor{0, 0, 0, 255};
 
-    void end() override;
+public:
+  void begin() override;
 
-    void setClearColor(const Adagio::Color &color) override;
+  void end() override;
 
-    Adagio::AbstractTextureManager *getTextureManager() override;
+  void setClearColor(const Adagio::Color &color) override;
 
-    void drawTexture(Adagio::Texture2D &texture, const Adagio::RectF &source, const Adagio::RectF &dest,
-                     const Adagio::Vector2d &origin, float rotation, const Adagio::Color &tint) override;
+  Adagio::AbstractTextureManager *getTextureManager() override;
 
-    void drawText(Font &font, const char *text, const Adagio::Vector2d &position, float fontSize, float spacing,
-                  const Adagio::Color &tint) override;
+  void drawTexture(Adagio::Texture2D &texture, const Adagio::RectF &source,
+                   const Adagio::RectF &dest, const Adagio::Vector2d &origin,
+                   float rotation, const Adagio::Color &tint) override;
 
+  void drawText(Font &font, const char *text, const Adagio::Vector2d &position,
+                float fontSize, float spacing,
+                const Adagio::Color &tint) override;
 };
 
-
-#endif //GL_ADAGIO_RAYLIBGRAPHICSDEVICE_H
+#endif // GL_ADAGIO_RAYLIBGRAPHICSDEVICE_H
diff --git a/src/backends/raylib/RaylibTexture.h b/src/backends/raylib/RaylibTexture.h
@@ -5,4 +5,4 @@
 
 typedef Texture2D RaylibTexture;
 
-#endif //GL_ADAGIO_RAYLIBTEXTURE_H
+#endif // GL_ADAGIO_RAYLIBTEXTURE_H
diff --git a/src/backends/raylib/RaylibTextureLoader.cpp b/src/backends/raylib/RaylibTextureLoader.cpp
@@ -1,12 +1,14 @@
 #include "RaylibTextureLoader.h"
 #include <utility>
 
-std::pair<RaylibTexture, Adagio::TextureDimensions> RaylibTextureLoader::load(const char *resource) {
-    RaylibTexture tex = LoadTexture(resource);
-    Adagio::TextureDimensions dims{static_cast<unsigned int>(tex.width), static_cast<unsigned int>(tex.height)};
-    return std::make_pair(tex, dims);
+std::pair<RaylibTexture, Adagio::TextureDimensions>
+RaylibTextureLoader::load(const char *resource) {
+  RaylibTexture tex = LoadTexture(resource);
+  Adagio::TextureDimensions dims{static_cast<unsigned int>(tex.width),
+                                 static_cast<unsigned int>(tex.height)};
+  return std::make_pair(tex, dims);
 }
 
 void RaylibTextureLoader::unload(RaylibTexture texture) {
-    UnloadTexture(texture);
+  UnloadTexture(texture);
 }
diff --git a/src/backends/raylib/RaylibTextureLoader.h b/src/backends/raylib/RaylibTextureLoader.h
@@ -1,15 +1,15 @@
 #ifndef GL_ADAGIO_RAYLIBTEXTURELOADER_H
 #define GL_ADAGIO_RAYLIBTEXTURELOADER_H
 
-#include "RaylibTexture.h"
 #include "../../graphics/TextureLoader.h"
+#include "RaylibTexture.h"
 
 class RaylibTextureLoader : public Adagio::TextureLoader<RaylibTexture> {
 public:
-    std::pair<RaylibTexture, Adagio::TextureDimensions> load(const char *resource) override;
+  std::pair<RaylibTexture, Adagio::TextureDimensions>
+  load(const char *resource) override;
 
-    void unload(RaylibTexture texture) override;
+  void unload(RaylibTexture texture) override;
 };
 
-
-#endif //GL_ADAGIO_RAYLIBTEXTURELOADER_H
+#endif // GL_ADAGIO_RAYLIBTEXTURELOADER_H
diff --git a/src/game/SandboxGame.cpp b/src/game/SandboxGame.cpp
@@ -3,14 +3,12 @@
 SandboxGame::SandboxGame(Adagio::SpriteBatch &sb) : Adagio::Game(sb) {}
 
 void SandboxGame::init() {
-    InitWindow(640, 480, "Raylib Test");
-    SetTargetFPS(60);
+  InitWindow(640, 480, "Raylib Test");
+  SetTargetFPS(60);
 }
 
 void SandboxGame::loadContent() {
-    // load game statez
+  // load game statez
 }
 
-void SandboxGame::cleanup() {
-    CloseWindow();
-}
+void SandboxGame::cleanup() { CloseWindow(); }
diff --git a/src/game/SandboxGame.h b/src/game/SandboxGame.h
@@ -6,13 +6,13 @@
 
 class SandboxGame : public Adagio::Game {
 public:
-    explicit SandboxGame(Adagio::SpriteBatch &sb);
-
-    void init() override;
+  explicit SandboxGame(Adagio::SpriteBatch &sb);
 
-    void loadContent() override;
+  void init() override;
 
-    void cleanup() override;
+  void loadContent() override;
+
+  void cleanup() override;
 };
 
-#endif //GL_ADAGIO_SANDBOXGAME_H
+#endif // GL_ADAGIO_SANDBOXGAME_H