diff --git a/assets/voxygen b/assets/voxygen index e3083ec8e8..0a176c4089 160000 --- a/assets/voxygen +++ b/assets/voxygen @@ -1 +1 @@ -Subproject commit e3083ec8e8e634af8c9daed00ea82435da195979 +Subproject commit 0a176c408946f081850132623a6730d9d2b1e7ed diff --git a/voxygen/src/anim/character/mod.rs b/voxygen/src/anim/character/mod.rs index 3d6e3e1dfc..4d442d416e 100644 --- a/voxygen/src/anim/character/mod.rs +++ b/voxygen/src/anim/character/mod.rs @@ -20,10 +20,10 @@ const SCALE: f32 = 11.0; pub struct CharacterSkeleton { head: Bone, chest: Bone, - belt: Bone, - shorts: Bone, - l_hand: Bone, + bl_foot: Bone, + br_foot: Bone, r_hand: Bone, + l_hand: Bone, l_foot: Bone, r_foot: Bone, back: Bone, @@ -34,10 +34,10 @@ impl CharacterSkeleton { Self { head: Bone::default(), chest: Bone::default(), - belt: Bone::default(), - shorts: Bone::default(), - l_hand: Bone::default(), + br_foot: Bone::default(), + bl_foot: Bone::default(), r_hand: Bone::default(), + l_hand: Bone::default(), l_foot: Bone::default(), r_foot: Bone::default(), back: Bone::default(), @@ -52,10 +52,10 @@ impl Skeleton for CharacterSkeleton { [ FigureBoneData::new(self.head.compute_base_matrix()), FigureBoneData::new(chest_mat), - FigureBoneData::new(self.belt.compute_base_matrix()), - FigureBoneData::new(self.shorts.compute_base_matrix()), - FigureBoneData::new(self.l_hand.compute_base_matrix()), + FigureBoneData::new(self.bl_foot.compute_base_matrix()), + FigureBoneData::new(self.br_foot.compute_base_matrix()), FigureBoneData::new(self.r_hand.compute_base_matrix()), + FigureBoneData::new(self.l_hand.compute_base_matrix()), FigureBoneData::new(self.l_foot.compute_base_matrix()), FigureBoneData::new(self.r_foot.compute_base_matrix()), FigureBoneData::new(chest_mat * self.back.compute_base_matrix()), diff --git a/voxygen/src/anim/character/run.rs b/voxygen/src/anim/character/run.rs index 27da889f95..a94788c0cf 100644 --- a/voxygen/src/anim/character/run.rs +++ b/voxygen/src/anim/character/run.rs @@ -24,9 +24,12 @@ impl Animation for RunAnimation { let mut next = (*skeleton).clone(); let wave = (time as f32 * 12.0).sin(); + let wavecos = (time as f32 * 12.0).cos(); let wave_slow = (time as f32 * 6.0 + PI).sin(); + let wavecos_slow = (time as f32 * 6.0 + PI).cos(); let wave_dip = (wave_slow.abs() - 0.5).abs(); +<<<<<<< HEAD next.head.offset = Vec3::unit_z() * 13.0 / SCALE; next.head.ori = Quaternion::rotation_z(wave * 0.3); @@ -52,5 +55,6 @@ impl Animation for RunAnimation { next.back.scale = Vec3::one(); next + } }