fix format

Author: jube

.clang-format

@@ -1,7 +1,7 @@
 # format style for gf2
 AccessModifierOffset: -2
 AlignAfterOpenBracket: DontAlign
-AlignArrayOfStructures: Right
+AlignArrayOfStructures: Left
 AlignEscapedNewlines: Left
 AllowShortBlocksOnASingleLine: Never
 AlwaysBreakAfterReturnType: None

examples/01-colors.cc

@@ -14,43 +14,41 @@ int main()
   constexpr gf::Vec2I Size = { 64, 64 };
 
   constexpr std::tuple<std::string_view, gf::Color> Colors[] = {
-    { "black", gf::Black },
-    { "white", gf::White },
-    { "gray", gf::Gray },
-
-    { "red", gf::Red },
-    { "vermilion", gf::Vermilion },
-    { "orange", gf::Orange },
-    { "amber", gf::Amber },
-    { "yellow", gf::Yellow },
-    { "lime", gf::Lime },
+    { "black",      gf::Black      },
+    { "white",      gf::White      },
+    { "gray",       gf::Gray       },
+
+    { "red",        gf::Red        },
+    { "vermilion",  gf::Vermilion  },
+    { "orange",     gf::Orange     },
+    { "amber",      gf::Amber      },
+    { "yellow",     gf::Yellow     },
+    { "lime",       gf::Lime       },
     { "chartreuse", gf::Chartreuse },
-    { "harlequin", gf::Harlequin },
-    { "green", gf::Green },
-    { "erin", gf::Erin },
-    { "spring", gf::Spring },
+    { "harlequin",  gf::Harlequin  },
+    { "green",      gf::Green      },
+    { "erin",       gf::Erin       },
+    { "spring",     gf::Spring     },
     { "aquamarine", gf::Aquamarine },
-    { "cyan", gf::Cyan },
-    { "capri", gf::Capri },
-    { "azure", gf::Azure },
-    { "cerulean", gf::Cerulean },
-    { "blue", gf::Blue },
-    { "indigo", gf::Indigo },
-    { "violet", gf::Violet },
-    { "purple", gf::Purple },
-    { "magenta", gf::Magenta },
-    { "cerise", gf::Cerise },
-    { "rose", gf::Rose },
-    { "crimson", gf::Crimson },
+    { "cyan",       gf::Cyan       },
+    { "capri",      gf::Capri      },
+    { "azure",      gf::Azure      },
+    { "cerulean",   gf::Cerulean   },
+    { "blue",       gf::Blue       },
+    { "indigo",     gf::Indigo     },
+    { "violet",     gf::Violet     },
+    { "purple",     gf::Purple     },
+    { "magenta",    gf::Magenta    },
+    { "cerise",     gf::Cerise     },
+    { "rose",       gf::Rose       },
+    { "crimson",    gf::Crimson    },
   };
 
-
-  for (auto [ name, color ] : Colors) {
+  for (auto [name, color] : Colors) {
     std::filesystem::path filename = name;
     filename.concat(".png");
 
     gf::Image image(Size, color);
     image.save_to_file(filename);
   }
-
 }

examples/14-curve.cc

