Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Borrow Access in FilteredEntity(Ref|Mut) and Entity(Ref|Mut)Except #5

Open
wants to merge 2 commits into
base: state-in-queryitem-base
Choose a base branch
from
Open

Borrow Access in FilteredEntity(Ref|Mut) and Entity(Ref|Mut)Except #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5ea5c9
Borrow Access in FilteredEntity(Ref|Mut) to avoid cloning.
chescock Sep 22, 2024
468d224
Have Entity(Ref|Mut)Except look up the component ids on initializatio…
chescock Sep 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions crates/bevy_animation/src/keyframes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ pub trait Keyframes: Reflect + Debug + Send + Sync {
fn apply_single_keyframe<'a>(
&self,
transform: Option<Mut<'a, Transform>>,
entity: EntityMutExcept<'a, (Transform, AnimationPlayer, Handle<AnimationGraph>)>,
entity: EntityMutExcept<'a, 'a, (Transform, AnimationPlayer, Handle<AnimationGraph>)>,
weight: f32,
) -> Result<(), AnimationEvaluationError>;

Expand Down Expand Up @@ -178,7 +178,7 @@ pub trait Keyframes: Reflect + Debug + Send + Sync {
fn apply_tweened_keyframes<'a>(
&self,
transform: Option<Mut<'a, Transform>>,
entity: EntityMutExcept<'a, (Transform, AnimationPlayer, Handle<AnimationGraph>)>,
entity: EntityMutExcept<'a, 'a, (Transform, AnimationPlayer, Handle<AnimationGraph>)>,
interpolation: Interpolation,
step_start: usize,
time: f32,
Expand Down Expand Up @@ -278,7 +278,7 @@ impl Keyframes for TranslationKeyframes {
fn apply_single_keyframe<'a>(
&self,
transform: Option<Mut<'a, Transform>>,
_: EntityMutExcept<'a, (Transform, AnimationPlayer, Handle<AnimationGraph>)>,
_: EntityMutExcept<'a, 'a, (Transform, AnimationPlayer, Handle<AnimationGraph>)>,
weight: f32,
) -> Result<(), AnimationEvaluationError> {
let mut component = transform.ok_or_else(|| {
Expand All @@ -294,7 +294,7 @@ impl Keyframes for TranslationKeyframes {
fn apply_tweened_keyframes<'a>(
&self,
transform: Option<Mut<'a, Transform>>,
_: EntityMutExcept<'a, (Transform, AnimationPlayer, Handle<AnimationGraph>)>,
_: EntityMutExcept<'a, 'a, (Transform, AnimationPlayer, Handle<AnimationGraph>)>,
interpolation: Interpolation,
step_start: usize,
time: f32,
Expand Down Expand Up @@ -333,7 +333,7 @@ impl Keyframes for ScaleKeyframes {
fn apply_single_keyframe<'a>(
&self,
transform: Option<Mut<'a, Transform>>,
_: EntityMutExcept<'a, (Transform, AnimationPlayer, Handle<AnimationGraph>)>,
_: EntityMutExcept<'a, 'a, (Transform, AnimationPlayer, Handle<AnimationGraph>)>,
weight: f32,
) -> Result<(), AnimationEvaluationError> {
let mut component = transform.ok_or_else(|| {
Expand All @@ -349,7 +349,7 @@ impl Keyframes for ScaleKeyframes {
fn apply_tweened_keyframes<'a>(
&self,
transform: Option<Mut<'a, Transform>>,
_: EntityMutExcept<'a, (Transform, AnimationPlayer, Handle<AnimationGraph>)>,
_: EntityMutExcept<'a, 'a, (Transform, AnimationPlayer, Handle<AnimationGraph>)>,
interpolation: Interpolation,
step_start: usize,
time: f32,
Expand Down Expand Up @@ -388,7 +388,7 @@ impl Keyframes for RotationKeyframes {
fn apply_single_keyframe<'a>(
&self,
transform: Option<Mut<'a, Transform>>,
_: EntityMutExcept<'a, (Transform, AnimationPlayer, Handle<AnimationGraph>)>,
_: EntityMutExcept<'a, 'a, (Transform, AnimationPlayer, Handle<AnimationGraph>)>,
weight: f32,
) -> Result<(), AnimationEvaluationError> {
let mut component = transform.ok_or_else(|| {
Expand All @@ -404,7 +404,7 @@ impl Keyframes for RotationKeyframes {
fn apply_tweened_keyframes<'a>(
&self,
transform: Option<Mut<'a, Transform>>,
_: EntityMutExcept<'a, (Transform, AnimationPlayer, Handle<AnimationGraph>)>,
_: EntityMutExcept<'a, 'a, (Transform, AnimationPlayer, Handle<AnimationGraph>)>,
interpolation: Interpolation,
step_start: usize,
time: f32,
Expand Down Expand Up @@ -447,7 +447,7 @@ where
fn apply_single_keyframe<'a>(
&self,
_: Option<Mut<'a, Transform>>,
mut entity: EntityMutExcept<'a, (Transform, AnimationPlayer, Handle<AnimationGraph>)>,
mut entity: EntityMutExcept<'a, 'a, (Transform, AnimationPlayer, Handle<AnimationGraph>)>,
weight: f32,
) -> Result<(), AnimationEvaluationError> {
let mut component = entity.get_mut::<P::Component>().ok_or_else(|| {
Expand All @@ -465,7 +465,7 @@ where
fn apply_tweened_keyframes<'a>(
&self,
_: Option<Mut<'a, Transform>>,
mut entity: EntityMutExcept<'a, (Transform, AnimationPlayer, Handle<AnimationGraph>)>,
mut entity: EntityMutExcept<'a, 'a, (Transform, AnimationPlayer, Handle<AnimationGraph>)>,
interpolation: Interpolation,
step_start: usize,
time: f32,
Expand Down Expand Up @@ -529,7 +529,7 @@ impl Keyframes for MorphWeightsKeyframes {
fn apply_single_keyframe<'a>(
&self,
_: Option<Mut<'a, Transform>>,
mut entity: EntityMutExcept<'a, (Transform, AnimationPlayer, Handle<AnimationGraph>)>,
mut entity: EntityMutExcept<'a, 'a, (Transform, AnimationPlayer, Handle<AnimationGraph>)>,
weight: f32,
) -> Result<(), AnimationEvaluationError> {
let mut dest = entity.get_mut::<MorphWeights>().ok_or_else(|| {
Expand All @@ -548,7 +548,7 @@ impl Keyframes for MorphWeightsKeyframes {
fn apply_tweened_keyframes<'a>(
&self,
_: Option<Mut<'a, Transform>>,
mut entity: EntityMutExcept<'a, (Transform, AnimationPlayer, Handle<AnimationGraph>)>,
mut entity: EntityMutExcept<'a, 'a, (Transform, AnimationPlayer, Handle<AnimationGraph>)>,
interpolation: Interpolation,
step_start: usize,
time: f32,
Expand Down
Loading