fix format

jube · jube · commit 832dfe381f17 · 2024-11-07T21:43:46.000+01:00
diff --git a/bin/gf2_tmx_display.cc b/bin/gf2_tmx_display.cc
@@ -14,10 +14,10 @@
 #include <gf2/graphics/Entity.h>
 #include <gf2/graphics/RenderManager.h>
 #include <gf2/graphics/RenderRecorder.h>
-#include <gf2/graphics/Scene.h>
-#include <gf2/graphics/SceneManager.h>
 #include <gf2/graphics/RichMap.h>
 #include <gf2/graphics/RichMapRenderer.h>
+#include <gf2/graphics/Scene.h>
+#include <gf2/graphics/SceneManager.h>
 #include <gf2/graphics/Zoom.h>
 
 namespace {
diff --git a/examples/ninepatch.cc b/examples/ninepatch.cc
@@ -2,9 +2,9 @@
 // Copyright (c) 2023 Julien Bernard
 #include <cstdlib>
 
+#include <gf2/graphics/NinePatchEntity.h>
 #include <gf2/graphics/Scene.h>
 #include <gf2/graphics/SceneManager.h>
-#include <gf2/graphics/NinePatchEntity.h>
 
 #include "config.h"
 
diff --git a/games/HOME/bits/WorldScene.h b/games/HOME/bits/WorldScene.h
@@ -5,11 +5,11 @@
 
 #include <gf2/audio/Music.h>
 #include <gf2/audio/Sound.h>
+#include <gf2/framework/GraphicsPhysicsDebug.h>
 #include <gf2/graphics/ActionGroup.h>
 #include <gf2/graphics/Scene.h>
 #include <gf2/graphics/TextEntity.h>
 #include <gf2/physics/PhysicsWorld.h>
-#include <gf2/framework/GraphicsPhysicsDebug.h>
 
 #include "BackpackEntity.h"
 #include "HeroEntity.h"
diff --git a/include/gf2/core/Fixed.h b/include/gf2/core/Fixed.h
@@ -13,6 +13,7 @@ namespace gf {
     template<typename T>
     struct LargerType;
 
+    // clang-format off
     template<>
     struct LargerType<int8_t> { using type = int16_t; };
     template<>
@@ -25,6 +26,7 @@ namespace gf {
     struct LargerType<uint16_t> { using type = uint32_t; };
     template<>
     struct LargerType<uint32_t> { using type = uint64_t; };
+    // clang-format on
 
     template<typename T>
     using Larger = typename LargerType<T>::type;
@@ -107,7 +109,7 @@ namespace gf {
     }
 
   private:
-    struct RawType {};
+    struct RawType { };
     static constexpr RawType Raw = {};
 
     constexpr Fixed(T raw, [[maybe_unused]] RawType tag)
diff --git a/include/gf2/core/Range.h b/include/gf2/core/Range.h
@@ -523,7 +523,12 @@ namespace gf {
       {
       }
 
-      void operator++() { ++m_index; ++m_iterator; }
+      void operator++()
+      {
+        ++m_index;
+        ++m_iterator;
+      }
+
       auto operator*() { return std::tie(m_index, *m_iterator); }
       bool operator!=(SentinelType other) const { return m_iterator != other; }
 
diff --git a/include/gf2/core/SpriteSheet.h b/include/gf2/core/SpriteSheet.h
@@ -8,9 +8,9 @@
 #include <string>
 
 #include "CoreApi.h"
+#include "NinePatchData.h"
 #include "Rect.h"
 #include "SpriteData.h"
-#include "NinePatchData.h"
 
 namespace gf {
 
@@ -37,4 +37,3 @@ namespace gf {
 }
 
 #endif // GF_SPRITE_SHEET_H
-
diff --git a/include/gf2/framework/GraphicsPhysicsDebug.h b/include/gf2/framework/GraphicsPhysicsDebug.h
@@ -1,10 +1,9 @@
 #ifndef GF_GRAPHICS_PHYSICS_DEBUG_H
 #define GF_GRAPHICS_PHYSICS_DEBUG_H
 
-#include <gf2/graphics/Entity.h>
 #include <gf2/graphics/Curve.h>
+#include <gf2/graphics/Entity.h>
 #include <gf2/graphics/Shape.h>
-
 #include <gf2/physics/PhysicsDebug.h>
 #include <gf2/physics/PhysicsWorld.h>
 
diff --git a/include/gf2/graphics/Animation.h b/include/gf2/graphics/Animation.h
@@ -12,10 +12,10 @@
 #include <gf2/core/Rect.h>
 #include <gf2/core/Time.h>
 
+#include "AnimationRuntime.h"
 #include "Buffer.h"
 #include "GraphicsApi.h"
 #include "RenderObject.h"
-#include "AnimationRuntime.h"
 
 namespace gf {
   class Texture;
@@ -41,7 +41,6 @@ namespace gf {
     Time m_current_time;
   };
 
-
   class GF_GRAPHICS_API AnimationGraphics {
   public:
     AnimationGraphics(std::vector<const Texture*> textures, const AnimationData& data, RenderManager* render_manager);
diff --git a/include/gf2/graphics/AnimationGroup.h b/include/gf2/graphics/AnimationGroup.h
@@ -10,10 +10,10 @@
 #include <gf2/core/Id.h>
 #include <gf2/core/Time.h>
 
+#include "AnimationRuntime.h"
 #include "Buffer.h"
 #include "GraphicsApi.h"
 #include "RenderObject.h"
-#include "AnimationRuntime.h"
 
 namespace gf {
   class Texture;
@@ -71,7 +71,6 @@ namespace gf {
     std::map<Id, details::AnimationGraphicsRuntime> m_animations;
   };
 
-
   class GF_GRAPHICS_API AnimationGroup {
   public:
     AnimationGroup(std::vector<const Texture*> textures, const AnimationGroupData& data, RenderManager* render_manager);
diff --git a/include/gf2/graphics/AnimationRuntime.h b/include/gf2/graphics/AnimationRuntime.h
@@ -9,8 +9,8 @@
 #include <gf2/core/ResourceManager.h>
 #include <gf2/core/Time.h>
 
-#include "Vertex.h"
 #include "Texture.h"
+#include "Vertex.h"
 
 namespace gf {
   class Buffer;
@@ -42,7 +42,6 @@ namespace gf {
       std::vector<uint16_t> indices;
     };
 
-
     template<typename Resource>
     std::vector<const Texture*> load_animation_resources(const Resource& resource, ResourceManager* resource_manager)
     {
diff --git a/include/gf2/graphics/Text.h b/include/gf2/graphics/Text.h
@@ -47,7 +47,7 @@ namespace gf {
 
   class GF_GRAPHICS_API RichText {
   public:
-    RichText(FontAtlas* atlas, RichTextStyle* style,  FontFace* default_font, FontFace* bold_font, FontFace* italic_font, FontFace* bold_italic_font, const TextData& data, RenderManager* render_manager);
+    RichText(FontAtlas* atlas, RichTextStyle* style, FontFace* default_font, FontFace* bold_font, FontFace* italic_font, FontFace* bold_italic_font, const TextData& data, RenderManager* render_manager);
     RichText(FontAtlas* atlas, RichTextStyle* style, const RichTextResource& resource, RenderManager* render_manager, ResourceManager* resource_manager);
 
     void update(const TextData& data, RenderManager* render_manager);
diff --git a/include/gf2/physics/PhysicsHandle.h b/include/gf2/physics/PhysicsHandle.h
@@ -86,7 +86,7 @@ namespace gf::details {
 
     PhysicsId id() const
     {
-      return PhysicsId{reinterpret_cast<uintptr_t>(m_handle)}; // NOLINT(cppcoreguidelines-pro-type-reinterpret-cast)
+      return PhysicsId{ reinterpret_cast<uintptr_t>(m_handle) }; // NOLINT(cppcoreguidelines-pro-type-reinterpret-cast)
     }
 
     T* get()
diff --git a/include/gf2/physics/PhysicsId.h b/include/gf2/physics/PhysicsId.h
@@ -7,7 +7,7 @@
 
 namespace gf {
 
-  enum class PhysicsId : uintptr_t {};
+  enum class PhysicsId : uintptr_t { };
 
 }
 
diff --git a/library/audio/AudioManager.cc b/library/audio/AudioManager.cc
@@ -63,12 +63,12 @@ namespace gf {
 
   AudioListener AudioManager::default_listener()
   {
-    return {engine(), 0};
+    return { engine(), 0 };
   }
 
   AudioListener AudioManager::closest_listener(Vec3F position)
   {
-    return {engine(), ma_engine_find_closest_listener(engine(), position.x, position.y, position.z)};
+    return { engine(), ma_engine_find_closest_listener(engine(), position.x, position.y, position.z) };
   }
 
   ma_engine* AudioManager::engine()
diff --git a/library/core/GridMap.cc b/library/core/GridMap.cc
@@ -8,6 +8,7 @@
 #include <gf2/core/BinaryHeap.h>
 #include <gf2/core/GridVisibility.h>
 #include <gf2/core/Log.h>
+
 #include "gf2/core/GridTypes.h"
 
 namespace gf {
@@ -169,7 +170,6 @@ namespace gf {
     m_cells(position) |= (CellProperty::Transparent | CellProperty::Walkable);
   }
 
-
   bool GridMap::blocked(Vec2I position) const
   {
     if (!m_cells.valid(position)) {
diff --git a/library/core/Image.cc b/library/core/Image.cc
@@ -266,7 +266,6 @@ namespace gf {
     return static_cast<std::ptrdiff_t>(position.x + (position.y * m_size.w)) * 4;
   }
 
-
   Vec2I image_size(const std::filesystem::path& filename)
   {
     std::unique_ptr<std::FILE, decltype(&std::fclose)> file(std::fopen(filename.string().c_str(), "rb"), std::fclose);
@@ -286,5 +285,4 @@ namespace gf {
     return size;
   }
 
-
 } // namespace gf
diff --git a/library/core/ProcGen.cc b/library/core/ProcGen.cc
@@ -54,7 +54,8 @@ namespace gf {
 
   namespace {
 
-    int compute_power_of_two_size(Vec2I size) {
+    int compute_power_of_two_size(Vec2I size)
+    {
       int actual_size = 1;
 
       while (actual_size + 1 < size.h || actual_size + 1 < size.w) {
@@ -64,7 +65,8 @@ namespace gf {
       return actual_size;
     }
 
-    void initialize_corners(Heightmap& map, Span<const double> initial_values, int d) {
+    void initialize_corners(Heightmap& map, Span<const double> initial_values, int d)
+    {
       if (initial_values.size() == 0) {
         map.set_value({ 0, 0 }, 0.0);
         map.set_value({ 0, d }, 0.0);
@@ -142,7 +144,8 @@ namespace gf {
 
   namespace {
 
-    void diamond(Heightmap& map, Random& random, Vec2I pos, int d) {
+    void diamond(Heightmap& map, Random& random, Vec2I pos, int d)
+    {
       // clang-format off
       const double value = (map.value({ pos.x - d, pos.y - d })
                           + map.value({ pos.x - d, pos.y + d })
@@ -154,7 +157,8 @@ namespace gf {
       map.set_value(pos, value + noise);
     }
 
-    void square(Heightmap& map, Random& random, Vec2I pos, int d) {
+    void square(Heightmap& map, Random& random, Vec2I pos, int d)
+    {
       const Vec2I size = map.size();
 
       double value = 0.0;
diff --git a/library/core/TiledMap.cc b/library/core/TiledMap.cc
@@ -854,7 +854,7 @@ namespace gf {
 
   const MapTilesetTile* MapTileset::tile(uint32_t id) const
   {
-    auto [ first, last ] = std::equal_range(tiles.begin(), tiles.end(), id, MapTilesetTileComparator());
+    auto [first, last] = std::equal_range(tiles.begin(), tiles.end(), id, MapTilesetTileComparator());
 
     if (std::distance(first, last) != 1) {
       return nullptr;
diff --git a/library/graphics/Animation.cc b/library/graphics/Animation.cc
@@ -87,7 +87,7 @@ namespace gf {
 
   RenderGeometry AnimationGraphics::geometry(std::size_t frame_index) const
   {
-    assert(frame_index  < m_animation.frames.size());
+    assert(frame_index < m_animation.frames.size());
 
     const auto& frame = m_animation.frames[frame_index];
 
diff --git a/library/graphics/AnimationGroup.cc b/library/graphics/AnimationGroup.cc
@@ -4,6 +4,7 @@
 #include <gf2/graphics/AnimationGroup.h>
 
 #include <gf2/core/Log.h>
+
 #include "gf2/graphics/AnimationRuntime.h"
 
 namespace gf {
diff --git a/library/graphics/MotionGroup.cc b/library/graphics/MotionGroup.cc
@@ -8,6 +8,7 @@
 #include <algorithm>
 
 #include <gf2/graphics/Event.h>
+
 #include "gf2/core/GamepadTypes.h"
 
 namespace gf {
diff --git a/library/graphics/RichMap.cc b/library/graphics/RichMap.cc
@@ -66,5 +66,4 @@ namespace gf {
     return m_textures[i];
   }
 
-
 }
diff --git a/tests/tests_core_Array2D.cc b/tests/tests_core_Array2D.cc
@@ -13,7 +13,9 @@ TEST(Array2DTest, PositionRange) {
     ++count;
   }
 
+  // clang-format off
   EXPECT_EQ(count, Size.x * Size.y);
+  // clang-format on
 }
 
 TEST(Array2DTest, FourNeighbors) {
diff --git a/tests/tests_core_Color.cc b/tests/tests_core_Color.cc
@@ -136,7 +136,9 @@ TEST(ColorTest, Multiplication) {
   gf::Color color0(1.0f, 1.0f, 0.5f, 0.5f);
   gf::Color color1(1.0f, 0.5f, 0.5f, 1.0f);
 
+  // clang-format off
   EXPECT_EQ(color0 * color1, gf::Color(1.0f, 0.5f, 0.25f, 0.5f));
+  // clang-format on
   EXPECT_EQ(color0 * 0.5f, gf::Color(0.5f, 0.5f, 0.25f, 0.25f));
   EXPECT_EQ(0.5f * color1, gf::Color(0.5f, 0.25f, 0.25f, 0.5f));
 
diff --git a/tests/tests_core_Range.cc b/tests/tests_core_Range.cc
@@ -237,11 +237,11 @@ TEST(RangeTest, NeighborDiamondVerticalSide) {
 TEST(RangeTest, Enumerate) {
   std::vector<double> vec = { 3.14, 2.2, 1.1 };
 
-  for (auto [i, value ] : gf::enumerate(vec)) {
+  for (auto [i, value] : gf::enumerate(vec)) {
     EXPECT_EQ(vec[i], value);
   }
 
-  for (auto&& [i, value ] : gf::enumerate(vec)) {
+  for (auto&& [i, value] : gf::enumerate(vec)) {
     static_assert(std::is_lvalue_reference_v<decltype(value)>);
     EXPECT_EQ(vec[i], value);
   }

Original file line number	Diff line number	Diff line change
`@@ -523,7 +523,12 @@ namespace gf {`
`523`	`523`	`{`
`524`	`524`	`}`
`525`	`525`
`526`		`- void operator++() { ++m_index; ++m_iterator; }`
	`526`	`+ void operator++()`
	`527`	`+ {`
	`528`	`+ ++m_index;`
	`529`	`+ ++m_iterator;`
	`530`	`+ }`
	`531`	`+`
`527`	`532`	`auto operator() { return std::tie(m_index, m_iterator); }`
`528`	`533`	`bool operator!=(SentinelType other) const { return m_iterator != other; }`
`529`	`534`