From f1529d7e58448ce6eb42c07beed51c1bb01e7eb6 Mon Sep 17 00:00:00 2001 From: 2ndbeam <2ndbeam@disroot.org> Date: Thu, 10 Jul 2025 00:14:15 +0300 Subject: [PATCH] Added gun sprite --- .gitignore | 1 + assets/models/red dragon room.fbx.options | 3 + assets/ui/guns/placeholder/static.png | Bin 0 -> 402 bytes data/guns/placeholder.ui | Bin 0 -> 6385 bytes data/scene.rgs | Bin 26047 -> 17112 bytes game/src/player.rs | 12 ++ settings.ron | 241 +++++++++++++++++++--- 7 files changed, 225 insertions(+), 32 deletions(-) create mode 100644 assets/models/red dragon room.fbx.options create mode 100644 assets/ui/guns/placeholder/static.png create mode 100644 data/guns/placeholder.ui diff --git a/.gitignore b/.gitignore index 593ecb8..170bfb2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /target *.log +history.bin diff --git a/assets/models/red dragon room.fbx.options b/assets/models/red dragon room.fbx.options new file mode 100644 index 0000000..7c7e900 --- /dev/null +++ b/assets/models/red dragon room.fbx.options @@ -0,0 +1,3 @@ +( + material_search_options: UsePathDirectly, +) \ No newline at end of file diff --git a/assets/ui/guns/placeholder/static.png b/assets/ui/guns/placeholder/static.png new file mode 100644 index 0000000000000000000000000000000000000000..5b92e6c629afab75275391788b8bda6e4c4a82cd GIT binary patch literal 402 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O{!3HGlTK@_GDaPU;cPEB*=VV?2**=~wjv*Cu z-rls$J7gfimT*Z^+x$WL%c#z!LD%D2oxf_W@ra$UYm-PJr;6FGg&jgt?H4}Gd>*;^ z#>dy@oyHPCvzlP|ux@ZDlp$QRoN4L|X^&9SM4?>Egjvi9oRUouV~u6$=u zI{mOvfr0nQhRd%x4oqFNy@A1GN;Wr#1G^HCsd8c?E6W1qz-R{sp{LiFB7L9P|JizZ zF{=x+jRj*yV$`&)*B9*tD(1fbyY{~Giyj7*TRGuJm$G%ZF+^F3H)Te~)!5uoX7u>- z?@w9HG56><#VilFu9i2hNEB#bxq5d#H>1af2>t$c8_PHU8X1;kf8w;LujRZf!gQgj zxPiT_>RNpG|G+2*hNzBjho4W%QM)w#)%1fEJARk`ef;_Ly7wE|c3eu@t8?t|-J3`I h9T@W7+`G?O$FRB4XIF|5s}?9oJYD@<);T3K0RWt!q>lgq literal 0 HcmV?d00001 diff --git a/data/guns/placeholder.ui b/data/guns/placeholder.ui new file mode 100644 index 0000000000000000000000000000000000000000..e92a133522011ad31e556ca57d49dfa94fbea3cc GIT binary patch literal 6385 zcmeHL&2Jk;6koTLQV2C|5h|z$B!t9?gnl4VsS1wWBunBtvYnJ7)M&ChSr1+BtY&tT zx*TeWUN|6C@DBj@o_gWHf%X6g%0Ga_0U=IBDjyODkSOmr>-AS1*Dj5as;o5eytnUb z-h1=j+mz>y6`rsxYjw3;DpglkX=`O@?V`0T_R!xaX;mD>c~B9T_yOz969vn9rSKG? zSA>q4U*K!8m$mj2A|ER))soaA5;8bI81pQhY=3O`u?f9k~1= zHb&AM54d6of8{a+1)Xil}@ZjQj$6m zO7bj>V#VE&7>V9INIAFx7LLgZcRwIoS;{ESf(@qc>&Enia1>6aVK%ss`LlGVhB+0v zTIP;auI_U?B7g<4Hl^Q|JSF46?d3CPPWW&+jk4tpa+A4cT|!|S zK%)*P0^)7>-R#b_cV}tWoW|REvjYX_XMGV4*9|vT>H1RMrrKJTrJzv`0MQ!cVnQ2p zV5zA(Acj`k-TUi=b@l7ZorvX>GcYQ0DHzfs!YDr-tvtMsEMP|d$}3YoLW8ZwTmiUoRI zsyaz+P7}K8xfcdsnNtx|XN zWwCXcYZ)tt+X00na5(Bx)_RfN9i~-Mf*J|)6Lah!rG`jk+erN)WkTL`r7%HB5vj7Z zN+h?wCg3xThX{>AAfUZ<^HXrpJprp_S_56gs+@tF+7)+j5kYHgwbUXH;w`OCrj4y$ zmqO-H-ln#VYAXDb3@YPtqK=#n7>!4L#jd|dqGnMG-z){y`#Bw?Ip3F?1vLgK^V0N4 z9NZl%5@>SZ9TUhNIvl_}U7-bxv0z?ARj#8>J?P=Qrw_o3OH9$#N$IvsRJa+BnUre6 zcZn;FY2SQ;J2;L7MW*QT42vTQEEWbl_}Yw$6cw|F8_ZN_ARK8%Mv<%=5X7j6^HPaR zH2*O_=L;{W(~*ZM#5=g8Z}MH?imLI0%P?6h{kR^a{x*@{Dx&DQW!WA&htk67vsC7i zHa^DLK#Da52V+yt+{Mpa@-vhChTk0c#~Rm^KwTiWSR-9D9jgAKRsS|8)@hfhIx(;i5_xFn5#1#(PrWSNF6t-^;25; zK1%c1#Wl5DcTrM~q~B#djO}lW4zsZczCXk2=D4t~b)!IqS7uTGVArYj(XXiuNwZ1i zCpQ;FNQJ&R6fB0H#?|8hp!Gk`uMpH0dknzC7khMj#J;vYVy7OO*x}y>7p|Oqz4HC+ z`(K=Ysrk=`M?Qn!5%%7117ML&J0s&ZkBnERHh=i@n}xHV-1z(Y^LKtfxHB>)6HWg} zwKFodKfy7bJmMoGozOf(Mn+U9th6@`te+!yxShds(CCF2Jko=wX_d&JL8nhMtZVQ* z3fx@A{LCajt?~B%8$7@2pJ{QPfrIBgl-n_QlJd^r2>_27o6Y}QdT%7&Z83BH3-hdf ALjV8( literal 0 HcmV?d00001 diff --git a/data/scene.rgs b/data/scene.rgs index 9bb1c4dc64f86aad3983c5395d40d7d6114936fc..1e715088e61dcdf1f689c390512497d4ea469d59 100644 GIT binary patch delta 799 zcmdmgn(;;}=O7 z9LjkW;wmy>GlT=w%fJG}KB;LXlNCcOI1)BMRm})<;ZRrx<>ZCCvIRtgIFoF&CN~(f zPTtS^2+cL_oAvp785!9p?-g(sL2y3fWPv!A$q$mn zC+h@?Pu^)HIC+zB&E`I@J8YBBDoIYhFI>#XG$mEYkrh+^!^W_9i`QGmLm%aUS z=C=v#lOI~EPQJx0HFcb1A{^^ia*1qxUTi%wQf^_y&9p*We%F=O*ii<3-~ zJ>8`z&$Tud$Y$TUM|hFP!sWZFqBxdxX>NXC{flw3fobhzkk;FN>XSdXux_4b_mXjP zg9q#6uK`Ar`5jm%zwi{Fe9J*+GEb7|bio;=5ybF+ezCDUY90Rh3+ z=Jz|KJe&;YpH5Iu+{w^}aHpQF@FZalkW-l|j!ixMMu4U!&!DN<>&UYPUbx4}7VkW>K|Iuer221y%mA-M?U$$LXR*&rzcD!h&j pk~W~+w8>fFp3oEm)3{kKLXc}Rv%B)-I(5;>_l5X2mnL~J0|2^=7V`iA literal 26047 zcmeI54R9URb$}(X;~1#zfCQ8DcMW%8%UMWf!pbw@*I;szSLO|E{oG8ImPP}3Uu zJK|3GL8;oL#RhFrDY=1HnHri6J-?z&LD5@wrmCH%8WQ(89?SKYw+E*R*XS8`o#~G3zabaT238vi8)`p?jS#b`O-4cl5PZ?U@xxgxL zTC*!~W~a%}6CzU{XPj9Z=5M#;2u3kRT)uc$MNrsV7|9^~B~Y&XR(nUlG*^dz_hB zkZa;wHJkb(5|%^yz^aWN=>qMV{a!`nwKE9(V6A`VsaIVnRfB#ocjj9eYo>HC}6&+7LD3`#Q~`zE2jl!`$d9xJ!J5$nM2`P$x(tHvtS7 zg7)14$mG(#Lw9D2+-m{6h+&#B}wqX{7?nk>y){`n{k3U zDNCZhk{e}svC~{_ahI{;?kFIIr_Kfzx;4t@grR?-oN## z&u#t4(bDFZAAa$^hqnVg>{oRaJiRdZ#Eus(?(Vwx&98R>2rtX$L?SURqb(nh`{Sf7 za5XkJ>+Y?2rL&ISxA|kAKX1>k-F?+nkDVP}eLhmB!Jte;Bqg^>2HeWPsZen(`l=&t zRVCI}k(F9pi}gCMOs=nV);;g6ee%MWhQ{ys=6^gi`|9lV$ee3*BJgILY7dTe= zCecVNn!4mHb45z)<{_fT=xyDr?IdsXj<)0(<=C2m7mIa9$7|2uBKMLYqR32;DP-_v z<^fY9nqp}xDQ`k0@*NADN_A5FH@VjYX_nan1%~Q%N{(MHd*YS@WR&FnWT1}*%WG1= z7%RznpStp?;`aXM9{iE5cX+>EyTx>wR1!u3=`OZ0z%NqHmZ(i*UwCGA?A5Dp{q%+{ z16yuC(D}V;6FfAL6TBPkHq!sUtxYIptW9K!VxI#?Zem?}9~mRq#! zZm%C4asqLL*g{ZHkO)LnLbsIkyOZI1T^q=a5FuEvyNhd`Ls%4LVAu;MrZopa3ldJ- zCI+O1&fCo{U9^?ee2`i2)+ria7bfA!^K`~T(d-N(Oex=h*} zGb;;aiGGbvJF{-fP!T8+swFv11cVY8h68`r4Z=Cg0O3T%%1B1SX{O`R&<~s`7mV12 zf+Le#;!Y;0myiHtkX12}L2eT8lfRnKfoR_}?1a;%wJjQH0Y)mLwP4Z_w|p_s#8}YO zG)Jgb!wPkmmNZ z)O)_zWKYXb#qQEC{qVgTzdbW}=3PH_=acvMJ^qT}Nb%7D1u(wLmAGpd%oS>~q0)UV z!7mZBCo!)mC|8u-xr_@YKohh@GuU$~Q{`wJ5`&Mva8bnIZ?#$}oG>tTuckxp3aj5) zzbmdriAgaIs|0O0hGE^m}`T`0g9wGuLPN!+c~Jlmp#T}lpjbpb&8QUg5k`a}La=~h z5$$BMMU3z_jRJx169erYj;0_~F?LZIk?PJZh$G7DTwG1W+gOsb72iDBC>@m_E{zb> z%j!S#QpRPH-kY}d@@#!J-$A?jMP0T&o7c8SBba0zG>}i0={;@DMI+LDbj?e7s=aB~ zCH34(()xLB2U~_>W3$q8)JA6yvYA zrF}9P81qY=-kbLPnlj68TnAn*X%D=?m;G&MpJ*G`$&G=F%LH$%6BLr>(yA`bQ0=f$AiXTKoXlydfQu-4Q!$gM~-Az$fJGDSyNFib%ilFwml_u*I%FbmNwayqS z<5_W1sFZb9q{uue)W)j$DKbwA8)Mb(6q!v&^F(Mcs+WmgONk~7tciy)XCZp2(W+Oz z^}$@xs&!*;_MCA|_uGH_qtCwl`Y$}b4Kqi7sc6*(DKL@#f<)XU8X1QKqir#P1};De z_~^oHaM{9>@WmBN3COsix{cAf#FPP&HVPF}2#RR^Su;EG#=UvsbEiChWzXL4c7Ojv zSNz+J*FW&;he2Txh9OXiqzh=O`@{IufUpX#BQrieT$VWLv|r}vq#UKG1+En9gPJ|A zo>@$QW8!0QG7|Bdl%ppJKr@c&uPn5v}QN=Xu>B`uwJM56MM-XgB z;%d@ugC4mvUbQNIpg{EIta_K)t>JZ~^DXkbqMt(a zQ$Of!r-og7%srX99ns_6l5HZUhC!Q+o>R$O0LTnlqb4Repdnf1z+`~5nQ-cx(89!t zSs>&1mMPw-rN@Dk2H95hoVA6VM%6tID<5B7H4@!edG!>ij$=Y09yeHVXa{iB=idh*fp zARFDycyWd`WseCD6?Mk}iyEst8KI?8k|Q8;Yr{n`2^2+tX2!38@JzXKoWQ&HZuciQ zylu||_dNgHC%U)Y`RoP(W82yK1RgDNo#J9qC_2@U0rn5Y=S{ zZKhb0g}gGAvW*Sx?Mt-H31*lRBTQ!`dL477s72;B$c${H)q-rukdRUCgE0zG2O98s z4Ek2Ft)3A4N;k36ZAqpC &Z{?O@Fo zz$pBc>U=TC5ns;2i(j*}KJoMoy>4@ zqglyy;Npm{S{4i7SC$pCim^H>0YX1M_#Z7y2}MJYN@`-HQ<{c_$+p+Ht>A4i?defy zWzgS@isyia4DVWjs7$i9Xq;3JHp*T8?51eIg z0KxoP8WUYMxim7 zV4E2<&+DnAwTZFMK*r`wsx%?EW%N|i1VB1OBrFU4**%p;P-xHRspNw_X+0Iyh-LFs z6kA)KN(^b1?cAPb`|IIxWbIc>@ zlxc^|UyG;Gu=-NI(EO2jYPQw{pIFBqgSV-Dh!AeJ&+4!z1!K-zFjZocB98$Ms^ z`|D2}dGd`vzkmCORveSGrXa2r$0V90%&s;a6Nb@fKHj*-bHSRl>~RBqx2S~!PE}K% zK8=MbVOcGtRK;ow=TO%KgyJ0G933vK#3YBmW{r-482P0-Nnk^B_3=9yc`ec_ZDMJYjIKrKzx6l`!vIJo8cA`x z{?XUYKeqMeulA1L|II)C`0x4y?*|tXH~D@Ut|EqV#3^|T-(*l z^mF^}|Gkaf%eS8Epy06N2{gnbo-@#(?a_&5frj*_#TdBEsw^cdk3^Dgs(r+=L5eol zb4Htl5RT6psv5CuYp7ytYYmMd&4wj+pg|$q3p6NbyMYD;ZZpsjbKBM$nucy3Xn6j^ z@9IW-61I^n^I!YTy@qOsSV>Eu0c@!?beIp-r52E;o+$PO_+?x}^L%3jb?148E*=tS z;25HHt;&vE{W*gl)PeeI`eDPw_`*@V_89Y-H3mBm&-zt4*k>9yd#213gN2fte3p$_Yjq=EeC4RZzm@Dd<(zh(q22ox)r3Vs;+GnsxG zTAQ94&P@F4o4L+REW=^TmOYEzE6Eox8Bzc%2#98vQvbf>v|<4zdPkpHD2Q5 z*|Q%xQf-$63ivbde5I7j4B9b#s}vP2#g+sdwK(a2*wPAzs#Ke&6Foac(t zzK)x-@k2&gp_}iThVNX}wPW|HM-%1~bSTX7?V6Y=u^&LD*zhI2EmEq6nOVdZ>Np)G z`-jbcdDkEQ*Wf??>QxsHoZIulgV+GNG*L(FLC%B1w_g6%=uP)@|KhJ4`RaRas=Tpp z#lEL) { self.move_right = is_pressed; }, + KeyCode::F1 => { + self.reset_position = is_pressed; + }, _ => (), } } @@ -114,6 +120,12 @@ impl ScriptTrait for Player { } if let Some(rigid_body) = context.scene.graph.try_get_mut_of_type::(context.handle) { + + if self.reset_position { + rigid_body.local_transform_mut().set_position(Vector3::new(0.0, 0.0, 0.0)); + return; + } + let mut velocity = Vector3::new(0.0, 0.0, 0.0); if self.move_forward { velocity += look_vector; diff --git a/settings.ron b/settings.ron index c8bc9a9..a844585 100644 --- a/settings.ron +++ b/settings.ron @@ -489,50 +489,26 @@ ), ), scene_settings: { - "data/scene.rgs": ( + "/home/secondbeam/workspace/rust/fyrox/red_dragon_pon/data/guns/placeholder.ui": ( camera_settings: ( - position: (0.6421091, 0.11491381, 1.7991738), - yaw: 4.735702, - pitch: 0.11656319, + position: (0.0, 1.0, 0.0), + yaw: 0.0, + pitch: 0.0, projection: Perspective(( fov: 1.3089969, z_near: 0.025, - z_far: 128.0, + z_far: 2048.0, )), ), node_infos: { ( - index: 45, + index: 0, generation: 1, ): ( is_expanded: true, ), ( - index: 2, - generation: 1, - ): ( - is_expanded: true, - ), - ( - index: 3, - generation: 1, - ): ( - is_expanded: true, - ), - ( - index: 46, - generation: 1, - ): ( - is_expanded: true, - ), - ( - index: 1, - generation: 1, - ): ( - is_expanded: true, - ), - ( - index: 69, + index: 5, generation: 1, ): ( is_expanded: true, @@ -564,6 +540,12 @@ )), ), node_infos: { + ( + index: 2, + generation: 1, + ): ( + is_expanded: true, + ), ( index: 1, generation: 1, @@ -578,16 +560,211 @@ ), }, ), + "data/scene.rgs": ( + camera_settings: ( + position: (0.0, 0.0, 0.0), + yaw: 7.867303, + pitch: 0.41450697, + projection: Perspective(( + fov: 1.3089969, + z_near: 0.025, + z_far: 128.0, + )), + ), + node_infos: { + ( + index: 3, + generation: 1, + ): ( + is_expanded: false, + ), + ( + index: 140, + generation: 1, + ): ( + is_expanded: true, + ), + ( + index: 0, + generation: 1, + ): ( + is_expanded: true, + ), + ( + index: 180, + generation: 1, + ): ( + is_expanded: true, + ), + ( + index: 1, + generation: 1, + ): ( + is_expanded: true, + ), + ( + index: 49, + generation: 1, + ): ( + is_expanded: true, + ), + ( + index: 181, + generation: 1, + ): ( + is_expanded: true, + ), + ( + index: 5, + generation: 1, + ): ( + is_expanded: true, + ), + ( + index: 53, + generation: 1, + ): ( + is_expanded: true, + ), + ( + index: 51, + generation: 1, + ): ( + is_expanded: true, + ), + ( + index: 182, + generation: 1, + ): ( + is_expanded: true, + ), + ( + index: 139, + generation: 2, + ): ( + is_expanded: true, + ), + ( + index: 138, + generation: 2, + ): ( + is_expanded: true, + ), + ( + index: 69, + generation: 1, + ): ( + is_expanded: true, + ), + ( + index: 47, + generation: 1, + ): ( + is_expanded: true, + ), + ( + index: 97, + generation: 1, + ): ( + is_expanded: true, + ), + ( + index: 52, + generation: 1, + ): ( + is_expanded: true, + ), + ( + index: 46, + generation: 1, + ): ( + is_expanded: true, + ), + ( + index: 56, + generation: 1, + ): ( + is_expanded: true, + ), + ( + index: 102, + generation: 1, + ): ( + is_expanded: true, + ), + ( + index: 2, + generation: 1, + ): ( + is_expanded: true, + ), + ( + index: 45, + generation: 1, + ): ( + is_expanded: true, + ), + ( + index: 6, + generation: 1, + ): ( + is_expanded: true, + ), + ( + index: 57, + generation: 1, + ): ( + is_expanded: true, + ), + ( + index: 110, + generation: 1, + ): ( + is_expanded: true, + ), + ( + index: 50, + generation: 1, + ): ( + is_expanded: true, + ), + ( + index: 109, + generation: 1, + ): ( + is_expanded: true, + ), + ( + index: 4, + generation: 1, + ): ( + is_expanded: true, + ), + ( + index: 48, + generation: 1, + ): ( + is_expanded: true, + ), + ( + index: 54, + generation: 1, + ): ( + is_expanded: true, + ), + }, + ), }, recent: ( scenes: [ + "data/guns/placeholder.ui", "data/player.rgs", "data/scene.rgs", ], ), windows: ( window_position: (0.0, 0.0), - window_size: (1093.0, 505.0), + window_size: (1896.0, 1024.0), window_maximized: false, layout: None, ),