Skip to content

Commit

Permalink
1-8-25 - Camera zoom added
Browse files Browse the repository at this point in the history
Added camera zoom to pause menu animation
  • Loading branch information
Tougon committed Jan 8, 2025
1 parent a0fbcf1 commit 5144520
Show file tree
Hide file tree
Showing 6 changed files with 65 additions and 13 deletions.
2 changes: 1 addition & 1 deletion addons/camera-effects/sepia.gdshader
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ void fragment() {
col.r * .393 + col.g *.769 + col.b * .189,
col.r * .349 + col.g *.686 + col.b * .168,
col.r * .272 + col.g *.534 + col.b * .131);

COLOR = vec4(sepia, 1.0);
}
16 changes: 8 additions & 8 deletions assets/Shaders/chromatic_aberration.gdshader
Original file line number Diff line number Diff line change
Expand Up @@ -45,33 +45,33 @@ void fragment() {
float att = clamp(dist / radius, 0., 1.);

chaos_v *= 1. - pow(att, attenuation);

float x = abs(UV.r-.5)*2.0;
float y = abs(UV.g-.5)*2.0;
float q = 1.0-(1.0-sqrt(x*x+y*y)/outer_radius)/(1.0-inner_radius);

vec4 screen_tex = texture(SCREEN_TEXTURE, SCREEN_UV);

float r = texture(SCREEN_TEXTURE, SCREEN_UV + chaos_v * amount_r).r;
float g = texture(SCREEN_TEXTURE, SCREEN_UV + chaos_v * amount_g).g;
float b = texture(SCREEN_TEXTURE, SCREEN_UV + chaos_v * amount_b).b;

if (invert)
{
r = 1. - r;
g = 1. - g;
b = 1. - b;
}

float max_color = max(r, max(g, b));

r = mix(max_color * mix(1, modulate.r, modulate_amount), r, saturation);
g = mix(max_color * mix(1, modulate.g, modulate_amount), g, saturation);
b = mix(max_color * mix(1, modulate.b, modulate_amount), b, saturation);

float v = clamp(1.0 - (q * alpha), 0, 1);
if (!vignette) v = 1.;

COLOR = mix(screen_tex, vec4(r * v, g * v, b * v, 1.), final_amount);

}
21 changes: 20 additions & 1 deletion src/RPGData/Scenes/Overworld/OverworldScene.gd
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ var battle_scene_window_ref : PackedScene = preload("res://src/RPGData/Scenes/Ba
func _ready() -> void:
EventManager.on_battle_queue.connect(_on_overworld_battle_queued);
EventManager.on_battle_end.connect(_on_battle_end);
UIManager.on_menu_opened.connect(_on_menu_opened);
UIManager.on_menu_closing.connect(_on_menu_closing);

OverworldManager.player_controller = player_controller;
OverworldManager.free_camera = free_camera;
Expand Down Expand Up @@ -162,11 +164,28 @@ func _on_battle_end(result : BattleResult):
result.free();


func _on_menu_opened(menu : MenuPanel):
if menu.menu_name == "overworld_menu_main":
var tween = get_tree().create_tween();
tween.tween_property(game_camera, "zoom", Vector2(1.2,1.2), 0.5).set_trans(Tween.TRANS_QUART).set_ease(Tween.EASE_OUT)



func _on_menu_closing(menu : MenuPanel):
if menu.menu_name == "overworld_menu_main":
var tween = get_tree().create_tween();
tween.tween_property(game_camera, "zoom", Vector2(1.0,1.0), 0.5).set_trans(Tween.TRANS_QUART).set_ease(Tween.EASE_OUT)


func _exit_tree():
if EventManager != null:
EventManager.on_battle_queue.disconnect(_on_overworld_battle_queued);
EventManager.on_battle_end.disconnect(_on_battle_end);


if UIManager != null:
UIManager.on_menu_opened.disconnect(_on_menu_opened);
UIManager.on_menu_closing.disconnect(_on_menu_closing);

QuestManager.quest_completed.disconnect(quest_complete)
Dialogic.timeline_started.disconnect(_on_dialogue_begin);
Dialogic.timeline_ended.disconnect(_on_dialogue_end);
37 changes: 34 additions & 3 deletions src/RPGData/Scenes/UI/overworld_main_menu.tscn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=34 format=3 uid="uid://drqpg4ss303dj"]
[gd_scene load_steps=36 format=3 uid="uid://drqpg4ss303dj"]

