From 58e43884f0724f38d191dbb248a029f351315339 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Mon, 17 Nov 2025 14:44:23 +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=A3=D0=B3=D0=BE=D0=BB=20=D0=BD=D0=B0=D0=BA?= =?UTF-8?q?=D0=BB=D0=BE=D0=BD=D0=B0=20=D1=88=D1=82=D1=80=D0=B8=D1=85=D0=BE?= =?UTF-8?q?=D0=B2=D0=BA=D0=B8=20=D0=B4=D0=BB=D1=8F=20=D0=B8=D0=BD=D0=B4?= =?UTF-8?q?=D0=B8=D0=BA=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BD=D0=B5=D0=B8=D1=81?= =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BD=D1=8B=D1=85=20=D0=BC=D0=BE=D0=B4?= =?UTF-8?q?=D1=83=D0=BB=D0=B5=D0=B9=20=D0=A4=D0=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/контроль/контроль.tscn | 18 +----------------- shaders/antenas.tres | 14 +++++++++----- 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/scenes/контроль/контроль.tscn b/scenes/контроль/контроль.tscn index d1a0774..7323ba3 100644 --- a/scenes/контроль/контроль.tscn +++ b/scenes/контроль/контроль.tscn @@ -373,7 +373,6 @@ stretch_mode = 4 flip_h = true script = ExtResource("3_4pt7j") state_colors = [Color(1, 1, 1, 1), Color(0, 0.87, 0, 1), Color(0.65, 0.0715, 0.0715, 1)] -show_functional = null metadata/online_proc = "on_line_changed" metadata/unit_name = ["уарэп-яу07-1н"] @@ -436,7 +435,6 @@ stretch_mode = 0 script = ExtResource("3_4pt7j") state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)] state = 1 -show_functional = null metadata/unit_name = ["уарэп-эмс"] metadata/online_proc = "on_line_changed" @@ -476,6 +474,7 @@ script = ExtResource("11_u7tym") [node name="pic_functional" type="TextureRect" parent="pribor_uf"] visible = false +layout_mode = 0 offset_left = -962.0 offset_top = 73.0 offset_right = 96.9999 @@ -499,7 +498,6 @@ texture_normal = ExtResource("3_hhadv") stretch_mode = 0 script = ExtResource("3_4pt7j") state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)] -show_functional = null metadata/unit_name = [&"уарэп-бпо-1", &"уарэп-бпо-2"] metadata/online_proc = "online_change_arr" @@ -563,7 +561,6 @@ texture_normal = ExtResource("9_iqgf5") stretch_mode = 0 script = ExtResource("3_4pt7j") state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)] -show_functional = null metadata/unit_name = [&"уарэп-афсп-левый"] metadata/online_proc = "on_line_changed" @@ -631,7 +628,6 @@ stretch_mode = 0 flip_h = true script = ExtResource("3_4pt7j") state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)] -show_functional = null metadata/unit_name = [&"уарэп-афсп-правый"] metadata/online_proc = "on_line_changed" @@ -696,7 +692,6 @@ texture_normal = ExtResource("5_kvnex") stretch_mode = 0 script = ExtResource("3_4pt7j") state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)] -show_functional = null metadata/unit_name = ["уарэп-щ3", "уарэп-спт25-1", "уарэп-спт25-2"] metadata/online_proc = "online_change_arr" @@ -749,7 +744,6 @@ stretch_mode = 4 flip_h = true script = ExtResource("3_4pt7j") state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)] -show_functional = null metadata/unit_name = ["уарэп-яу07-2в"] metadata/online_proc = "on_line_changed" @@ -802,7 +796,6 @@ stretch_mode = 4 flip_h = true script = ExtResource("3_4pt7j") state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)] -show_functional = null metadata/unit_name = ["уарэп-яу07-2н"] metadata/online_proc = "on_line_changed" @@ -857,7 +850,6 @@ stretch_mode = 4 flip_h = true script = ExtResource("3_4pt7j") state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)] -show_functional = null metadata/unit_name = ["уарэп-яу07-2к"] metadata/online_proc = "on_line_changed" @@ -910,7 +902,6 @@ stretch_mode = 4 flip_h = true script = ExtResource("3_4pt7j") state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)] -show_functional = null metadata/unit_name = ["уарэп-яу07-3в"] metadata/online_proc = "on_line_changed" @@ -963,7 +954,6 @@ stretch_mode = 4 flip_h = true script = ExtResource("3_4pt7j") state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)] -show_functional = null metadata/unit_name = ["уарэп-яу07-3н"] metadata/online_proc = "on_line_changed" @@ -1016,7 +1006,6 @@ stretch_mode = 4 flip_h = true script = ExtResource("3_4pt7j") state_colors = [Color(1, 1, 1, 1), Color(0, 1, 0, 1), Color(1, 0, 0, 1)] -show_functional = null metadata/unit_name = ["уарэп-яу07-3к"] metadata/online_proc = "on_line_changed" @@ -1069,7 +1058,6 @@ stretch_mode = 4 flip_h = true script = ExtResource("3_4pt7j") state_colors = [Color(1, 1, 1, 1), Color(0, 0.87, 0, 1), Color(0.65, 0.0715, 0.0715, 1)] -show_functional = null metadata/unit_name = ["уарэп-яу07-1в"] metadata/online_proc = "on_line_changed" @@ -1122,7 +1110,6 @@ stretch_mode = 4 flip_h = true script = ExtResource("3_4pt7j") state_colors = [Color(1, 1, 1, 1), Color(0, 0.87, 0, 1), Color(0.65, 0.0715, 0.0715, 1)] -show_functional = null metadata/unit_name = ["уарэп-яу07-1к"] metadata/online_proc = "on_line_changed" @@ -1174,7 +1161,6 @@ texture_normal = ExtResource("6_i1yfn") stretch_mode = 4 script = ExtResource("3_4pt7j") state_colors = [Color(1, 1, 1, 1), Color(0, 0.87, 0, 1), Color(0.65, 0.0715, 0.0715, 1)] -show_functional = null metadata/unit_name = ["уарэп-яу07-4в"] metadata/online_proc = "on_line_changed" @@ -1226,7 +1212,6 @@ texture_normal = ExtResource("6_i1yfn") stretch_mode = 4 script = ExtResource("3_4pt7j") state_colors = [Color(1, 1, 1, 1), Color(0, 0.87, 0, 1), Color(0.65, 0.0715, 0.0715, 1)] -show_functional = null metadata/unit_name = ["уарэп-яу07-4н"] metadata/online_proc = "on_line_changed" @@ -1278,7 +1263,6 @@ texture_normal = ExtResource("6_i1yfn") stretch_mode = 4 script = ExtResource("3_4pt7j") state_colors = [Color(1, 1, 1, 1), Color(0, 0.87, 0, 1), Color(0.65, 0.0715, 0.0715, 1)] -show_functional = null metadata/unit_name = ["уарэп-яу07-4к"] metadata/online_proc = "on_line_changed" diff --git a/shaders/antenas.tres b/shaders/antenas.tres index 8488bdc..a1cbc38 100644 --- a/shaders/antenas.tres +++ b/shaders/antenas.tres @@ -17,11 +17,12 @@ uniform vec4 color0: source_color = vec4(0.38, 0.47, 0.51, 0.4); uniform vec4 color1: source_color = vec4(0.39, 0.44, 0.50, 0.4); uniform float radius_inner_0 = RADIUS_INNER_0; uniform float radius_inner_1 = RADIUS_INNER_1; -uniform float radius_outter = 550.0; /* Радиус внешний. Должно быть равно ant_band_r1_6 */ +uniform float radius_outter = 550.0; /* Радиус внешний. Должно быть равно ant_band_r1_6 */ uniform float alpha: hint_range(0.0, 1.0) = 0.5; -uniform int mode = 0; /* Режим отображения. Приоритет РТО - 0, приоритет РЛС - 1 */ -uniform float ffr: hint_range(0.0, 1.0) = 0.2; -uniform float sfr: hint_range(0.0, 10.0) = 0.0; +uniform int mode = 0; /* Режим отображения. Приоритет РТО - 0, приоритет РЛС - 1 */ +uniform float ffr: hint_range(0.0, 1.0) = 0.2; /* Индикация неисправности модулей ФС. Заметность штриховки. Индикация неисправности модулей ФС */ +uniform float sfr: hint_range(0.0, 10.0) = 0.0; /* Индикация неисправности модулей ФС. Скорость движения штрховки */ +uniform float afr: hint_range(0.0, 180.0) = 0.0; /* Индикация неисправности модулей ФС. Наклон штрховки */ const int ant_band_count_0 = 2; const int ant_band_count_1 = 2; @@ -87,7 +88,9 @@ void antenas(inout vec4 c, vec2 uv, vec2 p0, int cnt, float r0, float r1, inout col.a = alpha + (random_timed(uv) - 0.5f) * ant_band_c[j].a; if (ant_band_m[j] == ANT_BAND_FAILED) { - col.a *= (1.0 - ffr) + tanh(10.0 * sin(TIME * sfr + 2.0 * PI * uv.x / 10.0)) * ffr; + vec2 uvr = uv; + rotate_vec2(uvr, radians(afr), pc0); + col.a *= (1.0 - ffr) + tanh(10.0 * sin(TIME * sfr + 2.0 * PI * uvr.x / 10.0)) * ffr; } float v = float(i & 1); vec4 color = v * col + (1.0f - v) * col; @@ -132,5 +135,6 @@ shader_parameter/alpha = 0.5 shader_parameter/mode = 0 shader_parameter/ffr = 0.2 shader_parameter/sfr = 0.0 +shader_parameter/afr = 0.0 shader_parameter/ant_band_c = PackedVector4Array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) shader_parameter/ant_band_m = PackedInt32Array(0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)