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

Quadmed run anim tweaks and deers offsets tweaks

Browse Source
This commit is contained in:
Snowram 2020-09-01 01:28:09 +02:00 committed by jshipsey
parent b781a1765b
commit 6a16268ff0
5 changed files with 56 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
assets/voxygen/voxel/quadruped_medium_central_manifest.ron
View File

@ -661,7 +661,7 @@
),
(Deer, Male): (
upper: (
offset: (-6.0, 0.0, -8.0),
offset: (-6.0, -5.0, 0.0),
central: ("npc.deer.male.head_upper"),
),
lower: (
@ -685,13 +685,13 @@
central: ("armor.empty"),
),
tail: (
offset: (-2.0, -3.0, -6.0),
offset: (-2.0, -2.0, 0.0),
central: ("npc.deer.male.tail"),
),
),
(Deer, Female): (
upper: (
offset: (-6.0, 0.0, -4.5),
offset: (-6.0, -3.0, 0.0),
central: ("npc.deer.female.head_upper"),
),
lower: (
@ -715,13 +715,13 @@
central: ("armor.empty"),
),
tail: (
offset: (-2.0, -3.0, -6.0),
central: ("npc.deer.female.tail"),
offset: (-2.0, -2.0, 0.0),
central: ("npc.deer.male.tail"),
),
),
(Hirdrassil, Male): (
upper: (
offset: (-9.0, 0.0, -11.5),
offset: (-9.0, -12.0, 0.0),
central: ("npc.hirdrassil.male.head_upper"),
),
lower: (
@ -729,7 +729,7 @@
central: ("npc.hirdrassil.male.head_lower"),
),
jaw: (
offset: (-1.0, 0.0, -1.0),
offset: (-1.0, 0.0, -7.0),
central: ("npc.hirdrassil.male.jaw"),
),
torso_front: (
@ -745,13 +745,13 @@
central: ("armor.empty"),
),
tail: (
offset: (-2.0, -4.0, -3.0),
offset: (-2.0, -2.0, 0.0),
central: ("npc.hirdrassil.male.tail"),
),
),
(Hirdrassil, Female): (
upper: (
offset: (-9.0, 0.0, -11.5),
offset: (-9.0, -12.0, 0.0),
central: ("npc.hirdrassil.male.head_upper"),
),
lower: (
@ -759,7 +759,7 @@
central: ("npc.hirdrassil.male.head_lower"),
),
jaw: (
offset: (-1.0, 0.0, -1.0),
offset: (-1.0, 0.0, -7.0),
central: ("npc.hirdrassil.male.jaw"),
),
torso_front: (
@ -775,7 +775,7 @@
central: ("armor.empty"),
),
tail: (
offset: (-2.0, -4.0, -3.0),
offset: (-2.0, -2.0, 0.0),
central: ("npc.hirdrassil.male.tail"),
),
),

44
assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron
View File

@ -545,11 +545,11 @@
),
(Mouflon, Male): (
leg_fl: (
offset: (-1.5, -2.5, -2.5),
offset: (-1.5, -2.5, -4.0),
lateral: ("npc.mouflon.male.leg_fl"),
),
leg_fr: (
offset: (-1.5, -2.5, -2.5),
offset: (-1.5, -2.5, -4.0),
lateral: ("npc.mouflon.male.leg_fr"),
),
leg_bl: (
@ -579,19 +579,19 @@
),
(Mouflon, Female): (
leg_fl: (
offset: (-1.5, -2.5, -2.5),
offset: (-1.5, -2.5, -4.0),
lateral: ("npc.mouflon.male.leg_fl"),
),
leg_fr: (
offset: (-1.5, -2.5, -2.5),
offset: (-1.5, -2.5, -4.0),
lateral: ("npc.mouflon.male.leg_fr"),
),
leg_bl: (
offset: (-2.0, -1.0, -2.5),
offset: (-2.0, -2.5, -4.0),
lateral: ("npc.mouflon.male.leg_bl"),
),
leg_br: (
offset: (-2.0, -1.0, -2.5),
offset: (-2.0, -2.5, -4.0),
lateral: ("npc.mouflon.male.leg_br"),
),
foot_fl: (
@ -749,19 +749,19 @@
),
(Deer, Male): (
leg_fl: (
offset: (-1.5, -2.5, -2.5),
offset: (-1.5, -2.5, -3.5),
lateral: ("npc.deer.male.leg_fl"),
),
leg_fr: (
offset: (-1.5, -2.5, -2.5),
offset: (-1.5, -2.5, -3.5),
lateral: ("npc.deer.male.leg_fr"),
),
leg_bl: (
offset: (-2.0, -1.0, -2.5),
offset: (-2.0, -2.5, -4.0),
lateral: ("npc.deer.male.leg_bl"),
),
leg_br: (
offset: (-2.0, -1.0, -2.5),
offset: (-2.0, -2.5, -4.0),
lateral: ("npc.deer.male.leg_br"),
),
foot_fl: (
@ -783,19 +783,19 @@
),
(Deer, Female): (
leg_fl: (
offset: (-1.5, -2.5, -2.5),
offset: (-1.5, -2.5, -3.5),
lateral: ("npc.deer.female.leg_fl"),
),
leg_fr: (
offset: (-1.5, -2.5, -2.5),
offset: (-1.5, -2.5, -3.5),
lateral: ("npc.deer.female.leg_fr"),
),
leg_bl: (
offset: (-2.0, -1.0, -2.5),
offset: (-2.0, -2.5, -4.0),
lateral: ("npc.deer.female.leg_bl"),
),
leg_br: (
offset: (-2.0, -1.0, -2.5),
offset: (-2.0, -2.5, -4.0),
lateral: ("npc.deer.female.leg_br"),
),
foot_fl: (
@ -817,19 +817,19 @@
),
(Hirdrassil, Male): (
leg_fl: (
offset: (-1.5, -3.0, -2.5),
offset: (-1.5, -3.0, -4.0),
lateral: ("npc.hirdrassil.male.leg_fl"),
),
leg_fr: (
offset: (-1.5, -3.0, -2.5),
offset: (-1.5, -3.0, -4.0),
lateral: ("npc.hirdrassil.male.leg_fr"),
),
leg_bl: (
offset: (-2.0, -1.0, -2.5),
offset: (-2.0, -2.5, -5.0),
lateral: ("npc.hirdrassil.male.leg_bl"),
),
leg_br: (
offset: (-2.0, -1.0, -2.5),
offset: (-2.0, -2.5, -5.0),
lateral: ("npc.hirdrassil.male.leg_br"),
),
foot_fl: (
@ -851,19 +851,19 @@
),
(Hirdrassil, Female): (
leg_fl: (
offset: (-1.5, -3.0, -2.5),
offset: (-1.5, -3.0, -4.0),
lateral: ("npc.hirdrassil.male.leg_fl"),
),
leg_fr: (
offset: (-1.5, -3.0, -2.5),
offset: (-1.5, -3.0, -4.0),
lateral: ("npc.hirdrassil.male.leg_fr"),
),
leg_bl: (
offset: (-2.0, -1.0, -2.5),
offset: (-2.0, -2.5, -5.0),
lateral: ("npc.hirdrassil.male.leg_bl"),
),
leg_br: (
offset: (-2.0, -1.0, -2.5),
offset: (-2.0, -2.5, -5.0),
lateral: ("npc.hirdrassil.male.leg_br"),
),
foot_fl: (

4
voxygen/src/anim/src/quadruped_medium/idle.rs
View File

@ -71,9 +71,9 @@ impl Animation for IdleAnimation {
next.jaw.position = Vec3::new(
0.0,
skeleton_attr.jaw.0 - slower * 0.12,
skeleton_attr.jaw.1 + slow * 0.2,
skeleton_attr.jaw.1 + slow * 0.2 + 0.5,
);
next.jaw.orientation = Quaternion::rotation_x(slow * 0.05);
next.jaw.orientation = Quaternion::rotation_x(slow * 0.05 - 0.08);
next.jaw.scale = Vec3::one() * 1.02;
next.tail.position = Vec3::new(0.0, skeleton_attr.tail.0, skeleton_attr.tail.1);

27
voxygen/src/anim/src/quadruped_medium/mod.rs
View File

@ -143,9 +143,9 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Mouflon, _) => (-2.5, 6.0),
(Catoblepas, _) => (-1.0, -6.5),
(Bonerattler, _) => (-1.0, 2.5),
(Deer, Male) => (-4.5, 11.0),
(Deer, Female) => (-2.5, 8.0),
(Hirdrassil, _) => (-12.0, 16.0),
(Deer, Male) => (0.5, 3.5),
(Deer, Female) => (0.5, 3.5),
(Hirdrassil, _) => (0.0, 5.0),
},
head_lower: match (body.species, body.body_type) {
(Grolgar, _) => (1.0, -1.0),
@ -174,9 +174,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Mouflon, _) => (10.5, -4.0),
(Catoblepas, _) => (1.0, -4.0),
(Bonerattler, _) => (3.0, -3.0),
(Deer, Male) => (9.0, -5.5),
(Deer, Female) => (7.0, -2.0),
(Hirdrassil, _) => (14.5, -15.0),
(Deer, _) => (3.5, 2.0),
(Hirdrassil, _) => (2.5, 2.5),
},
tail: match (body.species, body.body_type) {
(Grolgar, _) => (-11.5, -0.5),
@ -190,8 +189,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Mouflon, _) => (-10.5, 3.0),
(Catoblepas, _) => (-8.5, -2.0),
(Bonerattler, _) => (-10.0, 1.5),
(Deer, _) => (-8.5, 6.5),
(Hirdrassil, _) => (-9.0, 5.0),
(Deer, _) => (-8.5, 0.5),
(Hirdrassil, _) => (-11.0, 2.0),
},
torso_front: match (body.species, body.body_type) {
(Grolgar, _) => (10.0, 13.0),
@ -251,7 +250,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Catoblepas, _) => (7.0, 2.0, -6.0),
(Bonerattler, _) => (5.5, 5.0, -4.0),
(Deer, _) => (3.5, -4.5, -3.5),
(Hirdrassil, _) => (4.5, -6.0, -3.5),
(Hirdrassil, _) => (4.5, -5.0, -2.5),
},
leg_b: match (body.species, body.body_type) {
(Grolgar, _) => (6.0, -6.5, -5.5),
@ -265,8 +264,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Mouflon, _) => (3.5, -8.0, -4.5),
(Catoblepas, _) => (6.0, -2.5, -2.5),
(Bonerattler, _) => (6.0, -8.0, -4.0),
(Deer, _) => (3.0, -8.0, -5.0),
(Hirdrassil, _) => (4.0, -8.0, -6.0),
(Deer, _) => (3.0, -6.5, -3.5),
(Hirdrassil, _) => (4.0, -6.5, -3.0),
},
feet_f: match (body.species, body.body_type) {
(Grolgar, _) => (0.0, -9.0, -7.0),
@ -281,7 +280,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Catoblepas, _) => (1.0, 4.0, -3.0),
(Bonerattler, _) => (-0.5, -3.0, -2.5),
(Deer, _) => (-0.5, -0.5, -2.5),
(Hirdrassil, _) => (-0.5, -3.0, -2.5),
(Hirdrassil, _) => (-0.5, -3.0, -3.5),
},
feet_b: match (body.species, body.body_type) {
(Grolgar, _) => (0.0, 0.0, -5.0),
@ -295,8 +294,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Mouflon, _) => (-1.0, 0.0, -2.5),
(Catoblepas, _) => (0.5, 0.5, -3.0),
(Bonerattler, _) => (0.0, 3.0, -2.5),
(Deer, _) => (-1.0, 0.0, -0.5),
(Hirdrassil, _) => (-1.0, 0.0, -1.5),
(Deer, _) => (-1.0, -0.5, -2.0),
(Hirdrassil, _) => (-1.0, -2.0, -4.5),
},
scaler: match (body.species, body.body_type) {
(Grolgar, _) => (1.3),

16
voxygen/src/anim/src/quadruped_medium/run.rs
View File

@ -162,7 +162,7 @@ impl Animation for RunAnimation {
skeleton_attr.leg_f.2 + amplitude3 * foot1a * 2.3,
);
next.leg_fl.orientation =
Quaternion::rotation_x(0.2 * canceler + amplitude3 * foot1a * 0.35)
Quaternion::rotation_x(0.2 * canceler + amplitude3 * foot1a * 0.85)
* Quaternion::rotation_z(tilt * -0.5)
* Quaternion::rotation_y(tilt * 1.5);
next.leg_fl.scale = Vec3::one() * 1.02;
@ -173,7 +173,7 @@ impl Animation for RunAnimation {
skeleton_attr.leg_f.2 + amplitude3 * foot2a * 2.8,
);
next.leg_fr.orientation =
Quaternion::rotation_x(0.2 * canceler + amplitude3 * foot2a * 0.35)
Quaternion::rotation_x(0.2 * canceler + amplitude3 * foot2a * 0.85)
* Quaternion::rotation_z(tilt * -0.5)
* Quaternion::rotation_y(tilt * 1.5);
next.leg_fr.scale = Vec3::one() * 1.02;
@ -183,7 +183,7 @@ impl Animation for RunAnimation {
skeleton_attr.leg_b.1 + amplitude3 * foot3b * -1.1,
skeleton_attr.leg_b.2 + canceler + amplitude3 * foot3a * 1.6,
);
next.leg_bl.orientation = Quaternion::rotation_x(amplitude3 * foot3a * 0.12)
next.leg_bl.orientation = Quaternion::rotation_x(amplitude3 * foot1b * 0.85)
* Quaternion::rotation_y(tilt * 1.5)
* Quaternion::rotation_z(tilt * -1.5);
next.leg_bl.scale = Vec3::one() * 1.02;
@ -193,7 +193,7 @@ impl Animation for RunAnimation {
skeleton_attr.leg_b.1 + amplitude3 * foot4b * -1.1,
skeleton_attr.leg_b.2 + canceler + amplitude3 * foot4a * 1.6,
);
next.leg_br.orientation = Quaternion::rotation_x(amplitude3 * foot4b * 0.12)
next.leg_br.orientation = Quaternion::rotation_x(amplitude3 * foot2b * 0.85)
* Quaternion::rotation_y(tilt * 1.5)
* Quaternion::rotation_z(tilt * -1.5);
next.leg_br.scale = Vec3::one() * 1.02;
@ -204,7 +204,7 @@ impl Animation for RunAnimation {
skeleton_attr.feet_f.2 + (foot1a * 2.0).max(-1.0) * amplitude2 + 1.0 * canceler,
);
next.foot_fl.orientation = Quaternion::rotation_x(
((1.0 - skeleton_attr.dampen) * -1.0) * canceler + amplitude2 * foot1b * -0.8,
((1.0 - skeleton_attr.dampen) * -1.0) * canceler + amplitude2 * foot1b * -0.7,
) * Quaternion::rotation_y(tilt * -1.0);
next.foot_fl.scale = Vec3::one() * 0.96;
@ -214,7 +214,7 @@ impl Animation for RunAnimation {
skeleton_attr.feet_f.2 + (foot2a * 2.0).max(-1.0) * amplitude2 + 1.0 * canceler,
);
next.foot_fr.orientation = Quaternion::rotation_x(
((1.0 - skeleton_attr.dampen) * -1.0) * canceler + amplitude2 * foot2b * -0.8,
((1.0 - skeleton_attr.dampen) * -1.0) * canceler + amplitude2 * foot2b * -0.7,
) * Quaternion::rotation_y(tilt * -1.0);
next.foot_fr.scale = Vec3::one() * 0.96;
@ -224,7 +224,7 @@ impl Animation for RunAnimation {
skeleton_attr.feet_b.2 + (foot3a * 0.5).max(0.0) * amplitude2 + 2.0 * canceler,
);
next.foot_bl.orientation =
Quaternion::rotation_x(amplitude2 * foot3b * -0.9 - 0.5 * canceler)
Quaternion::rotation_x(amplitude2 * foot3b * -0.5 - 0.5 * canceler)
* Quaternion::rotation_y(tilt * -1.0);
next.foot_bl.scale = Vec3::one() * 0.96;
@ -234,7 +234,7 @@ impl Animation for RunAnimation {
skeleton_attr.feet_b.2 + (foot4a * 0.5).max(0.0) * amplitude2 + 2.0 * canceler,
);
next.foot_br.orientation =
Quaternion::rotation_x(amplitude2 * foot4b * -0.9 - 0.5 * canceler)
Quaternion::rotation_x(amplitude2 * foot4b * -0.5 - 0.5 * canceler)
* Quaternion::rotation_y(tilt * -1.0);
next.foot_br.scale = Vec3::one() * 0.96;
next