From 55bea416d94ab22d252a375e10cd75a9e3ebd75c Mon Sep 17 00:00:00 2001 From: Maxim Date: Wed, 12 Feb 2025 12:12:33 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=BD=D0=B0=D0=BF=D0=B8?= =?UTF-8?q?=D1=81=D0=B0=D0=BD=D0=B8=D0=B8=20=D0=A2=D0=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Shaders/load.gdshader | 14 +++++++------- Shaders/ray.gdshader | 12 ++++++------ Shaders/shader_edu.tres | 1 + scripts/PRD.gd | 2 ++ scripts/constants.gd | 2 ++ scripts/control_panel.gd | 4 ++-- scripts/ems_g.gd | 7 +++++-- table/switch.gdshader | 1 - 8 files changed, 25 insertions(+), 18 deletions(-) diff --git a/Shaders/load.gdshader b/Shaders/load.gdshader index 8674110..298a477 100644 --- a/Shaders/load.gdshader +++ b/Shaders/load.gdshader @@ -25,24 +25,24 @@ vec2 rotate_uv(vec2 uv, vec2 pivot, float rotation) { void fragment() { vec2 uv = FRAGCOORD.xy; - + // Нормализуем UV-координаты в диапазоне [0, 1] uv = uv * 0.15 - 1.0; // Преобразуем в диапазон [-1, 1] - + // Поворот UV-координат на 45 градусов float angle = radians(-60.0); // Преобразуем градусы в радианы vec2 origin = vec2(0.0, 0.0); uv = rotate_uv(uv, origin, angle); - + // Преобразуем обратно в диапазон [0, 1] uv = uv * 0.05 + 0.05; - + // Вычисляем синусоидальную волну float sine_wave = sin(uv.x * frequency + TIME * speed * direction) * amplitude; uv.y += sine_wave; - + float t = sin(uv.x * frequency + TIME * speed * direction); - + vec4 final_color; if (t < -0.5) { final_color = color1; @@ -53,7 +53,7 @@ void fragment() { } else { final_color = color4; } - + final_color *= vec4(1.0, 1.0, 1.0, opacity); COLOR = final_color; } \ No newline at end of file diff --git a/Shaders/ray.gdshader b/Shaders/ray.gdshader index 037b71c..72e44cb 100644 --- a/Shaders/ray.gdshader +++ b/Shaders/ray.gdshader @@ -23,14 +23,14 @@ float mask(vec2 uv, float value) float r = atan(uv.x, uv.y); r = remap(-PI, PI, 0.0, 1.0, r); r = step(r, value * 0.5); - + uv.x = uv.x + 1.0; uv.x = uv.x * -1.0; uv.x += 1.0; float l = atan(uv.x, uv.y); l = remap(-PI, PI, 0.0, 1.0, l); l = step(l, value * 0.5); - + return r + l ; } @@ -41,13 +41,13 @@ vec2 rotate_uv(vec2 uv, vec2 pivot, float rotation) { uv -= pivot; return vec2( cosa * uv.x - sina * uv.y, - cosa * uv.y + sina * uv.x + cosa * uv.y + sina * uv.x ) + pivot; } float circle(vec2 uv, float value) -{ +{ float d = length(uv); float t = smoothstep( inner_radius + blur, @@ -57,7 +57,7 @@ float circle(vec2 uv, float value) outer_radius + blur, outer_radius - blur, d - ); + ); return t; } @@ -79,6 +79,6 @@ void fragment(){ //d = abs(d); d = size/d; color *= d*t; - + COLOR = vec4(color * mask * c); } \ No newline at end of file diff --git a/Shaders/shader_edu.tres b/Shaders/shader_edu.tres index 1c3c4d8..28a6c59 100644 --- a/Shaders/shader_edu.tres +++ b/Shaders/shader_edu.tres @@ -7,3 +7,4 @@ shader = ExtResource("1_mtift") shader_parameter/color_signal = null shader_parameter/turn = 0.785 shader_parameter/inner_radius = 0.32 +shader_parameter/speed = 0.0 diff --git a/scripts/PRD.gd b/scripts/PRD.gd index f993f4d..15ce063 100644 --- a/scripts/PRD.gd +++ b/scripts/PRD.gd @@ -54,6 +54,7 @@ func _ready() -> void: node_select_yau_07b.set_node_text(0, 3, 'Положение луча') node_select_yau_07b.set_node_text(0, 4, 'Аттенюатор УМ') node_select_yau_07b.set_node_text(0, 6, 'СИ 2 в УФ') + node_select_yau_07b.set_node_text(0, 7, 'СЗИ 2 от УФ') var node_select_yau_07b_2 = $TabContainer/PRD/body_grid/litera_3_5_7/yau07b_control draw_tabl(node_select_yau_07b_2, Constants.ROWS_YAU_07B_2, Constants.ROWS_YAU_07B_2.size()) @@ -66,6 +67,7 @@ func _ready() -> void: node_select_yau_07b_2.set_node_text(0, 4, 'Аттенюатор УМ') node_select_yau_07b_2.set_node_text(0, 5, 'ФГОЗ 3') node_select_yau_07b_2.set_node_text(0, 6, 'СИ 3 в УФ') + node_select_yau_07b_2.set_node_text(0, 7, 'СЗИ 3 от УФ') #Таблица ФС var node_select_fs_1 = $TabContainer/PRD/body_grid/litera_2_4_6/fs_control diff --git a/scripts/constants.gd b/scripts/constants.gd index c58da46..39500e4 100644 --- a/scripts/constants.gd +++ b/scripts/constants.gd @@ -29,6 +29,7 @@ const ROWS_YAU_07B_1: Array = [ [TableNode, TableList], [TableNode, TableList], [TableNode, TableNode], + [TableNode, SocketStatus], [TableNode, SocketStatus]] const ROWS_YAU_07B_2: Array = [ [Header, Header], @@ -37,6 +38,7 @@ const ROWS_YAU_07B_2: Array = [ [TableNode, TableList], [TableNode, TableList], [TableNode, Switch], + [TableNode, SocketStatus], [TableNode, SocketStatus]] const ROWS_FS: Array = [ [Header, Header, Header], diff --git a/scripts/control_panel.gd b/scripts/control_panel.gd index 235e340..904b7ca 100644 --- a/scripts/control_panel.gd +++ b/scripts/control_panel.gd @@ -101,14 +101,14 @@ func _status_prd(): $lbl_control.text = 'Прибор исправен' $lbl_control.modulate = Color.AQUAMARINE else: - $lbl_control.text = 'Прибор не исправен' + $lbl_control.text = 'Прибор неисправен' $lbl_control.modulate = Color.CRIMSON else: if (status == count_cell-2): $lbl_control.text = 'Прибор исправен' $lbl_control.modulate = Color.AQUAMARINE else: - $lbl_control.text = 'Прибор не исправен' + $lbl_control.text = 'Прибор неисправен' $lbl_control.modulate = Color.CRIMSON diff --git a/scripts/ems_g.gd b/scripts/ems_g.gd index 6985a88..6c33d83 100644 --- a/scripts/ems_g.gd +++ b/scripts/ems_g.gd @@ -140,9 +140,12 @@ func process_sockets_vert(blank: int, imp: int, count: int, col: int, parent_nod set_frame(socket_status, frame_type) if i == 1: # СЗИ_2_от_УФ - pass + # $TabContainer /PRD /body_grid/litera_2_4_6/yau07b_control + var CZI_2_FS = parent_node2.get_child(3).get_child(0).get_child(0).get_child(0).get_child(2).get_node2(1, 7).get_child(1) + set_frame(CZI_2_FS, frame_type) if i == 2: # СЗИ_3_от_УФ - pass + var CZI_3_FS = parent_node2.get_child(3).get_child(0).get_child(0).get_child(1).get_child(2).get_node2(1, 7).get_child(1) + set_frame(CZI_3_FS, frame_type) if i == 9: # СИ_2_от_ФС var CI_2_FS = parent_node2.get_child(3).get_child(0).get_child(0).get_child(0).get_child(0).get_node2(1, 6).get_child(1) set_frame(CI_2_FS, frame_type) diff --git a/table/switch.gdshader b/table/switch.gdshader index b470eac..d082f90 100644 --- a/table/switch.gdshader +++ b/table/switch.gdshader @@ -4,4 +4,3 @@ void fragment() { COLOR.rgb = vec3(1.0, 1.0, 1.0) - log(COLOR.rgb); } -