Update new GUI.

- Add font
- first step to update main menu Ui
- replace button with a subscene
- add props textures
- write a new resolution default
- actvate HDPI
This commit is contained in:
stilobique-surface
2021-05-14 19:07:26 +02:00
committed by Vaillant Jeremy
parent 16f79021ad
commit 2d1081a3f8
26 changed files with 696 additions and 101 deletions
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+6
View File
@@ -0,0 +1,6 @@
[gd_resource type="DynamicFont" load_steps=2 format=2]
[ext_resource path="res://assets/fonts/kirsty/kirsty rg.otf" type="DynamicFontData" id=1]
[resource]
font_data = ExtResource( 1 )
+253
View File
@@ -0,0 +1,253 @@
[gd_scene load_steps=22 format=2]
[ext_resource path="res://assets/ui/summary/UI_header_summary.tscn" type="PackedScene" id=1]
[ext_resource path="res://assets/ui/summary/UI_footer_summary.tscn" type="PackedScene" id=2]
[ext_resource path="res://assets/ui/themes/bck-vert-grd.png" type="Texture" id=3]
[ext_resource path="res://assets/ui/themes/wood-tile.jpg" type="Texture" id=4]
[sub_resource type="VisualShaderNodeVectorOp" id=12]
operator = 3
[sub_resource type="VisualShaderNodeInput" id=14]
input_name = "screen_uv"
[sub_resource type="VisualShaderNodeVectorDecompose" id=15]
output_port_for_preview = 1
[sub_resource type="VisualShaderNodeVectorScalarMix" id=16]
[sub_resource type="VisualShaderNodeColorConstant" id=17]
constant = Color( 0.2, 0.155, 0.11, 1 )
[sub_resource type="VisualShaderNodeColorOp" id=18]
[sub_resource type="VisualShaderNodeVectorScalarMix" id=19]
[sub_resource type="VisualShaderNodeScalarOp" id=20]
default_input_values = [ 0, 0.0, 1, 0.2 ]
operator = 2
[sub_resource type="VisualShaderNodeScalarOp" id=21]
default_input_values = [ 0, 0.0, 1, -1.0 ]
operator = 2
[sub_resource type="VisualShaderNodeInput" id=2]
input_name = "screen_uv"
[sub_resource type="VisualShaderNodeTexture" id=3]
texture = ExtResource( 4 )
texture_type = 1
[sub_resource type="VisualShaderNodeVectorCompose" id=6]
default_input_values = [ 0, 0.0, 1, 0.0, 2, 1.0 ]
[sub_resource type="VisualShaderNodeScalarConstant" id=7]
constant = 0.4
[sub_resource type="VisualShaderNodeVectorDecompose" id=8]
[sub_resource type="VisualShaderNodeScalarOp" id=9]
default_input_values = [ 0, 0.0, 1, 1.6 ]
operator = 3
[sub_resource type="VisualShader" id=4]
code = "shader_type canvas_item;
uniform sampler2D tex_frg_4 : hint_albedo;
void vertex() {
// Output:0
}
void fragment() {
// Input:3
vec3 n_out3p0 = vec3(SCREEN_UV, 0.0);
// Scalar:6
float n_out6p0 = 0.400000;
// VectorOp:11
vec3 n_out11p0 = n_out3p0 / vec3(n_out6p0);
// VectorDecompose:7
float n_out7p0 = n_out11p0.x;
float n_out7p1 = n_out11p0.y;
float n_out7p2 = n_out11p0.z;
// ScalarOp:8
float n_in8p1 = 1.60000;
float n_out8p0 = n_out7p1 / n_in8p1;
// VectorCompose:5
float n_in5p2 = 1.00000;
vec3 n_out5p0 = vec3(n_out7p0, n_out8p0, n_in5p2);
// Texture:4
vec4 tex_frg_4_read = texture(tex_frg_4, n_out5p0.xy);
vec3 n_out4p0 = tex_frg_4_read.rgb;
float n_out4p1 = tex_frg_4_read.a;
// ScalarOp:22
float n_in22p1 = 0.20000;
float n_out22p0 = dot(n_out4p0, vec3(0.333333, 0.333333, 0.333333)) * n_in22p1;
// Color:18
vec3 n_out18p0 = vec3(0.200000, 0.155000, 0.110000);
float n_out18p1 = 1.000000;
// ColorOp:19
vec3 n_out19p0 = vec3(1.0) - (vec3(1.0) - n_out18p0) * (vec3(1.0) - n_out4p0);
// Input:14
vec3 n_out14p0 = vec3(SCREEN_UV, 0.0);
// VectorDecompose:15
float n_out15p0 = n_out14p0.x;
float n_out15p1 = n_out14p0.y;
float n_out15p2 = n_out14p0.z;
// VectorScalarMix:17
vec3 n_out17p0 = mix(n_out4p0, n_out19p0, n_out15p1);
// VectorScalarMix:20
vec3 n_out20p0 = mix(vec3(n_out22p0), n_out17p0, n_out15p1);
// Output:0
COLOR.rgb = n_out20p0;
}
void light() {
// Output:0
}
"
graph_offset = Vector2( -1049.92, -110.97 )
mode = 1
flags/light_only = false
nodes/fragment/0/position = Vector2( 2300, 540 )
nodes/fragment/3/node = SubResource( 2 )
nodes/fragment/3/position = Vector2( -2320, 660 )
nodes/fragment/4/node = SubResource( 3 )
nodes/fragment/4/position = Vector2( 60, 160 )
nodes/fragment/5/node = SubResource( 6 )
nodes/fragment/5/position = Vector2( -580, 720 )
nodes/fragment/6/node = SubResource( 7 )
nodes/fragment/6/position = Vector2( -2300, 800 )
nodes/fragment/7/node = SubResource( 8 )
nodes/fragment/7/position = Vector2( -1480, 700 )
nodes/fragment/8/node = SubResource( 9 )
nodes/fragment/8/position = Vector2( -960, 820 )
nodes/fragment/11/node = SubResource( 12 )
nodes/fragment/11/position = Vector2( -1860, 700 )
nodes/fragment/14/node = SubResource( 14 )
nodes/fragment/14/position = Vector2( 140, 980 )
nodes/fragment/15/node = SubResource( 15 )
nodes/fragment/15/position = Vector2( 580, 960 )
nodes/fragment/17/node = SubResource( 16 )
nodes/fragment/17/position = Vector2( 1240, 560 )
nodes/fragment/18/node = SubResource( 17 )
nodes/fragment/18/position = Vector2( 520, 620 )
nodes/fragment/19/node = SubResource( 18 )
nodes/fragment/19/position = Vector2( 840, 580 )
nodes/fragment/20/node = SubResource( 19 )
nodes/fragment/20/position = Vector2( 1780, 660 )
nodes/fragment/22/node = SubResource( 20 )
nodes/fragment/22/position = Vector2( 1260, 780 )
nodes/fragment/23/node = SubResource( 21 )
nodes/fragment/23/position = Vector2( 1080, 1080 )
nodes/fragment/connections = PoolIntArray( 8, 0, 5, 1, 7, 1, 8, 0, 7, 0, 5, 0, 5, 0, 4, 0, 3, 0, 11, 0, 6, 0, 11, 1, 11, 0, 7, 0, 14, 0, 15, 0, 4, 0, 17, 0, 15, 1, 17, 2, 4, 0, 19, 1, 18, 0, 19, 0, 19, 0, 17, 1, 4, 0, 22, 0, 20, 0, 0, 0, 15, 1, 23, 0, 22, 0, 20, 0, 15, 1, 20, 2, 17, 0, 20, 1 )
[sub_resource type="ShaderMaterial" id=5]
shader = SubResource( 4 )
[node name="Summary" type="HBoxContainer"]
anchor_bottom = 1.0
margin_right = 236.0
custom_constants/separation = 0
__meta__ = {
"_edit_use_anchors_": false
}
[node name="PanelWood" type="Panel" parent="."]
material = SubResource( 5 )
margin_right = 350.0
margin_bottom = 900.0
rect_min_size = Vector2( 350, 0 )
size_flags_vertical = 3
[node name="VBoxContainer" type="VBoxContainer" parent="PanelWood"]
anchor_right = 1.0
anchor_bottom = 1.0
size_flags_horizontal = 3
size_flags_vertical = 3
custom_constants/separation = 0
__meta__ = {
"_edit_use_anchors_": false
}
[node name="MarginTop" type="MarginContainer" parent="PanelWood/VBoxContainer"]
margin_right = 350.0
margin_bottom = 60.0
size_flags_horizontal = 3
custom_constants/margin_top = 60
[node name="SummaryHeader" parent="PanelWood/VBoxContainer" instance=ExtResource( 1 )]
anchor_right = 0.0
margin_top = 60.0
margin_right = 350.0
margin_bottom = 248.0
[node name="CenterContainer" parent="PanelWood/VBoxContainer/SummaryHeader" index="0"]
margin_right = 350.0
[node name="TextureRect" parent="PanelWood/VBoxContainer/SummaryHeader/CenterContainer" index="0"]
margin_left = 111.0
margin_right = 239.0
[node name="ButtonPuzzle" parent="PanelWood/VBoxContainer/SummaryHeader" index="1"]
margin_right = 350.0
[node name="ButtonSetting" parent="PanelWood/VBoxContainer/SummaryHeader" index="2"]
margin_right = 350.0
[node name="MarginContainer" type="MarginContainer" parent="PanelWood/VBoxContainer"]
margin_top = 248.0
margin_right = 350.0
margin_bottom = 802.0
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="SummaryFooter" parent="PanelWood/VBoxContainer" instance=ExtResource( 2 )]
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 802.0
margin_right = 350.0
margin_bottom = 840.0
size_flags_horizontal = 3
size_flags_vertical = 9
alignment = 2
[node name="MarginFooter" type="MarginContainer" parent="PanelWood/VBoxContainer"]
margin_top = 840.0
margin_right = 350.0
margin_bottom = 900.0
custom_constants/margin_top = 60
[node name="TextureRect" type="TextureRect" parent="."]
margin_left = 350.0
margin_right = 446.0
margin_bottom = 900.0
rect_clip_content = true
size_flags_horizontal = 11
size_flags_vertical = 3
texture = ExtResource( 3 )
stretch_mode = 2
__meta__ = {
"_edit_use_anchors_": false
}
[editable path="PanelWood/VBoxContainer/SummaryHeader"]
+22
View File
@@ -0,0 +1,22 @@
[gd_scene format=2]
[node name="VBoxContainer" type="VBoxContainer"]
anchor_top = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
margin_top = -38.0
__meta__ = {
"_edit_use_anchors_": false
}
[node name="ButtonQuit" type="Button" parent="."]
margin_right = 1440.0
margin_bottom = 20.0
text = "Quitter"
[node name="Label" type="Label" parent="."]
margin_top = 24.0
margin_right = 1440.0
margin_bottom = 38.0
text = "v XX.XX"
align = 2
+39
View File
@@ -0,0 +1,39 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://assets/ui/icones/treasure.png" type="Texture" id=1]
[node name="VBoxContainer" type="VBoxContainer"]
anchor_right = 1.0
margin_bottom = 176.0
custom_constants/separation = 10
__meta__ = {
"_edit_use_anchors_": false
}
[node name="CenterContainer" type="CenterContainer" parent="."]
margin_right = 1440.0
margin_bottom = 128.0
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="TextureRect" type="TextureRect" parent="CenterContainer"]
margin_left = 656.0
margin_right = 784.0
margin_bottom = 128.0
size_flags_horizontal = 4
size_flags_vertical = 4
texture = ExtResource( 1 )
stretch_mode = 1
flip_h = true
[node name="ButtonPuzzle" type="Button" parent="."]
margin_top = 138.0
margin_right = 1440.0
margin_bottom = 158.0
text = "Puzzles"
[node name="ButtonSetting" type="Button" parent="."]
margin_top = 168.0
margin_right = 1440.0
margin_bottom = 188.0
text = "Parametres"
Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

