fix loading unset parameters, interpolate values even if no update

Author: erodozer

lib/preferences.gd

@@ -16,6 +16,16 @@ func _ready() -> void:
 				)
 	)
 
+func get_setting(path: String, default: Variant) -> Variant:
+	var parts = path.split(".")
+	var cursor = _data
+	for p in parts:
+		if p in cursor:
+			cursor = cursor.get(p)
+		else:
+			return default
+	return cursor
+
 func get_state():
 	return _data.duplicate(true)
 

lib/tracking/camera/openseeface/osf_config.gd

@@ -16,9 +16,8 @@ func _ready() -> void:
 	)
 
 func _process(_delta: float) -> void:
-	if tracker != null:
-		%FpsCounter.text = "FPS: %d" % tracker.fps
-
+	%FpsCounter.text = "FPS: %d" % max(0, tracker.fps)
+	
 func _on_blink_sync_toggled(toggled_on: bool) -> void:
 	tracker.blink_sync = toggled_on
 

lib/tracking/camera/openseeface/osf_tracker.gd

@@ -13,11 +13,6 @@ func _ready():
 	server = UdpTracker.new()
 	server.name = "OSFSocket"
 	server.packet_received.connect(_packet_received)
-	server.connection_status.connect(
-		func (status):
-			if status == UdpTracker.ConnectionStatus.OFF:
-				reset()
-	)
 	data_received.connect(_data_received)
 	add_child(server)
 

lib/tracking/interpolated_tracker.gd

@@ -37,7 +37,7 @@ func update(updated_parameters: Dictionary):
 	_previous = _parameters
 	_previous_msec = _latest_msec
 	_latest_msec = now
-	_parameters = {}
+	_parameters = _previous.duplicate()
 
 	for p in updated_parameters:
 		_parameters[p] = lerp(
@@ -47,6 +47,7 @@ func update(updated_parameters: Dictionary):
 		)
 
 	# estimate avg sample rate
-	var delta = 1.0 / ((_latest_msec - _previous_msec) / 1000.0)
-	fps += delta
-	fps /= 2.0
+	if _latest_msec > _previous_msec:
+		var delta = 1.0 / ((_latest_msec - _previous_msec) / 1000.0)
+		fps += delta
+		fps /= 2.0

studio/action_engine/action_graph_loader.gd

@@ -211,6 +211,7 @@ func _load_vts_graph(model: VtModel) -> Array:
 		var _x = x
 		if breathing or unbound:
 			input.queue_free()
+			input = null
 		else:
 			_x += input.size.x + 40
 
@@ -245,9 +246,10 @@ func _load_vts_graph(model: VtModel) -> Array:
 			_x += smoothing.size.x + 40
 			input = smoothing
 
-		graph._on_connection_request(
-			input.name, 0, output.name, 0
-		)
+		if input != null:
+			graph._on_connection_request(
+				input.name, 0, output.name, 0
+			)
 
 		output.position_offset = Vector2(_x, y)
 		y += output.size.y + 96

studio/action_engine/graph/outputs/model_parameter.gd

@@ -2,8 +2,6 @@ extends "../vt_action.gd"
 
 const Serializers = preload("res://lib/utils/serializers.gd")
 
-const VALUE_SLOT = 1
-
 @onready var input: OptionButton = %Parameters
 
 var parameter: int = -1 :
@@ -44,7 +42,8 @@ var invert_value: bool = false :
 var value: float :
 	set(v):
 		value = v
-		%Input/Value.value = v
+		%Input/Value.set_value_no_signal(v)
+		_dirty = true
 
 var _dirty = false
 
@@ -55,6 +54,20 @@ func _ready() -> void:
 		input.set_item_metadata(input.item_count - 1, m)
 	input.select(parameter)
 
+func bind(slot: int, node: GraphNode) -> void:
+	if slot == 0:
+		%Input/Value.editable = false
+
+func unbind(slot: int, node: GraphNode) -> void:
+	if slot == 0:
+		%Input/Value.editable = true
+
+func reset_value(slot: int) -> void:
+	if parameter < 0:
+		return
+	var definition = model.parameters.values()[parameter]
+	value = definition.default
+	
 func get_type():
 	return "model_parameter"
 
@@ -81,10 +94,15 @@ func deserialize(data: Dictionary):
 		clamp_range = value_range
 
 func load_from_vts(data: Dictionary):
-	parameter = model.parameters.values().find_custom(
+	var parameters = model.parameters.values()
+	parameter = parameters.find_custom(
 		func (f):
 			return f.name == data["OutputLive2D"]
 	)
+	if parameter == -1:
+		return
+	
+	var definition = parameters[parameter]
 
 	var output_range = Vector2(
 		data["OutputRangeLower"],
@@ -97,6 +115,7 @@ func load_from_vts(data: Dictionary):
 		invert_value = false
 		clamp_range = output_range
 	clamp_enabled = data.get("ClampOutput", false)
+	reset_value(0)
 
 func update_value(_slot: int, v: float) -> void:
 	if input.get_selected_metadata() == null:
@@ -111,14 +130,13 @@ func update_value(_slot: int, v: float) -> void:
 		v = clampf(v, clamp_range.x, clamp_range.y)
 
 	value = v
-	_dirty = true
 
 func _update_model():
 	if model_parameter.is_empty():
 		return
 	if not _dirty:
 		return
-	
+
 	model.mixer.get_node("Tracking").set(
 		model_parameter, value
 	)
@@ -131,3 +149,6 @@ func _on_reset_button_pressed() -> void:
 	invert_value = false
 	if not model_parameter.is_empty():
 		clamp_range = Vector2(input.get_selected_metadata().min, input.get_selected_metadata().max)
+
+func _on_manual_value_changed(v: float) -> void:
+	value = v

studio/action_engine/graph/outputs/model_parameter.tscn

@@ -64,7 +64,6 @@ size_flags_horizontal = 3
 min_value = -999.0
 max_value = 999.0
 step = 0.01
-editable = false
 
 [node name="Options" type="VBoxContainer" parent="."]
 layout_mode = 2
@@ -96,4 +95,5 @@ layout_mode = 2
 size_flags_horizontal = 3
 text = "Invert"
 
+[connection signal="value_changed" from="Input/Value" to="." method="_on_manual_value_changed"]
 [connection signal="pressed" from="Options/Range/ResetButton" to="." method="_on_reset_button_pressed"]