diff --git a/asset_dev/highway/highway_road.xcf b/asset_dev/highway/highway_road.xcf index bd1abc8..f7a6572 100644 Binary files a/asset_dev/highway/highway_road.xcf and b/asset_dev/highway/highway_road.xcf differ diff --git a/levels/debug_level/debug_level.tscn b/levels/debug_level/debug_level.tscn index 4c294bc..94ec8d3 100644 --- a/levels/debug_level/debug_level.tscn +++ b/levels/debug_level/debug_level.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=42 format=3 uid="uid://bm2o3mex10v11"] +[gd_scene load_steps=45 format=3 uid="uid://bm2o3mex10v11"] [ext_resource type="Terrain3DStorage" uid="uid://bu1gewgsgc5hm" path="res://levels/debug_level/terrain_3d_storage.res" id="1_nlsu2"] [ext_resource type="Texture2D" path="res://assets/textures/grass_fairway/grass_fairway_albedo.dds" id="2_e4m27"] @@ -42,7 +42,7 @@ _shader_parameters = { "noise_texture": SubResource("NoiseTexture2D_sb318"), "vertex_normals_distance": 128.0, "world_noise_blend_far": 1.0, -"world_noise_blend_near": 0.57, +"world_noise_blend_near": 0.48, "world_noise_height": 74.0, "world_noise_lod_distance": 16384.0, "world_noise_max_octaves": 8, @@ -174,11 +174,32 @@ point_count = 3 [sub_resource type="Curve3D" id="Curve3D_u4eo7"] _data = { -"points": PackedVector3Array(10.8695, 0, -3.68539, -10.8695, 0, 3.68539, -14.925, 0, 18.9744, 2.975, 0, -11.175, -2.975, 0, 11.175, -30.3645, 0, 45.9536, -12.075, 0, -20.125, 12.075, 0, 20.125, -21.5332, 0, 96.8633, 0.125, 0, 20.4, -0.125, 0, -20.4, 35.8701, 0, 94.7854, 0.9, 0, 27.9, -0.9, 0, -27.9, 35.9986, 0, 26.4862, 11, 0, -4, 0, 0, 0, -15, 0, 19), +"points": PackedVector3Array(0, 0, -7.71536, 0, 0, 7.71536, -27.728, 0, 8.22205, 2.975, 0, -11.175, -2.975, 0, 11.175, -30.3645, 0, 45.9536, -12.075, 0, -20.125, 12.075, 0, 20.125, -21.5332, 0, 96.8633, 0.125, 0, 20.4, -0.125, 0, -20.4, 35.8701, 0, 94.7854, 0.9, 0, 27.9, -0.9, 0, -27.9, 35.9986, 0, 26.4862, 11.7438, 0, 0, -11.7438, 0, 0, 0.948586, 0, -1.88303), "tilts": PackedFloat32Array(0, 0, 0, 0, 0, 0) } point_count = 6 +[sub_resource type="Curve3D" id="Curve3D_5n8tb"] +_data = { +"points": PackedVector3Array(0, 0, 0, 0, 0, 0, 240.456, 0, -225.597, 59.3141, 0, 0, -59.3141, 0, 0, -18.05, 0, -225.653, 7.05249, 0, -37.1185, -7.05249, 0, 37.1185, -109.935, 0, -186.743, -21.8588, 0, -34.8939, 21.8588, 0, 34.8939, -66.1359, 0, -80.2544, 0.442711, 0, -2.30483, -0.442711, 0, 2.30483, -48.737, 0, -15.663, 5.53914, 0, -18.8786, -5.53914, 0, 18.8786, -74.3908, 20, 109.935, 13.4071, 0, 6.63843, -13.4071, 0, -6.63843, -115.009, 20, 126.521, -0.260315, 0, 23.4299, 0.260315, 0, -23.4299, -133.47, 20, 68.4647, 6.79831, 0, 42.3564, -6.79831, 0, -42.3564, -120.971, 20, -39.3107, 11.1252, 0, 10.3163, -11.1252, 0, -10.3163, -159.053, 20, -106.529, 26.7909, 0, 0.0442963, -26.7909, 0, -0.0442963, -215.095, 20, -127.132, 20.4801, 0, -20.654, -20.4801, 0, 20.654, -276.061, 20, -97.3046, 0, 0, 0, 0, 0, 0, -311.461, 20, -42.5658), +"tilts": PackedFloat32Array(0, 0, 0, 0, 0, -0.008, -0.008, -0.008, -0.008, -0.008, -0.008, -0.008, -0.008) +} +point_count = 13 + +[sub_resource type="Curve3D" id="Curve3D_4iuea"] +_data = { +"points": PackedVector3Array(8.60495, 0, -21.6587, -8.60495, 0, 21.6587, 4.31738, 0, -6.92267, 11.7785, 0, -0.0902557, -11.7785, 0, 0.0902557, -33.8488, 0, 18.9507, 9.83423, 0, 24.6441, -9.83423, 0, -24.6441, -72.7077, 0, -7.35956), +"tilts": PackedFloat32Array(0, 0, 0) +} +point_count = 3 + +[sub_resource type="Curve3D" id="Curve3D_eu1hd"] +_data = { +"points": PackedVector3Array(-2.56145, 0, 21.5912, 2.56145, 0, -21.5912, -0.00744629, 0, -7.08258, 13.7421, 0, 29.0431, -13.7421, 0, -29.0431, -10.9398, 0, -86.784, 17.5664, 0, 6.698, -17.5664, 0, -6.698, -69.4132, 0, -142.321, 25.2755, 0, -9.60468, -25.2755, 0, 9.60468, -138.962, 0, -142.928, 5.79678, 0, -12.6036, -5.79678, 0, 12.6036, -196.582, 0, -86.4825), +"tilts": PackedFloat32Array(0, 0, 0, 0, 0) +} +point_count = 5 + [node name="TestLevel" type="Node3D"] [node name="Terrain3D" type="Terrain3D" parent="."] @@ -195,24 +216,6 @@ transform = Transform3D(0.782608, -0.611691, 0.11558, 0, 0.185667, 0.982613, -0. shadow_enabled = true shadow_blur = 4.0 -[node name="Buildings" type="Node3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 129.404, -9.53674e-07, 309.4) - -[node name="ConcreteBuilding1" parent="Buildings" instance=ExtResource("10_lf15j")] -transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 0) - -[node name="KanaSignboard" parent="Buildings/ConcreteBuilding1" instance=ExtResource("11_evxup")] -transform = Transform3D(-8.74228e-08, 0, -2, 0, 2, 0, 2, 0, -8.74228e-08, 10.8, 12, 7) - -[node name="ConcreteBuilding2" parent="Buildings" instance=ExtResource("10_lf15j")] -transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 0, 20) - -[node name="ConcreteBuilding3" parent="Buildings" instance=ExtResource("10_lf15j")] -transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 0, 40) - -[node name="PalmTree" parent="." instance=ExtResource("12_sswxf")] -transform = Transform3D(-0.69799, 0, -0.716107, 0, 1, 0, 0.716107, 0, -0.69799, 140.872, -9.53674e-07, 296.932) - [node name="Course" type="Node3D" parent="."] [node name="Fairway" type="Area3D" parent="Course"] @@ -259,11 +262,67 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 540, 4, 452) [node name="ShotSetup" parent="Course" instance=ExtResource("8_h44v5")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 212.717, 4, 294.073) -[node name="GuardRail" parent="." instance=ExtResource("16_xtxyj")] +[node name="GuardRail" parent="Course" instance=ExtResource("16_xtxyj")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 211.416, 4, 288.708) curve = SubResource("Curve3D_3gyu3") end_cap = true -[node name="HighwayRoad" parent="." instance=ExtResource("17_amems")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 124.25, 0, 267.5) +[node name="CityBuildings" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 129.404, -9.53674e-07, 309.4) + +[node name="ConcreteBuilding1" parent="CityBuildings" instance=ExtResource("10_lf15j")] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 0) + +[node name="KanaSignboard" parent="CityBuildings/ConcreteBuilding1" instance=ExtResource("11_evxup")] +transform = Transform3D(-8.74228e-08, 0, -2, 0, 2, 0, 2, 0, -8.74228e-08, 10.8, 12, 7) + +[node name="ConcreteBuilding2" parent="CityBuildings" instance=ExtResource("10_lf15j")] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 0, 20) + +[node name="ConcreteBuilding3" parent="CityBuildings" instance=ExtResource("10_lf15j")] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 0, 40) + +[node name="PalmTree" parent="CityBuildings" instance=ExtResource("12_sswxf")] +transform = Transform3D(-0.69799, 0, -0.716107, 0, 1, 0, 0.716107, 0, -0.69799, 11.468, 0, -12.468) + +[node name="HighwayRoad" parent="CityBuildings" instance=ExtResource("17_amems")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.15401, 9.53674e-07, -41.9) curve = SubResource("Curve3D_u4eo7") + +[node name="MountainCurve" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -252.35, 20, 498.52) + +[node name="MountainHighway" parent="MountainCurve" instance=ExtResource("17_amems")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 137.181, -20, -7.285) +curve = SubResource("Curve3D_5n8tb") + +[node name="ConcreteBuilding1" parent="MountainCurve" instance=ExtResource("10_lf15j")] +transform = Transform3D(-0.0979477, 0, 0.995192, 0, 1, 0, -0.995192, 0, -0.0979477, -10.074, 0, -32.347) + +[node name="GuardRail" parent="MountainCurve" instance=ExtResource("16_xtxyj")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 70.2122, 0, 116.269) +curve = SubResource("Curve3D_4iuea") +end_cap = true + +[node name="GuardRail2" parent="MountainCurve" instance=ExtResource("16_xtxyj")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 27.5313, 0, 3.09094) +curve = SubResource("Curve3D_eu1hd") +end_cap = true + +[node name="PalmTree" parent="MountainCurve" instance=ExtResource("12_sswxf")] +transform = Transform3D(0.57763, 0, -0.816299, 0, 1, 0, 0.816299, 0, 0.57763, 0.942703, 0, -4.85565) + +[node name="PalmTree2" parent="MountainCurve" instance=ExtResource("12_sswxf")] +transform = Transform3D(0.184826, 0, -0.982771, 0, 1, 0, 0.982771, 0, 0.184826, 1.55019, 0, -15.9243) + +[node name="Lakeside" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 452.34, 1.52588e-05, 209.912) + +[node name="PalmTree" parent="Lakeside" instance=ExtResource("12_sswxf")] +transform = Transform3D(-0.101178, 0, 0.994868, 0, 1, 0, -0.994868, 0, -0.101178, -1.09882, -1.90735e-06, 6.638) + +[node name="PalmTree2" parent="Lakeside" instance=ExtResource("12_sswxf")] +transform = Transform3D(-0.984291, 0, 0.176552, 0, 1, 0, -0.176552, 0, -0.984291, -9.27121, -1.90735e-06, -3.14384) + +[node name="PalmTree3" parent="Lakeside" instance=ExtResource("12_sswxf")] +transform = Transform3D(-0.652998, 0, 0.75736, 0, 1, 0, -0.75736, 0, -0.652998, -1.89178, -3.8147e-06, -1.44794) diff --git a/levels/debug_level/terrain_3d_storage.res b/levels/debug_level/terrain_3d_storage.res index 51dddb7..ea2d8de 100644 --- a/levels/debug_level/terrain_3d_storage.res +++ b/levels/debug_level/terrain_3d_storage.res @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69ee35d345ab47d868c1b2e9901af9b2457a79f865269d42e7e27fe4ed4dd585 -size 883222 +oid sha256:46a7005e2e79da5de3f639826c93294d34f861316f7dfbb9ef23c0d622fda73f +size 1298031 diff --git a/src/player/shot_setup/shot_setup.tscn b/src/player/shot_setup/shot_setup.tscn index 017e204..63f2c68 100644 --- a/src/player/shot_setup/shot_setup.tscn +++ b/src/player/shot_setup/shot_setup.tscn @@ -484,7 +484,7 @@ _data = { [sub_resource type="ShaderMaterial" id="ShaderMaterial_afsun"] shader = ExtResource("7_h6c4m") shader_parameter/change_color_depth = true -shader_parameter/target_color_depth = 6 +shader_parameter/target_color_depth = 3 shader_parameter/dithering = true shader_parameter/scale_resolution = true shader_parameter/target_resolution_scale = 3 diff --git a/src/props/flag/flag.tscn b/src/props/flag/flag.tscn index 3d95cda..bb73cd8 100644 --- a/src/props/flag/flag.tscn +++ b/src/props/flag/flag.tscn @@ -28,7 +28,8 @@ outline_modulate = Color(1, 0, 0.133333, 1) text = "Goal! 0000 m" font = ExtResource("2_tmki0") -outline_size = 8 +font_size = 64 +outline_size = 16 line_spacing = -16.0 [node name="Skeleton3D" parent="Armature" index="0"] diff --git a/src/props/scenery/highway/guard_rail.tscn b/src/props/scenery/highway/guard_rail.tscn index a8ed894..14d3979 100644 --- a/src/props/scenery/highway/guard_rail.tscn +++ b/src/props/scenery/highway/guard_rail.tscn @@ -21,7 +21,7 @@ size = Vector2(0.5, 1) center_offset = Vector3(0, 0.5, 0) orientation = 2 -[sub_resource type="MultiMesh" id="MultiMesh_o7ch8"] +[sub_resource type="MultiMesh" id="MultiMesh_ecm13"] transform_format = 1 mesh = SubResource("PlaneMesh_ko4yv") @@ -59,6 +59,6 @@ path_joined = false material = ExtResource("2_1s4wy") [node name="PostMultiMesh" type="MultiMeshInstance3D" parent="."] -multimesh = SubResource("MultiMesh_o7ch8") +multimesh = SubResource("MultiMesh_ecm13") [connection signal="curve_changed" from="." to="." method="_on_curve_changed"]