From ccd70c01a88723db5012a1454902cd7c958c76e9 Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Fri, 11 Apr 2025 14:03:20 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/контроль/контроль.gd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scenes/контроль/контроль.gd b/scenes/контроль/контроль.gd index e712cf5..7c2449a 100644 --- a/scenes/контроль/контроль.gd +++ b/scenes/контроль/контроль.gd @@ -48,7 +48,7 @@ func _ready(): func on_line_changed(u, conn_node, _pribor_meta): conn_node.set_val(u.online) -func online_change_arr(u, conn_node, pribor_meta): +func online_change_arr(_u, conn_node, pribor_meta): var state_online = true for i in pribor_meta.size(): var unit_key = settings.get_unit_key(pribor_meta[i]) From 7fe42be4ca8acba6ea1d11af8a6a442447af6c4a Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Fri, 11 Apr 2025 14:08:20 +0300 Subject: [PATCH 2/2] =?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=D0=B3=D1=80=D0=B0=D0=BD=D0=B8=D1=87?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=88=D0=B8=D1=80=D0=B8=D0=BD=D1=8B?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=BB=D0=BE=D1=81=D1=8B=20=D0=B2=20120=D0=9C?= =?UTF-8?q?=D0=B3=D1=86=20=D0=B4=D0=BB=D1=8F=20=D1=81=D0=B5=D0=BA=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BE=D0=B2.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/interfer.gd | 5 ++++- shaders/bip.gdshader | 5 ++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/interfer.gd b/scripts/interfer.gd index e25965d..83f2360 100644 --- a/scripts/interfer.gd +++ b/scripts/interfer.gd @@ -5,7 +5,6 @@ class_name Iterfer extends Node ## Режимы помехи. const ITERFER_MODE = { 'off': ['Откл', ['freq', 'width'], 0], - 'auto': ['АВТО', ['freq', 'width'], 1000], 'srni1': ['СРН-И1', ['freq', 'width'], 1], 'srnm2': ['СРН-М2', ['freq', 'width'], 2], 'srngps': ['СРН-GPS', ['freq', 'width'], 3], @@ -210,6 +209,10 @@ func on_interfer_create(interfer_name, sel_threats, fs_arr, _unit, ecms): var id = item[3] param['freq'] = item[1] param['width'] = item[2] + if (param['width'] < WIDTH_MIN): + param['width'] = WIDTH_MIN + elif (param['width'] > WIDTH_MAX): + param['width'] = WIDTH_MAX interfer_create(interfer_name, ecms, param, kni, id, fs, SOURCE_INTERFER[1]) diff --git a/shaders/bip.gdshader b/shaders/bip.gdshader index 3895d74..a58c0fa 100644 --- a/shaders/bip.gdshader +++ b/shaders/bip.gdshader @@ -6,7 +6,6 @@ global uniform int tick_curent; /* Закрашенная окружность */ instance uniform int tick_update = 1000; /* Время последнего обновления, мс */ -instance uniform vec4 color: source_color = vec4(1.0, 1.0, 1.0, 1.0); uniform int tick_delta = 200; /* Время вспышки при обновлении, мc */ uniform float radius = 0.060; /* Радиус */ const float ds = 0.010; /* Относительное расстояние на котором выполняется сглаживание краёв */ @@ -15,7 +14,7 @@ const vec2 center = vec2(0.125, 0.125); /* Центр должен быть в void fragment() { - COLOR = color; - COLOR.a *= 1.5 - smoothstep(float(tick_update), float(tick_update + tick_delta), float(tick_curent)); + COLOR = vec4(1, 1, 1, 1); + COLOR.a = 1.5 - smoothstep(float(tick_update), float(tick_update + tick_delta), float(tick_curent)); COLOR.a *= smooth_px(length(UV - center), radius + (COLOR.a - 0.5) / 20.0, ds); }