From d61d0e3c365fe9e3445c260148bc5ff6af15cc10 Mon Sep 17 00:00:00 2001 From: Snowram Date: Sat, 29 Aug 2020 16:11:48 +0200 Subject: [PATCH] Tweak offsets for theropods --- .../voxygen/voxel/npc/archaeos/male/leg_l.vox | Bin 2540 -> 2540 bytes .../voxygen/voxel/npc/archaeos/male/leg_r.vox | Bin 2540 -> 2540 bytes .../voxygen/voxel/npc/archaeos/male/neck.vox | Bin 2836 -> 2836 bytes .../npc/odontotyrannos/Odontotyrannos-4.vox | Bin 2952 -> 0 bytes .../npc/odontotyrannos/Odontotyrannos-9.vox | Bin 2476 -> 0 bytes .../chest_back.vox} | Bin .../chest_front.vox} | Bin .../foot_l.vox} | Bin .../voxel/npc/odontotyrannos/male/foot_r.vox | Bin 0 -> 2952 bytes .../{Odontotyrannos-6.vox => male/hand_l.vox} | Bin .../hand_r.vox} | Bin .../{Odontotyrannos-0.vox => male/head.vox} | Bin .../{Odontotyrannos-1.vox => male/jaw.vox} | Bin .../{Odontotyrannos-5.vox => male/leg_l.vox} | Bin .../voxel/npc/odontotyrannos/male/leg_r.vox | Bin 0 -> 2476 bytes .../tail_back.vox} | Bin .../tail_front.vox} | Bin .../voxel/theropod_central_manifest.ron | 60 +++++++------- .../voxel/theropod_lateral_manifest.ron | 52 ++++++------ voxygen/src/anim/src/quadruped_medium/run.rs | 4 +- voxygen/src/anim/src/theropod/idle.rs | 39 ++++----- voxygen/src/anim/src/theropod/jump.rs | 36 ++++----- voxygen/src/anim/src/theropod/mod.rs | 76 +++++++----------- voxygen/src/anim/src/theropod/run.rs | 42 +++++----- 24 files changed, 146 insertions(+), 163 deletions(-) delete mode 100644 assets/voxygen/voxel/npc/odontotyrannos/Odontotyrannos-4.vox delete mode 100644 assets/voxygen/voxel/npc/odontotyrannos/Odontotyrannos-9.vox rename assets/voxygen/voxel/npc/odontotyrannos/{Odontotyrannos-3.vox => male/chest_back.vox} (100%) rename assets/voxygen/voxel/npc/odontotyrannos/{Odontotyrannos-2.vox => male/chest_front.vox} (100%) rename assets/voxygen/voxel/npc/odontotyrannos/{Odontotyrannos-10.vox => male/foot_l.vox} (100%) create mode 100644 assets/voxygen/voxel/npc/odontotyrannos/male/foot_r.vox rename assets/voxygen/voxel/npc/odontotyrannos/{Odontotyrannos-6.vox => male/hand_l.vox} (100%) rename assets/voxygen/voxel/npc/odontotyrannos/{Odontotyrannos-11.vox => male/hand_r.vox} (100%) rename assets/voxygen/voxel/npc/odontotyrannos/{Odontotyrannos-0.vox => male/head.vox} (100%) rename assets/voxygen/voxel/npc/odontotyrannos/{Odontotyrannos-1.vox => male/jaw.vox} (100%) rename assets/voxygen/voxel/npc/odontotyrannos/{Odontotyrannos-5.vox => male/leg_l.vox} (100%) create mode 100644 assets/voxygen/voxel/npc/odontotyrannos/male/leg_r.vox rename assets/voxygen/voxel/npc/odontotyrannos/{Odontotyrannos-8.vox => male/tail_back.vox} (100%) rename assets/voxygen/voxel/npc/odontotyrannos/{Odontotyrannos-7.vox => male/tail_front.vox} (100%) diff --git a/assets/voxygen/voxel/npc/archaeos/male/leg_l.vox b/assets/voxygen/voxel/npc/archaeos/male/leg_l.vox index 6c94ec3143a1034824e42a25c0c94ea1e831e6fe..0007f2a7878efdb437db62146c7e3159ec6ead82 100644 GIT binary patch delta 1464 zcmW-h!4=pj3`Eh41lWhYq>XK1i?R)8w~$`a&sLBk@|}YoMo1$u8vOgm?;k(^d*i%Q zn9r3tcGhvV-Y?Jo)aY0C@o4m0b*zeGOXs8Nmy*@z)v7-&=UqCNYwm2vj-0D}KH2+| z>W}kV$5xKJh*!=lHJ_^SycH9m`NZhU9#^u@IBpLD8^E2WI=}+}ab6@B4QJow1AnJ+ zz=F6ub_K;67&I6`L5exYQjFy%Dy6Dvmdtv!+nA^AH!z&Sbm|` z%rm&5xp8P-(E+2w05s^neMJN?x)8TC8nKT%Vxog%sRsI(x5l`PmW-wZYf=3U#uObh z7lIwNaRufeUdQ!1j!OX*2uA@J4On#M^KLQdl#Y9C&0-X_J&W1au2E>D5GQ*T8mX1D zC|od9G+SV?cRg0Y3^4->a-y!pUsdli8yDbNs2H$fb?sIp5+sTRMH-22wF1!g`5Vn7 z#mEbahB+fA@Cm%u^U+M2&gGeilkbt2N5WL{0`T=W?<7bBHRWSgiM>fuLUFDfSS0Ka zi@z$N7$DZlL~NWFtCLZ2W(rU&DAI_FYK#?pa@D|1zOkTIyv`>I14tjpFi*}5K333xDH09wH5en;J)oSGTuJ=p$nWB*5&Pwj*dkvv p6!_Ew27*yhv;P~2<1<045DiI#;=S=ZZ3JW0P&qT~zy7a(@(+7|yoUe) delta 1464 zcmW-h%Nf`>2!sX0L-t`WX=7X1qHIfNw~$`a&sLBk@;e7USqKI+jQsn@?;k(^d;7ej zusl~p@6d4#uS=tzw7SCkajV;Ptn6cZosX+757s=dp?XHlJL_E1+%b=BF<0jKgx3>Q zkK$Wed(10pKB<1*>*EhBIO>@?*78vw<*NEQu8?aTvz(KujD zTpT-_ViOD+w5A}%6urEA>5D6JvbJLx{j&KwnSeD8l8pk+ZQ~^QxY8*g&WH}m!i1l-0By4IZ#9C zjl?K6a;`z#sKy5y++I*<*=uk^k#C$Uj%9*T;yh|uz@{I!7YzFZYd(Ta%VX(MF`|%YifYF6>OQ8|vaa&Jxa4c7&k9oWGCA1_o<*;U|+ZdBMmRtyS zeD-CSn)o`dSAAUGP=Ro~0iyvGo#lCtZaSr7&+Q`_MQ)8`wz<<1jU?h^Ux`L?#YhS# z3?F{8*JQ8SkTIzIoTnV=YX zMo~-7$T55l-tc&Q1Wm`%2*k;^#U%@v3SIy{f8!2ZsOkS2;`q#=)e#LzMsXkfP6xr51}bNU{_FqzC;k8_BD|ph diff --git a/assets/voxygen/voxel/npc/archaeos/male/leg_r.vox b/assets/voxygen/voxel/npc/archaeos/male/leg_r.vox index 702d3e818ff50688ca41de5db7d59a1eb844e1c8..7f205f0dc194e244ef962bb0167a1c6fdfa2335a 100644 GIT binary patch delta 1464 zcmW-h%Nf`>2!zG(l6}}q+SnGhDBIH6Eu@$9vlXO>{LX<-7J>l{Bme&K`^V4!UOR6S z=I65LZFyW-b!pZ!x-P4JyzBNn*05u{&d0MZ4^}^~%z85BJ#;SR+%}FKG1u_(v8u;Z zkK$WK$nqu2n02E!;wF-0%8Ui#uhj@NcvG;ZnMwWi%U^lV{X|Cy&TA(ba3P9J9Iojg7Vx+ zL+KdB(&tLzQjHHbxV@k-yjOBVksq8Zjui=`#Cg<;fXzB?7Yx?~Yd(U_@MGzPUNO($ zhT_Jdc|`$6hXH8NeSSp*FuHJVDKsKK?y!jtj^)|tW8U6<2`vdtIjlw29gHaob1nos zKKcqwM!b&el^vHGR3IETz-U0CGe7UNrc*ku+&+_0qWgIf2i?%ZkTm&~z-#K%9JcTRiNpZ%52T$Z=TPG?fyuW` ze8G1+qww3=Yx>G`Xv9yvg`*o^PQLI9UxeQ&;+!=c4Pe60d6>hV@7F2ffT|ra5zv4T z2!zG(l6}}q+SnGhDBIH6Eu@$9vlXO>{LX<-7J>l{Bme&K`^V4!-acurz_UL;M?=df{`3&#p9X$b>PgpHwU&h}0xMc)RfJIXR*Z?Tbon)uss6Fz)Uo;L_ z6BoxGO|c0E4MtOtVv1hgz4XNuIa%AW5&g3HI+=hq4w8)m;OQ8|vaYs*da4h#mAMRcl`un$VNFiwW%!5ZyTnEgcqA$Y%vm#cI*9~1#eyP9qGqlDG(Z2OnV=YX zLD5Lg$O(K7UMe0RLDR7`0&((famfOvf){{KZ`?+Z6Ol=RDeB&-d#TaX@8`m7sV~y#$$+EG%#MC zlK6v(XC%54GZaCCXCwl}ZEVYg;%x;Dh$1l&--I!8C4+KSa=pY~j(mxyM(mewww-*Z pp}^-d7%)afP5o<#<1<045DiI2aSeW_gJ8@DDrbiJ^?&{oe*lT_ygvW{ diff --git a/assets/voxygen/voxel/npc/archaeos/male/neck.vox b/assets/voxygen/voxel/npc/archaeos/male/neck.vox index bbe142c14df466582927b2a30ab0d8e171aebbab..29f2c001df17a8c88257c4a3a2bbd8daa62e41f2 100644 GIT binary patch delta 1762 zcmW-h$(6=74upxN0IL0-j}D=`lbAG|hqi;H!=J(&oXI5UPjjdTk;GCcg8JvLfByRK ze?B9Aeb|$89x?UA7?-=>o_^WX-NS!u<{dU3tGqloGrOEK>%49Fw~UyM+h<+Lx5!b$ zIE!zU;~Q5NafKb@jnGeEv-qy`r|atpLC)jX z0%UymOT_%QoY>5tCSMcZrJtVl-4;LX%hkj*F`c0D){M_(t>2VCHREY>lIdHllXWSc z?05vBs^wAIRq>wn(^Hq;GiR^kDt)n^SD-@G8zXY+F80coJ7?X25kM=o-Y7mdidhahQ+4i^$yznKZ9vzl*~9x{c25wLKv>Z;NIQUJL$TkhRZC z@4foGEAR^x;#`qOMQ#dh>AA}DtQVm@UHeC_qg-cpt?D`on^jx3PGQxYSDl4TaXx(0 zuro`m%=S!Qm42vnNVOL>N9-E0rnF1iYQ&b|yTZ46*AZtrG47u&jf5bRK#xrxN13nX zu@(h0>r_IjbFVCdCPe9=^T}Fra1HC(r0y&I7yr&P9d*4Ttxt&kWSCV0`F4 zc%LCG5=Lo{W`Jhz%7rHdYB@z0nv+*D&&=l47z6pj8A|7MEL+lTYT9g@i;ktqvtysaipi6M0DfuB8zz}^{@U?A MQT7Vxf7O5HzuTwYa{vGU delta 1762 zcmW-h$&v0h41@(V7HVFVk1vFOCJCqEJhUAo9h8C(&cq4&lMh`GNi2;fsDFO{^ZV~V zpP?TgcE>b!O?hifrdS zGkww>U!CE^Id)8!((WRM!tTc+eoXQ0dK1Jg0vc<|k2#p?TV=PkJ{5kqf87$~NjzPskLiD_awfX9`Sp3^LULVnkzyW2^YpJW}ZOS;2! zCxpu9JHyV(_pI-p^33}h^?vauEyu-JHoEk zue)-_A?~)B1Yc*6APH*ryS~n0bqbjy?TWH%sP2(@k47zgJZG+Mz71bPCHJq(#kYRZ z(teLq+#gY|Ay~y06a(l9JugW8=mbBUn8(wQz9*Irk-0LW8i1XoV z4m-kg$+j)Rmki(2b5GS)*cjS!XbI((%C&~pNZ&Gjt#_R|qKGMf)@Txf2m(uMmiB62 zsu`AZ^}C}Kp%5y;=%g8Z8hM-IpgNAWKH7V0 zQ73@a)~MSLl6CNrwKR-7a%=9YxtnGlx?=CQh(pA+g-}S?U>!ON8_8a3^WnROt!jYe z&J_q{9T?47$0izbppp3J@rdL;7`!eHa(CF8^=96S2@6}ZI?QV`$QooVYd0jdAZg}d z%#T&9HsbK0F!$?RqZ_%o9v29{-vMU`-6+odxbj(?Bu)}1iBrhEc2^MqDC89K>fK`; zF5qKz1KFEH&XLq1>(+Gdi%)$h=2Zed?=tZIT^Up{gsKIH!~p7{d+|Oc zEE39dlQBS3Zy7UB3ix~^UF0-)CF6)_UX3x3FPx!tUdOx!-G*k)XJ%ro#n2^{B>%@Z=zXUv%?^NmiV{cDzrN LJqP-?`j7YzxA@+L diff --git a/assets/voxygen/voxel/npc/odontotyrannos/Odontotyrannos-4.vox b/assets/voxygen/voxel/npc/odontotyrannos/Odontotyrannos-4.vox deleted file mode 100644 index cc45052882acb2c0c04a7566aa6b4ad83f18a795..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2952 zcmW-i4Qy8B6~~`@@ALiKw@8*{V=|+tM3GiguwX3$1%yKRvbIn_`LwLGZ|8kK)>9WO5&HnqpzR9oubDw*jbIx<_ zxwmce7hgIkgqShi+#B?>Wq!(OpM5Kwqv)@AkG7{BNUB7ZXi=6# zY5GwOv6_BVuSFKLD5kt8jVLH1%Gxjw)f$mG+TMs_pq)~srH`eL6`8T3XsswY+Magc zdP+NSj75|aMNKtS>zI$WryXdgRFjKK%F~A!&)PkGsNS<@8H@f^D79p{$))kd*KRdR7$_HoSlQDu|FMVrLzbzJl$Br)eXE*fHqlQH`pXMuJq zj3ZR7dqHE(8^Gp5ublF=v@RIxZNhr8=tDaVe0Lc4Fd88u}4U46$5urcw{{ zQ&Xz6ai%PNsK&-6YZ;4pt_70XxR~QCO2@jD%CuunVqIKzF3vnPkd$lM^PZ10>vDa+<7kAUQ#X3EoI3OFD2hW+Dc|#N!H3fXvrCnJd5NE z$YRj4q>bc!%Yr4&(3cu2YgY0*KwtLHQ-hU7GP7~2kYE2h72xlky+e4v>p`?% zR)hb%`a1sg)G@57Yrww;594UlQhd}ufOAWF@b=t1{`cPd_-TJX&Rx`uz1P>{zTsnW z;m{$xvbF=8XHLeE!Cm;IzZXBAJp+eUufT7nG~#DB*5l37ConK;3X0Pv;>=C;Xl<;+ z!#Cf6&vxI7qtnOZ*p?0WZ2eknX|Bgd*L@Rj-r94watUBzweI{PJwH}38wfKD5 zwOBXhDm=1aJWj8ghG&;I;LE`t6q+VtC|iWLw`chD_L2B|-)x-iYr)T#O+ee^8vJEv z4|XhRz^8{cx7&mCNh56}GoU;J?^aN6P@C$7NRXO?5+cfLhNVC2Y= z)Nf%-WV)hRfD+;Z@|`_T^JaegPqUZiKAy9!5ZssYrv=t3vuvI$FT0+0;=3hB!O`@x^NxJ!29&j=zY}_iw_KrLDMbNgMi3 zoyLT&JPy43SM&}(f{uqD$Hp^%z_=%0LOQDvxwe&z`4q;jE#b|HE8cpf!}-b1+P8yI%w6xb2f5X+uL7~g}t2i`zW zc|S&9G84mVH(}oVhj7^?t$1MLtGIK`BY1S+6t;D}jCIXF!H(XeXqmJW&+qsx_T-;O zZ{v^9aP3sg9(5Z!YS*KE>}q^}+(s;FUWB2ICouV%IxHG98MjYbfWqn?th)ME?|pVH;LVxCvi<@lU>`U*ea)I*y%t_M&gY-MDjo33sf$11;?>m_L6O zZkaX-6B;I>zIHS&T)2Sq=g;HBi4!<{_%OC?*@E8QUbMEhV*2#y7&U4Xh7TW($`|1O D_eNTx diff --git a/assets/voxygen/voxel/npc/odontotyrannos/Odontotyrannos-9.vox b/assets/voxygen/voxel/npc/odontotyrannos/Odontotyrannos-9.vox deleted file mode 100644 index 771bfd55c64cb60977c8910fc75e2c2d6caef470..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2476 zcmX9;4Qy8B6@LHUYjl}pF&l#s?XXd3iz(P*DYO)j7Rpa8EtK+8ek=~?H}3uJT}y$) zjvq@^XalPSmw_S(Oro%&KsOyoLdIlcW*IY59d3ybH>S%LHZXhkTz8X`^WOK~_nhZE z=Q(fvoCWvy3L$1qu9{6J`tA~x_Ob9fa!Msi*~BQ5bxJ4F`Pg}%SfjJjsL&`MX&ppH+r%pV?}DswDiqel!kO6F zAZr!Z)^Sh8!l+mqoj7eGL2nq_X&XB4vYKAn)Kp}QjHOet)HYUVRvX4}ku;2**3JCR=vZ3A+KH1`Ou$+L z8>_%ZG9YepXamQ6A6seYb*zK5hn8Ffq4mV;9WfcM`Hy#z@jldCEAH#Shsyh`VqT+z zP+Q4(K9rJpq#|#QJf|3CR(Nt|1M){4#!wH`h-U6|k3BckiFQ6xv!@t7yhjv)+>Lv`_52Cm+7vQyXIE zTuH;e8^+e@UEmVIcft8qHlQv7a!5>!qZGNLPl9+P*H%)esn;~#W0o_f1SyYOD^&Z8^szzLI z@5beY8GJaa1^@l{8h+B=j?4E}W8b4C*fJy!H;){_JFA+pZF(7w_wK@H?XCFHjA=Ns zq6xn)ufR_yl;Fzw0d!ZEBRge0E=(#xT}2W0JpLHI*u5Dir;fwv&Q17Y<0^Dkm*Dy% z_u=nv=P z!yO?$UosqjYny?KZMFE>qGHsS72wZ38SGqGiqDU1!~Rt>arS#Wx2GAq+gos8MG-#T z-GoiGdAP83F8Y>^!nH%|v9+-fU+$X)oY{gK&yK>415e?2+f?+fD8R+`JWLrk41Yb< zg|@oUc%!uly-^iD**yUlp3cXMneQS~HwK^ehq!Wj2Y%RGf;V^6;ph8W@l5krobAd5 zjt|4{`f@RNFdx6_8;k$EGYwZyt;d<3LR^1yI&Ph-z(a)(W9{k^ym5E|KE3<{-2TIM z;Cz6;4~)dcV@omo+ux)O#qi<7>A!`X`@e&ipDV`Nrjgjz_9&J&;}pO0O=bFsNAAIJOGW7)Ftm^phC8kZMfR?TDB-m?bX z{WH;XY#mNs+>e#37huE7W!QGM88aFtqM|7uHJQoi>EDH?cW%V6j!9VjS_g{iOOdmw z28aK68ml))$Zwg6$Jx`7yE52z=mm)FYjM}IN(`M{j=Z=D;FT3%|$ML#J?0Wd*)gzl^U#sff03hw&Pu_Te%l6cArDnnzymK`p4MW zdJ?r08*yUiZ_w9r0<9I#qjbz<%*a`c=E99=$XkK$kL|$x>iOvJ7(m(RBFrCEh9wi{ zB3hBb@`vZ4rJxaK3wPjfRXgenit(q?E;JQS!k4%I!706iU;Oe6diwUEZPNy<+Zf}? zRZpU}p%!!IRN{##6H#0`9wmjjxOwv?1_uW*Fff3lM~|YjvlFeYt*EQ3!_=u$k&}~y LAwz~By#f9QxyBM} diff --git a/assets/voxygen/voxel/npc/odontotyrannos/Odontotyrannos-3.vox b/assets/voxygen/voxel/npc/odontotyrannos/male/chest_back.vox similarity index 100% rename from assets/voxygen/voxel/npc/odontotyrannos/Odontotyrannos-3.vox rename to assets/voxygen/voxel/npc/odontotyrannos/male/chest_back.vox diff --git a/assets/voxygen/voxel/npc/odontotyrannos/Odontotyrannos-2.vox b/assets/voxygen/voxel/npc/odontotyrannos/male/chest_front.vox similarity index 100% rename from assets/voxygen/voxel/npc/odontotyrannos/Odontotyrannos-2.vox rename to assets/voxygen/voxel/npc/odontotyrannos/male/chest_front.vox diff --git a/assets/voxygen/voxel/npc/odontotyrannos/Odontotyrannos-10.vox b/assets/voxygen/voxel/npc/odontotyrannos/male/foot_l.vox similarity index 100% rename from assets/voxygen/voxel/npc/odontotyrannos/Odontotyrannos-10.vox rename to assets/voxygen/voxel/npc/odontotyrannos/male/foot_l.vox diff --git a/assets/voxygen/voxel/npc/odontotyrannos/male/foot_r.vox b/assets/voxygen/voxel/npc/odontotyrannos/male/foot_r.vox new file mode 100644 index 0000000000000000000000000000000000000000..d141945ef50f6b8e297d95c194269cf2316fd16b GIT binary patch literal 2952 zcmXAq3yf9O6^8eF?{m(*Jkm6+l@g^$6q&&cIN&%43?K{)FUJ`e-VYr*%-pHxK04zF ziIj(c7KT7a)TXF_0@WyXP#&!oBq62JQq$BLMXPP1#+GW+#uiNf{@32*%fHS(Yp=ET zI_sRii3ZA?7$7_30GU$*WVh)iTo zGmj-|Aag|Yi5MryToRa0XpvXM8&Pydl&leXLo`uDa@|`|aF+g-_h@U{ibyNc*ojg^ zf}0rDB6-51^NW~1d+NR3O0zMp{;2v zu1nf+#8@OmqTs2HY9r>Ot!XRTlIpUm7-ISm7qj-5K2#mECfYJC*XL57FjvAD3GXMo zPgMzXQAK&(y1dWuTp6C5s0{Z~eU^U2MwaJrsSUQIyv^&c`YVf0%hVF1Wl3pS^oDE1 z8d)$#vcIyZj7%l*R_2|R%q2_4%A&S1RYa25$wK60F;Kme>@WQs<2uIRwc@p;9c;O` zjN_SuYP>9I&p4jcYF+SH6ZArD>vQIj-JZp$~ z9^zuw5;GprvCONOHFM24$7f8xgn1MCCETB|CfYh-O;k}{cP<|?%$tz~mtkIFc&&-c zvOmN`mgjH<9dT~iU+*nzv_+#-Nh`(qu_dQf!D_``tAZvVTFqPeDs45}bFi&4b7txbKzoWw?|WFnPnsv?qWKIXkxr8eeyh~~AT z%2*YB!Wt6ZOBkQ3sfuf|yyjdfWK`-i><86mcow3Fywl%4?hPAQ}&Ts|{&tfw1_(@L>E)HtIzFTXsY49jqK71Ij zt!c%U=@W6ZZ#O>e>B5g@PQ&5VEAZ<{b@=J+HF)dnDfG^mgu;~ZICn=4n(C_Y*qyiG z^F14JZ0cB?*t#B{uUmty4K?`qmapTjyPI%qX#+OTsK)+f)A7dLHOSAX!WTt9_lw*N;bkx&ZI&Nb%XSA^2POOq}m-#Lt$DL-WK+{CQU=b}p*L zXNR}o$u+ZZx{doDYsH?P9QLoS#z%WrV145#oZCDPdzX*I2hZG(&5Nt><-Xa#$xZm= z;gR@c|95e;dn)=?SK@rnC`=i9E&h6ZJGz^0#*1Cm=*!pR!#%g-+=CT(qVqfGY#NPE z`%}DiVh4WET7#E&G~ws_y6{lz7@Xcd0yugtez$i7E*-4EulA0?e_or0caPtXle?<$ z@ypZk#hE(XSalOR*4E&~LkscI#qZiZGCWc-2 zZ9M(RICQKSjxF7{VpYp1d~%@yU%cIbs~^tC+ZTHA{8M$f^yck2_~d-NdS)WyS73MF zJZ#)vfusHRW97>6m^Ei47O$$r?D@B0+pc!>_Rqqu=kLR@^H1WQwF~jU(-X1fbSq}I zOhDa=3e4}Ej9vY^@!-yNxOT%GSo+)sR5#aR*!uZ6^v4reyD^W7+$`M5XF7a$C$>EE zD8#l7L@Q_DnmLm&s<;B;x6eTw>4muR21ZPqfYy_*V8lb4F==rVZduff?lWgGu04l? z@BIZ`eUGE{v8S-%-0v~wnd8XJs6)1SC1XB|F>8vrp|J%+w;n=sM*$1gZO6iw-o?$! zOQ_lT3M!X$Laf?^^(WrL{6m*edH8)KgT97=H%vmfrUGKg3rNOx;(^{b(OEix5kseA zaMfnanfoZNAKHY6H@uGf?s*(f^q#@?_E)jC;m6q7bqtLY7UQLzzro(zOX#ZmA!`<$(OR_*Eu&WBdt)|WLBj&{Z#adCH&TkOP4O;)TvWAa^wiMZrzHmt}Zk+HDT)1sTekF7zPg>jPe)Ye~mCym;e9( literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/npc/odontotyrannos/Odontotyrannos-6.vox b/assets/voxygen/voxel/npc/odontotyrannos/male/hand_l.vox similarity index 100% rename from assets/voxygen/voxel/npc/odontotyrannos/Odontotyrannos-6.vox rename to assets/voxygen/voxel/npc/odontotyrannos/male/hand_l.vox diff --git a/assets/voxygen/voxel/npc/odontotyrannos/Odontotyrannos-11.vox b/assets/voxygen/voxel/npc/odontotyrannos/male/hand_r.vox similarity index 100% rename from assets/voxygen/voxel/npc/odontotyrannos/Odontotyrannos-11.vox rename to assets/voxygen/voxel/npc/odontotyrannos/male/hand_r.vox diff --git a/assets/voxygen/voxel/npc/odontotyrannos/Odontotyrannos-0.vox b/assets/voxygen/voxel/npc/odontotyrannos/male/head.vox similarity index 100% rename from assets/voxygen/voxel/npc/odontotyrannos/Odontotyrannos-0.vox rename to assets/voxygen/voxel/npc/odontotyrannos/male/head.vox diff --git a/assets/voxygen/voxel/npc/odontotyrannos/Odontotyrannos-1.vox b/assets/voxygen/voxel/npc/odontotyrannos/male/jaw.vox similarity index 100% rename from assets/voxygen/voxel/npc/odontotyrannos/Odontotyrannos-1.vox rename to assets/voxygen/voxel/npc/odontotyrannos/male/jaw.vox diff --git a/assets/voxygen/voxel/npc/odontotyrannos/Odontotyrannos-5.vox b/assets/voxygen/voxel/npc/odontotyrannos/male/leg_l.vox similarity index 100% rename from assets/voxygen/voxel/npc/odontotyrannos/Odontotyrannos-5.vox rename to assets/voxygen/voxel/npc/odontotyrannos/male/leg_l.vox diff --git a/assets/voxygen/voxel/npc/odontotyrannos/male/leg_r.vox b/assets/voxygen/voxel/npc/odontotyrannos/male/leg_r.vox new file mode 100644 index 0000000000000000000000000000000000000000..245295d41f668ded54130948c301aad75c5f8d6f GIT binary patch literal 2476 zcmX9;4Qy8B6@LHUYjl}pF&l#s?XXd3iz(P*DYO)j7Rpa8EtK+8ek=~?H}3uJT}y$) zjvq@^XalPSmw_S(Oro%&KsOyoLdIlcW*IY59d3ybH>S%LHZXhkTz8X`^WOK~_nhZE z=Q(fvoCWvy3L$1qu9{6J`tA~YUVRvX4}ku{8+*3JCF=-67r+KH1`RKQvT z8=JsJHXv?tCv!@YiP<+v)+>Lv`_52Cm+_QyXIE zTv@}u8^+e@UEmVOcgOiQHlQv7a!5>!V-&g9ntSAgGiJ!8ajEBhB5hSyYOD^&Z8^szzLI z@5beY8GJaa1^@l{8h+B=j?4E}W8b4C*fJy!H;){_JFA+pZF(7w_wK@H?XCFHjA=Ns zq6xn)ufR_yl;Fzw0d!ZEBRge0E=(#xT}2W0JpLHI*u5Dir;fwv&Q17Y<0^Dkm*Dy% z_u=nv=P z!yO?$UosqjYny?KZMFE>qGHsS72wZ38SGqGiqDU1!~Rt>arS#Wx2GAq+gos8MG-#T z-GoiGdAP83F8Y>^!nH%|v9+-fU+$X)oY{gK&yK>415e?2+f?+fD8R+`JWLrk41Yb< zg|@oUc%!uly-^iD**yUlp3cXMneQS~HwK^ehq!Wj2Y%RGf;V^6;ph8W@l5krobAd5 zjt|4{`f@RNFdx6_8;k$EGYwZyt;d<3LR^1yI&Ph-z(a)(W9{k^ym5E|KE3<{-2TIM z;Cz6;4~)dcV@omo+ux)O#qi<7>A!`X`@e&ipDV`Nrjgjz_9&J&;}pO0O=bFsNAAIJOGW7)Ftm^phC8kZMfR?TDB-m?bX z{WH;XY#mNs+>e#37huE7W!QGM88aFtqM|7uHJQoi>EDH?cW%V6j!9VjS_g{iOOdmw z28aK68ml))$Zwg6$Jx`7yE52z=mm)FYjM}IN(`M{j=Z=D;FT3%|$ML#J?0Wd*)gzl^U#sff03hw&Pu_Te%l6cArDnnzymK`p4MW zdJ?r08*yUiZ_w9r0<9I#qjbz<%*a`c=E99=$XkK$kL|$x>iOvJ7(m(RBFrCEh9wi{ zB3hBb@`vZ4rJxaK3wPjfRXgenit(q?E;JQS!k4%I!706iU;Oe6diwUEZPNy<+Zf}? zRZpU}p%!!IRN{##6H#0`9wmjjxOwv?1_uW*Fff3lM~|YjvlFeYt*EQ3!_=u$k&}~y LAwz~By#f9QHQ^EQ literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/npc/odontotyrannos/Odontotyrannos-8.vox b/assets/voxygen/voxel/npc/odontotyrannos/male/tail_back.vox similarity index 100% rename from assets/voxygen/voxel/npc/odontotyrannos/Odontotyrannos-8.vox rename to assets/voxygen/voxel/npc/odontotyrannos/male/tail_back.vox diff --git a/assets/voxygen/voxel/npc/odontotyrannos/Odontotyrannos-7.vox b/assets/voxygen/voxel/npc/odontotyrannos/male/tail_front.vox similarity index 100% rename from assets/voxygen/voxel/npc/odontotyrannos/Odontotyrannos-7.vox rename to assets/voxygen/voxel/npc/odontotyrannos/male/tail_front.vox diff --git a/assets/voxygen/voxel/theropod_central_manifest.ron b/assets/voxygen/voxel/theropod_central_manifest.ron index 1b21ef0838..d859b44337 100644 --- a/assets/voxygen/voxel/theropod_central_manifest.ron +++ b/assets/voxygen/voxel/theropod_central_manifest.ron @@ -5,7 +5,7 @@ central: ("npc.archaeos.male.head"), ), jaw: ( - offset: (-4.5, -9.0, -3.0), + offset: (-5.5, -9.0, -3.0), central: ("npc.archaeos.male.jaw"), ), neck: ( @@ -35,7 +35,7 @@ central: ("npc.archaeos.male.head"), ), jaw: ( - offset: (-4.5, -9.0, -3.0), + offset: (-5.5, -9.0, -3.0), central: ("npc.archaeos.male.jaw"), ), neck: ( @@ -61,62 +61,62 @@ ), (Odontotyrannos, Male): ( head: ( - offset: (-4.5, -4.0, -4.0), - central: ("npc.rat.male.head"), + offset: (-10.5, 0.0, -8.0), + central: ("npc.odontotyrannos.male.head"), ), jaw: ( - offset: (-4.5, -6.0, -4.0), - central: ("npc.rat.male.chest"), + offset: (-6.5, -7.0, -3.0), + central: ("npc.odontotyrannos.male.jaw"), ), neck: ( - offset: (-4.0, -1.5, -1.0), - central: ("npc.rat.male.chest"), + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), ), chest_front: ( - offset: (-4.0, -1.5, -1.0), - central: ("npc.rat.male.chest"), + offset: (-5.5, -5.0, -6.0), + central: ("npc.odontotyrannos.male.chest_front"), ), chest_back: ( - offset: (-4.0, -1.5, -1.0), - central: ("npc.rat.male.chest"), + offset: (-6.5, -8.0, -8.5), + central: ("npc.odontotyrannos.male.chest_back"), ), tail_front: ( - offset: (-0.5, -4.0, -1.5), - central: ("npc.rat.male.chest"), + offset: (-3.5, -8.0, -5.5), + central: ("npc.odontotyrannos.male.tail_front"), ), tail_back: ( - offset: (-0.5, -4.0, -1.5), - central: ("npc.rat.male.chest"), + offset: (-2.5, -8.0, -3.0), + central: ("npc.odontotyrannos.male.tail_back"), ), ), (Odontotyrannos, Female): ( head: ( - offset: (-4.5, -4.0, -4.0), - central: ("npc.rat.male.head"), + offset: (-10.5, 0.0, -8.0), + central: ("npc.odontotyrannos.male.head"), ), jaw: ( - offset: (-4.5, -6.0, -4.0), - central: ("npc.rat.male.chest"), + offset: (-6.5, -7.0, -3.0), + central: ("npc.odontotyrannos.male.jaw"), ), neck: ( - offset: (-4.0, -1.5, -1.0), - central: ("npc.rat.male.chest"), + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), ), chest_front: ( - offset: (-4.0, -1.5, -1.0), - central: ("npc.rat.male.chest"), + offset: (-5.5, -5.0, -6.0), + central: ("npc.odontotyrannos.male.chest_front"), ), chest_back: ( - offset: (-4.0, -1.5, -1.0), - central: ("npc.rat.male.chest"), + offset: (-6.5, -8.0, -8.5), + central: ("npc.odontotyrannos.male.chest_back"), ), tail_front: ( - offset: (-0.5, -4.0, -1.5), - central: ("npc.rat.male.chest"), + offset: (-3.5, -8.0, -5.5), + central: ("npc.odontotyrannos.male.tail_front"), ), tail_back: ( - offset: (-0.5, -4.0, -1.5), - central: ("npc.rat.male.chest"), + offset: (-2.5, -8.0, -3.0), + central: ("npc.odontotyrannos.male.tail_back"), ), ), }) diff --git a/assets/voxygen/voxel/theropod_lateral_manifest.ron b/assets/voxygen/voxel/theropod_lateral_manifest.ron index 67e48db670..9c4db7376e 100644 --- a/assets/voxygen/voxel/theropod_lateral_manifest.ron +++ b/assets/voxygen/voxel/theropod_lateral_manifest.ron @@ -5,7 +5,7 @@ lateral: ("npc.archaeos.male.hand_l"), ), hand_r: ( - offset: (0.0, -2.0, -4.0), + offset: (0.0, -2.0, -9.0), lateral: ("npc.archaeos.male.hand_r"), ), leg_l: ( @@ -31,7 +31,7 @@ lateral: ("npc.archaeos.male.hand_l"), ), hand_r: ( - offset: (0.0, -2.0, -4.0), + offset: (0.0, -2.0, -9.0), lateral: ("npc.archaeos.male.hand_r"), ), leg_l: ( @@ -53,54 +53,54 @@ ), (Odontotyrannos, Male): ( hand_l: ( - offset: (-6.0, -3.5, -4.0), - lateral: ("npc.ogre.male.shoulder_l"), + offset: (-3.0, -3.0, -7.0), + lateral: ("npc.odontotyrannos.male.hand_l"), ), hand_r: ( - offset: (-6.0, -4.5, -4.0), - lateral: ("npc.ogre.male.shoulder_r"), + offset: (0.0, -3.0, -7.0), + lateral: ("npc.odontotyrannos.male.hand_r"), ), leg_l: ( - offset: (-6.0, -3.5, -4.0), - lateral: ("npc.ogre.male.shoulder_l"), + offset: (-7.0, -4.5, -4.0), + lateral: ("npc.odontotyrannos.male.leg_l"), ), leg_r: ( - offset: (-6.0, -4.5, -4.0), - lateral: ("npc.ogre.male.shoulder_r"), + offset: (0.0, -4.5, -4.0), + lateral: ("npc.odontotyrannos.male.leg_r"), ), foot_l: ( - offset: (-6.0, -3.5, -4.0), - lateral: ("npc.ogre.male.shoulder_l"), + offset: (-14.0, -1.0, -8.0), + lateral: ("npc.odontotyrannos.male.foot_l"), ), foot_r: ( - offset: (-6.0, -4.5, -4.0), - lateral: ("npc.ogre.male.shoulder_r"), + offset: (-6.0, -1.0, -8.0), + lateral: ("npc.odontotyrannos.male.foot_r"), ), ), (Odontotyrannos, Female): ( hand_l: ( - offset: (-6.0, -3.5, -4.0), - lateral: ("npc.ogre.male.shoulder_l"), + offset: (-3.0, -3.0, -7.0), + lateral: ("npc.odontotyrannos.male.hand_l"), ), hand_r: ( - offset: (-6.0, -4.5, -4.0), - lateral: ("npc.ogre.male.shoulder_r"), + offset: (0.0, -3.0, -7.0), + lateral: ("npc.odontotyrannos.male.hand_r"), ), leg_l: ( - offset: (-6.0, -3.5, -4.0), - lateral: ("npc.ogre.male.shoulder_l"), + offset: (-7.0, -4.5, -4.0), + lateral: ("npc.odontotyrannos.male.leg_l"), ), leg_r: ( - offset: (-6.0, -4.5, -4.0), - lateral: ("npc.ogre.male.shoulder_r"), + offset: (0.0, -4.5, -4.0), + lateral: ("npc.odontotyrannos.male.leg_r"), ), foot_l: ( - offset: (-6.0, -3.5, -4.0), - lateral: ("npc.ogre.male.shoulder_l"), + offset: (-14.0, -1.0, -8.0), + lateral: ("npc.odontotyrannos.male.foot_l"), ), foot_r: ( - offset: (-6.0, -4.5, -4.0), - lateral: ("npc.ogre.male.shoulder_r"), + offset: (-6.0, -1.0, -8.0), + lateral: ("npc.odontotyrannos.male.foot_r"), ), ), }) diff --git a/voxygen/src/anim/src/quadruped_medium/run.rs b/voxygen/src/anim/src/quadruped_medium/run.rs index 310e6d2105..23af24cfd3 100644 --- a/voxygen/src/anim/src/quadruped_medium/run.rs +++ b/voxygen/src/anim/src/quadruped_medium/run.rs @@ -133,11 +133,11 @@ impl Animation for RunAnimation { skeleton_attr.torso_front.1 + canceler * 1.0 + canceler * shortalt * 2.5 - + x_tilt * 10.0, + + x_tilt * 10.0 * canceler, ) * skeleton_attr.scaler / 11.0; next.torso_front.orientation = - Quaternion::rotation_x((amplitude * (short * -0.13).max(-0.2)) + x_tilt) + Quaternion::rotation_x((amplitude * (short * -0.13).max(-0.2)) + x_tilt * (canceler * 6.0).min(1.0)) * Quaternion::rotation_y(tilt * 0.8) * Quaternion::rotation_z(tilt * -1.5); next.torso_front.scale = Vec3::one() * skeleton_attr.scaler / 11.0; diff --git a/voxygen/src/anim/src/theropod/idle.rs b/voxygen/src/anim/src/theropod/idle.rs index f82a9575a1..7fc5ea3121 100644 --- a/voxygen/src/anim/src/theropod/idle.rs +++ b/voxygen/src/anim/src/theropod/idle.rs @@ -58,52 +58,53 @@ impl Animation for IdleAnimation { next.tail_back.scale = Vec3::one(); next.hand_l.position = Vec3::new( - skeleton_attr.hand_l.0, - skeleton_attr.hand_l.0, - skeleton_attr.hand_l.1, + -skeleton_attr.hand.0, + skeleton_attr.hand.1, + skeleton_attr.hand.2, ); next.hand_l.orientation = Quaternion::rotation_z(0.0); next.hand_l.scale = Vec3::one(); next.hand_r.position = Vec3::new( - skeleton_attr.hand_r.0, - skeleton_attr.hand_r.0, - skeleton_attr.hand_r.1, + skeleton_attr.hand.0, + skeleton_attr.hand.1, + skeleton_attr.hand.2, ); next.hand_r.orientation = Quaternion::rotation_z(0.0); - next.hand_l.scale = Vec3::one(); + next.hand_r.scale = Vec3::one(); next.leg_l.position = Vec3::new( - skeleton_attr.leg_l.0, - skeleton_attr.leg_l.0, - skeleton_attr.leg_l.1, + -skeleton_attr.leg.0, + skeleton_attr.leg.1, + skeleton_attr.leg.2, ); next.leg_l.orientation = Quaternion::rotation_z(0.0); next.leg_l.scale = Vec3::one(); next.leg_r.position = Vec3::new( - skeleton_attr.leg_r.0, - skeleton_attr.leg_r.0, - skeleton_attr.leg_r.1, + skeleton_attr.leg.0, + skeleton_attr.leg.1, + skeleton_attr.leg.2, ); next.leg_r.orientation = Quaternion::rotation_z(0.0); next.leg_r.scale = Vec3::one(); next.foot_l.position = Vec3::new( - skeleton_attr.foot_l.0, - skeleton_attr.foot_l.0, - skeleton_attr.foot_l.1, + -skeleton_attr.foot.0, + skeleton_attr.foot.1, + skeleton_attr.foot.2, ); next.foot_l.orientation = Quaternion::rotation_z(0.0); next.foot_l.scale = Vec3::one(); next.foot_r.position = Vec3::new( - skeleton_attr.foot_r.0, - skeleton_attr.foot_r.0, - skeleton_attr.foot_r.1, + skeleton_attr.foot.0, + skeleton_attr.foot.1, + skeleton_attr.foot.2, ); next.foot_r.orientation = Quaternion::rotation_z(0.0); next.foot_r.scale = Vec3::one(); + next } } diff --git a/voxygen/src/anim/src/theropod/jump.rs b/voxygen/src/anim/src/theropod/jump.rs index a18778e6a6..fe6be33a0b 100644 --- a/voxygen/src/anim/src/theropod/jump.rs +++ b/voxygen/src/anim/src/theropod/jump.rs @@ -59,49 +59,49 @@ impl Animation for JumpAnimation { next.tail_back.scale = Vec3::one(); next.hand_l.position = Vec3::new( - skeleton_attr.hand_l.0, - skeleton_attr.hand_l.0, - skeleton_attr.hand_l.1, + -skeleton_attr.hand.0, + skeleton_attr.hand.1, + skeleton_attr.hand.2, ); next.hand_l.orientation = Quaternion::rotation_z(0.0); next.hand_l.scale = Vec3::one(); next.hand_r.position = Vec3::new( - skeleton_attr.hand_r.0, - skeleton_attr.hand_r.0, - skeleton_attr.hand_r.1, + skeleton_attr.hand.0, + skeleton_attr.hand.1, + skeleton_attr.hand.2, ); next.hand_r.orientation = Quaternion::rotation_z(0.0); next.hand_l.scale = Vec3::one(); next.leg_l.position = Vec3::new( - skeleton_attr.leg_l.0, - skeleton_attr.leg_l.0, - skeleton_attr.leg_l.1, + -skeleton_attr.leg.0, + skeleton_attr.leg.1, + skeleton_attr.leg.2, ); next.leg_l.orientation = Quaternion::rotation_z(0.0); next.leg_l.scale = Vec3::one(); next.leg_r.position = Vec3::new( - skeleton_attr.leg_r.0, - skeleton_attr.leg_r.0, - skeleton_attr.leg_r.1, + skeleton_attr.leg.0, + skeleton_attr.leg.1, + skeleton_attr.leg.2, ); next.leg_r.orientation = Quaternion::rotation_z(0.0); next.leg_r.scale = Vec3::one(); next.foot_l.position = Vec3::new( - skeleton_attr.foot_l.0, - skeleton_attr.foot_l.0, - skeleton_attr.foot_l.1, + -skeleton_attr.foot.0, + skeleton_attr.foot.1, + skeleton_attr.foot.2, ); next.foot_l.orientation = Quaternion::rotation_z(0.0); next.foot_l.scale = Vec3::one(); next.foot_r.position = Vec3::new( - skeleton_attr.foot_r.0, - skeleton_attr.foot_r.0, - skeleton_attr.foot_r.1, + skeleton_attr.foot.0, + skeleton_attr.foot.1, + skeleton_attr.foot.2, ); next.foot_r.orientation = Quaternion::rotation_z(0.0); next.foot_r.scale = Vec3::one(); diff --git a/voxygen/src/anim/src/theropod/mod.rs b/voxygen/src/anim/src/theropod/mod.rs index 4a024f8663..86b08cfb5a 100644 --- a/voxygen/src/anim/src/theropod/mod.rs +++ b/voxygen/src/anim/src/theropod/mod.rs @@ -77,12 +77,9 @@ pub struct SkeletonAttr { chest_back: (f32, f32), tail_front: (f32, f32), tail_back: (f32, f32), - hand_l: (f32, f32, f32), - hand_r: (f32, f32, f32), - leg_l: (f32, f32, f32), - leg_r: (f32, f32, f32), - foot_l: (f32, f32, f32), - foot_r: (f32, f32, f32), + hand: (f32, f32, f32), + leg: (f32, f32, f32), + foot: (f32, f32, f32), } impl<'a> std::convert::TryFrom<&'a comp::Body> for SkeletonAttr { @@ -106,12 +103,9 @@ impl Default for SkeletonAttr { chest_back: (0.0, 0.0), tail_front: (0.0, 0.0), tail_back: (0.0, 0.0), - hand_l: (0.0, 0.0, 0.0), - hand_r: (0.0, 0.0, 0.0), - leg_l: (0.0, 0.0, 0.0), - leg_r: (0.0, 0.0, 0.0), - foot_l: (0.0, 0.0, 0.0), - foot_r: (0.0, 0.0, 0.0), + hand: (0.0, 0.0, 0.0), + leg: (0.0, 0.0, 0.0), + foot: (0.0, 0.0, 0.0), } } } @@ -121,56 +115,44 @@ impl<'a> From<&'a Body> for SkeletonAttr { use comp::theropod::Species::*; Self { head: match (body.species, body.body_type) { - (Archaeos, _) => (6.5, 3.0), - (Odontotyrannos, _) => (5.0, 1.0), + (Archaeos, _) => (8.0, 4.0), + (Odontotyrannos, _) => (-2.5, 3.0), }, jaw: match (body.species, body.body_type) { - (Archaeos, _) => (0.0, 6.0), - (Odontotyrannos, _) => (-1.0, 3.0), + (Archaeos, _) => (10.0, -7.0), + (Odontotyrannos, _) => (10.0, -7.0), }, neck: match (body.species, body.body_type) { - (Archaeos, _) => (0.0, 6.0), - (Odontotyrannos, _) => (-1.0, 3.0), + (Archaeos, _) => (4.5, -2.0), + (Odontotyrannos, _) => (4.5, -2.0), }, chest_front: match (body.species, body.body_type) { - (Archaeos, _) => (0.0, 6.0), - (Odontotyrannos, _) => (-1.0, 3.0), + (Archaeos, _) => (4.5, 20.0), + (Odontotyrannos, _) => (4.0, 13.0), }, chest_back: match (body.species, body.body_type) { - (Archaeos, _) => (0.0, 6.0), - (Odontotyrannos, _) => (-1.0, 3.0), + (Archaeos, _) => (-5.5, -1.0), + (Odontotyrannos, _) => (-5.0, 2.0), }, tail_front: match (body.species, body.body_type) { - (Archaeos, _) => (-8.0, -1.0), - (Odontotyrannos, _) => (-7.0, -1.0), + (Archaeos, _) => (-9.0, -1.5), + (Odontotyrannos, _) => (-8.0, -1.0), }, tail_back: match (body.species, body.body_type) { - (Archaeos, _) => (-8.0, -1.0), - (Odontotyrannos, _) => (-7.0, -1.0), + (Archaeos, _) => (-20.0, -0.5), + (Odontotyrannos, _) => (-19.0, -1.5), }, - hand_l: match (body.species, body.body_type) { - (Archaeos, _) => (-8.0, -1.0, 0.0), - (Odontotyrannos, _) => (-7.0, -1.0, 0.0), + hand: match (body.species, body.body_type) { + (Archaeos, _) => (2.5, -2.5, -4.0), + (Odontotyrannos, _) => (3.5, 3.0, -4.0), }, - hand_r: match (body.species, body.body_type) { - (Archaeos, _) => (8.0, -1.0, 0.0), - (Odontotyrannos, _) => (7.0, -1.0, 0.0), + leg: match (body.species, body.body_type) { + (Archaeos, _) => (4.5, -9.0, -4.0), + (Odontotyrannos, _) => (5.5, -6.5, -2.0), }, - leg_l: match (body.species, body.body_type) { - (Archaeos, _) => (-8.0, -1.0, 0.0), - (Odontotyrannos, _) => (-7.0, -1.0, 0.0), - }, - leg_r: match (body.species, body.body_type) { - (Archaeos, _) => (8.0, -1.0, 0.0), - (Odontotyrannos, _) => (7.0, -1.0, 0.0), - }, - foot_l: match (body.species, body.body_type) { - (Archaeos, _) => (-8.0, -1.0, 0.0), - (Odontotyrannos, _) => (-7.0, -1.0, 0.0), - }, - foot_r: match (body.species, body.body_type) { - (Archaeos, _) => (8.0, -1.0, 0.0), - (Odontotyrannos, _) => (7.0, -1.0, 0.0), + foot: match (body.species, body.body_type) { + (Archaeos, _) => (1.0, -0.5, -8.0), + (Odontotyrannos, _) => (-1.0, -6.5, -3.0), }, } } diff --git a/voxygen/src/anim/src/theropod/run.rs b/voxygen/src/anim/src/theropod/run.rs index 4ca88632a4..c607a53f8f 100644 --- a/voxygen/src/anim/src/theropod/run.rs +++ b/voxygen/src/anim/src/theropod/run.rs @@ -22,9 +22,9 @@ impl Animation for RunAnimation { ) -> Self::Skeleton { let mut next = (*skeleton).clone(); - let wave = (anim_time as f32 * 8.0).sin(); - let wavealt = (anim_time as f32 * 8.0 + PI / 2.0).sin(); - let wave_slow = (anim_time as f32 * 6.5 + PI).sin(); + //let wave = (anim_time as f32 * 8.0).sin(); + //let wavealt = (anim_time as f32 * 8.0 + PI / 2.0).sin(); + //let wave_slow = (anim_time as f32 * 6.5 + PI).sin(); next.head.position = Vec3::new(0.0, skeleton_attr.head.0, skeleton_attr.head.1); next.head.orientation = Quaternion::rotation_z(0.0); @@ -62,49 +62,49 @@ impl Animation for RunAnimation { next.tail_back.scale = Vec3::one(); next.hand_l.position = Vec3::new( - skeleton_attr.hand_l.0, - skeleton_attr.hand_l.0, - skeleton_attr.hand_l.1, + -skeleton_attr.hand.0, + skeleton_attr.hand.1, + skeleton_attr.hand.2, ); next.hand_l.orientation = Quaternion::rotation_z(0.0); next.hand_l.scale = Vec3::one(); next.hand_r.position = Vec3::new( - skeleton_attr.hand_r.0, - skeleton_attr.hand_r.0, - skeleton_attr.hand_r.1, + skeleton_attr.hand.0, + skeleton_attr.hand.1, + skeleton_attr.hand.2, ); next.hand_r.orientation = Quaternion::rotation_z(0.0); next.hand_l.scale = Vec3::one(); next.leg_l.position = Vec3::new( - skeleton_attr.leg_l.0, - skeleton_attr.leg_l.0, - skeleton_attr.leg_l.1, + -skeleton_attr.leg.0, + skeleton_attr.leg.1, + skeleton_attr.leg.2, ); next.leg_l.orientation = Quaternion::rotation_z(0.0); next.leg_l.scale = Vec3::one(); next.leg_r.position = Vec3::new( - skeleton_attr.leg_r.0, - skeleton_attr.leg_r.0, - skeleton_attr.leg_r.1, + skeleton_attr.leg.0, + skeleton_attr.leg.1, + skeleton_attr.leg.2, ); next.leg_r.orientation = Quaternion::rotation_z(0.0); next.leg_r.scale = Vec3::one(); next.foot_l.position = Vec3::new( - skeleton_attr.foot_l.0, - skeleton_attr.foot_l.0, - skeleton_attr.foot_l.1, + -skeleton_attr.foot.0, + skeleton_attr.foot.1, + skeleton_attr.foot.2, ); next.foot_l.orientation = Quaternion::rotation_z(0.0); next.foot_l.scale = Vec3::one(); next.foot_r.position = Vec3::new( - skeleton_attr.foot_r.0, - skeleton_attr.foot_r.0, - skeleton_attr.foot_r.1, + skeleton_attr.foot.0, + skeleton_attr.foot.1, + skeleton_attr.foot.2, ); next.foot_r.orientation = Quaternion::rotation_z(0.0); next.foot_r.scale = Vec3::one();