diff --git a/design/subway/subway.blend b/design/subway/subway.blend index 547775b..c34d6dc 100644 --- a/design/subway/subway.blend +++ b/design/subway/subway.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c014fc6dcb5c7b55eb20b56c8feef2c741a6dce8fe8c929803cce31bb726d7b5 -size 371224406 +oid sha256:d0acaa9c532e53d675d9458d6605da6ac8881ad3a8d06d53e762c25616b90f91 +size 338391186 diff --git a/src/base-environments/transition/first_platform.tscn b/src/base-environments/transition/first_platform.tscn index fa35e31..54bc767 100644 --- a/src/base-environments/transition/first_platform.tscn +++ b/src/base-environments/transition/first_platform.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=34 format=3 uid="uid://dgxujvk66rka6"] +[gd_scene load_steps=44 format=3 uid="uid://dgxujvk66rka6"] [ext_resource type="PackedScene" uid="uid://cb4m4oe32guqi" path="res://base-environments/transition/import/first_station.glb" id="1_yerc2"] [ext_resource type="Shader" uid="uid://sxauef61xfpx" path="res://base-environments/transition/time_sparks.gdshader" id="2_4y17u"] @@ -11,6 +11,8 @@ [ext_resource type="Texture2D" uid="uid://jtr7v163pfy7" path="res://base-environments/transition/misc/blender_graffiti_albedo.png" id="9_bvylv"] [ext_resource type="Texture2D" uid="uid://cwjr0xq64hdsw" path="res://base-environments/transition/misc/blender_graffiti_orm.png" id="10_xrnct"] [ext_resource type="Material" uid="uid://d3rfe7mryshj1" path="res://base-environments/transition/import/next_room_peak.tres" id="11_sy31e"] +[ext_resource type="PackedScene" uid="uid://dotekvpr6rytk" path="res://base-environments/transition/import/subway_train.glb" id="12_dgbje"] +[ext_resource type="VoxelGIData" uid="uid://fjy2ca233sp4" path="res://base-environments/transition/subway_car_gi.res" id="13_f5y2f"] [sub_resource type="ViewportTexture" id="ViewportTexture_sjsoq"] viewport_path = NodePath("first_station/MeshInstance3D/SubViewport") @@ -39,17 +41,19 @@ sky = SubResource("Sky_5ahgt") reflected_light_source = 2 tonemap_mode = 2 tonemap_exposure = 1.5 -ssao_enabled = true -ssil_enabled = true -sdfgi_use_occlusion = true -sdfgi_read_sky_light = false sdfgi_energy = 0.2 glow_enabled = true -glow_levels/1 = 0.2 +glow_levels/2 = 0.2 +glow_levels/3 = 0.5 +glow_levels/4 = 0.5 +glow_levels/6 = 1.0 +glow_levels/7 = 0.3 glow_strength = 0.7 glow_mix = 1.0 glow_bloom = 0.5 glow_blend_mode = 1 +glow_hdr_threshold = 1.74 +glow_hdr_luminance_cap = 66.78 fog_light_color = Color(0.0449019, 0.147257, 0.213563, 1) fog_height = 0.25 fog_height_density = 0.5 @@ -59,7 +63,7 @@ adjustment_enabled = true adjustment_contrast = 1.02 [sub_resource type="ShaderMaterial" id="ShaderMaterial_4tj6b"] -render_priority = 3 +render_priority = 0 shader = ExtResource("2_4y17u") shader_parameter/spark_texture = ExtResource("3_cbtb8") @@ -96,6 +100,9 @@ color_initial_ramp = SubResource("GradientTexture1D_7joox") size = Vector2(1, 150) orientation = 0 +[sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_f5y2f"] +exposure_multiplier = 0.8 + [sub_resource type="Gradient" id="Gradient_weiut"] offsets = PackedFloat32Array(0, 0.99726) @@ -135,6 +142,57 @@ turbulence_influence_max = 0.05 [sub_resource type="PlaneMesh" id="PlaneMesh_8c2us"] orientation = 2 +[sub_resource type="Animation" id="Animation_dgbje"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector3(0.785, 2.75, -0.535)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath(".:rotation") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector3(-0.671952, 0, 0)] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("../MeshInstance3D:material_override:emission_energy_multiplier") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [3.0] +} +tracks/3/type = "value" +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/path = NodePath("../MeshInstance3D:material_override:emission") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Color(0.0748178, 0.134808, 0.168364, 1)] +} + [sub_resource type="Animation" id="Animation_irpux"] resource_name = "trailer" length = 10.0 @@ -187,64 +245,57 @@ tracks/3/keys = { "values": [Color(0.0748178, 0.134808, 0.168364, 1), Color(1, 1, 1, 1)] } -[sub_resource type="Animation" id="Animation_dgbje"] -length = 0.001 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath(".:position") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Vector3(0.785, 2.75, -0.535)] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath(".:rotation") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Vector3(-0.671952, 0, 0)] -} -tracks/2/type = "value" -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/path = NodePath("../MeshInstance3D:material_override:emission_energy_multiplier") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [3.0] -} -tracks/3/type = "value" -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/path = NodePath("../MeshInstance3D:material_override:emission") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Color(0.0748178, 0.134808, 0.168364, 1)] -} - [sub_resource type="AnimationLibrary" id="AnimationLibrary_sy31e"] _data = { &"RESET": SubResource("Animation_dgbje"), &"trailer": SubResource("Animation_irpux") } +[sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_dgbje"] +exposure_multiplier = 2.0 + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_f5y2f"] +emission_enabled = true +emission = Color(0.250458, 0.274236, 0.577358, 1) + +[sub_resource type="PlaneMesh" id="PlaneMesh_awhi4"] + +[sub_resource type="Shader" id="Shader_iyklq"] +code = "shader_type spatial; +render_mode blend_mix, depth_draw_always, cull_back; +uniform sampler2D DEPTH_TEXTURE: hint_depth_texture; +uniform vec3 fog_color: source_color = vec3(0); +uniform float density: hint_range(0.0, 0.2) = .05; + + +void fragment() { + + float depth = texture(DEPTH_TEXTURE, SCREEN_UV).r; + depth = PROJECTION_MATRIX[3][2] / (depth + PROJECTION_MATRIX[2][2]); + depth += VERTEX.z; + depth = clamp(depth * density, 0.0, 1.0); + + ALBEDO = fog_color; + ALPHA = pow(depth, 0.5); + +} +" + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_tpaj8"] +render_priority = 1 +shader = SubResource("Shader_iyklq") +shader_parameter/fog_color = Color(0.0392674, 0.120682, 0.141248, 1) +shader_parameter/density = 0.05 + +[sub_resource type="PlaneMesh" id="PlaneMesh_bjefl"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_dgbje"] +emission_enabled = true +emission = Color(1, 0, 0, 1) +emission_energy_multiplier = 10.0 + [node name="Node3D" type="Node3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.252546, 0.415653, 0.0961766) [node name="first_station" parent="." instance=ExtResource("1_yerc2")] @@ -263,144 +314,157 @@ size = Vector2i(2896, 2048) environment = SubResource("Environment_hovki") [node name="OmniLight3D" type="SpotLight3D" parent="WorldEnvironment"] -transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.322136, 2.02551, -10.1989) +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -0.252596, 2.54413, -10.1989) light_color = Color(0.978917, 0.789534, 0.685226, 1) -light_size = 0.67 +light_size = 0.6 light_specular = 0.0 light_bake_mode = 1 shadow_enabled = true +shadow_blur = 6.0 spot_range = 7.0 spot_angle = 80.0 spot_angle_attenuation = 0.517633 [node name="OmniLight3D13" type="SpotLight3D" parent="WorldEnvironment"] -transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.322136, 2.02551, -5.1989) +transform = Transform3D(1, 0, 0, 0, -0.5, 0.866025, 0, -0.866025, -0.5, -0.252596, 2.54413, -5.1989) light_color = Color(0.978917, 0.789534, 0.685226, 1) -light_size = 0.67 +light_size = 0.6 light_specular = 0.0 light_bake_mode = 1 shadow_enabled = true +shadow_blur = 6.0 spot_range = 7.0 spot_angle = 80.0 spot_angle_attenuation = 0.517633 [node name="OmniLight3D2" type="SpotLight3D" parent="WorldEnvironment"] -transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.322136, 2.02551, -15.2744) +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -0.252596, 2.54413, -15.2744) light_color = Color(0.978917, 0.789534, 0.685226, 1) -light_size = 0.67 +light_size = 0.6 light_specular = 0.0 light_bake_mode = 1 shadow_enabled = true +shadow_blur = 6.0 spot_range = 7.0 spot_angle = 80.0 spot_angle_attenuation = 0.517633 [node name="OmniLight3D3" type="SpotLight3D" parent="WorldEnvironment"] -transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.322136, 2.02551, -20.2744) +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -0.252596, 2.54413, -20.2744) light_color = Color(0.978917, 0.789534, 0.685226, 1) -light_size = 0.67 +light_size = 0.6 light_specular = 0.0 light_bake_mode = 1 shadow_enabled = true +shadow_blur = 6.0 spot_range = 7.0 spot_angle = 80.0 spot_angle_attenuation = 0.517633 [node name="OmniLight3D4" type="SpotLight3D" parent="WorldEnvironment"] -transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.322136, 2.02551, -25.2744) +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -0.252596, 2.54413, -25.2744) light_color = Color(0.978917, 0.789534, 0.685226, 1) -light_size = 0.67 +light_size = 0.6 light_specular = 0.0 light_bake_mode = 1 shadow_enabled = true +shadow_blur = 6.0 spot_range = 7.0 spot_angle = 80.0 spot_angle_attenuation = 0.517633 [node name="OmniLight3D5" type="SpotLight3D" parent="WorldEnvironment"] -transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.322136, 2.02551, -30.2744) +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -0.252596, 2.54413, -30.2744) light_color = Color(0.978917, 0.789534, 0.685226, 1) -light_size = 0.67 +light_size = 0.6 light_specular = 0.0 light_bake_mode = 1 shadow_enabled = true +shadow_blur = 6.0 spot_range = 7.0 spot_angle = 80.0 spot_angle_attenuation = 0.517633 [node name="OmniLight3D6" type="SpotLight3D" parent="WorldEnvironment"] -transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.322136, 2.02551, -35.2744) +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -0.252596, 2.54413, -35.2744) light_color = Color(0.978917, 0.789534, 0.685226, 1) -light_size = 0.67 +light_size = 0.6 light_specular = 0.0 light_bake_mode = 1 shadow_enabled = true +shadow_blur = 6.0 spot_range = 7.0 spot_angle = 80.0 spot_angle_attenuation = 0.517633 [node name="OmniLight3D7" type="SpotLight3D" parent="WorldEnvironment"] -transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.322136, 2.02551, -40.2744) +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -0.252596, 2.54413, -40.2744) light_color = Color(0.978917, 0.789534, 0.685226, 1) -light_size = 0.67 +light_size = 0.6 light_specular = 0.0 light_bake_mode = 1 shadow_enabled = true +shadow_blur = 6.0 spot_range = 7.0 spot_angle = 80.0 spot_angle_attenuation = 0.517633 [node name="OmniLight3D8" type="SpotLight3D" parent="WorldEnvironment"] -transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.322136, 2.02551, -45.2744) +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -0.252596, 2.54413, -45.2744) light_color = Color(0.978917, 0.789534, 0.685226, 1) -light_size = 0.67 +light_size = 0.6 light_specular = 0.0 light_bake_mode = 1 shadow_enabled = true +shadow_blur = 6.0 spot_range = 7.0 spot_angle = 80.0 spot_angle_attenuation = 0.517633 [node name="OmniLight3D9" type="SpotLight3D" parent="WorldEnvironment"] -transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.322136, 2.02551, -50.2744) +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -0.252596, 2.54413, -50.2744) light_color = Color(0.978917, 0.789534, 0.685226, 1) -light_size = 0.67 +light_size = 0.6 light_specular = 0.0 light_bake_mode = 1 shadow_enabled = true +shadow_blur = 6.0 spot_range = 7.0 spot_angle = 80.0 spot_angle_attenuation = 0.517633 [node name="OmniLight3D10" type="SpotLight3D" parent="WorldEnvironment"] -transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.322136, 2.02551, -55.2744) +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -0.252596, 2.54413, -55.2744) light_color = Color(0.978917, 0.789534, 0.685226, 1) -light_size = 0.67 +light_size = 0.6 light_specular = 0.0 light_bake_mode = 1 shadow_enabled = true +shadow_blur = 6.0 spot_range = 7.0 spot_angle = 80.0 spot_angle_attenuation = 0.517633 [node name="OmniLight3D11" type="SpotLight3D" parent="WorldEnvironment"] -transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.322136, 2.02551, -60.2744) +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -0.252596, 2.54413, -60.2744) light_color = Color(0.978917, 0.789534, 0.685226, 1) -light_size = 0.67 +light_size = 0.6 light_specular = 0.0 light_bake_mode = 1 shadow_enabled = true +shadow_blur = 6.0 spot_range = 7.0 spot_angle = 80.0 spot_angle_attenuation = 0.517633 [node name="OmniLight3D12" type="SpotLight3D" parent="WorldEnvironment"] -transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0.322136, 2.02551, -65.2744) +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -0.252596, 2.54413, -65.2744) light_color = Color(0.978917, 0.789534, 0.685226, 1) -light_size = 0.67 +light_size = 0.6 light_specular = 0.0 light_bake_mode = 1 shadow_enabled = true +shadow_blur = 6.0 spot_range = 7.0 spot_angle = 80.0 spot_angle_attenuation = 0.517633 @@ -422,7 +486,7 @@ draw_pass_1 = SubResource("QuadMesh_oo2l3") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.65518, 1.08384, -32.4645) sorting_offset = 100.0 material_override = SubResource("ShaderMaterial_4tj6b") -amount = 10 +amount = 5 lifetime = 10.0 explosiveness = 0.5 randomness = 0.55 @@ -433,14 +497,15 @@ draw_pass_1 = SubResource("QuadMesh_oo2l3") [node name="VoxelGI" type="VoxelGI" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.61825, -33.3675) -subdiv = 2 +subdiv = 3 size = Vector3(20, 10.4688, 124.604) +camera_attributes = SubResource("CameraAttributesPractical_f5y2f") data = ExtResource("4_nmgvo") [node name="GPUParticles3D3" type="GPUParticles3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.18283, 0.258846, -32.3954) material_override = ExtResource("5_32vcv") -amount = 2000 +amount = 1000 lifetime = 1.5 speed_scale = 0.2 explosiveness = 0.4 @@ -454,7 +519,9 @@ draw_pass_1 = SubResource("PlaneMesh_8c2us") [node name="GPUParticles3D4" type="GPUParticles3D" parent="."] transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, -6.80088, 0.258846, -32.3954) material_override = ExtResource("5_32vcv") -amount = 2000 +gi_mode = 2 +visibility_range_begin_margin = 1.0 +amount = 1000 lifetime = 1.5 speed_scale = 0.22 explosiveness = 0.4 @@ -491,3 +558,59 @@ autoplay = "trailer" [node name="MeshInstance3D" type="MeshInstance3D" parent="."] material_override = ExtResource("11_sy31e") + +[node name="subway_train" parent="." instance=ExtResource("12_dgbje")] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -20.3734, -0.125, -8.52174) + +[node name="VoxelGI" type="VoxelGI" parent="subway_train"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -25.5427, 1.26147, 5.72205e-06) +subdiv = 3 +size = Vector3(31.2329, 4.60791, 4.26172) +camera_attributes = SubResource("CameraAttributesPractical_dgbje") +data = ExtResource("13_f5y2f") + +[node name="MeshInstance3D2" type="MeshInstance3D" parent="."] +transform = Transform3D(-1.09, 0, 3.35223e-06, 0, 1.514, 0, -9.52908e-08, 0, -38.345, -6.62142, -0.527946, -27.073) +visible = false +material_override = SubResource("StandardMaterial3D_f5y2f") +mesh = SubResource("PlaneMesh_awhi4") + +[node name="MeshInstance3D3" type="MeshInstance3D" parent="."] +transform = Transform3D(3.52244, 0, 0, 0, -1.2314e-07, 2.81712, 0, -2.81712, -1.2314e-07, -6.37235, 1.22511, 0.165661) +material_override = SubResource("ShaderMaterial_tpaj8") +gi_mode = 0 +mesh = SubResource("PlaneMesh_bjefl") +skeleton = NodePath("../MeshInstance3D2") + +[node name="MeshInstance3D4" type="MeshInstance3D" parent="."] +transform = Transform3D(3.52244, 0, 0, 0, -1.2314e-07, 2.81712, 0, -2.81712, -1.2314e-07, 6.372, 1.225, 0.166) +material_override = SubResource("ShaderMaterial_tpaj8") +gi_mode = 0 +mesh = SubResource("PlaneMesh_bjefl") +skeleton = NodePath("../MeshInstance3D2") + +[node name="MeshInstance3D6" type="MeshInstance3D" parent="."] +transform = Transform3D(-3.52244, -2.4628e-07, -1.07652e-14, 0, -1.2314e-07, 2.81712, -3.07942e-07, 2.81712, 1.2314e-07, 6.372, 1.22511, -66.2916) +material_override = SubResource("ShaderMaterial_tpaj8") +gi_mode = 0 +mesh = SubResource("PlaneMesh_bjefl") +skeleton = NodePath("../MeshInstance3D2") + +[node name="MeshInstance3D7" type="MeshInstance3D" parent="."] +transform = Transform3D(-3.52244, -2.4628e-07, -1.07652e-14, 0, -1.2314e-07, 2.81712, -3.07942e-07, 2.81712, 1.2314e-07, -6.37235, 1.225, -66.292) +material_override = SubResource("ShaderMaterial_tpaj8") +gi_mode = 0 +mesh = SubResource("PlaneMesh_bjefl") +skeleton = NodePath("../MeshInstance3D2") + +[node name="MeshInstance3D5" type="MeshInstance3D" parent="."] +transform = Transform3D(3.52244, 0, 0, 0, -2.21081, 1.74599, 0, -1.74599, -2.21081, 0, 4.91844, 1.52058) +material_override = SubResource("ShaderMaterial_tpaj8") +gi_mode = 0 +mesh = SubResource("PlaneMesh_bjefl") +skeleton = NodePath("../MeshInstance3D2") + +[node name="CSGBox3D" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.66292, -0.4523, -24.7506) +visible = false +material_override = SubResource("StandardMaterial3D_dgbje") diff --git a/src/base-environments/transition/first_station.tscn b/src/base-environments/transition/first_station.tscn deleted file mode 100644 index 1c4e236..0000000 --- a/src/base-environments/transition/first_station.tscn +++ /dev/null @@ -1,324 +0,0 @@ -[gd_scene load_steps=22 format=3 uid="uid://be6kde2f4ad52"] - -[ext_resource type="Shader" uid="uid://uma3ulih4mau" path="res://base-environments/transition/shaders/station_waves.gdshader" id="1_f8feh"] -[ext_resource type="Texture2D" uid="uid://b5gmqj4nd868a" path="res://base-environments/transition/shaders/water_displacement_noise.png" id="2_8dsiv"] -[ext_resource type="Texture2D" uid="uid://bn5w1h1aviai1" path="res://base-environments/transition/shaders/water_color.png" id="3_366va"] -[ext_resource type="Texture2D" uid="uid://bvlldp00ytilp" path="res://base-environments/transition/shaders/water_noise.png" id="4_gc0t8"] -[ext_resource type="ArrayMesh" uid="uid://cy0ns76th64wa" path="res://base-environments/transition/import/water_surface_Plane.res" id="5_k1ij8"] -[ext_resource type="PackedScene" uid="uid://cr7g2bkunq7vh" path="res://base-environments/transition/import/firs_station.glb" id="6_uyfv5"] -[ext_resource type="Shader" uid="uid://sxauef61xfpx" path="res://base-environments/transition/time_sparks.gdshader" id="7_y1lbc"] -[ext_resource type="Texture2D" uid="uid://cxsne8gg5fmca" path="res://base-environments/transition/shaders/time_spark.png" id="8_xnxqa"] - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_7hmde"] -render_priority = 0 -shader = ExtResource("1_f8feh") -shader_parameter/displacement_strength = Vector3(0.8, 0.25, 0.2) -shader_parameter/w_scale = Vector3(1.5, 2, 2) -shader_parameter/disp_texture = ExtResource("2_8dsiv") -shader_parameter/water_texture = ExtResource("4_gc0t8") -shader_parameter/water_color = ExtResource("3_366va") - -[sub_resource type="Shader" id="Shader_wl6o1"] -code = "// NOTE: Shader automatically converted from Godot Engine 4.3.stable's StandardMaterial3D. - -shader_type spatial; -render_mode blend_mix, depth_draw_opaque, cull_back, diffuse_burley, specular_schlick_ggx; - -uniform vec4 albedo : source_color; -uniform sampler2D texture_albedo : source_color, filter_linear_mipmap, repeat_enable; -uniform float point_size : hint_range(0.1, 128.0, 0.1); - -uniform float roughness : hint_range(0.0, 1.0); -uniform sampler2D texture_metallic : hint_default_white, filter_linear_mipmap, repeat_enable; -uniform vec4 metallic_texture_channel; -uniform sampler2D texture_roughness : hint_roughness_g, filter_linear_mipmap, repeat_enable; - -uniform float specular : hint_range(0.0, 1.0, 0.01); -uniform float metallic : hint_range(0.0, 1.0, 0.01); - -uniform sampler2D texture_normal : hint_roughness_normal, filter_linear_mipmap, repeat_enable; -uniform float normal_scale : hint_range(-16.0, 16.0); - -uniform sampler2D texture_detail_albedo : source_color, filter_linear_mipmap, repeat_enable; -uniform sampler2D texture_detail_normal : hint_normal, filter_linear_mipmap, repeat_enable; -uniform sampler2D texture_detail_roughness : hint_default_white, filter_linear_mipmap, repeat_enable; - -uniform vec3 uv1_scale; -uniform vec3 uv1_offset; -uniform vec3 uv2_scale; -uniform vec3 uv2_offset; - -void vertex() { - UV = UV * uv1_scale.xy + uv1_offset.xy; -} - -void fragment() { - vec2 base_uv = UV; - - vec4 albedo_tex = texture(texture_albedo, base_uv); - ALBEDO = albedo.rgb * albedo_tex.rgb; - - float metallic_tex = dot(texture(texture_metallic, base_uv), metallic_texture_channel); - METALLIC = metallic_tex * metallic; - SPECULAR = specular; - - vec4 roughness_texture_channel = vec4(0.0, 1.0, 0.0, 0.0); - float roughness_tex = dot(texture(texture_roughness, base_uv), roughness_texture_channel); - float rougness_detail = dot(texture(texture_detail_roughness, base_uv), roughness_texture_channel); - ROUGHNESS = roughness_tex + rougness_detail* roughness; - - // Normal Map: Enabled - NORMAL_MAP = texture(texture_normal, base_uv).rgb; - NORMAL_MAP_DEPTH = normal_scale; - - // Detail: Enabled - vec4 detail_tex = texture(texture_detail_albedo, base_uv); - vec4 detail_norm_tex = texture(texture_detail_normal, base_uv); - vec4 detail_mask_tex = texture(texture_detail_mask, base_uv); - - // Detail Blend Mode: Add - vec3 detail = mix(ALBEDO.rgb, ALBEDO.rgb + detail_tex.rgb, detail_tex.a); - vec3 detail_norm = mix(NORMAL_MAP, detail_norm_tex.rgb, detail_tex.a); - NORMAL_MAP = mix(NORMAL_MAP, detail_norm, 0.5); - ALBEDO.rgb = mix(ALBEDO.rgb, detail, detail_mask_tex.r); -} -" - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_3f5xe"] -resource_name = "station_tiles" -render_priority = 0 -shader = SubResource("Shader_wl6o1") - -[sub_resource type="QuadMesh" id="QuadMesh_po8v1"] - -[sub_resource type="Environment" id="Environment_wlhyl"] -tonemap_mode = 3 -ssil_enabled = true -sdfgi_enabled = true -glow_enabled = true -glow_strength = 0.74 -glow_blend_mode = 1 -glow_hdr_threshold = 0.0 -glow_hdr_luminance_cap = 5.0 -fog_enabled = true -fog_light_color = Color(0.390929, 0.489667, 0.392857, 1) -fog_density = 0.001 -fog_height = 3.0 -volumetric_fog_enabled = true -volumetric_fog_density = 0.0 - -[sub_resource type="FogMaterial" id="FogMaterial_hxa53"] -density = 0.1 -albedo = Color(0.696, 0.770533, 0.8, 1) -height_falloff = 16.0 -edge_fade = 0.0001011 - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_6a7ft"] -render_priority = 0 -shader = ExtResource("7_y1lbc") -shader_parameter/spark_texture = ExtResource("8_xnxqa") - -[sub_resource type="Gradient" id="Gradient_kax14"] -offsets = PackedFloat32Array(0.0322581, 0.285714, 0.617512, 0.746544, 0.903226) -colors = PackedColorArray(0, 0.38, 0.240667, 0.0431373, 0.34, 0.12, 1, 0.258824, 0.76, 0.486147, 0.4104, 0.368627, 0.94, 0.82156, 0.5452, 0.717647, 0.83, 0, 0.2075, 0.827451) - -[sub_resource type="GradientTexture1D" id="GradientTexture1D_ncanj"] -gradient = SubResource("Gradient_kax14") - -[sub_resource type="Gradient" id="Gradient_skb6t"] -offsets = PackedFloat32Array(0, 0.617512, 1) -colors = PackedColorArray(0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1) - -[sub_resource type="GradientTexture1D" id="GradientTexture1D_hsnlb"] -gradient = SubResource("Gradient_skb6t") - -[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_dw2id"] -lifetime_randomness = 0.5 -emission_shape_scale = Vector3(1, 1.5, 1.5) -emission_shape = 1 -emission_sphere_radius = 2.0 -spread = 0.0 -initial_velocity_max = 1.0 -gravity = Vector3(0, 0, 0) -scale_min = 0.3 -scale_max = 3.0 -color_ramp = SubResource("GradientTexture1D_hsnlb") -color_initial_ramp = SubResource("GradientTexture1D_ncanj") - -[sub_resource type="QuadMesh" id="QuadMesh_qanh3"] -size = Vector2(1, 100) - -[node name="Node3D" type="Node3D"] - -[node name="water_surface2" type="Node3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.931149, 0) - -[node name="Plane" type="MeshInstance3D" parent="water_surface2"] -transform = Transform3D(1, 0, 0, 0, 1.154, 0, 0, 0, 1.154, 4.63741, -0.0648499, 0) -material_override = SubResource("ShaderMaterial_7hmde") -mesh = ExtResource("5_k1ij8") -skeleton = NodePath("") - -[node name="Plane3" type="MeshInstance3D" parent="water_surface2"] -transform = Transform3D(1, 0, 0, 0, 1.154, 0, 0, 0, 1.154, 4.63741, -0.0648499, 12.7074) -material_override = SubResource("ShaderMaterial_7hmde") -mesh = ExtResource("5_k1ij8") -skeleton = NodePath("") - -[node name="OmniLight3D" type="OmniLight3D" parent="water_surface2/Plane3"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 17.0509, 1.35761, 0) - -[node name="Plane2" type="MeshInstance3D" parent="water_surface2"] -transform = Transform3D(-3.21494, 0, 1.00921e-07, 0, 1.15441, 0, -2.81059e-07, 0, -1.15441, 102.098, -0.0439224, -6.60792) -material_override = SubResource("ShaderMaterial_7hmde") -mesh = ExtResource("5_k1ij8") -skeleton = NodePath("") - -[node name="OmniLight3D" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 41.7658, 4.40309, 2.30073) -light_color = Color(0.871013, 0.66119, 0.457878, 1) -light_size = 0.2 -shadow_enabled = true -omni_range = 7.0 - -[node name="OmniLight3D2" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 32.5267, 4.40309, 2.30073) -light_color = Color(0.871013, 0.66119, 0.457878, 1) -light_size = 0.2 -shadow_enabled = true -omni_range = 7.0 - -[node name="OmniLight3D3" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 24.2704, 4.40309, 2.30073) -light_color = Color(0.871013, 0.66119, 0.457878, 1) -light_size = 0.2 -shadow_enabled = true -omni_range = 7.0 - -[node name="OmniLight3D4" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 15.602, 4.40309, 2.30073) -light_color = Color(0.871013, 0.66119, 0.457878, 1) -light_size = 0.2 -shadow_enabled = true -omni_range = 7.0 - -[node name="OmniLight3D5" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.14971, 4.40309, 2.30073) -light_color = Color(0.871013, 0.66119, 0.457878, 1) -light_size = 0.2 -shadow_enabled = true -omni_range = 7.0 - -[node name="OmniLight3D11" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 41.7658, 4.40309, -8.55641) -light_color = Color(0.871013, 0.66119, 0.457878, 1) -light_size = 0.2 -shadow_enabled = true -omni_range = 7.0 - -[node name="OmniLight3D12" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 32.5267, 4.40309, -8.55641) -light_color = Color(0.871013, 0.66119, 0.457878, 1) -light_size = 0.2 -shadow_enabled = true -omni_range = 7.0 - -[node name="OmniLight3D13" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 24.2704, 4.40309, -8.55641) -light_color = Color(0.871013, 0.66119, 0.457878, 1) -light_size = 0.2 -shadow_enabled = true -omni_range = 7.0 - -[node name="OmniLight3D14" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 15.602, 4.40309, -8.55641) -light_color = Color(0.871013, 0.66119, 0.457878, 1) -light_size = 0.2 -shadow_enabled = true -omni_range = 7.0 - -[node name="OmniLight3D15" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.14971, 4.40309, -8.55641) -light_color = Color(0.871013, 0.66119, 0.457878, 1) -light_size = 0.2 -shadow_enabled = true -omni_range = 7.0 - -[node name="firs_station" parent="." instance=ExtResource("6_uyfv5")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 33.6871, 1.17329, 0) - -[node name="OmniLight3D6" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 45.9976, 3.75855, 4.16173) -light_color = Color(0.446025, 0.787512, 0.665755, 1) -light_size = 0.2 -shadow_enabled = true -omni_range = 7.0 - -[node name="OmniLight3D7" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 36.7586, 3.75855, 4.16173) -light_color = Color(0.446025, 0.787512, 0.665755, 1) -light_size = 0.2 -shadow_enabled = true -omni_range = 7.0 - -[node name="OmniLight3D8" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 28.5022, 3.75855, 4.16173) -visible = false -light_color = Color(0.446025, 0.787512, 0.665755, 1) -light_size = 0.2 -shadow_enabled = true -omni_range = 7.0 - -[node name="OmniLight3D9" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 19.8339, 3.75855, 4.16173) -light_color = Color(0.446025, 0.787512, 0.665755, 1) -light_size = 0.2 -shadow_enabled = true -omni_range = 7.0 - -[node name="OmniLight3D10" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 11.3815, 3.75855, 4.16173) -light_color = Color(0.446025, 0.787512, 0.665755, 1) -light_size = 0.2 -shadow_enabled = true -omni_range = 7.0 - -[node name="MeshInstance3D" type="MeshInstance3D" parent="OmniLight3D10"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -1.94099) -material_override = SubResource("ShaderMaterial_3f5xe") -mesh = SubResource("QuadMesh_po8v1") - -[node name="WorldEnvironment" type="WorldEnvironment" parent="."] -environment = SubResource("Environment_wlhyl") - -[node name="OmniLight3D" type="OmniLight3D" parent="WorldEnvironment"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 26.654, -0.124089, -0.0374017) -light_color = Color(0.741993, 0.313645, 0.954721, 1) -light_energy = 4.0 -light_size = 1.0 -shadow_enabled = true -omni_range = 7.0561 - -[node name="OmniLight3D2" type="OmniLight3D" parent="WorldEnvironment"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 44.156, -0.124089, -0.0374017) -light_color = Color(0.741993, 0.313645, 0.954721, 1) -light_energy = 4.0 -light_size = 1.0 -shadow_enabled = true -omni_range = 7.0561 - -[node name="FogVolume" type="FogVolume" parent="WorldEnvironment"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 29.5439, 1.63094, -2.71465) -size = Vector3(60, 5, 40) -material = SubResource("FogMaterial_hxa53") - -[node name="GPUParticles3D" type="GPUParticles3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 25.8524, 2.40937, 0.116003) -sorting_offset = 100.0 -material_override = SubResource("ShaderMaterial_6a7ft") -amount = 20 -lifetime = 4.0 -randomness = 0.55 -draw_order = 3 -process_material = SubResource("ParticleProcessMaterial_dw2id") -draw_pass_1 = SubResource("QuadMesh_qanh3") diff --git a/src/base-environments/transition/import/Banco.tres b/src/base-environments/transition/import/Banco.tres index 5f38c24..fe0c332 100644 --- a/src/base-environments/transition/import/Banco.tres +++ b/src/base-environments/transition/import/Banco.tres @@ -7,7 +7,6 @@ [resource] resource_name = "Banco" albedo_texture = ExtResource("1_coy2j") -metallic = 1.0 metallic_texture = ExtResource("2_x1do5") metallic_texture_channel = 2 roughness_texture = ExtResource("2_x1do5") diff --git a/src/base-environments/transition/import/ceiling.tres b/src/base-environments/transition/import/ceiling.tres new file mode 100644 index 0000000..4032575 --- /dev/null +++ b/src/base-environments/transition/import/ceiling.tres @@ -0,0 +1,25 @@ +[gd_resource type="StandardMaterial3D" load_steps=5 format=3 uid="uid://6wu2p36l7yay"] + +[ext_resource type="Texture2D" uid="uid://bgyq1g25s6bao" path="res://base-environments/transition/import/textures/ceiling_baseColor.png" id="1_hdg72"] +[ext_resource type="Texture2D" uid="uid://bpil3hdolc26t" path="res://base-environments/transition/import/textures/ceiling_mrao.png" id="2_5s2hl"] +[ext_resource type="Texture2D" uid="uid://c72x8cgs8l72m" path="res://base-environments/transition/import/textures/ceiling_emissive.png" id="3_7ugg4"] +[ext_resource type="Texture2D" uid="uid://i6r37mqdrhk8" path="res://base-environments/transition/import/textures/ceiling_normal.png" id="4_fq38w"] + +[resource] +resource_name = "ceiling" +albedo_texture = ExtResource("1_hdg72") +albedo_texture_force_srgb = true +metallic = 1.0 +metallic_texture = ExtResource("2_5s2hl") +metallic_texture_channel = 2 +roughness_texture = ExtResource("2_5s2hl") +roughness_texture_channel = 1 +emission_enabled = true +emission = Color(0.663322, 0.553828, 0.464384, 1) +emission_energy_multiplier = 5.0 +emission_operator = 1 +emission_texture = ExtResource("3_7ugg4") +normal_enabled = true +normal_texture = ExtResource("4_fq38w") +ao_enabled = true +ao_texture = ExtResource("2_5s2hl") diff --git a/src/base-environments/transition/import/firs_station.glb b/src/base-environments/transition/import/firs_station.glb deleted file mode 100644 index 43809cf..0000000 --- a/src/base-environments/transition/import/firs_station.glb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9632dec9971a22f66ac5c66f711ccd343a37f3c99823a5bd69cd21101ba037a7 -size 6354252 diff --git a/src/base-environments/transition/import/firs_station.glb.import b/src/base-environments/transition/import/firs_station.glb.import deleted file mode 100644 index 6ed4a74..0000000 --- a/src/base-environments/transition/import/firs_station.glb.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="scene" -importer_version=1 -type="PackedScene" -uid="uid://cr7g2bkunq7vh" -path="res://.godot/imported/firs_station.glb-df7fd2d8a5f3d70941f23c6abb363b4e.scn" - -[deps] - -source_file="res://base-environments/transition/import/firs_station.glb" -dest_files=["res://.godot/imported/firs_station.glb-df7fd2d8a5f3d70941f23c6abb363b4e.scn"] - -[params] - -nodes/root_type="" -nodes/root_name="" -nodes/apply_root_scale=true -nodes/root_scale=1.0 -nodes/import_as_skeleton_bones=false -nodes/use_node_type_suffixes=true -meshes/ensure_tangents=true -meshes/generate_lods=true -meshes/create_shadow_meshes=true -meshes/light_baking=1 -meshes/lightmap_texel_size=0.2 -meshes/force_disable_compression=false -skins/use_named_skins=true -animation/import=true -animation/fps=30 -animation/trimming=false -animation/remove_immutable_tracks=true -animation/import_rest_as_RESET=false -import_script/path="" -_subresources={} -gltf/naming_version=1 -gltf/embedded_image_handling=1 diff --git a/src/base-environments/transition/import/first_station.glb.import b/src/base-environments/transition/import/first_station.glb.import index 47fbe60..c580210 100644 --- a/src/base-environments/transition/import/first_station.glb.import +++ b/src/base-environments/transition/import/first_station.glb.import @@ -140,6 +140,14 @@ _subresources={ } }, "meshes": { +"first_station_escalator_floor": { +"generate/lightmap_uv": 0, +"generate/lods": 2, +"generate/shadow_meshes": 0, +"lods/normal_merge_angle": 60.0, +"save_to_file/enabled": false, +"save_to_file/path": "" +}, "first_station_escalator_stairs": { "generate/lightmap_uv": 0, "generate/lods": 2, diff --git a/src/base-environments/transition/import/main_interiour.tres b/src/base-environments/transition/import/main_interiour.tres new file mode 100644 index 0000000..8baed77 --- /dev/null +++ b/src/base-environments/transition/import/main_interiour.tres @@ -0,0 +1,16 @@ +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://2em44il3jvc1"] + +[ext_resource type="Texture2D" uid="uid://1ksxpyr61cel" path="res://base-environments/transition/import/textures/interiour_albedo.png" id="1_h065x"] +[ext_resource type="Texture2D" uid="uid://cqav6y2p3ss37" path="res://base-environments/transition/import/textures/interiour_mrao.png" id="2_275kg"] +[ext_resource type="Texture2D" uid="uid://bl1b5sung7xww" path="res://base-environments/transition/import/textures/interiour_normal.png" id="3_21l8m"] + +[resource] +resource_name = "main_interiour" +albedo_texture = ExtResource("1_h065x") +metallic = 1.0 +metallic_texture = ExtResource("2_275kg") +metallic_texture_channel = 2 +roughness_texture = ExtResource("2_275kg") +roughness_texture_channel = 1 +normal_enabled = true +normal_texture = ExtResource("3_21l8m") diff --git a/src/base-environments/transition/import/next_room_peak.tres b/src/base-environments/transition/import/next_room_peak.tres index 74472e3..2bb595d 100644 --- a/src/base-environments/transition/import/next_room_peak.tres +++ b/src/base-environments/transition/import/next_room_peak.tres @@ -7,3 +7,4 @@ albedo_color = Color(0, 0, 0, 1) metallic = 1.0 emission_enabled = true emission = Color(0.0748178, 0.134808, 0.168364, 1) +emission_energy_multiplier = 3.0 diff --git a/src/base-environments/transition/import/seats.tres b/src/base-environments/transition/import/seats.tres new file mode 100644 index 0000000..5932e3a --- /dev/null +++ b/src/base-environments/transition/import/seats.tres @@ -0,0 +1,20 @@ +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://dluvpqvy1vy4t"] + +[ext_resource type="Texture2D" uid="uid://csr1oxv8o4xeg" path="res://base-environments/transition/import/textures/seats_Base_Color.png" id="1_6tcpn"] +[ext_resource type="Texture2D" uid="uid://dcbogkomaq87r" path="res://base-environments/transition/import/textures/seats_mrao.png" id="2_b7nsj"] +[ext_resource type="Texture2D" uid="uid://d0dn07r8cxhgi" path="res://base-environments/transition/import/textures/seats_Normal_DirectX.png" id="3_504aj"] + +[resource] +resource_name = "seats" +cull_mode = 2 +albedo_color = Color(0.873298, 0.873298, 0.873298, 1) +albedo_texture = ExtResource("1_6tcpn") +metallic = 1.0 +metallic_texture = ExtResource("2_b7nsj") +metallic_texture_channel = 2 +roughness_texture = ExtResource("2_b7nsj") +roughness_texture_channel = 1 +normal_enabled = true +normal_texture = ExtResource("3_504aj") +ao_enabled = true +ao_texture = ExtResource("2_b7nsj") diff --git a/src/base-environments/transition/import/signal_lights.tres b/src/base-environments/transition/import/signal_lights.tres index 5307a71..9866b47 100644 --- a/src/base-environments/transition/import/signal_lights.tres +++ b/src/base-environments/transition/import/signal_lights.tres @@ -9,6 +9,8 @@ resource_name = "signal_lights" albedo_color = Color(1.5, 1.5, 1.5, 1) albedo_texture = ExtResource("1_fu6hv") +metallic = 1.0 +metallic_texture = ExtResource("2_lrk4v") metallic_texture_channel = 1 roughness_texture = ExtResource("2_lrk4v") roughness_texture_channel = 1 diff --git a/src/base-environments/transition/import/station_metal.tres b/src/base-environments/transition/import/station_metal.tres index c4210cc..171be8a 100644 --- a/src/base-environments/transition/import/station_metal.tres +++ b/src/base-environments/transition/import/station_metal.tres @@ -7,7 +7,7 @@ resource_name = "station_metal" cull_mode = 2 albedo_texture = ExtResource("1_dphdk") -metallic = 0.77 +metallic = 0.9 roughness = 0.4 roughness_texture = ExtResource("1_dphdk") normal_enabled = true diff --git a/src/base-environments/transition/import/subway_coat.tres b/src/base-environments/transition/import/subway_coat.tres new file mode 100644 index 0000000..4c2a346 --- /dev/null +++ b/src/base-environments/transition/import/subway_coat.tres @@ -0,0 +1,7 @@ +[gd_resource type="StandardMaterial3D" format=3 uid="uid://bqo0oxige18et"] + +[resource] +resource_name = "subway_coat" +cull_mode = 2 +albedo_color = Color(0.383873, 0.76223, 0.906363, 1) +roughness = 0.621101 diff --git a/src/base-environments/transition/import/subway_train.glb b/src/base-environments/transition/import/subway_train.glb new file mode 100644 index 0000000..46552f7 --- /dev/null +++ b/src/base-environments/transition/import/subway_train.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a17cfce408b68822c9429b2c1675fce1cde5a2f40bc3c13c95d541e90dfd1f02 +size 3807808 diff --git a/src/base-environments/transition/import/subway_train.glb.import b/src/base-environments/transition/import/subway_train.glb.import new file mode 100644 index 0000000..545f024 --- /dev/null +++ b/src/base-environments/transition/import/subway_train.glb.import @@ -0,0 +1,82 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://dotekvpr6rytk" +path="res://.godot/imported/subway_train.glb-90a429b5aca492471f3f9472724bd3f0.scn" + +[deps] + +source_file="res://base-environments/transition/import/subway_train.glb" +dest_files=["res://.godot/imported/subway_train.glb-90a429b5aca492471f3f9472724bd3f0.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +_subresources={ +"materials": { +"ceiling": { +"use_external/enabled": true, +"use_external/path": "res://base-environments/transition/import/ceiling.tres" +}, +"escalator_rim": { +"use_external/enabled": true, +"use_external/path": "res://base-environments/transition/import/escalator_rim.tres" +}, +"main_interiour": { +"use_external/enabled": true, +"use_external/path": "res://base-environments/transition/import/main_interiour.tres" +}, +"seats": { +"use_external/enabled": true, +"use_external/path": "res://base-environments/transition/import/seats.tres" +}, +"subway_coat": { +"use_external/enabled": true, +"use_external/path": "res://base-environments/transition/import/subway_coat.tres" +}, +"train_floor": { +"use_external/enabled": true, +"use_external/path": "res://base-environments/transition/import/train_floor.tres" +}, +"train_misc": { +"use_external/enabled": true, +"use_external/path": "res://base-environments/transition/import/train_misc.tres" +}, +"undercarriage": { +"use_external/enabled": true, +"use_external/path": "res://base-environments/transition/import/undercarriage.tres" +} +}, +"meshes": { +"subway_train_ParedesLateralesInterior_LP_008_LateralesInteriores_0_001": { +"generate/lightmap_uv": 0, +"generate/lods": 2, +"generate/shadow_meshes": 0, +"lods/normal_merge_angle": 60.0, +"save_to_file/enabled": false, +"save_to_file/path": "" +} +} +} +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/src/base-environments/transition/import/textures/BajosExterioresTren_baseColor_2K.png.import b/src/base-environments/transition/import/textures/BajosExterioresTren_baseColor_2K.png.import new file mode 100644 index 0000000..2764eb3 --- /dev/null +++ b/src/base-environments/transition/import/textures/BajosExterioresTren_baseColor_2K.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ctjapro0nbvvv" +path="res://.godot/imported/BajosExterioresTren_baseColor_2K.png-05de8d5bd3eff68480ec2b6e610f16b2.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://base-environments/transition/import/textures/BajosExterioresTren_baseColor_2K.png" +dest_files=["res://.godot/imported/BajosExterioresTren_baseColor_2K.png-05de8d5bd3eff68480ec2b6e610f16b2.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +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/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/src/base-environments/transition/import/textures/FluorescenteLuz.tres b/src/base-environments/transition/import/textures/FluorescenteLuz.tres index 81315d2..0f229bb 100644 --- a/src/base-environments/transition/import/textures/FluorescenteLuz.tres +++ b/src/base-environments/transition/import/textures/FluorescenteLuz.tres @@ -12,7 +12,7 @@ metallic_texture = ExtResource("3_nfygd") roughness_texture = ExtResource("3_nfygd") roughness_texture_channel = 1 emission_enabled = true -emission = Color(1, 0.763716, 0.558479, 1) -emission_energy_multiplier = 5.0 +emission = Color(0.953007, 0.768561, 0.732701, 1) +emission_energy_multiplier = 10.0 emission_operator = 1 emission_texture = ExtResource("2_4fu4b") diff --git a/src/base-environments/transition/import/textures/MAT_SEATS_Metallic.png b/src/base-environments/transition/import/textures/MAT_SEATS_Metallic.png new file mode 100644 index 0000000..c42bff4 --- /dev/null +++ b/src/base-environments/transition/import/textures/MAT_SEATS_Metallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b05ebd8605bb94fe4f2f7c4d35d01a3b5687247639edcf79844e91bba7045f11 +size 57390 diff --git a/src/base-environments/transition/import/textures/MAT_SEATS_Metallic.png.import b/src/base-environments/transition/import/textures/MAT_SEATS_Metallic.png.import new file mode 100644 index 0000000..8489958 --- /dev/null +++ b/src/base-environments/transition/import/textures/MAT_SEATS_Metallic.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dx33nv66wvweg" +path="res://.godot/imported/MAT_SEATS_Metallic.png-fd16a82119c6d84e450a2a6401c5fd9a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://base-environments/transition/import/textures/MAT_SEATS_Metallic.png" +dest_files=["res://.godot/imported/MAT_SEATS_Metallic.png-fd16a82119c6d84e450a2a6401c5fd9a.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +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/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/src/base-environments/transition/import/textures/MAT_SEATS_Mixed_AO.png b/src/base-environments/transition/import/textures/MAT_SEATS_Mixed_AO.png new file mode 100644 index 0000000..d39df86 --- /dev/null +++ b/src/base-environments/transition/import/textures/MAT_SEATS_Mixed_AO.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:740fa8733b11024b657e50bc9bca8ba0bbdee996c77f39b04768b59b7b4daf48 +size 1050055 diff --git a/src/base-environments/transition/import/textures/MAT_SEATS_Mixed_AO.png.import b/src/base-environments/transition/import/textures/MAT_SEATS_Mixed_AO.png.import new file mode 100644 index 0000000..8cedd38 --- /dev/null +++ b/src/base-environments/transition/import/textures/MAT_SEATS_Mixed_AO.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b8ksqbhfxa3wb" +path="res://.godot/imported/MAT_SEATS_Mixed_AO.png-43443fe56b06ab17a94b48561bc96f57.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://base-environments/transition/import/textures/MAT_SEATS_Mixed_AO.png" +dest_files=["res://.godot/imported/MAT_SEATS_Mixed_AO.png-43443fe56b06ab17a94b48561bc96f57.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +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/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/src/base-environments/transition/import/textures/ceiling_baseColor.png b/src/base-environments/transition/import/textures/ceiling_baseColor.png new file mode 100644 index 0000000..4a3a116 --- /dev/null +++ b/src/base-environments/transition/import/textures/ceiling_baseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:46b673fa6a6974fa2a684f70290d5c4f77d2b4f77c6dd10a06348bf2903ee37c +size 7567685 diff --git a/src/base-environments/transition/import/textures/ceiling_baseColor.png.import b/src/base-environments/transition/import/textures/ceiling_baseColor.png.import new file mode 100644 index 0000000..41ca69d --- /dev/null +++ b/src/base-environments/transition/import/textures/ceiling_baseColor.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bgyq1g25s6bao" +path.s3tc="res://.godot/imported/ceiling_baseColor.png-8970c9d7bb0e149cc14f143da8c27c69.s3tc.ctex" +path.etc2="res://.godot/imported/ceiling_baseColor.png-8970c9d7bb0e149cc14f143da8c27c69.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://base-environments/transition/import/textures/ceiling_baseColor.png" +dest_files=["res://.godot/imported/ceiling_baseColor.png-8970c9d7bb0e149cc14f143da8c27c69.s3tc.ctex", "res://.godot/imported/ceiling_baseColor.png-8970c9d7bb0e149cc14f143da8c27c69.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +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=0 diff --git a/src/base-environments/transition/import/textures/ceiling_emissive.png b/src/base-environments/transition/import/textures/ceiling_emissive.png new file mode 100644 index 0000000..5724d37 --- /dev/null +++ b/src/base-environments/transition/import/textures/ceiling_emissive.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a74985fb7d9c4c9cb6a40b14ec01cec7046105ad0113618342b04b0ff9ba038c +size 720527 diff --git a/src/base-environments/transition/import/textures/ceiling_emissive.png.import b/src/base-environments/transition/import/textures/ceiling_emissive.png.import new file mode 100644 index 0000000..f1cfe12 --- /dev/null +++ b/src/base-environments/transition/import/textures/ceiling_emissive.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c72x8cgs8l72m" +path.s3tc="res://.godot/imported/ceiling_emissive.png-97d8b4510145166129806bc0f88a20db.s3tc.ctex" +path.etc2="res://.godot/imported/ceiling_emissive.png-97d8b4510145166129806bc0f88a20db.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://base-environments/transition/import/textures/ceiling_emissive.png" +dest_files=["res://.godot/imported/ceiling_emissive.png-97d8b4510145166129806bc0f88a20db.s3tc.ctex", "res://.godot/imported/ceiling_emissive.png-97d8b4510145166129806bc0f88a20db.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +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=0 diff --git a/src/base-environments/transition/import/textures/ceiling_mrao.png b/src/base-environments/transition/import/textures/ceiling_mrao.png new file mode 100644 index 0000000..1cd95ba --- /dev/null +++ b/src/base-environments/transition/import/textures/ceiling_mrao.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:07818d8908ec46a903afce9efe9e3e3960909381b07949c2021d41ea63470491 +size 647863 diff --git a/src/base-environments/transition/import/textures/ceiling_mrao.png.import b/src/base-environments/transition/import/textures/ceiling_mrao.png.import new file mode 100644 index 0000000..6e6a917 --- /dev/null +++ b/src/base-environments/transition/import/textures/ceiling_mrao.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bpil3hdolc26t" +path.s3tc="res://.godot/imported/ceiling_mrao.png-3e2985d5f992ff387472602836d0f8c1.s3tc.ctex" +path.etc2="res://.godot/imported/ceiling_mrao.png-3e2985d5f992ff387472602836d0f8c1.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://base-environments/transition/import/textures/ceiling_mrao.png" +dest_files=["res://.godot/imported/ceiling_mrao.png-3e2985d5f992ff387472602836d0f8c1.s3tc.ctex", "res://.godot/imported/ceiling_mrao.png-3e2985d5f992ff387472602836d0f8c1.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=3 +roughness/src_normal="" +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=0 diff --git a/src/base-environments/transition/import/textures/ceiling_normal.png b/src/base-environments/transition/import/textures/ceiling_normal.png new file mode 100644 index 0000000..5d34fb7 --- /dev/null +++ b/src/base-environments/transition/import/textures/ceiling_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3320b15676c36bcb842669c18d549050e693ccdd7965eb651d9d9a5f873e2c8f +size 19951641 diff --git a/src/base-environments/transition/import/textures/ceiling_normal.png.import b/src/base-environments/transition/import/textures/ceiling_normal.png.import new file mode 100644 index 0000000..2b91555 --- /dev/null +++ b/src/base-environments/transition/import/textures/ceiling_normal.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://i6r37mqdrhk8" +path.s3tc="res://.godot/imported/ceiling_normal.png-730ff3a2f8e6db813c29e7d76925959a.s3tc.ctex" +path.etc2="res://.godot/imported/ceiling_normal.png-730ff3a2f8e6db813c29e7d76925959a.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://base-environments/transition/import/textures/ceiling_normal.png" +dest_files=["res://.godot/imported/ceiling_normal.png-730ff3a2f8e6db813c29e7d76925959a.s3tc.ctex", "res://.godot/imported/ceiling_normal.png-730ff3a2f8e6db813c29e7d76925959a.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=1 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=1 +roughness/src_normal="res://base-environments/transition/import/textures/ceiling_normal.png" +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=0 diff --git a/src/base-environments/transition/import/textures/LateralesInteriores_baseColor_upscayl_2x_remacri.png b/src/base-environments/transition/import/textures/interiour_albedo.png similarity index 100% rename from src/base-environments/transition/import/textures/LateralesInteriores_baseColor_upscayl_2x_remacri.png rename to src/base-environments/transition/import/textures/interiour_albedo.png diff --git a/src/base-environments/transition/import/textures/interiour_albedo.png.import b/src/base-environments/transition/import/textures/interiour_albedo.png.import new file mode 100644 index 0000000..a0547e3 --- /dev/null +++ b/src/base-environments/transition/import/textures/interiour_albedo.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://1ksxpyr61cel" +path.s3tc="res://.godot/imported/interiour_albedo.png-dfea48fba5a17ab7160e70bc993da165.s3tc.ctex" +path.etc2="res://.godot/imported/interiour_albedo.png-dfea48fba5a17ab7160e70bc993da165.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://base-environments/transition/import/textures/interiour_albedo.png" +dest_files=["res://.godot/imported/interiour_albedo.png-dfea48fba5a17ab7160e70bc993da165.s3tc.ctex", "res://.godot/imported/interiour_albedo.png-dfea48fba5a17ab7160e70bc993da165.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +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=0 diff --git a/src/base-environments/transition/import/textures/interiour_mrao.png b/src/base-environments/transition/import/textures/interiour_mrao.png new file mode 100644 index 0000000..50bc8d9 --- /dev/null +++ b/src/base-environments/transition/import/textures/interiour_mrao.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9536befdaf5cba28f8285a4869aeee368f645e5c860473cd0b6557ce175c077 +size 2398263 diff --git a/src/base-environments/transition/import/textures/interiour_mrao.png.import b/src/base-environments/transition/import/textures/interiour_mrao.png.import new file mode 100644 index 0000000..c5074c9 --- /dev/null +++ b/src/base-environments/transition/import/textures/interiour_mrao.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cqav6y2p3ss37" +path.s3tc="res://.godot/imported/interiour_mrao.png-2e33639be1a5bf01555cda9b976def7e.s3tc.ctex" +path.etc2="res://.godot/imported/interiour_mrao.png-2e33639be1a5bf01555cda9b976def7e.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://base-environments/transition/import/textures/interiour_mrao.png" +dest_files=["res://.godot/imported/interiour_mrao.png-2e33639be1a5bf01555cda9b976def7e.s3tc.ctex", "res://.godot/imported/interiour_mrao.png-2e33639be1a5bf01555cda9b976def7e.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +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=0 diff --git a/src/base-environments/transition/import/textures/interiour_normal.png b/src/base-environments/transition/import/textures/interiour_normal.png new file mode 100644 index 0000000..d29d2e4 --- /dev/null +++ b/src/base-environments/transition/import/textures/interiour_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3fbc2e8d7f0d929bf40cc1a05677e7d39b94e26a53972981a9af6a45e26a8316 +size 3623021 diff --git a/src/base-environments/transition/import/textures/interiour_normal.png.import b/src/base-environments/transition/import/textures/interiour_normal.png.import new file mode 100644 index 0000000..c8fa9d8 --- /dev/null +++ b/src/base-environments/transition/import/textures/interiour_normal.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bl1b5sung7xww" +path.s3tc="res://.godot/imported/interiour_normal.png-9ff07aeb19f1f3ac00fc67e9c3b44d51.s3tc.ctex" +path.etc2="res://.godot/imported/interiour_normal.png-9ff07aeb19f1f3ac00fc67e9c3b44d51.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://base-environments/transition/import/textures/interiour_normal.png" +dest_files=["res://.godot/imported/interiour_normal.png-9ff07aeb19f1f3ac00fc67e9c3b44d51.s3tc.ctex", "res://.godot/imported/interiour_normal.png-9ff07aeb19f1f3ac00fc67e9c3b44d51.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=1 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=1 +roughness/src_normal="res://base-environments/transition/import/textures/interiour_normal.png" +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=0 diff --git a/src/base-environments/transition/import/textures/seats_Base_Color.png b/src/base-environments/transition/import/textures/seats_Base_Color.png new file mode 100644 index 0000000..a80517e --- /dev/null +++ b/src/base-environments/transition/import/textures/seats_Base_Color.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eebc59e47b6e0aabbf511da51d26b053ca30fb8dfea814959d5e1118247070e1 +size 5198360 diff --git a/src/base-environments/transition/import/textures/seats_Base_Color.png.import b/src/base-environments/transition/import/textures/seats_Base_Color.png.import new file mode 100644 index 0000000..7440194 --- /dev/null +++ b/src/base-environments/transition/import/textures/seats_Base_Color.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://csr1oxv8o4xeg" +path.s3tc="res://.godot/imported/seats_Base_Color.png-c8d7da91e688d70dadc5797edbd7c819.s3tc.ctex" +path.etc2="res://.godot/imported/seats_Base_Color.png-c8d7da91e688d70dadc5797edbd7c819.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://base-environments/transition/import/textures/seats_Base_Color.png" +dest_files=["res://.godot/imported/seats_Base_Color.png-c8d7da91e688d70dadc5797edbd7c819.s3tc.ctex", "res://.godot/imported/seats_Base_Color.png-c8d7da91e688d70dadc5797edbd7c819.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +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=0 diff --git a/src/base-environments/transition/import/textures/seats_Normal_DirectX.png b/src/base-environments/transition/import/textures/seats_Normal_DirectX.png new file mode 100644 index 0000000..ee4dcfe --- /dev/null +++ b/src/base-environments/transition/import/textures/seats_Normal_DirectX.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0235c1e38dbace0ac4b84b9982301b229e2b9a6cdab9f3c7f5258593be8013ab +size 4699629 diff --git a/src/base-environments/transition/import/textures/seats_Normal_DirectX.png.import b/src/base-environments/transition/import/textures/seats_Normal_DirectX.png.import new file mode 100644 index 0000000..34b83a7 --- /dev/null +++ b/src/base-environments/transition/import/textures/seats_Normal_DirectX.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d0dn07r8cxhgi" +path.s3tc="res://.godot/imported/seats_Normal_DirectX.png-4329c94774ececb28768f3f72383589b.s3tc.ctex" +path.etc2="res://.godot/imported/seats_Normal_DirectX.png-4329c94774ececb28768f3f72383589b.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://base-environments/transition/import/textures/seats_Normal_DirectX.png" +dest_files=["res://.godot/imported/seats_Normal_DirectX.png-4329c94774ececb28768f3f72383589b.s3tc.ctex", "res://.godot/imported/seats_Normal_DirectX.png-4329c94774ececb28768f3f72383589b.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=1 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=true +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/src/base-environments/transition/import/textures/seats_Roughness.png b/src/base-environments/transition/import/textures/seats_Roughness.png new file mode 100644 index 0000000..7246f8e --- /dev/null +++ b/src/base-environments/transition/import/textures/seats_Roughness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:981390ef9fb3d8e3ad47d29bcd60364deb5c58f97bda5b923d63254452359f1a +size 2992879 diff --git a/src/base-environments/transition/import/textures/seats_Roughness.png.import b/src/base-environments/transition/import/textures/seats_Roughness.png.import new file mode 100644 index 0000000..793c53b --- /dev/null +++ b/src/base-environments/transition/import/textures/seats_Roughness.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c5ye0ncnqer58" +path="res://.godot/imported/seats_Roughness.png-71e25f0a75e60a9c6740ffb60fcd1af6.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://base-environments/transition/import/textures/seats_Roughness.png" +dest_files=["res://.godot/imported/seats_Roughness.png-71e25f0a75e60a9c6740ffb60fcd1af6.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +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/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/src/base-environments/transition/import/textures/seats_mrao.png b/src/base-environments/transition/import/textures/seats_mrao.png new file mode 100644 index 0000000..424cb77 --- /dev/null +++ b/src/base-environments/transition/import/textures/seats_mrao.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b47c55c090d88bd680bb748da833cc262e9e2f3a3f10c5812052d6e1030f87eb +size 3609690 diff --git a/src/base-environments/transition/import/textures/seats_mrao.png.import b/src/base-environments/transition/import/textures/seats_mrao.png.import new file mode 100644 index 0000000..6c8acaa --- /dev/null +++ b/src/base-environments/transition/import/textures/seats_mrao.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dcbogkomaq87r" +path.s3tc="res://.godot/imported/seats_mrao.png-49ff97252e403a8bd7d86f116fc2cfd2.s3tc.ctex" +path.etc2="res://.godot/imported/seats_mrao.png-49ff97252e403a8bd7d86f116fc2cfd2.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://base-environments/transition/import/textures/seats_mrao.png" +dest_files=["res://.godot/imported/seats_mrao.png-49ff97252e403a8bd7d86f116fc2cfd2.s3tc.ctex", "res://.godot/imported/seats_mrao.png-49ff97252e403a8bd7d86f116fc2cfd2.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=8 +roughness/src_normal="res://base-environments/transition/import/textures/seats_Normal_DirectX.png" +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=0 diff --git a/src/base-environments/transition/import/textures/signal_lights_baseColor.jpeg b/src/base-environments/transition/import/textures/signal_lights_baseColor.jpeg index b02e60c..39763c8 100644 Binary files a/src/base-environments/transition/import/textures/signal_lights_baseColor.jpeg and b/src/base-environments/transition/import/textures/signal_lights_baseColor.jpeg differ diff --git a/src/base-environments/transition/import/textures/train_floor_baseColor.jpeg b/src/base-environments/transition/import/textures/train_floor_baseColor.jpeg new file mode 100644 index 0000000..2f7e9ec Binary files /dev/null and b/src/base-environments/transition/import/textures/train_floor_baseColor.jpeg differ diff --git a/src/base-environments/transition/import/textures/train_floor_baseColor.jpeg.import b/src/base-environments/transition/import/textures/train_floor_baseColor.jpeg.import new file mode 100644 index 0000000..64ad963 --- /dev/null +++ b/src/base-environments/transition/import/textures/train_floor_baseColor.jpeg.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://clwembgx6ejuh" +path.s3tc="res://.godot/imported/train_floor_baseColor.jpeg-10c580a7414fee0c28e4023a74a7fc4f.s3tc.ctex" +path.etc2="res://.godot/imported/train_floor_baseColor.jpeg-10c580a7414fee0c28e4023a74a7fc4f.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://base-environments/transition/import/textures/train_floor_baseColor.jpeg" +dest_files=["res://.godot/imported/train_floor_baseColor.jpeg-10c580a7414fee0c28e4023a74a7fc4f.s3tc.ctex", "res://.godot/imported/train_floor_baseColor.jpeg-10c580a7414fee0c28e4023a74a7fc4f.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +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=0 diff --git a/src/base-environments/transition/import/textures/train_floor_mr.png b/src/base-environments/transition/import/textures/train_floor_mr.png new file mode 100644 index 0000000..d6856c6 --- /dev/null +++ b/src/base-environments/transition/import/textures/train_floor_mr.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d3ad15874f79ad600e8cfca949a12644eafb42942745068757db59d2aa067d9 +size 2600220 diff --git a/src/base-environments/transition/import/textures/train_floor_mr.png.import b/src/base-environments/transition/import/textures/train_floor_mr.png.import new file mode 100644 index 0000000..5a1f4f5 --- /dev/null +++ b/src/base-environments/transition/import/textures/train_floor_mr.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dw63uy12ewids" +path.s3tc="res://.godot/imported/train_floor_mr.png-e2653489491af3b6f7a27c68190bb2bd.s3tc.ctex" +path.etc2="res://.godot/imported/train_floor_mr.png-e2653489491af3b6f7a27c68190bb2bd.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://base-environments/transition/import/textures/train_floor_mr.png" +dest_files=["res://.godot/imported/train_floor_mr.png-e2653489491af3b6f7a27c68190bb2bd.s3tc.ctex", "res://.godot/imported/train_floor_mr.png-e2653489491af3b6f7a27c68190bb2bd.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +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=0 diff --git a/src/base-environments/transition/import/textures/train_floor_normal.png b/src/base-environments/transition/import/textures/train_floor_normal.png new file mode 100644 index 0000000..f6eb6f1 --- /dev/null +++ b/src/base-environments/transition/import/textures/train_floor_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de99be3ee77795bfcb79e97c4e923523c405845e0ff4fe273227aac7c9c14c88 +size 3509859 diff --git a/src/base-environments/transition/import/textures/train_floor_normal.png.import b/src/base-environments/transition/import/textures/train_floor_normal.png.import new file mode 100644 index 0000000..09099f1 --- /dev/null +++ b/src/base-environments/transition/import/textures/train_floor_normal.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://byj4w5ox1jsfv" +path.s3tc="res://.godot/imported/train_floor_normal.png-900b0a2309e1dd688b7527a70b78301d.s3tc.ctex" +path.etc2="res://.godot/imported/train_floor_normal.png-900b0a2309e1dd688b7527a70b78301d.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://base-environments/transition/import/textures/train_floor_normal.png" +dest_files=["res://.godot/imported/train_floor_normal.png-900b0a2309e1dd688b7527a70b78301d.s3tc.ctex", "res://.godot/imported/train_floor_normal.png-900b0a2309e1dd688b7527a70b78301d.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=1 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=1 +roughness/src_normal="res://base-environments/transition/import/textures/train_floor_normal.png" +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=0 diff --git a/src/base-environments/transition/import/textures/train_misc_baseColor.png b/src/base-environments/transition/import/textures/train_misc_baseColor.png new file mode 100644 index 0000000..9b7eaef --- /dev/null +++ b/src/base-environments/transition/import/textures/train_misc_baseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c90396f68f39b9b019e59b47e4e22785e237cca8bd30fb7c8583b23175e4fab5 +size 1405248 diff --git a/src/base-environments/transition/import/textures/train_misc_baseColor.png.import b/src/base-environments/transition/import/textures/train_misc_baseColor.png.import new file mode 100644 index 0000000..73fe61c --- /dev/null +++ b/src/base-environments/transition/import/textures/train_misc_baseColor.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dvlogqjnv4yqw" +path="res://.godot/imported/train_misc_baseColor.png-108ac9d2c5f8b6d0a2a2ff68ee449e21.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://base-environments/transition/import/textures/train_misc_baseColor.png" +dest_files=["res://.godot/imported/train_misc_baseColor.png-108ac9d2c5f8b6d0a2a2ff68ee449e21.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +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/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/src/base-environments/transition/import/textures/train_misc_mrao.png b/src/base-environments/transition/import/textures/train_misc_mrao.png new file mode 100644 index 0000000..369e287 --- /dev/null +++ b/src/base-environments/transition/import/textures/train_misc_mrao.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:412521e8a97dc50f3039f622de226221b6a349e032dc95f987780946c3cfe624 +size 3940667 diff --git a/src/base-environments/transition/import/textures/train_misc_mrao.png.import b/src/base-environments/transition/import/textures/train_misc_mrao.png.import new file mode 100644 index 0000000..2d098fd --- /dev/null +++ b/src/base-environments/transition/import/textures/train_misc_mrao.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cnyacysnie1d7" +path.s3tc="res://.godot/imported/train_misc_mrao.png-32bf505f89303799b0b9af81bf3f82e8.s3tc.ctex" +path.etc2="res://.godot/imported/train_misc_mrao.png-32bf505f89303799b0b9af81bf3f82e8.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://base-environments/transition/import/textures/train_misc_mrao.png" +dest_files=["res://.godot/imported/train_misc_mrao.png-32bf505f89303799b0b9af81bf3f82e8.s3tc.ctex", "res://.godot/imported/train_misc_mrao.png-32bf505f89303799b0b9af81bf3f82e8.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=2 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +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=0 diff --git a/src/base-environments/transition/import/textures/train_misc_normal.png b/src/base-environments/transition/import/textures/train_misc_normal.png new file mode 100644 index 0000000..0fd8bd4 --- /dev/null +++ b/src/base-environments/transition/import/textures/train_misc_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3566de3c8f8ebd927c46dcbeffd5bccd67e80144f1b392ae370651357160eea4 +size 3715627 diff --git a/src/base-environments/transition/import/textures/train_misc_normal.png.import b/src/base-environments/transition/import/textures/train_misc_normal.png.import new file mode 100644 index 0000000..8f9c5ff --- /dev/null +++ b/src/base-environments/transition/import/textures/train_misc_normal.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ccp1g385ytavg" +path.s3tc="res://.godot/imported/train_misc_normal.png-8308e63ac90facca07c51ef69fb5ae54.s3tc.ctex" +path.etc2="res://.godot/imported/train_misc_normal.png-8308e63ac90facca07c51ef69fb5ae54.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://base-environments/transition/import/textures/train_misc_normal.png" +dest_files=["res://.godot/imported/train_misc_normal.png-8308e63ac90facca07c51ef69fb5ae54.s3tc.ctex", "res://.godot/imported/train_misc_normal.png-8308e63ac90facca07c51ef69fb5ae54.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=1 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=1 +roughness/src_normal="res://base-environments/transition/import/textures/train_misc_normal.png" +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=0 diff --git a/src/base-environments/transition/import/textures/BajosExterioresTren_baseColor_upscayl_2x_ultrasharp.png b/src/base-environments/transition/import/textures/undercarriage_baseColor_2K.png similarity index 100% rename from src/base-environments/transition/import/textures/BajosExterioresTren_baseColor_upscayl_2x_ultrasharp.png rename to src/base-environments/transition/import/textures/undercarriage_baseColor_2K.png diff --git a/src/base-environments/transition/import/textures/undercarriage_baseColor_2K.png.import b/src/base-environments/transition/import/textures/undercarriage_baseColor_2K.png.import new file mode 100644 index 0000000..cc117be --- /dev/null +++ b/src/base-environments/transition/import/textures/undercarriage_baseColor_2K.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dyv8u4nufyhkx" +path.s3tc="res://.godot/imported/undercarriage_baseColor_2K.png-fe47f89ad0735b2179197c4dbc109cbc.s3tc.ctex" +path.etc2="res://.godot/imported/undercarriage_baseColor_2K.png-fe47f89ad0735b2179197c4dbc109cbc.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://base-environments/transition/import/textures/undercarriage_baseColor_2K.png" +dest_files=["res://.godot/imported/undercarriage_baseColor_2K.png-fe47f89ad0735b2179197c4dbc109cbc.s3tc.ctex", "res://.godot/imported/undercarriage_baseColor_2K.png-fe47f89ad0735b2179197c4dbc109cbc.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +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=0 diff --git a/src/base-environments/transition/import/textures/undercarriage_mrao_1K.png b/src/base-environments/transition/import/textures/undercarriage_mrao_1K.png new file mode 100644 index 0000000..b41710c --- /dev/null +++ b/src/base-environments/transition/import/textures/undercarriage_mrao_1K.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e041606899c813168943b7e5b3aa1a2cc2699f69829ad48a786344e7195f6618 +size 1866964 diff --git a/src/base-environments/transition/import/textures/undercarriage_mrao_1K.png.import b/src/base-environments/transition/import/textures/undercarriage_mrao_1K.png.import new file mode 100644 index 0000000..7e7cf79 --- /dev/null +++ b/src/base-environments/transition/import/textures/undercarriage_mrao_1K.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cb46xwrh56lr1" +path.s3tc="res://.godot/imported/undercarriage_mrao_1K.png-c1382a00f0e248c812d9317909fa920e.s3tc.ctex" +path.etc2="res://.godot/imported/undercarriage_mrao_1K.png-c1382a00f0e248c812d9317909fa920e.etc2.ctex" +metadata={ +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true +} + +[deps] + +source_file="res://base-environments/transition/import/textures/undercarriage_mrao_1K.png" +dest_files=["res://.godot/imported/undercarriage_mrao_1K.png-c1382a00f0e248c812d9317909fa920e.s3tc.ctex", "res://.godot/imported/undercarriage_mrao_1K.png-c1382a00f0e248c812d9317909fa920e.etc2.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +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=0 diff --git a/src/base-environments/transition/import/train_floor.tres b/src/base-environments/transition/import/train_floor.tres new file mode 100644 index 0000000..9f0070d --- /dev/null +++ b/src/base-environments/transition/import/train_floor.tres @@ -0,0 +1,16 @@ +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://cwoovivhoimmq"] + +[ext_resource type="Texture2D" uid="uid://clwembgx6ejuh" path="res://base-environments/transition/import/textures/train_floor_baseColor.jpeg" id="1_heh2h"] +[ext_resource type="Texture2D" uid="uid://dw63uy12ewids" path="res://base-environments/transition/import/textures/train_floor_mr.png" id="2_dxaym"] +[ext_resource type="Texture2D" uid="uid://byj4w5ox1jsfv" path="res://base-environments/transition/import/textures/train_floor_normal.png" id="3_eyfwo"] + +[resource] +resource_name = "train_floor" +albedo_texture = ExtResource("1_heh2h") +metallic = 0.5 +metallic_texture = ExtResource("2_dxaym") +metallic_texture_channel = 2 +roughness_texture = ExtResource("2_dxaym") +roughness_texture_channel = 1 +normal_enabled = true +normal_texture = ExtResource("3_eyfwo") diff --git a/src/base-environments/transition/import/train_misc.tres b/src/base-environments/transition/import/train_misc.tres new file mode 100644 index 0000000..0256bc6 --- /dev/null +++ b/src/base-environments/transition/import/train_misc.tres @@ -0,0 +1,15 @@ +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://d2hhp14qovqkg"] + +[ext_resource type="Texture2D" uid="uid://cnyacysnie1d7" path="res://base-environments/transition/import/textures/train_misc_mrao.png" id="1_5juke"] +[ext_resource type="Texture2D" uid="uid://ccp1g385ytavg" path="res://base-environments/transition/import/textures/train_misc_normal.png" id="2_v8a0o"] + +[resource] +resource_name = "train_misc" +cull_mode = 2 +metallic = 1.0 +metallic_texture = ExtResource("1_5juke") +metallic_texture_channel = 2 +roughness_texture = ExtResource("1_5juke") +roughness_texture_channel = 1 +normal_enabled = true +normal_texture = ExtResource("2_v8a0o") diff --git a/src/base-environments/transition/import/undercarriage.tres b/src/base-environments/transition/import/undercarriage.tres new file mode 100644 index 0000000..c3cbe23 --- /dev/null +++ b/src/base-environments/transition/import/undercarriage.tres @@ -0,0 +1,15 @@ +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://cnkoneog6maye"] + +[ext_resource type="Texture2D" uid="uid://dyv8u4nufyhkx" path="res://base-environments/transition/import/textures/undercarriage_baseColor_2K.png" id="1_1kkwk"] +[ext_resource type="Texture2D" uid="uid://cb46xwrh56lr1" path="res://base-environments/transition/import/textures/undercarriage_mrao_1K.png" id="2_rhrwj"] + +[resource] +resource_name = "undercarriage" +cull_mode = 2 +albedo_texture = ExtResource("1_1kkwk") +metallic_texture = ExtResource("2_rhrwj") +metallic_texture_channel = 2 +roughness_texture = ExtResource("2_rhrwj") +roughness_texture_channel = 1 +ao_enabled = true +ao_texture = ExtResource("2_rhrwj") diff --git a/src/base-environments/transition/meeeep.res b/src/base-environments/transition/meeeep.res new file mode 100644 index 0000000..009e17b Binary files /dev/null and b/src/base-environments/transition/meeeep.res differ diff --git a/src/base-environments/transition/shaders/escalator_disp.gdshader b/src/base-environments/transition/shaders/escalator_disp.gdshader index 1bcd05e..27e0fb8 100644 --- a/src/base-environments/transition/shaders/escalator_disp.gdshader +++ b/src/base-environments/transition/shaders/escalator_disp.gdshader @@ -37,11 +37,14 @@ void vertex() { } void fragment() { - METALLIC = 0.9; - ALBEDO = texture(albedo_texture, UV).xyz * 1.5; + AO = min(1.0, mod(UV.y, 0.5)* 4.0 +0.2); + METALLIC = AO; + SPECULAR = 0.0; + ALBEDO = texture(albedo_texture, UV).xyz * 1.5 * AO;// * (mod(UV.y, 0.5)* 2.0); ROUGHNESS = texture(albedo_texture, UV).x*.7; NORMAL_MAP = texture(normal_map, UV).xyz; ALPHA = texture(albedo_texture, UV).w; + //EMISSION.g = float(EMISSION.r > 1.0); } //void light() { diff --git a/src/base-environments/transition/shaders/platform_foam.tres b/src/base-environments/transition/shaders/platform_foam.tres index 41bb51d..b9b1ac1 100644 --- a/src/base-environments/transition/shaders/platform_foam.tres +++ b/src/base-environments/transition/shaders/platform_foam.tres @@ -10,7 +10,7 @@ colors = PackedColorArray(0.177466, 0.446826, 0.531851, 1, 0.968177, 0.843068, 0 gradient = SubResource("Gradient_fttg7") [resource] -render_priority = 3 +render_priority = 1 shader = ExtResource("1_64pgk") shader_parameter/spray_texture = ExtResource("2_6cag6") shader_parameter/lifetime_gradient = SubResource("GradientTexture1D_df7bf") diff --git a/src/base-environments/transition/shaders/station_foam.gdshader b/src/base-environments/transition/shaders/station_foam.gdshader index 021f613..327d947 100644 --- a/src/base-environments/transition/shaders/station_foam.gdshader +++ b/src/base-environments/transition/shaders/station_foam.gdshader @@ -3,10 +3,11 @@ shader_type spatial; render_mode blend_mix, depth_draw_opaque, cull_back, diffuse_burley, specular_schlick_ggx; - uniform sampler2D spray_texture; uniform sampler2D lifetime_gradient; +uniform sampler2D SCREEN_TEXTURE: hint_screen_texture, repeat_disable; varying vec4 passtrough; +varying vec2 screen_pos; void vertex() { passtrough = INSTANCE_CUSTOM; @@ -33,10 +34,30 @@ void vertex() { MODELVIEW_NORMAL_MATRIX = mat3(MODELVIEW_MATRIX); - //passtrough = INSTANCE_CUSTOM; + // get instance position in view space + // vec3 view = (MODELVIEW_MATRIX * vec4(0.0, 0.0, 0.0, 1.0)).xyz; + // convert view space to clip space + // vec4 clip = PROJECTION_MATRIX * vec4( view, 1.0 ); + vec4 clip = PROJECTION_MATRIX * MODELVIEW_MATRIX[3]; + screen_pos = clip.xy/clip.w / 2.0 + 0.5; +} + +vec4 sample_blurred(sampler2D sample, vec2 uv, int iterations, float spread, float mipmap) { + float s_step = spread / float(iterations); + vec4 result = vec4(0); + uv -= spread/2.0; + + for (int x = 0; x 0.3 && (UV+disp).x < 0.7); + ALBEDO = texture(spark_texture, (UV + disp) * vec2(0.5, 0.5) + vec2(sin(TIME*0.2+COLOR.w*20.0)), 0.0).xyz * COLOR.xyz * float((UV+disp).x > 0.3 && (UV+disp).x < 0.7) * 2.0; //ALBEDO = vec3(float((disp-UV).y < 0.0)); } diff --git a/src/meeeeep.tscn b/src/meeeeep.tscn deleted file mode 100644 index b715f55..0000000 --- a/src/meeeeep.tscn +++ /dev/null @@ -1,20 +0,0 @@ -[gd_scene load_steps=2 format=3 uid="uid://dok5ty1o02wg3"] - -[sub_resource type="Resource" id="Resource_y00cx"] -metadata/__load_path__ = "res://addons/inputty/Rebind/InputRemap.gd" - -[node name="Control" type="Control"] -layout_mode = 3 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 - -[node name="InputRemap" type="Control" parent="."] -anchors_preset = 0 -offset_right = 40.0 -offset_bottom = 40.0 -script = SubResource("Resource_y00cx") -actionNames = Array[StringName]([&"player_right", &"player_left"]) -actionDisplayNames = Array[String](["walk left", "walk right"])