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

more quadmed run work

Browse Source
This commit is contained in:
jshipsey 2020-06-12 03:32:47 -04:00
parent e362749fc7
commit 59777ee688
5 changed files with 99 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -258,7 +258,7 @@
central: ("npc.tarasque.male.torso_front"),
),
torso_back: (
offset: (-6.0, -6.5, -6.0),
offset: (-6.0, 0.0, -6.0),
central: ("npc.tarasque.male.torso_back"),
),
ears: (
@ -288,7 +288,7 @@
central: ("npc.tarasque.female.torso_front"),
),
torso_back: (
offset: (-6.0, -6.5, -6.0),
offset: (-6.0, 0.0, -6.0),
central: ("npc.tarasque.female.torso_back"),
),
ears: (
@ -302,7 +302,7 @@
),
(Tiger, Male): (
upper: (
offset: (-5.5, -5.0, -5.0),
offset: (-5.5, 0.0, -5.0),
central: ("npc.tiger.male.head_upper"),
),
lower: (
@ -314,11 +314,11 @@
central: ("npc.tiger.male.jaw"),
),
torso_front: (
offset: (-5.5, -6.5, -6.5),
offset: (-5.5, -13.0, -6.5),
central: ("npc.tiger.male.torso_front"),
),
torso_back: (
offset: (-5.5, -6.5, -5.0),
offset: (-5.5, -6.5, -5.0),///needs adjust
central: ("npc.tiger.male.torso_back"),
),
ears: (
@ -332,7 +332,7 @@
),
(Tiger, Female): (
upper: (
offset: (-5.5, -5.0, -5.0),
offset: (-5.5, 0.0, -5.0),
central: ("npc.tiger.female.head_upper"),
),
lower: (
@ -344,11 +344,11 @@
central: ("npc.tiger.female.jaw"),
),
torso_front: (
offset: (-5.5, -6.5, -6.5),
offset: (-5.5, -13.0, -6.5),
central: ("npc.tiger.female.torso_front"),
),
torso_back: (
offset: (-5.5, -6.5, -5.0),
offset: (-5.5, -6.5, -5.0),///needs adjust
central: ("npc.tiger.female.torso_back"),
),
ears: (

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

@ -281,27 +281,27 @@
lateral: ("npc.tarasque.male.leg_fr"),
),
leg_bl: (
offset: (-1.5, -2.0, -3.5),
offset: (-2.0, -3.5, -3.5),
lateral: ("npc.tarasque.male.leg_bl"),
),
leg_br: (
offset: (-1.5, -2.0, -3.5),
offset: (-2.0, -3.5, -3.5),
lateral: ("npc.tarasque.male.leg_br"),
),
foot_fl: (
offset: (-4.0, -6.0, -9.0),
offset: (-4.0, -3.0, -9.0),
lateral: ("npc.tarasque.male.foot_fl"),
),
foot_fr: (
offset: (-4.0, -6.0, -9.0),
offset: (-4.0, -3.0, -9.0),
lateral: ("npc.tarasque.male.foot_fr"),
),
foot_bl: (
offset: (-2.5, -4.0, -8.0),
offset: (-2.5, -2.0, -8.0),
lateral: ("npc.tarasque.male.foot_bl"),
),
foot_br: (
offset: (-2.5, -4.0, -8.0),
offset: (-2.5, -2.0, -8.0),
lateral: ("npc.tarasque.male.foot_br"),
),
),
@ -315,53 +315,53 @@
lateral: ("npc.tarasque.female.leg_fr"),
),
leg_bl: (
offset: (-1.5, -2.0, -3.5),
offset: (-2.0, -3.5, -3.5),
lateral: ("npc.tarasque.female.leg_bl"),
),
leg_br: (
offset: (-1.5, -2.0, -3.5),
offset: (-2.0, -3.5, -3.5),
lateral: ("npc.tarasque.female.leg_br"),
),
foot_fl: (
offset: (-4.0, -6.0, -9.0),
offset: (-4.0, -3.0, -9.0), //(1/4) Y dimension, (1/1) Z dimension
lateral: ("npc.tarasque.female.foot_fl"),
),
foot_fr: (
offset: (-4.0, -6.0, -9.0),
offset: (-4.0, -3.0, -9.0), //(1/4) Y dimension, (1/1) Z dimension
lateral: ("npc.tarasque.female.foot_fr"),
),
foot_bl: (
offset: (-2.5, -4.0, -8.0),
offset: (-2.5, -2.0, -8.0),
lateral: ("npc.tarasque.female.foot_bl"),
),
foot_br: (
offset: (-2.5, -4.0, -8.0),
offset: (-2.5, -2.0, -8.0),
lateral: ("npc.tarasque.female.foot_br"),
),
),
(Tiger, Male): (
leg_fl: (
offset: (-2.0, -1.5, -9.0),
offset: (-2.0, -3.0, -5.0),
lateral: ("npc.tiger.male.leg_fl"),
),
leg_fr: (
offset: (-2.0, -1.5, -9.0),
offset: (-2.0, -3.0, -5.0),
lateral: ("npc.tiger.male.leg_fr"),
),
leg_bl: (
offset: (-2.0, -2.0, -9.0),
offset: (-2.0, -3.0, -5.0),
lateral: ("npc.tiger.male.leg_bl"),
),
leg_br: (
offset: (-2.0, -2.0, -9.0),
offset: (-2.0, -3.0, -5.0),
lateral: ("npc.tiger.male.leg_br"),
),
foot_fl: (
offset: (-2.5, -1.5, -6.0),
offset: (-2.5, -2.0, -6.0),
lateral: ("npc.tiger.male.foot_fl"),
),
foot_fr: (
offset: (-2.5, -1.5, -6.0),
offset: (-2.5, -2.0, -6.0),
lateral: ("npc.tiger.male.foot_fr"),
),
foot_bl: (
@ -375,35 +375,35 @@
),
(Tiger, Female): (
leg_fl: (
offset: (-1.5, -1.5, -9.0),
offset: (-2.0, -3.0, -5.0),
lateral: ("npc.tiger.female.leg_fl"),
),
leg_fr: (
offset: (-1.5, -1.5, -9.0),
offset: (-2.0, -3.0, -5.0),
lateral: ("npc.tiger.female.leg_fr"),
),
leg_bl: (
offset: (-1.5, -2.0, -9.0),
offset: (-2.0, -3.0, -5.0),
lateral: ("npc.tiger.female.leg_bl"),
),
leg_br: (
offset: (-1.5, -2.0, -9.0),
offset: (-2.0, -3.0, -5.0),
lateral: ("npc.tiger.female.leg_br"),
),
foot_fl: (
offset: (-1.5, -1.5, -6.0),
offset: (-2.5, -2.0, -6.0),
lateral: ("npc.tiger.female.foot_fl"),
),
foot_fr: (
offset: (-1.5, -1.5, -6.0),
offset: (-2.5, -2.0, -6.0),
lateral: ("npc.tiger.female.foot_fr"),
),
foot_bl: (
offset: (-1.5, -2.0, -6.0),
offset: (-2.5, -2.0, -6.0),
lateral: ("npc.tiger.female.foot_bl"),
),
foot_br: (
offset: (-1.5, -2.0, -6.0),
offset: (-2.5, -2.0, -6.0),
lateral: ("npc.tiger.female.foot_br"),
),
),

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

@ -114,33 +114,33 @@ impl Animation for IdleAnimation {
-skeleton_attr.leg_f.0,
skeleton_attr.leg_f.1,
skeleton_attr.leg_f.2,
) / 8.0;
);
next.leg_fl.ori = Quaternion::rotation_x(0.0);
next.leg_fl.scale = Vec3::one() / 8.0;
next.leg_fl.scale = Vec3::one();
next.leg_fr.offset = Vec3::new(
skeleton_attr.leg_f.0,
skeleton_attr.leg_f.1,
skeleton_attr.leg_f.2,
) / 8.0;
);
next.leg_fr.ori = Quaternion::rotation_x(0.0);
next.leg_fr.scale = Vec3::one() / 8.0;
next.leg_fr.scale = Vec3::one();
next.leg_bl.offset = Vec3::new(
-skeleton_attr.leg_b.0,
skeleton_attr.leg_b.1,
skeleton_attr.leg_b.2,
) / 8.0;
);
next.leg_bl.ori = Quaternion::rotation_x(0.0);
next.leg_bl.scale = Vec3::one() / 8.0;
next.leg_bl.scale = Vec3::one();
next.leg_br.offset = Vec3::new(
skeleton_attr.leg_b.0,
skeleton_attr.leg_b.1,
skeleton_attr.leg_b.2,
) / 8.0;
);
next.leg_br.ori = Quaternion::rotation_x(0.0);
next.leg_br.scale = Vec3::one() / 8.0;
next.leg_br.scale = Vec3::one();
next.foot_fl.offset = Vec3::new(
-skeleton_attr.feet_f.0,

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

@ -112,14 +112,14 @@ impl Skeleton for QuadrupedMediumSkeleton {
FigureBoneData::new(torso_front_mat),
FigureBoneData::new(torso_front_mat * torso_back_mat),
FigureBoneData::new(torso_front_mat *head_lower_mat*head_upper_mat * ears_mat),
FigureBoneData::new(leg_fl_mat),
FigureBoneData::new(leg_fr_mat),
FigureBoneData::new(leg_bl_mat),
FigureBoneData::new(leg_br_mat),
FigureBoneData::new(leg_fl_mat * self.foot_fl.compute_base_matrix()),
FigureBoneData::new(leg_fr_mat * self.foot_fr.compute_base_matrix()),
FigureBoneData::new(leg_bl_mat * self.foot_bl.compute_base_matrix()),
FigureBoneData::new(leg_br_mat * self.foot_br.compute_base_matrix()),
FigureBoneData::new(torso_front_mat *leg_fl_mat),
FigureBoneData::new(torso_front_mat *leg_fr_mat),
FigureBoneData::new(torso_front_mat *torso_back_mat *leg_bl_mat),
FigureBoneData::new(torso_front_mat *torso_back_mat *leg_br_mat),
FigureBoneData::new(torso_front_mat *leg_fl_mat * self.foot_fl.compute_base_matrix()),
FigureBoneData::new(torso_front_mat *leg_fr_mat * self.foot_fr.compute_base_matrix()),
FigureBoneData::new(torso_front_mat *torso_back_mat *leg_bl_mat * self.foot_bl.compute_base_matrix()),
FigureBoneData::new(torso_front_mat *torso_back_mat *leg_br_mat * self.foot_br.compute_base_matrix()),
FigureBoneData::default(),
],
Vec3::default(),
@ -200,7 +200,7 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr {
(Tuskram, _) => (9.0, 12.0),
(Lion, _) => (12.5, 14.0),
(Tarasque, _) => (14.0, 3.5),
(Tiger, _) => (12.0, 19.0),
(Tiger, _) => (2.0, 1.0),
},
head_lower: match (body.species, body.body_type) {
(Grolgar, _) => (-4.0, -7.0),
@ -217,15 +217,15 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr {
(Tuskram, _) => (2.0, -2.0),
(Lion, _) => (2.0, -3.0),
(Tarasque, _) => (1.5, -10.0),
(Tiger, _) => (4.0, -9.0),
(Tiger, _) => (8.0, -4.0),
},
tail: match (body.species, body.body_type) {
(Grolgar, _) => (-6.0, -2.0),
(Saber, _) => (-4.0, -2.0),
(Tuskram, _) => (-6.0, -2.0),
(Lion, _) => (-8.0, -6.0),
(Tarasque, _) => (-4.5, 0.0),
(Tiger, _) => (-7.0, -2.0),
(Tarasque, _) => (2.0, 0.0),
(Tiger, _) => (-6.5, -7.0),
},
torso_front: match (body.species, body.body_type) {
(Grolgar, _) => (-7.0, 10.5),
@ -233,15 +233,15 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr {
(Tuskram, _) => (-7.0, 9.0),
(Lion, _) => (-9.0, 9.0),
(Tarasque, _) => (11.5, 18.5),
(Tiger, _) => (-7.0, 8.0),
(Tiger, _) => (10.0, 12.0),
},
torso_back: match (body.species, body.body_type) {
(Grolgar, _) => (4.0, 11.0),
(Saber, _) => (4.0, 9.0),
(Tuskram, _) => (4.0, 9.0),
(Lion, _) => (4.0, 10.0),
(Tarasque, _) => (-20.0, -1.0),
(Tiger, _) => (4.0, 9.0),
(Tarasque, _) => (-26.5, -1.0),
(Tiger, _) => (-19.0, 0.0),
},
ears: match (body.species, body.body_type) {
(Grolgar, _) => (-1.0, 5.0),
@ -249,39 +249,39 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr {
(Tuskram, _) => (10.0, 2.0),
(Lion, _) => (-2.0, 4.0),
(Tarasque, _) => (-5.0, 1.0),
(Tiger, _) => (1.5, -2.0),
(Tiger, _) => (2.5, 5.0),
},
leg_f: match (body.species, body.body_type) {
(Grolgar, _) => (5.0, 6.0, 2.0),
(Saber, _) => (4.0, 6.0, 3.0),
(Tuskram, _) => (4.0, 6.0, 4.5),
(Lion, _) => (5.0, 6.0, 3.0),
(Tarasque, _) => (7.5, 4.5, 12.5),
(Tiger, _) => (4.0, 6.0, 3.0),
(Tarasque, _) => (7.5, -2.0, -6.0),
(Tiger, _) => (7.0, -2.0, -1.0),
},
leg_b: match (body.species, body.body_type) {
(Grolgar, _) => (5.0, -4.0, 3.0),
(Saber, _) => (4.0, -6.0, 3.5),
(Tuskram, _) => (4.0, -8.0, 5.5),
(Lion, _) => (5.5, -8.0, 3.5),
(Tarasque, _) => (6.0, -10.0, 10.5),
(Tiger, _) => (4.0, -8.0, 3.5),
(Tarasque, _) => (6.0, 4.5, -6.0),
(Tiger, _) => (7.0, -2.0, -1.0),
},
feet_f: match (body.species, body.body_type) {
(Grolgar, _) => (5.0, 6.0, 2.0),
(Saber, _) => (4.0, 6.0, 3.0),
(Tuskram, _) => (4.0, 6.0, 4.5),
(Lion, _) => (5.0, 6.0, 3.0),
(Tarasque, _) => (2.0, -0.5, -3.5),
(Tiger, _) => (4.0, 6.0, 3.0),
(Tarasque, _) => (2.0, -0.5, -4.5),
(Tiger, _) => (1.0, 0.0, -5.0),
},
feet_b: match (body.species, body.body_type) {
(Grolgar, _) => (5.0, -4.0, 3.0),
(Saber, _) => (4.0, -6.0, 3.5),
(Tuskram, _) => (4.0, -8.0, 5.5),
(Lion, _) => (5.5, -8.0, 3.5),
(Tarasque, _) => (1.5, -0.5, -2.5),
(Tiger, _) => (4.0, -8.0, 3.5),
(Tarasque, _) => (1.5, -0.5, -3.5),
(Tiger, _) => (1.0, 0.5, -4.0),
},
height: match (body.species, body.body_type) {
(Grolgar, _) => (1.2),

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

@ -185,15 +185,15 @@ impl Animation for RunAnimation {
next.jaw.scale = Vec3::one() * 1.02;
next.tail.offset = Vec3::new(0.0, skeleton_attr.tail.0, skeleton_attr.tail.1);
next.tail.ori = Quaternion::rotation_x(0.0);
next.tail.ori = Quaternion::rotation_x(shortalt*0.3);
next.tail.scale = Vec3::one();
next.torso_front.offset = Vec3::new(
0.0,
skeleton_attr.torso_front.0,
skeleton_attr.torso_front.1+shortalt*1.0,
skeleton_attr.torso_front.1+shortalt*2.0,
) / 8.0;
next.torso_front.ori = Quaternion::rotation_x(short * -0.05);
next.torso_front.ori = Quaternion::rotation_x(short * 0.17);
next.torso_front.scale = Vec3::one() / 8.0;
next.torso_back.offset = Vec3::new(
@ -201,75 +201,77 @@ impl Animation for RunAnimation {
skeleton_attr.torso_back.0,
skeleton_attr.torso_back.1,
);
next.torso_back.ori = Quaternion::rotation_y(0.0);
next.torso_back.ori = Quaternion::rotation_x(short * -0.1);
next.torso_back.scale = Vec3::one();
next.ears.offset = Vec3::new(0.0, skeleton_attr.ears.0, skeleton_attr.ears.1);
next.ears.ori = Quaternion::rotation_x(0.0);
next.ears.scale = Vec3::one() * 1.02;
////left and right functions currently swapped on some bones to change gait
next.leg_fl.offset = Vec3::new(
-skeleton_attr.leg_f.0,
skeleton_attr.leg_f.1 + foothoril * -3.5,
skeleton_attr.leg_f.2 +1.0+ ((footvertl * -1.0).max(-1.0)),
) / 8.0;
next.leg_fl.ori = Quaternion::rotation_x(footrotl * -0.4);
next.leg_fl.scale = Vec3::one()/8.0*0.99;
skeleton_attr.leg_f.1 + foothoril * -2.5,
skeleton_attr.leg_f.2 +1.0+ footvertl * -1.0,
);
next.leg_fl.ori = Quaternion::rotation_x(footrotl * -0.6);
next.leg_fl.scale = Vec3::one()*0.99;
next.leg_fr.offset = Vec3::new(
skeleton_attr.leg_f.0,
skeleton_attr.leg_f.1 + foothorir * -3.5,
skeleton_attr.leg_f.2 +1.0+ ((footvertr * -1.0).max(-1.0)),
) / 8.0;
next.leg_fr.ori = Quaternion::rotation_x(footrotr * -0.4);
next.leg_fr.scale = Vec3::one()/8.0*0.99;
skeleton_attr.leg_f.1 + foothoril * -2.5,
skeleton_attr.leg_f.2 +1.0+ footvertl * -1.0,
);
next.leg_fr.ori = Quaternion::rotation_x(footrotl * -0.6);
next.leg_fr.scale = Vec3::one()*0.99;
next.leg_bl.offset = Vec3::new(
-skeleton_attr.leg_b.0,
skeleton_attr.leg_b.1 + foothorilb * -3.5,
skeleton_attr.leg_b.2 +1.0+ ((footvertlb * -1.2).max(-1.0)),
skeleton_attr.leg_b.1 + foothorirb * -2.5,
skeleton_attr.leg_b.2 +1.0+ footvertrb * -1.2,
) / 8.0;
next.leg_bl.ori = Quaternion::rotation_x(footrotlb * -0.4);
next.leg_bl.scale = Vec3::one() / 8.0*0.99;
);
next.leg_bl.ori = Quaternion::rotation_x(footrotrb * -0.6);
next.leg_bl.scale = Vec3::one() *0.99;
next.leg_br.offset = Vec3::new(
skeleton_attr.leg_b.0,
skeleton_attr.leg_b.1 + foothorirb * -3.5,
skeleton_attr.leg_b.2 +1.0+ ((footvertrb * -1.2).max(-1.0)),
) / 8.0;
next.leg_br.ori = Quaternion::rotation_x(footrotrb * -0.4);
next.leg_br.scale = Vec3::one() / 8.0*0.99;
skeleton_attr.leg_b.1 + foothorirb * -2.5,
skeleton_attr.leg_b.2 +1.0+ footvertrb * -1.2,
);
next.leg_br.ori = Quaternion::rotation_x(footrotrb * -0.6);
next.leg_br.scale = Vec3::one() *0.99;
next.foot_fl.offset = Vec3::new(
-skeleton_attr.feet_f.0,
skeleton_attr.feet_f.1,
skeleton_attr.feet_f.2,
skeleton_attr.feet_f.2+ ((footvertl * -3.5).max(-1.0)),
);
next.foot_fl.ori = Quaternion::rotation_x(footrotl * -0.7);
next.foot_fl.scale = Vec3::one()*0.98;
next.foot_fl.scale = Vec3::one()*0.97;
next.foot_fr.offset = Vec3::new(
skeleton_attr.feet_f.0,
skeleton_attr.feet_f.1,
skeleton_attr.feet_f.2,
skeleton_attr.feet_f.2+ ((footvertl * -3.5).max(-1.0)),
);
next.foot_fr.ori = Quaternion::rotation_x(footrotr * -0.7);
next.foot_fr.ori = Quaternion::rotation_x(footrotl * -0.7);
next.foot_fr.scale = Vec3::one()*0.98;
next.foot_bl.offset = Vec3::new(
-skeleton_attr.feet_b.0,
skeleton_attr.feet_b.1,
skeleton_attr.feet_b.2,
skeleton_attr.feet_b.2+ ((footvertrb * -3.5).max(-1.0)),
);
next.foot_bl.ori = Quaternion::rotation_x(footrotlb * -0.7);
next.foot_bl.ori = Quaternion::rotation_x(footrotrb * -0.7);
next.foot_bl.scale = Vec3::one()*0.98;
next.foot_br.offset = Vec3::new(
skeleton_attr.feet_b.0,
skeleton_attr.feet_b.1,
skeleton_attr.feet_b.2,
skeleton_attr.feet_b.2 + ((footvertrb * -3.5).max(-1.0)),
);
next.foot_br.ori = Quaternion::rotation_x(footrotrb * -0.7);
next.foot_br.scale = Vec3::one()*0.98;