diff --git a/consts.gd b/consts.gd index 5c053d0..5f8121a 100644 --- a/consts.gd +++ b/consts.gd @@ -3,11 +3,6 @@ extends Node2D const MENU_SCENE_FILE: String = 'res://меню.tscn' -# Адрес имитатора -const MAIN_ADDR = [ '127.0.0.1', 42022 ] -const DST_ADDR = [ '127.0.0.1', 42023 ] - - const TABLE_ROW_HIGHT = 34 # Высота строки таблицы в пикселях const TABLE_ROW_POINTS = [ Vector2(1, 0), Vector2(1247, 0), Vector2(1247, TABLE_ROW_HIGHT), Vector2(1, TABLE_ROW_HIGHT), Vector2(1, 0) ] const TABLE_MARKER_ADJ = Vector2(22.0, 9.0) diff --git a/interfers.gd b/interfers.gd index 4136644..be248c0 100644 --- a/interfers.gd +++ b/interfers.gd @@ -66,7 +66,9 @@ const INTERFER_NAMES: Dictionary = { 'SVI1_LIT3.pcm', 'SVM2_LIT2.pcm', 'SVM2_LIT3.pcm', - 'ERLS.pcm'] } + 'ERLS.pcm', + 'SRNI1_LIT4.pcm', + 'SRNI1_LIT5.pcm'] } # Помеха class Interfer: diff --git a/main.gd b/main.gd index b7ec014..a11c0ea 100644 --- a/main.gd +++ b/main.gd @@ -1,6 +1,11 @@ extends Node2D var sock = PacketPeerUDP.new() + +# Адрес имитатора +var main_addr = [ '127.0.0.1', 42022 ] +var dst_addr = [ '127.0.0.1', 42023 ] + @onready var table_threats = get_node('ColorRect/tabs/threats/scroll_thr/table_t') @onready var btn_add_threats = get_node('ColorRect/tabs/threats/btn_add') @onready var btn_del_threats = get_node('ColorRect/tabs/threats/btn_del') @@ -28,8 +33,8 @@ func _ready(): 'chkbx_rt': chkbx_rotate, 'scroll_thr': scroll_thr, 'panel': panel_threats} - sock.bind(Consts.MAIN_ADDR[1], Consts.MAIN_ADDR[0]) - sock.set_dest_address(Consts.DST_ADDR[0], Consts.DST_ADDR[1]) + sock.bind(main_addr[1], main_addr[0]) + sock.set_dest_address(dst_addr[0], dst_addr[1]) Threats.init_treats(table_threats, nodes) Interfers.init_pomehi(table_pomehi) fs.init_fs($ColorRect/tabs/pomehi, $ColorRect/tabs/pomehi/fs_rect) @@ -79,3 +84,17 @@ func _process(delta): var addr: = sock.get_packet_ip() var port: = sock.get_packet_port() on_receive(data) + + +func parse_command_line() -> void: + var args = OS.get_cmdline_args() + for argument in args: + argument = argument.strip_edges() + if argument.begins_with("--main_ip="): + var key_value = argument.split("=") + if key_value.size() == 2: + main_addr[0] = key_value[1].strip_edges() + if argument.begins_with("--dst_ip="): + var key_value = argument.split("=") + if key_value.size() == 2: + dst_addr[0] = key_value[1].strip_edges() diff --git a/main.tscn b/main.tscn index 35fb8a5..6576546 100644 --- a/main.tscn +++ b/main.tscn @@ -25,9 +25,10 @@ self_modulate = Color(0, 0, 0, 1) layout_mode = 0 offset_right = 1594.0 offset_bottom = 897.0 -current_tab = 0 +current_tab = 1 [node name="threats" type="Panel" parent="ColorRect/tabs"] +visible = false self_modulate = Color(0, 0, 0, 1) light_mask = 2 layout_mode = 2 @@ -136,7 +137,6 @@ offset_bottom = 50.0 text = "100 целей" [node name="pomehi" type="Panel" parent="ColorRect/tabs"] -visible = false layout_mode = 2 metadata/_tab_index = 1