This commit is contained in:
numzero 2024-12-30 23:39:54 +03:00
parent 7ec4a1480e
commit 1f97134511
4 changed files with 14 additions and 3 deletions

11
Cargo.lock generated
View File

@ -595,12 +595,23 @@ checksum = "cd6f44aed642f18953a158afeb30206f4d50da59fbc66ecb53c66488de73563b"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"byteorder-lite", "byteorder-lite",
"image-webp",
"num-traits", "num-traits",
"png", "png",
"zune-core", "zune-core",
"zune-jpeg", "zune-jpeg",
] ]
[[package]]
name = "image-webp"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e031e8e3d94711a9ccb5d6ea357439ef3dcbed361798bd4071dc4d9793fbe22f"
dependencies = [
"byteorder-lite",
"quick-error",
]
[[package]] [[package]]
name = "indexmap" name = "indexmap"
version = "2.7.0" version = "2.7.0"

View File

@ -7,7 +7,7 @@ default-run = "minitracer"
[dependencies] [dependencies]
bytemuck = { version = "1.21.0", features = ["derive"] } bytemuck = { version = "1.21.0", features = ["derive"] }
glam = { version = "0.29.2", features = ["bytemuck"] } glam = { version = "0.29.2", features = ["bytemuck"] }
image = { version = "0.25.5", default-features = false, features = ["png", "jpeg"] } image = { version = "0.25.5", default-features = false, features = ["png", "jpeg", "webp"] }
pollster = "0.4.0" pollster = "0.4.0"
rand = "0.8.5" rand = "0.8.5"
rand_distr = { version = "0.4.3", features = ["std_math"] } rand_distr = { version = "0.4.3", features = ["std_math"] }

View File

@ -121,7 +121,7 @@ fn main() {
let img = let img =
image::RgbaImage::from_raw(extent, extent, buf.slice(..).get_mapped_range().to_vec()).unwrap(); image::RgbaImage::from_raw(extent, extent, buf.slice(..).get_mapped_range().to_vec()).unwrap();
let img: image::RgbImage = img.convert(); let img: image::RgbImage = img.convert();
img.save(format!("textures/env{face}.jpeg")).unwrap(); img.save(format!("textures/env{face}.webp")).unwrap();
}); });
} }
}) })

View File

@ -138,7 +138,7 @@ pub fn load_envmap(device: &wgpu::Device, queue: &wgpu::Queue) -> wgpu::TextureV
[0, 1, 2, 3, 4, 5] [0, 1, 2, 3, 4, 5]
.map(|face| { .map(|face| {
s.spawn(move || { s.spawn(move || {
let img = ImageReader::open(format!("textures/env{face}.jpeg")) let img = ImageReader::open(format!("textures/env{face}.webp"))
.unwrap() .unwrap()
.with_guessed_format() .with_guessed_format()
.unwrap() .unwrap()