Added per fixture, and global LTP layer options

Author: Liam Sherwin

core/components/fixtures/DMXFixture.gd

@@ -29,6 +29,10 @@ var _parameters: Dictionary = {}
 ## { "zone": { "parameter": { value: float, function: String } } }
 var _active_values: Dictionary[String, Dictionary]
 
+## Stores all active LTP parameters
+## { "zone": { "parameter": [ layer_id ] } } 
+var _active_ltp_parameters: Dictionary[String, Dictionary]
+
 ## All the input value layers. Mapped to the DMX value used to calculate HTP
 ## { "zone": { "parameter": { "layer_id": mapped_value } } }
 var _mapped_layers: Dictionary[String, Dictionary] = {}
@@ -134,9 +138,23 @@ func set_parameter(p_parameter: String, p_function: String, p_value: float, p_la
 			var mapped_layer: Dictionary = _mapped_layers.get_or_add(p_zone, {}).get_or_add(p_parameter, {})
 			mapped_layer[p_layer_id] = mapped_value
 
-			var max: int = mapped_layer.values().max()
-
-			if max != _current.get(p_zone, {}).get(p_parameter, null):
+			var new_value: int = mapped_layer.values().max()
+
+			# if has_ltp_layer(p_layer_id):
+			# 	if uuid == "7dcf43e3-34f4-4564-aee2-68eb788abf38": print("Using LTP, Current")
+			# 	new_value = mapped_value
+			# 	if not _active_ltp_parameters.get_or_add(p_zone, {}).get_or_add(p_parameter, {}).has(p_layer_id):
+			# 		_active_ltp_parameters[p_zone][p_parameter][p_layer_id] = null
+			
+			# elif _active_ltp_parameters.get(p_zone, {}).get(p_parameter, []) and _current.get(p_zone, {}).has(p_parameter):
+			# 	if uuid == "7dcf43e3-34f4-4564-aee2-68eb788abf38": print("Using LTP, Pre existing")
+			# 	new_value = _current[p_zone][p_parameter]
+			
+			# else:
+			# 	if uuid == "7dcf43e3-34f4-4564-aee2-68eb788abf38": print("Using HTP")
+			# 	new_value = mapped_layer.values().max()
+			
+			if new_value != _current.get(p_zone, {}).get(p_parameter, null):
 				_current.get_or_add(p_zone, {})[p_parameter] = mapped_value
 				_active_values.get_or_add(p_zone, {})[p_parameter] = {
 					"value": p_value,

core/components/fixtures/Fixture.gd

@@ -26,7 +26,7 @@ static var RootZone: String = "root"
 
 
 ## Enables layer based LTP on layers
-var _ltp_layers: Array[String]
+var _ltp_layers: Dictionary[String, Variant]
 
 
 ## Called when this EngineComponent is ready
@@ -148,16 +148,16 @@ func function_can_fade(p_zone: String, p_parameter: String, p_function: String)
 
 ## Enabled LTP on a layer
 func add_ltp_layer(p_layer_id: String) -> bool:
-	if p_layer_id in _ltp_layers:
+	if _ltp_layers.has(p_layer_id):
 		return false
 
-	_ltp_layers.append(p_layer_id)
+	_ltp_layers[p_layer_id] = null
 	return true
 
 
 ## Enabled LTP on a layer
 func remove_ltp_layer(p_layer_id: String) -> bool:
-	if p_layer_id not in _ltp_layers:
+	if not _ltp_layers.has(p_layer_id):
 		return false
 
 	_ltp_layers.erase(p_layer_id)
@@ -166,4 +166,4 @@ func remove_ltp_layer(p_layer_id: String) -> bool:
 
 ## Enabled LTP on a layer
 func has_ltp_layer(p_layer_id: String) -> bool:
-	return p_layer_id in _ltp_layers
+	return _ltp_layers.has(p_layer_id) or FixtureLibrary.has_global_ltp_layer(p_layer_id)

core/components/functions/Function.gd

@@ -14,6 +14,9 @@ signal on_active_state_changed(state: ActiveState)
 ## Emitted when the transport state changes
 signal on_transport_state_changed(state: TransportState)
 
+## Emitted when the PriorityMode state changes
+signal on_priority_mode_state_changed(state: PriorityMode)
+
 ## Emitted when auto start is changed
 signal on_auto_start_changed(auto_start: bool)
 
@@ -27,13 +30,21 @@ enum ActiveState {
 	ENABLED,
 }
 
-## Transport Stae
+## Transport State
 enum TransportState {
 	PAUSED,
 	FORWARDS,
 	BACKWARDS
 }
 
+
+## Priority Mode
+enum PriorityMode {
+	HTP,
+	LTP
+}
+
+
 ## Intensity of this function
 var _intensity: float = 0
 
@@ -46,6 +57,9 @@ var _transport_state: TransportState = TransportState.PAUSED
 ## The previous transport state before setting it to Paused
 var _previous_transport_state: TransportState = TransportState.PAUSED
 
+## The current PriorityMode
+var _priority_mode: PriorityMode = PriorityMode.HTP
+
 ## Should this Function set ActiveState to ENABLED when intensity is not 0
 var _auto_start: bool = true
 
@@ -197,6 +211,31 @@ func get_intensity() -> float:
 	return _intensity
 
 
+## Sets the _priority_mode state
+func set_priority_mode_state(p_priority_mode: PriorityMode) -> void:
+	if p_priority_mode == _priority_mode:
+		return
+	
+	_priority_mode = p_priority_mode
+	on_priority_mode_state_changed.emit(_priority_mode)
+	_handle_priority_mode_change(_priority_mode)
+
+
+## Override this function to handle _priority_mode changes
+func _handle_priority_mode_change(p_priority_mode: PriorityMode) -> void:
+	match p_priority_mode:
+		PriorityMode.HTP:
+			FixtureLibrary.remove_global_ltp_layer(uuid)
+		
+		PriorityMode.LTP:
+			FixtureLibrary.add_global_ltp_layer(uuid)
+
+
+## Gets the current PriorityMode
+func get_priority_mode_state() -> PriorityMode:
+	return _priority_mode
+
+
 ## Sets the auto start state
 func set_auto_start(p_auto_start: bool) -> void:
 	if _auto_start == p_auto_start:
@@ -233,6 +272,7 @@ func get_data_container() -> DataContainer:
 ## Returns serialized version of this component, change the mode to define if this object should be serialized for saving to disk, or for networking to clients
 func serialize(p_mode: int = CoreEngine.SERIALIZE_MODE_NETWORK) -> Dictionary:
 	return super.serialize(p_mode).merged({
+		"priority_mode": _priority_mode,
 		"auto_start": _auto_start,
 		"auto_stop": _auto_stop
 	}.merged({
@@ -244,6 +284,8 @@ func serialize(p_mode: int = CoreEngine.SERIALIZE_MODE_NETWORK) -> Dictionary:
 
 ## Loades this object from a serialized version
 func load(p_serialized_data: Dictionary) -> void:
+	set_priority_mode_state(type_convert(p_serialized_data.get("priority_mode", _priority_mode), TYPE_INT))
+
 	_auto_start = type_convert(p_serialized_data.get("auto_start", _auto_start), TYPE_BOOL)
 	_auto_stop = type_convert(p_serialized_data.get("auto_stop", _auto_stop), TYPE_BOOL)
 

core/global/Debug.gd

@@ -44,6 +44,8 @@ func dump_fixture_data(fixture: Fixture) -> String:
     var path: String = debug_file_location + "fixture_" + fixture.uuid + "/"
 
     if fixture is DMXFixture:
+        Utils.save_json_to_file(path, "_active_ltp_parameters", fixture._active_ltp_parameters)
+        Utils.save_json_to_file(path, "_active_values", fixture._active_values)
         Utils.save_json_to_file(path, "_parameters", fixture._parameters)
         Utils.save_json_to_file(path, "_mapped_layers", fixture._mapped_layers)
         Utils.save_json_to_file(path, "_raw_layers", fixture._raw_layers)

core/global/FixtureLibrary.gd

@@ -36,6 +36,9 @@ var _manifest_importers: Dictionary = {
 	"gdtf": GDTFImport.new()
 }
 
+## Global LTP layers for fixtures
+var _global_ltp_layers: Dictionary[String, Variant]
+
 
 ## Load the fixture manifests from the folders, buit in manifests will override user manifests
 func _ready() -> void:
@@ -119,6 +122,29 @@ func is_loaded() -> bool:
 	return _is_loaded
 
 
+## Enabled LTP on a layer
+func add_global_ltp_layer(p_layer_id: String) -> bool:
+	if has_global_ltp_layer(p_layer_id):
+		return false
+
+	_global_ltp_layers[p_layer_id] = null
+	return true
+
+
+## Enabled LTP on a layer
+func remove_global_ltp_layer(p_layer_id: String) -> bool:
+	if not has_global_ltp_layer(p_layer_id):
+		return false
+
+	_global_ltp_layers.erase(p_layer_id)
+	return true
+
+
+## Enabled LTP on a layer
+func has_global_ltp_layer(p_layer_id: String) -> bool:
+	return _global_ltp_layers.has(p_layer_id)
+
+
 ## Finds all the fixture manifetsts in the folders
 func _find_manifests(folder_path: String) -> Dictionary:
 	# var user_library: Dictionary = _get_gdtf_list_from_folder(_user_fixture_library_path, true)