mindustry logic execution, map- and schematic- parsing and rendering
fix scaling
bendn 2023-10-29
parent d4364ae · commit ecb3d4b
-rw-r--r--mindus/Cargo.toml2
-rw-r--r--mindus/src/block/logic.rs12
2 files changed, 5 insertions, 9 deletions
diff --git a/mindus/Cargo.toml b/mindus/Cargo.toml
index 9c77e79..35cc54a 100644
--- a/mindus/Cargo.toml
+++ b/mindus/Cargo.toml
@@ -25,7 +25,7 @@ bobbin-bits = "0.1"
blurslice = { version = "0.1" }
enum_dispatch = "0.3"
phf = { version = "0.11", features = ["macros"] }
-fimg = { version = "0.4.15", default-features = false }
+fimg = { version = "0.4.20", features = ["scale"], default-features = false }
umath = "0.0.1"
[features]
diff --git a/mindus/src/block/logic.rs b/mindus/src/block/logic.rs
index 2b03326..060381c 100644
--- a/mindus/src/block/logic.rs
+++ b/mindus/src/block/logic.rs
@@ -138,14 +138,10 @@ impl BlockLogic for CanvasBlock {
(*r, *g, *b) = PALETTE[y as usize];
*a = 255;
}
- let img = unsafe {
- fimg::scale::Nearest::scale(
- img.as_ref(),
- (s * self.size as u32) - offset * 2,
- (s * self.size as u32) - offset * 2,
- )
- .boxed()
- };
+ let img = img.scale::<fimg::scale::Nearest>(
+ (s * self.size as u32) - offset * 2,
+ (s * self.size as u32) - offset * 2,
+ );
let mut borders = load!("canvas", s);
unsafe { borders.overlay_at(&ImageHolder::from(img), offset, offset) };
return borders;