Animation and Color updates

Author: Liam Sherwin

core/animation/Animator.gd

@@ -53,6 +53,9 @@ var _animation_data: Dictionary = {}
 ## Time to stop the animation at
 var _stop_at: float = length
 
+## Previous time for the animation step
+var _previous_time: float = 0
+
 
 func _ready() -> void:
 	set_process(false)
@@ -77,6 +80,7 @@ func _process(delta: float) -> void:
 
 		if elapsed_time >= _stop_at:
 			finish()
+			is_playing = false
 
 
 ## Plays this animation
@@ -148,17 +152,24 @@ func _seek_to(time: float) -> void:
 				Tween.EASE_IN_OUT
 			)
 
-		elif play_backwards and time <= animation_track.stop:
+		elif _previous_time > time and time <= animation_track.stop:
 			new_data = animation_track.from
 
-		elif not play_backwards and time >= animation_track.start:
+		elif time > _previous_time and time >= animation_track.start:
 			new_data = animation_track.to
 
+
 		if new_data != - 1 and animation_track.current != new_data:
 			animation_track.current = new_data
-			var fixture: Fixture = animation_track.fixture
-			fixture.set_parameter(animation_track.parameter, animation_track.function, new_data, layer_id, animation_track.zone)
 
+			if animation_track.has("fixture"):
+				var fixture: Fixture = animation_track.fixture
+				fixture.set_parameter(animation_track.parameter, animation_track.function, new_data, layer_id, animation_track.zone)
+			
+			elif animation_track.has("method"):
+				animation_track.method.call(new_data)
+
+	_previous_time = time
 	steped.emit(time)
 
 

core/components/FixtureManifest.gd

@@ -96,7 +96,7 @@ func remove_parameter(p_mode: String, p_zone: String, p_parameter: String) -> bo
 
 
 ## Adds a funtion to the given parameter
-func add_parameter_function(p_mode: String, p_zone: String, p_parameter: String, p_function: String, p_name: String, p_default: int, p_range: Array[int], p_can_fade: bool) -> bool:
+func add_parameter_function(p_mode: String, p_zone: String, p_parameter: String, p_function: String, p_name: String, p_default: int, p_range: Array[int], p_can_fade: bool, p_vdim_effected: bool) -> bool:
 	if not _modes.has(p_mode) or not _modes[p_mode].zones.has(p_zone) or not _modes[p_mode].zones[p_zone].has(p_parameter):
 		return false
 
@@ -105,6 +105,7 @@ func add_parameter_function(p_mode: String, p_zone: String, p_parameter: String,
 		"name": p_name,
 		"default": p_default,
 		"can_fade": p_can_fade,
+		"vdim_effected": p_vdim_effected,
 		"dmx_range": p_range.duplicate(),
 		"sets": []
 	}
@@ -155,6 +156,11 @@ func function_can_fade(p_mode: String, p_zone: String, p_parameter: String, p_fu
 	return _modes.get(p_mode, {}).get("zones", {}).get(p_zone, {}).get(p_parameter, {}).get("functions", {}).get(p_function, {}).get("can_fade", false)
 
 
+## Checks if this FixtureManifest has a function that can vdim
+func function_can_vdim(p_mode: String, p_zone: String, p_parameter: String, p_function: String) -> bool:
+	return _modes.get(p_mode, {}).get("zones", {}).get(p_zone, {}).get(p_parameter, {}).get("functions", {}).get(p_function, {}).get("vdim_effected", false)
+
+
 ## Returns the given mode
 func get_mode(p_mode: String) -> Dictionary:
 	return _modes.get(p_mode, {}).duplicate(true)

core/components/containers/DataContainer.gd

@@ -199,15 +199,15 @@ func _load_stored_global_data(p_serialized_stored_global_data: Dictionary) -> vo
 		)
 
 
-## Serializes this scene and returnes it in a dictionary
+## Serializes this DataContainer and returnes it in a dictionary
 func _serialize() -> Dictionary:
 	return {
 		"fixture_data": _serialize_stored_data(),
 		"global_data": _serialize_stored_global_data(),
 	}
 
 
-## Called when this scene is to be loaded from serialized data
+## Called when this DataContainer is to be loaded from serialized data
 func _load(serialized_data: Dictionary) -> void:
 	_load_stored_data(serialized_data.get("fixture_data", {}))
 	_load_stored_global_data(serialized_data.get("global_data", {}))

core/components/fixtures/DMXFixture.gd

