From 20f24229537800094ee9fefedbe4cd4c4d4f000f Mon Sep 17 00:00:00 2001 From: Florian Gebhardt Date: Wed, 27 Mar 2024 17:20:56 +0100 Subject: [PATCH] fix: scale not affecting `tile_res` with `--hr` (#25) --- Cargo.lock | 2 +- Cargo.toml | 2 +- src/main.rs | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 61d8e0f..fa58596 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -968,7 +968,7 @@ dependencies = [ [[package]] name = "spritter" -version = "0.5.1" +version = "0.5.2" dependencies = [ "clap", "env_logger", diff --git a/Cargo.toml b/Cargo.toml index a95124d..77cf21f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "spritter" -version = "0.5.1" +version = "0.5.2" edition = "2021" authors = ["fgardt "] description = "Spritesheet generator for factorio" diff --git a/src/main.rs b/src/main.rs index 5f7cdba..7134769 100644 --- a/src/main.rs +++ b/src/main.rs @@ -250,11 +250,13 @@ impl SpritesheetArgs { } fn tile_res(&self) -> usize { - if self.hr { - 64 + let res = if self.hr { + 64.0 } else { - (self.tile_resolution as f64 * self.scale).round() as usize - } + self.tile_resolution as f64 + }; + + (res * self.scale).round() as usize } }