Re enabled UDP peer

Author: Liam Sherwin

core/animation/CueAnimator.gd

@@ -200,7 +200,7 @@ func track(p_cue: Cue, p_pre_existing_data: Dictionary[String, Dictionary]) -> D
 			item.get_parameter(), 
 			item.get_function(), 
 			item.get_zone(),
-			from / (_intensity if item.get_parameter() in _allowed_intensity_parameters else 1.0), 
+			(from / _intensity if _intensity != 0.0 else 0.0) if item.get_parameter() in _allowed_intensity_parameters else from,
 			item.get_value(), 
 			item.get_can_fade(), 
 			item.get_start(),

core/components/EngineComponent.gd

@@ -48,9 +48,9 @@ var _control_methods: Dictionary[String, Dictionary] = {}
 ## Network Config:
 ## high_frequency_signals: Contains all the signals that should be send over the udp stream, instead of the tcp websocket
 var network_config: Dictionary = {
-	"high_frequency_signals": [
+	"high_frequency_signals": {
 
-	]
+	}
 }
 
 
@@ -88,8 +88,13 @@ func set_self_class(p_self_class_name: String) -> void:
 
 
 ## Adds a high frequency signal to the network config
-func register_high_frequency_signals(p_high_frequency_signals: Array) -> void:
-	network_config.high_frequency_signals.append_array(p_high_frequency_signals)
+func register_high_frequency_signal(p_signal: Signal, p_match_args: int = 0) -> void:
+	network_config.high_frequency_signals[p_signal] = p_match_args
+
+
+## Gets the arg match count of a high frequency signal
+func get_hf_signal_arg_match(p_signal: Signal) -> int:
+	return network_config.high_frequency_signals.get(p_signal, 0)
 
 
 ## Registers a method that can be called by external control systems

core/components/TriggerBlock.gd

