robin/vmdl
1
0
Fork 0
mirror of https://codeberg.org/icewind/vmdl.git synced 2026-06-03 16:44:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

clippy fixes

Browse source
This commit is contained in:
Robin Appelman 2024-12-14 15:03:59 +01:00
commit 3175e0840c
4 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
examples/common/materials.rs
View file

@ -83,7 +83,7 @@ pub fn load_material(
let bump_map = material.bump_map().and_then(|path| {
Some(TextureData {
image: load_texture(&path, loader).ok()?,
image: load_texture(path, loader).ok()?,
name: path.into(),
})
});
@ -107,10 +107,10 @@ fn load_texture(name: &str, loader: &Loader) -> Result<DynamicImage, Error> {
"materials/{}.vtf",
name.trim_end_matches(".vtf").trim_start_matches('/')
);
let mut raw = loader
let raw = loader
.load(&path)?
.ok_or(Error::Other(format!("Can't find file {}", path)))?;
let vtf = VTF::read(&mut raw)?;
let vtf = VTF::read(&raw)?;
let image = vtf.highres_image.decode(0)?;
Ok(image)
}