Add exponential fog controllable with keyboard and MARSH parameter

This commit is contained in:
Marek S. Łukasiewicz 2026-01-15 16:39:54 +01:00
parent aaef0b0475
commit c1c3be7e85
8 changed files with 78 additions and 7 deletions

View file

@ -1,15 +1,18 @@
extends Node3D
signal use_fallback(active: bool)
signal fog_density_changed(new_density: float)
## Rotation of cyclic stick model for full control deflection, in degrees
@export var range_cyclic: float = 30
## Main rotor speed, in revolutions per minute
@export var rotor_rpm: float = 500
@export var track_platform: bool = false
@export var fog_values: Array[float] = [0.0, -1.0, -2.0, -3.0, -4.0]
## Current angle of rotor rotation
var _rotor_azimuth: float = 0
var fog_index: int = 0
@onready var connector: MarshConnector = $MarshConnector
@onready var skeleton: Skeleton3D = $"Mi-2/Armature/Skeleton3D"
@ -65,6 +68,14 @@ func _process(delta: float) -> void:
xr_origin.transform = tracker_mount.transform * tracker.transform.affine_inverse()
recent_tracking.start()
func _input(event):
if event.is_action_pressed("fog_cycle"):
var step = 1
if event is InputEventWithModifiers and event.shift_pressed:
step = -1
# The index is updated in the signal callback to handle parameter changes
connector.fog_density = fog_values[(fog_index + step) % len(fog_values)]
# Only reset the position when tracking is lost for some time
func _on_recent_tracking_timeout() -> void:
xr_origin.transform = Transform3D.IDENTITY
@ -72,3 +83,14 @@ func _on_recent_tracking_timeout() -> void:
func _on_vr_setup_failed() -> void:
xr_camera.current = false
use_fallback.emit(true)
func _on_marsh_connector_fog_density_changed(new_density: float) -> void:
# Forward to parent
fog_density_changed.emit(new_density)
# Round down to nearest defined value or assign the last one (so it will disable on next cycle)
# Example: -1.5 should select -2 and on next cycle it will be -3
var new_index = fog_values.find_custom(func (d): return d <= new_density)
if new_index == -1:
new_index = len(fog_values) - 1
fog_index = new_index

View file

@ -71,5 +71,6 @@ transform = Transform3D(-0.5, -1.27582e-08, 7.43353e-08, 4.33325e-10, 0.4923, 0.
[connection signal="use_fallback" from="." to="AttitudeRoot/PilotEyes" method="_on_aircraft_use_fallback"]
[connection signal="timeout" from="AttitudeRoot/PilotEyes/PilotFloor/XROrigin3D/RecentTracking" to="." method="_on_recent_tracking_timeout"]
[connection signal="fog_density_changed" from="MarshConnector" to="." method="_on_marsh_connector_fog_density_changed"]
[editable path="Mi-2"]

View file

@ -0,0 +1,8 @@
extends WorldEnvironment
func _on_fog_density_changed(new_density: float) -> void:
if new_density == 0.0 or not is_finite(new_density):
environment.fog_enabled = false
else:
environment.fog_enabled = true
environment.fog_density = 10 ** new_density

View file

@ -0,0 +1 @@
uid://6g3b2ohwbkyv

View file

@ -1,7 +1,8 @@
[gd_scene load_steps=7 format=3 uid="uid://crq3o0eu4y8ya"]
[gd_scene load_steps=8 format=3 uid="uid://crq3o0eu4y8ya"]
[ext_resource type="Script" uid="uid://dfcjdxesyn3l0" path="res://start_vr.gd" id="1_ig7tw"]
[ext_resource type="PackedScene" uid="uid://bj1s0g7ixjw71" path="res://aircraft/aircraft.tscn" id="2_0xm2m"]
[ext_resource type="Script" uid="uid://6g3b2ohwbkyv" path="res://fog_controller.gd" id="3_1bvp3"]
[ext_resource type="PackedScene" uid="uid://bchcr54i3piaw" path="res://ads33-terrain/Cones_scene_terrain.tscn" id="3_h2yge"]
[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_7dm0k"]
@ -12,6 +13,10 @@ sky_material = SubResource("ProceduralSkyMaterial_7dm0k")
[sub_resource type="Environment" id="Environment_0xm2m"]
background_mode = 2
sky = SubResource("Sky_ig7tw")
fog_enabled = true
fog_sun_scatter = 0.5
fog_density = 0.0
fog_depth_end = 80.0
[node name="Main" type="Node3D"]
@ -21,6 +26,7 @@ sky = SubResource("Sky_ig7tw")
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
environment = SubResource("Environment_0xm2m")
script = ExtResource("3_1bvp3")
[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
transform = Transform3D(0.866025, 0.433013, 0.25, 0, -0.5, 0.866025, 0.5, -0.75, -0.433013, -5, 5, -5)
@ -29,4 +35,5 @@ shadow_enabled = true
[node name="StartVR" type="Node3D" parent="."]
script = ExtResource("1_ig7tw")
[connection signal="fog_density_changed" from="Aircraft" to="WorldEnvironment" method="_on_fog_density_changed"]
[connection signal="setup_failed" from="StartVR" to="Aircraft" method="_on_vr_setup_failed"]

View file

@ -62,6 +62,11 @@ pov_reset={
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":81,"key_label":0,"unicode":113,"location":0,"echo":false,"script":null)
]
}
fog_cycle={
"deadzone": 0.2,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":70,"key_label":0,"unicode":102,"location":0,"echo":false,"script":null)
]
}
[physics]