feat: subway signage, subway lighting, subway structural refactor

This commit is contained in:
tiger tiger tiger 2026-01-19 22:36:41 +01:00
parent e9980378b8
commit d51e0ae65e
30 changed files with 738 additions and 1096 deletions

View File

@ -37,6 +37,29 @@ import_script/path=""
materials/extract=1
materials/extract_format=0
materials/extract_path="res://base-environments/transition/import/textures"
_subresources={}
_subresources={
"materials": {
"ParedTunel": {
"use_external/enabled": true,
"use_external/fallback_path": "res://base-environments/transition/import/textures/ParedTunel.tres",
"use_external/path": "uid://bcim2jku0oi5s"
},
"station_floor": {
"use_external/enabled": true,
"use_external/fallback_path": "res://base-environments/transition/import/textures/station_floor.tres",
"use_external/path": "uid://duhe1nn0uwulo"
},
"station_tiles": {
"use_external/enabled": true,
"use_external/fallback_path": "res://base-environments/transition/import/textures/station_tiles.tres",
"use_external/path": "uid://b3wybjajg4dr3"
},
"unlit_station_tiles": {
"use_external/enabled": true,
"use_external/fallback_path": "res://base-environments/transition/import/textures/unlit_station_tiles.tres",
"use_external/path": "uid://85u11etmwhac"
}
}
}
gltf/naming_version=2
gltf/embedded_image_handling=1

View File

@ -14,7 +14,8 @@ metallic_texture_channel = 2
roughness_texture = ExtResource("2_i1m4q")
roughness_texture_channel = 1
emission_enabled = true
emission_energy_multiplier = 30.0
emission_energy_multiplier = 2.0
emission_on_uv2 = true
emission_texture = ExtResource("3_fnaaw")
normal_enabled = true
normal_texture = ExtResource("4_wnwnf")

View File

@ -15,7 +15,7 @@ metallic_texture_channel = 2
roughness_texture = ExtResource("2_5i5r4")
roughness_texture_channel = 1
emission_enabled = true
emission_energy_multiplier = 5.0
emission_energy_multiplier = 3.0
emission_texture = ExtResource("3_68xv4")
normal_enabled = true
normal_texture = ExtResource("4_5bw0m")

View File

@ -4,4 +4,6 @@
resource_name = "display"
cull_mode = 2
albedo_color = Color(0.16613327, 0.10919999, 0.28, 1)
roughness = 0.1
metallic = 0.1
metallic_specular = 0.3
roughness = 0.15

View File

