Reorder Options members by usage order

This commit is contained in:
ISSOtm
2022-03-05 21:28:45 +01:00
committed by Eldred Habert
parent f0eca86c52
commit bf9f99ebf5

View File

@@ -20,30 +20,32 @@
#include "gfx/rgba.hpp" #include "gfx/rgba.hpp"
struct Options { struct Options {
bool beVerbose = false; // -v bool useColorCurve = false; // -C
bool fixInput = false; // -f bool fixInput = false; // -f
bool columnMajor = false; // -Z, previously -h
bool allowMirroring = false; // -m bool allowMirroring = false; // -m
bool allowDedup = false; // -u bool allowDedup = false; // -u
bool useColorCurve = false; // -C bool beVerbose = false; // -v
uint8_t bitDepth = 2; // -d bool columnMajor = false; // -Z, previously -h
uint64_t trim = 0; // -x
uint8_t nbPalettes = 8; // -n std::filesystem::path attrmap{}; // -a, -A
uint8_t nbColorsPerPal = 0; // -s; 0 means "auto" = 1 << bitDepth; std::array<uint8_t, 2> baseTileIDs{0, 0}; // -b
enum { enum {
NO_SPEC, NO_SPEC,
EXPLICIT, EXPLICIT,
EMBEDDED, EMBEDDED,
} palSpecType = NO_SPEC; // -c } palSpecType = NO_SPEC; // -c
std::vector<std::array<Rgba, 4>> palSpec{}; std::vector<std::array<Rgba, 4>> palSpec{};
std::array<uint16_t, 2> unitSize{1, 1}; // -u (in tiles) uint8_t bitDepth = 2; // -d
std::array<uint32_t, 4> inputSlice{0, 0, 0, 0}; // -L std::array<uint32_t, 4> inputSlice{0, 0, 0, 0}; // -L
std::array<uint8_t, 2> baseTileIDs{0, 0}; // -b
std::array<uint16_t, 2> maxNbTiles{UINT16_MAX, 0}; // -N std::array<uint16_t, 2> maxNbTiles{UINT16_MAX, 0}; // -N
std::filesystem::path tilemap{}; // -t, -T uint8_t nbPalettes = 8; // -n
std::filesystem::path attrmap{}; // -a, -A
std::filesystem::path palettes{}; // -p, -P
std::filesystem::path output{}; // -o std::filesystem::path output{}; // -o
std::filesystem::path palettes{}; // -p, -P
uint8_t nbColorsPerPal = 0; // -s; 0 means "auto" = 1 << bitDepth;
std::filesystem::path tilemap{}; // -t, -T
std::array<uint16_t, 2> unitSize{1, 1}; // -U (in tiles)
uint64_t trim = 0; // -x
std::filesystem::path input{}; // positional arg std::filesystem::path input{}; // positional arg
format_(printf, 2, 3) void verbosePrint(char const *fmt, ...) const; format_(printf, 2, 3) void verbosePrint(char const *fmt, ...) const;