From 6f8e3714dab2100e47f384ec899cca91df46e93b Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Tue, 3 Nov 2026 19:34:20 -0500 Subject: [PATCH] Rename RenderParams -> Options --- src/fart/Cli.cpp | 8 ++++---- src/fart/Cli.h | 4 ++-- src/fart/Engine.cpp | 10 +++++----- src/fart/Engine.h | 6 +++--- src/fart/{RenderParams.cpp => Options.cpp} | 6 +++--- src/fart/{RenderParams.h => Options.h} | 4 ++-- src/fart/Parser.cpp | 6 +++--- src/fart/Scene.h | 4 ++-- src/fart/main.cpp | 2 +- 9 files changed, 25 insertions(+), 25 deletions(-) rename src/fart/{RenderParams.cpp => Options.cpp} (84%) rename src/fart/{RenderParams.h => Options.h} (83%) diff --git a/src/fart/Cli.cpp b/src/fart/Cli.cpp index a1aaadd..55397c9 100644 --- a/src/fart/Cli.cpp +++ b/src/fart/Cli.cpp @@ -172,7 +172,7 @@ int Cli::handle_option(size_t flag_idx, const char * arg_value) { case flag_height: case flag_height_l: - if (!parse_size(flag_defs[flag_idx].flag, arg_value, &this->params.height)) + if (!parse_size(flag_defs[flag_idx].flag, arg_value, &this->options.height)) { return 2; } @@ -198,11 +198,11 @@ int Cli::handle_option(size_t flag_idx, const char * arg_value) case flag_threads: case flag_threads_l: - if (!parse_size(flag_defs[flag_idx].flag, arg_value, &this->params.threads)) + if (!parse_size(flag_defs[flag_idx].flag, arg_value, &this->options.threads)) { return 2; } - if (*this->params.threads == 0u) + if (*this->options.threads == 0u) { fprintf(stderr, "Error: option %s must be at least 1\n", flag_defs[flag_idx].flag); return 2; @@ -211,7 +211,7 @@ int Cli::handle_option(size_t flag_idx, const char * arg_value) case flag_width: case flag_width_l: - if (!parse_size(flag_defs[flag_idx].flag, arg_value, &this->params.width)) + if (!parse_size(flag_defs[flag_idx].flag, arg_value, &this->options.width)) { return 2; } diff --git a/src/fart/Cli.h b/src/fart/Cli.h index ec31c24..b9642c8 100644 --- a/src/fart/Cli.h +++ b/src/fart/Cli.h @@ -1,11 +1,11 @@ #pragma once -#include +#include class Cli { public: - RenderParams params; + Options options; string_view input_file; opt output_file; diff --git a/src/fart/Engine.cpp b/src/fart/Engine.cpp index b55e6f4..9050d48 100644 --- a/src/fart/Engine.cpp +++ b/src/fart/Engine.cpp @@ -4,8 +4,8 @@ #include #include -Engine::Engine(const RenderParams & params) - : params(params) +Engine::Engine(const Options & options) + : options(options) { } @@ -62,9 +62,9 @@ int Engine::run(string_view input_file, opt output_file) return 1; } - /* CLI params take precedence over scene params; defaults fill the rest. */ - params.merge(scene->params); - params.apply_defaults(); + /* CLI options take precedence over scene options; defaults fill the rest. */ + options.merge(scene->options); + options.apply_defaults(); return 0; } diff --git a/src/fart/Engine.h b/src/fart/Engine.h index 528ece7..7845529 100644 --- a/src/fart/Engine.h +++ b/src/fart/Engine.h @@ -1,19 +1,19 @@ #pragma once #include -#include +#include #include #include class Engine { public: - Engine(const RenderParams & params); + Engine(const Options & options); ~Engine(); int run(string_view input_file, opt output_file); protected: - RenderParams params; + Options options; std::unique_ptr image_writer; Scene * scene = nullptr; }; diff --git a/src/fart/RenderParams.cpp b/src/fart/Options.cpp similarity index 84% rename from src/fart/RenderParams.cpp rename to src/fart/Options.cpp index f717f23..2a3e510 100644 --- a/src/fart/RenderParams.cpp +++ b/src/fart/Options.cpp @@ -1,7 +1,7 @@ -#include +#include #include -void RenderParams::merge(const RenderParams & other) +void Options::merge(const Options & other) { if (!width) { @@ -21,7 +21,7 @@ void RenderParams::merge(const RenderParams & other) } } -void RenderParams::apply_defaults() +void Options::apply_defaults() { if (!width) { diff --git a/src/fart/RenderParams.h b/src/fart/Options.h similarity index 83% rename from src/fart/RenderParams.h rename to src/fart/Options.h index d2bf070..65594bb 100644 --- a/src/fart/RenderParams.h +++ b/src/fart/Options.h @@ -3,7 +3,7 @@ #include #include -struct RenderParams +struct Options { opt width; opt height; @@ -11,7 +11,7 @@ struct RenderParams opt background; /* Set each field that is not already set to the value from other. */ - void merge(const RenderParams & other); + void merge(const Options & other); /* Fill in any unset fields with default values. */ void apply_defaults(); diff --git a/src/fart/Parser.cpp b/src/fart/Parser.cpp index 6c83c5a..15f8267 100644 --- a/src/fart/Parser.cpp +++ b/src/fart/Parser.cpp @@ -124,15 +124,15 @@ Scene * Parser::build_scene(const string_view & input_file, PStart start) bool ok = true; if (PBackground background = item.pBackground(); p_node_valid(background)) { - scene->params.background = vector_to_color(background.pVector()); + scene->options.background = vector_to_color(background.pVector()); } else if (PHeight height = item.pHeight(); p_node_valid(height)) { - ok = token_to_size(input_file, height.pToken2(), &scene->params.height); + ok = token_to_size(input_file, height.pToken2(), &scene->options.height); } else if (PWidth width = item.pWidth(); p_node_valid(width)) { - ok = token_to_size(input_file, width.pToken2(), &scene->params.width); + ok = token_to_size(input_file, width.pToken2(), &scene->options.width); } if (!ok) { diff --git a/src/fart/Scene.h b/src/fart/Scene.h index 5349bb8..1d2a14e 100644 --- a/src/fart/Scene.h +++ b/src/fart/Scene.h @@ -1,9 +1,9 @@ #pragma once -#include +#include class Scene { public: - RenderParams params; + Options options; }; diff --git a/src/fart/main.cpp b/src/fart/main.cpp index 0f82813..a81605c 100644 --- a/src/fart/main.cpp +++ b/src/fart/main.cpp @@ -15,6 +15,6 @@ int main(int argc, char * argv[]) fprintf(stderr, "Error: no input file specified\n"); return 1; } - Engine engine(cli.params); + Engine engine(cli.options); return engine.run(cli.input_file, cli.output_file); }