From b83ab824b903aec2945ce6d5e0ef3a1241413ef8 Mon Sep 17 00:00:00 2001 From: Pfauenauge90 <44173739+Pfauenauge90@users.noreply.github.com> Date: Fri, 26 Apr 2019 15:13:30 +0200 Subject: [PATCH 1/4] removed test_assets in voxygen Former-commit-id: e9a0ab15ea5c1d11a98db7875846d4afd33453dc --- assets/voxygen | 2 +- voxygen/src/hud/mod.rs | 11 ++++++++--- voxygen/test_assets/body.vox | Bin 6984 -> 0 bytes voxygen/test_assets/dragon_body.vox | Bin 9540 -> 0 bytes voxygen/test_assets/dragon_lfoot.vox | Bin 1408 -> 0 bytes voxygen/test_assets/dragon_rfoot.vox | Bin 1408 -> 0 bytes voxygen/test_assets/dragon_tail.vox | Bin 2080 -> 0 bytes voxygen/test_assets/dragon_wingL_in.vox | Bin 2884 -> 0 bytes voxygen/test_assets/dragon_wingL_out.vox | Bin 3544 -> 0 bytes voxygen/test_assets/dragon_wingR_in.vox | Bin 2884 -> 0 bytes voxygen/test_assets/dragon_wingR_out.vox | Bin 3544 -> 0 bytes voxygen/test_assets/dragonhead.vox | Bin 3040 -> 0 bytes voxygen/test_assets/foot_BL.vox | Bin 1236 -> 0 bytes voxygen/test_assets/foot_BR.vox | Bin 1236 -> 0 bytes voxygen/test_assets/foot_FL.vox | Bin 1192 -> 0 bytes voxygen/test_assets/foot_FR.vox | Bin 1192 -> 0 bytes voxygen/test_assets/lionhead.vox | Bin 5164 -> 0 bytes voxygen/test_assets/sabremale.vox | Bin 7436 -> 0 bytes 18 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 voxygen/test_assets/body.vox delete mode 100644 voxygen/test_assets/dragon_body.vox delete mode 100644 voxygen/test_assets/dragon_lfoot.vox delete mode 100644 voxygen/test_assets/dragon_rfoot.vox delete mode 100644 voxygen/test_assets/dragon_tail.vox delete mode 100644 voxygen/test_assets/dragon_wingL_in.vox delete mode 100644 voxygen/test_assets/dragon_wingL_out.vox delete mode 100644 voxygen/test_assets/dragon_wingR_in.vox delete mode 100644 voxygen/test_assets/dragon_wingR_out.vox delete mode 100644 voxygen/test_assets/dragonhead.vox delete mode 100644 voxygen/test_assets/foot_BL.vox delete mode 100644 voxygen/test_assets/foot_BR.vox delete mode 100644 voxygen/test_assets/foot_FL.vox delete mode 100644 voxygen/test_assets/foot_FR.vox delete mode 100644 voxygen/test_assets/lionhead.vox delete mode 100644 voxygen/test_assets/sabremale.vox diff --git a/assets/voxygen b/assets/voxygen index 25346c1ead..b5c4e96c49 160000 --- a/assets/voxygen +++ b/assets/voxygen @@ -1 +1 @@ -Subproject commit 25346c1ead7d03b11f7f4403332f2288824c6ca9 +Subproject commit b5c4e96c490667d4aef061f5e1792c196b9c88d0 diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index a8d1f55c48..8ff6e1bee3 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -633,13 +633,18 @@ impl Hud { //Image::new(self.imgs.mmap_frame_bg) //.w_h(1750.0 / 8.0, 1650.0 / 8.0) //.top_right_with_margins_on(ui_widgets.window, 5.0, 5.0) - //.set(self.ids.mmap_frame_bg, ui_widgets); + //.set(self.ids.mmap_frame_bg, ui_widgets); + Image::new(self.imgs.mmap_frame) - .w_h(1750.0 / 8.0, 1650.0 / 8.0) + .w_h(100.0*2.5, 100.0*2.5) .top_right_with_margins_on(ui_widgets.window, 5.0, 5.0) .set(self.ids.mmap_frame, ui_widgets); + Rectangle::fill_with([92.0*2.5, 82.0*2.5], color::RED) + .mid_top_with_margin_on(self.ids.mmap_frame, 13.0*2.5+2.5) + .set(self.ids.mmap_frame_bg, ui_widgets); + // Title // Make it display the actual location Text::new("Uncanny Valley") @@ -1236,7 +1241,7 @@ impl Hud { } // Title Text::new("Social") - .mid_top_with_margin_on(self.ids.social_frame, 16.0) + .mid_top_with_margin_on(self.ids.social_frame, 17.0) .font_id(self.font_metamorph) .font_size(14) .color(TEXT_COLOR) diff --git a/voxygen/test_assets/body.vox b/voxygen/test_assets/body.vox deleted file mode 100644 index d6c7aa48dcc2c87e2cddbfa2b1ccb66f309a022f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6984 zcma)=Yp8A2b;s9UbB;0QTx;!p_Ich{s`jdh_gZ3n)JL`HwQ9}Y=V)rIHn~Z}l!ST_ zn;=CJxuhhwmD*rxt!U2OduweGDIqoym6m=m5+npd2sV^Lkq}Dh*M2Ca-$sAq_%WDv z!(gsC=a{eY{EvO_M?ZeiGfmUnar5j>n&z5gO>_6`^ld|Q_>G~X&<6DJPn@3RLwxZ2 zt~8Bq%B~#h=2~nnW4>iP&oW*~riId^%yL&}x~+4`17ksJ&q-ce$#yqSYs{xQm$uF` zBpHf+fecbepc?JkN-g%8K9|KE!x)3Yu~e%%`+s~_A?}fI~p{| zZj)^}WL=C>T}sh;F3KFO(JD0Q*pGJ1`!pbn-emF5^qn)A(c8yyg%{& zj4U$WIlhraO5}t($4jJvX5aSxw43uNCCaIpc1YdBf0_rPeYR=G!zZ z#m3x6b~C&QU5Jj6(`24^x_O^uq2n^I>oV^)psh0RHjQuIbGYnvTa0Z&=+(w~SEqHZ zlREFREb6w*dy!?`l3ABBeWhi5Q)Yc@`*nlyE#tc^yX`XTMVGqPv6nHfvmU*4o6(kK zp6Gnk>VA)W`-9dNIrKgf#>zsXMHgwL`+1|Ax2>M<7|-;(w(LuchaR`OdFc!9#eSxo zWvu0$o!LSM_FFgfgiWztr|=;YgFhn|UE^)*p-1I?$nbF8(?g8yppS{{+K_iM>ueHo zuz6WS-xHhHNk6M={j5`6D7vVd{a&ZGtQ)kvxvtZ4_d1R7vM}t##{ImLvMA$zX4}{c z_EEWqZS~wI?-tt9bH;YRXOkY=nQ#_&LpO!KuJMjT@UQW`Q@9K5Ht#`ZHsyPBJTK9r zPu&{NjW^gjdqTArc(I8cd@AydXSyDfH?cF@-jW80j)#htde#}04dtit{Y`zsrKv!<}7Y%+!|mM!jr9|}54 z*klQx#3l{@EJHtQu}vec*npp4pDlJ-hKdb$i?WH0x80(4aTjF1QRh8%X2m09W8FZxsZ+^cSKEw2A)+Rf_}*><#Rm36d}IumqJ){(z;=o}j;tP4HEU(io&8C&Nri59;t(Z|MX zrp1SAVjc5^{Ve9;Gv%s8_bTN?aE46)Er z>;q2+k5<_oF)#RECC}*;8;iI>%rN%rq+gcsd+ArkcvV{Z%6k-<6dSL4e7#~TI-t`5 z9d~)R5|6BA>^$rdKKi92mT-QB&ls}~9}S<5xxU9f87JS_K|7#3Ip3=;N01RC727J< zVz0IsLCXEDjCo&OSsl+uw91)EJgfMhb;OCvJ{#;Cv4!(2zI))^O?~&7${9eg-mXRG~#Q4Jfl^9*nOM|Z#{6!8S@9=A4 zSi!G^*iu4&YqHxV^oAS+SqiqA!5fuaUe|3_6Z=92)v3)Se0t4h8h(NO)=it`ZT8+^ z?648@cpouJ$OqPudx_6Nj?lz=xI^ZQLhdOCd4svoC%mN)7x7o4HRg?ZV{NfvX~tOa zAdA9T!o2W4L1wm&K6pp2*n|!XQ+Rok@tz`lL&_Q@hLq4%B@SXwNrqM7t_pssU{QwvWJq_+V}xUGiFz%-_7D+_E>kP$km<1!O+Zz2C%2hj?7xYCw_zRCNUd|dE% zi*NE$0dp4aR=8W?Zk2H%j}&asSX0@zPu;R$=b3Tiein1|D{BqRT#Y@AHQ1<->uX>z z{Gbr0GI_p&6OH*gCNDEquyqL>0M04cc|jJ2J_`LDcp%2Wo7Qrt&_8b}d{@W<|0sKb zg^kuKI)Q|IDdbM!O+t<>0#DcibH=x!vzo^X2|p!AOZYQ+T*%uQ|ILhN#%jn7oh5i{ z9+n9z#AbsMzL2p4!;Z3!mx3KB7`)5GA#76u$AD9ey9;d&e8SrbI6ULKLf^pU3f8GP z&OxT&6^VEgHo;y7URP{C5i^9jgdZB%U9rWCPYD>MJBZcXk(iRPc>&)T_AX$Q61GIW zB4CFucMBEH8c{>Q*MU7#>;d*EF&23?5&t6wfd2(7B;XAJe<+wCV`mBmP->k{yH%lX zNyPSnxTV1S)MGjPF7ha%Qjbhb+WQJm-@+gYe&o}w1x2kk5XGHwSh)nCAMk! zGMHV-iJ5z6?vTMdO72zah#WD6n!bzOh>)d@jd}JY19?iTmqX2`t7N&dTOMO`lzEe z>V$9JTd7?N*ieW~3J%byhrlsHKB;_bNDbJQ6rh$)y&xZRB?3+QOq?m_&}rksAW{vA)1#=&YdQ26-7aS0IfVH)<(# zJfc=g?2}lR0#kzZ5|~BotWrFaY(` zDC(BT^Vsr;a}$0&qE6C0U8zi;Q(|IEzoljxQIiNcM92{>by7=>l*4Yxzlx11_LMna z@Xa=AG-8Xy9QY&?j}<#h#3hNiM1F0le_HCEmb<6}N$>SMpnWB%3gj_#x z-wf7NVv7HnfV;^;BF;GCvbNQ?r*^jBS^TTf-RM}sl-7g*5{}fBlg7{ zxG8}XH0qtOS+GS0D`j%IfIAYgBZHd~dt`EF!dDZvpQFWI1iplSXU2rF41XfNCUl=! zBe4cwO!2nhi#6~F{0aP<8JDm-aBikA^b?ph(--;)T$7a$!LouJ1Z*eZNMR2Fzoys=>?+{L3{I8!Po_t1 z#2AhHQjZ9}BiN?mqk{Z0vdn>R!J5LEiTs?&#Toy|V5|W>C^=J+g~ZuW-{QX-^)j(s z$!D3EDDYkHXDG2&$y)QMOL>^DUA8q9FgZFYb za+9PfIdi&_M)wWM4Y?Caqq1M2G^(_9Um81aK`l87Qh1fVjLLa~GE@%QN?Yl7v>oU6 z=PQ)k;e3JeXkZP*x6u~J_*O{TG3}T>ZCZnm7P6qGr-j(d8hGgoeW5S(jWdn&gjQ&k zyC~n<@J4cjL21N)8Bl7v{nYgI`$gru@?H7P&A{7-{oIZh1(Gyb7?j$9x^-BztnHw7 zL{5iVx+H~lwhp0o^e$_+mXjpYn zZaEi{M6Cd6d_x9l=oA!O$o&`jMPI($ zPdtBvH@As54|d+Xu;I;HJ3hUm@k0+a{=O$0|CMhyULI_Ge6I0L`a9oj{F*y@pFcG9 z(_h*2KYRU`{MNIL-}Q9kzxQ(EU-~g??>g!ioH_27oIUB+zIw`!J-p?|pE&9#U%b$- z{Qd|0(5D)|?D%8%H~!3- z#_zkn@kefL{2PqlboB$`|~`$G_@F&K>dZ z|8?U(`DEkYyzDYRapHtOaPcF)_mNk;IrpeDib3+~2(FUw`F$zW?2~ z{a3&6xPSPo&-?CkZ}{Ece%nu-I^{oW+?xXVe|vhn@t^*~yZ8Gk_Vs_wTrh>LC#6mQcO@0x7Y>0>;A|?@ph(z?X2N69xz0Ozaflqqa58j;n>s;qL*SXI5 z{J;O(UiaoJA6%B@)|cG!TFG+#)ywk6TW-I3KMVej;d0FKo8NN#Ez9F&{Jpp>%kE4+ z+MQ{rN6VQaEl2yAo>qUl9WAG;v>xrTwe4u@*e3mG+v#&s`za{zj^Q{?%zB){F|v>2 z1Ww{qJK7twH)fG8Gd)(0mg6{qlQ=cYSs5pBDx25*yQzbDd)Jn<;Z#!B)M3L8`&lmX z*jr1ZU$2*T8_3x0aSX?C0%Y#U+@Fr*MP+)Dwj;Y_vn|o*Oow;}B-W|gUoWj)e zxcTP1bNwgf=bjv&ZBjD#Q!YK0GuC-hy*@ko>`u?JwnM$KGd)eW({!u)Rk~nT>4;sO z_4-#f#jdh5cBl0{GyC$RA}#tCeT#lYpR6vc%j&YaJjbZBr<;A)*l$ml1^YQSyKd~a z*^kX0Z_^*o1nt&BzlER0uv zvmgHm{3P(3zM_$RUy9ZrPcGIdRoCg7)F*a~>=>n4eMQX1 zAzw&G1r_=5)c2uPe9UC$^@f>-`D5z-Y z*bvV}?NNKw9<@j9QTwb9>Vx{AKBx~z;Vk`;kWo<4(6J$$B^L=91r-e)8{%2=kx@|5 z&}Z5Hq_gHmK}DPCT#vRs_iy?vKU?|IDh901eQ`ck=RP>|alag`&TS6qC`cm`%Jc<( znB^-PI#%bqA773(`8d<#D}P?q2Sl=_9D2``e{9qD;dgpLEJ^P#6xm@{Fv%Xav==z44&NVpGQ9dD~AQ)Gr4ILXw+VPvN|J0Sv zVoH!kBxDp+H1t^xo3q9iY?z(PJniC~Cgr4@lq(xoXS!NrkuUODnrEu6ilfz+HC0-rMOvg;nx$#3OFqp$&T3`v>MR%eB46aQe3p;a7OgRgVbMJpXB?Yxl+D5! zzJ-L0f{KQY4XJGUEMiu=l#%3D=XZ6E^Q=cjLr0kY%rAp;9mJI&u0(Mt^06omMZO-z zq3G;KaVUyIS$o!=wP)>Fd)A({=NbR3Cs|9frevRzH6?3G)|9L%SyQs6!uJASj7Z2R zsA%X&iOsB|iKmM>7IQ4-*k&JkGLZ$Y=R1pXHla(7Yv@b6dSDs&ZAX zv&_$mx-#R1x}vVA%j&YatS+m|(;tOigH%Y z%2_$n!utqOPbb>WXq*-M6cKS=muO%V+s=z}=)A zlUQM|Vw!n=lEhKeBnBjFK$h?7x_({1u3tBp1U}IZDIag^ zUESL*qInAj@1Ee@Q~6oZr+815N;gzA^&K0+e0$9E#@B+F5X6SS&Vl^{n+LWJ_8`pn zi5L^bnrIKBy^HoR+RJEGgc!ZqoAUpW5epatn=;&_AuC=$nNqb@CEs* zuF9ub4)z-@&i?irNj}f9Gd=X@7xMLxH>dlq8Jkg7>p#ezDVyq7^ed4)=6eL?fVzV% ztifBdc}quc<&LzicP0Lo_*vp(!P_$;A)}z8q33!jc%McjWE501^jx&FXZ9|VW>hqE zb-^1qX7N&*QBcv))d%n3h=h!SiiVDu>5GhliiVDq#cLE)w3+wD&it<;cxNYM6jU?> zewmO_P|*;KO^5N;AZ-ZV?FktL6%B#E#}Y4PX*u{leU;5fG7(QBcv)vHBhfh)BpNsA%X|=@AeQ z`mmj}qM>8;jS~=&kWo<4(6Ra+3W!L^D5z-Y2)>P$pB_ki?pdf{KRZyk->C!`YqXDT~aB z7|>3!gZF4V0dL!O4BnP)hYcN#o!kvoyw8W2FMdR2Y^S_yPOvXIos4dLH?|wwjqS!Z zeVX@g)313qH{agPJG}W8Z@$l~v30(Qjjwd5WK=p-aw<8MoO;lKU$~Q6v<`E(`F`|{ zY~GV?-tF%A=B{tPD1}e_v@v;gBaK8)!iFa zzp7u=uj*Izt8}k)ulm)gzkbCUiZv8#DArJ{p;$w)hGGrH8j3Y!_iUkm#pXS`dDm{< z6PtI$<~`Br+UeTq+UeS-uGZA8sZT$kPoYntPoYntPoYntPoYntPoYnyPo__%Po__% zPo__%Po__%Po8_@e$NM8+(GWK%{{ic$2Rv^r(dUEr(dUEpZaQVpxUUG3{? zPgnc7^3m0vu6#7GPhgwCE`dz~n*=rqY?8DkwoBR*+a-MxUrl^9_4QI@i^vX<4Wji& z>yOqSt$(9i@Vyt2CibQw%NJB^-qD-yfz3O6^Pb+kwLANC_UY`?*{4tYc=vSgo-W>W zajef6X?&kD5Pf?t^Zh!%2~ehQS$Dz0ZYzIU*=XfQD<4|<(8`BaJ`~s{@cY0%f!_x< z3j98>Q(&jSPJx}0eo4QiU(zq>m-I{eCH<0qNx#Tuk3Tzgfy})jP%_2KQc8Kf{ z*&(t+WQWKOkqz3^VYL_DXYKGEU@s13_qcz5ifkUI9D5MSjATc1M03S?-mSZPi}ty8 z-)`NvTlekOeYGy!u?*gme2Ufom1hUG6yy~}uf{f(1gyc7esfX{M)f;P@%u}bR=?F0zt!ZK`n{#FTiUY+3M$$xYpb*UU~gr= z)f8mE%_P6kWE9kix?&%SeQ3&2+EMITnQiv9n>)uE?oTEO^6S1gzNXb3g1g+e%k# zr^!Y`MMgqIK;v(9`WzBAzfX2FR1{<+Ltl0Q|M?*zMLPS7wjyGq!qs_C9h=9$R?r2De2-uwaj)sJYfG#$)Lws;%qzUm* zXYR9n2pQ>+C;yyz(NK|*5D~D6K^+Zs#v>#|1axt#p&}z8qKjb-^$^SGB2BYS46KJZ z=+2OKajzX>pSh(85nW7dNQme&HX4$=1@odHBOS`-ykKq=W9s34@SZr_1?G@8cSAyRPo%?LVZ3{z z%sb;EJ(1Ba(hmh03GL$SLoXz>i*!OkMmm(qx=1F9KIJldEPf<$BsrJK`Ap7fa$b{j zo1DkwTqfr;Ij2cnOJZjdi5E%SNa9B{XB1bWd80TJ%^k&^X#OldXE8O4*I9hc;&-M~rcZ^xpN!K z=T491Tj$5gTbFU+y~}v)$CvTcuPme8xr}4?FXN2z`7bWxS-0-StKNHZ-2TBc;}5?6 zbK~XrE#vhMEaTU{yo?Wg-`Lk*KCZaqs`148t{cyJ_@?ogd(MulK6d%I?(>fu&-nI} z$Az~pl)#Jwl%QC)> zf5gAyf%h-t%YV9zN58O)?|fDHre%EY=4BkcVHrRAjb+@f{QldP@$q-5f8R1*cI`6W z{=8+p@8!$*l={~{>+*5O%~y?kUw_Sb@ZHZG_r2-4Uj5>0#=CEO?zr<+%een-%XsLwmhp{0UdD5-xP07l-4n-KpYybF&&zKdw_SIB z-0`f(jE}wI>hbW~pFVDW!869|e(}a}`!Bs@-1&~zj(hLAeSG})?i>$);ltwx-~8-& z_%m-EkN(wfj@@oIE<1B-TzTb{;~CdpHJ<>8G@ky9&yDAQ;GzZ3dd6}f9aU%i`Kgj>8($`5aes!9)7gPk(=$IdO5^u-@^%ZU58f IXVT@r0oGHx%>V!Z diff --git a/voxygen/test_assets/dragon_lfoot.vox b/voxygen/test_assets/dragon_lfoot.vox deleted file mode 100644 index 80828a713720e4be9d073de8f5282fa58a8c93bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1408 zcmchWZA@Eb6vxkV@9m4j7Z|0iFrjuZTA1Ud45%n`wkqoPZ3d|&EL&JZyJbt{XyU3((qzSoBqid*I2H`C7mUU^jlF7ABATA#{TlZ$iHs^SC=pfTdPYc0yq8hT zj7f>0smDtktem}y9PjD`fqB)w7NJ{q3`$0o`g+`FfZ z>-E*t)P#6Ejt7&3eOFeo&GH9+vsjSL1|Zipe;VCgH8_5>8S&vRq{sY7Paa2ldJv82 z2y(qv*pAs@f2#_vSr5o(0EIV!<~D;?t;h`!3QrTZP7ronCz!*8ClZ8w_SUO}`aljk zPv;^ynvV<1PopDF=t&Y@T_l`c^j}D(6d4d#eJ4{e-en z?mb0lSs~C%Jb%OtNWdKaIWW@W#MH?;#1A!M>Qp_oJ~gT6{DLiNQM z-&>BcpBgv;f^uFbo# zf8P=)F@l0<0hXs9zC-zrN=i!bc6kyt)q^;3@jSK+6yokz>--aI~3L9^3eOb_HCch)uY69m34AS^}IH!>yDW< SP({jXB)_ diff --git a/voxygen/test_assets/dragon_rfoot.vox b/voxygen/test_assets/dragon_rfoot.vox deleted file mode 100644 index 1e2bcfe32d72e45c57b712337b993ed77f354f69..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1408 zcmc(eZA?>F7{{M`?(NHDFCeAZ;!0OR+T!G;2y`GTLZ=0bLuRKP65TYj>r6={M4M&{ zb~9s+jj;wKQ4tMci;*d5NtbeNq+f1 z|K~jCIp>~xZ)o2^`y>$s+XFo;^sbJmFA(-Wtr{L|X~W-o@K89=Dydl_wOHtsoX{&d zk|`%K;wd^Mj10#zqo{eoc}8YPVb2IgW)#)y*fX+`i6cvtzU?h$i zK{P~atVlT_OWd1Pkzx|7%qnwEVuXQndR9HFj#bBV>}6JAluikQU==ypAaat5BDfEG z6`hF52JXWMMdq{0IYq~Ly@)A#!79i9dbkD2;cjF{1ISJsMRsZs zP1zUz8Z3=&FD5;l($w%sHcql9NtgktvQ>x712 z0lH2WB0N%zkC&cDXOhsHCcL>oIJ3%Yd#$iV9H>aT(U|d}EN+5h%nJ8hIqL3Ip|qb+ zF~Yqk39ZWndX4u_7(wZ0L5n7gRuy5swgeA$mH}NaAWeiN<_G2%CViT)@C6}1Pq=%F zy^k>KC*<}M*54+C*`E#(#*cA+n9$)O3^WslI|&y!-`ikC#P2|&*NMsF^++CQ!sLk# z8uyWNgD zmjjL4x8kLG7sfx>jD;%>{CL-m_50Ph$a`ky2=~4v{QNy35pm)|%7c{~9r*31KE%%# zV(cpuZmn9dj`IKg`8^&FK5v>qP2DV7M$f{Mvf$2D!h<&m*PTwdTrTX`xD$K#EP_%A zl*CK0H1+r$?o|}nY&N`KnMQ5RAda0shfM>exc_w}mckZH@LfH5|7|T3TCYQW_Ygk; zoSB+O>RJY$F5brUcWc-&IEuEjGw8m&jJ}&|@cDdrL;x8X`~i85@bH_*=X=QC*MH6P zPl#&kE~wfj4Qd*!ifH$Ij`kOV diff --git a/voxygen/test_assets/dragon_tail.vox b/voxygen/test_assets/dragon_tail.vox deleted file mode 100644 index 050f21c65a3468e0a49993190171cc26cc9904a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2080 zcmc(eYiO2r7{>qaY3}eIpVQp5x#npHQ|EMtrZx{tr%h9H=~B^Bat(2e5FNwNm9)$< z8&g4B7P3M#l}+C0gAEZ8L}W<>B_a`h?L$c4u71xW^}#QF?178>zW?`i-S_qU-{);x zyQy^07}L6>Wevf^bB)>1(%u~R3!Wkn136&R=Ju9fA|yPIL18$OEewZ2C|elvK_22P zLLMQHkcXo5K?H;hIfwuQ$G|agqU2HXXe2u^9LqZN9e56WkC+bfC@~B|*$j1tJsI|8 z*qdQ~hFuwUX4vha_s}~2IUY0UGUzNkSkxA^MQyXsVwTNr8xJ;KY&_X`vzcN0y})yf zI!X$2O$pUXav z+zVnjn+rD|B+(_&B$=5{KNm#c$A~!~N}dBR0xuTu`8~+fXwuXUz8(BKyoVQn9n=;a z3$GR&%fEB@mVXXE8q8uI-lHG_a_|+wcND||u!orDJ<|SN`oAOhV{tzg=N5Nl(X)7W zi@wDS%l~%hd;a~w^*HnB=fKPL!H#?%tIQJ9xeSQfO1?QtXJsEAYWt0sI2A1@QAZ z%L@?7=21uK<-y4#=5jv42lWK%3G^qR%i$~rlH|!CMzRU=1bG5p0xt=;3A`lmlE6!X z840{3@DhWwe#O!yCK~+BO?`d6dV72I=!DVAvo|%>`AdH~j>g7XI0FRHX;2R58>b(;SoO%$GT5$=vjmZZ#_0V>J1= z(X7ixxt&IdJ|mmjyI?fGwLq)(q}6`N)(6*~(ehrSbpuAPUotvy5AC{Qm2{M8T5qLl zN18OL+fmuEVpX1>qUu{SRk+1y+975S8ZEqTWL{x^Pp-^BQs%0o{+SsK&vkWw(Ijcr zvl=i)*T9e9H!!f@=+dV~W5Y(buTVD`oohDAt~Yw{rcpcf{x+lIJ2~HHw5-BtTfNb~ zhzxYierr zN!^g!Oii!#?uomg1l~-l@dgOMyx_0u(Z+NhnZ>OY0 z?@S-i+&Nv^dGv@TZY$K?Z>H;7dy!6XS5M#n;>Huftj!zlsC&0`;N-CSz8uj)LR6Tun_)dSoP%3-nl#aifRdKJoXE@9V$%{0mi8yi|T%9O?>U z>&%WIJ{M|KW@C4dPw)6Jh;1`Y2eBdC8$@5{KYna@<4_Q1oxUeKRiv6w$G^RQI8R0M EH>B;$0{{R3 diff --git a/voxygen/test_assets/dragon_wingL_in.vox b/voxygen/test_assets/dragon_wingL_in.vox deleted file mode 100644 index aa0a7eedb2afbf963d7ede5a3235f2f9b7bdf915..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2884 zcmc)LTZ~m#9mnziz|5S>zMs9%KDW6s+-9JbYqw3=qN1qrvV`jUzj_)CCrDwKpd}4?1F8GY1i7q_x7SF)M<=D9PKCZY3H^0q`s_sX+X?Br z6VQLhXAF+VIGi$LaY~HGDKaLfz_^@V#^&@eKBt>8I`bK)Gmo(%?zVQ^!(2PP)($Z* zw{}-#{3MCJ=8BCQ|7*c3<;`;k+UulStCQTP6njU z`#u@C`6OE?qYoAC^^++%!1EsKF-Z1OH{|MB;|ek)s3Jzrx<{xXM8Nw2S#fJcHsPTK zpYz(sI|12GhU5VC1q>o(?^KW>K@}c*At!w@r0tMBR(0P&X4Ls)6CPS9^K2hV=tmI) zNE6ydh6Gi2%{=5}NJg$r+N-$lL4!T)bFT>xEtIM2BTHmIStL{Tc?B5~R1qU}ZMvkb zgmRs7L^jAWbxqPk%Uz=nB@~fzW-7=yHwjrKV=_mC8bZ_&pn;hAZjupgx5zR|D58Lr z^H)K}8B9<`j2sba2vJ9X27EN(p^OrW$T+_#s;D4G!nv-IF z-C*A}*dGnbb=I>^xlUb;^{w&yRpUA*D?FdDM-sQ5u1uRT<(Rf&>SLad9QI($J0a^B zavhL9^Y6i@98g!L{St~UIa@^(9L{ww9((wqt=4_-zi`8b4Vs>w)@P?okGyqD3$uUe zA6cfGH+Rc@-Wk8DJ-b%wnWr{s`p7O_JwC3hr=HQ(vu&-v`l8~oT#cuPH1x`Hjh^2q z+tDLCRF+++$Zq9|cbjT2nEFnd?t9l%JY))HOexp-+orX3Fs!d#nI4{Fz!M)chN^*XfEH1m|{{9)6LADh+sh%bp z8XD57(P6E-e~G@hdQ>OB*Qd)rAJ(5fT&BApFV~xV=j=t(N53=u-nl<{#`tw?`>Vh^Me^rf{hCcX(>634m-X0mz z=;){(s642zJaR=gb5zx-s;-^Aw}!7Y**gOR`tIV>TDhXFXJ3C!^@BBi{F}wPHqp>2 z=IZnFzh%>@xwf9%_mQTamtH=5Ni)BkRp-k4I`{iKdZ2w=TV6e{T|c{_eed4U*w~mp zGs%k3KQ;f3>C@ld>))sBum5$QQ>f+5hvafgS9>mZFP)srFLZ5E^7zzTdGX|r=5qg% nb91?I-t=6$_uR+j#%~>)%lppVRvI<5rfc%Q_x|(D=hFTSe|IGn diff --git a/voxygen/test_assets/dragon_wingL_out.vox b/voxygen/test_assets/dragon_wingL_out.vox deleted file mode 100644 index 879372f6d8d7af3fb5897159e1512c98499fe431..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3544 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 diff --git a/voxygen/test_assets/dragonhead.vox b/voxygen/test_assets/dragonhead.vox deleted file mode 100644 index 0de9789f15d4495178dca869b50b40272cc46005..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3040 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 S)HH5pGxbliZ6tnry!;FE;3mre diff --git a/voxygen/test_assets/foot_BR.vox b/voxygen/test_assets/foot_BR.vox deleted file mode 100644 index 073a55c9e009ef5d5b79538af901e1f6f04bd83f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1236 zcma)*e@L8l9LGP;^V~wR*)7lW$F1`^b-O!b?$q>5TW5N?d;GDSY1?fR7aMtqZ5$!n zaV)kg$%bW@=!BM8h{Tv}qEhsSlOba;#;_4V$QTj*+aD4A_v-t&KZmOiy!kwzpYQMI z^L)QO2M&2AM5Mhj+M$%(u!(d^&CU|Q%`A3D)^Q!lR(6A!Nn~Fb~g^cGQ3l2th?_h3k9`|2y zf%yXCA}lNXtnjk9bLT`j|LbNvgY+iT);5KYEKlX5*BXIBBRXru9`HCwpocFopCnVfsB` zh-NckutuUsYAbXSLH*1ZSupxj`wC!I& z(n<0Xc`Q#p`iJL=)ZKBrdB1F&ef1emTpXsLH=n!Tm9ZQvB;)Zswtp+n>UFs54vBs^ zJ2^-Cn?*iZxXILwbzV9>!oCaBw0^ll*R^%R;V=&cBujz6G1i3#KRi0$19iXtE3Tg4 W<~!R;Tfwbjmj6ky&Bjlzmwy2+<0jnz diff --git a/voxygen/test_assets/foot_FL.vox b/voxygen/test_assets/foot_FL.vox deleted file mode 100644 index 23eab56821aed022d1485f7849650580a8a36cc5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1192 zcma)*Z%kWd6vofJWeE|7OiH0;mRewIiy12*6v0^pWWD^E48g722s13wG`OWPWNVt4 ztxCiNWwn7VaUvQ*%re|aOEi8!vXEuTvMjh56GN887{B_#7{C2|FZ0{N^d!%H?s?8V z=Y7w)?>lhdkZW2*x?4g$iX@#Q(iaN1KW#e7EdOGg;zNhSp0R-&NkIbG^us5e9O z90iMlZfLrML=!_aQ&+5OhNf8zUF5Q^bj^f_p=(-5Ghybdn5O9=O;^5dvZd=_$Ez)( z_G4Ng5Fn9A@GvFpzp_TT^>6;PT3KD~#%ow=oX4cg`HEv3)h9*sIWaL6e{0#RjBLE!x$|f ze6Em>mY<_7A@rt&w-$vn_f&4L182ldMZ!mYCP-<_ihI(5Z@vuwt=$wK6)MiD+S5Yw ziXd;O_2aonIv-iGGO>FH3ww*W|8gl9&yyBmS>Y#z-xSiPg~d;W)dk`94dn-gxpv{( zgTlt!LZm}DJs?a)Y>W>H(-C1XAdIyMmz3UH=OEJVCf@5|`a}(h{syK;T3P+@O@5z` zP*rZDxu%THS3H~;Xdr3`$z#IoyTZyRLcP;L$XCJ9`aQ(j8X54}h}4xb*-=Smu$uN} zKL=iGB>Z{{(V-sVC&NsA5GAuP&ic(Oq~39pI8sVpULGZdJE$%#!0&Zazh@UO)p(hD zeRwh(|nJO4hP=t(8B1=_7WbfXT0|+_-0FgEGQu z9-I9StGSE`t=_HsAMM)pSpUwFXYjd;@RjA$ z{ic%Tu$`34_1OH)@61|<`|c1Mfip7;B)`h=@zPB$|FF)BrzY5UewNP9SLnOGPB0kc rp@8Hn@E4YK;lX#0_V+-Yum6gxE4X>jwqi55Rm{|%6x%HP(yWrpBd!jLwE zjy9Xj6*rrO*upyJhR7&&tt7Is2PZ{Jp_Jmv7z`<8jJ@t*jJ^GKWA|3f7zz=p~KPQSUkr{1g^}{#$ zeLg}>rJ2^c3c6l#abmEEXh=vN6K3BPRz49L?N)-GDvmbpA=c5%pvO$4!Nyc)HQAwB z0o7nhRttX*s8k6-$UT`)5BwTT<|ENoCg zSj}Uz{}DBpaiQJ4b^l}CyB_P`Uj7UoXDObFVp`nA4EVM);Qjyo*Vor`v1yiC?;I_Y z=dmO$-1<_ue?++Ia^ZHn8Lb?rd;b!Wj8hsbWqIb&KRjzycgJq$z3MdkT2hQ$n4o;9 zjJw}dvmCaNayTBFe|}xQ*5Up;#75!F%mT@;vV6RBlgmG>^Wv#V_MM-l>+==*udn0x t`*|oJg$n+{ur56K?$P-ksQdL_arFc@-`Q3=AKWUI_dhANS@_BM@()`hBKH6Q diff --git a/voxygen/test_assets/lionhead.vox b/voxygen/test_assets/lionhead.vox deleted file mode 100644 index 7d6727d68553a8bfa9c0b56db5003eab21bb2042..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5164 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 E1MV8k_W%F@ From ed4336f40895275eae1673602ec92c59f04b0186 Mon Sep 17 00:00:00 2001 From: Pfauenauge90 <44173739+Pfauenauge90@users.noreply.github.com> Date: Fri, 26 Apr 2019 18:13:30 +0200 Subject: [PATCH 2/4] FPS display moved, changes to windows Former-commit-id: a044a52e3194ff7091964b3e7dcc83f368e32770 --- voxygen/src/hud/mod.rs | 448 ++++++++++++++++++++--------------------- 1 file changed, 219 insertions(+), 229 deletions(-) diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index 8ff6e1bee3..792ec24324 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -6,9 +6,7 @@ use crate::{ window::{Event as WinEvent, Key, Window}, GlobalState, }; -use common::{ - assets, - figure::Segment}; +use common::{assets, figure::Segment}; use conrod_core::{ color, @@ -24,13 +22,13 @@ widget_ids! { bag_space_add, inventorytest_button, inventorytest_button_label, - //Debug + // Debug debug_bg, debug_button, debug_button_label, fps_counter, - // Logo - v_logo, + // Game Version + version, // Bag and Inventory bag, @@ -282,7 +280,7 @@ pub(self) struct Imgs { } impl Imgs { fn new(ui: &mut Ui, renderer: &mut Renderer) -> Imgs { - let mut load_img = |filename, ui: &mut Ui| { + let mut load_img = |filename, ui: &mut Ui| { let fullpath: String = ["/voxygen/", filename].concat(); let image = image::load_from_memory( assets::load(fullpath.as_str()) @@ -302,9 +300,9 @@ impl Imgs { .unwrap(); ui.new_graphic(ui::Graphic::Voxel(Segment::from(dot_vox))) }; - Imgs { + Imgs { // Bag - bag: load_img("element/buttons/bag/closed.png", ui), + bag: load_img("element/buttons/bag/closed.png", ui), bag_hover: load_img("element/buttons/bag/closed_hover.png", ui), bag_press: load_img("element/buttons/bag/closed_press.png", ui), bag_open: load_img("element/buttons/bag/open.png", ui), @@ -315,7 +313,6 @@ impl Imgs { inv_slot: load_vox("element/buttons/inv_slot.vox", ui), // Buttons - settings: load_vox("element/buttons/settings.vox", ui), settings_hover: load_vox("element/buttons/settings_hover.vox", ui), settings_press: load_vox("element/buttons/settings_press.vox", ui), @@ -361,7 +358,6 @@ impl Imgs { mmap_frame: load_vox("element/frames/mmap.vox", ui), mmap_frame_bg: load_img("element/misc_bg/mmap_bg.png", ui), - // Skillbar Module sb_grid: load_img("element/skill_bar/sbar_grid.png", ui), sb_grid_bg: load_img("element/skill_bar/sbar_grid_bg.png", ui), @@ -386,7 +382,7 @@ impl Imgs { check_checked_mo: load_img("element/buttons/check/yes_mo.png", ui), slider: load_img("element/slider/track.png", ui), slider_indicator: load_img("element/slider/indicator.png", ui), - button_blank: ui.new_graphic(ui::Graphic::Blank), + button_blank: ui.new_graphic(ui::Graphic::Blank), button_blue_mo: load_img("element/buttons/blue_mo.png", ui), button_blue_press: load_img("element/buttons/blue_press.png", ui), @@ -424,7 +420,6 @@ impl Imgs { chat_arrow: load_img("element/buttons/arrow/chat_arrow.png", ui), chat_arrow_mo: load_img("element/buttons/arrow/chat_arrow_mo.png", ui), chat_arrow_press: load_img("element/buttons/arrow/chat_arrow_press.png", ui), - } } } @@ -550,15 +545,18 @@ impl Hud { // Display debug window if self.show_debug { - Image::new(self.imgs.window_frame_2) - .down_from(self.ids.mmap_frame, 20.0) - .w_h(300.0, 350.0) - .set(self.ids.debug_bg, ui_widgets); + // Alpha Version + Text::new(version) + .top_left_with_margins_on(ui_widgets.window, 5.0, 5.0) + .font_size(14) + .font_id(self.font_opensans) + .color(TEXT_COLOR) + .set(self.ids.version, ui_widgets); Text::new(&format!("FPS: {:.1}", tps)) .color(TEXT_COLOR) - .top_left_with_margins_on(self.ids.debug_bg, 20.0, 20.0) + .down_from(self.ids.version, 5.0) .font_id(self.font_opensans) - .font_size(18) + .font_size(14) .set(self.ids.fps_counter, ui_widgets); } @@ -586,13 +584,6 @@ impl Hud { events.push(Event::SendMessage(msg)); } - // Alpha Version - Text::new(version) - .top_left_with_margins_on(ui_widgets.window, 5.0, 5.0) - .font_size(14) - .color(TEXT_COLOR) - .set(self.ids.v_logo, ui_widgets); - // Help Text if self.show_help { Image::new(self.imgs.window_frame_2) @@ -608,13 +599,13 @@ impl Hud { F2 = Toggle Interface \n\ \n\ Enter = Open Chat \n\ - Mouse Wheel = Scroll Chat" + Mouse Wheel = Scroll Chat", ) - .color(TEXT_COLOR) - .top_left_with_margins_on(self.ids.help_bg, 20.0, 20.0) - .font_id(self.font_opensans) - .font_size(18) - .set(self.ids.help, ui_widgets); + .color(TEXT_COLOR) + .top_left_with_margins_on(self.ids.help_bg, 20.0, 20.0) + .font_id(self.font_opensans) + .font_size(18) + .set(self.ids.help, ui_widgets); // X-button if Button::image(self.imgs.close_button) @@ -631,18 +622,17 @@ impl Hud { // Minimap frame and bg //Image::new(self.imgs.mmap_frame_bg) - //.w_h(1750.0 / 8.0, 1650.0 / 8.0) - //.top_right_with_margins_on(ui_widgets.window, 5.0, 5.0) - //.set(self.ids.mmap_frame_bg, ui_widgets); - + //.w_h(1750.0 / 8.0, 1650.0 / 8.0) + //.top_right_with_margins_on(ui_widgets.window, 5.0, 5.0) + //.set(self.ids.mmap_frame_bg, ui_widgets); Image::new(self.imgs.mmap_frame) - .w_h(100.0*2.5, 100.0*2.5) + .w_h(100.0 * 2.0, 100.0 * 2.0) .top_right_with_margins_on(ui_widgets.window, 5.0, 5.0) .set(self.ids.mmap_frame, ui_widgets); - Rectangle::fill_with([92.0*2.5, 82.0*2.5], color::RED) - .mid_top_with_margin_on(self.ids.mmap_frame, 13.0*2.5+2.5) + Rectangle::fill_with([92.0 * 2.0, 82.0 * 2.0], color::TRANSPARENT) + .mid_top_with_margin_on(self.ids.mmap_frame, 13.0 * 2.0 + 2.0) .set(self.ids.mmap_frame_bg, ui_widgets); // Title @@ -663,6 +653,8 @@ impl Hud { .press_image(self.imgs.settings_press) .label("N") .label_font_size(10) + .label_font_id(self.font_metamorph) + .color(TEXT_COLOR) .label_color(TEXT_COLOR) .label_y(conrod_core::position::Relative::Scalar(-7.0)) .label_x(conrod_core::position::Relative::Scalar(10.0)) @@ -684,6 +676,7 @@ impl Hud { .press_image(self.imgs.map_press) .label("M") .label_font_size(10) + .label_font_id(self.font_metamorph) .label_color(TEXT_COLOR) .label_y(conrod_core::position::Relative::Scalar(-7.0)) .label_x(conrod_core::position::Relative::Scalar(10.0)) @@ -717,7 +710,8 @@ impl Hud { if match self.open_windows { Windows::Settings => false, _ => true, - } && self.map_open == false { + } && self.map_open == false + { // 1 Social if Button::image(self.imgs.social_button) .w_h(25.0, 25.0) @@ -726,6 +720,7 @@ impl Hud { .press_image(self.imgs.social_press) .label("O") .label_font_size(10) + .label_font_id(self.font_metamorph) .label_color(TEXT_COLOR) .label_y(conrod_core::position::Relative::Scalar(-7.0)) .label_x(conrod_core::position::Relative::Scalar(10.0)) @@ -751,6 +746,7 @@ impl Hud { .press_image(self.imgs.spellbook_press) .label("P") .label_font_size(10) + .label_font_id(self.font_metamorph) .label_color(TEXT_COLOR) .label_y(conrod_core::position::Relative::Scalar(-7.0)) .label_x(conrod_core::position::Relative::Scalar(10.0)) @@ -776,6 +772,7 @@ impl Hud { .press_image(self.imgs.character_press) .label("C") .label_font_size(10) + .label_font_id(self.font_metamorph) .label_color(TEXT_COLOR) .label_y(conrod_core::position::Relative::Scalar(-7.0)) .label_x(conrod_core::position::Relative::Scalar(10.0)) @@ -793,20 +790,21 @@ impl Hud { } } - // 5 Quest-Log - if Button::image(self.imgs.qlog_button) - .w_h(23.0, 25.0) - .left_from(self.ids.character_button, 10.0) - .hover_image(self.imgs.qlog_hover) - .press_image(self.imgs.qlog_press) - .label("L") - .label_font_size(10) - .label_color(TEXT_COLOR) - .label_y(conrod_core::position::Relative::Scalar(-7.0)) - .label_x(conrod_core::position::Relative::Scalar(10.0)) - .set(self.ids.qlog_button, ui_widgets) - .was_clicked() - { + // 5 Quest-Log + if Button::image(self.imgs.qlog_button) + .w_h(23.0, 25.0) + .left_from(self.ids.character_button, 10.0) + .hover_image(self.imgs.qlog_hover) + .press_image(self.imgs.qlog_press) + .label("L") + .label_font_size(10) + .label_font_id(self.font_metamorph) + .label_color(TEXT_COLOR) + .label_y(conrod_core::position::Relative::Scalar(-7.0)) + .label_x(conrod_core::position::Relative::Scalar(10.0)) + .set(self.ids.qlog_button, ui_widgets) + .was_clicked() + { self.open_windows = match self.open_windows { Windows::Small(Small::Questlog) => Windows::None, Windows::None | Windows::Small(_) => Windows::Small(Small::Questlog), @@ -819,7 +817,6 @@ impl Hud { } } - // Skillbar Module // Experience-Bar @@ -916,54 +913,54 @@ impl Hud { .set(self.ids.next_level_text, ui_widgets); // Bag contents - if self.bag_open { - // Contents - Image::new(self.imgs.bag_contents) - .w_h(68.0*4.0, 123.0*4.0) - .bottom_right_with_margins_on(ui_widgets.window, 90.0, 5.0) - .set(self.ids.bag_contents, ui_widgets); + if self.bag_open { + // Contents + Image::new(self.imgs.bag_contents) + .w_h(68.0 * 4.0, 123.0 * 4.0) + .bottom_right_with_margins_on(ui_widgets.window, 90.0, 5.0) + .set(self.ids.bag_contents, ui_widgets); - // Alignment for Grid - Rectangle::fill_with([(58.0*4.0)-5.0, 100.0*4.0], color::TRANSPARENT) - .top_left_with_margins_on(self.ids.bag_contents, 11.0*4.0, 5.0*4.0) - .scroll_kids() - .scroll_kids_vertically() - .set(self.ids.inv_alignment, ui_widgets); - // Grid - Image::new(self.imgs.inv_grid) - .w_h(58.0*4.0, 111.0*4.0) - .mid_top_with_margin_on(self.ids.inv_alignment, 0.0) - .set(self.ids.inv_grid_1, ui_widgets); - Image::new(self.imgs.inv_grid) - .w_h(58.0*4.0, 111.0*4.0) - .mid_top_with_margin_on(self.ids.inv_alignment, 110.0*4.0) - .set(self.ids.inv_grid_2, ui_widgets); - Scrollbar::y_axis(self.ids.inv_alignment) - .thickness(5.0) - .rgba(0.33, 0.33, 0.33, 1.0) - .set(self.ids.inv_scrollbar, ui_widgets); + // Alignment for Grid + Rectangle::fill_with([(58.0 * 4.0) - 5.0, 100.0 * 4.0], color::TRANSPARENT) + .top_left_with_margins_on(self.ids.bag_contents, 11.0 * 4.0, 5.0 * 4.0) + .scroll_kids() + .scroll_kids_vertically() + .set(self.ids.inv_alignment, ui_widgets); + // Grid + Image::new(self.imgs.inv_grid) + .w_h(58.0 * 4.0, 111.0 * 4.0) + .mid_top_with_margin_on(self.ids.inv_alignment, 0.0) + .set(self.ids.inv_grid_1, ui_widgets); + Image::new(self.imgs.inv_grid) + .w_h(58.0 * 4.0, 111.0 * 4.0) + .mid_top_with_margin_on(self.ids.inv_alignment, 110.0 * 4.0) + .set(self.ids.inv_grid_2, ui_widgets); + Scrollbar::y_axis(self.ids.inv_alignment) + .thickness(5.0) + .rgba(0.33, 0.33, 0.33, 1.0) + .set(self.ids.inv_scrollbar, ui_widgets); - // X-button - if Button::image(self.imgs.close_button) - .w_h(4.0*4.0, 4.0*4.0) - .hover_image(self.imgs.close_button_hover) - .press_image(self.imgs.close_button_press) - .top_right_with_margins_on(self.ids.bag_contents, 4.5, 4.5) - .set(self.ids.bag_close, ui_widgets) - .was_clicked() - { - self.bag_open = false; - } - - if self.inventory_space > 0 { - // First Slot - Button::image(self.imgs.inv_slot) - .top_left_with_margins_on(self.ids.inv_grid_1, 4.0, 4.0) - .w_h(10.0*4.0, 10.0*4.0) - .set(self.ids.inv_slot_0, ui_widgets); - } + // X-button + if Button::image(self.imgs.close_button) + .w_h(4.0 * 4.0, 4.0 * 4.0) + .hover_image(self.imgs.close_button_hover) + .press_image(self.imgs.close_button_press) + .top_right_with_margins_on(self.ids.bag_contents, 4.5, 4.5) + .set(self.ids.bag_close, ui_widgets) + .was_clicked() + { + self.bag_open = false; } + if self.inventory_space > 0 { + // First Slot + Button::image(self.imgs.inv_slot) + .top_left_with_margins_on(self.ids.inv_grid_1, 4.0, 4.0) + .w_h(10.0 * 4.0, 10.0 * 4.0) + .set(self.ids.inv_slot_0, ui_widgets); + } + } + // Bag if !self.map_open && self.show_ui { self.bag_open = ToggleButton::new(self.bag_open, self.imgs.bag, self.imgs.bag_open) @@ -972,9 +969,10 @@ impl Hud { .press_images(self.imgs.bag_press, self.imgs.bag_open_press) .w_h(420.0 / 10.0, 480.0 / 10.0) .set(self.ids.bag, ui_widgets); - Text::new("B") + Text::new("B") .bottom_right_with_margins_on(self.ids.bag, 0.0, 0.0) .font_size(10) + .font_id(self.font_metamorph) .color(TEXT_COLOR) .set(self.ids.bag_text, ui_widgets); } else { @@ -985,9 +983,8 @@ impl Hud { Text::new("B") .bottom_right_with_margins_on(self.ids.bag, 0.0, 0.0) .font_size(10) - .color(TEXT_COLOR) + .font_id(self.font_metamorph) .set(self.ids.bag_text, ui_widgets); - } //Windows @@ -999,7 +996,7 @@ impl Hud { if let Windows::Settings = self.open_windows { // BG - Image::new(self.imgs.settings_bg) + Image::new(self.imgs.window_frame) .middle_of(ui_widgets.window) .w_h(1648.0 / 2.5, 1952.0 / 2.5) .set(self.ids.settings_bg, ui_widgets); @@ -1073,11 +1070,11 @@ impl Hud { self.imgs.check, self.imgs.check_checked, ) - .w_h(288.0 / 24.0, 288.0 / 24.0) - .top_left_with_margins_on(self.ids.rectangle, 40.0, 15.0) - .hover_images(self.imgs.check_checked_mo, self.imgs.check_mo) - .press_images(self.imgs.check_press, self.imgs.check_press) - .set(self.ids.inventorytest_button, ui_widgets); + .w_h(288.0 / 24.0, 288.0 / 24.0) + .top_left_with_margins_on(self.ids.rectangle, 40.0, 15.0) + .hover_images(self.imgs.check_checked_mo, self.imgs.check_mo) + .press_images(self.imgs.check_press, self.imgs.check_press) + .set(self.ids.inventorytest_button, ui_widgets); Text::new("Show Inventory Test Button") .right_from(self.ids.inventorytest_button, 10.0) @@ -1087,16 +1084,13 @@ impl Hud { .color(TEXT_COLOR) .set(self.ids.inventorytest_button_label, ui_widgets); - self.show_debug = ToggleButton::new( - self.show_debug, - self.imgs.check, - self.imgs.check_checked - ) - .w_h(288.0 / 24.0, 288.0 / 24.0) - .top_left_with_margins_on(self.ids.rectangle, 65.0, 15.0) - .hover_images(self.imgs.check_checked_mo, self.imgs.check_mo) - .press_images(self.imgs.check_press, self.imgs.check_press) - .set(self.ids.debug_button, ui_widgets); + self.show_debug = + ToggleButton::new(self.show_debug, self.imgs.check, self.imgs.check_checked) + .w_h(288.0 / 24.0, 288.0 / 24.0) + .top_left_with_margins_on(self.ids.rectangle, 65.0, 15.0) + .hover_images(self.imgs.check_checked_mo, self.imgs.check_mo) + .press_images(self.imgs.check_press, self.imgs.check_press) + .set(self.ids.debug_button, ui_widgets); Text::new("Show Debug Window") .right_from(self.ids.debug_button, 10.0) @@ -1105,85 +1099,80 @@ impl Hud { .graphics_for(self.ids.debug_button) .color(TEXT_COLOR) .set(self.ids.debug_button_label, ui_widgets); - } // 2 Gameplay//////////////// if Button::image(if let SettingsTab::Gameplay = self.settings_tab { - self.imgs.button_blue_mo - } else { - self.imgs.button_blank - } - ) - .w_h(304.0 / 2.5, 80.0 / 2.5) - .hover_image(self.imgs.button_blue_mo) - .press_image(self.imgs.button_blue_press) - .down_from(self.ids.interface, 1.0) - .label("Gameplay") - .label_font_size(14) - .label_color(TEXT_COLOR) - .set(self.ids.gameplay, ui_widgets) - .was_clicked() + self.imgs.button_blue_mo + } else { + self.imgs.button_blank + }) + .w_h(304.0 / 2.5, 80.0 / 2.5) + .hover_image(self.imgs.button_blue_mo) + .press_image(self.imgs.button_blue_press) + .down_from(self.ids.interface, 1.0) + .label("Gameplay") + .label_font_size(14) + .label_color(TEXT_COLOR) + .set(self.ids.gameplay, ui_widgets) + .was_clicked() { self.settings_tab = SettingsTab::Gameplay; } // 3 Controls///////////////////// if Button::image(if let SettingsTab::Controls = self.settings_tab { - self.imgs.button_blue_mo - } else { - self.imgs.button_blank - } - ) - .w_h(304.0 / 2.5, 80.0 / 2.5) - .hover_image(self.imgs.button_blue_mo) - .press_image(self.imgs.button_blue_press) - .down_from(self.ids.gameplay, 1.0) - .label("Controls") - .label_font_size(14) - .label_color(TEXT_COLOR) - .set(self.ids.controls, ui_widgets) - .was_clicked() + self.imgs.button_blue_mo + } else { + self.imgs.button_blank + }) + .w_h(304.0 / 2.5, 80.0 / 2.5) + .hover_image(self.imgs.button_blue_mo) + .press_image(self.imgs.button_blue_press) + .down_from(self.ids.gameplay, 1.0) + .label("Controls") + .label_font_size(14) + .label_color(TEXT_COLOR) + .set(self.ids.controls, ui_widgets) + .was_clicked() { self.settings_tab = SettingsTab::Controls; } // 4 Video//////////////////////////////// if Button::image(if let SettingsTab::Video = self.settings_tab { - self.imgs.button_blue_mo - } else { - self.imgs.button_blank - } - ) - .w_h(304.0 / 2.5, 80.0 / 2.5) - .hover_image(self.imgs.button_blue_mo) - .press_image(self.imgs.button_blue_press) - .down_from(self.ids.controls, 1.0) - .label("Video") - .label_font_size(14) - .label_color(TEXT_COLOR) - .set(self.ids.video, ui_widgets) - .was_clicked() + self.imgs.button_blue_mo + } else { + self.imgs.button_blank + }) + .w_h(304.0 / 2.5, 80.0 / 2.5) + .hover_image(self.imgs.button_blue_mo) + .press_image(self.imgs.button_blue_press) + .down_from(self.ids.controls, 1.0) + .label("Video") + .label_font_size(14) + .label_color(TEXT_COLOR) + .set(self.ids.video, ui_widgets) + .was_clicked() { self.settings_tab = SettingsTab::Video; } // 5 Sound/////////////////////////////// if Button::image(if let SettingsTab::Sound = self.settings_tab { - self.imgs.button_blue_mo - } else { - self.imgs.button_blank - } - ) - .w_h(304.0 / 2.5, 80.0 / 2.5) - .hover_image(self.imgs.button_blue_mo) - .press_image(self.imgs.button_blue_press) - .down_from(self.ids.video, 1.0) - .label("Sound") - .label_font_size(14) - .label_color(TEXT_COLOR) - .set(self.ids.sound, ui_widgets) - .was_clicked() + self.imgs.button_blue_mo + } else { + self.imgs.button_blank + }) + .w_h(304.0 / 2.5, 80.0 / 2.5) + .hover_image(self.imgs.button_blue_mo) + .press_image(self.imgs.button_blue_press) + .down_from(self.ids.video, 1.0) + .label("Sound") + .label_font_size(14) + .label_color(TEXT_COLOR) + .set(self.ids.sound, ui_widgets) + .was_clicked() { self.settings_tab = SettingsTab::Sound; } @@ -1201,12 +1190,12 @@ impl Hud { if char_window_open { Image::new(self.imgs.window_frame) .right_from(self.ids.charwindow_frame, 20.0) - .w_h(107.0*4.0, 125.0*4.0) + .w_h(107.0 * 4.0, 125.0 * 4.0) .set(self.ids.social_frame, ui_widgets); } else { Image::new(self.imgs.window_frame) .top_left_with_margins_on(ui_widgets.window, 200.0, 10.0) - .w_h(1648.0 / 4.0, 1952.0 / 4.0) + .w_h(107.0 * 4.0, 125.0 * 4.0) .set(self.ids.social_frame, ui_widgets); } @@ -1223,7 +1212,6 @@ impl Hud { .scroll_kids_vertically() .set(self.ids.social_bg, ui_widgets); - // X-Button if Button::image(self.imgs.close_button) .w_h(20.0, 20.0) @@ -1252,33 +1240,34 @@ impl Hud { if char_window_open { Image::new(self.imgs.window_frame) .right_from(self.ids.charwindow_frame, 20.0) - .w_h(1648.0 / 4.0, 1952.0 / 4.0) + .w_h(107.0 * 4.0, 125.0 * 4.0) .set(self.ids.spellbook_frame, ui_widgets); } else { Image::new(self.imgs.window_frame) - .top_left_with_margins_on(ui_widgets.window, 200.0, 90.0) - .w_h(1648.0 / 4.0, 1952.0 / 4.0) + .top_left_with_margins_on(ui_widgets.window, 200.0, 10.0) + .w_h(107.0 * 4.0, 125.0 * 4.0) .set(self.ids.spellbook_frame, ui_widgets); } - // BG - Image::new(self.imgs.spellbook_bg) - .w_h(1648.0 / 4.0, 1952.0 / 4.0) - .middle_of(self.ids.spellbook_frame) - .set(self.ids.spellbook_bg, ui_widgets); - // Icon Image::new(self.imgs.spellbook_icon) - .w_h(224.0 / 3.0, 224.0 / 3.0) - .top_left_with_margins_on(self.ids.spellbook_frame, -10.0, -10.0) + .w_h(40.0, 40.0) + .top_left_with_margins_on(self.ids.spellbook_frame, 4.0, 4.0) .set(self.ids.spellbook_icon, ui_widgets); + // Content alignment + Rectangle::fill_with([362.0, 418.0], color::TRANSPARENT) + .bottom_right_with_margins_on(self.ids.spellbook_frame, 17.0, 17.0) + .scroll_kids() + .scroll_kids_vertically() + .set(self.ids.spellbook_bg, ui_widgets); + // X-Button if Button::image(self.imgs.close_button) - .w_h(244.0 * 0.22 / 4.0, 244.0 * 0.22 / 4.0) + .w_h(20.0, 20.0) .hover_image(self.imgs.close_button_hover) .press_image(self.imgs.close_button_press) - .top_right_with_margins_on(self.ids.spellbook_frame, 4.0, 4.0) + .top_right_with_margins_on(self.ids.spellbook_frame, 17.0, 5.0) .set(self.ids.spellbook_close, ui_widgets) .was_clicked() { @@ -1290,7 +1279,8 @@ impl Hud { } // Title Text::new("Spellbook") - .mid_top_with_margin_on(self.ids.spellbook_frame, 7.0) + .mid_top_with_margin_on(self.ids.spellbook_frame, 17.0) + .font_size(14) .color(TEXT_COLOR) .set(self.ids.spellbook_title, ui_widgets); } @@ -1299,33 +1289,33 @@ impl Hud { if char_window_open { Image::new(self.imgs.window_frame) .right_from(self.ids.charwindow_frame, 20.0) - .w_h(1648.0 / 4.0, 1952.0 / 4.0) + .w_h(107.0 * 4.0, 125.0 * 4.0) .set(self.ids.questlog_frame, ui_widgets); } else { Image::new(self.imgs.window_frame) - .top_left_with_margins_on(ui_widgets.window, 200.0, 90.0) - .w_h(1648.0 / 4.0, 1952.0 / 4.0) + .top_left_with_margins_on(ui_widgets.window, 200.0, 10.0) + .w_h(107.0 * 4.0, 125.0 * 4.0) .set(self.ids.questlog_frame, ui_widgets); } - // BG - Image::new(self.imgs.questlog_bg) - .w_h(1648.0 / 4.0, 1952.0 / 4.0) - .middle_of(self.ids.questlog_frame) - .set(self.ids.questlog_bg, ui_widgets); - // Icon Image::new(self.imgs.questlog_icon) - .w_h(224.0 / 3.0, 224.0 / 3.0) - .top_left_with_margins_on(self.ids.questlog_frame, -10.0, -10.0) + .w_h(40.0, 40.0) + .top_left_with_margins_on(self.ids.questlog_frame, 4.0, 4.0) .set(self.ids.questlog_icon, ui_widgets); + // Content alignment + Rectangle::fill_with([362.0, 418.0], color::TRANSPARENT) + .bottom_right_with_margins_on(self.ids.questlog_frame, 17.0, 17.0) + .scroll_kids() + .scroll_kids_vertically() + .set(self.ids.questlog_bg, ui_widgets); + // X-Button if Button::image(self.imgs.close_button) - .w_h(244.0 * 0.22 / 4.0, 244.0 * 0.22 / 4.0) - .hover_image(self.imgs.close_button_hover) + .w_h(20.0, 20.0) .press_image(self.imgs.close_button_press) - .top_right_with_margins_on(self.ids.questlog_frame, 4.0, 4.0) + .top_right_with_margins_on(self.ids.questlog_frame, 17.0, 5.0) .set(self.ids.questlog_close, ui_widgets) .was_clicked() { @@ -1337,8 +1327,9 @@ impl Hud { } // Title Text::new("Quest-Log") - .mid_top_with_margin_on(self.ids.questlog_frame, 7.0) + .mid_top_with_margin_on(self.ids.questlog_frame, 17.0) .color(TEXT_COLOR) + .font_size(14) .set(self.ids.questlog_title, ui_widgets); } } @@ -1353,15 +1344,15 @@ impl Hud { .set(self.ids.charwindow_frame, ui_widgets); // BG - Image::new(self.imgs.window_bg) - .w_h(348.0, 404.0) - .mid_top_with_margin_on(self.ids.charwindow_frame, 48.0) - .set(self.ids.charwindow_bg, ui_widgets); + //Image::new(self.imgs.window_bg) + //.w_h(348.0, 404.0) + //.mid_top_with_margin_on(self.ids.charwindow_frame, 48.0) + //.set(self.ids.charwindow_bg, ui_widgets); // Overlay - Image::new(self.imgs.charwindow) - .middle_of(self.ids.charwindow_bg) - .set(self.ids.charwindow, ui_widgets); + //Image::new(self.imgs.charwindow) + //.middle_of(self.ids.charwindow_bg) + //.set(self.ids.charwindow, ui_widgets); // Icon //Image::new(self.imgs.charwindow_icon) @@ -1444,11 +1435,11 @@ impl Hud { \n\ Intelligence", ) - .top_left_with_margins_on(self.ids.charwindow_rectangle, 100.0, 20.0) - .font_id(self.font_opensans) - .font_size(16) - .color(TEXT_COLOR) - .set(self.ids.charwindow_tab1_statnames, ui_widgets); + .top_left_with_margins_on(self.ids.charwindow_rectangle, 100.0, 20.0) + .font_id(self.font_opensans) + .font_size(16) + .color(TEXT_COLOR) + .set(self.ids.charwindow_tab1_statnames, ui_widgets); Text::new( "1234\n\ @@ -1459,11 +1450,11 @@ impl Hud { \n\ 124124", ) - .right_from(self.ids.charwindow_tab1_statnames, 10.0) - .font_id(self.font_opensans) - .font_size(16) - .color(TEXT_COLOR) - .set(self.ids.charwindow_tab1_stats, ui_widgets); + .right_from(self.ids.charwindow_tab1_statnames, 10.0) + .font_id(self.font_opensans) + .font_size(16) + .color(TEXT_COLOR) + .set(self.ids.charwindow_tab1_stats, ui_widgets); } // 2 Map @@ -1471,7 +1462,7 @@ impl Hud { // BG Image::new(self.imgs.map_bg) .w_h(824.0, 488.0) - .middle_of(ui_widgets.window) + .mid_top_with_margin_on(ui_widgets.window, 200.0) .set(self.ids.map_bg, ui_widgets); // Frame Image::new(self.imgs.map_frame_l) @@ -1491,10 +1482,10 @@ impl Hud { // X-Button if Button::image(self.imgs.close_button) - .w_h(4.0*2.0, 4.0*2.0) + .w_h(20.0, 20.0) .hover_image(self.imgs.close_button_hover) .press_image(self.imgs.close_button_press) - .top_right_with_margins_on(self.ids.map_frame_r, 1.0, 1.0) + .top_right_with_margins_on(self.ids.map_frame_r, 17.0, 5.0) .set(self.ids.map_close, ui_widgets) .was_clicked() { @@ -1503,12 +1494,11 @@ impl Hud { // Title Text::new("Map") .mid_top_with_margin_on(self.ids.map_bg, -7.0) - .font_size(50) + .font_size(14) .color(TEXT_COLOR) .set(self.ids.map_title, ui_widgets); } - // ESC-MENU // Background if self.menu_open { From 9ea4cd917f79b1b9ff1a80b2aa3323d988f802f2 Mon Sep 17 00:00:00 2001 From: Pfauenauge90 <44173739+Pfauenauge90@users.noreply.github.com> Date: Fri, 26 Apr 2019 15:13:30 +0200 Subject: [PATCH 3/4] removed test_assets in voxygen Former-commit-id: f9cac7ebf57a4997fd64e1cb65c4582940c30f42 --- assets/voxygen | 2 +- voxygen/src/hud/mod.rs | 11 ++++++++--- voxygen/test_assets/body.vox | Bin 6984 -> 0 bytes voxygen/test_assets/dragon_body.vox | Bin 9540 -> 0 bytes voxygen/test_assets/dragon_lfoot.vox | Bin 1408 -> 0 bytes voxygen/test_assets/dragon_rfoot.vox | Bin 1408 -> 0 bytes voxygen/test_assets/dragon_tail.vox | Bin 2080 -> 0 bytes voxygen/test_assets/dragon_wingL_in.vox | Bin 2884 -> 0 bytes voxygen/test_assets/dragon_wingL_out.vox | Bin 3544 -> 0 bytes voxygen/test_assets/dragon_wingR_in.vox | Bin 2884 -> 0 bytes voxygen/test_assets/dragon_wingR_out.vox | Bin 3544 -> 0 bytes voxygen/test_assets/dragonhead.vox | Bin 3040 -> 0 bytes voxygen/test_assets/foot_BL.vox | Bin 1236 -> 0 bytes voxygen/test_assets/foot_BR.vox | Bin 1236 -> 0 bytes voxygen/test_assets/foot_FL.vox | Bin 1192 -> 0 bytes voxygen/test_assets/foot_FR.vox | Bin 1192 -> 0 bytes voxygen/test_assets/lionhead.vox | Bin 5164 -> 0 bytes voxygen/test_assets/sabremale.vox | Bin 7436 -> 0 bytes 18 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 voxygen/test_assets/body.vox delete mode 100644 voxygen/test_assets/dragon_body.vox delete mode 100644 voxygen/test_assets/dragon_lfoot.vox delete mode 100644 voxygen/test_assets/dragon_rfoot.vox delete mode 100644 voxygen/test_assets/dragon_tail.vox delete mode 100644 voxygen/test_assets/dragon_wingL_in.vox delete mode 100644 voxygen/test_assets/dragon_wingL_out.vox delete mode 100644 voxygen/test_assets/dragon_wingR_in.vox delete mode 100644 voxygen/test_assets/dragon_wingR_out.vox delete mode 100644 voxygen/test_assets/dragonhead.vox delete mode 100644 voxygen/test_assets/foot_BL.vox delete mode 100644 voxygen/test_assets/foot_BR.vox delete mode 100644 voxygen/test_assets/foot_FL.vox delete mode 100644 voxygen/test_assets/foot_FR.vox delete mode 100644 voxygen/test_assets/lionhead.vox delete mode 100644 voxygen/test_assets/sabremale.vox diff --git a/assets/voxygen b/assets/voxygen index 25346c1ead..b5c4e96c49 160000 --- a/assets/voxygen +++ b/assets/voxygen @@ -1 +1 @@ -Subproject commit 25346c1ead7d03b11f7f4403332f2288824c6ca9 +Subproject commit b5c4e96c490667d4aef061f5e1792c196b9c88d0 diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index a8d1f55c48..8ff6e1bee3 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -633,13 +633,18 @@ impl Hud { //Image::new(self.imgs.mmap_frame_bg) //.w_h(1750.0 / 8.0, 1650.0 / 8.0) //.top_right_with_margins_on(ui_widgets.window, 5.0, 5.0) - //.set(self.ids.mmap_frame_bg, ui_widgets); + //.set(self.ids.mmap_frame_bg, ui_widgets); + Image::new(self.imgs.mmap_frame) - .w_h(1750.0 / 8.0, 1650.0 / 8.0) + .w_h(100.0*2.5, 100.0*2.5) .top_right_with_margins_on(ui_widgets.window, 5.0, 5.0) .set(self.ids.mmap_frame, ui_widgets); + Rectangle::fill_with([92.0*2.5, 82.0*2.5], color::RED) + .mid_top_with_margin_on(self.ids.mmap_frame, 13.0*2.5+2.5) + .set(self.ids.mmap_frame_bg, ui_widgets); + // Title // Make it display the actual location Text::new("Uncanny Valley") @@ -1236,7 +1241,7 @@ impl Hud { } // Title Text::new("Social") - .mid_top_with_margin_on(self.ids.social_frame, 16.0) + .mid_top_with_margin_on(self.ids.social_frame, 17.0) .font_id(self.font_metamorph) .font_size(14) .color(TEXT_COLOR) diff --git a/voxygen/test_assets/body.vox b/voxygen/test_assets/body.vox deleted file mode 100644 index d6c7aa48dcc2c87e2cddbfa2b1ccb66f309a022f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6984 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 IXVT@r0oGHx%>V!Z diff --git a/voxygen/test_assets/dragon_lfoot.vox b/voxygen/test_assets/dragon_lfoot.vox deleted file mode 100644 index 80828a713720e4be9d073de8f5282fa58a8c93bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1408 zcmchWZA@Eb6vxkV@9m4j7Z|0iFrjuZTA1Ud45%n`wkqoPZ3d|&EL&JZyJbt{XyU3((qzSoBqid*I2H`C7mUU^jlF7ABATA#{TlZ$iHs^SC=pfTdPYc0yq8hT zj7f>0smDtktem}y9PjD`fqB)w7NJ{q3`$0o`g+`FfZ z>-E*t)P#6Ejt7&3eOFeo&GH9+vsjSL1|Zipe;VCgH8_5>8S&vRq{sY7Paa2ldJv82 z2y(qv*pAs@f2#_vSr5o(0EIV!<~D;?t;h`!3QrTZP7ronCz!*8ClZ8w_SUO}`aljk zPv;^ynvV<1PopDF=t&Y@T_l`c^j}D(6d4d#eJ4{e-en z?mb0lSs~C%Jb%OtNWdKaIWW@W#MH?;#1A!M>Qp_oJ~gT6{DLiNQM z-&>BcpBgv;f^uFbo# zf8P=)F@l0<0hXs9zC-zrN=i!bc6kyt)q^;3@jSK+6yokz>--aI~3L9^3eOb_HCch)uY69m34AS^}IH!>yDW< SP({jXB)_ diff --git a/voxygen/test_assets/dragon_rfoot.vox b/voxygen/test_assets/dragon_rfoot.vox deleted file mode 100644 index 1e2bcfe32d72e45c57b712337b993ed77f354f69..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1408 zcmc(eZA?>F7{{M`?(NHDFCeAZ;!0OR+T!G;2y`GTLZ=0bLuRKP65TYj>r6={M4M&{ zb~9s+jj;wKQ4tMci;*d5NtbeNq+f1 z|K~jCIp>~xZ)o2^`y>$s+XFo;^sbJmFA(-Wtr{L|X~W-o@K89=Dydl_wOHtsoX{&d zk|`%K;wd^Mj10#zqo{eoc}8YPVb2IgW)#)y*fX+`i6cvtzU?h$i zK{P~atVlT_OWd1Pkzx|7%qnwEVuXQndR9HFj#bBV>}6JAluikQU==ypAaat5BDfEG z6`hF52JXWMMdq{0IYq~Ly@)A#!79i9dbkD2;cjF{1ISJsMRsZs zP1zUz8Z3=&FD5;l($w%sHcql9NtgktvQ>x712 z0lH2WB0N%zkC&cDXOhsHCcL>oIJ3%Yd#$iV9H>aT(U|d}EN+5h%nJ8hIqL3Ip|qb+ zF~Yqk39ZWndX4u_7(wZ0L5n7gRuy5swgeA$mH}NaAWeiN<_G2%CViT)@C6}1Pq=%F zy^k>KC*<}M*54+C*`E#(#*cA+n9$)O3^WslI|&y!-`ikC#P2|&*NMsF^++CQ!sLk# z8uyWNgD zmjjL4x8kLG7sfx>jD;%>{CL-m_50Ph$a`ky2=~4v{QNy35pm)|%7c{~9r*31KE%%# zV(cpuZmn9dj`IKg`8^&FK5v>qP2DV7M$f{Mvf$2D!h<&m*PTwdTrTX`xD$K#EP_%A zl*CK0H1+r$?o|}nY&N`KnMQ5RAda0shfM>exc_w}mckZH@LfH5|7|T3TCYQW_Ygk; zoSB+O>RJY$F5brUcWc-&IEuEjGw8m&jJ}&|@cDdrL;x8X`~i85@bH_*=X=QC*MH6P zPl#&kE~wfj4Qd*!ifH$Ij`kOV diff --git a/voxygen/test_assets/dragon_tail.vox b/voxygen/test_assets/dragon_tail.vox deleted file mode 100644 index 050f21c65a3468e0a49993190171cc26cc9904a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2080 zcmc(eYiO2r7{>qaY3}eIpVQp5x#npHQ|EMtrZx{tr%h9H=~B^Bat(2e5FNwNm9)$< z8&g4B7P3M#l}+C0gAEZ8L}W<>B_a`h?L$c4u71xW^}#QF?178>zW?`i-S_qU-{);x zyQy^07}L6>Wevf^bB)>1(%u~R3!Wkn136&R=Ju9fA|yPIL18$OEewZ2C|elvK_22P zLLMQHkcXo5K?H;hIfwuQ$G|agqU2HXXe2u^9LqZN9e56WkC+bfC@~B|*$j1tJsI|8 z*qdQ~hFuwUX4vha_s}~2IUY0UGUzNkSkxA^MQyXsVwTNr8xJ;KY&_X`vzcN0y})yf zI!X$2O$pUXav z+zVnjn+rD|B+(_&B$=5{KNm#c$A~!~N}dBR0xuTu`8~+fXwuXUz8(BKyoVQn9n=;a z3$GR&%fEB@mVXXE8q8uI-lHG_a_|+wcND||u!orDJ<|SN`oAOhV{tzg=N5Nl(X)7W zi@wDS%l~%hd;a~w^*HnB=fKPL!H#?%tIQJ9xeSQfO1?QtXJsEAYWt0sI2A1@QAZ z%L@?7=21uK<-y4#=5jv42lWK%3G^qR%i$~rlH|!CMzRU=1bG5p0xt=;3A`lmlE6!X z840{3@DhWwe#O!yCK~+BO?`d6dV72I=!DVAvo|%>`AdH~j>g7XI0FRHX;2R58>b(;SoO%$GT5$=vjmZZ#_0V>J1= z(X7ixxt&IdJ|mmjyI?fGwLq)(q}6`N)(6*~(ehrSbpuAPUotvy5AC{Qm2{M8T5qLl zN18OL+fmuEVpX1>qUu{SRk+1y+975S8ZEqTWL{x^Pp-^BQs%0o{+SsK&vkWw(Ijcr zvl=i)*T9e9H!!f@=+dV~W5Y(buTVD`oohDAt~Yw{rcpcf{x+lIJ2~HHw5-BtTfNb~ zhzxYierr zN!^g!Oii!#?uomg1l~-l@dgOMyx_0u(Z+NhnZ>OY0 z?@S-i+&Nv^dGv@TZY$K?Z>H;7dy!6XS5M#n;>Huftj!zlsC&0`;N-CSz8uj)LR6Tun_)dSoP%3-nl#aifRdKJoXE@9V$%{0mi8yi|T%9O?>U z>&%WIJ{M|KW@C4dPw)6Jh;1`Y2eBdC8$@5{KYna@<4_Q1oxUeKRiv6w$G^RQI8R0M EH>B;$0{{R3 diff --git a/voxygen/test_assets/dragon_wingL_in.vox b/voxygen/test_assets/dragon_wingL_in.vox deleted file mode 100644 index aa0a7eedb2afbf963d7ede5a3235f2f9b7bdf915..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2884 zcmc)LTZ~m#9mnziz|5S>zMs9%KDW6s+-9JbYqw3=qN1qrvV`jUzj_)CCrDwKpd}4?1F8GY1i7q_x7SF)M<=D9PKCZY3H^0q`s_sX+X?Br z6VQLhXAF+VIGi$LaY~HGDKaLfz_^@V#^&@eKBt>8I`bK)Gmo(%?zVQ^!(2PP)($Z* zw{}-#{3MCJ=8BCQ|7*c3<;`;k+UulStCQTP6njU z`#u@C`6OE?qYoAC^^++%!1EsKF-Z1OH{|MB;|ek)s3Jzrx<{xXM8Nw2S#fJcHsPTK zpYz(sI|12GhU5VC1q>o(?^KW>K@}c*At!w@r0tMBR(0P&X4Ls)6CPS9^K2hV=tmI) zNE6ydh6Gi2%{=5}NJg$r+N-$lL4!T)bFT>xEtIM2BTHmIStL{Tc?B5~R1qU}ZMvkb zgmRs7L^jAWbxqPk%Uz=nB@~fzW-7=yHwjrKV=_mC8bZ_&pn;hAZjupgx5zR|D58Lr z^H)K}8B9<`j2sba2vJ9X27EN(p^OrW$T+_#s;D4G!nv-IF z-C*A}*dGnbb=I>^xlUb;^{w&yRpUA*D?FdDM-sQ5u1uRT<(Rf&>SLad9QI($J0a^B zavhL9^Y6i@98g!L{St~UIa@^(9L{ww9((wqt=4_-zi`8b4Vs>w)@P?okGyqD3$uUe zA6cfGH+Rc@-Wk8DJ-b%wnWr{s`p7O_JwC3hr=HQ(vu&-v`l8~oT#cuPH1x`Hjh^2q z+tDLCRF+++$Zq9|cbjT2nEFnd?t9l%JY))HOexp-+orX3Fs!d#nI4{Fz!M)chN^*XfEH1m|{{9)6LADh+sh%bp z8XD57(P6E-e~G@hdQ>OB*Qd)rAJ(5fT&BApFV~xV=j=t(N53=u-nl<{#`tw?`>Vh^Me^rf{hCcX(>634m-X0mz z=;){(s642zJaR=gb5zx-s;-^Aw}!7Y**gOR`tIV>TDhXFXJ3C!^@BBi{F}wPHqp>2 z=IZnFzh%>@xwf9%_mQTamtH=5Ni)BkRp-k4I`{iKdZ2w=TV6e{T|c{_eed4U*w~mp zGs%k3KQ;f3>C@ld>))sBum5$QQ>f+5hvafgS9>mZFP)srFLZ5E^7zzTdGX|r=5qg% nb91?I-t=6$_uR+j#%~>)%lppVRvI<5rfc%Q_x|(D=hFTSe|IGn diff --git a/voxygen/test_assets/dragon_wingL_out.vox b/voxygen/test_assets/dragon_wingL_out.vox deleted file mode 100644 index 879372f6d8d7af3fb5897159e1512c98499fe431..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3544 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 diff --git a/voxygen/test_assets/dragonhead.vox b/voxygen/test_assets/dragonhead.vox deleted file mode 100644 index 0de9789f15d4495178dca869b50b40272cc46005..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3040 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 S)HH5pGxbliZ6tnry!;FE;3mre diff --git a/voxygen/test_assets/foot_BR.vox b/voxygen/test_assets/foot_BR.vox deleted file mode 100644 index 073a55c9e009ef5d5b79538af901e1f6f04bd83f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1236 zcma)*e@L8l9LGP;^V~wR*)7lW$F1`^b-O!b?$q>5TW5N?d;GDSY1?fR7aMtqZ5$!n zaV)kg$%bW@=!BM8h{Tv}qEhsSlOba;#;_4V$QTj*+aD4A_v-t&KZmOiy!kwzpYQMI z^L)QO2M&2AM5Mhj+M$%(u!(d^&CU|Q%`A3D)^Q!lR(6A!Nn~Fb~g^cGQ3l2th?_h3k9`|2y zf%yXCA}lNXtnjk9bLT`j|LbNvgY+iT);5KYEKlX5*BXIBBRXru9`HCwpocFopCnVfsB` zh-NckutuUsYAbXSLH*1ZSupxj`wC!I& z(n<0Xc`Q#p`iJL=)ZKBrdB1F&ef1emTpXsLH=n!Tm9ZQvB;)Zswtp+n>UFs54vBs^ zJ2^-Cn?*iZxXILwbzV9>!oCaBw0^ll*R^%R;V=&cBujz6G1i3#KRi0$19iXtE3Tg4 W<~!R;Tfwbjmj6ky&Bjlzmwy2+<0jnz diff --git a/voxygen/test_assets/foot_FL.vox b/voxygen/test_assets/foot_FL.vox deleted file mode 100644 index 23eab56821aed022d1485f7849650580a8a36cc5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1192 zcma)*Z%kWd6vofJWeE|7OiH0;mRewIiy12*6v0^pWWD^E48g722s13wG`OWPWNVt4 ztxCiNWwn7VaUvQ*%re|aOEi8!vXEuTvMjh56GN887{B_#7{C2|FZ0{N^d!%H?s?8V z=Y7w)?>lhdkZW2*x?4g$iX@#Q(iaN1KW#e7EdOGg;zNhSp0R-&NkIbG^us5e9O z90iMlZfLrML=!_aQ&+5OhNf8zUF5Q^bj^f_p=(-5Ghybdn5O9=O;^5dvZd=_$Ez)( z_G4Ng5Fn9A@GvFpzp_TT^>6;PT3KD~#%ow=oX4cg`HEv3)h9*sIWaL6e{0#RjBLE!x$|f ze6Em>mY<_7A@rt&w-$vn_f&4L182ldMZ!mYCP-<_ihI(5Z@vuwt=$wK6)MiD+S5Yw ziXd;O_2aonIv-iGGO>FH3ww*W|8gl9&yyBmS>Y#z-xSiPg~d;W)dk`94dn-gxpv{( zgTlt!LZm}DJs?a)Y>W>H(-C1XAdIyMmz3UH=OEJVCf@5|`a}(h{syK;T3P+@O@5z` zP*rZDxu%THS3H~;Xdr3`$z#IoyTZyRLcP;L$XCJ9`aQ(j8X54}h}4xb*-=Smu$uN} zKL=iGB>Z{{(V-sVC&NsA5GAuP&ic(Oq~39pI8sVpULGZdJE$%#!0&Zazh@UO)p(hD zeRwh(|nJO4hP=t(8B1=_7WbfXT0|+_-0FgEGQu z9-I9StGSE`t=_HsAMM)pSpUwFXYjd;@RjA$ z{ic%Tu$`34_1OH)@61|<`|c1Mfip7;B)`h=@zPB$|FF)BrzY5UewNP9SLnOGPB0kc rp@8Hn@E4YK;lX#0_V+-Yum6gxE4X>jwqi55Rm{|%6x%HP(yWrpBd!jLwE zjy9Xj6*rrO*upyJhR7&&tt7Is2PZ{Jp_Jmv7z`<8jJ@t*jJ^GKWA|3f7zz=p~KPQSUkr{1g^}{#$ zeLg}>rJ2^c3c6l#abmEEXh=vN6K3BPRz49L?N)-GDvmbpA=c5%pvO$4!Nyc)HQAwB z0o7nhRttX*s8k6-$UT`)5BwTT<|ENoCg zSj}Uz{}DBpaiQJ4b^l}CyB_P`Uj7UoXDObFVp`nA4EVM);Qjyo*Vor`v1yiC?;I_Y z=dmO$-1<_ue?++Ia^ZHn8Lb?rd;b!Wj8hsbWqIb&KRjzycgJq$z3MdkT2hQ$n4o;9 zjJw}dvmCaNayTBFe|}xQ*5Up;#75!F%mT@;vV6RBlgmG>^Wv#V_MM-l>+==*udn0x t`*|oJg$n+{ur56K?$P-ksQdL_arFc@-`Q3=AKWUI_dhANS@_BM@()`hBKH6Q diff --git a/voxygen/test_assets/lionhead.vox b/voxygen/test_assets/lionhead.vox deleted file mode 100644 index 7d6727d68553a8bfa9c0b56db5003eab21bb2042..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5164 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 E1MV8k_W%F@ From de37e494f3fae62b3751a4959b619ee2db67a635 Mon Sep 17 00:00:00 2001 From: Pfauenauge90 <44173739+Pfauenauge90@users.noreply.github.com> Date: Fri, 26 Apr 2019 18:13:30 +0200 Subject: [PATCH 4/4] FPS display moved, changes to windows Former-commit-id: 94543cc211584b9f560c5c7145f1775f8689d267 --- voxygen/src/hud/mod.rs | 448 ++++++++++++++++++++--------------------- 1 file changed, 219 insertions(+), 229 deletions(-) diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index 8ff6e1bee3..792ec24324 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -6,9 +6,7 @@ use crate::{ window::{Event as WinEvent, Key, Window}, GlobalState, }; -use common::{ - assets, - figure::Segment}; +use common::{assets, figure::Segment}; use conrod_core::{ color, @@ -24,13 +22,13 @@ widget_ids! { bag_space_add, inventorytest_button, inventorytest_button_label, - //Debug + // Debug debug_bg, debug_button, debug_button_label, fps_counter, - // Logo - v_logo, + // Game Version + version, // Bag and Inventory bag, @@ -282,7 +280,7 @@ pub(self) struct Imgs { } impl Imgs { fn new(ui: &mut Ui, renderer: &mut Renderer) -> Imgs { - let mut load_img = |filename, ui: &mut Ui| { + let mut load_img = |filename, ui: &mut Ui| { let fullpath: String = ["/voxygen/", filename].concat(); let image = image::load_from_memory( assets::load(fullpath.as_str()) @@ -302,9 +300,9 @@ impl Imgs { .unwrap(); ui.new_graphic(ui::Graphic::Voxel(Segment::from(dot_vox))) }; - Imgs { + Imgs { // Bag - bag: load_img("element/buttons/bag/closed.png", ui), + bag: load_img("element/buttons/bag/closed.png", ui), bag_hover: load_img("element/buttons/bag/closed_hover.png", ui), bag_press: load_img("element/buttons/bag/closed_press.png", ui), bag_open: load_img("element/buttons/bag/open.png", ui), @@ -315,7 +313,6 @@ impl Imgs { inv_slot: load_vox("element/buttons/inv_slot.vox", ui), // Buttons - settings: load_vox("element/buttons/settings.vox", ui), settings_hover: load_vox("element/buttons/settings_hover.vox", ui), settings_press: load_vox("element/buttons/settings_press.vox", ui), @@ -361,7 +358,6 @@ impl Imgs { mmap_frame: load_vox("element/frames/mmap.vox", ui), mmap_frame_bg: load_img("element/misc_bg/mmap_bg.png", ui), - // Skillbar Module sb_grid: load_img("element/skill_bar/sbar_grid.png", ui), sb_grid_bg: load_img("element/skill_bar/sbar_grid_bg.png", ui), @@ -386,7 +382,7 @@ impl Imgs { check_checked_mo: load_img("element/buttons/check/yes_mo.png", ui), slider: load_img("element/slider/track.png", ui), slider_indicator: load_img("element/slider/indicator.png", ui), - button_blank: ui.new_graphic(ui::Graphic::Blank), + button_blank: ui.new_graphic(ui::Graphic::Blank), button_blue_mo: load_img("element/buttons/blue_mo.png", ui), button_blue_press: load_img("element/buttons/blue_press.png", ui), @@ -424,7 +420,6 @@ impl Imgs { chat_arrow: load_img("element/buttons/arrow/chat_arrow.png", ui), chat_arrow_mo: load_img("element/buttons/arrow/chat_arrow_mo.png", ui), chat_arrow_press: load_img("element/buttons/arrow/chat_arrow_press.png", ui), - } } } @@ -550,15 +545,18 @@ impl Hud { // Display debug window if self.show_debug { - Image::new(self.imgs.window_frame_2) - .down_from(self.ids.mmap_frame, 20.0) - .w_h(300.0, 350.0) - .set(self.ids.debug_bg, ui_widgets); + // Alpha Version + Text::new(version) + .top_left_with_margins_on(ui_widgets.window, 5.0, 5.0) + .font_size(14) + .font_id(self.font_opensans) + .color(TEXT_COLOR) + .set(self.ids.version, ui_widgets); Text::new(&format!("FPS: {:.1}", tps)) .color(TEXT_COLOR) - .top_left_with_margins_on(self.ids.debug_bg, 20.0, 20.0) + .down_from(self.ids.version, 5.0) .font_id(self.font_opensans) - .font_size(18) + .font_size(14) .set(self.ids.fps_counter, ui_widgets); } @@ -586,13 +584,6 @@ impl Hud { events.push(Event::SendMessage(msg)); } - // Alpha Version - Text::new(version) - .top_left_with_margins_on(ui_widgets.window, 5.0, 5.0) - .font_size(14) - .color(TEXT_COLOR) - .set(self.ids.v_logo, ui_widgets); - // Help Text if self.show_help { Image::new(self.imgs.window_frame_2) @@ -608,13 +599,13 @@ impl Hud { F2 = Toggle Interface \n\ \n\ Enter = Open Chat \n\ - Mouse Wheel = Scroll Chat" + Mouse Wheel = Scroll Chat", ) - .color(TEXT_COLOR) - .top_left_with_margins_on(self.ids.help_bg, 20.0, 20.0) - .font_id(self.font_opensans) - .font_size(18) - .set(self.ids.help, ui_widgets); + .color(TEXT_COLOR) + .top_left_with_margins_on(self.ids.help_bg, 20.0, 20.0) + .font_id(self.font_opensans) + .font_size(18) + .set(self.ids.help, ui_widgets); // X-button if Button::image(self.imgs.close_button) @@ -631,18 +622,17 @@ impl Hud { // Minimap frame and bg //Image::new(self.imgs.mmap_frame_bg) - //.w_h(1750.0 / 8.0, 1650.0 / 8.0) - //.top_right_with_margins_on(ui_widgets.window, 5.0, 5.0) - //.set(self.ids.mmap_frame_bg, ui_widgets); - + //.w_h(1750.0 / 8.0, 1650.0 / 8.0) + //.top_right_with_margins_on(ui_widgets.window, 5.0, 5.0) + //.set(self.ids.mmap_frame_bg, ui_widgets); Image::new(self.imgs.mmap_frame) - .w_h(100.0*2.5, 100.0*2.5) + .w_h(100.0 * 2.0, 100.0 * 2.0) .top_right_with_margins_on(ui_widgets.window, 5.0, 5.0) .set(self.ids.mmap_frame, ui_widgets); - Rectangle::fill_with([92.0*2.5, 82.0*2.5], color::RED) - .mid_top_with_margin_on(self.ids.mmap_frame, 13.0*2.5+2.5) + Rectangle::fill_with([92.0 * 2.0, 82.0 * 2.0], color::TRANSPARENT) + .mid_top_with_margin_on(self.ids.mmap_frame, 13.0 * 2.0 + 2.0) .set(self.ids.mmap_frame_bg, ui_widgets); // Title @@ -663,6 +653,8 @@ impl Hud { .press_image(self.imgs.settings_press) .label("N") .label_font_size(10) + .label_font_id(self.font_metamorph) + .color(TEXT_COLOR) .label_color(TEXT_COLOR) .label_y(conrod_core::position::Relative::Scalar(-7.0)) .label_x(conrod_core::position::Relative::Scalar(10.0)) @@ -684,6 +676,7 @@ impl Hud { .press_image(self.imgs.map_press) .label("M") .label_font_size(10) + .label_font_id(self.font_metamorph) .label_color(TEXT_COLOR) .label_y(conrod_core::position::Relative::Scalar(-7.0)) .label_x(conrod_core::position::Relative::Scalar(10.0)) @@ -717,7 +710,8 @@ impl Hud { if match self.open_windows { Windows::Settings => false, _ => true, - } && self.map_open == false { + } && self.map_open == false + { // 1 Social if Button::image(self.imgs.social_button) .w_h(25.0, 25.0) @@ -726,6 +720,7 @@ impl Hud { .press_image(self.imgs.social_press) .label("O") .label_font_size(10) + .label_font_id(self.font_metamorph) .label_color(TEXT_COLOR) .label_y(conrod_core::position::Relative::Scalar(-7.0)) .label_x(conrod_core::position::Relative::Scalar(10.0)) @@ -751,6 +746,7 @@ impl Hud { .press_image(self.imgs.spellbook_press) .label("P") .label_font_size(10) + .label_font_id(self.font_metamorph) .label_color(TEXT_COLOR) .label_y(conrod_core::position::Relative::Scalar(-7.0)) .label_x(conrod_core::position::Relative::Scalar(10.0)) @@ -776,6 +772,7 @@ impl Hud { .press_image(self.imgs.character_press) .label("C") .label_font_size(10) + .label_font_id(self.font_metamorph) .label_color(TEXT_COLOR) .label_y(conrod_core::position::Relative::Scalar(-7.0)) .label_x(conrod_core::position::Relative::Scalar(10.0)) @@ -793,20 +790,21 @@ impl Hud { } } - // 5 Quest-Log - if Button::image(self.imgs.qlog_button) - .w_h(23.0, 25.0) - .left_from(self.ids.character_button, 10.0) - .hover_image(self.imgs.qlog_hover) - .press_image(self.imgs.qlog_press) - .label("L") - .label_font_size(10) - .label_color(TEXT_COLOR) - .label_y(conrod_core::position::Relative::Scalar(-7.0)) - .label_x(conrod_core::position::Relative::Scalar(10.0)) - .set(self.ids.qlog_button, ui_widgets) - .was_clicked() - { + // 5 Quest-Log + if Button::image(self.imgs.qlog_button) + .w_h(23.0, 25.0) + .left_from(self.ids.character_button, 10.0) + .hover_image(self.imgs.qlog_hover) + .press_image(self.imgs.qlog_press) + .label("L") + .label_font_size(10) + .label_font_id(self.font_metamorph) + .label_color(TEXT_COLOR) + .label_y(conrod_core::position::Relative::Scalar(-7.0)) + .label_x(conrod_core::position::Relative::Scalar(10.0)) + .set(self.ids.qlog_button, ui_widgets) + .was_clicked() + { self.open_windows = match self.open_windows { Windows::Small(Small::Questlog) => Windows::None, Windows::None | Windows::Small(_) => Windows::Small(Small::Questlog), @@ -819,7 +817,6 @@ impl Hud { } } - // Skillbar Module // Experience-Bar @@ -916,54 +913,54 @@ impl Hud { .set(self.ids.next_level_text, ui_widgets); // Bag contents - if self.bag_open { - // Contents - Image::new(self.imgs.bag_contents) - .w_h(68.0*4.0, 123.0*4.0) - .bottom_right_with_margins_on(ui_widgets.window, 90.0, 5.0) - .set(self.ids.bag_contents, ui_widgets); + if self.bag_open { + // Contents + Image::new(self.imgs.bag_contents) + .w_h(68.0 * 4.0, 123.0 * 4.0) + .bottom_right_with_margins_on(ui_widgets.window, 90.0, 5.0) + .set(self.ids.bag_contents, ui_widgets); - // Alignment for Grid - Rectangle::fill_with([(58.0*4.0)-5.0, 100.0*4.0], color::TRANSPARENT) - .top_left_with_margins_on(self.ids.bag_contents, 11.0*4.0, 5.0*4.0) - .scroll_kids() - .scroll_kids_vertically() - .set(self.ids.inv_alignment, ui_widgets); - // Grid - Image::new(self.imgs.inv_grid) - .w_h(58.0*4.0, 111.0*4.0) - .mid_top_with_margin_on(self.ids.inv_alignment, 0.0) - .set(self.ids.inv_grid_1, ui_widgets); - Image::new(self.imgs.inv_grid) - .w_h(58.0*4.0, 111.0*4.0) - .mid_top_with_margin_on(self.ids.inv_alignment, 110.0*4.0) - .set(self.ids.inv_grid_2, ui_widgets); - Scrollbar::y_axis(self.ids.inv_alignment) - .thickness(5.0) - .rgba(0.33, 0.33, 0.33, 1.0) - .set(self.ids.inv_scrollbar, ui_widgets); + // Alignment for Grid + Rectangle::fill_with([(58.0 * 4.0) - 5.0, 100.0 * 4.0], color::TRANSPARENT) + .top_left_with_margins_on(self.ids.bag_contents, 11.0 * 4.0, 5.0 * 4.0) + .scroll_kids() + .scroll_kids_vertically() + .set(self.ids.inv_alignment, ui_widgets); + // Grid + Image::new(self.imgs.inv_grid) + .w_h(58.0 * 4.0, 111.0 * 4.0) + .mid_top_with_margin_on(self.ids.inv_alignment, 0.0) + .set(self.ids.inv_grid_1, ui_widgets); + Image::new(self.imgs.inv_grid) + .w_h(58.0 * 4.0, 111.0 * 4.0) + .mid_top_with_margin_on(self.ids.inv_alignment, 110.0 * 4.0) + .set(self.ids.inv_grid_2, ui_widgets); + Scrollbar::y_axis(self.ids.inv_alignment) + .thickness(5.0) + .rgba(0.33, 0.33, 0.33, 1.0) + .set(self.ids.inv_scrollbar, ui_widgets); - // X-button - if Button::image(self.imgs.close_button) - .w_h(4.0*4.0, 4.0*4.0) - .hover_image(self.imgs.close_button_hover) - .press_image(self.imgs.close_button_press) - .top_right_with_margins_on(self.ids.bag_contents, 4.5, 4.5) - .set(self.ids.bag_close, ui_widgets) - .was_clicked() - { - self.bag_open = false; - } - - if self.inventory_space > 0 { - // First Slot - Button::image(self.imgs.inv_slot) - .top_left_with_margins_on(self.ids.inv_grid_1, 4.0, 4.0) - .w_h(10.0*4.0, 10.0*4.0) - .set(self.ids.inv_slot_0, ui_widgets); - } + // X-button + if Button::image(self.imgs.close_button) + .w_h(4.0 * 4.0, 4.0 * 4.0) + .hover_image(self.imgs.close_button_hover) + .press_image(self.imgs.close_button_press) + .top_right_with_margins_on(self.ids.bag_contents, 4.5, 4.5) + .set(self.ids.bag_close, ui_widgets) + .was_clicked() + { + self.bag_open = false; } + if self.inventory_space > 0 { + // First Slot + Button::image(self.imgs.inv_slot) + .top_left_with_margins_on(self.ids.inv_grid_1, 4.0, 4.0) + .w_h(10.0 * 4.0, 10.0 * 4.0) + .set(self.ids.inv_slot_0, ui_widgets); + } + } + // Bag if !self.map_open && self.show_ui { self.bag_open = ToggleButton::new(self.bag_open, self.imgs.bag, self.imgs.bag_open) @@ -972,9 +969,10 @@ impl Hud { .press_images(self.imgs.bag_press, self.imgs.bag_open_press) .w_h(420.0 / 10.0, 480.0 / 10.0) .set(self.ids.bag, ui_widgets); - Text::new("B") + Text::new("B") .bottom_right_with_margins_on(self.ids.bag, 0.0, 0.0) .font_size(10) + .font_id(self.font_metamorph) .color(TEXT_COLOR) .set(self.ids.bag_text, ui_widgets); } else { @@ -985,9 +983,8 @@ impl Hud { Text::new("B") .bottom_right_with_margins_on(self.ids.bag, 0.0, 0.0) .font_size(10) - .color(TEXT_COLOR) + .font_id(self.font_metamorph) .set(self.ids.bag_text, ui_widgets); - } //Windows @@ -999,7 +996,7 @@ impl Hud { if let Windows::Settings = self.open_windows { // BG - Image::new(self.imgs.settings_bg) + Image::new(self.imgs.window_frame) .middle_of(ui_widgets.window) .w_h(1648.0 / 2.5, 1952.0 / 2.5) .set(self.ids.settings_bg, ui_widgets); @@ -1073,11 +1070,11 @@ impl Hud { self.imgs.check, self.imgs.check_checked, ) - .w_h(288.0 / 24.0, 288.0 / 24.0) - .top_left_with_margins_on(self.ids.rectangle, 40.0, 15.0) - .hover_images(self.imgs.check_checked_mo, self.imgs.check_mo) - .press_images(self.imgs.check_press, self.imgs.check_press) - .set(self.ids.inventorytest_button, ui_widgets); + .w_h(288.0 / 24.0, 288.0 / 24.0) + .top_left_with_margins_on(self.ids.rectangle, 40.0, 15.0) + .hover_images(self.imgs.check_checked_mo, self.imgs.check_mo) + .press_images(self.imgs.check_press, self.imgs.check_press) + .set(self.ids.inventorytest_button, ui_widgets); Text::new("Show Inventory Test Button") .right_from(self.ids.inventorytest_button, 10.0) @@ -1087,16 +1084,13 @@ impl Hud { .color(TEXT_COLOR) .set(self.ids.inventorytest_button_label, ui_widgets); - self.show_debug = ToggleButton::new( - self.show_debug, - self.imgs.check, - self.imgs.check_checked - ) - .w_h(288.0 / 24.0, 288.0 / 24.0) - .top_left_with_margins_on(self.ids.rectangle, 65.0, 15.0) - .hover_images(self.imgs.check_checked_mo, self.imgs.check_mo) - .press_images(self.imgs.check_press, self.imgs.check_press) - .set(self.ids.debug_button, ui_widgets); + self.show_debug = + ToggleButton::new(self.show_debug, self.imgs.check, self.imgs.check_checked) + .w_h(288.0 / 24.0, 288.0 / 24.0) + .top_left_with_margins_on(self.ids.rectangle, 65.0, 15.0) + .hover_images(self.imgs.check_checked_mo, self.imgs.check_mo) + .press_images(self.imgs.check_press, self.imgs.check_press) + .set(self.ids.debug_button, ui_widgets); Text::new("Show Debug Window") .right_from(self.ids.debug_button, 10.0) @@ -1105,85 +1099,80 @@ impl Hud { .graphics_for(self.ids.debug_button) .color(TEXT_COLOR) .set(self.ids.debug_button_label, ui_widgets); - } // 2 Gameplay//////////////// if Button::image(if let SettingsTab::Gameplay = self.settings_tab { - self.imgs.button_blue_mo - } else { - self.imgs.button_blank - } - ) - .w_h(304.0 / 2.5, 80.0 / 2.5) - .hover_image(self.imgs.button_blue_mo) - .press_image(self.imgs.button_blue_press) - .down_from(self.ids.interface, 1.0) - .label("Gameplay") - .label_font_size(14) - .label_color(TEXT_COLOR) - .set(self.ids.gameplay, ui_widgets) - .was_clicked() + self.imgs.button_blue_mo + } else { + self.imgs.button_blank + }) + .w_h(304.0 / 2.5, 80.0 / 2.5) + .hover_image(self.imgs.button_blue_mo) + .press_image(self.imgs.button_blue_press) + .down_from(self.ids.interface, 1.0) + .label("Gameplay") + .label_font_size(14) + .label_color(TEXT_COLOR) + .set(self.ids.gameplay, ui_widgets) + .was_clicked() { self.settings_tab = SettingsTab::Gameplay; } // 3 Controls///////////////////// if Button::image(if let SettingsTab::Controls = self.settings_tab { - self.imgs.button_blue_mo - } else { - self.imgs.button_blank - } - ) - .w_h(304.0 / 2.5, 80.0 / 2.5) - .hover_image(self.imgs.button_blue_mo) - .press_image(self.imgs.button_blue_press) - .down_from(self.ids.gameplay, 1.0) - .label("Controls") - .label_font_size(14) - .label_color(TEXT_COLOR) - .set(self.ids.controls, ui_widgets) - .was_clicked() + self.imgs.button_blue_mo + } else { + self.imgs.button_blank + }) + .w_h(304.0 / 2.5, 80.0 / 2.5) + .hover_image(self.imgs.button_blue_mo) + .press_image(self.imgs.button_blue_press) + .down_from(self.ids.gameplay, 1.0) + .label("Controls") + .label_font_size(14) + .label_color(TEXT_COLOR) + .set(self.ids.controls, ui_widgets) + .was_clicked() { self.settings_tab = SettingsTab::Controls; } // 4 Video//////////////////////////////// if Button::image(if let SettingsTab::Video = self.settings_tab { - self.imgs.button_blue_mo - } else { - self.imgs.button_blank - } - ) - .w_h(304.0 / 2.5, 80.0 / 2.5) - .hover_image(self.imgs.button_blue_mo) - .press_image(self.imgs.button_blue_press) - .down_from(self.ids.controls, 1.0) - .label("Video") - .label_font_size(14) - .label_color(TEXT_COLOR) - .set(self.ids.video, ui_widgets) - .was_clicked() + self.imgs.button_blue_mo + } else { + self.imgs.button_blank + }) + .w_h(304.0 / 2.5, 80.0 / 2.5) + .hover_image(self.imgs.button_blue_mo) + .press_image(self.imgs.button_blue_press) + .down_from(self.ids.controls, 1.0) + .label("Video") + .label_font_size(14) + .label_color(TEXT_COLOR) + .set(self.ids.video, ui_widgets) + .was_clicked() { self.settings_tab = SettingsTab::Video; } // 5 Sound/////////////////////////////// if Button::image(if let SettingsTab::Sound = self.settings_tab { - self.imgs.button_blue_mo - } else { - self.imgs.button_blank - } - ) - .w_h(304.0 / 2.5, 80.0 / 2.5) - .hover_image(self.imgs.button_blue_mo) - .press_image(self.imgs.button_blue_press) - .down_from(self.ids.video, 1.0) - .label("Sound") - .label_font_size(14) - .label_color(TEXT_COLOR) - .set(self.ids.sound, ui_widgets) - .was_clicked() + self.imgs.button_blue_mo + } else { + self.imgs.button_blank + }) + .w_h(304.0 / 2.5, 80.0 / 2.5) + .hover_image(self.imgs.button_blue_mo) + .press_image(self.imgs.button_blue_press) + .down_from(self.ids.video, 1.0) + .label("Sound") + .label_font_size(14) + .label_color(TEXT_COLOR) + .set(self.ids.sound, ui_widgets) + .was_clicked() { self.settings_tab = SettingsTab::Sound; } @@ -1201,12 +1190,12 @@ impl Hud { if char_window_open { Image::new(self.imgs.window_frame) .right_from(self.ids.charwindow_frame, 20.0) - .w_h(107.0*4.0, 125.0*4.0) + .w_h(107.0 * 4.0, 125.0 * 4.0) .set(self.ids.social_frame, ui_widgets); } else { Image::new(self.imgs.window_frame) .top_left_with_margins_on(ui_widgets.window, 200.0, 10.0) - .w_h(1648.0 / 4.0, 1952.0 / 4.0) + .w_h(107.0 * 4.0, 125.0 * 4.0) .set(self.ids.social_frame, ui_widgets); } @@ -1223,7 +1212,6 @@ impl Hud { .scroll_kids_vertically() .set(self.ids.social_bg, ui_widgets); - // X-Button if Button::image(self.imgs.close_button) .w_h(20.0, 20.0) @@ -1252,33 +1240,34 @@ impl Hud { if char_window_open { Image::new(self.imgs.window_frame) .right_from(self.ids.charwindow_frame, 20.0) - .w_h(1648.0 / 4.0, 1952.0 / 4.0) + .w_h(107.0 * 4.0, 125.0 * 4.0) .set(self.ids.spellbook_frame, ui_widgets); } else { Image::new(self.imgs.window_frame) - .top_left_with_margins_on(ui_widgets.window, 200.0, 90.0) - .w_h(1648.0 / 4.0, 1952.0 / 4.0) + .top_left_with_margins_on(ui_widgets.window, 200.0, 10.0) + .w_h(107.0 * 4.0, 125.0 * 4.0) .set(self.ids.spellbook_frame, ui_widgets); } - // BG - Image::new(self.imgs.spellbook_bg) - .w_h(1648.0 / 4.0, 1952.0 / 4.0) - .middle_of(self.ids.spellbook_frame) - .set(self.ids.spellbook_bg, ui_widgets); - // Icon Image::new(self.imgs.spellbook_icon) - .w_h(224.0 / 3.0, 224.0 / 3.0) - .top_left_with_margins_on(self.ids.spellbook_frame, -10.0, -10.0) + .w_h(40.0, 40.0) + .top_left_with_margins_on(self.ids.spellbook_frame, 4.0, 4.0) .set(self.ids.spellbook_icon, ui_widgets); + // Content alignment + Rectangle::fill_with([362.0, 418.0], color::TRANSPARENT) + .bottom_right_with_margins_on(self.ids.spellbook_frame, 17.0, 17.0) + .scroll_kids() + .scroll_kids_vertically() + .set(self.ids.spellbook_bg, ui_widgets); + // X-Button if Button::image(self.imgs.close_button) - .w_h(244.0 * 0.22 / 4.0, 244.0 * 0.22 / 4.0) + .w_h(20.0, 20.0) .hover_image(self.imgs.close_button_hover) .press_image(self.imgs.close_button_press) - .top_right_with_margins_on(self.ids.spellbook_frame, 4.0, 4.0) + .top_right_with_margins_on(self.ids.spellbook_frame, 17.0, 5.0) .set(self.ids.spellbook_close, ui_widgets) .was_clicked() { @@ -1290,7 +1279,8 @@ impl Hud { } // Title Text::new("Spellbook") - .mid_top_with_margin_on(self.ids.spellbook_frame, 7.0) + .mid_top_with_margin_on(self.ids.spellbook_frame, 17.0) + .font_size(14) .color(TEXT_COLOR) .set(self.ids.spellbook_title, ui_widgets); } @@ -1299,33 +1289,33 @@ impl Hud { if char_window_open { Image::new(self.imgs.window_frame) .right_from(self.ids.charwindow_frame, 20.0) - .w_h(1648.0 / 4.0, 1952.0 / 4.0) + .w_h(107.0 * 4.0, 125.0 * 4.0) .set(self.ids.questlog_frame, ui_widgets); } else { Image::new(self.imgs.window_frame) - .top_left_with_margins_on(ui_widgets.window, 200.0, 90.0) - .w_h(1648.0 / 4.0, 1952.0 / 4.0) + .top_left_with_margins_on(ui_widgets.window, 200.0, 10.0) + .w_h(107.0 * 4.0, 125.0 * 4.0) .set(self.ids.questlog_frame, ui_widgets); } - // BG - Image::new(self.imgs.questlog_bg) - .w_h(1648.0 / 4.0, 1952.0 / 4.0) - .middle_of(self.ids.questlog_frame) - .set(self.ids.questlog_bg, ui_widgets); - // Icon Image::new(self.imgs.questlog_icon) - .w_h(224.0 / 3.0, 224.0 / 3.0) - .top_left_with_margins_on(self.ids.questlog_frame, -10.0, -10.0) + .w_h(40.0, 40.0) + .top_left_with_margins_on(self.ids.questlog_frame, 4.0, 4.0) .set(self.ids.questlog_icon, ui_widgets); + // Content alignment + Rectangle::fill_with([362.0, 418.0], color::TRANSPARENT) + .bottom_right_with_margins_on(self.ids.questlog_frame, 17.0, 17.0) + .scroll_kids() + .scroll_kids_vertically() + .set(self.ids.questlog_bg, ui_widgets); + // X-Button if Button::image(self.imgs.close_button) - .w_h(244.0 * 0.22 / 4.0, 244.0 * 0.22 / 4.0) - .hover_image(self.imgs.close_button_hover) + .w_h(20.0, 20.0) .press_image(self.imgs.close_button_press) - .top_right_with_margins_on(self.ids.questlog_frame, 4.0, 4.0) + .top_right_with_margins_on(self.ids.questlog_frame, 17.0, 5.0) .set(self.ids.questlog_close, ui_widgets) .was_clicked() { @@ -1337,8 +1327,9 @@ impl Hud { } // Title Text::new("Quest-Log") - .mid_top_with_margin_on(self.ids.questlog_frame, 7.0) + .mid_top_with_margin_on(self.ids.questlog_frame, 17.0) .color(TEXT_COLOR) + .font_size(14) .set(self.ids.questlog_title, ui_widgets); } } @@ -1353,15 +1344,15 @@ impl Hud { .set(self.ids.charwindow_frame, ui_widgets); // BG - Image::new(self.imgs.window_bg) - .w_h(348.0, 404.0) - .mid_top_with_margin_on(self.ids.charwindow_frame, 48.0) - .set(self.ids.charwindow_bg, ui_widgets); + //Image::new(self.imgs.window_bg) + //.w_h(348.0, 404.0) + //.mid_top_with_margin_on(self.ids.charwindow_frame, 48.0) + //.set(self.ids.charwindow_bg, ui_widgets); // Overlay - Image::new(self.imgs.charwindow) - .middle_of(self.ids.charwindow_bg) - .set(self.ids.charwindow, ui_widgets); + //Image::new(self.imgs.charwindow) + //.middle_of(self.ids.charwindow_bg) + //.set(self.ids.charwindow, ui_widgets); // Icon //Image::new(self.imgs.charwindow_icon) @@ -1444,11 +1435,11 @@ impl Hud { \n\ Intelligence", ) - .top_left_with_margins_on(self.ids.charwindow_rectangle, 100.0, 20.0) - .font_id(self.font_opensans) - .font_size(16) - .color(TEXT_COLOR) - .set(self.ids.charwindow_tab1_statnames, ui_widgets); + .top_left_with_margins_on(self.ids.charwindow_rectangle, 100.0, 20.0) + .font_id(self.font_opensans) + .font_size(16) + .color(TEXT_COLOR) + .set(self.ids.charwindow_tab1_statnames, ui_widgets); Text::new( "1234\n\ @@ -1459,11 +1450,11 @@ impl Hud { \n\ 124124", ) - .right_from(self.ids.charwindow_tab1_statnames, 10.0) - .font_id(self.font_opensans) - .font_size(16) - .color(TEXT_COLOR) - .set(self.ids.charwindow_tab1_stats, ui_widgets); + .right_from(self.ids.charwindow_tab1_statnames, 10.0) + .font_id(self.font_opensans) + .font_size(16) + .color(TEXT_COLOR) + .set(self.ids.charwindow_tab1_stats, ui_widgets); } // 2 Map @@ -1471,7 +1462,7 @@ impl Hud { // BG Image::new(self.imgs.map_bg) .w_h(824.0, 488.0) - .middle_of(ui_widgets.window) + .mid_top_with_margin_on(ui_widgets.window, 200.0) .set(self.ids.map_bg, ui_widgets); // Frame Image::new(self.imgs.map_frame_l) @@ -1491,10 +1482,10 @@ impl Hud { // X-Button if Button::image(self.imgs.close_button) - .w_h(4.0*2.0, 4.0*2.0) + .w_h(20.0, 20.0) .hover_image(self.imgs.close_button_hover) .press_image(self.imgs.close_button_press) - .top_right_with_margins_on(self.ids.map_frame_r, 1.0, 1.0) + .top_right_with_margins_on(self.ids.map_frame_r, 17.0, 5.0) .set(self.ids.map_close, ui_widgets) .was_clicked() { @@ -1503,12 +1494,11 @@ impl Hud { // Title Text::new("Map") .mid_top_with_margin_on(self.ids.map_bg, -7.0) - .font_size(50) + .font_size(14) .color(TEXT_COLOR) .set(self.ids.map_title, ui_widgets); } - // ESC-MENU // Background if self.menu_open {