diff --git a/asset_dev/backgrounds/vista_2.xcf b/asset_dev/backgrounds/vista_2.xcf index 1e077da..5db5df7 100644 Binary files a/asset_dev/backgrounds/vista_2.xcf and b/asset_dev/backgrounds/vista_2.xcf differ diff --git a/assets/vista_2.png b/assets/vista_2.png index fdd6e81..bb2e124 100644 --- a/assets/vista_2.png +++ b/assets/vista_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:487dd32087e2b1ee74f053b84bc5f6eeda2085fe808431c7ed4b7eb18463f355 -size 40639 +oid sha256:4c38dd80f611fc24eff8c128987d24a2c54fb54bccde52435fa27f659bbeae9a +size 40630 diff --git a/levels/debug_level/debug_level.tscn b/levels/debug_level/debug_level.tscn index 24e9bc5..aa6271f 100644 --- a/levels/debug_level/debug_level.tscn +++ b/levels/debug_level/debug_level.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=36 format=3 uid="uid://bm2o3mex10v11"] +[gd_scene load_steps=38 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"] @@ -38,21 +38,30 @@ _shader_parameters = { "noise2_scale": 0.076, "noise3_scale": 0.021, "noise_texture": SubResource("NoiseTexture2D_sb318"), -"vertex_normals_distance": 128.0 +"vertex_normals_distance": 128.0, +"world_noise_blend_far": 1.0, +"world_noise_blend_near": 0.57, +"world_noise_height": 74.0, +"world_noise_lod_distance": 16384.0, +"world_noise_max_octaves": 8, +"world_noise_min_octaves": 2, +"world_noise_offset": Vector3(0, -8, 0), +"world_noise_scale": 5.0 } +world_background = 2 texture_filtering = 1 -show_navigation = true -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ly4sm"] +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_2u1w6"] cull_mode = 2 vertex_color_use_as_albedo = true backlight_enabled = true backlight = Color(0.5, 0.5, 0.5, 1) [sub_resource type="Terrain3DMeshAsset" id="Terrain3DMeshAsset_8g62o"] +name = "palm_tree" height_offset = 0.5 density = 10.0 -material_override = SubResource("StandardMaterial3D_ly4sm") +material_override = SubResource("StandardMaterial3D_2u1w6") generated_type = 1 [sub_resource type="Terrain3DTextureAsset" id="Terrain3DTextureAsset_kocfk"] @@ -82,11 +91,16 @@ sky_material = SubResource("PanoramaSkyMaterial_h8tes") background_mode = 2 sky = SubResource("Sky_2xshh") ambient_light_source = 2 -ambient_light_color = Color(0.838897, 0.838897, 0.838897, 1) +ambient_light_color = Color(0.78, 0.78, 0.78, 1) +ssao_enabled = true +ssao_intensity = 1.7 +glow_enabled = true +glow_bloom = 0.05 volumetric_fog_enabled = true -volumetric_fog_density = 0.005 -volumetric_fog_emission = Color(0, 1, 1, 1) -volumetric_fog_length = 32.0 +volumetric_fog_density = 0.001 +volumetric_fog_emission = Color(0.6, 1, 1, 1) +volumetric_fog_length = 1024.0 +volumetric_fog_sky_affect = 0.0 [sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_ypy22"] dof_blur_far_distance = 200.0 @@ -95,6 +109,17 @@ dof_blur_near_enabled = true dof_blur_near_distance = 1.0 dof_blur_near_transition = 0.5 +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_5p7vs"] +albedo_texture = ExtResource("14_y7s2h") +uv1_scale = Vector3(300, 800, 1) + +[sub_resource type="BoxMesh" id="BoxMesh_20p1k"] +material = SubResource("StandardMaterial3D_5p7vs") +size = Vector3(300, 1, 800) + +[sub_resource type="BoxShape3D" id="BoxShape3D_g31tw"] +size = Vector3(300, 1, 800) + [sub_resource type="FastNoiseLite" id="FastNoiseLite_mgjj0"] fractal_type = 2 @@ -110,8 +135,8 @@ shader_parameter/albedo = Color(0.427451, 0.917647, 1, 1) shader_parameter/scroll_speed1 = Vector2(0.05, 0) shader_parameter/scroll_speed2 = Vector2(-0.03, 0) shader_parameter/blend_factor = 0.5 -shader_parameter/scale1 = Vector2(128, 128) -shader_parameter/scale2 = Vector2(256, 256) +shader_parameter/scale1 = Vector2(512, 512) +shader_parameter/scale2 = Vector2(1024, 1024) shader_parameter/wave_strength = 0.4 shader_parameter/wave_scale = 0.02 shader_parameter/pixelation_level = 128 @@ -124,23 +149,19 @@ shader_parameter/noise_texture = SubResource("NoiseTexture2D_0xqld") [sub_resource type="PlaneMesh" id="PlaneMesh_2ywhk"] material = SubResource("ShaderMaterial_dkdxa") -size = Vector2(4096, 4096) -subdivide_width = 256 -subdivide_depth = 256 +size = Vector2(16384, 16384) +subdivide_width = 1024 +subdivide_depth = 1024 [sub_resource type="BoxShape3D" id="BoxShape3D_x3wvm"] size = Vector3(4096, 2, 4096) -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_5p7vs"] -albedo_texture = ExtResource("14_y7s2h") -uv1_scale = Vector3(300, 800, 1) +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_65jc8"] +albedo_color = Color(0.427451, 0.917647, 1, 1) -[sub_resource type="BoxMesh" id="BoxMesh_20p1k"] -material = SubResource("StandardMaterial3D_5p7vs") -size = Vector3(300, 1, 800) - -[sub_resource type="BoxShape3D" id="BoxShape3D_g31tw"] -size = Vector3(300, 1, 800) +[sub_resource type="PlaneMesh" id="PlaneMesh_h0mhn"] +material = SubResource("StandardMaterial3D_65jc8") +size = Vector2(65536, 65536) [node name="TestLevel" type="Node3D"] @@ -154,22 +175,8 @@ environment = SubResource("Environment_k6wwx") camera_attributes = SubResource("CameraAttributesPractical_ypy22") [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 0.29404, 0.955793, 0, -0.955793, 0.29404, 0, 0, 0) - -[node name="WaterTable" type="MeshInstance3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -2, 0) -mesh = SubResource("PlaneMesh_2ywhk") - -[node name="BallZone" type="Area3D" parent="WaterTable"] -script = ExtResource("9_jwlau") -water_hazard = true - -[node name="CollisionShape3D" type="CollisionShape3D" parent="WaterTable/BallZone"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.2, 0) -shape = SubResource("BoxShape3D_x3wvm") - -[node name="ShotSetup" parent="." instance=ExtResource("8_h44v5")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 212.717, 4, 294.073) +transform = Transform3D(0.782608, -0.611691, 0.11558, 0, 0.185667, 0.982613, -0.622515, -0.769001, 0.145304, 0, 0, 0) +shadow_enabled = true [node name="Buildings" type="Node3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 129.404, -9.53674e-07, 309.4) @@ -189,23 +196,48 @@ transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 0, [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="Flag" parent="." instance=ExtResource("13_6jtao")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 540, 4, 452) +[node name="Course" type="Node3D" parent="."] -[node name="DebugTable" type="MeshInstance3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 160.1, 0, 885.605) -mesh = SubResource("BoxMesh_20p1k") - -[node name="StaticBody3D" type="StaticBody3D" parent="DebugTable"] - -[node name="CollisionShape3D" type="CollisionShape3D" parent="DebugTable/StaticBody3D"] -shape = SubResource("BoxShape3D_g31tw") - -[node name="Fairway" type="Area3D" parent="."] +[node name="Fairway" type="Area3D" parent="Course"] script = ExtResource("9_jwlau") terrain_angular_damping = 2.0 -[node name="CollisionPolygon3D" type="CollisionPolygon3D" parent="Fairway"] +[node name="CollisionPolygon3D" type="CollisionPolygon3D" parent="Course/Fairway"] transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 209.788, 6.20358, 256.527) depth = 10.0 polygon = PackedVector2Array(-1.47594, 8.77969, -12.788, 19.9447, -17.7778, 31.2864, -19.2001, 41.1398, -19.2001, 55.4081, -16.3465, 66.9813, -15.7123, 75.8594, -14.9196, 82.6765, -12.383, 89.9692, -5.6736, 102.186, 2.88742, 115.027, 9.22891, 125.332, 14.7777, 133.893, 23.4973, 146.417, 35.7046, 159.893, 44.1071, 167.661, 55.8437, 178.18, 64.5632, 185.314, 69.7949, 189.753, 73.7584, 193.082, 80.734, 200.85, 94.5267, 212.899, 106.576, 221.46, 127.915, 233.827, 139.647, 240.802, 170.403, 256.181, 183.721, 262.839, 204.489, 271.717, 216.062, 274.571, 224.465, 279.485, 235.727, 283.429, 246.983, 289.929, 253.958, 290.88, 265.373, 296.27, 275.044, 298.965, 288.995, 299.282, 302.154, 299.599, 330.056, 297.063, 356.532, 289.612, 370.483, 282.636, 382.057, 270.112, 388.081, 259.648, 392.679, 245.221, 395.849, 226.989, 395.863, 185.922, 391.266, 164.52, 381.913, 148.636, 362.889, 133.417, 344.657, 121.051, 327.059, 111.063, 306.291, 103.136, 292.974, 102.66, 277.913, 102.66, 264.913, 105.99, 241.347, 117.315, 222.323, 125.558, 203.457, 127.144, 182.371, 123.973, 157.322, 119.534, 132.908, 107.644, 108.651, 86.0827, 88.8301, 59.386, 82.6471, 48.764, 75.6715, 25.7761, 65.063, 10.562, 56.819, 3.7449, 48.5751, -0.852661, 35.2579, -3.07219, 20.8311, -3.38925, 7.35541, 1.36685) + +[node name="DebugTable" type="MeshInstance3D" parent="Course"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 150, 0, -400) +mesh = SubResource("BoxMesh_20p1k") +skeleton = NodePath("../..") + +[node name="StaticBody3D" type="StaticBody3D" parent="Course/DebugTable"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Course/DebugTable/StaticBody3D"] +shape = SubResource("BoxShape3D_g31tw") + +[node name="WaterTable" type="MeshInstance3D" parent="Course"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -2, 0) +mesh = SubResource("PlaneMesh_2ywhk") +skeleton = NodePath("../..") + +[node name="BallZone" type="Area3D" parent="Course/WaterTable"] +script = ExtResource("9_jwlau") +water_hazard = true + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Course/WaterTable/BallZone"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.2, 0) +shape = SubResource("BoxShape3D_x3wvm") + +[node name="MacroWaterTable" type="MeshInstance3D" parent="Course"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -10, 0) +visible = false +mesh = SubResource("PlaneMesh_h0mhn") +skeleton = NodePath("../..") + +[node name="Flag" parent="Course" instance=ExtResource("13_6jtao")] +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) diff --git a/levels/debug_level/terrain_3d_storage.res b/levels/debug_level/terrain_3d_storage.res index fb19a74..641bc92 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:15963516f2fa043cc75864de02faf0c77215491bbd49f5b0d57624b070f199f9 -size 740017 +oid sha256:8930f396f07a2241c26b195a0879cae82e16e3f40a06e25e4194abd9cda02ac9 +size 907293 diff --git a/project.godot b/project.godot index d011191..ac65392 100644 --- a/project.godot +++ b/project.godot @@ -151,7 +151,6 @@ select_putter={ [physics] 3d/physics_engine="JoltPhysics3D" -3d/sleep_threshold_linear=0.1 3d/sleep_threshold_angular=2.0 jolt_3d/sleep/velocity_threshold=0.1 jolt_3d/sleep/time_threshold=1.0 @@ -161,3 +160,6 @@ jolt_3d/limits/max_temporary_memory=64 textures/canvas_textures/default_texture_filter=0 anti_aliasing/quality/msaa_3d=3 +anti_aliasing/quality/screen_space_aa=1 +anti_aliasing/quality/use_taa=true +anti_aliasing/quality/use_debanding=true diff --git a/src/characters/gfolf_girl/gfolf_girl.tscn b/src/characters/gfolf_girl/gfolf_girl.tscn index cac07d4..470ae32 100644 --- a/src/characters/gfolf_girl/gfolf_girl.tscn +++ b/src/characters/gfolf_girl/gfolf_girl.tscn @@ -169,7 +169,7 @@ bones/23/scale = Vector3(1, 1, 1) visible = false [node name="BoneAttachment3D" type="BoneAttachment3D" parent="Armature/Skeleton3D" index="6"] -transform = Transform3D(-0.944824, 0.316851, -0.0831417, -0.325647, -0.936013, 0.133541, -0.0355091, 0.153247, 0.98755, -0.1687, 3.15793, 0.845315) +transform = Transform3D(-0.944824, 0.316851, -0.0831418, -0.326496, -0.931474, 0.160486, -0.0265942, 0.178777, 0.98353, -0.1687, 3.14973, 0.864426) bone_name = "Hand.R" bone_idx = 11 diff --git a/src/player/free_camera/free_camera.tscn b/src/player/free_camera/free_camera.tscn index be04cd7..a535270 100644 --- a/src/player/free_camera/free_camera.tscn +++ b/src/player/free_camera/free_camera.tscn @@ -14,3 +14,4 @@ shape = SubResource("SphereShape3D_wmusx") [node name="Camera3D" type="Camera3D" parent="."] current = true +far = 8192.0 diff --git a/src/player/orbital_camera/orbital_camera.tscn b/src/player/orbital_camera/orbital_camera.tscn index 9a3cbfc..e4d033c 100644 --- a/src/player/orbital_camera/orbital_camera.tscn +++ b/src/player/orbital_camera/orbital_camera.tscn @@ -13,3 +13,4 @@ spring_length = 3.2 unique_name_in_owner = true transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 3) current = true +far = 8192.0 diff --git a/src/player/shot_setup/shot_setup.tscn b/src/player/shot_setup/shot_setup.tscn index fd10bcb..655ae2c 100644 --- a/src/player/shot_setup/shot_setup.tscn +++ b/src/player/shot_setup/shot_setup.tscn @@ -712,6 +712,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 6) unique_name_in_owner = true transform = Transform3D(1, 0, 0, 0, 1, 2.98023e-08, 0, -2.98023e-08, 1, 0, 0, 0) current = true +far = 8192.0 [node name="ArrowPivot" type="Node3D" parent="."] unique_name_in_owner = true