YannK/godot-third-person-basic-scene
1
0
Fork 0
Code Issues 21 Pull requests Projects Releases Packages Wiki Activity

upgrade godot to alpha9

Browse source
This commit is contained in:
AleaJactaEst 2022-06-15 22:53:34 +02:00
parent 0b975133e7
commit be596f9c69
16 changed files with 121 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
maps/materials/ashtarie-bench_flower-band.tres
View file

File diff suppressed because one or more lines are too long

12
maps/meshes/import/microvegetation_aa.tres
View file

File diff suppressed because one or more lines are too long

12
maps/meshes/import/microvegetation_ab.tres
View file

File diff suppressed because one or more lines are too long

12
maps/meshes/import/microvegetation_ab_01.tres
View file

File diff suppressed because one or more lines are too long

8
maps/shaders/ashtarie-bench_flower-band.gdshader
View file

@ -2,12 +2,12 @@
shader_type spatial; shader_type spatial;
render_mode blend_mix,depth_draw_opaque,cull_disabled,diffuse_burley,specular_schlick_ggx; render_mode blend_mix,depth_draw_opaque,cull_disabled,diffuse_burley,specular_schlick_ggx;
uniform vec4 base_color : hint_color; uniform vec4 base_color : source_color;
uniform vec4 decor_color : hint_color; uniform vec4 decor_color : source_color;
uniform sampler2D texture_albedo : hint_albedo,filter_linear_mipmap,repeat_enable; uniform sampler2D texture_albedo : source_color,filter_linear_mipmap,repeat_enable;
uniform float point_size : hint_range(0,128); uniform float point_size : hint_range(0,128);
uniform float roughness : hint_range(0,1); uniform float roughness : hint_range(0,1);
uniform sampler2D texture_metallic : hint_white,filter_linear_mipmap,repeat_enable; uniform sampler2D texture_metallic : hint_default_white,filter_linear_mipmap,repeat_enable;
uniform vec4 metallic_texture_channel; uniform vec4 metallic_texture_channel;
uniform sampler2D texture_roughness : hint_roughness_r,filter_linear_mipmap,repeat_enable; uniform sampler2D texture_roughness : hint_roughness_r,filter_linear_mipmap,repeat_enable;
uniform float specular; uniform float specular;

8
maps/shaders/ashtarie-bench_flower.gdshader
View file

@ -2,12 +2,12 @@
shader_type spatial; shader_type spatial;
render_mode blend_mix,depth_draw_opaque,cull_disabled,diffuse_burley,specular_schlick_ggx; render_mode blend_mix,depth_draw_opaque,cull_disabled,diffuse_burley,specular_schlick_ggx;
uniform vec4 base_color : hint_color; uniform vec4 base_color : source_color;
uniform vec4 decor_color : hint_color; uniform vec4 decor_color : source_color;
uniform sampler2D texture_albedo : hint_albedo,filter_linear_mipmap,repeat_disable; uniform sampler2D texture_albedo : source_color,filter_linear_mipmap,repeat_disable;
uniform float point_size : hint_range(0,128); uniform float point_size : hint_range(0,128);
uniform float roughness : hint_range(0,1); uniform float roughness : hint_range(0,1);
uniform sampler2D texture_metallic : hint_white,filter_linear_mipmap,repeat_enable; uniform sampler2D texture_metallic : hint_default_white,filter_linear_mipmap,repeat_enable;
uniform vec4 metallic_texture_channel; uniform vec4 metallic_texture_channel;
uniform sampler2D texture_roughness : hint_roughness_r,filter_linear_mipmap,repeat_enable; uniform sampler2D texture_roughness : hint_roughness_r,filter_linear_mipmap,repeat_enable;
uniform float specular; uniform float specular;

8
maps/shaders/base_ground.gdshader
View file

