From f81cfa413f2c57de2721f5b676ca659eec112200 Mon Sep 17 00:00:00 2001 From: Michael Huebner Date: Mon, 10 Mar 2025 12:13:08 +0100 Subject: [PATCH] Allow multiple modifier --- vulkan-rs/src/image.rs | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/vulkan-rs/src/image.rs b/vulkan-rs/src/image.rs index f95dabc..2444e84 100644 --- a/vulkan-rs/src/image.rs +++ b/vulkan-rs/src/image.rs @@ -708,7 +708,7 @@ impl Image { /// # Arguments /// /// * `array` - Source images - pub fn cube_map(array: [(AssetPath, ImageModifier); 6]) -> Result { + pub fn cube_map(array: [(AssetPath, Vec); 6]) -> Result { let mut dyn_images = array .into_iter() .map(|(path, modifier)| { @@ -720,14 +720,16 @@ impl Image { }) .collect::>>()?; - for (image, modifier) in dyn_images.iter_mut() { - match modifier { - ImageModifier::None => (), - ImageModifier::Rotate90 => *image = image.rotate90(), - ImageModifier::Rotate180 => *image = image.rotate180(), - ImageModifier::Rotate270 => *image = image.rotate270(), - ImageModifier::FlipV => *image = image.flipv(), - ImageModifier::FlipH => *image = image.fliph(), + for (image, modifiers) in dyn_images.iter_mut() { + for modifier in modifiers { + match modifier { + ImageModifier::None => (), + ImageModifier::Rotate90 => *image = image.rotate90(), + ImageModifier::Rotate180 => *image = image.rotate180(), + ImageModifier::Rotate270 => *image = image.rotate270(), + ImageModifier::FlipV => *image = image.flipv(), + ImageModifier::FlipH => *image = image.fliph(), + } } }