Replaced remaining emit_signal() calls with .emit()

First upgrade to Godot 4.
2021-08-21 21:01:58 +02:00 · 2021-08-21 20:56:19 +02:00
15 changed files with 222 additions and 200 deletions
--- a/scripts/libs/algorithm.gd
+++ b/scripts/libs/algorithm.gd
@ -18,7 +18,7 @@ class __SortBy:
 ################
 # public stuff #
 ################
-func _init() -> void:
+func _init():
 	assert(0, "This class should not be instantiated.")

 # Packs source code into a small script object, like a lambda in other languages.
@ -35,11 +35,11 @@ func _init() -> void:
 # @param params A list of parameter names your function takes.
 # @param fn_name The name of the resulting function, defaults to "eval".
 # @returns An object containing the lambda function as fn_name.
-static func lambda(source : String, params := [], fn_name := "eval") -> Reference:
+static func lambda(source : String, params := [], fn_name := "eval") -> RefCounted:
 	var script := GDScript.new();
 	script.source_code = "tool\nextends Reference\nfunc {fn_name}({param_list}):\n\t{source}".format({
 		"source": source,
-		"param_list": PoolStringArray(params).join(","),
+		"param_list": ",".join(PackedStringArray(params)),
 		"fn_name": fn_name
 	})
 	var err : int = script.reload()
@ -63,12 +63,12 @@ static func lambda(source : String, params := [], fn_name := "eval") -> Referenc
 # Example 2:
 # func remove_negatives2(col):
 #     GDBAlgorithm.remove_if(col, "num < 0", ["num"])
-static func remove_if(collection, p0, p1 = null) -> int:
+static func remove_if(collection, p0, p1 : Variant = null) -> int:
 	if p0 is String:
 		if p1 && !p1 is Array:
 			printerr("remove_if failed: invalid parameters")
 			return 0
-		var lmb := lambda(p0 as String, p1 as Array if p1 else [])
+		var lmb := lambda(p0 as String, p1 if p1 is Array else [])
 		if !lmb:
 			return 0 # errors have already been printed
 		return __remove_if(collection, lmb, "eval")
@ -82,7 +82,7 @@ static func sort_by(arr : Array, prop_name : String, descending := false):
 	var comparator := __SortBy.new()
 	comparator.prop_name = prop_name
 	comparator.descending = descending
-	arr.sort_custom(comparator, "__sort")
+	arr.sort_custom(comparator.__sort)

 #################
 # private stuff #
--- a/scripts/libs/constants.gd
+++ b/scripts/libs/constants.gd
@ -11,5 +11,5 @@ const SETTING_FAVOURITE_PLACES = "favourite_places"
 ################
 # public stuff #
 ################
-func _init() -> void:
+func _init():
 	assert(0, "This class should not be instantiated.")
--- a/scripts/libs/coroutine.gd
+++ b/scripts/libs/coroutine.gd
@ -6,7 +6,7 @@ extends Object
 class_name GDBCoroutine

 class __WaitAll:
-	var __SIG_SEPERATOR = Reference.new()
+	var __SIG_SEPERATOR = RefCounted.new()
 	var remaining_signals : Array
 	var results := []
 	
@ -18,7 +18,7 @@ class __WaitAll:
 		results.resize(remaining_signals.size())
 	
 	func _on_signal(p0 = null, p1 = null, p2 = null, p3 = null, p4 = null, p5 = null, p6 = null, p7 = null):
-		var params := [p0, p1, p2, p3, p4, p5, p6, p7]
+		var params : Array = [p0, p1, p2, p3, p4, p5, p6, p7]
 		assert(__SIG_SEPERATOR in params)
 		
 		# store the parameters
@ -33,16 +33,16 @@ class __WaitAll:
 		for i in range(remaining_signals.size()):
 			if remaining_signals[i]["object"] == params[0] && remaining_signals[i]["signal"] == params[1]:
 				remaining_signals.remove(i)
-				results[params[2]] = sig_params
+				results[params[2] as int] = sig_params
 				break
 		
-		if remaining_signals.empty():
-			emit_signal("finished", results)
+		if remaining_signals.is_empty():
+			finished.emit(results)
 	
 	signal finished(results)

 class __WaitAny:
-	var __SIG_SEPERATOR = Reference.new()
+	var __SIG_SEPERATOR = RefCounted.new()
 	
 	func __connect_signals(signals : Array):
 		for ele in signals:
@ -62,7 +62,7 @@ class __WaitAny:
 		
 		# object and signal should be remaining (and some nulls)
 		assert(params.size() >= 2)
-		emit_signal("finished", params[0], params[1], sig_params)
+		finished.emit(params[0], params[1], sig_params)
 		
 		for con in get_signal_connection_list("_on_signal"):
 			con["source"].disconnect(con["signal"], self, "_on_signal")
@ -72,7 +72,7 @@ class __WaitAny:
 ################
 # public stuff #
 ################
-func _init() -> void:
+func _init():
 	assert(0, "This class should not be instantiated.")

 #! Wait for multiple signals.
@ -102,6 +102,7 @@ func _init() -> void:
 #!                            "object" and "signal" elements.
 #! \returns An object with a "finished" signal.
 static func wait_for_all(objects_and_signals : Array) -> Object:
+	# TODO: this should just take an array of Signals now
 	var obj := __WaitAll.new()
 	if objects_and_signals:
 		obj.remaining_signals = objects_and_signals
