From 32ef33808829e67ed1a234b90b47ed30986e11a0 Mon Sep 17 00:00:00 2001 From: Nordup Date: Fri, 10 May 2024 18:27:15 +0400 Subject: [PATCH] move Sandbox.exe and ipc files to sandbox folder --- app/.gitignore | 3 +++ app/app_icon/README.md | 2 +- app/resources/sandbox_executable.tres | 2 +- app/scripts/sandbox/sandbox_manager.gd | 4 ++++ godot | 2 +- 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/.gitignore b/app/.gitignore index 4709183..f1b281c 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1,2 +1,5 @@ # Godot 4+ specific ignores .godot/ + +# for ipc files (inter process communication) +sandbox/ \ No newline at end of file diff --git a/app/app_icon/README.md b/app/app_icon/README.md index 8fa4049..9956cb8 100644 --- a/app/app_icon/README.md +++ b/app/app_icon/README.md @@ -9,4 +9,4 @@ Otherwise Windows will downscale 32x32 image to 24x24
**Windows Native Icon** in project settings
`toolbar_icon.ico - 16x16, 24x24, 32x32`
-Refer to: https://learn.microsoft.com/en-us/windows/win32/uxguide/vis-icons \ No newline at end of file +Refer to: https://learn.microsoft.com/en-us/windows/win32/uxguide/vis-icons diff --git a/app/resources/sandbox_executable.tres b/app/resources/sandbox_executable.tres index 98cb26c..9aca2d2 100644 --- a/app/resources/sandbox_executable.tres +++ b/app/resources/sandbox_executable.tres @@ -6,5 +6,5 @@ script = ExtResource("1_q0dqh") linux = "sandbox/Sandbox.x86_64" linux_debug = "godot.linuxbsd.template_debug.dev.sandbox.x86_64.llvm" -windows = "Sandbox.exe" +windows = "sandbox/Sandbox.exe" windows_debug = "godot.windows.template_debug.dev.sandbox.x86_64.exe" diff --git a/app/scripts/sandbox/sandbox_manager.gd b/app/scripts/sandbox/sandbox_manager.gd index 1394445..85695f8 100644 --- a/app/scripts/sandbox/sandbox_manager.gd +++ b/app/scripts/sandbox/sandbox_manager.gd @@ -6,6 +6,8 @@ class_name SandboxManager @export var snbx_executable: SandboxExecutable @export var snbx_env: SandboxEnv +const IPC_FOLDER := "sandbox" + var sandbox_pid: int @@ -47,6 +49,8 @@ func start_sandbox_windows(gate: Gate) -> void: if not snbx_executable.exists(): Debug.logerr("Sandbox executable not found at " + snbx_executable.path); return + DirAccess.make_dir_recursive_absolute(IPC_FOLDER) # TODO: move to snbx_env + var pack_file = ProjectSettings.globalize_path(gate.resource_pack) var shared_libs = ProjectSettings.globalize_path(gate.shared_libs_dir) var args = [ diff --git a/godot b/godot index 2ff9ee5..29d6d65 160000 --- a/godot +++ b/godot @@ -1 +1 @@ -Subproject commit 2ff9ee5a145b789c179e5e255378ab12e6d37238 +Subproject commit 29d6d651a6dd28c0a132a97de65098a7a13e145c