From bc489397f4d4bd68228df58835fa7db1dceeade6 Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Wed, 18 Oct 2023 16:31:08 +0300 Subject: [PATCH 1/6] =?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=D0=96=D1=83=D1=80=D0=BD=D0=B0?= =?UTF-8?q?=D0=BB=20=D0=BD=D0=B5=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0?= =?UTF-8?q?=D0=B6=D0=B0=D0=B5=D1=82=D1=81=D1=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/godot-logger/plugin.gd | 2 +- addons/godot-logger/scripts/logger_output.gd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/godot-logger/plugin.gd b/addons/godot-logger/plugin.gd index e26e3e1..a6ff3f7 100644 --- a/addons/godot-logger/plugin.gd +++ b/addons/godot-logger/plugin.gd @@ -5,7 +5,7 @@ extends EditorPlugin -const AUTOLOAD_NAME = "Log" +const AUTOLOAD_NAME = "log" const AUTOLOAD_PATH = "res://addons/godot-logger/scripts/logger.gd" const LOGGER_OUTPUT = "LoggerOutput" diff --git a/addons/godot-logger/scripts/logger_output.gd b/addons/godot-logger/scripts/logger_output.gd index 96d88d7..539daac 100644 --- a/addons/godot-logger/scripts/logger_output.gd +++ b/addons/godot-logger/scripts/logger_output.gd @@ -24,7 +24,7 @@ var _logger : Logger func _enter_tree() -> void: - var logger := get_node_or_null("/root/Log") as Logger + var logger := get_node_or_null("/root/log") as Logger if is_instance_valid(logger): set_logger(logger) From b20c3b0982fa37854661495917475f21bb00bc25 Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Wed, 18 Oct 2023 16:31:19 +0300 Subject: [PATCH 2/6] Godot4 --- scenes/canvas.tscn | 20 +++--- scenes/count_all_pad.tscn | 6 +- scenes/sector.tscn | 4 +- scenes/tab-switch.tscn | 24 +++---- scenes/журнал.tscn | 10 +-- scenes/работа.tscn | 40 +++++------ scenes/состояния-эмс.tscn | 20 +++--- scenes/эмс.tscn | 144 -------------------------------------- 8 files changed, 62 insertions(+), 206 deletions(-) delete mode 100644 scenes/эмс.tscn diff --git a/scenes/canvas.tscn b/scenes/canvas.tscn index 8dcb94e..365e4a9 100644 --- a/scenes/canvas.tscn +++ b/scenes/canvas.tscn @@ -1,16 +1,16 @@ [gd_scene load_steps=7 format=3 uid="uid://b5kjdyxuwsot5"] -[ext_resource type="Material" uid="uid://s6xe8igevnv2" path="res://shaders/shader_edu.tres" id="1_uxbga"] -[ext_resource type="Script" path="res://scenes/canvas.gd" id="2_vkwmy"] -[ext_resource type="PackedScene" uid="uid://c73ahpv8uiuc7" path="res://scenes/sector.tscn" id="3_uhdvc"] -[ext_resource type="Shader" path="res://shaders/sector.gdshader" id="4_gb4a1"] +[ext_resource type="Material" uid="uid://s6xe8igevnv2" path="res://shaders/shader_edu.tres" id="1_ha3yh"] +[ext_resource type="Script" path="res://scenes/canvas.gd" id="2_8se1s"] +[ext_resource type="PackedScene" uid="uid://c73ahpv8uiuc7" path="res://scenes/sector.tscn" id="3_7ta34"] +[ext_resource type="Shader" path="res://shaders/sector.gdshader" id="4_m7dli"] [sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_2bft1"] size = Vector2(1600, 1200) -[sub_resource type="ShaderMaterial" id="ShaderMaterial_iqsw2"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_1nxnr"] resource_local_to_scene = true -shader = ExtResource("4_gb4a1") +shader = ExtResource("4_m7dli") shader_parameter/color = Color(1, 1, 1, 0.168627) shader_parameter/clip_color = Color(1, 0.5, 0.5, 1) shader_parameter/width = 45.0 @@ -20,12 +20,12 @@ shader_parameter/dir = 0.08 shader_parameter/inner_clip = 0.045 [node name="canvas" type="Sprite2D"] -material = ExtResource("1_uxbga") +material = ExtResource("1_ha3yh") texture = SubResource("PlaceholderTexture2D_2bft1") centered = false -script = ExtResource("2_vkwmy") +script = ExtResource("2_8se1s") -[node name="строб" parent="." instance=ExtResource("3_uhdvc")] -material = SubResource("ShaderMaterial_iqsw2") +[node name="строб" parent="." instance=ExtResource("3_7ta34")] +material = SubResource("ShaderMaterial_1nxnr") position = Vector2(560, 560) scale = Vector2(1100, 1100) diff --git a/scenes/count_all_pad.tscn b/scenes/count_all_pad.tscn index eb2d7c5..ca0c75d 100644 --- a/scenes/count_all_pad.tscn +++ b/scenes/count_all_pad.tscn @@ -1,12 +1,12 @@ [gd_scene load_steps=2 format=3 uid="uid://dymo732qc2doa"] -[ext_resource type="FontFile" uid="uid://befva8r034a4v" path="res://data/DSEG7Classic-Regular.ttf" id="1_di0yu"] +[ext_resource type="FontFile" uid="uid://befva8r034a4v" path="res://data/DSEG7Classic-Regular.ttf" id="1_llb8n"] [node name="count_all_pad" type="Label"] self_modulate = Color(0.403922, 0.403922, 0.403922, 1) offset_right = 33.0 offset_bottom = 23.0 -theme_override_fonts/font = ExtResource("1_di0yu") +theme_override_fonts/font = ExtResource("1_llb8n") theme_override_font_sizes/font_size = 20 text = "88" vertical_alignment = 1 @@ -15,7 +15,7 @@ vertical_alignment = 1 layout_mode = 0 offset_right = 33.0 offset_bottom = 23.0 -theme_override_fonts/font = ExtResource("1_di0yu") +theme_override_fonts/font = ExtResource("1_llb8n") theme_override_font_sizes/font_size = 20 text = "00" vertical_alignment = 1 diff --git a/scenes/sector.tscn b/scenes/sector.tscn index 6e7d6b9..9670ad1 100644 --- a/scenes/sector.tscn +++ b/scenes/sector.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=4 format=3 uid="uid://c73ahpv8uiuc7"] -[ext_resource type="Shader" path="res://shaders/sector.gdshader" id="1_aikdh"] +[ext_resource type="Shader" path="res://shaders/sector.gdshader" id="1_nwvyo"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_xo5or"] resource_local_to_scene = true -shader = ExtResource("1_aikdh") +shader = ExtResource("1_nwvyo") shader_parameter/color = Color(1, 1, 1, 0.168627) shader_parameter/clip_color = Color(1, 0.5, 0.5, 1) shader_parameter/width = 45.0 diff --git a/scenes/tab-switch.tscn b/scenes/tab-switch.tscn index c2c1e3c..ebe4bce 100644 --- a/scenes/tab-switch.tscn +++ b/scenes/tab-switch.tscn @@ -1,32 +1,32 @@ [gd_scene load_steps=7 format=3 uid="uid://3slb0i3pvowc"] -[ext_resource type="Script" path="res://scenes/tab-switch.gd" id="1_qroqt"] -[ext_resource type="PackedScene" uid="uid://b276iygic5itk" path="res://scenes/работа.tscn" id="2_pdbvn"] -[ext_resource type="PackedScene" uid="uid://lwmw4egynmd1" path="res://scenes/контроль.tscn" id="3_2apbp"] -[ext_resource type="PackedScene" uid="uid://trt0q8th3bn2" path="res://scenes/журнал.tscn" id="4_yq6c0"] -[ext_resource type="PackedScene" uid="uid://dab6loryocc73" path="res://scenes/ЭМС.tscn" id="5_tlyql"] -[ext_resource type="PackedScene" uid="uid://bnptm4rlp60dq" path="res://scenes/настройки.tscn" id="6_rxq15"] +[ext_resource type="Script" path="res://scenes/tab-switch.gd" id="1_jjaev"] +[ext_resource type="PackedScene" uid="uid://b276iygic5itk" path="res://scenes/работа.tscn" id="2_ottu4"] +[ext_resource type="PackedScene" uid="uid://lwmw4egynmd1" path="res://scenes/контроль.tscn" id="3_50u6g"] +[ext_resource type="PackedScene" uid="uid://trt0q8th3bn2" path="res://scenes/журнал.tscn" id="4_jbm5n"] +[ext_resource type="PackedScene" uid="uid://dab6loryocc73" path="res://scenes/эмс.tscn" id="5_014x4"] +[ext_resource type="PackedScene" uid="uid://bnptm4rlp60dq" path="res://scenes/настройки.tscn" id="6_06u87"] [node name="tab_switch" type="TabContainer"] offset_right = 1600.0 offset_bottom = 1200.0 -script = ExtResource("1_qroqt") +script = ExtResource("1_jjaev") -[node name="Работа" parent="." instance=ExtResource("2_pdbvn")] +[node name="Работа" parent="." instance=ExtResource("2_ottu4")] layout_mode = 2 -[node name="Контроль" parent="." instance=ExtResource("3_2apbp")] +[node name="Контроль" parent="." instance=ExtResource("3_50u6g")] visible = false layout_mode = 2 -[node name="Журнал" parent="." instance=ExtResource("4_yq6c0")] +[node name="Журнал" parent="." instance=ExtResource("4_jbm5n")] visible = false layout_mode = 2 -[node name="ЭМС" parent="." instance=ExtResource("5_tlyql")] +[node name="ЭМС" parent="." instance=ExtResource("5_014x4")] visible = false layout_mode = 2 -[node name="Настройки" parent="." instance=ExtResource("6_rxq15")] +[node name="Настройки" parent="." instance=ExtResource("6_06u87")] visible = false layout_mode = 2 diff --git a/scenes/журнал.tscn b/scenes/журнал.tscn index 35f8343..8481364 100644 --- a/scenes/журнал.tscn +++ b/scenes/журнал.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://trt0q8th3bn2"] -[ext_resource type="Script" path="res://scenes/журнал.gd" id="1_ifi7q"] -[ext_resource type="Script" path="res://addons/godot-logger/scripts/logger_output.gd" id="2_i478f"] +[ext_resource type="Script" path="res://scenes/журнал.gd" id="1_o4bid"] +[ext_resource type="Script" path="res://addons/godot-logger/scripts/logger_output.gd" id="2_2css8"] [node name="журнал" type="Panel"] anchors_preset = 15 @@ -13,7 +13,7 @@ offset_right = -2.0 offset_bottom = -1.0 grow_horizontal = 2 grow_vertical = 2 -script = ExtResource("1_ifi7q") +script = ExtResource("1_o4bid") [node name="content" type="RichTextLabel" parent="."] layout_mode = 0 @@ -26,7 +26,7 @@ theme_override_colors/selection_color = Color(0.72549, 0.270588, 0.133333, 1) threaded = true selection_enabled = true deselect_on_focus_loss_enabled = false -script = ExtResource("2_i478f") +script = ExtResource("2_2css8") [node name="btn_save" type="Button" parent="."] layout_mode = 0 @@ -46,8 +46,8 @@ text = "Очистить" [node name="dlg_file" type="FileDialog" parent="."] gui_embed_subwindows = true -title = "Сохранить журнал работы в файл" initial_position = 2 +title = "Сохранить журнал работы в файл" size = Vector2i(900, 900) borderless = true ok_button_text = "Да" diff --git a/scenes/работа.tscn b/scenes/работа.tscn index 4530f07..fc2712c 100644 --- a/scenes/работа.tscn +++ b/scenes/работа.tscn @@ -1,18 +1,18 @@ [gd_scene load_steps=10 format=3 uid="uid://b276iygic5itk"] -[ext_resource type="Script" path="res://scenes/работа.gd" id="1_vmjjl"] -[ext_resource type="PackedScene" uid="uid://nl1vklubr5kr" path="res://scenes/bip.tscn" id="2_ew6j4"] -[ext_resource type="PackedScene" uid="uid://dem3fcec25awh" path="res://scenes/grd_side.tscn" id="3_7lxgd"] -[ext_resource type="PackedScene" uid="uid://cnkbk53mi7viu" path="res://scenes/grd_btns.tscn" id="5_0a5o3"] -[ext_resource type="PackedScene" uid="uid://dymo732qc2doa" path="res://scenes/count_all_pad.tscn" id="6_l7wyl"] -[ext_resource type="PackedScene" uid="uid://bwti82byphl68" path="res://scenes/count_danger_pad.tscn" id="7_f41cy"] -[ext_resource type="PackedScene" uid="uid://b5kjdyxuwsot5" path="res://scenes/canvas.tscn" id="7_pvt8f"] -[ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat.tscn" id="8_r2k1p"] -[ext_resource type="PackedScene" uid="uid://0uqi1ghf7sma" path="res://scenes/btn_scale.tscn" id="8_xddop"] +[ext_resource type="Script" path="res://scenes/работа.gd" id="1_mwan0"] +[ext_resource type="PackedScene" uid="uid://nl1vklubr5kr" path="res://scenes/bip.tscn" id="2_w87w3"] +[ext_resource type="PackedScene" uid="uid://dem3fcec25awh" path="res://scenes/grd_side.tscn" id="3_a6x3x"] +[ext_resource type="PackedScene" uid="uid://b5kjdyxuwsot5" path="res://scenes/canvas.tscn" id="4_1nelj"] +[ext_resource type="PackedScene" uid="uid://cnkbk53mi7viu" path="res://scenes/grd_btns.tscn" id="5_kkt1m"] +[ext_resource type="PackedScene" uid="uid://dymo732qc2doa" path="res://scenes/count_all_pad.tscn" id="6_lribk"] +[ext_resource type="PackedScene" uid="uid://bwti82byphl68" path="res://scenes/count_danger_pad.tscn" id="7_wg1cv"] +[ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat.tscn" id="8_nxux2"] +[ext_resource type="PackedScene" uid="uid://0uqi1ghf7sma" path="res://scenes/btn_scale.tscn" id="9_qmu1r"] [node name="Работа" type="Panel"] -script = ExtResource("1_vmjjl") -Bip = ExtResource("2_ew6j4") +script = ExtResource("1_mwan0") +Bip = ExtResource("2_w87w3") col_grey = Color(0.34902, 0.643137, 0.772549, 0.168627) col_red = Color(1, 0.568627, 0.431373, 0.239216) drag_scale_band = 0.05 @@ -29,31 +29,31 @@ strob_min_width = 5.0 metadata/_edit_vertical_guides_ = [] metadata/_edit_lock_ = true -[node name="grd_side" parent="." instance=ExtResource("3_7lxgd")] +[node name="grd_side" parent="." instance=ExtResource("3_a6x3x")] layout_mode = 0 offset_left = 1114.0 offset_top = 7.0 offset_right = 1594.0 offset_bottom = 1170.0 -[node name="canvas" parent="." instance=ExtResource("7_pvt8f")] +[node name="canvas" parent="." instance=ExtResource("4_1nelj")] metadata/_edit_lock_ = true -[node name="grd_btns" parent="." instance=ExtResource("5_0a5o3")] +[node name="grd_btns" parent="." instance=ExtResource("5_kkt1m")] layout_mode = 0 offset_left = 10.0 offset_top = 1116.0 offset_right = 1106.0 offset_bottom = 1170.0 -[node name="count_all_pad" parent="." instance=ExtResource("6_l7wyl")] +[node name="count_all_pad" parent="." instance=ExtResource("6_lribk")] layout_mode = 0 offset_left = 100.0 offset_top = 117.0 offset_right = 133.0 offset_bottom = 140.0 -[node name="count_danger_pad" parent="." instance=ExtResource("7_f41cy")] +[node name="count_danger_pad" parent="." instance=ExtResource("7_wg1cv")] layout_mode = 0 offset_left = 96.0 offset_top = 29.0 @@ -85,7 +85,7 @@ offset_right = 83.0 offset_bottom = 72.0 text = "Опасных:" -[node name="btn_auto_threat" parent="." instance=ExtResource("8_r2k1p")] +[node name="btn_auto_threat" parent="." instance=ExtResource("8_nxux2")] layout_mode = 0 offset_left = 1034.0 offset_top = 7.0 @@ -95,7 +95,7 @@ size_flags_horizontal = 3 size_flags_vertical = 3 text = "Автомат" -[node name="btn_strob" parent="." instance=ExtResource("8_r2k1p")] +[node name="btn_strob" parent="." instance=ExtResource("8_nxux2")] layout_mode = 2 offset_left = 1034.0 offset_top = 67.0 @@ -106,7 +106,7 @@ size_flags_vertical = 3 tooltip_text = "Кнопка для выбора сектора при помощи клика мышкой" text = "Строб" -[node name="btn_view" parent="." instance=ExtResource("8_r2k1p")] +[node name="btn_view" parent="." instance=ExtResource("8_nxux2")] layout_mode = 2 offset_left = 874.0 offset_top = 1023.0 @@ -116,7 +116,7 @@ size_flags_horizontal = 3 size_flags_vertical = 3 text = "Вид" -[node name="btn_scale" parent="." instance=ExtResource("8_xddop")] +[node name="btn_scale" parent="." instance=ExtResource("9_qmu1r")] layout_mode = 0 offset_left = 952.0 offset_top = 1038.0 diff --git a/scenes/состояния-эмс.tscn b/scenes/состояния-эмс.tscn index 2667d5b..aa2b493 100644 --- a/scenes/состояния-эмс.tscn +++ b/scenes/состояния-эмс.tscn @@ -1,25 +1,25 @@ [gd_scene load_steps=7 format=3 uid="uid://by22sta8tt8dn"] -[ext_resource type="Script" path="res://scenes/состояния-эмс.gd" id="1_fvtic"] -[ext_resource type="Texture2D" uid="uid://belwchvdktrw0" path="res://data/эмс-бланк.png" id="2_6nlah"] -[ext_resource type="Texture2D" uid="uid://bwddxs24es81u" path="res://data/эмс-бланк-пост.png" id="3_1phdq"] -[ext_resource type="Texture2D" uid="uid://pfoscstbm025" path="res://data/эмс-бланк-перем.png" id="4_8x71b"] -[ext_resource type="Texture2D" uid="uid://dvl3sq036gn75" path="res://data/эмс-бланк-замыкание.png" id="5_rmevl"] +[ext_resource type="Script" path="res://scenes/состояния-эмс.gd" id="1_01i4u"] +[ext_resource type="Texture2D" uid="uid://belwchvdktrw0" path="res://data/эмс-бланк.png" id="2_rqcib"] +[ext_resource type="Texture2D" uid="uid://bwddxs24es81u" path="res://data/эмс-бланк-пост.png" id="3_quu6u"] +[ext_resource type="Texture2D" uid="uid://pfoscstbm025" path="res://data/эмс-бланк-перем.png" id="4_15asl"] +[ext_resource type="Texture2D" uid="uid://dvl3sq036gn75" path="res://data/эмс-бланк-замыкание.png" id="5_cwj2u"] [sub_resource type="SpriteFrames" id="SpriteFrames_ow7xh"] animations = [{ "frames": [{ "duration": 1.0, -"texture": ExtResource("2_6nlah") +"texture": ExtResource("2_rqcib") }, { "duration": 1.0, -"texture": ExtResource("3_1phdq") +"texture": ExtResource("3_quu6u") }, { "duration": 1.0, -"texture": ExtResource("4_8x71b") +"texture": ExtResource("4_15asl") }, { "duration": 1.0, -"texture": ExtResource("5_rmevl") +"texture": ExtResource("5_cwj2u") }], "loop": true, "name": &"default", @@ -35,7 +35,7 @@ offset_right = -1540.0 offset_bottom = -1182.0 grow_horizontal = 2 grow_vertical = 2 -script = ExtResource("1_fvtic") +script = ExtResource("1_01i4u") [node name="sprite" type="AnimatedSprite2D" parent="."] position = Vector2(34, 9) diff --git a/scenes/эмс.tscn b/scenes/эмс.tscn deleted file mode 100644 index 444fca6..0000000 --- a/scenes/эмс.tscn +++ /dev/null @@ -1,144 +0,0 @@ -[gd_scene load_steps=9 format=3 uid="uid://dab6loryocc73"] - -[ext_resource type="Script" path="res://scenes/эмс.gd" id="1_mk57x"] -[ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat.tscn" id="2_eju8r"] -[ext_resource type="Texture2D" uid="uid://dd60btbqnpiqw" path="res://data/document-new-0.png" id="3_w7rqa"] -[ext_resource type="Texture2D" uid="uid://coqg6wsftvtxr" path="res://data/document-save-0.png" id="4_gyaoq"] -[ext_resource type="Texture2D" uid="uid://cywuevvpkxl7v" path="res://data/edit-copy-0.png" id="5_dxpqo"] -[ext_resource type="Texture2D" uid="uid://7h55yvh84cve" path="res://data/connect.png" id="6_axj2m"] -[ext_resource type="Texture2D" uid="uid://cjsr544qccftu" path="res://data/disconnect.png" id="7_yscbq"] -[ext_resource type="Script" path="res://table/table.gd" id="8_qcl30"] - -[node name="ЭМС" type="Panel"] -offset_right = 1598.0 -offset_bottom = 1201.0 -script = ExtResource("1_mk57x") - -[node name="lbl_online" type="Label" parent="."] -layout_mode = 0 -offset_left = 30.0 -offset_top = 4.0 -offset_right = 166.0 -offset_bottom = 30.0 -theme_override_colors/font_color = Color(0, 0.647059, 0.184314, 1) -text = "Ячейка на связи" - -[node name="btn_flash_read" parent="." instance=ExtResource("2_eju8r")] -layout_mode = 0 -offset_left = 1446.0 -offset_top = 55.0 -offset_right = 1583.0 -offset_bottom = 85.0 -text = "Прочитать" - -[node name="btn_flash_write" parent="." instance=ExtResource("2_eju8r")] -layout_mode = 0 -offset_left = 1446.0 -offset_top = 99.0 -offset_right = 1583.0 -offset_bottom = 129.0 -text = "Записать" - -[node name="btn_new" type="Button" parent="."] -layout_mode = 0 -offset_left = 1453.0 -offset_top = 960.0 -offset_right = 1509.0 -offset_bottom = 1016.0 -focus_mode = 0 -shortcut_feedback = false -shortcut_in_tooltip = false -icon = ExtResource("3_w7rqa") - -[node name="btn_save" type="Button" parent="."] -layout_mode = 0 -offset_left = 1453.0 -offset_top = 1017.0 -offset_right = 1509.0 -offset_bottom = 1073.0 -focus_mode = 0 -icon = ExtResource("4_gyaoq") - -[node name="btn_copy" type="Button" parent="."] -layout_mode = 0 -offset_left = 1454.0 -offset_top = 1074.0 -offset_right = 1510.0 -offset_bottom = 1130.0 -focus_mode = 0 -icon = ExtResource("5_dxpqo") - -[node name="btn_connect" type="Button" parent="."] -layout_mode = 0 -offset_left = 627.0 -offset_top = 55.0 -offset_right = 683.0 -offset_bottom = 111.0 -focus_mode = 0 -theme_override_colors/icon_normal_color = Color(1, 1, 1, 1) -icon = ExtResource("6_axj2m") - -[node name="btn_disconnect" type="Button" parent="."] -layout_mode = 0 -offset_left = 714.0 -offset_top = 741.0 -offset_right = 770.0 -offset_bottom = 815.0 -focus_mode = 0 -theme_override_colors/icon_normal_color = Color(1, 1, 1, 1) -icon = ExtResource("7_yscbq") - -[node name="scrollin" type="ScrollContainer" parent="."] -layout_mode = 0 -offset_left = 56.0 -offset_top = 52.0 -offset_right = 641.0 -offset_bottom = 679.0 - -[node name="tbl_in" type="GridContainer" parent="scrollin"] -layout_mode = 2 -script = ExtResource("8_qcl30") - -[node name="scrl_files" type="ScrollContainer" parent="."] -layout_mode = 0 -offset_left = 1047.0 -offset_top = 962.0 -offset_right = 1442.0 -offset_bottom = 1166.0 - -[node name="tbl_files" type="GridContainer" parent="scrl_files"] -layout_mode = 2 -script = ExtResource("8_qcl30") - -[node name="scrollout" type="ScrollContainer" parent="."] -layout_mode = 0 -offset_left = 657.0 -offset_top = 50.0 -offset_right = 1351.0 -offset_bottom = 679.0 - -[node name="tbl_out" type="GridContainer" parent="scrollout"] -layout_mode = 2 -script = ExtResource("8_qcl30") - -[node name="scrl_in_set" type="ScrollContainer" parent="."] -layout_mode = 0 -offset_left = 120.0 -offset_top = 776.0 -offset_right = 703.0 -offset_bottom = 942.0 - -[node name="tbl_in_set" type="GridContainer" parent="scrl_in_set"] -layout_mode = 2 -script = ExtResource("8_qcl30") - -[node name="scrl_out_set" type="ScrollContainer" parent="."] -layout_mode = 0 -offset_left = 719.0 -offset_top = 773.0 -offset_right = 1415.0 -offset_bottom = 924.0 - -[node name="tbl_out_set" type="GridContainer" parent="scrl_out_set"] -layout_mode = 2 -script = ExtResource("8_qcl30") From 4a0323b3143b5a57648f2d6f62632096db3e01ac Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Thu, 19 Oct 2023 07:59:54 +0300 Subject: [PATCH 3/6] Godot4 --- scenes/canvas.tscn | 20 ++++++++++---------- scenes/count_all_pad.tscn | 6 +++--- scenes/sector.tscn | 4 ++-- scenes/журнал.tscn | 10 +++++----- scenes/работа.tscn | 40 +++++++++++++++++++-------------------- scenes/состояния-эмс.tscn | 20 ++++++++++---------- 6 files changed, 50 insertions(+), 50 deletions(-) diff --git a/scenes/canvas.tscn b/scenes/canvas.tscn index 8dcb94e..920c04a 100644 --- a/scenes/canvas.tscn +++ b/scenes/canvas.tscn @@ -1,16 +1,16 @@ [gd_scene load_steps=7 format=3 uid="uid://b5kjdyxuwsot5"] -[ext_resource type="Material" uid="uid://s6xe8igevnv2" path="res://shaders/shader_edu.tres" id="1_uxbga"] -[ext_resource type="Script" path="res://scenes/canvas.gd" id="2_vkwmy"] -[ext_resource type="PackedScene" uid="uid://c73ahpv8uiuc7" path="res://scenes/sector.tscn" id="3_uhdvc"] -[ext_resource type="Shader" path="res://shaders/sector.gdshader" id="4_gb4a1"] +[ext_resource type="Material" uid="uid://s6xe8igevnv2" path="res://shaders/shader_edu.tres" id="1_pga55"] +[ext_resource type="Script" path="res://scenes/canvas.gd" id="2_4el78"] +[ext_resource type="PackedScene" uid="uid://c73ahpv8uiuc7" path="res://scenes/sector.tscn" id="3_fqm6d"] +[ext_resource type="Shader" path="res://shaders/sector.gdshader" id="4_ymx7b"] [sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_2bft1"] size = Vector2(1600, 1200) -[sub_resource type="ShaderMaterial" id="ShaderMaterial_iqsw2"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_doacg"] resource_local_to_scene = true -shader = ExtResource("4_gb4a1") +shader = ExtResource("4_ymx7b") shader_parameter/color = Color(1, 1, 1, 0.168627) shader_parameter/clip_color = Color(1, 0.5, 0.5, 1) shader_parameter/width = 45.0 @@ -20,12 +20,12 @@ shader_parameter/dir = 0.08 shader_parameter/inner_clip = 0.045 [node name="canvas" type="Sprite2D"] -material = ExtResource("1_uxbga") +material = ExtResource("1_pga55") texture = SubResource("PlaceholderTexture2D_2bft1") centered = false -script = ExtResource("2_vkwmy") +script = ExtResource("2_4el78") -[node name="строб" parent="." instance=ExtResource("3_uhdvc")] -material = SubResource("ShaderMaterial_iqsw2") +[node name="строб" parent="." instance=ExtResource("3_fqm6d")] +material = SubResource("ShaderMaterial_doacg") position = Vector2(560, 560) scale = Vector2(1100, 1100) diff --git a/scenes/count_all_pad.tscn b/scenes/count_all_pad.tscn index eb2d7c5..d234fa5 100644 --- a/scenes/count_all_pad.tscn +++ b/scenes/count_all_pad.tscn @@ -1,12 +1,12 @@ [gd_scene load_steps=2 format=3 uid="uid://dymo732qc2doa"] -[ext_resource type="FontFile" uid="uid://befva8r034a4v" path="res://data/DSEG7Classic-Regular.ttf" id="1_di0yu"] +[ext_resource type="FontFile" uid="uid://befva8r034a4v" path="res://data/DSEG7Classic-Regular.ttf" id="1_lkevq"] [node name="count_all_pad" type="Label"] self_modulate = Color(0.403922, 0.403922, 0.403922, 1) offset_right = 33.0 offset_bottom = 23.0 -theme_override_fonts/font = ExtResource("1_di0yu") +theme_override_fonts/font = ExtResource("1_lkevq") theme_override_font_sizes/font_size = 20 text = "88" vertical_alignment = 1 @@ -15,7 +15,7 @@ vertical_alignment = 1 layout_mode = 0 offset_right = 33.0 offset_bottom = 23.0 -theme_override_fonts/font = ExtResource("1_di0yu") +theme_override_fonts/font = ExtResource("1_lkevq") theme_override_font_sizes/font_size = 20 text = "00" vertical_alignment = 1 diff --git a/scenes/sector.tscn b/scenes/sector.tscn index 6e7d6b9..e65c1e7 100644 --- a/scenes/sector.tscn +++ b/scenes/sector.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=4 format=3 uid="uid://c73ahpv8uiuc7"] -[ext_resource type="Shader" path="res://shaders/sector.gdshader" id="1_aikdh"] +[ext_resource type="Shader" path="res://shaders/sector.gdshader" id="1_0ypek"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_xo5or"] resource_local_to_scene = true -shader = ExtResource("1_aikdh") +shader = ExtResource("1_0ypek") shader_parameter/color = Color(1, 1, 1, 0.168627) shader_parameter/clip_color = Color(1, 0.5, 0.5, 1) shader_parameter/width = 45.0 diff --git a/scenes/журнал.tscn b/scenes/журнал.tscn index 35f8343..6d2d188 100644 --- a/scenes/журнал.tscn +++ b/scenes/журнал.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://trt0q8th3bn2"] -[ext_resource type="Script" path="res://scenes/журнал.gd" id="1_ifi7q"] -[ext_resource type="Script" path="res://addons/godot-logger/scripts/logger_output.gd" id="2_i478f"] +[ext_resource type="Script" path="res://scenes/журнал.gd" id="1_nh6ok"] +[ext_resource type="Script" path="res://addons/godot-logger/scripts/logger_output.gd" id="2_0fb07"] [node name="журнал" type="Panel"] anchors_preset = 15 @@ -13,7 +13,7 @@ offset_right = -2.0 offset_bottom = -1.0 grow_horizontal = 2 grow_vertical = 2 -script = ExtResource("1_ifi7q") +script = ExtResource("1_nh6ok") [node name="content" type="RichTextLabel" parent="."] layout_mode = 0 @@ -26,7 +26,7 @@ theme_override_colors/selection_color = Color(0.72549, 0.270588, 0.133333, 1) threaded = true selection_enabled = true deselect_on_focus_loss_enabled = false -script = ExtResource("2_i478f") +script = ExtResource("2_0fb07") [node name="btn_save" type="Button" parent="."] layout_mode = 0 @@ -46,8 +46,8 @@ text = "Очистить" [node name="dlg_file" type="FileDialog" parent="."] gui_embed_subwindows = true -title = "Сохранить журнал работы в файл" initial_position = 2 +title = "Сохранить журнал работы в файл" size = Vector2i(900, 900) borderless = true ok_button_text = "Да" diff --git a/scenes/работа.tscn b/scenes/работа.tscn index 4530f07..9fc6054 100644 --- a/scenes/работа.tscn +++ b/scenes/работа.tscn @@ -1,18 +1,18 @@ [gd_scene load_steps=10 format=3 uid="uid://b276iygic5itk"] -[ext_resource type="Script" path="res://scenes/работа.gd" id="1_vmjjl"] -[ext_resource type="PackedScene" uid="uid://nl1vklubr5kr" path="res://scenes/bip.tscn" id="2_ew6j4"] -[ext_resource type="PackedScene" uid="uid://dem3fcec25awh" path="res://scenes/grd_side.tscn" id="3_7lxgd"] -[ext_resource type="PackedScene" uid="uid://cnkbk53mi7viu" path="res://scenes/grd_btns.tscn" id="5_0a5o3"] -[ext_resource type="PackedScene" uid="uid://dymo732qc2doa" path="res://scenes/count_all_pad.tscn" id="6_l7wyl"] -[ext_resource type="PackedScene" uid="uid://bwti82byphl68" path="res://scenes/count_danger_pad.tscn" id="7_f41cy"] -[ext_resource type="PackedScene" uid="uid://b5kjdyxuwsot5" path="res://scenes/canvas.tscn" id="7_pvt8f"] -[ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat.tscn" id="8_r2k1p"] -[ext_resource type="PackedScene" uid="uid://0uqi1ghf7sma" path="res://scenes/btn_scale.tscn" id="8_xddop"] +[ext_resource type="Script" path="res://scenes/работа.gd" id="1_2ystu"] +[ext_resource type="PackedScene" uid="uid://nl1vklubr5kr" path="res://scenes/bip.tscn" id="2_lhktp"] +[ext_resource type="PackedScene" uid="uid://dem3fcec25awh" path="res://scenes/grd_side.tscn" id="3_3ca56"] +[ext_resource type="PackedScene" uid="uid://b5kjdyxuwsot5" path="res://scenes/canvas.tscn" id="4_1i71s"] +[ext_resource type="PackedScene" uid="uid://cnkbk53mi7viu" path="res://scenes/grd_btns.tscn" id="5_mlvo5"] +[ext_resource type="PackedScene" uid="uid://dymo732qc2doa" path="res://scenes/count_all_pad.tscn" id="6_5ujdv"] +[ext_resource type="PackedScene" uid="uid://bwti82byphl68" path="res://scenes/count_danger_pad.tscn" id="7_cjh6l"] +[ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat.tscn" id="8_lknwf"] +[ext_resource type="PackedScene" uid="uid://0uqi1ghf7sma" path="res://scenes/btn_scale.tscn" id="9_jmjm2"] [node name="Работа" type="Panel"] -script = ExtResource("1_vmjjl") -Bip = ExtResource("2_ew6j4") +script = ExtResource("1_2ystu") +Bip = ExtResource("2_lhktp") col_grey = Color(0.34902, 0.643137, 0.772549, 0.168627) col_red = Color(1, 0.568627, 0.431373, 0.239216) drag_scale_band = 0.05 @@ -29,31 +29,31 @@ strob_min_width = 5.0 metadata/_edit_vertical_guides_ = [] metadata/_edit_lock_ = true -[node name="grd_side" parent="." instance=ExtResource("3_7lxgd")] +[node name="grd_side" parent="." instance=ExtResource("3_3ca56")] layout_mode = 0 offset_left = 1114.0 offset_top = 7.0 offset_right = 1594.0 offset_bottom = 1170.0 -[node name="canvas" parent="." instance=ExtResource("7_pvt8f")] +[node name="canvas" parent="." instance=ExtResource("4_1i71s")] metadata/_edit_lock_ = true -[node name="grd_btns" parent="." instance=ExtResource("5_0a5o3")] +[node name="grd_btns" parent="." instance=ExtResource("5_mlvo5")] layout_mode = 0 offset_left = 10.0 offset_top = 1116.0 offset_right = 1106.0 offset_bottom = 1170.0 -[node name="count_all_pad" parent="." instance=ExtResource("6_l7wyl")] +[node name="count_all_pad" parent="." instance=ExtResource("6_5ujdv")] layout_mode = 0 offset_left = 100.0 offset_top = 117.0 offset_right = 133.0 offset_bottom = 140.0 -[node name="count_danger_pad" parent="." instance=ExtResource("7_f41cy")] +[node name="count_danger_pad" parent="." instance=ExtResource("7_cjh6l")] layout_mode = 0 offset_left = 96.0 offset_top = 29.0 @@ -85,7 +85,7 @@ offset_right = 83.0 offset_bottom = 72.0 text = "Опасных:" -[node name="btn_auto_threat" parent="." instance=ExtResource("8_r2k1p")] +[node name="btn_auto_threat" parent="." instance=ExtResource("8_lknwf")] layout_mode = 0 offset_left = 1034.0 offset_top = 7.0 @@ -95,7 +95,7 @@ size_flags_horizontal = 3 size_flags_vertical = 3 text = "Автомат" -[node name="btn_strob" parent="." instance=ExtResource("8_r2k1p")] +[node name="btn_strob" parent="." instance=ExtResource("8_lknwf")] layout_mode = 2 offset_left = 1034.0 offset_top = 67.0 @@ -106,7 +106,7 @@ size_flags_vertical = 3 tooltip_text = "Кнопка для выбора сектора при помощи клика мышкой" text = "Строб" -[node name="btn_view" parent="." instance=ExtResource("8_r2k1p")] +[node name="btn_view" parent="." instance=ExtResource("8_lknwf")] layout_mode = 2 offset_left = 874.0 offset_top = 1023.0 @@ -116,7 +116,7 @@ size_flags_horizontal = 3 size_flags_vertical = 3 text = "Вид" -[node name="btn_scale" parent="." instance=ExtResource("8_xddop")] +[node name="btn_scale" parent="." instance=ExtResource("9_jmjm2")] layout_mode = 0 offset_left = 952.0 offset_top = 1038.0 diff --git a/scenes/состояния-эмс.tscn b/scenes/состояния-эмс.tscn index 2667d5b..a0b95bc 100644 --- a/scenes/состояния-эмс.tscn +++ b/scenes/состояния-эмс.tscn @@ -1,25 +1,25 @@ [gd_scene load_steps=7 format=3 uid="uid://by22sta8tt8dn"] -[ext_resource type="Script" path="res://scenes/состояния-эмс.gd" id="1_fvtic"] -[ext_resource type="Texture2D" uid="uid://belwchvdktrw0" path="res://data/эмс-бланк.png" id="2_6nlah"] -[ext_resource type="Texture2D" uid="uid://bwddxs24es81u" path="res://data/эмс-бланк-пост.png" id="3_1phdq"] -[ext_resource type="Texture2D" uid="uid://pfoscstbm025" path="res://data/эмс-бланк-перем.png" id="4_8x71b"] -[ext_resource type="Texture2D" uid="uid://dvl3sq036gn75" path="res://data/эмс-бланк-замыкание.png" id="5_rmevl"] +[ext_resource type="Script" path="res://scenes/состояния-эмс.gd" id="1_4sp0y"] +[ext_resource type="Texture2D" uid="uid://belwchvdktrw0" path="res://data/эмс-бланк.png" id="2_a1kfw"] +[ext_resource type="Texture2D" uid="uid://bwddxs24es81u" path="res://data/эмс-бланк-пост.png" id="3_caoso"] +[ext_resource type="Texture2D" uid="uid://pfoscstbm025" path="res://data/эмс-бланк-перем.png" id="4_hoe6v"] +[ext_resource type="Texture2D" uid="uid://dvl3sq036gn75" path="res://data/эмс-бланк-замыкание.png" id="5_aogws"] [sub_resource type="SpriteFrames" id="SpriteFrames_ow7xh"] animations = [{ "frames": [{ "duration": 1.0, -"texture": ExtResource("2_6nlah") +"texture": ExtResource("2_a1kfw") }, { "duration": 1.0, -"texture": ExtResource("3_1phdq") +"texture": ExtResource("3_caoso") }, { "duration": 1.0, -"texture": ExtResource("4_8x71b") +"texture": ExtResource("4_hoe6v") }, { "duration": 1.0, -"texture": ExtResource("5_rmevl") +"texture": ExtResource("5_aogws") }], "loop": true, "name": &"default", @@ -35,7 +35,7 @@ offset_right = -1540.0 offset_bottom = -1182.0 grow_horizontal = 2 grow_vertical = 2 -script = ExtResource("1_fvtic") +script = ExtResource("1_4sp0y") [node name="sprite" type="AnimatedSprite2D" parent="."] position = Vector2(34, 9) From 0f54bcfd5c879ff622b777823b7a4b998688bd67 Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Thu, 19 Oct 2023 08:16:22 +0300 Subject: [PATCH 4/6] Godot4 --- scenes/canvas.tscn | 20 +++--- scenes/count_all_pad.tscn | 6 +- scenes/sector.tscn | 4 +- scenes/журнал.tscn | 8 +-- scenes/работа.tscn | 40 +++++------ scenes/состояния-эмс.tscn | 20 +++--- scenes/эмс.tscn | 144 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 193 insertions(+), 49 deletions(-) create mode 100644 scenes/эмс.tscn diff --git a/scenes/canvas.tscn b/scenes/canvas.tscn index 920c04a..5df1042 100644 --- a/scenes/canvas.tscn +++ b/scenes/canvas.tscn @@ -1,16 +1,16 @@ [gd_scene load_steps=7 format=3 uid="uid://b5kjdyxuwsot5"] -[ext_resource type="Material" uid="uid://s6xe8igevnv2" path="res://shaders/shader_edu.tres" id="1_pga55"] -[ext_resource type="Script" path="res://scenes/canvas.gd" id="2_4el78"] -[ext_resource type="PackedScene" uid="uid://c73ahpv8uiuc7" path="res://scenes/sector.tscn" id="3_fqm6d"] -[ext_resource type="Shader" path="res://shaders/sector.gdshader" id="4_ymx7b"] +[ext_resource type="Material" uid="uid://s6xe8igevnv2" path="res://shaders/shader_edu.tres" id="1_rlqpd"] +[ext_resource type="Script" path="res://scenes/canvas.gd" id="2_epit6"] +[ext_resource type="PackedScene" uid="uid://c73ahpv8uiuc7" path="res://scenes/sector.tscn" id="3_p4snc"] +[ext_resource type="Shader" path="res://shaders/sector.gdshader" id="4_uljjp"] [sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_2bft1"] size = Vector2(1600, 1200) -[sub_resource type="ShaderMaterial" id="ShaderMaterial_doacg"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_ekn8l"] resource_local_to_scene = true -shader = ExtResource("4_ymx7b") +shader = ExtResource("4_uljjp") shader_parameter/color = Color(1, 1, 1, 0.168627) shader_parameter/clip_color = Color(1, 0.5, 0.5, 1) shader_parameter/width = 45.0 @@ -20,12 +20,12 @@ shader_parameter/dir = 0.08 shader_parameter/inner_clip = 0.045 [node name="canvas" type="Sprite2D"] -material = ExtResource("1_pga55") +material = ExtResource("1_rlqpd") texture = SubResource("PlaceholderTexture2D_2bft1") centered = false -script = ExtResource("2_4el78") +script = ExtResource("2_epit6") -[node name="строб" parent="." instance=ExtResource("3_fqm6d")] -material = SubResource("ShaderMaterial_doacg") +[node name="строб" parent="." instance=ExtResource("3_p4snc")] +material = SubResource("ShaderMaterial_ekn8l") position = Vector2(560, 560) scale = Vector2(1100, 1100) diff --git a/scenes/count_all_pad.tscn b/scenes/count_all_pad.tscn index d234fa5..eb73072 100644 --- a/scenes/count_all_pad.tscn +++ b/scenes/count_all_pad.tscn @@ -1,12 +1,12 @@ [gd_scene load_steps=2 format=3 uid="uid://dymo732qc2doa"] -[ext_resource type="FontFile" uid="uid://befva8r034a4v" path="res://data/DSEG7Classic-Regular.ttf" id="1_lkevq"] +[ext_resource type="FontFile" uid="uid://befva8r034a4v" path="res://data/DSEG7Classic-Regular.ttf" id="1_omx3t"] [node name="count_all_pad" type="Label"] self_modulate = Color(0.403922, 0.403922, 0.403922, 1) offset_right = 33.0 offset_bottom = 23.0 -theme_override_fonts/font = ExtResource("1_lkevq") +theme_override_fonts/font = ExtResource("1_omx3t") theme_override_font_sizes/font_size = 20 text = "88" vertical_alignment = 1 @@ -15,7 +15,7 @@ vertical_alignment = 1 layout_mode = 0 offset_right = 33.0 offset_bottom = 23.0 -theme_override_fonts/font = ExtResource("1_lkevq") +theme_override_fonts/font = ExtResource("1_omx3t") theme_override_font_sizes/font_size = 20 text = "00" vertical_alignment = 1 diff --git a/scenes/sector.tscn b/scenes/sector.tscn index e65c1e7..dddbccf 100644 --- a/scenes/sector.tscn +++ b/scenes/sector.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=4 format=3 uid="uid://c73ahpv8uiuc7"] -[ext_resource type="Shader" path="res://shaders/sector.gdshader" id="1_0ypek"] +[ext_resource type="Shader" path="res://shaders/sector.gdshader" id="1_jalbg"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_xo5or"] resource_local_to_scene = true -shader = ExtResource("1_0ypek") +shader = ExtResource("1_jalbg") shader_parameter/color = Color(1, 1, 1, 0.168627) shader_parameter/clip_color = Color(1, 0.5, 0.5, 1) shader_parameter/width = 45.0 diff --git a/scenes/журнал.tscn b/scenes/журнал.tscn index 6d2d188..e811e30 100644 --- a/scenes/журнал.tscn +++ b/scenes/журнал.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://trt0q8th3bn2"] -[ext_resource type="Script" path="res://scenes/журнал.gd" id="1_nh6ok"] -[ext_resource type="Script" path="res://addons/godot-logger/scripts/logger_output.gd" id="2_0fb07"] +[ext_resource type="Script" path="res://scenes/журнал.gd" id="1_jtuvb"] +[ext_resource type="Script" path="res://addons/godot-logger/scripts/logger_output.gd" id="2_wm8il"] [node name="журнал" type="Panel"] anchors_preset = 15 @@ -13,7 +13,7 @@ offset_right = -2.0 offset_bottom = -1.0 grow_horizontal = 2 grow_vertical = 2 -script = ExtResource("1_nh6ok") +script = ExtResource("1_jtuvb") [node name="content" type="RichTextLabel" parent="."] layout_mode = 0 @@ -26,7 +26,7 @@ theme_override_colors/selection_color = Color(0.72549, 0.270588, 0.133333, 1) threaded = true selection_enabled = true deselect_on_focus_loss_enabled = false -script = ExtResource("2_0fb07") +script = ExtResource("2_wm8il") [node name="btn_save" type="Button" parent="."] layout_mode = 0 diff --git a/scenes/работа.tscn b/scenes/работа.tscn index 9fc6054..fd9e974 100644 --- a/scenes/работа.tscn +++ b/scenes/работа.tscn @@ -1,18 +1,18 @@ [gd_scene load_steps=10 format=3 uid="uid://b276iygic5itk"] -[ext_resource type="Script" path="res://scenes/работа.gd" id="1_2ystu"] -[ext_resource type="PackedScene" uid="uid://nl1vklubr5kr" path="res://scenes/bip.tscn" id="2_lhktp"] -[ext_resource type="PackedScene" uid="uid://dem3fcec25awh" path="res://scenes/grd_side.tscn" id="3_3ca56"] -[ext_resource type="PackedScene" uid="uid://b5kjdyxuwsot5" path="res://scenes/canvas.tscn" id="4_1i71s"] -[ext_resource type="PackedScene" uid="uid://cnkbk53mi7viu" path="res://scenes/grd_btns.tscn" id="5_mlvo5"] -[ext_resource type="PackedScene" uid="uid://dymo732qc2doa" path="res://scenes/count_all_pad.tscn" id="6_5ujdv"] -[ext_resource type="PackedScene" uid="uid://bwti82byphl68" path="res://scenes/count_danger_pad.tscn" id="7_cjh6l"] -[ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat.tscn" id="8_lknwf"] -[ext_resource type="PackedScene" uid="uid://0uqi1ghf7sma" path="res://scenes/btn_scale.tscn" id="9_jmjm2"] +[ext_resource type="Script" path="res://scenes/работа.gd" id="1_p02b1"] +[ext_resource type="PackedScene" uid="uid://nl1vklubr5kr" path="res://scenes/bip.tscn" id="2_ypwe8"] +[ext_resource type="PackedScene" uid="uid://dem3fcec25awh" path="res://scenes/grd_side.tscn" id="3_c0dic"] +[ext_resource type="PackedScene" uid="uid://b5kjdyxuwsot5" path="res://scenes/canvas.tscn" id="4_h6th4"] +[ext_resource type="PackedScene" uid="uid://cnkbk53mi7viu" path="res://scenes/grd_btns.tscn" id="5_6qu62"] +[ext_resource type="PackedScene" uid="uid://dymo732qc2doa" path="res://scenes/count_all_pad.tscn" id="6_slsok"] +[ext_resource type="PackedScene" uid="uid://bwti82byphl68" path="res://scenes/count_danger_pad.tscn" id="7_ueybb"] +[ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat.tscn" id="8_eofgo"] +[ext_resource type="PackedScene" uid="uid://0uqi1ghf7sma" path="res://scenes/btn_scale.tscn" id="9_gj0op"] [node name="Работа" type="Panel"] -script = ExtResource("1_2ystu") -Bip = ExtResource("2_lhktp") +script = ExtResource("1_p02b1") +Bip = ExtResource("2_ypwe8") col_grey = Color(0.34902, 0.643137, 0.772549, 0.168627) col_red = Color(1, 0.568627, 0.431373, 0.239216) drag_scale_band = 0.05 @@ -29,31 +29,31 @@ strob_min_width = 5.0 metadata/_edit_vertical_guides_ = [] metadata/_edit_lock_ = true -[node name="grd_side" parent="." instance=ExtResource("3_3ca56")] +[node name="grd_side" parent="." instance=ExtResource("3_c0dic")] layout_mode = 0 offset_left = 1114.0 offset_top = 7.0 offset_right = 1594.0 offset_bottom = 1170.0 -[node name="canvas" parent="." instance=ExtResource("4_1i71s")] +[node name="canvas" parent="." instance=ExtResource("4_h6th4")] metadata/_edit_lock_ = true -[node name="grd_btns" parent="." instance=ExtResource("5_mlvo5")] +[node name="grd_btns" parent="." instance=ExtResource("5_6qu62")] layout_mode = 0 offset_left = 10.0 offset_top = 1116.0 offset_right = 1106.0 offset_bottom = 1170.0 -[node name="count_all_pad" parent="." instance=ExtResource("6_5ujdv")] +[node name="count_all_pad" parent="." instance=ExtResource("6_slsok")] layout_mode = 0 offset_left = 100.0 offset_top = 117.0 offset_right = 133.0 offset_bottom = 140.0 -[node name="count_danger_pad" parent="." instance=ExtResource("7_cjh6l")] +[node name="count_danger_pad" parent="." instance=ExtResource("7_ueybb")] layout_mode = 0 offset_left = 96.0 offset_top = 29.0 @@ -85,7 +85,7 @@ offset_right = 83.0 offset_bottom = 72.0 text = "Опасных:" -[node name="btn_auto_threat" parent="." instance=ExtResource("8_lknwf")] +[node name="btn_auto_threat" parent="." instance=ExtResource("8_eofgo")] layout_mode = 0 offset_left = 1034.0 offset_top = 7.0 @@ -95,7 +95,7 @@ size_flags_horizontal = 3 size_flags_vertical = 3 text = "Автомат" -[node name="btn_strob" parent="." instance=ExtResource("8_lknwf")] +[node name="btn_strob" parent="." instance=ExtResource("8_eofgo")] layout_mode = 2 offset_left = 1034.0 offset_top = 67.0 @@ -106,7 +106,7 @@ size_flags_vertical = 3 tooltip_text = "Кнопка для выбора сектора при помощи клика мышкой" text = "Строб" -[node name="btn_view" parent="." instance=ExtResource("8_lknwf")] +[node name="btn_view" parent="." instance=ExtResource("8_eofgo")] layout_mode = 2 offset_left = 874.0 offset_top = 1023.0 @@ -116,7 +116,7 @@ size_flags_horizontal = 3 size_flags_vertical = 3 text = "Вид" -[node name="btn_scale" parent="." instance=ExtResource("9_jmjm2")] +[node name="btn_scale" parent="." instance=ExtResource("9_gj0op")] layout_mode = 0 offset_left = 952.0 offset_top = 1038.0 diff --git a/scenes/состояния-эмс.tscn b/scenes/состояния-эмс.tscn index a0b95bc..89ab18e 100644 --- a/scenes/состояния-эмс.tscn +++ b/scenes/состояния-эмс.tscn @@ -1,25 +1,25 @@ [gd_scene load_steps=7 format=3 uid="uid://by22sta8tt8dn"] -[ext_resource type="Script" path="res://scenes/состояния-эмс.gd" id="1_4sp0y"] -[ext_resource type="Texture2D" uid="uid://belwchvdktrw0" path="res://data/эмс-бланк.png" id="2_a1kfw"] -[ext_resource type="Texture2D" uid="uid://bwddxs24es81u" path="res://data/эмс-бланк-пост.png" id="3_caoso"] -[ext_resource type="Texture2D" uid="uid://pfoscstbm025" path="res://data/эмс-бланк-перем.png" id="4_hoe6v"] -[ext_resource type="Texture2D" uid="uid://dvl3sq036gn75" path="res://data/эмс-бланк-замыкание.png" id="5_aogws"] +[ext_resource type="Script" path="res://scenes/состояния-эмс.gd" id="1_5cq67"] +[ext_resource type="Texture2D" uid="uid://belwchvdktrw0" path="res://data/эмс-бланк.png" id="2_don4l"] +[ext_resource type="Texture2D" uid="uid://bwddxs24es81u" path="res://data/эмс-бланк-пост.png" id="3_lu634"] +[ext_resource type="Texture2D" uid="uid://pfoscstbm025" path="res://data/эмс-бланк-перем.png" id="4_b33qw"] +[ext_resource type="Texture2D" uid="uid://dvl3sq036gn75" path="res://data/эмс-бланк-замыкание.png" id="5_q2yfw"] [sub_resource type="SpriteFrames" id="SpriteFrames_ow7xh"] animations = [{ "frames": [{ "duration": 1.0, -"texture": ExtResource("2_a1kfw") +"texture": ExtResource("2_don4l") }, { "duration": 1.0, -"texture": ExtResource("3_caoso") +"texture": ExtResource("3_lu634") }, { "duration": 1.0, -"texture": ExtResource("4_hoe6v") +"texture": ExtResource("4_b33qw") }, { "duration": 1.0, -"texture": ExtResource("5_aogws") +"texture": ExtResource("5_q2yfw") }], "loop": true, "name": &"default", @@ -35,7 +35,7 @@ offset_right = -1540.0 offset_bottom = -1182.0 grow_horizontal = 2 grow_vertical = 2 -script = ExtResource("1_4sp0y") +script = ExtResource("1_5cq67") [node name="sprite" type="AnimatedSprite2D" parent="."] position = Vector2(34, 9) diff --git a/scenes/эмс.tscn b/scenes/эмс.tscn new file mode 100644 index 0000000..444fca6 --- /dev/null +++ b/scenes/эмс.tscn @@ -0,0 +1,144 @@ +[gd_scene load_steps=9 format=3 uid="uid://dab6loryocc73"] + +[ext_resource type="Script" path="res://scenes/эмс.gd" id="1_mk57x"] +[ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat.tscn" id="2_eju8r"] +[ext_resource type="Texture2D" uid="uid://dd60btbqnpiqw" path="res://data/document-new-0.png" id="3_w7rqa"] +[ext_resource type="Texture2D" uid="uid://coqg6wsftvtxr" path="res://data/document-save-0.png" id="4_gyaoq"] +[ext_resource type="Texture2D" uid="uid://cywuevvpkxl7v" path="res://data/edit-copy-0.png" id="5_dxpqo"] +[ext_resource type="Texture2D" uid="uid://7h55yvh84cve" path="res://data/connect.png" id="6_axj2m"] +[ext_resource type="Texture2D" uid="uid://cjsr544qccftu" path="res://data/disconnect.png" id="7_yscbq"] +[ext_resource type="Script" path="res://table/table.gd" id="8_qcl30"] + +[node name="ЭМС" type="Panel"] +offset_right = 1598.0 +offset_bottom = 1201.0 +script = ExtResource("1_mk57x") + +[node name="lbl_online" type="Label" parent="."] +layout_mode = 0 +offset_left = 30.0 +offset_top = 4.0 +offset_right = 166.0 +offset_bottom = 30.0 +theme_override_colors/font_color = Color(0, 0.647059, 0.184314, 1) +text = "Ячейка на связи" + +[node name="btn_flash_read" parent="." instance=ExtResource("2_eju8r")] +layout_mode = 0 +offset_left = 1446.0 +offset_top = 55.0 +offset_right = 1583.0 +offset_bottom = 85.0 +text = "Прочитать" + +[node name="btn_flash_write" parent="." instance=ExtResource("2_eju8r")] +layout_mode = 0 +offset_left = 1446.0 +offset_top = 99.0 +offset_right = 1583.0 +offset_bottom = 129.0 +text = "Записать" + +[node name="btn_new" type="Button" parent="."] +layout_mode = 0 +offset_left = 1453.0 +offset_top = 960.0 +offset_right = 1509.0 +offset_bottom = 1016.0 +focus_mode = 0 +shortcut_feedback = false +shortcut_in_tooltip = false +icon = ExtResource("3_w7rqa") + +[node name="btn_save" type="Button" parent="."] +layout_mode = 0 +offset_left = 1453.0 +offset_top = 1017.0 +offset_right = 1509.0 +offset_bottom = 1073.0 +focus_mode = 0 +icon = ExtResource("4_gyaoq") + +[node name="btn_copy" type="Button" parent="."] +layout_mode = 0 +offset_left = 1454.0 +offset_top = 1074.0 +offset_right = 1510.0 +offset_bottom = 1130.0 +focus_mode = 0 +icon = ExtResource("5_dxpqo") + +[node name="btn_connect" type="Button" parent="."] +layout_mode = 0 +offset_left = 627.0 +offset_top = 55.0 +offset_right = 683.0 +offset_bottom = 111.0 +focus_mode = 0 +theme_override_colors/icon_normal_color = Color(1, 1, 1, 1) +icon = ExtResource("6_axj2m") + +[node name="btn_disconnect" type="Button" parent="."] +layout_mode = 0 +offset_left = 714.0 +offset_top = 741.0 +offset_right = 770.0 +offset_bottom = 815.0 +focus_mode = 0 +theme_override_colors/icon_normal_color = Color(1, 1, 1, 1) +icon = ExtResource("7_yscbq") + +[node name="scrollin" type="ScrollContainer" parent="."] +layout_mode = 0 +offset_left = 56.0 +offset_top = 52.0 +offset_right = 641.0 +offset_bottom = 679.0 + +[node name="tbl_in" type="GridContainer" parent="scrollin"] +layout_mode = 2 +script = ExtResource("8_qcl30") + +[node name="scrl_files" type="ScrollContainer" parent="."] +layout_mode = 0 +offset_left = 1047.0 +offset_top = 962.0 +offset_right = 1442.0 +offset_bottom = 1166.0 + +[node name="tbl_files" type="GridContainer" parent="scrl_files"] +layout_mode = 2 +script = ExtResource("8_qcl30") + +[node name="scrollout" type="ScrollContainer" parent="."] +layout_mode = 0 +offset_left = 657.0 +offset_top = 50.0 +offset_right = 1351.0 +offset_bottom = 679.0 + +[node name="tbl_out" type="GridContainer" parent="scrollout"] +layout_mode = 2 +script = ExtResource("8_qcl30") + +[node name="scrl_in_set" type="ScrollContainer" parent="."] +layout_mode = 0 +offset_left = 120.0 +offset_top = 776.0 +offset_right = 703.0 +offset_bottom = 942.0 + +[node name="tbl_in_set" type="GridContainer" parent="scrl_in_set"] +layout_mode = 2 +script = ExtResource("8_qcl30") + +[node name="scrl_out_set" type="ScrollContainer" parent="."] +layout_mode = 0 +offset_left = 719.0 +offset_top = 773.0 +offset_right = 1415.0 +offset_bottom = 924.0 + +[node name="tbl_out_set" type="GridContainer" parent="scrl_out_set"] +layout_mode = 2 +script = ExtResource("8_qcl30") From c6b3ed55e26207c43140bccaf63f27a16f92e0b3 Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Fri, 27 Oct 2023 11:38:54 +0300 Subject: [PATCH 5/6] =?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=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D1=8C=20=D0=BA=D0=BB=D0=B8=D0=BA=D0=B0=20=D0=BF?= =?UTF-8?q?=D0=BE=20=D0=BE=D1=82=D0=BC=D0=B5=D1=82=D0=BA=D0=B5=20=D1=86?= =?UTF-8?q?=D0=B5=D0=BB=D0=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/bip.gd | 15 +++++++++++++++ scenes/bip.tscn | 33 +++++++++++++++++++++++++++------ scenes/btn_scale.tscn | 4 ++-- scenes/canvas.tscn | 20 ++++++++++---------- scenes/tab-switch.tscn | 24 ++++++++++++------------ scenes/работа.gd | 2 +- scenes/работа.tscn | 42 +++++++++++++++++++++--------------------- 7 files changed, 88 insertions(+), 52 deletions(-) create mode 100644 scenes/bip.gd diff --git a/scenes/bip.gd b/scenes/bip.gd new file mode 100644 index 0000000..7bc087d --- /dev/null +++ b/scenes/bip.gd @@ -0,0 +1,15 @@ +extends TextureButton + + +# Called when the node enters the scene tree for the first time. +func _ready(): + pass # Replace with function body. + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(delta): + pass + + +func _on_pressed(): + print_debug('Click') diff --git a/scenes/bip.tscn b/scenes/bip.tscn index 66305c6..a7e6859 100644 --- a/scenes/bip.tscn +++ b/scenes/bip.tscn @@ -1,16 +1,37 @@ -[gd_scene load_steps=4 format=3 uid="uid://nl1vklubr5kr"] +[gd_scene load_steps=5 format=3 uid="uid://nl1vklubr5kr"] -[ext_resource type="Shader" path="res://shaders/bip.gdshader" id="1_k6vue"] +[ext_resource type="Shader" path="res://shaders/bip_test.gdshader" id="1_qbah6"] +[ext_resource type="Script" path="res://scenes/bip.gd" id="2_77mbp"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_2dulj"] -shader = ExtResource("1_k6vue") +shader = ExtResource("1_qbah6") shader_parameter/color = Color(1, 0.101961, 0.494118, 1) shader_parameter/color_up = Color(1, 1, 1, 1) shader_parameter/tick_update = 0 +shader_parameter/width = 59.5 +shader_parameter/band = 0.045 +shader_parameter/sec_radius = 0.08 +shader_parameter/dir = 0.0 +shader_parameter/inner_clip = 0.055 -[sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_tgf76"] +[sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_w5pye"] -[node name="bip" type="Sprite2D"] +[node name="Control" type="Control"] +layout_mode = 3 +anchors_preset = 0 +offset_right = 31.0 +offset_bottom = 30.0 + +[node name="bip" type="TextureButton" parent="."] material = SubResource("ShaderMaterial_2dulj") +layout_mode = 0 +offset_left = -15.0 +offset_top = -15.0 +offset_right = -12.0 +offset_bottom = -12.0 scale = Vector2(10, 10) -texture = SubResource("PlaceholderTexture2D_tgf76") +texture_normal = SubResource("PlaceholderTexture2D_w5pye") +stretch_mode = 3 +script = ExtResource("2_77mbp") + +[connection signal="pressed" from="bip" to="bip" method="_on_pressed"] diff --git a/scenes/btn_scale.tscn b/scenes/btn_scale.tscn index 51f9920..d2df508 100644 --- a/scenes/btn_scale.tscn +++ b/scenes/btn_scale.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://0uqi1ghf7sma"] -[ext_resource type="Texture2D" uid="uid://c1maea6yhd3k7" path="res://data/кнопка-масштаб.png" id="1_yxc3k"] +[ext_resource type="Texture2D" uid="uid://c1maea6yhd3k7" path="res://data/кнопка-масштаб.png" id="1_iq7o5"] [node name="btn_scale" type="TextureButton"] self_modulate = Color(1, 1, 1, 0.509804) @@ -8,7 +8,7 @@ offset_right = 152.0 offset_bottom = 18.0 tooltip_text = "Измененяет масштаб" action_mode = 0 -texture_normal = ExtResource("1_yxc3k") +texture_normal = ExtResource("1_iq7o5") ignore_texture_size = true stretch_mode = 0 metadata/i_scale = 0 diff --git a/scenes/canvas.tscn b/scenes/canvas.tscn index 5df1042..4d81dc8 100644 --- a/scenes/canvas.tscn +++ b/scenes/canvas.tscn @@ -1,16 +1,16 @@ [gd_scene load_steps=7 format=3 uid="uid://b5kjdyxuwsot5"] -[ext_resource type="Material" uid="uid://s6xe8igevnv2" path="res://shaders/shader_edu.tres" id="1_rlqpd"] -[ext_resource type="Script" path="res://scenes/canvas.gd" id="2_epit6"] -[ext_resource type="PackedScene" uid="uid://c73ahpv8uiuc7" path="res://scenes/sector.tscn" id="3_p4snc"] -[ext_resource type="Shader" path="res://shaders/sector.gdshader" id="4_uljjp"] +[ext_resource type="Material" uid="uid://s6xe8igevnv2" path="res://shaders/shader_edu.tres" id="1_svpxu"] +[ext_resource type="Script" path="res://scenes/canvas.gd" id="2_vajef"] +[ext_resource type="PackedScene" uid="uid://c73ahpv8uiuc7" path="res://scenes/sector.tscn" id="3_dswe7"] +[ext_resource type="Shader" path="res://shaders/sector.gdshader" id="4_hx35l"] [sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_2bft1"] size = Vector2(1600, 1200) -[sub_resource type="ShaderMaterial" id="ShaderMaterial_ekn8l"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_ctwvi"] resource_local_to_scene = true -shader = ExtResource("4_uljjp") +shader = ExtResource("4_hx35l") shader_parameter/color = Color(1, 1, 1, 0.168627) shader_parameter/clip_color = Color(1, 0.5, 0.5, 1) shader_parameter/width = 45.0 @@ -20,12 +20,12 @@ shader_parameter/dir = 0.08 shader_parameter/inner_clip = 0.045 [node name="canvas" type="Sprite2D"] -material = ExtResource("1_rlqpd") +material = ExtResource("1_svpxu") texture = SubResource("PlaceholderTexture2D_2bft1") centered = false -script = ExtResource("2_epit6") +script = ExtResource("2_vajef") -[node name="строб" parent="." instance=ExtResource("3_p4snc")] -material = SubResource("ShaderMaterial_ekn8l") +[node name="строб" parent="." instance=ExtResource("3_dswe7")] +material = SubResource("ShaderMaterial_ctwvi") position = Vector2(560, 560) scale = Vector2(1100, 1100) diff --git a/scenes/tab-switch.tscn b/scenes/tab-switch.tscn index ebe4bce..0747d5c 100644 --- a/scenes/tab-switch.tscn +++ b/scenes/tab-switch.tscn @@ -1,32 +1,32 @@ [gd_scene load_steps=7 format=3 uid="uid://3slb0i3pvowc"] -[ext_resource type="Script" path="res://scenes/tab-switch.gd" id="1_jjaev"] -[ext_resource type="PackedScene" uid="uid://b276iygic5itk" path="res://scenes/работа.tscn" id="2_ottu4"] -[ext_resource type="PackedScene" uid="uid://lwmw4egynmd1" path="res://scenes/контроль.tscn" id="3_50u6g"] -[ext_resource type="PackedScene" uid="uid://trt0q8th3bn2" path="res://scenes/журнал.tscn" id="4_jbm5n"] -[ext_resource type="PackedScene" uid="uid://dab6loryocc73" path="res://scenes/эмс.tscn" id="5_014x4"] -[ext_resource type="PackedScene" uid="uid://bnptm4rlp60dq" path="res://scenes/настройки.tscn" id="6_06u87"] +[ext_resource type="Script" path="res://scenes/tab-switch.gd" id="1_be4as"] +[ext_resource type="PackedScene" uid="uid://b276iygic5itk" path="res://scenes/работа.tscn" id="2_eikhn"] +[ext_resource type="PackedScene" uid="uid://lwmw4egynmd1" path="res://scenes/контроль.tscn" id="3_voomf"] +[ext_resource type="PackedScene" uid="uid://trt0q8th3bn2" path="res://scenes/журнал.tscn" id="4_gwdwv"] +[ext_resource type="PackedScene" uid="uid://dab6loryocc73" path="res://scenes/эмс.tscn" id="5_lqysn"] +[ext_resource type="PackedScene" uid="uid://bnptm4rlp60dq" path="res://scenes/настройки.tscn" id="6_aelvp"] [node name="tab_switch" type="TabContainer"] offset_right = 1600.0 offset_bottom = 1200.0 -script = ExtResource("1_jjaev") +script = ExtResource("1_be4as") -[node name="Работа" parent="." instance=ExtResource("2_ottu4")] +[node name="Работа" parent="." instance=ExtResource("2_eikhn")] layout_mode = 2 -[node name="Контроль" parent="." instance=ExtResource("3_50u6g")] +[node name="Контроль" parent="." instance=ExtResource("3_voomf")] visible = false layout_mode = 2 -[node name="Журнал" parent="." instance=ExtResource("4_jbm5n")] +[node name="Журнал" parent="." instance=ExtResource("4_gwdwv")] visible = false layout_mode = 2 -[node name="ЭМС" parent="." instance=ExtResource("5_014x4")] +[node name="ЭМС" parent="." instance=ExtResource("5_lqysn")] visible = false layout_mode = 2 -[node name="Настройки" parent="." instance=ExtResource("6_06u87")] +[node name="Настройки" parent="." instance=ExtResource("6_aelvp")] visible = false layout_mode = 2 diff --git a/scenes/работа.gd b/scenes/работа.gd index 24a0cad..2aabd7f 100644 --- a/scenes/работа.gd +++ b/scenes/работа.gd @@ -66,7 +66,7 @@ func _ready(): ## Производит отображение цели на диаграмму -func map_threat_to_bip(th: threats.Threat, bip: Sprite2D): +func map_threat_to_bip(th: threats.Threat, bip: Control): bip.position = tools.pos_calc( th.freq, th.aoa, diff --git a/scenes/работа.tscn b/scenes/работа.tscn index fd9e974..69ebca2 100644 --- a/scenes/работа.tscn +++ b/scenes/работа.tscn @@ -1,24 +1,24 @@ [gd_scene load_steps=10 format=3 uid="uid://b276iygic5itk"] -[ext_resource type="Script" path="res://scenes/работа.gd" id="1_p02b1"] -[ext_resource type="PackedScene" uid="uid://nl1vklubr5kr" path="res://scenes/bip.tscn" id="2_ypwe8"] -[ext_resource type="PackedScene" uid="uid://dem3fcec25awh" path="res://scenes/grd_side.tscn" id="3_c0dic"] -[ext_resource type="PackedScene" uid="uid://b5kjdyxuwsot5" path="res://scenes/canvas.tscn" id="4_h6th4"] -[ext_resource type="PackedScene" uid="uid://cnkbk53mi7viu" path="res://scenes/grd_btns.tscn" id="5_6qu62"] -[ext_resource type="PackedScene" uid="uid://dymo732qc2doa" path="res://scenes/count_all_pad.tscn" id="6_slsok"] -[ext_resource type="PackedScene" uid="uid://bwti82byphl68" path="res://scenes/count_danger_pad.tscn" id="7_ueybb"] -[ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat.tscn" id="8_eofgo"] -[ext_resource type="PackedScene" uid="uid://0uqi1ghf7sma" path="res://scenes/btn_scale.tscn" id="9_gj0op"] +[ext_resource type="Script" path="res://scenes/работа.gd" id="1_hmu4p"] +[ext_resource type="PackedScene" uid="uid://nl1vklubr5kr" path="res://scenes/bip.tscn" id="2_cn3uy"] +[ext_resource type="PackedScene" uid="uid://dem3fcec25awh" path="res://scenes/grd_side.tscn" id="3_2eau6"] +[ext_resource type="PackedScene" uid="uid://b5kjdyxuwsot5" path="res://scenes/canvas.tscn" id="4_acmpi"] +[ext_resource type="PackedScene" uid="uid://cnkbk53mi7viu" path="res://scenes/grd_btns.tscn" id="5_2dg76"] +[ext_resource type="PackedScene" uid="uid://dymo732qc2doa" path="res://scenes/count_all_pad.tscn" id="6_nbfk8"] +[ext_resource type="PackedScene" uid="uid://bwti82byphl68" path="res://scenes/count_danger_pad.tscn" id="7_q8b60"] +[ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat.tscn" id="8_txl8n"] +[ext_resource type="PackedScene" uid="uid://0uqi1ghf7sma" path="res://scenes/btn_scale.tscn" id="9_4ie8q"] [node name="Работа" type="Panel"] -script = ExtResource("1_p02b1") -Bip = ExtResource("2_ypwe8") +script = ExtResource("1_hmu4p") +Bip = ExtResource("2_cn3uy") col_grey = Color(0.34902, 0.643137, 0.772549, 0.168627) col_red = Color(1, 0.568627, 0.431373, 0.239216) drag_scale_band = 0.05 drag_scale_width = 0.5 freq_high = 6000.0 -freq_low = 200.0 +freq_low = 400.0 radius_center = Vector2(560, 560) radius_internal = 200.0 radius_outter = 550.0 @@ -29,31 +29,31 @@ strob_min_width = 5.0 metadata/_edit_vertical_guides_ = [] metadata/_edit_lock_ = true -[node name="grd_side" parent="." instance=ExtResource("3_c0dic")] +[node name="grd_side" parent="." instance=ExtResource("3_2eau6")] layout_mode = 0 offset_left = 1114.0 offset_top = 7.0 offset_right = 1594.0 offset_bottom = 1170.0 -[node name="canvas" parent="." instance=ExtResource("4_h6th4")] +[node name="canvas" parent="." instance=ExtResource("4_acmpi")] metadata/_edit_lock_ = true -[node name="grd_btns" parent="." instance=ExtResource("5_6qu62")] +[node name="grd_btns" parent="." instance=ExtResource("5_2dg76")] layout_mode = 0 offset_left = 10.0 offset_top = 1116.0 offset_right = 1106.0 offset_bottom = 1170.0 -[node name="count_all_pad" parent="." instance=ExtResource("6_slsok")] +[node name="count_all_pad" parent="." instance=ExtResource("6_nbfk8")] layout_mode = 0 offset_left = 100.0 offset_top = 117.0 offset_right = 133.0 offset_bottom = 140.0 -[node name="count_danger_pad" parent="." instance=ExtResource("7_ueybb")] +[node name="count_danger_pad" parent="." instance=ExtResource("7_q8b60")] layout_mode = 0 offset_left = 96.0 offset_top = 29.0 @@ -85,7 +85,7 @@ offset_right = 83.0 offset_bottom = 72.0 text = "Опасных:" -[node name="btn_auto_threat" parent="." instance=ExtResource("8_eofgo")] +[node name="btn_auto_threat" parent="." instance=ExtResource("8_txl8n")] layout_mode = 0 offset_left = 1034.0 offset_top = 7.0 @@ -95,7 +95,7 @@ size_flags_horizontal = 3 size_flags_vertical = 3 text = "Автомат" -[node name="btn_strob" parent="." instance=ExtResource("8_eofgo")] +[node name="btn_strob" parent="." instance=ExtResource("8_txl8n")] layout_mode = 2 offset_left = 1034.0 offset_top = 67.0 @@ -106,7 +106,7 @@ size_flags_vertical = 3 tooltip_text = "Кнопка для выбора сектора при помощи клика мышкой" text = "Строб" -[node name="btn_view" parent="." instance=ExtResource("8_eofgo")] +[node name="btn_view" parent="." instance=ExtResource("8_txl8n")] layout_mode = 2 offset_left = 874.0 offset_top = 1023.0 @@ -116,7 +116,7 @@ size_flags_horizontal = 3 size_flags_vertical = 3 text = "Вид" -[node name="btn_scale" parent="." instance=ExtResource("9_gj0op")] +[node name="btn_scale" parent="." instance=ExtResource("9_4ie8q")] layout_mode = 0 offset_left = 952.0 offset_top = 1038.0 From 668a9cdc5ba75b482ebfe4267ffc87a4ce15319a Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Thu, 2 Nov 2023 15:50:12 +0300 Subject: [PATCH 6/6] =?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=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=D1=82=D0=BE=D1=82=D0=BC=D0=B5=D1=82=D0=BE=D0=BA=20?= =?UTF-8?q?=D1=86=D0=B5=D0=BB=D0=B5=D0=B9=20=D0=B2=D0=B7=D1=8F=D1=82=D1=8B?= =?UTF-8?q?=D1=85=20=D0=BD=D0=B0=20=D1=81=D0=BE=D0=BF=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=BE=D0=B6=D0=B4=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B8=20=D1=80?= =?UTF-8?q?=D0=B5=D0=BA=D0=BE=D0=BC=D0=B5=D0=BD=D0=B4=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D0=BD=D0=BD=D1=8B=D1=85=20=D1=86=D0=B5=D0=BB=D0=B5=D0=B9.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/bip.gd | 2 +- scenes/bip.tscn | 162 +++++++++++++++++++++++++++++++++---- scenes/btn_scale.tscn | 4 +- scenes/canvas.tscn | 22 ++--- scenes/tab-switch.tscn | 24 +++--- scenes/работа.tscn | 40 ++++----- scripts/threats.gd | 1 + shaders/bip.gdshader | 2 +- shaders/select_tr.gdshader | 80 ++++++++++++++++++ shaders/tracked.gdshader | 80 ++++++++++++++++++ 10 files changed, 355 insertions(+), 62 deletions(-) create mode 100644 shaders/select_tr.gdshader create mode 100644 shaders/tracked.gdshader diff --git a/scenes/bip.gd b/scenes/bip.gd index 7bc087d..94badd2 100644 --- a/scenes/bip.gd +++ b/scenes/bip.gd @@ -1,4 +1,4 @@ -extends TextureButton +extends Control # Called when the node enters the scene tree for the first time. diff --git a/scenes/bip.tscn b/scenes/bip.tscn index a7e6859..9980797 100644 --- a/scenes/bip.tscn +++ b/scenes/bip.tscn @@ -1,37 +1,169 @@ -[gd_scene load_steps=5 format=3 uid="uid://nl1vklubr5kr"] +[gd_scene load_steps=12 format=3 uid="uid://nl1vklubr5kr"] -[ext_resource type="Shader" path="res://shaders/bip_test.gdshader" id="1_qbah6"] -[ext_resource type="Script" path="res://scenes/bip.gd" id="2_77mbp"] +[ext_resource type="Script" path="res://scenes/bip.gd" id="1_23kyy"] +[ext_resource type="Shader" path="res://shaders/bip.gdshader" id="2_w4jcf"] +[ext_resource type="Shader" path="res://shaders/tracked.gdshader" id="3_d16rn"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_2dulj"] -shader = ExtResource("1_qbah6") -shader_parameter/color = Color(1, 0.101961, 0.494118, 1) +shader = ExtResource("2_w4jcf") +shader_parameter/color = Color(0.972549, 0.12549, 0.411765, 1) shader_parameter/color_up = Color(1, 1, 1, 1) shader_parameter/tick_update = 0 -shader_parameter/width = 59.5 -shader_parameter/band = 0.045 -shader_parameter/sec_radius = 0.08 -shader_parameter/dir = 0.0 -shader_parameter/inner_clip = 0.055 [sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_w5pye"] +[sub_resource type="Shader" id="Shader_60ho7"] +code = "shader_type canvas_item; + +uniform vec4 color: source_color = vec4(1, 1, 1, 1); +uniform vec4 color_up: source_color = vec4(1, 1, 1, 1); /* Цвет вспышки при обновлении */ +const float ds = 0.00725; /* Относительное расстояние на котором выполняется сглаживание краёв */ +const float dsr = 6.125; +const vec2 center = vec2(0.5, 0.5); /* Центр должен быть в (0.5, 0.5), но это не так */ +const float radius = 0.075 - ds * 2.0; /* Радиус должен быть 0.5, но это не так */ + +uniform float speed: hint_range(-1024.0, 1024.0) = 0.0; /* Время вспышки при обновлении, c */ +uniform int ant_band_count_0 = 3; + +const float ant_band_r0_0 = 0.3; + +const float ant_band_r1_0 = 0.4; + +float smooth_px(float r, float R, float dss) +{ + return 1.0 - smoothstep(R - dss, R + dss, r); +} + +void sector(inout vec4 c, vec2 uv, vec2 cnt, float a, float da, float r0, float r1, vec4 col) +{ + float l = distance(cnt, uv); + vec2 d = uv - cnt; + float sf = 500.0; + float theta = atan(d.x, d.y) * sf; + da /= 2.0; + float a0 = radians(a - da); + float a1 = radians(a + da); + float va = smooth_px(a0 * sf, theta, dsr) - smooth_px(a1 * sf, theta, dsr); + float vr = smooth_px(r0, l, ds) - smooth_px(r1, l, ds); + float rgb = sqrt(va * vr); + c.rgb += col.rgb * rgb * col.a; + c.a += rgb * col.a; +} + + +void antenas(inout vec4 c, vec2 uv, vec2 p0, int cnt, float r0, float r1, vec4 c0, vec4 c1) +{ + float da = 180.0f / float(cnt); + for (int i = -cnt; i <= cnt; i ++) + { + float v = float(i & 1); + vec4 col = v * c0 + (1.0f - v) * c1; + sector(c, uv, p0, float(i) * da, da, r0, r1, col); + } +} + +vec2 rotateUVmatrinx(vec2 uv, vec2 pivot, float rotation) +{ + mat2 rotation_matrix=mat2( vec2(sin(rotation),-cos(rotation)), + vec2(cos(rotation),sin(rotation)) + ); + uv -= pivot; + uv *= rotation_matrix; + uv += pivot; + return uv; +} + + +void vertex() +{ + float dir = 0.0; + dir += speed * TIME; + VERTEX = rotateUVmatrinx(VERTEX, center, radians(dir)); +} + + + +void fragment() +{ + + ivec2 isz = textureSize(TEXTURE, 0); + vec2 uv = UV * vec2(float(isz.x), float(isz.y)); // координаты текущей точки в пикселях + COLOR = vec4(0, 0, 0, 0.0); //texture(TEXTURE, UV); // Цвет текущей точки + + // Сетка антенн + antenas(COLOR, uv, center, ant_band_count_0, ant_band_r0_0, ant_band_r1_0, color, color_up); +} +" + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_fkqwb"] +shader = SubResource("Shader_60ho7") +shader_parameter/color = Color(1, 1, 1, 0.968627) +shader_parameter/color_up = Color(1, 1, 1, 0) +shader_parameter/speed = 73.0 +shader_parameter/ant_band_count_0 = 3 + +[sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_hqs6j"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_lpmq6"] +shader = SubResource("Shader_60ho7") +shader_parameter/color = Color(0.0862745, 0.560784, 0.72549, 0.886275) +shader_parameter/color_up = Color(1, 1, 1, 0) +shader_parameter/speed = -73.0 +shader_parameter/ant_band_count_0 = 9 + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_lkrha"] +shader = ExtResource("3_d16rn") +shader_parameter/ColorFig = Color(0, 0.862745, 0, 1) +shader_parameter/point_1 = Vector2(0.125, 0) +shader_parameter/point_2 = Vector2(0.125, 0.036) +shader_parameter/point_3 = Vector2(0, 0.125) +shader_parameter/point_4 = Vector2(0.036, 0.125) +shader_parameter/point_5 = Vector2(0.214, 0.125) +shader_parameter/point_6 = Vector2(0.25, 0.125) +shader_parameter/point_7 = Vector2(0.125, 0.214) +shader_parameter/point_8 = Vector2(0.125, 0.25) +shader_parameter/len = 0.264 +shader_parameter/speed = 71.0 + +[sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_svd33"] + [node name="Control" type="Control"] layout_mode = 3 anchors_preset = 0 offset_right = 31.0 offset_bottom = 30.0 +script = ExtResource("1_23kyy") [node name="bip" type="TextureButton" parent="."] material = SubResource("ShaderMaterial_2dulj") +layout_direction = 1 layout_mode = 0 -offset_left = -15.0 -offset_top = -15.0 -offset_right = -12.0 -offset_bottom = -12.0 +offset_right = 3.0 +offset_bottom = 3.0 scale = Vector2(10, 10) texture_normal = SubResource("PlaceholderTexture2D_w5pye") stretch_mode = 3 -script = ExtResource("2_77mbp") +script = ExtResource("1_23kyy") + +[node name="selector" type="Sprite2D" parent="."] +visible = false +material = SubResource("ShaderMaterial_fkqwb") +position = Vector2(10, 10) +scale = Vector2(10, 10) +texture = SubResource("PlaceholderTexture2D_hqs6j") +centered = false + +[node name="recomendation" type="Sprite2D" parent="."] +material = SubResource("ShaderMaterial_lpmq6") +position = Vector2(10, 10) +scale = Vector2(10, 10) +texture = SubResource("PlaceholderTexture2D_hqs6j") +centered = false + +[node name="track" type="Sprite2D" parent="."] +material = SubResource("ShaderMaterial_lkrha") +position = Vector2(15, 15) +scale = Vector2(13, 13) +texture = SubResource("PlaceholderTexture2D_svd33") [connection signal="pressed" from="bip" to="bip" method="_on_pressed"] diff --git a/scenes/btn_scale.tscn b/scenes/btn_scale.tscn index d2df508..9611706 100644 --- a/scenes/btn_scale.tscn +++ b/scenes/btn_scale.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://0uqi1ghf7sma"] -[ext_resource type="Texture2D" uid="uid://c1maea6yhd3k7" path="res://data/кнопка-масштаб.png" id="1_iq7o5"] +[ext_resource type="Texture2D" uid="uid://c1maea6yhd3k7" path="res://data/кнопка-масштаб.png" id="1_r871k"] [node name="btn_scale" type="TextureButton"] self_modulate = Color(1, 1, 1, 0.509804) @@ -8,7 +8,7 @@ offset_right = 152.0 offset_bottom = 18.0 tooltip_text = "Измененяет масштаб" action_mode = 0 -texture_normal = ExtResource("1_iq7o5") +texture_normal = ExtResource("1_r871k") ignore_texture_size = true stretch_mode = 0 metadata/i_scale = 0 diff --git a/scenes/canvas.tscn b/scenes/canvas.tscn index 4d81dc8..1302ada 100644 --- a/scenes/canvas.tscn +++ b/scenes/canvas.tscn @@ -1,31 +1,31 @@ [gd_scene load_steps=7 format=3 uid="uid://b5kjdyxuwsot5"] -[ext_resource type="Material" uid="uid://s6xe8igevnv2" path="res://shaders/shader_edu.tres" id="1_svpxu"] -[ext_resource type="Script" path="res://scenes/canvas.gd" id="2_vajef"] -[ext_resource type="PackedScene" uid="uid://c73ahpv8uiuc7" path="res://scenes/sector.tscn" id="3_dswe7"] -[ext_resource type="Shader" path="res://shaders/sector.gdshader" id="4_hx35l"] +[ext_resource type="Material" uid="uid://s6xe8igevnv2" path="res://shaders/shader_edu.tres" id="1_27ax3"] +[ext_resource type="Script" path="res://scenes/canvas.gd" id="2_5wost"] +[ext_resource type="PackedScene" uid="uid://c73ahpv8uiuc7" path="res://scenes/sector.tscn" id="3_rminv"] +[ext_resource type="Shader" path="res://shaders/sector.gdshader" id="4_nkch3"] [sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_2bft1"] size = Vector2(1600, 1200) -[sub_resource type="ShaderMaterial" id="ShaderMaterial_ctwvi"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_vipcu"] resource_local_to_scene = true -shader = ExtResource("4_hx35l") +shader = ExtResource("4_nkch3") shader_parameter/color = Color(1, 1, 1, 0.168627) shader_parameter/clip_color = Color(1, 0.5, 0.5, 1) shader_parameter/width = 45.0 shader_parameter/band = 0.02 shader_parameter/radius = 0.08 -shader_parameter/dir = 0.08 +shader_parameter/dir = 0.0 shader_parameter/inner_clip = 0.045 [node name="canvas" type="Sprite2D"] -material = ExtResource("1_svpxu") +material = ExtResource("1_27ax3") texture = SubResource("PlaceholderTexture2D_2bft1") centered = false -script = ExtResource("2_vajef") +script = ExtResource("2_5wost") -[node name="строб" parent="." instance=ExtResource("3_dswe7")] -material = SubResource("ShaderMaterial_ctwvi") +[node name="строб" parent="." instance=ExtResource("3_rminv")] +material = SubResource("ShaderMaterial_vipcu") position = Vector2(560, 560) scale = Vector2(1100, 1100) diff --git a/scenes/tab-switch.tscn b/scenes/tab-switch.tscn index 0747d5c..99a7f33 100644 --- a/scenes/tab-switch.tscn +++ b/scenes/tab-switch.tscn @@ -1,32 +1,32 @@ [gd_scene load_steps=7 format=3 uid="uid://3slb0i3pvowc"] -[ext_resource type="Script" path="res://scenes/tab-switch.gd" id="1_be4as"] -[ext_resource type="PackedScene" uid="uid://b276iygic5itk" path="res://scenes/работа.tscn" id="2_eikhn"] -[ext_resource type="PackedScene" uid="uid://lwmw4egynmd1" path="res://scenes/контроль.tscn" id="3_voomf"] -[ext_resource type="PackedScene" uid="uid://trt0q8th3bn2" path="res://scenes/журнал.tscn" id="4_gwdwv"] -[ext_resource type="PackedScene" uid="uid://dab6loryocc73" path="res://scenes/эмс.tscn" id="5_lqysn"] -[ext_resource type="PackedScene" uid="uid://bnptm4rlp60dq" path="res://scenes/настройки.tscn" id="6_aelvp"] +[ext_resource type="Script" path="res://scenes/tab-switch.gd" id="1_tn6rq"] +[ext_resource type="PackedScene" uid="uid://b276iygic5itk" path="res://scenes/работа.tscn" id="2_vgolr"] +[ext_resource type="PackedScene" uid="uid://lwmw4egynmd1" path="res://scenes/контроль.tscn" id="3_pwwde"] +[ext_resource type="PackedScene" uid="uid://trt0q8th3bn2" path="res://scenes/журнал.tscn" id="4_4hfhr"] +[ext_resource type="PackedScene" uid="uid://dab6loryocc73" path="res://scenes/эмс.tscn" id="5_5gqgu"] +[ext_resource type="PackedScene" uid="uid://bnptm4rlp60dq" path="res://scenes/настройки.tscn" id="6_v5404"] [node name="tab_switch" type="TabContainer"] offset_right = 1600.0 offset_bottom = 1200.0 -script = ExtResource("1_be4as") +script = ExtResource("1_tn6rq") -[node name="Работа" parent="." instance=ExtResource("2_eikhn")] +[node name="Работа" parent="." instance=ExtResource("2_vgolr")] layout_mode = 2 -[node name="Контроль" parent="." instance=ExtResource("3_voomf")] +[node name="Контроль" parent="." instance=ExtResource("3_pwwde")] visible = false layout_mode = 2 -[node name="Журнал" parent="." instance=ExtResource("4_gwdwv")] +[node name="Журнал" parent="." instance=ExtResource("4_4hfhr")] visible = false layout_mode = 2 -[node name="ЭМС" parent="." instance=ExtResource("5_lqysn")] +[node name="ЭМС" parent="." instance=ExtResource("5_5gqgu")] visible = false layout_mode = 2 -[node name="Настройки" parent="." instance=ExtResource("6_aelvp")] +[node name="Настройки" parent="." instance=ExtResource("6_v5404")] visible = false layout_mode = 2 diff --git a/scenes/работа.tscn b/scenes/работа.tscn index 69ebca2..197f1c6 100644 --- a/scenes/работа.tscn +++ b/scenes/работа.tscn @@ -1,18 +1,18 @@ [gd_scene load_steps=10 format=3 uid="uid://b276iygic5itk"] -[ext_resource type="Script" path="res://scenes/работа.gd" id="1_hmu4p"] -[ext_resource type="PackedScene" uid="uid://nl1vklubr5kr" path="res://scenes/bip.tscn" id="2_cn3uy"] -[ext_resource type="PackedScene" uid="uid://dem3fcec25awh" path="res://scenes/grd_side.tscn" id="3_2eau6"] -[ext_resource type="PackedScene" uid="uid://b5kjdyxuwsot5" path="res://scenes/canvas.tscn" id="4_acmpi"] -[ext_resource type="PackedScene" uid="uid://cnkbk53mi7viu" path="res://scenes/grd_btns.tscn" id="5_2dg76"] -[ext_resource type="PackedScene" uid="uid://dymo732qc2doa" path="res://scenes/count_all_pad.tscn" id="6_nbfk8"] -[ext_resource type="PackedScene" uid="uid://bwti82byphl68" path="res://scenes/count_danger_pad.tscn" id="7_q8b60"] -[ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat.tscn" id="8_txl8n"] -[ext_resource type="PackedScene" uid="uid://0uqi1ghf7sma" path="res://scenes/btn_scale.tscn" id="9_4ie8q"] +[ext_resource type="Script" path="res://scenes/работа.gd" id="1_r567t"] +[ext_resource type="PackedScene" uid="uid://nl1vklubr5kr" path="res://scenes/bip.tscn" id="2_x35jc"] +[ext_resource type="PackedScene" uid="uid://dem3fcec25awh" path="res://scenes/grd_side.tscn" id="3_3dhct"] +[ext_resource type="PackedScene" uid="uid://b5kjdyxuwsot5" path="res://scenes/canvas.tscn" id="4_mf3fi"] +[ext_resource type="PackedScene" uid="uid://cnkbk53mi7viu" path="res://scenes/grd_btns.tscn" id="5_o2ae4"] +[ext_resource type="PackedScene" uid="uid://dymo732qc2doa" path="res://scenes/count_all_pad.tscn" id="6_xtpqt"] +[ext_resource type="PackedScene" uid="uid://bwti82byphl68" path="res://scenes/count_danger_pad.tscn" id="7_sfry6"] +[ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat.tscn" id="8_rst8q"] +[ext_resource type="PackedScene" uid="uid://0uqi1ghf7sma" path="res://scenes/btn_scale.tscn" id="9_hqslj"] [node name="Работа" type="Panel"] -script = ExtResource("1_hmu4p") -Bip = ExtResource("2_cn3uy") +script = ExtResource("1_r567t") +Bip = ExtResource("2_x35jc") col_grey = Color(0.34902, 0.643137, 0.772549, 0.168627) col_red = Color(1, 0.568627, 0.431373, 0.239216) drag_scale_band = 0.05 @@ -29,31 +29,31 @@ strob_min_width = 5.0 metadata/_edit_vertical_guides_ = [] metadata/_edit_lock_ = true -[node name="grd_side" parent="." instance=ExtResource("3_2eau6")] +[node name="grd_side" parent="." instance=ExtResource("3_3dhct")] layout_mode = 0 offset_left = 1114.0 offset_top = 7.0 offset_right = 1594.0 offset_bottom = 1170.0 -[node name="canvas" parent="." instance=ExtResource("4_acmpi")] +[node name="canvas" parent="." instance=ExtResource("4_mf3fi")] metadata/_edit_lock_ = true -[node name="grd_btns" parent="." instance=ExtResource("5_2dg76")] +[node name="grd_btns" parent="." instance=ExtResource("5_o2ae4")] layout_mode = 0 offset_left = 10.0 offset_top = 1116.0 offset_right = 1106.0 offset_bottom = 1170.0 -[node name="count_all_pad" parent="." instance=ExtResource("6_nbfk8")] +[node name="count_all_pad" parent="." instance=ExtResource("6_xtpqt")] layout_mode = 0 offset_left = 100.0 offset_top = 117.0 offset_right = 133.0 offset_bottom = 140.0 -[node name="count_danger_pad" parent="." instance=ExtResource("7_q8b60")] +[node name="count_danger_pad" parent="." instance=ExtResource("7_sfry6")] layout_mode = 0 offset_left = 96.0 offset_top = 29.0 @@ -85,7 +85,7 @@ offset_right = 83.0 offset_bottom = 72.0 text = "Опасных:" -[node name="btn_auto_threat" parent="." instance=ExtResource("8_txl8n")] +[node name="btn_auto_threat" parent="." instance=ExtResource("8_rst8q")] layout_mode = 0 offset_left = 1034.0 offset_top = 7.0 @@ -95,7 +95,7 @@ size_flags_horizontal = 3 size_flags_vertical = 3 text = "Автомат" -[node name="btn_strob" parent="." instance=ExtResource("8_txl8n")] +[node name="btn_strob" parent="." instance=ExtResource("8_rst8q")] layout_mode = 2 offset_left = 1034.0 offset_top = 67.0 @@ -106,7 +106,7 @@ size_flags_vertical = 3 tooltip_text = "Кнопка для выбора сектора при помощи клика мышкой" text = "Строб" -[node name="btn_view" parent="." instance=ExtResource("8_txl8n")] +[node name="btn_view" parent="." instance=ExtResource("8_rst8q")] layout_mode = 2 offset_left = 874.0 offset_top = 1023.0 @@ -116,7 +116,7 @@ size_flags_horizontal = 3 size_flags_vertical = 3 text = "Вид" -[node name="btn_scale" parent="." instance=ExtResource("9_4ie8q")] +[node name="btn_scale" parent="." instance=ExtResource("9_hqslj")] layout_mode = 0 offset_left = 952.0 offset_top = 1038.0 diff --git a/scripts/threats.gd b/scripts/threats.gd index 5bafd72..ed2c9af 100644 --- a/scripts/threats.gd +++ b/scripts/threats.gd @@ -54,6 +54,7 @@ func _ready() -> void: timer_check_lost.start(repsettings.ThreatParams.time_lost / 1000.0) + ## Периодически удаляет устаревшие цели func on_timer_check_lost(time_lost: int, threats: Dictionary): var tick = Time.get_ticks_msec() diff --git a/shaders/bip.gdshader b/shaders/bip.gdshader index 56ead0a..dc92cfc 100644 --- a/shaders/bip.gdshader +++ b/shaders/bip.gdshader @@ -8,7 +8,7 @@ uniform uint tick_update = 0; /* Время после const float time_delta = 0.1; /* Время вспышки при обновлении, c */ const float ds = 0.01; /* Относительное расстояние на котором выполняется сглаживание краёв */ const vec2 center = vec2(0.125, 0.125); /* Центр должен быть в (0.5, 0.5), но это не так */ -const float radius = 0.125 - ds * 2.0; /* Радиус должен быть 0.5, но это не так */ +const float radius = 0.075 - ds * 2.0; /* Радиус должен быть 0.5, но это не так */ float smooth_px(float r, float R) diff --git a/shaders/select_tr.gdshader b/shaders/select_tr.gdshader new file mode 100644 index 0000000..8bf2e88 --- /dev/null +++ b/shaders/select_tr.gdshader @@ -0,0 +1,80 @@ +shader_type canvas_item; + +uniform vec4 color: source_color = vec4(1, 1, 1, 1); +uniform vec4 color_up: source_color = vec4(1, 1, 1, 1); /* Цвет вспышки при обновлении */ +const float ds = 0.00725; /* Относительное расстояние на котором выполняется сглаживание краёв */ +const float dsr = 6.125; +const vec2 center = vec2(0.5, 0.5); /* Центр должен быть в (0.5, 0.5), но это не так */ +const float radius = 0.075 - ds * 2.0; /* Радиус должен быть 0.5, но это не так */ + +uniform float speed: hint_range(0.0, 1024.0) = 0.0; /* Время вспышки при обновлении, c */ +uniform int ant_band_count_0 = 3; + +const float ant_band_r0_0 = 0.3; + +const float ant_band_r1_0 = 0.4; + +float smooth_px(float r, float R, float dss) +{ + return 1.0 - smoothstep(R - dss, R + dss, r); +} + +void sector(inout vec4 c, vec2 uv, vec2 cnt, float a, float da, float r0, float r1, vec4 col) +{ + float l = distance(cnt, uv); + vec2 d = uv - cnt; + float sf = 500.0; + float theta = atan(d.x, d.y) * sf; + da /= 2.0; + float a0 = radians(a - da); + float a1 = radians(a + da); + float va = smooth_px(a0 * sf, theta, dsr) - smooth_px(a1 * sf, theta, dsr); + float vr = smooth_px(r0, l, ds) - smooth_px(r1, l, ds); + float rgb = sqrt(va * vr); + c.rgb += col.rgb * rgb * col.a; + c.a += rgb * col.a; +} + + +void antenas(inout vec4 c, vec2 uv, vec2 p0, int cnt, float r0, float r1, vec4 c0, vec4 c1) +{ + float da = 180.0f / float(cnt); + for (int i = -cnt; i <= cnt; i ++) + { + float v = float(i & 1); + vec4 col = v * c0 + (1.0f - v) * c1; + sector(c, uv, p0, float(i) * da, da, r0, r1, col); + } +} + +vec2 rotateUVmatrinx(vec2 uv, vec2 pivot, float rotation) +{ + mat2 rotation_matrix=mat2( vec2(sin(rotation),-cos(rotation)), + vec2(cos(rotation),sin(rotation)) + ); + uv -= pivot; + uv *= rotation_matrix; + uv += pivot; + return uv; +} + + +void vertex() +{ + float dir = 0.0; + dir += speed * TIME; + VERTEX = rotateUVmatrinx(VERTEX, center, radians(dir)); +} + + + +void fragment() +{ + + ivec2 isz = textureSize(TEXTURE, 0); + vec2 uv = UV * vec2(float(isz.x), float(isz.y)); // координаты текущей точки в пикселях + COLOR = vec4(0, 0, 0, 0.0); //texture(TEXTURE, UV); // Цвет текущей точки + + // Сетка антенн + antenas(COLOR, uv, center, ant_band_count_0, ant_band_r0_0, ant_band_r1_0, color, color_up); +} diff --git a/shaders/tracked.gdshader b/shaders/tracked.gdshader new file mode 100644 index 0000000..211e065 --- /dev/null +++ b/shaders/tracked.gdshader @@ -0,0 +1,80 @@ +shader_type canvas_item; +uniform vec4 ColorFig:source_color; +uniform vec2 point_1; +uniform vec2 point_2; +uniform vec2 point_3; +uniform vec2 point_4; +uniform vec2 point_5; +uniform vec2 point_6; +uniform vec2 point_7; +uniform vec2 point_8; +uniform float len: hint_range(0.0, 1.0) = 0.5; +const vec2 center = vec2(0.125, 0.125); +const float DSS = 0.001225; +const float radius = 0.125; +uniform float speed: hint_range(0.0, 1024.0) = 0.0; + +float smooth_px(float r, float R, float dss) +{ + return 1.0 - smoothstep(R - dss, R + dss, r); +} + +float line(vec2 p1, vec2 p2, float width, vec2 uv) +{ + float dist = distance(p1, p2); // Дистанция между точками + float dist_uv = distance(p1, uv); // Дистанция между точкой и текущим пикселем + return 1.0 - floor(1.0 - (0.001 * width) + distance (mix(p1, p2, clamp(dist_uv / dist, 0.0, 1.0)), uv)); +} + + +void get_line_points(inout float px0, inout float px1, inout float py0 ,inout float py1, float ang) +{ + px0 = (sin(ang*PI/180.0)/4.0); + py0 = (cos(ang*PI/180.0)/4.0); + px1 = px0 * len; + py1 = py0 * len; + px0 +=0.125; + py0 +=0.125; + px1 +=0.125; + py1 +=0.125; +} + + +vec2 rotateUVmatrinx(vec2 uv, vec2 pivot, float rotation) +{ + mat2 rotation_matrix=mat2( vec2(sin(rotation),-cos(rotation)), + vec2(cos(rotation),sin(rotation)) + ); + uv -= pivot; + uv *= rotation_matrix; + uv += pivot; + return uv; +} + + +void vertex() +{ + float dir = 0.0; + vec2 offset = vec2(0.125, 0.125); + dir -= speed * TIME; + VERTEX = rotateUVmatrinx(VERTEX, center - offset, radians(dir)); +} + + +void fragment() +{ + float px0 = 0.0; + float px1 = 0.0; + float py0 = 0.0; + float py1 = 0.0; + COLOR = vec4(1.0, 0.0, 0.0, 0.0); //texture(TEXTURE, UV); // Цвет текущей точки + get_line_points(px0, px1, py0, py1, 330.0); + COLOR.a += line(vec2(px0, py0), vec2(px1, py1), 5.0, UV); + get_line_points(px0, px1, py0, py1, 90.0); + COLOR.a += line(vec2(px0, py0), vec2(px1, py1), 5.0, UV); + 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); + + +}