Put TGA decoder into its own crate

Inochi2D · Feb 15, 2024 · d2fe01b · d2fe01b
1 parent 317c50b
commit d2fe01b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 360 deletions.
diff --git a/inox2d/Cargo.toml b/inox2d/Cargo.toml
@@ -17,6 +17,7 @@ image = { version = "0.24.7", default-features = false, features = [
 indextree = "4.6.0"
 json = "0.12.4"
 owo-colors = { version = "4.0.0", optional = true }
+simple-tga-reader = "0.1.0"
 thiserror = "1.0.39"
 tracing = "0.1.37"
 

diff --git a/inox2d/src/texture.rs b/inox2d/src/texture.rs
@@ -5,9 +5,7 @@ use tracing::error;
 
 use crate::model::ModelTexture;
 
-use self::tga::{read_tga, TgaDecodeError, TgaImage};
-
-pub mod tga;
+use simple_tga_reader::{read_tga, TgaDecodeError, TgaImage};
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct TextureId(pub(crate) usize);
@@ -42,8 +40,8 @@ impl From<TgaImage> for ShallowTexture {
 	fn from(value: TgaImage) -> Self {
 		Self {
 			pixels: value.data,
-			width: value.header.width() as u32,
-			height: value.header.height() as u32,
+			width: value.header.width as u32,
+			height: value.header.height as u32,
 		}
 	}
 }

diff --git a/inox2d/src/texture/tga.rs b/inox2d/src/texture/tga.rs