Skip to content

Remove duplicate fmt formatter specialization and update upstream. #235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Sebanisu merged 4 commits into from
May 25, 2026
Merged

Remove duplicate fmt formatter specialization and update upstream. #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
410eee4
Remove duplicate fmt formatter specializations
Sebanisu May 24, 2026
5c776d3
Update mim_sprite PNG save call for new API
Sebanisu May 24, 2026
d6d98c4
build: add fmt dependency and update vcpkg baseline
Sebanisu May 25, 2026
5334391
## Summary
Sebanisu May 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 0 additions & 82 deletions src/opengl/main/formatters.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,42 +118,6 @@ struct fmt::formatter<ff_8::draw_bitT> : fmt::formatter<std::string_view>
}
};

template<>
struct fmt::formatter<open_viii::graphics::background::BlendModeT>
: fmt::formatter<std::string_view>
{
// parse is inherited from formatter<string_view>.
template<typename FormatContext>
constexpr auto format(
open_viii::graphics::background::BlendModeT blend_mode_t,
FormatContext &ctx) const
{
using namespace open_viii::graphics::background;
using namespace std::string_view_literals;
std::string_view name = {};
switch (blend_mode_t)
{
case BlendModeT::add:
name = "add"sv;
break;
case BlendModeT::half_add:
name = "half add"sv;
break;
case BlendModeT::none:
name = "none"sv;
break;
case BlendModeT::quarter_add:
name = "quarter add"sv;
break;
case BlendModeT::subtract:
name = "subtract"sv;
break;
}
return fmt::formatter<std::string_view>::format(name, ctx);
}
};


template<>
struct fmt::formatter<draw_mode> : fmt::formatter<std::string_view>
{
Expand Down Expand Up @@ -265,23 +229,6 @@ struct fmt::formatter<open_viii::LangT> : fmt::formatter<std::string_view>
}
};

template<open_viii::Number numT>
struct fmt::formatter<open_viii::graphics::Point<numT>> : fmt::formatter<numT>
{
// parse is inherited from formatter<std::underlying_type_t<tile_sizes>>.
template<typename FormatContext>
constexpr auto format(
open_viii::graphics::Point<numT> point,
FormatContext &ctx) const
{
fmt::format_to(ctx.out(), "{}", '(');
fmt::formatter<numT>::format(point.x(), ctx);
fmt::format_to(ctx.out(), "{}", ", ");
fmt::formatter<numT>::format(point.y(), ctx);
return fmt::format_to(ctx.out(), "{}", ')');
}
};

template<>
struct fmt::formatter<fme::BackgroundSettings>
{
Expand Down Expand Up @@ -350,35 +297,6 @@ struct fmt::formatter<open_viii::graphics::Rectangle<numT>>
}
};

template<>
struct fmt::formatter<open_viii::graphics::BPPT> : fmt::formatter<std::uint32_t>
{
// parse is inherited from formatter<string_view>.
template<typename FormatContext>
constexpr auto format(
open_viii::graphics::BPPT bppt,
FormatContext &ctx) const
{
using namespace open_viii::graphics;
using namespace std::string_view_literals;

if (bppt.bpp8())
{
return fmt::formatter<std::uint32_t>::format(BPPT::BPP8, ctx);
}
if (bppt.bpp16())
{
return fmt::formatter<std::uint32_t>::format(BPPT::BPP16, ctx);
}
if (bppt.bpp24())
{
return fmt::formatter<std::uint32_t>::format(BPPT::BPP24, ctx);
}
return fmt::formatter<std::uint32_t>::format(BPPT::BPP4, ctx);
}
};


