Mirrors/bevy
2
0
Fork 0
mirror of https://github.com/bevyengine/bevy synced 2024-11-22 04:33:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Delete ImageLoader::COUNT in favour of ImageLoader::SUPPORTED_FORMATS.len(). (#15939)

Browse source 
# Objective

- This is a followup to #15812.

## Solution

I just deleted the `COUNT` const and replaced it. I didn't realize for
loops are not const yet, so improving the other const variables is not
obvious.

Note: `slice::len` has been const since Rust 1.39, so we're not relying
on a brand new feature or anything.

## Testing

- It builds!
This commit is contained in:
andriyDev 2024-10-15 17:50:50 -07:00 committed by GitHub
parent fbb53140e9
commit b109787764
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
crates/bevy_image/src/image_loader.rs
View file

@ -12,72 +12,6 @@ pub struct ImageLoader {
} }
impl ImageLoader { impl ImageLoader {
/// Number of image formats, used for computing other constants.
const COUNT: usize = {
let mut count = 0;
#[cfg(feature = "avif")]
{
count += 1;
}
#[cfg(feature = "basis-universal")]
{
count += 1;
}
#[cfg(feature = "bmp")]
{
count += 1;
}
#[cfg(feature = "dds")]
{
count += 1;
}
#[cfg(feature = "ff")]
{
count += 1;
}
#[cfg(feature = "gif")]
{
count += 1;
}
#[cfg(feature = "ico")]
{
count += 1;
}
#[cfg(feature = "jpeg")]
{
count += 1;
}
#[cfg(feature = "ktx2")]
{
count += 1;
}
#[cfg(feature = "pnm")]
{
count += 1;
}
#[cfg(feature = "png")]
{
count += 1;
}
#[cfg(feature = "qoi")]
{
count += 1;
}
#[cfg(feature = "tga")]
{
count += 1;
}
#[cfg(feature = "tiff")]
{
count += 1;
}
#[cfg(feature = "webp")]
{
count += 1;
}
count
};
/// Full list of supported formats. /// Full list of supported formats.
pub const SUPPORTED_FORMATS: &'static [ImageFormat] = &[ pub const SUPPORTED_FORMATS: &'static [ImageFormat] = &[
#[cfg(feature = "avif")] #[cfg(feature = "avif")]
@ -116,7 +50,7 @@ impl ImageLoader {
const COUNT_FILE_EXTENSIONS: usize = { const COUNT_FILE_EXTENSIONS: usize = {
let mut count = 0; let mut count = 0;
let mut idx = 0; let mut idx = 0;
while idx < Self::COUNT { while idx < Self::SUPPORTED_FORMATS.len() {
count += Self::SUPPORTED_FORMATS[idx].to_file_extensions().len(); count += Self::SUPPORTED_FORMATS[idx].to_file_extensions().len();
idx += 1; idx += 1;
} }
@ -128,7 +62,7 @@ impl ImageLoader {
let mut exts = [""; Self::COUNT_FILE_EXTENSIONS]; let mut exts = [""; Self::COUNT_FILE_EXTENSIONS];
let mut ext_idx = 0; let mut ext_idx = 0;
let mut fmt_idx = 0; let mut fmt_idx = 0;
while fmt_idx < Self::COUNT { while fmt_idx < Self::SUPPORTED_FORMATS.len() {
let mut off = 0; let mut off = 0;
let fmt_exts = Self::SUPPORTED_FORMATS[fmt_idx].to_file_extensions(); let fmt_exts = Self::SUPPORTED_FORMATS[fmt_idx].to_file_extensions();
while off < fmt_exts.len() { while off < fmt_exts.len() {