From f29f6243cc745222baa9471bc0d27a7dd5c9c9d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Sun, 18 Feb 2024 17:56:34 +0100 Subject: [PATCH 1/4] update Bevy --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index a841374..1e5cfbf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,7 +18,7 @@ default = ["default-source"] default-source = ["futures-io", "futures-lite"] [dependencies.bevy] -version = "0.12" +version = "0.13" default-features = false features = ["bevy_asset"] From 7bb09a04c5b072701b939393a0f29ab3cd8fb9b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Sun, 18 Feb 2024 17:56:40 +0100 Subject: [PATCH 2/4] formatting --- src/asset_reader.rs | 12 ++++++------ src/lib.rs | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/asset_reader.rs b/src/asset_reader.rs index d36eed5..3befcab 100644 --- a/src/asset_reader.rs +++ b/src/asset_reader.rs @@ -17,15 +17,15 @@ use crate::{include_all_assets, EmbeddedRegistry}; /// Struct which can be used to retrieve embedded assets directly /// without the normal Bevy `Handle` approach. This is useful /// for cases where you need an asset outside the Bevy ECS environment. -/// +/// /// This is only available when the `default-source` cargo feature is enabled. -/// +/// /// Example usage is below which assumes you have an asset named `image.png` /// in your `assets` folder (which this crate embeds at compile time). /// ```rust -/// use bevy_embedded_assets::EmbeddedAssetReader; +/// use bevy_embedded_assets::{DataReader, EmbeddedAssetReader}; /// use std::path::Path; -/// +/// /// fn some_bevy_system() { /// let embedded: EmbeddedAssetReader = EmbeddedAssetReader::preloaded(); /// let reader: DataReader = embedded.load_path_sync(&Path::new("image.png")).unwrap(); @@ -68,7 +68,7 @@ impl EmbeddedAssetReader { } /// Create an [`EmbeddedAssetReader`] loaded with all the assets found by the build script. - /// + /// /// This ensures the [`EmbeddedAssetReader`] has all (embedded) assets loaded and can be used /// directly without the typical Bevy `Handle` approach. Retrieve assets directly after /// calling `preloaded` with [`EmbeddedAssetReader::load_path_sync()`]. @@ -140,7 +140,7 @@ impl EmbeddedAssetReader { /// A wrapper around the raw bytes of an asset. /// This is returned by [`EmbeddedAssetReader::load_path_sync()`]. -/// +/// /// To get the raw data, use `reader.0`. #[derive(Default, Debug, Clone, Copy)] pub struct DataReader(pub &'static [u8]); diff --git a/src/lib.rs b/src/lib.rs index b4191ed..4d7d49b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -27,9 +27,9 @@ use bevy::{ #[cfg(feature = "default-source")] mod asset_reader; #[cfg(feature = "default-source")] -pub use asset_reader::EmbeddedAssetReader; -#[cfg(feature = "default-source")] pub use asset_reader::DataReader; +#[cfg(feature = "default-source")] +pub use asset_reader::EmbeddedAssetReader; include!(concat!(env!("OUT_DIR"), "/include_all_assets.rs")); From ccffad72b36865ec0b301c56628b0a94c526ad6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Sun, 18 Feb 2024 19:55:26 +0100 Subject: [PATCH 3/4] ignore lint --- src/asset_reader.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/asset_reader.rs b/src/asset_reader.rs index 3befcab..82f7326 100644 --- a/src/asset_reader.rs +++ b/src/asset_reader.rs @@ -33,6 +33,7 @@ use crate::{include_all_assets, EmbeddedRegistry}; /// // Do what you need with the data /// } /// ``` +#[allow(clippy::module_name_repetitions)] pub struct EmbeddedAssetReader { loaded: HashMap<&'static Path, &'static [u8]>, fallback: Option>, From cc5900ff384ea1118c4f7d9525e288e43724fbfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Sun, 18 Feb 2024 19:57:13 +0100 Subject: [PATCH 4/4] update version --- Cargo.toml | 2 +- README.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 1e5cfbf..932fff8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bevy_embedded_assets" -version = "0.9.1" +version = "0.10.0" authors = ["François Mockers "] edition = "2021" license = "MIT OR Apache-2.0" diff --git a/README.md b/README.md index 4f7bfd0..37b521f 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,7 @@ fn main() { |Bevy|bevy_embedded_assets| |---|---| |main|main| +|0.13|0.10| |0.12|0.9| |0.11|0.8| |0.10|0.7|