3 Commits

Author SHA1 Message Date
2358dc8b53 add prewarm chunk generation 2026-07-08 11:22:21 +02:00
185b1b4744 add distance_menu_world and fix rail generation 2026-07-08 10:59:00 +02:00
e86da0c2bc update snow management 2026-07-08 10:14:29 +02:00
53 changed files with 374 additions and 762 deletions

View File

@@ -212,6 +212,17 @@ func _physics_process(_delta: float) -> void:
last_pos_train = current_pos
_refresh_world(current_pos)
func generate_initial_world_now() -> void:
if rail_path == null or rail_path.train_instance == null:
return
var train_pos = rail_path.train_instance.global_position
var current_pos = Vector2i(roundi(train_pos.x / chunk_size), roundi(train_pos.z / chunk_size))
last_pos_train = current_pos
_rebuild_generation_queue(current_pos)
_drain_generation_queue_now()
_drain_wire_queue_now()
func collect_all_chunkinfo(root: Node, list: Array[Node]) -> void:
if root == null: return
@@ -535,6 +546,20 @@ func _drain_generation_queue() -> void:
pending_generation_cells.clear()
pending_generation_cursor = 0
func _drain_generation_queue_now() -> void:
while pending_generation_cursor < pending_generation_cells.size():
var grid_pos: Vector2i = pending_generation_cells[pending_generation_cursor]
pending_generation_cursor += 1
if board.has(grid_pos):
continue
var is_obstacle = _register_cell_with_ray(grid_pos)
if not is_obstacle:
_add_compatible_biome(grid_pos)
pending_generation_cells.clear()
pending_generation_cursor = 0
func _drain_cleanup_queue() -> void:
var processed: int = 0
var start_usec: int = Time.get_ticks_usec()
@@ -595,6 +620,22 @@ func _drain_wire_queue() -> void:
pending_wire_cells.clear()
pending_wire_cursor = 0
func _drain_wire_queue_now() -> void:
while pending_wire_cursor < pending_wire_cells.size():
var grid_pos: Vector2i = pending_wire_cells[pending_wire_cursor]
pending_wire_cursor += 1
pending_wire_lookup.erase(grid_pos)
if not board.has(grid_pos):
continue
if not board[grid_pos].get("have_lamppost", false):
continue
_connect_lamppost_wires(grid_pos)
pending_wire_cells.clear()
pending_wire_cursor = 0
func _generate_pieces_around_train(center: Vector2i) -> void:
for x in range(-eye_line, eye_line + 1):
for z in range(-eye_line, eye_line + 1):

View File

@@ -50,10 +50,14 @@ enum TrainFacingDirection { KEEP_PATH_DIRECTION, LOCOMOTIVE_LEFT, LOCOMOTIVE_RIG
@export_enum("keep_path_direction", "locomotive_left", "locomotive_right") var train_facing_direction: int = TrainFacingDirection.KEEP_PATH_DIRECTION
@export_group("Rails Bulding")
##if true builds visible rail pieces along the Path3D
@export var build_track_visuals: bool = true
##distance between sleepers of the rails
@export var sleepers_distance: float = 1.0
##nodel for the sleeper of the rail
@export var sleepers_model: PackedScene
##if true add procedural rail bars even when sleepers_model is assigned
@export var add_procedural_rails_to_sleepers_model: bool = false
@export_group("Manual Controls")
##max speed
@@ -115,6 +119,7 @@ func _ready() -> void:
_initial_is_inmotion = is_inmotion
if curve != null and curve.get_baked_length() > 0:
if build_track_visuals:
build_rails()
build_train()
_plan_stops()
@@ -258,6 +263,7 @@ func build_rails() -> void:
var total_length = curve.get_baked_length()
var piece_number = int(total_length / sleepers_distance)
var should_add_procedural_rails: bool = sleepers_model == null or add_procedural_rails_to_sleepers_model
for i in range(piece_number):
var distance = i * sleepers_distance
@@ -289,6 +295,7 @@ func build_rails() -> void:
sleeper.material_override = mat_wood
rail_piece.add_child(sleeper)
if should_add_procedural_rails:
var rail_sx = MeshInstance3D.new()
rail_sx.mesh = mesh_rail
rail_sx.material_override = mat_iron

View File

@@ -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])

View File

