From 488c7ed94b0662222fa0d825ab81b60b0b1e5d6c Mon Sep 17 00:00:00 2001
From: Micha White <botahamec@outlook.com>
Date: Mon, 1 Jan 2024 19:41:32 -0500
Subject: Created a texture packer

---
 packer/src/bin/benchmark.rs  |  26 ++++++++++++++++++++++++++
 packer/src/bin/res/bunny.ff  | Bin 0 -> 8208 bytes
 packer/src/bin/res/bunny.png | Bin 0 -> 438 bytes
 packer/src/bin/res/gator.bmp | Bin 0 -> 750054 bytes
 packer/src/bin/res/gator.ff  | Bin 0 -> 2000016 bytes
 packer/src/bin/res/ghost.ico | Bin 0 -> 67646 bytes
 packer/src/lib.rs            |   4 +++-
 7 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 packer/src/bin/benchmark.rs
 create mode 100644 packer/src/bin/res/bunny.ff
 create mode 100644 packer/src/bin/res/bunny.png
 create mode 100644 packer/src/bin/res/gator.bmp
 create mode 100644 packer/src/bin/res/gator.ff
 create mode 100644 packer/src/bin/res/ghost.ico

(limited to 'packer/src')

diff --git a/packer/src/bin/benchmark.rs b/packer/src/bin/benchmark.rs
new file mode 100644
index 0000000..bb83992
--- /dev/null
+++ b/packer/src/bin/benchmark.rs
@@ -0,0 +1,26 @@
+use std::{fs::File, sync::Arc, time::Instant};
+
+use image::{io::Reader as ImageReader, ImageOutputFormat};
+use packer::RectanglePacker;
+
+fn main() -> Result<(), exun::RawUnexpected> {
+	let img1 = ImageReader::open("src/bin/res/gator.bmp")?.decode()?;
+	let img2 = ImageReader::open("src/bin/res/bunny.ff")?.decode()?;
+	let img3 = ImageReader::open("src/bin/res/ghost.ico")?.decode()?;
+
+	let start = Instant::now();
+	let mut packer = RectanglePacker::new();
+	packer.add_texture("gator".into(), Arc::new(img1.to_rgb8()));
+	packer.add_texture("bunny".into(), Arc::new(img2.to_rgb8()));
+	packer.add_texture("ghost".into(), Arc::new(img3.to_rgb8()));
+	println!("{} milliseconds", start.elapsed().as_secs_f32() * 1000.0);
+
+	let start = Instant::now();
+	let packed = packer.output();
+	println!("{} milliseconds", start.elapsed().as_secs_f32() * 1000.0);
+
+	let mut file = File::create("packed.png")?;
+	packed?.0.write_to(&mut file, ImageOutputFormat::Bmp)?;
+
+	Ok(())
+}
diff --git a/packer/src/bin/res/bunny.ff b/packer/src/bin/res/bunny.ff
new file mode 100644
index 0000000..64c5a69
Binary files /dev/null and b/packer/src/bin/res/bunny.ff differ
diff --git a/packer/src/bin/res/bunny.png b/packer/src/bin/res/bunny.png
new file mode 100644
index 0000000..87ba72d
Binary files /dev/null and b/packer/src/bin/res/bunny.png differ
diff --git a/packer/src/bin/res/gator.bmp b/packer/src/bin/res/gator.bmp
new file mode 100644
index 0000000..e752b56
Binary files /dev/null and b/packer/src/bin/res/gator.bmp differ
diff --git a/packer/src/bin/res/gator.ff b/packer/src/bin/res/gator.ff
new file mode 100644
index 0000000..aac1bcb
Binary files /dev/null and b/packer/src/bin/res/gator.ff differ
diff --git a/packer/src/bin/res/ghost.ico b/packer/src/bin/res/ghost.ico
new file mode 100644
index 0000000..102de00
Binary files /dev/null and b/packer/src/bin/res/ghost.ico differ
diff --git a/packer/src/lib.rs b/packer/src/lib.rs
index 06c66ae..328f90e 100644
--- a/packer/src/lib.rs
+++ b/packer/src/lib.rs
@@ -1,5 +1,6 @@
+use std::collections::HashMap;
+use std::ops::Deref;
 use std::sync::Arc;
-use std::{collections::HashMap, ops::Deref};
 
 use exun::RawUnexpected;
 use image::{GenericImage, RgbImage};
@@ -92,6 +93,7 @@ impl RectanglePacker {
 		let mut rectangles = Vec::with_capacity(self.textures.len());
 
 		self.textures.sort();
+		self.textures.reverse();
 		for texture in &self.textures {
 			// loop to the next row if we've gone off the edge
 			if (x_position + texture.0.width()) > image_width {
-- 
cgit v1.2.3