@ -2,18 +2,18 @@
shader_type spatial; shader_type spatial;
render_mode blend_mix,depth_draw_opaque,cull_back,diffuse_burley,specular_schlick_ggx; render_mode blend_mix,depth_draw_opaque,cull_back,diffuse_burley,specular_schlick_ggx;
uniform vec4 albedo : hint_color; uniform vec4 albedo : source_color;
uniform sampler2D texture_albedo : hint_albedo,filter_linear_mipmap,repeat_enable; uniform sampler2D texture_albedo : source_color,filter_linear_mipmap,repeat_enable;
uniform float point_size : hint_range(0,128); uniform float point_size : hint_range(0,128);
uniform float roughness : hint_range(0,1); uniform float roughness : hint_range(0,1);
uniform sampler2D texture_metallic : hint_white,filter_linear_mipmap,repeat_enable; uniform sampler2D texture_metallic : hint_default_white,filter_linear_mipmap,repeat_enable;
uniform vec4 metallic_texture_channel; uniform vec4 metallic_texture_channel;
uniform sampler2D texture_roughness : hint_roughness_gray,filter_linear_mipmap,repeat_enable; uniform sampler2D texture_roughness : hint_roughness_gray,filter_linear_mipmap,repeat_enable;
uniform float specular; uniform float specular;
uniform float metallic; uniform float metallic;
uniform sampler2D texture_normal : hint_roughness_normal,filter_linear_mipmap,repeat_enable; uniform sampler2D texture_normal : hint_roughness_normal,filter_linear_mipmap,repeat_enable;
uniform float normal_scale : hint_range(-16,16); uniform float normal_scale : hint_range(-16,16);
uniform sampler2D texture_heightmap : hint_black,filter_linear_mipmap,repeat_enable; uniform sampler2D texture_heightmap : hint_default_black,filter_linear_mipmap,repeat_enable;
uniform float heightmap_scale; uniform float heightmap_scale;
uniform int heightmap_min_layers; uniform int heightmap_min_layers;
uniform int heightmap_max_layers; uniform int heightmap_max_layers;

14
maps/shaders/khanat_sky.gdshader
View file

@ -5,28 +5,28 @@
shader_type sky; shader_type sky;
uniform float rayleigh : hint_range(0, 64) = 2.0; uniform float rayleigh : hint_range(0, 64) = 2.0;
uniform vec4 rayleigh_color : hint_color = vec4(0.3, 0.405, 0.6, 1.0); uniform vec4 rayleigh_color : source_color = vec4(0.3, 0.405, 0.6, 1.0);
uniform float mie : hint_range(0, 1) = 0.005; uniform float mie : hint_range(0, 1) = 0.005;
uniform float mie_eccentricity : hint_range(-1, 1) = 0.8; uniform float mie_eccentricity : hint_range(-1, 1) = 0.8;
uniform vec4 mie_color : hint_color = vec4(0.69, 0.729, 0.812, 1.0); uniform vec4 mie_color : source_color = vec4(0.69, 0.729, 0.812, 1.0);
uniform float turbidity : hint_range(0, 1000) = 10.0; uniform float turbidity : hint_range(0, 1000) = 10.0;
uniform float sun_disk_scale : hint_range(0, 360) = 1.0; uniform float sun_disk_scale : hint_range(0, 360) = 1.0;
uniform vec4 ground_color : hint_color = vec4(0.1, 0.07, 0.034, 1.0); uniform vec4 ground_color : source_color = vec4(0.1, 0.07, 0.034, 1.0);
uniform float exposure : hint_range(0, 128) = 0.1; uniform float exposure : hint_range(0, 128) = 0.1;
uniform float dither_strength : hint_range(0, 10) = 1.0; uniform float dither_strength : hint_range(0, 10) = 1.0;
uniform sampler2D night_sky : hint_black_albedo; uniform sampler2D night_sky : source_color;
uniform sampler2D samayun : hint_albedo; uniform sampler2D samayun : source_color;
uniform float samayun_arc = 45 ; uniform float samayun_arc = 45 ;
uniform vec3 samayun_position = vec3( 0.0, 0.5, 0.0 ); uniform vec3 samayun_position = vec3( 0.0, 0.5, 0.0 );
uniform sampler2D zabr : hint_albedo; uniform sampler2D zabr : source_color;
uniform float zabr_arc = 15 ; uniform float zabr_arc = 15 ;
uniform vec3 zabr_position = vec3( 0.0, 0.7, 0.0 ); uniform vec3 zabr_position = vec3( 0.0, 0.7, 0.0 );
uniform sampler2D stigi : hint_albedo; uniform sampler2D stigi : source_color;
uniform float stigi_arc = 8 ; uniform float stigi_arc = 8 ;
uniform vec3 stigi_position = vec3( 0.0, 0.8, 0.0 ); uniform vec3 stigi_position = vec3( 0.0, 0.8, 0.0 );

