From 9de7202764094f09b829991eb523bd27865bfa81 Mon Sep 17 00:00:00 2001 From: Lee-Orr Date: Thu, 8 Feb 2024 19:24:10 -0500 Subject: [PATCH] format and clippy --- examples/simple_example.rs | 19 +++++++++++++++---- src/lib.rs | 31 ++++++++++++++++++++++++------- 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/examples/simple_example.rs b/examples/simple_example.rs index 80813d5..ab333d4 100644 --- a/examples/simple_example.rs +++ b/examples/simple_example.rs @@ -51,12 +51,23 @@ fn setup(mut commands: Commands, asset_server: Res) { }); } -fn setup_animation(mut commands: Commands, asset_server: Res, mut players: Query, Without)>) { +fn setup_animation( + mut commands: Commands, + asset_server: Res, + mut players: Query, Without)>, +) { for entity in &mut players { - let handle = asset_server.load_with_settings("20240205_shapekey_BevyImplementationFaceCap_5/fake_test.morph_anim.csv", |s: &mut CSVAnimationLoaderSettings| { s.0.parts = vec![Name::new("pascal_Head")]; }); + let handle = asset_server.load_with_settings( + "20240205_shapekey_BevyImplementationFaceCap_5/fake_test.morph_anim.csv", + |s: &mut CSVAnimationLoaderSettings| { + s.0.parts = vec![Name::new("pascal_Head")]; + }, + ); let mut player = AnimationPlayer::default(); player.play(handle.clone()).repeat(); - - commands.entity(entity).insert((AnimationRunning(handle), player)); + + commands + .entity(entity) + .insert((AnimationRunning(handle), player)); } } diff --git a/src/lib.rs b/src/lib.rs index 2d494ad..cec0c2f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,9 +1,13 @@ use std::{num::ParseFloatError, str::FromStr}; use bevy::{ - animation::{self, AnimationClip, EntityPath, Keyframes, VariableCurve}, asset::{meta::Settings, Asset, AssetLoader, AsyncReadExt}, core::Name, log::info, reflect::Reflect + animation::{AnimationClip, EntityPath, Keyframes, VariableCurve}, + asset::{Asset, AssetLoader, AsyncReadExt}, + core::Name, + log::info, + reflect::Reflect, }; -use serde::{de::DeserializeOwned, Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; #[derive( Clone, Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord, Reflect, Default, @@ -253,8 +257,14 @@ pub struct CSVAnimationLoaderSettings(pub EntityPath); impl Serialize for CSVAnimationLoaderSettings { fn serialize(&self, serializer: S) -> Result where - S: serde::Serializer { - let names = self.0.parts.iter().map(|name| name.to_string()).collect::>(); + S: serde::Serializer, + { + let names = self + .0 + .parts + .iter() + .map(|name| name.to_string()) + .collect::>(); names.serialize(serializer) } } @@ -262,9 +272,12 @@ impl Serialize for CSVAnimationLoaderSettings { impl<'de> Deserialize<'de> for CSVAnimationLoaderSettings { fn deserialize(deserializer: D) -> Result where - D: serde::Deserializer<'de> { + D: serde::Deserializer<'de>, + { let names = Vec::::deserialize(deserializer)?; - Ok(CSVAnimationLoaderSettings(EntityPath { parts: names.into_iter().map(|name| Name::new(name)).collect() })) + Ok(CSVAnimationLoaderSettings(EntityPath { + parts: names.into_iter().map(Name::new).collect(), + })) } } @@ -290,7 +303,11 @@ impl AssetLoader for CSVAnimationLoader { let csv_animation = CSVAnimation::parse(&csv).map_err(CSVAnimationLoaderError::CSVParseError)?; - info!("Parsed Animation - got {} FPS with {} total frames", csv_animation.fps, csv_animation.frames.len()); + info!( + "Parsed Animation - got {} FPS with {} total frames", + csv_animation.fps, + csv_animation.frames.len() + ); let animation = csv_animation.generate_clip(&settings.0);