From c0d5f5d20d478db051323e0a163d08133fc1a464 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Fri, 17 Nov 2023 10:44:04 +0300 Subject: [PATCH 1/8] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=A1=D0=9A=D0=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index f0b60c9e..33cd0eba 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ mono_crash.*.json # Godot 4+ specific ignores .godot/ +/override.cfg From 25cfc5191f63b975d260ee9216096e5bf0e85909 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Fri, 17 Nov 2023 10:44:41 +0300 Subject: [PATCH 2/8] =?UTF-8?q?=D0=92=20=D0=BF=D1=80=D0=BE=D1=86=D0=B5?= =?UTF-8?q?=D1=81=D1=81=D0=B5.=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BF=D1=80=D0=B5=D0=B4=D1=83=D0=BF?= =?UTF-8?q?=D1=80=D0=B5=D0=B6=D0=B4=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=80=D0=B5?= =?UTF-8?q?=D0=B4=D0=B0=D0=BA=D1=82=D0=BE=D1=80=D0=B0=20=D0=BF=D1=80=D0=B8?= =?UTF-8?q?=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B5=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/godot-logger/scripts/logger.gd | 1 - project.godot | 9 +++++++- scenes/scroll-ecm-list.gd | 14 +++++------- scenes/tilemap.gd | 2 +- scenes/кнопка-3.tscn | 13 ----------- scenes/настройки.gd | 1 + scenes/настройки.tscn | 25 +++++++++++++++------ scenes/работа.gd | 31 +++++++++++++++++++-------- scenes/работа.tscn | 6 +++--- shaders/tracked.gdshader | 4 ++-- 10 files changed, 61 insertions(+), 45 deletions(-) delete mode 100644 scenes/кнопка-3.tscn diff --git a/addons/godot-logger/scripts/logger.gd b/addons/godot-logger/scripts/logger.gd index dc6a1f92..1648f794 100644 --- a/addons/godot-logger/scripts/logger.gd +++ b/addons/godot-logger/scripts/logger.gd @@ -226,7 +226,6 @@ func _open_file() -> void: err = _file.get_error() if err: return print_debug(error_string(err)) - var read = _file.get_as_text() _file.seek_end(0) diff --git a/project.godot b/project.godot index 77779285..e106d342 100644 --- a/project.godot +++ b/project.godot @@ -19,13 +19,13 @@ boot_splash/show_image=false boot_splash/fullsize=false boot_splash/use_filter=false config/icon="res://data/icon.png" -config/map_server_addr="https://a.tile.openstreetmap.org" config/map_bcs=Vector3(0.5, 1.5, 0.3) config/map_tile_size=256 config/map_image_hight=512 config/map_image_width=512 config/map_minimum_zoom=5 config/map_maximum_zoom=19 +config/map_server_addr="https://b.tile.openstreetmap.org" [autoload] @@ -113,3 +113,10 @@ shader_compiler/shader_cache/strip_debug=true textures/default_filters/anisotropic_filtering_level=0 anti_aliasing/screen_space_roughness_limiter/enabled=false quality/driver/fallback_to_gles2=true + +[shader_globals] + +tools={ +"type": "bool", +"value": true +} diff --git a/scenes/scroll-ecm-list.gd b/scenes/scroll-ecm-list.gd index 94086e60..594f5e4a 100644 --- a/scenes/scroll-ecm-list.gd +++ b/scenes/scroll-ecm-list.gd @@ -20,18 +20,18 @@ const INTERFER_STATE = { 5: 'Передача' } ## Индексы колонок -const COLUMN_NUMBER = 0 -const COLUMN_NAME = 1 -const COLUMN_FREQ = 2 +const COLUMN_NUMBER = 0 +const COLUMN_NAME = 1 +const COLUMN_FREQ = 2 const COLUMN_AOA = 3 -const COLUMN_STATE = 4 +const COLUMN_STATE = 4 # Called when the node enters the scene tree for the first time. func _ready(): var table_index: = Dictionary() signaller.connect('interfer_new', Callable(self, 'on_interfer_new').bind(table_index)) call_deferred('init_table') - + func init_table(): $table.set_header(TABLE_HEADER) @@ -43,7 +43,3 @@ func init_table(): func on_interfer_new(ecm, table_index): print_debug() - -# Called every frame. 'delta' is the elapsed time since the previous frame. -func _process(delta): - pass diff --git a/scenes/tilemap.gd b/scenes/tilemap.gd index 9a57f195..6138a3e1 100644 --- a/scenes/tilemap.gd +++ b/scenes/tilemap.gd @@ -84,7 +84,7 @@ func img_tile_to_map_image(image: Image, dst_pos: Vector2i, tile: mercator.Tile) map_rects.append(Rect2i(dst_pos.x, dst_pos.y, tile.x, tile.y)) # сохранить корневую плитку -func _process(delta: float): +func _process(_delta: float): if (map_tile_state == TASK_STATE.DONE) and map_tile_stack.size(): var tile: mercator.Tile = map_tile_stack[-1] if request_tile(tile, map_server_addr) == OK: diff --git a/scenes/кнопка-3.tscn b/scenes/кнопка-3.tscn deleted file mode 100644 index df9e3863..00000000 --- a/scenes/кнопка-3.tscn +++ /dev/null @@ -1,13 +0,0 @@ -[gd_scene load_steps=3 format=3 uid="uid://b37dpuas0emkc"] - -[ext_resource type="Texture2D" uid="uid://bgekehgbqyddu" path="res://кнопка-3-1.png" id="1"] -[ext_resource type="Texture2D" uid="uid://caj3qxh8fo025" path="res://кнопка-3-0.png" id="2"] - -[node name="TextureButton" type="TextureButton"] -modulate = Color(1.5, 1.5, 1.5, 1) -offset_right = 140.0 -offset_bottom = 34.0 -toggle_mode = true -action_mode = 0 -texture_normal = ExtResource("2") -texture_pressed = ExtResource("1") diff --git a/scenes/настройки.gd b/scenes/настройки.gd index 446ab498..a510901f 100644 --- a/scenes/настройки.gd +++ b/scenes/настройки.gd @@ -7,3 +7,4 @@ func _ready() -> void: $Label2.text = 'Текущий режим доступа: ограниченный' for node in $GridContainer.get_children().filter(func(b): return b is Button): node.disabled = true + diff --git a/scenes/настройки.tscn b/scenes/настройки.tscn index bb9f1054..4b79291a 100644 --- a/scenes/настройки.tscn +++ b/scenes/настройки.tscn @@ -1,7 +1,18 @@ -[gd_scene load_steps=2 format=3 uid="uid://bnptm4rlp60dq"] +[gd_scene load_steps=3 format=3 uid="uid://bnptm4rlp60dq"] [ext_resource type="Script" path="res://scenes/настройки.gd" id="1_2l3rd"] +[sub_resource type="GDScript" id="GDScript_anjmx"] +script/source = "extends LineEdit + +func _ready() -> void: text = ProjectSettings.get('application/config/map_server_addr') + + +func _on_text_changed(new_text: String) -> void: + ProjectSettings.set('application/config/map_server_addr', new_text) + ProjectSettings.save_custom('override.cfg') +" + [node name="Настройки" type="Panel"] script = ExtResource("1_2l3rd") @@ -241,11 +252,11 @@ text = "Текущий режим доступа: полный" [node name="edt_mapaddr" type="LineEdit" parent="."] layout_mode = 0 -offset_left = 536.0 -offset_top = 60.0 -offset_right = 908.0 -offset_bottom = 87.0 -text = "https://a.tile.openstreetmap.org" +offset_left = 477.0 +offset_top = 85.0 +offset_right = 849.0 +offset_bottom = 112.0 +script = SubResource("GDScript_anjmx") [node name="Label" type="Label" parent="edt_mapaddr"] layout_mode = 0 @@ -255,3 +266,5 @@ offset_bottom = -8.0 text = "Адрес сервера карт" horizontal_alignment = 1 vertical_alignment = 1 + +[connection signal="text_changed" from="edt_mapaddr" to="edt_mapaddr" method="_on_text_changed"] diff --git a/scenes/работа.gd b/scenes/работа.gd index ae90a2ea..79e8067e 100644 --- a/scenes/работа.gd +++ b/scenes/работа.gd @@ -52,29 +52,42 @@ func on_button_view_toggled(toggled: bool): $canvas.set_view_mode(int(toggled)) func on_threats_resized(threats: Dictionary): $count_all_pad/count_all.text = '%02d' % threats.size() +## +func _init() -> void: + var timer1 = Timer.new() + add_child(timer1) + timer1.one_shot = true + timer1.wait_time = 2000 + timer1.connect('timeout', Callable(self, 'on_enter_tree')) + + ## Производит инициализацию func _ready(): min_zoom = ProjectSettings.get_setting('application/config/map_minimum_zoom', 5) max_zoom = ProjectSettings.get_setting('application/config/map_maximum_zoom', 19) $btn_zoom.set_meta('zoom', min_zoom - 1) - $tilemap.position = $canvas.get_strob_center() $btn_strob.button_connect('pressed', Callable(self, 'on_button_strobe_pressed')) $btn_view.button_connect('toggled', Callable(self, 'on_button_view_toggled')) $grd_btns/btn_off.set_pressed(true) - on_button_strobe_pressed() drag_fsm = DragFSM.OFF 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))) - 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')) - threats.connect('threat_update', Callable(self, 'on_threat_update')) - call_deferred('_on_btn_scale_pressed') - signaller.connect('zoom_complete', Callable(self, '_on_zoom_complete')) - signaller.connect('rto_threat_sel', Callable(self, 'on_rto_threat_sel')) + 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')) + threats.connect('threat_update', Callable(self, 'on_threat_update')) + signaller.connect('zoom_complete', Callable(self, '_on_zoom_complete')) + signaller.connect('rto_threat_sel', Callable(self, 'on_rto_threat_sel')) signaller.connect('threat_selected', Callable(self, 'on_threat_selected')) +func on_enter_tree() -> void: + call_deferred('_on_btn_scale_pressed') + call_deferred('on_button_strobe_pressed') + $tilemap.position = $canvas.get_strob_center() + $canvas.position = Vector2i(600, 600) + + ## Производит отображение цели на диаграмму func map_threat_to_bip(th: threats.Threat, bip: Control): bip.position = tools.pos_calc( diff --git a/scenes/работа.tscn b/scenes/работа.tscn index 23bebdc2..eaa15858 100644 --- a/scenes/работа.tscn +++ b/scenes/работа.tscn @@ -8,11 +8,11 @@ [ext_resource type="PackedScene" uid="uid://dymo732qc2doa" path="res://scenes/count_all_pad.tscn" id="6_e3re7"] [ext_resource type="PackedScene" uid="uid://bwti82byphl68" path="res://scenes/count_danger_pad.tscn" id="7_2arls"] [ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat.tscn" id="8_k0iv2"] -[ext_resource type="PackedScene" uid="uid://0uqi1ghf7sma" path="res://scenes/btn_zoom.tscn" id="9_oey3x"] +[ext_resource type="PackedScene" uid="uid://0uqi1ghf7sma" path="res://scenes/btn_scale.tscn" id="9_oey3x"] [ext_resource type="PackedScene" uid="uid://bbq6nklh36yij" path="res://scenes/tilemap.tscn" id="10_gtwyg"] [ext_resource type="Shader" path="res://shaders/tilemap.gdshader" id="11_ekapd"] -[sub_resource type="ShaderMaterial" id="ShaderMaterial_idugi"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_ryewg"] resource_local_to_scene = true shader = ExtResource("11_ekapd") shader_parameter/radius = 0.39 @@ -45,7 +45,7 @@ offset_bottom = 1170.0 metadata/_edit_lock_ = true [node name="tilemap" parent="." instance=ExtResource("10_gtwyg")] -material = SubResource("ShaderMaterial_idugi") +material = SubResource("ShaderMaterial_ryewg") [node name="canvas" parent="." instance=ExtResource("4_lryxs")] metadata/_edit_lock_ = true diff --git a/shaders/tracked.gdshader b/shaders/tracked.gdshader index db8e7c8a..a9acbbfc 100644 --- a/shaders/tracked.gdshader +++ b/shaders/tracked.gdshader @@ -53,7 +53,7 @@ vec2 rotateUVmatrinx(vec2 uv, vec2 pivot, float rotation) void vertex() -{ +{ float dir = 0.0; vec2 offset = vec2(0.125, 0.125); dir -= speed * TIME; @@ -75,6 +75,6 @@ void fragment() get_line_points(px0, px1, py0, py1, 210.0); COLOR.a += line(vec2(px0, py0), vec2(px1, py1), 5.0, UV); COLOR *= smooth_px(length(UV-center), radius, DSS); - + } From b4bdc6718123f1bbe3b7013377cfa9566cc88bea Mon Sep 17 00:00:00 2001 From: sasha80 Date: Fri, 17 Nov 2023 16:39:46 +0300 Subject: [PATCH 3/8] =?UTF-8?q?=D0=92=20=D0=BF=D1=80=D0=BE=D1=86=D0=B5?= =?UTF-8?q?=D1=81=D1=81=D0=B5.=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BF=D0=BE=D0=BB=D0=BE=D0=B6=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=85=D0=BE=D0=BB=D1=81=D1=82=D0=B0=20?= =?UTF-8?q?=D1=81=20=D0=B4=D0=B8=D0=B0=D0=B3=D1=80=D0=B0=D0=BC=D0=BC=D0=BE?= =?UTF-8?q?=D0=B9=20=D0=BF=D1=80=D0=B8=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81?= =?UTF-8?q?=D0=BA=D0=B5=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D0=BD=D1=8F=D0=B5?= =?UTF-8?q?=D0=BC=D0=BE=D0=B3=D0=BE=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/работа.gd | 1 - shaders/shader_edu.tres | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/scenes/работа.gd b/scenes/работа.gd index 79e8067e..c81bcf38 100644 --- a/scenes/работа.gd +++ b/scenes/работа.gd @@ -85,7 +85,6 @@ func on_enter_tree() -> void: call_deferred('_on_btn_scale_pressed') call_deferred('on_button_strobe_pressed') $tilemap.position = $canvas.get_strob_center() - $canvas.position = Vector2i(600, 600) ## Производит отображение цели на диаграмму diff --git a/shaders/shader_edu.tres b/shaders/shader_edu.tres index ed5b6155..c31a2090 100644 --- a/shaders/shader_edu.tres +++ b/shaders/shader_edu.tres @@ -5,7 +5,7 @@ code = "shader_type canvas_item; #include \"tools.gdshaderinc\" -uniform vec2 pc0; /* Центр сетки антенн */ +uniform vec2 pc0 = vec2(560, 560); /* Центр сетки антенн */ uniform float rotation: hint_range(0.0, 360.0) = 0.0; /* */ uniform vec4 color0: source_color = vec4(0.38, 0.47, 0.51, 0.4); uniform vec4 color1: source_color = vec4(0.39, 0.44, 0.50, 0.4); From 772a40bcea59216e597deeb6f6e23ff7f9b2828e Mon Sep 17 00:00:00 2001 From: sasha80 Date: Mon, 20 Nov 2023 08:27:46 +0300 Subject: [PATCH 4/8] =?UTF-8?q?=D0=92=20=D0=BF=D1=80=D0=BE=D1=86=D0=B5?= =?UTF-8?q?=D1=81=D1=81=D0=B5.=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BF=D0=BE=D0=BB=D0=BE=D0=B6=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=85=D0=BE=D0=BB=D1=81=D1=82=D0=B0=20?= =?UTF-8?q?=D1=81=20=D0=B4=D0=B8=D0=B0=D0=B3=D1=80=D0=B0=D0=BC=D0=BC=D0=BE?= =?UTF-8?q?=D0=B9=20=D0=BF=D1=80=D0=B8=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81?= =?UTF-8?q?=D0=BA=D0=B5=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D0=BD=D1=8F=D0=B5?= =?UTF-8?q?=D0=BC=D0=BE=D0=B3=D0=BE=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/tab-switch.tscn | 1 + scenes/работа.tscn | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scenes/tab-switch.tscn b/scenes/tab-switch.tscn index 70716090..827f9c11 100644 --- a/scenes/tab-switch.tscn +++ b/scenes/tab-switch.tscn @@ -10,6 +10,7 @@ [node name="tab_switch" type="TabContainer"] offset_right = 1600.0 offset_bottom = 1200.0 +tooltip_text = "Переключает режимы работы программы" script = ExtResource("1_fg0vd") [node name="Работа" parent="." instance=ExtResource("2_u7p16")] diff --git a/scenes/работа.tscn b/scenes/работа.tscn index eaa15858..c694c16b 100644 --- a/scenes/работа.tscn +++ b/scenes/работа.tscn @@ -12,7 +12,7 @@ [ext_resource type="PackedScene" uid="uid://bbq6nklh36yij" path="res://scenes/tilemap.tscn" id="10_gtwyg"] [ext_resource type="Shader" path="res://shaders/tilemap.gdshader" id="11_ekapd"] -[sub_resource type="ShaderMaterial" id="ShaderMaterial_ryewg"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_sk62e"] resource_local_to_scene = true shader = ExtResource("11_ekapd") shader_parameter/radius = 0.39 @@ -45,7 +45,7 @@ offset_bottom = 1170.0 metadata/_edit_lock_ = true [node name="tilemap" parent="." instance=ExtResource("10_gtwyg")] -material = SubResource("ShaderMaterial_ryewg") +material = SubResource("ShaderMaterial_sk62e") [node name="canvas" parent="." instance=ExtResource("4_lryxs")] metadata/_edit_lock_ = true From 383493d7552e1414e2b8ac55bbd065fbf4f8cdc1 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Mon, 20 Nov 2023 08:42:32 +0300 Subject: [PATCH 5/8] =?UTF-8?q?=D0=92=20=D0=BF=D1=80=D0=BE=D1=86=D0=B5?= =?UTF-8?q?=D1=81=D1=81=D0=B5.=20=D0=9F=D0=B5=D1=80=D0=B5=D1=81=D0=BE?= =?UTF-8?q?=D0=B1=D1=80=D0=B0=D0=BD=20tab=5Fswitch.=20=D0=9D=D0=B8=D1=87?= =?UTF-8?q?=D0=B5=D0=B3=D0=BE=20=D0=BD=D0=B5=20=D0=B8=D0=B7=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=BB=D0=BE=D1=81=D1=8C.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/работа.tscn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scenes/работа.tscn b/scenes/работа.tscn index c694c16b..179d2b59 100644 --- a/scenes/работа.tscn +++ b/scenes/работа.tscn @@ -12,7 +12,7 @@ [ext_resource type="PackedScene" uid="uid://bbq6nklh36yij" path="res://scenes/tilemap.tscn" id="10_gtwyg"] [ext_resource type="Shader" path="res://shaders/tilemap.gdshader" id="11_ekapd"] -[sub_resource type="ShaderMaterial" id="ShaderMaterial_sk62e"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_mnfh2"] resource_local_to_scene = true shader = ExtResource("11_ekapd") shader_parameter/radius = 0.39 @@ -45,7 +45,7 @@ offset_bottom = 1170.0 metadata/_edit_lock_ = true [node name="tilemap" parent="." instance=ExtResource("10_gtwyg")] -material = SubResource("ShaderMaterial_sk62e") +material = SubResource("ShaderMaterial_mnfh2") [node name="canvas" parent="." instance=ExtResource("4_lryxs")] metadata/_edit_lock_ = true From 96bf969d796517a13f96811a8624d70f56fe2e80 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Mon, 20 Nov 2023 09:24:34 +0300 Subject: [PATCH 6/8] =?UTF-8?q?=D0=92=20=D0=BF=D1=80=D0=BE=D1=86=D0=B5?= =?UTF-8?q?=D1=81=D1=81=D0=B5.=20=D0=9E=D1=82=D0=BA=D0=B0=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/работа.gd | 11 +++++++++-- scenes/работа.tscn | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/scenes/работа.gd b/scenes/работа.gd index c81bcf38..f6531e9b 100644 --- a/scenes/работа.gd +++ b/scenes/работа.gd @@ -53,12 +53,19 @@ func on_threats_resized(threats: Dictionary): $count_all_pad/count_all.text = '% ## -func _init() -> void: +func _enter_tree() -> void: var timer1 = Timer.new() + timer1.name = 'timer1' add_child(timer1) timer1.one_shot = true - timer1.wait_time = 2000 timer1.connect('timeout', Callable(self, 'on_enter_tree')) + timer1.start(1.0) + + +func _exit_tree() -> void: + var timer1 = get_node('timer1') + remove_child(timer1) + timer1.queue_free() ## Производит инициализацию diff --git a/scenes/работа.tscn b/scenes/работа.tscn index 179d2b59..c228ec2b 100644 --- a/scenes/работа.tscn +++ b/scenes/работа.tscn @@ -12,7 +12,7 @@ [ext_resource type="PackedScene" uid="uid://bbq6nklh36yij" path="res://scenes/tilemap.tscn" id="10_gtwyg"] [ext_resource type="Shader" path="res://shaders/tilemap.gdshader" id="11_ekapd"] -[sub_resource type="ShaderMaterial" id="ShaderMaterial_mnfh2"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_4p7y1"] resource_local_to_scene = true shader = ExtResource("11_ekapd") shader_parameter/radius = 0.39 @@ -45,7 +45,7 @@ offset_bottom = 1170.0 metadata/_edit_lock_ = true [node name="tilemap" parent="." instance=ExtResource("10_gtwyg")] -material = SubResource("ShaderMaterial_mnfh2") +material = SubResource("ShaderMaterial_4p7y1") [node name="canvas" parent="." instance=ExtResource("4_lryxs")] metadata/_edit_lock_ = true From a3805a2356280226e682f769431870c32298c10f Mon Sep 17 00:00:00 2001 From: sasha80 Date: Mon, 20 Nov 2023 13:16:59 +0300 Subject: [PATCH 7/8] =?UTF-8?q?=D0=92=20=D0=BF=D1=80=D0=BE=D1=86=D0=B5?= =?UTF-8?q?=D1=81=D1=81=D0=B5.=20=D0=9E=D1=82=D0=BA=D0=B0=D1=82.=20=D0=98?= =?UTF-8?q?=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE=20-=20"?= =?UTF-8?q?=D1=81=D1=82=D1=80=D0=BE=D0=B1=20=D0=BD=D0=B5=20=D1=80=D0=B0?= =?UTF-8?q?=D0=B1=D0=BE=D1=82=D0=B0=D0=B5=D1=82".=20=D0=9F=D0=B0=D1=80?= =?UTF-8?q?=D0=B0=D0=BC=D0=B5=D1=82=D1=80=20=D1=88=D0=B5=D0=B9=D0=B4=D0=B5?= =?UTF-8?q?=D1=80=D0=B0=20=D0=BF=D1=80=D0=B8=D0=BD=D0=B8=D0=BC=D0=B0=D0=BB?= =?UTF-8?q?=20=D0=BD=D1=83=D0=BB=D0=B5=D0=B2=D0=BE=D0=B5=20=D0=B7=D0=BD?= =?UTF-8?q?=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D0=B5,=20=D0=B7=D0=B0=D0=B3?= =?UTF-8?q?=D1=80=D1=83=D0=B6=D0=B0=D0=B5=D0=BC=D0=BE=D0=B5=20=D0=B8=D0=B7?= =?UTF-8?q?=20=D1=80=D0=B5=D1=81=D1=83=D1=80=D1=81=D0=B0,=20=D1=83=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BB=D1=8F=D0=B5=D0=BC=D0=BE=D0=B3=D0=BE=20?= =?UTF-8?q?=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=82=D0=BE=D1=80=D0=BE=D0=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project.godot | 2 +- scenes/работа.tscn | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/project.godot b/project.godot index e106d342..92217c13 100644 --- a/project.godot +++ b/project.godot @@ -12,7 +12,7 @@ config_version=5 config/name="uarep-ctl" run/main_scene="res://scenes/tab-switch.tscn" -config/features=PackedStringArray("4.1") +config/features=PackedStringArray("4.2") run/low_processor_mode=true run/delta_smoothing=false boot_splash/show_image=false diff --git a/scenes/работа.tscn b/scenes/работа.tscn index c228ec2b..e018a206 100644 --- a/scenes/работа.tscn +++ b/scenes/работа.tscn @@ -3,13 +3,13 @@ [ext_resource type="Script" path="res://scenes/работа.gd" id="1_niok4"] [ext_resource type="PackedScene" uid="uid://nl1vklubr5kr" path="res://scenes/bip.tscn" id="2_br3s6"] [ext_resource type="PackedScene" uid="uid://dem3fcec25awh" path="res://scenes/grd_side.tscn" id="3_s2j0e"] -[ext_resource type="PackedScene" uid="uid://b5kjdyxuwsot5" path="res://scenes/canvas.tscn" id="4_lryxs"] [ext_resource type="PackedScene" uid="uid://cnkbk53mi7viu" path="res://scenes/grd_btns.tscn" id="5_2jnbs"] [ext_resource type="PackedScene" uid="uid://dymo732qc2doa" path="res://scenes/count_all_pad.tscn" id="6_e3re7"] [ext_resource type="PackedScene" uid="uid://bwti82byphl68" path="res://scenes/count_danger_pad.tscn" id="7_2arls"] [ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat.tscn" id="8_k0iv2"] [ext_resource type="PackedScene" uid="uid://0uqi1ghf7sma" path="res://scenes/btn_scale.tscn" id="9_oey3x"] [ext_resource type="PackedScene" uid="uid://bbq6nklh36yij" path="res://scenes/tilemap.tscn" id="10_gtwyg"] +[ext_resource type="PackedScene" uid="uid://b5kjdyxuwsot5" path="res://scenes/canvas.tscn" id="11_b6su4"] [ext_resource type="Shader" path="res://shaders/tilemap.gdshader" id="11_ekapd"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_4p7y1"] @@ -47,9 +47,6 @@ metadata/_edit_lock_ = true [node name="tilemap" parent="." instance=ExtResource("10_gtwyg")] material = SubResource("ShaderMaterial_4p7y1") -[node name="canvas" parent="." instance=ExtResource("4_lryxs")] -metadata/_edit_lock_ = true - [node name="grd_btns" parent="." instance=ExtResource("5_2jnbs")] layout_mode = 0 offset_left = 10.0 @@ -136,6 +133,8 @@ offset_right = 1104.0 offset_bottom = 1056.0 metadata/zoom = 4 +[node name="canvas" parent="." instance=ExtResource("11_b6su4")] + [connection signal="drag_begin" from="." to="." method="_on_drag_begin"] [connection signal="drag_continue" from="." to="." method="_on_drag_continue"] [connection signal="pressed" from="btn_zoom" to="." method="_on_btn_scale_pressed"] From 80f462261c9625fa1acf6b3cc08f612d5a78c58a Mon Sep 17 00:00:00 2001 From: sasha80 Date: Mon, 20 Nov 2023 13:47:15 +0300 Subject: [PATCH 8/8] =?UTF-8?q?=D0=92=20=D0=BF=D1=80=D0=BE=D1=86=D0=B5?= =?UTF-8?q?=D1=81=D1=81=D0=B5.=20=D0=A1=D0=BE=D0=B2=D0=BC=D0=B5=D1=81?= =?UTF-8?q?=D1=82=D0=B8=D0=BC=D0=BE=D1=81=D1=82=D1=8C=20=D1=81=20Godot4.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/interfer.gd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/interfer.gd b/scripts/interfer.gd index ac5a85f1..88706b43 100644 --- a/scripts/interfer.gd +++ b/scripts/interfer.gd @@ -33,7 +33,7 @@ class Interfer: var powp: float = 0.0 ## Мощность излучения выраженная в процентах. var kni: = 0.0 ## Курсовой угол направления излучения. var params: = {} ## Параметры помехи. - var get: Array[String] ## Запрос массива параметров (список запрошенных параметров). + var get_params: Array[String] ## Запрос массива параметров (список запрошенных параметров). var retss: int ## Значение счётчика сообщения в котором был произведён запрос массива параметров. var tick_rx: int ## Тик время обновления цели, мс.