diff options
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | Cargo.toml | 6 | ||||
| -rw-r--r-- | source/benoit/benoit/application/handle_keys.rs | 4 | ||||
| -rw-r--r-- | source/benoit/benoit/application/initialise.rs | 11 | ||||
| -rw-r--r-- | source/benoit/benoit/configuration/load.rs | 8 |
5 files changed, 19 insertions, 16 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 94a6178..34a8383 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# 2↊ + +* Fix Julia toggle messages +* Fix configuration parameter names +* Bump dependency versions + # 29 * Support offsets in viewport feedback @@ -1,6 +1,6 @@ [package] name = "benoit" -version = "0.33.0" +version = "0.34.0" authors = ["Gabriel Bjørnager Jensen"] edition = "2021" description = "Mandelbrot renderer." @@ -16,7 +16,7 @@ lto = true [dependencies] rayon = "1.7.0" -rug = "1.21.0" +rug = "1.22.0" sdl2 = "0.35.2" -toml = "0.7.6" +toml = "0.8.0" webp = "0.2.5" diff --git a/source/benoit/benoit/application/handle_keys.rs b/source/benoit/benoit/application/handle_keys.rs index 3d45f1d..0a1b281 100644 --- a/source/benoit/benoit/application/handle_keys.rs +++ b/source/benoit/benoit/application/handle_keys.rs @@ -52,8 +52,8 @@ fn toggle_julia(julia: bool) -> (bool, RowRenderer) { let row_renderer = Application::get_row_renderer(julia); match julia { - false => eprintln!("enabled the julia set"), - true => eprintln!("disabled the julia set"), + false => eprintln!("disabled the julia set"), + true => eprintln!("enabled the julia set"), }; return (julia, row_renderer); diff --git a/source/benoit/benoit/application/initialise.rs b/source/benoit/benoit/application/initialise.rs index 2e9eb2b..f019f02 100644 --- a/source/benoit/benoit/application/initialise.rs +++ b/source/benoit/benoit/application/initialise.rs @@ -21,16 +21,13 @@ If not, see <https://www.gnu.org/licenses/>. */ -use crate::benoit::PRECISION; use crate::benoit::application::Application; use crate::benoit::configuration::Configuration; use crate::benoit::video::Video; extern crate rayon; -extern crate rug; use rayon::ThreadPoolBuilder; -use rug::Float; use std::env::args; use std::thread::available_parallelism; @@ -71,9 +68,9 @@ impl Application { scale: configuration.scale, frame_count: configuration.frame_count, - centre_real: Float::with_val(PRECISION, configuration.centre_real), - centre_imag: Float::with_val(PRECISION, configuration.centre_imag), - zoom: Float::with_val(PRECISION, configuration.zoom), + centre_real: configuration.centre_real, + centre_imag: configuration.centre_imag, + zoom: configuration.zoom, max_iter_count: configuration.max_iter_count, dump_path: configuration.dump_path, @@ -81,7 +78,7 @@ impl Application { video: video, interactive: configuration.interactive, - do_render: true, + do_render: true, do_dump: false, row_renderer: Application::get_row_renderer( configuration.julia), diff --git a/source/benoit/benoit/configuration/load.rs b/source/benoit/benoit/configuration/load.rs index ae8c999..b06cd71 100644 --- a/source/benoit/benoit/configuration/load.rs +++ b/source/benoit/benoit/configuration/load.rs @@ -100,10 +100,10 @@ impl Configuration { get_integer(&mut configuration.scale, &configuration_table, "scale"); get_integer(&mut configuration.frame_count, &configuration_table, "frame_count"); - get_float( &mut configuration.centre_real, &configuration_table, "real"); - get_float( &mut configuration.centre_imag, &configuration_table, "imaginary"); - get_float( &mut configuration.zoom, &configuration_table, "zoom"); - get_integer(&mut configuration.max_iter_count, &configuration_table, "max_iter_count"); + get_float( &mut configuration.centre_real, &configuration_table, "real"); + get_float( &mut configuration.centre_imag, &configuration_table, "imaginary"); + get_float( &mut configuration.zoom, &configuration_table, "zoom"); + get_integer(&mut configuration.max_iter_count, &configuration_table, "maximum_iteration_count"); return configuration; } |