From a32d3edfffc5555e3ebcedb5665d8dfd52ce9aad Mon Sep 17 00:00:00 2001 From: unfa Date: Sun, 21 Nov 2021 23:31:51 +0100 Subject: [PATCH] Cleanup in the damage HUD overlay --- Game/Assets/HUD/HUD.gd | 4 +-- Game/Assets/HUD/HUD.tres | 26 -------------- Game/Assets/HUD/HUD.tscn | 74 +++++++++++++--------------------------- 3 files changed, 26 insertions(+), 78 deletions(-) diff --git a/Game/Assets/HUD/HUD.gd b/Game/Assets/HUD/HUD.gd index f012dad..2a5b967 100644 --- a/Game/Assets/HUD/HUD.gd +++ b/Game/Assets/HUD/HUD.gd @@ -4,9 +4,9 @@ extends Control var pain: float = 0: set(value): - $Damage/EyeBleed.material.set('shader_param/Damage', value) + $PostProcessing/Damage.material.set('shader_param/Damage', value) get: - return $Damage/EyeBleed.material.get('shader_param/Damage') + return $PostProcessing/Damage.material.get('shader_param/Damage') # Declare member variables here. Examples: # var a = 2 diff --git a/Game/Assets/HUD/HUD.tres b/Game/Assets/HUD/HUD.tres index 44a8c91..5a2d0f2 100644 --- a/Game/Assets/HUD/HUD.tres +++ b/Game/Assets/HUD/HUD.tres @@ -1,74 +1,48 @@ [gd_resource type="VisualShader" load_steps=15 format=3 uid="uid://bet2pthddt01v"] [sub_resource type="VisualShaderNodeFloatFunc" id="VisualShaderNodeFloatFunc_6ihsi"] -default_input_values = [0, 0.0] -expanded_output_ports = [] function = 31 [sub_resource type="VisualShaderNodeFloatOp" id="VisualShaderNodeFloatOp_4sg8c"] -default_input_values = [0, 0.0, 1, 0.0] -expanded_output_ports = [] operator = 7 [sub_resource type="VisualShaderNodeSmoothStep" id="VisualShaderNodeSmoothStep_cq3b8"] output_port_for_preview = 0 default_input_values = [0, -0.25, 1, 0.25, 2, 0.0] -expanded_output_ports = [] [sub_resource type="VisualShaderNodeFloatOp" id="VisualShaderNodeFloatOp_ibeng"] output_port_for_preview = 0 -default_input_values = [0, 0.0, 1, 0.0] -expanded_output_ports = [] operator = 2 [sub_resource type="VisualShaderNodeFloatUniform" id="VisualShaderNodeFloatUniform_64m16"] -default_input_values = [] -expanded_output_ports = [] uniform_name = "Depth" [sub_resource type="VisualShaderNodeSmoothStep" id="VisualShaderNodeSmoothStep_1syv6"] -default_input_values = [0, 0.0, 1, 0.0, 2, 0.0] -expanded_output_ports = [] [sub_resource type="VisualShaderNodeFloatUniform" id="VisualShaderNodeFloatUniform_gmj03"] -default_input_values = [] -expanded_output_ports = [] uniform_name = "Damage" [sub_resource type="VisualShaderNodeFloatFunc" id="VisualShaderNodeFloatFunc_g75xc"] -default_input_values = [0, 0.0] -expanded_output_ports = [] function = 31 [sub_resource type="VisualShaderNodeColorConstant" id="VisualShaderNodeColorConstant_awhie"] -default_input_values = [] -expanded_output_ports = [] constant = Color(1, 0.118141, 0, 1) [sub_resource type="VisualShaderNodeInput" id="VisualShaderNodeInput_hcnqy"] output_port_for_preview = 0 -default_input_values = [] -expanded_output_ports = [] input_name = "uv" [sub_resource type="VisualShaderNodeVectorDecompose" id="VisualShaderNodeVectorDecompose_c1wnt"] output_port_for_preview = 0 -default_input_values = [0, Vector3(0, 0, 0)] -expanded_output_ports = [] [sub_resource type="VisualShaderNodeSmoothStep" id="VisualShaderNodeSmoothStep_4gtfo"] output_port_for_preview = 0 default_input_values = [0, -0.25, 1, 0.25, 2, 0.0] -expanded_output_ports = [] [sub_resource type="VisualShaderNodeFloatFunc" id="VisualShaderNodeFloatFunc_bp0gw"] -default_input_values = [0, 0.0] -expanded_output_ports = [] function = 31 [sub_resource type="VisualShaderNodeFloatOp" id="VisualShaderNodeFloatOp_wvp6b"] -default_input_values = [0, 0.0, 1, 0.0] -expanded_output_ports = [] operator = 7 [resource] diff --git a/Game/Assets/HUD/HUD.tscn b/Game/Assets/HUD/HUD.tscn index f15bd53..811c568 100644 --- a/Game/Assets/HUD/HUD.tscn +++ b/Game/Assets/HUD/HUD.tscn @@ -21,8 +21,8 @@ [sub_resource type="ShaderMaterial" id="ShaderMaterial_dxk5q"] resource_local_to_scene = true shader = ExtResource( "2_djyym" ) -shader_param/Damage = 0.0 shader_param/Depth = 0.33 +shader_param/Damage = 0.0 [sub_resource type="Animation" id="1"] resource_name = "Default" @@ -32,11 +32,11 @@ length = 0.1 length = 0.2 step = 0.05 tracks/0/type = "audio" +tracks/0/imported = false +tracks/0/enabled = false tracks/0/path = NodePath("ConfirmSound") tracks/0/interp = 1 tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = false tracks/0/keys = { "clips": [{ "end_offset": 0.0, @@ -46,11 +46,11 @@ tracks/0/keys = { "times": PackedFloat32Array(0) } tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true tracks/1/path = NodePath("Hit:modulate") tracks/1/interp = 1 tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true tracks/1/keys = { "times": PackedFloat32Array(0, 0.2), "transitions": PackedFloat32Array(2, 1), @@ -62,11 +62,11 @@ tracks/1/keys = { length = 0.5 step = 0.05 tracks/0/type = "audio" +tracks/0/imported = false +tracks/0/enabled = false tracks/0/path = NodePath("ConfirmSound") tracks/0/interp = 1 tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = false tracks/0/keys = { "clips": [{ "end_offset": 0.0, @@ -76,11 +76,11 @@ tracks/0/keys = { "times": PackedFloat32Array(0) } tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true tracks/1/path = NodePath("Kill:modulate") tracks/1/interp = 1 tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true tracks/1/keys = { "times": PackedFloat32Array(0, 0.5), "transitions": PackedFloat32Array(2, 1), @@ -91,11 +91,11 @@ tracks/1/keys = { [sub_resource type="Animation" id="Animation_j1um2"] length = 0.001 tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true tracks/0/path = NodePath("Hit:modulate") tracks/0/interp = 1 tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true tracks/0/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), @@ -103,11 +103,11 @@ tracks/0/keys = { "values": [Color(1, 1, 1, 0)] } tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true tracks/1/path = NodePath("Kill:modulate") tracks/1/interp = 1 tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true tracks/1/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), @@ -125,19 +125,25 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Damage" type="Control" parent="."] +[node name="PostProcessing" type="Control" parent="."] anchor_right = 1.0 anchor_bottom = 1.0 -script = null __meta__ = { "_edit_use_anchors_": false } -[node name="EyeBleed" type="ColorRect" parent="Damage"] +[node name="LensFlare" type="ColorRect" parent="PostProcessing"] +visible = false +anchor_right = 1.0 +anchor_bottom = 1.0 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Damage" type="ColorRect" parent="PostProcessing"] material = SubResource( "ShaderMaterial_dxk5q" ) anchor_right = 1.0 anchor_bottom = 1.0 -script = null __meta__ = { "_edit_use_anchors_": false } @@ -165,7 +171,6 @@ offset_top = -16.0 offset_right = 16.0 offset_bottom = 16.0 texture = ExtResource( "3_r05jh" ) -script = null __meta__ = { "_edit_use_anchors_": false } @@ -184,7 +189,6 @@ offset_top = -16.0 offset_right = 16.0 offset_bottom = 16.0 texture = ExtResource( "4_guqkl" ) -script = null __meta__ = { "_edit_use_anchors_": false } @@ -203,7 +207,6 @@ offset_top = -16.0 offset_right = 16.0 offset_bottom = 16.0 texture = ExtResource( "5_4mbbg" ) -script = null __meta__ = { "_edit_use_anchors_": false } @@ -214,18 +217,14 @@ anims/Default = SubResource( "1" ) anims/Hit = SubResource( "2" ) anims/Kill = SubResource( "3" ) anims/RESET = SubResource( "Animation_j1um2" ) -blend_times = [] -script = null [node name="ConfirmSound" type="AudioStreamPlayer" parent="Crosshair"] stream = ExtResource( "4_llqcq" ) volume_db = 6.0 -script = null [node name="ConfirmSound2" type="AudioStreamPlayer" parent="Crosshair"] stream = ExtResource( "5_hh74r" ) volume_db = 6.0 -script = null [node name="Vignette" type="TextureRect" parent="."] modulate = Color(1, 1, 1, 0) @@ -234,7 +233,6 @@ anchor_bottom = 1.0 texture = ExtResource( "1" ) expand = true stretch_mode = 7 -script = null __meta__ = { "_edit_use_anchors_": false } @@ -253,7 +251,6 @@ __meta__ = { offset_right = 300.0 offset_bottom = 507.0 alignment = 2 -script = null __meta__ = { "_edit_use_anchors_": false } @@ -264,12 +261,10 @@ offset_right = 300.0 offset_bottom = 507.0 rect_min_size = Vector2(0, 470) theme = ExtResource( "7" ) +theme_override_font_sizes/normal_font_size = 16 bbcode_enabled = true scroll_active = false scroll_following = true -custom_effects = [] -structured_text_bidi_override_options = [] -script = null __meta__ = { "_edit_use_anchors_": false } @@ -279,7 +274,6 @@ visible = false offset_top = 474.0 offset_right = 309.0 offset_bottom = 507.0 -script = null __meta__ = { "_edit_use_anchors_": false } @@ -290,8 +284,6 @@ offset_right = 55.0 offset_bottom = 29.0 rect_min_size = Vector2(55, 0) text = "say: " -structured_text_bidi_override_options = [] -script = null __meta__ = { "_edit_use_anchors_": false } @@ -307,18 +299,15 @@ context_menu_enabled = false virtual_keyboard_enabled = false shortcut_keys_enabled = false selecting_enabled = false -structured_text_bidi_override_options = [] placeholder_text = "ENTER to send, ESC to cancel" placeholder_alpha = 0.5 caret_blink = true -script = null __meta__ = { "_edit_use_anchors_": false } [node name="Message" type="AudioStreamPlayer" parent="Chat"] stream = ExtResource( "9_ubwxw" ) -script = null [node name="RespawnCountdown" type="Label" parent="."] visible = false @@ -331,8 +320,6 @@ theme_override_font_sizes/font_size = 32 text = "RESPAWNING IN 5.0 seconds" align = 1 valign = 1 -structured_text_bidi_override_options = [] -script = null __meta__ = { "_edit_use_anchors_": false } @@ -347,8 +334,6 @@ offset_top = -27.0 offset_bottom = 27.0 align = 2 valign = 1 -structured_text_bidi_override_options = [] -script = null __meta__ = { "_edit_use_anchors_": false } @@ -365,7 +350,6 @@ offset_left = -309.5 offset_top = -157.5 offset_right = 309.5 offset_bottom = 157.5 -script = null __meta__ = { "_edit_use_anchors_": false } @@ -373,7 +357,6 @@ __meta__ = { [node name="VBoxContainer" type="VBoxContainer" parent="ScoreTable"] anchor_right = 1.0 anchor_bottom = 1.0 -script = null __meta__ = { "_edit_use_anchors_": false } @@ -385,8 +368,6 @@ size_flags_horizontal = 3 size_flags_vertical = 5 text = "LE SCORE TABLE" align = 1 -structured_text_bidi_override_options = [] -script = null __meta__ = { "_edit_use_anchors_": false } @@ -398,9 +379,6 @@ offset_bottom = 315.0 size_flags_horizontal = 3 size_flags_vertical = 3 text = "scoretab" -custom_effects = [] -structured_text_bidi_override_options = [] -script = null __meta__ = { "_edit_use_anchors_": false } @@ -416,7 +394,6 @@ offset_right = -32.0 offset_bottom = -32.0 grow_horizontal = 0 grow_vertical = 0 -script = null __meta__ = { "_edit_use_anchors_": false } @@ -439,7 +416,6 @@ stretch_margin_left = 16 stretch_margin_top = 16 stretch_margin_right = 16 stretch_margin_bottom = 16 -script = null [node name="JetpackBar" type="TextureProgressBar" parent="Stats"] offset_top = 36.0 @@ -458,7 +434,6 @@ stretch_margin_left = 16 stretch_margin_top = 16 stretch_margin_right = 16 stretch_margin_bottom = 16 -script = null [node name="Performance" type="Label" parent="."] material = ExtResource( "4_f6eam" ) @@ -471,7 +446,6 @@ offset_bottom = -2.0 text = "FPS: PING:" valign = 2 -structured_text_bidi_override_options = [] script = ExtResource( "17_getmp" ) __meta__ = { "_edit_use_anchors_": false