clang-format edit

Bartanakin · Oct 20, 2024 · af3d39b · af3d39b
1 parent be41b9d
commit af3d39b
Show file tree

Hide file tree

Showing 3 changed files with 108 additions and 49 deletions.
diff --git a/include/Collisions/CollisionExecutors/CollisionTestExecutor.h b/include/Collisions/CollisionExecutors/CollisionTestExecutor.h
@@ -30,8 +30,11 @@ class CollisionTestExecutor {
             auto j = list2.begin();
             while (j != list2.end()) {
                 collisionResults.push_back(
-                    {(*i)->getHitbox()
-                         ->intersects(*((*j)->getHitbox()), *(this->collisionDetectionStrategy), (*i)->getDynamicsDTO().getRelativeDynamics((*j)->getDynamicsDTO())),
+                    {(*i)->getHitbox()->intersects(
+                         *((*j)->getHitbox()),
+                         *(this->collisionDetectionStrategy),
+                         (*i)->getDynamicsDTO().getRelativeDynamics((*j)->getDynamicsDTO())
+                     ),
                      (*i),
                      (*j)}
                 );

diff --git a/include/Graphics/SpriteBuilder/SpriteBuilder.h b/include/Graphics/SpriteBuilder/SpriteBuilder.h
@@ -1,46 +1,106 @@
 #pragma once
-#include "../Color.h"
 #include "../../Geometrics/Vector2f.h"
+#include "../Color.h"
 
-namespace Barta{
-    class SpriteBuilder {
-        public:
-        SpriteBuilder() noexcept = default;
-        ~SpriteBuilder() noexcept = default;
-
-        SpriteBuilder* setColor1(Color color) { this->color1 = color; return this; }
-        SpriteBuilder* setColor2(Color color) { this->color2 = color; return this; }
-        SpriteBuilder* setColor3(Color color) { this->color3 = color; return this; }
-        SpriteBuilder* setColor4(Color color) { this->color4 = color; return this; }
-        SpriteBuilder* setAllColors(Color color) {
-            this->color1 = color;
-            this->color2 = color;
-            this->color3 = color;
-            this->color4 = color;
-
-            return this;
-        }
-
-        SpriteBuilder* setVertex1(Vector2f vertex) { this->vertex1 = vertex; return this; }
-        SpriteBuilder* setVertex2(Vector2f vertex) { this->vertex2 = vertex; return this; }
-        SpriteBuilder* setVertex3(Vector2f vertex) { this->vertex3 = vertex; return this; }
-        SpriteBuilder* setSize(Vector2f size) { this->size = size; return this; }
-        SpriteBuilder* setString(std::string string) { this->string = string; return this; }
-        SpriteBuilder* setFontSize(int fontSize) { this->fontSize = fontSize; return this; }
-
-        protected:
-        Color color1;
-        Color color2;
-        Color color3;
-        Color color4;
-
-        Vector2f vertex1;
-        Vector2f vertex2;
-        Vector2f vertex3;
-
-        Vector2f size;
-        std::string string;
-        int fontSize;
-    };
-}
+namespace Barta {
+class SpriteBuilder {
+public:
+    SpriteBuilder() noexcept = default;
+    ~SpriteBuilder() noexcept = default;
+
+    SpriteBuilder* setColor1(
+        Color color
+    ) {
+        this->color1 = color;
+        return this;
+    }
+
+    SpriteBuilder* setColor2(
+        Color color
+    ) {
+        this->color2 = color;
+        return this;
+    }
+
+    SpriteBuilder* setColor3(
+        Color color
+    ) {
+        this->color3 = color;
+        return this;
+    }
+
+    SpriteBuilder* setColor4(
+        Color color
+    ) {
+        this->color4 = color;
+        return this;
+    }
+
+    SpriteBuilder* setAllColors(
+        Color color
+    ) {
+        this->color1 = color;
+        this->color2 = color;
+        this->color3 = color;
+        this->color4 = color;
+
+        return this;
+    }
 
+    SpriteBuilder* setVertex1(
+        Vector2f vertex
+    ) {
+        this->vertex1 = vertex;
+        return this;
+    }
+
+    SpriteBuilder* setVertex2(
+        Vector2f vertex
+    ) {
+        this->vertex2 = vertex;
+        return this;
+    }
+
+    SpriteBuilder* setVertex3(
+        Vector2f vertex
+    ) {
+        this->vertex3 = vertex;
+        return this;
+    }
+
+    SpriteBuilder* setSize(
+        Vector2f size
+    ) {
+        this->size = size;
+        return this;
+    }
+
+    SpriteBuilder* setString(
+        std::string string
+    ) {
+        this->string = string;
+        return this;
+    }
+
+    SpriteBuilder* setFontSize(
+        int fontSize
+    ) {
+        this->fontSize = fontSize;
+        return this;
+    }
+
+protected:
+    Color color1;
+    Color color2;
+    Color color3;
+    Color color4;
+
+    Vector2f vertex1;
+    Vector2f vertex2;
+    Vector2f vertex3;
+
+    Vector2f size;
+    std::string string;
+    int fontSize;
+};
+}
diff --git a/lib/Graphics/SpriteBuilder/SpriteMerger.cpp b/lib/Graphics/SpriteBuilder/SpriteMerger.cpp
@@ -80,11 +80,7 @@ Barta::SpriteMerger* Barta::SpriteMerger::addTriangle(
         this->data.push_back(0.f);
     }
 
-    for (const auto& color: {
-             triangleSprite.color1,
-             triangleSprite.color2,
-             triangleSprite.color3
-         }) {
+    for (const auto& color: {triangleSprite.color1, triangleSprite.color2, triangleSprite.color3}) {
         this->data.push_back(color.r);
         this->data.push_back(color.g);
         this->data.push_back(color.b);