Доработка. Цвет антенн теперь Color, вместо Vector3

This commit is contained in:
sasha80
2025-10-07 12:43:06 +03:00
parent 6c60eeda74
commit 482d1f6dda
5 changed files with 19 additions and 20 deletions

View File

@@ -2,7 +2,7 @@ class_name Diagram extends Sprite2D
const NUM_OF_RANGE = 7
const NUM_OF_DIRECTIONS = 4
var fs_default_colors: Array ## Цвета по умолчанию для блоков ФС.
var fs_default_colors: Array[Color] ## Цвета по умолчанию для блоков ФС.
@export var SecZap: PackedScene
@@ -93,8 +93,8 @@ func set_view_mode(val: int):
## Закрашивание по умолчанию блоков ФС цветами из настроек.
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 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))
var col_arr: Array = [color0, color1]
var col = false
for i in NUM_OF_RANGE:

View File

@@ -449,8 +449,8 @@ func set_fs_color(ecm):
func update_fs_colors():
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))
var color_ecm: Color = ProjectSettings.get_setting('application/interfer/interfer_color', Color(0.58, 0.47, 0.51, 1.0))
var color_select: Color = ProjectSettings.get_setting('application/interfer/select_color', Color(1.0, 1.0, 1.0, 1.0))
for key in fs_active.keys():
fs_colors[key] = color_ecm
for key in fs_selected.keys():