Add unified inventory and animated menu backdrop
This commit is contained in:
parent
4985cc3374
commit
28ce6fedcb
16 changed files with 865 additions and 123 deletions
48
main/main.gd
48
main/main.gd
|
|
@ -72,6 +72,8 @@ const NetworkProfileServiceType = preload(
|
|||
)
|
||||
|
||||
const TITLE_MUSIC_SILENCE_DB: float = -80.0
|
||||
const PLAYER_MENU_PATTERN_SCALE: float = 0.85
|
||||
const PLAYER_MENU_PATTERN_SCROLL_VELOCITY := Vector2(-7.0, -5.0)
|
||||
|
||||
@export var fish_catalog: FishPoolType
|
||||
@export var pelican_buyer_profile: FishBuyerProfileType
|
||||
|
|
@ -143,6 +145,7 @@ var _title_music_requested: bool = false
|
|||
var _quit_in_progress: bool = false
|
||||
var _join_requested_from_title: bool = false
|
||||
var _join_requested_from_pause: bool = false
|
||||
var _player_menu_backdrop_tween: Tween
|
||||
var _pending_join_endpoint: String = ""
|
||||
var _server_trust_dialog: ConfirmationDialog
|
||||
var _pending_trust_changed: bool = false
|
||||
|
|
@ -158,6 +161,18 @@ var _local_recovery_attempt_id: String = ""
|
|||
|
||||
func _ready() -> void:
|
||||
DisplayServer.window_set_title("NETfishing")
|
||||
var menu_pattern_material := (
|
||||
_player_menu_backdrop.material as ShaderMaterial
|
||||
)
|
||||
if menu_pattern_material != null:
|
||||
menu_pattern_material.set_shader_parameter(
|
||||
"display_scale",
|
||||
PLAYER_MENU_PATTERN_SCALE,
|
||||
)
|
||||
menu_pattern_material.set_shader_parameter(
|
||||
"scroll_velocity_pixels",
|
||||
PLAYER_MENU_PATTERN_SCROLL_VELOCITY,
|
||||
)
|
||||
get_window().size_changed.connect(_resize_native_overlays)
|
||||
_resize_native_overlays()
|
||||
if not _settings_manager.settings_changed.is_connected(
|
||||
|
|
@ -906,7 +921,38 @@ func _set_gameplay_active(active: bool) -> void:
|
|||
|
||||
|
||||
func _set_player_menu_backdrop_visible(is_visible: bool) -> void:
|
||||
_player_menu_backdrop.visible = is_visible and _gameplay_started
|
||||
if _player_menu_backdrop_tween != null:
|
||||
_player_menu_backdrop_tween.kill()
|
||||
_player_menu_backdrop_tween = null
|
||||
var should_show: bool = is_visible and _gameplay_started
|
||||
if should_show:
|
||||
var was_visible: bool = _player_menu_backdrop.visible
|
||||
_player_menu_backdrop.visible = true
|
||||
if not was_visible:
|
||||
_player_menu_backdrop.modulate.a = 0.0
|
||||
_player_menu_backdrop_tween = create_tween()
|
||||
_player_menu_backdrop_tween.tween_property(
|
||||
_player_menu_backdrop,
|
||||
"modulate:a",
|
||||
1.0,
|
||||
UIMotion.UTILITY_ENTER_DURATION,
|
||||
).set_trans(Tween.TRANS_QUAD).set_ease(Tween.EASE_OUT)
|
||||
return
|
||||
if not _player_menu_backdrop.visible:
|
||||
return
|
||||
_player_menu_backdrop_tween = create_tween()
|
||||
_player_menu_backdrop_tween.tween_property(
|
||||
_player_menu_backdrop,
|
||||
"modulate:a",
|
||||
0.0,
|
||||
UIMotion.UTILITY_EXIT_DURATION,
|
||||
).set_trans(Tween.TRANS_QUAD).set_ease(Tween.EASE_IN)
|
||||
_player_menu_backdrop_tween.finished.connect(
|
||||
func() -> void:
|
||||
_player_menu_backdrop.visible = false
|
||||
_player_menu_backdrop.modulate.a = 1.0
|
||||
_player_menu_backdrop_tween = null
|
||||
)
|
||||
|
||||
|
||||
func _resize_native_overlays() -> void:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
[gd_scene load_steps=42 format=3]
|
||||
[gd_scene load_steps=45 format=3]
|
||||
|
||||
[ext_resource type="PackedScene" path="res://world/test_world.tscn" id="1_world"]
|
||||
[ext_resource type="PackedScene" path="res://player/player.tscn" id="2_player"]
|
||||
|
|
@ -40,10 +40,19 @@
|
|||
[ext_resource type="Script" path="res://network/identity_backup_service.gd" id="38_identity_backup"]
|
||||
[ext_resource type="Script" path="res://ui/interface_font_controller.gd" id="39_fonts"]
|
||||
[ext_resource type="Shader" path="res://ui/title_water_background.gdshader" id="40_title_water"]
|
||||
[ext_resource type="Texture2D" path="res://art/patterns/pattern_bluedot.png" id="41_menu_pattern"]
|
||||
[ext_resource type="Shader" path="res://ui/player_menu_pattern.gdshader" id="42_menu_pattern"]
|
||||
|
||||
[sub_resource type="ShaderMaterial" id="ShaderMaterial_title_water_native"]
|
||||
shader = ExtResource("40_title_water")
|
||||
|
||||
[sub_resource type="ShaderMaterial" id="ShaderMaterial_player_menu_pattern"]
|
||||
shader = ExtResource("42_menu_pattern")
|
||||
shader_parameter/pattern_texture = ExtResource("41_menu_pattern")
|
||||
shader_parameter/source_tile_size = Vector2(128, 128)
|
||||
shader_parameter/display_scale = 0.85
|
||||
shader_parameter/scroll_velocity_pixels = Vector2(-7, -5)
|
||||
|
||||
[node name="Main" type="Node3D"]
|
||||
script = ExtResource("3_main")
|
||||
fish_catalog = ExtResource("6_pool")
|
||||
|
|
@ -70,7 +79,8 @@ unique_name_in_owner = true
|
|||
visible = false
|
||||
z_index = 10
|
||||
mouse_filter = 2
|
||||
color = Color(0.015, 0.02, 0.03, 0.72)
|
||||
material = SubResource("ShaderMaterial_player_menu_pattern")
|
||||
color = Color(1, 1, 1, 1)
|
||||
|
||||
[node name="InterfaceFontController" type="Node" parent="."]
|
||||
unique_name_in_owner = true
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue