wip

dsrw · Jul 22, 2024 · a942e15 · a942e15
1 parent 7ddf621
commit a942e15
Show file tree

Hide file tree

Showing 32 changed files with 548 additions and 576 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -26,7 +26,7 @@
       "type": "lldb",
       "request": "launch",
       "name": "Client: Build & Debug",
-      "program": "${workspaceFolder}/vendor/godot/bin/godot.osx.opt.tools.arm64",
+      "program": "${workspaceFolder}/vendor/godot/bin/godot.osx.tools.arm64",
       "env": {
         "ENU_CONNECT_ADDRESS": "127.0.0.1",
         "ENU_METRICS_PORT": "8001"
@@ -49,7 +49,7 @@
       "type": "lldb",
       "request": "launch",
       "name": "Host: Build & Debug",
-      "program": "${workspaceFolder}/vendor/godot/bin/godot.osx.opt.tools.arm64",
+      "program": "${workspaceFolder}/vendor/godot/bin/godot.osx.tools.arm64",
       "env": {
         "ENU_LISTEN_ADDRESS": "0.0.0.0",
         "ENU_METRICS_PORT": "8000"
@@ -72,7 +72,7 @@
       "type": "lldb",
       "request": "launch",
       "name": "Client: Debug",
-      "program": "${workspaceFolder}/vendor/godot/bin/godot.osx.opt.tools.arm64",
+      "program": "${workspaceFolder}/vendor/godot/bin/godot.osx.tools.arm64",
       "env": {
         "ENU_CONNECT_ADDRESS": "127.0.0.1",
         "ENU_METRICS_PORT": "8001"
@@ -94,7 +94,7 @@
       "type": "lldb",
       "request": "launch",
       "name": "Host: Debug",
-      "program": "${workspaceFolder}/vendor/godot/bin/godot.osx.opt.tools.arm64",
+      "program": "${workspaceFolder}/vendor/godot/bin/godot.osx.tools.arm64",
       "env": {
         "ENU_LISTEN_ADDRESS": "0.0.0.0",
         "ENU_METRICS_PORT": "8000"
@@ -116,7 +116,7 @@
       "type": "lldb",
       "request": "launch",
       "name": "Enu: Debug",
-      "program": "${workspaceFolder}/vendor/godot/bin/godot.osx.opt.tools.arm64",
+      "program": "${workspaceFolder}/vendor/godot/bin/godot.osx.tools.arm64",
       "windows": {
         "program": "${workspaceFolder}/vendor/godot/bin/godot.windows.opt.tools.64"
       },
@@ -134,7 +134,7 @@
       "type": "lldb",
       "request": "launch",
       "name": "Enu: Build & Debug",
-      "program": "${workspaceFolder}/vendor/godot/bin/godot.osx.opt.tools.arm64",
+      "program": "${workspaceFolder}/vendor/godot/bin/godot.osx.tools.arm64",
       "windows": {
         "program": "${workspaceFolder}/vendor/godot/bin/godot.windows.opt.tools.64"
       },

diff --git a/app/components/Console.tscn b/app/components/Console.tscn
@@ -1,6 +1,7 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=4 format=2]
 
 [ext_resource path="res://components/Console.gdns" type="Script" id=1]
+[ext_resource path="res://themes/DarkTheme.tres" type="Theme" id=2]
 
 [sub_resource type="StyleBoxFlat" id=7]
 bg_color = Color( 0.0784314, 0.0117647, 0.113725, 1 )
@@ -19,3 +20,35 @@ bbcode_enabled = true
 scroll_following = true
 selection_enabled = true
 script = ExtResource( 1 )
+
+[node name="GridContainer" type="GridContainer" parent="."]
+anchor_right = 1.0
+anchor_bottom = 1.0
+theme = ExtResource( 2 )
+columns = 2
+
+[node name="Label" type="Label" parent="GridContainer"]
+margin_right = 426.0
+margin_bottom = 53.0
+size_flags_horizontal = 3
+size_flags_vertical = 1
+
+[node name="MarginContainer" type="MarginContainer" parent="GridContainer"]
+margin_left = 430.0
+margin_right = 500.0
+margin_bottom = 53.0
+custom_constants/margin_right = 30
+custom_constants/margin_top = 25
+
+[node name="GridContainer" type="GridContainer" parent="GridContainer/MarginContainer"]
+margin_top = 25.0
+margin_right = 40.0
+margin_bottom = 53.0
+rect_pivot_offset = Vector2( -911, -78 )
+custom_constants/vseparation = 30
+
+[node name="Close" type="Button" parent="GridContainer/MarginContainer/GridContainer"]
+margin_right = 40.0
+margin_bottom = 28.0
+theme_type_variation = "IconButton"
+text = "  "
diff --git a/app/components/Editor.tscn b/app/components/Editor.tscn
@@ -1,17 +1,19 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://components/TextEdit.gdns" type="Script" id=1]
+[ext_resource path="res://themes/DarkTheme.tres" type="Theme" id=2]
+[ext_resource path="res://components/FloatingButton.gdns" type="Script" id=3]
 
 [sub_resource type="StyleBoxFlat" id=5]
 bg_color = Color( 0, 0, 0, 0.839216 )
 border_width_right = 2
 border_color = Color( 0.964706, 0.952941, 0.909804, 1 )
 
 [node name="Editor" type="TextEdit"]
-visible = false
 margin_right = 961.0
 margin_bottom = 1080.0
 size_flags_vertical = 3
+theme = ExtResource( 2 )
 custom_colors/selection_color = Color( 0.207843, 0, 0.321569, 1 )
 custom_colors/executing_line_color = Color( 0.0392157, 0, 0.168627, 1 )
 custom_styles/read_only = SubResource( 5 )
@@ -28,3 +30,49 @@ wrap_enabled = true
 caret_blink = true
 caret_moving_by_right_click = false
 script = ExtResource( 1 )
+
+[node name="GridContainer" type="GridContainer" parent="."]
+anchor_right = 1.0
+anchor_bottom = 1.0
+margin_right = 14.0
+margin_bottom = 55.0
+mouse_filter = 0
+columns = 2
+
+[node name="Label" type="Label" parent="GridContainer"]
+margin_right = 881.0
+margin_bottom = 111.0
+size_flags_horizontal = 3
+size_flags_vertical = 1
+
+[node name="MarginContainer" type="MarginContainer" parent="GridContainer"]
+margin_left = 885.0
+margin_right = 975.0
+margin_bottom = 111.0
+custom_constants/margin_right = 50
+custom_constants/margin_top = 25
+
+[node name="GridContainer" type="GridContainer" parent="GridContainer/MarginContainer"]
+margin_top = 25.0
+margin_right = 40.0
+margin_bottom = 111.0
+rect_pivot_offset = Vector2( -911, -78 )
+mouse_filter = 0
+custom_constants/vseparation = 30
+
+[node name="Close" type="Button" parent="GridContainer/MarginContainer/GridContainer"]
+margin_right = 40.0
+margin_bottom = 28.0
+rect_pivot_offset = Vector2( 138, 238 )
+theme_type_variation = "IconButton"
+text = "  "
+script = ExtResource( 3 )
+
+[node name="Run" type="Button" parent="GridContainer/MarginContainer/GridContainer"]
+margin_top = 58.0
+margin_right = 40.0
+margin_bottom = 86.0
+mouse_filter = 1
+theme_type_variation = "IconButton"
+text = "  "
+script = ExtResource( 3 )
diff --git a/app/components/FloatingButton.gdns b/app/components/FloatingButton.gdns
@@ -0,0 +1,8 @@
+[gd_resource type="NativeScript" load_steps=2 format=2]
+
+[ext_resource path="res://nimlib.gdnlib" type="GDNativeLibrary" id=1]
+
+[resource]
+resource_name = "FloatingButton"
+class_name = "FloatingButton"
+library = ExtResource( 1 )
diff --git a/app/components/Settings.tscn b/app/components/Settings.tscn
@@ -40,7 +40,7 @@ text = "  "
 
 [node name="Window" type="PanelContainer" parent="."]
 margin_right = 874.0
-margin_bottom = 521.0
+margin_bottom = 516.0
 rect_clip_content = true
 mouse_filter = 1
 size_flags_horizontal = 0
@@ -50,7 +50,7 @@ size_flags_vertical = 0
 margin_left = 20.0
 margin_top = 20.0
 margin_right = 854.0
-margin_bottom = 501.0
+margin_bottom = 496.0
 mouse_filter = 1
 custom_constants/margin_right = 10
 custom_constants/margin_top = 5
@@ -59,21 +59,21 @@ custom_constants/margin_bottom = 0
 [node name="RowContainer" type="VBoxContainer" parent="Window/MainContainer"]
 margin_top = 5.0
 margin_right = 824.0
-margin_bottom = 481.0
+margin_bottom = 476.0
 custom_constants/separation = 50
 
 [node name="VFlowContainer" type="HBoxContainer" parent="Window/MainContainer/RowContainer"]
 margin_right = 824.0
-margin_bottom = 33.0
+margin_bottom = 28.0
 size_flags_horizontal = 3
 alignment = 2
 
 [node name="Close" type="Button" parent="Window/MainContainer/RowContainer/VFlowContainer"]
-margin_left = 775.0
+margin_left = 784.0
 margin_right = 824.0
-margin_bottom = 33.0
-theme_type_variation = "MonoButton"
-text = " × "
+margin_bottom = 28.0
+theme_type_variation = "IconButton"
+text = "  "
 
 [node name="NewLevelContainer" type="VBoxContainer" parent="Window/MainContainer/RowContainer"]
 visible = false
@@ -129,9 +129,9 @@ margin_right = 1753.0
 margin_bottom = 80.0
 
 [node name="SettingsContainer" type="GridContainer" parent="Window/MainContainer/RowContainer"]
-margin_top = 83.0
+margin_top = 78.0
 margin_right = 824.0
-margin_bottom = 310.0
+margin_bottom = 305.0
 custom_constants/vseparation = 25
 custom_constants/hseparation = 20
 columns = 4
@@ -332,9 +332,9 @@ margin_bottom = 180.0
 rect_min_size = Vector2( 400, 140 )
 
 [node name="RemoteContainer" type="MarginContainer" parent="Window/MainContainer/RowContainer"]
-margin_top = 360.0
+margin_top = 355.0
 margin_right = 824.0
-margin_bottom = 476.0
+margin_bottom = 471.0
 rect_clip_content = true
 mouse_filter = 1
 custom_constants/margin_bottom = 20

diff --git a/app/project.godot b/app/project.godot
@@ -8,10 +8,6 @@
 
 config_version=4
 
-_global_script_classes=[  ]
-_global_script_class_icons={
-}
-
 [application]
 
 config/name="Enu"

diff --git a/app/scenes/GUI.gdns b/app/scenes/GUI.gdns
@@ -0,0 +1,8 @@
+[gd_resource type="NativeScript" load_steps=2 format=2]
+
+[ext_resource path="res://nimlib.gdnlib" type="GDNativeLibrary" id=1]
+
+[resource]
+resource_name = "GUI"
+class_name = "GUI"
+library = ExtResource( 1 )
diff --git a/app/scenes/GUI.tscn b/app/scenes/GUI.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=16 format=2]
+[gd_scene load_steps=18 format=2]
 
 [ext_resource path="res://components/Editor.tscn" type="PackedScene" id=1]
 [ext_resource path="res://components/Console.tscn" type="PackedScene" id=2]
@@ -12,6 +12,8 @@
 [ext_resource path="res://components/PreviewMaker.gdns" type="Script" id=10]
 [ext_resource path="res://components/Toolbar.gdns" type="Script" id=11]
 [ext_resource path="res://components/Settings.tscn" type="PackedScene" id=12]
+[ext_resource path="res://joystick/virtual_joystick.tscn" type="PackedScene" id=13]
+[ext_resource path="res://scenes/GUI.gdns" type="Script" id=14]
 
 [sub_resource type="ButtonGroup" id=1]
 
@@ -27,7 +29,8 @@ font_data = ExtResource( 8 )
 [node name="GUI" type="Control"]
 anchor_right = 1.0
 anchor_bottom = 1.0
-mouse_filter = 2
+mouse_filter = 1
+script = ExtResource( 14 )
 
 [node name="Toolbar" type="HBoxContainer" parent="."]
 anchor_top = 1.0
@@ -95,21 +98,22 @@ margin_bottom = 50.0
 group = SubResource( 1 )
 icon = null
 
-[node name="CenterContainer" type="GridContainer" parent="."]
+[node name="GridContainer" type="GridContainer" parent="."]
 anchor_right = 1.0
 mouse_filter = 2
 columns = 2
 
-[node name="Label" type="Label" parent="CenterContainer"]
-margin_right = 1916.0
-margin_bottom = 14.0
+[node name="Label" type="Label" parent="GridContainer"]
+margin_right = 1042.0
+margin_bottom = 516.0
 size_flags_horizontal = 3
 size_flags_vertical = 1
 
-[node name="Settings" parent="CenterContainer" instance=ExtResource( 12 )]
-margin_left = 1920.0
+[node name="Settings" parent="GridContainer" instance=ExtResource( 12 )]
+margin_left = 1046.0
+margin_top = 0.0
 margin_right = 1920.0
-margin_bottom = 0.0
+margin_bottom = 516.0
 
 [node name="LeftPanel" type="MarginContainer" parent="."]
 anchor_right = 0.5
@@ -135,7 +139,11 @@ size_flags_vertical = 3
 size_flags_stretch_ratio = 2.0
 
 [node name="Editor" parent="LeftPanel/ThemeHolder/MarginContainer" instance=ExtResource( 1 )]
+visible = false
 margin_bottom = 678.0
+middle_mouse_paste_enabled = false
+deselect_on_focus_loss_enabled = false
+drag_and_drop_selection_enabled = false
 
 [node name="Console" parent="LeftPanel/ThemeHolder" instance=ExtResource( 2 )]
 margin_top = 680.0
@@ -161,6 +169,39 @@ margin_bottom = 1080.0
 focus_mode = 2
 custom_styles/bg = SubResource( 8 )
 
+[node name="GridContainer" type="GridContainer" parent="RightPanel"]
+margin_left = -2.0
+margin_right = 959.0
+margin_bottom = 1080.0
+theme = ExtResource( 6 )
+columns = 2
+
+[node name="Label" type="Label" parent="RightPanel/GridContainer"]
+margin_right = 887.0
+margin_bottom = 53.0
+size_flags_horizontal = 3
+size_flags_vertical = 1
+
+[node name="MarginContainer" type="MarginContainer" parent="RightPanel/GridContainer"]
+margin_left = 891.0
+margin_right = 961.0
+margin_bottom = 53.0
+custom_constants/margin_right = 35
+custom_constants/margin_top = 25
+
+[node name="GridContainer" type="GridContainer" parent="RightPanel/GridContainer/MarginContainer"]
+margin_top = 25.0
+margin_right = 40.0
+margin_bottom = 53.0
+rect_pivot_offset = Vector2( -911, -78 )
+custom_constants/vseparation = 30
+
+[node name="Close" type="Button" parent="RightPanel/GridContainer/MarginContainer/GridContainer"]
+margin_right = 40.0
+margin_bottom = 28.0
+theme_type_variation = "IconButton"
+text = "  "
+
 [node name="Reticle" type="Control" parent="."]
 visible = false
 anchor_left = 0.5
@@ -205,4 +246,15 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[editable path="CenterContainer/Settings"]
+[node name="LeftStick" parent="." instance=ExtResource( 13 )]
+anchor_left = 0.12
+anchor_top = 0.7
+anchor_right = 0.12
+anchor_bottom = 0.7
+margin_left = 0.0
+margin_top = 0.0
+margin_right = 0.0
+margin_bottom = 0.0
+rect_min_size = Vector2( 200, 200 )
+
+[editable path="GridContainer/Settings"]