From 22f14fb60ecafdacbffe98533ecb8de3cd7a8e47 Mon Sep 17 00:00:00 2001 From: betalars Date: Sat, 15 Apr 2023 15:57:14 +0200 Subject: [PATCH] Moved UI Elements, Intorduced new Cursors --- .../interface-elements/bottom.png} | Bin .../interface-elements/bottom.png.import} | 6 ++-- src/import/interface-elements/cursor.png | Bin 0 -> 1314 bytes .../interface-elements/cursor.png.import | 34 ++++++++++++++++++ src/import/interface-elements/cursor_drag.png | Bin 0 -> 1430 bytes .../interface-elements/cursor_drag.png.import | 34 ++++++++++++++++++ src/import/interface-elements/cursor_grab.png | Bin 0 -> 1586 bytes .../interface-elements/cursor_grab.png.import | 34 ++++++++++++++++++ .../interface-elements/cursor_point.png | Bin 0 -> 1606 bytes .../cursor_point.png.import | 34 ++++++++++++++++++ .../interface-elements/frame.png} | Bin .../interface-elements/frame.png.import} | 6 ++-- src/project.godot | 5 +++ 13 files changed, 147 insertions(+), 6 deletions(-) rename src/{logic-scenes/startup/start_bottom.png => import/interface-elements/bottom.png} (100%) rename src/{logic-scenes/startup/start_bottom.png.import => import/interface-elements/bottom.png.import} (70%) create mode 100644 src/import/interface-elements/cursor.png create mode 100644 src/import/interface-elements/cursor.png.import create mode 100644 src/import/interface-elements/cursor_drag.png create mode 100644 src/import/interface-elements/cursor_drag.png.import create mode 100644 src/import/interface-elements/cursor_grab.png create mode 100644 src/import/interface-elements/cursor_grab.png.import create mode 100644 src/import/interface-elements/cursor_point.png create mode 100644 src/import/interface-elements/cursor_point.png.import rename src/{logic-scenes/startup/start_frame.png => import/interface-elements/frame.png} (100%) rename src/{logic-scenes/startup/start_frame.png.import => import/interface-elements/frame.png.import} (70%) diff --git a/src/logic-scenes/startup/start_bottom.png b/src/import/interface-elements/bottom.png similarity index 100% rename from src/logic-scenes/startup/start_bottom.png rename to src/import/interface-elements/bottom.png diff --git a/src/logic-scenes/startup/start_bottom.png.import b/src/import/interface-elements/bottom.png.import similarity index 70% rename from src/logic-scenes/startup/start_bottom.png.import rename to src/import/interface-elements/bottom.png.import index 70efec8..59accd9 100644 --- a/src/logic-scenes/startup/start_bottom.png.import +++ b/src/import/interface-elements/bottom.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://bwicl5q0lw06q" -path="res://.godot/imported/start_bottom.png-687c4ed67f36702eaa13bc180a11daac.ctex" +path="res://.godot/imported/bottom.png-3eb31957ef51fac0c94899c57d0847c3.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://logic-scenes/startup/start_bottom.png" -dest_files=["res://.godot/imported/start_bottom.png-687c4ed67f36702eaa13bc180a11daac.ctex"] +source_file="res://import/interface-elements/bottom.png" +dest_files=["res://.godot/imported/bottom.png-3eb31957ef51fac0c94899c57d0847c3.ctex"] [params] diff --git a/src/import/interface-elements/cursor.png b/src/import/interface-elements/cursor.png new file mode 100644 index 0000000000000000000000000000000000000000..227fb2b1371e67a4ec12ec560773f5141ee0c8e8 GIT binary patch literal 1314 zcmV+-1>O3IP)uC%)mZipOkV8_yM@J(t7Iwq?CHV2w*T6bnWf! z?}b94>Xw!ko55hvY2x1oJ_o*&Qhq3gtL*J3Gr1 zMOl?JPXP`9&2ezv^8&Nff%5Y5)!Kl{%F1Ce!o9#u~@QN zTU)oEJ9n;Rk$kTM-^921m1O~g!C+Li^YZcx7cN|wu-R<4+S=O2^?JST#EBE7E|<%m zlar%Q$@YKF1He~O%9PGmCncJ~=kp~#az#;$0ORB1;o92TUk)BT_><4)o87;E|AyY) z-fbl%CF$y_$_9KPrCiW(DloB)qobp<8sLI$xq9{LX zdo$G)zz)YA9C2uLZnoj!f~two@9@iRI-aBy&N zHWG=%0L*4{+QI|4-R>E?-G1lHnKMJDPMxy4TrRuGWJ*`pe4r{Bm^h{afxy$Tv9W0Y zgTbKB&(BZ(=o5;?Vw^pD_Mz2k?F@&*(f`SLr})z!&$wX4mO7U=PK{L2NJOeTGCadB2zSy^5r5{aEZ ze}2sAbgtdAXOH&wG4gC{p8C* zW@u=rs;Q~T=5#vOMx)W#@#DvT@9608Crwje;q~+wcoSfFcsStm`2vN7g*g_BWx)!I zii)ys-n{uic6PR5WMt$?b93{9hK7c})J9uG^NAJ4HKz5t-R?<%+}zv+O`|BvDwD}% z0I*uEN_~C(hFEMV764Ppz(2L##>U2nu~>|$si}GGxYz3qT)TE{96+zv>xzqu&4&&h zDp&&cuMlD`8Mxs2(ACv7efRF&f9~JEA0SCir*qKb@g(Ye`0(L3mH_suh8FlMn#KXB ztgP(wdc7&Yxw*Ng4u_*}U|?VhVCT-A>x@RDE;&vkcM356M!BtxTC6sHzdyQr_wL^A z?(RvG$z-Ugs4!;;9TY+gr2yk<0cKgIrl+T)yLRpByLj>9sM%~zcOpfAE7}2_`tnvK zrQ8BEr1>)|QIinjN9{mLQX#|u(2V9lU!h#du(ZH9v<>*0=h$A2BEYvoh%4!w8MjRc z;Q>Acz9)W4ETI_By74n1M0=*7lp3a!l+prJ0Oi1X;I+8R5Bv@E13f|r-%`1j1$>eE Y4_Jh_GIuT^P5=M^07*qoM6N<$f=)GxApigX literal 0 HcmV?d00001 diff --git a/src/import/interface-elements/cursor.png.import b/src/import/interface-elements/cursor.png.import new file mode 100644 index 0000000..71feb80 --- /dev/null +++ b/src/import/interface-elements/cursor.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://5a36ownywoa8" +path="res://.godot/imported/cursor.png-10cec2772e1d2948212bee924d0eb111.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://import/interface-elements/cursor.png" +dest_files=["res://.godot/imported/cursor.png-10cec2772e1d2948212bee924d0eb111.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/src/import/interface-elements/cursor_drag.png b/src/import/interface-elements/cursor_drag.png new file mode 100644 index 0000000000000000000000000000000000000000..e0a826cca6c9cdf9037bca0d198cf2c9f44a51d4 GIT binary patch literal 1430 zcmV;H1!?+;P)Nh#L zC+Ggo?{n|@{qFCaD-aO?fH9UvM9X;3Qp)<@GsZFi^aHp{M6>T3s0Hv5fXx8DVT}C) z;12-(L==7>z#Lg$08l2j2FBQJ0KXHF>sc2k--9?6u67fQtX~l9Q98XlrZR?DP3*B9X`* zpU+ogv)Mk`wr!gR0Q7pj>gds3f_&dxkR5QO8$j~jOF+VvNJ3IN^mq*;(VX=-YE(9zNHI2a5@H*MOK zcI?-YuEfPmn+oM z)3bH^_U#1>(<=R(9pA_!~~6ujLa7o7q838%1YDebV|S94*=N!=2HNGh+Y5) zNfU@j+t=4uwR7jrLWM#h06-`dime6)03MI$wWWu+{iVnT0#c{Bxw$kwJw5*Y^!D~n zCyU=oip5?&TPPHY1OkDGIQ$|J=$1MgHf)IR9(KFkzi;2ZzgG(bfZW{NQ~+=~olj(O zpG^c##>sAXJf;?lAKsoB}tB>~{O-Mx#-C^XARK;lqbNayp&!Cr_S~a$<~#{*~;N3G;sePz6A9_UzfILx&FO z%gV~u8w`f*(b3T_7-QbS!NK`xGzx>kkgFlatap_D3S>ej`wX?g7vUAccsu?d|Oq8jU8tgLBT|a5&~~+_*7y>C&ZXuh+Y* zR;yFO;V_RzqtbU^B_d0r@1#HxS`Oe_0GgtrqO``w#)913+%%8Jv)J9;J?C&ZRw@J$ z0IfvSo9yO_KoOb^pccS>07=g%GI6~8FKH*Dsg;c02$X@>1NaQUrvUN+}2P)jNBm94^wv{!jbt zwfFkYT4(KbwoV8EfRr*^2rguI5@bludi8YOe}7tief`>_M~^Pn&NnwVKLaqE&AA4H;Y%syHjl^i2Jk+xX{Nx4P{ZZR zmmll(dR<9LNt(rCS*Xr8Ha7MF#K*@+YTW^xUd^HZn)JwYu2oZ12zNYQpyRHuL38nuCA^w@0l}an$_o$ zl9ELLPN(xP0E5Ax%g@h$rL(istEN9QGgGbX44_O(`J8VR7?=zQaQyi3j$kkt1X#U# zwQ1S1WwUSIy!lkMXJuv01$gr0$uK~AdU~v8dnWL~zXCQlH+$~gyZ0A>PN&mt-@ZM; z;c$!>PGVwW6hLopuLoekf(4;z+%ndqX9ff~fBt-@I?l+*h-qkO=yy7ueZgQbc>DJ4 zrvUBk?SlY%y=x%n0D{pJwL>ScO0lF%0-LCGU1P*)%x}8Uj?YEtLxmgYuAJJ z_V)2Y>+bIM?bxy7{@Jr<$D7244I5qyanY-du)Ct7;^Qk&X|WHOm%19&_h z|5PtkT3Y%j5C{ZewEt>M-9iWt{8Oc$4h#&uv2NWub6s8C>yIBl9_r}m7>J07Fc^)- zFt^+7RlCjFwQEf=F);?W+dTo?)z#%4931o+jmBB(`5e;?br1$nSXlTZH#axiXf*z~ zb?eq8CX*@3WHLRMVz1Zh2Z)W04KFS(POPY?XbS}{UAlC((P*4CGBV;ndGch3##FBk z#>2jJ>C&^JqM{Q?Nl6#??Adec+_`gYt*x!@k&zL9Pfw4>X0tt1)0Ll}|N3MpwOXx< z0m{qEoi3M4z3JT%Lj3w%gc{j z6cjA9+wHAZt5uEO2Yjtvr&Dje(>tyX7wdHHV| z^A|#h8twWCPK6M+fYZF7p#wxmN9)VV%95QL;CJ9> kpg{=n$BTT;2>3GfHy*i3hBAl4GXMYp07*qoM6N<$g4+N07XSbN literal 0 HcmV?d00001 diff --git a/src/import/interface-elements/cursor_grab.png.import b/src/import/interface-elements/cursor_grab.png.import new file mode 100644 index 0000000..9e50d41 --- /dev/null +++ b/src/import/interface-elements/cursor_grab.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d005qvnbnishb" +path="res://.godot/imported/cursor_grab.png-f38d4369c64694a26a6f4ea70068e889.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://import/interface-elements/cursor_grab.png" +dest_files=["res://.godot/imported/cursor_grab.png-f38d4369c64694a26a6f4ea70068e889.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/src/import/interface-elements/cursor_point.png b/src/import/interface-elements/cursor_point.png new file mode 100644 index 0000000000000000000000000000000000000000..6f088ccebaad452173c182b0c979ec3277682137 GIT binary patch literal 1606 zcmV-M2D$l(P)E30@T*ly7unfTX~oHb_@7%DP_@OfyLI&lP6D(WZR96jlR;-Qe^=@DzFpy zt(4OLse!>@@T2MJX#=3FtgN`HscGFpU!IX0_+=){g^LD;!{OxV)2GL>?>l$yT?}@8m<{vKrIbta0q+P|TU*=JY};6tF0|Ns$ zv+vutZ}(JJSKqNI>g(&&-?bgk{!9OfO+{yJTcpjQe+@<(8XoPj_&ElY2q6$co(SIa&6hNWtE~R|1b>01Oie@MF?SJLz))|(A3m490&w@ zTUuI1?q+8ghI#1F;j8I%%Je+2R(;}$$6cABB4$H7`wxW>Ng$rb&zu^6@?7;oHb-7Q zIzI97^+aKzeaW|bob#f*(}#pVMBTb_UL zkuPsq1vbLrv3T$|FJ1$#3n5+uW)FVm@NdL&=zTulTixB=W7dNojYg(T(=*c^)DKbryj*gCThr^MotgI|Pe*E~*D@R`${?Zp~ovyO-;);qYhu(_gW zTVD9J&+qp;SFUswnWjlBHkBM28k#!P{)cOAzi-c$wiNK35aPz2SSL^g?udv`2W;@0b<^B*?&!3KL7v#07*qoM6N<$ Ef&wfIBLDyZ literal 0 HcmV?d00001 diff --git a/src/import/interface-elements/cursor_point.png.import b/src/import/interface-elements/cursor_point.png.import new file mode 100644 index 0000000..f8cf1e0 --- /dev/null +++ b/src/import/interface-elements/cursor_point.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://djocdj0psv4wq" +path="res://.godot/imported/cursor_point.png-0b3cad564cc0e3b9bb8ca527d95e8bfb.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://import/interface-elements/cursor_point.png" +dest_files=["res://.godot/imported/cursor_point.png-0b3cad564cc0e3b9bb8ca527d95e8bfb.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/src/logic-scenes/startup/start_frame.png b/src/import/interface-elements/frame.png similarity index 100% rename from src/logic-scenes/startup/start_frame.png rename to src/import/interface-elements/frame.png diff --git a/src/logic-scenes/startup/start_frame.png.import b/src/import/interface-elements/frame.png.import similarity index 70% rename from src/logic-scenes/startup/start_frame.png.import rename to src/import/interface-elements/frame.png.import index 185c0c1..d0e7aa1 100644 --- a/src/logic-scenes/startup/start_frame.png.import +++ b/src/import/interface-elements/frame.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://d0ucjqi8tx6vt" -path="res://.godot/imported/start_frame.png-e3da868bb60eabb343abc46b5c0d68c9.ctex" +path="res://.godot/imported/frame.png-2a731741f972f4976de0b52bee013a7e.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://logic-scenes/startup/start_frame.png" -dest_files=["res://.godot/imported/start_frame.png-e3da868bb60eabb343abc46b5c0d68c9.ctex"] +source_file="res://import/interface-elements/frame.png" +dest_files=["res://.godot/imported/frame.png-2a731741f972f4976de0b52bee013a7e.ctex"] [params] diff --git a/src/project.godot b/src/project.godot index cb886fe..409d368 100644 --- a/src/project.godot +++ b/src/project.godot @@ -20,11 +20,16 @@ config/icon="res://icon.png" State="*res://singletons/global_state.gd" +[debug] + +gdscript/warnings/native_method_override=0 + [display] window/size/viewport_width=1440 window/size/viewport_height=1080 window/size/mode=3 +mouse_cursor/custom_image="res://import/interface-elements/cursor.png" window/stretch/mode="canvas_items" window/stretch/aspect="expand"