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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: godot-cli-control
-Version: 0.2.16
+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.16 → 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.16 → 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.16 → 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.16'
-__version_tuple__ = version_tuple = (0, 2, 16)
+__version__ = version = '0.2.17'
+__version_tuple__ = version_tuple = (0, 2, 17)
 
 __commit_id__ = commit_id = None