@@ -91,7 +91,7 @@ func get_current_dmx() -> Dictionary:
 # Shutter1.Shutter1Strobe, 1.0, effect_uuid, root
 
 ## Sets a parameter to a float value
-func set_parameter(p_parameter: String, p_function: String, p_value: float, p_layer_id: String, p_zone: String = "root", p_disable_output: bool = false) -> void:
+func set_parameter(p_parameter: String, p_function: String, p_value: float, p_layer_id: String, p_zone: String = "root", p_disable_output: bool = false) -> bool:
 	if _parameters.has(p_zone) and _parameters[p_zone].has(p_parameter) and _parameters[p_zone][p_parameter].functions.has(p_function):
 		var offsets: Array = _parameters[p_zone][p_parameter].offsets
 		_raw_layers.get_or_add(p_zone, {}).get_or_add(p_parameter, {})[p_layer_id] = {"value": p_value, "function": p_function}
@@ -119,6 +119,10 @@ func set_parameter(p_parameter: String, p_function: String, p_value: float, p_la
 
 			on_parameter_changed.emit(p_parameter, p_function, p_value, p_zone)
 			_compile_output()
+		
+		return true
+	
+	return false
 
 
 ## Erases the parameter on the given layer
@@ -155,7 +159,7 @@ func erase_parameter(p_parameter: String, p_layer_id: String, p_zone: String = "
 
 
 ## Sets a parameter override to a float value
-func set_override(p_parameter: String, p_function: String, p_value: float, p_zone: String = "root", p_disable_output: bool = false) -> void:
+func set_override(p_parameter: String, p_function: String, p_value: float, p_zone: String = "root", p_disable_output: bool = false) -> bool:
 	if _parameters.has(p_zone) and _parameters[p_zone].has(p_parameter) and _parameters[p_zone][p_parameter].functions.has(p_function):
 		var offsets: Array = _parameters[p_zone][p_parameter].offsets
 		_raw_override_layers.get_or_add(p_zone, {})[p_parameter] = {"value": p_value, "function": p_function}
@@ -187,6 +191,9 @@ func set_override(p_parameter: String, p_function: String, p_value: float, p_zon
 			on_override_changed.emit(p_parameter, p_function, p_value, p_zone)
 			_compile_output()
 
+		return true
+	
+	return false
 
 
 ## Erases the parameter override 
@@ -261,6 +268,11 @@ func get_default(p_zone: String, p_parameter: String, p_function: String) -> flo
 	return remap(dmx_value, range[0], range[1], 0.0, 1.0)
 
 
+## Gets a value from the given layer id, parameter, and zone
+func get_current_value(p_zone: String, p_parameter: String, p_layer_id: String, p_function: String = "", p_allow_default: bool = true) -> float:
+	return _raw_layers.get(p_zone, {}).get(p_parameter, {}).get(p_layer_id, {}).get("value", get_default(p_zone, p_parameter, p_function) if p_allow_default else 0.0)
+
+
 ## Sets the manifest for this fixture
 func set_manifest(p_manifest: FixtureManifest, p_mode: String) -> void:
 	_parameters = p_manifest.get_mode(p_mode).zones

core/components/fixtures/Fixture.gd

@@ -29,8 +29,8 @@ func _init(p_uuid: String = UUID_Util.v4(), p_name: String = name) -> void:
 
 
 ## Sets a parameter to a float value
-func set_parameter(p_parameter: String, p_function: String, p_value: float, p_layer_id: String, p_zone: String = "root") -> void:
-	pass
+func set_parameter(p_parameter: String, p_function: String, p_value: float, p_layer_id: String, p_zone: String = "root") -> bool:
+	return false
 
 
 ## Erases the parameter on the given layer
@@ -39,8 +39,8 @@ func erase_parameter(p_parameter: String, p_layer_id: String, p_zone: String = "
 
 
 ## Sets a parameter override to a float value
-func set_override(p_parameter: String, p_function: String, p_value: float, p_zone: String = "root") -> void:
-	pass
+func set_override(p_parameter: String, p_function: String, p_value: float, p_zone: String = "root") -> bool:
+	return false
 
 
 ## Erases the parameter override 
@@ -74,7 +74,7 @@ func get_parameter_functions(p_zone: String, p_parameter: String) -> Array:
 
 
 ## Checks if this fixture has a parameter
-func has_parameter(p_zone: String, p_parameter: String) -> bool:
+func has_parameter(p_zone: String, p_parameter: String, p_function: String = "") -> bool:
 	return false
 
 
@@ -86,3 +86,8 @@ func function_can_fade(p_zone: String, p_parameter: String, p_function: String)
 ## Gets the default value of a parameter
 func get_default(p_zone: String, p_parameter: String, p_function: String) -> float:
 	return 0.0
+
+
+## Gets a value from the given layer id, parameter, and zone
+func get_current_value(p_zone: String, p_parameter: String, p_layer_id: String, p_function: String = "", p_allow_default: bool = true) -> float:
+	return 0.0

core/components/functions/CueList.gd

@@ -39,7 +39,7 @@ enum MODE {NORMAL, LOOP}
 var _mode: int = MODE.NORMAL
 
 ## Stores all fixtures that are currently being animated
-## str(fixture.uuid + method_name):{
+## str(fixture.uuid + zone + parameter):{
 ##      "current_value": Variant,
 ##      "animator": Animator
 ##    }
@@ -81,6 +81,7 @@ func _component_ready() -> void:
 	_intensity = 1
 	TC.frames_changed.connect(_find_keyframes)
 
+
 ## Adds a pre-existing cue to this CueList
 ## Returns false if the cue already exists in this list, or if the index is already in use
 func add_cue(cue: Cue, number: float = 0, rename: bool = false) -> bool:
@@ -154,7 +155,6 @@ func _on_cue_timecode_trigger_changed(timecode_trigger: int, cue: Cue) -> void:
 		_add_cue_keyframe(cue)
 
 
-
 func _add_cue_keyframe(cue: Cue) -> void:
 	if not cue.timecode_trigger in _keyframes.keys():
 		_keyframes[cue.timecode_trigger] = []
@@ -167,8 +167,6 @@ func _add_cue_keyframe(cue: Cue) -> void:
 	cue.local_data[uuid+"old_timecode_trigger"] = cue.timecode_trigger
 
 
-
-
 func _on_cue_timecode_enabled_stage_changed(timecode_enabled: bool, cue: Cue) -> void:
 	if timecode_enabled:
 		_add_cue_keyframe(cue)
@@ -186,7 +184,6 @@ func _on_cue_timecode_enabled_stage_changed(timecode_enabled: bool, cue: Cue) ->
 	print(_keyframes)
 
 
-
 func _find_keyframes(frame: int) -> void:
 	# Use binary search to find the closest frame <= frame 
 
@@ -311,24 +308,38 @@ func _seek_to_next_cue_after(seconds: float) -> void:
 func _reset_animated_fixtures(animator: Animator, accumulated_animated_data: Dictionary) -> void:
 	for animation_id in _current_animated_fixtures.keys():
 		var animating_fixture = _current_animated_fixtures[animation_id]
-		var from_value: Variant = animating_fixture.fixture.get_value_from_layer_id(uuid, animating_fixture.method_name) 
-		var to_value: Variant = animating_fixture.fixture.get_zero_from_channel_key(animating_fixture.method_name)
+		var from_value: float = animating_fixture.fixture.get_current_value(animating_fixture.zone, animating_fixture.parameter, uuid, animating_fixture.function) 
+		var to_value: float = animating_fixture.fixture.get_default(animating_fixture.zone, animating_fixture.parameter, animating_fixture.function)
 
 		if is_instance_valid(animating_fixture.animator):
 			animating_fixture.animator.remove_track_from_id(animation_id, false)
 
 		accumulated_animated_data[animation_id] = {
 			"method": func (new_value: Variant) -> void: 
 					_current_animated_fixtures[animation_id].current_value = new_value
-					animating_fixture.fixture.get(animating_fixture.method_name).call(new_value, uuid),
+					animating_fixture.fixture.set_parameter(
+						animating_fixture.parameter, 
+						animating_fixture.function, 
+						new_value * _intensity, 
+						uuid, 
+						animating_fixture.zone
+					),
 			"from": from_value,
 			"to": to_value,
-			"current": from_value
+			"current": from_value,
+			"can_fade": animating_fixture.can_fade,
+			"start": animating_fixture.start,
+			"stop": animating_fixture.stop,
 		}
 
 		_current_animated_fixtures[animation_id] = {
-			"method_name": animating_fixture.method_name,
+			"zone": animating_fixture.zone,
+			"parameter": animating_fixture.parameter,
+			"function": animating_fixture.function,
 			"fixture": animating_fixture.fixture,
+			"can_fade": animating_fixture.can_fade,
+			"start": animating_fixture.start,
+			"stop": animating_fixture.stop,
 			"animator": animator,
 			# "current_value": to_value
 		}
@@ -339,39 +350,62 @@ func _remove_all_animators() -> void:
 		_remove_animator(old_cue_number)
 
 
+## Builds animation data from the cue and updates current animations.
 func _accumulate_state(cue: Cue, accumulated_animated_data: Dictionary, animator: Animator) -> void:
-	for fixture: Fixture in cue.get_fixture_data().keys():
-		for method_name: String in cue.get_fixture_data()[fixture]:
-			var stored_value: Dictionary = cue.get_fixture_data()[fixture][method_name]
-			var from_value: Variant = fixture.get_value_from_layer_id(uuid, method_name)
-			var to_value: Variant = stored_value.value
-			print(stored_value)
-			var animation_id: String = fixture.uuid + method_name
-			accumulated_animated_data[animation_id] = {
-				"method": func (new_value: Variant) -> void: 
-					_current_animated_fixtures[animation_id].current_value = new_value
-					fixture.get(method_name).call(new_value * _intensity, uuid)
-					,
-				"from": from_value * (2 - _intensity),
-				"to": to_value,
-				"current": from_value * (2 - _intensity),
-			}
-
-			if animation_id in _current_animated_fixtures:
-				if _current_animated_fixtures[animation_id].has("current_value"):
-					accumulated_animated_data[animation_id].from = _current_animated_fixtures[animation_id].current_value
-
-				var _animator = _current_animated_fixtures[animation_id].animator
-				if is_instance_valid(_animator) and _animator != animator:
-					_animator.remove_track_from_id(animation_id, false)
-
-
-			_current_animated_fixtures[animation_id] = {
-				"method_name": method_name,
-				"fixture": fixture,
-				"animator": animator,
-				"current_value": from_value
-			}
+	var fixture_data: Dictionary = cue.get_fixture_data()
+
+	for fixture: Fixture in fixture_data:
+		for zone: String in fixture_data[fixture]:
+			for parameter: String in fixture_data[fixture][zone]:
+				var value_config: Dictionary = fixture_data[fixture][zone][parameter]
+				var from_value: float = fixture.get_current_value(zone, parameter, uuid, value_config.function)
+				var to_value: Variant = value_config.value
+				if parameter == "Zoom":
+					print(from_value)
+					print(to_value)
+					print()
+				
+				var animation_id: String = fixture.uuid + zone + parameter
+				accumulated_animated_data[animation_id] = {
+					"method": func (new_value: Variant) -> void: 
+						_current_animated_fixtures[animation_id].current_value = new_value
+						if parameter == "Zoom":
+							print(new_value * _intensity)
+						fixture.set_parameter(
+							parameter, 
+							value_config.function, 
+							new_value * _intensity, 
+							uuid, 
+							zone
+						),
+					"from": from_value * (2 - _intensity),
+					"to": to_value,
+					"current": from_value * (2 - _intensity),
+					"can_fade": value_config.can_fade,
+					"start": value_config.start,
+					"stop": value_config.stop,
+				}
+
+				if animation_id in _current_animated_fixtures:
+					if _current_animated_fixtures[animation_id].has("current_value"):
+						accumulated_animated_data[animation_id].from = _current_animated_fixtures[animation_id].current_value
+
+					var _animator = _current_animated_fixtures[animation_id].animator
+					if is_instance_valid(_animator) and _animator != animator:
+						_animator.remove_track_from_id(animation_id, false)
+
+
+				_current_animated_fixtures[animation_id] = {
+					"zone": zone,
+					"parameter": parameter,
+					"function": value_config.function,
+					"can_fade": value_config.can_fade,
+					"start": value_config.start,
+					"stop": value_config.stop,
+					"fixture": fixture,
+					"animator": animator,
+					"current_value": from_value
+				}
 
 
 func _handle_animator_finished(animator: Animator, cue_number: float, fade_time: float) -> void:
@@ -518,7 +552,16 @@ func set_intensity(p_intensity: float) -> void:
 	if _index != -1:
 		for animated_fixture: Dictionary in _current_animated_fixtures.values():
 			if not is_instance_valid(animated_fixture.animator) and animated_fixture.has("current_value"):
-				animated_fixture.fixture.get(animated_fixture.method_name).call(animated_fixture.current_value * _intensity, uuid)
+				var fixture: Fixture = animated_fixture.fixture
+
+				if fixture.function_can_fade(animated_fixture.zone, animated_fixture.parameter, animated_fixture.function):
+					fixture.set_parameter(
+						animated_fixture.parameter, 
+						animated_fixture.function,
+						animated_fixture.current_value * _intensity,
+						uuid,
+						animated_fixture.zone
+					)
 
 
 ## Sets the fade time for all cues