Skip to content

Commit b30ff43

Browse files
SebanisuSebanisu
committed
remove ::Get
1 parent 2d9bbfe commit b30ff43

12 files changed

Lines changed: 75 additions & 81 deletions

‎src/opengl/experimental/ff8/Map.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@ class Map
814814
std::ranges::transform(
815815
f_tiles,
816816
std::back_inserter(unique_z),
817-
TileOperations::Z::Get{});
817+
TileOperations::Z{});
818818
std::ranges::sort(unique_z);
819819
auto [begin, end] = std::ranges::unique(unique_z);
820820
unique_z.erase(begin, end);

‎src/opengl/experimental/ff8/MapDeswizzle.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ namespace ff_8
1010
{
1111
struct TileFunctionsDeswizzle
1212
{
13-
using X = TileOperations::X::Get;
14-
using Y = TileOperations::Y::Get;
13+
using X = TileOperations::X;
14+
using Y = TileOperations::Y;
1515
using TexturePage = TileOperations::TextureId::DefaultValue;
1616
using UseTexturePage = std::true_type;
1717
using UseBlending = std::true_type;

‎src/opengl/experimental/ff8/MapDims.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ class MapDims
121121
template<std::ranges::range TilesR>
122122
void get_true_x(TilesR &&f_tiles)
123123
{
124-
static constexpr TileOperations::X::Get true_x = {};
124+
static constexpr TileOperations::X true_x = {};
125125
const auto [true_i_min_x, true_i_max_x]
126126
= std::ranges::minmax_element(f_tiles, {}, true_x);
127127
if (true_i_min_x == true_i_max_x)
@@ -134,7 +134,7 @@ class MapDims
134134
template<std::ranges::range TilesR>
135135
void get_true_y(TilesR &&f_tiles)
136136
{
137-
static constexpr TileOperations::Y::Get true_y = {};
137+
static constexpr TileOperations::Y true_y = {};
138138
const auto [true_i_min_y, true_i_max_y]
139139
= std::ranges::minmax_element(f_tiles, {}, true_y);
140140
if (true_i_min_y == true_i_max_y)

‎src/opengl/experimental/ff8/MapSwizzle.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ namespace ff_8
1010
{
1111
struct TileFunctionsSwizzle
1212
{
13-
using X = TileOperations::SourceX::Get;
14-
using Y = TileOperations::SourceY::Get;
15-
using TexturePage = TileOperations::TextureId::Get;
13+
using X = TileOperations::SourceX;
14+
using Y = TileOperations::SourceY;
15+
using TexturePage = TileOperations::TextureId;
1616
using UseTexturePage = std::false_type;
1717
using UseBlending = std::false_type;
1818
static constexpr const char *const label = "Map (Swizzle)";

‎src/opengl/experimental/ff8/MapUpscaleDeswizzle.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ namespace ff_8
1010
{
1111
struct TileFunctionsUpscaleDeswizzle
1212
{
13-
using X = TileOperations::X::Get;
14-
using Y = TileOperations::Y::Get;
13+
using X = TileOperations::X;
14+
using Y = TileOperations::Y;
1515
using TexturePage = TileOperations::TextureId::DefaultValue;
1616
using UseTexturePage = std::true_type;
1717
using UseBlending = std::true_type;

‎src/opengl/experimental/ff8/MapUpscaleSwizzle.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ namespace ff_8
1010
{
1111
struct TileFunctionsUpscaleSwizzle
1212
{
13-
using X = TileOperations::SourceX::Get;
14-
using Y = TileOperations::SourceY::Get;
15-
using TexturePage = TileOperations::TextureId::Get;
13+
using X = TileOperations::SourceX;
14+
using Y = TileOperations::SourceY;
15+
using TexturePage = TileOperations::TextureId;
1616
using UseTexturePage = std::false_type;
1717
using UseBlending = std::false_type;
1818
static constexpr const char *const label = "Map (Swizzle Swizzle)";

‎src/opengl/experimental/ff8/SimilarAdjustments.hpp‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,33 +30,32 @@ struct SimilarAdjustments
3030
auto operator()(const TileT &tile) const
3131
{
3232

33-
static constexpr auto xy_f = TileOperations::XY::Get{};
34-
static constexpr auto z_f = TileOperations::Z::Get{};
33+
static constexpr auto xy_f = TileOperations::XY{};
34+
static constexpr auto z_f = TileOperations::Z{};
3535
return [=, this](const TileT &other_tile) -> bool
3636
{
3737
const auto compare = [&](bool toggle, auto &&op) -> bool
3838
{ return !toggle || op(tile) == op(other_tile); };
3939
return std::ranges::all_of(
4040
std::array{
41-
compare(x, TileOperations::X::Get{}),
42-
compare(y, TileOperations::Y::Get{}), compare(xy, xy_f),
41+
compare(x, TileOperations::X{}),
42+
compare(y, TileOperations::Y{}), compare(xy, xy_f),
4343
compare(z, z_f),
4444
compare(
4545
xyz, [](const TileT &t)
4646
{ return std::make_pair(xy_f(t), z_f(t)); }),
47-
compare(source_x, TileOperations::SourceX::Get{}),
48-
compare(source_y, TileOperations::SourceY::Get{}),
49-
compare(source_xy, TileOperations::SourceXY::Get{}),
50-
compare(texture_id, TileOperations::TextureId::Get{}),
51-
compare(blend_mode, TileOperations::BlendMode::Get{}),
52-
compare(blend, TileOperations::Blend::Get{}),
53-
compare(draw, TileOperations::Draw::Get{}),
54-
compare(depth, TileOperations::Depth::Get{}),
55-
compare(layer_id, TileOperations::LayerId::Get{}),
56-
compare(palette_id, TileOperations::PaletteId::Get{}),
57-
compare(animation_id, TileOperations::AnimationId::Get{}),
58-
compare(
59-
animation_state, TileOperations::AnimationState::Get{}) },
47+
compare(source_x, TileOperations::SourceX{}),
48+
compare(source_y, TileOperations::SourceY{}),
49+
compare(source_xy, TileOperations::SourceXY{}),
50+
compare(texture_id, TileOperations::TextureId{}),
51+
compare(blend_mode, TileOperations::BlendMode{}),
52+
compare(blend, TileOperations::Blend{}),
53+
compare(draw, TileOperations::Draw{}),
54+
compare(depth, TileOperations::Depth{}),
55+
compare(layer_id, TileOperations::LayerId{}),
56+
compare(palette_id, TileOperations::PaletteId{}),
57+
compare(animation_id, TileOperations::AnimationId{}),
58+
compare(animation_state, TileOperations::AnimationState{}) },
6059
std::identity{});
6160
};
6261
}

‎src/opengl/experimental/ff8/UniqueTileValues.hpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,41 +64,41 @@ struct UniqueTileValues
6464
}
6565
static auto gen_z(const MapT &map)
6666
{
67-
return visit(map, TileOperations::Z::Get{});
67+
return visit(map, TileOperations::Z{});
6868
}
6969
static auto gen_layer_id(const MapT &map)
7070
{
71-
return visit(map, TileOperations::LayerId::Get{});
71+
return visit(map, TileOperations::LayerId{});
7272
}
7373
static auto gen_palette_id(const MapT &map)
7474
{
75-
return visit(map, TileOperations::PaletteId::Get{});
75+
return visit(map, TileOperations::PaletteId{});
7676
}
7777
static auto gen_texture_page_id(const MapT &map)
7878
{
79-
return visit(map, TileOperations::TextureId::Get{});
79+
return visit(map, TileOperations::TextureId{});
8080
}
8181
static auto gen_animation_id(const MapT &map)
8282
{
83-
return visit(map, TileOperations::AnimationId::Get{});
83+
return visit(map, TileOperations::AnimationId{});
8484
}
8585
static auto gen_animation_frame(const MapT &map)
8686
{
87-
return visit(map, TileOperations::AnimationState::Get{});
87+
return visit(map, TileOperations::AnimationState{});
8888
}
8989
static auto gen_blend_other(const MapT &map)
9090
{
91-
return visit(map, TileOperations::Blend::Get{});
91+
return visit(map, TileOperations::Blend{});
9292
}
9393
static auto gen_blend_mode(const MapT &map)
9494
{
9595
return UniqueValues<open_viii::graphics::background::BlendModeT>(
96-
visit(map, TileOperations::BlendMode::Get{}), blendmode_to_string);
96+
visit(map, TileOperations::BlendMode{}), blendmode_to_string);
9797
}
9898
static auto gen_bpp(const MapT &map)
9999
{
100100
return UniqueValues<open_viii::graphics::BPPT>(
101-
visit(map, TileOperations::Depth::Get{}), bpp_to_string);
101+
visit(map, TileOperations::Depth{}), bpp_to_string);
102102
}
103103
static void refresh(
104104
const MapT &map,

‎src/opengl/ff_8/ff_8/TileOperations.hpp‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,12 @@ struct TileOperation
5050
using nested_type_t = nested_type<T>::local_value_type;
5151

5252
// === Get ===
53-
struct Get
53+
template<open_viii::graphics::background::is_tile TileT>
54+
[[nodiscard]] constexpr value_type<TileT>
55+
operator()(const TileT &tile) const noexcept
5456
{
55-
template<open_viii::graphics::background::is_tile TileT>
56-
[[nodiscard]] constexpr value_type<TileT>
57-
operator()(const TileT &tile) const noexcept
58-
{
59-
return GetFn(tile);
60-
}
61-
};
57+
return GetFn(tile);
58+
}
6259

6360
// === DefaultValue ===
6461
struct DefaultValue

‎src/opengl/main/filter.hpp‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ struct ConfigKeys<FilterTag::DrawBit>
209209
return in ? draw_bitT::enabled : draw_bitT::disabled;
210210
}
211211
using operation_type
212-
= decltype([](auto &&...args) { return to_draw_bitT(ff_8::TileOperations::Draw::Get{}(std::forward<decltype(args)>(args)...)); });
212+
= decltype([](auto &&...args) { return to_draw_bitT(ff_8::TileOperations::Draw{}(std::forward<decltype(args)>(args)...)); });
213213
static constexpr std::string_view key_name = "filter_draw";
214214
static constexpr std::string_view enabled_key_name = "filter_draw_enabled";
215215
};
@@ -219,7 +219,7 @@ struct ConfigKeys<FilterTag::Z>
219219
{
220220
using TileT = open_viii::graphics::background::Tile1;
221221
using value_type = ff_8::TileOperations::Z::value_type<TileT>;
222-
using operation_type = ff_8::TileOperations::Z::Get;
222+
using operation_type = ff_8::TileOperations::Z;
223223
static constexpr std::string_view key_name = "filter_z";
224224
static constexpr std::string_view enabled_key_name = "filter_z_enabled";
225225
};
@@ -230,7 +230,7 @@ struct ConfigKeys<FilterTag::MultiZ>
230230
{
231231
using TileT = open_viii::graphics::background::Tile1;
232232
using value_type = std::vector<ff_8::TileOperations::Z::value_type<TileT>>;
233-
using operation_type = ff_8::TileOperations::Z::Get;
233+
using operation_type = ff_8::TileOperations::Z;
234234
static constexpr std::string_view key_name = "filter_multi_z";
235235
static constexpr std::string_view enabled_key_name
236236
= "filter_multi_z_enabled";
@@ -241,7 +241,7 @@ struct ConfigKeys<FilterTag::Palette>
241241
{
242242
using TileT = open_viii::graphics::background::Tile1;
243243
using value_type = ff_8::TileOperations::PaletteId::value_type<TileT>;
244-
using operation_type = ff_8::TileOperations::PaletteId::Get;
244+
using operation_type = ff_8::TileOperations::PaletteId;
245245
static constexpr std::string_view key_name = "filter_palette";
246246
static constexpr std::string_view enabled_key_name
247247
= "filter_palette_enabled";
@@ -253,7 +253,7 @@ struct ConfigKeys<FilterTag::MultiPalette>
253253
using TileT = open_viii::graphics::background::Tile1;
254254
using value_type
255255
= std::vector<ff_8::TileOperations::PaletteId::value_type<TileT>>;
256-
using operation_type = ff_8::TileOperations::PaletteId::Get;
256+
using operation_type = ff_8::TileOperations::PaletteId;
257257
static constexpr std::string_view key_name = "filter_multi_palette";
258258
static constexpr std::string_view enabled_key_name
259259
= "filter_multi_palette_enabled";
@@ -264,7 +264,7 @@ struct ConfigKeys<FilterTag::AnimationId>
264264
{
265265
using TileT = open_viii::graphics::background::Tile1;
266266
using value_type = ff_8::TileOperations::AnimationId::value_type<TileT>;
267-
using operation_type = ff_8::TileOperations::AnimationId::Get;
267+
using operation_type = ff_8::TileOperations::AnimationId;
268268
static constexpr std::string_view key_name = "filter_animation_id";
269269
static constexpr std::string_view enabled_key_name
270270
= "filter_animation_id_enabled";
@@ -276,7 +276,7 @@ struct ConfigKeys<FilterTag::MultiAnimationId>
276276
using TileT = open_viii::graphics::background::Tile1;
277277
using value_type
278278
= std::vector<ff_8::TileOperations::AnimationId::value_type<TileT>>;
279-
using operation_type = ff_8::TileOperations::AnimationId::Get;
279+
using operation_type = ff_8::TileOperations::AnimationId;
280280
static constexpr std::string_view key_name = "filter_multi_animation_id";
281281
static constexpr std::string_view enabled_key_name
282282
= "filter_multi_animation_id_enabled";
@@ -287,7 +287,7 @@ struct ConfigKeys<FilterTag::AnimationFrame>
287287
{
288288
using TileT = open_viii::graphics::background::Tile1;
289289
using value_type = ff_8::TileOperations::AnimationState::value_type<TileT>;
290-
using operation_type = ff_8::TileOperations::AnimationState::Get;
290+
using operation_type = ff_8::TileOperations::AnimationState;
291291
static constexpr std::string_view key_name = "filter_animation_frame";
292292
static constexpr std::string_view enabled_key_name
293293
= "filter_animation_frame_enabled";
@@ -300,7 +300,7 @@ struct ConfigKeys<FilterTag::MultiAnimationState>
300300
using TileT = open_viii::graphics::background::Tile1;
301301
using value_type
302302
= std::vector<ff_8::TileOperations::AnimationState::value_type<TileT>>;
303-
using operation_type = ff_8::TileOperations::AnimationState::Get;
303+
using operation_type = ff_8::TileOperations::AnimationState;
304304
static constexpr std::string_view key_name
305305
= "filter_multi_animation_frame";
306306
static constexpr std::string_view enabled_key_name
@@ -312,7 +312,7 @@ struct ConfigKeys<FilterTag::LayerId>
312312
{
313313
using TileT = open_viii::graphics::background::Tile1;
314314
using value_type = ff_8::TileOperations::LayerId::value_type<TileT>;
315-
using operation_type = ff_8::TileOperations::LayerId::Get;
315+
using operation_type = ff_8::TileOperations::LayerId;
316316
static constexpr std::string_view key_name = "filter_layer_id";
317317
static constexpr std::string_view enabled_key_name
318318
= "filter_layer_id_enabled";
@@ -325,7 +325,7 @@ struct ConfigKeys<FilterTag::MultiLayerId>
325325
using TileT = open_viii::graphics::background::Tile1;
326326
using value_type
327327
= std::vector<ff_8::TileOperations::LayerId::value_type<TileT>>;
328-
using operation_type = ff_8::TileOperations::LayerId::Get;
328+
using operation_type = ff_8::TileOperations::LayerId;
329329
static constexpr std::string_view key_name = "filter_multi_layer_id";
330330
static constexpr std::string_view enabled_key_name
331331
= "filter_multi_layer_id_enabled";
@@ -336,7 +336,7 @@ struct ConfigKeys<FilterTag::TexturePageId>
336336
{
337337
using TileT = open_viii::graphics::background::Tile1;
338338
using value_type = ff_8::TileOperations::TextureId::value_type<TileT>;
339-
using operation_type = ff_8::TileOperations::TextureId::Get;
339+
using operation_type = ff_8::TileOperations::TextureId;
340340
static constexpr std::string_view key_name = "filter_texture_page_id";
341341
static constexpr std::string_view enabled_key_name
342342
= "filter_texture_page_id_enabled";
@@ -348,7 +348,7 @@ struct ConfigKeys<FilterTag::MultiTexturePageId>
348348
using TileT = open_viii::graphics::background::Tile1;
349349
using value_type
350350
= std::vector<ff_8::TileOperations::TextureId::value_type<TileT>>;
351-
using operation_type = ff_8::TileOperations::TextureId::Get;
351+
using operation_type = ff_8::TileOperations::TextureId;
352352
static constexpr std::string_view key_name
353353
= "filter_multi_texture_page_id";
354354
static constexpr std::string_view enabled_key_name
@@ -360,7 +360,7 @@ struct ConfigKeys<FilterTag::BlendMode>
360360
{
361361
using TileT = open_viii::graphics::background::Tile1;
362362
using value_type = ff_8::TileOperations::BlendMode::value_type<TileT>;
363-
using operation_type = ff_8::TileOperations::BlendMode::Get;
363+
using operation_type = ff_8::TileOperations::BlendMode;
364364
static constexpr std::string_view key_name = "filter_blend_mode";
365365
static constexpr std::string_view enabled_key_name
366366
= "filter_blend_mode_enabled";
@@ -372,7 +372,7 @@ struct ConfigKeys<FilterTag::MultiBlendMode>
372372
using TileT = open_viii::graphics::background::Tile1;
373373
using value_type
374374
= std::vector<ff_8::TileOperations::BlendMode::value_type<TileT>>;
375-
using operation_type = ff_8::TileOperations::BlendMode::Get;
375+
using operation_type = ff_8::TileOperations::BlendMode;
376376
static constexpr std::string_view enabled_key_name
377377
= "filter_multi_blend_mode_enabled";
378378
static constexpr std::string_view key_name = "filter_multi_blend_mode";
@@ -383,7 +383,7 @@ struct ConfigKeys<FilterTag::BlendOther>
383383
{
384384
using TileT = open_viii::graphics::background::Tile1;
385385
using value_type = ff_8::TileOperations::Blend::value_type<TileT>;
386-
using operation_type = ff_8::TileOperations::Blend::Get;
386+
using operation_type = ff_8::TileOperations::Blend;
387387
static constexpr std::string_view key_name = "filter_blend_other";
388388
static constexpr std::string_view enabled_key_name
389389
= "filter_blend_other_enabled";
@@ -396,7 +396,7 @@ struct ConfigKeys<FilterTag::MultiBlendOther>
396396
using TileT = open_viii::graphics::background::Tile1;
397397
using value_type
398398
= std::vector<ff_8::TileOperations::Blend::value_type<TileT>>;
399-
using operation_type = ff_8::TileOperations::Blend::Get;
399+
using operation_type = ff_8::TileOperations::Blend;
400400
static constexpr std::string_view key_name = "filter_multi_blend_other";
401401
static constexpr std::string_view enabled_key_name
402402
= "filter_multi_blend_other_enabled";
@@ -407,7 +407,7 @@ struct ConfigKeys<FilterTag::Bpp>
407407
{
408408
using TileT = open_viii::graphics::background::Tile1;
409409
using value_type = ff_8::TileOperations::Depth::value_type<TileT>;
410-
using operation_type = ff_8::TileOperations::Depth::Get;
410+
using operation_type = ff_8::TileOperations::Depth;
411411
static constexpr std::string_view key_name = "filter_bpp";
412412
static constexpr std::string_view enabled_key_name = "filter_bpp_enabled";
413413
};
@@ -418,7 +418,7 @@ struct ConfigKeys<FilterTag::MultiBpp>
418418
using TileT = open_viii::graphics::background::Tile1;
419419
using value_type
420420
= std::vector<ff_8::TileOperations::Depth::value_type<TileT>>;
421-
using operation_type = ff_8::TileOperations::Depth::Get;
421+
using operation_type = ff_8::TileOperations::Depth;
422422
static constexpr std::string_view key_name = "filter_multi_bpp";
423423
static constexpr std::string_view enabled_key_name
424424
= "filter_multi_bpp_enabled";

0 commit comments

Comments
 (0)