switch to godot 4 (alpha)
This commit is contained in:
		
							parent
							
								
									db3848454d
								
							
						
					
					
						commit
						62c5adc267
					
				
					 6 changed files with 68 additions and 57 deletions
				
			
		
							
								
								
									
										56
									
								
								flake.nix
									
										
									
									
									
								
							
							
						
						
									
										56
									
								
								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
 | 
			
		||||
      ];
 | 
			
		||||
    };
 | 
			
		||||
  };
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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 )
 | 
			
		||||
										
											Binary file not shown.
										
									
								
							| 
		 Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.4 KiB  | 
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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")
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										22
									
								
								justfile
									
										
									
									
									
								
							
							
						
						
									
										22
									
								
								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}}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue