Implements tree visibility occlusion system.

Adds tree fading based on camera line of sight.
Trees now fade out when they obstruct the player's view,
improving visibility.

Also includes several fixes:
- Fixes tree distribution.
- Adds a see-through shader.
- Adds camera and occlusion scripts.
This commit is contained in:
Dan Baker 2025-07-01 10:32:21 +01:00
parent a1efaf6294
commit f98773237e
10 changed files with 314 additions and 137 deletions

View file

@ -1,10 +1,12 @@
[gd_scene load_steps=53 format=4 uid="uid://bwsugg4p50fjr"]
[gd_scene load_steps=55 format=4 uid="uid://bwsugg4p50fjr"]
[ext_resource type="Environment" uid="uid://cm77bbr0io118" path="res://Stages/Test3D/new_environment.tres" id="1_8ph61"]
[ext_resource type="Script" uid="uid://bwed2dwogfmxv" path="res://Entities/Player/scripts/player.gd" id="1_d602n"]
[ext_resource type="AnimationLibrary" uid="uid://bwnn7vpd0dqds" path="res://Common/animations/basic-movement.res" id="1_tfa5t"]
[ext_resource type="Script" uid="uid://bbjv6a7yg7m02" path="res://Stages/Test3D/camera_pivot.gd" id="2_sdmks"]
[ext_resource type="Shader" uid="uid://bsemnmdracd4m" path="res://Common/shaders/outline.gdshader" id="4_feu7y"]
[ext_resource type="Script" uid="uid://cjbk6jnxla4mn" path="res://Stages/Test3D/camera_3d.gd" id="5_fm6lr"]
[ext_resource type="PackedScene" uid="uid://isogcpkb8su4" path="res://Entities/Tree/assets/temp/tent_detailedOpen.glb" id="9_4jb6r"]
[ext_resource type="Script" uid="uid://bjco8musjqog4" path="res://Stages/Test3D/particles.gd" id="9_oiyue"]
[ext_resource type="PackedScene" uid="uid://cdbnr0jg2icaj" path="res://Entities/Tree/assets/temp/campfire_bricks.glb" id="13_qasnx"]
[ext_resource type="PackedScene" uid="uid://c4ovjmemnepdy" path="res://Entities/Tree/assets/temp/campfire_logs.glb" id="14_2xm50"]
@ -372,42 +374,6 @@ size = Vector2(2, 2)
[sub_resource type="BoxShape3D" id="BoxShape3D_tfa5t"]
size = Vector3(60, 0, 20)
[sub_resource type="Curve" id="Curve_5r2bu"]
_data = [Vector2(0.003125, 0.0237797), 0.0, 0.0, 0, 0, Vector2(0.21875, 0.877972), 0.0, 0.0, 0, 0, Vector2(0.41875, 0.194618), 0.0, 0.0, 0, 0, Vector2(0.478125, 0.576971), -7.27116, -7.27116, 0, 0, Vector2(0.621875, 0.227159), 0.0, 0.0, 0, 0, Vector2(0.7625, 0.365457), 0.0, 0.0, 0, 0, Vector2(1, 0.04005), 0.0, 0.0, 0, 0]
point_count = 7
[sub_resource type="CurveTexture" id="CurveTexture_23r73"]
curve = SubResource("Curve_5r2bu")
[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_p5fn2"]
emission_shape = 6
emission_ring_axis = Vector3(0, 1, 0)
emission_ring_height = 1.0
emission_ring_radius = 5.0
emission_ring_inner_radius = 0.0
emission_ring_cone_angle = 90.0
direction = Vector3(0.2, -1, 0)
spread = 5.0
initial_velocity_max = 10.0
scale_min = 0.1
alpha_curve = SubResource("CurveTexture_23r73")
collision_mode = 2
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_p5fn2"]
transparency = 1
cull_mode = 2
shading_mode = 0
vertex_color_use_as_albedo = true
albedo_color = Color(1, 1, 1, 0.807843)
albedo_texture = ExtResource("23_23r73")
use_particle_trails = true
[sub_resource type="RibbonTrailMesh" id="RibbonTrailMesh_5r2bu"]
material = SubResource("StandardMaterial3D_p5fn2")
size = 0.025
sections = 2
section_segments = 1
[sub_resource type="Curve" id="Curve_ukp6m"]
_data = [Vector2(0, 0), 0.0, 0.0, 0, 0, Vector2(0.515625, 1), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0]
point_count = 3
@ -450,6 +416,42 @@ material = SubResource("StandardMaterial3D_hvb1l")
size = Vector2(0.2, 0.2)
orientation = 0
[sub_resource type="Curve" id="Curve_5r2bu"]
_data = [Vector2(0.003125, 0.0237797), 0.0, 0.0, 0, 0, Vector2(0.21875, 0.877972), 0.0, 0.0, 0, 0, Vector2(0.41875, 0.194618), 0.0, 0.0, 0, 0, Vector2(0.478125, 0.576971), -7.27116, -7.27116, 0, 0, Vector2(0.621875, 0.227159), 0.0, 0.0, 0, 0, Vector2(0.7625, 0.365457), 0.0, 0.0, 0, 0, Vector2(1, 0.04005), 0.0, 0.0, 0, 0]
point_count = 7
[sub_resource type="CurveTexture" id="CurveTexture_23r73"]
curve = SubResource("Curve_5r2bu")
[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_p5fn2"]
emission_shape = 6
emission_ring_axis = Vector3(0, 1, 0)
emission_ring_height = 1.0
emission_ring_radius = 5.0
emission_ring_inner_radius = 0.0
emission_ring_cone_angle = 90.0
direction = Vector3(0.2, -1, 0)
spread = 5.0
initial_velocity_max = 10.0
scale_min = 0.1
alpha_curve = SubResource("CurveTexture_23r73")
collision_mode = 2
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_p5fn2"]
transparency = 1
cull_mode = 2
shading_mode = 0
vertex_color_use_as_albedo = true
albedo_color = Color(1, 1, 1, 0.807843)
albedo_texture = ExtResource("23_23r73")
use_particle_trails = true
[sub_resource type="RibbonTrailMesh" id="RibbonTrailMesh_5r2bu"]
material = SubResource("StandardMaterial3D_p5fn2")
size = 0.025
sections = 2
section_segments = 1
[node name="Test3d" type="Node3D"]
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
@ -748,9 +750,10 @@ script = ExtResource("2_sdmks")
transform = Transform3D(1, 0, 0, 0, 1, 1.78814e-07, 0, -3.27826e-07, 1, 0, 0, 7)
projection = 1
current = true
size = 3.0
size = 4.0
near = 0.001
far = 100.0
script = ExtResource("5_fm6lr")
[node name="PostProcessing" type="MeshInstance3D" parent="SubViewportContainer/SubViewport/Player/CameraPivot/Camera3D"]
unique_name_in_owner = true
@ -759,6 +762,9 @@ visible = false
extra_cull_margin = 16384.0
mesh = SubResource("QuadMesh_tfa5t")
[node name="RayCast3D" type="RayCast3D" parent="SubViewportContainer/SubViewport/Player/CameraPivot/Camera3D"]
collision_mask = 3
[node name="Environment" type="Node3D" parent="SubViewportContainer/SubViewport"]
[node name="Ground" type="StaticBody3D" parent="SubViewportContainer/SubViewport/Environment"]
@ -781,17 +787,49 @@ unique_name_in_owner = true
[node name="Objects" type="Node3D" parent="SubViewportContainer/SubViewport/Camp"]
[node name="tent-canvas2" parent="SubViewportContainer/SubViewport/Camp/Objects" instance=ExtResource("23_5r2bu")]
transform = Transform3D(0.964438, 0, -0.264311, 0, 1, 0, 0.264311, 0, 0.964438, -1.40178, 0, -1.67128)
[node name="Camp" type="Node3D" parent="SubViewportContainer/SubViewport/Camp/Objects"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.718493, 0, -0.353187)
[node name="campfire_bricks2" parent="SubViewportContainer/SubViewport/Camp/Objects" instance=ExtResource("13_qasnx")]
[node name="tent_detailedOpen2" parent="SubViewportContainer/SubViewport/Camp/Objects/Camp" instance=ExtResource("9_4jb6r")]
transform = Transform3D(-0.993544, 0, 0.113446, 0, 1, 0, -0.113446, 0, -0.993544, -0.933611, 0.05, -1.63291)
[node name="tent-canvas2" parent="SubViewportContainer/SubViewport/Camp/Objects/Camp" instance=ExtResource("23_5r2bu")]
transform = Transform3D(0.964438, 0, -0.264311, 0, 1, 0, 0.264311, 0, 0.964438, -1.40178, 0, -1.67128)
visible = false
[node name="Campfire" parent="SubViewportContainer/SubViewport/Camp/Objects/Camp" instance=ExtResource("13_qasnx")]
transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, -0.93138, 0.05, -0.326702)
[node name="campfire_logs2" parent="SubViewportContainer/SubViewport/Camp/Objects/campfire_bricks2" instance=ExtResource("14_2xm50")]
[node name="campfire_logs2" parent="SubViewportContainer/SubViewport/Camp/Objects/Camp/Campfire" instance=ExtResource("14_2xm50")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0053246, 0, 0.0117908)
[node name="log2" parent="SubViewportContainer/SubViewport/Camp/Objects" instance=ExtResource("15_e0hgm")]
transform = Transform3D(0.440003, 0, 0.237482, 0, 0.5, 0, -0.237482, 0, 0.440003, -0.565749, 0.0532002, -0.598678)
[node name="Fire" type="GPUParticles3D" parent="SubViewportContainer/SubViewport/Camp/Objects/Camp/Campfire"]
transform = Transform3D(1.42857, 0, 0, 0, 1.42857, 0, 0, 0, 1.42857, 0, 0, 0)
amount = 50
lifetime = 0.4
speed_scale = 0.4
process_material = SubResource("ParticleProcessMaterial_xvexm")
draw_pass_1 = SubResource("QuadMesh_hvb1l")
[node name="OmniLight3D" type="OmniLight3D" parent="SubViewportContainer/SubViewport/Camp/Objects/Camp/Campfire/Fire"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.000509977, 0.121094, -0.00151992)
light_color = Color(0.89, 0.461613, 0.2136, 1)
light_energy = 0.923321
light_indirect_energy = 1.084
light_volumetric_fog_energy = 3.764
light_size = 0.105
shadow_enabled = true
distance_fade_enabled = true
distance_fade_begin = 386.01
distance_fade_shadow = 45.9
distance_fade_length = 28.05
script = ExtResource("22_ukp6m")
[node name="log2" parent="SubViewportContainer/SubViewport/Camp/Objects/Camp" instance=ExtResource("15_e0hgm")]
transform = Transform3D(0.440003, 0, 0.237482, 0, 0.5, 0, -0.237482, 0, 0.440003, -0.566, 0.006, -0.599)
[node name="bed_floor2" parent="SubViewportContainer/SubViewport/Camp/Objects/Camp" instance=ExtResource("15_pbfwi")]
transform = Transform3D(0.72094, 0, -0.346764, 0, 0.8, 0, 0.346764, 0, 0.72094, -1.4942, 0.00999988, -0.784986)
[node name="statue_column2" parent="SubViewportContainer/SubViewport/Camp/Objects" instance=ExtResource("16_ynokf")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.654, 0, -2.707)
@ -805,9 +843,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.727, 0, 0.611)
[node name="statue_columnDamaged2" parent="SubViewportContainer/SubViewport/Camp/Objects" instance=ExtResource("17_pbfwi")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.609224, 0, 0.72)
[node name="bed_floor2" parent="SubViewportContainer/SubViewport/Camp/Objects" instance=ExtResource("15_pbfwi")]
transform = Transform3D(0.72094, 0, -0.346764, 0, 0.8, 0, 0.346764, 0, 0.72094, -1.54675, 0.0359214, -1.37165)
[node name="VFX" type="Node3D" parent="SubViewportContainer/SubViewport/Camp"]
[node name="Rain" type="GPUParticles3D" parent="SubViewportContainer/SubViewport/Camp/VFX"]
@ -821,28 +856,6 @@ trail_lifetime = 0.1
process_material = SubResource("ParticleProcessMaterial_p5fn2")
draw_pass_1 = SubResource("RibbonTrailMesh_5r2bu")
[node name="Fire" type="GPUParticles3D" parent="SubViewportContainer/SubViewport/Camp/VFX"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.923367, 0.0346675, -0.309572)
amount = 50
lifetime = 0.4
speed_scale = 0.4
process_material = SubResource("ParticleProcessMaterial_xvexm")
draw_pass_1 = SubResource("QuadMesh_hvb1l")
[node name="OmniLight3D" type="OmniLight3D" parent="SubViewportContainer/SubViewport/Camp/VFX/Fire"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.000509977, 0.121094, -0.00151992)
light_color = Color(0.89, 0.461613, 0.2136, 1)
light_energy = 0.716329
light_indirect_energy = 1.084
light_volumetric_fog_energy = 3.764
light_size = 0.105
shadow_enabled = true
distance_fade_enabled = true
distance_fade_begin = 386.01
distance_fade_shadow = 45.9
distance_fade_length = 28.05
script = ExtResource("22_ukp6m")
[node name="UISubViewportContainer" type="SubViewportContainer" parent="."]
anchors_preset = 15
anchor_right = 1.0