diff --git a/app/assets/textures/background.png b/app/assets/textures/background.png deleted file mode 100644 index bfbcfc5..0000000 Binary files a/app/assets/textures/background.png and /dev/null differ diff --git a/app/assets/textures/empty_icon.svg b/app/assets/textures/empty_icon.svg new file mode 100644 index 0000000..6828f8f --- /dev/null +++ b/app/assets/textures/empty_icon.svg @@ -0,0 +1,26 @@ + + + + + + + + + diff --git a/app/assets/textures/background.png.import b/app/assets/textures/empty_icon.svg.import similarity index 51% rename from app/assets/textures/background.png.import rename to app/assets/textures/empty_icon.svg.import index cf826d8..444d56e 100644 --- a/app/assets/textures/background.png.import +++ b/app/assets/textures/empty_icon.svg.import @@ -2,27 +2,27 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cykx425p6ylwr" -path="res://.godot/imported/background.png-db55ec47224fbca7de3496d6823058f9.ctex" +uid="uid://6k1ia4pidwrq" +path="res://.godot/imported/empty_icon.svg-b721453304feda680f1ac1f81d30ae65.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/textures/background.png" -dest_files=["res://.godot/imported/background.png-db55ec47224fbca7de3496d6823058f9.ctex"] +source_file="res://assets/textures/empty_icon.svg" +dest_files=["res://.godot/imported/empty_icon.svg-b721453304feda680f1ac1f81d30ae65.ctex"] [params] -compress/mode=3 -compress/high_quality=true +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=true -mipmaps/limit=6 +mipmaps/generate=false +mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" process/fix_alpha_border=true @@ -32,3 +32,6 @@ process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 detect_3d/compress_to=1 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/app/scenes/components/bookmark.tscn b/app/scenes/components/bookmark.tscn index 1e14e76..5263aab 100644 --- a/app/scenes/components/bookmark.tscn +++ b/app/scenes/components/bookmark.tscn @@ -2,10 +2,10 @@ [ext_resource type="Script" path="res://scripts/ui/menu/bookmark_ui.gd" id="1_bpkqj"] [ext_resource type="Resource" uid="uid://b1xvdym0qh6td" path="res://resources/gate_events.res" id="2_7i5yr"] -[ext_resource type="Texture2D" uid="uid://cykx425p6ylwr" path="res://assets/textures/background.png" id="3_kgutt"] [ext_resource type="StyleBox" uid="uid://bllkg32sc4iam" path="res://assets/styles/bookmark.stylebox" id="3_tb1mf"] [ext_resource type="StyleBox" uid="uid://bmxiecm3vkddl" path="res://assets/styles/bookmark_hover.stylebox" id="4_figib"] [ext_resource type="LabelSettings" uid="uid://85ms8ndcmbn0" path="res://assets/styles/text_small.tres" id="4_xqjm8"] +[ext_resource type="Texture2D" uid="uid://6k1ia4pidwrq" path="res://assets/textures/empty_icon.svg" id="5_vwpfy"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_od0ga"] corner_radius_top_left = 20 @@ -65,7 +65,7 @@ grow_vertical = 2 size_flags_horizontal = 4 size_flags_vertical = 4 mouse_filter = 2 -texture = ExtResource("3_kgutt") +texture = ExtResource("5_vwpfy") expand_mode = 1 stretch_mode = 5 diff --git a/app/scenes/components/result.tscn b/app/scenes/components/result.tscn index 0535d5e..a664dfb 100644 --- a/app/scenes/components/result.tscn +++ b/app/scenes/components/result.tscn @@ -2,11 +2,11 @@ [ext_resource type="Script" path="res://scripts/ui/search/result.gd" id="1_b6nfm"] [ext_resource type="StyleBox" uid="uid://bmxiecm3vkddl" path="res://assets/styles/bookmark_hover.stylebox" id="1_bqxb5"] -[ext_resource type="Texture2D" uid="uid://cykx425p6ylwr" path="res://assets/textures/background.png" id="1_cbuy3"] [ext_resource type="StyleBox" uid="uid://bllkg32sc4iam" path="res://assets/styles/bookmark.stylebox" id="2_agglm"] [ext_resource type="Script" path="res://scripts/ui/search/one_line_text.gd" id="2_nxics"] [ext_resource type="Resource" uid="uid://b1xvdym0qh6td" path="res://resources/gate_events.res" id="2_wgd6i"] [ext_resource type="FontFile" uid="uid://do40418waa8w3" path="res://assets/fonts/Inter-Regular.otf" id="4_tevcf"] +[ext_resource type="Texture2D" uid="uid://6k1ia4pidwrq" path="res://assets/textures/empty_icon.svg" id="5_a6pb2"] [ext_resource type="FontFile" uid="uid://c14w1y1r54wgi" path="res://assets/fonts/Inter-Bold.otf" id="5_vkte5"] [ext_resource type="FontFile" uid="uid://b3xb1fpllhnf4" path="res://assets/fonts/Inter-Italic.otf" id="6_10owe"] [ext_resource type="FontFile" uid="uid://tfj3o1e1wytn" path="res://assets/fonts/Inter-BoldItalic.otf" id="7_gyppg"] @@ -66,7 +66,7 @@ grow_horizontal = 2 grow_vertical = 2 size_flags_horizontal = 4 size_flags_vertical = 4 -texture = ExtResource("1_cbuy3") +texture = ExtResource("5_a6pb2") expand_mode = 1 stretch_mode = 5 diff --git a/app/scenes/menu_body/world.tscn b/app/scenes/menu_body/world.tscn index 9e8708a..c550d5c 100644 --- a/app/scenes/menu_body/world.tscn +++ b/app/scenes/menu_body/world.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=27 format=3 uid="uid://kywrsqro3d5i"] +[gd_scene load_steps=26 format=3 uid="uid://kywrsqro3d5i"] [ext_resource type="Script" path="res://scripts/loading/gate_loader.gd" id="1_uxhy6"] [ext_resource type="Resource" uid="uid://b1xvdym0qh6td" path="res://resources/gate_events.res" id="2_q7cvi"] @@ -12,7 +12,6 @@ [ext_resource type="Resource" uid="uid://crjhix0osmtnf" path="res://resources/ui_events.res" id="9_ir58h"] [ext_resource type="Script" path="res://scripts/ui/world/world_canvas.gd" id="9_ncfxj"] [ext_resource type="Shader" path="res://shaders/render_result.gdshader" id="10_2auwe"] -[ext_resource type="Texture2D" uid="uid://cykx425p6ylwr" path="res://assets/textures/background.png" id="10_23bjc"] [ext_resource type="Script" path="res://scripts/sandbox/command_sync.gd" id="10_cqo55"] [ext_resource type="Resource" uid="uid://cjcdum6fm4ta0" path="res://resources/api_settings.tres" id="10_vhc7k"] [ext_resource type="Script" path="res://scripts/sandbox/process_checker.gd" id="11_72cjp"] @@ -186,20 +185,19 @@ ui_events = ExtResource("9_ir58h") interpolate = 1.0 [node name="SplashScreen" type="TextureRect" parent="WorldCanvas"] +visible = false layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -texture = ExtResource("10_23bjc") expand_mode = 1 stretch_mode = 5 script = ExtResource("13_3b6nd") gate_events = ExtResource("2_q7cvi") command_events = ExtResource("6_18mgg") ui_events = ExtResource("9_ir58h") -splash_screen = ExtResource("10_23bjc") [node name="RenderResult" type="TextureRect" parent="WorldCanvas"] texture_filter = 2 diff --git a/app/scripts/ui/world/splash_screen.gd b/app/scripts/ui/world/splash_screen.gd index 1067639..957dd21 100644 --- a/app/scripts/ui/world/splash_screen.gd +++ b/app/scripts/ui/world/splash_screen.gd @@ -10,13 +10,13 @@ class_name SplashScreen @onready var height: int = int(size.y) -func _ready(): - gate_events.gate_info_loaded.connect(show_thumbnail) - gate_events.gate_entered.connect(show_splash_screen) - gate_events.first_frame.connect(func(): hide()) - - # Change size - show_splash_screen() +#func _ready(): + #gate_events.gate_info_loaded.connect(show_thumbnail) + #gate_events.gate_entered.connect(show_splash_screen) + #gate_events.first_frame.connect(func(): hide()) + # + ## Change size + #show_splash_screen() func show_thumbnail(gate: Gate, is_cached: bool) -> void: