mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Homogenizes quadmed bones names
This commit is contained in:
Snowram
jshipsey
parent
9fec5f3d14
commit
390f516e13
@ -12,11 +12,11 @@
|
||||
offset: (-3.0, -3.0, -2.5),
|
||||
central: ("npc.grolgar.male.jaw"),
|
||||
),
|
||||
torso_f: (
|
||||
torso_front: (
|
||||
offset: (-8.0, -5.5, -6.0),
|
||||
central: ("npc.grolgar.male.torso_front"),
|
||||
),
|
||||
torso_b: (
|
||||
torso_back: (
|
||||
offset: (-7.0, -6.0, -6.0),
|
||||
central: ("npc.grolgar.male.torso_back"),
|
||||
),
|
||||
@ -42,11 +42,11 @@
|
||||
offset: (-3.0, -3.0, -2.5),
|
||||
central: ("npc.grolgar.male.jaw"),
|
||||
),
|
||||
torso_f: (
|
||||
torso_front: (
|
||||
offset: (-8.0, -5.5, -6.0),
|
||||
central: ("npc.grolgar.female.torso_front"),
|
||||
),
|
||||
torso_b: (
|
||||
torso_back: (
|
||||
offset: (-7.0, -6.0, -6.0),
|
||||
central: ("npc.grolgar.female.torso_back"),
|
||||
),
|
||||
@ -73,11 +73,11 @@
|
||||
offset: (-2.0, -2.5, -1.0),
|
||||
central: ("npc.saber.male.jaw"),
|
||||
),
|
||||
torso_f: (
|
||||
torso_front: (
|
||||
offset: (-6.0, -6.0, -5.5),
|
||||
central: ("npc.saber.male.torso_front"),
|
||||
),
|
||||
torso_b: (
|
||||
torso_back: (
|
||||
offset: (-6.0, -6.0, -5.0),
|
||||
central: ("npc.saber.male.torso_back"),
|
||||
),
|
||||
@ -103,11 +103,11 @@
|
||||
offset: (-2.0, -2.5, -1.0),
|
||||
central: ("npc.saber.female.jaw"),
|
||||
),
|
||||
torso_f: (
|
||||
torso_front: (
|
||||
offset: (-6.0, -6.0, -5.5),
|
||||
central: ("npc.saber.female.torso_front"),
|
||||
),
|
||||
torso_b: (
|
||||
torso_back: (
|
||||
offset: (-6.0, -6.0, -5.0),
|
||||
central: ("npc.saber.female.torso_back"),
|
||||
),
|
||||
@ -133,11 +133,11 @@
|
||||
offset: (-2.0, -1.0, -1.0),
|
||||
central: ("npc.tuskram.male.jaw"),
|
||||
),
|
||||
torso_f: (
|
||||
torso_front: (
|
||||
offset: (-5.0, -6.0, -4.0),
|
||||
central: ("npc.tuskram.male.torso_front"),
|
||||
),
|
||||
torso_b: (
|
||||
torso_back: (
|
||||
offset: (-5.0, -6.0, -4.0),
|
||||
central: ("npc.tuskram.male.torso_back"),
|
||||
),
|
||||
@ -163,11 +163,11 @@
|
||||
offset: (-2.0, -1.0, -1.0),
|
||||
central: ("npc.tuskram.male.jaw"),
|
||||
),
|
||||
torso_f: (
|
||||
torso_front: (
|
||||
offset: (-5.0, -6.0, -4.0),
|
||||
central: ("npc.tuskram.female.torso_front"),
|
||||
),
|
||||
torso_b: (
|
||||
torso_back: (
|
||||
offset: (-5.0, -6.0, -4.0),
|
||||
central: ("npc.tuskram.female.torso_back"),
|
||||
),
|
||||
@ -193,11 +193,11 @@
|
||||
offset: (-2.5, -2.5, -0.5),
|
||||
central: ("npc.lion.male.jaw"),
|
||||
),
|
||||
torso_f: (
|
||||
torso_front: (
|
||||
offset: (-5.5, -7.5, -5.5),
|
||||
central: ("npc.lion.male.torso_front"),
|
||||
),
|
||||
torso_b: (
|
||||
torso_back: (
|
||||
offset: (-6.5, -6.0, -5.0),
|
||||
central: ("npc.lion.male.torso_back"),
|
||||
),
|
||||
@ -223,11 +223,11 @@
|
||||
offset: (-2.5, -2.5, -0.5),
|
||||
central: ("npc.lion.male.jaw"),
|
||||
),
|
||||
torso_f: (
|
||||
torso_front: (
|
||||
offset: (-5.5, -7.5, -5.5),
|
||||
central: ("npc.lion.female.torso_front"),
|
||||
),
|
||||
torso_b: (
|
||||
torso_back: (
|
||||
offset: (-6.5, -6.0, -5.0),
|
||||
central: ("npc.lion.female.torso_back"),
|
||||
),
|
||||
@ -253,11 +253,11 @@
|
||||
offset: (-2.0, -2.5, -1.0),
|
||||
central: ("npc.tarasque.male.jaw"),
|
||||
),
|
||||
torso_f: (
|
||||
torso_front: (
|
||||
offset: (-5.0, -7.0, -6.5),
|
||||
central: ("npc.tarasque.male.torso_front"),
|
||||
),
|
||||
torso_b: (
|
||||
torso_back: (
|
||||
offset: (-5.0, -6.0, -5.5),
|
||||
central: ("npc.tarasque.male.torso_back"),
|
||||
),
|
||||
@ -283,11 +283,11 @@
|
||||
offset: (-2.0, -2.5, -1.0),
|
||||
central: ("npc.tarasque.male.jaw"),
|
||||
),
|
||||
torso_f: (
|
||||
torso_front: (
|
||||
offset: (-5.0, -7.0, -6.5),
|
||||
central: ("npc.tarasque.female.torso_front"),
|
||||
),
|
||||
torso_b: (
|
||||
torso_back: (
|
||||
offset: (-5.0, -6.0, -5.5),
|
||||
central: ("npc.tarasque.female.torso_back"),
|
||||
),
|
||||
@ -313,11 +313,11 @@
|
||||
offset: (-2.0, -2.5, -1.0),
|
||||
central: ("npc.tiger.male.jaw"),
|
||||
),
|
||||
torso_f: (
|
||||
torso_front: (
|
||||
offset: (-6.0, -6.0, -5.5),
|
||||
central: ("npc.tiger.male.torso_front"),
|
||||
),
|
||||
torso_b: (
|
||||
torso_back: (
|
||||
offset: (-6.0, -6.0, -5.0),
|
||||
central: ("npc.tiger.male.torso_back"),
|
||||
),
|
||||
@ -343,11 +343,11 @@
|
||||
offset: (-2.0, -2.5, -1.0),
|
||||
central: ("npc.tiger.female.jaw"),
|
||||
),
|
||||
torso_f: (
|
||||
torso_front: (
|
||||
offset: (-6.0, -6.0, -5.5),
|
||||
central: ("npc.tiger.female.torso_front"),
|
||||
),
|
||||
torso_b: (
|
||||
torso_back: (
|
||||
offset: (-6.0, -6.0, -5.0),
|
||||
central: ("npc.tiger.female.torso_back"),
|
||||
),
|
||||
|
||||
@ -1,410 +1,410 @@
|
||||
({
|
||||
(Grolgar, Male): (
|
||||
leg_lf: (
|
||||
leg_fl: (
|
||||
offset: (-2.5, -4.0, -1.5),
|
||||
lateral: ("npc.grolgar.male.leg_lf"),
|
||||
lateral: ("npc.grolgar.male.leg_fl"),
|
||||
),
|
||||
leg_rf: (
|
||||
leg_fr: (
|
||||
offset: (-2.5, -4.0, -1.5),
|
||||
lateral: ("npc.grolgar.male.leg_rf"),
|
||||
lateral: ("npc.grolgar.male.leg_fr"),
|
||||
),
|
||||
leg_lb: (
|
||||
leg_bl: (
|
||||
offset: (-2.5, -4.0, -3.0),
|
||||
lateral: ("npc.grolgar.male.leg_lb"),
|
||||
lateral: ("npc.grolgar.male.leg_bl"),
|
||||
),
|
||||
leg_rb: (
|
||||
leg_br: (
|
||||
offset: (-2.5, -4.0, -3.0),
|
||||
lateral: ("npc.grolgar.male.leg_rb"),
|
||||
lateral: ("npc.grolgar.male.leg_br"),
|
||||
),
|
||||
foot_lf: (
|
||||
foot_fl: (
|
||||
offset: (-2.5, -4.0, -1.5),
|
||||
lateral: ("npc.grolgar.male.foot_lf"),
|
||||
lateral: ("npc.grolgar.male.foot_fl"),
|
||||
),
|
||||
foot_rf: (
|
||||
foot_fr: (
|
||||
offset: (-2.5, -4.0, -1.5),
|
||||
lateral: ("npc.grolgar.male.foot_rf"),
|
||||
lateral: ("npc.grolgar.male.foot_fr"),
|
||||
),
|
||||
foot_lb: (
|
||||
foot_bl: (
|
||||
offset: (-2.5, -4.0, -3.0),
|
||||
lateral: ("npc.grolgar.male.foot_lb"),
|
||||
lateral: ("npc.grolgar.male.foot_bl"),
|
||||
),
|
||||
foot_rb: (
|
||||
foot_br: (
|
||||
offset: (-2.5, -4.0, -3.0),
|
||||
lateral: ("npc.grolgar.male.foot_rb"),
|
||||
lateral: ("npc.grolgar.male.foot_br"),
|
||||
),
|
||||
),
|
||||
(Grolgar, Female): (
|
||||
leg_lf: (
|
||||
leg_fl: (
|
||||
offset: (-2.5, -4.0, -1.5),
|
||||
lateral: ("npc.grolgar.female.leg_lf"),
|
||||
lateral: ("npc.grolgar.female.leg_fl"),
|
||||
),
|
||||
leg_rf: (
|
||||
leg_fr: (
|
||||
offset: (-2.5, -4.0, -1.5),
|
||||
lateral: ("npc.grolgar.female.leg_rf"),
|
||||
lateral: ("npc.grolgar.female.leg_fr"),
|
||||
),
|
||||
leg_lb: (
|
||||
leg_bl: (
|
||||
offset: (-2.5, -4.0, -3.0),
|
||||
lateral: ("npc.grolgar.female.leg_lb"),
|
||||
lateral: ("npc.grolgar.female.leg_bl"),
|
||||
),
|
||||
leg_rb: (
|
||||
leg_br: (
|
||||
offset: (-2.5, -4.0, -3.0),
|
||||
lateral: ("npc.grolgar.female.leg_rb"),
|
||||
lateral: ("npc.grolgar.female.leg_br"),
|
||||
),
|
||||
foot_lf: (
|
||||
foot_fl: (
|
||||
offset: (-2.5, -4.0, -1.5),
|
||||
lateral: ("npc.grolgar.female.foot_lf"),
|
||||
lateral: ("npc.grolgar.female.foot_fl"),
|
||||
),
|
||||
foot_rf: (
|
||||
foot_fr: (
|
||||
offset: (-2.5, -4.0, -1.5),
|
||||
lateral: ("npc.grolgar.female.foot_rf"),
|
||||
lateral: ("npc.grolgar.female.foot_fr"),
|
||||
),
|
||||
foot_lb: (
|
||||
foot_bl: (
|
||||
offset: (-2.5, -4.0, -3.0),
|
||||
lateral: ("npc.grolgar.female.foot_lb"),
|
||||
lateral: ("npc.grolgar.female.foot_bl"),
|
||||
),
|
||||
foot_rb: (
|
||||
foot_br: (
|
||||
offset: (-2.5, -4.0, -3.0),
|
||||
lateral: ("npc.grolgar.female.foot_rb"),
|
||||
lateral: ("npc.grolgar.female.foot_br"),
|
||||
),
|
||||
),
|
||||
(Saber, Male): (
|
||||
leg_lf: (
|
||||
leg_fl: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
lateral: ("npc.saber.male.leg_lf"),
|
||||
lateral: ("npc.saber.male.leg_fl"),
|
||||
),
|
||||
leg_rf: (
|
||||
leg_fr: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
lateral: ("npc.saber.male.leg_rf"),
|
||||
lateral: ("npc.saber.male.leg_fr"),
|
||||
),
|
||||
leg_lb: (
|
||||
leg_bl: (
|
||||
offset: (-1.5, -4.0, -3.5),
|
||||
lateral: ("npc.saber.male.leg_lb"),
|
||||
lateral: ("npc.saber.male.leg_bl"),
|
||||
),
|
||||
leg_rb: (
|
||||
leg_br: (
|
||||
offset: (-1.5, -4.0, -3.5),
|
||||
lateral: ("npc.saber.male.leg_rb"),
|
||||
lateral: ("npc.saber.male.leg_br"),
|
||||
),
|
||||
foot_lf: (
|
||||
foot_fl: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
lateral: ("npc.saber.male.foot_lf"),
|
||||
lateral: ("npc.saber.male.foot_fl"),
|
||||
),
|
||||
foot_rf: (
|
||||
foot_fr: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
lateral: ("npc.saber.male.foot_rf"),
|
||||
lateral: ("npc.saber.male.foot_fr"),
|
||||
),
|
||||
foot_lb: (
|
||||
foot_bl: (
|
||||
offset: (-1.5, -4.0, -3.5),
|
||||
lateral: ("npc.saber.male.foot_lb"),
|
||||
lateral: ("npc.saber.male.foot_bl"),
|
||||
),
|
||||
foot_rb: (
|
||||
foot_br: (
|
||||
offset: (-1.5, -4.0, -3.5),
|
||||
lateral: ("npc.saber.male.foot_rb"),
|
||||
lateral: ("npc.saber.male.foot_br"),
|
||||
),
|
||||
),
|
||||
(Saber, Female): (
|
||||
leg_lf: (
|
||||
leg_fl: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
lateral: ("npc.saber.female.leg_lf"),
|
||||
lateral: ("npc.saber.female.leg_fl"),
|
||||
),
|
||||
leg_rf: (
|
||||
leg_fr: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
lateral: ("npc.saber.female.leg_rf"),
|
||||
lateral: ("npc.saber.female.leg_fr"),
|
||||
),
|
||||
leg_lb: (
|
||||
leg_bl: (
|
||||
offset: (-1.5, -4.0, -3.5),
|
||||
lateral: ("npc.saber.female.leg_lb"),
|
||||
lateral: ("npc.saber.female.leg_bl"),
|
||||
),
|
||||
leg_rb: (
|
||||
leg_br: (
|
||||
offset: (-1.5, -2.0, -3.5),
|
||||
lateral: ("npc.saber.female.leg_rb"),
|
||||
lateral: ("npc.saber.female.leg_br"),
|
||||
),
|
||||
foot_lf: (
|
||||
foot_fl: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
lateral: ("npc.saber.female.foot_lf"),
|
||||
lateral: ("npc.saber.female.foot_fl"),
|
||||
),
|
||||
foot_rf: (
|
||||
foot_fr: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
lateral: ("npc.saber.female.foot_rf"),
|
||||
lateral: ("npc.saber.female.foot_fr"),
|
||||
),
|
||||
foot_lb: (
|
||||
foot_bl: (
|
||||
offset: (-1.5, -4.0, -3.5),
|
||||
lateral: ("npc.saber.female.foot_lb"),
|
||||
lateral: ("npc.saber.female.foot_bl"),
|
||||
),
|
||||
foot_rb: (
|
||||
foot_br: (
|
||||
offset: (-1.5, -2.0, -3.5),
|
||||
lateral: ("npc.saber.female.foot_rb"),
|
||||
lateral: ("npc.saber.female.foot_br"),
|
||||
),
|
||||
),
|
||||
(Tuskram, Male): (
|
||||
leg_lf: (
|
||||
leg_fl: (
|
||||
offset: (-1.5, -1.5, -4.5),
|
||||
lateral: ("npc.tuskram.male.leg_lf"),
|
||||
lateral: ("npc.tuskram.male.leg_fl"),
|
||||
),
|
||||
leg_rf: (
|
||||
leg_fr: (
|
||||
offset: (-1.5, -1.5, -4.5),
|
||||
lateral: ("npc.tuskram.male.leg_rf"),
|
||||
lateral: ("npc.tuskram.male.leg_fr"),
|
||||
),
|
||||
leg_lb: (
|
||||
leg_bl: (
|
||||
offset: (-1.5, -4.0, -5.5),
|
||||
lateral: ("npc.tuskram.male.leg_lb"),
|
||||
lateral: ("npc.tuskram.male.leg_bl"),
|
||||
),
|
||||
leg_rb: (
|
||||
leg_br: (
|
||||
offset: (-1.5, -4.0, -5.5),
|
||||
lateral: ("npc.tuskram.male.leg_rb"),
|
||||
lateral: ("npc.tuskram.male.leg_br"),
|
||||
),
|
||||
foot_lf: (
|
||||
foot_fl: (
|
||||
offset: (-1.5, -1.5, -4.5),
|
||||
lateral: ("npc.tuskram.male.foot_lf"),
|
||||
lateral: ("npc.tuskram.male.foot_fl"),
|
||||
),
|
||||
foot_rf: (
|
||||
foot_fr: (
|
||||
offset: (-1.5, -1.5, -4.5),
|
||||
lateral: ("npc.tuskram.male.foot_rf"),
|
||||
lateral: ("npc.tuskram.male.foot_fr"),
|
||||
),
|
||||
foot_lb: (
|
||||
foot_bl: (
|
||||
offset: (-1.5, -4.0, -5.5),
|
||||
lateral: ("npc.tuskram.male.foot_lb"),
|
||||
lateral: ("npc.tuskram.male.foot_bl"),
|
||||
),
|
||||
foot_rb: (
|
||||
foot_br: (
|
||||
offset: (-1.5, -4.0, -5.5),
|
||||
lateral: ("npc.tuskram.male.foot_rb"),
|
||||
lateral: ("npc.tuskram.male.foot_br"),
|
||||
),
|
||||
),
|
||||
(Tuskram, Female): (
|
||||
leg_lf: (
|
||||
leg_fl: (
|
||||
offset: (-1.5, -1.5, -4.5),
|
||||
lateral: ("npc.tuskram.female.leg_lf"),
|
||||
lateral: ("npc.tuskram.female.leg_fl"),
|
||||
),
|
||||
leg_rf: (
|
||||
leg_fr: (
|
||||
offset: (-1.5, -1.5, -4.5),
|
||||
lateral: ("npc.tuskram.female.leg_rf"),
|
||||
lateral: ("npc.tuskram.female.leg_fr"),
|
||||
),
|
||||
leg_lb: (
|
||||
leg_bl: (
|
||||
offset: (-1.5, -4.0, -5.5),
|
||||
lateral: ("npc.tuskram.female.leg_lb"),
|
||||
lateral: ("npc.tuskram.female.leg_bl"),
|
||||
),
|
||||
leg_rb: (
|
||||
leg_br: (
|
||||
offset: (-1.5, -4.0, -5.5),
|
||||
lateral: ("npc.tuskram.female.leg_rb"),
|
||||
lateral: ("npc.tuskram.female.leg_br"),
|
||||
),
|
||||
foot_lf: (
|
||||
foot_fl: (
|
||||
offset: (-1.5, -1.5, -4.5),
|
||||
lateral: ("npc.tuskram.female.foot_lf"),
|
||||
lateral: ("npc.tuskram.female.foot_fl"),
|
||||
),
|
||||
foot_rf: (
|
||||
foot_fr: (
|
||||
offset: (-1.5, -1.5, -4.5),
|
||||
lateral: ("npc.tuskram.female.foot_rf"),
|
||||
lateral: ("npc.tuskram.female.foot_fr"),
|
||||
),
|
||||
foot_lb: (
|
||||
foot_bl: (
|
||||
offset: (-1.5, -4.0, -5.5),
|
||||
lateral: ("npc.tuskram.female.foot_lb"),
|
||||
lateral: ("npc.tuskram.female.foot_bl"),
|
||||
),
|
||||
foot_rb: (
|
||||
foot_br: (
|
||||
offset: (-1.5, -4.0, -5.5),
|
||||
lateral: ("npc.tuskram.female.foot_rb"),
|
||||
lateral: ("npc.tuskram.female.foot_br"),
|
||||
),
|
||||
),
|
||||
(Lion, Male): (
|
||||
leg_lf: (
|
||||
leg_fl: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
lateral: ("npc.lion.male.leg_lf"),
|
||||
lateral: ("npc.lion.male.leg_fl"),
|
||||
),
|
||||
leg_rf: (
|
||||
leg_fr: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
lateral: ("npc.lion.male.leg_rf"),
|
||||
lateral: ("npc.lion.male.leg_fr"),
|
||||
),
|
||||
leg_lb: (
|
||||
leg_bl: (
|
||||
offset: (-1.5, -2.0, -3.5),
|
||||
lateral: ("npc.lion.male.leg_lb"),
|
||||
lateral: ("npc.lion.male.leg_bl"),
|
||||
),
|
||||
leg_rb: (
|
||||
leg_br: (
|
||||
offset: (-1.5, -2.0, -3.5),
|
||||
lateral: ("npc.lion.male.leg_rb"),
|
||||
lateral: ("npc.lion.male.leg_br"),
|
||||
),
|
||||
foot_lf: (
|
||||
foot_fl: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
lateral: ("npc.lion.male.foot_lf"),
|
||||
lateral: ("npc.lion.male.foot_fl"),
|
||||
),
|
||||
foot_rf: (
|
||||
foot_fr: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
lateral: ("npc.lion.male.foot_rf"),
|
||||
lateral: ("npc.lion.male.foot_fr"),
|
||||
),
|
||||
foot_lb: (
|
||||
foot_bl: (
|
||||
offset: (-1.5, -2.0, -3.5),
|
||||
lateral: ("npc.lion.male.foot_lb"),
|
||||
lateral: ("npc.lion.male.foot_bl"),
|
||||
),
|
||||
foot_rb: (
|
||||
foot_br: (
|
||||
offset: (-1.5, -2.0, -3.5),
|
||||
lateral: ("npc.lion.male.foot_rb"),
|
||||
lateral: ("npc.lion.male.foot_br"),
|
||||
),
|
||||
),
|
||||
(Lion, Female): (
|
||||
leg_lf: (
|
||||
leg_fl: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
lateral: ("npc.lion.female.leg_lf"),
|
||||
lateral: ("npc.lion.female.leg_fl"),
|
||||
),
|
||||
leg_rf: (
|
||||
leg_fr: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
lateral: ("npc.lion.female.leg_rf"),
|
||||
lateral: ("npc.lion.female.leg_fr"),
|
||||
),
|
||||
leg_lb: (
|
||||
leg_bl: (
|
||||
offset: (-1.5, -2.0, -3.5),
|
||||
lateral: ("npc.lion.female.leg_lb"),
|
||||
lateral: ("npc.lion.female.leg_bl"),
|
||||
),
|
||||
leg_rb: (
|
||||
leg_br: (
|
||||
offset: (-1.5, -2.0, -3.5),
|
||||
lateral: ("npc.lion.female.leg_rb"),
|
||||
lateral: ("npc.lion.female.leg_br"),
|
||||
),
|
||||
foot_lf: (
|
||||
foot_fl: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
lateral: ("npc.lion.female.foot_lf"),
|
||||
lateral: ("npc.lion.female.foot_fl"),
|
||||
),
|
||||
foot_rf: (
|
||||
foot_fr: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
lateral: ("npc.lion.female.foot_rf"),
|
||||
lateral: ("npc.lion.female.foot_fr"),
|
||||
),
|
||||
foot_lb: (
|
||||
foot_bl: (
|
||||
offset: (-1.5, -2.0, -3.5),
|
||||
lateral: ("npc.lion.female.foot_lb"),
|
||||
lateral: ("npc.lion.female.foot_bl"),
|
||||
),
|
||||
foot_rb: (
|
||||
foot_br: (
|
||||
offset: (-1.5, -2.0, -3.5),
|
||||
lateral: ("npc.lion.female.foot_rb"),
|
||||
lateral: ("npc.lion.female.foot_br"),
|
||||
),
|
||||
),
|
||||
(Tarasque, Male): (
|
||||
leg_lf: (
|
||||
leg_fl: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
lateral: ("npc.tarasque.male.leg_lf"),
|
||||
lateral: ("npc.tarasque.male.leg_fl"),
|
||||
),
|
||||
leg_rf: (
|
||||
leg_fr: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
lateral: ("npc.tarasque.male.leg_rf"),
|
||||
lateral: ("npc.tarasque.male.leg_fr"),
|
||||
),
|
||||
leg_lb: (
|
||||
leg_bl: (
|
||||
offset: (-1.5, -2.0, -3.5),
|
||||
lateral: ("npc.tarasque.male.leg_lb"),
|
||||
lateral: ("npc.tarasque.male.leg_bl"),
|
||||
),
|
||||
leg_rb: (
|
||||
leg_br: (
|
||||
offset: (-1.5, -2.0, -3.5),
|
||||
lateral: ("npc.tarasque.male.leg_rb"),
|
||||
lateral: ("npc.tarasque.male.leg_br"),
|
||||
),
|
||||
foot_lf: (
|
||||
foot_fl: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
lateral: ("npc.tarasque.male.foot_lf"),
|
||||
lateral: ("npc.tarasque.male.foot_fl"),
|
||||
),
|
||||
foot_rf: (
|
||||
foot_fr: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
lateral: ("npc.tarasque.male.foot_rf"),
|
||||
lateral: ("npc.tarasque.male.foot_fr"),
|
||||
),
|
||||
foot_lb: (
|
||||
foot_bl: (
|
||||
offset: (-1.5, -2.0, -3.5),
|
||||
lateral: ("npc.tarasque.male.foot_lb"),
|
||||
lateral: ("npc.tarasque.male.foot_bl"),
|
||||
),
|
||||
foot_rb: (
|
||||
foot_br: (
|
||||
offset: (-1.5, -2.0, -3.5),
|
||||
lateral: ("npc.tarasque.male.foot_rb"),
|
||||
lateral: ("npc.tarasque.male.foot_br"),
|
||||
),
|
||||
),
|
||||
(Tarasque, Female): (
|
||||
leg_lf: (
|
||||
leg_fl: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
lateral: ("npc.tarasque.female.leg_lf"),
|
||||
lateral: ("npc.tarasque.female.leg_fl"),
|
||||
),
|
||||
leg_rf: (
|
||||
leg_fr: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
lateral: ("npc.tarasque.female.leg_rf"),
|
||||
lateral: ("npc.tarasque.female.leg_fr"),
|
||||
),
|
||||
leg_lb: (
|
||||
leg_bl: (
|
||||
offset: (-1.5, -2.0, -3.5),
|
||||
lateral: ("npc.tarasque.female.leg_lb"),
|
||||
lateral: ("npc.tarasque.female.leg_bl"),
|
||||
),
|
||||
leg_rb: (
|
||||
leg_br: (
|
||||
offset: (-1.5, -2.0, -3.5),
|
||||
lateral: ("npc.tarasque.female.leg_rb"),
|
||||
lateral: ("npc.tarasque.female.leg_br"),
|
||||
),
|
||||
foot_lf: (
|
||||
foot_fl: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
lateral: ("npc.tarasque.female.foot_lf"),
|
||||
lateral: ("npc.tarasque.female.foot_fl"),
|
||||
),
|
||||
foot_rf: (
|
||||
foot_fr: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
lateral: ("npc.tarasque.female.foot_rf"),
|
||||
lateral: ("npc.tarasque.female.foot_fr"),
|
||||
),
|
||||
foot_lb: (
|
||||
foot_bl: (
|
||||
offset: (-1.5, -2.0, -3.5),
|
||||
lateral: ("npc.tarasque.female.foot_lb"),
|
||||
lateral: ("npc.tarasque.female.foot_bl"),
|
||||
),
|
||||
foot_rb: (
|
||||
foot_br: (
|
||||
offset: (-1.5, -2.0, -3.5),
|
||||
lateral: ("npc.tarasque.female.foot_rb"),
|
||||
lateral: ("npc.tarasque.female.foot_br"),
|
||||
),
|
||||
),
|
||||
(Tiger, Male): (
|
||||
leg_lf: (
|
||||
leg_fl: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
lateral: ("npc.tiger.male.leg_lf"),
|
||||
lateral: ("npc.tiger.male.leg_fl"),
|
||||
),
|
||||
leg_rf: (
|
||||
leg_fr: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
lateral: ("npc.tiger.male.leg_rf"),
|
||||
lateral: ("npc.tiger.male.leg_fr"),
|
||||
),
|
||||
leg_lb: (
|
||||
leg_bl: (
|
||||
offset: (-1.5, -4.0, -3.5),
|
||||
lateral: ("npc.tiger.male.leg_lb"),
|
||||
lateral: ("npc.tiger.male.leg_bl"),
|
||||
),
|
||||
leg_rb: (
|
||||
leg_br: (
|
||||
offset: (-1.5, -4.0, -3.5),
|
||||
lateral: ("npc.tiger.male.leg_rb"),
|
||||
lateral: ("npc.tiger.male.leg_br"),
|
||||
),
|
||||
foot_lf: (
|
||||
foot_fl: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
lateral: ("npc.tiger.male.foot_lf"),
|
||||
lateral: ("npc.tiger.male.foot_fl"),
|
||||
),
|
||||
foot_rf: (
|
||||
foot_fr: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
lateral: ("npc.tiger.male.foot_rf"),
|
||||
lateral: ("npc.tiger.male.foot_fr"),
|
||||
),
|
||||
foot_lb: (
|
||||
foot_bl: (
|
||||
offset: (-1.5, -4.0, -3.5),
|
||||
lateral: ("npc.tiger.male.foot_lb"),
|
||||
lateral: ("npc.tiger.male.foot_bl"),
|
||||
),
|
||||
foot_rb: (
|
||||
foot_br: (
|
||||
offset: (-1.5, -4.0, -3.5),
|
||||
lateral: ("npc.tiger.male.foot_rb"),
|
||||
lateral: ("npc.tiger.male.foot_br"),
|
||||
),
|
||||
),
|
||||
(Tiger, Female): (
|
||||
leg_lf: (
|
||||
leg_fl: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
lateral: ("npc.tiger.female.leg_lf"),
|
||||
lateral: ("npc.tiger.female.leg_fl"),
|
||||
),
|
||||
leg_rf: (
|
||||
leg_fr: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
lateral: ("npc.tiger.female.leg_rf"),
|
||||
lateral: ("npc.tiger.female.leg_fr"),
|
||||
),
|
||||
leg_lb: (
|
||||
leg_bl: (
|
||||
offset: (-1.5, -4.0, -3.5),
|
||||
lateral: ("npc.tiger.female.leg_lb"),
|
||||
lateral: ("npc.tiger.female.leg_bl"),
|
||||
),
|
||||
leg_rb: (
|
||||
leg_br: (
|
||||
offset: (-1.5, -2.0, -3.5),
|
||||
lateral: ("npc.tiger.female.leg_rb"),
|
||||
lateral: ("npc.tiger.female.leg_br"),
|
||||
),
|
||||
foot_lf: (
|
||||
foot_fl: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
lateral: ("npc.tiger.female.foot_lf"),
|
||||
lateral: ("npc.tiger.female.foot_fl"),
|
||||
),
|
||||
foot_rf: (
|
||||
foot_fr: (
|
||||
offset: (-1.5, -1.5, -2.5),
|
||||
lateral: ("npc.tiger.female.foot_rf"),
|
||||
lateral: ("npc.tiger.female.foot_fr"),
|
||||
),
|
||||
foot_lb: (
|
||||
foot_bl: (
|
||||
offset: (-1.5, -4.0, -3.5),
|
||||
lateral: ("npc.tiger.female.foot_lb"),
|
||||
lateral: ("npc.tiger.female.foot_bl"),
|
||||
),
|
||||
foot_rb: (
|
||||
foot_br: (
|
||||
offset: (-1.5, -2.0, -3.5),
|
||||
lateral: ("npc.tiger.female.foot_rb"),
|
||||
lateral: ("npc.tiger.female.foot_br"),
|
||||
),
|
||||
),
|
||||
})
|
||||
|
||||
@ -96,49 +96,49 @@ impl Animation for IdleAnimation {
|
||||
* Quaternion::rotation_x(0.2 * look.y);
|
||||
next.torso_back.scale = Vec3::one() / 11.0;
|
||||
|
||||
next.torso_mid.offset = Vec3::new(
|
||||
next.torso_front.offset = Vec3::new(
|
||||
0.0,
|
||||
skeleton_attr.torso_mid.0,
|
||||
skeleton_attr.torso_mid.1 + wave_ultra_slow * 0.5,
|
||||
skeleton_attr.torso_front.0,
|
||||
skeleton_attr.torso_front.1 + wave_ultra_slow * 0.5,
|
||||
) / 11.0;
|
||||
next.torso_mid.ori = Quaternion::rotation_y(wave_slow * 0.015);
|
||||
next.torso_mid.scale = Vec3::one() / 10.98;
|
||||
next.torso_front.ori = Quaternion::rotation_y(wave_slow * 0.015);
|
||||
next.torso_front.scale = Vec3::one() / 10.98;
|
||||
|
||||
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.foot_lf.offset = Vec3::new(
|
||||
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_lf.ori = Quaternion::rotation_x(0.0);
|
||||
next.foot_lf.scale = Vec3::one() / 11.0;
|
||||
next.foot_fl.ori = Quaternion::rotation_x(0.0);
|
||||
next.foot_fl.scale = Vec3::one() / 11.0;
|
||||
|
||||
next.foot_rf.offset = Vec3::new(
|
||||
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_rf.ori = Quaternion::rotation_x(0.0);
|
||||
next.foot_rf.scale = Vec3::one() / 11.0;
|
||||
next.foot_fr.ori = Quaternion::rotation_x(0.0);
|
||||
next.foot_fr.scale = Vec3::one() / 11.0;
|
||||
|
||||
next.foot_lb.offset = Vec3::new(
|
||||
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_lb.ori = Quaternion::rotation_x(0.0);
|
||||
next.foot_lb.scale = Vec3::one() / 11.0;
|
||||
next.foot_bl.ori = Quaternion::rotation_x(0.0);
|
||||
next.foot_bl.scale = Vec3::one() / 11.0;
|
||||
|
||||
next.foot_rb.offset = Vec3::new(
|
||||
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_rb.ori = Quaternion::rotation_x(0.0);
|
||||
next.foot_rb.scale = Vec3::one() / 11.0;
|
||||
next.foot_br.ori = Quaternion::rotation_x(0.0);
|
||||
next.foot_br.scale = Vec3::one() / 11.0;
|
||||
|
||||
next
|
||||
}
|
||||
|
||||
@ -51,46 +51,46 @@ impl Animation for JumpAnimation {
|
||||
* Quaternion::rotation_x(0.2);
|
||||
next.torso_back.scale = Vec3::one() / 11.0;
|
||||
|
||||
next.torso_mid.offset =
|
||||
Vec3::new(0.0, skeleton_attr.torso_mid.0, skeleton_attr.torso_mid.1) / 11.0;
|
||||
next.torso_mid.ori = Quaternion::rotation_x(-0.4);
|
||||
next.torso_mid.scale = Vec3::one() / 10.98;
|
||||
next.torso_front.offset =
|
||||
Vec3::new(0.0, skeleton_attr.torso_front.0, skeleton_attr.torso_front.1) / 11.0;
|
||||
next.torso_front.ori = Quaternion::rotation_x(-0.4);
|
||||
next.torso_front.scale = Vec3::one() / 10.98;
|
||||
|
||||
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;
|
||||
|
||||
next.foot_lf.offset = Vec3::new(
|
||||
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_lf.ori = Quaternion::rotation_x(0.0);
|
||||
next.foot_lf.scale = Vec3::one() / 11.0;
|
||||
next.foot_fl.ori = Quaternion::rotation_x(0.0);
|
||||
next.foot_fl.scale = Vec3::one() / 11.0;
|
||||
|
||||
next.foot_rf.offset = Vec3::new(
|
||||
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_rf.ori = Quaternion::rotation_x(0.0);
|
||||
next.foot_rf.scale = Vec3::one() / 11.0;
|
||||
next.foot_fr.ori = Quaternion::rotation_x(0.0);
|
||||
next.foot_fr.scale = Vec3::one() / 11.0;
|
||||
|
||||
next.foot_lb.offset = Vec3::new(
|
||||
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_lb.ori = Quaternion::rotation_x(0.0);
|
||||
next.foot_lb.scale = Vec3::one() / 11.0;
|
||||
next.foot_bl.ori = Quaternion::rotation_x(0.0);
|
||||
next.foot_bl.scale = Vec3::one() / 11.0;
|
||||
|
||||
next.foot_rb.offset = Vec3::new(
|
||||
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_rb.ori = Quaternion::rotation_x(0.0);
|
||||
next.foot_rb.scale = Vec3::one() / 11.0;
|
||||
next.foot_br.ori = Quaternion::rotation_x(0.0);
|
||||
next.foot_br.scale = Vec3::one() / 11.0;
|
||||
|
||||
next
|
||||
}
|
||||
|
||||
@ -16,16 +16,16 @@ pub struct QuadrupedMediumSkeleton {
|
||||
jaw: Bone,
|
||||
tail: Bone,
|
||||
torso_back: Bone,
|
||||
torso_mid: Bone,
|
||||
torso_front: Bone,
|
||||
ears: Bone,
|
||||
leg_lf: Bone,
|
||||
leg_rf: Bone,
|
||||
leg_lb: Bone,
|
||||
leg_rb: Bone,
|
||||
foot_lf: Bone,
|
||||
foot_rf: Bone,
|
||||
foot_lb: Bone,
|
||||
foot_rb: Bone,
|
||||
leg_fl: Bone,
|
||||
leg_fr: Bone,
|
||||
leg_bl: Bone,
|
||||
leg_br: Bone,
|
||||
foot_fl: Bone,
|
||||
foot_fr: Bone,
|
||||
foot_bl: Bone,
|
||||
foot_br: Bone,
|
||||
}
|
||||
|
||||
#[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)]
|
||||
@ -96,24 +96,24 @@ impl Skeleton for QuadrupedMediumSkeleton {
|
||||
let ears_mat = self.ears.compute_base_matrix();
|
||||
let head_upper_mat = self.head_upper.compute_base_matrix();
|
||||
let head_lower_mat = self.head_lower.compute_base_matrix();
|
||||
let torso_mid_mat = self.torso_mid.compute_base_matrix();
|
||||
let torso_front_mat = self.torso_front.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_mid_mat * self.tail.compute_base_matrix()),
|
||||
FigureBoneData::new(torso_front_mat * self.tail.compute_base_matrix()),
|
||||
FigureBoneData::new(self.torso_back.compute_base_matrix()),
|
||||
FigureBoneData::new(torso_mid_mat),
|
||||
FigureBoneData::new(torso_front_mat),
|
||||
FigureBoneData::new(head_upper_mat * ears_mat),
|
||||
FigureBoneData::new(self.leg_lf.compute_base_matrix()),
|
||||
FigureBoneData::new(self.leg_rf.compute_base_matrix()),
|
||||
FigureBoneData::new(self.leg_lb.compute_base_matrix()),
|
||||
FigureBoneData::new(self.leg_rb.compute_base_matrix()),
|
||||
FigureBoneData::new(self.leg_lf.compute_base_matrix() * self.foot_lf.compute_base_matrix()),
|
||||
FigureBoneData::new(self.leg_rf.compute_base_matrix() * self.foot_rf.compute_base_matrix()),
|
||||
FigureBoneData::new(self.leg_lb.compute_base_matrix() * self.foot_lb.compute_base_matrix()),
|
||||
FigureBoneData::new(self.leg_rb.compute_base_matrix() * self.foot_rb.compute_base_matrix()),
|
||||
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::default(),
|
||||
],
|
||||
Vec3::default(),
|
||||
@ -126,16 +126,16 @@ impl Skeleton for QuadrupedMediumSkeleton {
|
||||
self.jaw.interpolate(&target.jaw, dt);
|
||||
self.tail.interpolate(&target.tail, dt);
|
||||
self.torso_back.interpolate(&target.torso_back, dt);
|
||||
self.torso_mid.interpolate(&target.torso_mid, dt);
|
||||
self.torso_front.interpolate(&target.torso_front, dt);
|
||||
self.ears.interpolate(&target.ears, dt);
|
||||
self.leg_lf.interpolate(&target.leg_lf, dt);
|
||||
self.leg_rf.interpolate(&target.leg_rf, dt);
|
||||
self.leg_lb.interpolate(&target.leg_lb, dt);
|
||||
self.leg_rb.interpolate(&target.leg_rb, dt);
|
||||
self.foot_lf.interpolate(&target.foot_lf, dt);
|
||||
self.foot_rf.interpolate(&target.foot_rf, dt);
|
||||
self.foot_lb.interpolate(&target.foot_lb, dt);
|
||||
self.foot_rb.interpolate(&target.foot_rb, dt);
|
||||
self.leg_fl.interpolate(&target.leg_fl, dt);
|
||||
self.leg_fr.interpolate(&target.leg_fr, dt);
|
||||
self.leg_bl.interpolate(&target.leg_bl, dt);
|
||||
self.leg_br.interpolate(&target.leg_br, dt);
|
||||
self.foot_fl.interpolate(&target.foot_fl, dt);
|
||||
self.foot_fr.interpolate(&target.foot_fr, dt);
|
||||
self.foot_bl.interpolate(&target.foot_bl, dt);
|
||||
self.foot_br.interpolate(&target.foot_br, dt);
|
||||
}
|
||||
}
|
||||
|
||||
@ -145,7 +145,7 @@ pub struct SkeletonAttr {
|
||||
jaw: (f32, f32),
|
||||
tail: (f32, f32),
|
||||
torso_back: (f32, f32),
|
||||
torso_mid: (f32, f32),
|
||||
torso_front: (f32, f32),
|
||||
ears: (f32, f32),
|
||||
leg_f: (f32, f32, f32),
|
||||
leg_b: (f32, f32, f32),
|
||||
@ -173,7 +173,7 @@ impl Default for SkeletonAttr {
|
||||
jaw: (0.0, 0.0),
|
||||
tail: (0.0, 0.0),
|
||||
torso_back: (0.0, 0.0),
|
||||
torso_mid: (0.0, 0.0),
|
||||
torso_front: (0.0, 0.0),
|
||||
ears: (0.0, 0.0),
|
||||
leg_f: (0.0, 0.0, 0.0),
|
||||
leg_b: (0.0, 0.0, 0.0),
|
||||
@ -220,6 +220,14 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr {
|
||||
(Tarasque, _) => (-7.0, -2.0),
|
||||
(Tiger, _) => (*TAIL_X, *TAIL_Z),
|
||||
},
|
||||
torso_front: match (body.species, body.body_type) {
|
||||
(Grolgar, _) => (-7.0, 10.5),
|
||||
(Saber, _) => (-7.0, 9.5),
|
||||
(Tuskram, _) => (-7.0, 9.0),
|
||||
(Lion, _) => (-9.0, 9.0),
|
||||
(Tarasque, _) => (-7.0, 8.0),
|
||||
(Tiger, _) => (*TORSO_MID_X, *TORSO_MID_Z),
|
||||
},
|
||||
torso_back: match (body.species, body.body_type) {
|
||||
(Grolgar, _) => (4.0, 11.0),
|
||||
(Saber, _) => (4.0, 9.0),
|
||||
@ -228,14 +236,6 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr {
|
||||
(Tarasque, _) => (4.0, 9.0),
|
||||
(Tiger, _) => (*TORSO_BACK_X, *TORSO_BACK_Z),
|
||||
},
|
||||
torso_mid: match (body.species, body.body_type) {
|
||||
(Grolgar, _) => (-7.0, 10.5),
|
||||
(Saber, _) => (-7.0, 9.5),
|
||||
(Tuskram, _) => (-7.0, 9.0),
|
||||
(Lion, _) => (-9.0, 9.0),
|
||||
(Tarasque, _) => (-7.0, 8.0),
|
||||
(Tiger, _) => (*TORSO_MID_X, *TORSO_MID_Z),
|
||||
},
|
||||
ears: match (body.species, body.body_type) {
|
||||
(Grolgar, _) => (-1.0, 5.0),
|
||||
(Saber, _) => (-1.0, 6.0),
|
||||
|
||||
@ -82,49 +82,49 @@ impl Animation for RunAnimation {
|
||||
next.torso_back.ori = Quaternion::rotation_y(horichest * -0.12);
|
||||
next.torso_back.scale = Vec3::one() / 11.0;
|
||||
|
||||
next.torso_mid.offset = Vec3::new(
|
||||
next.torso_front.offset = Vec3::new(
|
||||
0.0,
|
||||
skeleton_attr.torso_mid.0 + horichest * 2.5,
|
||||
skeleton_attr.torso_mid.1 + vertchest * -3.2 + 1.0,
|
||||
skeleton_attr.torso_front.0 + horichest * 2.5,
|
||||
skeleton_attr.torso_front.1 + vertchest * -3.2 + 1.0,
|
||||
) / 11.0;
|
||||
next.torso_mid.ori = Quaternion::rotation_y(horichest * -0.09);
|
||||
next.torso_mid.scale = Vec3::one() * 0.98 / 11.0;
|
||||
next.torso_front.ori = Quaternion::rotation_y(horichest * -0.09);
|
||||
next.torso_front.scale = Vec3::one() * 0.98 / 11.0;
|
||||
|
||||
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;
|
||||
|
||||
next.foot_lf.offset = Vec3::new(
|
||||
next.foot_fl.offset = Vec3::new(
|
||||
-skeleton_attr.feet_f.0,
|
||||
skeleton_attr.feet_f.1 + horilf * 2.5,
|
||||
skeleton_attr.feet_f.2 + vertlf * 5.0 * skeleton_attr.height - 0.5,
|
||||
) / 11.0;
|
||||
next.foot_lf.ori = Quaternion::rotation_x(horilf * 0.4);
|
||||
next.foot_lf.scale = Vec3::one() / 11.0;
|
||||
next.foot_fl.ori = Quaternion::rotation_x(horilf * 0.4);
|
||||
next.foot_fl.scale = Vec3::one() / 11.0;
|
||||
|
||||
next.foot_rf.offset = Vec3::new(
|
||||
next.foot_fr.offset = Vec3::new(
|
||||
skeleton_attr.feet_f.0,
|
||||
skeleton_attr.feet_f.1 + horirfoffset * 2.5,
|
||||
skeleton_attr.feet_f.2 + vertrfoffset * 5.0 * skeleton_attr.height - 0.5,
|
||||
) / 11.0;
|
||||
next.foot_rf.ori = Quaternion::rotation_x(horirfoffset * 0.4);
|
||||
next.foot_rf.scale = Vec3::one() / 11.0;
|
||||
next.foot_fr.ori = Quaternion::rotation_x(horirfoffset * 0.4);
|
||||
next.foot_fr.scale = Vec3::one() / 11.0;
|
||||
|
||||
next.foot_lb.offset = Vec3::new(
|
||||
next.foot_bl.offset = Vec3::new(
|
||||
-skeleton_attr.feet_b.0,
|
||||
skeleton_attr.feet_b.1 + horilboffset * 3.0,
|
||||
skeleton_attr.feet_b.2 + vertlboffset * 5.0 * skeleton_attr.height - 0.5,
|
||||
) / 11.0;
|
||||
next.foot_lb.ori = Quaternion::rotation_x(horilboffset * 0.35);
|
||||
next.foot_lb.scale = Vec3::one() / 11.0;
|
||||
next.foot_bl.ori = Quaternion::rotation_x(horilboffset * 0.35);
|
||||
next.foot_bl.scale = Vec3::one() / 11.0;
|
||||
|
||||
next.foot_rb.offset = Vec3::new(
|
||||
next.foot_br.offset = Vec3::new(
|
||||
skeleton_attr.feet_b.0,
|
||||
skeleton_attr.feet_b.1 + horirb * 3.0,
|
||||
skeleton_attr.feet_b.2 + vertrb * 5.0 * skeleton_attr.height - 0.5,
|
||||
) / 11.0;
|
||||
next.foot_rb.ori = Quaternion::rotation_x(horirb * 0.35);
|
||||
next.foot_rb.scale = Vec3::one() / 11.0;
|
||||
next.foot_br.ori = Quaternion::rotation_x(horirb * 0.35);
|
||||
next.foot_br.scale = Vec3::one() / 11.0;
|
||||
|
||||
next
|
||||
}
|
||||
|
||||
@ -53,37 +53,37 @@ impl Animation for IdleAnimation {
|
||||
next.chest.ori = Quaternion::rotation_y(slow * 0.05);
|
||||
next.chest.scale = Vec3::one() / 11.0;
|
||||
|
||||
next.leg_lf.offset = Vec3::new(
|
||||
next.leg_fl.offset = Vec3::new(
|
||||
-skeleton_attr.feet_f.0,
|
||||
skeleton_attr.feet_f.1,
|
||||
skeleton_attr.feet_f.2,
|
||||
) / 11.0;
|
||||
next.leg_lf.ori = Quaternion::rotation_x(slow * 0.08);
|
||||
next.leg_lf.scale = Vec3::one() / 11.0;
|
||||
next.leg_fl.ori = Quaternion::rotation_x(slow * 0.08);
|
||||
next.leg_fl.scale = Vec3::one() / 11.0;
|
||||
|
||||
next.leg_rf.offset = Vec3::new(
|
||||
next.leg_fr.offset = Vec3::new(
|
||||
skeleton_attr.feet_f.0,
|
||||
skeleton_attr.feet_f.1,
|
||||
skeleton_attr.feet_f.2,
|
||||
) / 11.0;
|
||||
next.leg_rf.ori = Quaternion::rotation_x(slow_alt * 0.08);
|
||||
next.leg_rf.scale = Vec3::one() / 11.0;
|
||||
next.leg_fr.ori = Quaternion::rotation_x(slow_alt * 0.08);
|
||||
next.leg_fr.scale = Vec3::one() / 11.0;
|
||||
|
||||
next.leg_lb.offset = Vec3::new(
|
||||
next.leg_bl.offset = Vec3::new(
|
||||
-skeleton_attr.feet_b.0,
|
||||
skeleton_attr.feet_b.1,
|
||||
skeleton_attr.feet_b.2,
|
||||
) / 11.0;
|
||||
next.leg_lb.ori = Quaternion::rotation_x(slow_alt * 0.08);
|
||||
next.leg_lb.scale = Vec3::one() / 11.0;
|
||||
next.leg_bl.ori = Quaternion::rotation_x(slow_alt * 0.08);
|
||||
next.leg_bl.scale = Vec3::one() / 11.0;
|
||||
|
||||
next.leg_rb.offset = Vec3::new(
|
||||
next.leg_br.offset = Vec3::new(
|
||||
skeleton_attr.feet_b.0,
|
||||
skeleton_attr.feet_b.1,
|
||||
skeleton_attr.feet_b.2,
|
||||
) / 11.0;
|
||||
next.leg_rb.ori = Quaternion::rotation_x(slow * 0.08);
|
||||
next.leg_rb.scale = Vec3::one() / 11.0;
|
||||
next.leg_br.ori = Quaternion::rotation_x(slow * 0.08);
|
||||
next.leg_br.scale = Vec3::one() / 11.0;
|
||||
|
||||
next.tail.offset = Vec3::new(0.0, skeleton_attr.tail.0, skeleton_attr.tail.1);
|
||||
next.tail.ori = Quaternion::rotation_z(slow * 0.4);
|
||||
|
||||
@ -28,37 +28,37 @@ impl Animation for JumpAnimation {
|
||||
next.chest.ori = Quaternion::rotation_y(0.0);
|
||||
next.chest.scale = Vec3::one() / 11.0;
|
||||
|
||||
next.leg_lf.offset = Vec3::new(
|
||||
next.leg_fl.offset = Vec3::new(
|
||||
-skeleton_attr.feet_f.0,
|
||||
skeleton_attr.feet_f.1,
|
||||
skeleton_attr.feet_f.2,
|
||||
) / 11.0;
|
||||
next.leg_lf.ori = Quaternion::rotation_x(0.0);
|
||||
next.leg_lf.scale = Vec3::one() / 11.0;
|
||||
next.leg_fl.ori = Quaternion::rotation_x(0.0);
|
||||
next.leg_fl.scale = Vec3::one() / 11.0;
|
||||
|
||||
next.leg_rf.offset = Vec3::new(
|
||||
next.leg_fr.offset = Vec3::new(
|
||||
skeleton_attr.feet_f.0,
|
||||
skeleton_attr.feet_f.1,
|
||||
skeleton_attr.feet_f.2,
|
||||
) / 11.0;
|
||||
next.leg_rf.ori = Quaternion::rotation_x(0.0);
|
||||
next.leg_rf.scale = Vec3::one() / 11.0;
|
||||
next.leg_fr.ori = Quaternion::rotation_x(0.0);
|
||||
next.leg_fr.scale = Vec3::one() / 11.0;
|
||||
|
||||
next.leg_lb.offset = Vec3::new(
|
||||
next.leg_bl.offset = Vec3::new(
|
||||
-skeleton_attr.feet_b.0,
|
||||
skeleton_attr.feet_b.1,
|
||||
skeleton_attr.feet_b.2,
|
||||
) / 11.0;
|
||||
next.leg_lb.ori = Quaternion::rotation_x(0.0);
|
||||
next.leg_lb.scale = Vec3::one() / 11.0;
|
||||
next.leg_bl.ori = Quaternion::rotation_x(0.0);
|
||||
next.leg_bl.scale = Vec3::one() / 11.0;
|
||||
|
||||
next.leg_rb.offset = Vec3::new(
|
||||
next.leg_br.offset = Vec3::new(
|
||||
skeleton_attr.feet_b.0,
|
||||
skeleton_attr.feet_b.1,
|
||||
skeleton_attr.feet_b.2,
|
||||
) / 11.0;
|
||||
next.leg_rb.ori = Quaternion::rotation_x(0.0);
|
||||
next.leg_rb.scale = Vec3::one() / 11.0;
|
||||
next.leg_br.ori = Quaternion::rotation_x(0.0);
|
||||
next.leg_br.scale = Vec3::one() / 11.0;
|
||||
|
||||
next.tail.offset = Vec3::new(0.0, skeleton_attr.tail.0, skeleton_attr.tail.1);
|
||||
next.tail.ori = Quaternion::rotation_x(-0.3);
|
||||
|
||||
@ -13,10 +13,10 @@ use vek::Vec3;
|
||||
pub struct QuadrupedSmallSkeleton {
|
||||
head: Bone,
|
||||
chest: Bone,
|
||||
leg_lf: Bone,
|
||||
leg_rf: Bone,
|
||||
leg_lb: Bone,
|
||||
leg_rb: Bone,
|
||||
leg_fl: Bone,
|
||||
leg_fr: Bone,
|
||||
leg_bl: Bone,
|
||||
leg_br: Bone,
|
||||
tail: Bone,
|
||||
}
|
||||
|
||||
@ -39,10 +39,10 @@ impl Skeleton for QuadrupedSmallSkeleton {
|
||||
[
|
||||
FigureBoneData::new(self.head.compute_base_matrix()),
|
||||
FigureBoneData::new(chest_mat),
|
||||
FigureBoneData::new(self.leg_lf.compute_base_matrix()),
|
||||
FigureBoneData::new(self.leg_rf.compute_base_matrix()),
|
||||
FigureBoneData::new(self.leg_lb.compute_base_matrix()),
|
||||
FigureBoneData::new(self.leg_rb.compute_base_matrix()),
|
||||
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(chest_mat * self.tail.compute_base_matrix()),
|
||||
FigureBoneData::default(),
|
||||
FigureBoneData::default(),
|
||||
@ -61,10 +61,10 @@ impl Skeleton for QuadrupedSmallSkeleton {
|
||||
fn interpolate(&mut self, target: &Self, dt: f32) {
|
||||
self.head.interpolate(&target.head, dt);
|
||||
self.chest.interpolate(&target.chest, dt);
|
||||
self.leg_lf.interpolate(&target.leg_lf, dt);
|
||||
self.leg_rf.interpolate(&target.leg_rf, dt);
|
||||
self.leg_lb.interpolate(&target.leg_lb, dt);
|
||||
self.leg_rb.interpolate(&target.leg_rb, dt);
|
||||
self.leg_fl.interpolate(&target.leg_fl, dt);
|
||||
self.leg_fr.interpolate(&target.leg_fr, dt);
|
||||
self.leg_bl.interpolate(&target.leg_bl, dt);
|
||||
self.leg_br.interpolate(&target.leg_br, dt);
|
||||
self.tail.interpolate(&target.tail, dt);
|
||||
}
|
||||
}
|
||||
|
||||
@ -40,37 +40,37 @@ impl Animation for RunAnimation {
|
||||
next.chest.ori = Quaternion::rotation_x(slow * 0.1);
|
||||
next.chest.scale = Vec3::one() / 11.0;
|
||||
|
||||
next.leg_lf.offset = Vec3::new(
|
||||
next.leg_fl.offset = Vec3::new(
|
||||
-skeleton_attr.feet_f.0,
|
||||
skeleton_attr.feet_f.1 + fast * 0.8,
|
||||
skeleton_attr.feet_f.2 + fast_alt * 1.5,
|
||||
) / 11.0;
|
||||
next.leg_lf.ori = Quaternion::rotation_x(fast * 0.3);
|
||||
next.leg_lf.scale = Vec3::one() / 11.0;
|
||||
next.leg_fl.ori = Quaternion::rotation_x(fast * 0.3);
|
||||
next.leg_fl.scale = Vec3::one() / 11.0;
|
||||
|
||||
next.leg_rf.offset = Vec3::new(
|
||||
next.leg_fr.offset = Vec3::new(
|
||||
skeleton_attr.feet_f.0,
|
||||
skeleton_attr.feet_f.1 + fast_alt * -0.8,
|
||||
skeleton_attr.feet_f.2 + fast * 1.5,
|
||||
) / 11.0;
|
||||
next.leg_rf.ori = Quaternion::rotation_x(fast_alt * -0.3);
|
||||
next.leg_rf.scale = Vec3::one() / 11.0;
|
||||
next.leg_fr.ori = Quaternion::rotation_x(fast_alt * -0.3);
|
||||
next.leg_fr.scale = Vec3::one() / 11.0;
|
||||
|
||||
next.leg_lb.offset = Vec3::new(
|
||||
next.leg_bl.offset = Vec3::new(
|
||||
-skeleton_attr.feet_b.0,
|
||||
skeleton_attr.feet_b.1 + fast_alt * -0.8,
|
||||
skeleton_attr.feet_b.2 + fast * 1.5,
|
||||
) / 11.0;
|
||||
next.leg_lb.ori = Quaternion::rotation_x(fast_alt * -0.3);
|
||||
next.leg_lb.scale = Vec3::one() / 11.0;
|
||||
next.leg_bl.ori = Quaternion::rotation_x(fast_alt * -0.3);
|
||||
next.leg_bl.scale = Vec3::one() / 11.0;
|
||||
|
||||
next.leg_rb.offset = Vec3::new(
|
||||
next.leg_br.offset = Vec3::new(
|
||||
skeleton_attr.feet_b.0,
|
||||
skeleton_attr.feet_b.1 + fast * 0.8,
|
||||
skeleton_attr.feet_b.2 + fast_alt * 1.5,
|
||||
) / 11.0;
|
||||
next.leg_rb.ori = Quaternion::rotation_x(fast * 0.3);
|
||||
next.leg_rb.scale = Vec3::one() / 11.0;
|
||||
next.leg_br.ori = Quaternion::rotation_x(fast * 0.3);
|
||||
next.leg_br.scale = Vec3::one() / 11.0;
|
||||
|
||||
next.tail.offset = Vec3::new(0.0, skeleton_attr.tail.0, skeleton_attr.tail.1);
|
||||
next.tail.ori = Quaternion::rotation_z(0.0);
|
||||
|
||||
@ -217,22 +217,22 @@ impl<Skel: Skeleton> FigureModelCache<Skel> {
|
||||
body.body_type,
|
||||
generate_mesh,
|
||||
)),
|
||||
Some(quadruped_small_lateral_spec.mesh_foot_lf(
|
||||
Some(quadruped_small_lateral_spec.mesh_foot_fl(
|
||||
body.species,
|
||||
body.body_type,
|
||||
generate_mesh,
|
||||
)),
|
||||
Some(quadruped_small_lateral_spec.mesh_foot_rf(
|
||||
Some(quadruped_small_lateral_spec.mesh_foot_fr(
|
||||
body.species,
|
||||
body.body_type,
|
||||
generate_mesh,
|
||||
)),
|
||||
Some(quadruped_small_lateral_spec.mesh_foot_lb(
|
||||
Some(quadruped_small_lateral_spec.mesh_foot_bl(
|
||||
body.species,
|
||||
body.body_type,
|
||||
generate_mesh,
|
||||
)),
|
||||
Some(quadruped_small_lateral_spec.mesh_foot_rb(
|
||||
Some(quadruped_small_lateral_spec.mesh_foot_br(
|
||||
body.species,
|
||||
body.body_type,
|
||||
generate_mesh,
|
||||
@ -280,12 +280,12 @@ impl<Skel: Skeleton> FigureModelCache<Skel> {
|
||||
body.body_type,
|
||||
generate_mesh,
|
||||
)),
|
||||
Some(quadruped_medium_central_spec.mesh_torso_f(
|
||||
Some(quadruped_medium_central_spec.mesh_torso_front(
|
||||
body.species,
|
||||
body.body_type,
|
||||
generate_mesh,
|
||||
)),
|
||||
Some(quadruped_medium_central_spec.mesh_torso_b(
|
||||
Some(quadruped_medium_central_spec.mesh_torso_back(
|
||||
body.species,
|
||||
body.body_type,
|
||||
generate_mesh,
|
||||
@ -295,42 +295,42 @@ impl<Skel: Skeleton> FigureModelCache<Skel> {
|
||||
body.body_type,
|
||||
generate_mesh,
|
||||
)),
|
||||
Some(quadruped_medium_lateral_spec.mesh_leg_lf(
|
||||
Some(quadruped_medium_lateral_spec.mesh_leg_fl(
|
||||
body.species,
|
||||
body.body_type,
|
||||
generate_mesh,
|
||||
)),
|
||||
Some(quadruped_medium_lateral_spec.mesh_leg_rf(
|
||||
Some(quadruped_medium_lateral_spec.mesh_leg_fr(
|
||||
body.species,
|
||||
body.body_type,
|
||||
generate_mesh,
|
||||
)),
|
||||
Some(quadruped_medium_lateral_spec.mesh_leg_lb(
|
||||
Some(quadruped_medium_lateral_spec.mesh_leg_bl(
|
||||
body.species,
|
||||
body.body_type,
|
||||
generate_mesh,
|
||||
)),
|
||||
Some(quadruped_medium_lateral_spec.mesh_leg_rb(
|
||||
Some(quadruped_medium_lateral_spec.mesh_leg_br(
|
||||
body.species,
|
||||
body.body_type,
|
||||
generate_mesh,
|
||||
)),
|
||||
Some(quadruped_medium_lateral_spec.mesh_foot_lf(
|
||||
Some(quadruped_medium_lateral_spec.mesh_foot_fl(
|
||||
body.species,
|
||||
body.body_type,
|
||||
generate_mesh,
|
||||
)),
|
||||
Some(quadruped_medium_lateral_spec.mesh_foot_rf(
|
||||
Some(quadruped_medium_lateral_spec.mesh_foot_fr(
|
||||
body.species,
|
||||
body.body_type,
|
||||
generate_mesh,
|
||||
)),
|
||||
Some(quadruped_medium_lateral_spec.mesh_foot_lb(
|
||||
Some(quadruped_medium_lateral_spec.mesh_foot_bl(
|
||||
body.species,
|
||||
body.body_type,
|
||||
generate_mesh,
|
||||
)),
|
||||
Some(quadruped_medium_lateral_spec.mesh_foot_rb(
|
||||
Some(quadruped_medium_lateral_spec.mesh_foot_br(
|
||||
body.species,
|
||||
body.body_type,
|
||||
generate_mesh,
|
||||
|
||||
@ -1122,7 +1122,7 @@ impl QuadrupedSmallLateralSpec {
|
||||
.unwrap()
|
||||
}
|
||||
|
||||
pub fn mesh_foot_lf(
|
||||
pub fn mesh_foot_fl(
|
||||
&self,
|
||||
species: QSSpecies,
|
||||
body_type: QSBodyType,
|
||||
@ -1143,7 +1143,7 @@ impl QuadrupedSmallLateralSpec {
|
||||
generate_mesh(&lateral, Vec3::from(spec.left_front.offset))
|
||||
}
|
||||
|
||||
pub fn mesh_foot_rf(
|
||||
pub fn mesh_foot_fr(
|
||||
&self,
|
||||
species: QSSpecies,
|
||||
body_type: QSBodyType,
|
||||
@ -1164,7 +1164,7 @@ impl QuadrupedSmallLateralSpec {
|
||||
generate_mesh(&lateral, Vec3::from(spec.right_front.offset))
|
||||
}
|
||||
|
||||
pub fn mesh_foot_lb(
|
||||
pub fn mesh_foot_bl(
|
||||
&self,
|
||||
species: QSSpecies,
|
||||
body_type: QSBodyType,
|
||||
@ -1185,7 +1185,7 @@ impl QuadrupedSmallLateralSpec {
|
||||
generate_mesh(&lateral, Vec3::from(spec.left_back.offset))
|
||||
}
|
||||
|
||||
pub fn mesh_foot_rb(
|
||||
pub fn mesh_foot_br(
|
||||
&self,
|
||||
species: QSSpecies,
|
||||
body_type: QSBodyType,
|
||||
@ -1217,8 +1217,8 @@ struct SidedQMCentralVoxSpec {
|
||||
lower: QuadrupedMediumCentralSubSpec,
|
||||
jaw: QuadrupedMediumCentralSubSpec,
|
||||
ears: QuadrupedMediumCentralSubSpec,
|
||||
torso_f: QuadrupedMediumCentralSubSpec,
|
||||
torso_b: QuadrupedMediumCentralSubSpec,
|
||||
torso_front: QuadrupedMediumCentralSubSpec,
|
||||
torso_back: QuadrupedMediumCentralSubSpec,
|
||||
tail: QuadrupedMediumCentralSubSpec,
|
||||
}
|
||||
#[derive(Serialize, Deserialize)]
|
||||
@ -1231,14 +1231,14 @@ struct QuadrupedMediumCentralSubSpec {
|
||||
pub struct QuadrupedMediumLateralSpec(HashMap<(QMSpecies, QMBodyType), SidedQMLateralVoxSpec>);
|
||||
#[derive(Serialize, Deserialize)]
|
||||
struct SidedQMLateralVoxSpec {
|
||||
leg_lf: QuadrupedMediumLateralSubSpec,
|
||||
leg_rf: QuadrupedMediumLateralSubSpec,
|
||||
leg_lb: QuadrupedMediumLateralSubSpec,
|
||||
leg_rb: QuadrupedMediumLateralSubSpec,
|
||||
foot_lf: QuadrupedMediumLateralSubSpec,
|
||||
foot_rf: QuadrupedMediumLateralSubSpec,
|
||||
foot_lb: QuadrupedMediumLateralSubSpec,
|
||||
foot_rb: QuadrupedMediumLateralSubSpec,
|
||||
leg_fl: QuadrupedMediumLateralSubSpec,
|
||||
leg_fr: QuadrupedMediumLateralSubSpec,
|
||||
leg_bl: QuadrupedMediumLateralSubSpec,
|
||||
leg_br: QuadrupedMediumLateralSubSpec,
|
||||
foot_fl: QuadrupedMediumLateralSubSpec,
|
||||
foot_fr: QuadrupedMediumLateralSubSpec,
|
||||
foot_bl: QuadrupedMediumLateralSubSpec,
|
||||
foot_br: QuadrupedMediumLateralSubSpec,
|
||||
}
|
||||
#[derive(Serialize, Deserialize)]
|
||||
struct QuadrupedMediumLateralSubSpec {
|
||||
@ -1352,7 +1352,7 @@ impl QuadrupedMediumCentralSpec {
|
||||
generate_mesh(¢ral, Vec3::from(spec.ears.offset))
|
||||
}
|
||||
|
||||
pub fn mesh_torso_f(
|
||||
pub fn mesh_torso_front(
|
||||
&self,
|
||||
species: QMSpecies,
|
||||
body_type: QMBodyType,
|
||||
@ -1368,12 +1368,12 @@ impl QuadrupedMediumCentralSpec {
|
||||
return load_mesh("not_found", Vec3::new(-5.0, -5.0, -2.5), generate_mesh);
|
||||
},
|
||||
};
|
||||
let central = graceful_load_segment(&spec.torso_f.central.0);
|
||||
let central = graceful_load_segment(&spec.torso_front.central.0);
|
||||
|
||||
generate_mesh(¢ral, Vec3::from(spec.torso_f.offset))
|
||||
generate_mesh(¢ral, Vec3::from(spec.torso_front.offset))
|
||||
}
|
||||
|
||||
pub fn mesh_torso_b(
|
||||
pub fn mesh_torso_back(
|
||||
&self,
|
||||
species: QMSpecies,
|
||||
body_type: QMBodyType,
|
||||
@ -1389,9 +1389,9 @@ impl QuadrupedMediumCentralSpec {
|
||||
return load_mesh("not_found", Vec3::new(-5.0, -5.0, -2.5), generate_mesh);
|
||||
},
|
||||
};
|
||||
let central = graceful_load_segment(&spec.torso_b.central.0);
|
||||
let central = graceful_load_segment(&spec.torso_back.central.0);
|
||||
|
||||
generate_mesh(¢ral, Vec3::from(spec.torso_b.offset))
|
||||
generate_mesh(¢ral, Vec3::from(spec.torso_back.offset))
|
||||
}
|
||||
|
||||
pub fn mesh_tail(
|
||||
@ -1422,7 +1422,7 @@ impl QuadrupedMediumLateralSpec {
|
||||
.unwrap()
|
||||
}
|
||||
|
||||
pub fn mesh_leg_lf(
|
||||
pub fn mesh_leg_fl(
|
||||
&self,
|
||||
species: QMSpecies,
|
||||
body_type: QMBodyType,
|
||||
@ -1438,12 +1438,12 @@ impl QuadrupedMediumLateralSpec {
|
||||
return load_mesh("not_found", Vec3::new(-5.0, -5.0, -2.5), generate_mesh);
|
||||
},
|
||||
};
|
||||
let lateral = graceful_load_segment(&spec.leg_lf.lateral.0);
|
||||
let lateral = graceful_load_segment(&spec.leg_fl.lateral.0);
|
||||
|
||||
generate_mesh(&lateral, Vec3::from(spec.leg_lf.offset))
|
||||
generate_mesh(&lateral, Vec3::from(spec.leg_fl.offset))
|
||||
}
|
||||
|
||||
pub fn mesh_leg_rf(
|
||||
pub fn mesh_leg_fr(
|
||||
&self,
|
||||
species: QMSpecies,
|
||||
body_type: QMBodyType,
|
||||
@ -1459,12 +1459,12 @@ impl QuadrupedMediumLateralSpec {
|
||||
return load_mesh("not_found", Vec3::new(-5.0, -5.0, -2.5), generate_mesh);
|
||||
},
|
||||
};
|
||||
let lateral = graceful_load_segment(&spec.leg_rf.lateral.0);
|
||||
let lateral = graceful_load_segment(&spec.leg_fr.lateral.0);
|
||||
|
||||
generate_mesh(&lateral, Vec3::from(spec.leg_rf.offset))
|
||||
generate_mesh(&lateral, Vec3::from(spec.leg_fr.offset))
|
||||
}
|
||||
|
||||
pub fn mesh_leg_lb(
|
||||
pub fn mesh_leg_bl(
|
||||
&self,
|
||||
species: QMSpecies,
|
||||
body_type: QMBodyType,
|
||||
@ -1480,12 +1480,12 @@ impl QuadrupedMediumLateralSpec {
|
||||
return load_mesh("not_found", Vec3::new(-5.0, -5.0, -2.5), generate_mesh);
|
||||
},
|
||||
};
|
||||
let lateral = graceful_load_segment(&spec.leg_lb.lateral.0);
|
||||
let lateral = graceful_load_segment(&spec.leg_bl.lateral.0);
|
||||
|
||||
generate_mesh(&lateral, Vec3::from(spec.leg_lb.offset))
|
||||
generate_mesh(&lateral, Vec3::from(spec.leg_bl.offset))
|
||||
}
|
||||
|
||||
pub fn mesh_leg_rb(
|
||||
pub fn mesh_leg_br(
|
||||
&self,
|
||||
species: QMSpecies,
|
||||
body_type: QMBodyType,
|
||||
@ -1501,12 +1501,12 @@ impl QuadrupedMediumLateralSpec {
|
||||
return load_mesh("not_found", Vec3::new(-5.0, -5.0, -2.5), generate_mesh);
|
||||
},
|
||||
};
|
||||
let lateral = graceful_load_segment(&spec.leg_rb.lateral.0);
|
||||
let lateral = graceful_load_segment(&spec.leg_br.lateral.0);
|
||||
|
||||
generate_mesh(&lateral, Vec3::from(spec.leg_rb.offset))
|
||||
generate_mesh(&lateral, Vec3::from(spec.leg_br.offset))
|
||||
}
|
||||
|
||||
pub fn mesh_foot_lf(
|
||||
pub fn mesh_foot_fl(
|
||||
&self,
|
||||
species: QMSpecies,
|
||||
body_type: QMBodyType,
|
||||
@ -1522,12 +1522,12 @@ impl QuadrupedMediumLateralSpec {
|
||||
return load_mesh("not_found", Vec3::new(-5.0, -5.0, -2.5), generate_mesh);
|
||||
},
|
||||
};
|
||||
let lateral = graceful_load_segment(&spec.foot_lf.lateral.0);
|
||||
let lateral = graceful_load_segment(&spec.foot_fl.lateral.0);
|
||||
|
||||
generate_mesh(&lateral, Vec3::from(spec.foot_lf.offset))
|
||||
generate_mesh(&lateral, Vec3::from(spec.foot_fl.offset))
|
||||
}
|
||||
|
||||
pub fn mesh_foot_rf(
|
||||
pub fn mesh_foot_fr(
|
||||
&self,
|
||||
species: QMSpecies,
|
||||
body_type: QMBodyType,
|
||||
@ -1543,12 +1543,12 @@ impl QuadrupedMediumLateralSpec {
|
||||
return load_mesh("not_found", Vec3::new(-5.0, -5.0, -2.5), generate_mesh);
|
||||
},
|
||||
};
|
||||
let lateral = graceful_load_segment(&spec.foot_rf.lateral.0);
|
||||
let lateral = graceful_load_segment(&spec.foot_fr.lateral.0);
|
||||
|
||||
generate_mesh(&lateral, Vec3::from(spec.foot_rf.offset))
|
||||
generate_mesh(&lateral, Vec3::from(spec.foot_fr.offset))
|
||||
}
|
||||
|
||||
pub fn mesh_foot_lb(
|
||||
pub fn mesh_foot_bl(
|
||||
&self,
|
||||
species: QMSpecies,
|
||||
body_type: QMBodyType,
|
||||
@ -1564,12 +1564,12 @@ impl QuadrupedMediumLateralSpec {
|
||||
return load_mesh("not_found", Vec3::new(-5.0, -5.0, -2.5), generate_mesh);
|
||||
},
|
||||
};
|
||||
let lateral = graceful_load_segment(&spec.foot_lb.lateral.0);
|
||||
let lateral = graceful_load_segment(&spec.foot_bl.lateral.0);
|
||||
|
||||
generate_mesh(&lateral, Vec3::from(spec.foot_lb.offset))
|
||||
generate_mesh(&lateral, Vec3::from(spec.foot_bl.offset))
|
||||
}
|
||||
|
||||
pub fn mesh_foot_rb(
|
||||
pub fn mesh_foot_br(
|
||||
&self,
|
||||
species: QMSpecies,
|
||||
body_type: QMBodyType,
|
||||
@ -1585,9 +1585,9 @@ impl QuadrupedMediumLateralSpec {
|
||||
return load_mesh("not_found", Vec3::new(-5.0, -5.0, -2.5), generate_mesh);
|
||||
},
|
||||
};
|
||||
let lateral = graceful_load_segment(&spec.foot_rb.lateral.0);
|
||||
let lateral = graceful_load_segment(&spec.foot_br.lateral.0);
|
||||
|
||||
generate_mesh(&lateral, Vec3::from(spec.foot_rb.offset))
|
||||
generate_mesh(&lateral, Vec3::from(spec.foot_br.offset))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user