Various small improvements to anims and models

This commit is contained in:
Snowram 2020-07-05 03:45:50 +02:00 committed by jshipsey
parent 8508b5177b
commit 1b778ca191
26 changed files with 48 additions and 60 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -308,7 +308,7 @@
central: ("armor.empty"),
),
tail_front: (
offset: (-1.5, -7.0, -1.5),
offset: (-1.5, -3.5, -1.5),
central: ("npc.tortoise.male.tail_front"),
),
),

View File

@ -553,11 +553,11 @@
lateral: ("npc.mouflon.male.leg_fr"),
),
leg_bl: (
offset: (-2.0, -2.5, -3.5),
offset: (-2.0, -1.0, -2.5),
lateral: ("npc.mouflon.male.leg_bl"),
),
leg_br: (
offset: (-2.0, -2.5, -3.5),
offset: (-2.0, -1.0, -2.5),
lateral: ("npc.mouflon.male.leg_br"),
),
foot_fl: (
@ -569,11 +569,11 @@
lateral: ("npc.mouflon.male.foot_fr"),
),
foot_bl: (
offset: (-1.0, -0.5, -6.0),
offset: (-1.0, -2.0, -6.0),
lateral: ("npc.mouflon.male.foot_bl"),
),
foot_br: (
offset: (-1.0, -0.5, -6.0),
offset: (-1.0, -2.0, -6.0),
lateral: ("npc.mouflon.male.foot_br"),
),
),
@ -587,11 +587,11 @@
lateral: ("npc.mouflon.male.leg_fr"),
),
leg_bl: (
offset: (-2.0, -2.5, -3.5),
offset: (-2.0, -1.0, -2.5),
lateral: ("npc.mouflon.male.leg_bl"),
),
leg_br: (
offset: (-2.0, -2.5, -3.5),
offset: (-2.0, -1.0, -2.5),
lateral: ("npc.mouflon.male.leg_br"),
),
foot_fl: (
@ -603,11 +603,11 @@
lateral: ("npc.mouflon.male.foot_fr"),
),
foot_bl: (
offset: (-1.0, -0.5, -6.0),
offset: (-1.0, -2.0, -6.0),
lateral: ("npc.mouflon.male.foot_bl"),
),
foot_br: (
offset: (-1.0, -0.5, -6.0),
offset: (-1.0, -2.0, -6.0),
lateral: ("npc.mouflon.male.foot_br"),
),
),

View File

@ -209,7 +209,7 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr {
(Salamander, _) => (4.0, -6.0, -2.0),
(Monitor, _) => (2.5, -6.5, 0.0),
(Asp, _) => (2.5, -5.5, -1.0),
(Tortoise, _) => (6.0, -11.5, -3.0),
(Tortoise, _) => (5.5, -11.5, -3.0),
(Rocksnapper, _) => (8.0, -12.0, -9.5),
(Pangolin, _) => (6.0, -4.0, -1.0),
},

View File

@ -259,7 +259,7 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr {
(Tiger, _) => (6.0, -5.0, -3.0),
(Wolf, _) => (4.5, -6.5, -1.0),
(Frostfang, _) => (5.5, -5.5, -2.0),
(Mouflon, _) => (5.0, -5.0, -5.0),
(Mouflon, _) => (4.0, -5.0, -5.0),
},
leg_b: match (body.species, body.body_type) {
(Grolgar, _) => (6.0, -6.5, -5.5),
@ -270,7 +270,7 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr {
(Tiger, _) => (6.0, -7.5, -3.0),
(Wolf, _) => (5.0, -6.5, -2.5),
(Frostfang, _) => (3.5, -4.5, -2.0),
(Mouflon, _) => (3.5, -6.0, -4.5),
(Mouflon, _) => (3.5, -8.0, -4.5),
},
feet_f: match (body.species, body.body_type) {
(Grolgar, _) => (0.0, -9.0, -7.0),
@ -292,7 +292,7 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr {
(Tiger, _) => (1.0, 0.5, -4.0),
(Wolf, _) => (0.0, -1.0, -1.5),
(Frostfang, _) => (0.0, -1.5, -3.5),
(Mouflon, _) => (-1.0, -1.5, -2.5),
(Mouflon, _) => (-1.0, 0.0, -2.5),
},
scaler: match (body.species, body.body_type) {
(Grolgar, _) => (1.3),

View File

@ -265,7 +265,7 @@ impl Animation for RunAnimation {
skeleton_attr.leg_b.1 + footvert * -1.7,
skeleton_attr.leg_b.2 + 1.0 + footvertt * -1.5,
);
next.leg_bl.ori = Quaternion::rotation_x(footvertt * -0.4 - 0.2)
next.leg_bl.ori = Quaternion::rotation_x(footvertt * -0.45 - 0.2)
* Quaternion::rotation_y(tilt * 1.5)
* Quaternion::rotation_z(tilt * -1.5);
next.leg_bl.scale = Vec3::one() * 1.02;
@ -275,7 +275,7 @@ impl Animation for RunAnimation {
skeleton_attr.leg_b.1 + footvertf * -1.7,
skeleton_attr.leg_b.2 + 1.0 + footverttf * -1.5,
);
next.leg_br.ori = Quaternion::rotation_x(footverttf * -0.4 - 0.2)
next.leg_br.ori = Quaternion::rotation_x(footverttf * -0.45 - 0.2)
* Quaternion::rotation_y(tilt * 1.5)
* Quaternion::rotation_z(tilt * -1.5);
next.leg_br.scale = Vec3::one() * 1.02;
@ -303,7 +303,7 @@ impl Animation for RunAnimation {
next.foot_bl.offset = Vec3::new(
-skeleton_attr.feet_b.0,
skeleton_attr.feet_b.1,
skeleton_attr.feet_b.2 + ((footvert * 2.4).max(0.0)),
skeleton_attr.feet_b.2 + ((footvert * 1.3).max(0.0)),
);
next.foot_bl.ori = Quaternion::rotation_x(footvertt * -0.9 - 0.2)
* Quaternion::rotation_y(tilt * -1.0);
@ -312,7 +312,7 @@ impl Animation for RunAnimation {
next.foot_br.offset = Vec3::new(
skeleton_attr.feet_b.0,
skeleton_attr.feet_b.1,
skeleton_attr.feet_b.2 + ((footvertf * 2.4).max(-0.0)),
skeleton_attr.feet_b.2 + ((footvertf * 1.3).max(-0.0)),
);
next.foot_br.ori = Quaternion::rotation_x(footverttf * -0.9 - 0.2)
* Quaternion::rotation_y(tilt * -1.0);