@@ -4,6 +4,15 @@ extends Node3D
const NOISE_TEXTURE: Texture2D = preload("res://core/daynight/noise.tres")
const WEATHER_SHADER: Material = preload("res://core/daynight/weather_overlay.tres")
const DYNAMIC_ENVIRONMENT_UPDATES_PER_FRAME: int = 32 #how many update of the environment (apply materials) will be done per frame
const FORCE_WEATHER_MATERIAL_PATH_PARTS: PackedStringArray = [
"/chunk/material/field.tres",
"/chunk/material/grassflat_chunk.tres",
"/chunk/material/path_chunk.tres",
"/chunk/material/railway_chunk.tres",
"/chunk/material/terrain.tres",
"/chunk/prop/house/house.tres",
"/chunk/prop/house/house_emissiv.tres",
]
@export var environment_config: EnvironmentConfig
@@ -157,9 +166,17 @@ func _restore_keyboard_action_events() -> void:
_blocked_keyboard_events_by_action.clear()
func _on_tree_node_added(node: Node) -> void:
if node.is_in_group("wind_node") or node.is_in_group("weather_node") or node.is_in_group("weather_vegetables_node"):
if _should_queue_dynamic_environment_node(node):
_queue_dynamic_environment_node(node)
func _should_queue_dynamic_environment_node(node: Node) -> bool:
if node.is_in_group("wind_node"):
return true
if node.is_in_group("weather_vegetables_node"):
return true
return node is Node3D
func _queue_dynamic_environment_node(node: Node) -> void:
if not is_instance_valid(node):
return
@@ -205,7 +222,7 @@ func _apply_dynamic_environment_materials(node: Node) -> void:
if node.is_in_group("wind_node"):
_apply_wind_noise_to_node(node, NOISE_TEXTURE)
if node.is_in_group("weather_node") or node.is_in_group("weather_vegetables_node"):
if node is Node3D:
_apply_weather_overlay_to_node(node, _get_weather_overlay_material(node))
if _should_ignore_weather_overlay(node):
@@ -231,11 +248,9 @@ func _apply_wind_noise_to_node(node: Node, noise_tex: Texture2D) -> void:
_apply_wind_noise_to_node(child, noise_tex)
func ApplyWeatherShaderToMaterials():
for node in get_tree().get_nodes_in_group("weather_node"):
_apply_weather_overlay_to_node(node, _get_weather_overlay_material(node))
for node in get_tree().get_nodes_in_group("weather_vegetables_node"):
_apply_weather_overlay_to_node(node, _get_weather_overlay_material(node))
var current_scene := get_tree().current_scene
if current_scene != null:
_apply_weather_overlay_to_node(current_scene, _get_weather_overlay_material(current_scene))
func _get_weather_overlay_material(node: Node) -> Material:
if not node.is_in_group("weather_overlay_no_noise"):
@@ -255,13 +270,21 @@ func _apply_weather_overlay_to_node(node: Node, material: Material) -> void:
return
if node is GeometryInstance3D:
if _should_clear_weather_overlay(node) or _geometry_uses_alpha_texture(node):
if _geometry_should_never_receive_weather_overlay(node):
node.material_overlay = null
elif _should_clear_weather_overlay(node) and not _geometry_forces_weather_overlay(node):
node.material_overlay = null
elif _geometry_uses_alpha_texture(node) or _geometry_should_skip_weather_overlay(node):
node.material_overlay = null
else:
node.material_overlay = material
var child_material := _get_weather_overlay_material(node)
if child_material == WEATHER_SHADER and material == weather_shader_no_noise:
child_material = material
for child in node.get_children():
_apply_weather_overlay_to_node(child, material)
_apply_weather_overlay_to_node(child, child_material)
func _clear_weather_overlay_from_node(node: Node) -> void:
if node is GeometryInstance3D:
@@ -289,11 +312,99 @@ func _geometry_uses_alpha_texture(node: GeometryInstance3D) -> bool:
return false
func _geometry_should_never_receive_weather_overlay(node: GeometryInstance3D) -> bool:
if node is GPUParticles3D:
return true
var node_name := String(node.name).to_lower()
return node_name.contains("cloud") or node_name.contains("fog") or node_name.contains("godray")
func _geometry_should_skip_weather_overlay(node: GeometryInstance3D) -> bool:
if _geometry_forces_weather_overlay(node):
return false
if _node_name_indicates_water(node):
return true
var has_material: bool = false
var all_materials_ignored: bool = true
var material_override := node.material_override
if material_override != null:
has_material = true
all_materials_ignored = all_materials_ignored and _material_ignores_weather_overlay(material_override)
if node is MeshInstance3D:
for surface_index in node.get_surface_override_material_count():
var surface_material: Material = node.get_surface_override_material(surface_index)
if surface_material == null:
continue
has_material = true
all_materials_ignored = all_materials_ignored and _material_ignores_weather_overlay(surface_material)
if node.mesh:
for surface_index in node.mesh.get_surface_count():
var mesh_material: Material = node.mesh.surface_get_material(surface_index)
if mesh_material == null:
continue
has_material = true
all_materials_ignored = all_materials_ignored and _material_ignores_weather_overlay(mesh_material)
return has_material and all_materials_ignored
func _geometry_forces_weather_overlay(node: GeometryInstance3D) -> bool:
if _material_forces_weather_overlay(node.material_override):
return true
if node is MeshInstance3D:
for surface_index in node.get_surface_override_material_count():
if _material_forces_weather_overlay(node.get_surface_override_material(surface_index)):
return true
if node.mesh:
for surface_index in node.mesh.get_surface_count():
if _material_forces_weather_overlay(node.mesh.surface_get_material(surface_index)):
return true
return false
func _material_forces_weather_overlay(material: Material) -> bool:
if material == null:
return false
var resource_path := material.resource_path.to_lower()
for path_part in FORCE_WEATHER_MATERIAL_PATH_PARTS:
if resource_path.contains(path_part):
return true
return false
func _node_name_indicates_water(node: Node) -> bool:
var node_name := String(node.name).to_lower()
return node_name.begins_with("water") or node_name.contains("/water")
func _material_ignores_weather_overlay(material: Material) -> bool:
if material == null:
return false
var resource_path := material.resource_path.to_lower()
if resource_path.contains("/water") or resource_path.contains("water_"):
return true
if resource_path.contains("/cloud/") or resource_path.contains("cloud"):
return true
var base_material := material as BaseMaterial3D
if base_material != null:
return base_material.transparency != BaseMaterial3D.TRANSPARENCY_DISABLED or base_material.albedo_color.a < 0.99
return false
func _shader_material_uses_alpha_texture(material: ShaderMaterial) -> bool:
if material == null or material.shader == null:
return false
return material.shader.code.find("alpha_texture") != -1
var shader_code := material.shader.code
return shader_code.find("alpha_texture") != -1 or shader_code.find("ALPHA") != -1 or shader_code.find("opacity") != -1
func _should_ignore_weather_overlay(node: Node) -> bool:
return node.is_in_group("weather_overlay_ignore")
@@ -316,19 +427,8 @@ func select_day_time(normalized_time: float) -> void:
#24:00 1.0000 3.0
if normalized_time < environment_config.sunrise:
#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
#Sunrise: night → morning
day_time = 3.0 + (normalized_time / environment_config.sunrise) * 1.0 # 3.0 → 4.0
elif normalized_time < environment_config.day:
#Morning: morning → afternoon
var t: float = (normalized_time - environment_config.sunrise) / (environment_config.day - environment_config.sunrise)
@@ -353,17 +453,10 @@ func _update_clouds_lighting(normalized_time: float) -> void:
return
if normalized_time < environment_config.sunrise:
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)