[ext_resource type="Script" path="res://src/RPGData/Scenes/UI/overworld_main_menu.gd" id="1_ywfua"]
[ext_resource type="Script" path="res://addons/toui/src/tween_player_ui.gd" id="2_fajv7"]
Expand Down Expand Up @@ -135,9 +135,24 @@ relative = false
"Color Value" = Color(1, 1, 1, 1)
"From Color" = Color(1, 1, 1, 0.384314)

[sub_resource type="Resource" id="Resource_lyvhg"]
script = ExtResource("9_7mkwv")
target = "Header/Options Headers"
property_name = "scale"
material_property = false
duration = 0.6
delay = 0.1
transition = 4
ease = 1
relative = false
"Use From" = true
"Value Type" = 3
"Vector2 Value" = Vector2(1, 1)
"From Vector2" = Vector2(0.8, 0.8)

[sub_resource type="Resource" id="Resource_ig1wf"]
script = ExtResource("8_5bptp")
frames = Array[ExtResource("9_7mkwv")]([SubResource("Resource_b0o5m"), SubResource("Resource_tv1mv"), SubResource("Resource_i0m8o")])
frames = Array[ExtResource("9_7mkwv")]([SubResource("Resource_b0o5m"), SubResource("Resource_tv1mv"), SubResource("Resource_i0m8o"), SubResource("Resource_lyvhg")])

[sub_resource type="Resource" id="Resource_d1135"]
script = ExtResource("7_2gsnx")
Expand Down Expand Up @@ -195,9 +210,24 @@ relative = false
"Value Type" = 5
"Color Value" = Color(1, 1, 1, 0)

[sub_resource type="Resource" id="Resource_n8u5n"]
script = ExtResource("9_7mkwv")
target = "Header/Options Headers"
property_name = "scale"
material_property = false
duration = 0.2
delay = 0.0
transition = 3
ease = 1
relative = false
"Use From" = true
"Value Type" = 3
"Vector2 Value" = Vector2(0.8, 0.8)
"From Vector2" = Vector2(1, 1)

[sub_resource type="Resource" id="Resource_psnsu"]
script = ExtResource("8_5bptp")
frames = Array[ExtResource("9_7mkwv")]([SubResource("Resource_ixc86"), SubResource("Resource_ou1q5"), SubResource("Resource_pecf3")])
frames = Array[ExtResource("9_7mkwv")]([SubResource("Resource_ixc86"), SubResource("Resource_ou1q5"), SubResource("Resource_pecf3"), SubResource("Resource_n8u5n")])

[sub_resource type="Resource" id="Resource_bdl6l"]
script = ExtResource("7_2gsnx")
Expand Down Expand Up @@ -248,6 +278,7 @@ anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
pivot_offset = Vector2(480, 36)

[node name="GridContainer" type="GridContainer" parent="Header/Options Headers"]
material = SubResource("ShaderMaterial_gbffb")
Expand Down
1 change: 1 addition & 0 deletions src/UIManager/Scripts/MenuPanel.gd
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ func set_active(state : bool):

else :
set_focus(false);
UIManager.on_menu_closing.emit(self);

if tween_player.has_tween("Close"):
tween_player.tween_ended.connect(on_tween_end_inactive);
Expand Down
1 change: 1 addition & 0 deletions src/UIManager/Scripts/UIManager.gd
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ var current_hover : Control;

signal current_hover_changed(hover_item);
signal on_menu_opened(panel : MenuPanel);
signal on_menu_closing(panel : MenuPanel);
signal on_menu_closed(panel : MenuPanel);
signal on_all_menus_closed();

Expand Down

0 comments on commit 5144520

Please sign in to comment.