From 62c5adc26736f0689cfc5702a9088f4b8e5a7eee Mon Sep 17 00:00:00 2001 From: Fabien Freling Date: Thu, 19 May 2022 14:23:51 +0200 Subject: [PATCH] switch to godot 4 (alpha) --- flake.nix | 56 ++++++++++++++++++++++-------------- godot-impl/default_env.tres | 7 ----- godot-impl/icon.png | Bin 3305 -> 3523 bytes godot-impl/icon.png.import | 29 +++++++++---------- godot-impl/project.godot | 11 ++----- justfile | 22 +++++++++++--- 6 files changed, 68 insertions(+), 57 deletions(-) delete mode 100644 godot-impl/default_env.tres diff --git a/flake.nix b/flake.nix index c97329b..bd43ca3 100644 --- a/flake.nix +++ b/flake.nix @@ -2,28 +2,40 @@ description = "Doggo flake"; outputs = { self, nixpkgs }: - let pkgs = nixpkgs.legacyPackages.x86_64-linux; - in { - # packages.x86_64-linux.hello = pkgs.hello; - # packages.x86_64-linux.hello = nixpkgs.legacyPackages.x86_64-linux.hello; - # defaultPackage.x86_64-linux = self.packages.x86_64-linux.hello; + let + pkgs = nixpkgs.legacyPackages.x86_64-linux; - devShell.x86_64-linux = with pkgs; - mkShell { - buildInputs = [ - just - zig - godot - - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXext - xorg.libXrandr - xorg.libXinerama - libGL - libGLU - ]; - }; + # godot-alpha = (with pkgs; stdenv.mkDerivation { + # pname = "godot-alpha"; + # version = "4.0.0-a8"; + # src = fetchzip { + # url = "https://downloads.tuxfamily.org/godotengine/4.0/alpha8/Godot_v4.0-alpha8_linux.64.zip"; + # hash = "sha512-qkUpt1reFgVDt5u9zLHYLoJAzC0D/YdtNpQhWLarpTW0e+Vzlqy7kna2plIeddybNsn+tS+QqTmYJExA7aT3zw=="; + # }; + # installPhase = '' + # mkdir -p $out/bin + # mv Godot_v4.0-alpha8_linux.64 $out/bin/godot-v4-alpha + # ''; + # }); + in { + + devShell.x86_64-linux = with pkgs; + mkShell { + buildInputs = [ + just + # zig + # godot + # godot-alpha + # + # xorg.libX11 + # xorg.libXcursor + # xorg.libXi + # xorg.libXext + # xorg.libXrandr + # xorg.libXinerama + # libGL + # libGLU + ]; + }; }; } diff --git a/godot-impl/default_env.tres b/godot-impl/default_env.tres deleted file mode 100644 index 20207a4..0000000 --- a/godot-impl/default_env.tres +++ /dev/null @@ -1,7 +0,0 @@ -[gd_resource type="Environment" load_steps=2 format=2] - -[sub_resource type="ProceduralSky" id=1] - -[resource] -background_mode = 2 -background_sky = SubResource( 1 ) diff --git a/godot-impl/icon.png b/godot-impl/icon.png index c98fbb601c83c81ec8c22b1dba7d1d57c62b323c..836bc8bc1cc3ececdb6210c09f114a836fc81412 100644 GIT binary patch delta 3509 zcmV;m4NCIq8N(ZpFnwz18U#F)$6hrk??iI9*$ z_c5cZgZh1GP2i$&*R1`x%`cSc&4AE zo_6@~HkSxsvwzgRhoa;Qf{4CPEZV4OR2toP-gp2(5K(D#XroN%`^5TfQsfB@8sBCB zVf4He`CiF+3J~>uViDEahpck%LiS3yY!(1ntJY5tWv_b;AgZ;7N8Weeh3$5YIGt9*ys6`{J6)Xp<_2b~tylDEwN(M5x>v3MB=?Qu=_e-gy}S_& zOB>MEo=#0hw8L?%n;O=I%7 z;UEZHxqo9}>#3w#Zd~c-;Aif5hY;U@FBdj?x&a?5_`^8aNwIN8d}_K{nZvHPmfJy z^^fN8^7<_u=B`;X7mLHgr-hZcJU&Y5Z0tQ-L4Tr2$J|jV%o&xX^hvZ}5xe8WH$zgi_D9Wqq07y$sV#25_HXkX$yB(EA!?TMWnCzqs5IgHsZDW%>7+G$tE>&ySqt-{1ZyWVynK z8A}y_sMy4y16MAZ#mYsq*>R!_m&eC*1?gx-IDX+8!-ou_UqTE!PTXSOxe9!;5`R?I z{X#7YEY2Uqa|LPC)SD?Tz0K6|BXN0UK0JAgXuXF zFn!`^4t`V3_ODCZPMzc!13y_Zmw(&U^?Z5iQnxa@T>&YH34HY1UsBTGWbM97c<;Hp zLzAMhyS-FdoISNKETqO6&}&qb)OCy(G%A6Oi^noJPRBE^ZltCm@Mhb(0)lRWqA0NL zr%O>p6&nv+?_@l{Uu#<)xbXmY%+5~619*H28^5@Ys8;jFi_dhsDF!9rM}KpsFg7QH zKODNz!KM9sN3GSx=EEiAS(*v~%csZA2A(5IA_HnmcAEGYZBA z9T${<6Bn;DIKjx|p?xE&+=IZBtVB}d44f#u9&}t#0=9qhCB>z8_~#i}#2ddmDYJw= zT3&i;7}rZG_;CMMLB|Fqz<=xY@y1&_(W&6)v$7+qWN$$LUY(tTMv!^qt)2LMUB?#? zf-8KhvX-}Ye#ZFpc%B@d6e&G>4Ks85Gj4Dk|GDE+Dyr+d9Uqb-wC_(}^NSaLKx$mq zWx^<}ilr0N7(FPK*eESG>ul^Vyu-!v@PeLuk(UP<0f0aL(b~}m5(PSk@GbJmLS3kN)lU)ip&*KeDP9Q`i75wtdED}vRZhU)# z7oLBCrx*SM3+69m-+$hHEGtN7c#0|Dym+Iw%gr@6HHK#=4Q9`t|6%^T1uR_fG%J6+ zlA9$r=^vx#XEU-Qp?c2=h&O6^EG-_F)5UAAz0R#${=4mTI(g@vcR6|DBv0fdcbb>e z-^8vp1?*g1z_8@#PW?{}Pv+RsV{F;H1*g;RY2Lh9%4@H^j(;RcOdOIxw7%!*j2;s( zIKc=&QBe^M4Go?8j~+cnT0di__OXNG5CBntv4i3|%k69A`0?YN+G}fTDK0K<8`D$t zn1EWVKlP>2242cKy^h*0(qq9;XLX_NLZ)7)ZyVE7^q7EZi<2sglboDvGBYzf3KvD@ z&Yi>gTTNlhJ%3-;#Ju_Q5XFuvW@l%UIW&{=M^2o4c$CMG7gg269qN zcfCj*@qO<8HEM}7YKhXS@P^?EhxG`Q)!V6WaS?CSks2RGZfY!IJHo3hPF~o0rpx&w zQ)3uCu(Q+C9)%TVu2nX7*}s0#Xp&6&w(qi{V1KrIFxw?6%@z_(dIrWDLbfR^0#24R z@Zrh7Rc1xOUj>Rc>R2;9ldS%Meg0Pbd{#CovB8y_l9kA+?Pt5}@7qU5VTGA3M@lf; zC9F(bVt*S$ttboPg!Q${xWpOfUU@Tg-7_i8x76p=H z41b&~X<+l=l7QEE@yVe)mKKjF2*^t3BgCLlp%Miuo1B!@2d)tsG%6%-_nUB=UZD=O zSnZ_7cbyMtarp}q+5JsanjKi3UOerxG08D{L;-Hr+1lLadr?|vV?ss(i6$L2?e-F_ zS|nPpX3*WZqxD*WFfbvCCQIn0xsVAcE`PgCPS&t4`x|Zk*!<1KW7^u>UYQoB2dm3N z>kX|mcU|AVbGPsHg}DdHg@X&)0JxMZZEM>8lv_7kIA6^+y7B&8d}^zH@K^JnrXC2#27TRxct>7Yk#$s z7MGV6m!C+B!^77%0;jqr5A8?1QOlvzmqRrx^x~)}3ha9GUr-xk_{j(70zRV;6Dm<) z%kq4z<_4Cp{XO@-25>JzDvh;=EGztB_vZ{wh~nj0SsjkQhYe8>cy)F*1L6$)_pZ;o zHNHJmi9<&I8-PaNeR83qx*o~n<$swc$B`0i;LOd&p#J`YfJP1+?PoU&}dvt%OMAdsJt!0PFlEPpFVr>?Gn zU;cI*N6%deOHS(w2ze6>1eHo;$=sui+P z+o)-FQPb?Cw%J9C%Y(}!*T`I;Whi`bV5YQf4jhYdegBX)DgfZFaqzyd%F%W9yQ25f3&CwLX{|p!chR9=ezS8pq`@DRzVPth-y*$HXwT?7qYkO zDC<#y&nvaQK1$Ijp#Cmb*3yr?O3%YoOiB)6=IvuW!)!HY@m^ zm jMAYwIKKOozaPj{Em(FS#YSV&P00000NkvXXu0mjf^OVgp delta 3289 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 X7her>#-hHS00000NkvXXu0mjf(4=C- diff --git a/godot-impl/icon.png.import b/godot-impl/icon.png.import index a4c02e6..f57c70d 100644 --- a/godot-impl/icon.png.import +++ b/godot-impl/icon.png.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +type="CompressedTexture2D" +uid="uid://dda5wstjh822x" +path="res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.ctex" metadata={ "vram_texture": false } @@ -10,26 +11,24 @@ metadata={ [deps] source_file="res://icon.png" -dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ] +dest_files=["res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.ctex"] [params] compress/mode=0 compress/lossy_quality=0.7 -compress/hdr_mode=0 +compress/hdr_compression=1 compress/bptc_ldr=0 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +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/HDR_as_SRGB=false -process/invert_color=false process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/godot-impl/project.godot b/godot-impl/project.godot index 0580194..7d6483a 100644 --- a/godot-impl/project.godot +++ b/godot-impl/project.godot @@ -6,17 +6,10 @@ ; [section] ; section goes between [] ; param=value ; assign values to parameters -config_version=4 +config_version=5 [application] config/name="Doggo" config/icon="res://icon.png" - -[physics] - -common/enable_pause_aware_picking=true - -[rendering] - -environment/default_environment="res://default_env.tres" +config/features=PackedStringArray("4.0", "Vulkan Clustered") diff --git a/justfile b/justfile index b315d48..4867e8c 100644 --- a/justfile +++ b/justfile @@ -1,7 +1,21 @@ godot_project := "./godot-impl/project.godot" +godot_url := "https://downloads.tuxfamily.org/godotengine/4.0/alpha8/Godot_v4.0-alpha8_linux.64.zip" +godot_exe := "Godot_v4.0-alpha8_linux.64" +godot_exe_dir := "~/bin" +godot_path := godot_exe_dir + "/" + godot_exe -run: - nixGL zig build run +setup: + #!/usr/bin/env bash + set -euo pipefail + if [ ! -e {{godot_path}} ]; then + curl {{godot_url}} -O + unzip Godot*.zip + mv {{godot_exe}} {{godot_exe_dir}} + rm Godot*.zip + fi -edit: - nixGL godot {{godot_project}} +#run: +# nixGL zig build run + +edit: setup + {{godot_exe}} {{godot_project}}