gdharness 1.3.27 → 1.3.28

package/build/godot/addons/auto_reload/auto_reload.gd

@@ -6,10 +6,27 @@ extends EditorPlugin
 ## that keeps showing the old file is how a change reads as one that never happened. The
 ## files are polled once a second; the editor's own watcher only fires on window focus.
 
+
+## What was last seen of a watched file.
+class GdhSeen:
+	## Its modification time, in whole seconds.
+	var time: int
+	## The MD5 of its contents.
+	var md5: String
+
+	func _init(seen_time: int, seen_md5: String) -> void:
+		time = seen_time
+		md5 = seen_md5
+
+
 const CHECK_INTERVAL_SECONDS: float = 1.0
+## How long after a file's modification time its contents are compared as well. The time is in
+## whole seconds, so a second write inside the second of the first leaves it as it was and changes
+## only the contents; past that second any write moves the time.
+const SAME_SECOND_SECONDS: int = 5
 
 var _timer: Timer
-## The last modification time seen, by path.
+## What was last seen of each watched file, by path.
 var _watched_files: Dictionary = {}
 
 
@@ -22,6 +39,11 @@ func _enter_tree() -> void:
 	var watching: int = _timer.timeout.connect(_check_for_changes)
 	if watching != OK:
 		push_error("gdharness: could not start watching for changes on disk")
+	# A scene's files are watched from the moment it opens: found at the next poll instead, a file
+	# written in between was first seen already changed, and its change was never reloaded.
+	var opening: int = scene_changed.connect(_on_scene_changed)
+	if opening != OK:
+		push_error("gdharness: could not start watching the scenes the editor opens")
 	add_child(_timer)
 	_timer.start()
 	_update_watched_files()
@@ -33,12 +55,16 @@ func _exit_tree() -> void:
 		_timer.queue_free()
 
 
+func _on_scene_changed(_scene_root: Node) -> void:
+	_update_watched_files()
+
+
 func _update_watched_files() -> void:
 	var edited_scene: Node = EditorInterface.get_edited_scene_root()
 	if edited_scene and edited_scene.scene_file_path:
 		var path: String = edited_scene.scene_file_path
 		if not _watched_files.has(path):
-			_watched_files[path] = _get_modified_time(path)
+			_watched_files[path] = _seen(path)
 		_watch_node_scripts(edited_scene)
 
 
@@ -48,11 +74,15 @@ func _watch_node_scripts(node: Node) -> void:
 		var attached: Script = script
 		var path: String = attached.resource_path
 		if not path.is_empty() and not _watched_files.has(path):
-			_watched_files[path] = _get_modified_time(path)
+			_watched_files[path] = _seen(path)
 	for child: Node in node.get_children():
 		_watch_node_scripts(child)
 
 
+func _seen(path: String) -> GdhSeen:
+	return GdhSeen.new(_get_modified_time(path), _md5_of(path))
+
+
 func _get_modified_time(path: String) -> int:
 	var global_path: String = ProjectSettings.globalize_path(path)
 	if FileAccess.file_exists(global_path):
@@ -60,20 +90,32 @@ func _get_modified_time(path: String) -> int:
 	return 0
 
 
+func _md5_of(path: String) -> String:
+	var global_path: String = ProjectSettings.globalize_path(path)
+	if FileAccess.file_exists(global_path):
+		return FileAccess.get_md5(global_path)
+	return ""
+
+
 func _check_for_changes() -> void:
 	_update_watched_files()
 
+	var now: int = int(Time.get_unix_time_from_system())
 	var scenes_to_reload: Array[String] = []
 	var scripts_to_reload: Array[String] = []
 	for path: String in _watched_files.keys():
+		var last: GdhSeen = _watched_files[path]
 		var current_time: int = _get_modified_time(path)
-		var last_time: int = _watched_files[path]
-		if current_time > last_time:
-			if path.ends_with(".gd"):
-				scripts_to_reload.append(path)
-			else:
-				scenes_to_reload.append(path)
-			_watched_files[path] = current_time
+		if current_time == last.time and now - current_time >= SAME_SECOND_SECONDS:
+			continue
+		var current_md5: String = _md5_of(path)
+		_watched_files[path] = GdhSeen.new(current_time, current_md5)
+		if current_md5 == last.md5:
+			continue
+		if path.ends_with(".gd"):
+			scripts_to_reload.append(path)
+		else:
+			scenes_to_reload.append(path)
 
 	# Scripts first, so a scene reloaded after them instantiates the new code.
 	for path: String in scripts_to_reload:

package/build/godot/addons/gdharness_runtime/runtime_mouse.gd

@@ -85,16 +85,19 @@ static func button_event(
 ## [param answer], saying so when one of [param points] lies outside [param viewport]: the GUI picks
 ## what is under the pointer only inside it, so such a press or motion reaches no control, and its
 ## answer read the same as one that landed.
+##
+## The points are window pixels and the visible rect is canvas units, which differ by the window's
+## content scale and any letterbox offset, so the rect is taken into window pixels first.
 static func outside_noted(answer: Dictionary, viewport: Viewport, points: Array[Vector2]) -> Dictionary:
-	var shown: Rect2 = viewport.get_visible_rect()
+	var shown: Rect2 = viewport.get_final_transform() * viewport.get_visible_rect()
 	for point: Vector2 in points:
 		if not shown.has_point(point):
 			answer["outside_viewport"] = (
 				(
-					"%s is outside the window's viewport, %s, so no control there receives it; the game's"
+					"%s is outside the window's viewport, %s in window pixels, so no control there receives"
 					% [point, shown]
 				)
-				+ " _input and _unhandled_input still do."
+				+ " it; the game's _input and _unhandled_input still do."
 			)
 			break
 	return answer

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gdharness",
-  "version": "1.3.27",
+  "version": "1.3.28",
   "mcpName": "io.github.Aureliolo/gdharness",
   "description": "A harness for driving a Godot 4 project from an agent: editor addons, a runtime bridge into the running game, an MCP server in front of them, and a CLI that installs and diagnoses the Godot side.",
   "type": "module",