Animation fixes for custom portrait scenes (#818)

bitbrain · web-flow · commit 065c5e42cdef · 2022-03-04T22:46:20.000+01:00
* consider scale when tweening via Anima

* consider tweening for custom portrait scenes

* do not override custom modulate colour but only use alpha

* do not reset custom node scale when mirroring
diff --git a/addons/dialogic/Nodes/Anima/DialogicAnimaPropertiesHelper.gd b/addons/dialogic/Nodes/Anima/DialogicAnimaPropertiesHelper.gd
@@ -29,15 +29,22 @@ static func get_position(node: Node) -> Vector2:
 static func get_size(node: Node) -> Vector2:
 	if node is Control:
 		return node.get_size()
-	elif node is Node2D:
-		return node.texture.get_size() * node.scale
+	elif node is AnimatedSprite:
+		var frames = (node as AnimatedSprite).frames
+		var animation = (node as AnimatedSprite).animation
+		# scale can be negative
+		var scale =  Vector2(abs(node.scale.x), abs(node.scale.y))
+		return frames.get_frame(animation, 0).get_size() * scale
+	elif node is Node2D and "texture" in node:
+		# scale can be negative
+		var scale =  Vector2(abs(node.scale.x), abs(node.scale.y))
+		return node.texture.get_size() * scale
 
 	return Vector2.ZERO
 
 static func get_scale(node: Node) -> Vector2:
 	if node is Control:
 		return node.rect_scale
-	
 	return node.scale
 
 static func get_rotation(node: Node):
diff --git a/addons/dialogic/Nodes/Anima/animations/attention_seeker/bounce.gd b/addons/dialogic/Nodes/Anima/animations/attention_seeker/bounce.gd
@@ -13,15 +13,15 @@ func generate_animation(anima_tween: Tween, data: Dictionary) -> void:
 	]
 
 	var scale_frames = [
-		{ percentage = 0, to = 1 },
-		{ percentage = 20, to = 1 },
-		{ percentage = 40, to = 1.1, easing_points = [0.7555, 0.5, 0.8555, 0.06] },
-		{ percentage = 43, to = 1.1, easing_points = [0.7555, 0.5, 0.8555, 0.06] },
-		{ percentage = 53, to = 1 },
-		{ percentage = 70, to = 1.05, easing_points = [0.755, 0.05, 0.855, 0.06] },
-		{ percentage = 80, to = 0.95 },
-		{ percentage = 90, to = 1.02 },
-		{ percentage = 100, to = 1 },
+		{ percentage = 0, to = 1 * data.node.scale.y },
+		{ percentage = 20, to = 1 * data.node.scale.y },
+		{ percentage = 40, to = 1.1 * data.node.scale.y, easing_points = [0.7555, 0.5, 0.8555, 0.06] },
+		{ percentage = 43, to = 1.1 * data.node.scale.y, easing_points = [0.7555, 0.5, 0.8555, 0.06] },
+		{ percentage = 53, to = 1 * data.node.scale.y },
+		{ percentage = 70, to = 1.05 * data.node.scale.y, easing_points = [0.755, 0.05, 0.855, 0.06] },
+		{ percentage = 80, to = 0.95 * data.node.scale.y },
+		{ percentage = 90, to = 1.02 * data.node.scale.y },
+		{ percentage = 100, to = 1 * data.node.scale.y },
 	]
 
 	anima_tween.add_relative_frames(data, "Y", bounce_frames)
