From 5003bf06708318cac184aee2ad5cef0c53a48f0b Mon Sep 17 00:00:00 2001 From: MyNameIsBatman Date: Sun, 13 Jun 2021 02:13:55 -0300 Subject: [PATCH] Room Widget: camera --- src/assets/images/camera/base.png | Bin 2166 -> 0 bytes src/assets/images/camera/hud.png | Bin 959 -> 0 bytes src/assets/images/camera/snap.png | Bin 1344 -> 0 bytes .../camera-widget/camera-spritesheet.png | Bin 0 -> 6015 bytes .../camera-widget}/selected.png | Bin .../camera-widget}/selector.png | Bin src/events/index.ts | 1 + .../camera/RoomWidgetCameraEvent.ts | 13 ++++ src/events/room-widgets/camera/index.ts | 1 + src/events/room-widgets/index.ts | 1 + src/views/room/RoomView.tsx | 2 + src/views/room/widgets/RoomWidgets.scss | 1 + .../room/widgets/camera/CameraWidgetView.scss | 24 ++++++++ .../room/widgets/camera/CameraWidgetView.tsx | 57 ++++++++++++++++++ .../widgets/camera/CameraWidgetView.types.ts | 2 + src/views/toolbar/ToolbarView.tsx | 8 +++ src/views/toolbar/ToolbarView.types.ts | 1 + 17 files changed, 111 insertions(+) delete mode 100644 src/assets/images/camera/base.png delete mode 100644 src/assets/images/camera/hud.png delete mode 100644 src/assets/images/camera/snap.png create mode 100644 src/assets/images/room-widgets/camera-widget/camera-spritesheet.png rename src/assets/images/{camera => room-widgets/camera-widget}/selected.png (100%) rename src/assets/images/{camera => room-widgets/camera-widget}/selector.png (100%) create mode 100644 src/events/room-widgets/camera/RoomWidgetCameraEvent.ts create mode 100644 src/events/room-widgets/camera/index.ts create mode 100644 src/events/room-widgets/index.ts create mode 100644 src/views/room/widgets/camera/CameraWidgetView.scss create mode 100644 src/views/room/widgets/camera/CameraWidgetView.tsx create mode 100644 src/views/room/widgets/camera/CameraWidgetView.types.ts diff --git a/src/assets/images/camera/base.png b/src/assets/images/camera/base.png deleted file mode 100644 index d6cf994d063352f748ce25d259c4dd3e54645754..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2166 zcmcguZAcVp9G|t_b$3bIyLH{t%uHBLiPW~K$PS!NQDN3*ZI-;~)q}AXqvJYzIgjHS zd%e5DPj~JLwP-BUKte5Ymm$Hmas)elsPRKqgm4uYT45O^;r*Xy+-GN$=u6#)XP)2x z|NH%4o@a*VnKN8NZI&a?K~YpzeO+}UMVWXQw{2GN{Bz)CCq>!5tgmMHBO~Lg66oL- zpA3wgE|4lO-7F|cWZiE%St8~YukYy@E&J)*x<3vIJ3ZmV(BO-lq0?7aZWgAlP4$;Q z`;(n{p|`caHOAZa6jTQ} zf1Q#cmd3mn1t#F;U5!45b~Ughe3`h97sfBXr8K6^2U}M6GtOmVmc126%qtG(zP^ez9-!k z;^yaq6E9K-27*4NXE%)^NsX2%lsN})}L)ee+P?=n%A8@AA! zTF%chWGEnnx4gxPhp(arwla}};2UDGAZ1ijsn; zFI*V`=o&Xd0JM05PZdY8ACylnl3T3lOc0_kr7r9kyGCh6fQsAY784OGUTLDxU@bLR zOAJ;nw&=6b0j(`{jX1VS+r+yzxzdb__=}~9Y$EjG{*kbc!fQst3?j5T)t{pSo+@sE zIMzThSvGl^GSkbYi406+Vj>$8lbMLPy$lf>4r3x|LJ^ZzOypsr1rxt%gas41nAi%t z;;!OMW_S=_g0BvHFo5?*F%~C02mnj-U|>+AM8<6YV_N+pK5g0El??5>|6o(cNbPX4 z_1ErDZ!{8q*TU7n5xS;a5(F;{F_fBg&A8NPV+=HY? zq2`7$*dAIE5Bx%7*T&CVmCkcne(CarvpQlvg;&y(WQq3Bv{hy!3{t>X-)^+da%@`v1?sM~#X{vlv{5lGnoFt1q~FISuQ zCG3B7&&`$BrBfOO>}#&F0woiCdj2S*N2pc`=9l%#X|um6hrgfX)-x)yALJser}% zJO7x?#Rw*xA$^9Yz$J~%LJ1zys1X2(A8whz{^{zke==dQj;cZj)~$N=Nn}H|%iEc$ zF2Il$uxsIO;eW{d(D{c0kPAxOH%uXkyOjkhh@@si`ZU3Zhv!AQA?X1|Do6b5>F)dA lJM~sne)@Lm9LU8E>-f1hoe(_ia##<<^>p=fS?83{1OQ0_I2!-} diff --git a/src/assets/images/camera/snap.png b/src/assets/images/camera/snap.png deleted file mode 100644 index c3f57a0435278386e41682712f92d42f0abacd06..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1344 zcmV-G1;6@Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1l37IK~#8N?c6_h z(?Af%aVIAMy40!DaRXXzK$TQ*0;rOT8_;qCy40!D0XH%J**j*nn%SM%Ka#xC_dQ-z z5KH^ftcCOPxY{kRz5A+dQEQm{Vn%rT+go>}>+0pj9SxdoU2~lHjA+Hv79dZ$#;Hzb zL;UdG9VGhs%N@u~jobPJN609m7EfCQ*~4wN?p7}xhpde#CE&J%t^I;BWW{YfsNi*5 zz}9-9JV+~^Hsd*K!qx!Yn;;d4!GlCB`rb?#uEU+T$fOi>j7bal_-VKM@%?m+1V|1~ z1$D^uy-L_p)DqAk=H1=t>%&75(uZIHo}S!6qWgPy@W141D_~1db3wP>s1{H&=4_B* z3~Vb@EodI*+>l}3^|V6OfaYT^1v1QCTMN__Xn&YgBh+j6HC<1b2-kSHR$Q|~I_0hD z9EU6v107B$)dMDFL3KHk^Urs~bQ6j@gz4-FlhUFpr&IzRPiK#qlyOp>4Lhaj3B{ek z4?0kfn3M)pF{K=+Je{uYFewR@$r+8NG(MsJ9TCQV6&a>91m&OXUfoV7RXC;cgl^M0 zOgW|LhmzNMI#G|)Nx8LYrZmh4<+nRGo!IWZ$E}gE2)8{yq0C6HW;&_VlnUG4wB?Vj zVLGXdwGya)yRTt7DQ>NaZ9ksS)OKHCmThm}@>|h1(8_I~l>?~$fwXlh@?aWH==MMo z(>|ECEnm3}v~nA0TTbp*fli_(noBn&WmlE3@nYMiL;nZ2;bVfRZMz=jTrLV81Ld*y;T8%^jSg=?vd0(+?$K zO1ndqFlo(SKPRUXjX;xA+9PTTQ#qX|J)tPPGd-bdF!77Gis?iwsOr762UO!^BK%!x zI+1Qd5qF0!8C8pk>3n`Z9V=p$sl%PvAMONyLO&0CaDhwxyq}4gnog9Q(9zbv^hqtm zOck9_gek?>qDe(_PpfxxOE6>8iISkG1QpE+8$hB~m`DYRa#7JNuqjAX855~NQ3)y% z7Z$^%|A~isd~^p)!F#rNKGXmcnLv>V6-8hXyI7Q(-~f+GzP5jzzyu_!fQihYNJK>j zSmXmxB65)FdqYTkHb>0cQ!XaT0!2|&WQ6tOptw}<#+_4wiLybFkBUsNNP(M`@tkx6 zOEFOqC?Zsp4eMt`E_mG#5|v=0Vo>Cxq9`oVB9tcF91aqdVxlUblo=M)#*IvPOGv6J zC?&z7q6bNs;_ZPDQApP|mXOpWpneiA z#UaO%@Te&e{U!(XOX21=HKO0Fpj=kuIq}BrcK-kdji1^{>kCK#0000t$z{BG*vLC<)>o>K6qw{ZzC8G|91pg*m<13N!qFcviSLgtFC zeZvFu_c}b?(e&s-=A>(QZKg+2)4VMEAgjpMCmDvvk#%QpHf_Z1(muH-*rmYmtk5KS z-j!`x|HEi#2pip*+U?q8M9@84$XwMm_WKus|GSQ{cQ23Hjw;t3Z8$J;tFW-JWQtda zr+cYSQ{$&Me(Wh9KfS$mJP+H~BGKYtWp^34YYQa<_UaEWQ)h=M9()>0U2@_|0t;Dh zTrJUySY{pLf|F~zq?Pv+Uw)M9OfqdM@u#Kec4WDGA2;8KlVd1}+C06GIp@=WF-G^4 z$}i(b&y$%%7%Qup0S9euEncZr7gUtS!4#0wsk*_5mrR156Ri<#msn#YK&$M0Sn%_t zlr%hDi*s<2BB9B8Kt;2Ofqb%WD) zY;cJ2FPsiw-rX+QA!>X3HqaMC&Ukug!{h5esdR6j_Fjb=x&Wn!dkGPB;v)@YbC#3( z+}Wmgl=N<0S5$GKWDrv8&6pE2_>hdPFpWkP*pQ#EigcE{#mV*;0Y2orb_PYrHf2cD zdtI8QGM?|YLeaaxN^ve;rCn1fLxaP!xEZ}v;e2d`y~YMplDNAUqtSF_)SB{jG*aX= z)kf=novIb>`lWQ#eGKyA!KOHi7CH@0rN5!_4^g8Hf2J%dAPPmYPcje?SwB^prg6Cp zDYke$K=S&ve4`^Oo-0!6hh|UKSXwq6ndP19e(*Yq)gG#U?A9Hl5%S0KuAlIHxvVo8 z3vz62qiRCP`Sf^=!}#hg$QhU1Y4=Bh zh;+idCI{IdQ(9B8b#ym1GKHqE_%inP=!46jw)9o^%dW{x*~W-3QbQ@ z+4%9<XuO(WXn%I3n3LpP@y0YR~OvKI&hMygyY4$o2E% zlg^Y27BGL=`5^Vn_?q}01A0er!Kre6m>fGQy6sSE>mmXc5D1T&=o?&}jzbuDdaN>; zXaM1?kdmld?lXi2z?XD>j}U_jg{W7jYayi>s+`%^vGUDCgn?0o{RZUEN8noPnoFjx*Ia zQpfAw{Z^{rVahNe?a3o=R*N`Lx=bKU;5O+qaHyESKCi3i8dr;ot64wg36`E_z=v$K zm8ZqNd_39+(NP?>S-@RP74oj-+G?B`O3WJqY6<-5vi+A9XoL=0DL|o{3}CEPi`yKS z*Pl~ARglH|qjoByO&6asg|97Fn%muwwJ|6XCdZVizSF!@3o$%Vr6pn4M+dEPM*`|B zDn0i521L^Ov!Md0bgx8y{aIin`ngXMmgMMn80ey^QuqCd@4vfaL`(f}9ks{g9J8y} zkN%~9*!2WW!X_LV=jm z-XeIl@quuy_=zz(5Qq>7 zu%2fVs5|TLc=PzTZh4z)1(OOlH12kKT4m2D%LSV! zE!F^z6*pi6IlapGAiEm=8UkVa26{{`U^j>|npN(|KPt>m=NhiJyFGWU2D-LlMT? z+`~w~077UfQA>8!nQdW}W2z53FG9n>pvyIktH?f^s$3x#o7E zlp=Siq}? z!!|g=%(3&H#5b1!2|yi0m{K(wF)~kBp15Xv5E*g9&~r%0<{y!zub=I)Mm7`VI=b*h zN4VnEGodvya?sZpzStMKVzjMHEAD>r(z?psJTqqLZYX6;omhV=f!yRMB)^^1Fz*0V z-{!0)`$}Sq^O9n*%5tH(kc*M$B`IIMY@udD9cPX%uGNpQD*7;wE=ElZ*oB%`Eolcx zbEYCS`tTgj?d5xeG1d7t^BJ{I`vXv!Ymn2nBMBBQ0WMA#?%?2*#x2DFk2QhUV6#Br zqxw_W1{10gzR?$c&%Da3eQBLJv-W9yFWReT=T~_Bj4rPY?EdOcGswW1o2{aJxHXTg zCV-;lPD^kSCEU7YT0KL=F=YuZHf%k2in_@-gL%u9nW?04(%S=-d%%(zvx^40Ln3O5BiOoc53A)JmWbM? zy;zs-Z^+x|*l%1-;_GPoIN%I+JTS^@EjhjSZL-=8PZzWQ#td_F0r};BWJo>tSM1^8 z`E!68L^(AD?zvKK&qrs(6-iktsMn%{f-I_D4YiX#_t&!N5l}i<_e_5;mU?sPulAf5 zK{r~5??g@-ztq$N&MWxYvOoGHI!rI0VS~DAR-VP{t|ykjN2opCbr{bxi=mwyB!B37 zYiaJIb_OR3zRU8PAHMg3?-cESD1Ghz_)CJ&fPa8t5Z!04Na%FjnOk^}iLbf=0c}HG zU}tpSXC12+X|u}cyD!ZgC_bxSRT(KV;CI-ovyjxa6iL|I%t;bv0-G-+5?x`OE7N9n zUV*Sn#|z1{V=JHdr?0~ifrPBa7ThI9-&-EAVt@okP%3b|$(O8moE@5RJC4cq5{Fq- zb)^=z9bSI!5K*ywf^ve2hkUSd< zYM<8{I(}RUmEnSq9h&bb0@b?GzOa;NH>O?Xz@cwAb*piuw{Zj^4QX5XA@M0NVoXoM+&_^JA|l6ZYeyP>WDo{3Q7IYRavb6 zNJPLtMOD{^mEIZ7^k-!l-t9Y;$v zLqT57c6Y2wLOmf2LA zb*@jX)0c&j=@wJlp;EbBd}i?MCRWjCTY@LDI>RMh)}2v~sR|MvNt5O%yX=y+nhnAa zPFB2flM2D@XL6b}gLh>`Edidj;3SjtoF(`oT~4s);;N0o8m(`*bG8$!coM6E=@%9! z2%2ou$ho|s6}6xyZtQp;fmiMksMcquEKG-PAum}8`5kN%$XfC#)y=08RwAn-^1HLB zoBWbagm9vqSVNEVYfNC@j^JBchJGKt+I8-Pq69uYx6pZLjuP1Zxy0O#u)&FYxNVyj7gzIeh4gI0c`Q7O!cJjwf3mjG39itq z*z9-+q%*(7k13_+{)P>n6;tK8qufBAv*hk|NmQcKnZ3a`H*+sGeD4I$g4ii6?%L2K zK}$Bx@9_2LjP_Q0Jvhf+nyn0wT-fN4mSEbl%%vZ=&UKI^W(HHEy%;+7!RdvRx1UGn=Sx)gJS4o(56)747KDBDbbsA2o z1%oR=rZP@)fkDmQ)XorKlrO}S*VdZAvkW!zX$d@JwI$hiPBi3|rg9X|Z%)ubR-0)$ za7u;b0;JI+3srIAfk+QmcozPfo~}kLN2oe29^iY}!?UoOG2h0~yIppNUOS&&jX@>u zyS?{W17`n&ND5K1>*%oqPv7h~;Yk#{2{jv(fkWvH)=*0w3YXXR9EMU3K8{>{c;sIQ z<~(vnk&|(9n+2!u{~ko3Pp|h4+G~X@*p+am=i1J9^$N<49p!j9V6(>iZ~DBM;YWV3 z(UTY4E1q%H05+EVI1rw&Yn6Q`;7dO!S)_4GHQ*gRRqh#X9^`bSZIfN{CQWa-7JN+x z3Q38{>IjZR4)?}Wvz_1E+qRR*#VG$!^PjEoaEjPn)Y`nWwnCTAjx*vloJueU7ydH$ z+%!)9A{IDuRb=;SMOPK2bMl9T5S-JieQw7Us~?V=Ou=>=qau?egKNo{;Su|_ zbZ^n1x++ksemwGNCMrLaM%}}k8uRX?PLdb%xmo36;gN*&ZorTEZWeHoEJ{djcGjy9 zv8z1zP(jHD@R-7*$Lu>9wg0{An$$03jfo7E>EG{24zb~gEuXCItaJ1(HuS)|%Ub|j zg0%Q>@gaoHso^Qlbu1Bw*vUvS!>N&Z>{Z*o`$B-FJ6&b=jqwUfezYTq1bHE|*5}zi z`TglA9)PM@08dF1WcFFDU$@KlrFxywyhQ+3tKAKjbDh;ItlVLkp!Dh7l$0`JX=-Z^ zLNAs0J|f5LiqxjFFOpy{v=1CIDQxKNcHj}*pV20s&IX582R#@VNaH{S;7AI5p+{0M z3N*n30MNjJLG+EmL81reYaTODk*|ZMsQOnCF!;^(5QN%B^)(`>2VncF`v2!1i2U9A zbk0|(8Z;9Qze1gGIDz-yTtNl!K5eBAl=5WviW7(9pY1FJ{?Vw?IGfI(5i=;DgKPof z1}`aSY*;zfWkLV|r_MrOKL8W}AJx&s0$Sin4z!?x!||vEv;&;_!2<`#4`_k}CHreM zKvJsD>w@{4wd|jUMjv;7p)%%Y@&Xe;!c#0{U6o)w`5K~{TJ;h?4bd!7D1Oa95t#0>anvlBB69mAXdY52c||IO|{PKEscCM$oPW9Wnc z1^jcyYe4-|_W#rF*R?RQmfG1f|C0TgWW`bUbh!glvkZu7DqGhg_A*Nsu|HmE-|oP^ z$^`Gv;WXSqha)(A)o#1`R!;uN_rms$FF3<9)SZ*)|MMBVsAJf^0SnKtB1HcS5G>Xo literal 0 HcmV?d00001 diff --git a/src/assets/images/camera/selected.png b/src/assets/images/room-widgets/camera-widget/selected.png similarity index 100% rename from src/assets/images/camera/selected.png rename to src/assets/images/room-widgets/camera-widget/selected.png diff --git a/src/assets/images/camera/selector.png b/src/assets/images/room-widgets/camera-widget/selector.png similarity index 100% rename from src/assets/images/camera/selector.png rename to src/assets/images/room-widgets/camera-widget/selector.png diff --git a/src/events/index.ts b/src/events/index.ts index 81a2cdd4..70ffd6ca 100644 --- a/src/events/index.ts +++ b/src/events/index.ts @@ -3,3 +3,4 @@ export * from './catalog'; export * from './friend-list'; export * from './inventory'; export * from './navigator'; +export * from './room-widgets'; diff --git a/src/events/room-widgets/camera/RoomWidgetCameraEvent.ts b/src/events/room-widgets/camera/RoomWidgetCameraEvent.ts new file mode 100644 index 00000000..0eb6b4f0 --- /dev/null +++ b/src/events/room-widgets/camera/RoomWidgetCameraEvent.ts @@ -0,0 +1,13 @@ +import { NitroEvent } from 'nitro-renderer'; + +export class RoomWidgetCameraEvent extends NitroEvent +{ + public static SHOW_CAMERA: string = 'NE_SHOW_CAMERA'; + public static HIDE_CAMERA: string = 'NE_HIDE_CAMERA'; + public static TOGGLE_CAMERA: string = 'NE_TOGGLE_CAMERA'; + + constructor(type: string) + { + super(type); + } +} diff --git a/src/events/room-widgets/camera/index.ts b/src/events/room-widgets/camera/index.ts new file mode 100644 index 00000000..a04e80d0 --- /dev/null +++ b/src/events/room-widgets/camera/index.ts @@ -0,0 +1 @@ +export * from './RoomWidgetCameraEvent'; diff --git a/src/events/room-widgets/index.ts b/src/events/room-widgets/index.ts new file mode 100644 index 00000000..5eeca25b --- /dev/null +++ b/src/events/room-widgets/index.ts @@ -0,0 +1 @@ +export * from './camera'; diff --git a/src/views/room/RoomView.tsx b/src/views/room/RoomView.tsx index 381caa1b..99019599 100644 --- a/src/views/room/RoomView.tsx +++ b/src/views/room/RoomView.tsx @@ -7,6 +7,7 @@ import { DispatchTouchEvent } from '../../api/nitro/room/DispatchTouchEvent'; import { GetRoomEngine } from '../../api/nitro/room/GetRoomEngine'; import { RoomViewProps } from './RoomView.types'; import { AvatarInfoWidgetView } from './widgets/avatar-info/AvatarInfoWidgetView'; +import { CameraWidgetView } from './widgets/camera/CameraWidgetView'; import { ChatInputView } from './widgets/chat-input/ChatInputView'; import { ChatWidgetView } from './widgets/chat/ChatWidgetView'; import { FurnitureWidgetsView } from './widgets/furniture/FurnitureWidgetsView'; @@ -92,6 +93,7 @@ export function RoomView(props: RoomViewProps): JSX.Element createPortal(props.children, document.getElementById('room-view').appendChild(roomCanvas)) && <> + diff --git a/src/views/room/widgets/RoomWidgets.scss b/src/views/room/widgets/RoomWidgets.scss index 71970ddb..8b1fa8ca 100644 --- a/src/views/room/widgets/RoomWidgets.scss +++ b/src/views/room/widgets/RoomWidgets.scss @@ -1,3 +1,4 @@ +@import './camera/CameraWidgetView'; @import './chat/ChatWidgetView'; @import './chat-input/ChatInputView'; @import './furniture/FurnitureWidgets'; diff --git a/src/views/room/widgets/camera/CameraWidgetView.scss b/src/views/room/widgets/camera/CameraWidgetView.scss new file mode 100644 index 00000000..163f651b --- /dev/null +++ b/src/views/room/widgets/camera/CameraWidgetView.scss @@ -0,0 +1,24 @@ +.nitro-camera { + width: 340px; + height: 462px; + + background-image: url('../../../../assets/images/room-widgets/camera-widget/camera-spritesheet.png'); + + .camera-button { + width: 94px; + height: 94px; + cursor: pointer; + margin-top: 334px; + + background-image: url('../../../../assets/images/room-widgets/camera-widget/camera-spritesheet.png'); + background-position: -340px 0px; + + &:hover { + background-position: -340px -94px; + } + + &:active { + background-position: -340px -188px; + } + } +} diff --git a/src/views/room/widgets/camera/CameraWidgetView.tsx b/src/views/room/widgets/camera/CameraWidgetView.tsx new file mode 100644 index 00000000..9b53b7a7 --- /dev/null +++ b/src/views/room/widgets/camera/CameraWidgetView.tsx @@ -0,0 +1,57 @@ +import { FC, useCallback, useState } from 'react'; +import { RoomWidgetCameraEvent } from '../../../../events/room-widgets/camera/RoomWidgetCameraEvent'; +import { DraggableWindow } from '../../../../hooks/draggable-window/DraggableWindow'; +import { useUiEvent } from '../../../../hooks/events/ui/ui-event'; +import { CameraWidgetViewProps } from './CameraWidgetView.types'; + +export const CameraWidgetView: FC = props => +{ + const [ isVisible, setIsVisible ] = useState(false); + + const onRoomWidgetCameraEvent = useCallback((event: RoomWidgetCameraEvent) => + { + switch(event.type) + { + case RoomWidgetCameraEvent.SHOW_CAMERA: + setIsVisible(true); + return; + case RoomWidgetCameraEvent.HIDE_CAMERA: + setIsVisible(false); + return; + case RoomWidgetCameraEvent.TOGGLE_CAMERA: + setIsVisible(value => !value); + return; + } + }, []); + + useUiEvent(RoomWidgetCameraEvent.SHOW_CAMERA, onRoomWidgetCameraEvent); + useUiEvent(RoomWidgetCameraEvent.HIDE_CAMERA, onRoomWidgetCameraEvent); + useUiEvent(RoomWidgetCameraEvent.TOGGLE_CAMERA, onRoomWidgetCameraEvent); + + const processAction = useCallback((type: string, value: string = null) => + { + switch(type) + { + case 'close': + setIsVisible(false); + return; + } + }, []); + + if(!isVisible) return null; + + return ( + +
+
+
processAction('close') }> + +
+
+
+
+
+
+ + ); +} diff --git a/src/views/room/widgets/camera/CameraWidgetView.types.ts b/src/views/room/widgets/camera/CameraWidgetView.types.ts new file mode 100644 index 00000000..e97e9b69 --- /dev/null +++ b/src/views/room/widgets/camera/CameraWidgetView.types.ts @@ -0,0 +1,2 @@ +export interface CameraWidgetViewProps +{} diff --git a/src/views/toolbar/ToolbarView.tsx b/src/views/toolbar/ToolbarView.tsx index 6ab6a57e..fa8ccedb 100644 --- a/src/views/toolbar/ToolbarView.tsx +++ b/src/views/toolbar/ToolbarView.tsx @@ -2,6 +2,7 @@ import { UserInfoEvent } from 'nitro-renderer/src/nitro/communication/messages/i import { UserInfoDataParser } from 'nitro-renderer/src/nitro/communication/messages/parser/user/data/UserInfoDataParser'; import { FC, useCallback, useState } from 'react'; import { AvatarEditorEvent, CatalogEvent, FriendListEvent, InventoryEvent, NavigatorEvent } from '../../events'; +import { RoomWidgetCameraEvent } from '../../events/room-widgets/camera/RoomWidgetCameraEvent'; import { dispatchUiEvent } from '../../hooks/events/ui/ui-event'; import { CreateMessageHook } from '../../hooks/messages/message-event'; import { TransitionAnimation } from '../../transitions/TransitionAnimation'; @@ -44,6 +45,9 @@ export const ToolbarView: FC = props => case ToolbarViewItems.FRIEND_LIST_ITEM: dispatchUiEvent(new CatalogEvent(FriendListEvent.TOGGLE_FRIEND_LIST)); return; + case ToolbarViewItems.CAMERA_ITEM: + dispatchUiEvent(new RoomWidgetCameraEvent(RoomWidgetCameraEvent.TOGGLE_CAMERA)); + return; case ToolbarViewItems.CLOTHING_ITEM: dispatchUiEvent(new AvatarEditorEvent(AvatarEditorEvent.TOGGLE_EDITOR)); setMeExpanded(false); @@ -101,6 +105,10 @@ export const ToolbarView: FC = props => { (unseenFriendListCount > 0) && (
{ unseenFriendListCount }
) } + { isInRoom && ( +
handleToolbarItemClick(ToolbarViewItems.CAMERA_ITEM) }> + +
) }
diff --git a/src/views/toolbar/ToolbarView.types.ts b/src/views/toolbar/ToolbarView.types.ts index b0b97068..6c280e6c 100644 --- a/src/views/toolbar/ToolbarView.types.ts +++ b/src/views/toolbar/ToolbarView.types.ts @@ -10,4 +10,5 @@ export class ToolbarViewItems public static CATALOG_ITEM: string = 'TVI_CATALOG_ITEM'; public static FRIEND_LIST_ITEM: string = 'TVI_FRIEND_LIST_ITEM'; public static CLOTHING_ITEM: string = 'TVI_CLOTHING_ITEM'; + public static CAMERA_ITEM: string = 'TVI_CAMERA_ITEM'; }