From 5994aabca96a507c9ea5f0031aa3ec51f806813c Mon Sep 17 00:00:00 2001 From: Pfauenauge Date: Fri, 10 May 2019 23:49:14 +0200 Subject: [PATCH] positioning Former-commit-id: 4524965ee5fa82fc35c965061079d7b52919a74a --- assets/voxygen/element/buttons/x.vox | Bin 237548 -> 237548 bytes assets/voxygen/element/icons/head.vox | Bin 20624 -> 63732 bytes voxygen/src/hud/character_window.rs | 120 ++++++++++++++++++++++++-- voxygen/src/hud/skillbar.rs | 4 +- 4 files changed, 117 insertions(+), 7 deletions(-) diff --git a/assets/voxygen/element/buttons/x.vox b/assets/voxygen/element/buttons/x.vox index c5f9d5cad602ac651e4037963dc0f633e7daa2b9..8829dfd2077ca0693b29071027daa555d0a636e0 100644 GIT binary patch delta 23 fcmaE}pYP3nzJ?aYEldXAnQcvVwi|zE+PMM%fOZNx delta 23 fcmaE}pYP3nzJ?aYEldXAnf=`?w;O+F+PMM%f%^(- diff --git a/assets/voxygen/element/icons/head.vox b/assets/voxygen/element/icons/head.vox index 303b619e65ed3560b3e68627f79aad2ecea59e98..86ac3596aa1132a4b46522fb2f1dd8b565d5fda9 100644 GIT binary patch literal 63732 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 JJ=>0d{eOmO@VWp1 delta 8938 zcmW;QNscU8LWSYPiSWKPZ^Jw58}FMZ763B_6g5I@!S{eR4W9RY;dzY6ud=>(h&Mci-IkR$R?abPl zjWZi(j?NsMIXJU-X79|-nVmCRXSUA#v=%si=FTphT{yd}9bP)Ta(LzN+Tpds8;3Uz zhYlYdK017G_TcQ^*}bznXLrtSo!vV7)0!jv1n$h;nY*)aXW`D$ouxY~cUJDK-C4U+ zZ(Q2A6uA_-6uNYD>FCnIrGra*m-a60T-v#`b!Y3&Pb)z5nYkOd8@M}nckb@O-G#eL zcbD$2++Df5c6aUW#@$UTsz0&Ik;{?Gq06DmN0*N-A6!1Tymxu;^3LU*%UhSXiho)& z#Gk2*nT(l?Kt>>AE@LiZA!8w9DPt*PC1WLHEo0rPBNj8npF~J3Bo-10iG+kgLLo;X zMdTNyvCDU#1b)>PJ1)=bt+Rv;^oHJ3G)wUD)_g)N0Gg{_3G zgsp|Gg>8gwgr&j~VTrIcq}{?9tn?xhr&bQ zN8v}|2jK_dd*OTGJK;OwTjE>UKdlk+&rrum$4JLm$5_XtRx(jCRWemFQ!-N$C<&Cz zmCThalq{4il`NI4l&qAjm8_L)lx&m~N^&K+l1xdaB-N4XNOUARVjZ!LNJkwh36+FO zj!KS74oVJ6_Dc3jc1m_iwo0~2ep*8mpMkQWvZ1n(vXQc}vazy>vWc>(vZ=C}vYD2N^_;T z(oAWlG*y}^O_U}|W2LduNNJ=rR2nKhDm^MaC_O0ME8Xkd>D=k8w@SB4e_DN1pPur* z^1kwc@`3W9@}csP@{#hf^0D%X@`>`P@~QHf@|p5Ld7yl*e6D<CormvQb?NneR9@f1>C+|ABhe$#C($P{ATb~@Brzm0A~7N{CNU;4Au%B_ zB{3y2BQYZpkO)Z3Nz6$sNGwP!Ni0eD^BEQBdlj@M_km{1^lIoG_k?ND` zlNyj3kQ$O2k{Xd3)vU&>#;hi+Cak6=nv$B4nvn`f1*GPr=A;&+7NnM>mZVmsR;1RX z)}%J1Hl(hkE~GA`&ZN$yPNYtxDpD1xx@1+dDp(b)a#lI1j8sM{C6$s&NF}6VQZcEB zR75Hy6_PrVI+8k&I*{6v+LPLm+L79l+LHQdwQ>D?lWVs&wJ%$lCX6xW$wl=Px z8@sFNuH-J{F67SS&g4$yPUI?b6}ggJNvtWS3c2-?s zZ`CCZwOJQ9nstuQtN|jk&Jde*io~oFq-Gr>GwTSsS%)ahIzVaGJ}RsBaI$I_XRCH_ zv1%JvtA3-tne_{Ivpzmgvp&rFFzcQ1o$-zFjq#Q7)vOo77s6-4XTm4KC&Crsif~D| zBwP?K2f)B}b?hC_xUh9ib!hGT{kh7*EQf>VMs zf-`~v!GPeL;GE!s;DX?i;F92q;ELdy;D+GKs!yvvt@^O)!>V`E_tw5P?GgvmE^svM z9HD6gM5dh~HtiINX(vccJ4W-rZX@KT9ilMp0Ht~Rs4UyV$+BIXE!)AxvTf8?(|+S- z+ArKq`!Ma(v@f$RaWLxwN3+fmnl(UV))`{6PLY^(g4DEQWL6y^x9SjuRR<`o+DG-7 z*6gP2X6$C{0(JqrIlH+@7vvV?mgJV?R^-;?Hss!BeVO%T)~8vYW__6T;h%*&@jLMw z@f-0g@hkBQ@eA=Y@iX!I#Qem(VqP&XnU~B9<^}VddCojzo-t3Er_2-L3GtYCOgthU z5f6!n#E-;}#1F&|#P`H^#J9wMT5qc^aIDQbM`+dnky&Sm%{oP5)(KLxj**#lgyw&z zhbYWCKxx)KDzo-*vT7G+t9Ed)Y8zLpe&c4&vX~&o8sS&H6U$%d9W6 zKF#_x>%*)Mv)={ zXY5n_he;`y>0KSr6p*)qvHI)R5GO)QHrW)R@$S)P&TO)RfeW)QnU>Dj+o{H7B(owIsD7 zwI;P8^~<8aEc&+S+oCUvzM6mkpC)~p^kLG6N$>3M>~HLE?62&v>@Vyu?9c4a>`&}Z z z14QPWAvWg}i8&`o%{fM9(h+iN4$*u=jQXDj!7@(Y~yOqZ`{oJ zg}XT)=6ss-WzM%bn<>}WnQ?`^8J9R%ae<>1=LoGBAhO~Nu@$FCtT;hxMSuQh)+g2{ z))niDb;-J9U9c`#=d5$q8S9L7N;)N-kWNU)q+`+%>49nW9vwV#Fy@&Ol)_Ym+ zZM|l>74}wJ;$XFU;mgr%bA)CK5SeX;*lbfIW}6^2+ZdVYM#!x;L}9f7N~`rzS*?eY z)w(!at%Hlz+PGTn8@EqfvyItCY(ut3wgZ7t&4<~DNakf?m7i+a~wbnOo*82L?Q{^+|f%3WXh4SU^sg|ZXm}!BdmF5Vo6dQ*6HGGox0=8#XN0X&GU_$dA@Kr z(Zf1V>%6S-S%n@28KxCB}VyjG%SY?9LDr00;86mgI5QS9+pL6s3--+Fc zUB#|qSF$VF6&5MT<>Yd58M%yHN-iarkc-JhDpD1xl2l2mAXSjcN#&$6QW>d~R6;5y6_E;m zFEFw|?)5_yUOzzT^?g)c-^0o4yQt4z-@(P}+qioDH*Q}4g}c{3y#DF+FRy=lee=&i zfXJ(7h`oA>#H%Mry?Ttyt4GMadWgcS2Pi$dkE;3e?|J#jtGhURbq5!(ZsY3J-?(}8 z7w%sD@am^mzr6bG)y=;JLlj;+Kj`|{ei*ETPmA@<5C60e*f^~y0auN)!w${`A`9H8{dJ}R&5q4_|wi?c^|aPi1C zuC-TwjZ`{1_3wMuu zc-+(DULN=MxaMI~)QMM3kb2b^nOBXFd({wyR}D~lRUegC^>Fg4F3w)n!NsfExO&w$ zZXWf8yGK1d>giE0k9vDl^PoPe&vz}TEvPN1Bcv;&E2Jl&FQ6}AAYdq9Bw#FH^4osG zJ|#XzMtp>v_z(s00ZQV1RK$BY5$~e;6t#m(^WXnA`z!Nr+?api&iujr$^6Cq&AhQb zng2}oLiS4ZM)XedLGnrRMel;rxTYIZ%G*mZGc*TIEd8&`7Q zxRLw9o!o=mliZ8kn_MGyCf0lmdnI-wb|>~A_9XTq_9oUyjgS)>q99Zcd?^|AQ8DV_ zM5v21p$?jlQrox^`o@jW7w&`}gr0<6gx-W2nG2aKnH!lqnFpCCnHQNinMP!Y;`45P z|9=yB5qJ@J5_l4L5O@%{6Sxb!5x5Dx61WP!5V#0G3qJ|3gqOmL-vZ6Yt2Y970uKUD z0xtq@0!{eccBlVPoXcNZ=p@V$>p<)7Z Widget for CharacterWindow<'a> { // Title Text::new("Character Name") // Add in actual Character Name - .mid_top_with_margin_on(state.charwindow_frame, 4.0) + .mid_top_with_margin_on(state.charwindow_frame, 6.0) .font_id(self.fonts.metamorph) .font_size(14) .color(TEXT_COLOR) @@ -143,13 +143,123 @@ impl<'a> Widget for CharacterWindow<'a> { // Contents - //Head BG and Grid - + //Head Image::new(self.imgs.head_bg) - .w_h(28.0 * 4.0, 28.0 * 4.0) + .w_h(28.0 * 2.0, 28.0 * 2.0) .mid_top_with_margin_on(state.content_align, 5.0) .set(state.head_bg, ui); - + Button::image(self.imgs.grid) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .middle_of(state.head_bg) + .set(state.head_grid, ui); + // Shoulders + Image::new(self.imgs.head_bg) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .top_right_with_margins_on(state.content_align, 65.0, 40.0) + .set(state.shoulders_bg, ui); + Button::image(self.imgs.grid) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .middle_of(state.shoulders_bg) + .set(state.shoulders_grid, ui); + // Hands + Image::new(self.imgs.head_bg) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .up_from(state.belt_bg, 10.0) + .set(state.hands_bg, ui); + Button::image(self.imgs.grid) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .middle_of(state.hands_bg) + .set(state.hands_grid, ui); + // Belt + Image::new(self.imgs.head_bg) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .up_from(state.legs_bg, 10.0) + .set(state.belt_bg, ui); + Button::image(self.imgs.grid) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .middle_of(state.belt_bg) + .set(state.belt_grid, ui); + // Legs + Image::new(self.imgs.head_bg) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .up_from(state.feet_bg, 10.0) + .set(state.legs_bg, ui); + Button::image(self.imgs.grid) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .middle_of(state.legs_bg) + .set(state.legs_grid, ui); + // Feet + Image::new(self.imgs.head_bg) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .up_from(state.ring_r_bg, 10.0) + .set(state.feet_bg, ui); + Button::image(self.imgs.grid) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .middle_of(state.feet_bg) + .set(state.feet_grid, ui); + // Ring R + Image::new(self.imgs.head_bg) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .bottom_right_with_margins_on(state.content_align, 20.0, 20.0) + .set(state.ring_r_bg, ui); + Button::image(self.imgs.grid) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .middle_of(state.ring_r_bg) + .set(state.ring_r_grid, ui); + // Ring L + Image::new(self.imgs.head_bg) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .bottom_left_with_margins_on(state.content_align, 20.0, 20.0) + .set(state.ring_l_bg, ui); + Button::image(self.imgs.grid) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .middle_of(state.ring_l_bg) + .set(state.ring_l_grid, ui); + // Tabard + Image::new(self.imgs.head_bg) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .up_from(state.ring_l_bg, 10.0) + .set(state.tabard_bg, ui); + Button::image(self.imgs.grid) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .middle_of(state.tabard_bg) + .set(state.tabard_grid, ui); + // Chest + Image::new(self.imgs.head_bg) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .up_from(state.tabard_bg, 10.0) + .set(state.chest_bg, ui); + Button::image(self.imgs.grid) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .middle_of(state.chest_bg) + .set(state.chest_grid, ui); + // Back + Image::new(self.imgs.head_bg) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .up_from(state.chest_bg, 10.0) + .set(state.back_bg, ui); + Button::image(self.imgs.grid) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .middle_of(state.back_bg) + .set(state.back_grid, ui); + // Gem + Image::new(self.imgs.head_bg) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .up_from(state.back_bg, 10.0) + .set(state.gem_bg, ui); + Button::image(self.imgs.grid) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .middle_of(state.gem_bg) + .set(state.gem_grid, ui); + //Necklace + Image::new(self.imgs.head_bg) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .top_left_with_margins_on(state.content_align, 65.0, 40.0) + .set(state.necklace_bg, ui); + Button::image(self.imgs.grid) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .middle_of(state.necklace_bg) + .set(state.necklace_grid, ui); // Stats Tab // Tab BG diff --git a/voxygen/src/hud/skillbar.rs b/voxygen/src/hud/skillbar.rs index 5fc20576d4..a9b660fa64 100644 --- a/voxygen/src/hud/skillbar.rs +++ b/voxygen/src/hud/skillbar.rs @@ -69,8 +69,8 @@ impl<'a> Widget for Skillbar<'a> { // TODO: Read from parameter / character struct let xp_percentage = 0.4; - let hp_percentage = 0.4; - let mana_percentage = 0.4; + let hp_percentage = 1.0; + let mana_percentage = 1.0; // Experience-Bar Image::new(self.imgs.xp_bar)