restructure manipulator, fix voxelGI toggle
This commit is contained in:
parent
1fe3faf4a6
commit
bdd6be5554
8 changed files with 117 additions and 90 deletions
|
|
@ -1,36 +1,29 @@
|
|||
# keeps the visual mesh in sync with the attractor radius, and allows the
|
||||
# attractor radius to be scaled by joystick input of the controller holding the
|
||||
# object.
|
||||
extends Node3D
|
||||
|
||||
@onready var mesh: MeshInstance3D = $Bounds
|
||||
@onready var attractor: GPUParticlesAttractorSphere3D = $GPUParticlesAttractorSphere3D
|
||||
# a vector field manipulator that can be picked up and radius resized by the
|
||||
# holding controller's joystick.
|
||||
# needs a VisualAttractorSphere child node to work.
|
||||
class_name Manipulator
|
||||
extends XRToolsPickable
|
||||
|
||||
var held_controller: XRController3D = null
|
||||
|
||||
@onready var attractor: GPUParticlesAttractorSphere3D = $VisualAttractorSphere
|
||||
|
||||
const MIN_SCALE = 0.5
|
||||
const MAX_SCALE = 10
|
||||
const SCALE_SPEED = 1.0
|
||||
|
||||
var initial_rotation: Vector3 = Vector3.ZERO
|
||||
|
||||
func _ready() -> void:
|
||||
initial_rotation = attractor.global_rotation
|
||||
super()
|
||||
picked_up.connect(_on_pickable_object_picked_up)
|
||||
dropped.connect(_on_pickable_object_dropped)
|
||||
|
||||
func _process(delta: float) -> void:
|
||||
# Keep attractor radius in sync with mesh scale
|
||||
mesh.scale = Vector3(attractor.radius, attractor.radius, attractor.radius)
|
||||
|
||||
# Keep attractor's global rotation fixed
|
||||
attractor.global_rotation = initial_rotation
|
||||
|
||||
# Adjust scale based on controller input if being held
|
||||
if held_controller:
|
||||
var joystick_y = held_controller.get_vector2("primary").y
|
||||
if abs(joystick_y) > 0.1:
|
||||
var new_radius = attractor.radius + (joystick_y * SCALE_SPEED * delta)
|
||||
attractor.radius = clamp(new_radius, MIN_SCALE, MAX_SCALE)
|
||||
|
||||
|
||||
func _on_pickable_object_picked_up(pickable: XRToolsPickable) -> void:
|
||||
held_controller = pickable.get_picked_up_by_controller()
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
[gd_scene load_steps=11 format=3 uid="uid://bixan352mi1j6"]
|
||||
[gd_scene load_steps=7 format=3 uid="uid://bifpsyvpcem3a"]
|
||||
|
||||
[ext_resource type="PackedScene" uid="uid://c8l60rnugru40" path="res://addons/godot-xr-tools/objects/pickable.tscn" id="1_dshke"]
|
||||
[ext_resource type="PackedScene" uid="uid://c25yxb0vt53vc" path="res://addons/godot-xr-tools/objects/grab_points/grab_point_hand_left.tscn" id="2_m3e5t"]
|
||||
[ext_resource type="PackedScene" uid="uid://ctw7nbntd5pcj" path="res://addons/godot-xr-tools/objects/grab_points/grab_point_hand_right.tscn" id="3_1s35s"]
|
||||
[ext_resource type="Script" path="res://scenes/manipulator.gd" id="4_25j3l"]
|
||||
[ext_resource type="Shader" uid="uid://dilr5r6k3ik7t" path="res://scenes/manipulatorsphere.tres" id="4_ewjtf"]
|
||||
[ext_resource type="Script" path="res://scenes/manipulator.gd" id="1_g7g3k"]
|
||||
[ext_resource type="PackedScene" uid="uid://c25yxb0vt53vc" path="res://addons/godot-xr-tools/objects/grab_points/grab_point_hand_left.tscn" id="2_nqt0c"]
|
||||
[ext_resource type="PackedScene" uid="uid://ctw7nbntd5pcj" path="res://addons/godot-xr-tools/objects/grab_points/grab_point_hand_right.tscn" id="3_luhd1"]
|
||||
|
||||
[sub_resource type="SphereShape3D" id="SphereShape3D_f261g"]
|
||||
radius = 0.1
|
||||
|
|
@ -19,44 +17,24 @@ emission_enabled = true
|
|||
emission = Color(1.44392e-06, 0.591371, 0.38197, 1)
|
||||
emission_energy_multiplier = 0.22
|
||||
|
||||
[sub_resource type="SphereMesh" id="SphereMesh_56y52"]
|
||||
radius = 1.0
|
||||
height = 2.0
|
||||
|
||||
[sub_resource type="ShaderMaterial" id="ShaderMaterial_1u5an"]
|
||||
render_priority = 0
|
||||
shader = ExtResource("4_ewjtf")
|
||||
shader_parameter/Albedo = Color(1, 1, 1, 1)
|
||||
|
||||
[node name="Manipulator" instance=ExtResource("1_dshke")]
|
||||
[node name="Manipulator" type="RigidBody3D"]
|
||||
collision_layer = 4
|
||||
collision_mask = 196615
|
||||
lock_rotation = true
|
||||
freeze = true
|
||||
release_mode = 1
|
||||
freeze_mode = 1
|
||||
script = ExtResource("1_g7g3k")
|
||||
ranged_grab_method = 0
|
||||
second_hand_grab = 1
|
||||
|
||||
[node name="CollisionShape3D" parent="." index="0"]
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
|
||||
shape = SubResource("SphereShape3D_f261g")
|
||||
|
||||
[node name="Visual" type="MeshInstance3D" parent="." index="1"]
|
||||
[node name="Visual" type="MeshInstance3D" parent="."]
|
||||
layers = 2
|
||||
mesh = SubResource("SphereMesh_mou0a")
|
||||
surface_material_override/0 = SubResource("StandardMaterial3D_ljyno")
|
||||
|
||||
[node name="GrabPointHandLeft" parent="." index="2" instance=ExtResource("2_m3e5t")]
|
||||
[node name="GrabPointHandLeft" parent="." instance=ExtResource("2_nqt0c")]
|
||||
|
||||
[node name="GrabPointHandRight" parent="." index="3" instance=ExtResource("3_1s35s")]
|
||||
|
||||
[node name="ManipulatorSync" type="Node3D" parent="." index="4"]
|
||||
script = ExtResource("4_25j3l")
|
||||
|
||||
[node name="Bounds" type="MeshInstance3D" parent="ManipulatorSync" index="0"]
|
||||
layers = 2
|
||||
mesh = SubResource("SphereMesh_56y52")
|
||||
skeleton = NodePath("../..")
|
||||
surface_material_override/0 = SubResource("ShaderMaterial_1u5an")
|
||||
|
||||
[node name="GPUParticlesAttractorSphere3D" type="GPUParticlesAttractorSphere3D" parent="ManipulatorSync" index="1"]
|
||||
|
||||
[connection signal="dropped" from="." to="ManipulatorSync" method="_on_pickable_object_dropped"]
|
||||
[connection signal="picked_up" from="." to="ManipulatorSync" method="_on_pickable_object_picked_up"]
|
||||
[node name="GrabPointHandRight" parent="." instance=ExtResource("3_luhd1")]
|
||||
|
|
|
|||
|
|
@ -63,6 +63,7 @@ void fragment() {
|
|||
|
||||
}
|
||||
"
|
||||
graph_offset = Vector2(-451.023, -134.578)
|
||||
nodes/fragment/0/position = Vector2(620, 180)
|
||||
nodes/fragment/2/node = SubResource("VisualShaderNodeInput_5b52k")
|
||||
nodes/fragment/2/position = Vector2(-940, 280)
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@ extends Node
|
|||
|
||||
var environment: Environment = preload("res://scenes/environment.tres")
|
||||
|
||||
signal voxel_gi_changed(enabled: bool)
|
||||
|
||||
var voxel_gi_enabled := true
|
||||
var bloom_enabled := true
|
||||
var volumetric_fog_enabled := true
|
||||
|
|
@ -29,6 +31,9 @@ func toggle_volumetric_fog(enabled: bool) -> void:
|
|||
environment.volumetric_fog_enabled = volumetric_fog_enabled
|
||||
|
||||
func _update_voxel_gi() -> void:
|
||||
voxel_gi_changed.emit(voxel_gi_enabled)
|
||||
var voxel_gi = get_tree().current_scene.get_node_or_null("VoxelGI")
|
||||
if voxel_gi:
|
||||
voxel_gi.visible = voxel_gi_enabled
|
||||
else:
|
||||
print("couldn't find VoxelGI!")
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
[gd_scene load_steps=41 format=3 uid="uid://bd86thqpujh3p"]
|
||||
[gd_scene load_steps=42 format=3 uid="uid://bd86thqpujh3p"]
|
||||
|
||||
[ext_resource type="Script" path="res://addons/godot-xr-tools/staging/scene_base.gd" id="1_t86sx"]
|
||||
[ext_resource type="PackedScene" uid="uid://7uc6tf2tvn1k" path="res://scenes/xr_origin_3d.tscn" id="2_xk21l"]
|
||||
|
|
@ -11,12 +11,13 @@
|
|||
[ext_resource type="Script" path="res://scenes/voxel_gi_toggle.gd" id="7_4p11s"]
|
||||
[ext_resource type="PackedScene" uid="uid://c20kawop2lrv" path="res://assets/Arcane Source 2.glb" id="8_h17hj"]
|
||||
[ext_resource type="Script" path="res://scenes/target_highlight_test.gd" id="9_jig6v"]
|
||||
[ext_resource type="PackedScene" uid="uid://bixan352mi1j6" path="res://scenes/manipulator.tscn" id="10_dms3y"]
|
||||
[ext_resource type="AudioStream" uid="uid://dnwh2iqwi86ku" path="res://assets/04 bass.ogg" id="12_8dki8"]
|
||||
[ext_resource type="AudioStream" uid="uid://cv0f1tu5pac60" path="res://assets/02 midpiano.ogg" id="13_6bsa0"]
|
||||
[ext_resource type="PackedScene" uid="uid://clujaf3u776a3" path="res://addons/godot-xr-tools/objects/viewport_2d_in_3d.tscn" id="13_ab6mb"]
|
||||
[ext_resource type="AudioStream" uid="uid://cqb1bo72232vs" path="res://assets/03 highpiano.ogg" id="14_8b4v6"]
|
||||
[ext_resource type="PackedScene" uid="uid://cyd8poa47ir2i" path="res://scenes/performance_settings_menu.tscn" id="14_s5dwy"]
|
||||
[ext_resource type="PackedScene" uid="uid://bifpsyvpcem3a" path="res://scenes/manipulator.tscn" id="17_uqqr1"]
|
||||
[ext_resource type="PackedScene" uid="uid://ccmx5v2601k8q" path="res://scenes/visual_attractor_sphere.tscn" id="18_qmvne"]
|
||||
|
||||
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_lvd12"]
|
||||
albedo_color = Color(0.563626, 0.563626, 0.563625, 1)
|
||||
|
|
@ -130,6 +131,12 @@ emission_energy_multiplier = 0.61
|
|||
rim = 0.38
|
||||
refraction_scale = 0.88
|
||||
|
||||
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_a5rjy"]
|
||||
shading_mode = 0
|
||||
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_jwkgy"]
|
||||
size = Vector3(40, 40, 40)
|
||||
|
||||
[sub_resource type="PrismMesh" id="PrismMesh_be80n"]
|
||||
size = Vector3(0.2, 0.2, 0.2)
|
||||
|
||||
|
|
@ -137,12 +144,6 @@ size = Vector3(0.2, 0.2, 0.2)
|
|||
emission_enabled = true
|
||||
emission = Color(0.208505, 0.70691, 0.626474, 1)
|
||||
|
||||
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_a5rjy"]
|
||||
shading_mode = 0
|
||||
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_jwkgy"]
|
||||
size = Vector3(40, 40, 40)
|
||||
|
||||
[node name="TitleScene" type="Node3D"]
|
||||
script = ExtResource("1_t86sx")
|
||||
|
||||
|
|
@ -265,32 +266,7 @@ stream = ExtResource("12_8dki8")
|
|||
volume_db = -80.0
|
||||
autoplay = true
|
||||
|
||||
[node name="Manipulator0" parent="." instance=ExtResource("10_dms3y")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.63926, -9.75923)
|
||||
|
||||
[node name="Bounds" parent="Manipulator0/ManipulatorSync" index="0"]
|
||||
transform = Transform3D(3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0)
|
||||
|
||||
[node name="GPUParticlesAttractorSphere3D" parent="Manipulator0/ManipulatorSync" index="1"]
|
||||
strength = 19.33
|
||||
attenuation = 2.82316
|
||||
radius = 3.0
|
||||
|
||||
[node name="Manipulator1" parent="." instance=ExtResource("10_dms3y")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.6324, 2.25799, -6.74718)
|
||||
|
||||
[node name="GPUParticlesAttractorSphere3D" parent="Manipulator1/ManipulatorSync" index="1"]
|
||||
strength = 19.33
|
||||
attenuation = 2.82316
|
||||
directionality = 1.0
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="Manipulator1/ManipulatorSync/GPUParticlesAttractorSphere3D" index="0"]
|
||||
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, -0.141177)
|
||||
mesh = SubResource("PrismMesh_be80n")
|
||||
skeleton = NodePath("../../..")
|
||||
surface_material_override/0 = SubResource("StandardMaterial3D_hyt1m")
|
||||
|
||||
[node name="Viewport2Din3D" parent="." instance=ExtResource("13_ab6mb")]
|
||||
[node name="PerformanceMenu" parent="." instance=ExtResource("13_ab6mb")]
|
||||
transform = Transform3D(0.866025, 0, -0.5, 0, 1, 0, 0.5, 0, 0.866025, 5.61352, 2, -3)
|
||||
screen_size = Vector2(2.5, 1.5)
|
||||
scene = ExtResource("14_s5dwy")
|
||||
|
|
@ -307,9 +283,28 @@ reverb_bus_amount = 1.0
|
|||
[node name="CollisionShape3D" type="CollisionShape3D" parent="ReverbArea"]
|
||||
shape = SubResource("BoxShape3D_jwkgy")
|
||||
|
||||
[node name="Manipulator0" parent="." instance=ExtResource("17_uqqr1")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.63926, -9.75923)
|
||||
|
||||
[node name="VisualAttractorSphere" parent="Manipulator0" instance=ExtResource("18_qmvne")]
|
||||
strength = 19.33
|
||||
attenuation = 2.82316
|
||||
radius = 3.0
|
||||
|
||||
[node name="Manipulator1" parent="." instance=ExtResource("17_uqqr1")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.6324, 2.25799, -6.74718)
|
||||
|
||||
[node name="VisualAttractorSphere" parent="Manipulator1" instance=ExtResource("18_qmvne")]
|
||||
strength = 19.33
|
||||
attenuation = 2.82316
|
||||
directionality = 1.0
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="Manipulator1/VisualAttractorSphere"]
|
||||
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, -0.11962)
|
||||
mesh = SubResource("PrismMesh_be80n")
|
||||
skeleton = NodePath("")
|
||||
surface_material_override/0 = SubResource("StandardMaterial3D_hyt1m")
|
||||
|
||||
[connection signal="target_occupancy_changed" from="ProxyCollisionDetector" to="Target1" method="_on_proxy_collision_detector_target_occupancy_changed"]
|
||||
[connection signal="target_occupancy_changed" from="ProxyCollisionDetector" to="Target2" method="_on_proxy_collision_detector_target_occupancy_changed"]
|
||||
[connection signal="target_occupancy_changed" from="ProxyCollisionDetector" to="Target3" method="_on_proxy_collision_detector_target_occupancy_changed"]
|
||||
|
||||
[editable path="Manipulator0"]
|
||||
[editable path="Manipulator1"]
|
||||
|
|
|
|||
29
scenes/visual_attractor_sphere.gd
Normal file
29
scenes/visual_attractor_sphere.gd
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
# syncs a sphere mesh with a GPUParticlesAttractorSphere3D bounds.
|
||||
# also runs in editor for preview.
|
||||
@tool
|
||||
class_name VisualAttractorSphere
|
||||
extends GPUParticlesAttractorSphere3D
|
||||
|
||||
func _get_configuration_warnings() -> PackedStringArray:
|
||||
var warnings: PackedStringArray = []
|
||||
|
||||
if not has_node("Visual"):
|
||||
warnings.append("Missing Visual child node - this node requires a Visual child containing the mesh to display")
|
||||
|
||||
return warnings
|
||||
|
||||
var initial_rotation: Vector3 = Vector3.ZERO
|
||||
|
||||
func _ready() -> void:
|
||||
initial_rotation = global_rotation
|
||||
|
||||
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
||||
func _process(_delta: float) -> void:
|
||||
var visual = get_node_or_null("Visual")
|
||||
# assume visual mesh is 1m radius
|
||||
if visual:
|
||||
visual.scale = Vector3(radius, radius, radius)
|
||||
|
||||
# in the actual game, keep the rotation fixed.
|
||||
if !Engine.is_editor_hint():
|
||||
global_rotation = initial_rotation
|
||||
22
scenes/visual_attractor_sphere.tscn
Normal file
22
scenes/visual_attractor_sphere.tscn
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
[gd_scene load_steps=5 format=3 uid="uid://ccmx5v2601k8q"]
|
||||
|
||||
[ext_resource type="Script" path="res://scenes/visual_attractor_sphere.gd" id="1_62tkw"]
|
||||
[ext_resource type="Shader" uid="uid://dilr5r6k3ik7t" path="res://scenes/manipulatorsphere.tres" id="2_1iign"]
|
||||
|
||||
[sub_resource type="SphereMesh" id="SphereMesh_56y52"]
|
||||
radius = 1.0
|
||||
height = 2.0
|
||||
|
||||
[sub_resource type="ShaderMaterial" id="ShaderMaterial_1u5an"]
|
||||
render_priority = 0
|
||||
shader = ExtResource("2_1iign")
|
||||
shader_parameter/Albedo = Color(1, 1, 1, 1)
|
||||
|
||||
[node name="VisualAttractorSphere" type="GPUParticlesAttractorSphere3D"]
|
||||
script = ExtResource("1_62tkw")
|
||||
|
||||
[node name="Visual" type="MeshInstance3D" parent="."]
|
||||
layers = 2
|
||||
mesh = SubResource("SphereMesh_56y52")
|
||||
skeleton = NodePath("../../..")
|
||||
surface_material_override/0 = SubResource("ShaderMaterial_1u5an")
|
||||
|
|
@ -3,3 +3,7 @@ extends VoxelGI
|
|||
func _ready() -> void:
|
||||
# toggle according to the singleton settings.
|
||||
visible = PerformanceSettingsSingleton.voxel_gi_enabled
|
||||
PerformanceSettingsSingleton.voxel_gi_changed.connect(_on_voxel_gi_changed)
|
||||
|
||||
func _on_voxel_gi_changed(enabled: bool):
|
||||
visible = enabled
|
||||
|
|
|
|||
Loading…
Reference in a new issue