godot-cli-control 0.2.15__tar.gz → 0.2.17__tar.gz

{godot_cli_control-0.2.15 → godot_cli_control-0.2.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: godot-cli-control
-Version: 0.2.15
+Version: 0.2.17
 Summary: WebSocket bridge for headless / scripted control of Godot scenes.
 Project-URL: Homepage, https://github.com/ClaymanTwinkle/godot-cli-control
 Project-URL: Repository, https://github.com/ClaymanTwinkle/godot-cli-control

{godot_cli_control-0.2.15 → godot_cli_control-0.2.17}/addons/godot_cli_control/bridge/render_api.gd

@@ -30,8 +30,8 @@ func handle_sprite_info(params: Dictionary) -> Dictionary:
 	)
 
 
-## screenshot --node 的边界计算：节点 local rect → 经 canvas/camera 变换的
-## 视口像素坐标 AABB。返回 Rect2，失败返回 error Dictionary（1010）。
+## screenshot --node 的边界计算：节点 local rect → 经 canvas/camera + content
+## scale 变换的物理像素坐标 AABB。返回 Rect2，失败返回 error Dictionary（1010）。
 ## static：只依赖传入节点自身的变换链，便于 GUT 直接单测（无需真渲染）。
 static func compute_node_screen_rect(node: Node) -> Variant:
 	if not (node is CanvasItem):
@@ -51,9 +51,16 @@ static func compute_node_screen_rect(node: Node) -> Variant:
 					% node.get_class(),
 			}
 		}
-	# get_global_transform_with_canvas 含 CanvasLayer / Camera2D 变换，
-	# 结果即视口像素坐标；Transform2D * Rect2 返回旋转后四角的 AABB。
+	# get_global_transform_with_canvas 含 CanvasLayer / Camera2D 变换，结果是画布
+	# （逻辑设计分辨率）坐标；再乘 viewport.get_final_transform()（content scale 的
+	# stretch 缩放 + letterbox 偏移）才与取图侧 get_image() 的物理像素系对齐——
+	# 漏乘时 hiDPI / 拉伸窗口下裁剪整体偏左上且偏小（#137）。平窗（物理 == 逻辑）
+	# 环境 final transform 为 identity，行为不变。Transform2D * Rect2 返回旋转后
+	# 四角的 AABB。
 	var xform: Transform2D = (node as CanvasItem).get_global_transform_with_canvas()
+	var viewport: Viewport = (node as CanvasItem).get_viewport()
+	if viewport != null:
+		xform = viewport.get_final_transform() * xform
 	return xform * (local_rect_or_null as Rect2)
 
 

{godot_cli_control-0.2.15 → godot_cli_control-0.2.17}/addons/godot_cli_control/tests/gut/test_render_api.gd

@@ -184,6 +184,25 @@ func test_screen_rect_sprite2d_centered_with_scale() -> void:
 	assert_eq(rect as Rect2, Rect2(92, 46, 16, 8))
 
 
+func test_screen_rect_applies_viewport_final_transform() -> void:
+	# content scale（hiDPI / stretch 窗口）回归（#137）：rect 必须落在取图侧
+	# get_image() 的物理像素系。SubViewport size(200,100) + size_2d_override(100,50)
+	# + stretch 构造 final transform = scale 2：Control (10,20,30,40) → (20,40,60,80)。
+	# 漏乘 final transform 时返回画布坐标 (10,20,30,40)，hiDPI 下裁剪整体错位。
+	var viewport := SubViewport.new()
+	viewport.size = Vector2i(200, 100)
+	viewport.size_2d_override = Vector2i(100, 50)
+	viewport.size_2d_override_stretch = true
+	add_child_autofree(viewport)
+	var ctl := Control.new()
+	ctl.position = Vector2(10, 20)
+	ctl.size = Vector2(30, 40)
+	viewport.add_child(ctl)
+	var rect: Variant = RenderApiScript.compute_node_screen_rect(ctl)
+	assert_true(rect is Rect2, "stretch viewport 内 Control 应能算出 Rect2，实际: %s" % [rect])
+	assert_eq(rect as Rect2, Rect2(20, 40, 60, 80))
+
+
 func test_screen_rect_non_canvas_item_returns_1010() -> void:
 	var plain := Node.new()
 	plain.name = "PlainNode"

