chore: update GUT to 9.5.0

Author: unvermuthet

project/addons/gut/GutScene.gd

@@ -91,9 +91,11 @@ func _set_font(rtl, font_name, custom_name):
 	if(font_name == null):
 		rtl.remove_theme_font_override(custom_name)
 	else:
-		var dyn_font = FontFile.new()
-		dyn_font.load_dynamic_font('res://addons/gut/fonts/' + font_name + '.ttf')
-		rtl.add_theme_font_override(custom_name, dyn_font)
+		var font_path = 'res://addons/gut/fonts/' + font_name + '.ttf'
+		if(FileAccess.file_exists(font_path)):
+			var dyn_font = FontFile.new()
+			dyn_font.load_dynamic_font('res://addons/gut/fonts/' + font_name + '.ttf')
+			rtl.add_theme_font_override(custom_name, dyn_font)
 
 
 func _set_all_fonts_in_rtl(rtl, base_name):

project/addons/gut/GutScene.gd.uid

@@ -1 +1 @@
-uid://bdbketrn3oroe
+uid://bw7tukh738kw1

project/addons/gut/GutScene.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=4 format=3 uid="uid://m28heqtswbuq"]
 
-[ext_resource type="Script" uid="uid://bdbketrn3oroe" path="res://addons/gut/GutScene.gd" id="1_b4m8y"]
+[ext_resource type="Script" uid="uid://bw7tukh738kw1" path="res://addons/gut/GutScene.gd" id="1_b4m8y"]
 [ext_resource type="PackedScene" uid="uid://duxblir3vu8x7" path="res://addons/gut/gui/NormalGui.tscn" id="2_j6ywb"]
 [ext_resource type="PackedScene" uid="uid://cnqqdfsn80ise" path="res://addons/gut/gui/MinGui.tscn" id="3_3glw1"]
 

project/addons/gut/UserFileViewer.gd.uid

@@ -1 +1 @@
-uid://cb2o4uyohi8ff
+uid://x51wilphva3d

project/addons/gut/UserFileViewer.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://bsm7wtt1gie4v"]
 
-[ext_resource type="Script" uid="uid://cb2o4uyohi8ff" path="res://addons/gut/UserFileViewer.gd" id="1"]
+[ext_resource type="Script" uid="uid://x51wilphva3d" path="res://addons/gut/UserFileViewer.gd" id="1"]
 
 [node name="UserFileViewer" type="Window"]
 exclusive = true

project/addons/gut/autofree.gd

@@ -30,28 +30,57 @@
 # ##############################################################################
 var _to_free = []
 var _to_queue_free = []
+var _ref_counted_doubles = []
+var _all_instance_ids = []
+
+
+func _add_instance_id(thing):
+	if(thing.has_method("get_instance_id")):
+		_all_instance_ids.append(thing.get_instance_id())
+
 
 func add_free(thing):
 	if(typeof(thing) == TYPE_OBJECT):
+		_add_instance_id(thing)
 		if(!thing is RefCounted):
 			_to_free.append(thing)
+		elif(GutUtils.is_double(thing)):
+			_ref_counted_doubles.append(thing)
+
 
 func add_queue_free(thing):
-	_to_queue_free.append(thing)
+	if(typeof(thing) == TYPE_OBJECT):
+		_add_instance_id(thing)
+		_to_queue_free.append(thing)
+
 
 func get_queue_free_count():
 	return _to_queue_free.size()
 
+
 func get_free_count():
 	return _to_free.size()
 
+
 func free_all():
-	for i in range(_to_free.size()):
-		if(is_instance_valid(_to_free[i])):
-			_to_free[i].free()
+	for node in _to_free:
+		if(is_instance_valid(node)):
+			if(GutUtils.is_double(node)):
+				node.__gutdbl_done()
+			node.free()
 	_to_free.clear()
 
 	for i in range(_to_queue_free.size()):
 		if(is_instance_valid(_to_queue_free[i])):
 			_to_queue_free[i].queue_free()
 	_to_queue_free.clear()
+
+	for ref_dbl in _ref_counted_doubles:
+		ref_dbl.__gutdbl_done()
+	_ref_counted_doubles.clear()
+
+	_all_instance_ids.clear()
+
+
+func has_instance_id(id):
+	return _all_instance_ids.has(id)