6
maps/shaders/micro_vegetation_aa.gdshader
View file

@ -2,11 +2,11 @@
shader_type spatial; shader_type spatial;
render_mode blend_mix,depth_draw_opaque,cull_disabled,diffuse_burley,specular_schlick_ggx,depth_prepass_alpha; render_mode blend_mix,depth_draw_opaque,cull_disabled,diffuse_burley,specular_schlick_ggx,depth_prepass_alpha;
uniform vec4 albedo : hint_color; uniform vec4 albedo : source_color;
uniform sampler2D texture_albedo : hint_albedo,filter_linear_mipmap,repeat_enable; uniform sampler2D texture_albedo : source_color,filter_linear_mipmap,repeat_enable;
uniform float point_size : hint_range(0,128); uniform float point_size : hint_range(0,128);
uniform float roughness : hint_range(0,1); uniform float roughness : hint_range(0,1);
uniform sampler2D texture_metallic : hint_white,filter_linear_mipmap,repeat_enable; uniform sampler2D texture_metallic : hint_default_white,filter_linear_mipmap,repeat_enable;
uniform vec4 metallic_texture_channel; uniform vec4 metallic_texture_channel;
uniform sampler2D texture_roughness : hint_roughness_g,filter_linear_mipmap,repeat_enable; uniform sampler2D texture_roughness : hint_roughness_g,filter_linear_mipmap,repeat_enable;
uniform vec4 roughness_texture_channel; uniform vec4 roughness_texture_channel;

8
maps/shaders/water.gdshader
View file

@ -40,20 +40,20 @@ uniform float uv_sampler_strength = 0.04; // UV shifting strength
uniform sampler2D normalmap_a_sampler : hint_normal; // Normalmap sampler A uniform sampler2D normalmap_a_sampler : hint_normal; // Normalmap sampler A
uniform sampler2D normalmap_b_sampler : hint_normal; // Normalmap sampler B uniform sampler2D normalmap_b_sampler : hint_normal; // Normalmap sampler B
uniform sampler2D foam_sampler : hint_black; // Foam sampler uniform sampler2D foam_sampler : hint_default_black; // Foam sampler
uniform float foam_level = 0.5; // Foam level -> distance from the object (0.0 - 0.5) uniform float foam_level = 0.5; // Foam level -> distance from the object (0.0 - 0.5)
// Volume settings: // Volume settings:
uniform float refraction = 0.075; // Refraction of the water uniform float refraction = 0.075; // Refraction of the water
uniform vec4 color_deep : hint_color; // Color for deep places in the water, medium to dark blue uniform vec4 color_deep : source_color; // Color for deep places in the water, medium to dark blue
uniform vec4 color_shallow : hint_color; // Color for lower places in the water, bright blue - green uniform vec4 color_shallow : source_color; // Color for lower places in the water, bright blue - green
uniform float beers_law = 2.0; // Beers law value, regulates the blending size to the deep water level uniform float beers_law = 2.0; // Beers law value, regulates the blending size to the deep water level
uniform float depth_offset = -0.75; // Offset for the blending uniform float depth_offset = -0.75; // Offset for the blending
// Projector for the water caustics: // Projector for the water caustics:
uniform mat4 projector; // Projector matrix, mostly the matric of the sun / directlight uniform mat4 projector; // Projector matrix, mostly the matric of the sun / directlight
uniform sampler2DArray caustic_sampler : hint_black; // Caustic sampler, (Texture array with 16 Textures for the animation) uniform sampler2DArray caustic_sampler : hint_default_black; // Caustic sampler, (Texture array with 16 Textures for the animation)
// Vertex -> Fragment: // Vertex -> Fragment:

