From 53667e5ac9e698ac1e25c17fb28b57d5654e20a8 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Mon, 13 Oct 2025 14:04:31 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0.=20=D0=9E=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=80=D0=B5=D0=B6=D0=B8=D0=BC=D0=B0?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=BC=D0=B5=D1=85=D0=B8=20=D0=B2=20=D1=81=D0=B5?= =?UTF-8?q?=D0=BA=D1=82=D0=BE=D1=80=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/diagram/diagram.gd | 2 ++ scenes/работа/работа.gd | 2 ++ scenes/работа/работа.tscn | 2 +- shaders/antenas.tres | 10 +++++----- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/scenes/diagram/diagram.gd b/scenes/diagram/diagram.gd index accc1a84..d0a346d8 100644 --- a/scenes/diagram/diagram.gd +++ b/scenes/diagram/diagram.gd @@ -95,6 +95,8 @@ func set_view_mode(val: int): func set_def_colors(): var color0: Color = ProjectSettings.get_setting('application/interfer/default_color0', Color(0.38, 0.47, 0.51, 1.0)) var color1: Color = ProjectSettings.get_setting('application/interfer/default_color1', Color(0.39, 0.44, 0.50, 1.0)) + color0 *= Color(1.0, 1.0, 1.0, 0.0) + color1 *= Color(1.0, 1.0, 1.0, 0.0) var col_arr: Array = [color0, color1] var col = false for i in NUM_OF_RANGE: diff --git a/scenes/работа/работа.gd b/scenes/работа/работа.gd index fa4950da..1315666c 100644 --- a/scenes/работа/работа.gd +++ b/scenes/работа/работа.gd @@ -87,6 +87,8 @@ func on_enter_tree() -> void: call_deferred('on_button_strobe_pressed') func on_settings_changed(): color_ecm = ProjectSettings.get_setting('application/interfer/interfer_color', Color(0.58, 0.47, 0.51, 1.0)) color_select = ProjectSettings.get_setting('application/interfer/select_color', Color(1.0, 1.0, 1.0, 1.0)) + color_select *= Color(1.0, 1.0, 1.0, 0.0) + color_ecm *= Color(1.0, 1.0, 1.0, 0.0) ## Обработчик сигнала изменения списка целей. diff --git a/scenes/работа/работа.tscn b/scenes/работа/работа.tscn index cb6871f1..dca53d69 100644 --- a/scenes/работа/работа.tscn +++ b/scenes/работа/работа.tscn @@ -342,8 +342,8 @@ text = "−" [connection signal="drag_continue" from="." to="." method="_on_drag_continue"] [connection signal="toggled" from="btn_view" to="." method="on_button_view_toggled"] [connection signal="toggled" from="chk_auto" to="." method="on_value_changed"] -[connection signal="toggled" from="btn_activate" to="." method="on_btn_activate_toggled"] [connection signal="toggled" from="btn_activate" to="." method="on_btn_activate"] +[connection signal="toggled" from="btn_activate" to="." method="on_btn_activate_toggled"] [connection signal="toggled" from="btn_center" to="." method="on_btn_center_toggled"] [connection signal="button_down" from="zoom_plus" to="tilemap" method="_on_zoom_plus_button_down"] [connection signal="button_up" from="zoom_plus" to="tilemap" method="_on_zoom_button_up"] diff --git a/shaders/antenas.tres b/shaders/antenas.tres index 74c1d79c..2c689e09 100644 --- a/shaders/antenas.tres +++ b/shaders/antenas.tres @@ -78,11 +78,11 @@ void antenas(inout vec4 c, vec2 uv, vec2 p0, int cnt, float r0, float r1, inout } col.rgb = ant_band_c[j].rgb; index++; - col.a = alpha; - float v = float(i & 1); - vec4 color = v * col + (1.0f - v) * col; - sector(c, uv, p0, float(i) * da, da, r0, r1, color); - } + col.a = alpha + (random_timed(uv) - 0.5f) * ant_band_c[j].a; + float v = float(i & 1); + vec4 color = v * col + (1.0f - v) * col; + sector(c, uv, p0, float(i) * da, da, r0, r1, color); + } }