diff --git a/project/assets/environment/walls/metro_back.blend b/project/assets/environment/walls/metro_back.blend index 6b7ce3b5..23fdd799 100644 --- a/project/assets/environment/walls/metro_back.blend +++ b/project/assets/environment/walls/metro_back.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c45958a53512e409d0423d5d413ba290582e7690dc405f89042826cf92e6856 -size 94955 +oid sha256:83aee08b555344abedd73075215f7dbf05fb052c09f9f5e338ed03c523bc7cc4 +size 95054 diff --git a/project/assets/environment/walls/metro_back.blend1 b/project/assets/environment/walls/metro_back.blend1 index e7cfe901..ab557785 100644 Binary files a/project/assets/environment/walls/metro_back.blend1 and b/project/assets/environment/walls/metro_back.blend1 differ diff --git a/project/levels/station.tscn b/project/levels/station.tscn index 2d3840c6..b8f1334f 100644 --- a/project/levels/station.tscn +++ b/project/levels/station.tscn @@ -6,8 +6,12 @@ [ext_resource type="PackedScene" uid="uid://ckyx3uv0ttjbl" path="res://assets/environment/walls/metro_back.blend" id="4_ue8rc"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_mo284"] +sky_top_color = Color(0.50243366, 0.63148725, 0.86914206, 1) sky_horizon_color = Color(0.66224277, 0.6717428, 0.6867428, 1) +sky_curve = 6.9814385e-05 +ground_bottom_color = Color(0.1554, 0.17723998, 0.21, 1) ground_horizon_color = Color(0.66224277, 0.6717428, 0.6867428, 1) +ground_curve = 1e-05 [sub_resource type="Sky" id="Sky_ue8rc"] sky_material = SubResource("ProceduralSkyMaterial_mo284") @@ -16,6 +20,8 @@ sky_material = SubResource("ProceduralSkyMaterial_mo284") background_mode = 2 background_energy_multiplier = 1.11 sky = SubResource("Sky_ue8rc") +ambient_light_source = 2 +ambient_light_color = Color(0.5219292, 0.52192914, 0.5219292, 1) tonemap_mode = 2 glow_enabled = true @@ -31,49 +37,49 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.815383, 1.5223571, -2.4564 use_collision = true [node name="CSGBox3D5" type="CSGBox3D" parent="CSGCombiner3D" unique_id=1627404678] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.109503746, 5.214408, -23.658356) -size = Vector3(19.687622, 13.130496, 10.332764) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.109503746, 6.4121914, -23.658356) +size = Vector3(19.687622, 15.526064, 10.332764) material = ExtResource("2_mo284") [node name="CSGBox3D14" type="CSGBox3D" parent="CSGCombiner3D" unique_id=547192779] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.7318625, 7.8599772, -36.912334) -size = Vector3(16.895142, 8.637452, 0.6951904) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.5092978, 7.8599772, -37.043713) +size = Vector3(16.450012, 8.637452, 0.9579468) material = ExtResource("2_mo284") [node name="CSGBox3D12" type="CSGBox3D" parent="CSGCombiner3D" unique_id=786318085] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.768046, 7.6565127, -32.83026) -size = Vector3(0.69573975, 8.509523, 9.418884) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.654902, 8.854908, -32.83026) +size = Vector3(4.469452, 10.649109, 9.418884) material = ExtResource("2_mo284") [node name="CSGBox3D13" type="CSGBox3D" parent="CSGCombiner3D" unique_id=207597189] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.912941, 7.6565127, -32.63765) -size = Vector3(0.69573975, 8.509523, 9.033661) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.547296, 7.6565127, -32.63765) +size = Vector3(0.3703308, 8.509523, 9.033661) material = ExtResource("2_mo284") [node name="CSGBox3D15" type="CSGBox3D" parent="CSGCombiner3D" unique_id=1788258721] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.110395, 12.901361, -32.91986) -size = Vector3(16.452621, 3.091309, 9.239685) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.8096194, 12.775263, -32.91986) +size = Vector3(15.85107, 2.8391116, 9.239685) material = ExtResource("2_mo284") [node name="CSGBox3D8" type="CSGBox3D" parent="CSGCombiner3D" unique_id=1955739710] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.210968, 4.1506276, 8.826321) -size = Vector3(13.474609, 11.002935, 11.584106) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.84921265, 6.3841763, 8.826321) +size = Vector3(12.751099, 15.470034, 11.584106) material = ExtResource("2_mo284") [node name="CSGBox3D10" type="CSGBox3D" parent="CSGCombiner3D" unique_id=702769195] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.052964, 1.3243732, -8.7476225) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.584733, 1.6290789, -8.544305) operation = 2 -size = Vector3(9.779175, 4.8121567, 39.153114) +size = Vector3(6.8427124, 4.4414425, 38.74648) material = ExtResource("2_mo284") [node name="CSGBox3D11" type="CSGBox3D" parent="CSGCombiner3D" unique_id=1836105164] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.451482, 5.5881114, -23.369968) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.451482, 5.590849, -25.222355) operation = 2 -size = Vector3(4.255371, 3.0124874, 11.2335205) +size = Vector3(4.255371, 3.0179625, 7.5287476) material = ExtResource("2_mo284") [node name="CSGBox3D25" type="CSGBox3D" parent="CSGCombiner3D" unique_id=506189761] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.845521, 9.339064, -30.408113) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.251006, 9.339064, -30.408113) operation = 2 size = Vector3(1.5527191, 2.5620298, 2.3671875) material = ExtResource("2_mo284") @@ -108,19 +114,19 @@ size = Vector3(1.9196396, 2.5620298, 0.883728) material = ExtResource("2_mo284") [node name="CSGBox3D28" type="CSGBox3D" parent="CSGCombiner3D" unique_id=1015490547] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.4613438, 7.7443066, -30.879257) -size = Vector3(16.156097, 0.52505064, 5.897156) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.0322437, 7.7443066, -30.879257) +size = Vector3(15.297897, 0.52505064, 5.897156) material = ExtResource("2_mo284") [node name="CSGBox3D29" type="CSGBox3D" parent="CSGCombiner3D" unique_id=1486841991] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.8466625, 8.474831, -33.590454) -size = Vector3(11.38546, 1.1266267, 0.46700287) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.4207687, 8.474831, -33.590454) +size = Vector3(10.533672, 1.1266267, 0.46700287) material = ExtResource("2_mo284") [node name="CSGBox3D21" type="CSGBox3D" parent="CSGCombiner3D" unique_id=1772153654] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.7508593, 5.5881114, -20.004612) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.7508593, 5.757841, -20.004612) operation = 2 -size = Vector3(8.854126, 3.0124874, 3.1427002) +size = Vector3(8.854126, 3.3519468, 3.1427002) material = ExtResource("2_mo284") [node name="CSGBox3D" type="CSGBox3D" parent="CSGCombiner3D" unique_id=1477842451] @@ -139,8 +145,8 @@ size = Vector3(8.269325, 0.65649414, 24.244385) material = ExtResource("2_mo284") [node name="CSGBox3D2" type="CSGBox3D" parent="CSGCombiner3D" unique_id=1770911707] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.4146814, 4.8804526, -1.4636297) -size = Vector3(4.6047363, 10.110029, 11.224808) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.4146814, 6.96584, -1.4636297) +size = Vector3(4.6047363, 14.280804, 11.224808) material = ExtResource("2_mo284") [node name="CSGBox3D16" type="CSGBox3D" parent="CSGCombiner3D" unique_id=1307658919] @@ -179,23 +185,23 @@ size = Vector3(0.91259766, 11.370781, 24.244385) material = ExtResource("2_mo284") [node name="CSGBox3D3" type="CSGBox3D" parent="CSGCombiner3D" unique_id=343699581] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.1704865, 8.5111475, -12.692641) -size = Vector3(11.1875305, 2.8753128, 11.878021) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.1704865, 10.790789, -12.692641) +size = Vector3(11.1875305, 6.651376, 11.878021) material = ExtResource("2_mo284") [node name="CSGBox3D17" type="CSGBox3D" parent="CSGCombiner3D" unique_id=1466316467] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.074523926, 6.973794, -1.464263) -size = Vector3(12.81543, 6.2426224, 11.226074) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.44189453, 8.993101, -1.464263) +size = Vector3(13.550171, 10.281237, 11.226074) material = ExtResource("2_mo284") [node name="CSGBox3D20" type="CSGBox3D" parent="CSGCombiner3D" unique_id=150537856] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.1480103, 6.973794, -12.383407) -size = Vector3(6.668457, 6.2426224, 13) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.5048828, 9.0137005, -12.383407) +size = Vector3(7.382202, 10.322435, 13) material = ExtResource("2_mo284") [node name="CSGBox3D6" type="CSGBox3D" parent="CSGCombiner3D" unique_id=354823178] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.2911124, 8.024046, -30.842365) -size = Vector3(16.520233, 0.09698486, 5.8007813) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.869123, 8.024046, -30.842365) +size = Vector3(15.676254, 0.09698486, 5.8007813) material = ExtResource("1_skip2") [node name="CSGBox3D34" type="CSGBox3D" parent="CSGCombiner3D" unique_id=528831191] @@ -205,8 +211,8 @@ size = Vector3(2.4245815, 9.953438, 4.6257935) material = ExtResource("2_mo284") [node name="CSGBox3D4" type="CSGBox3D" parent="CSGCombiner3D" unique_id=74370443] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.501699, 4.004548, -27.982044) -size = Vector3(20.09906, 0.2545166, 18.97342) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.047673702, 4.004548, -27.982044) +size = Vector3(19.19101, 0.2545166, 18.97342) material = ExtResource("1_skip2") [node name="CSGPolygon3D2" type="CSGPolygon3D" parent="CSGCombiner3D" unique_id=668114836] @@ -220,83 +226,67 @@ polygon = PackedVector2Array(-2.4738445, 0.4203205, -2.6779785, 4.094781, -1.482 depth = 1.5 [node name="SpotLight3D" type="SpotLight3D" parent="." unique_id=1590880744] -transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, -2.3770125, 4.9774046, -0.2432988) -shadow_enabled = true -spot_range = 13.788 +transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, -3.0713458, 4.9774046, -0.2432988) +spot_range = 20.0 spot_angle = 74.29 spot_angle_attenuation = 1.0057905 [node name="SpotLight3D2" type="SpotLight3D" parent="." unique_id=442374293] transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, -2.3770125, 4.9774046, -5.673456) -shadow_enabled = true -spot_range = 13.788 +spot_range = 20.0 spot_angle = 74.29 spot_angle_attenuation = 1.0057905 [node name="SpotLight3D4" type="SpotLight3D" parent="." unique_id=1501327529] -transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, -2.1922183, 8.016026, -22.063036) -shadow_enabled = true -spot_range = 13.788 +transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, -1.9276824, 9.282884, -23.936111) +spot_range = 20.0 spot_angle = 74.29 spot_angle_attenuation = 1.0057905 [node name="SpotLight3D6" type="SpotLight3D" parent="." unique_id=685198879] transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, -2.1922183, 12.730174, -32.953) -shadow_enabled = true -spot_range = 13.788 +spot_range = 20.0 spot_angle = 74.29 spot_angle_attenuation = 1.0057905 [node name="SpotLight3D7" type="SpotLight3D" parent="." unique_id=1675886779] transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, 7.7353215, 12.730174, -32.953) -shadow_enabled = true -spot_range = 13.788 -spot_angle = 74.29 -spot_angle_attenuation = 1.0057905 - -[node name="SpotLight3D5" type="SpotLight3D" parent="." unique_id=154289781] -transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, -2.1922183, 8.016026, -28.006233) -shadow_enabled = true -spot_range = 13.788 +spot_range = 20.0 spot_angle = 74.29 spot_angle_attenuation = 1.0057905 [node name="SpotLight3D3" type="SpotLight3D" parent="." unique_id=1486879270] transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, -4.6573744, 8.799653, -12.668277) -shadow_enabled = true -spot_range = 13.788 +spot_range = 20.0 spot_angle = 74.29 spot_angle_attenuation = 1.0057905 [node name="metro_back2" parent="." unique_id=1058637386 instance=ExtResource("4_ue8rc")] -transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 4.7805953, -1.0585066, 1.9575362) +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 2.952386, -1.0963985, 1.9575362) [node name="metro_back11" parent="." unique_id=2117952431 instance=ExtResource("4_ue8rc")] -transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 4.7805953, -1.0585066, 5.957536) +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 2.952386, -1.0963985, 5.957536) [node name="metro_back12" parent="." unique_id=841719309 instance=ExtResource("4_ue8rc")] -transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 4.7805953, -1.0585066, 9.957537) +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 2.952386, -1.0963985, 9.957537) [node name="metro_back3" parent="." unique_id=151264878 instance=ExtResource("4_ue8rc")] -transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 4.7805953, -1.0585066, -2.0424638) +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 2.952386, -1.0963985, -2.0424638) [node name="metro_back4" parent="." unique_id=1510316259 instance=ExtResource("4_ue8rc")] -transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 4.7805953, -1.0585066, -6.042464) +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 2.952386, -1.0963985, -6.042464) [node name="metro_back5" parent="." unique_id=1824194098 instance=ExtResource("4_ue8rc")] -transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 4.7805953, -1.0585066, -10.042463) +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 2.952386, -1.0963985, -10.042463) [node name="metro_back6" parent="." unique_id=1388654880 instance=ExtResource("4_ue8rc")] -transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 4.7805953, -1.0585066, -14.042463) +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 2.952386, -1.0963985, -14.042463) [node name="metro_back7" parent="." unique_id=933876689 instance=ExtResource("4_ue8rc")] -transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 4.7805953, -1.0585066, -18.042463) +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 2.952386, -1.0963985, -18.042463) [node name="metro_back8" parent="." unique_id=1158811948 instance=ExtResource("4_ue8rc")] -transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 4.7805953, -1.0585066, -22.042463) +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 2.952386, -1.0963985, -22.042463) [node name="metro_back9" parent="." unique_id=794696718 instance=ExtResource("4_ue8rc")] -transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 4.7805953, -1.0585066, -26.042463) - -[node name="metro_back10" parent="." unique_id=1414525606 instance=ExtResource("4_ue8rc")] -transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 4.7805953, -1.0585066, -30.042463) +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 2.952386, -1.0963985, -26.042463)