oier/gymkhana-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix inverted transitions in/out (#388)

Browse Source
This commit is contained in:
Julian Murgia
2021-09-09 08:23:03 +02:00
committed by GitHub
parent b4bf5b82d6
commit cb711b329b
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
addons/escoria-core/game/scenes/transitions/transition.gd
View File

@@ -32,9 +32,9 @@ func _ready() -> void:
# the default transition) # the default transition)
func transition_out(p_transition_name: String = "") -> void: func transition_out(p_transition_name: String = "") -> void:
if p_transition_name.empty(): if p_transition_name.empty():
_anim_player.play(transition_name) _anim_player.play_backwards(transition_name)
else: else:
_anim_player.play(p_transition_name) _anim_player.play_backwards(p_transition_name)
yield(_anim_player, "animation_finished") yield(_anim_player, "animation_finished")
emit_signal("transition_done") emit_signal("transition_done")
_anim_player.seek(0.0) _anim_player.seek(0.0)
@@ -48,9 +48,9 @@ func transition_out(p_transition_name: String = "") -> void:
# the default transition) # the default transition)
func transition_in(p_transition_name: String = "") -> void: func transition_in(p_transition_name: String = "") -> void:
if p_transition_name.empty(): if p_transition_name.empty():
_anim_player.play_backwards(transition_name) _anim_player.play(transition_name)
else: else:
_anim_player.play_backwards(p_transition_name) _anim_player.play(p_transition_name)
yield(_anim_player, "animation_finished") yield(_anim_player, "animation_finished")
emit_signal("transition_done") emit_signal("transition_done")
_anim_player.seek(0.0) _anim_player.seek(0.0)

15
addons/escoria-core/game/scenes/transitions/transition.tscn
View File

@@ -3,7 +3,7 @@
[ext_resource path="res://addons/escoria-core/game/scenes/transitions/transition.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-core/game/scenes/transitions/transition.gd" type="Script" id=1]
[ext_resource path="res://addons/escoria-core/game/scenes/transitions/shaders/transition.material" type="Material" id=2] [ext_resource path="res://addons/escoria-core/game/scenes/transitions/shaders/transition.material" type="Material" id=2]
[sub_resource type="Animation" id=3] [sub_resource type="Animation" id=1]
resource_name = "curtain" resource_name = "curtain"
tracks/0/type = "value" tracks/0/type = "value"
tracks/0/path = NodePath(".:material:shader_param/cutoff") tracks/0/path = NodePath(".:material:shader_param/cutoff")
@@ -42,8 +42,7 @@ tracks/2/keys = {
"values": [ Color( 1, 1, 1, 1 ) ] "values": [ Color( 1, 1, 1, 1 ) ]
} }
[sub_resource type="Animation" id=1] [sub_resource type="Animation" id=2]
resource_name = "fade_black"
length = 0.5 length = 0.5
tracks/0/type = "value" tracks/0/type = "value"
tracks/0/path = NodePath(".:modulate") tracks/0/path = NodePath(".:modulate")
@@ -82,8 +81,7 @@ tracks/2/keys = {
"values": [ Color( 0, 0, 0, 1 ) ] "values": [ Color( 0, 0, 0, 1 ) ]
} }
[sub_resource type="Animation" id=2] [sub_resource type="Animation" id=3]
resource_name = "fade_white"
length = 0.5 length = 0.5
tracks/0/type = "value" tracks/0/type = "value"
tracks/0/path = NodePath(".:modulate") tracks/0/path = NodePath(".:modulate")
@@ -123,7 +121,6 @@ tracks/2/keys = {
} }
[node name="scene_transition" type="ColorRect"] [node name="scene_transition" type="ColorRect"]
modulate = Color( 0, 0, 0, 0 )
material = ExtResource( 2 ) material = ExtResource( 2 )
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
@@ -135,6 +132,6 @@ __meta__ = {
transition_name = "curtain" transition_name = "curtain"
[node name="AnimationPlayer" type="AnimationPlayer" parent="."] [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
anims/curtain = SubResource( 3 ) anims/curtain = SubResource( 1 )
anims/fade_black = SubResource( 1 ) anims/fade_black = SubResource( 2 )
anims/fade_white = SubResource( 2 ) anims/fade_white = SubResource( 3 )

4
game/rooms/room01/room01.tscn
View File

@@ -50,6 +50,10 @@ position = Vector2( 3.5636, 0 )
[node name="r_door" parent="Hotspots" instance=ExtResource( 8 )] [node name="r_door" parent="Hotspots" instance=ExtResource( 8 )]
[node name="ESCLocation" type="Position2D" parent="Hotspots/r_door"]
position = Vector2( 1229.68, 355.298 )
script = ExtResource( 7 )
[node name="item" type="Area2D" parent="Hotspots"] [node name="item" type="Area2D" parent="Hotspots"]
pause_mode = 1 pause_mode = 1
position = Vector2( -217.19, 0 ) position = Vector2( -217.19, 0 )