@@ -11,6 +11,9 @@ signal on_trigger_added(component: EngineComponent, id: String, name: String, ro
 ## Emitted when a trigger is added
 signal on_trigger_removed(row: int, column: int)
 
+## Emitted when a column is reset
+signal on_column_reset(column: int)
+
 ## Emitted when a trigger name is changes
 signal on_trigger_name_changed(row: int, column: int, name: String)
 
@@ -61,6 +64,15 @@ func remove_trigger(p_row: int, p_column: int, no_signal: bool = false) -> bool:
 	return true
 
 
+## Resets a whole column
+func reset_column(p_column: int) -> void:
+	for row: int in _triggers:
+		if p_column in _triggers[row]:
+			remove_trigger(row, p_column, true)
+	
+	on_column_reset.emit(p_column)
+
+
 ## Renames a trigger
 func rename_trigger(p_row: int, p_column: int, p_name: String, no_signal: bool = false) -> bool:
 	if not _triggers.has(p_row) or not _triggers[p_row].has(p_column):

core/components/fixtures/DMXFixture.gd

@@ -76,7 +76,10 @@ func _component_ready() -> void:
 	set_name("DMXFixture")
 	set_self_class("DMXFixture")
 
-	register_high_frequency_signals([on_parameter_changed, on_override_changed])
+	register_high_frequency_signal(on_parameter_changed, 3)
+	register_high_frequency_signal(on_parameter_erased, 2)
+	register_high_frequency_signal(on_override_changed, 3)
+	register_high_frequency_signal(on_override_erased, 2)
 
 
 ## Gets the channel
@@ -158,7 +161,7 @@ func set_parameter(p_parameter: String, p_function: String, p_value: float, p_la
 				}
 
 				if not p_disable_output:
-					on_parameter_changed.emit(p_parameter, p_function, remapped_value, p_zone)
+					on_parameter_changed.emit(p_zone, p_parameter, p_function, remapped_value)
 					_queue_compilation()
 		else:
 			var zones: Array = _parameters.keys()
@@ -167,7 +170,7 @@ func set_parameter(p_parameter: String, p_function: String, p_value: float, p_la
 			for zone: String in zones:
 				set_parameter(p_parameter, p_function, p_value, p_layer_id, zone, true)
 
-			on_parameter_changed.emit(p_parameter, p_function, p_value, p_zone)
+			on_parameter_changed.emit(p_zone, p_parameter, p_function, p_value)
 			_queue_compilation()
 
 		return true
@@ -210,7 +213,7 @@ func erase_parameter(p_parameter: String, p_layer_id: String, p_zone: String = "
 				_active_values.get_or_add(p_zone, {}).erase(p_parameter)
 
 			if not p_disable_output:
-				on_parameter_erased.emit(p_parameter, p_zone)
+				# on_parameter_erased.emit(p_zone, p_parameter)
 				_find_and_output_parameter_function(p_parameter, p_zone, new_value)
 				_queue_compilation()
 
@@ -221,27 +224,32 @@ func erase_parameter(p_parameter: String, p_layer_id: String, p_zone: String = "
 			for zone: String in zones:
 				erase_parameter(p_parameter, p_layer_id, zone, true)
 
-			on_parameter_erased.emit(p_parameter, p_zone)
+			# on_parameter_erased.emit(p_zone, p_parameter)
 			_find_and_output_parameter_function(p_parameter, p_zone, _current[p_zone][p_parameter])
 
 			_queue_compilation()
 
 
 ## Findes a function from a parameter using the current dmx value. and outputs it via on_parameter_changed
 func _find_and_output_parameter_function(p_parameter: String, p_zone: String, p_dmx_value: int) -> void:
-	for function: String in _parameters[p_zone][p_parameter].functions:
-		var dmx_range: Array = _parameters[p_zone][p_parameter].functions[function].dmx_range
+	if not _current[p_zone].has(p_parameter):
+		var function: String = get_default_function(p_zone, p_parameter)
+		on_parameter_changed.emit(p_zone, p_parameter, function, get_default(p_zone, p_parameter, function))
+		
+	else:
+		for function: String in _parameters[p_zone][p_parameter].functions:
+			var dmx_range: Array = _parameters[p_zone][p_parameter].functions[function].dmx_range
 
-		if p_dmx_value >= dmx_range[0] and p_dmx_value <= dmx_range[1]:
-			var remapped_value: float = remap(p_dmx_value, dmx_range[0], dmx_range[1], 0, 1)
-			on_parameter_changed.emit(p_parameter, function, remapped_value, p_zone)
+			if p_dmx_value >= dmx_range[0] and p_dmx_value <= dmx_range[1]:
+				var remapped_value: float = remap(p_dmx_value, dmx_range[0], dmx_range[1], 0, 1)
+				on_parameter_changed.emit(p_zone, p_parameter, function, remapped_value)
 
-			_active_values.get_or_add(p_zone, {})[p_parameter] = {
-				"value": remapped_value,
-				"function": function
-			}
+				_active_values.get_or_add(p_zone, {})[p_parameter] = {
+					"value": remapped_value,
+					"function": function
+				}
 
-			return
+				return
 
 
 ## Sets a parameter override to a float value
@@ -264,7 +272,7 @@ func set_override(p_parameter: String, p_function: String, p_value: float, p_zon
 					_current_override_dmx[offsets[i] + _channel - 1] = channel_value
 
 				if not p_disable_output:
-					on_override_changed.emit(p_parameter, p_function, p_value, p_zone)
+					on_override_changed.emit(p_zone, p_parameter, p_function, p_value)
 					_queue_compilation()
 
 		else:
@@ -274,7 +282,7 @@ func set_override(p_parameter: String, p_function: String, p_value: float, p_zon
 			for zone: String in zones:
 				set_override(p_parameter, p_function, p_value, zone, true)
 
-			on_override_changed.emit(p_parameter, p_function, p_value, p_zone)
+			on_override_changed.emit(p_zone, p_parameter, p_function, p_value)
 			_queue_compilation()
 
 		return true
@@ -299,7 +307,7 @@ func erase_override(p_parameter: String, p_zone: String = "root", p_disable_outp
 				_current_override.erase(p_zone)
 
 			if not p_disable_output:
-				on_override_erased.emit(p_parameter, p_zone)
+				on_override_erased.emit(p_zone, p_parameter)
 				_queue_compilation()
 
 		else:
@@ -309,7 +317,7 @@ func erase_override(p_parameter: String, p_zone: String = "root", p_disable_outp
 			for zone: String in zones:
 				erase_override(p_parameter, zone, true)
 
-			on_override_erased.emit(p_parameter, p_zone)
+			on_override_erased.emit(p_zone, p_parameter)
 			_queue_compilation()
 
 

core/components/fixtures/Fixture.gd

@@ -6,16 +6,16 @@ class_name Fixture extends EngineComponent
 
 
 ## Emitted when a parameter is changed
-signal on_parameter_changed(parameter: String, function: String, value: Variant, zone: String)
+signal on_parameter_changed(zone: String, parameter: String, function: String, value: Variant)
 
 ## Emitted when a parameter is erased
-signal on_parameter_erased(parameter: String, zone: String)
+signal on_parameter_erased(zone: String, parameter: String)
 
 ## Emited when a parameter override is changed or added
-signal on_override_changed(parameter: String, function: String, value: Variant, zone: String)
+signal on_override_changed(zone: String, parameter: String, function: String, value: Variant)
 
 ## Emitted when a parameter override is removed
-signal on_override_erased(parameter: String, zone: String)
+signal on_override_erased(zone: String, parameter: String)
 
 ## Emitted when all overrides are removed
 signal on_all_override_removed()

core/components/functions/CueList.gd

@@ -77,6 +77,9 @@ var _loop_mode: LoopMode = LoopMode.RESET
 ## Allow cues with trigger modes to loop back to the start when reaching the end.
 var _allow_triggered_looping: bool = false
 
+## Allows cues follow modes
+var _allow_follow_cues: bool = true
+
 ## All active animators
 var _active_animators: Array[CueAnimator]
 
@@ -93,8 +96,8 @@ func _component_ready() -> void:
 
 	register_control_method("go_previous", go_previous)
 	register_control_method("go_next", go_next)
-	register_control_method("set_global_fade_speed", set_global_fade_speed, get_global_fade_speed, on_global_fade_changed)
-	register_control_method("set_global_pre_wait_speed", set_global_pre_wait_speed, get_global_pre_wait_speed, on_global_pre_wait_changed)
+	register_control_method("set_global_fade_speed", set_global_fade_speed, get_global_fade_speed, on_global_fade_changed, [TYPE_FLOAT])
+	register_control_method("set_global_pre_wait_speed", set_global_pre_wait_speed, get_global_pre_wait_speed, on_global_pre_wait_changed, [TYPE_FLOAT])
 
 
 ## Adds a cue to the list
@@ -305,7 +308,9 @@ func seek_to(cue: Cue) -> void:
 	_previous_seek_direction = TransportState.BACKWARDS if seeking_backwards else TransportState.FORWARDS
 	_cue_data_modified = false
 
-	_handle_cue_trigger(cue, _active_pos, animator)
+	if _allow_follow_cues:
+		_handle_cue_trigger(cue, _active_pos, animator)
+	
 	_set_transport_state(_previous_seek_direction)
 	_set_active_state(ActiveState.ENABLED)
 	_play()
@@ -470,15 +475,18 @@ func _handle_active_state_change(active_state: ActiveState) -> void:
 func _handle_transport_state_change(transport_state: TransportState) -> void:
 	match transport_state:
 		TransportState.FORWARDS:
+			_allow_follow_cues = true
 			if _active_animators and _previous_seek_direction == TransportState.FORWARDS:
 				_play()
 			else:
 				go_next()
 
 		TransportState.PAUSED:
+			_allow_follow_cues = false
 			_pause()
 
 		TransportState.BACKWARDS:
+			_allow_follow_cues = true
 			if _active_animators and _previous_seek_direction == TransportState.BACKWARDS:
 				_play()
 			else:

core/components/functions/Function.gd

@@ -86,7 +86,7 @@ func _init(p_uuid: String = UUID_Util.v4(), p_name: String = name) -> void:
 	register_control_method("full", full)
 	register_control_method("blackout", blackout)
 
-	register_high_frequency_signals([on_intensity_changed])
+	register_high_frequency_signal(on_intensity_changed)
 	Server.add_networked_object(_data_container.uuid, _data_container)
 
 	super._init(p_uuid, p_name)

core/components/functions/Scene.gd

@@ -56,6 +56,7 @@ func _handle_active_state_change(p_active_state: ActiveState) -> void:
 		_animator.play()
 
 	else:
+		_animator.pause()
 		_animator.seek_to(1 if p_active_state else 0)
 		_set_intensity(1 if p_active_state else 0)
 

core/engine/Server.gd

@@ -12,13 +12,13 @@ var websocket_port: int = 3824
 var udp_port: int = websocket_port - 1
 
 ## How often to send the the UDP queue
-var udp_frequency: float = 1.0 / 45.0  # 1 second divided by 45
+var udp_frequency: float = 1.0 / 60.0  # 1 second divided by 45
 
 ## Disables signal emissions to clients
 var disable_signals: bool = false
 
-## Dissables the use of the high frequency UDP socket
-var dissable_high_frequency: bool = true
+## Dissables the use of the high frequency UDP socketc
+var dissable_high_frequency: bool = false
 
 
 ## Used as an internal refernce for timing call_interval correctly
@@ -31,7 +31,7 @@ var _networked_objects: Dictionary = {}
 var _networked_object_callbacks: Dictionary = {}
 
 ## The queue of data that needs to be send over the UDP socket, there can only be one item in the queue at one, so new data will be merged into what is already there, using Dictionary.merge()
-var _udp_queue: Dictionary = {}
+var _udp_queue: Dictionary[Array, Dictionary] = {}
 
 
 func _ready() -> void:
@@ -71,7 +71,14 @@ func _process(delta: float) -> void:
 	if _accumulated_time >= udp_frequency:
 
 		if _udp_queue:
-			MainUDPSocket.put_var(_udp_queue)
+			var data: Dictionary[Array, Array]
+
+			for id: Array in _udp_queue:
+				data[id] = []
+				for base_args: Array in _udp_queue[id].keys():
+					data[id].append(base_args + _udp_queue[id][base_args])
+
+			MainUDPSocket.put_var(data)
 			_udp_queue = {}
 
 		_accumulated_time -= udp_frequency
@@ -83,7 +90,7 @@ func register_component(p_component: EngineComponent) -> void:
 
 
 ## Deregisters a component as a network object
-func deregister_component(p_component) -> void:
+func deregister_component(p_component: EngineComponent) -> void:
 	remove_networked_object(p_component.uuid)
 
 
@@ -164,9 +171,21 @@ func add_networked_object(object_name: String, object: Object, delete_signal: Si
 						return not (arg == null)
 					)
 
-					send_high_frequency({
-						[object_name, object_signal_dict.name]: args
-					})
+					var id: Array = [object_name, object_signal_dict.name]
+					var match_args: int = object_network_config.high_frequency_signals[object_signal]
+					var args_to_match: Array = args
+					var args_to_append: Array = []
+
+					if match_args:
+						args_to_match = args.slice(0, match_args)
+						args_to_append = args.slice(match_args)
+
+					if _udp_queue.has(id):
+						_udp_queue[id][args_to_match] = args_to_append
+
+					else:
+						_udp_queue[id] = {args_to_match: args_to_append}
+					
 
 		else:
 			# Get the signal from the object and connect a function to it that will seralise the data, and send it to the clients