From 6922fef5e36eaa5bb059335c7b8202892c598d79 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Fri, 17 Feb 2023 23:52:38 -0800 Subject: [PATCH] Cleanup warnings --- src/cmd/clsn.rs | 42 ++++++++++++++++------------------------ src/cmd/cmdl.rs | 2 +- src/util/dds.rs | 2 +- src/util/math_classes.rs | 2 +- 4 files changed, 20 insertions(+), 28 deletions(-) diff --git a/src/cmd/clsn.rs b/src/cmd/clsn.rs index 27f5a90..f59894d 100644 --- a/src/cmd/clsn.rs +++ b/src/cmd/clsn.rs @@ -1,34 +1,26 @@ use std::{ - borrow::Cow, - collections::HashMap, - fs::{ - DirBuilder, - File - }, - io::{Cursor, Read, Write}, + fs::File, + io::{Cursor, Write}, path::PathBuf, - string::FromUtf8Error, }; -use anyhow::{bail, ensure, Result}; +use anyhow::{ensure, Result}; use argh::FromArgs; -use binrw::{binrw, BinReaderExt, BinWriterExt, Endian}; +use binrw::{binrw, BinReaderExt, Endian}; use crate::{ format::{ chunk::ChunkDescriptor, - pack::{K_CHUNK_META, K_FORM_FOOT}, + pack::K_FORM_FOOT, rfrm::FormDescriptor, FourCC, }, util::{ file::map_file, - lzss::decompress_buffer, math_classes::{ CVector3f, CAABox, COBBox }, },}; -use crate::cmd::txtr::K_CHUNK_HEAD; // CAABoxCollisionTree pub const K_FORM_CLSN: FourCC = FourCC(*b"CLSN"); @@ -194,34 +186,34 @@ fn convert(args: ConvertArgs) -> Result<()> { ensure!(foot_desc.version_b == 1); ensure!(remain.is_empty()); - let mut bounds: Option = None; + //let mut bounds: Option = None; let mut vertices: Option = None; - let mut materials: Option = None; + //let mut materials: Option = None; let mut triangles: Option = None; - let mut aboxtree: Option = None; - let mut oboxtree: Option = None; + //let mut aboxtree: Option = None; + //let mut oboxtree: Option = None; while !col_data.is_empty() { let (desc, data, remain) = ChunkDescriptor::slice(col_data, Endian::Little)?; if desc.id == K_CHUNK_INFO { - bounds = Some(Cursor::new(data).read_type(Endian::Little)?); - log::debug!("Bounds: {bounds:#?}"); + //bounds = Some(Cursor::new(data).read_type(Endian::Little)?); + //log::debug!("Bounds: {bounds:#?}"); } else if desc.id == K_CHUNK_VERT { vertices = Some(Cursor::new(data).read_type(Endian::Little)?); log::debug!("Vertices: {vertices:#?}"); } else if desc.id == K_CHUNK_MTRL { - materials = Some(Cursor::new(data).read_type(Endian::Little)?); - log::debug!("Materials: {materials:#?}"); + //materials = Some(Cursor::new(data).read_type(Endian::Little)?); + //log::debug!("Materials: {materials:#?}"); } else if desc.id == K_CHUNK_TRIS { triangles = Some(Cursor::new(data).read_type(Endian::Little)?); log::debug!("Triangles: {triangles:#?}"); } else if desc.id == K_CHUNK_TREE { if form_desc.id == K_FORM_CLSN { - aboxtree = Some(Cursor::new(data).read_type(Endian::Little)?); - log::debug!("Tree: {aboxtree:#?}"); + //aboxtree = Some(Cursor::new(data).read_type(Endian::Little)?); + //log::debug!("Tree: {aboxtree:#?}"); } else { - oboxtree = Some(Cursor::new(data).read_type(Endian::Little)?); - log::debug!("Tree: {oboxtree:#?}"); + //oboxtree = Some(Cursor::new(data).read_type(Endian::Little)?); + //log::debug!("Tree: {oboxtree:#?}"); } } col_data = remain; diff --git a/src/cmd/cmdl.rs b/src/cmd/cmdl.rs index f6fa879..db34402 100644 --- a/src/cmd/cmdl.rs +++ b/src/cmd/cmdl.rs @@ -28,7 +28,7 @@ use crate::{ file::map_file, lzss::decompress_buffer, math_classes::{ - CVector3f, CAABox, + CAABox, }, }, }; diff --git a/src/util/dds.rs b/src/util/dds.rs index 3f55d41..2c3a168 100644 --- a/src/util/dds.rs +++ b/src/util/dds.rs @@ -1,6 +1,6 @@ use std::io::Write; -use anyhow::{ensure, Result}; +use anyhow::Result; use ddsfile::{AlphaMode, D3D10ResourceDimension, DxgiFormat, NewDxgiParams}; use crate::format::txtr::{ETextureFormat, ETextureType, STextureHeader}; diff --git a/src/util/math_classes.rs b/src/util/math_classes.rs index 3481c70..1630894 100644 --- a/src/util/math_classes.rs +++ b/src/util/math_classes.rs @@ -1,4 +1,4 @@ -use binrw::{binrw, BinReaderExt, BinWriterExt, Endian}; +use binrw::binrw; #[binrw] #[derive(Clone, Debug)]