template<open_viii::graphics::background::is_tile tileT>
struct fmt::formatter<tileT> : fmt::formatter<std::string>
{
Expand Down
116 changes: 61 additions & 55 deletions src/opengl/main/gui/import.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,9 @@ open_viii::graphics::background::Map::variant_tile &
const auto pop_item_width = glengine::ScopeGuard(&ImGui::PopItemWidth);


if (ImGui::BeginCombo(
"##Select Existing Tile", "", ImGuiComboFlags_HeightLarge))
if (
ImGui::BeginCombo(
"##Select Existing Tile", "", ImGuiComboFlags_HeightLarge))
{
static constexpr int columnWidth = 100;// Adjust as needed
const auto num_columns = std::max(
Expand All @@ -228,43 +229,44 @@ open_viii::graphics::background::Map::variant_tile &
bool is_selected
= (selections->get<ConfigKey::ImportSelectedTile>() == tile_id);// You can store your selection however you
// want, outside or inside your objects
if (std::ranges::any_of(
std::array{
[&]() -> bool
{
bool const selected
= ImGui::Selectable("", is_selected);
tool_tip(
[&]()
{
format_imgui_text("{}", tile_id);
const tile_button_options options
= { .size = { tooltips_size,
tooltips_size } };
(void)create_tile_button(
map_sprite, tile, options);
// map_sprite->enable_square(tile);
was_hovered = true;
});
return selected;
}(),
[]() -> bool
{
ImGui::SameLine();
return false;
}(),
create_tile_button(map_sprite, tile),
[]() -> bool
{
ImGui::SameLine();
return false;
}(),
[&tile_id]() -> bool
{
format_imgui_text("{}", tile_id);
return false;
}() },
std::identity{}))
if (
std::ranges::any_of(
std::array{
[&]() -> bool
{
bool const selected
= ImGui::Selectable("", is_selected);
tool_tip(
[&]()
{
format_imgui_text("{}", tile_id);
const tile_button_options options
= { .size = { tooltips_size,
tooltips_size } };
(void)create_tile_button(
map_sprite, tile, options);
// map_sprite->enable_square(tile);
was_hovered = true;
});
return selected;
}(),
[]() -> bool
{
ImGui::SameLine();
return false;
}(),
create_tile_button(map_sprite, tile),
[]() -> bool
{
ImGui::SameLine();
return false;
}(),
[&tile_id]() -> bool
{
format_imgui_text("{}", tile_id);
return false;
}() },
std::identity{}))
{
selections->get<ConfigKey::ImportSelectedTile>()
= tile_id;
Expand Down Expand Up @@ -437,9 +439,10 @@ bool import::browse_for_image_display_preview() const
glengine::ConvertGliDtoImTextureId<ImTextureID>(
m_loaded_image_texture.id()),
ImVec2(width, height));
if (ImGui::Checkbox(
gui_labels::draw_grid.data(),
&selections->get<ConfigKey::ImportImageGrid>()))
if (
ImGui::Checkbox(
gui_labels::draw_grid.data(),
&selections->get<ConfigKey::ImportImageGrid>()))
{
selections->update<ConfigKey::ImportImageGrid>();
}
Expand Down Expand Up @@ -512,7 +515,7 @@ bool import::combo_tile_size() const
tile_sizes::x_16_size };
static const auto strings = values | std::views::transform(AsString{})
| std::ranges::to<std::vector>();
const auto gcc = GenericCombo(
const auto gcc = GenericCombo(
gui_labels::tile_size,
values,
strings,
Expand Down Expand Up @@ -570,8 +573,8 @@ void import::generate_map_for_imported_image(
[&](auto tile)
-> open_viii::graphics::background::Map::variant_tile
{
if constexpr (is_tile<
std::remove_cvref_t<decltype(tile)>>)
if constexpr (
is_tile<std::remove_cvref_t<decltype(tile)>>)
{
if (x_tile == tiles_wide)
{
Expand Down Expand Up @@ -840,7 +843,7 @@ void import::reset_imported_image() const
return;
}
map_sprite->update_render_texture(nullptr, {}, tile_sizes::default_size);
m_import_image_map = {};
m_import_image_map.reset();
m_loaded_image_texture = {};
// m_loaded_image_cpu = {};
m_import_image_path = {};
Expand Down Expand Up @@ -885,15 +888,17 @@ void import::find_selected_tile_for_import(
std::visit(
[&](const auto &tile)
{
if (std::cmp_less(
selections->get<ConfigKey::ImportSelectedTile>(),
tiles.size()))
if (
std::cmp_less(
selections->get<ConfigKey::ImportSelectedTile>(),
tiles.size()))
{
const auto &tmp_tile = tiles[static_cast<size_t>(
selections->get<ConfigKey::ImportSelectedTile>())];
if constexpr (std::is_same_v<
std::decay_t<decltype(tile)>,
std::decay_t<decltype(tmp_tile)>>)
if constexpr (
std::is_same_v<
std::decay_t<decltype(tile)>,
std::decay_t<decltype(tmp_tile)>>)
{
if (tile != tmp_tile)
{
Expand Down Expand Up @@ -982,9 +987,10 @@ bool import::checkbox_render_imported_image() const
return false;
}

if (ImGui::Checkbox(
gui_labels::render_imported_image.data(),
&selections->get<ConfigKey::RenderImportedImage>()))
if (
ImGui::Checkbox(
gui_labels::render_imported_image.data(),
&selections->get<ConfigKey::RenderImportedImage>()))
{
selections->update<ConfigKey::RenderImportedImage>();
// Pass texture and map and tile_size
Expand Down
4 changes: 1 addition & 3 deletions src/opengl/main/mim_sprite.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,7 @@ void mim_sprite::save(const std::filesystem::path &dest_path) const
m_colors,
width(),
height(),
dest_path.string(),
dest_path.stem().string(),
"");
{ .filename = dest_path.string(), .prefix = "" });
}
}

Expand Down
8 changes: 7 additions & 1 deletion vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{
"name": "field-map-editor",
"version": "1.0.5",
"builtin-baseline": "4334d8b4c8916018600212ab4dd4bbdc343065d1",
"builtin-baseline": "4f1406d8f7923c3fff34738b6177f72b143ad5b6",
"dependencies": [
"lz4",
"spdlog",
"fmt",
"glfw3",
"glew",
"glm",
Expand Down Expand Up @@ -36,6 +37,11 @@
"version": "1.15.3",
"port-version": 0
},
{
"name": "fmt",
"version": "12.0.0",
"port-version": 0
},
{
"name": "glfw3",
"version": "3.4",
Expand Down
Loading