@ -1,9 +1,10 @@
[gd_scene load_steps=10 format=3 uid="uid://tuv111h6jsnu"]
[gd_scene load_steps=11 format=3 uid="uid://tuv111h6jsnu"]
[ext_resource type="PackedScene" uid="uid://swh2v0icrwum" path="res://base-environments/transition/import/meta_station.glb" id="1_yekr5"]
[ext_resource type="Shader" uid="uid://i3k8blcd043t" path="res://base-environments/transition/shaders/escalator_disp.gdshader" id="2_klf6x"]
[ext_resource type="Texture2D" uid="uid://dfkqm1qqjq7sg" path="res://base-environments/transition/import/meta_station_stairs_albedo-stairs_alpha.png" id="3_e0ljd"]
[ext_resource type="Texture2D" uid="uid://bkakclhq1uwda" path="res://base-environments/transition/shaders/stairs_normal.png" id="4_yyrp7"]
[ext_resource type="FontFile" uid="uid://8es6n8tktmx6" path="res://import/fonts/Doto-ExtraBold.ttf" id="5_e0ljd"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_jh12p"]
render_priority = 0
@ -110,3 +111,203 @@ material_override = SubResource("ShaderMaterial_e0ljd")
gi_mode = 0
mesh = SubResource("PlaneMesh_yyrp7")
skeleton = NodePath("")
[node name="station_display_R" parent="." index="48"]
cast_shadow = 0
[node name="Label3D" type="Label3D" parent="station_display_R" index="0" groups=["signage"]]
transform = Transform3D(1, 0, 1.9895195e-13, 0, 1, 0, -1.9895195e-13, 0, 1, -0.8458553, 0.35, 0.1)
transparency = 0.6
modulate = Color(2.454227, 1.0085243, 0.54216844, 1)
text = "Loem Ipsum
dolor sit amed"
font = ExtResource("5_e0ljd")
outline_size = 2
horizontal_alignment = 0
vertical_alignment = 0
[node name="Label3D2" type="Label3D" parent="station_display_R" index="1" groups=["signage"]]
transform = Transform3D(-1, 0, -8.742282e-08, 0, 1, 0, 8.742282e-08, 0, -1, 0.85590327, 0.35, -0.1)
transparency = 0.6
modulate = Color(2.454227, 1.0085243, 0.54216844, 1)
text = "Loem Ipsum
dolor sit amed"
font = ExtResource("5_e0ljd")
outline_size = 2
horizontal_alignment = 0
vertical_alignment = 0
[node name="Cube_012" parent="." index="49"]
cast_shadow = 0
[node name="Label3D" type="Label3D" parent="Cube_012" index="0" groups=["signage"]]
transform = Transform3D(1, 0, 1.9895197e-13, 0, 1, 0, -1.9895197e-13, 0, 1, -0.8458555, 0.35, 0.1)
transparency = 0.6
modulate = Color(2.454227, 1.0085243, 0.54216844, 1)
text = "Loem Ipsum
dolor sit amed"
font = ExtResource("5_e0ljd")
outline_size = 2
horizontal_alignment = 0
vertical_alignment = 0
[node name="Label3D2" type="Label3D" parent="Cube_012" index="1" groups=["signage"]]
transform = Transform3D(-1, 0, -8.742293e-08, 0, 1, 0, 8.742293e-08, 0, -1, 0.85590315, 0.35, -0.1)
transparency = 0.6
modulate = Color(2.454227, 1.0085243, 0.54216844, 1)
text = "Loem Ipsum
dolor sit amed"
font = ExtResource("5_e0ljd")
outline_size = 2
horizontal_alignment = 0
vertical_alignment = 0
[node name="Cube_014" parent="." index="50"]
cast_shadow = 0
[node name="Label3D" type="Label3D" parent="Cube_014" index="0" groups=["signage"]]
transform = Transform3D(1, 0, 1.9895195e-13, 0, 1, 0, -1.9895195e-13, 0, 1, -0.8458553, 0.35, 0.1)
transparency = 0.6
modulate = Color(2.454227, 1.0085243, 0.54216844, 1)
text = "Loem Ipsum
dolor sit amed"
font = ExtResource("5_e0ljd")
outline_size = 2
horizontal_alignment = 0
vertical_alignment = 0
[node name="Label3D2" type="Label3D" parent="Cube_014" index="1" groups=["signage"]]
transform = Transform3D(-1, 0, -8.742282e-08, 0, 1, 0, 8.742282e-08, 0, -1, 0.85590327, 0.35, -0.1)
transparency = 0.6
modulate = Color(2.454227, 1.0085243, 0.54216844, 1)
text = "Loem Ipsum
dolor sit amed"
font = ExtResource("5_e0ljd")
outline_size = 2
horizontal_alignment = 0
vertical_alignment = 0
[node name="Cube_016" parent="." index="51"]
cast_shadow = 0
[node name="Label3D" type="Label3D" parent="Cube_016" index="0" groups=["signage"]]
transform = Transform3D(1, 0, 1.9895197e-13, 0, 1, 0, -1.9895197e-13, 0, 1, -0.8458553, 0.35, 0.1)
transparency = 0.6
modulate = Color(2.454227, 1.0085243, 0.54216844, 1)
text = "Loem Ipsum
dolor sit amed"
font = ExtResource("5_e0ljd")
outline_size = 2
horizontal_alignment = 0
vertical_alignment = 0
[node name="Label3D2" type="Label3D" parent="Cube_016" index="1" groups=["signage"]]
transform = Transform3D(-1, 0, -8.742293e-08, 0, 1, 0, 8.742293e-08, 0, -1, 0.85590315, 0.35, -0.1)
transparency = 0.6
modulate = Color(2.454227, 1.0085243, 0.54216844, 1)
text = "Loem Ipsum
dolor sit amed"
font = ExtResource("5_e0ljd")
outline_size = 2
horizontal_alignment = 0
vertical_alignment = 0
[node name="Cube_010" parent="." index="52"]
cast_shadow = 0
[node name="Label3D" type="Label3D" parent="Cube_010" index="0" groups=["signage"]]
transform = Transform3D(1, 0, 1.9895195e-13, 0, 1, 0, -1.9895195e-13, 0, 1, -0.8458553, 0.35, 0.1)
transparency = 0.6
modulate = Color(2.454227, 1.0085243, 0.54216844, 1)
text = "Loem Ipsum
dolor sit amed"
font = ExtResource("5_e0ljd")
outline_size = 2
horizontal_alignment = 0
vertical_alignment = 0
[node name="Label3D2" type="Label3D" parent="Cube_010" index="1" groups=["signage"]]
transform = Transform3D(-1, 0, -8.742282e-08, 0, 1, 0, 8.742282e-08, 0, -1, 0.85590327, 0.35, -0.1)
transparency = 0.6
modulate = Color(2.454227, 1.0085243, 0.54216844, 1)
text = "Loem Ipsum
dolor sit amed"
font = ExtResource("5_e0ljd")
outline_size = 2
horizontal_alignment = 0
vertical_alignment = 0
[node name="Cube_017" parent="." index="53"]
cast_shadow = 0
[node name="Label3D" type="Label3D" parent="Cube_017" index="0" groups=["signage"]]
transform = Transform3D(1, 0, 1.9895197e-13, 0, 1, 0, -1.9895197e-13, 0, 1, -0.8458555, 0.35, 0.1)
transparency = 0.6
modulate = Color(2.454227, 1.0085243, 0.54216844, 1)
text = "Loem Ipsum
dolor sit amed"
font = ExtResource("5_e0ljd")
outline_size = 2
horizontal_alignment = 0
vertical_alignment = 0
[node name="Label3D2" type="Label3D" parent="Cube_017" index="1" groups=["signage"]]
transform = Transform3D(-1, 0, -8.742293e-08, 0, 1, 0, 8.742293e-08, 0, -1, 0.855903, 0.35, -0.1)
transparency = 0.6
modulate = Color(2.454227, 1.0085243, 0.54216844, 1)
text = "Loem Ipsum
dolor sit amed"
font = ExtResource("5_e0ljd")
outline_size = 2
horizontal_alignment = 0
vertical_alignment = 0
[node name="Cube_018" parent="." index="54"]
cast_shadow = 0
[node name="Label3D" type="Label3D" parent="Cube_018" index="0" groups=["signage"]]
transform = Transform3D(1, 0, 1.9895195e-13, 0, 1, 0, -1.9895195e-13, 0, 1, -0.8458553, 0.35, 0.1)
transparency = 0.6
modulate = Color(2.454227, 1.0085243, 0.54216844, 1)
text = "Loem Ipsum
dolor sit amed"
font = ExtResource("5_e0ljd")
outline_size = 2
horizontal_alignment = 0
vertical_alignment = 0
[node name="Label3D2" type="Label3D" parent="Cube_018" index="1" groups=["signage"]]
transform = Transform3D(-1, 0, -8.742282e-08, 0, 1, 0, 8.742282e-08, 0, -1, 0.85590327, 0.35, -0.1)
transparency = 0.6
modulate = Color(2.454227, 1.0085243, 0.54216844, 1)
text = "Loem Ipsum
dolor sit amed"
font = ExtResource("5_e0ljd")
outline_size = 2
horizontal_alignment = 0
vertical_alignment = 0
[node name="Cube_019" parent="." index="55"]
cast_shadow = 0
[node name="Label3D" type="Label3D" parent="Cube_019" index="0" groups=["signage"]]
transform = Transform3D(1, 0, 1.9895197e-13, 0, 1, 0, -1.9895197e-13, 0, 1, -0.8458553, 0.35, 0.1)
transparency = 0.6
modulate = Color(2.454227, 1.0085243, 0.54216844, 1)
text = "Loem Ipsum
dolor sit amed"
font = ExtResource("5_e0ljd")
outline_size = 2
horizontal_alignment = 0
vertical_alignment = 0
[node name="Label3D2" type="Label3D" parent="Cube_019" index="1" groups=["signage"]]
transform = Transform3D(-1, 0, -8.742293e-08, 0, 1, 0, 8.742293e-08, 0, -1, 0.85590315, 0.35, -0.1)
transparency = 0.6
modulate = Color(2.454227, 1.0085243, 0.54216844, 1)
text = "Loem Ipsum
dolor sit amed"
font = ExtResource("5_e0ljd")
outline_size = 2
horizontal_alignment = 0
vertical_alignment = 0

View File

@ -9,15 +9,18 @@
[resource]
resource_name = "station_ceiling"
vertex_color_use_as_albedo = true
albedo_color = Color(0.48570347, 0.48570353, 0.48570347, 1)
albedo_texture = ExtResource("1_fw6ln")
metallic = 0.5
metallic_specular = 0.2
metallic_texture = ExtResource("2_ilmcm")
roughness_texture = ExtResource("2_ilmcm")
roughness_texture_channel = 1
emission_enabled = true
emission = Color(0.9894878, 0.815461, 0.7171153, 1)
emission_energy_multiplier = 0.5
emission_operator = 1
emission_texture = ExtResource("4_4f468")
normal_enabled = true
normal_scale = 0.2
normal_texture = ExtResource("3_k7xpx")
ao_enabled = true
ao_light_affect = 0.5

View File

@ -1,4 +1,4 @@
[gd_resource type="ShaderMaterial" load_steps=4 format=3 uid="uid://dchm78gv31r6a"]
[gd_resource type="ShaderMaterial" format=3 uid="uid://dchm78gv31r6a"]
[ext_resource type="Shader" uid="uid://dpowid5cwvgu0" path="res://base-environments/transition/shaders/timetravel.gdshader" id="1_0da7x"]
[ext_resource type="Texture2D" uid="uid://dst0u5b51mx4h" path="res://base-environments/transition/shaders/water_color.exr" id="2_4vy32"]

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -18,13 +18,22 @@ func start_room():
%burnout_station.leave_room.connect(func():
proceed.emit(Main.adulthood_room_path))
%PlayerController.process_mode = Node.PROCESS_MODE_INHERIT
# Give player control immediately, then open
Scenes.player_enable.emit(true)
on_first_station()
_set_signage_texts("")
await Main.curtain.open()
func _set_signage_texts(message: String) -> void:
get_tree().call_group("signage", "set_text", "")
for i in range(len(message)):
get_tree().call_group("signage", "set_text", message.substr(0, i+1))
await get_tree().create_timer(0.05).timeout
var left_first_station: bool = false
func on_first_station() -> void:
Scenes.enabled_sequences += 1 << Scenes.id.ADULT_DND
@ -182,4 +191,4 @@ func on_right_train_exit(_body):
await get_tree().create_timer(10).timeout
%RightLabel.text = "U1 weissnicht \n via Saint-Exupery Sq."
await get_tree().create_timer(5).timeout
%ShedulePlayer_R.play("train_arriving")
%ShedulePlayer_R.play("train_arriving")

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,17 @@
[gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://bx6dygeknq3qd"]
[sub_resource type="ViewportTexture" id="ViewportTexture_820wi"]
viewport_path = NodePath("Train/SubwayMap3D/SubViewport")
[resource]
resource_local_to_scene = true
albedo_color = Color(0.70380783, 0.70380783, 0.70380783, 1)
albedo_texture = SubResource("ViewportTexture_820wi")
metallic = 0.3
metallic_specular = 0.3
roughness = 0.15
emission_enabled = true
emission = Color(1, 1, 1, 1)
emission_energy_multiplier = 0.1
emission_operator = 1
emission_texture = SubResource("ViewportTexture_820wi")

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,4 @@
[gd_resource type="AudioBusLayout" format=3 uid="uid://djkwd76o033io"]
[gd_resource type="AudioBusLayout" load_steps=10 format=3 uid="uid://djkwd76o033io"]
[sub_resource type="AudioEffectLowPassFilter" id="AudioEffectLowPassFilter_ijm2o"]
resource_name = "LowPassFilter"

File diff suppressed because one or more lines are too long

Binary file not shown.

View File

@ -0,0 +1,42 @@
[remap]
importer="font_data_dynamic"
type="FontFile"
uid="uid://8es6n8tktmx6"
path="res://.godot/imported/Doto-ExtraBold.ttf-840939e72e05dc486610b4d18c2f8447.fontdata"
[deps]
source_file="res://import/fonts/Doto-ExtraBold.ttf"
dest_files=["res://.godot/imported/Doto-ExtraBold.ttf-840939e72e05dc486610b4d18c2f8447.fontdata"]
[params]
Rendering=null
antialiasing=1
generate_mipmaps=true
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=2.0
Fallbacks=null
fallbacks=[]
Compress=null
compress=true
preload=[{
"chars": [],
"glyphs": [],
"name": "New Configuration",
"size": Vector2i(16, 0),
&"variation_embolden": 0.0
}]
language_support={}
script_support={}
opentype_features={}

View File

@ -1,4 +1,4 @@
[gd_resource type="SpriteFrames" format=3 uid="uid://j7e7me3hl6xt"]
[gd_resource type="SpriteFrames" load_steps=7 format=3 uid="uid://j7e7me3hl6xt"]
[ext_resource type="Texture2D" uid="uid://sv0nhkkur1tt" path="res://logic-scenes/board/card-textures/cardsheet.png" id="1_l4v2i"]

View File

@ -1,4 +1,4 @@
[gd_resource type="SpriteFrames" format=3 uid="uid://bixem613olfie"]
[gd_resource type="SpriteFrames" load_steps=14 format=3 uid="uid://bixem613olfie"]
[ext_resource type="Texture2D" uid="uid://c8ckkjmdegyis" path="res://logic-scenes/board/card-textures/postitsheet.png" id="1_c6eib"]

View File

@ -15,13 +15,13 @@ compatibility/default_parent_skeleton_in_mesh_instance_3d=true
[application]
config/name="Frame of Mind"
run/main_scene="uid://ccdfkvtu6sb36"
run/main_scene="uid://fgp3s28h7msy"
config/use_custom_user_dir=true
config/features=PackedStringArray("4.6", "Forward Plus")
config/features=PackedStringArray("4.5", "Forward Plus")
boot_splash/bg_color=Color(0.0313726, 0.0117647, 0.129412, 1)
boot_splash/stretch_mode=0
boot_splash/image="res://splash.png"
config/icon="res://icon.png"
boot_splash/stretch_mode=0
[audio]
@ -32,7 +32,7 @@ buses/default_bus_layout="uid://djkwd76o033io"
State="*res://singletons/global_state.gd"
Scenes="*res://singletons/scene_reference.gd"
Steamworks="*res://dev-util/steamworks.gd"
PromptManager="*uid://7tdmg25cjdqd"
PromptManager="*res://addons/input_prompts/input_prompt_manager.gd"
Steam="*res://dev-util/steam.gd"
Main="*res://singletons/main/main.tscn"
HardCards="*res://dev-util/hardcoded_cards.tscn"
@ -69,6 +69,7 @@ import/blender/enabled=false
[global_group]
interactables=""
signage=""
[gui]
@ -225,7 +226,9 @@ limits/message_queue/max_size_mb=2048
textures/vram_compression/import_etc2_astc=true
lights_and_shadows/directional_shadow/size=2048
global_illumination/voxel_gi/quality=1
viewport/hdr_2d=true
anti_aliasing/quality/msaa_3d=2
anti_aliasing/quality/screen_space_aa=1
anti_aliasing/quality/msaa_3d=1
environment/screen_space_reflection/roughness_quality=2
anti_aliasing/quality/use_taa=true
anti_aliasing/quality/use_debanding=true