{godot_cli_control-0.2.15 → godot_cli_control-0.2.17}/python/godot_cli_control/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.2.15'
-__version_tuple__ = version_tuple = (0, 2, 15)
+__version__ = version = '0.2.17'
+__version_tuple__ = version_tuple = (0, 2, 17)
 
 __commit_id__ = commit_id = None

{godot_cli_control-0.2.15 → godot_cli_control-0.2.17}/python/godot_cli_control/cli.py

@@ -2223,8 +2223,10 @@ def build_parser() -> argparse.ArgumentParser:
             "GODOT_BIN 查找顺序：\n"
             "  1. 环境变量 GODOT_BIN\n"
             "  2. 项目根 .cli_control/godot_bin 文件（init 检测到时会写入）\n"
-            "  3. macOS /Applications/Godot*.app/Contents/MacOS/Godot\n"
-            "  4. PATH 上的 godot4 / godot / Godot\n"
+            "  3. macOS /Applications 与 ~/Applications 下的 "
+            "Godot*.app/Contents/MacOS/Godot（系统级优先）\n"
+            "  4. PATH 上的 godot4 / godot / Godot，"
+            "及 mono 别名 godot4-mono / godot-mono / godot_mono / Godot_mono\n"
             "  5. Windows Program Files\\Godot*\\Godot*.exe\n"
             "都没找到时 init 会打 warning，daemon start 会直接报错。\n"
             "可以手动 `export GODOT_BIN=/path/to/godot` 或写到 .cli_control/godot_bin。"

{godot_cli_control-0.2.15 → godot_cli_control-0.2.17}/python/godot_cli_control/daemon.py

@@ -415,23 +415,46 @@ def discover_port(project_root: Path | None = None) -> int | None:
 # ── Godot 二进制发现 ──
 
 
+def _macos_app_dirs() -> tuple[Path, ...]:
+    """macOS .app 扫描目录序：系统级 /Applications 优先于用户级（#135）。
+
+    无管理员权限的用户常把 app 拖进 ~/Applications；目录不存在时 glob
+    安静返回空，无需预检。单测靠 monkeypatch 本函数注入 tmp 目录。
+    """
+    return (Path("/Applications"), Path.home() / "Applications")
+
+
 def find_godot_binary() -> str | None:
     """查找可用的 Godot 二进制。
 
-    优先级：``GODOT_BIN`` env > macOS /Applications > PATH > Windows Program Files。
+    优先级：``GODOT_BIN`` env > macOS /Applications + ~/Applications（系统级
+    优先）> PATH > Windows Program Files。
+    PATH 候选名含 .NET/mono 版常见别名（godot4-mono / godot-mono / godot_mono /
+    Godot_mono），排标准名之后——两版都装时优先轻量的标准版。macOS Applications
+    与 Windows Program Files 两级的 glob 天然匹配 ``Godot_mono.app`` / mono exe
+    （mono 版 .app 内部可执行文件仍叫 ``Godot``），无需单列。
     """
     env_bin = os.environ.get("GODOT_BIN")
     if env_bin and Path(env_bin).is_file() and os.access(env_bin, os.X_OK):
         return env_bin
 
     if sys.platform == "darwin":
-        # macOS 默认安装位置 + 同目录所有 Godot*.app
-        for app in sorted(Path("/Applications").glob("Godot*.app")):
-            candidate = app / "Contents" / "MacOS" / "Godot"
-            if candidate.is_file() and os.access(candidate, os.X_OK):
-                return str(candidate)
-
-    for name in ("godot4", "godot", "Godot"):
+        # macOS 默认安装位置 + 各目录下所有 Godot*.app
+        for base in _macos_app_dirs():
+            for app in sorted(base.glob("Godot*.app")):
+                candidate = app / "Contents" / "MacOS" / "Godot"
+                if candidate.is_file() and os.access(candidate, os.X_OK):
+                    return str(candidate)
+
+    for name in (
+        "godot4",
+        "godot",
+        "Godot",
+        "godot4-mono",
+        "godot-mono",
+        "godot_mono",
+        "Godot_mono",
+    ):
         p = shutil.which(name)
         if p:
             return p

{godot_cli_control-0.2.15 → godot_cli_control-0.2.17}/python/tests/test_daemon.py

