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

fixing eyes, cleanup on offsets

Browse Source
This commit is contained in:
jshipsey 2019-08-31 15:35:43 -04:00 committed by Imbris
parent 178657c871
commit ca4da22c7d
3 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/voxel/figure/eyes/danari/male.vox (Stored with Git LFS)
View File

Binary file not shown.

26
assets/voxygen/voxel/humanoid_head_manifest.ron
View File

@ -17,11 +17,11 @@
), ),
(Human, Female): ( (Human, Female): (
offset: (-7.0, -7.5, -3.25), offset: (-7.0, -7.5, -3.25),
head: ("figure.head.human.female", (0, 4, 3)), head: ("figure.head.human.female", (0, 5, 2)),
eyes: ("figure.eyes.human.female", (2, 11, 5)), eyes: ("figure.eyes.human.female", (2, 12, 4)),
hair: { hair: {
Temp1: Some(("figure.hair.human.female_1", (1, 1, -4))), Temp1: Some(("figure.hair.human.female_1", (1, 2, -5))),
Temp2: Some(("figure.hair.human.female_2", (1, -1, 1))), Temp2: Some(("figure.hair.human.female_2", (1, 0, 0))),
}, },
beard: { beard: {
None: None, None: None,
@ -37,7 +37,6 @@
head: ("figure.head.orc.male", (0, 1, 1)), head: ("figure.head.orc.male", (0, 1, 1)),
eyes: ("figure.eyes.orc.male", (0, 2, 4)), eyes: ("figure.eyes.orc.male", (0, 2, 4)),
hair: { hair: {
None: None,
Temp1: Some(("figure.hair.orc.male", (4, 0, 1))), Temp1: Some(("figure.hair.orc.male", (4, 0, 1))),
}, },
beard: { beard: {
@ -51,10 +50,10 @@
), ),
(Orc, Female): ( (Orc, Female): (
offset: (-8.0, -8.0, -2), offset: (-8.0, -8.0, -2),
head: ("figure.head.orc.female", (0, 0, -1)), head: ("figure.head.orc.female", (0, 0, -2)),
eyes: ("figure.eyes.orc.female", (3, 9, 0)), eyes: ("figure.eyes.orc.female", (3, 9, -1)),
hair: { hair: {
Temp1: Some(("figure.hair.orc.female", (5, 2, -1))), Temp1: Some(("figure.hair.orc.female", (5, 1, -2))),
}, },
beard: { beard: {
None: None, None: None,
@ -99,14 +98,13 @@
), ),
(Dwarf, Male): ( (Dwarf, Male): (
offset: (-6.0, -5.0, -2), offset: (-6.0, -5.0, -2),
head: ("figure.head.dwarf.male", (0, 0, 0)), head: ("figure.head.dwarf.male", (0, 0, -1)),
eyes: ("figure.eyes.dwarf.male", (2, 7, 2)), eyes: ("figure.eyes.dwarf.male", (2, 7, 1)),
hair: { hair: {
None: None,
}, },
beard: { beard: {
None: None, None: None,
Some: Some(("figure.beard.dwarf.1", (1, 3, -9))), Some: Some(("figure.beard.dwarf.1", (1, 3, -10))),
}, },
accessory: { accessory: {
Nothing: None, Nothing: None,
@ -134,7 +132,6 @@
head: ("figure.head.undead.male", (1, 1, -1)), head: ("figure.head.undead.male", (1, 1, -1)),
eyes: ("figure.eyes.undead.male", (3, 7, 3)), eyes: ("figure.eyes.undead.male", (3, 7, 3)),
hair: { hair: {
None: None,
Temp1: Some(("figure.hair.undead.male", (0, 0, 0))), Temp1: Some(("figure.hair.undead.male", (0, 0, 0))),
}, },
beard: { beard: {
@ -165,9 +162,8 @@
(Danari, Male): ( (Danari, Male): (
offset: (-9.0, -5.0, -2.75), offset: (-9.0, -5.0, -2.75),
head: ("figure.head.danari.male", (0, 1, -1)), head: ("figure.head.danari.male", (0, 1, -1)),
eyes: ("figure.eyes.danari.male", (5, 7, 1)), eyes: ("figure.eyes.danari.male", (5, 8, 1)),
hair: { hair: {
None: None,
Temp1: Some(("figure.hair.danari.male", (3, 0, -1))), Temp1: Some(("figure.hair.danari.male", (3, 0, -1))),
}, },
beard: { beard: {

3
common/src/comp/body/humanoid.rs
View File

@ -277,11 +277,10 @@ pub const ALL_SHOULDERS: [Shoulder; 2] = [Shoulder::None, Shoulder::Brown1];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub enum HairStyle { pub enum HairStyle {
None,
Temp1, Temp1,
Temp2, Temp2,
} }
pub const ALL_HAIR_STYLES: [HairStyle; 3] = [HairStyle::None, HairStyle::Temp1, HairStyle::Temp2]; pub const ALL_HAIR_STYLES: [HairStyle; 2] = [HairStyle::Temp1, HairStyle::Temp2];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub enum Eyebrows { pub enum Eyebrows {