a6adced9ed
# Objective - Remove `derive_more`'s error derivation and replace it with `thiserror` ## Solution - Added `derive_more`'s `error` feature to `deny.toml` to prevent it sneaking back in. - Reverted to `thiserror` error derivation ## Notes Merge conflicts were too numerous to revert the individual changes, so this reversion was done manually. Please scrutinise carefully during review.
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(
|
|
&self,
|
|
reader: &mut dyn Reader,
|
|
_settings: &(),
|
|
_load_context: &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"]
|
|
}
|
|
}
|