@@ -17,6 +17,7 @@ from godot_cli_control.daemon import (
     _allocate_port,
     _process_alive,
     _wait_port_ready,
+    find_godot_binary,
 )
 
 
@@ -140,6 +141,94 @@ def test_read_godot_bin_pref_ignores_dead_path(tmp_path: Path) -> None:
     assert daemon.read_godot_bin_pref() is None
 
 
+@pytest.mark.parametrize(
+    "alias", ["godot4-mono", "godot-mono", "godot_mono", "Godot_mono"]
+)
+def test_find_godot_binary_finds_mono_alias_on_path(
+    alias: str, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    """标准名都不在 PATH 时，.NET/mono 版的常见别名也要能命中。
+
+    平台固定成 linux：跳过 macOS /Applications glob（开发机上真有
+    Godot.app 会先命中）与 Windows Program Files glob，让 PATH 这级
+    在三平台 CI 上都被确定性地测到。
+    """
+    monkeypatch.delenv("GODOT_BIN", raising=False)
+    monkeypatch.setattr(sys, "platform", "linux")
+    monkeypatch.setattr(
+        "godot_cli_control.daemon.shutil.which",
+        lambda name: f"/usr/bin/{name}" if name == alias else None,
+    )
+    assert find_godot_binary() == f"/usr/bin/{alias}"
+
+
+def test_find_godot_binary_prefers_standard_over_mono(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    """标准版与 mono 版同时在 PATH 时优先标准版（更轻量）。"""
+    monkeypatch.delenv("GODOT_BIN", raising=False)
+    monkeypatch.setattr(sys, "platform", "linux")
+    table = {
+        "godot": "/usr/bin/godot",
+        "godot-mono": "/usr/bin/godot-mono",
+        "Godot_mono": "/usr/bin/Godot_mono",
+    }
+    monkeypatch.setattr("godot_cli_control.daemon.shutil.which", table.get)
+    assert find_godot_binary() == "/usr/bin/godot"
+
+
+def _fake_godot_app(base: Path, app_name: str) -> Path:
+    """在 base 下伪造 <app_name>/Contents/MacOS/Godot 可执行结构，返回二进制路径。"""
+    binary = base / app_name / "Contents" / "MacOS" / "Godot"
+    binary.parent.mkdir(parents=True)
+    binary.write_text("")
+    binary.chmod(0o755)
+    return binary
+
+
+def _patch_macos_scan(
+    monkeypatch: pytest.MonkeyPatch, system_dir: Path, user_dir: Path
+) -> None:
+    """把 macOS .app 扫描钉到两个 tmp 目录：平台固定 darwin、PATH 全空。
+
+    扫描目录必须可注入——开发机 /Applications 里有真 Godot.app，
+    不注入的话用户级兜底永远测不到。
+    """
+    monkeypatch.delenv("GODOT_BIN", raising=False)
+    monkeypatch.setattr(sys, "platform", "darwin")
+    monkeypatch.setattr("godot_cli_control.daemon.shutil.which", lambda name: None)
+    monkeypatch.setattr(
+        "godot_cli_control.daemon._macos_app_dirs",
+        lambda: (system_dir, user_dir),
+        raising=False,
+    )
+
+
+def test_find_godot_binary_scans_user_applications(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    """系统 /Applications 没有时兜底扫 ~/Applications（#135）；空目录不炸。"""
+    system_dir = tmp_path / "Applications"  # 不存在：glob 应安静返回空
+    user_dir = tmp_path / "home" / "Applications"
+    binary = _fake_godot_app(user_dir, "Godot_mono.app")
+
+    _patch_macos_scan(monkeypatch, system_dir, user_dir)
+    assert find_godot_binary() == str(binary)
+
+
+def test_find_godot_binary_prefers_system_applications_over_user(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    """系统级与用户级都有时优先 /Applications。"""
+    system_dir = tmp_path / "Applications"
+    user_dir = tmp_path / "home" / "Applications"
+    system_binary = _fake_godot_app(system_dir, "Godot.app")
+    _fake_godot_app(user_dir, "Godot.app")
+
+    _patch_macos_scan(monkeypatch, system_dir, user_dir)
+    assert find_godot_binary() == str(system_binary)
+
+
 def test_stop_handles_missing_pid_file(tmp_path: Path) -> None:
     daemon = Daemon(tmp_path)
     assert daemon.stop() == 0  # noop