From 513982ca430ffb409f77ca6aea97aa389904a9e7 Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 28 Aug 2021 21:20:07 -0400 Subject: [PATCH] Fixed compile error when importing sprite position. --- voxygen/anim/src/character/collect.rs | 2 +- voxygen/src/scene/figure/mod.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/voxygen/anim/src/character/collect.rs b/voxygen/anim/src/character/collect.rs index 8c81c435a5..1ede0dabfd 100644 --- a/voxygen/anim/src/character/collect.rs +++ b/voxygen/anim/src/character/collect.rs @@ -9,7 +9,7 @@ pub struct CollectAnimation; impl Animation for CollectAnimation { #[allow(clippy::type_complexity)] - type Dependency<'a> = (Vec3, f32, Option, Vec3); + type Dependency<'a> = (Vec3, f32, Option, Vec3); type Skeleton = CharacterSkeleton; #[cfg(feature = "use-dyn-lib")] diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs index f6d85e4e47..39501fed8e 100644 --- a/voxygen/src/scene/figure/mod.rs +++ b/voxygen/src/scene/figure/mod.rs @@ -1148,7 +1148,7 @@ impl FigureMgr { }; anim::character::CollectAnimation::update_skeleton( &target_base, - (pos.0, time, Some(s.stage_section), sprite_pos), + (pos.0, time, Some(s.stage_section), anim::vek::Vec3::from(sprite_pos.map(|x| x as f32))), stage_progress, &mut state_animation_rate, skeleton_attr,