diff --git a/crates/bevy_gltf/src/lib.rs b/crates/bevy_gltf/src/lib.rs index 7277a906269f5..fc022bf94ff20 100644 --- a/crates/bevy_gltf/src/lib.rs +++ b/crates/bevy_gltf/src/lib.rs @@ -40,20 +40,23 @@ impl GltfPlugin { impl Plugin for GltfPlugin { fn build(&self, app: &mut App) { + app.register_type::() + .add_asset::() + .add_asset::() + .add_asset::() + .add_asset::(); + } + + fn finish(&self, app: &mut App) { let supported_compressed_formats = match app.world.get_resource::() { Some(render_device) => CompressedImageFormats::from_features(render_device.features()), - None => CompressedImageFormats::all(), + None => CompressedImageFormats::NONE, }; app.add_asset_loader::(GltfLoader { supported_compressed_formats, custom_vertex_attributes: self.custom_vertex_attributes.clone(), - }) - .register_type::() - .add_asset::() - .add_asset::() - .add_asset::() - .add_asset::(); + }); } } diff --git a/crates/bevy_render/src/texture/image_texture_loader.rs b/crates/bevy_render/src/texture/image_texture_loader.rs index 080198beee5df..247d65e5a279f 100644 --- a/crates/bevy_render/src/texture/image_texture_loader.rs +++ b/crates/bevy_render/src/texture/image_texture_loader.rs @@ -82,7 +82,7 @@ impl FromWorld for ImageTextureLoader { let supported_compressed_formats = match world.get_resource::() { Some(render_device) => CompressedImageFormats::from_features(render_device.features()), - None => CompressedImageFormats::all(), + None => CompressedImageFormats::NONE, }; Self { supported_compressed_formats, diff --git a/crates/bevy_render/src/texture/mod.rs b/crates/bevy_render/src/texture/mod.rs index 6d4fd23bb6c75..25a65e5198a6f 100644 --- a/crates/bevy_render/src/texture/mod.rs +++ b/crates/bevy_render/src/texture/mod.rs @@ -70,19 +70,6 @@ impl ImagePlugin { impl Plugin for ImagePlugin { fn build(&self, app: &mut App) { - #[cfg(any( - feature = "png", - feature = "dds", - feature = "tga", - feature = "jpeg", - feature = "bmp", - feature = "basis-universal", - feature = "ktx2", - ))] - { - app.init_asset_loader::(); - } - #[cfg(feature = "exr")] { app.init_asset_loader::(); @@ -112,6 +99,19 @@ impl Plugin for ImagePlugin { } fn finish(&self, app: &mut App) { + #[cfg(any( + feature = "png", + feature = "dds", + feature = "tga", + feature = "jpeg", + feature = "bmp", + feature = "basis-universal", + feature = "ktx2", + ))] + { + app.init_asset_loader::(); + } + if let Ok(render_app) = app.get_sub_app_mut(RenderApp) { let default_sampler = { let device = render_app.world.resource::();