From e2e41be299238c585543030a84337da027bedfca Mon Sep 17 00:00:00 2001 From: William Edwards Date: Tue, 17 Dec 2024 00:21:53 -0800 Subject: [PATCH] fix(Power Menu): add blur + tint --- core/ui/card_ui/power/power_menu.gd | 4 ---- core/ui/card_ui/power/power_menu.tscn | 24 ++++++++++++++++++++++-- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/core/ui/card_ui/power/power_menu.gd b/core/ui/card_ui/power/power_menu.gd index 1760316a..7d51a640 100644 --- a/core/ui/card_ui/power/power_menu.gd +++ b/core/ui/card_ui/power/power_menu.gd @@ -23,10 +23,6 @@ func _ready() -> void: exit_button.button_down.connect(_on_exit) cancel_button.button_up.connect(_on_cancel) - var on_visible_changed := func(): - set_process(visible) - visibility_changed.connect(set_process) - func _on_state_entered(_from: State) -> void: if focus_group: diff --git a/core/ui/card_ui/power/power_menu.tscn b/core/ui/card_ui/power/power_menu.tscn index 332de40f..a27c2e1b 100644 --- a/core/ui/card_ui/power/power_menu.tscn +++ b/core/ui/card_ui/power/power_menu.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=13 format=3 uid="uid://lfm3ps837gy5"] +[gd_scene load_steps=15 format=3 uid="uid://lfm3ps837gy5"] [ext_resource type="Script" path="res://core/ui/card_ui/power/power_menu.gd" id="2_0vc46"] +[ext_resource type="Shader" path="res://assets/shaders/simple_blur.gdshader" id="2_hkifr"] [ext_resource type="PackedScene" uid="uid://c6fg6uvng0ovi" path="res://core/systems/input/input_watcher.tscn" id="3_1whtm"] [ext_resource type="PackedScene" uid="uid://b76dvfuouhlwd" path="res://core/systems/state/state_updater.tscn" id="4_4rhfl"] [ext_resource type="Resource" uid="uid://cadriyl38ny5y" path="res://assets/state/state_machines/popup_state_machine.tres" id="5_kxixy"] @@ -12,6 +13,12 @@ [ext_resource type="PackedScene" uid="uid://dithv38oqgy58" path="res://core/ui/components/section_label.tscn" id="10_y3iyf"] [ext_resource type="PackedScene" uid="uid://c71ayw7pcw6u6" path="res://core/ui/components/card_button.tscn" id="12_2pwjc"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_v0ws8"] +shader = ExtResource("2_hkifr") +shader_parameter/blur_amount = 1.578 +shader_parameter/mix_amount = null +shader_parameter/color_over = Color(0, 0, 0, 0) + [sub_resource type="Resource" id="Resource_fafkw"] script = ExtResource("10_6ywv6") @@ -25,14 +32,27 @@ grow_horizontal = 2 grow_vertical = 2 script = ExtResource("2_0vc46") +[node name="BackBufferCopy" type="BackBufferCopy" parent="."] +copy_mode = 2 + [node name="ColorRect" type="ColorRect" parent="."] +material = SubResource("ShaderMaterial_v0ws8") +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +color = Color(0, 0, 0, 1) + +[node name="ColorRect2" type="ColorRect" parent="."] layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -color = Color(0, 0, 0, 0.686275) +color = Color(0, 0, 0, 0.666667) [node name="InputWatcher" parent="." instance=ExtResource("3_1whtm")] stop_propagation = true