From 42fd761b397d3d8062a768974eb8c55cf873b49b Mon Sep 17 00:00:00 2001
From: joni <johnfshaughnessy@gmail.com>
Date: Thu, 12 Apr 2018 11:55:25 -0700
Subject: [PATCH] Use slice9 component for block UI.
---
package.json | 3 ++-
src/assets/hud/button_block.png | Bin 2073 -> 0 bytes
src/assets/hud/tooltip.png | Bin 0 -> 815 bytes
src/hub.html | 6 ++++--
src/hub.js | 1 +
yarn.lock | 4 ++++
6 files changed, 11 insertions(+), 3 deletions(-)
delete mode 100755 src/assets/hud/button_block.png
create mode 100755 src/assets/hud/tooltip.png
diff --git a/package.json b/package.json
index efecd3d57..1b0e87daa 100644
--- a/package.json
+++ b/package.json
@@ -23,8 +23,9 @@
"aframe-input-mapping-component": "https://github.com/johnshaughnessy/aframe-input-mapping-component#feature/map-to-array",
"aframe-physics-extras": "https://github.com/infinitelee/aframe-physics-extras#fix/physics-collider-crash",
"aframe-physics-system": "https://github.com/donmccurdy/aframe-physics-system",
- "aframe-teleport-controls": "^0.3.1",
"aframe-rounded": "^1.0.3",
+ "aframe-slice9-component": "^1.0.0",
+ "aframe-teleport-controls": "^0.3.1",
"aframe-xr": "github:brianpeiris/aframe-xr#3162aed",
"classnames": "^2.2.5",
"detect-browser": "^2.1.0",
diff --git a/src/assets/hud/button_block.png b/src/assets/hud/button_block.png
deleted file mode 100755
index 71c81c10b5d740bc3e9afd45f2237c0ed7fa442d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2073
zcmV+!2<G>RP)<h;3K|Lk000e1NJLTq003wJ001lq1^@s6iPinv000NzNkl<Zc%1E=
zdr(y88Hb-;))m1E7j;pW(5QhZNE`)95M@TAKu{BGX~Y^dX;m^RL7P#qCblM~!Z1vT
zPPO?XGfGMmM05()&N$Hwmv}cpP>9)x3|Qn6F1ucKLH6{IU5<OWo5=1u*=Ob*&ih^8
zbAIQ1=i6^T7C{gY1cAcB!kEa&$p5NTsyl$-FzcI2rMeRp6?L+tq-0*VE(n4^N=nM#
zY#p4#q_%hO-tB@QAS)~^j9I#LX`ur69S{PH!htP#02Bkq0GX3h*ST}&LY-P$TeCD8
z&2uY(2w;RwL;Phk0+@#B5&BLL<T{;htdmx&&AfN-p6efQh+{8I0KNp;+uO&<FbT##
zY#Ne-o@_AxmD@B52ZQ1e$j)&HWal^pvU3~)**Ok@>>P(cc8*;NwB-14)(e7Y>ZmBI
z_P<i2k@P>x%gd_$TcQ}QhS#>Wp&U1^SGw`xLprotbT@Bur=*1MKK+!I^6~-O+6O!b
z1Po88gR%|S3iLjk;m7JvkX)g_*~5bgK|#z)PG-fo-{SZF`_>NQslnz$oLnv^V&_g;
zSFW^mD0Yd}1d5G~W!9`&1P2GRX3ZLEYHB3;A?w$3(OSVgMGV_Js3#hYhWQm0OaMAB
zUE<$59h>v>#r&yLr&0_A53xPZ*|YKAw24U(5xA<=bm{f9Ucb%{pMOr}C!b(67^D^C
za(rKZ9pANUahoxNk?!t1XlUSnXU<TTo=)qvYlHTwbaP|HrAv&RHcd>cFD~Z9OD|#U
z=on(;kB8L+0@E`36!Y=qwl+y#Q&SU7Lu|)?^JZSm%tWqu6u!dQ8LzM~yu!kmyml>T
zUVfQ}4GpF|S63G2<>B39HaObb8{dQke)ZaG<j2ROJ$9`BPGvF{e)gF}oa*XoLRPH6
zt)qi249~^1{v<)E#3L|}pdJ&0yu3Wd457X{GLo>YEQvThd3MemW`6MnTC*RTk<m*W
zOOzu=vMf6rjY`#TnXvcX<C&Nk(bws8EMLAHp}Cp27`{8*Y66v)m-AOa;Ex6azbz}n
zYu-FDFE=-r%*;&Y456K0r>7&6$wWUbEe*9=&7wt%sIRXV(?cU7sEUrpWy%z0Y}g>C
zH#Id89v+Ujw>P=DxnjDjt1H5)RidbtL`O#xwriK@8;wTd<Ky|hqJoXU=pkK!pN7q6
zakaIzWM^j+*xAYALCTKv^~EzVQ1mq#4XLTA1l+#OlGCU8`hyQ7<wIV573C|hNCZ82
z@E~QSrNr0O(UOuPDgV5`KNtGwcmMwVk~X$&+s1!RoM0V~hV0?OYVV+;q9SxU9RTj`
z?u3Mdpin6A_V%WrpnxMuNwn_UH((p%{QM;T`Sa%)F9^f}GC+3joFw1h-=Ev}?n%-r
zD=UcrrUO)0lQwD;e=+BEb#)QaN53vEF5+=xV<TBvS^Nf=HOM(X39Kg2#*G^>R8-(>
z_Gd0wz`wrwO1v|pKm3r*hYs<gwy#0Pg!B0E62GOTg=aB|1E6nimgKv+xzXU^AxYEg
z^;j<4xa;*~SonhtDHA77BxUPXCa0$lQu4`Q)gdk(*krbaMMbpN)rondM~~)*nKOAX
zK>d#Pc8Txd;eo4#Kho1vlCRZjX)`~y-8eft_u3pY!or+}a2~0<c2VZzGlY^qADg{{
z<VqzjJ=W@sPEOSKQy!qLs!HMq2M1$0fK3dM4p3E9Rn+vT<LBo`r}=oKhX+xGg`x$#
z{dS-IUb%9GoSYodcX4rH>ArpZI6$mV3abe;efo4J1_a<95WwVx3t60(hjQ##G2du3
zQdwDvaey}3u3xA5#tqT;_4Orw&mLUWY9>WQFz4NOCFPGFKhE`&CoviywVIfii0AzI
zjPmj#X!mZOiHQ;I%9t^H*+;)|adBj9*}`3m;dkk>Wi-adKK6BZT&(sEIyTUUK;Y=n
zqqMfPFlmr>uB4{2<mge+Pu{TucI@a?uC%n2f`S6x5(LT*9pZ&I-T*+QQju0v)T_K+
zuO}lrn-}`%^Zxz&yxG{u<vn|dNJ|sb|Mc<4WSlz1%)567iTbBw^JzA~g$ox*OiW}B
zNZu)ZaVtNc{O#LK8_WBltgMW<xHzT?0)fEgq$Dn%In!@>gTX*TLISsIY6$J8j1u_%
zqmQ_A^QM@lR;%&dy&L@?G5;KFB9OsgptiP_f`S4P5)udt3uA0c3%?&?{pR#^QbI$?
z$;qLvu8z*mPPAGrXV0D`IXRio&`_M}>)C*5hWGI9UA|tjgq`cwQCwV1TU#5Qot@Ox
z)p7XnVdl=A%dsOzcoXm(pkHH02j9H&jwEeEQWDo@&;Dr_Vh9ZD&eCM)cUGnV#sJ>H
zTuhtxE$^1U17#NeW_o{NR}Gv7ZU8z=v#`lP5U_yWTba9nvu3*ubeLm!9*8v8?Pe!P
z)&|pg^o89wz(I>V8SrQGxjZSl*FGFuf9({<*59WDhd_3YLm)fHA&{Np5XjDP2xRBT
zRVq~j^#6Iqf%WNLg!S?9sgVZ-1ziHue-}Hj54snn=FgvBEGsQ74GRwsFF_DwF+dmt
zFLyW?K7Pa`&M82tRCZjwdNmM15J*c)+on(`I<bQvaBvucQmHf?IB+0Q{G|~=5V&~p
zV$iBptN!WZ<8#Z_0sd0W$H(W^>eZ{WtE#H}x^?+K6RR6xgtNt@00000NkvXXu0mjf
DY>f(D
diff --git a/src/assets/hud/tooltip.png b/src/assets/hud/tooltip.png
new file mode 100755
index 0000000000000000000000000000000000000000..8f01466f1551e8cc8bb046e4e434c0b99b721a9b
GIT binary patch
literal 815
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPd3y+Yt`Oic(O$G+0J)SO(Ar-gY&bG}Kag;e$zq#7d
z@~fYT*uEt}iegz0y%#b%uIbVDJaD>PK<Spm{>BL%Nekl-t?=|nT2+#@l!MXG_01IR
zGqF$3Jyv*Drc<VrKIbOO>e+k$Gv9u5M#pCV-JkEz8TDU^n!G^AAfxZ|0mb5VbH57z
z;HqI!Ys^eIdo@y(L4xU6WAcx+sSoTvoVq3vajx~i49N$(D|_0f9}C_g+8|KD&@;)d
zS1NxYx5KQn){0xMHEf(RJOApAmE83VcUaVPWKAzHgf&`ic-MK5;Rf#;=Awp8Uo@HY
zr(Cn*u3@awc~;Nxz9BL}a0TN;c7~z@nGe_s7;hx6EWh8NEa|-Hc+tc*!~Z+#6IN`G
zS$U^xk;dc0Z^OM@f7bl_eCW>|<>FUD8;XOsA3ji!U{{nA#hUh;y{&5h`ZX~<i&mVr
z@ye~wSbI2YYt^GqQ&-m>;0Y+Kkl|@4?mK3+VMmbOcgtr1w^xU)mNgIFp115v+FafS
z=Dv@w9elH8e?`68dQCET`>Z}acIE{4L#9f9!k_H;&2Y1UZ#shj1Cs*-2Lq!514{!Q
zj>p81<;)k1SkV=2U|R9_z0;w^M<<*<9>p+4rdM*of+<;5uVYr0E@)8IN)F-b_<rfu
z7H*53`*;6-8>YRgEYxm(Jd>ZK{<h^0Y8iYikG*GIw}0Ne7%dU5`8>Yy?`o!;e(J^j
zxj4Te`&hSc@NHh7GY|3;7V(!SJbK}lvW&x~{EttD!29j%h2QV`mS~mZlD4bRJ*};=
z^V)?g76tkb7wx;+xWxR1vya0XQ3nniMz^4Uuj<+E82W#X|GbFv4(q(KuFBif6J{y?
zNxt`0^A1a%a60Go;Dnl+B0mLnE=q3g{ZTW~!n3Z;BJ0}KXKnQ}!|$*^`tgT_^W)F^
YX`gq$n^3gpAOjG1y85}Sb4q9e0QDPP761SM
literal 0
HcmV?d00001
diff --git a/src/hub.html b/src/hub.html
index 24e07f7a2..293fa12ea 100644
--- a/src/hub.html
+++ b/src/hub.html
@@ -30,7 +30,7 @@
<img id="unmuted" src="./assets/hud/unmuted.png" >
<img id="muted" src="./assets/hud/muted.png" >
<img id="avatar" src="./assets/hud/avatar.png" >
- <img id="block" src="./assets/hud/button_block.png" >
+ <img id="tooltip" src="./assets/hud/tooltip.png" >
<a-asset-item id="botdefault" response-type="arraybuffer" src="https://asset-bundles-prod.reticulum.io/bots/BotDefault_Avatar-9f71f8ff22.gltf"></a-asset-item>
<a-asset-item id="botbobo" response-type="arraybuffer" src="https://asset-bundles-prod.reticulum.io/bots/BotBobo_Avatar-f9740a010b.gltf"></a-asset-item>
@@ -83,7 +83,9 @@
<a-entity>
<a-entity personal-space-invader="radius: 0.2; useMaterial: true;" bone-visibility> </a-entity>
<a-entity billboard>
- <a-image src="#block" scale="0.56 0.22 0.1" position="0 0 0.35" material="alphaTest:0.5;"></a-image>
+ <a-entity slice9="width: 0.45; height: 0.2; left: 53; top: 53; right: 10; bottom: 10; opacity: 1.3; src: #tooltip" position="0 0 .35">
+ <a-entity text="value:Block;width:3;align:center;" position="0 0 0.01"></a-entity>
+ </a-entity>
</a-entity>
</a-entity>
</template>
diff --git a/src/hub.js b/src/hub.js
index d3bb84845..1db136698 100644
--- a/src/hub.js
+++ b/src/hub.js
@@ -13,6 +13,7 @@ import "aframe-input-mapping-component";
import "aframe-billboard-component";
import "aframe-rounded";
import "webrtc-adapter";
+import "aframe-slice9-component";
import { vive_trackpad_dpad4 } from "./behaviours/vive-trackpad-dpad4";
import { oculus_touch_joystick_dpad4 } from "./behaviours/oculus-touch-joystick-dpad4";
diff --git a/yarn.lock b/yarn.lock
index 86fb13e79..97096cfc4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -194,6 +194,10 @@ aframe-rounded@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/aframe-rounded/-/aframe-rounded-1.0.3.tgz#72c7d9c0ff02e94ee138bf217c284e187efa3cfb"
+aframe-slice9-component@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/aframe-slice9-component/-/aframe-slice9-component-1.0.0.tgz#fb0f8441dadd1e8b11cc24512ba7aa692d622be1"
+
aframe-teleport-controls@^0.3.1:
version "0.3.1"
resolved "https://registry.yarnpkg.com/aframe-teleport-controls/-/aframe-teleport-controls-0.3.1.tgz#7d7ef206f483ea92425a6333b0f8fb26c9596d1c"
--
GitLab