Рефактор.

project.godot

@@ -22,9 +22,9 @@ config/icon="res://data/icon.png"
 
 [autoload]
 
-signaller="*res://scripts/signaller.gd"
 Log="*res://addons/godot-logger/scripts/logger.gd"
-Tools="*res://scripts/tools.gd"
+tools="*res://scripts/tools.gd"
+signaller="*res://scripts/signaller.gd"
 repsettings="*res://scripts/repsettings.gd"
 REPNetwork="*res://scripts/repnetwork.gd"
 yau07="*res://scripts/yau07.gd"

scenes/canvas.tscn

@@ -8,7 +8,7 @@
 [sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_2bft1"]
 size = Vector2(1600, 1200)
 
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_vm0v1"]
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_ddhy2"]
 resource_local_to_scene = true
 shader = ExtResource("4_gb4a1")
 shader_parameter/color = Color(1, 1, 1, 0.168627)
@@ -26,6 +26,6 @@ centered = false
 script = ExtResource("2_vkwmy")
 
 [node name="строб" parent="." instance=ExtResource("3_uhdvc")]
-material = SubResource("ShaderMaterial_vm0v1")
+material = SubResource("ShaderMaterial_ddhy2")
 position = Vector2(560, 560)
 scale = Vector2(1100, 1100)

scenes/scroll-params.gd

@@ -50,7 +50,7 @@ func _ready() -> void:
 ## Обновляет отображение только для выбранной цели.
 func on_threat_update(th):
     if th.id != $table.get_meta('id'): return
-    var mnms = Tools.get_members_names(th)
+    var mnms = tools.get_members_names(th)
     for member_name in mnms:
         if not TABLE_PARAMS.has(member_name): continue
         var p = TABLE_PARAMS[member_name]

scenes/работа.gd

@@ -67,7 +67,7 @@ func _ready():
 
 ## Производит отображение цели на диаграмму
 func map_threat_to_bip(th: Threats.Threat, bip: Sprite2D):
-    bip.position = Tools.pos_calc(
+    bip.position = tools.pos_calc(
         th.freq,
         th.aoa,
         radius_center,
@@ -112,20 +112,20 @@ func on_button_pressed(btn_this, btn_others) -> void:
 ## Возвращает ширину строба по направлению
 func get_strob_width(pos: Vector2, prev: float) -> float:
     var strob_dir_width: float = prev + (drag_pos_begin.y - pos.y) * drag_scale_width
-    strob_dir_width = Tools.clip_value(strob_dir_width, strob_min_width, strob_max_width)
+    strob_dir_width = tools.clip_value(strob_dir_width, strob_min_width, strob_max_width)
     return strob_dir_width
 
 
 ## Возвращает ширину строба по частоте
 func get_strob_band(pos: Vector2, prev: float) -> float:
     var strob_dir_band: float = prev - (drag_pos_begin.y - pos.y) * drag_scale_band
-    strob_dir_band = Tools.clip_value(strob_dir_band, strob_min_band, strob_max_band)
+    strob_dir_band = tools.clip_value(strob_dir_band, strob_min_band, strob_max_band)
     return strob_dir_band
 
 
 ## Устанавливает центр строба по частоте и направлению
 func set_strob(pos: Vector2) -> void:
-    var radp: Vector2 = Tools.map_dec_to_rad(radius_center, pos)
+    var radp: Vector2 = tools.map_dec_to_rad(radius_center, pos)
     if radp.y < $canvas.get_radius_outter():
         $canvas.set_strob_dir(radp.x)
         $canvas.set_strob_radius(radp.y)

scripts/interfer.gd

@@ -41,7 +41,7 @@ class Interfer:
 
 
     func set_from_dic(dic: Dictionary):
-        var names: = Tools.get_members_names(self)
+        var names: = tools.get_members_names(self)
         names.any(func(vn): if dic.has(vn): set(vn, dic[vn]); return false)
 
 

scripts/threats.gd

@@ -29,7 +29,7 @@ class Threat:
 
     func _init(): clear_fflags()
     func _to_string() -> String: return '<Threat>: номер:%d пеленг:%0.1f частота:%0.1f МГц' % [id, aoa, freq]
-    func clear_fflags(): Tools.get_members_names(self).any(func(vn): fflags[vn] = false)
+    func clear_fflags(): tools.get_members_names(self).any(func(vn): fflags[vn] = false)
 
     func set_from_dic(dic: Dictionary):
         var items: = fflags.keys().filter(func(vn): return dic.has(vn))

scripts/tools.gd

@@ -27,7 +27,7 @@ func is_overlap(x1, x2, y1, y2): return max(x1, y1) <= min(x2, y2)
 func pos_calc(freq: float, aoa: float, pos0: Vector2, r0: float, r1: float, f0: float, f1: float):
     var df = f1 - f0
     var r = ((freq - f0) / df) * r1 + r0
-    var aoa_rad = Tools.radians(aoa) - PI / 2.0
+    var aoa_rad = radians(aoa) - PI / 2.0
     var x = cos(aoa_rad) * r + pos0.x
     var y = sin(aoa_rad) * r + pos0.y
     return Vector2(x, y)