Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compile error when importing sprite position.

Browse Source
This commit is contained in:
Sam 2021-08-28 21:20:07 -04:00
parent c7690958b6
commit 0f7e0b4152
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
voxygen/anim/src/character/collect.rs
View File

@ -9,7 +9,7 @@ pub struct CollectAnimation;
impl Animation for CollectAnimation { impl Animation for CollectAnimation {
#[allow(clippy::type_complexity)] #[allow(clippy::type_complexity)]
type Dependency<'a> = (Vec3<f32>, f32, Option<StageSection>, Vec3<i32>); type Dependency<'a> = (Vec3<f32>, f32, Option<StageSection>, Vec3<f32>);
type Skeleton = CharacterSkeleton; type Skeleton = CharacterSkeleton;
#[cfg(feature = "use-dyn-lib")] #[cfg(feature = "use-dyn-lib")]

2
voxygen/src/scene/figure/mod.rs
View File

@ -1148,7 +1148,7 @@ impl FigureMgr {
}; };
anim::character::CollectAnimation::update_skeleton( anim::character::CollectAnimation::update_skeleton(
&target_base, &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, stage_progress,
&mut state_animation_rate, &mut state_animation_rate,
skeleton_attr, skeleton_attr,