put ConsoleData and ConsoleResource in their own file

Author: jube

include/gf2/core/Console.h

@@ -147,17 +147,6 @@ namespace gf {
     return ar | buffer.raw();
   }
 
-  struct GF_CORE_API ConsoleResource {
-    std::filesystem::path console_font;
-    Vec2I size;
-  };
-
-  template<typename Archive>
-  Archive& operator|(Archive& ar, MaybeConst<ConsoleResource, Archive>& resource)
-  {
-    return ar | resource.console_font | resource.size;
-  }
-
 }
 
 #endif // GF_CONSOLE_H

include/gf2/core/ConsoleData.h

@@ -0,0 +1,69 @@
+// SPDX-License-Identifier: Zlib
+// Copyright (c) 2023-2025 Julien Bernard
+#ifndef GF_CONSOLE_DATA_H
+#define GF_CONSOLE_DATA_H
+
+#include <cstdint>
+
+#include <filesystem>
+
+#include "CoreApi.h"
+#include "TypeTraits.h"
+#include "Vec2.h"
+
+namespace gf {
+
+  struct GF_CORE_API ConsoleFontFormat {
+    enum Transparency : uint8_t {
+      Alpha,
+      Grayscale,
+      ColorKey,
+    };
+
+    Transparency transparency;
+
+    enum Layout : uint8_t {
+      InColumn,
+      InRow,
+    };
+
+    Layout layout;
+
+    enum Mapping : uint8_t {
+      CodePage437,
+      ModifiedCodePage437,
+      Special,
+      Custom,
+    };
+
+    Mapping mapping;
+  };
+
+  inline constexpr ConsoleFontFormat LibtcodFormat = { ConsoleFontFormat::ColorKey, ConsoleFontFormat::InRow, ConsoleFontFormat::Special };
+  inline constexpr ConsoleFontFormat DwarfFortressFormat = { ConsoleFontFormat::ColorKey, ConsoleFontFormat::InRow, ConsoleFontFormat::CodePage437 };
+
+  struct GF_CORE_API ConsoleData {
+    ConsoleFontFormat font_format;
+    Vec2I font_size = { 0, 0 };
+  };
+
+  template<typename Archive>
+  inline Archive& operator|(Archive& ar, MaybeConst<ConsoleData, Archive>& data)
+  {
+    return ar | data.font_format.transparency | data.font_format.layout | data.font_format.mapping | data.font_size;
+  }
+
+  struct GF_CORE_API ConsoleResource {
+    std::filesystem::path console_font;
+    ConsoleData data;
+  };
+
+  template<typename Archive>
+  inline Archive& operator|(Archive& ar, MaybeConst<ConsoleResource, Archive>& resource)
+  {
+    return ar | resource.console_font | resource.data;
+  }
+
+}
+
+#endif // GF_CONSOLE_FONT_DATA_H

include/gf2/framework/BundleBuilder.h

@@ -18,6 +18,8 @@ namespace gf {
   struct AnimationResource;
   struct AnimationGroupResource;
   struct AudioSourceResource;
+  struct ConsoleResource;
+  struct ConsoleData;
   struct NinePatchResource;
   struct RichMapResource;
   struct RichTextResource;
@@ -38,12 +40,16 @@ namespace gf {
     void add_in_bundle(const SpriteResource& resource);
     void add_in_bundle(const TextResource& resource);
 
+    void add_in_bundle(const ConsoleResource& resource);
+
     void add_raw_texture(const std::filesystem::path& path);
     void add_raw_font(const std::filesystem::path& path);
     void add_raw_map(const std::filesystem::path& path);
     void add_raw_sound(const std::filesystem::path& path);
     void add_raw_music(const std::filesystem::path& path);
 
+    void add_raw_console_font(const std::filesystem::path& path, const ConsoleData& data);
+
     ResourceBundle make_bundle() const;
 
   private:
@@ -56,6 +62,8 @@ namespace gf {
     std::vector<std::filesystem::path> m_maps;
     std::vector<std::filesystem::path> m_sounds;
     std::vector<std::filesystem::path> m_musics;
+
+    std::vector<ConsoleResource> m_console_fonts;
   };
 
 }

include/gf2/graphics/ConsoleFont.h

@@ -7,42 +7,14 @@
 
 #include <filesystem>
 
+#include <gf2/core/ConsoleData.h>
 #include <gf2/core/Span.h>
 
 #include "GraphicsApi.h"
 #include "Texture.h"
 
 namespace gf {
 
-  struct GF_GRAPHICS_API ConsoleFontFormat {
-    enum Transparency : uint8_t {
-      Alpha,
-      Grayscale,
-      ColorKey,
-    };
-
-    Transparency transparency;
-
-    enum Layout : uint8_t {
-      InColumn,
-      InRow,
-    };
-
-    Layout layout;
-
-    enum Mapping : uint8_t {
-      CodePage437,
-      ModifiedCodePage437,
-      Special,
-      Custom,
-    };
-
-    Mapping mapping;
-  };
-
-  inline constexpr ConsoleFontFormat LibtcodFormat = { ConsoleFontFormat::ColorKey, ConsoleFontFormat::InRow, ConsoleFontFormat::Special };
-  inline constexpr ConsoleFontFormat DwarfFortressFormat = { ConsoleFontFormat::ColorKey, ConsoleFontFormat::InRow, ConsoleFontFormat::CodePage437 };
-
   struct GF_GRAPHICS_API ConsoleFontElement {
     char16_t character = '\0';
     uint8_t index = 0;

include/gf2/graphics/ConsoleGraphics.h

@@ -4,6 +4,7 @@
 #define GF_CONSOLE_GRAPHICS_H
 
 #include <gf2/core/Console.h>
+#include <gf2/core/ConsoleData.h>
 
 #include "ConsoleFont.h"
 #include "DynamicBuffer.h"

library/core/ConsoleData.cc

@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: Zlib
+// Copyright (c) 2023-2025 Julien Bernard
+
+#include <gf2/core/ConsoleData.h>

library/framework/BundleBuilder.cc

@@ -5,6 +5,7 @@
 
 #include <gf2/core/AnimationData.h>
 #include <gf2/core/AudioSourceData.h>
+#include <gf2/core/ConsoleData.h>
 #include <gf2/core/FontFace.h>
 #include <gf2/core/NinePatchData.h>
 #include <gf2/core/RichMapResource.h>
@@ -58,6 +59,11 @@ namespace gf {
     }
   }
 
+  void BundleBuilder::add_in_bundle(const ConsoleResource& resource)
+  {
+    add_raw_console_font(resource.console_font, resource.data);
+  }
+
   void BundleBuilder::add_in_bundle(const NinePatchResource& resource)
   {
     add_raw_texture(resource.texture);
@@ -111,6 +117,12 @@ namespace gf {
     m_musics.push_back(path);
   }
 
+  void BundleBuilder::add_raw_console_font(const std::filesystem::path& path, const ConsoleData& data)
+  {
+    m_console_fonts.push_back({ path, data });
+  }
+
+
   ResourceBundle BundleBuilder::make_bundle() const
   {
     // capture 'this' by copy in case the bundle builder is a local variable
@@ -134,6 +146,11 @@ namespace gf {
       for (const std::filesystem::path& music : m_musics) {
         bundle->handle<Music>(music, m_audio_manager, resource_manager, action);
       }
+
+      for (const ConsoleResource& console_resource : m_console_fonts) {
+        bundle->handle<ConsoleFont>(console_resource.console_font, { console_resource.data.font_format, console_resource.data.font_size, m_render_manager }, resource_manager, action);
+      }
+
     });
 
     return bundle;