diff --git a/addons/dialogic/Nodes/Anima/animations/attention_seeker/heartbeat.gd b/addons/dialogic/Nodes/Anima/animations/attention_seeker/heartbeat.gd
@@ -1,11 +1,11 @@
 func generate_animation(anima_tween: Tween, data: Dictionary) -> void:
 	var frames = [
-		{ percentage = 0, from = Vector2(1, 1) },
-		{ percentage = 14, to = Vector2(1.3, 1.3) },
-		{ percentage = 28, to = Vector2(1, 1) },
-		{ percentage = 42, to = Vector2(1.3, 1.3) },
-		{ percentage = 70, to = Vector2(1, 1) },
-		{ percentage = 100, to = Vector2(1, 1) },
+		{ percentage = 0, from = data.node.scale * Vector2(1, 1) },
+		{ percentage = 14, to = data.node.scale * Vector2(1.3, 1.3) },
+		{ percentage = 28, to = data.node.scale * Vector2(1, 1) },
+		{ percentage = 42, to = data.node.scale * Vector2(1.3, 1.3) },
+		{ percentage = 70, to = data.node.scale * Vector2(1, 1) },
+		{ percentage = 100, to = data.node.scale * Vector2(1, 1) },
 	]
 
 	DialogicAnimaPropertiesHelper.set_2D_pivot(data.node, DialogicAnimaPropertiesHelper.PIVOT.CENTER)
diff --git a/addons/dialogic/Nodes/Anima/animations/attention_seeker/pulse.gd b/addons/dialogic/Nodes/Anima/animations/attention_seeker/pulse.gd
@@ -1,8 +1,8 @@
 func generate_animation(anima_tween: Tween, data: Dictionary) -> void:
 	var frames = [
-		{ percentage = 0, from = Vector2(1, 1) },
-		{ percentage = 50, to = Vector2(1.05, 1.05), easing = anima_tween.EASING.EASE_IN_OUT_SINE },
-		{ percentage = 100, to = Vector2(1, 1) },
+		{ percentage = 0, from = data.node.scale * Vector2(1, 1) },
+		{ percentage = 50, to = data.node.scale * Vector2(1.05, 1.05), easing = anima_tween.EASING.EASE_IN_OUT_SINE },
+		{ percentage = 100, to = data.node.scale * Vector2(1, 1) },
 	]
 
 	DialogicAnimaPropertiesHelper.set_2D_pivot(data.node, DialogicAnimaPropertiesHelper.PIVOT.CENTER)
diff --git a/addons/dialogic/Nodes/Anima/animations/attention_seeker/rubber_band.gd b/addons/dialogic/Nodes/Anima/animations/attention_seeker/rubber_band.gd
@@ -1,12 +1,12 @@
 func generate_animation(anima_tween: Tween, data: Dictionary) -> void:
 	var frames = [
-		{ percentage = 0, from = Vector2(1, 1) },
-		{ percentage = 30, to = Vector2(1.25, 0.75) },
-		{ percentage = 40, to = Vector2(0.75, 1.25) },
-		{ percentage = 50, to = Vector2(1.15, 0.85) },
-		{ percentage = 65, to = Vector2(0.95, 1.05) },
-		{ percentage = 75, to = Vector2(1.05, 0.95) },
-		{ percentage = 100, to = Vector2(1, 1) },
+		{ percentage = 0, from = data.node.scale * Vector2(1, 1) },
+		{ percentage = 30, to = data.node.scale * Vector2(1.25, 0.75) },
+		{ percentage = 40, to = data.node.scale * Vector2(0.75, 1.25) },
+		{ percentage = 50, to = data.node.scale * Vector2(1.15, 0.85) },
+		{ percentage = 65, to = data.node.scale * Vector2(0.95, 1.05) },
+		{ percentage = 75, to = data.node.scale * Vector2(1.05, 0.95) },
+		{ percentage = 100, to = data.node.scale * Vector2(1, 1) },
 	]
 
 	DialogicAnimaPropertiesHelper.set_2D_pivot(data.node, DialogicAnimaPropertiesHelper.PIVOT.CENTER)
diff --git a/addons/dialogic/Nodes/Anima/animations/attention_seeker/tada.gd b/addons/dialogic/Nodes/Anima/animations/attention_seeker/tada.gd
@@ -3,7 +3,7 @@ func generate_animation(anima_tween: Tween, data: Dictionary) -> void:
 		{ percentage = 0, from = 0 },
 	]
 	var scale_frames = [
-		{ percentage = 0, from = Vector2(1, 1) },
+		{ percentage = 0, from = data.node.scale * Vector2(1, 1) },
 	]
 
 	for index in range(2, 9):
diff --git a/addons/dialogic/Nodes/Anima/animations/entrances_and_exits/back_in_down.gd b/addons/dialogic/Nodes/Anima/animations/entrances_and_exits/back_in_down.gd
@@ -6,9 +6,9 @@ func generate_animation(anima_tween: Tween, data: Dictionary) -> void:
 	]
 	
 	var scale_frames = [
-		{ percentage = 0, from = Vector2(0.7, 0.7) },
-		{ percentage = 80, to = Vector2(0.7, 0.7) },
-		{ percentage = 100, to = Vector2(1, 1) },
+		{ percentage = 0, from = data.node.scale * Vector2(0.7, 0.7) },
+		{ percentage = 80, to = data.node.scale * Vector2(0.7, 0.7) },
+		{ percentage = 100, to = data.node.scale * Vector2(1, 1) },
 	]
 
 	var opacity_frames = [
diff --git a/addons/dialogic/Nodes/Anima/animations/entrances_and_exits/back_in_left.gd b/addons/dialogic/Nodes/Anima/animations/entrances_and_exits/back_in_left.gd
@@ -6,9 +6,9 @@ func generate_animation(anima_tween: Tween, data: Dictionary) -> void:
 	]
 	
 	var scale_frames = [
-		{ percentage = 0, from = Vector2(0.7, 0.7) },
-		{ percentage = 80, to = Vector2(0.7, 0.7) },
-		{ percentage = 100, to = Vector2(1, 1) },
+		{ percentage = 0, from = data.node.scale * Vector2(0.7, 0.7) },
+		{ percentage = 80, to = data.node.scale * Vector2(0.7, 0.7) },
+		{ percentage = 100, to = data.node.scale * Vector2(1, 1) },
 	]
 
 	var opacity_frames = [
diff --git a/addons/dialogic/Nodes/Anima/animations/entrances_and_exits/back_in_right.gd b/addons/dialogic/Nodes/Anima/animations/entrances_and_exits/back_in_right.gd
@@ -6,9 +6,9 @@ func generate_animation(anima_tween: Tween, data: Dictionary) -> void:
 	]
 	
 	var scale_frames = [
-		{ percentage = 0, from = Vector2(0.7, 0.7) },
-		{ percentage = 80, to = Vector2(0.7, 0.7) },
-		{ percentage = 100, to = Vector2(1, 1) },
+		{ percentage = 0, from = data.node.scale * Vector2(0.7, 0.7) },
+		{ percentage = 80, to = data.node.scale * Vector2(0.7, 0.7) },
+		{ percentage = 100, to = data.node.scale * Vector2(1, 1) },
 	]
 
 	var opacity_frames = [
diff --git a/addons/dialogic/Nodes/Anima/animations/entrances_and_exits/back_in_up.gd b/addons/dialogic/Nodes/Anima/animations/entrances_and_exits/back_in_up.gd
@@ -6,9 +6,9 @@ func generate_animation(anima_tween: Tween, data: Dictionary) -> void:
 	]
 	
 	var scale_frames = [
-		{ percentage = 0, from = Vector2(0.7, 0.7) },
-		{ percentage = 80, to = Vector2(0.7, 0.7) },
-		{ percentage = 100, to = Vector2(1, 1) },
+		{ percentage = 0, from = data.node.scale *  Vector2(0.7, 0.7) },
+		{ percentage = 80, to = data.node.scale * Vector2(0.7, 0.7) },
+		{ percentage = 100, to = data.node.scale * Vector2(1, 1) },
 	]
 
 	var opacity_frames = [
diff --git a/addons/dialogic/Nodes/Anima/animations/entrances_and_exits/back_out_down.gd b/addons/dialogic/Nodes/Anima/animations/entrances_and_exits/back_out_down.gd
@@ -6,9 +6,9 @@ func generate_animation(anima_tween: Tween, data: Dictionary) -> void:
 	]
 
 	var scale_frames = [
-		{ percentage = 0, from = Vector2(1, 1) },
-		{ percentage = 20, to = Vector2(0.7, 0.7) },
-		{ percentage = 100, to = Vector2(0.7, 0.7) },
+		{ percentage = 0, from = data.node.scale * Vector2(1, 1) },
+		{ percentage = 20, to = data.node.scale *  Vector2(0.7, 0.7) },
+		{ percentage = 100, to = data.node.scale * Vector2(0.7, 0.7) },
 	]
 
 	var opacity_frames = [
diff --git a/addons/dialogic/Nodes/Anima/animations/entrances_and_exits/back_out_left.gd b/addons/dialogic/Nodes/Anima/animations/entrances_and_exits/back_out_left.gd
@@ -6,9 +6,9 @@ func generate_animation(anima_tween: Tween, data: Dictionary) -> void:
 	]
 
 	var scale_frames = [
-		{ percentage = 0, from = Vector2(1, 1) },
-		{ percentage = 20, to = Vector2(0.7, 0.7) },
-		{ percentage = 100, to = Vector2(0.7, 0.7) },
+		{ percentage = 0, from = data.node.scale * Vector2(1, 1) },
+		{ percentage = 20, to = data.node.scale * Vector2(0.7, 0.7) },
+		{ percentage = 100, to = data.node.scale * Vector2(0.7, 0.7) },
 	]
 
 	var opacity_frames = [
diff --git a/addons/dialogic/Nodes/Anima/animations/entrances_and_exits/back_out_right.gd b/addons/dialogic/Nodes/Anima/animations/entrances_and_exits/back_out_right.gd
@@ -6,9 +6,9 @@ func generate_animation(anima_tween: Tween, data: Dictionary) -> void:
 	]
 
 	var scale_frames = [
-		{ percentage = 0, from = Vector2(1, 1) },
-		{ percentage = 20, to = Vector2(0.7, 0.7) },
-		{ percentage = 100, to = Vector2(0.7, 0.7) },
+		{ percentage = 0, from = data.node.scale * Vector2(1, 1) },
+		{ percentage = 20, to = data.node.scale * Vector2(0.7, 0.7) },
+		{ percentage = 100, to = data.node.scale * Vector2(0.7, 0.7) },
 	]
 
 	var opacity_frames = [
diff --git a/addons/dialogic/Nodes/Anima/animations/entrances_and_exits/back_out_up.gd b/addons/dialogic/Nodes/Anima/animations/entrances_and_exits/back_out_up.gd
@@ -6,9 +6,9 @@ func generate_animation(anima_tween: Tween, data: Dictionary) -> void:
 	]
 
 	var scale_frames = [
-		{ percentage = 0, from = Vector2(1, 1) },
-		{ percentage = 20, to = Vector2(0.7, 0.7) },
-		{ percentage = 100, to = Vector2(0.7, 0.7) },
+		{ percentage = 0, from =  data.node.scale * Vector2(1, 1) },
+		{ percentage = 20, to =  data.node.scale * Vector2(0.7, 0.7) },
+		{ percentage = 100, to =  data.node.scale * Vector2(0.7, 0.7) },
 	]
 
 	var opacity_frames = [
diff --git a/addons/dialogic/Nodes/Anima/animations/entrances_and_exits/bounce_out.gd b/addons/dialogic/Nodes/Anima/animations/entrances_and_exits/bounce_out.gd
@@ -1,10 +1,10 @@
 func generate_animation(anima_tween: Tween, data: Dictionary) -> void:
 	var scale_frames = [
-		{ percentage = 0, from = Vector2(1, 1) },
-		{ percentage = 20, to = Vector2(0.9, 0.9) },
-		{ percentage = 50, to = Vector2(1.1, 1.1) },
-		{ percentage = 55, to = Vector2(1.1, 1.1) },
-		{ percentage = 100, to = Vector2(0.3, 0.3) },
+		{ percentage = 0, from =  data.node.scale * Vector2(1, 1) },
+		{ percentage = 20, to =  data.node.scale * Vector2(0.9, 0.9) },
+		{ percentage = 50, to =  data.node.scale * Vector2(1.1, 1.1) },
+		{ percentage = 55, to =  data.node.scale * Vector2(1.1, 1.1) },
+		{ percentage = 100, to =  data.node.scale * Vector2(0.3, 0.3) },
 	]
 
 	var opacity_frames = [
diff --git a/addons/dialogic/Nodes/Anima/animations/entrances_and_exits/bouncing_in.gd b/addons/dialogic/Nodes/Anima/animations/entrances_and_exits/bouncing_in.gd
@@ -1,11 +1,11 @@
 func generate_animation(anima_tween: Tween, data: Dictionary) -> void:
 	var scale_frames = [
-		{ percentage = 0, from = Vector2(0.3, 0.3), easing_points = [0.215, 0.61, 0.355, 1] },
-		{ percentage = 20, to = Vector2(1, 1), easing_points = [0.215, 0.61, 0.355, 1] },
-		{ percentage = 40, to = Vector2(0.9, 0.9), easing_points = [0.215, 0.61, 0.355, 1] },
-		{ percentage = 60, to = Vector2(1.03, 1.03), easing_points = [0.215, 0.61, 0.355, 1] },
-		{ percentage = 80, to = Vector2(0.97, 0.97), easing_points = [0.215, 0.61, 0.355, 1] },
-		{ percentage = 100, to = Vector2(1, 1) },
+		{ percentage = 0, from = data.node.scale * Vector2(0.3, 0.3), easing_points = [0.215, 0.61, 0.355, 1] },
+		{ percentage = 20, to = data.node.scale * Vector2(1, 1), easing_points = [0.215, 0.61, 0.355, 1] },
+		{ percentage = 40, to = data.node.scale * Vector2(0.9, 0.9), easing_points = [0.215, 0.61, 0.355, 1] },
+		{ percentage = 60, to = data.node.scale * Vector2(1.03, 1.03), easing_points = [0.215, 0.61, 0.355, 1] },
+		{ percentage = 80, to = data.node.scale * Vector2(0.97, 0.97), easing_points = [0.215, 0.61, 0.355, 1] },
+		{ percentage = 100, to = data.node.scale * Vector2(1, 1) },
 	]
 
 	var opacity_frames = [
diff --git a/addons/dialogic/Nodes/Portrait.gd b/addons/dialogic/Nodes/Portrait.gd
@@ -15,6 +15,7 @@ var dim_time = 0.5
 var direction = 'left'
 var debug = false
 var fading_out = false
+var custom_instance : Node2D = null
 
 var current_state := {'character':'', 'portrait':'', 'position':'', 'mirrored':false}
 
@@ -45,16 +46,18 @@ func set_portrait(expression: String) -> void:
 	for n in get_children():
 		if 'DialogicCustomPortraitScene' in n.name:
 			n.queue_free()
+			
+	custom_instance = null
 	
 	var default
 	for p in character_data['portraits']:
 		if p['name'] == expression:
 			if is_scene(p['path']):
 				# Creating a scene portrait
 				var custom_node = load(p['path'])
-				var instance = custom_node.instance()
-				instance.name = 'DialogicCustomPortraitScene'
-				add_child(instance)
+				custom_instance = custom_node.instance()
+				custom_instance.name = 'DialogicCustomPortraitScene'
+				add_child(custom_instance)
 				
 				$TextureRect.texture = ImageTexture.new()
 				return
@@ -76,9 +79,9 @@ func set_portrait(expression: String) -> void:
 		push_warning('[Dialogic] Portrait missing: "' + expression + '". Maybe you deleted it? Update your timeline.')
 		# Creating a scene portrait
 		var custom_node = load(default)
-		var instance = custom_node.instance()
-		instance.name = 'DialogicCustomPortraitScene'
-		add_child(instance)
+		custom_instance = custom_node.instance()
+		custom_instance.name = 'DialogicCustomPortraitScene'
+		add_child(custom_instance)
 		
 		$TextureRect.texture = ImageTexture.new()
 		return
@@ -96,11 +99,20 @@ func set_mirror(value):
 	current_state['mirrored'] = value
 	if character_data["data"].has('mirror_portraits'):
 		if character_data["data"]['mirror_portraits']:
-			$TextureRect.flip_h = !value
+			if custom_instance != null:
+				custom_instance.scale.x *= get_mirror_scale(custom_instance.scale.x, !value)
+			else:
+				$TextureRect.flip_h = !value
 		else:
-			$TextureRect.flip_h = value
+			if custom_instance != null:
+				custom_instance.scale.x *= get_mirror_scale(custom_instance.scale.x, value)
+			else:
+				$TextureRect.flip_h = value
 	else:
-		$TextureRect.flip_h = value
+		if custom_instance != null:
+			custom_instance.scale.x *= get_mirror_scale(custom_instance.scale.x, value)
+		else:
+			$TextureRect.flip_h = value
 
 
 func move_to_position(position_offset):
@@ -141,10 +153,17 @@ func animate(animation_name = '[No Animation]', time = 1, loop = 1, delete = fal
 		return
 	
 	if '_in' in animation_name:
-		$TextureRect.modulate = Color(1,1,1,0)
+		if custom_instance != null:
+			custom_instance.modulate.a = 0
+		else:
+			$TextureRect.modulate = Color(1,1,1,0)
+		
 	
 	$AnimationTween.loop = loop
-	$AnimationTween.play($TextureRect, animation_name, time)
+	if custom_instance != null:
+		$AnimationTween.play(custom_instance, animation_name, time)
+	else:
+		$AnimationTween.play($TextureRect, animation_name, time)
 	
 	if delete:
 		$AnimationTween.connect("tween_all_completed", self, "queue_free")
@@ -176,3 +195,9 @@ func is_scene(path) -> bool:
 	if '.tscn' in path.to_lower():
 		return true
 	return false
+
+func get_mirror_scale(current_scale:float, mirror_value:bool) -> int:
+	if mirror_value and current_scale > 0:
+		return -1
+	else:
+		return 1

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ func generate_animation(anima_tween: Tween, data: Dictionary) -> void:`
`3`	`3`	`{ percentage = 0, from = 0 },`
`4`	`4`	`]`
`5`	`5`	`var scale_frames = [`
`6`		`- { percentage = 0, from = Vector2(1, 1) },`
	`6`	`+ { percentage = 0, from = data.node.scale * Vector2(1, 1) },`
`7`	`7`	`]`
`8`	`8`
`9`	`9`	`for index in range(2, 9):`
Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,9 @@ func generate_animation(anima_tween: Tween, data: Dictionary) -> void:`
`6`	`6`	`]`
`7`	`7`
`8`	`8`	`var scale_frames = [`
`9`		`- { percentage = 0, from = Vector2(0.7, 0.7) },`
`10`		`- { percentage = 80, to = Vector2(0.7, 0.7) },`
`11`		`- { percentage = 100, to = Vector2(1, 1) },`
	`9`	`+ { percentage = 0, from = data.node.scale * Vector2(0.7, 0.7) },`
	`10`	`+ { percentage = 80, to = data.node.scale * Vector2(0.7, 0.7) },`
	`11`	`+ { percentage = 100, to = data.node.scale * Vector2(1, 1) },`
`12`	`12`	`]`
`13`	`13`
`14`	`14`	`var opacity_frames = [`