efda7f3f9c
Takes the first two commits from #15375 and adds suggestions from this comment: https://github.com/bevyengine/bevy/pull/15375#issuecomment-2366968300 See #15375 for more reasoning/motivation. ## Rebasing (rerunning) ```rust git switch simpler-lint-fixes git reset --hard main cargo fmt --all -- --unstable-features --config normalize_comments=true,imports_granularity=Crate cargo fmt --all git add --update git commit --message "rustfmt" cargo clippy --workspace --all-targets --all-features --fix cargo fmt --all -- --unstable-features --config normalize_comments=true,imports_granularity=Crate cargo fmt --all git add --update git commit --message "clippy" git cherry-pick e6c0b94f6795222310fb812fa5c4512661fc7887 ```
70 lines
2.0 KiB
Rust
70 lines
2.0 KiB
Rust
#[cfg(feature = "serialize")]
|
|
use crate::serde::SceneDeserializer;
|
|
use crate::{ron, DynamicScene};
|
|
use bevy_asset::{io::Reader, AssetLoader, LoadContext};
|
|
use bevy_ecs::{
|
|
reflect::AppTypeRegistry,
|
|
world::{FromWorld, World},
|
|
};
|
|
use bevy_reflect::TypeRegistryArc;
|
|
#[cfg(feature = "serialize")]
|
|
use serde::de::DeserializeSeed;
|
|
use thiserror::Error;
|
|
|
|
/// Asset loader for a Bevy dynamic scene (`.scn` / `.scn.ron`).
|
|
///
|
|
/// The loader handles assets serialized with [`DynamicScene::serialize`].
|
|
#[derive(Debug)]
|
|
pub struct SceneLoader {
|
|
type_registry: TypeRegistryArc,
|
|
}
|
|
|
|
impl FromWorld for SceneLoader {
|
|
fn from_world(world: &mut World) -> Self {
|
|
let type_registry = world.resource::<AppTypeRegistry>();
|
|
SceneLoader {
|
|
type_registry: type_registry.0.clone(),
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Possible errors that can be produced by [`SceneLoader`]
|
|
#[non_exhaustive]
|
|
#[derive(Debug, Error)]
|
|
pub enum SceneLoaderError {
|
|
/// An [IO Error](std::io::Error)
|
|
#[error("Error while trying to read the scene file: {0}")]
|
|
Io(#[from] std::io::Error),
|
|
/// A [RON Error](ron::error::SpannedError)
|
|
#[error("Could not parse RON: {0}")]
|
|
RonSpannedError(#[from] ron::error::SpannedError),
|
|
}
|
|
|
|
#[cfg(feature = "serialize")]
|
|
impl AssetLoader for SceneLoader {
|
|
type Asset = DynamicScene;
|
|
type Settings = ();
|
|
type Error = SceneLoaderError;
|
|
|
|
async fn load<'a>(
|
|
&'a self,
|
|
reader: &'a mut dyn Reader,
|
|
_settings: &'a (),
|
|
_load_context: &'a mut LoadContext<'_>,
|
|
) -> Result<Self::Asset, Self::Error> {
|
|
let mut bytes = Vec::new();
|
|
reader.read_to_end(&mut bytes).await?;
|
|
let mut deserializer = ron::de::Deserializer::from_bytes(&bytes)?;
|
|
let scene_deserializer = SceneDeserializer {
|
|
type_registry: &self.type_registry.read(),
|
|
};
|
|
Ok(scene_deserializer
|
|
.deserialize(&mut deserializer)
|
|
.map_err(|e| deserializer.span_error(e))?)
|
|
}
|
|
|
|
fn extensions(&self) -> &[&str] {
|
|
&["scn", "scn.ron"]
|
|
}
|
|
}
|