4
scenes/hud/hud.gd
View file

@ -53,8 +53,8 @@ func _on_confirmation_dialog_confirmed():
func _on_languages_pressed(): func _on_languages_pressed():
$MenuLanguage/Window.popup_centered() #$MenuLanguage/Window.popup_centered()
$MenuLanguage/Window.visible = true $MenuLanguage/Window.set_visible(true)
func _on_keys_pressed(): func _on_keys_pressed():

2
scenes/languages/languages.gd
View file

@ -41,4 +41,4 @@ func _on_select_item_selected(_index):
func _on_quit_pressed(): func _on_quit_pressed():
$Window.visible = false $Window.set_visible(false)

72
scenes/languages/languages.tscn
View file

@ -1,12 +1,15 @@
[gd_scene load_steps=2 format=3 uid="uid://dpvequp5fv27k"] [gd_scene load_steps=3 format=3 uid="uid://dpvequp5fv27k"]
[ext_resource type="Script" path="res://scenes/languages/languages.gd" id="1_qc7c5"] [ext_resource type="Script" path="res://scenes/languages/languages.gd" id="1_qc7c5"]
[ext_resource type="Texture2D" uid="uid://0cn1ngjhkhrj" path="res://scenes/languages/panel.jpg" id="2_nhy1g"]
[node name="Control" type="Control"] [node name="Control" type="Control"]
script = ExtResource( "1_qc7c5" ) script = ExtResource( "1_qc7c5" )
[node name="Window" type="Window" parent="."] [node name="Window" type="Window" parent="."]
title = "Language" title = "Language"
position = Vector2i(50, 100)
size = Vector2i(300, 150)
visible = false visible = false
[node name="VBoxContainer" type="VBoxContainer" parent="Window"] [node name="VBoxContainer" type="VBoxContainer" parent="Window"]
@ -19,20 +22,71 @@ size_flags_vertical = 3
metadata/_edit_use_custom_anchors = false metadata/_edit_use_custom_anchors = false
[node name="Label" type="Label" parent="Window/VBoxContainer"] [node name="Label" type="Label" parent="Window/VBoxContainer"]
offset_right = 40.0 offset_right = 1024.0
offset_bottom = 23.0 offset_bottom = 26.0
text = "Select language" text = "Select language"
[node name="Select" type="OptionButton" parent="Window/VBoxContainer"] [node name="Select" type="OptionButton" parent="Window/VBoxContainer"]
offset_right = 43.0 offset_top = 30.0
offset_bottom = 31.0 offset_right = 1024.0
offset_bottom = 565.0
size_flags_vertical = 3 size_flags_vertical = 3
metadata/_edit_use_custom_anchors = false metadata/_edit_use_custom_anchors = false
[node name="Quit" type="Button" parent="Window/VBoxContainer"] [node name="Quit" type="Button" parent="Window/VBoxContainer"]
offset_top = 35.0 offset_left = 491.0
offset_right = 43.0 offset_top = 569.0
offset_bottom = 66.0 offset_right = 533.0
offset_bottom = 600.0
size_flags_horizontal = 4
size_flags_vertical = 8
text = "Quit"
[node name="Window3" type="NinePatchRect" parent="."]
visible = false
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = 72.0
offset_top = 38.0
offset_right = 681.0
offset_bottom = 411.0
grow_horizontal = 2
grow_vertical = 2
texture = ExtResource( "2_nhy1g" )
patch_margin_left = 8
patch_margin_top = 8
patch_margin_right = 8
patch_margin_bottom = 8
metadata/_edit_layout_mode = 1
metadata/_edit_use_custom_anchors = true
[node name="VBoxContainer" type="VBoxContainer" parent="Window3"]
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
size_flags_horizontal = 3
size_flags_vertical = 3
metadata/_edit_layout_mode = 1
[node name="Label" type="Label" parent="Window3/VBoxContainer"]
offset_right = 609.0
offset_bottom = 26.0
text = "Select language"
[node name="Select" type="OptionButton" parent="Window3/VBoxContainer"]
offset_top = 30.0
offset_right = 609.0
offset_bottom = 338.0
size_flags_vertical = 3
metadata/_edit_use_custom_anchors = false
[node name="Quit" type="Button" parent="Window3/VBoxContainer"]
offset_left = 283.0
offset_top = 342.0
offset_right = 325.0
offset_bottom = 373.0
size_flags_horizontal = 4 size_flags_horizontal = 4
size_flags_vertical = 8 size_flags_vertical = 8
text = "Quit" text = "Quit"
@ -40,3 +94,5 @@ text = "Quit"
[connection signal="close_requested" from="Window" to="." method="_on_quit_pressed"] [connection signal="close_requested" from="Window" to="." method="_on_quit_pressed"]
[connection signal="item_selected" from="Window/VBoxContainer/Select" to="." method="_on_select_item_selected"] [connection signal="item_selected" from="Window/VBoxContainer/Select" to="." method="_on_select_item_selected"]
[connection signal="pressed" from="Window/VBoxContainer/Quit" to="." method="_on_quit_pressed"] [connection signal="pressed" from="Window/VBoxContainer/Quit" to="." method="_on_quit_pressed"]
[connection signal="item_selected" from="Window3/VBoxContainer/Select" to="." method="_on_select_item_selected"]
[connection signal="pressed" from="Window3/VBoxContainer/Quit" to="." method="_on_quit_pressed"]

