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

run anim tweaks

Browse Source
This commit is contained in:
jshipsey 2021-01-16 14:15:01 -05:00
parent 559ece5ede
commit 31208e29ee
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
assets/voxygen/voxel/biped_small_lateral_manifest.ron
View File

@ -37,11 +37,11 @@
), ),
(Sahagin, Male): ( (Sahagin, Male): (
hand_l: ( hand_l: (
offset: (0.0, -2.5, -11.0), offset: (0.0, -4.0, -11.0),
lateral: ("npc.sahagin.male.hand_l"), lateral: ("npc.sahagin.male.hand_l"),
), ),
hand_r: ( hand_r: (
offset: (-7.0, -2.5, -11.0), offset: (0.0, -4.0, -11.0),
lateral: ("npc.sahagin.male.hand_r"), lateral: ("npc.sahagin.male.hand_r"),
), ),
foot_l: ( foot_l: (
@ -55,11 +55,11 @@
), ),
(Sahagin, Female): ( (Sahagin, Female): (
hand_l: ( hand_l: (
offset: (0.0, -2.5, -11.0), offset: (0.0, -4.0, -11.0),
lateral: ("npc.sahagin.male.hand_l"), lateral: ("npc.sahagin.male.hand_l"),
), ),
hand_r: ( hand_r: (
offset: (-7.0, -2.5, -11.0), offset: (-7.0, -4.0, -11.0),
lateral: ("npc.sahagin.male.hand_r"), lateral: ("npc.sahagin.male.hand_r"),
), ),
foot_l: ( foot_l: (
@ -181,11 +181,11 @@
), ),
(Kappa, Male): ( (Kappa, Male): (
hand_l: ( hand_l: (
offset: (-3.0, -2.5, -10.0), offset: (-3.0, -4.0, -10.0),
lateral: ("npc.kappa.male.hand_l"), lateral: ("npc.kappa.male.hand_l"),
), ),
hand_r: ( hand_r: (
offset: (-3.0, -2.5, -10.0), offset: (-3.0, -4.0, -10.0),
lateral: ("npc.kappa.male.hand_r"), lateral: ("npc.kappa.male.hand_r"),
), ),
foot_l: ( foot_l: (
@ -199,11 +199,11 @@
), ),
(Kappa, Female): ( (Kappa, Female): (
hand_l: ( hand_l: (
offset: (-3.0, -2.5, -10.0), offset: (-3.0, -4.0, -10.0),
lateral: ("npc.kappa.male.hand_l"), lateral: ("npc.kappa.male.hand_l"),
), ),
hand_r: ( hand_r: (
offset: (-3.0, -2.5, -10.0), offset: (-3.0, -4.0, -10.0),
lateral: ("npc.kappa.male.hand_r"), lateral: ("npc.kappa.male.hand_r"),
), ),
foot_l: ( foot_l: (

12
voxygen/anim/src/biped_small/run.rs
View File

@ -116,8 +116,8 @@ impl Animation for RunAnimation {
next.hand_l.position = Vec3::new( next.hand_l.position = Vec3::new(
-s_a.hand.0 + footrotr * -1.3 * speednorm, -s_a.hand.0 + footrotr * -1.3 * speednorm,
1.0 * speednorm + s_a.hand.1 + footrotr * -3.5 * speednorm, 1.0 * speednorm + s_a.hand.1 + footrotr * -2.5 * speednorm,
1.5 * speednorm + s_a.hand.2 - footrotr * 2.5 * speednorm, s_a.hand.2 - footrotr * 1.5 * speednorm,
); );
next.hand_l.orientation = next.hand_l.orientation =
Quaternion::rotation_x(0.4 * speednorm + (footrotr * -1.2) * speednorm) Quaternion::rotation_x(0.4 * speednorm + (footrotr * -1.2) * speednorm)
@ -125,8 +125,8 @@ impl Animation for RunAnimation {
next.hand_r.position = Vec3::new( next.hand_r.position = Vec3::new(
s_a.hand.0 + footrotl * 1.3 * speednorm, s_a.hand.0 + footrotl * 1.3 * speednorm,
1.0 * speednorm + s_a.hand.1 + footrotl * -3.5 * speednorm, 1.0 * speednorm + s_a.hand.1 + footrotl * -2.5 * speednorm,
1.5 * speednorm + s_a.hand.2 - footrotl * 2.5 * speednorm, s_a.hand.2 - footrotl * 1.5 * speednorm,
); );
next.hand_r.orientation = next.hand_r.orientation =
Quaternion::rotation_x(0.4 * speednorm + (footrotl * -1.2) * speednorm) Quaternion::rotation_x(0.4 * speednorm + (footrotl * -1.2) * speednorm)
@ -136,7 +136,7 @@ impl Animation for RunAnimation {
next.foot_l.position = Vec3::new( next.foot_l.position = Vec3::new(
-s_a.foot.0 + footstrafel * sideabs * 3.0 + tilt * -2.0, -s_a.foot.0 + footstrafel * sideabs * 3.0 + tilt * -2.0,
s_a.foot.1 s_a.foot.1
+ (1.0 - sideabs) * (-1.0 * speednorm + footrotl * -7.5 * speednorm) + (1.0 - sideabs) * (-1.0 * speednorm + footrotl * -4.5 * speednorm)
+ (direction * 5.0).max(0.0), + (direction * 5.0).max(0.0),
s_a.foot.2 s_a.foot.2
+ (1.0 - sideabs) * (2.0 * speednorm + ((footvertl * -2.1 * speednorm).max(-1.0))) + (1.0 - sideabs) * (2.0 * speednorm + ((footvertl * -2.1 * speednorm).max(-1.0)))
@ -151,7 +151,7 @@ impl Animation for RunAnimation {
next.foot_r.position = Vec3::new( next.foot_r.position = Vec3::new(
s_a.foot.0 + footstrafer * sideabs * 3.0 + tilt * -2.0, s_a.foot.0 + footstrafer * sideabs * 3.0 + tilt * -2.0,
s_a.foot.1 s_a.foot.1
+ (1.0 - sideabs) * (-1.0 * speednorm + footrotr * -7.5 * speednorm) + (1.0 - sideabs) * (-1.0 * speednorm + footrotr * -4.5 * speednorm)
+ (direction * 5.0).max(0.0), + (direction * 5.0).max(0.0),
s_a.foot.2 s_a.foot.2
+ (1.0 - sideabs) * (2.0 * speednorm + ((footvertr * -2.1 * speednorm).max(-1.0))) + (1.0 - sideabs) * (2.0 * speednorm + ((footvertr * -2.1 * speednorm).max(-1.0)))