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

rotation simplification

Browse Source 
Former-commit-id: d6ddc514d76dee88477964a7cf053122e39a67a8
This commit is contained in:
jshipsey 2019-05-19 18:01:19 -04:00
parent 98630b3692
commit 8e896cc3c4
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
voxygen/src/scene/figure.rs
View File

@ -69,13 +69,8 @@ impl FigureModelCache {
Some(Self::load_left_shoulder(body.shoulder)), Some(Self::load_left_shoulder(body.shoulder)),
Some(Self::load_right_shoulder(body.shoulder)), Some(Self::load_right_shoulder(body.shoulder)),
Some(Self::load_draw(body.draw)), Some(Self::load_draw(body.draw)),
<<<<<<< HEAD
Some(Self::load_left_equip(body.weapon)), Some(Self::load_left_equip(body.weapon)),
None, Some(Self::load_right_equip(body.hand)),
=======
Some(Self::load_left_hold(body.hand)),
Some(Self::load_right_hold(body.hand)),
>>>>>>> attack state
None, None,
None, None,
], ],
@ -143,6 +138,7 @@ impl FigureModelCache {
) )
} }
fn load_chest(chest: Chest) -> Mesh<FigurePipeline> { fn load_chest(chest: Chest) -> Mesh<FigurePipeline> {
Self::load_mesh( Self::load_mesh(
match chest { match chest {
@ -154,6 +150,7 @@ impl FigureModelCache {
Chest::Orange => "armor/chest/chest_orange.vox", Chest::Orange => "armor/chest/chest_orange.vox",
}, },
Vec3::new(-6.0, -3.5, 0.0), Vec3::new(-6.0, -3.5, 0.0),
) )
} }
@ -205,7 +202,7 @@ impl FigureModelCache {
Foot::Default => "figure/body/foot.vox", Foot::Default => "figure/body/foot.vox",
Foot::Dark => "armor/foot/foot_dark.vox", Foot::Dark => "armor/foot/foot_dark.vox",
}, },
Vec3::new(2.5, -3.5, -9.0), Vec3::new(-2.5, -3.5, -9.0),
) )
} }
@ -215,7 +212,7 @@ impl FigureModelCache {
Foot::Default => "figure/body/foot.vox", Foot::Default => "figure/body/foot.vox",
Foot::Dark => "armor/foot/foot_dark.vox", Foot::Dark => "armor/foot/foot_dark.vox",
}, },
Vec3::new(2.5, -3.5, -9.0), Vec3::new(-2.5, -3.5, -9.0),
) )
} }
@ -267,7 +264,6 @@ impl FigureModelCache {
Vec3::new(-6.5, -1.5, -5.0), Vec3::new(-6.5, -1.5, -5.0),
) )
} }
fn load_right_equip(hand: Hand) -> Mesh<FigurePipeline> { fn load_right_equip(hand: Hand) -> Mesh<FigurePipeline> {
Self::load_mesh( Self::load_mesh(
match hand { match hand {