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

merge fix

Browse Source 
Former-commit-id: a344856978c40e12d37dba5aaa0e0abac1dba9f4
This commit is contained in:
jshipsey 2019-04-19 19:42:12 -04:00
parent 164b9ee203
commit c655790c8a
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
voxygen/src/anim/character/mod.rs
View File

@ -20,10 +20,10 @@ const SCALE: f32 = 11.0;
pub struct CharacterSkeleton { pub struct CharacterSkeleton {
head: Bone, head: Bone,
chest: Bone, chest: Bone,
bl_foot: Bone, belt: Bone,
br_foot: Bone, shorts: Bone,
r_hand: Bone,
l_hand: Bone, l_hand: Bone,
r_hand: Bone,
l_foot: Bone, l_foot: Bone,
r_foot: Bone, r_foot: Bone,
back: Bone, back: Bone,
@ -34,10 +34,10 @@ impl CharacterSkeleton {
Self { Self {
head: Bone::default(), head: Bone::default(),
chest: Bone::default(), chest: Bone::default(),
br_foot: Bone::default(), belt: Bone::default(),
bl_foot: Bone::default(), shorts: Bone::default(),
r_hand: Bone::default(),
l_hand: Bone::default(), l_hand: Bone::default(),
r_hand: Bone::default(),
l_foot: Bone::default(), l_foot: Bone::default(),
r_foot: Bone::default(), r_foot: Bone::default(),
back: Bone::default(), back: Bone::default(),
@ -52,10 +52,10 @@ impl Skeleton for CharacterSkeleton {
[ [
FigureBoneData::new(self.head.compute_base_matrix()), FigureBoneData::new(self.head.compute_base_matrix()),
FigureBoneData::new(chest_mat), FigureBoneData::new(chest_mat),
FigureBoneData::new(self.bl_foot.compute_base_matrix()), FigureBoneData::new(self.belt.compute_base_matrix()),
FigureBoneData::new(self.br_foot.compute_base_matrix()), FigureBoneData::new(self.shorts.compute_base_matrix()),
FigureBoneData::new(self.r_hand.compute_base_matrix()),
FigureBoneData::new(self.l_hand.compute_base_matrix()), FigureBoneData::new(self.l_hand.compute_base_matrix()),
FigureBoneData::new(self.r_hand.compute_base_matrix()),
FigureBoneData::new(self.l_foot.compute_base_matrix()), FigureBoneData::new(self.l_foot.compute_base_matrix()),
FigureBoneData::new(self.r_foot.compute_base_matrix()), FigureBoneData::new(self.r_foot.compute_base_matrix()),
FigureBoneData::new(chest_mat * self.back.compute_base_matrix()), FigureBoneData::new(chest_mat * self.back.compute_base_matrix()),