project/addons/gut/autofree.gd.uid

@@ -1 +1 @@
-uid://dskww66ilk3xl
+uid://bxjfriqxgwe0r

project/addons/gut/awaiter.gd

@@ -1,60 +1,126 @@
 extends Node
 
+class AwaitLogger:
+	var _time_waited = 0.0
+	var logger = GutUtils.get_logger()
+	var waiting_on = "nothing"
+	var logged_initial_message = false
+	var wait_log_delay := 1.0
+	var disabled = false
+
+	func waited(x):
+		_time_waited += x
+		if(!logged_initial_message and _time_waited >= wait_log_delay):
+			log_it()
+			logged_initial_message = true
+
+
+	func reset():
+		_time_waited = 0.0
+		logged_initial_message = false
+
+
+	func log_it():
+		if(!disabled):
+			var msg = str("--- Awaiting ", waiting_on, " ---")
+			logger.wait_msg(msg)
+
+
+
+
 signal timeout
 signal wait_started
 
+var await_logger = AwaitLogger.new()
 var _wait_time := 0.0
-var _wait_frames := 0
+var _wait_process_frames := 0
+var _wait_physics_frames := 0
 var _signal_to_wait_on = null
 
-var _predicate_function_waiting_to_be_true = null
+var _predicate_method = null
+var _waiting_for_predicate_to_be = null
+
 var _predicate_time_between := 0.0
 var _predicate_time_between_elpased := 0.0
 
+var _elapsed_time := 0.0
+var _elapsed_frames := 0
+
 var _did_last_wait_timeout = false
 var did_last_wait_timeout = false :
 	get: return _did_last_wait_timeout
 	set(val): push_error("Cannot set did_last_wait_timeout")
 
-var _elapsed_time := 0.0
-var _elapsed_frames := 0
+
+
+func _ready() -> void:
+	get_tree().process_frame.connect(_on_tree_process_frame)
+	get_tree().physics_frame.connect(_on_tree_physics_frame)
+
+
+func _on_tree_process_frame():
+	# Count frames here instead of in _process so that tree order never
+	# makes a difference and the count/signaling happens outside of
+	# _process being called.
+	if(_wait_process_frames > 0):
+		_elapsed_frames += 1
+		if(_elapsed_frames > _wait_process_frames):
+			_end_wait()
+
+
+func _on_tree_physics_frame():
+	# Count frames here instead of in _physics_process so that tree order never
+	# makes a difference and the count/signaling happens outside of
+	# _physics_process being called.
+	if(_wait_physics_frames != 0):
+		_elapsed_frames += 1
+		if(_elapsed_frames > _wait_physics_frames):
+			_end_wait()
 
 
 func _physics_process(delta):
+	if(is_waiting()):
+		await_logger.waited(delta)
+
 	if(_wait_time != 0.0):
 		_elapsed_time += delta
 		if(_elapsed_time >= _wait_time):
 			_end_wait()
 
-	if(_wait_frames != 0):
-		_elapsed_frames += 1
-		if(_elapsed_frames >= _wait_frames):
-			_end_wait()
-
-	if(_predicate_function_waiting_to_be_true != null):
+	if(_predicate_method != null):
 		_predicate_time_between_elpased += delta
 		if(_predicate_time_between_elpased >= _predicate_time_between):
 			_predicate_time_between_elpased = 0.0
-			var result = _predicate_function_waiting_to_be_true.call()
-			if(typeof(result) == TYPE_BOOL and result):
-				_end_wait()
+			var result = _predicate_method.call()
+			if(_waiting_for_predicate_to_be == false):
+				if(typeof(result) != TYPE_BOOL or result != true):
+					_end_wait()
+			else:
+				if(typeof(result) == TYPE_BOOL and result == _waiting_for_predicate_to_be):
+					_end_wait()
 
 
 func _end_wait():
+	await_logger.reset()
 	# Check for time before checking for frames so that the extra frames added
 	# when waiting on a signal do not cause a false negative for timing out.
 	if(_wait_time > 0):
 		_did_last_wait_timeout = _elapsed_time >= _wait_time
