diff --git a/core/camera_move.gd b/core/camera_move.gd index b4c7e10..da77c8b 100644 --- a/core/camera_move.gd +++ b/core/camera_move.gd @@ -115,21 +115,21 @@ func on_change_camera_request(camera_index: int) -> void: var next_cam = array_camera[camera_index] set_camera(next_cam) -func _unhandled_input(event: InputEvent) -> void: - var current_cam = get_viewport().get_camera_3d() - var is_photo_mode = current_cam != null and not current_cam in array_camera - if is_photo_mode: - return - - if event is InputEventKey and event.pressed and not event.echo: - match event.keycode: - KEY_1: - if array_camera.size() > 0: set_camera(array_camera[0]) - KEY_2: - if array_camera.size() > 1: set_camera(array_camera[1]) - KEY_3: - if array_camera.size() > 2: set_camera(array_camera[2]) - KEY_4: - if array_camera.size() > 3: set_camera(array_camera[3]) - KEY_5: - if array_camera.size() > 4: set_camera(array_camera[4]) +#func _unhandled_input(event: InputEvent) -> void: + #var current_cam = get_viewport().get_camera_3d() + #var is_photo_mode = current_cam != null and not current_cam in array_camera + #if is_photo_mode: + #return + # + #if event is InputEventKey and event.pressed and not event.echo: + #match event.keycode: + #KEY_1: + #if array_camera.size() > 0: set_camera(array_camera[0]) + #KEY_2: + #if array_camera.size() > 1: set_camera(array_camera[1]) + #KEY_3: + #if array_camera.size() > 2: set_camera(array_camera[2]) + #KEY_4: + #if array_camera.size() > 3: set_camera(array_camera[3]) + #KEY_5: + #if array_camera.size() > 4: set_camera(array_camera[4]) diff --git a/core/daynight/environment_manager.gd b/core/daynight/environment_manager.gd index cb1d3d2..7c8f89f 100644 --- a/core/daynight/environment_manager.gd +++ b/core/daynight/environment_manager.gd @@ -316,8 +316,19 @@ func select_day_time(normalized_time: float) -> void: #24:00 1.0000 3.0 if normalized_time < environment_config.sunrise: - #Sunrise: night → morning - day_time = 3.0 + (normalized_time / environment_config.sunrise) * 1.0 # 3.0 → 4.0 + #Sunrise: stay night → night to alba(afternoon) → alba to morning + var part = environment_config.sunrise / 3.0 + if normalized_time < part: + # Stay Night + day_time = 3.0 + elif normalized_time < part * 2.0: + # Night to Alba (Afternoon) + var t = (normalized_time - part) / part + day_time = 3.0 - (t * 1.0) # 3.0 → 2.0 + else: + # Alba (Afternoon) to Morning + var t = (normalized_time - part * 2.0) / part + day_time = 2.0 - (t * 1.0) # 2.0 → 1.0 elif normalized_time < environment_config.day: #Morning: morning → afternoon var t: float = (normalized_time - environment_config.sunrise) / (environment_config.day - environment_config.sunrise) @@ -342,10 +353,17 @@ func _update_clouds_lighting(normalized_time: float) -> void: return if normalized_time < environment_config.sunrise: - # NOTTE / PRE-ALBA (Colori scuri, nessun rim light solare) - cloud_material.set_shader_parameter("cloud_color", Color("1a1c2e")) - cloud_material.set_shader_parameter("shadow_color", Color("0d0e17")) - cloud_material.set_shader_parameter("rim_color", Color("000000")) + var part = environment_config.sunrise / 3.0 + if normalized_time < part * 2.0: + # NOTTE / PRE-ALBA (Colori scuri, nessun rim light solare) + cloud_material.set_shader_parameter("cloud_color", Color("1a1c2e")) + cloud_material.set_shader_parameter("shadow_color", Color("0d0e17")) + cloud_material.set_shader_parameter("rim_color", Color("000000")) + else: + # ALBA (uguale al tramonto) + cloud_material.set_shader_parameter("cloud_color", Color("fdf3e7")) + cloud_material.set_shader_parameter("shadow_color", Color("5c537a")) + cloud_material.set_shader_parameter("rim_color", Color("ff9e64")) elif normalized_time < environment_config.day: # MATTINA / ALBA (Colori che iniziano a scaldarsi) diff --git a/core/font/DePixelSchmal.ttf b/core/font/DePixelSchmal.ttf new file mode 100644 index 0000000..3bc10b2 Binary files /dev/null and b/core/font/DePixelSchmal.ttf differ diff --git a/core/font/DePixelSchmal.ttf.import b/core/font/DePixelSchmal.ttf.import new file mode 100644 index 0000000..b5c1775 --- /dev/null +++ b/core/font/DePixelSchmal.ttf.import @@ -0,0 +1,36 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://d08lffa62cwe4" +path="res://.godot/imported/DePixelSchmal.ttf-8ac33b7cef810a277bf67f13d849d16b.fontdata" + +[deps] + +source_file="res://core/font/DePixelSchmal.ttf" +dest_files=["res://.godot/imported/DePixelSchmal.ttf-8ac33b7cef810a277bf67f13d849d16b.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +disable_embedded_bitmaps=true +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +modulate_color_glyphs=false +hinting=1 +subpixel_positioning=4 +keep_rounding_remainders=true +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/core/font/audio_player_theme.tres b/core/font/audio_player_theme.tres new file mode 100644 index 0000000..7ab1ec6 --- /dev/null +++ b/core/font/audio_player_theme.tres @@ -0,0 +1,6 @@ +[gd_resource type="Theme" format=3 uid="uid://dib2yjsuiyhl"] + +[ext_resource type="FontFile" uid="uid://d08lffa62cwe4" path="res://core/font/DePixelSchmal.ttf" id="1_svhk7"] + +[resource] +default_font = ExtResource("1_svhk7") diff --git a/core/game_menu/assets/page_2/pg_3.png b/core/game_menu/assets/page_2/pg_3.png new file mode 100644 index 0000000..930a0a1 Binary files /dev/null and b/core/game_menu/assets/page_2/pg_3.png differ diff --git a/core/game_menu/assets/page_2/pg_3.png.import b/core/game_menu/assets/page_2/pg_3.png.import new file mode 100644 index 0000000..b347b66 --- /dev/null +++ b/core/game_menu/assets/page_2/pg_3.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dpsyqpi74dnvu" +path="res://.godot/imported/pg_3.png-03cc0909b35fe8817a39820d5cb898ba.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_2/pg_3.png" +dest_files=["res://.godot/imported/pg_3.png-03cc0909b35fe8817a39820d5cb898ba.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/core/game_menu/assets/page_2/pg_3_vertical.png b/core/game_menu/assets/page_2/pg_3_vertical.png new file mode 100644 index 0000000..2c7f3c1 Binary files /dev/null and b/core/game_menu/assets/page_2/pg_3_vertical.png differ diff --git a/core/game_menu/assets/page_2/pg_3_vertical.png.import b/core/game_menu/assets/page_2/pg_3_vertical.png.import new file mode 100644 index 0000000..8eec91e --- /dev/null +++ b/core/game_menu/assets/page_2/pg_3_vertical.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://decvm18okiuxw" +path="res://.godot/imported/pg_3_vertical.png-c2c3e741e77873e5b55455c2f973c775.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_2/pg_3_vertical.png" +dest_files=["res://.godot/imported/pg_3_vertical.png-c2c3e741e77873e5b55455c2f973c775.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/core/game_menu/assets/page_2/pg_3_vertical_2.png b/core/game_menu/assets/page_2/pg_3_vertical_2.png new file mode 100644 index 0000000..c62aea8 Binary files /dev/null and b/core/game_menu/assets/page_2/pg_3_vertical_2.png differ diff --git a/core/game_menu/assets/page_2/pg_3_vertical_2.png.import b/core/game_menu/assets/page_2/pg_3_vertical_2.png.import new file mode 100644 index 0000000..afe5c03 --- /dev/null +++ b/core/game_menu/assets/page_2/pg_3_vertical_2.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://nqkwsl05pj6t" +path="res://.godot/imported/pg_3_vertical_2.png-733981bb73bbd5adfc0b985312448a48.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_2/pg_3_vertical_2.png" +dest_files=["res://.godot/imported/pg_3_vertical_2.png-733981bb73bbd5adfc0b985312448a48.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/core/game_menu/assets/page_2/pg_3_vertical_cs.png b/core/game_menu/assets/page_2/pg_3_vertical_cs.png new file mode 100644 index 0000000..804da49 Binary files /dev/null and b/core/game_menu/assets/page_2/pg_3_vertical_cs.png differ diff --git a/core/game_menu/assets/page_2/pg_3_vertical_cs.png.import b/core/game_menu/assets/page_2/pg_3_vertical_cs.png.import new file mode 100644 index 0000000..f6fa883 --- /dev/null +++ b/core/game_menu/assets/page_2/pg_3_vertical_cs.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://nw420tkucw5p" +path="res://.godot/imported/pg_3_vertical_cs.png-2d42ea13986f9679ddedd33b2e463769.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_2/pg_3_vertical_cs.png" +dest_files=["res://.godot/imported/pg_3_vertical_cs.png-2d42ea13986f9679ddedd33b2e463769.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/core/game_menu/assets/page_3/barretta_regular.png b/core/game_menu/assets/page_3/barretta_regular.png new file mode 100644 index 0000000..6fef5f1 Binary files /dev/null and b/core/game_menu/assets/page_3/barretta_regular.png differ diff --git a/core/game_menu/assets/page_3/barretta_regular.png.import b/core/game_menu/assets/page_3/barretta_regular.png.import new file mode 100644 index 0000000..fe351bb --- /dev/null +++ b/core/game_menu/assets/page_3/barretta_regular.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://culspkef43qfd" +path="res://.godot/imported/barretta_regular.png-004551bd2a59af046ec6f59b14c511df.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_3/barretta_regular.png" +dest_files=["res://.godot/imported/barretta_regular.png-004551bd2a59af046ec6f59b14c511df.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/core/game_menu/assets/page_3/button_1_texture.png b/core/game_menu/assets/page_3/button_1_texture.png new file mode 100644 index 0000000..49d9731 Binary files /dev/null and b/core/game_menu/assets/page_3/button_1_texture.png differ diff --git a/core/game_menu/assets/page_3/button_1_texture.png.import b/core/game_menu/assets/page_3/button_1_texture.png.import new file mode 100644 index 0000000..4d53882 --- /dev/null +++ b/core/game_menu/assets/page_3/button_1_texture.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://od0hlvkpilqt" +path="res://.godot/imported/button_1_texture.png-c83d07b1c1d4bd7bb3af0cf5e59324e0.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_3/button_1_texture.png" +dest_files=["res://.godot/imported/button_1_texture.png-c83d07b1c1d4bd7bb3af0cf5e59324e0.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/core/game_menu/assets/page_3/button_2_texture.png b/core/game_menu/assets/page_3/button_2_texture.png new file mode 100644 index 0000000..2167c57 Binary files /dev/null and b/core/game_menu/assets/page_3/button_2_texture.png differ diff --git a/core/game_menu/assets/page_3/button_2_texture.png.import b/core/game_menu/assets/page_3/button_2_texture.png.import new file mode 100644 index 0000000..7fc2e4b --- /dev/null +++ b/core/game_menu/assets/page_3/button_2_texture.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bfy6ju4p5uu2t" +path="res://.godot/imported/button_2_texture.png-05acc1cdd8e1a7438677073a53d6fc60.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_3/button_2_texture.png" +dest_files=["res://.godot/imported/button_2_texture.png-05acc1cdd8e1a7438677073a53d6fc60.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/core/game_menu/assets/page_3/button_3_texture.png b/core/game_menu/assets/page_3/button_3_texture.png new file mode 100644 index 0000000..409f2cb Binary files /dev/null and b/core/game_menu/assets/page_3/button_3_texture.png differ diff --git a/core/game_menu/assets/page_3/button_3_texture.png.import b/core/game_menu/assets/page_3/button_3_texture.png.import new file mode 100644 index 0000000..ab864dc --- /dev/null +++ b/core/game_menu/assets/page_3/button_3_texture.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dxms3ts0qh2t5" +path="res://.godot/imported/button_3_texture.png-68d6211a327c46ea2d6803fe08d2ca24.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_3/button_3_texture.png" +dest_files=["res://.godot/imported/button_3_texture.png-68d6211a327c46ea2d6803fe08d2ca24.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/core/game_menu/assets/page_3/play_button_2.png b/core/game_menu/assets/page_3/play_button_2.png new file mode 100644 index 0000000..ee84421 Binary files /dev/null and b/core/game_menu/assets/page_3/play_button_2.png differ diff --git a/core/game_menu/assets/page_3/play_button_2.png.import b/core/game_menu/assets/page_3/play_button_2.png.import new file mode 100644 index 0000000..dc0014b --- /dev/null +++ b/core/game_menu/assets/page_3/play_button_2.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://kuqxyqwqdrq0" +path="res://.godot/imported/play_button_2.png-c01ddb1aeca349285eb93a0bb8d21b97.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_3/play_button_2.png" +dest_files=["res://.godot/imported/play_button_2.png-c01ddb1aeca349285eb93a0bb8d21b97.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/core/game_menu/assets/page_3/quit_button_2.png b/core/game_menu/assets/page_3/quit_button_2.png new file mode 100644 index 0000000..905bea8 Binary files /dev/null and b/core/game_menu/assets/page_3/quit_button_2.png differ diff --git a/core/game_menu/assets/page_3/quit_button_2.png.import b/core/game_menu/assets/page_3/quit_button_2.png.import new file mode 100644 index 0000000..2a9b168 --- /dev/null +++ b/core/game_menu/assets/page_3/quit_button_2.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://diqsj3x0ftdo" +path="res://.godot/imported/quit_button_2.png-a64c0ab5cbea6b10b86c94631528b175.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_3/quit_button_2.png" +dest_files=["res://.godot/imported/quit_button_2.png-a64c0ab5cbea6b10b86c94631528b175.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/core/game_menu/assets/page_3/settings_button_2.png b/core/game_menu/assets/page_3/settings_button_2.png new file mode 100644 index 0000000..3506776 Binary files /dev/null and b/core/game_menu/assets/page_3/settings_button_2.png differ diff --git a/core/game_menu/assets/page_3/settings_button_2.png.import b/core/game_menu/assets/page_3/settings_button_2.png.import new file mode 100644 index 0000000..eb6e34d --- /dev/null +++ b/core/game_menu/assets/page_3/settings_button_2.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c010wpjb66cmb" +path="res://.godot/imported/settings_button_2.png-5ff07ad2e8705a51cc1173bc788b44c9.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_3/settings_button_2.png" +dest_files=["res://.godot/imported/settings_button_2.png-5ff07ad2e8705a51cc1173bc788b44c9.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/core/game_menu/audio_option.tscn b/core/game_menu/audio_option.tscn index bb91638..bbf61c4 100644 --- a/core/game_menu/audio_option.tscn +++ b/core/game_menu/audio_option.tscn @@ -2,21 +2,23 @@ [ext_resource type="Script" uid="uid://bnh1y560h55vc" path="res://core/game_menu/audio_option.gd" id="1_orafl"] [ext_resource type="Texture2D" uid="uid://dirbxw8ii87nv" path="res://core/game_menu/assets/page_3/main_volume_button.png" id="2_vudub"] -[ext_resource type="Texture2D" uid="uid://s33pbfshxhb5" path="res://core/game_menu/assets/page_3/button_-1.png" id="3_vf41c"] -[ext_resource type="Texture2D" uid="uid://c6kgm3fq8521h" path="res://core/game_menu/assets/page_3/barretta.png" id="4_hduhm"] +[ext_resource type="Texture2D" uid="uid://dxms3ts0qh2t5" path="res://core/game_menu/assets/page_3/button_3_texture.png" id="3_f3y2u"] +[ext_resource type="Texture2D" uid="uid://bfy6ju4p5uu2t" path="res://core/game_menu/assets/page_3/button_2_texture.png" id="4_tj25j"] +[ext_resource type="Texture2D" uid="uid://od0hlvkpilqt" path="res://core/game_menu/assets/page_3/button_1_texture.png" id="5_4fmty"] +[ext_resource type="Texture2D" uid="uid://culspkef43qfd" path="res://core/game_menu/assets/page_3/barretta_regular.png" id="6_aax0b"] [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_f3y2u"] content_margin_left = 0.0 content_margin_right = 0.0 content_margin_bottom = 0.0 -texture = ExtResource("4_hduhm") +texture = ExtResource("6_aax0b") texture_margin_top = 23.0 [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_tj25j"] -texture = ExtResource("4_hduhm") +texture = ExtResource("6_aax0b") [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_4fmty"] -texture = ExtResource("4_hduhm") +texture = ExtResource("6_aax0b") [node name="AudioOption" type="VBoxContainer" unique_id=1509773712] custom_minimum_size = Vector2(280, 117) @@ -40,9 +42,9 @@ stretch_mode = 5 [node name="HSlider" type="HSlider" parent="." unique_id=1286896253] process_mode = 3 layout_mode = 2 -theme_override_icons/grabber = ExtResource("3_vf41c") -theme_override_icons/grabber_highlight = ExtResource("3_vf41c") -theme_override_icons/grabber_disabled = ExtResource("3_vf41c") +theme_override_icons/grabber = ExtResource("3_f3y2u") +theme_override_icons/grabber_highlight = ExtResource("4_tj25j") +theme_override_icons/grabber_disabled = ExtResource("5_4fmty") theme_override_styles/slider = SubResource("StyleBoxTexture_f3y2u") theme_override_styles/grabber_area = SubResource("StyleBoxTexture_tj25j") theme_override_styles/grabber_area_highlight = SubResource("StyleBoxTexture_4fmty") diff --git a/core/game_menu/page_2_left.tscn b/core/game_menu/page_2_left.tscn index 389033e..fd55535 100644 --- a/core/game_menu/page_2_left.tscn +++ b/core/game_menu/page_2_left.tscn @@ -33,7 +33,10 @@ flip_h = true layout_mode = 1 anchors_preset = 9 anchor_bottom = 1.0 -offset_right = 760.0 +offset_left = 2.0 +offset_top = 13.0 +offset_right = 762.0 +offset_bottom = 13.0 grow_vertical = 2 mouse_filter = 2 texture = ExtResource("3_sfb5f") diff --git a/core/game_menu/page_2_right.tscn b/core/game_menu/page_2_right.tscn index 7999b53..94fa6b0 100644 --- a/core/game_menu/page_2_right.tscn +++ b/core/game_menu/page_2_right.tscn @@ -4,6 +4,7 @@ [ext_resource type="Texture2D" uid="uid://xfl3ks4dbfaw" path="res://core/game_menu/assets/page_2/achievements_text.png" id="3_4uwhd"] [ext_resource type="Texture2D" uid="uid://drwe2xcnp8vs1" path="res://core/game_menu/assets/page_2/2_dx.png" id="3_msl27"] [ext_resource type="PackedScene" uid="uid://bvw086glfpcba" path="res://core/game_menu/collectible_gallery.tscn" id="5_w0bcg"] +[ext_resource type="Texture2D" uid="uid://nw420tkucw5p" path="res://core/game_menu/assets/page_2/pg_3_vertical_cs.png" id="7_71v1w"] [ext_resource type="Texture2D" uid="uid://bx6gsh5uchkge" path="res://core/game_menu/assets/lock.png" id="8_48jk0"] [ext_resource type="Texture2D" uid="uid://vg5y4qgc26ko" path="res://core/game_menu/assets/page_3/coming_soon_01.png" id="8_71v1w"] [ext_resource type="Texture2D" uid="uid://bmatlcouch6jm" path="res://core/game_menu/assets/page_3/coming_soon_02.png" id="9_g7kul"] @@ -56,7 +57,10 @@ anchors_preset = 11 anchor_left = 1.0 anchor_right = 1.0 anchor_bottom = 1.0 -offset_left = -760.0 +offset_left = -149.695 +offset_top = 22.855 +offset_right = 610.3054 +offset_bottom = 22.85498 grow_horizontal = 0 grow_vertical = 2 mouse_filter = 2 @@ -65,9 +69,9 @@ stretch_mode = 2 [node name="AchievementsText" type="TextureRect" parent="." unique_id=766898810] layout_mode = 0 -offset_left = 261.0 +offset_left = 184.0 offset_top = 34.5 -offset_right = 656.0 +offset_right = 579.0 offset_bottom = 105.5 mouse_filter = 2 texture = ExtResource("3_4uwhd") @@ -82,6 +86,7 @@ offset_right = 767.0 offset_bottom = 539.5 [node name="LockTexture" type="TextureRect" parent="." unique_id=535700029] +visible = false layout_mode = 0 offset_left = 342.0 offset_top = 153.5 @@ -92,12 +97,24 @@ texture = ExtResource("8_48jk0") expand_mode = 1 stretch_mode = 5 +[node name="LockTexture2" type="TextureRect" parent="." unique_id=997767159] +layout_mode = 0 +offset_left = 129.0 +offset_top = 122.0 +offset_right = 643.0 +offset_bottom = 482.7 +mouse_filter = 2 +texture = ExtResource("7_71v1w") +expand_mode = 1 +stretch_mode = 5 + [node name="TextureRect" type="TextureRect" parent="." unique_id=1942592146] layout_mode = 0 -offset_left = 596.0 -offset_top = 86.0 -offset_right = 743.0 -offset_bottom = 233.0 +offset_left = 387.99997 +offset_top = 224.00002 +offset_right = 708.0 +offset_bottom = 567.0 +rotation = -0.05235988 texture = SubResource("AnimatedTexture_0x02d") expand_mode = 1 stretch_mode = 5 diff --git a/core/game_menu/page_3_left.tscn b/core/game_menu/page_3_left.tscn index cd32841..947acfc 100644 --- a/core/game_menu/page_3_left.tscn +++ b/core/game_menu/page_3_left.tscn @@ -32,17 +32,21 @@ flip_h = true layout_mode = 1 anchors_preset = 9 anchor_bottom = 1.0 -offset_right = 760.0 +offset_left = 5.3050003 +offset_top = 78.795 +offset_right = 765.305 +offset_bottom = 78.79498 grow_vertical = 2 mouse_filter = 2 texture = ExtResource("3_jdqrf") stretch_mode = 2 [node name="SettingsMenu" parent="." unique_id=1402645746 instance=ExtResource("2_settings")] -layout_mode = 0 -anchors_preset = 0 -anchor_right = 0.0 -anchor_bottom = 0.0 +layout_mode = 1 +anchor_left = 0.034210525 +anchor_top = 0.034843206 +anchor_right = 0.034210525 +anchor_bottom = 0.034843206 offset_left = 68.0 offset_top = 24.5 offset_right = 692.0 diff --git a/core/game_menu/page_3_right.tscn b/core/game_menu/page_3_right.tscn index 877e496..6cfa156 100644 --- a/core/game_menu/page_3_right.tscn +++ b/core/game_menu/page_3_right.tscn @@ -36,7 +36,10 @@ anchors_preset = 11 anchor_left = 1.0 anchor_right = 1.0 anchor_bottom = 1.0 -offset_left = -760.0 +offset_left = -235.0 +offset_top = 398.0 +offset_right = 525.0 +offset_bottom = 398.0 grow_horizontal = 0 grow_vertical = 2 mouse_filter = 2 @@ -50,10 +53,10 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -181.5 -offset_top = -212.0 -offset_right = 248.5 -offset_bottom = 212.0 +offset_left = -193.5 +offset_top = -217.0 +offset_right = 236.5 +offset_bottom = 207.0 [node name="PlayButton" parent="OptionMenu/VBoxContainer" parent_id_path=PackedInt32Array(537721615, 508055524) index="0" unique_id=1990327704] visible = false diff --git a/core/main_menu/sign.gd b/core/main_menu/sign.gd index c7e7a56..9624856 100644 --- a/core/main_menu/sign.gd +++ b/core/main_menu/sign.gd @@ -12,10 +12,10 @@ func _ready() -> void: mat.transparency = BaseMaterial3D.TRANSPARENCY_ALPHA #fix color - sub_viewport.use_hdr_2d = false - mat.albedo_texture_force_srgb = true - mat.shading_mode = BaseMaterial3D.SHADING_MODE_UNSHADED - mat.albedo_color = Color(0.85, 0.85, 0.85, 1.0) + #sub_viewport.use_hdr_2d = false + #mat.albedo_texture_force_srgb = true + #mat.shading_mode = BaseMaterial3D.SHADING_MODE_UNSHADED + #mat.albedo_color = Color(0.85, 0.85, 0.85, 1.0) quad_cartello.material_override = mat diff --git a/core/main_scene_ui/audio_player.tscn b/core/main_scene_ui/audio_player.tscn index 3b7da0f..9d2a73f 100644 --- a/core/main_scene_ui/audio_player.tscn +++ b/core/main_scene_ui/audio_player.tscn @@ -1,9 +1,9 @@ [gd_scene format=3 uid="uid://dg4f3v0ukpmay"] [ext_resource type="Script" uid="uid://c4kekqicrv4m8" path="res://core/main_scene_ui/audio_player.gd" id="1_i2mrl"] -[ext_resource type="Theme" uid="uid://bg8megpn77mod" path="res://core/font/main_theme.tres" id="2_0koyu"] [ext_resource type="Texture2D" uid="uid://dlp62v48tori0" path="res://core/main_scene_ui/assets/audio_player_background.png" id="3_e87kc"] [ext_resource type="Texture2D" uid="uid://s8pp2i6bjkps" path="res://core/main_scene_ui/assets/audio_player_wheel.png" id="4_n5r1o"] +[ext_resource type="Theme" uid="uid://dib2yjsuiyhl" path="res://core/font/audio_player_theme.tres" id="5_e87kc"] [ext_resource type="Texture2D" uid="uid://bgrmy57xhg2gj" path="res://core/main_scene_ui/assets/audio_player_empty.png" id="10_xv7rp"] [node name="AudioPlayer" type="Control" unique_id=425192018] @@ -104,7 +104,7 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -theme = ExtResource("2_0koyu") +theme = ExtResource("5_e87kc") theme_override_font_sizes/font_size = 12 text = "Uknown Track" horizontal_alignment = 1 diff --git a/core/main_scene_ui/main_scene_ui.gd b/core/main_scene_ui/main_scene_ui.gd index 94a402c..98b647c 100644 --- a/core/main_scene_ui/main_scene_ui.gd +++ b/core/main_scene_ui/main_scene_ui.gd @@ -10,7 +10,7 @@ extends Control @onready var collectible_icon_button: Button = $%CollectibleIconButton @onready var weather_row: HBoxContainer = $%WeatherRow @onready var time_of_day_row: HBoxContainer = $%TimeOfDayRow -@onready var cameras_row: HBoxContainer = $%CamerasRow +#@onready var cameras_row: HBoxContainer = $%CamerasRow @onready var photo_mode_texture_panel: Panel = $%PhotoModeTexturePanel @onready var photo_mode_texture_mask: TextureRect = $%PhotoModeTextureMask @onready var photo_mode_black_screen: ColorRect = $%PhotoModeBlackScreen @@ -224,26 +224,34 @@ func _set_buttons_mouse_filter(ignore: bool) -> void: buttons.append_array(weather_row.options_icon_buttons) if time_of_day_row and "options_icon_buttons" in time_of_day_row: buttons.append_array(time_of_day_row.options_icon_buttons) - if cameras_row and "options_icon_buttons" in cameras_row: - buttons.append_array(cameras_row.options_icon_buttons) + #if cameras_row and "options_icon_buttons" in cameras_row: + #buttons.append_array(cameras_row.options_icon_buttons) for btn in buttons: if btn is Control: btn.mouse_filter = filter + if ignore: + if btn.tooltip_text != "": + btn.set_meta("old_tooltip", btn.tooltip_text) + btn.tooltip_text = "" + else: + if btn.has_meta("old_tooltip"): + btn.tooltip_text = btn.get_meta("old_tooltip") func hide_ui() -> void: _ui_hidden = true _set_buttons_mouse_filter(true) - var hud_elements = [hide_ui_button, weather_row, time_of_day_row, cameras_row, customize_train_button, collectible_icon_button, menu_icon_button, photo_icon_button, audio_player, choo_choo_button, time_label, dist_label] + var hud_elements = [hide_ui_button, weather_row, time_of_day_row, customize_train_button, collectible_icon_button, menu_icon_button, photo_icon_button, audio_player, choo_choo_button, time_label, dist_label] for element in hud_elements: element.visible = false element.visible = true TweenFX.fade_out(element, 0.25) func show_ui() -> void: + UIEvents.on_show_ui_requested.emit() _ui_hidden = false _set_buttons_mouse_filter(false) - var hud_elements = [hide_ui_button, weather_row, time_of_day_row, cameras_row, customize_train_button, collectible_icon_button, menu_icon_button, photo_icon_button, audio_player, choo_choo_button, time_label, dist_label, tooltips] + var hud_elements = [hide_ui_button, weather_row, time_of_day_row, customize_train_button, collectible_icon_button, menu_icon_button, photo_icon_button, audio_player, choo_choo_button, time_label, dist_label, tooltips] for element in hud_elements: element.show() TweenFX.fade_in(element, 0.25) diff --git a/core/main_scene_ui/main_scene_ui.tscn b/core/main_scene_ui/main_scene_ui.tscn index 28950f4..146cdaa 100644 --- a/core/main_scene_ui/main_scene_ui.tscn +++ b/core/main_scene_ui/main_scene_ui.tscn @@ -233,6 +233,7 @@ offset_bottom = 220.0 [node name="CamerasRow" parent="InfoLabels" unique_id=1233961141 instance=ExtResource("2_4cc8f")] unique_name_in_owner = true +visible = false layout_mode = 2 size_flags_vertical = 1 diff --git a/core/photo_mode/runtime/photo_mode_controller.gd b/core/photo_mode/runtime/photo_mode_controller.gd index 26bf399..69776a6 100644 --- a/core/photo_mode/runtime/photo_mode_controller.gd +++ b/core/photo_mode/runtime/photo_mode_controller.gd @@ -31,11 +31,15 @@ var initial_local_basis: Basis var is_making_photo = false var captured_image: Image +var _ui_is_visible = true + func _ready() -> void: GameState.on_enable_photo_mode_request.connect(enable_photo_mode) GameState.on_disable_photo_mode_request.connect(disable_photo_mode) GameState.on_photo_taken_making.connect(take_photo_async) GameState.on_photo_mode_black_screen_disappeared.connect(_on_photo_mode_black_screen_disappeared) + UIEvents.on_show_ui_requested.connect(update_ui_visibility.bind(true)) + UIEvents.on_hide_ui_requested.connect(update_ui_visibility.bind(false)) initial_local_pos = position initial_local_basis = basis @@ -131,6 +135,8 @@ func _input(event: InputEvent) -> void: if event.is_action_pressed("toggle_photo_mode"): if get_tree().paused: return + if !_ui_is_visible: + return if not is_active: GameState.on_enable_photo_mode_request.emit() else: @@ -192,3 +198,6 @@ func take_photo_async() -> void: func _on_photo_mode_black_screen_disappeared() -> void: is_making_photo = false + +func update_ui_visibility(ui_is_visible) -> void: + _ui_is_visible = ui_is_visible diff --git a/core/ui_events.gd b/core/ui_events.gd index 11be5cc..773d9cb 100644 --- a/core/ui_events.gd +++ b/core/ui_events.gd @@ -52,6 +52,8 @@ signal toot_toot(update_stats: bool) @warning_ignore("unused_signal") signal resume_game_requested @warning_ignore("unused_signal") +signal on_show_ui_requested +@warning_ignore("unused_signal") signal on_hide_ui_requested @warning_ignore("unused_signal") signal change_camera_request(camera_index: int) diff --git a/tgcc/main menu/main_menu_test.tscn b/tgcc/main menu/main_menu_test.tscn index 67cbd37..d6b861b 100644 --- a/tgcc/main menu/main_menu_test.tscn +++ b/tgcc/main menu/main_menu_test.tscn @@ -105,6 +105,9 @@ [ext_resource type="Shader" uid="uid://bhqtjjs3emv7f" path="res://tgcc/main menu/godraysmenu.gdshader" id="103_g1vc5"] [ext_resource type="PackedScene" uid="uid://cp2vmysawnuql" path="res://tgcc/chunk/prop/sign/scene/signMenu.tscn" id="103_mrhmq"] [ext_resource type="Material" uid="uid://dljvvppsdbjd1" path="res://tgcc/chunk/material/glowplane.tres" id="104_mrhmq"] +[ext_resource type="Texture2D" uid="uid://kuqxyqwqdrq0" path="res://core/game_menu/assets/page_3/play_button_2.png" id="106_5hxod"] +[ext_resource type="Texture2D" uid="uid://c010wpjb66cmb" path="res://core/game_menu/assets/page_3/settings_button_2.png" id="107_cg70g"] +[ext_resource type="Texture2D" uid="uid://diqsj3x0ftdo" path="res://core/game_menu/assets/page_3/quit_button_2.png" id="108_0hcuf"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_00nq7"] render_priority = 0 @@ -375,14 +378,14 @@ transform = Transform3D(-0.09359112, 0, 0.9713834, 0, 0.56225973, 0, -0.38276488 [node name="Fuji4" parent="." unique_id=930179001 instance=ExtResource("99_61psf")] transform = Transform3D(-0.09359112, 0, 0.9713834, 0, 0.56225973, 0, -0.38276488, 0, -0.23751618, 239.46135, 1.7057877, 224.6928) -[node name="Landscape" parent="Fuji4" index="0" unique_id=244602034] +[node name="Landscape" parent="Fuji4" index="0" unique_id=1897614485] transform = Transform3D(28.638817, 1.7053026e-13, -7.6293945e-06, 0, 13.6219845, 2.1621709e-06, 0, -1.0284306e-06, 28.638834, -10.786804, 5.0069, 17.382736) surface_material_override/0 = SubResource("ShaderMaterial_g1vc5") [node name="Fuji5" parent="." unique_id=1070037082 instance=ExtResource("99_61psf")] transform = Transform3D(0.0935979, 0, 0.9713791, 0, 0.56225973, 0, -0.38276324, 0, 0.23753339, -275.95566, -3.4616928, 232.02234) -[node name="Landscape" parent="Fuji5" index="0" unique_id=244602034] +[node name="Landscape" parent="Fuji5" index="0" unique_id=1897614485] transform = Transform3D(28.638819, 1.7053026e-13, -7.6293945e-06, 0, 13.6219845, 2.1621709e-06, 0, -1.0284306e-06, 28.638836, -10.786743, 6.703195, 17.382767) surface_material_override/0 = SubResource("ShaderMaterial_g1vc5") @@ -392,7 +395,7 @@ transform = Transform3D(-4.88843, -0.020050459, 0.86837775, -0.010355438, 4.9646 [node name="Fuji6" parent="." unique_id=150126281 instance=ExtResource("100_0aqpp")] transform = Transform3D(-5.287449, -0.020231497, 0.22351237, -0.011200703, 5.009496, 0.014500697, -0.9394429, 0.05414178, -1.2581636, 32.446022, 15.848213, 525.54346) -[node name="Mt Fuji_simplified_3d_mesh" parent="Fuji6" index="0" unique_id=1389340781] +[node name="Mt Fuji_simplified_3d_mesh" parent="Fuji6" index="0" unique_id=206531083] transform = Transform3D(0.5151193, -0.011206273, -0.07264297, 0.077138014, 0.07483422, 0.48510167, 3.5762787e-07, -0.4938935, 0.07515043, 6.299696, 12.244916, 3.004303) surface_material_override/0 = SubResource("ShaderMaterial_vvb5q") @@ -495,12 +498,21 @@ offset_top = 6.0 offset_bottom = -6.0 theme_override_constants/separation = 64 +[node name="PlayButton" parent="MainMenuUI/SubViewport/OptionMenu/VBoxContainer" index="0" unique_id=1990327704] +image = ExtResource("106_5hxod") + [node name="ResumeButton" parent="MainMenuUI/SubViewport/OptionMenu/VBoxContainer" index="1" unique_id=635721927] visible = false +[node name="SettingsButton" parent="MainMenuUI/SubViewport/OptionMenu/VBoxContainer" index="2" unique_id=1931222561] +image = ExtResource("107_cg70g") + [node name="SaveButton" parent="MainMenuUI/SubViewport/OptionMenu/VBoxContainer" index="3" unique_id=1161034414] visible = false +[node name="QuitButton" parent="MainMenuUI/SubViewport/OptionMenu/VBoxContainer" index="4" unique_id=1804807896] +image = ExtResource("108_0hcuf") + [connection signal="input_event" from="Sign/QuadSign/Area3D" to="Sign" method="_on_area_3d_input_event"] [editable path="Fuji4"]