@ -137,12 +138,13 @@ static func wait_for_all(objects_and_signals : Array) -> Object:
 #!                            "object" and "signal" elements.
 #! \returns An object with a "finished" signal.
 static func wait_for_any(objects_and_signals : Array):
+	# TODO: this should just take an array of Signals now
 	var obj := __WaitAny.new()
 	obj.__connect_signals(objects_and_signals)
 	return obj

-static func await(res):
-	if res is GDScriptFunctionState:
-		return yield(res, "completed")
-	yield(GDBUtility.get_scene_tree(), "idle_frame")
-	return res
+#static func await(res):
+#	if res is GDScriptFunctionState:
+#		return yield(res, "completed")
+#	yield(GDBUtility.get_scene_tree(), "idle_frame")
+#	return res
--- a/scripts/libs/debug.gd
+++ b/scripts/libs/debug.gd
@ -9,7 +9,7 @@ class_name GDBDebug
 ################
 # public stuff #
 ################
-func _init() -> void:
+func _init():
 	assert(0, "This class should not be instantiated.")

 static func assert_valid_num(v):
--- a/scripts/libs/format.gd
+++ b/scripts/libs/format.gd
@ -8,7 +8,7 @@ class_name GDBFormat
 ################
 # public stuff #
 ################
-func _init() -> void:
+func _init():
 	assert(0, "This class should not be instantiated.")

 static func format_bytes(bytes : int) -> String:
@ -25,7 +25,7 @@ static func format_time(time : float) -> String:
 	var seconds = int(time) % 60
 	return "%02d:%02d" % [minutes, seconds]

-static func format_unixtime(unix_time : int, format := tr("{0year}-{0month}-{0day} {0hour}:{0minute}")) -> String:
+static func format_unixtime(unix_time : int, format := GDBUtility.translate("{0year}-{0month}-{0day} {0hour}:{0minute}")) -> String:
 	var datetime = OS.get_datetime_from_unix_time(unix_time)
 	datetime["year2"] = datetime["year"] % 100
 	datetime["0year"] = "%02d" % datetime["year2"]