-	elif(_wait_frames > 0):
-		_did_last_wait_timeout = _elapsed_frames >= _wait_frames
-
-	if(_signal_to_wait_on != null and _signal_to_wait_on.is_connected(_signal_callback)):
+	elif(_wait_physics_frames > 0):
+		_did_last_wait_timeout = _elapsed_frames >= _wait_physics_frames
+	elif(_wait_process_frames > 0):
+		_did_last_wait_timeout = _elapsed_frames >= _wait_process_frames
+
+	if(_signal_to_wait_on != null and \
+	   is_instance_valid(_signal_to_wait_on.get_object()) and \
+	   _signal_to_wait_on.is_connected(_signal_callback)):
 		_signal_to_wait_on.disconnect(_signal_callback)
 
+	_wait_process_frames = 0
 	_wait_time = 0.0
-	_wait_frames = 0
+	_wait_physics_frames = 0
 	_signal_to_wait_on = null
-	_predicate_function_waiting_to_be_true = null
+	_predicate_method = null
 	_elapsed_time = 0.0
 	_elapsed_frames = 0
 	timeout.emit()
@@ -68,38 +134,68 @@ func _signal_callback(
 
 	_signal_to_wait_on.disconnect(_signal_callback)
 	# DO NOT _end_wait here.  For other parts of the test to get the signal that
-	# was waited on, we have to wait for a couple more frames.  For example, the
+	# was waited on, we have to wait for another frames.  For example, the
 	# signal_watcher doesn't get the signal in time if we don't do this.
-	_wait_frames = 2
+	_wait_process_frames = 1
+
 
-func wait_seconds(x):
+func wait_seconds(x, msg=''):
+	await_logger.waiting_on = str(x, " seconds ", msg)
 	_did_last_wait_timeout = false
 	_wait_time = x
 	wait_started.emit()
 
 
-func wait_frames(x):
+func wait_process_frames(x, msg=''):
+	await_logger.waiting_on = str(x, " idle frames ", msg)
+	_did_last_wait_timeout = false
+	_wait_process_frames = x
+	wait_started.emit()
+
+
+func wait_physics_frames(x, msg=''):
+	await_logger.waiting_on = str(x, " physics frames ", msg)
 	_did_last_wait_timeout = false
-	_wait_frames = x
+	_wait_physics_frames = x
 	wait_started.emit()
 
 
-func wait_for_signal(the_signal, max_time):
+func wait_for_signal(the_signal : Signal, max_time, msg=''):
+	await_logger.waiting_on = str("signal ", the_signal.get_name(), " or ", max_time, "s ", msg)
 	_did_last_wait_timeout = false
 	the_signal.connect(_signal_callback)
 	_signal_to_wait_on = the_signal
 	_wait_time = max_time
 	wait_started.emit()
 
 
-func wait_until(predicate_function: Callable, max_time, time_between_calls:=0.0):
+func wait_until(predicate_function: Callable, max_time, time_between_calls:=0.0, msg=''):
+	await_logger.waiting_on = str("callable to return TRUE or ", max_time, "s.  ", msg)
 	_predicate_time_between = time_between_calls
-	_predicate_function_waiting_to_be_true = predicate_function
+	_predicate_method = predicate_function
+	_wait_time = max_time
+
+	_waiting_for_predicate_to_be = true
 	_predicate_time_between_elpased = 0.0
 	_did_last_wait_timeout = false
+
+	wait_started.emit()
+
+
+func wait_while(predicate_function: Callable, max_time, time_between_calls:=0.0, msg=''):
+	await_logger.waiting_on = str("callable to return FALSE or ", max_time, "s.  ", msg)
+	_predicate_time_between = time_between_calls
+	_predicate_method = predicate_function
 	_wait_time = max_time
+
+	_waiting_for_predicate_to_be = false
+	_predicate_time_between_elpased = 0.0
+	_did_last_wait_timeout = false
+
 	wait_started.emit()
 
 
 func is_waiting():
-	return _wait_time != 0.0 || _wait_frames != 0
+	return _wait_time != 0.0 || \
+		_wait_physics_frames != 0 || \
+		_wait_process_frames != 0

project/addons/gut/awaiter.gd.uid

@@ -1 +1 @@
-uid://j1rvrx3u5a35
+uid://ccu4ww35edtdi

project/addons/gut/cli/change_project_warnings.gd.uid

@@ -1 +1 @@
-uid://1df8gcj6lhx0
+uid://1pauyfnd1cre