BIN
scenes/languages/panel.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 218 KiB

1
scenes/main/main.tscn
View file

@ -6,6 +6,7 @@
[ext_resource type="PackedScene" uid="uid://cdyi1a858p7em" path="res://scenes/hud/hud.tscn" id="3_5vcj4"] [ext_resource type="PackedScene" uid="uid://cdyi1a858p7em" path="res://scenes/hud/hud.tscn" id="3_5vcj4"]
[node name="main_scene" type="Node3D"] [node name="main_scene" type="Node3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -16.7863, -3.32883, 24.6513)
script = ExtResource( "1_ld2xt" ) script = ExtResource( "1_ld2xt" )
[node name="player" parent="." instance=ExtResource( "1_btdsd" )] [node name="player" parent="." instance=ExtResource( "1_btdsd" )]

2
start-khanat-client.sh
View file

@ -7,7 +7,7 @@ declare FORCE=0
declare IMPORT=0 declare IMPORT=0
declare ERASEIMPORT=0 declare ERASEIMPORT=0
declare WORKDIR="$(dirname $(readlink -f $0))" declare WORKDIR="$(dirname $(readlink -f $0))"
declare GODOT_SRC="https://downloads.tuxfamily.org/godotengine/4.0/alpha8/Godot_v4.0-alpha8_linux.64.zip" declare GODOT_SRC="https://downloads.tuxfamily.org/godotengine/4.0/alpha9/Godot_v4.0-alpha9_linux.64.zip"
declare OUTZIP="$WORKDIR/$(basename $GODOT_SRC)" declare OUTZIP="$WORKDIR/$(basename $GODOT_SRC)"
declare OPTION="" declare OPTION=""
declare NEWPRG=0 declare NEWPRG=0