From 43eac6f89885d12514f87fde68319c0c41537168 Mon Sep 17 00:00:00 2001 From: jshipsey Date: Fri, 3 Jul 2020 05:00:35 -0400 Subject: [PATCH] better everything --- .../voxel/npc/grolgar/female/head_lower.vox | Bin 3048 -> 3480 bytes .../voxel/npc/grolgar/female/head_upper.vox | Bin 4728 -> 5936 bytes .../voxygen/voxel/npc/grolgar/female/jaw.vox | Bin 1248 -> 1336 bytes .../voxel/npc/grolgar/female/torso_front.vox | Bin 8560 -> 7728 bytes .../voxel/npc/grolgar/male/head_lower.vox | Bin 3048 -> 3480 bytes .../voxel/npc/grolgar/male/head_upper.vox | Bin 4728 -> 5936 bytes assets/voxygen/voxel/npc/grolgar/male/jaw.vox | Bin 1248 -> 1336 bytes .../voxel/npc/grolgar/male/torso_front.vox | Bin 8560 -> 7728 bytes .../voxel/quadruped_low_central_manifest.ron | 28 +- .../quadruped_medium_central_manifest.ron | 8 +- .../quadruped_medium_lateral_manifest.ron | 40 +-- voxygen/src/anim/src/quadruped_low/idle.rs | 18 +- voxygen/src/anim/src/quadruped_low/jump.rs | 82 ++--- voxygen/src/anim/src/quadruped_low/mod.rs | 40 ++- voxygen/src/anim/src/quadruped_low/run.rs | 70 ++-- .../src/anim/src/quadruped_medium/alpha.rs | 31 +- voxygen/src/anim/src/quadruped_medium/idle.rs | 20 +- voxygen/src/anim/src/quadruped_medium/jump.rs | 101 ++++-- voxygen/src/anim/src/quadruped_medium/mod.rs | 80 +++-- voxygen/src/anim/src/quadruped_medium/run.rs | 333 +++++++++--------- voxygen/src/scene/figure/mod.rs | 2 +- 21 files changed, 423 insertions(+), 430 deletions(-) diff --git a/assets/voxygen/voxel/npc/grolgar/female/head_lower.vox b/assets/voxygen/voxel/npc/grolgar/female/head_lower.vox index 5621e57ce141949a063d7db94d58c8fa766b4534..983084c14e3351c025de8368688df355c23bdfd7 100644 GIT binary patch literal 3480 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 diff --git a/assets/voxygen/voxel/npc/grolgar/female/head_upper.vox b/assets/voxygen/voxel/npc/grolgar/female/head_upper.vox index a9ba5344bea99aa6263c8eee4a1c525f06294078..257215a5b4534e3afe82d6eae2e761b720e36cb9 100644 GIT binary patch literal 5936 zcmb{0U928O8Nl(`oq6VYW@h(22dIT2mZpHV#fW?e^qdCES7<39v=y}?5dumjL@lJj zrfRgthy+E%f(FEDh#v?dX$iswHii%rLkt>YVhAC|c;kf^#(4Mm-`6WO;EgBwW#@Zm zXP=#Sa;|;P`_~){AzXRk)~mRLla3Ez$JSk!4pWA|85VFX-v5DJTmLd8_eYuvx_P8;vE@lG4> zwDC^c@_bH5?HNNMof`Q@9)+|Gb-N91 zyNqqSL3oA?ov+>EMm4@~2#PLlH04{5$1Ka#hrU8g2{9$aln_%wOj+x%upuJtG{z~Y zXo$jh3qgj$P$sN-AjnV{3Mx{e4jBqVL8_D^*Wnq3 zkuI?LK0U)yOFpXiMx@w z8<$6fL_hS1NDyQw3W<(P#rfhQd%#ZCpx)I%FseWxDd4B$aX~Y%>3?8kcgT4A#aa8ORUh zVWedwKaP79Hl=6d?TX0rWnxLDctS+w%u-;SVH9zSGvdk8F-wXJL8ZLFpvXv!C)1cv z7z!#HdMT_uXA%f96o!I|Hnqw8erDPrLt!YW)QM6Kg`u+ck#kmp4hzc}+7^hf8SynE zzGlSNjQE-nUo+-9W6m??KI0i?#Mg}Ynh{?!;)_0sK8Q#VWGD;;6%7M=p)C>w845!| zMUxrpJKLBtZIGcb6jbV>Qm@n_Lt!YWQ=QHD?V0f#L>-KDK`OH)K`xZTNSCRsQdTL0 zk(S1|P#9z&4~0$Xadw9y&$vQZPn*^hdBU1%U0}?GB`pgZGt{`E=)xtY3%9GX{t(iM zvXU1zTBaW|1c|aL3rj^7SR?9?AxMbS)wIAmQx8RkAfb=6L4qJdVJN6*h_oGg&SO0> z#kEI=#yNZ7Og?ayZm38-znSRK&6VZ8CmuOZS4hu!rswR6hy+1~!cb7rFibd4ThI4_ z3_(JiU-|uK%-FNO=t(!un{|HX&pG7%Ga_-DM=Sw6+Wacc0%sHWF z%!IDzT!n}PL59LmP|+|z=sR*=ROVBeXXYx?nlY9!4@HJ?Po3YNJ-&~mBju5{k$#Je zr>r|?k7*6(V{xY8YG{mCq0|{d&p84;A`%1{3PV9f!+>$ZIi%3PqA=GozweZu<}{7Z z?+qIBttj&=>&Lt+b2HkP`IXQG? zkXIP;ypD5O;F~}}onQG*0^dvE`$0nv^n;-gUW{cGU6gF#WLYlyJGw~va30hu-f z_h{3-=--e6`v)=XD9?n>_C+B0-R$ zFcefYMAoe1x%&CD@f*gq>&PP_L6D&^6jU?}=oqJCFX*~LTuv(cQd=JRzDB-*Kst~P zq_Nwqk`JJ$j{2e~)iH;#X~Zr{D0Q zW#7Mdn;*Grs~@@V20!w^C;Yr4ANR%0D}B|6*Z7*xobKx%+34X?@o;PPaOhYMFRb*% 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 SKi(YY$CHASb7vE z3y+=o{C$mn!_#I}XLmDOl+{wpKEZ5VHS=*_G^#cbmwMY&5AA*?0wPl2XekzygR;1? zC1@cO?{ljE0x(jHyk4@IZuq2l&|AU-5_NH9ri>7G6ee&h=-m`K{CzHOdp~wx?)V3h C86JHA diff --git a/assets/voxygen/voxel/npc/grolgar/female/torso_front.vox b/assets/voxygen/voxel/npc/grolgar/female/torso_front.vox index 853e818cef3d53adfb96c240c5ac9eb6cfab62a8..3c5ba4e941f19053e74130505723dd8ad4ac6d67 100644 GIT binary patch delta 3765 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 diff --git a/assets/voxygen/voxel/npc/grolgar/male/head_lower.vox b/assets/voxygen/voxel/npc/grolgar/male/head_lower.vox index 5621e57ce141949a063d7db94d58c8fa766b4534..983084c14e3351c025de8368688df355c23bdfd7 100644 GIT binary patch literal 3480 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 diff --git a/assets/voxygen/voxel/npc/grolgar/male/head_upper.vox b/assets/voxygen/voxel/npc/grolgar/male/head_upper.vox index a9ba5344bea99aa6263c8eee4a1c525f06294078..257215a5b4534e3afe82d6eae2e761b720e36cb9 100644 GIT binary patch literal 5936 zcmb{0U928O8Nl(`oq6VYW@h(22dIT2mZpHV#fW?e^qdCES7<39v=y}?5dumjL@lJj zrfRgthy+E%f(FEDh#v?dX$iswHii%rLkt>YVhAC|c;kf^#(4Mm-`6WO;EgBwW#@Zm zXP=#Sa;|;P`_~){AzXRk)~mRLla3Ez$JSk!4pWA|85VFX-v5DJTmLd8_eYuvx_P8;vE@lG4> zwDC^c@_bH5?HNNMof`Q@9)+|Gb-N91 zyNqqSL3oA?ov+>EMm4@~2#PLlH04{5$1Ka#hrU8g2{9$aln_%wOj+x%upuJtG{z~Y zXo$jh3qgj$P$sN-AjnV{3Mx{e4jBqVL8_D^*Wnq3 zkuI?LK0U)yOFpXiMx@w z8<$6fL_hS1NDyQw3W<(P#rfhQd%#ZCpx)I%FseWxDd4B$aX~Y%>3?8kcgT4A#aa8ORUh zVWedwKaP79Hl=6d?TX0rWnxLDctS+w%u-;SVH9zSGvdk8F-wXJL8ZLFpvXv!C)1cv z7z!#HdMT_uXA%f96o!I|Hnqw8erDPrLt!YW)QM6Kg`u+ck#kmp4hzc}+7^hf8SynE zzGlSNjQE-nUo+-9W6m??KI0i?#Mg}Ynh{?!;)_0sK8Q#VWGD;;6%7M=p)C>w845!| zMUxrpJKLBtZIGcb6jbV>Qm@n_Lt!YWQ=QHD?V0f#L>-KDK`OH)K`xZTNSCRsQdTL0 zk(S1|P#9z&4~0$Xadw9y&$vQZPn*^hdBU1%U0}?GB`pgZGt{`E=)xtY3%9GX{t(iM zvXU1zTBaW|1c|aL3rj^7SR?9?AxMbS)wIAmQx8RkAfb=6L4qJdVJN6*h_oGg&SO0> z#kEI=#yNZ7Og?ayZm38-znSRK&6VZ8CmuOZS4hu!rswR6hy+1~!cb7rFibd4ThI4_ z3_(JiU-|uK%-FNO=t(!un{|HX&pG7%Ga_-DM=Sw6+Wacc0%sHWF z%!IDzT!n}PL59LmP|+|z=sR*=ROVBeXXYx?nlY9!4@HJ?Po3YNJ-&~mBju5{k$#Je zr>r|?k7*6(V{xY8YG{mCq0|{d&p84;A`%1{3PV9f!+>$ZIi%3PqA=GozweZu<}{7Z z?+qIBttj&=>&Lt+b2HkP`IXQG? zkXIP;ypD5O;F~}}onQG*0^dvE`$0nv^n;-gUW{cGU6gF#WLYlyJGw~va30hu-f z_h{3-=--e6`v)=XD9?n>_C+B0-R$ zFcefYMAoe1x%&CD@f*gq>&PP_L6D&^6jU?}=oqJCFX*~LTuv(cQd=JRzDB-*Kst~P zq_Nwqk`JJ$j{2e~)iH;#X~Zr{D0Q zW#7Mdn;*Grs~@@V20!w^C;Yr4ANR%0D}B|6*Z7*xobKx%+34X?@o;PPaOhYMFRb*% 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 SKi(YY$CHASb7vE z3y+=o{C$mn!_#I}XLmDOl+{wpKEZ5VHS=*_G^#cbmwMY&5AA*?0wPl2XekzygR;1? zC1@cO?{ljE0x(jHyk4@IZuq2l&|AU-5_NH9ri>7G6ee&h=-m`K{CzHOdp~wx?)V3h C86JHA diff --git a/assets/voxygen/voxel/npc/grolgar/male/torso_front.vox b/assets/voxygen/voxel/npc/grolgar/male/torso_front.vox index 853e818cef3d53adfb96c240c5ac9eb6cfab62a8..3c5ba4e941f19053e74130505723dd8ad4ac6d67 100644 GIT binary patch delta 3765 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 diff --git a/assets/voxygen/voxel/quadruped_low_central_manifest.ron b/assets/voxygen/voxel/quadruped_low_central_manifest.ron index ca025afedb..76eb8cd58d 100644 --- a/assets/voxygen/voxel/quadruped_low_central_manifest.ron +++ b/assets/voxygen/voxel/quadruped_low_central_manifest.ron @@ -9,7 +9,7 @@ central: ("npc.crocodile.male.head_lower"), ), jaw: ( - offset: (-4.0, -7.0, -1.5), + offset: (-4.0, 0.0, -1.5), central: ("npc.crocodile.male.jaw"), ), chest: ( @@ -35,7 +35,7 @@ central: ("npc.crocodile.female.head_lower"), ), jaw: ( - offset: (-4.0, -7.0, -1.5), + offset: (-4.0, 0.0, -1.5), central: ("npc.crocodile.female.jaw"), ), chest: ( @@ -61,7 +61,7 @@ central: ("npc.alligator.male.head_lower"), ), jaw: ( - offset: (-4.0, -7.5, -2.5), + offset: (-4.0, 0.0, -2.5), central: ("npc.alligator.male.jaw"), ), chest: ( @@ -87,7 +87,7 @@ central: ("npc.alligator.female.head_lower"), ), jaw: ( - offset: (-4.0, -7.5, -2.5), + offset: (-4.0, 0.0, -2.5), central: ("npc.alligator.female.jaw"), ), chest: ( @@ -113,7 +113,7 @@ central: ("npc.salamander.male.head_lower"), ), jaw: ( - offset: (-6.5, -6.0, -3.0), + offset: (-6.5, 0.0, -3.0), central: ("npc.salamander.male.jaw"), ), chest: ( @@ -139,7 +139,7 @@ central: ("npc.salamander.female.head_lower"), ), jaw: ( - offset: (-6.5, -6.0, -3.0), + offset: (-6.5, 0.0, -3.0), central: ("npc.salamander.female.jaw"), ), chest: ( @@ -165,7 +165,7 @@ central: ("npc.monitor.male.head_lower"), ), jaw: ( - offset: (-3.0, -3.5, -1.0), + offset: (-3.0, 0.0, -1.0), central: ("npc.monitor.male.jaw"), ), chest: ( @@ -192,7 +192,7 @@ central: ("npc.monitor.female.head_lower"), ), jaw: ( - offset: (-3.0, -3.5, -1.0), + offset: (-3.0, 0.0, -1.0), central: ("npc.monitor.female.jaw"), ), chest: ( @@ -218,7 +218,7 @@ central: ("npc.asp.male.head_lower"), ), jaw: ( - offset: (-2.0, -4.0, -1.0), + offset: (-2.0, 0.0, -1.0), central: ("npc.asp.male.jaw"), ), chest: ( @@ -244,7 +244,7 @@ central: ("npc.asp.female.head_lower"), ), jaw: ( - offset: (-2.0, -4.0, -1.0), + offset: (-2.0, 0.0, -1.0), central: ("npc.asp.female.jaw"), ), chest: ( @@ -270,7 +270,7 @@ central: ("npc.tortoise.male.head_lower"), ), jaw: ( - offset: (-1.5, -3.5, -1.0), + offset: (-1.5, 0.0, -1.0), central: ("npc.tortoise.male.jaw"), ), chest: ( @@ -296,7 +296,7 @@ central: ("npc.tortoise.female.head_lower"), ), jaw: ( - offset: (-1.5, -3.5, -1.0), + offset: (-1.5, 0.0, -1.0), central: ("npc.tortoise.female.jaw"), ), chest: ( @@ -322,7 +322,7 @@ central: ("npc.rocksnapper.male.head_lower"), ), jaw: ( - offset: (-6.5, -6.0, -2.5), + offset: (-6.5, 0.0, -2.5), central: ("npc.rocksnapper.male.jaw"), ), chest: ( @@ -348,7 +348,7 @@ central: ("npc.rocksnapper.female.head_lower"), ), jaw: ( - offset: (-6.5, -6.0, -2.5), + offset: (-6.5, 0.0, -2.5), central: ("npc.rocksnapper.female.jaw"), ), chest: ( diff --git a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron index 55b6676d7a..9da1996d96 100644 --- a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron +++ b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron @@ -5,7 +5,7 @@ central: ("npc.grolgar.male.head_upper"), ), lower: ( - offset: (-6.0, -4.5, -4.0), + offset: (-6.0, -2.0, -8.0), central: ("npc.grolgar.male.head_lower"), ), jaw: ( @@ -13,7 +13,7 @@ central: ("npc.grolgar.male.jaw"), ), torso_front: ( - offset: (-7.0, -14.0, -8.0),//value in y dimension is full length of model + offset: (-7.0, -11.0, -8.0),//value in y dimension is full length of model central: ("npc.grolgar.male.torso_front"), ), torso_back: ( @@ -35,7 +35,7 @@ central: ("npc.grolgar.female.head_upper"), ), lower: ( - offset: (-6.0, -4.5, -4.0), + offset: (-6.0, -2.0, -8.0), central: ("npc.grolgar.female.head_lower"), ), jaw: ( @@ -43,7 +43,7 @@ central: ("npc.grolgar.female.jaw"), ), torso_front: ( - offset: (-7.0, -14.0, -8.0), + offset: (-7.0, -11.0, -8.0), central: ("npc.grolgar.female.torso_front"), ), torso_back: ( diff --git a/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron b/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron index 193c94ab05..052be53942 100644 --- a/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron +++ b/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron @@ -1,11 +1,11 @@ ({ (Grolgar, Male): ( leg_fl: ( - offset: (-2.5, -6.0, -3.0), + offset: (-2.5, -12.0, -7.5),//these are done very case by case lateral: ("npc.grolgar.male.leg_fl"), ), leg_fr: ( - offset: (-2.5, -6.0, -3.0), + offset: (-2.5, -12.0, -7.5), lateral: ("npc.grolgar.male.leg_fr"), ), leg_bl: ( @@ -35,11 +35,11 @@ ), (Grolgar, Female): ( leg_fl: ( - offset: (-2.5, -6.0, -3.0), + offset: (-2.5, -12.0, -7.5), lateral: ("npc.grolgar.female.leg_fl"), ), leg_fr: ( - offset: (-2.5, -6.0, -3.0), + offset: (-2.5, -12.0, -7.5), lateral: ("npc.grolgar.female.leg_fr"), ), leg_bl: ( @@ -69,11 +69,11 @@ ), (Saber, Male): ( leg_fl: ( - offset: (-2.0, -3.5, -4.5), + offset: (-2.0, -6.0, -4.5), lateral: ("npc.saber.male.leg_fl"), ), leg_fr: ( - offset: (-2.0, -3.5, -4.5), + offset: (-2.0, -6.0, -4.5), lateral: ("npc.saber.male.leg_fr"), ), leg_bl: ( @@ -103,11 +103,11 @@ ), (Saber, Female): ( leg_fl: ( - offset: (-2.0, -3.5, -4.5), + offset: (-2.0, -6.0, -4.5), lateral: ("npc.saber.female.leg_fl"), ), leg_fr: ( - offset: (-2.0, -3.5, -4.5), + offset: (-2.0, -6.0, -4.5), lateral: ("npc.saber.female.leg_fr"), ), leg_bl: ( @@ -137,11 +137,11 @@ ), (Tuskram, Male): ( leg_fl: ( - offset: (-2.0, -2.5, -5.0), + offset: (-2.0, -2.5, -10.0), lateral: ("npc.tuskram.male.leg_fl"), ), leg_fr: ( - offset: (-2.0, -2.5, -5.0), + offset: (-2.0, -2.5, -10.0), lateral: ("npc.tuskram.male.leg_fr"), ), leg_bl: ( @@ -171,11 +171,11 @@ ), (Tuskram, Female): ( leg_fl: ( - offset: (-2.0, -2.5, -5.0), + offset: (-2.0, -2.5, -10.0), lateral: ("npc.tuskram.female.leg_fl"), ), leg_fr: ( - offset: (-2.0, -2.5, -5.0), + offset: (-2.0, -2.5, -10.0), lateral: ("npc.tuskram.female.leg_fr"), ), leg_bl: ( @@ -205,19 +205,19 @@ ), (Lion, Male): ( leg_fl: ( - offset: (-2.0, -2.5, -2.5), + offset: (-2.0, -2.5, -7.5), lateral: ("npc.lion.male.leg_fl"), ), leg_fr: ( - offset: (-2.0, -2.5, -2.5), + offset: (-2.0, -2.5, -7.5), lateral: ("npc.lion.male.leg_fr"), ), leg_bl: ( - offset: (-2.0, -3.0, -4.0), + offset: (-2.0, -3.0, -6.0), lateral: ("npc.lion.male.leg_bl"), ), leg_br: ( - offset: (-2.0, -3.0, -4.0), + offset: (-2.0, -3.0, -6.0), lateral: ("npc.lion.male.leg_br"), ), foot_fl: ( @@ -239,19 +239,19 @@ ), (Lion, Female): ( leg_fl: ( - offset: (-2.0, -2.5, -2.5), + offset: (-2.0, -2.5, -7.5), lateral: ("npc.lion.female.leg_fl"), ), leg_fr: ( - offset: (-2.0, -2.5, -2.5), + offset: (-2.0, -2.5, -7.5), lateral: ("npc.lion.female.leg_fr"), ), leg_bl: ( - offset: (-2.0, -3.0, -4.0), + offset: (-2.0, -3.0, -6.0), lateral: ("npc.lion.female.leg_bl"), ), leg_br: ( - offset: (-2.0, -3.0, -4.0), + offset: (-2.0, -3.0, -6.0), lateral: ("npc.lion.female.leg_br"), ), foot_fl: ( diff --git a/voxygen/src/anim/src/quadruped_low/idle.rs b/voxygen/src/anim/src/quadruped_low/idle.rs index 164ed1ea82..1a7ef52347 100644 --- a/voxygen/src/anim/src/quadruped_low/idle.rs +++ b/voxygen/src/anim/src/quadruped_low/idle.rs @@ -21,8 +21,8 @@ impl Animation for IdleAnimation { ) -> Self::Skeleton { let mut next = (*skeleton).clone(); - let ultra_slow = 0.0 * (anim_time as f32 * 1.0).sin(); - let slow = 0.0 * (anim_time as f32 * 2.5).sin(); + let slower = (anim_time as f32 * 1.25).sin(); + let slow = (anim_time as f32 * 2.5).sin(); let slowalt = (anim_time as f32 * 2.5 + PI / 2.0).sin(); let dragon_look = Vec2::new( @@ -41,7 +41,7 @@ impl Animation for IdleAnimation { next.head_upper.offset = Vec3::new( 0.0, skeleton_attr.head_upper.0, - skeleton_attr.head_upper.1 + ultra_slow * 0.20, + skeleton_attr.head_upper.1 + slower * 0.20, ); next.head_upper.ori = Quaternion::rotation_z(0.8 * dragon_look.x) * Quaternion::rotation_x(0.8 * dragon_look.y); @@ -50,7 +50,7 @@ impl Animation for IdleAnimation { next.head_lower.offset = Vec3::new( 0.0, skeleton_attr.head_lower.0, - skeleton_attr.head_lower.1 + ultra_slow * 0.20, + skeleton_attr.head_lower.1 + slower * 0.20, ); next.head_lower.ori = Quaternion::rotation_z(0.8 * dragon_look.x) * Quaternion::rotation_x(0.8 * dragon_look.y); @@ -63,7 +63,7 @@ impl Animation for IdleAnimation { next.chest.offset = Vec3::new(0.0, skeleton_attr.chest.0, skeleton_attr.chest.1) * skeleton_attr.scaler / 11.0; - next.chest.ori = Quaternion::rotation_y(slow * 0.01); + next.chest.ori = Quaternion::rotation_y(slow * 0.03); next.chest.scale = Vec3::one() * skeleton_attr.scaler / 11.0; next.tail_front.offset = @@ -81,7 +81,7 @@ impl Animation for IdleAnimation { skeleton_attr.feet_f.1, skeleton_attr.feet_f.2, ); - next.foot_fl.ori = Quaternion::rotation_z(0.0); + next.foot_fl.ori = Quaternion::rotation_y(slow * -0.05); next.foot_fl.scale = Vec3::one(); next.foot_fr.offset = Vec3::new( @@ -89,7 +89,7 @@ impl Animation for IdleAnimation { skeleton_attr.feet_f.1, skeleton_attr.feet_f.2, ); - next.foot_fr.ori = Quaternion::rotation_x(0.0); + next.foot_fr.ori = Quaternion::rotation_y(slow * -0.05); next.foot_fr.scale = Vec3::one(); next.foot_bl.offset = Vec3::new( @@ -97,7 +97,7 @@ impl Animation for IdleAnimation { skeleton_attr.feet_b.1, skeleton_attr.feet_b.2, ); - next.foot_bl.ori = Quaternion::rotation_x(0.0); + next.foot_bl.ori = Quaternion::rotation_y(slow * -0.05); next.foot_bl.scale = Vec3::one(); next.foot_br.offset = Vec3::new( @@ -105,7 +105,7 @@ impl Animation for IdleAnimation { skeleton_attr.feet_b.1, skeleton_attr.feet_b.2, ); - next.foot_br.ori = Quaternion::rotation_x(0.0); + next.foot_br.ori = Quaternion::rotation_y(slow * -0.05); next.foot_br.scale = Vec3::one(); next diff --git a/voxygen/src/anim/src/quadruped_low/jump.rs b/voxygen/src/anim/src/quadruped_low/jump.rs index 828659c951..06cf23abc9 100644 --- a/voxygen/src/anim/src/quadruped_low/jump.rs +++ b/voxygen/src/anim/src/quadruped_low/jump.rs @@ -15,76 +15,48 @@ impl Animation for JumpAnimation { fn update_skeleton_inner( skeleton: &Self::Skeleton, _global_time: Self::Dependency, - anim_time: f64, + _anim_time: f64, _rate: &mut f32, skeleton_attr: &SkeletonAttr, ) -> Self::Skeleton { let mut next = (*skeleton).clone(); - let lab = 12.0; + next.head_upper.offset = + Vec3::new(0.0, skeleton_attr.head_upper.0, skeleton_attr.head_upper.1); + next.head_upper.ori = Quaternion::rotation_z(0.4) * Quaternion::rotation_x(0.0); + next.head_upper.scale = Vec3::one(); - let wave_ultra_slow = (anim_time as f32 * 1.0 + PI).sin(); - let wave_ultra_slow_cos = (anim_time as f32 * 3.0 + PI).cos(); - let wave_slow = (anim_time as f32 * 3.5 + PI).sin(); + next.head_lower.offset = + Vec3::new(0.0, skeleton_attr.head_lower.0, skeleton_attr.head_lower.1); + next.head_lower.ori = Quaternion::rotation_z(0.2); + next.head_lower.scale = Vec3::one(); - let footl = (anim_time as f32 * lab as f32 + PI).sin(); - let footr = (anim_time as f32 * lab as f32).sin(); + next.jaw.offset = Vec3::new(0.0, skeleton_attr.jaw.0, skeleton_attr.jaw.1); + next.jaw.ori = Quaternion::rotation_x(-0.3); + next.jaw.scale = Vec3::one() * 0.98; - let center = (anim_time as f32 * lab as f32 + PI / 2.0).sin(); - let centeroffset = (anim_time as f32 * lab as f32 + PI * 1.5).sin(); + next.chest.offset = Vec3::new(0.0, skeleton_attr.chest.0, skeleton_attr.chest.1) + * skeleton_attr.scaler + / 11.0; + next.chest.ori = Quaternion::rotation_y(0.0); + next.chest.scale = Vec3::one() * skeleton_attr.scaler / 11.0; - next.head_upper.offset = Vec3::new( - 0.0, - skeleton_attr.head_upper.0, - skeleton_attr.head_upper.1 + wave_ultra_slow * 0.20, - ); - next.head_upper.ori = - Quaternion::rotation_z(0.0) * Quaternion::rotation_x(wave_ultra_slow * -0.10); - next.head_upper.scale = Vec3::one() * 1.05; - - next.head_lower.offset = Vec3::new( - 0.0, - skeleton_attr.head_lower.0, - skeleton_attr.head_lower.1 + wave_ultra_slow * 0.20, - ); - next.head_lower.ori = - Quaternion::rotation_z(0.0) * Quaternion::rotation_x(wave_ultra_slow * -0.10); - next.head_lower.scale = Vec3::one() * 1.05; - - next.jaw.offset = Vec3::new( - 0.0, - skeleton_attr.jaw.0 - wave_ultra_slow_cos * 0.12, - skeleton_attr.jaw.1 + wave_slow * 0.2, - ); - next.jaw.ori = Quaternion::rotation_x(wave_slow * 0.03); - next.jaw.scale = Vec3::one() * 1.05; - - next.tail_front.offset = Vec3::new( - 0.0, - skeleton_attr.tail_front.0, - skeleton_attr.tail_front.1 + centeroffset * 0.6, - ); - next.tail_front.ori = Quaternion::rotation_x(center * 0.03); + next.tail_front.offset = + Vec3::new(0.0, skeleton_attr.tail_front.0, skeleton_attr.tail_front.1); + next.tail_front.ori = Quaternion::rotation_x(0.15) * Quaternion::rotation_z(-0.2); next.tail_front.scale = Vec3::one() * 0.98; - next.tail_rear.offset = Vec3::new( - 0.0, - skeleton_attr.tail_rear.0, - skeleton_attr.tail_rear.1 + centeroffset * 0.6, - ); - next.tail_rear.ori = Quaternion::rotation_x(center * 0.03); + next.tail_rear.offset = + Vec3::new(0.0, skeleton_attr.tail_rear.0, skeleton_attr.tail_rear.1); + next.tail_rear.ori = Quaternion::rotation_z(-0.4) * Quaternion::rotation_x(-0.12); next.tail_rear.scale = Vec3::one() * 0.98; - next.chest.offset = Vec3::new(0.0, skeleton_attr.chest.0, skeleton_attr.chest.1); - next.chest.ori = Quaternion::rotation_y(center * 0.05); - next.chest.scale = Vec3::one(); - next.foot_fl.offset = Vec3::new( -skeleton_attr.feet_f.0, skeleton_attr.feet_f.1, skeleton_attr.feet_f.2, ); - next.foot_fl.ori = Quaternion::rotation_x(-1.3 + footl * 0.06); + next.foot_fl.ori = Quaternion::rotation_z(0.3); next.foot_fl.scale = Vec3::one(); next.foot_fr.offset = Vec3::new( @@ -92,7 +64,7 @@ impl Animation for JumpAnimation { skeleton_attr.feet_f.1, skeleton_attr.feet_f.2, ); - next.foot_fr.ori = Quaternion::rotation_x(-1.3 + footr * 0.06); + next.foot_fr.ori = Quaternion::rotation_z(0.3); next.foot_fr.scale = Vec3::one(); next.foot_bl.offset = Vec3::new( @@ -100,7 +72,7 @@ impl Animation for JumpAnimation { skeleton_attr.feet_b.1, skeleton_attr.feet_b.2, ); - next.foot_bl.ori = Quaternion::rotation_x(-1.3 + footl * 0.06); + next.foot_bl.ori = Quaternion::rotation_y(0.0); next.foot_bl.scale = Vec3::one(); next.foot_br.offset = Vec3::new( @@ -108,7 +80,7 @@ impl Animation for JumpAnimation { skeleton_attr.feet_b.1, skeleton_attr.feet_b.2, ); - next.foot_br.ori = Quaternion::rotation_x(-1.3 + footr * 0.06); + next.foot_br.ori = Quaternion::rotation_y(0.0); next.foot_br.scale = Vec3::one(); next diff --git a/voxygen/src/anim/src/quadruped_low/mod.rs b/voxygen/src/anim/src/quadruped_low/mod.rs index 9920f05c18..a052da5177 100644 --- a/voxygen/src/anim/src/quadruped_low/mod.rs +++ b/voxygen/src/anim/src/quadruped_low/mod.rs @@ -94,6 +94,7 @@ pub struct SkeletonAttr { feet_b: (f32, f32, f32), lean: (f32, f32), scaler: f32, + tempo: f32, } impl<'a> std::convert::TryFrom<&'a comp::Body> for SkeletonAttr { @@ -120,6 +121,7 @@ impl Default for SkeletonAttr { feet_b: (0.0, 0.0, 0.0), lean: (0.0, 0.0), scaler: 0.0, + tempo: 0.0, } } } @@ -149,14 +151,14 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr { (Pangolin, _) => (8.0, -9.0), }, jaw: match (body.species, body.body_type) { - (Crocodile, _) => (0.0, -3.0), - (Alligator, _) => (8.5, -2.0), - (Salamander, _) => (0.0, -2.0), - (Monitor, _) => (0.0, -1.0), - (Asp, _) => (1.0, -2.0), - (Tortoise, _) => (0.5, -2.0), - (Rocksnapper, _) => (0.5, -1.5), - (Pangolin, _) => (0.5, -1.5), + (Crocodile, _) => (-6.0, -3.0), + (Alligator, _) => (2.5, -2.0), + (Salamander, _) => (-6.0, -2.0), + (Monitor, _) => (-2.0, -1.0), + (Asp, _) => (-3.0, -2.0), + (Tortoise, _) => (-3.5, -2.0), + (Rocksnapper, _) => (-5.0, -1.5), + (Pangolin, _) => (0.0, 0.0), }, chest: match (body.species, body.body_type) { (Crocodile, _) => (0.0, 5.0), @@ -174,7 +176,7 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr { (Salamander, _) => (-9.0, 0.0), (Monitor, _) => (-12.0, 0.0), (Asp, _) => (-14.0, -2.0), - (Tortoise, _) => (-7.0, -1.5), + (Tortoise, _) => (-10.0, -1.5), (Rocksnapper, _) => (-14.5, -2.0), (Pangolin, _) => (-7.0, -3.0), }, @@ -184,7 +186,7 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr { (Salamander, _) => (-7.5, 0.0), (Monitor, _) => (-6.5, 0.0), (Asp, _) => (-6.0, -2.0), - (Tortoise, _) => (-10.0, -3.5), + (Tortoise, _) => (-13.0, -3.5), (Rocksnapper, _) => (-13.5, -6.5), (Pangolin, _) => (-7.5, -0.5), }, @@ -202,9 +204,9 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr { (Crocodile, _) => (3.5, -6.0, -1.0), (Alligator, _) => (4.5, -5.5, -1.0), (Salamander, _) => (4.0, -6.0, -2.0), - (Monitor, _) => (3.0, -6.0, 0.0), + (Monitor, _) => (2.5, -6.5, 0.0), (Asp, _) => (2.5, -5.5, -1.0), - (Tortoise, _) => (7.0, -11.5, -3.0), + (Tortoise, _) => (6.0, -11.5, -3.0), (Rocksnapper, _) => (8.0, -16.0, -9.5), (Pangolin, _) => (6.0, -4.0, -1.0), }, @@ -217,11 +219,21 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr { (Alligator, _) => (1.5), (Salamander, _) => (1.4), (Monitor, _) => (1.1), - (Asp, _) => (1.2), + (Asp, _) => (1.4), (Tortoise, _) => (1.0), - (Rocksnapper, _) => (1.2), + (Rocksnapper, _) => (1.4), (Pangolin, _) => (1.3), }, + tempo: match (body.species, body.body_type) { + (Crocodile, _) => (0.8), + (Alligator, _) => (0.8), + (Salamander, _) => (1.0), + (Monitor, _) => (1.3), + (Asp, _) => (1.0), + (Tortoise, _) => (0.7), + (Rocksnapper, _) => (0.9), + (Pangolin, _) => (1.15), + }, } } } diff --git a/voxygen/src/anim/src/quadruped_low/run.rs b/voxygen/src/anim/src/quadruped_low/run.rs index 9bf9ce7015..4300b24285 100644 --- a/voxygen/src/anim/src/quadruped_low/run.rs +++ b/voxygen/src/anim/src/quadruped_low/run.rs @@ -21,10 +21,7 @@ impl Animation for RunAnimation { ) -> Self::Skeleton { let mut next = (*skeleton).clone(); - let lab = 0.7 * (skeleton_attr.lean.0 + 1.0) * (1.0 / skeleton_attr.scaler); - - let center = (anim_time as f32 * lab as f32 + PI / 2.0).sin(); - let centeroffset = (anim_time as f32 * lab as f32 + PI * 1.5).sin(); + let lab = 0.7 * skeleton_attr.tempo; let short = (((1.0) / (0.72 @@ -42,6 +39,8 @@ impl Animation for RunAnimation { .powf(2.0 as f32))) .sqrt()) * ((anim_time as f32 * 16.0 * lab as f32 + PI * 1.45).sin()); + let footvertl = (anim_time as f32 * 16.0 * lab as f32 + PI * 0.0).sin(); + let foothorir = (((1.0) / (0.4 + (0.6) @@ -49,53 +48,27 @@ impl Animation for RunAnimation { .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 = (((1.0) - / (0.4 - + (0.6) - * ((anim_time as f32 * 16.0 * lab as f32 + PI * 1.4).sin()).powf(2.0 as f32))) - .sqrt()) - * ((anim_time as f32 * 16.0 * lab as f32 + PI * 1.4).sin()); - - let footrotr = (((1.0) - / (0.4 - + (0.6) - * ((anim_time as f32 * 16.0 * lab as f32 + PI * 0.4).sin()).powf(2.0 as f32))) - .sqrt()) - * ((anim_time as f32 * 16.0 * lab as f32 + PI * 0.4).sin()); // let foothorilb = (((1.0) / (0.4 + (0.6) - * ((anim_time as f32 * 16.0 * lab as f32 + PI * 1.25).sin()) + * ((anim_time as f32 * 16.0 * lab as f32 + PI * 1.05).sin()) .powf(2.0 as f32))) .sqrt()) - * ((anim_time as f32 * 16.0 * lab as f32 + PI * 1.25).sin()); + * ((anim_time as f32 * 16.0 * lab as f32 + PI * 1.05).sin()); + let footvertlb = (anim_time as f32 * 16.0 * lab as f32 + PI * (-0.4)).sin(); + let foothorirb = (((1.0) / (0.4 + (0.6) - * ((anim_time as f32 * 16.0 * lab as f32 + PI * 0.25).sin()) + * ((anim_time as f32 * 16.0 * lab as f32 + PI * 0.05).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(); + * ((anim_time as f32 * 16.0 * lab as f32 + PI * 0.05).sin()); + let footvertrb = (anim_time as f32 * 16.0 * lab as f32 + PI * 0.6).sin(); - let footrotlb = (((1.0) - / (0.4 - + (0.6) - * ((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.2).sin()); - - let footrotrb = (((1.0) - / (0.4 - + (0.6) - * ((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.2).sin()); let ori = Vec2::from(orientation); let last_ori = Vec2::from(last_ori); let tilt = if Vec2::new(ori, last_ori) @@ -139,7 +112,7 @@ impl Animation for RunAnimation { next.tail_rear.offset = Vec3::new( 0.0, skeleton_attr.tail_rear.0, - skeleton_attr.tail_rear.1 + centeroffset * 0.6, + skeleton_attr.tail_rear.1 + shortalt * 0.6, ); next.tail_rear.ori = Quaternion::rotation_z(shortalt * 0.25 + tilt * 1.6) * Quaternion::rotation_y(shortalt * 0.1) @@ -150,7 +123,7 @@ impl Animation for RunAnimation { * skeleton_attr.scaler / 11.0; next.chest.ori = Quaternion::rotation_z(short * 0.13 + tilt * -1.9) - * Quaternion::rotation_y(shortalt * 0.12) + * Quaternion::rotation_y(short * 0.12) * Quaternion::rotation_x(skeleton_attr.lean.0); next.chest.scale = Vec3::one() * skeleton_attr.scaler / 11.0; @@ -159,9 +132,9 @@ impl Animation for RunAnimation { skeleton_attr.feet_f.1 + foothoril * -1.0, skeleton_attr.feet_f.2 + 1.0 + ((footvertl * -0.8).max(-0.0)), ); - next.foot_fl.ori = - Quaternion::rotation_x(footrotl * -0.25 * skeleton_attr.lean.1 - skeleton_attr.lean.0) - * Quaternion::rotation_z(footrotl * 0.4 * skeleton_attr.lean.1); + next.foot_fl.ori = Quaternion::rotation_x( + -0.2 + footvertl * -0.35 * skeleton_attr.lean.1 - skeleton_attr.lean.0, + ) * Quaternion::rotation_z(footvertl * 0.4 * skeleton_attr.lean.1); next.foot_fl.scale = Vec3::one(); next.foot_fr.offset = Vec3::new( @@ -170,8 +143,9 @@ impl Animation for RunAnimation { skeleton_attr.feet_f.2 + 1.0 + ((footvertr * -0.8).max(-0.0)), ); next.foot_fr.ori = - Quaternion::rotation_x(footrotr * -0.25 * skeleton_attr.lean.1 - skeleton_attr.lean.0) - * Quaternion::rotation_z(footrotr * -0.4 * skeleton_attr.lean.1 + tilt * 3.5); + Quaternion::rotation_x( + -0.2 + footvertr * -0.25 * skeleton_attr.lean.1 - skeleton_attr.lean.0, + ) * Quaternion::rotation_z(footvertr * -0.4 * skeleton_attr.lean.1 + tilt * 3.5); next.foot_fr.scale = Vec3::one(); next.foot_bl.offset = Vec3::new( @@ -179,8 +153,8 @@ impl Animation for RunAnimation { skeleton_attr.feet_b.1 + foothorilb * -1.0, skeleton_attr.feet_b.2 + 1.0 + ((footvertlb * -0.6).max(-0.0)), ); - next.foot_bl.ori = Quaternion::rotation_x(footrotlb * -0.25 - skeleton_attr.lean.0) - * Quaternion::rotation_z(footrotlb * 0.4); + next.foot_bl.ori = Quaternion::rotation_x(-0.2 + footvertlb * -0.3 - skeleton_attr.lean.0) + * Quaternion::rotation_z(footvertlb * 0.4); next.foot_bl.scale = Vec3::one(); next.foot_br.offset = Vec3::new( @@ -188,8 +162,8 @@ impl Animation for RunAnimation { skeleton_attr.feet_b.1 + foothorirb * -1.0, skeleton_attr.feet_b.2 + 1.0 + ((footvertrb * -0.6).max(-0.0)), ); - next.foot_br.ori = Quaternion::rotation_x(footrotrb * -0.25 - skeleton_attr.lean.0) - * Quaternion::rotation_z(footrotrb * -0.4); + next.foot_br.ori = Quaternion::rotation_x(-0.2 + footvertrb * -0.3 - skeleton_attr.lean.0) + * Quaternion::rotation_z(footvertrb * -0.4); next.foot_br.scale = Vec3::one(); next diff --git a/voxygen/src/anim/src/quadruped_medium/alpha.rs b/voxygen/src/anim/src/quadruped_medium/alpha.rs index 843a03dd7d..f9e2a71bb7 100644 --- a/voxygen/src/anim/src/quadruped_medium/alpha.rs +++ b/voxygen/src/anim/src/quadruped_medium/alpha.rs @@ -1,5 +1,5 @@ use super::{super::Animation, QuadrupedMediumSkeleton, SkeletonAttr}; -use std::{f32::consts::PI, ops::Mul}; +use std::f32::consts::PI; use vek::*; pub struct AlphaAnimation; @@ -21,40 +21,11 @@ impl Animation for AlphaAnimation { ) -> Self::Skeleton { let mut next = (*skeleton).clone(); - let slower = (anim_time as f32 * 1.0 + PI).sin(); - let wave_ultra_slow_cos = (anim_time as f32 * 1.0 + PI).cos(); - let slow = (anim_time as f32 * 3.5 + PI).sin(); - let wave_slow_cos = (anim_time as f32 * 3.5 + PI).cos(); - let short = (((1.0) / (0.5 + 0.5 * ((anim_time as f32 * 2.0 + PI * 1.0).sin()).powf(2.0 as f32))) .sqrt()) * ((anim_time as f32 * 2.0 + PI * 1.0).sin()); - let look = Vec2::new( - ((global_time + anim_time) as f32 / 8.0) - .floor() - .mul(7331.0) - .sin() - * 0.5, - ((global_time + anim_time) as f32 / 8.0) - .floor() - .mul(1337.0) - .sin() - * 0.25, - ); - let tailmove = Vec2::new( - ((global_time + anim_time) as f32 / 2.0) - .floor() - .mul(7331.0) - .sin() - * 0.25, - ((global_time + anim_time) as f32 / 2.0) - .floor() - .mul(1337.0) - .sin() - * 0.125, - ); let random = ((((2.0 * ((global_time as f32 - anim_time as f32) - ((global_time as f32 - anim_time as f32).round()))) diff --git a/voxygen/src/anim/src/quadruped_medium/idle.rs b/voxygen/src/anim/src/quadruped_medium/idle.rs index 01f8e467a2..f54dc50e77 100644 --- a/voxygen/src/anim/src/quadruped_medium/idle.rs +++ b/voxygen/src/anim/src/quadruped_medium/idle.rs @@ -22,9 +22,7 @@ impl Animation for IdleAnimation { let mut next = (*skeleton).clone(); let slower = (anim_time as f32 * 1.0 + PI).sin(); - let wave_ultra_slow_cos = (anim_time as f32 * 1.0 + PI).cos(); let slow = (anim_time as f32 * 3.5 + PI).sin(); - let wave_slow_cos = (anim_time as f32 * 3.5 + PI).cos(); let look = Vec2::new( ((global_time + anim_time) as f32 / 8.0) @@ -70,7 +68,7 @@ impl Animation for IdleAnimation { next.jaw.offset = Vec3::new( 0.0, - skeleton_attr.jaw.0 - wave_ultra_slow_cos * 0.12, + skeleton_attr.jaw.0 - slower * 0.12, skeleton_attr.jaw.1 + slow * 0.2, ); next.jaw.ori = Quaternion::rotation_x(slow * 0.05); @@ -110,7 +108,7 @@ impl Animation for IdleAnimation { skeleton_attr.leg_f.2 + slow * -0.15 + slower * -0.15, ); next.leg_fl.ori = Quaternion::rotation_y(slow * -0.02); - next.leg_fl.scale = Vec3::one(); + next.leg_fl.scale = Vec3::one() * 1.02; next.leg_fr.offset = Vec3::new( skeleton_attr.leg_f.0, @@ -118,7 +116,7 @@ impl Animation for IdleAnimation { skeleton_attr.leg_f.2 + slow * 0.15 + slower * -0.15, ); next.leg_fr.ori = Quaternion::rotation_y(slow * -0.02); - next.leg_fr.scale = Vec3::one(); + next.leg_fr.scale = Vec3::one() * 1.02; next.leg_bl.offset = Vec3::new( -skeleton_attr.leg_b.0, @@ -126,15 +124,15 @@ impl Animation for IdleAnimation { skeleton_attr.leg_b.2 + slower * -0.3, ); next.leg_bl.ori = Quaternion::rotation_y(slow * -0.02); - next.leg_bl.scale = Vec3::one(); + next.leg_bl.scale = Vec3::one() * 1.02; next.leg_br.offset = Vec3::new( skeleton_attr.leg_b.0, skeleton_attr.leg_b.1, - skeleton_attr.leg_b.2 + slower * -0.5, + skeleton_attr.leg_b.2 + slower * -0.3, ); next.leg_br.ori = Quaternion::rotation_y(slow * -0.02); - next.leg_br.scale = Vec3::one(); + next.leg_br.scale = Vec3::one() * 1.02; next.foot_fl.offset = Vec3::new( -skeleton_attr.feet_f.0, @@ -142,7 +140,7 @@ impl Animation for IdleAnimation { skeleton_attr.feet_f.2 + slower * -0.2, ); next.foot_fl.ori = Quaternion::rotation_x(0.0); - next.foot_fl.scale = Vec3::one(); + next.foot_fl.scale = Vec3::one() * 0.96; next.foot_fr.offset = Vec3::new( skeleton_attr.feet_f.0, @@ -158,7 +156,7 @@ impl Animation for IdleAnimation { skeleton_attr.feet_b.2 + slower * -0.2, ); next.foot_bl.ori = Quaternion::rotation_x(0.0); - next.foot_bl.scale = Vec3::one(); + next.foot_bl.scale = Vec3::one() * 0.96; next.foot_br.offset = Vec3::new( skeleton_attr.feet_b.0, @@ -166,7 +164,7 @@ impl Animation for IdleAnimation { skeleton_attr.feet_b.2 + slower * -0.2, ); next.foot_br.ori = Quaternion::rotation_x(0.0); - next.foot_br.scale = Vec3::one(); + next.foot_br.scale = Vec3::one() * 0.96; next } diff --git a/voxygen/src/anim/src/quadruped_medium/jump.rs b/voxygen/src/anim/src/quadruped_medium/jump.rs index ddf7c7516b..eb8647aecc 100644 --- a/voxygen/src/anim/src/quadruped_medium/jump.rs +++ b/voxygen/src/anim/src/quadruped_medium/jump.rs @@ -4,7 +4,7 @@ use vek::*; pub struct JumpAnimation; impl Animation for JumpAnimation { - type Dependency = (f32, f64); + type Dependency = f64; type Skeleton = QuadrupedMediumSkeleton; #[cfg(feature = "use-dyn-lib")] @@ -20,80 +20,107 @@ impl Animation for JumpAnimation { ) -> Self::Skeleton { let mut next = (*skeleton).clone(); - next.head_upper.offset = Vec3::new( - 0.0, - skeleton_attr.head_upper.0, - skeleton_attr.head_upper.1 + 3.0, - ) / 11.0; - next.head_upper.ori = Quaternion::rotation_z(0.8) * Quaternion::rotation_x(0.5); - next.head_upper.scale = Vec3::one() / 10.98; + next.head_upper.offset = + Vec3::new(0.0, skeleton_attr.head_upper.0, skeleton_attr.head_upper.1); + next.head_upper.ori = Quaternion::rotation_z(0.4) * Quaternion::rotation_x(0.3); + 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.4); + next.head_lower.ori = Quaternion::rotation_z(0.2) * Quaternion::rotation_x(0.3); next.head_lower.scale = Vec3::one() * 1.02; next.jaw.offset = Vec3::new(0.0, skeleton_attr.jaw.0, skeleton_attr.jaw.1); - next.jaw.ori = Quaternion::rotation_x(0.0); - next.jaw.scale = Vec3::one() * 0.98; + next.jaw.ori = Quaternion::rotation_x(-0.4); + 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_z(0.0) * Quaternion::rotation_x(0.0); + next.tail.ori = Quaternion::rotation_z(0.0) * Quaternion::rotation_x(-0.3); next.tail.scale = Vec3::one(); - next.torso_back.offset = Vec3::new( - 0.0, - skeleton_attr.torso_back.0, - skeleton_attr.torso_back.1 + 2.0, - ) / 11.0; - next.torso_back.ori = Quaternion::rotation_z(-0.8) - * Quaternion::rotation_z(0.0) - * Quaternion::rotation_x(0.2); - 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, - ) / 11.0; - next.torso_front.ori = Quaternion::rotation_x(-0.4); - next.torso_front.scale = Vec3::one() / 10.98; + ) * skeleton_attr.scaler + / 11.0; + next.torso_front.ori = Quaternion::rotation_y(0.0); + next.torso_front.scale = Vec3::one() * skeleton_attr.scaler / 11.0; + + next.torso_back.offset = + Vec3::new(0.0, skeleton_attr.torso_back.0, skeleton_attr.torso_back.1); + next.torso_back.ori = Quaternion::rotation_z(-0.3) + * 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); - next.ears.scale = Vec3::one() / 1.02; + next.ears.ori = Quaternion::rotation_x(0.6); + 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, + ); + next.leg_fl.ori = Quaternion::rotation_x(-0.4); + 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, + ); + next.leg_fr.ori = Quaternion::rotation_x(0.4); + 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, + ); + next.leg_bl.ori = Quaternion::rotation_y(0.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, + ); + next.leg_br.ori = Quaternion::rotation_y(0.0); + next.leg_br.scale = Vec3::one(); 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.ori = Quaternion::rotation_x(-0.3); + 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.ori = Quaternion::rotation_x(0.2); + 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 } diff --git a/voxygen/src/anim/src/quadruped_medium/mod.rs b/voxygen/src/anim/src/quadruped_medium/mod.rs index 3ffa2c0035..aef1904e54 100644 --- a/voxygen/src/anim/src/quadruped_medium/mod.rs +++ b/voxygen/src/anim/src/quadruped_medium/mod.rs @@ -132,6 +132,8 @@ pub struct SkeletonAttr { feet_b: (f32, f32, f32), scaler: f32, dampen: f32, + maximize: f32, + tempo: f32, } impl<'a> std::convert::TryFrom<&'a comp::Body> for SkeletonAttr { @@ -161,6 +163,8 @@ impl Default for SkeletonAttr { feet_b: (0.0, 0.0, 0.0), scaler: 0.0, dampen: 0.0, + maximize: 0.0, + tempo: 0.0, } } } @@ -170,7 +174,7 @@ 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, _) => (-8.0, 1.5), + (Grolgar, _) => (0.0, -1.0), (Saber, _) => (0.0, -3.0), (Tuskram, _) => (0.0, 1.0), (Lion, _) => (2.5, 2.0), @@ -181,7 +185,7 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr { (Mouflon, _) => (-2.5, 6.0), }, head_lower: match (body.species, body.body_type) { - (Grolgar, _) => (3.5, -3.0), + (Grolgar, _) => (1.0, -1.0), (Saber, _) => (1.0, 0.0), (Tuskram, _) => (1.0, 1.0), (Lion, _) => (0.5, 1.0), @@ -192,7 +196,7 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr { (Mouflon, _) => (-1.0, 0.5), }, jaw: match (body.species, body.body_type) { - (Grolgar, _) => (8.5, 4.5), + (Grolgar, _) => (8.5, 1.5), (Saber, _) => (3.5, -2.0), (Tuskram, _) => (5.5, -4.0), (Lion, _) => (3.5, -4.5), @@ -214,10 +218,10 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr { (Mouflon, _) => (-10.5, 3.0), }, torso_front: match (body.species, body.body_type) { - (Grolgar, _) => (10.0, 11.0), - (Saber, _) => (14.0, 13.0), + (Grolgar, _) => (10.0, 13.0), + (Saber, _) => (14.0, 14.0), (Tuskram, _) => (10.0, 14.5), - (Lion, _) => (10.0, 13.0), + (Lion, _) => (10.0, 14.0), (Tarasque, _) => (11.5, 18.5), (Tiger, _) => (10.0, 14.0), (Wolf, _) => (12.0, 13.0), @@ -225,7 +229,7 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr { (Mouflon, _) => (11.0, 13.5), }, torso_back: match (body.species, body.body_type) { - (Grolgar, _) => (-14.0, 1.5), + (Grolgar, _) => (-10.0, 1.5), (Saber, _) => (-13.5, 0.0), (Tuskram, _) => (-13.0, -2.0), (Lion, _) => (-13.0, -0.5), @@ -247,32 +251,32 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr { (Mouflon, _) => (2.5, 5.0), }, leg_f: match (body.species, body.body_type) { - (Grolgar, _) => (-7.0, -5.0, -2.0), - (Saber, _) => (7.0, -7.5, -3.5), - (Tuskram, _) => (6.0, -6.5, -5.5), - (Lion, _) => (6.5, -9.0, -6.0), + (Grolgar, _) => (-7.0, 4.0, 0.0), + (Saber, _) => (7.0, -4.0, -3.5), + (Tuskram, _) => (6.0, -6.5, -0.5), + (Lion, _) => (6.5, -8.0, -2.0), (Tarasque, _) => (7.0, -8.0, -6.0), (Tiger, _) => (7.0, -5.0, -3.0), (Wolf, _) => (4.5, -6.5, -1.0), (Frostfang, _) => (5.5, -5.5, -2.0), - (Mouflon, _) => (5.0, -5.5, -5.0), + (Mouflon, _) => (5.0, -5.0, -5.0), }, leg_b: match (body.species, body.body_type) { - (Grolgar, _) => (6.0, -6.5, -3.5), - (Saber, _) => (6.0, -7.0, -4.0), + (Grolgar, _) => (6.0, -6.5, -5.5), + (Saber, _) => (6.0, -7.0, -3.5), (Tuskram, _) => (5.0, -5.5, -3.5), - (Lion, _) => (6.0, -6.0, -2.5), + (Lion, _) => (6.0, -6.0, -2.0), (Tarasque, _) => (6.0, -6.5, -6.5), (Tiger, _) => (7.0, -8.0, -3.0), (Wolf, _) => (5.0, -6.5, -2.5), (Frostfang, _) => (3.5, -4.5, -2.0), - (Mouflon, _) => (3.5, -5.0, -4.5), + (Mouflon, _) => (3.5, -6.0, -4.5), }, feet_f: match (body.species, body.body_type) { - (Grolgar, _) => (0.0, -3.0, -3.0), - (Saber, _) => (1.0, 0.0, -1.0), - (Tuskram, _) => (0.5, 0.5, -4.0), - (Lion, _) => (0.0, 0.0, -1.5), + (Grolgar, _) => (0.0, -9.0, -7.0), + (Saber, _) => (1.0, -3.5, -2.5), + (Tuskram, _) => (0.5, 0.5, -9.0), + (Lion, _) => (0.0, 0.0, -7.0), (Tarasque, _) => (1.0, 0.0, -3.0), (Tiger, _) => (0.5, 0.0, -5.0), (Wolf, _) => (0.5, 0.0, -2.0), @@ -281,9 +285,9 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr { }, feet_b: match (body.species, body.body_type) { (Grolgar, _) => (0.0, 0.0, -5.0), - (Saber, _) => (1.0, -2.0, 0.0), + (Saber, _) => (1.0, -1.0, -1.0), (Tuskram, _) => (0.5, 0.0, -3.0), - (Lion, _) => (0.5, 0.5, -4.0), + (Lion, _) => (0.5, 0.5, -5.5), (Tarasque, _) => (1.5, -1.0, -2.5), (Tiger, _) => (1.0, 0.5, -4.0), (Wolf, _) => (0.0, -1.0, -1.5), @@ -292,7 +296,7 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr { }, scaler: match (body.species, body.body_type) { (Grolgar, _) => (1.3), - (Saber, _) => (1.1), + (Saber, _) => (0.9), (Tuskram, _) => (1.2), (Lion, _) => (1.3), (Tarasque, _) => (1.3), @@ -303,15 +307,37 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr { }, dampen: match (body.species, body.body_type) { (Grolgar, _) => (0.5), - (Saber, _) => (0.7), - (Tuskram, _) => (0.9), - (Lion, _) => (0.7), - (Tarasque, _) => (0.7), + (Saber, _) => (0.5), + (Tuskram, _) => (0.6), + (Lion, _) => (0.8), + (Tarasque, _) => (0.6), (Tiger, _) => (0.6), (Wolf, _) => (1.0), (Frostfang, _) => (1.0), (Mouflon, _) => (1.0), }, + maximize: match (body.species, body.body_type) { + (Grolgar, _) => (2.0), + (Saber, _) => (1.5), + (Tuskram, _) => (1.0), + (Lion, _) => (1.1), + (Tarasque, _) => (1.8), + (Tiger, _) => (1.8), + (Wolf, _) => (1.0), + (Frostfang, _) => (1.2), + (Mouflon, _) => (1.1), + }, + tempo: match (body.species, body.body_type) { + (Grolgar, _) => (0.95), + (Saber, _) => (1.1), + (Tuskram, _) => (0.9), + (Lion, _) => (0.85), + (Tarasque, _) => (0.95), + (Tiger, _) => (0.9), + (Wolf, _) => (1.0), + (Frostfang, _) => (1.0), + (Mouflon, _) => (0.85), + }, } } } diff --git a/voxygen/src/anim/src/quadruped_medium/run.rs b/voxygen/src/anim/src/quadruped_medium/run.rs index b978c82579..fb0ad9e79f 100644 --- a/voxygen/src/anim/src/quadruped_medium/run.rs +++ b/voxygen/src/anim/src/quadruped_medium/run.rs @@ -1,5 +1,5 @@ use super::{super::Animation, QuadrupedMediumSkeleton, SkeletonAttr}; -use std::{f32::consts::PI, ops::Mul}; +use std::f32::consts::PI; use vek::*; pub struct RunAnimation; @@ -25,9 +25,9 @@ impl Animation for RunAnimation { let lab = 0.6; //6 let speedmult = if speed > 8.0 { - 1.2 * (1.0 / skeleton_attr.scaler) + 1.2 * (1.0 * skeleton_attr.tempo) } else { - 1.0 * (1.0 / skeleton_attr.scaler) + 0.9 * (1.0 * skeleton_attr.tempo) }; let short = (((1.0) @@ -41,12 +41,25 @@ impl Animation for RunAnimation { // let shortalt = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 0.5).sin(); + let footvert = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 0.0).sin(); + let footvertt = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 0.4).sin(); + let footvertalt = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 1.2).sin(); + let footverttalt = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 1.6).sin(); - let vertchest = (anim_time as f32 * lab as f32 * speedmult + PI * 0.3) - .sin() - .max(0.2); - let horichest = (anim_time as f32 * lab as f32 * speedmult + PI * 0.8).sin(); + let footvertf = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 0.3).sin(); + let footverttf = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 0.7).sin(); + let footvertaltf = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 1.5).sin(); + let footverttaltf = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 1.9).sin(); + let footvertslow = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 0.0).sin(); + let footverttslow = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 0.4).sin(); + let footvertaltslow = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 1.2).sin(); + let footverttaltslow = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 1.6).sin(); + + let footvertfslow = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 0.6).sin(); + let footverttfslow = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 1.0).sin(); + let footvertaltfslow = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 1.8).sin(); + let footverttaltfslow = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 2.2).sin(); // let ori = Vec2::from(orientation); let last_ori = Vec2::from(last_ori); @@ -63,130 +76,17 @@ impl Animation for RunAnimation { } * 1.3; //let tilt = 0.0; if speed < 8.0 { - /* //Trot - 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(tilt * -1.2); - next.head_upper.scale = Vec3::one(); - - next.head_lower.offset = Vec3::new( - 0.0, - skeleton_attr.head_lower.0 + horichest * 0.4, - skeleton_attr.head_lower.1 + vertchest * -0.8, - ); - next.head_lower.ori = Quaternion::rotation_z(tilt * -0.8); - next.head_lower.scale = Vec3::one() * 1.02; - - next.jaw.offset = Vec3::new(0.0, skeleton_attr.jaw.0, skeleton_attr.jaw.1); - next.jaw.ori = Quaternion::rotation_x(0.0); - 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(shortalt * 0.08) * Quaternion::rotation_z(tilt * 1.5); - next.tail.scale = Vec3::one(); - - next.torso_front.offset = Vec3::new( - 0.0, - skeleton_attr.torso_front.0, - skeleton_attr.torso_front.1 + shortalt * 0.8, - ) * skeleton_attr.scaler - / 11.0; - next.torso_front.ori = Quaternion::rotation_x(short * 0.03); - next.torso_front.scale = Vec3::one() * skeleton_attr.scaler / 11.0; - - next.torso_back.offset = - Vec3::new(0.0, skeleton_attr.torso_back.0, skeleton_attr.torso_back.1 + shortalt * 0.2 - 0.2); - next.torso_back.ori = - Quaternion::rotation_x(short * -0.03) * Quaternion::rotation_z(tilt * 1.8); - 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(shortalt * 0.2 + 0.2); - 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 * -1.0, - skeleton_attr.leg_f.2 + footvertl * -0.4, - ); - next.leg_fl.ori = - Quaternion::rotation_x(footrotl * -0.3) * Quaternion::rotation_z(tilt * -1.5); - 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 * -1.0, - skeleton_attr.leg_f.2 + footvertr * -0.4, - ); - next.leg_fr.ori = - Quaternion::rotation_x(footrotr * -0.3) * Quaternion::rotation_z(tilt * -1.5); - 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 * -1.0, - skeleton_attr.leg_b.2 + footvertlb * -0.4, - ); - next.leg_bl.ori = - Quaternion::rotation_x(footrotlb * -0.3) * Quaternion::rotation_z(tilt * -1.5); - 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 * -1.0, - skeleton_attr.leg_b.2 + footvertrb * -0.4, - ); - next.leg_br.ori = - Quaternion::rotation_x(footrotrb * -0.3) * Quaternion::rotation_z(tilt * -1.5); - 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 + 1.0 + ((footvertl * -1.0).max(-1.0)), - ); - next.foot_fl.ori = Quaternion::rotation_x(footrotl * -0.3); - 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 + 1.0 + ((footvertr * -1.0).max(-1.0)), - ); - next.foot_fr.ori = Quaternion::rotation_x(footrotr * -0.3); - 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 + 1.0 + ((footvertlb * -1.0).max(-1.0)), - ); - next.foot_bl.ori = Quaternion::rotation_x(footrotlb * -0.3); - 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 + 1.0 + ((footvertrb * -1.0).max(-1.0)), - ); - next.foot_br.ori = Quaternion::rotation_x(footrotrb * -0.3); - next.foot_br.scale = Vec3::one() * 0.98;*/ - } else { - //Gallop + //Trot 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(short * -0.18) * Quaternion::rotation_z(tilt * -1.2); + Quaternion::rotation_x(short * -0.03 - 0.1) * Quaternion::rotation_z(tilt * -1.2); next.head_upper.scale = Vec3::one(); - next.head_lower.offset = Vec3::new( - 0.0, - skeleton_attr.head_lower.0 + horichest * 0.4, - skeleton_attr.head_lower.1 + vertchest * -0.8, - ); - next.head_lower.ori = Quaternion::rotation_z(tilt * -0.8); + next.head_lower.offset = + Vec3::new(0.0, skeleton_attr.head_lower.0, skeleton_attr.head_lower.1); + next.head_lower.ori = + Quaternion::rotation_z(tilt * -0.8) * Quaternion::rotation_x(short * -0.05); next.head_lower.scale = Vec3::one() * 1.02; next.jaw.offset = Vec3::new(0.0, skeleton_attr.jaw.0, skeleton_attr.jaw.1); @@ -201,7 +101,122 @@ impl Animation for RunAnimation { next.torso_front.offset = Vec3::new( 0.0, skeleton_attr.torso_front.0, - skeleton_attr.torso_front.1 + shortalt * 2.0, + skeleton_attr.torso_front.1 + shortalt * 1.0, + ) * skeleton_attr.scaler + / 11.0; + next.torso_front.ori = + Quaternion::rotation_x(short * 0.03) * Quaternion::rotation_z(tilt * -1.5); + next.torso_front.scale = Vec3::one() * skeleton_attr.scaler / 11.0; + + next.torso_back.offset = Vec3::new( + 0.0, + skeleton_attr.torso_back.0, + skeleton_attr.torso_back.1 + shortalt * 0.04 - 0.2, + ); + next.torso_back.ori = + Quaternion::rotation_x(short * 0.06) * Quaternion::rotation_z(tilt * 1.8); + 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(shortalt * 0.04 + 0.2); + next.ears.scale = Vec3::one() * 1.02; + + next.leg_fl.offset = Vec3::new( + -skeleton_attr.leg_f.0, + skeleton_attr.leg_f.1 + footvertaltfslow * -1.4, + skeleton_attr.leg_f.2 + 1.0 + footverttaltfslow * -0.3, + ); + next.leg_fl.ori = Quaternion::rotation_x(footverttaltfslow * -0.35) + * Quaternion::rotation_z(tilt * -0.5); + next.leg_fl.scale = Vec3::one() * 1.02; + + next.leg_fr.offset = Vec3::new( + skeleton_attr.leg_f.0, + skeleton_attr.leg_f.1 + footvertaltslow * -1.4, + skeleton_attr.leg_f.2 + 1.0 + footverttaltslow * -0.3, + ); + next.leg_fr.ori = Quaternion::rotation_x(footverttaltslow * -0.35) + * Quaternion::rotation_z(tilt * -0.5); + next.leg_fr.scale = Vec3::one() * 1.02; + + next.leg_bl.offset = Vec3::new( + -skeleton_attr.leg_b.0, + skeleton_attr.leg_b.1 + footvertaltslow * -1.0, + skeleton_attr.leg_b.2 + 1.0 + footverttaltslow * -0.3, + ); + next.leg_bl.ori = Quaternion::rotation_x(footverttaltslow * -0.2) + * Quaternion::rotation_z(tilt * -1.5); + next.leg_bl.scale = Vec3::one() * 1.02; + + next.leg_br.offset = Vec3::new( + skeleton_attr.leg_b.0, + skeleton_attr.leg_b.1 + footvertaltfslow * -1.0, + skeleton_attr.leg_b.2 + 1.0 + footverttaltfslow * -0.3, + ); + next.leg_br.ori = Quaternion::rotation_x(footverttaltfslow * -0.2) + * Quaternion::rotation_z(tilt * -1.5); + next.leg_br.scale = Vec3::one() * 1.02; + + next.foot_fl.offset = Vec3::new( + -skeleton_attr.feet_f.0, + skeleton_attr.feet_f.1, + skeleton_attr.feet_f.2 + ((footvertfslow * -1.0 * skeleton_attr.maximize).max(0.0)), + ); + next.foot_fl.ori = + Quaternion::rotation_x((1.0 - skeleton_attr.dampen) * -1.0 + footverttfslow * 0.5); + next.foot_fl.scale = Vec3::one() * 0.96; + + next.foot_fr.offset = Vec3::new( + skeleton_attr.feet_f.0, + skeleton_attr.feet_f.1, + skeleton_attr.feet_f.2 + ((footvertslow * -1.0 * skeleton_attr.maximize).max(0.0)), + ); + next.foot_fr.ori = + Quaternion::rotation_x((1.0 - skeleton_attr.dampen) * -1.0 + footverttslow * 0.5); + next.foot_fr.scale = Vec3::one() * 0.96; + + next.foot_bl.offset = Vec3::new( + -skeleton_attr.feet_b.0, + skeleton_attr.feet_b.1, + skeleton_attr.feet_b.2 + ((footvertslow * -1.8).max(0.0)), + ); + next.foot_bl.ori = Quaternion::rotation_x(footverttslow * 0.5 - 0.2); + next.foot_bl.scale = Vec3::one() * 0.96; + + next.foot_br.offset = Vec3::new( + skeleton_attr.feet_b.0, + skeleton_attr.feet_b.1, + skeleton_attr.feet_b.2 + ((footvertfslow * -0.8).max(-0.0)), + ); + next.foot_br.ori = Quaternion::rotation_x(footverttfslow * 0.5 - 0.2); + next.foot_br.scale = Vec3::one() * 0.96; + } else { + //Gallop + 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(short * -0.03 - 0.1) * Quaternion::rotation_z(tilt * -1.2); + 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_z(tilt * -0.8) * Quaternion::rotation_x(short * -0.05); + next.head_lower.scale = Vec3::one() * 1.02; + + next.jaw.offset = Vec3::new(0.0, skeleton_attr.jaw.0, skeleton_attr.jaw.1); + next.jaw.ori = Quaternion::rotation_x(0.0); + 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(shortalt * 0.3) * Quaternion::rotation_z(tilt * 1.5); + next.tail.scale = Vec3::one(); + + next.torso_front.offset = Vec3::new( + 0.0, + skeleton_attr.torso_front.0, + skeleton_attr.torso_front.1 + shortalt * 2.5, ) * skeleton_attr.scaler / 11.0; next.torso_front.ori = @@ -220,78 +235,76 @@ impl Animation for RunAnimation { next.ears.offset = Vec3::new(0.0, skeleton_attr.ears.0, skeleton_attr.ears.1); next.ears.ori = Quaternion::rotation_x(shortalt * 0.2 + 0.2); next.ears.scale = Vec3::one() * 1.02; - let footvertl = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 0.0).sin(); - let footvertlt = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 0.4).sin(); - let footvertlalt = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 1.2).sin(); - let footvertltalt = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 1.6).sin(); - ////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 + footvertlalt * -2.0, - skeleton_attr.leg_f.2 + 1.0 + footvertltalt * -1.9, + skeleton_attr.leg_f.1 + footvertaltf * -1.3, + skeleton_attr.leg_f.2 + 1.0 + footverttaltf * -1.9, ); next.leg_fl.ori = - Quaternion::rotation_x(footvertltalt * -0.4) * Quaternion::rotation_z(tilt * -0.5); - next.leg_fl.scale = Vec3::one() * 0.99; + Quaternion::rotation_x(footverttaltf * -0.65) * Quaternion::rotation_z(tilt * -0.5); + next.leg_fl.scale = Vec3::one() * 1.02; next.leg_fr.offset = Vec3::new( skeleton_attr.leg_f.0, - skeleton_attr.leg_f.1 + footvertlalt * -2.0, - skeleton_attr.leg_f.2 + 1.0 + footvertltalt * -1.9, + skeleton_attr.leg_f.1 + footvertalt * -1.3, + skeleton_attr.leg_f.2 + 1.0 + footverttalt * -1.9, ); next.leg_fr.ori = - Quaternion::rotation_x(footvertltalt * -0.4) * Quaternion::rotation_z(tilt * -0.5); - next.leg_fr.scale = Vec3::one() * 0.99; + Quaternion::rotation_x(footverttalt * -0.65) * Quaternion::rotation_z(tilt * -0.5); + next.leg_fr.scale = Vec3::one() * 1.02; next.leg_bl.offset = Vec3::new( -skeleton_attr.leg_b.0, - skeleton_attr.leg_b.1 + footvertl * -1.7, - skeleton_attr.leg_b.2 + 1.0 + footvertlt * -1.5, + 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(footvertlt * -0.4 - 0.2) + next.leg_bl.ori = Quaternion::rotation_x(footvertt * -0.4 - 0.2) * Quaternion::rotation_z(tilt * -1.5); - next.leg_bl.scale = Vec3::one() * 0.99; + next.leg_bl.scale = Vec3::one() * 1.02; next.leg_br.offset = Vec3::new( skeleton_attr.leg_b.0, - skeleton_attr.leg_b.1 + footvertl * -1.7, - skeleton_attr.leg_b.2 + 1.0 + footvertlt * -1.5, + 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(footvertlt * -0.4 - 0.2) + next.leg_br.ori = Quaternion::rotation_x(footverttf * -0.4 - 0.2) * Quaternion::rotation_z(tilt * -1.5); - next.leg_br.scale = Vec3::one() * 0.99; + next.leg_br.scale = Vec3::one() * 1.02; next.foot_fl.offset = Vec3::new( -skeleton_attr.feet_f.0, skeleton_attr.feet_f.1, - skeleton_attr.feet_f.2 + ((footvertl * -2.7).max(0.0)), + skeleton_attr.feet_f.2 + ((footvertf * -2.7 * skeleton_attr.maximize).max(0.0)), ); - next.foot_fl.ori = Quaternion::rotation_x(footvertlt * 0.9 * skeleton_attr.dampen); - next.foot_fl.scale = Vec3::one() * 0.97; + next.foot_fl.ori = + Quaternion::rotation_x((1.0 - skeleton_attr.dampen) * -1.0 + footverttf * 0.9); + next.foot_fl.scale = Vec3::one() * 0.96; next.foot_fr.offset = Vec3::new( skeleton_attr.feet_f.0, skeleton_attr.feet_f.1, - skeleton_attr.feet_f.2 + ((footvertl * -2.7).max(0.0)), + skeleton_attr.feet_f.2 + ((footvert * -2.7 * skeleton_attr.maximize).max(0.0)), ); - next.foot_fr.ori = Quaternion::rotation_x(footvertlt * 0.9 * skeleton_attr.dampen); - next.foot_fr.scale = Vec3::one() * 0.98; + next.foot_fr.ori = + Quaternion::rotation_x((1.0 - skeleton_attr.dampen) * -1.0 + footvertt * 0.9); + next.foot_fr.scale = Vec3::one() * 0.96; next.foot_bl.offset = Vec3::new( -skeleton_attr.feet_b.0, skeleton_attr.feet_b.1, - skeleton_attr.feet_b.2 + ((footvertl * 2.4).max(0.0)), + skeleton_attr.feet_b.2 + ((footvert * 2.4).max(0.0)), ); - next.foot_bl.ori = Quaternion::rotation_x(footvertlt * -0.9 - 0.2); - next.foot_bl.scale = Vec3::one() * 0.98; + next.foot_bl.ori = Quaternion::rotation_x(footvertt * -0.9 - 0.2); + next.foot_bl.scale = Vec3::one() * 0.96; next.foot_br.offset = Vec3::new( skeleton_attr.feet_b.0, skeleton_attr.feet_b.1, - skeleton_attr.feet_b.2 + ((footvertl * 2.4).max(-0.0)), + skeleton_attr.feet_b.2 + ((footvertf * 2.4).max(-0.0)), ); - next.foot_br.ori = Quaternion::rotation_x(footvertlt * -0.9 - 0.2); - next.foot_br.scale = Vec3::one() * 0.98; + next.foot_br.ori = Quaternion::rotation_x(footverttf * -0.9 - 0.2); + next.foot_br.scale = Vec3::one() * 0.96; } next } diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs index 3b0a79c3e2..54fbce398a 100644 --- a/voxygen/src/scene/figure/mod.rs +++ b/voxygen/src/scene/figure/mod.rs @@ -985,7 +985,7 @@ impl FigureMgr { (false, _, false) => { anim::quadruped_medium::JumpAnimation::update_skeleton( &QuadrupedMediumSkeleton::new(), - (vel.0.magnitude(), time), + (time), state.state_time, &mut state_animation_rate, skeleton_attr,