From 9ec51f509cdd66c7d34a250660bc86e94fa70ea0 Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Tue, 5 Mar 2024 09:35:42 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5.=20=20res://scenes/=D1=80=D0=B0=D0=B1?= =?UTF-8?q?=D0=BE=D1=82=D0=B0/=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0.gd:385?= =?UTF-8?q?=20-=20Invalid=20call.=20Nonexistent=20function=20'set=5Fband?= =?UTF-8?q?=5Fcolors'=20in=20base=20'Sprite2D=20(diagram.gd)'.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/diagram/diagram.gd | 20 +++++++++++++++++++- scenes/работа/работа.gd | 18 +----------------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/scenes/diagram/diagram.gd b/scenes/diagram/diagram.gd index d7c04010..f9c850d4 100644 --- a/scenes/diagram/diagram.gd +++ b/scenes/diagram/diagram.gd @@ -1,6 +1,11 @@ extends Sprite2D -func _ready() -> void: signaller.connect('map_mode_changed', Callable(self, 'set_view_mode')) +var fs_default_colors: Array # Цвета по умолчанию для блоков ФС + +func _ready() -> void: + signaller.connect('map_mode_changed', Callable(self, 'set_view_mode')) + set_def_colors() + func sv(val: float) -> float: return val / ($строб.scale.x / 2.0) * 0.125 @@ -24,3 +29,16 @@ func get_radius_inner_1() -> float: return material.get('shader_parameter/radiu func set_view_mode(val: int): material.set('shader_parameter/mode', val); func set_band_colors(val: Array): material.set('shader_parameter/ant_band_c', val) + +## Закрашивание по умолчанию блоков ФС цветами из настроек +func set_def_colors(): + var color0: Vector3 = ProjectSettings.get_setting('application/interfer/default_color0', Vector3(0.38, 0.47, 0.51)) + var color1: Vector3 = ProjectSettings.get_setting('application/interfer/default_color1', Vector3(0.39, 0.44, 0.50)) + var col_arr: Array = [color0, color1] + var col = false + for i in range(7): + for j in range (4): + fs_default_colors.append(col_arr[int(col)]) + col = not col + col = not col + set_band_colors(fs_default_colors) diff --git a/scenes/работа/работа.gd b/scenes/работа/работа.gd index f156c6dc..c696ac42 100644 --- a/scenes/работа/работа.gd +++ b/scenes/работа/работа.gd @@ -74,7 +74,6 @@ const fs_freq: Dictionary = { 6: [5200.0, 6000.0] } var fs_band = fs_band_rto # Текущий режим блоков ФС по частоте -var fs_default_colors: Array # Цвета по умолчанию для блоков ФС var fs_selected: Dictionary # Словарь выбранных секторов var fs_active: Dictionary # Словарь секторов назначенных на подавление @@ -136,7 +135,6 @@ func _ready(): $btn_view.button_connect('toggled', Callable(self, 'on_button_view_toggled')) var nodes: Array = get_tree().get_nodes_in_group('группа-режим-помехи') nodes.any(func(btn): btn.button_connect('pressed', Callable(self, 'on_button_pressed').bind(btn, nodes))) - set_def_colors() threats.connect('threat_new', Callable(self, 'on_threat_new')) threats.connect('threat_lost', Callable(self, 'on_threat_lost')) threats.connect('threats_resized', Callable(self, 'on_threats_resized')) @@ -371,20 +369,6 @@ func _on_zoom_complete(zoom: int) -> void: $btn_zoom.set_meta('zoom', zoom) -## Закрашивание по умолчанию блоков ФС цветами из настроек -func set_def_colors(): - var color0: Vector3 = ProjectSettings.get_setting('application/interfer/default_color0', Vector3(0.38, 0.47, 0.51)) - var color1: Vector3 = ProjectSettings.get_setting('application/interfer/default_color1', Vector3(0.39, 0.44, 0.50)) - var col_arr: Array = [color0, color1] - var col = false - for i in range(7): - for j in range (4): - fs_default_colors.append(col_arr[int(col)]) - col = not col - col = not col - $canvas.set_band_colors(fs_default_colors) - - # Обработчик нажатия по сектору формирователя сигналов func sel_fs_sector(event): if (event.button_index == MOUSE_BUTTON_LEFT) or (event.button_index == MOUSE_BUTTON_RIGHT): @@ -427,7 +411,7 @@ func set_fs_color(ecm): func update_fs_colors(): - var fs_colors = fs_default_colors.duplicate() + var fs_colors = $canvas.fs_default_colors.duplicate() var color_ecm: Vector3 = ProjectSettings.get_setting('application/interfer/interfer_color', Vector3(0.58, 0.47, 0.51)) var color_select: Vector3 = ProjectSettings.get_setting('application/interfer/select_color', Vector3(1.0, 1.0, 1.0)) for key in fs_active.keys():