Remove converter.rs and update related modules for refactoring

Delete src/converter.rs and update references in lib.rs, main.rs, and texture.rs to support codebase refactoring. Prepare for new utility structure under src/utils/.

Author: bingling-sama

src/converter.rs

@@ -1,23 +1,26 @@
-//! Minecraft 皮肤渲染器库
-//!
-//! 这个库提供了一个完整的 Minecraft 皮肤渲染解决方案，支持：
-//! - 加载和渲染 Minecraft 皮肤
-//! - 自定义姿势和视角
-//! - 多种输出格式
-//! - 离屏渲染
-//!
-//! # 示例
-//!
-//! ```rust
-//! use skinviewer::{Renderer, Character, Camera};
-//!
-//! let renderer = Renderer::new();
-//! let mut character = Character::new();
-//! let camera = Camera::new();
-//! // character.load_skin...
-//! renderer.render_to_image(&character, &camera, "output.png", (800, 600));
-//! ```
+/*!
+Minecraft 皮肤渲染器库
 
+这个库提供了一个完整的 Minecraft 皮肤渲染解决方案，支持：
+- 加载和渲染 Minecraft 皮肤
+- 自定义姿势和视角
+- 多种输出格式
+- 离屏渲染
+
+# 示例
+
+```rust
+use skinviewer::{Renderer, Character, Camera};
+
+let renderer = Renderer::new();
+let mut character = Character::new();
+let camera = Camera::new();
+// character.load_skin...
+renderer.render_to_image(&character, &camera, "output.png", (800, 600));
+```
+*/
+
+pub mod utils;
 pub mod camera;
 pub mod character;
 pub mod constants;

src/lib.rs

@@ -6,7 +6,8 @@ use eidolon::{
 };
 use std::path::PathBuf;
 
-mod converter;
+mod utils;
+use utils::converter;
 
 /// Minecraft皮肤工具
 #[derive(Parser, Debug)]
@@ -145,17 +146,15 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
             Ok(())
         }
-        Command::Convert { input, output } => {
-            match converter::convert_to_double_layer(&input, &output) {
-                Ok(_) => {
-                    println!("转换成功！双层皮肤已保存到: {:?}", output);
-                    Ok(())
-                }
-                Err(e) => {
-                    eprintln!("转换失败: {}", e);
-                    Err(Box::new(std::io::Error::new(std::io::ErrorKind::Other, e)))
-                }
+        Command::Convert { input, output } => match converter::single2double(&input, &output) {
+            Ok(_) => {
+                println!("转换成功！双层皮肤已保存到: {:?}", output);
+                Ok(())
             }
-        }
+            Err(e) => {
+                eprintln!("转换失败: {}", e);
+                Err(Box::new(std::io::Error::new(std::io::ErrorKind::Other, e)))
+            }
+        },
     }
 }

src/main.rs

@@ -5,9 +5,10 @@
 
 use glium::backend::glutin::headless::Headless;
 use glium::texture::{RawImage2d, Texture2d};
-use image::ImageFormat;
+use image::{DynamicImage, GenericImageView, ImageBuffer, ImageFormat};
 use std::fs::File;
 use std::io::BufReader;
+use crate::utils::converter::single2double_image;
 
 /// 纹理结构体
 ///
@@ -51,21 +52,43 @@ impl Texture {
         path: &str,
     ) -> Result<Self, Box<dyn std::error::Error>> {
         println!("Loading texture: {}", path);
-
         // 加载图像
-        let image = image::load(BufReader::new(File::open(path)?), ImageFormat::Png)?.to_rgba8();
+        let file = File::open(path)?;
+        let reader = BufReader::new(file);
+        let image = image::load(reader, ImageFormat::Png)?.to_rgba8();
+        match Self::load_texture(display, &DynamicImage::ImageRgba8(image)) {
+            Ok(texture) => Ok(texture),
+            Err(e) => Err(e),
+        }
+    }
 
-        let image_dimensions = image.dimensions();
+    fn load_texture(
+        display: &Headless,
+        image: &DynamicImage,
+    ) -> Result<Texture, Box<dyn std::error::Error>> {
+        let (width, height) = image.dimensions();
         println!(
             "Texture dimensions: {}x{}",
-            image_dimensions.0, image_dimensions.1
+            width, height
         );
 
+        // 判断是否为单层皮肤（宽=高×2），如是则转换为双层
+        let image = if width == height * 2 {
+            println!("Single-layer skin detected, converting to double-layer...");
+            match single2double_image(image) {
+                Ok(img) => img,
+                Err(e) => return Err(format!("Failed to convert single-layer to double-layer: {}", e).into()),
+            }
+        } else {
+            image.clone()
+        };
+
+        let image_dimensions = image.dimensions();
         // 创建 OpenGL 纹理
-        let image = RawImage2d::from_raw_rgba_reversed(&image.into_raw(), image_dimensions);
+        let image_rgba = image.to_rgba8();
+        let image = RawImage2d::from_raw_rgba_reversed(image_rgba.as_raw(), image_dimensions);
         let texture = Texture2d::new(display, image)?;
         println!("Texture loaded into GPU");
-
         Ok(Texture { texture })
     }
 }