+34
View File
@@ -0,0 +1,34 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/bck-vert-grd.png-d2083d6bd6456db9a6d0f312e3214ea8.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/ui/themes/bck-vert-grd.png"
dest_files=[ "res://.import/bck-vert-grd.png-d2083d6bd6456db9a6d0f312e3214ea8.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=true
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
Binary file not shown.

After

Width:  |  Height:  |  Size: 130 KiB

+34
View File
@@ -0,0 +1,34 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/bck.jpg-12e6b0ecb958a503e39a462df5c12528.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/ui/themes/bck.jpg"
dest_files=[ "res://.import/bck.jpg-12e6b0ecb958a503e39a462df5c12528.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=true
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
Binary file not shown.

After

Width:  |  Height:  |  Size: 90 KiB

@@ -0,0 +1,34 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/button-summary.jpg-aa86a5d3c97e55e7dd46546765e69753.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/ui/themes/button-summary.jpg"
dest_files=[ "res://.import/button-summary.jpg-aa86a5d3c97e55e7dd46546765e69753.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

+34
View File
@@ -0,0 +1,34 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/game-title.png-2ddb032c94bf4a6d065bd116579953b1.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/ui/themes/game-title.png"
dest_files=[ "res://.import/game-title.png-2ddb032c94bf4a6d065bd116579953b1.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
Binary file not shown.

After

Width:  |  Height:  |  Size: 140 KiB

+34
View File
@@ -0,0 +1,34 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/leather-bck.jpg-7aafba39292c0e1de112d859a6bad1e2.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/ui/themes/leather-bck.jpg"
dest_files=[ "res://.import/leather-bck.jpg-7aafba39292c0e1de112d859a6bad1e2.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=2
flags/repeat=1
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
Binary file not shown.
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

+34
View File
@@ -0,0 +1,34 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/summary-bck.jpg-a69db3cfeb0934085d499b17906cd9f7.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/ui/themes/summary-bck.jpg"
dest_files=[ "res://.import/summary-bck.jpg-a69db3cfeb0934085d499b17906cd9f7.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
Binary file not shown.

After

Width:  |  Height:  |  Size: 232 KiB

+34
View File
@@ -0,0 +1,34 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/wood-tile.jpg-341401d7ff46a44dbbd830e382df4e4d.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/ui/themes/wood-tile.jpg"
dest_files=[ "res://.import/wood-tile.jpg-341401d7ff46a44dbbd830e382df4e4d.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=1
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0