From 06e39396880d6d4712f97e54def756f6958baa24 Mon Sep 17 00:00:00 2001 From: unfa Date: Sun, 28 Nov 2021 18:37:49 +0100 Subject: [PATCH] Disabled readability screen texture to workaround a rendereer bug --- Game/Assets/HUD/Croshair.material | Bin 216 -> 0 bytes Game/Assets/HUD/HUD.tscn | 12 ++++---- Game/Assets/HUD/Readability.material | Bin 0 -> 215 bytes .../HUD/{Croshair.tres => Readability.tres} | 27 +++++------------- Game/Assets/UI/MenuButton.tscn | 6 ++-- 5 files changed, 15 insertions(+), 30 deletions(-) delete mode 100644 Game/Assets/HUD/Croshair.material create mode 100644 Game/Assets/HUD/Readability.material rename Game/Assets/HUD/{Croshair.tres => Readability.tres} (77%) diff --git a/Game/Assets/HUD/Croshair.material b/Game/Assets/HUD/Croshair.material deleted file mode 100644 index 5dbedca203453947b7c0cb99788a565d30290ddd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 216 zcmV;}04M)aQ$s@n000005C8yA0RRBN0000ewJ-f(PXM(A0HR1BD}cpm47-}3XPLnj zW-37hR6tt<;gXMciG4x8`UX{NiYc^FKmmZEdO{=xku*ua^E|;xU<=F!fS_RDpz@|h zhFY##s8NGZB5h;tI$CQee&=|x^zCmrF_%GSmTxH-smnchQTa3jH}yx1Jv5U50R!lN zzMQ2QokY{(s_8#m_!IyaYw|P!_G=ba0x%G62qx7DcEz4nj3P5Z<~`Q{gt<^Z>>9QJ SfcbGBE6W0m2Y>}qQ$s`5+*EM@ diff --git a/Game/Assets/HUD/HUD.tscn b/Game/Assets/HUD/HUD.tscn index c687df5..fbee159 100644 --- a/Game/Assets/HUD/HUD.tscn +++ b/Game/Assets/HUD/HUD.tscn @@ -1,10 +1,10 @@ -[gd_scene load_steps=24 format=3 uid="uid://bff5uslrxesjx"] +[gd_scene load_steps=24 format=3 uid="uid://bs80rhfpgh2m2"] [ext_resource type="Texture2D" uid="uid://blnjjtjifk22i" path="res://Assets/HUD/Vignette.png" id="1"] [ext_resource type="Script" path="res://Assets/HUD/HUD.gd" id="1_wc430"] [ext_resource type="Shader" uid="uid://bet2pthddt01v" path="res://Assets/HUD/HUD.tres" id="2_djyym"] [ext_resource type="Texture2D" uid="uid://dim1jrwuiy4qt" path="res://Assets/HUD/Crosshair Baseline.png" id="3_r05jh"] -[ext_resource type="Material" uid="uid://dkf0bpi007o2q" path="res://Assets/HUD/Croshair.material" id="4_f6eam"] +[ext_resource type="Material" uid="uid://dkf0bpi007o2q" path="res://Assets/HUD/Readability.material" id="4_75f0r"] [ext_resource type="Texture2D" uid="uid://d0p7vfc62t5sb" path="res://Assets/HUD/Crosshair Hit.png" id="4_guqkl"] [ext_resource type="AudioStream" uid="uid://dfcyohpsqvri1" path="res://Assets/SFX/HUD_Confirm_Hit.wav" id="4_llqcq"] [ext_resource type="Script" path="res://Assets/HUD/Crosshair.gd" id="5"] @@ -161,7 +161,7 @@ __meta__ = { [node name="Baseline" type="TextureRect" parent="Crosshair"] texture_filter = 1 texture_repeat = 1 -material = ExtResource( "4_f6eam" ) +material = ExtResource( "4_75f0r" ) anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -179,7 +179,7 @@ __meta__ = { modulate = Color(1, 1, 1, 0) texture_filter = 1 texture_repeat = 1 -material = ExtResource( "4_f6eam" ) +material = ExtResource( "4_75f0r" ) anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -197,7 +197,7 @@ __meta__ = { modulate = Color(1, 1, 1, 0) texture_filter = 1 texture_repeat = 1 -material = ExtResource( "4_f6eam" ) +material = ExtResource( "4_75f0r" ) anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -438,7 +438,7 @@ stretch_margin_right = 16 stretch_margin_bottom = 16 [node name="Performance" type="Label" parent="."] -material = ExtResource( "4_f6eam" ) +material = ExtResource( "4_75f0r" ) anchor_top = 1.0 anchor_bottom = 1.0 offset_left = 4.0 diff --git a/Game/Assets/HUD/Readability.material b/Game/Assets/HUD/Readability.material new file mode 100644 index 0000000000000000000000000000000000000000..c5e67188ae5ca29a9d32ea352e03eb86c188abc2 GIT binary patch literal 215 zcmV;|04V=bQ$s@n000005C8yG0RRBM0000ewJ-f(RRFC8020X{DR5QO7-UdYFjU1{ z747?(A@1$JTdI{v+G`)x<CbL(@=wO(ZU2@5_G03B;mH39Z(B31%0&~6CEs<76ITV%${yyqH#Fc<2FUBeat RFhA~NWm$mn0I*V1Lqn{>UC00c literal 0 HcmV?d00001 diff --git a/Game/Assets/HUD/Croshair.tres b/Game/Assets/HUD/Readability.tres similarity index 77% rename from Game/Assets/HUD/Croshair.tres rename to Game/Assets/HUD/Readability.tres index 7fc1f29..4abf35f 100644 --- a/Game/Assets/HUD/Croshair.tres +++ b/Game/Assets/HUD/Readability.tres @@ -24,24 +24,11 @@ render_mode unshaded; void fragment() { -// Input:2 - vec3 n_out2p0 = vec3(SCREEN_UV, 0.0); - - - vec3 n_out8p0; - float n_out8p1; -// Texture2D:8 - { - vec4 _tex_read = textureLod(SCREEN_TEXTURE, n_out2p0.xy, 0.0); - n_out8p0 = _tex_read.rgb; - n_out8p1 = _tex_read.a; - } - - vec3 n_out10p0; // ColorFunc:10 + vec3 n_in10p0 = vec3(0.00000, 0.00000, 0.00000); { - vec3 c = n_out8p0; + vec3 c = n_in10p0; float max1 = max(c.r, c.g); float max2 = max(max1, c.b); float max3 = max(max1, max2); @@ -74,7 +61,7 @@ void fragment() { } " -graph_offset = Vector2(-149.173, 27.2767) +graph_offset = Vector2(-532.609, 168.261) engine_version = { "major": 4, "minor": 0 @@ -84,13 +71,13 @@ flags/light_only = false flags/unshaded = true nodes/fragment/0/position = Vector2(660, 360) nodes/fragment/2/node = SubResource( "VisualShaderNodeInput_0xt2k" ) -nodes/fragment/2/position = Vector2(-320, 360) +nodes/fragment/2/position = Vector2(-480, 360) nodes/fragment/8/node = SubResource( "VisualShaderNodeTexture_33whc" ) -nodes/fragment/8/position = Vector2(-100, 360) +nodes/fragment/8/position = Vector2(-260, 340) nodes/fragment/10/node = SubResource( "VisualShaderNodeColorFunc_15wpt" ) -nodes/fragment/10/position = Vector2(80, 360) +nodes/fragment/10/position = Vector2(0, 360) nodes/fragment/12/node = SubResource( "VisualShaderNodeSwitch_w5e8y" ) nodes/fragment/12/position = Vector2(460, 360) nodes/fragment/13/node = SubResource( "VisualShaderNodeCompare_8o1qy" ) nodes/fragment/13/position = Vector2(280, 360) -nodes/fragment/connections = PackedInt32Array(2, 0, 8, 0, 8, 0, 10, 0, 10, 0, 13, 0, 13, 0, 12, 0, 12, 0, 0, 0) +nodes/fragment/connections = PackedInt32Array(10, 0, 13, 0, 13, 0, 12, 0, 12, 0, 0, 0) diff --git a/Game/Assets/UI/MenuButton.tscn b/Game/Assets/UI/MenuButton.tscn index d3c05a3..17c5f23 100644 --- a/Game/Assets/UI/MenuButton.tscn +++ b/Game/Assets/UI/MenuButton.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=4 format=3 uid="uid://d135tevauvmoq"] [ext_resource type="Script" path="res://Assets/UI/MenuButton.gd" id="1"] -[ext_resource type="AudioStream" uid="uid://tmb3cqyy8s33" path="res://Assets/SFX/UI_Click.wav" id="2_nyr44"] -[ext_resource type="AudioStream" uid="uid://dvfvty8gqab0a" path="res://Assets/SFX/UI_Hover.wav" id="3_g8hw6"] +[ext_resource type="AudioStream" uid="uid://da7hq3d1msmud" path="res://Assets/SFX/UI_Click.wav" id="2_nyr44"] +[ext_resource type="AudioStream" uid="uid://dc4rractm5dhf" path="res://Assets/SFX/UI_Hover.wav" id="3_g8hw6"] [node name="MenuButton" type="Button"] anchor_right = 1.0 @@ -14,11 +14,9 @@ __meta__ = { [node name="ClickSound" type="AudioStreamPlayer" parent="."] stream = ExtResource( "2_nyr44" ) -script = null [node name="HoverSound" type="AudioStreamPlayer" parent="."] stream = ExtResource( "3_g8hw6" ) -script = null [connection signal="mouse_entered" from="." to="." method="_on_MenuButton_mouse_entered"] [connection signal="pressed" from="." to="." method="_on_MenuButton_pressed"]