noury/miggor-StreamGraph
1
0
Fork 0
mirror of https://codeberg.org/StreamGraph/StreamGraph.git synced 2024-11-13 19:49:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

change all value requests and value resolutions in all nodes to be async (#57)

Browse source 
Reviewed-on: https://codeberg.org/StreamGraph/StreamGraph/pulls/57
Co-authored-by: Lera Elvoé <yagich@poto.cafe>
Co-committed-by: Lera Elvoé <yagich@poto.cafe>
This commit is contained in:
Lera Elvoé 2024-01-25 07:20:41 +00:00 committed by yagich
parent d0313b9697
commit fbcb04651c
26 changed files with 74 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
classes/deck/deck_node.gd
View file

@ -145,19 +145,9 @@ func add_incoming_connection(to_port: int, from_node: String, from_port: int) ->
incoming_connection_added.emit(to_port)
## Request a value from an incoming connection on this node's input port at [param on_port].
## Asynchronously request a value from an incoming connection on this node's input port at [param on_port].
## Returns [code]null[/code] if no incoming connection exists on that port.
## The connected node may also return [code]null[/code].
func request_value(on_port: int) -> Variant:
if !incoming_connections.has(on_port):
return null
var connection: Dictionary = incoming_connections[on_port]
var node := get_node(connection.keys()[0])
return node._value_request(connection.values()[0])
## Asynchronous version of [method request_value].
func request_value_async(on_port: int) -> Variant:
if !incoming_connections.has(on_port):
return null
@ -305,29 +295,21 @@ func _post_load() -> void:
## A helper function to get a value on an input port. Returns the best match in the following
## order of priority:[br]
## 1. The direct result of [method request value]. [br]
## 2. The result of [method Port.value_callback]. [br]
## 3. The input [Port] at index [param input_port]'s stored [member Port.value]. [br]
## 4. [code]null[/code].
func resolve_input_port_value(input_port: int) -> Variant:
if request_value(input_port) != null:
return request_value(input_port)
elif get_input_ports()[input_port].value_callback.get_object() && get_input_ports()[input_port].value_callback.call() != null:
## 1. The direct result of [method request value], called asynchronously. [br]
## 2. The result of [method Port.value_callback], if it's not equal to [param empty_value]. [br]
## 3. The input [Port] at index [param input_port]'s stored [member Port.value], if it's not equal to [param empty_value]. [br]
## 4. [code]null[/code].[br]
func resolve_input_port_value_async(input_port: int, empty_value: Variant = null) -> Variant:
var request = await request_value_async(input_port)
if request != null:
return request
elif get_input_ports()[input_port].value_callback.get_object() && get_input_ports()[input_port].value_callback.call() != empty_value:
return get_input_ports()[input_port].value_callback.call()
elif get_input_ports()[input_port].value != null:
elif get_input_ports()[input_port].value != empty_value:
return get_input_ports()[input_port].value
else:
return null
func resolve_input_port_value_async(input_port: int) -> Variant:
if await request_value_async(input_port) != null:
return await request_value_async(input_port)
elif get_input_ports()[input_port].value_callback.get_object() && get_input_ports()[input_port].value_callback.call() != null:
return get_input_ports()[input_port].value_callback.call()
elif get_input_ports()[input_port].value != null:
return get_input_ports()[input_port].value
else:
return null
## Returns a [Dictionary] representation of this node.
func to_dict(with_meta: bool = true) -> Dictionary:

4
classes/deck/nodes/general/array_get_index.gd
View file

@ -27,12 +27,12 @@ func _init() -> void:
func _value_request(on_port: int) -> Variant:
var arr = request_value(0)
var arr = await request_value_async(0)
if arr == null:
DeckHolder.logger.log_node("Array index: Input array is null. Returning null.", Logger.LogType.ERROR)
return null
var idx := int(resolve_input_port_value(1))
var idx := int(await resolve_input_port_value_async(1))
if idx < 0:
idx = (arr as Array).size() + idx

4
classes/deck/nodes/general/dictionary_get_key.gd
View file

@ -27,11 +27,11 @@ func _init() -> void:
func _value_request(_on_port: int) -> Variant:
var d = request_value(0)
var d = await request_value_async(0)
if d == null:
return null
var key = resolve_input_port_value(1)
var key = await resolve_input_port_value_async(1)
if key == null:
return null

2
classes/deck/nodes/general/expression_node.gd
View file

@ -40,7 +40,7 @@ func _value_request(_from_port : int) -> Variant:
return null
var res = expr.execute([_belonging_to.variable_stack, request_value(0)])
var res = expr.execute([_belonging_to.variable_stack, await request_value_async(0)])
if expr.has_execute_failed():
DeckHolder.logger.log_node("Expression Execution Failed: %s" % text, Logger.LogType.ERROR)

6
classes/deck/nodes/general/if_true.gd
View file

@ -29,9 +29,5 @@ func _receive(to_input_port: int, data: Variant, extra_data: Array = []) -> void
if to_input_port != 1:
return
if resolve_input_port_value(0):
if await resolve_input_port_value_async(0):
send(0, data, extra_data)
elif ports[0].value:
send(0, data, extra_data)

4
classes/deck/nodes/general/is_equal.gd
View file

@ -28,7 +28,7 @@ func _init() -> void:
func _value_request(on_port: int) -> Variant:
var a = resolve_input_port_value(0)
var b = resolve_input_port_value(1)
var a = await resolve_input_port_value_async(0)
var b = await resolve_input_port_value_async(1)
return a == b

2
classes/deck/nodes/general/print.gd
View file

@ -36,7 +36,7 @@ func _receive(to_input_port: int, data: Variant, extra_data: Array = []) -> void
if to_input_port != 1:
return
var data_to_print = str(resolve_input_port_value(0))
var data_to_print = str(await resolve_input_port_value_async(0))
if data_to_print == null:
data_to_print = str(data)
if (data_to_print as String).is_empty():

2
classes/deck/nodes/general/process_node.gd
View file

@ -32,7 +32,7 @@ func _event_received(event_name: StringName, event_data: Dictionary = {}) -> voi
if event_name != &"process":
return
var run = resolve_input_port_value(0) == true
var run = await resolve_input_port_value_async(0) == true
if !run:
return

15
classes/deck/nodes/general/set_deck_var.gd
View file

@ -38,21 +38,10 @@ func _receive(to_input_port: int, _data: Variant, _extra_data: Array = []) -> vo
if to_input_port != 2:
return
var var_name: String = resolve_input_port_value(0)
var var_value: Variant = resolve_input_port_value(1)
var var_name: String = await resolve_input_port_value_async(0)
var var_value: Variant = await resolve_input_port_value_async(1)
#_belonging_to.variable_stack[var_name] = var_value
_belonging_to.set_variable(var_name, var_value)
send(0, var_value)
# this can probably go into DeckNode with a different name that makes it clear
# that it prioritizes call-time resolution
# EDIT: done, see DeckNode#resolve_input_port_value
func get_value_for_port(port: int) -> Variant:
if request_value(port) != null:
return request_value(port)
elif get_input_ports()[port].value_callback.get_object() && get_input_ports()[port].value_callback.call() != null:
return get_input_ports()[port].value_callback.call()
else:
return null

8
classes/deck/nodes/general/string_split.gd
View file

@ -28,11 +28,11 @@ func _init() -> void:
func _value_request(on_port: int) -> Variant:
if !resolve_input_port_value(1):
var delimiter = await resolve_input_port_value_async(1)
if !delimiter:
DeckHolder.logger.log_node("Split: could not resolve delimiter. Returning: []", Logger.LogType.ERROR)
return []
var string := str(resolve_input_port_value(0))
var del := str(resolve_input_port_value(1))
var string = await resolve_input_port_value_async(0)
return Array(string.split(del))
return Array(string.split(delimiter))

2
classes/deck/nodes/group/group_input_node.gd
View file

@ -77,4 +77,4 @@ func _post_load() -> void:
func _value_request(from_port: int) -> Variant:
return group_node.request_value(group_node.get_input_ports()[from_port].index_of_type)
return await group_node.request_value_async(group_node.get_input_ports()[from_port].index_of_type)

2
classes/deck/nodes/group/group_node.gd
View file

@ -78,4 +78,4 @@ func _receive(to_input_port: int, data: Variant, extra_data: Array = []):
func _value_request(from_port: int) -> Variant:
return output_node.request_value(from_port)
return await output_node.request_value_async(from_port)

4
classes/deck/nodes/math/vector_add.gd
View file

@ -24,8 +24,8 @@ func _init() -> void:
func _value_request(_on_port: int) -> Variant:
var va = request_value(0)
var vb = request_value(1)
var va = await request_value_async(0)
var vb = await request_value_async(1)
if !va || !vb:
DeckHolder.logger.log_node("Vector Add: one of the vectors is invalid.", Logger.LogType.ERROR)

4
classes/deck/nodes/math/vector_compose.gd
View file

@ -27,6 +27,6 @@ func _init() -> void:
func _value_request(_on_port: int) -> Dictionary:
var x = float(resolve_input_port_value(0))
var y = float(resolve_input_port_value(1))
var x = float(await resolve_input_port_value_async(0))
var y = float(await resolve_input_port_value_async(1))
return {"x": x, "y": y}

2
classes/deck/nodes/math/vector_decompose.gd
View file

@ -25,7 +25,7 @@ func _init() -> void:
func _value_request(on_port: int) -> Variant:
var v = request_value(0)
var v = await request_value_async(0)
if !v:
DeckHolder.logger.log_node("Vector Decompose: the vector is invalid.", Logger.LogType.ERROR)
return null

4
classes/deck/nodes/math/vector_dot.gd
View file

@ -25,8 +25,8 @@ func _init() -> void:
func _value_request(_on_port: int) -> Variant:
var va = request_value(0)
var vb = request_value(1)
var va = await request_value_async(0)
var vb = await request_value_async(1)
if !va || !vb:
DeckHolder.logger.log_node("Vector Dot: one of the vectors is invalid.", Logger.LogType.ERROR)

4
classes/deck/nodes/math/vector_multiply.gd
View file

@ -26,7 +26,7 @@ func _init() -> void:
func _value_request(_on_port: int) -> Variant:
var v = request_value(0)
var v = await request_value_async(0)
if !v:
DeckHolder.logger.log_node("Vector Mult: the vector is invalid.", Logger.LogType.ERROR)
@ -36,6 +36,6 @@ func _value_request(_on_port: int) -> Variant:
DeckHolder.logger.log_node("Vector Mult: the vector is invalid.", Logger.LogType.ERROR)
return null
var s = float(resolve_input_port_value(1))
var s = float(await resolve_input_port_value_async(1))
return {"x": v.x * s, "y": v.y * s}

2
classes/deck/nodes/math/vector_normalize.gd
View file

@ -21,7 +21,7 @@ func _init() -> void:
func _value_request(_on_port: int) -> Variant:
var v = request_value(0)
var v = await request_value_async(0)
if !v:
DeckHolder.logger.log_node("Vector Normalize: the vector is invalid.", Logger.LogType.ERROR)
return null

4
classes/deck/nodes/math/vector_subtract.gd
View file

@ -24,8 +24,8 @@ func _init() -> void:
func _value_request(_on_port: int) -> Variant:
var va = request_value(0)
var vb = request_value(1)
var va = await request_value_async(0)
var vb = await request_value_async(1)
if !va || !vb:
DeckHolder.logger.log_node("Vector Sub: one of the vectors is invalid.", Logger.LogType.ERROR)

2
classes/deck/nodes/obs/obs_decompose_transform.gd
View file

@ -30,7 +30,7 @@ func _init() -> void:
func _value_request(on_port: int) -> Variant:
var t = request_value(0)
var t = await request_value_async(0)
if t == null:
return null

21
classes/deck/nodes/obs/obs_search_source.gd
View file

@ -37,21 +37,16 @@ func _value_request(_on_output_port: int) -> Variant:
if noobs == null:
noobs = Connections.obs_websocket
var scene_name: String
if request_value(0) != null:
scene_name = request_value(0)
elif get_input_ports()[0].value_callback.get_object() && get_input_ports()[0].value_callback.call() != "":
scene_name = get_input_ports()[0].value_callback.call()
if scene_name.is_empty():
var scene_name_req = await resolve_input_port_value_async(0, "")
if scene_name_req == null:
return null
var source_name: String
if request_value(1) != null:
source_name = request_value(1)
elif get_input_ports()[1].value_callback.get_object() && get_input_ports()[1].value_callback.call() != "":
source_name = get_input_ports()[1].value_callback.call()
if source_name.is_empty():
var source_name_req = await resolve_input_port_value_async(1, "")
if source_name_req == null:
return null
var scene_name: String = scene_name_req
var source_name: String = source_name_req
if cached_scene_name == scene_name && cached_source_name == scene_name:
return cached_id

29
classes/deck/nodes/obs/obs_set_source_transform.gd
View file

@ -57,27 +57,26 @@ func _receive(to_input_port: int, _data: Variant, _extra_data: Array = []) -> vo
if lock:
return
var scene_name_req = await resolve_input_port_value_async(InputPorts.SCENE_NAME, "")
if scene_name_req == null:
return
var scene_name: String
if request_value(InputPorts.SCENE_NAME) != null:
scene_name = request_value(InputPorts.SCENE_NAME)
elif get_input_ports()[InputPorts.SCENE_NAME].value_callback.get_object() && get_input_ports()[InputPorts.SCENE_NAME].value_callback.call() != "":
scene_name = get_input_ports()[InputPorts.SCENE_NAME].value_callback.call()
if scene_name.is_empty():
return
var source_id: float
var res_as = await request_value_async(InputPorts.SOURCE_ID)
if res_as != null:
source_id = res_as
elif get_input_ports()[InputPorts.SOURCE_ID].value_callback.get_object() && get_input_ports()[InputPorts.SOURCE_ID].value_callback.call() != null:
source_id = get_input_ports()[InputPorts.SOURCE_ID].value_callback.call()
var source_id_req = await resolve_input_port_value_async(InputPorts.SOURCE_ID)
if source_id_req == null:
return
var source_id: float = source_id_req
var xform: Dictionary
if request_value(InputPorts.XFORM) != null:
xform = request_value(InputPorts.XFORM)
elif get_input_ports()[InputPorts.XFORM].value_callback.get_object() && get_input_ports()[InputPorts.XFORM].value_callback.call() != null:
xform = get_input_ports()[InputPorts.XFORM].value_callback.call()
var xform_req = await resolve_input_port_value_async(InputPorts.XFORM)
if xform_req == null:
return
var xform: Dictionary = xform_req
if xform.is_empty():
return

10
classes/deck/nodes/obs/obs_switch_scene.gd
View file

@ -32,11 +32,11 @@ func _receive(on_input_port: int, _data: Variant, _extra_data: Array = []) -> vo
if noobs == null:
noobs = Connections.obs_websocket
var scene_name: String
if request_value(0) != null:
scene_name = request_value(0)
elif get_input_ports()[0].value_callback.get_object() && get_input_ports()[0].value_callback.call() != "":
scene_name = get_input_ports()[0].value_callback.call()
var scene_name_req = await resolve_input_port_value_async(0, "")
if scene_name_req == null:
return
var scene_name: String = scene_name_req
if scene_name.is_empty():
return

2
classes/deck/nodes/obs/obs_vector_to_position.gd
View file

@ -20,7 +20,7 @@ func _init() -> void:
func _value_request(_on_port: int) -> Variant:
var v = request_value(0)
var v = await request_value_async(0)
if !v:
return null

4
classes/deck/nodes/twitch/twitch_request_user_info.gd
View file

@ -42,8 +42,8 @@ func switch_user_input_type(value):
func _value_request(from_port):
var user_input = resolve_input_port_value(0)
var as_id = resolve_input_port_value(1)
var user_input = await resolve_input_port_value_async(0)
var as_id = await resolve_input_port_value_async(1)
var req_url := "https://api.twitch.tv/helix/users?"
if as_id:

4
classes/deck/nodes/twitch/twitch_send_chat.gd
View file

@ -35,8 +35,8 @@ func _receive(to_input_port, data: Variant, extra_data: Array = []):
return
var msg = resolve_input_port_value(0)
var channel = resolve_input_port_value(1)
var msg = await resolve_input_port_value_async(0)
var channel = await resolve_input_port_value_async(1)
if channel == null: