fix animations

ceceppa · Oct 13, 2023 · 93523b1 · 93523b1
1 parent 698487b
commit 93523b1
Show file tree

Hide file tree

Showing 35 changed files with 65 additions and 62 deletions.
diff --git a/addons/anima/animations/back_entrances/back_in_down.gd b/addons/anima/animations/back_entrances/back_in_down.gd
@@ -1,6 +1,6 @@
 var KEYFRAMES := {
 	0: {
-		"translate:y": "-:size:y - 60",
+		"translate:y": -1200,
 		"scale": Vector3(0.7, 0.7, 0.7),
 		"opacity": 0,
 	},

diff --git a/addons/anima/animations/back_entrances/back_in_left.gd b/addons/anima/animations/back_entrances/back_in_left.gd
@@ -1,6 +1,6 @@
 var KEYFRAMES := {
 	0: {
-		"translate:x": "-:size:x - 60",
+		"translate:x": -2000,
 		"scale": Vector3(0.7, 0.7, 0.7),
 		"opacity": 0.7,
 	},

diff --git a/addons/anima/animations/back_entrances/back_in_right.gd b/addons/anima/animations/back_entrances/back_in_right.gd
@@ -1,6 +1,6 @@
 var KEYFRAMES := {
 	0: {
-		"translate:x": ":size:x + 60",
+		"translate:x": 2000,
 		"scale": Vector3(0.7, 0.7, 0.7),
 		"opacity": 0.7,
 	},

diff --git a/addons/anima/animations/back_entrances/back_in_up.gd b/addons/anima/animations/back_entrances/back_in_up.gd
@@ -1,6 +1,6 @@
 var KEYFRAMES := {
 	0: {
-		"translate:y": ":size:y + 60",
+		"translate:y": 1200,
 		"scale": Vector3(0.7, 0.7, 0.7),
 		"opacity": 0.7,
 	},

diff --git a/addons/anima/animations/back_exits/back_out_down.gd b/addons/anima/animations/back_exits/back_out_down.gd
@@ -9,7 +9,7 @@ var KEYFRAMES := {
 		"opacity": 0.7
 	},
 	100: {
-		"translate:y": ":size:y * 2",
+		"translate:y": 700,
 		"scale": Vector2(0.7, 0.7),
 		"opacity": 0.7
 	}

diff --git a/addons/anima/animations/back_exits/back_out_left.gd b/addons/anima/animations/back_exits/back_out_left.gd
@@ -9,7 +9,7 @@ var KEYFRAMES := {
 		"opacity": 0.7
 	},
 	100: {
-		"translate:x": "-:size:x * 2",
+		"translate:x": -2000,
 		"scale": Vector2(0.7, 0.7),
 		"opacity": 0.7
 	}

diff --git a/addons/anima/animations/back_exits/back_out_right.gd b/addons/anima/animations/back_exits/back_out_right.gd
@@ -9,7 +9,7 @@ var KEYFRAMES := {
 		"opacity": 0.7
 	},
 	100: {
-		"translate:x": ":size:x * 2",
+		"translate:x": 2000,
 		"scale": Vector2(0.7, 0.7),
 		"opacity": 0.7
 	}

diff --git a/addons/anima/animations/back_exits/back_out_up.gd b/addons/anima/animations/back_exits/back_out_up.gd
@@ -9,7 +9,7 @@ var KEYFRAMES := {
 		"opacity": 0.7
 	},
 	100: {
-		"translate:y": "-:size:y * 2",
+		"translate:y": -700,
 		"scale": Vector2(0.7, 0.7),
 		"opacity": 0.7
 	}

diff --git a/addons/anima/animations/bouncing_exits/bounce_out_down.gd b/addons/anima/animations/bouncing_exits/bounce_out_down.gd
@@ -10,7 +10,7 @@ var KEYFRAMES := {
 	},
 	100: {
 		"opacity": 0,
-		"translate:y": "..:size:y + ..:position:y",
+		"translate:y": 2000,
 		"scale:y": 3
 	}
 }
diff --git a/addons/anima/animations/bouncing_exits/bounce_out_up.gd b/addons/anima/animations/bouncing_exits/bounce_out_up.gd
@@ -10,7 +10,7 @@ var KEYFRAMES := {
 	},
 	100: {
 		"opacity": 0,
-		"translate:y": "-..:size:y - ..:position:y",
+		"translate:y": -2000,
 		"scale:y": 3
 	}
 }
diff --git a/addons/anima/animations/fading_entrances/fade_in_down_big.gd b/addons/anima/animations/fading_entrances/fade_in_down_big.gd
@@ -1,7 +1,7 @@
 var KEYFRAMES := {
 	0: {
 		"opacity": 0,
-		"translate:y": ":size:y + ..:size:y"
+		"translate:y": "(:size:y + ..:size:y) * 2"
 	},
 	100: {
 		"opacity": 1,

diff --git a/addons/anima/animations/fading_entrances/fade_in_up_big.gd b/addons/anima/animations/fading_entrances/fade_in_up_big.gd
@@ -1,7 +1,7 @@
 var KEYFRAMES := {
 	0: {
 		"opacity": 0,
-		"translate:y": ":size:y + ..:size:y"
+		"translate:y": "-(:size:y + ..:size:y) * 2"
 	},
 	100: {
 		"opacity": 1,

diff --git a/addons/anima/animations/fading_exits/fade_out_down_big.gd b/addons/anima/animations/fading_exits/fade_out_down_big.gd
@@ -1,7 +1,7 @@
 var KEYFRAMES := {
 	100: {
 		"opacity": 0,
-		"translate:y": "-:size:y - ..:size:y"
+		"translate:y": "(:size:y + ..:size:y) * 2"
 	},
 	0: {
 		"opacity": 1,

diff --git a/addons/anima/animations/fading_exits/fade_out_up_big.gd b/addons/anima/animations/fading_exits/fade_out_up_big.gd
@@ -1,7 +1,7 @@
 var KEYFRAMES := {
 	100: {
 		"opacity": 0,
-		"translate:y": "-:size:y - ..:size:y"
+		"translate:y": "-(:size:y + ..:size:y) * 2"
 	},
 	0: {
 		"opacity": 1,

diff --git a/addons/anima/animations/lightspeed/light_speed_in_left.gd b/addons/anima/animations/lightspeed/light_speed_in_left.gd
@@ -2,14 +2,14 @@ var KEYFRAMES := {
 	0: {
 		"translate:x": "-:size:x",
 		"opacity": 0,
-		"skew:x": 30,
+		"skew:x": 0.52,
 	},
 	60: {
-		"skew:x": -20,
+		"skew:x": -0.34,
 		"opacity": 1,
 	},
 	80: {
-		"skew:x": 5,
+		"skew:x": 0.087,
 	},
 	100: {
 		"translate:x": 0,

diff --git a/addons/anima/animations/lightspeed/light_speed_in_right.gd b/addons/anima/animations/lightspeed/light_speed_in_right.gd
@@ -2,14 +2,14 @@ var KEYFRAMES := {
 	0: {
 		"translate:x": ":size:x",
 		"opacity": 0,
-		"skew:x": -30,
+		"skew:x": deg_to_rad(-30),
 	},
 	60: {
-		"skew:x": 20,
+		"skew:x": deg_to_rad(20),
 		"opacity": 1,
 	},
 	80: {
-		"skew:x": -5,
+		"skew:x": deg_to_rad(-5),
 	},
 	100: {
 		"translate:x": 0,

diff --git a/addons/anima/animations/lightspeed/light_speed_out_left.gd b/addons/anima/animations/lightspeed/light_speed_out_left.gd
@@ -4,7 +4,8 @@ var KEYFRAMES := {
 	},
 	100: {
 		"translate:x": "-:size:x",
-		"skew:x": -30,
+		"skew:x": deg_to_rad(-30),
+		"opacity": 0
 	},
 	"easing": ANIMA.EASING.EASE_IN
 }
diff --git a/addons/anima/animations/lightspeed/light_speed_out_right.gd b/addons/anima/animations/lightspeed/light_speed_out_right.gd
@@ -4,7 +4,8 @@ var KEYFRAMES := {
 	},
 	100: {
 		"translate:x": ":size:x",
-		"skew:x": 30,
+		"skew:x": deg_to_rad(30),
+		"opacity": 0
 	},
 	"easing": ANIMA.EASING.EASE_IN
 }
diff --git a/addons/anima/animations/rotating_entrances/rotate_in.gd b/addons/anima/animations/rotating_entrances/rotate_in.gd
@@ -1,6 +1,6 @@
 var KEYFRAMES := {
 	0: {
-		rotation = -200,
+		rotation = deg_to_rad(-200),
 		opacity = 0,
 	},
 	100: {

diff --git a/addons/anima/animations/rotating_entrances/rotate_in_down_left.gd b/addons/anima/animations/rotating_entrances/rotate_in_down_left.gd
@@ -1,6 +1,6 @@
 var KEYFRAMES := {
 	0: {
-		rotation = -45,
+		rotation = deg_to_rad(-45),
 		opacity = 0,
 	},
 	100: {

diff --git a/addons/anima/animations/rotating_entrances/rotate_in_down_right.gd b/addons/anima/animations/rotating_entrances/rotate_in_down_right.gd
@@ -1,6 +1,6 @@
 var KEYFRAMES := {
 	0: {
-		rotation = 45,
+		rotation = deg_to_rad(45),
 		opacity = 0,
 	},
 	100: {

diff --git a/addons/anima/animations/rotating_entrances/rotate_in_up_left.gd b/addons/anima/animations/rotating_entrances/rotate_in_up_left.gd
@@ -1,6 +1,6 @@
 var KEYFRAMES := {
 	0: {
-		rotation = 45,
+		rotation = deg_to_rad(45),
 		opacity = 0,
 	},
 	100: {

diff --git a/addons/anima/animations/rotating_entrances/rotate_in_up_right.gd b/addons/anima/animations/rotating_entrances/rotate_in_up_right.gd
@@ -1,6 +1,6 @@
 var KEYFRAMES := {
 	0: {
-		rotation = -90,
+		rotation = deg_to_rad(-90),
 		opacity = 0,
 	},
 	100: {

diff --git a/addons/anima/animations/rotating_exits/rotate_out.gd b/addons/anima/animations/rotating_exits/rotate_out.gd
@@ -3,7 +3,7 @@ var KEYFRAMES := {
 		opacity = 1,
 	},
 	100: {
-		rotation = 200,
+		rotation = deg_to_rad(200),
 		opacity = 0,
 	},
 }
diff --git a/addons/anima/animations/rotating_exits/rotate_out_down_left.gd b/addons/anima/animations/rotating_exits/rotate_out_down_left.gd
@@ -3,7 +3,7 @@ var KEYFRAMES := {
 		opacity = 1,
 	},
 	100: {
-		rotation = 45,
+		rotation = deg_to_rad(45),
 		opacity = 0,
 	},
 	"pivot": ANIMA.PIVOT.BOTTOM_LEFT

diff --git a/addons/anima/animations/rotating_exits/rotate_out_down_right.gd b/addons/anima/animations/rotating_exits/rotate_out_down_right.gd
@@ -3,7 +3,7 @@ var KEYFRAMES := {
 		opacity = 1,
 	},
 	100: {
-		rotation = -45,
+		rotation = deg_to_rad(-45),
 		opacity = 0,
 	},
 	"pivot": ANIMA.PIVOT.BOTTOM_RIGHT

diff --git a/addons/anima/animations/rotating_exits/rotate_out_up_left.gd b/addons/anima/animations/rotating_exits/rotate_out_up_left.gd
@@ -3,7 +3,7 @@ var KEYFRAMES := {
 		opacity = 1,
 	},
 	100: {
-		rotation = -45,
+		rotation = deg_to_rad(-45),
 		opacity = 0,
 	},
 	"pivot": ANIMA.PIVOT.BOTTOM_LEFT

diff --git a/addons/anima/animations/rotating_exits/rotate_out_up_right.gd b/addons/anima/animations/rotating_exits/rotate_out_up_right.gd
@@ -3,7 +3,7 @@ var KEYFRAMES := {
 		opacity = 1,
 	},
 	100: {
-		rotation = 90,
+		rotation = deg_to_rad(90),
 		opacity = 0,
 	},
 	"pivot": ANIMA.PIVOT.BOTTOM_RIGHT

diff --git a/addons/anima/animations/specials/hinge.gd b/addons/anima/animations/specials/hinge.gd
@@ -3,15 +3,20 @@ var KEYFRAMES := {
 		rotation = 0,
 	},
 	[20, 60]: {
-		rotation = 80,
+		rotation = deg_to_rad(80),
+		easing = ANIMA.EASING.EASE_IN_OUT,
 	},
 	[40, 80]: {
-		rotation = 60,
+		rotation = deg_to_rad(60),
 		opacity = 1,
+		easing = ANIMA.EASING.EASE_IN_OUT,
+	},
+	81: {
+		"translate:y": 0,
 	},
 	100: {
 		"translate:y": 700,
-		opacity = 0
+		"opacity": 0
 	},
 	"easing": ANIMA.EASING.EASE_IN_OUT,
 	"pivot": ANIMA.PIVOT.TOP_LEFT

diff --git a/addons/anima/animations/specials/jack_in_the_box.gd b/addons/anima/animations/specials/jack_in_the_box.gd
@@ -2,16 +2,18 @@ var KEYFRAMES := {
 	0: {
 		opacity = 0,
 		scale = Vector3(0.1, 0.1, 0.1),
-		rotation = 30,
+		rotation = deg_to_rad(30),
 	},
 	50: {
-		rotation = -10,
+		rotation = deg_to_rad(-10),
 	},
 	70: {
-		rotation = 3,
+		rotation = deg_to_rad(3),
 	},
 	100: {
 		opacity = 1,
-		scale = Vector3.ONE
-	}
+		scale = Vector3.ONE,
+		rotation = 0
+	},
+	"pivot": ANIMA.PIVOT.BOTTOM_CENTER
 }
diff --git a/addons/anima/animations/specials/roll_in.gd b/addons/anima/animations/specials/roll_in.gd
@@ -4,7 +4,7 @@ var KEYFRAMES := {
 	0: {
 		"opacity": 0,
 		"translate:x": "-:size:x",
-		"rotation": -120,
+		"rotation": deg_to_rad(-120),
 	},
 	100: {
 		"opacity": 1,

diff --git a/addons/anima/animations/specials/roll_out.gd b/addons/anima/animations/specials/roll_out.gd
@@ -7,7 +7,7 @@ var KEYFRAMES := {
 	100: {
 		"opacity": 0,
 		"translate:x": ":size:x",
-		"rotation": 120
+		"rotation": deg_to_rad(120)
 	}
 }
 
diff --git a/addons/anima/ui/AnimationPicker/AnimationPicker.gd b/addons/anima/ui/AnimationPicker/AnimationPicker.gd
@@ -46,11 +46,11 @@ func _ready():
 		is_first_header = false
 
 	_anima = Anima.begin(self)
-	_on_item_rect_changed()
 
 	ActiveDemoNode = SpriteDemo
 	ActiveDemoNode.show()
-#	LabelDemo.modulate.a = 0
+	LabelDemo.modulate.a = 0
+	_on_item_rect_changed()
 
 func _create_new_header(animation: String) -> Button:
 	var button: Button = HEADER_BUTTON.instantiate()
@@ -105,4 +105,4 @@ func _on_animation_speed_text_submitted(new_text):
 func _on_item_rect_changed():
 	if SpriteDemo:
 		SpriteDemo.position = LabelDemo.position
-		SpriteDemo.offset = (SpriteDemo.get_rect().size / 2) - (SpriteDemo.get_rect().size - LabelDemo.get_rect().size) / 2
+		SpriteDemo.position += (SpriteDemo.get_rect().size / 2) - (SpriteDemo.get_rect().size - LabelDemo.get_rect().size) / 2
diff --git a/addons/anima/ui/AnimationPicker/AnimationPicker.tscn b/addons/anima/ui/AnimationPicker/AnimationPicker.tscn
@@ -93,7 +93,6 @@ text = "Anima"
 
 [node name="SpriteDemo" type="Sprite2D" parent="TabContainer/Animations/Control/ControlContainer"]
 modulate = Color(0, 0, 0, 1)
-position = Vector2(152.5, 66)
 texture = ExtResource("2_pk6n6")
 
 [node name="Panel" type="PanelContainer" parent="TabContainer/Animations/Control"]
@@ -218,20 +217,20 @@ layout_mode = 2
 [connection signal="item_rect_changed" from="." to="." method="_on_item_rect_changed"]
 [connection signal="text_submitted" from="TabContainer/Animations/Control/Panel/MarginContainer/HBoxContainer/AnimationSpeed" to="." method="_on_animation_speed_text_submitted"]
 [connection signal="toggled" from="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/HeaderButton" to="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/HeaderButton" method="_on_toggled" flags=18]
-[connection signal="toggled" from="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22194" to="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22194" method="_on_toggled" flags=18]
-[connection signal="toggled" from="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22199" to="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22199" method="_on_toggled" flags=18]
+[connection signal="toggled" from="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22188" to="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22188" method="_on_toggled" flags=18]
+[connection signal="toggled" from="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22193" to="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22193" method="_on_toggled" flags=18]
+[connection signal="toggled" from="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22198" to="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22198" method="_on_toggled" flags=18]
 [connection signal="toggled" from="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22204" to="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22204" method="_on_toggled" flags=18]
 [connection signal="toggled" from="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22210" to="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22210" method="_on_toggled" flags=18]
-[connection signal="toggled" from="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22216" to="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22216" method="_on_toggled" flags=18]
-[connection signal="toggled" from="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22231" to="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22231" method="_on_toggled" flags=18]
-[connection signal="toggled" from="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22245" to="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22245" method="_on_toggled" flags=18]
+[connection signal="toggled" from="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22225" to="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22225" method="_on_toggled" flags=18]
+[connection signal="toggled" from="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22239" to="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22239" method="_on_toggled" flags=18]
+[connection signal="toggled" from="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22244" to="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22244" method="_on_toggled" flags=18]
 [connection signal="toggled" from="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22250" to="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22250" method="_on_toggled" flags=18]
 [connection signal="toggled" from="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22256" to="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22256" method="_on_toggled" flags=18]
-[connection signal="toggled" from="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22262" to="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22262" method="_on_toggled" flags=18]
-[connection signal="toggled" from="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22267" to="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22267" method="_on_toggled" flags=18]
-[connection signal="toggled" from="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22272" to="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22272" method="_on_toggled" flags=18]
-[connection signal="toggled" from="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22277" to="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22277" method="_on_toggled" flags=18]
-[connection signal="toggled" from="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22279" to="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22279" method="_on_toggled" flags=18]
-[connection signal="toggled" from="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22289" to="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22289" method="_on_toggled" flags=18]
+[connection signal="toggled" from="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22261" to="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22261" method="_on_toggled" flags=18]
+[connection signal="toggled" from="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22266" to="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22266" method="_on_toggled" flags=18]
+[connection signal="toggled" from="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22271" to="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22271" method="_on_toggled" flags=18]
+[connection signal="toggled" from="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22273" to="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22273" method="_on_toggled" flags=18]
+[connection signal="toggled" from="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22283" to="TabContainer/Animations/VBoxContainer/ScrollContainer/ListContainer/@Button@22283" method="_on_toggled" flags=18]
 [connection signal="pressed" from="TabContainer/Animations/VBoxContainer/MarginContainer/HBoxContainer/UseAnimation" to="." method="_on_use_animation_pressed"]
 [connection signal="pressed" from="TabContainer/Animations/VBoxContainer/MarginContainer/HBoxContainer/CloseButton" to="." method="_on_close_button_pressed"]