@@ -14,7 +14,7 @@ int main()
   gf::SingleSceneManager scene_manager("14-curve | gf2", gf::vec(1600, 900));
 
   constexpr gf::Vec2F SplinePoints[] = {
-    {  50.0f, 500.0f },
+    { 50.0f,  500.0f },
     { 150.0f, 550.0f },
     { 150.0f, 450.0f },
     { 300.0f, 500.0f },

include/gf2/core/Camera.h

@@ -28,9 +28,7 @@ namespace gf {
     Vec2F center = { 0.0f, 0.0f };
     Vec2F size = { 2.0f, 2.0f };
     float rotation = 0.0f;
-    // clang-format off
-    RectF viewport = {{ 0.0f, 0.0f }, { 1.0f, 1.0f }};
-    // clang-format on
+    RectF viewport = RectF::from_size({ 1.0f, 1.0f });
     // NOLINTEND(cppcoreguidelines-non-private-member-variables-in-classes)
 
     Camera() = default;
@@ -57,9 +55,7 @@ namespace gf {
 
   private:
     Vec2F m_computed_size = { 2.0f, 2.0f };
-    // clang-format off
-    RectF m_computed_viewport = {{ 0.0f, 0.0f }, { 1.0f, 1.0f }};
-    // clang-format on
+    RectF m_computed_viewport = RectF::from_size({ 1.0f, 1.0f });
   };
 
 }

include/gf2/core/ControlSettings.h

@@ -128,6 +128,7 @@ namespace gf {
     }
 
   private:
+    // clang-format off
     std::variant<
       std::monostate,
       KeycodeControlSettings,
@@ -136,6 +137,7 @@ namespace gf {
       GamepadButtonControlSettings,
       GamepadAxisControlSettings
     > m_data;
+    // clang-format on
   };
 
   template<typename Archive>

include/gf2/core/Rational.h

@@ -331,14 +331,16 @@ namespace gf {
       T q;
       T r;
 
-      void normalize() {
+      void normalize()
+      {
         while (r < T(0)) {
           r += d;
           --q;
         }
       }
 
-      void step() {
+      void step()
+      {
         n = r;
         d = r;
         q = n / d;

include/gf2/core/TaggedVariant.h

@@ -9,7 +9,7 @@
 
 namespace gf {
 
-  template<typename Enum, typename ... Args>
+  template<typename Enum, typename... Args>
   class TaggedVariant {
   public:
     TaggedVariant() = default;
@@ -79,13 +79,13 @@ namespace gf {
 
   }
 
-  template<typename Archive, typename Enum, typename ... Args>
+  template<typename Archive, typename Enum, typename... Args>
   inline Archive& operator|(Archive& ar, TaggedVariant<Enum, Args...>& variant)
   {
     return details::handle_tagged_variant_serialization(ar, variant);
   }
 
-  template<typename Archive, typename Enum, typename ... Args>
+  template<typename Archive, typename Enum, typename... Args>
   inline Archive& operator|(Archive& ar, const TaggedVariant<Enum, Args...>& variant)
   {
     return details::handle_tagged_variant_serialization(ar, variant);

include/gf2/graphics/Event.h

@@ -65,8 +65,10 @@ namespace gf {
     TouchMoved,
   };
 
+  // clang-format off
   struct GF_GRAPHICS_API QuitEvent {
   };
+  // clang-format on
 
   struct GF_GRAPHICS_API WindowShownEvent {
     uint32_t window_id;
@@ -149,7 +151,6 @@ namespace gf {
     Flags<Modifier> modifiers;
   };
 
-
   // struct GF_GRAPHICS_API TextEditedEvent {
   //   uint32_t window_id;
   //   std::string_view text;
@@ -308,6 +309,7 @@ namespace gf {
   private:
     uint64_t m_timestamp = 0;
 
+    // clang-format off
     std::variant<
       std::monostate,
       QuitEvent,
@@ -350,6 +352,7 @@ namespace gf {
       TouchReleasedEvent,
       TouchMovedEvent
     > m_data;
+    // clang-format on
   };
 
 } // namespace gf

library/core/GridMap.cc

@@ -507,7 +507,7 @@ namespace gf {
       {
         auto min_x = round_ties_down(depth * start_slope);
         auto max_x = round_ties_up(depth * end_slope);
-        return rectangle_range(RectI::from_position_size({min_x, depth  }, { max_x - min_x + 1, 1 }));
+        return rectangle_range(RectI::from_position_size({ min_x, depth }, { max_x - min_x + 1, 1 }));
       }
 
       Row next() const
@@ -535,7 +535,7 @@ namespace gf {
         map->add_properties(origin, properties);
 
         for (auto direction : { Direction::Up, Direction::Left, Direction::Down, Direction::Right }) {
-          const Quadrant quadrant = { direction , origin };
+          const Quadrant quadrant = { direction, origin };
           compute_visibility_in_quadrant(origin, range_limit, quadrant);
         }
       }

library/core/SpriteData.cc

@@ -9,7 +9,7 @@ namespace gf {
 
   uint32_t SpriteGroupResource::add_texture(const std::filesystem::path& texture_path)
   {
-    for (auto [ index, known_texture_path ] : enumerate(textures)) {
+    for (auto [index, known_texture_path] : enumerate(textures)) {
       if (texture_path == known_texture_path) {
         return uint32_t(index);
       }