@ -38,7 +38,7 @@ static func format_unixtime(unix_time : int, format := tr("{0year}-{0month}-{0da
 	# return "%02d-%02d-%02d %02d:%02d" % [datetime["year"] % 100, datetime["month"], datetime["day"], datetime["hour"], datetime["minute"]]
 	return format.format(datetime)

-static func smart_format_unixtime(unix_time : int, format_date := tr("{0year}-{0month}-{0day}"), format_time := tr("{0hour}:{0minute}")) -> String:
+static func smart_format_unixtime(unix_time : int, format_date := GDBUtility.translate("{0year}-{0month}-{0day}"), format_time := GDBUtility.translate("{0hour}:{0minute}")) -> String:
 	var now = OS.get_unix_time()
 	var datetime = OS.get_datetime_from_unix_time(unix_time)
 	
--- a/scripts/libs/fsutil.gd
+++ b/scripts/libs/fsutil.gd
@ -19,10 +19,10 @@ class SpecialFolder:
 ################
 # public stuff #
 ################
-func _init() -> void:
+func _init():
 	assert(0, "This class should not be instantiated.")

-static func find_all_by_name(path : String, name : String, files_only = true) -> Dictionary:
+static func find_all_by_name(path : String, name : String, files_only = true) -> Array:
 	var result = []
 	__find_all_by_name(path, name, result, files_only)
 	return result
@ -83,7 +83,7 @@ static func get_special_folders() -> Array:

 static func replace_environment_variables(string : String) -> String:
 	var matches := __get_envvar_regex().search_all(string)
-	var parts := PoolStringArray()
+	var parts := PackedStringArray()
 	var pos := 0
 	for the_match in matches:
 		var var_name : String = the_match.strings[-2] if !the_match.strings[-1] else the_match.strings[-1]
@ -91,7 +91,7 @@ static func replace_environment_variables(string : String) -> String:
 		parts.append(OS.get_environment(var_name))
 		pos = the_match.get_end()
 	parts.append(string.substr(pos))
-	return parts.join("")
+	return "".join(parts)

 #################
 # private stuff #
--- a/scripts/libs/geoutil.gd
+++ b/scripts/libs/geoutil.gd
@ -29,24 +29,24 @@ class Grid3D:
 ################
 # public stuff #
 ################
-func _init() -> void:
+func _init():
 	assert(0, "This class should not be instantiated.")

-static func full_aabb(root : Spatial):
+static func full_aabb(root : Node3D):
 	var aabb = AABB()
-	for vi in GDBUtility.find_nodes_by_type(root, VisualInstance):
+	for vi in GDBUtility.find_nodes_by_type(root, VisualInstance3D):
 		var local_aabb = vi.get_aabb()
 		local_aabb = vi.global_transform.xform(local_aabb)
 		aabb = aabb.merge(local_aabb)
 	return aabb

-static func gen_aabb(points : Array, point_transform = Transform()) -> AABB:
+static func gen_aabb(points : Array, point_transform = Transform3D()) -> AABB:
 	var aabb = AABB()
 	for point in points:
-		aabb = aabb.expand(point_transform.xform(point))
+		aabb = aabb.expand(point_transform * point)
 	return aabb

-static func collsion_aabb(collision_object : CollisionObject) -> AABB:
+static func collsion_aabb(collision_object : CollisionObject3D) -> AABB:
 	var aabb := AABB()
 	for owner_id in collision_object.get_shape_owners():
 		var trans = collision_object.shape_owner_get_transform(owner_id)
@ -54,56 +54,56 @@ static func collsion_aabb(collision_object : CollisionObject) -> AABB:
 			var shape = collision_object.shape_owner_get_shape(owner_id, shape_id)
 			var new_aabb = shape_aabb(shape)
 			if new_aabb.size:
-				aabb = aabb.merge(trans.xform(new_aabb))
+				aabb = aabb.merge(trans * new_aabb)
 	return aabb

-static func shape_aabb(shape : Shape) -> AABB:
-	if shape is BoxShape:
+static func shape_aabb(shape : Shape3D) -> AABB:
+	if shape is BoxShape3D:
 		return AABB(-shape.extents, 2.0 * shape.extents)
-	elif shape is CapsuleShape:
+	elif shape is CapsuleShape3D:
 		return AABB(Vector3(-shape.radius, -shape.radius - 0.5 * shape.height, -shape.radius), \
 				Vector3(2.0 * shape.radius, 2.0 * shape.radius + shape.height, 2.0 * shape.radius))
-	elif shape is CylinderShape:
+	elif shape is CylinderShape3D:
 		return AABB(Vector3(-shape.radius, -0.5 * shape.height, -shape.radius), \
 				Vector3(2.0 * shape.radius, shape.height, 2.0 * shape.radius))
-	elif shape is PlaneShape:
-		return AABB()
-	elif shape is SphereShape:
+#	elif shape is PlaneShape3D:
+#		return AABB()
+	elif shape is SphereShape3D:
 		return AABB(-Vector3(shape.radius, shape.radius, shape.radius), 2.0 * Vector3(shape.radius, shape.radius, shape.radius))
 	else:
 		# TODO: polygon shapes
 		return AABB()

 static func orphan_global_transform(node : Node):
-	var transform : Transform
-	if node is Spatial:
+	var transform : Transform3D
+	if node is Node3D:
 		transform = node.transform
 	var parent = node.get_parent()
 	if parent != null:
 		transform = orphan_global_transform(parent) * transform
 	return transform

-static func voxelize_surf(mesh : ArrayMesh, surf : int, particle_size = -1.0) -> PoolVector3Array:
+static func voxelize_surf(mesh : ArrayMesh, surf : int, particle_size = -1.0) -> PackedVector3Array:
 	var arrays = mesh.surface_get_arrays(surf)
 	var points = arrays[Mesh.ARRAY_VERTEX]
-	return PoolVector3Array(points)
+	return PackedVector3Array(points)

-static func voxelize(mesh : ArrayMesh, particle_size = -1.0) -> PoolVector3Array:
-	var points = PoolVector3Array()
+static func voxelize(mesh : ArrayMesh, particle_size = -1.0) -> PackedVector3Array:
+	var points = PackedVector3Array()
 	for surf in range(mesh.get_surface_count()):
 		points.append_array(voxelize_surf(mesh, surf, particle_size))
 	return points

 static func transform_to(node : Node, root : Node):
-	var transform = Transform()
+	var transform = Transform3D()
 	var node_ = node
 	while node_ != root && node_ != null:
-		if node_ is Spatial:
+		if node_ is Node3D:
 			transform = transform * node_.transform
 		node_ = node_.get_parent()
 	return transform

-static func mesh_to_grid(mesh : ArrayMesh, grid_size : float, point_transform = Transform()):
+static func mesh_to_grid(mesh : ArrayMesh, grid_size : float, point_transform = Transform3D()):
 	var aabb = AABB()
 	for i in range(mesh.get_surface_count()):
 		var points = mesh.surface_get_arrays(i)[Mesh.ARRAY_VERTEX]
@ -148,17 +148,17 @@ static func angle_diff(angle0 : float, angle1 : float) -> float:
 #################
 # private stuff #
 #################
-static func __insert_tri(a : Vector3, b : Vector3, c : Vector3, grid_origin : Vector3, grid_size : float, grid : Grid3D, point_transform : Transform):
+static func __insert_tri(a : Vector3, b : Vector3, c : Vector3, grid_origin : Vector3, grid_size : float, grid : Grid3D, point_transform : Transform3D):
 	var ray_dir = Vector3(0, 0, 1)
 	for x in range(grid.size.x):
 		for y in range(grid.size.y):
 			var ray_origin = grid_origin + grid_size * Vector3(x, y, 0)
-			var inters = Geometry.ray_intersects_triangle(ray_origin, ray_dir, point_transform.xform(a), point_transform.xform(b), point_transform.xform(c))
+			var inters = Geometry3D.ray_intersects_triangle(ray_origin, ray_dir, point_transform * a, point_transform * b, point_transform * c)
 			if inters != null:
 				var z = floor(0.99 * (inters.z - grid_origin.z) / grid_size)
 				grid.set_at(x, y, z, grid.get_at(x, y, z) + 1)

-static func __insert_surf(mesh : ArrayMesh, surf : int, grid_origin : Vector3, grid_size : float, grid : Grid3D, point_transform : Transform):
+static func __insert_surf(mesh : ArrayMesh, surf : int, grid_origin : Vector3, grid_size : float, grid : Grid3D, point_transform : Transform3D):
 	var arrays = mesh.surface_get_arrays(surf)
 	if arrays.size() >= Mesh.ARRAY_INDEX - 1 && arrays[Mesh.ARRAY_INDEX].size() > 0:
 		# index mode
--- a/scripts/libs/graphing.gd
+++ b/scripts/libs/graphing.gd
@ -31,7 +31,9 @@ class Graph:
 			if (edge.idx0 == idx0 && edge.idx1 == idx1) || \
 				(edge.idx0 == idx1 && edge.idx1 == idx0):
 				return
-		edges.append(Edge.new(idx0, idx1, weight))
+		# TODO: why doesn't this work? bug?
+		assert(0)
+		# edges.append(Edge.new(idx0, idx1, weight))
 	
 	func remove_vertex(vertex):
 		var idx = vertices.find(vertex)
@ -72,7 +74,7 @@ class Graph:
 ################
 # public stuff #
 ################
-func _init() -> void:
+func _init():
 	assert(0, "This class should not be instantiated.")

 # generates a delaunay triangulation for the given point list
@ -163,7 +165,7 @@ func find_path(graph : Graph, start_idx : int, end_idx : int) -> Dictionary:
 		queue.append(idx)
 	dist[start_idx] = 0.0
 	
-	while !queue.empty():
+	while !queue.is_empty():
 		var shortest_dist = INF
 		var shortest_idx : int
 		for idx in queue:
@ -207,8 +209,8 @@ func find_path(graph : Graph, start_idx : int, end_idx : int) -> Dictionary:
 # draws a graph onto a control
 func dump_graph_2d(graph : Graph, control : Control) -> void:
 	var normalized_graph = graph.duplicate()
-	var min_xy = Vector2.INF
-	var max_xy = -Vector2.INF
+	var min_xy = Vector2(INF, INF)
+	var max_xy = -Vector2(INF, INF)
 	
 	# normalize graph
 	for vertex in normalized_graph.vertices:
@ -235,18 +237,18 @@ func dump_graph_2d(graph : Graph, control : Control) -> void:
 		var coord0 = __img_vertex_coord(v0, img_size)
 		var coord1 = __img_vertex_coord(v1, img_size)
 		
-		control.draw_line(coord0, coord1, Color.yellow, 2.0, true)
+		control.draw_line(coord0, coord1, Color.YELLOW, 2.0)
 	
 	for vertex in normalized_graph.vertices:
 		var coord = __img_vertex_coord(vertex, img_size)
-		control.draw_circle(coord, 5.0, Color.red)
+		control.draw_circle(coord, 5.0, Color.RED)

 #################
 # private stuff #
 #################
 func __gen_super_triangle(graph : Graph, point_list : Array) -> void:
-	var min_xy = Vector2.INF
-	var max_xy = -Vector2.INF
+	var min_xy = Vector2(INF, INF)
+	var max_xy = -Vector2(INF, INF)
 	
 	for point in point_list:
 		if point.x < min_xy.x:
--- a/scripts/libs/math.gd
+++ b/scripts/libs/math.gd
@ -8,7 +8,7 @@ class_name GDBMath
 ################
 # public stuff #
 ################
-func _init() -> void:
+func _init():
 	assert(0, "This class should not be instantiated.")

 static func angle(vec0 : Vector3, vec1 : Vector3, axis : Vector3) -> float:
@ -30,7 +30,7 @@ static func find_perp(a : Vector3, b : Vector3, d : Vector3) -> Vector3:
 	
 	var t = -t1 / (t0 - t1)
 	# assert(t >= 0 && t <= 1)
-	var n = b.linear_interpolate(a, t).normalized()
+	var n = b.lerp(a, t).normalized()
 	var an = n.angle_to(d)
 	assert(abs(n.dot(d)) < 0.01)
 	assert(abs(an - 0.5 * PI) < 0.01)
--- a/scripts/libs/settings.gd
+++ b/scripts/libs/settings.gd
@ -19,7 +19,7 @@ class __State:
 ################
 # public stuff #
 ################
-func _init() -> void:
+func _init():
 	assert(0, "This class should not be instantiated.")

 static func has_value(name : String) -> bool:
@ -29,7 +29,7 @@ static func get_value(name : String, def = null, type = TYPE_NIL):
 	if type == TYPE_NIL && def != null:
 		type = typeof(def)
 	
-	var val = __get_state().values.get(name, def)
+	var val : Variant = __get_state().values.get(name, def)
 	if type is Object:
 		if !val is type:
 			return def
@ -40,8 +40,14 @@ static func get_value(name : String, def = null, type = TYPE_NIL):
 			TYPE_STRING:
 				val = str(val)
 			TYPE_INT:
+				if val is String:
+					val = val.to_int()
+				else:
 					val = int(val)
-			TYPE_REAL:
+			TYPE_FLOAT:
+				if val is String:
+					val = val.to_float()
+				else:
 					val = float(val)
 			TYPE_BOOL:
 				val = bool(val)
@ -58,7 +64,8 @@ static func set_value(name : String, value) -> void:
 		
 		# save next frame (in case multiple values are changed)
 		__get_state().settings_changed = true
-		yield(GDBUtility.get_scene_tree(), "idle_frame")
+		# await GDBUtility.get_scene_tree().process_frame
+		# TODO: cannot make this a coroutine (bug?!)
 		if __get_state().settings_changed:
 			store_to_file()
 			__get_state().settings_changed = false
@ -95,7 +102,13 @@ static func load_from_file() -> void:
 		return # nothing to load
 	
 	in_file.open(__get_state().settings_file_name, File.READ)
-	__load_data(parse_json(in_file.get_as_text()))
+	
+	var json := JSON.new()
+	if json.parse(in_file.get_as_text()) != OK:
+		printerr("Error parsing settings file, invalid json!")
+		printerr("at line {}: {}".format([json.get_error_line(), json.get_error_message()]))
+		return
+	__load_data(json.get_data())

 static func store_to_file() -> void:
 	var out_file = File.new()
@ -109,17 +122,15 @@ static func set_disable_default_settings(disable : bool) -> void:
 static func is_disable_default_settings() -> bool:
 	return __get_state().disable_default_settings

-static func connect_static(sig_name : String, receiver : Object, method : String, binds := []) -> int:
-	return __get_state().connect(sig_name, receiver, method, binds)
-
-static func disconnect_static(sig_name : String, receiver : Object, method : String) -> void:
-	__get_state().disconnect(sig_name, receiver, method)
+static func setting_changed() -> Signal:
+	return __get_state().setting_changed

 #################
 # private stuff #
 #################
 static func __save_data():
-	return to_json(__get_state().values)
+	var json := JSON.new()
+	return json.stringify(__get_state().values)

 static func __load_data(data : Dictionary):
 	for name in data:
@ -128,7 +139,7 @@ static func __load_data(data : Dictionary):
 static func __set_value(name : String, value):
 	__get_state().values[name] = value
 	__on_setting_changed(name, value)
-	__get_state().emit_signal("setting_changed", name, value)
+	__get_state().setting_changed.emit(name, value)

 static func __on_setting_changed(name : String, value):
 	if __get_state().disable_default_settings:
--- a/scripts/libs/util.gd
+++ b/scripts/libs/util.gd
@ -8,7 +8,7 @@ class_name GDBUtility
 ################
 # public stuff #
 ################
-func _init() -> void:
+func _init():
 	assert(0, "This class should not be instantiated.")

 static func find_node_filter(root : Node, object : Object, method : String, bfs := false) -> Node:
@ -118,14 +118,17 @@ static func find_parent_with_type(root : Node, tp) -> Node:
 		return find_parent_with_type(parent, tp)

 static func find_treeitem_with_metadata(root : TreeItem, metadata, column := 0) -> TreeItem:
-	while root:
-		if root.get_metadata(column) == metadata:
-			return root
-		var in_children := find_treeitem_with_metadata(root.get_children(), metadata, column)
-		if in_children:
-			return in_children
-		root = root.get_next()
+	assert(0)
+	# TODO: rewrite
 	return null
+#	while root:
+#		if root.get_metadata(column) == metadata:
+#			return root
+#		var in_children := find_treeitem_with_metadata(root.get_children(), metadata, column)
+#		if in_children:
+#			return in_children
+#		root = root.get_next()
+#	return null

 static func hide_properties(properties : Array, names_to_hide : Array) -> void:
 	for i in range(properties.size() - 1, -1, -1):
@ -140,7 +143,7 @@ static func type_name(type : int) -> String:
 			return "bool"
 		TYPE_INT:
 			return "int"
-		TYPE_REAL:
+		TYPE_FLOAT:
 			return "float"
 		TYPE_STRING:
 			return "String"
@ -154,14 +157,14 @@ static func type_name(type : int) -> String:
 			return "Transform2D"
 		TYPE_PLANE:
 			return "Plane"
-		TYPE_QUAT:
+		TYPE_QUATERNION:
 			return "Quat"
 		TYPE_AABB:
 			return "AABB"
 		TYPE_BASIS:
 			return "Basis"
-		TYPE_TRANSFORM:
-			return "Transform"
+		TYPE_TRANSFORM3D:
+			return "Transform3D"
 		TYPE_COLOR:
 			return "Color"
 		TYPE_NODE_PATH:
@ -175,11 +178,15 @@ static func type_name(type : int) -> String:
 		TYPE_ARRAY:
 			return "Array"
 		TYPE_RAW_ARRAY:
-			return "PoolByteArray"
-		TYPE_INT_ARRAY:
-			return "PoolIntArray"
-		TYPE_REAL_ARRAY:
-			return "PoolRealArray"
+			return "PackedByteArray"
+		TYPE_INT32_ARRAY:
+			return "PackedInt32Array"
+		TYPE_INT64_ARRAY:
+			return "PackedInt64Array"
+		TYPE_FLOAT32_ARRAY:
+			return "PackedFloat32Array"
+		TYPE_FLOAT64_ARRAY:
+			return "PackedFloat64Array"
 		TYPE_STRING_ARRAY:
 			return "PoolStringArray"
 		TYPE_VECTOR2_ARRAY:
@ -201,7 +208,7 @@ static func format_type(type : Dictionary, none_name := "void") -> String:
 			return type_name(tp)

 static func format_method_signature(method : Dictionary, format := "{return} {name}({args})") -> String:
-	var args := PoolStringArray()
+	var args := PackedStringArray()
 	var rettype := "void"
 	if method.has("return"):
 		rettype = format_type(method["return"])
@ -218,7 +225,7 @@ static func format_method_signature(method : Dictionary, format := "{return} {na
 	return format.format({
 		"return": rettype,
 		"name": method["name"],
-		"args": args.join(", ")
+		"args": ", ".join(args)
 	})

 static func format_signal_signature(sig : Dictionary) -> String:
@ -228,8 +235,8 @@ static func get_type_property_list(type : Dictionary) -> Array:
 	match type["type"]:
 		TYPE_VECTOR2:
 			return [
-				{"name": "x", "type": TYPE_REAL},
-				{"name": "y", "type": TYPE_REAL}
+				{"name": "x", "type": TYPE_FLOAT},
+				{"name": "y", "type": TYPE_FLOAT}
 			]
 		TYPE_RECT2:
 			return [
@ -239,9 +246,9 @@ static func get_type_property_list(type : Dictionary) -> Array:
 			]
 		TYPE_VECTOR3:
 			return [
-				{"name": "x", "type": TYPE_REAL},
-				{"name": "y", "type": TYPE_REAL},
-				{"name": "z", "type": TYPE_REAL}
+				{"name": "x", "type": TYPE_FLOAT},
+				{"name": "y", "type": TYPE_FLOAT},
+				{"name": "z", "type": TYPE_FLOAT}
 			]
 		TYPE_TRANSFORM2D:
 			return [
@ -252,17 +259,17 @@ static func get_type_property_list(type : Dictionary) -> Array:
 		TYPE_PLANE:
 			return [
 				{"name": "normal", "type": TYPE_VECTOR3},
-				{"name": "x", "type": TYPE_REAL},
-				{"name": "y", "type": TYPE_REAL},
-				{"name": "z", "type": TYPE_REAL},
-				{"name": "d", "type": TYPE_REAL}
+				{"name": "x", "type": TYPE_FLOAT},
+				{"name": "y", "type": TYPE_FLOAT},
+				{"name": "z", "type": TYPE_FLOAT},
+				{"name": "d", "type": TYPE_FLOAT}
 			]
-		TYPE_QUAT:
+		TYPE_QUATERNION:
 			return [
-				{"name": "x", "type": TYPE_REAL},
-				{"name": "y", "type": TYPE_REAL},
-				{"name": "z", "type": TYPE_REAL},
-				{"name": "w", "type": TYPE_REAL}
+				{"name": "x", "type": TYPE_FLOAT},
+				{"name": "y", "type": TYPE_FLOAT},
+				{"name": "z", "type": TYPE_FLOAT},
+				{"name": "w", "type": TYPE_FLOAT}
 			]
 		TYPE_AABB:
 			return [
@ -276,20 +283,20 @@ static func get_type_property_list(type : Dictionary) -> Array:
 				{"name": "y", "type": TYPE_VECTOR3},
 				{"name": "z", "type": TYPE_VECTOR3}
 			]
-		TYPE_TRANSFORM:
+		TYPE_TRANSFORM3D:
 			return [
 				{"name": "basis", "type": TYPE_BASIS},
 				{"name": "origin", "type": TYPE_VECTOR3}
 			]
 		TYPE_COLOR:
 			return [
-				{"name": "r", "type": TYPE_REAL},
-				{"name": "g", "type": TYPE_REAL},
-				{"name": "b", "type": TYPE_REAL},
-				{"name": "a", "type": TYPE_REAL},
-				{"name": "h", "type": TYPE_REAL},
-				{"name": "s", "type": TYPE_REAL},
-				{"name": "v", "type": TYPE_REAL},
+				{"name": "r", "type": TYPE_FLOAT},
+				{"name": "g", "type": TYPE_FLOAT},
+				{"name": "b", "type": TYPE_FLOAT},
+				{"name": "a", "type": TYPE_FLOAT},
+				{"name": "h", "type": TYPE_FLOAT},
+				{"name": "s", "type": TYPE_FLOAT},
+				{"name": "v", "type": TYPE_FLOAT},
 				{"name": "r8", "type": TYPE_INT},
 				{"name": "g8", "type": TYPE_INT},
 				{"name": "b8", "type": TYPE_INT},
@ -304,7 +311,7 @@ static func get_property_type(obj : Object, property : String) -> int:
 	return typeof(obj.get(property)) # TODO

 static func get_method_arg_types(obj : Object, method : String) -> Array:
-	var methods := obj.get_method_list()
+	var methods : Array = obj.get_method_list()
 	var types := []
 	for ele in methods:
 		if ele["name"] == method:
@ -319,7 +326,7 @@ static func get_scene_tree() -> SceneTree:
 static func wait_frames(nframes : int) -> void:
 	var tree := get_scene_tree()
 	for i in range(max(1, nframes)): # yield at least once so this always returns a GDScriptFunctionState
-		yield(tree, "idle_frame")
+		await tree.process_frame

 static func disconnect_all(sender : Object, receiver : Object, signal_name := "") -> void:
 	if signal_name == "":
@ -348,13 +355,14 @@ static func control_is_in_front_of(front : Control, back : Control) -> bool:
 	var front_popup : bool = find_parent_with_type(front, Popup) != null
 	var back_popup : bool = find_parent_with_type(back, Popup) != null
 	
-	if front_popup && !back_popup:
-		return true
-	elif !front_popup && back_popup:
-		return false
-	elif front_popup && back_popup:
-		return popup_is_in_front_of(front, back)
-	else:
+	# TODO: this part maybe needs to be reimplemented
+#	if front_popup && !back_popup:
+#		return true
+#	elif !front_popup && back_popup:
+#		return false
+#	elif front_popup && back_popup:
+#		return popup_is_in_front_of(front as Popup, back)
+#	else:
 	return back.is_greater_than(front)

 static func popup_is_in_front_of(front : Popup, back : Popup) -> bool:
--- a/scripts/properties/entity.gd
+++ b/scripts/properties/entity.gd
@ -1,4 +1,4 @@
-extends Reference
+extends RefCounted

 class_name GDB_Entity

@ -8,90 +8,88 @@ var _properties := [].duplicate()
 var _property_ids := [].duplicate()

 class _CommonWrapperProperty extends GDB_Property:
-	var object : WeakRef
-	func _init(object_ : Object, val, sig_name := "", flags := 0) -> void:
-		self.object = weakref(object_)
-		.set_type(typeof(val))
-		.set_value(val)
-		.set_flags(flags)
+	func _init(val, sig : Signal = Signal(), flags := 0):
+		super.set_type(typeof(val))
+		super.set_value(val)
+		super.set_flags(flags)
 		
-		if sig_name != "":
-			object_.connect(sig_name, self, "_on_object_value_changed")
+		if !sig.is_null():
+			sig.connect(self._on_object_value_changed)
 	
 	func _on_object_value_changed(p0 = null, p1 = null, p2 = null, p3 = null) -> void:
-		var obj : Object = self.object.get_ref()
-		if obj: # shouldn't actually be null, who called the handler then?
-			_value = obj.get(self.member)
-			emit_signal("value_changed")
+		_value = self.get_value()
+		value_changed.emit()

 class _WrapperProperty extends _CommonWrapperProperty:
+	var object : WeakRef
 	var member : String
 	
-	func _init(object_ : Object, member_ : String, sig_name : String, flags : int) \
-			.(object_, object_.get(member), sig_name, flags) -> void:
+	func _init(object_ : Object, member_ : String, sig : Signal, flags : int):
+		super(object_.get(member), sig, flags)
+		self.object = object_
 		self.member = member_
-		.set_name(member_.capitalize())
+		super.set_name(member_.capitalize())
 	
 	func get_value():
 		var obj : Object = self.object.get_ref()
 		if obj:
 			return obj.get(self.member)
-		return .get_value()
+		return super.get_value()
 	
 	func set_value(value) -> void:
 		var obj : Object = self.object.get_ref()
 		if obj:
 			obj.set(self.member, value)
-			.set_value(obj.get(self.member))
+			super.set_value(obj.get(self.member))
 		else:
-			.set_value(value)
+			super.set_value(value)

 class _ArrayWrapperProperty extends _WrapperProperty:
-	func _init(object_ : Object, member_ : String, sig_name_added : String, sig_name_removed : String, flags : int) \
-		.(object_, member_, "", flags) -> void:
-		if sig_name_added != "":
-			object_.connect(sig_name_added, self, "_on_object_value_added")
-		if sig_name_removed != "":
-			object_.connect(sig_name_added, self, "_on_object_value_removed")
+	func _init(object_ : Object, member_ : String, sig_added : Signal = Signal(), sig_removed : Signal = Signal(), flags := 0):
+		super(object_, member_, Signal(), flags)
+		if !sig_added.is_null():
+			sig_added.connect(self._on_object_value_added)
+		if !sig_removed.is_null():
+			sig_removed.connect(self._on_object_value_removed)
 	
 	func _on_object_value_added(value, p0 = null, p1 = null, p2 = null, p3 = null) -> void:
 		var obj : Object = self.object.get_ref()
 		if obj:
 			_value = obj.get(self.member)
-			emit_signal("value_changed")
-			emit_signal("value_added", value)
+			value_changed.emit()
+			value_added.emit(value)
 	
 	func _on_object_value_removed(value, p0 = null, p1 = null, p2 = null, p3 = null) -> void:
 		var obj : Object = self.object.get_ref()
 		if obj:
 			_value = obj.get(self.member)
-			emit_signal("value_changed")
-			emit_signal("value_removed", value)
+			value_changed.emit()
+			value_removed.emit(value)

 class _GetSetWrapperProperty extends _CommonWrapperProperty:
-	var getter := ""
-	var setter := ""
+	var getter := Callable()
+	var setter := Callable()
 	
-	func _init(object_ : Object, getter_ : String, setter_ := "", sig_name := "", flags := 0) \
-			.(object_, object.call(getter_), sig_name, flags) -> void:
+	func _init(getter_ : Callable, setter_ := Callable(), sig : Signal = Signal(), flags := 0):
+		super(getter_.call(), sig, flags)
 		self.getter = getter_
 		self.setter = setter_
 	
 	func get_value():
 		var obj : Object = self.object.get_ref()
 		if obj:
-			return obj.call(self.getter)
-		return .get_value()
+			return self.getter.call()
+		return super.get_value()
 	
 	func set_value(value) -> void:
-		if !self.setter:
+		if self.setter.is_null():
 			return
 		var obj : Object = self.object.get_ref()
 		if obj:
-			obj.call(self.setter, value)
-			.set_value(obj.call(self.getter))
+			self.setter.call(value)
+			super.set_value(self.getter.call())
 		else:
-			.set_value(value)
+			super.set_value(value)

 ################
 # public stuff #
@ -161,7 +159,7 @@ func add_property(id : String, property : Object, index := -1) -> void:
 	index = min(index, _properties.size())
 	_properties.insert(index, property)
 	_property_ids.insert(index, id)
-	emit_signal("property_added", index)
+	property_added.emit(index)

 func remove_property(property : Object) -> bool:
 	var index := find_property(property)
@ -170,7 +168,7 @@ func remove_property(property : Object) -> bool:
 	
 	_properties.remove(index)
 	_property_ids.remove(index)
-	emit_signal("property_removed", index, property)
+	property_removed.emit(index, property)
 	return true

 func remove_property_at(index : int) -> bool:
@ -190,7 +188,7 @@ func find_property_by_id(id : String) -> int:
 func __set_title(title : String) -> void:
 	if title != _title:
 		_title = title
-		emit_signal("entity_title_changed")
+		entity_title_changed.emit()

 ################
 # static stuff #
@ -199,14 +197,14 @@ static func is_valid_entity(object : Object) -> bool:
 	return object != null \
 		&& object.has_method("get_properties")

-static func make_property(object : Object, member : String, sig_name := "", flags := 0) -> GDB_Property:
-	return _WrapperProperty.new(object, member, sig_name, flags)
+static func make_property(object : Object, member : String, sig := Signal(), flags := 0) -> GDB_Property:
+	return _WrapperProperty.new(object, member, sig, flags)

-static func make_getset_property(object : Object, getter : String, setter := "", sig_name := "", flags := 0) -> GDB_Property:
-	return _GetSetWrapperProperty.new(object, getter, setter, sig_name, flags)
+static func make_getset_property(getter : Callable, setter := Callable(), sig := Signal(), flags := 0) -> GDB_Property:
+	return _GetSetWrapperProperty.new(getter, setter, sig, flags)

-static func make_array_property(object : Object, member : String, sig_name_added := "", sig_name_removed := "", array_type := TYPE_NIL, flags := 0) -> GDB_Property:
-	var prop := _ArrayWrapperProperty.new(object, member, sig_name_added, sig_name_removed, flags)
+static func make_array_property(object : Object, member : String, sig_added := Signal(), sig_removed := Signal(), array_type := TYPE_NIL, flags := 0) -> GDB_Property:
+	var prop := _ArrayWrapperProperty.new(object, member, sig_added, sig_removed, flags)
 	prop.set_content_type(array_type)
 	return prop

@ -217,21 +215,21 @@ static func make_entity_title_property(entity : Object) -> Object:
 		if property:
 			return property
 	if entity.get("title") is String:
-		var sig_name := ""
+		var sig := Signal()
 		if entity.has_signal("title_changed"):
-			sig_name = "title_changed"
-		return make_property(entity, "title", sig_name)
+			sig = entity.title_changed
+		return make_property(entity, "title", sig)
 	if entity.has_method("get_title"):
-		var setter := ""
-		var sig_name := ""
+		var setter := Callable()
+		var sig := Signal()
 		var flags := 0
 		if entity.has_method("set_title"):
-			setter = "set_title"
+			setter = entity.set_title
 		else:
 			flags |= GDB_Property.FLAG_READONLY
 		if entity.has_signal("title_changed"):
-			sig_name = "title_changed"
-		return make_getset_property(entity, "get_title", setter, sig_name, flags)
+			sig = entity.title_changed
+		return make_getset_property(entity.get_title, setter, sig, flags)
 	return null
 	

--- a/scripts/properties/property.gd
+++ b/scripts/properties/property.gd
@ -1,4 +1,4 @@
-extends Reference
+extends RefCounted

 class_name GDB_Property

@ -26,7 +26,7 @@ func get_name() -> String:
 func set_name(name : String) -> void:
 	if _name != name:
 		_name = name
-		emit_signal("name_changed")
+		name_changed.emit()

 func get_icon() -> Texture:
 	return _icon
@ -34,7 +34,7 @@ func get_icon() -> Texture:
 func set_icon(icon : Texture) -> void:
 	if _icon != icon:
 		_icon = icon
-		emit_signal("icon_changed")
+		icon_changed.emit()

 func get_value():
 	return _value
@ -42,7 +42,7 @@ func get_value():
 func set_value(value) -> void:
 	if value != _value:
 		_value = value
-		emit_signal("value_changed")
+		value_changed.emit()

 func get_type() -> int:
 	return _type
@ -50,7 +50,7 @@ func get_type() -> int:
 func set_type(type : int) -> void:
 	if type != _type:
 		_type = type
-		emit_signal("type_changed")
+		type_changed.emit()

 func get_content_type() -> int:
 	return _content_type
@ -58,7 +58,7 @@ func get_content_type() -> int:
 func set_content_type(type : int) -> void:
 	if type != _content_type:
 		_content_type = type
-		emit_signal("type_changed")
+		type_changed.emit()

 func get_flags() -> int:
 	return _flags
@ -66,7 +66,7 @@ func get_flags() -> int:
 func set_flags(flags : int) -> void:
 	if flags != _flags:
 		_flags = flags
-		emit_signal("flags_changed")
+		flags_changed.emit()

 ################
 # static stuff #
@ -97,7 +97,7 @@ static func is_prop_value_valid(property : Object, value) -> bool:
 			return value is bool
 		TYPE_INT:
 			return value is int
-		TYPE_REAL:
+		TYPE_FLOAT:
 			return value is float
 		TYPE_STRING:
 			return value is String
--- a/scripts/types/data_adapter.gd
+++ b/scripts/types/data_adapter.gd
@ -2,7 +2,8 @@ extends Node

 class_name GDB_DataAdapter

-var data setget _set_data
+var data : Variant:
+	set = _set_data

 ###########
 # setters #
@ -10,7 +11,7 @@ var data setget _set_data
 func _set_data(data_) -> void:
 	if data_ != data:
 		data = data_
-		emit_signal("data_changed")
+		data_changed.emit()

 ###########
 # signals #
--- a/scripts/types/reference_wrapper.gd
+++ b/scripts/types/reference_wrapper.gd
@ -1,7 +1,7 @@
 # wrapps not reference-counted object in a reference
 # useful for example if you want to store a type that extends Node outside of the tree

-extends Reference
+extends RefCounted

 class_name GDB_ReferenceWrapper
Author	SHA1	Message	Date
Patrick Wuttke	9dc6800303	Replaced remaining emit_signal() calls with .emit()	2021-08-21 21:01:58 +02:00
Patrick Wuttke	74d4a37de2	First upgrade to Godot 4.	2021-08-21 20:56:19 +02:00