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 branch 'pfau-vechro/orc-heads' into 'master'

Browse Source 
New orc head models

See merge request veloren/veloren!336
This commit is contained in:
Joshua Barretto 2019-07-14 14:34:47 +00:00
commit 9da822efce
9 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/element/icons/orc_f.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/icons/orc_m.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/figure/head/head_dwarf_female.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/figure/head/head_human_female.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/figure/head/head_human_male.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/figure/head/head_orc_female.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/figure/head/head_orc_male.vox (Stored with Git LFS)
View File

Binary file not shown.

12
voxygen/src/anim/mod.rs
View File

@ -104,10 +104,10 @@ impl<'a> From<&'a comp::humanoid::Body> for SkeletonAttr {
},
neck_height: match (body.race, body.body_type) {
(Orc, Male) => -2.0,
(Orc, Female) => -2.0,
(Human, Male) => -0.5,
(Orc, Female) => 0.0,
(Human, Male) => -0.75,
(Human, Female) => -2.0,
(Elf, Male) => -0.5,
(Elf, Male) => -0.75,
(Elf, Female) => -1.25,
(Dwarf, Male) => -0.0,
(Dwarf, Female) => -1.0,
@ -117,11 +117,11 @@ impl<'a> From<&'a comp::humanoid::Body> for SkeletonAttr {
(Danari, Female) => -0.5,
},
neck_forward: match (body.race, body.body_type) {
(Orc, Male) => 1.0,
(Orc, Female) => -1.0,
(Orc, Male) => 0.0,
(Orc, Female) => -2.0,
(Human, Male) => 0.0,
(Human, Female) => -1.0,
(Elf, Male) => 1.25,
(Elf, Male) => 0.0,
(Elf, Female) => -0.5,
(Dwarf, Male) => 2.0,
(Dwarf, Female) => 0.0,

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

@ -153,7 +153,7 @@ impl FigureModelCache {
let (name, offset) = match (race, body_type) {
(Human, Male) => (
"figure/head/head_human_male.vox",
Vec3::new(-7.0, -5.5, -2.25),
Vec3::new(-7.0, -5.0, -2.25),
),
(Human, Female) => (
"figure/head/head_human_female.vox",
@ -177,11 +177,11 @@ impl FigureModelCache {
),
(Orc, Male) => (
"figure/head/head_orc_male.vox",
Vec3::new(-8.0, -6.0, -2.75),
Vec3::new(-8.0, -5.0, -2.50),
),
(Orc, Female) => (
"figure/head/head_orc_female.vox",
Vec3::new(-8.0, -5.5, -2.75),
Vec3::new(-8.0, -8.0, -3.5),
),
(Undead, Male) => (
"figure/head/head_undead_male.vox",