View File

@@ -13,8 +13,9 @@ global uniform float global_snow_melt_speed = 0.1;
global uniform float global_snow_amount = 0.0;
global uniform vec4 global_snow_color;
global uniform float global_rain_intensity;
const float LEAVES_FULL_SNOW_START = 0.58;
const float LEAVES_FULL_SNOW_END = 0.86;
const float LEAVES_FULL_SNOW_START = 0.96;
const float LEAVES_FULL_SNOW_END = 1.0;
const float LEAVES_TOP_SNOW_COVERAGE = 0.75;
uniform sampler2D wind_noise : filter_linear_mipmap;
uniform bool billboard_enabled = true;
@@ -110,7 +111,7 @@ void fragment() {
float snow_amount = pow(get_snow_progress(), 0.55);
float top_mask = 1.0 - shifted_uv.y;
float snow_mask = smoothstep(1.0 - snow_amount * 1.35, 1.08 - snow_amount * 1.35, top_mask) * snow_visibility;
float snow_mask = smoothstep(1.0 - snow_amount * LEAVES_TOP_SNOW_COVERAGE, 1.08 - snow_amount * LEAVES_TOP_SNOW_COVERAGE, top_mask) * snow_visibility;
snow_mask *= step(0.01, snow_amount);
float full_snow_mask = smoothstep(LEAVES_FULL_SNOW_START, LEAVES_FULL_SNOW_END, snow_amount) * clamp(snow_visibility, 0.0, 1.0);
float final_snow_mask = max(snow_mask, full_snow_mask);

View File

@@ -17,8 +17,8 @@ global uniform float global_snow_cap_flatness_end = 0.96;
global uniform float global_snow_cap_noise_scale = 0.22;
global uniform float global_snow_cap_noise_strength = 0.18;
const float SNOW_VISUAL_RESPONSE = 0.55;
const float FULL_SNOW_VISUAL_START = 0.82;
const float FULL_SNOW_VISUAL_END = 0.98;
const float FULL_SNOW_VISUAL_START = 0.58;
const float FULL_SNOW_VISUAL_END = 0.86;
uniform bool snow_noise_enabled = true;
uniform float snow_noise_scale : hint_range(0.01, 1.0) = 0.15;
uniform float snow_edge_softness : hint_range(0.01, 0.5) = 0.2;
@@ -154,7 +154,7 @@ void fragment() {
float flat_accumulation = smoothstep(0.0, 0.35, v_snow_cap_mask) * snow_accumulation;
float snow_noise_mask = get_snow_noise_mask(world_pos, snow_progress);
float snow_variation = mix(0.75, 1.15, noise_val);
float snow_coverage = clamp(mix(snow_progress * 0.35, snow_progress * snow_variation, snow_noise_mask) + flat_accumulation * 0.15, 0.0, 1.0);
float snow_coverage = clamp(mix(snow_progress * 0.55, snow_progress * snow_variation, snow_noise_mask) + flat_accumulation * 0.2, 0.0, 1.0);
float snow_factor = max(snow_edge * snow_coverage, flat_accumulation);
float snow_opacity = clamp(snow_factor, 0.0, 1.0);
snow_opacity = max(snow_opacity, flat_accumulation * mix(0.45, 0.9, snow_noise_mask));

Binary file not shown.

View File

@@ -1,36 +0,0 @@
[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={}

View File

@@ -1,6 +0,0 @@
[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")

Binary file not shown.

Before

Width:  |  Height:  |  Size: 208 KiB

View File

@@ -1,40 +0,0 @@
[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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 195 KiB

View File

@@ -1,40 +0,0 @@
[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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 309 KiB

View File

@@ -1,40 +0,0 @@
[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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 343 KiB

View File

@@ -1,40 +0,0 @@
[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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.4 KiB

View File

@@ -1,40 +0,0 @@
[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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

View File

@@ -1,40 +0,0 @@
[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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

View File

@@ -1,40 +0,0 @@
[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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.9 KiB

View File

@@ -1,40 +0,0 @@
[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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 76 KiB

View File

@@ -1,40 +0,0 @@
[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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 75 KiB

View File

@@ -1,40 +0,0 @@
[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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 162 KiB

View File

@@ -1,40 +0,0 @@
[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

View File

@@ -2,23 +2,21 @@
[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://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"]
[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"]
[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_f3y2u"]
content_margin_left = 0.0
content_margin_right = 0.0
content_margin_bottom = 0.0
texture = ExtResource("6_aax0b")
texture = ExtResource("4_hduhm")
texture_margin_top = 23.0
[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_tj25j"]
texture = ExtResource("6_aax0b")
texture = ExtResource("4_hduhm")
[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_4fmty"]
texture = ExtResource("6_aax0b")
texture = ExtResource("4_hduhm")
[node name="AudioOption" type="VBoxContainer" unique_id=1509773712]
custom_minimum_size = Vector2(280, 117)
@@ -42,9 +40,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_f3y2u")
theme_override_icons/grabber_highlight = ExtResource("4_tj25j")
theme_override_icons/grabber_disabled = ExtResource("5_4fmty")
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_styles/slider = SubResource("StyleBoxTexture_f3y2u")
theme_override_styles/grabber_area = SubResource("StyleBoxTexture_tj25j")
theme_override_styles/grabber_area_highlight = SubResource("StyleBoxTexture_4fmty")

View File

@@ -16,32 +16,11 @@ func _ready():
$%TextureRect.show()
else:
$%TextureRect.hide()
TweenFX.breathe(self, 1)
func _on_pressed() -> void:
if locked:
return
TweenFX.stop_all(self)
scale = Vector2.ONE
rotation = 0.0
modulate.a = 1.0
TweenFX.press_rotate(self)
func _on_mouse_entered() -> void:
if locked:
return
TweenFX.stop_all(self)
scale = Vector2.ONE
rotation = 0.0
modulate.a = 1.0
TweenFX.breathe(self, 1)
func _on_mouse_exited() -> void:
if locked:
return
TweenFX.stop_all(self)
scale = Vector2.ONE
rotation = 0.0
modulate.a = 1.0

View File

@@ -80,6 +80,4 @@ mouse_filter = 2
texture = ExtResource("3_jqji0")
expand_mode = 1
[connection signal="mouse_entered" from="." to="." method="_on_mouse_entered"]
[connection signal="mouse_exited" from="." to="." method="_on_mouse_exited"]
[connection signal="pressed" from="." to="." method="_on_pressed"]

View File

@@ -6,28 +6,19 @@ func _ready() -> void:
GameState.on_game_resumed.connect(_on_game_resumed)
func show_page() -> void:
var tweens: Array[ContainerTween] = []
for child in find_children("*", "", true, false):
if child is ContainerTween:
tweens.append(child)
var tweens = find_children("*", "ContainerTween", true, false)
for tween in tweens:
tween.start_tween()
show()
func hide_page() -> void:
var tweens: Array[ContainerTween] = []
for child in find_children("*", "", true, false):
if child is ContainerTween:
tweens.append(child)
var tweens = find_children("*", "ContainerTween", true, false)
for tween in tweens:
tween.stop_tween()
hide()
func _on_game_resumed() -> void:
var tweens: Array[ContainerTween] = []
for child in find_children("*", "", true, false):
if child is ContainerTween:
tweens.append(child)
var tweens = find_children("*", "ContainerTween", true, false)
for tween in tweens:
tween.stop_tween()

View File

@@ -33,10 +33,7 @@ flip_h = true
layout_mode = 1
anchors_preset = 9
anchor_bottom = 1.0
offset_left = 2.0
offset_top = 13.0
offset_right = 762.0
offset_bottom = 13.0
offset_right = 760.0
grow_vertical = 2
mouse_filter = 2
texture = ExtResource("3_sfb5f")

View File

@@ -1,13 +0,0 @@
extends "res://core/game_menu/page_interactive.gd"
@onready var coming_soon_texture = $%ComingSoonTexture
func on_page_opened() -> void:
var anim = coming_soon_texture.texture
anim.current_frame = 0
anim.pause = false
func on_page_closed() -> void:
var anim = coming_soon_texture.texture as AnimatedTexture
anim.pause = true
anim.current_frame = 0

View File

@@ -1 +0,0 @@
uid://pkvsjrnsteuk

View File

@@ -1,10 +1,9 @@
[gd_scene format=3 uid="uid://clno1ahv2byng"]
[ext_resource type="Script" uid="uid://pkvsjrnsteuk" path="res://core/game_menu/page_2_right.gd" id="1_71v1w"]
[ext_resource type="Script" uid="uid://0yyr318wl7co" path="res://core/game_menu/page_interactive.gd" id="1_script"]
[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"]
@@ -15,7 +14,6 @@
[sub_resource type="AnimatedTexture" id="AnimatedTexture_0x02d"]
frames = 5
one_shot = true
frame_0/texture = ExtResource("8_71v1w")
frame_0/duration = 0.15
frame_1/texture = ExtResource("9_g7kul")
@@ -37,7 +35,7 @@ offset_bottom = -506.0
grow_horizontal = 2
grow_vertical = 2
mouse_filter = 2
script = ExtResource("1_71v1w")
script = ExtResource("1_script")
[node name="PageBackground" type="TextureRect" parent="." unique_id=1387851649]
layout_mode = 1
@@ -58,10 +56,7 @@ anchors_preset = 11
anchor_left = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
offset_left = -149.695
offset_top = 22.855
offset_right = 610.3054
offset_bottom = 22.85498
offset_left = -760.0
grow_horizontal = 0
grow_vertical = 2
mouse_filter = 2
@@ -70,9 +65,9 @@ stretch_mode = 2
[node name="AchievementsText" type="TextureRect" parent="." unique_id=766898810]
layout_mode = 0
offset_left = 184.0
offset_left = 261.0
offset_top = 34.5
offset_right = 579.0
offset_right = 656.0
offset_bottom = 105.5
mouse_filter = 2
texture = ExtResource("3_4uwhd")
@@ -87,7 +82,6 @@ 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
@@ -98,25 +92,12 @@ texture = ExtResource("8_48jk0")
expand_mode = 1
stretch_mode = 5
[node name="LockTexture2" type="TextureRect" parent="." unique_id=997767159]
[node name="TextureRect" type="TextureRect" parent="." unique_id=1942592146]
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="ComingSoonTexture" type="TextureRect" parent="." unique_id=1942592146]
unique_name_in_owner = true
layout_mode = 0
offset_left = 387.99997
offset_top = 224.00002
offset_right = 708.0
offset_bottom = 567.0
rotation = -0.05235988
offset_left = 596.0
offset_top = 86.0
offset_right = 743.0
offset_bottom = 233.0
texture = SubResource("AnimatedTexture_0x02d")
expand_mode = 1
stretch_mode = 5

View File

@@ -32,21 +32,17 @@ flip_h = true
layout_mode = 1
anchors_preset = 9
anchor_bottom = 1.0
offset_left = 5.3050003
offset_top = 78.795
offset_right = 765.305
offset_bottom = 78.79498
offset_right = 760.0
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 = 1
anchor_left = 0.034210525
anchor_top = 0.034843206
anchor_right = 0.034210525
anchor_bottom = 0.034843206
layout_mode = 0
anchors_preset = 0
anchor_right = 0.0
anchor_bottom = 0.0
offset_left = 68.0
offset_top = 24.5
offset_right = 692.0

View File

@@ -36,10 +36,7 @@ anchors_preset = 11
anchor_left = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
offset_left = -235.0
offset_top = 398.0
offset_right = 525.0
offset_bottom = 398.0
offset_left = -760.0
grow_horizontal = 0
grow_vertical = 2
mouse_filter = 2
@@ -53,10 +50,10 @@ anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -193.5
offset_top = -217.0
offset_right = 236.5
offset_bottom = 207.0
offset_left = -181.5
offset_top = -212.0
offset_right = 248.5
offset_bottom = 212.0
[node name="PlayButton" parent="OptionMenu/VBoxContainer" parent_id_path=PackedInt32Array(537721615, 508055524) index="0" unique_id=1990327704]
visible = false

View File

@@ -6,23 +6,9 @@ func _ready() -> void:
manage_pageflip.connect(_on_manage_pageflip)
func _on_manage_pageflip(give_control: bool) -> void:
var tweens: Array[ContainerTween] = []
for child in find_children("*", "", true, false):
if child is ContainerTween:
tweens.append(child)
var tweens = find_children("*", "ContainerTween", true, false)
for tween in tweens:
if give_control:
tween.stop_tween()
else:
tween.start_tween()
if give_control:
on_page_closed()
else:
on_page_opened()
func on_page_opened() -> void:
pass
func on_page_closed() -> void:
pass
tween.stop_tween()

View File

@@ -158,8 +158,4 @@ color = Color(0.9098039, 0.6, 0.5529412, 1)
[node name="ContainerTween" parent="." unique_id=160227524 node_paths=PackedStringArray("targets") instance=ExtResource("10_i2rs1")]
unique_name_in_owner = true
targets = [NodePath("../TextureRect/MarginContainer/HBoxContainer/ColorPicker1"), NodePath("../TextureRect/MarginContainer/HBoxContainer/ColorPicker2"), NodePath("../TextureRect/MarginContainer/HBoxContainer/ColorPicker3"), NodePath("../TextureRect/MarginContainer/HBoxContainer/ColorPicker4"), NodePath("../TextureRect/MarginContainer/HBoxContainer/ColorPicker5"), NodePath("../TextureRect/MarginContainer/HBoxContainer/ColorPicker6")]
[node name="ContainerTween2" parent="." unique_id=97219846 node_paths=PackedStringArray("targets") instance=ExtResource("10_i2rs1")]
unique_name_in_owner = true
targets = [NodePath("../TextureRect2/MarginContainer/HBoxContainer2/ColorPicker7"), NodePath("../TextureRect2/MarginContainer/HBoxContainer2/ColorPicker8"), NodePath("../TextureRect2/MarginContainer/HBoxContainer2/ColorPicker9"), NodePath("../TextureRect2/MarginContainer/HBoxContainer2/ColorPicker10"), NodePath("../TextureRect2/MarginContainer/HBoxContainer2/ColorPicker11"), NodePath("../TextureRect2/MarginContainer/HBoxContainer2/ColorPicker12")]
targets = [null, NodePath("../TextureRect/MarginContainer/HBoxContainer/ColorPicker1"), NodePath("../TextureRect/MarginContainer/HBoxContainer/ColorPicker2"), NodePath("../TextureRect/MarginContainer/HBoxContainer/ColorPicker3"), NodePath("../TextureRect/MarginContainer/HBoxContainer/ColorPicker4"), NodePath("../TextureRect/MarginContainer/HBoxContainer/ColorPicker5"), NodePath("../TextureRect/MarginContainer/HBoxContainer/ColorPicker6"), null]

View File

@@ -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

View File

@@ -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("5_e87kc")
theme = ExtResource("2_0koyu")
theme_override_font_sizes/font_size = 12
text = "Uknown Track"
horizontal_alignment = 1

View File

@@ -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
@@ -28,10 +28,8 @@ var _ui_hidden = false
var _photo_mode_mat_tween: Tween
var _photo_mode_alpha_tween: Tween
var _photo_mode_fold_tween: Tween
var _game_menu_base_scale: Vector2
func _ready() -> void:
_game_menu_base_scale = game_menu.scale
set_process_input(false)
GameState.on_enable_photo_mode_request.connect(_on_enable_photo_mode)
GameState.on_disable_photo_mode_request.connect(_on_disable_photo_mode)
@@ -88,34 +86,13 @@ func _on_photo_icon_button_pressed() -> void:
GameState.on_enable_photo_mode_request.emit()
func _open_game_menu_on_page(tab_index: int) -> void:
if TweenFX.is_playing(game_menu, TweenFX.Animations.FOLD_IN) or TweenFX.is_playing(game_menu, TweenFX.Animations.FOLD_OUT):
return
GameState.pause_game()
game_menu.on_tab_pressed(tab_index, true)
game_menu_panel.show()
game_menu.scale = _game_menu_base_scale
game_menu.scale = Vector2(1, 1)
TweenFX.fold_in(game_menu)
var book = BookAPI.get_current_book()
if is_instance_valid(book):
for slot in [book.get("_slot_1"), book.get("_slot_2")]:
if slot != null and slot.get_child_count() > 0:
var node = slot.get_child(-1)
if node.has_method("_on_manage_pageflip"):
node._on_manage_pageflip(false)
func _on_resume_button_pressed() -> void:
if TweenFX.is_playing(game_menu, TweenFX.Animations.FOLD_IN) or TweenFX.is_playing(game_menu, TweenFX.Animations.FOLD_OUT):
return
var book = BookAPI.get_current_book()
if is_instance_valid(book):
for slot in [book.get("_slot_1"), book.get("_slot_2")]:
if slot != null and slot.get_child_count() > 0:
var node = slot.get_child(-1)
if node.has_method("_on_manage_pageflip"):
node._on_manage_pageflip(true)
var tween = TweenFX.fold_out(game_menu)
await tween.finished
game_menu_panel.hide()
@@ -247,34 +224,26 @@ 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, 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, cameras_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, 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, cameras_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)

File diff suppressed because one or more lines are too long

View File

@@ -31,15 +31,11 @@ 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
@@ -135,8 +131,6 @@ 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:
@@ -198,6 +192,3 @@ 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

View File

@@ -52,8 +52,6 @@ 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)

View File

@@ -0,0 +1,84 @@
[gd_scene format=3 uid="uid://c7shevn0javuv"]
[ext_resource type="Material" uid="uid://blqelpjvdv23j" path="res://tgcc/chunk/material/grassflat_chunk.tres" id="1_grass"]
[ext_resource type="Material" uid="uid://c2x7xxweexmj" path="res://tgcc/chunk/material/field.tres" id="2_field"]
[ext_resource type="Material" uid="uid://4xhpd6lust7w" path="res://tgcc/chunk/material/path_chunk.tres" id="3_path"]
[ext_resource type="Material" uid="uid://cnu38m5dsy4uw" path="res://tgcc/chunk/material/terrain.tres" id="4_terrain"]
[ext_resource type="Material" uid="uid://o31kp0jm07q3" path="res://tgcc/chunk/material/rocks.tres" id="7_rocks"]
[sub_resource type="PlaneMesh" id="PlaneMesh_ground"]
size = Vector2(560, 360)
[sub_resource type="PlaneMesh" id="PlaneMesh_field_large"]
size = Vector2(70, 95)
[sub_resource type="PlaneMesh" id="PlaneMesh_field_small"]
size = Vector2(44, 62)
[sub_resource type="PlaneMesh" id="PlaneMesh_path_long"]
size = Vector2(12, 340)
[sub_resource type="PlaneMesh" id="PlaneMesh_path_short"]
size = Vector2(10, 120)
[sub_resource type="SphereMesh" id="SphereMesh_tree_crown"]
radius = 4.0
height = 5.0
radial_segments = 8
rings = 4
[node name="DistantMenuWorld" type="Node3D" unique_id=448788103]
[node name="Ground" type="MeshInstance3D" parent="." unique_id=1769769010]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 20, -0.12, 250)
cast_shadow = 0
mesh = SubResource("PlaneMesh_ground")
surface_material_override/0 = ExtResource("1_grass")
[node name="BackDirt" type="MeshInstance3D" parent="." unique_id=441617212]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -155, -0.1, 235)
cast_shadow = 0
mesh = SubResource("PlaneMesh_field_large")
surface_material_override/0 = ExtResource("4_terrain")
[node name="FieldA" type="MeshInstance3D" parent="." unique_id=1168162022]
transform = Transform3D(0.9659258, 0, -0.25881904, 0, 1, 0, 0.25881904, 0, 0.9659258, -90, -0.08, 175)
cast_shadow = 0
mesh = SubResource("PlaneMesh_field_large")
surface_material_override/0 = ExtResource("2_field")
[node name="FieldB" type="MeshInstance3D" parent="." unique_id=908374467]
transform = Transform3D(0.8660254, 0, 0.5, 0, 1, 0, -0.5, 0, 0.8660254, 105, -0.08, 190)
cast_shadow = 0
mesh = SubResource("PlaneMesh_field_large")
surface_material_override/0 = ExtResource("2_field")
[node name="FieldC" type="MeshInstance3D" parent="." unique_id=725405179]
transform = Transform3D(0.9063078, 0, -0.42261827, 0, 1, 0, 0.42261827, 0, 0.9063078, 160, -0.08, 305)
cast_shadow = 0
mesh = SubResource("PlaneMesh_field_small")
surface_material_override/0 = ExtResource("2_field")
[node name="FieldD" type="MeshInstance3D" parent="." unique_id=180749651]
transform = Transform3D(0.9848077, 0, 0.17364818, 0, 1, 0, -0.17364818, 0, 0.9848077, -190, -0.08, 320)
cast_shadow = 0
mesh = SubResource("PlaneMesh_field_small")
surface_material_override/0 = ExtResource("2_field")
[node name="DistantRoadMain" type="MeshInstance3D" parent="." unique_id=979021818]
transform = Transform3D(0.70710677, 0, -0.70710677, 0, 1, 0, 0.70710677, 0, 0.70710677, 5, -0.06, 240)
cast_shadow = 0
mesh = SubResource("PlaneMesh_path_long")
surface_material_override/0 = ExtResource("3_path")
[node name="DistantRoadCross" type="MeshInstance3D" parent="." unique_id=1994181739]
transform = Transform3D(0.25881904, 0, 0.9659258, 0, 1, 0, -0.9659258, 0, 0.25881904, -20, -0.05, 220)
cast_shadow = 0
mesh = SubResource("PlaneMesh_path_short")
surface_material_override/0 = ExtResource("3_path")
[node name="RockPatch" type="MeshInstance3D" parent="." unique_id=12563390]
transform = Transform3D(1, 0, 0, 0, 0.35, 0, 0, 0, 0.65, -15, 0.6, 350)
cast_shadow = 0
mesh = SubResource("SphereMesh_tree_crown")
surface_material_override/0 = ExtResource("7_rocks")

View File

@@ -4,13 +4,27 @@ extends Node3D
@export var play_departure_delay_seconds: float = 1.0
@export var play_move_before_transition_seconds: float = 3.0
@export var menu_train_whistle_volume_db: float = -12.0
@export var prewarm_chunks_before_show: bool = true
var _play_departure_started: bool = false
@onready var _rail_path: Node = $rail
@onready var _biome_generator: Node = $biome_generator
@onready var _environment_manager: Node = $EnvironmentManager
@onready var _option_menu: Control = $MainMenuUI/SubViewport/OptionMenu
func _ready() -> void:
if prewarm_chunks_before_show:
visible = false
await get_tree().physics_frame
if not is_inside_tree():
return
if _biome_generator != null and _biome_generator.has_method("generate_initial_world_now"):
_biome_generator.generate_initial_world_now()
if _environment_manager != null and _environment_manager.has_method("flush_pending_environment_nodes"):
_environment_manager.flush_pending_environment_nodes()
visible = true
_stop_menu_train()
_configure_menu_train_whistle_volume()
_configure_play_transition_delay()

View File

@@ -105,9 +105,7 @@
[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"]
[ext_resource type="PackedScene" path="res://tgcc/main menu/distant_menu_world.tscn" id="105_background"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_00nq7"]
render_priority = 0
@@ -179,13 +177,12 @@ metadata/_custom_type_script = "uid://brcimd12tx3dm"
compositor_effects = Array[CompositorEffect]([SubResource("CompositorEffect_q52t1")])
[sub_resource type="Curve3D" id="Curve3D_263ax"]
closed = true
bake_interval = 50.0
_data = {
"points": PackedVector3Array(0, 0, 0, 0, 0, 0, 3.5, 0, 0, 0, 0, 0, 0, 0, 0, 3.5, 0, 100, 0, 0, 0, 0, 0, 0, 2.961661, -0.009097099, -56.07381, 0, 0, 0, 0, 0, 0, 3.4848416, -0.013232231, -117.195526, 0, 0, 0, 0, 0, 0, 3.3488476, 0.0048189163, 176.55922, 0, 0, 0, 0, 0, 0, 1.7582202, 0.0118227005, 270.61703),
"tilts": PackedFloat32Array(0, 0, 0, 0, 0, 0)
"points": PackedVector3Array(0, 0, 0, 0, 0, 0, 3.0078363, -1.8119812e-05, -12.587097, 0, 0, 0, 0, 0, 0, 3.360159, -1.8119812e-05, -79.54889, 0, 0, 0, 0, 0, 0, 2.826539, -1.8119812e-05, -159.47318, 0, 0, 0, 0, 0, 0, 3.0367248, -1.8119812e-05, -269.20667),
"tilts": PackedFloat32Array(0, 0, 0, 0)
}
point_count = 6
point_count = 4
[sub_resource type="PlaneMesh" id="PlaneMesh_00nq7"]
@@ -287,6 +284,8 @@ size = Vector2(600, 300)
[node name="MainMenu" type="Node3D" unique_id=448381304]
transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0, 0, 0)
script = ExtResource("1_4j5xl")
play_departure_speed = 6.0
menu_train_whistle_volume_db = -14.0
[node name="EnvironmentManager" parent="." unique_id=1611939731 instance=ExtResource("1_2o8pc")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.822516, 0, 1.9254212)
@@ -314,7 +313,7 @@ directional_shadow_mode = 0
directional_shadow_max_distance = 200.0
[node name="rail" type="Path3D" parent="." unique_id=28337754]
transform = Transform3D(1.3113416e-07, 0, 1, 0, 1, 0, -1, 0, 1.3113416e-07, -47.25185, 1.7218199, 3.4257338)
transform = Transform3D(1.3113416e-07, 0, 1, 0, 1, 0, -1, 0, 1.3113416e-07, 114.74815, 1.7218199, 3.4257479)
curve = SubResource("Curve3D_263ax")
script = ExtResource("7_5p27e")
train_model = ExtResource("8_ljvyb")
@@ -325,7 +324,7 @@ wagon_gap = 0.6
wagon_spacing_scale = 0.9
train_start_mode = 2
train_start_stop_index = 0
train_start_position = 540.0
train_start_position = 87.0
train_start_after_delay = false
train_facing_direction = 2
sleepers_model = ExtResource("10_00nq7")
@@ -334,6 +333,9 @@ fireworks_scene = ExtResource("11_aylkj")
[node name="MainMap" parent="." unique_id=1895741703 instance=ExtResource("2_wbrya")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 63.069893, 0, -4.743943e-06)
[node name="DistantMenuWorld" parent="." unique_id=1852904287 instance=ExtResource("105_background")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -117.95)
[node name="MeshInstance3D" type="MeshInstance3D" parent="." unique_id=1523044435]
transform = Transform3D(-80.07708, -1.0239479e-05, 4.277144e-13, 0, -2.9642006e-06, -64.80289, 1.2091303e-05, -67.813, 2.832624e-06, 308.45245, 59.279312, 332.5165)
cast_shadow = 0
@@ -378,14 +380,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=1897614485]
[node name="Landscape" parent="Fuji4" index="0" unique_id=581950846]
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=1897614485]
[node name="Landscape" parent="Fuji5" index="0" unique_id=581950846]
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")
@@ -395,7 +397,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=206531083]
[node name="Mt Fuji_simplified_3d_mesh" parent="Fuji6" index="0" unique_id=65404928]
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")
@@ -498,21 +500,12 @@ 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"]

View File

@@ -207,7 +207,7 @@ biome_list = Array[ExtResource("6_jfe74")]([SubResource("Resource_3qrd0")])
entity_pool = ExtResource("34_a2cst")
entity_spawn_probability = 0.4
max_entities_per_chunk = 5
eye_line = 4
eye_line = 7
[node name="Terrain" type="MeshInstance3D" parent="." unique_id=219178561]
visible = false