mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
finished quadlow run, positioning work on quadmed
This commit is contained in:
parent
390f516e13
commit
967343ced6
@ -128,13 +128,13 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr {
|
||||
Self {
|
||||
head_upper: match (body.species, body.body_type) {
|
||||
(Crocodile, _) => (10.0, 2.0),
|
||||
(Alligator, _) => (0.5, 3.0),
|
||||
(Alligator, _) => (0.5, 3.25),
|
||||
(Salamander, _) => (3.0, 1.0),
|
||||
(Monitor, _) => (3.5, 2.0),
|
||||
},
|
||||
head_lower: match (body.species, body.body_type) {
|
||||
(Crocodile, _) => (8.0, 0.0),
|
||||
(Alligator, _) => (9.0, 0.0),
|
||||
(Alligator, _) => (9.0, 0.25),
|
||||
(Salamander, _) => (10.0, 2.0),
|
||||
(Monitor, _) => (10.0, 3.0),
|
||||
},
|
||||
@ -164,13 +164,13 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr {
|
||||
},
|
||||
feet_f: match (body.species, body.body_type) {
|
||||
(Crocodile, _) => (6.0, 6.0, -1.0),
|
||||
(Alligator, _) => (6.0, 6.0, 0.0),
|
||||
(Alligator, _) => (6.75, 6.25, -1.0),
|
||||
(Salamander, _) => (6.0, 6.0, -2.0),
|
||||
(Monitor, _) => (6.0, 6.0, 0.0),
|
||||
},
|
||||
feet_b: match (body.species, body.body_type) {
|
||||
(Crocodile, _) => (6.0, -6.0, -1.0),
|
||||
(Alligator, _) => (6.0, -6.0, 0.0),
|
||||
(Alligator, _) => (6.5, -4.5, -1.0),
|
||||
(Salamander, _) => (6.0, -6.0, -2.0),
|
||||
(Monitor, _) => (6.0, -6.0, 0.0),
|
||||
},
|
||||
|
@ -17,7 +17,7 @@ impl Animation for RunAnimation {
|
||||
) -> Self::Skeleton {
|
||||
let mut next = (*skeleton).clone();
|
||||
|
||||
let lab = 0.1;
|
||||
let lab = 0.5;
|
||||
|
||||
let wave_ultra_slow_cos = (anim_time as f32 * 3.0 + PI).cos();
|
||||
let wave_slow = (anim_time as f32 * 4.5).sin();
|
||||
@ -40,17 +40,30 @@ impl Animation for RunAnimation {
|
||||
|
||||
|
||||
let short = (((5.0)
|
||||
/ (2.5
|
||||
+ 2.5 * ((anim_time as f32 *16.0* lab as f32+ PI * 0.25).sin()).powf(2.0 as f32)))
|
||||
/ (3.6
|
||||
+ 1.4 * ((anim_time as f32 *16.0* lab as f32+ PI * 0.25).sin()).powf(2.0 as f32)))
|
||||
.sqrt())
|
||||
* ((anim_time as f32 *16.0* lab as f32+ PI * 0.25).sin());
|
||||
let shortalt = (anim_time as f32 *16.0* lab as f32 + PI * 0.25).sin();
|
||||
|
||||
|
||||
|
||||
let foothoril = (anim_time as f32 * 16.0 * lab as f32 + PI * 1.45).sin();
|
||||
let foothorir = (anim_time as f32 * 16.0 * lab as f32 + PI * (0.45)).sin();
|
||||
|
||||
let footvertl = (anim_time as f32 * 16.0 * lab as f32).sin();
|
||||
let foothoril = (((5.0)
|
||||
/ (1.0
|
||||
+ (4.0)
|
||||
* ((anim_time as f32 * 16.0 * lab as f32 + PI * 1.45).sin())
|
||||
.powf(2.0 as f32)))
|
||||
.sqrt())
|
||||
* ((anim_time as f32 * 16.0 * lab as f32 + PI * 1.45).sin());
|
||||
let foothorir = (((5.0)
|
||||
/ (1.0
|
||||
+ (4.0)
|
||||
* ((anim_time as f32 * 16.0 * lab as f32 + PI *0.45).sin())
|
||||
.powf(2.0 as f32)))
|
||||
.sqrt())
|
||||
* ((anim_time as f32 * 16.0 * lab as f32 + PI * 0.45).sin());
|
||||
let footvertl = (anim_time as f32 * 16.0 * lab as f32+PI*0.0).sin();
|
||||
let footvertr = (anim_time as f32 * 16.0 * lab as f32 + PI).sin();
|
||||
|
||||
let footrotl = (((5.0)
|
||||
@ -64,32 +77,43 @@ impl Animation for RunAnimation {
|
||||
let footrotr = (((5.0)
|
||||
/ (1.0
|
||||
+ (4.0)
|
||||
* ((anim_time as f32 * 16.0 * lab as f32 + PI * 0.4).sin())
|
||||
* ((anim_time as f32 * 16.0 * lab as f32 + PI * 0.3).sin())
|
||||
.powf(2.0 as f32)))
|
||||
.sqrt())
|
||||
* ((anim_time as f32 * 16.0 * lab as f32 + PI * 0.4).sin());
|
||||
///
|
||||
let foothorilb = (anim_time as f32 * 16.0 * lab as f32 + PI * 1.45).sin();
|
||||
let foothorirb = (anim_time as f32 * 16.0 * lab as f32 + PI * (0.45)).sin();
|
||||
|
||||
let footvertlb = (anim_time as f32 * 16.0 * lab as f32).sin();
|
||||
let footvertrb = (anim_time as f32 * 16.0 * lab as f32 + PI*1.0).sin();
|
||||
let foothorilb = (((5.0)
|
||||
/ (1.0
|
||||
+ (4.0)
|
||||
* ((anim_time as f32 * 16.0 * lab as f32 + PI *1.25).sin())
|
||||
.powf(2.0 as f32)))
|
||||
.sqrt())
|
||||
* ((anim_time as f32 * 16.0 * lab as f32 + PI * 1.25).sin());
|
||||
let foothorirb = (((5.0)
|
||||
/ (1.0
|
||||
+ (4.0)
|
||||
* ((anim_time as f32 * 16.0 * lab as f32 + PI *0.25).sin())
|
||||
.powf(2.0 as f32)))
|
||||
.sqrt())
|
||||
* ((anim_time as f32 * 16.0 * lab as f32 + PI * 0.25).sin());
|
||||
let footvertlb = (anim_time as f32 * 16.0 * lab as f32+PI*(-0.2)).sin();
|
||||
let footvertrb = (anim_time as f32 * 16.0 * lab as f32 + PI*0.8).sin();
|
||||
|
||||
let footrotlb = (((5.0)
|
||||
/ (2.5
|
||||
+ (2.5)
|
||||
* ((anim_time as f32 * 16.0 * lab as f32 + PI * 1.4).sin())
|
||||
* ((anim_time as f32 * 16.0 * lab as f32 + PI * 1.2).sin())
|
||||
.powf(2.0 as f32)))
|
||||
.sqrt())
|
||||
* ((anim_time as f32 * 16.0 * lab as f32 + PI * 1.4).sin());
|
||||
* ((anim_time as f32 * 16.0 * lab as f32 + PI * 1.2).sin());
|
||||
|
||||
let footrotrb = (((5.0)
|
||||
/ (1.0
|
||||
+ (4.0)
|
||||
* ((anim_time as f32 * 16.0 * lab as f32 + PI * 0.4).sin())
|
||||
* ((anim_time as f32 * 16.0 * lab as f32 + PI * 0.2).sin())
|
||||
.powf(2.0 as f32)))
|
||||
.sqrt())
|
||||
* ((anim_time as f32 * 16.0 * lab as f32 + PI * 0.4).sin());
|
||||
* ((anim_time as f32 * 16.0 * lab as f32 + PI * 0.2).sin());
|
||||
|
||||
|
||||
|
||||
@ -114,12 +138,12 @@ impl Animation for RunAnimation {
|
||||
next.head_upper.offset =
|
||||
Vec3::new(0.0, skeleton_attr.head_upper.0, skeleton_attr.head_upper.1);
|
||||
next.head_upper.ori =
|
||||
Quaternion::rotation_x(0.0) * Quaternion::rotation_z(short*-0.15);
|
||||
Quaternion::rotation_x(0.0) * Quaternion::rotation_z(short*-0.06);
|
||||
next.head_upper.scale = Vec3::one();
|
||||
|
||||
next.head_lower.offset =
|
||||
Vec3::new(0.0, skeleton_attr.head_lower.0, skeleton_attr.head_lower.1);
|
||||
next.head_lower.ori = Quaternion::rotation_x(0.0)* Quaternion::rotation_z(short*-0.25);
|
||||
next.head_lower.ori = Quaternion::rotation_x(0.0)* Quaternion::rotation_z(short*-0.15);
|
||||
next.head_lower.scale = Vec3::one();
|
||||
|
||||
next.jaw.offset = Vec3::new(
|
||||
@ -135,7 +159,7 @@ impl Animation for RunAnimation {
|
||||
skeleton_attr.tail_front.0,
|
||||
skeleton_attr.tail_front.1,
|
||||
);
|
||||
next.tail_front.ori = Quaternion::rotation_z(short*0.2)*Quaternion::rotation_y(short*0.15)*Quaternion::rotation_x(0.06);
|
||||
next.tail_front.ori = Quaternion::rotation_z(shortalt*0.18)*Quaternion::rotation_y(shortalt*0.1)*Quaternion::rotation_x(0.06);
|
||||
next.tail_front.scale = Vec3::one();
|
||||
|
||||
next.tail_rear.offset = Vec3::new(
|
||||
@ -143,44 +167,44 @@ impl Animation for RunAnimation {
|
||||
skeleton_attr.tail_rear.0,
|
||||
skeleton_attr.tail_rear.1 + centeroffset * 0.6,
|
||||
);
|
||||
next.tail_rear.ori = Quaternion::rotation_z(short*0.3)*Quaternion::rotation_y(short*0.1)*Quaternion::rotation_x(-0.04);
|
||||
next.tail_rear.ori = Quaternion::rotation_z(shortalt*0.25)*Quaternion::rotation_y(shortalt*0.1)*Quaternion::rotation_x(-0.04);
|
||||
next.tail_rear.scale = Vec3::one();
|
||||
|
||||
next.chest.offset =
|
||||
Vec3::new(0.0, skeleton_attr.chest.0, skeleton_attr.chest.1)/6.0;
|
||||
next.chest.ori = Quaternion::rotation_z(short*0.25)*Quaternion::rotation_y(short*0.15);
|
||||
next.chest.ori = Quaternion::rotation_z(short*0.12)*Quaternion::rotation_y(shortalt*0.12);
|
||||
next.chest.scale = Vec3::one()/6.0;
|
||||
|
||||
next.foot_fl.offset = Vec3::new(
|
||||
-skeleton_attr.feet_f.0,
|
||||
skeleton_attr.feet_f.1 + foothoril * -3.5,
|
||||
skeleton_attr.feet_f.2 + ((footvertl * -0.6).max(-1.0)),
|
||||
skeleton_attr.feet_f.1 + foothoril * -2.5,
|
||||
skeleton_attr.feet_f.2 + ((footvertl * -0.8).max(-0.0)),
|
||||
);
|
||||
next.foot_fl.ori = Quaternion::rotation_x(-0.2 + footrotl * -0.5);
|
||||
next.foot_fl.ori = Quaternion::rotation_x(-0.2 + footrotl * -0.4)*Quaternion::rotation_z(footrotl * 0.55);
|
||||
next.foot_fl.scale = Vec3::one();
|
||||
|
||||
next.foot_fr.offset = Vec3::new(
|
||||
skeleton_attr.feet_f.0,
|
||||
skeleton_attr.feet_f.1 + foothorir * -3.5,
|
||||
skeleton_attr.feet_f.2 + ((footvertr * -0.6).max(-1.0)),
|
||||
skeleton_attr.feet_f.1 + foothorir * -2.5,
|
||||
skeleton_attr.feet_f.2 + ((footvertr * -0.8).max(-0.0)),
|
||||
);
|
||||
next.foot_fr.ori = Quaternion::rotation_x(-0.2 + footrotr * -0.5);
|
||||
next.foot_fr.ori = Quaternion::rotation_x(-0.2 + footrotr * -0.4)*Quaternion::rotation_z(footrotr * -0.55);
|
||||
next.foot_fr.scale = Vec3::one();
|
||||
|
||||
next.foot_bl.offset = Vec3::new(
|
||||
-skeleton_attr.feet_b.0,
|
||||
skeleton_attr.feet_b.1 + foothorilb * -3.5,
|
||||
skeleton_attr.feet_b.2 + ((footvertlb * -0.6).max(-1.0)),
|
||||
skeleton_attr.feet_b.1 + foothorilb * -2.5,
|
||||
skeleton_attr.feet_b.2 + ((footvertlb * -0.6).max(-0.0)),
|
||||
);
|
||||
next.foot_bl.ori = Quaternion::rotation_x(-0.2 + footrotlb * -0.5);
|
||||
next.foot_bl.ori = Quaternion::rotation_x(-0.2 + footrotlb * -0.4)*Quaternion::rotation_z(footrotlb * 0.55);
|
||||
next.foot_bl.scale = Vec3::one();
|
||||
|
||||
next.foot_br.offset = Vec3::new(
|
||||
skeleton_attr.feet_b.0,
|
||||
skeleton_attr.feet_b.1 + foothorirb * -3.5,
|
||||
skeleton_attr.feet_b.2 + ((footvertrb * -0.6).max(-1.0)),
|
||||
skeleton_attr.feet_b.1 + foothorirb * -2.5,
|
||||
skeleton_attr.feet_b.2 + ((footvertrb * -0.6).max(-0.0)),
|
||||
);
|
||||
next.foot_br.ori = Quaternion::rotation_x(-0.2 + footrotrb * -0.5);
|
||||
next.foot_br.ori = Quaternion::rotation_x(-0.2 + footrotrb * -0.4)*Quaternion::rotation_z(footrotrb * -0.55);
|
||||
next.foot_br.scale = Vec3::one();
|
||||
|
||||
next
|
||||
|
@ -55,10 +55,10 @@ impl Animation for IdleAnimation {
|
||||
0.0,
|
||||
skeleton_attr.head_upper.0,
|
||||
skeleton_attr.head_upper.1 + wave_ultra_slow * 0.4,
|
||||
) / 11.0;
|
||||
);
|
||||
next.head_upper.ori =
|
||||
Quaternion::rotation_z(0.8 * look.x) * Quaternion::rotation_x(0.8 * look.y);
|
||||
next.head_upper.scale = Vec3::one() / 10.98;
|
||||
Quaternion::rotation_z(0.3 * look.x) * Quaternion::rotation_x(0.3 * look.y);
|
||||
next.head_upper.scale = Vec3::one();
|
||||
|
||||
next.head_lower.offset = Vec3::new(
|
||||
0.0,
|
||||
@ -66,7 +66,7 @@ impl Animation for IdleAnimation {
|
||||
skeleton_attr.head_lower.1 + wave_ultra_slow * 0.20,
|
||||
);
|
||||
next.head_lower.ori =
|
||||
Quaternion::rotation_z(-0.4 * look.x) * Quaternion::rotation_x(-0.4 * look.y);
|
||||
Quaternion::rotation_z(0.0) * Quaternion::rotation_x(0.0);
|
||||
next.head_lower.scale = Vec3::one() * 1.02;
|
||||
|
||||
next.jaw.offset = Vec3::new(
|
||||
@ -83,62 +83,96 @@ impl Animation for IdleAnimation {
|
||||
skeleton_attr.tail.1 + wave_ultra_slow * 0.6,
|
||||
);
|
||||
next.tail.ori = Quaternion::rotation_z(0.0 + wave_slow * 0.2 + tailmove.x)
|
||||
* Quaternion::rotation_x(tailmove.y);
|
||||
* Quaternion::rotation_x(0.0);
|
||||
next.tail.scale = Vec3::one();
|
||||
|
||||
next.torso_back.offset = Vec3::new(
|
||||
0.0,
|
||||
skeleton_attr.torso_back.0,
|
||||
skeleton_attr.torso_back.1 + wave_ultra_slow * 0.6,
|
||||
) / 11.0;
|
||||
next.torso_back.ori = Quaternion::rotation_y(wave_slow_cos * 0.015)
|
||||
* Quaternion::rotation_z(0.1 * look.x)
|
||||
* Quaternion::rotation_x(0.2 * look.y);
|
||||
next.torso_back.scale = Vec3::one() / 11.0;
|
||||
|
||||
|
||||
next.torso_front.offset = Vec3::new(
|
||||
0.0,
|
||||
skeleton_attr.torso_front.0,
|
||||
skeleton_attr.torso_front.1 + wave_ultra_slow * 0.5,
|
||||
) / 11.0;
|
||||
)/11.0;
|
||||
next.torso_front.ori = Quaternion::rotation_y(wave_slow * 0.015);
|
||||
next.torso_front.scale = Vec3::one() / 10.98;
|
||||
|
||||
next.torso_back.offset = Vec3::new(
|
||||
0.0,
|
||||
skeleton_attr.torso_back.0,
|
||||
skeleton_attr.torso_back.1 + wave_ultra_slow * 0.2,
|
||||
);
|
||||
next.torso_back.ori = Quaternion::rotation_y(wave_slow_cos * 0.015)
|
||||
* Quaternion::rotation_z(0.0)
|
||||
* Quaternion::rotation_x(0.0);
|
||||
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 + wave_ultra_slow * 0.03);
|
||||
next.ears.scale = Vec3::one() / 1.02;
|
||||
|
||||
next.leg_fl.offset = Vec3::new(
|
||||
-skeleton_attr.leg_f.0,
|
||||
skeleton_attr.leg_f.1,
|
||||
skeleton_attr.leg_f.2,
|
||||
) / 11.0;
|
||||
next.leg_fl.ori = Quaternion::rotation_x(0.0);
|
||||
next.leg_fl.scale = Vec3::one() / 11.0;
|
||||
|
||||
next.leg_fr.offset = Vec3::new(
|
||||
skeleton_attr.leg_f.0,
|
||||
skeleton_attr.leg_f.1,
|
||||
skeleton_attr.leg_f.2,
|
||||
) / 11.0;
|
||||
next.leg_fr.ori = Quaternion::rotation_x(0.0);
|
||||
next.leg_fr.scale = Vec3::one() / 11.0;
|
||||
|
||||
next.leg_bl.offset = Vec3::new(
|
||||
-skeleton_attr.leg_b.0,
|
||||
skeleton_attr.leg_b.1,
|
||||
skeleton_attr.leg_b.2,
|
||||
) / 11.0;
|
||||
next.leg_bl.ori = Quaternion::rotation_x(0.0);
|
||||
next.leg_bl.scale = Vec3::one() / 11.0;
|
||||
|
||||
next.leg_br.offset = Vec3::new(
|
||||
skeleton_attr.leg_b.0,
|
||||
skeleton_attr.leg_b.1,
|
||||
skeleton_attr.leg_b.2,
|
||||
) / 11.0;
|
||||
next.leg_br.ori = Quaternion::rotation_x(0.0);
|
||||
next.leg_br.scale = Vec3::one() / 11.0;
|
||||
|
||||
next.foot_fl.offset = Vec3::new(
|
||||
-skeleton_attr.feet_f.0,
|
||||
skeleton_attr.feet_f.1,
|
||||
skeleton_attr.feet_f.2,
|
||||
) / 11.0;
|
||||
);
|
||||
next.foot_fl.ori = Quaternion::rotation_x(0.0);
|
||||
next.foot_fl.scale = Vec3::one() / 11.0;
|
||||
next.foot_fl.scale = Vec3::one();
|
||||
|
||||
next.foot_fr.offset = Vec3::new(
|
||||
skeleton_attr.feet_f.0,
|
||||
skeleton_attr.feet_f.1,
|
||||
skeleton_attr.feet_f.2,
|
||||
) / 11.0;
|
||||
);
|
||||
next.foot_fr.ori = Quaternion::rotation_x(0.0);
|
||||
next.foot_fr.scale = Vec3::one() / 11.0;
|
||||
next.foot_fr.scale = Vec3::one();
|
||||
|
||||
next.foot_bl.offset = Vec3::new(
|
||||
-skeleton_attr.feet_b.0,
|
||||
skeleton_attr.feet_b.1,
|
||||
skeleton_attr.feet_b.2,
|
||||
) / 11.0;
|
||||
);
|
||||
next.foot_bl.ori = Quaternion::rotation_x(0.0);
|
||||
next.foot_bl.scale = Vec3::one() / 11.0;
|
||||
next.foot_bl.scale = Vec3::one();
|
||||
|
||||
next.foot_br.offset = Vec3::new(
|
||||
skeleton_attr.feet_b.0,
|
||||
skeleton_attr.feet_b.1,
|
||||
skeleton_attr.feet_b.2,
|
||||
) / 11.0;
|
||||
);
|
||||
next.foot_br.ori = Quaternion::rotation_x(0.0);
|
||||
next.foot_br.scale = Vec3::one() / 11.0;
|
||||
next.foot_br.scale = Vec3::one();
|
||||
|
||||
next
|
||||
}
|
||||
|
@ -15,8 +15,8 @@ pub struct QuadrupedMediumSkeleton {
|
||||
head_lower: Bone,
|
||||
jaw: Bone,
|
||||
tail: Bone,
|
||||
torso_back: Bone,
|
||||
torso_front: Bone,
|
||||
torso_back: Bone,
|
||||
ears: Bone,
|
||||
leg_fl: Bone,
|
||||
leg_fr: Bone,
|
||||
@ -97,23 +97,29 @@ impl Skeleton for QuadrupedMediumSkeleton {
|
||||
let head_upper_mat = self.head_upper.compute_base_matrix();
|
||||
let head_lower_mat = self.head_lower.compute_base_matrix();
|
||||
let torso_front_mat = self.torso_front.compute_base_matrix();
|
||||
let torso_back_mat = self.torso_back.compute_base_matrix();
|
||||
let leg_fl_mat = self.leg_fl.compute_base_matrix();
|
||||
let leg_fr_mat = self.leg_fr.compute_base_matrix();
|
||||
let leg_bl_mat = self.leg_bl.compute_base_matrix();
|
||||
let leg_br_mat = self.leg_br.compute_base_matrix();
|
||||
|
||||
(
|
||||
[
|
||||
FigureBoneData::new(head_upper_mat),
|
||||
FigureBoneData::new(head_upper_mat * head_lower_mat),
|
||||
FigureBoneData::new(head_upper_mat * self.jaw.compute_base_matrix()),
|
||||
FigureBoneData::new(torso_front_mat * self.tail.compute_base_matrix()),
|
||||
FigureBoneData::new(self.torso_back.compute_base_matrix()),
|
||||
FigureBoneData::new(torso_front_mat * head_lower_mat * head_upper_mat),
|
||||
FigureBoneData::new(torso_front_mat * head_lower_mat),
|
||||
FigureBoneData::new(torso_front_mat *head_lower_mat * head_upper_mat * self.jaw.compute_base_matrix()),
|
||||
FigureBoneData::new(torso_front_mat * torso_back_mat * self.tail.compute_base_matrix()),
|
||||
FigureBoneData::new(torso_front_mat),
|
||||
FigureBoneData::new(head_upper_mat * ears_mat),
|
||||
FigureBoneData::new(self.leg_fl.compute_base_matrix()),
|
||||
FigureBoneData::new(self.leg_fr.compute_base_matrix()),
|
||||
FigureBoneData::new(self.leg_bl.compute_base_matrix()),
|
||||
FigureBoneData::new(self.leg_br.compute_base_matrix()),
|
||||
FigureBoneData::new(self.leg_fl.compute_base_matrix() * self.foot_fl.compute_base_matrix()),
|
||||
FigureBoneData::new(self.leg_fr.compute_base_matrix() * self.foot_fr.compute_base_matrix()),
|
||||
FigureBoneData::new(self.leg_bl.compute_base_matrix() * self.foot_bl.compute_base_matrix()),
|
||||
FigureBoneData::new(self.leg_br.compute_base_matrix() * self.foot_br.compute_base_matrix()),
|
||||
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::default(),
|
||||
],
|
||||
Vec3::default(),
|
||||
@ -189,92 +195,92 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr {
|
||||
use comp::quadruped_medium::Species::*;
|
||||
Self {
|
||||
head_upper: match (body.species, body.body_type) {
|
||||
(Grolgar, _) => (12.0, 16.0),
|
||||
(Saber, _) => (14.0, 12.0),
|
||||
(Grolgar, _) => (25.0, 16.0),
|
||||
(Saber, _) => (-11.0, -3.0),
|
||||
(Tuskram, _) => (9.0, 12.0),
|
||||
(Lion, _) => (12.5, 14.0),
|
||||
(Tarasque, _) => (12.0, 19.0),
|
||||
(Tiger, _) => (*HEAD_UPPER_X, *HEAD_UPPER_Z),
|
||||
(Tiger, _) => (12.0, 19.0),
|
||||
},
|
||||
head_lower: match (body.species, body.body_type) {
|
||||
(Grolgar, _) => (-4.0, -7.0),
|
||||
(Saber, _) => (-6.0, 0.0),
|
||||
(Saber, _) => (1.0, 0.0),
|
||||
(Tuskram, _) => (-3.0, -1.0),
|
||||
(Lion, _) => (-5.0, -1.0),
|
||||
(Tarasque, _) => (-5.0, -6.0),
|
||||
(Tiger, _) => (*HEAD_LOWER_X, *HEAD_LOWER_Z),
|
||||
(Tiger, _) => (-5.0, -6.0),
|
||||
},
|
||||
jaw: match (body.species, body.body_type) {
|
||||
(Grolgar, _) => (3.0, -5.0),
|
||||
(Saber, _) => (2.0, -1.0),
|
||||
(Saber, _) => (18.0, -1.0),
|
||||
(Tuskram, _) => (2.0, -2.0),
|
||||
(Lion, _) => (2.0, -3.0),
|
||||
(Tarasque, _) => (4.0, -9.0),
|
||||
(Tiger, _) => (*JAW_X, *JAW_Z),
|
||||
(Tiger, _) => (4.0, -9.0),
|
||||
},
|
||||
tail: match (body.species, body.body_type) {
|
||||
(Grolgar, _) => (-6.0, -2.0),
|
||||
(Saber, _) => (-4.0, -2.0),
|
||||
(Saber, _) => (-6.0, 1.0),
|
||||
(Tuskram, _) => (-6.0, -2.0),
|
||||
(Lion, _) => (-8.0, -6.0),
|
||||
(Tarasque, _) => (-7.0, -2.0),
|
||||
(Tiger, _) => (*TAIL_X, *TAIL_Z),
|
||||
(Tiger, _) => (-7.0, -2.0),
|
||||
},
|
||||
torso_front: match (body.species, body.body_type) {
|
||||
(Grolgar, _) => (-7.0, 10.5),
|
||||
(Saber, _) => (-7.0, 9.5),
|
||||
(Saber, _) => (14.0, 12.0),
|
||||
(Tuskram, _) => (-7.0, 9.0),
|
||||
(Lion, _) => (-9.0, 9.0),
|
||||
(Tarasque, _) => (-7.0, 8.0),
|
||||
(Tiger, _) => (*TORSO_MID_X, *TORSO_MID_Z),
|
||||
(Tiger, _) => (-7.0, 8.0),
|
||||
},
|
||||
torso_back: match (body.species, body.body_type) {
|
||||
(Grolgar, _) => (4.0, 11.0),
|
||||
(Saber, _) => (4.0, 9.0),
|
||||
(Saber, _) => (-19.5, 0.5),
|
||||
(Tuskram, _) => (4.0, 9.0),
|
||||
(Lion, _) => (4.0, 10.0),
|
||||
(Tarasque, _) => (4.0, 9.0),
|
||||
(Tiger, _) => (*TORSO_BACK_X, *TORSO_BACK_Z),
|
||||
(Tiger, _) => (4.0, 9.0),
|
||||
},
|
||||
ears: match (body.species, body.body_type) {
|
||||
(Grolgar, _) => (-1.0, 5.0),
|
||||
(Saber, _) => (-1.0, 6.0),
|
||||
(Saber, _) => (13.0, 7.0),
|
||||
(Tuskram, _) => (10.0, 2.0),
|
||||
(Lion, _) => (-2.0, 4.0),
|
||||
(Tarasque, _) => (1.5, -2.0),
|
||||
(Tiger, _) => (*EARS_X, *EARS_Z),
|
||||
(Tiger, _) => (1.5, -2.0),
|
||||
},
|
||||
leg_f: match (body.species, body.body_type) {
|
||||
(Grolgar, _) => (5.0, 6.0, 2.0),
|
||||
(Saber, _) => (4.0, 6.0, 3.0),
|
||||
(Grolgar, _) => (20.0, 6.0, 2.0),
|
||||
(Saber, _) => (6.5, 8.0, 9.0),
|
||||
(Tuskram, _) => (4.0, 6.0, 4.5),
|
||||
(Lion, _) => (5.0, 6.0, 3.0),
|
||||
(Tarasque, _) => (4.0, 6.0, 3.0),
|
||||
(Tiger, _) => (*LEG_FRONT_X, *LEG_FRONT_Y, *LEG_FRONT_Z),
|
||||
(Tiger, _) => (4.0, 6.0, 3.0),
|
||||
},
|
||||
leg_b: match (body.species, body.body_type) {
|
||||
(Grolgar, _) => (5.0, -4.0, 3.0),
|
||||
(Saber, _) => (4.0, -6.0, 3.5),
|
||||
(Grolgar, _) => (20.0, -4.0, 3.0),
|
||||
(Saber, _) => (7.0, -7.5, 9.5),
|
||||
(Tuskram, _) => (4.0, -8.0, 5.5),
|
||||
(Lion, _) => (5.5, -8.0, 3.5),
|
||||
(Tarasque, _) => (4.0, -8.0, 3.5),
|
||||
(Tiger, _) => (*LEG_BACK_X, *LEG_BACK_Y, *LEG_BACK_Z),
|
||||
(Tiger, _) => (4.0, -8.0, 3.5),
|
||||
},
|
||||
feet_f: match (body.species, body.body_type) {
|
||||
(Grolgar, _) => (5.0, 6.0, 2.0),
|
||||
(Saber, _) => (4.0, 6.0, 3.0),
|
||||
(Saber, _) => (1.0, 3.0, -1.0),
|
||||
(Tuskram, _) => (4.0, 6.0, 4.5),
|
||||
(Lion, _) => (5.0, 6.0, 3.0),
|
||||
(Tarasque, _) => (4.0, 6.0, 3.0),
|
||||
(Tiger, _) => (*FEET_FRONT_X, *FEET_FRONT_Y, *FEET_FRONT_Z),
|
||||
(Tiger, _) => (4.0, 6.0, 3.0),
|
||||
},
|
||||
feet_b: match (body.species, body.body_type) {
|
||||
(Grolgar, _) => (5.0, -4.0, 3.0),
|
||||
(Saber, _) => (4.0, -6.0, 3.5),
|
||||
(Saber, _) => (1.0, 0.0, 0.0),
|
||||
(Tuskram, _) => (4.0, -8.0, 5.5),
|
||||
(Lion, _) => (5.5, -8.0, 3.5),
|
||||
(Tarasque, _) => (4.0, -8.0, 3.5),
|
||||
(Tiger, _) => (*FEET_BACK_X, *FEET_BACK_Y, *FEET_BACK_Z),
|
||||
(Tiger, _) => (4.0, -8.0, 3.5),
|
||||
},
|
||||
height: match (body.species, body.body_type) {
|
||||
(Grolgar, _) => (1.2),
|
||||
|
Loading…
Reference in New Issue
Block a user