update

VERSIONS.md

@@ -1,7 +1,27 @@
+# 4.2.0
+- Environments can now be set normally in scenes loaded through the staging system.
+- Fixed issue with not being able to push rigid bodies when colliding with them.
+- Fixed player movement on slopes.
+- Fixed lag in finger-poke.
+- Added initial collision hand support.
+- Added support for custom materials for 2D in 3D viewport
+- Updated pointer to support visibility properties and events
+- Modified virtual keyboard to expose viewport controls and default to unshaded
+- Cleaned up teleport and added more properties for customization
+- Modified pickup highlighting to support pickables in snap-zones
+- Added "UI Objects" layer 23 for viewports to support interaction by pointer and poking
+- Fixed player scaling issues with crouching and poke
+- **minor-breakage** Added support for passing user data between staged scenes with default handling for spawn-points
+- Moved teleport logic to player and added teleport area node
+- Change pointer event dispatching
+- Added multi-touch on 2D in 3D viewports and virtual-keyboard
+- Added option to disable laser-pointers when close to specific bodies/areas
+
 # 4.1.0
 - Enhanced grappling to support collision and target layers
 - Added Godot Editor XR Tools menu for layers and openxr configuration
 - Improved gliding to support roll-turning while flapping
+- Added render_target_size_multiplier to StartXR (requires Godot 4.1+)
 
 # 4.0.0
 - Conversion to Godot 4

addons/godot-xr-tools/audio/area_audio.gd

@@ -0,0 +1,53 @@
+@tool
+@icon("res://addons/godot-xr-tools/editor/icons/audio.svg")
+class_name XRToolsAreaAudio
+extends AudioStreamPlayer3D
+
+
+## XRTools Area Audio
+##
+## This node is attached as a child of a Area3D,
+## since all the interactables are actualy Extensions of the Area3D,
+## this node will work on those as well
+
+
+## XRToolsAreaAudioType to associate with this Area Audio
+@export var area_audio_type : XRToolsAreaAudioType
+
+@onready var area : Area3D = get_parent()
+
+
+# Add support for is_class on XRTools classes
+func is_xr_class(name : String) -> bool:
+	return name == "XRToolsAreaAudio"
+
+
+# Called when the node enters the scene tree for the first time.
+func _ready() -> void:
+	# Listen for enter
+	area.body_entered.connect(_on_body_entered)
+	# Listen for exit
+	area.body_exited.connect(_on_body_exited)
+
+
+func _on_body_entered(_body):
+	if playing:
+		stop()
+	stream = area_audio_type.touch_sound
+	play()
+
+
+func _on_body_exited(_body):
+	if playing:
+			stop()
+
+
+# This method checks for configuration issues.
+func _get_configuration_warnings() -> PackedStringArray:
+	var warnings := PackedStringArray()
+
+	if !area_audio_type:
+		warnings.append("Area audio type not specified")
+
+	# Return warnings
+	return warnings

addons/godot-xr-tools/audio/area_audio.tscn

@@ -0,0 +1,8 @@
+[gd_scene load_steps=2 format=3 uid="uid://duqehif60vcjg"]
+
+[ext_resource type="Script" path="res://addons/godot-xr-tools/audio/area_audio.gd" id="1_q1jr0"]
+
+[node name="AreaAudio" type="AudioStreamPlayer3D"]
+unit_size = 3.0
+max_distance = 100.0
+script = ExtResource("1_q1jr0")

addons/godot-xr-tools/audio/area_audio_type.gd

@@ -0,0 +1,28 @@
+@tool
+@icon("res://addons/godot-xr-tools/editor/icons/audio.svg")
+class_name XRToolsAreaAudioType
+extends Resource
+
+
+## XRTools Area Audio Type Resource
+##
+## This resource defines the audio stream to play when
+## a objects enters it
+
+
+## Surface name
+@export var name : String = ""
+
+## Optional audio stream to play when the player lands on this surface
+@export var touch_sound : AudioStream
+
+
+# This method checks for configuration issues.
+func _get_configuration_warnings() -> PackedStringArray:
+	var warnings := PackedStringArray()
+
+	if name == "":
+		warnings.append("Area audio type must have a name")
+
+	# Return warnings
+	return warnings

addons/godot-xr-tools/audio/pickable_audio.gd

@@ -0,0 +1,79 @@
+@tool
+@icon("res://addons/godot-xr-tools/editor/icons/audio.svg")
+class_name XRToolsPickableAudio
+extends AudioStreamPlayer3D
+
+
+## XRTools Pickable Audio
+##
+## This node is attached as a child of a Pickable,
+## it plays audio for drop and hit based on velocity,
+## along with a audio for when the object is being picked up.
+
+
+## XRToolsPickableAudioType to associate with this pickable
+@export var pickable_audio_type  : XRToolsPickableAudioType
+
+## delta throttle is 1/10 of delta
+@onready var delta_throttle : float = 0.1
+
+@onready var _pickable : XRToolsPickable = get_parent()
+
+
+# Add support for is_class on XRTools classes
+func is_xr_class(name : String) -> bool:
+	return name == "XRToolsPickableAudio"
+
+
+# Called when the node enters the scene tree for the first time.
+func _ready() -> void:
+	# Listen for when this object enters a body
+	_pickable.body_entered.connect(_on_body_entered)
+	# Listen for when this object is picked up or dropped
+	_pickable.picked_up.connect(_on_picked_up)
+	_pickable.dropped.connect(_on_dropped)
+
+
+func _physics_process(_delta):
+	if !_pickable.sleeping:
+		if _pickable.linear_velocity.length() > 5:
+			volume_db = 0
+		else:
+			volume_db -= _pickable.linear_velocity.length() * delta_throttle
+
+
+# Called when this object is picked up
+func _on_picked_up(_pickable) -> void:
+	volume_db = 0
+	if playing:
+		stop()
+	stream = pickable_audio_type.grab_sound
+	play()
+
+
+# Called when this object is dropped
+func _on_dropped(_pickable) -> void:
+	for body in _pickable.get_colliding_bodies():
+		if playing:
+			stop()
+
+
+func _on_body_entered(_body):
+	if playing:
+			stop()
+	if _pickable.is_picked_up():
+		stream = pickable_audio_type.hit_sound
+	else:
+		stream = pickable_audio_type.drop_sound
+	play()
+
+
+# This method checks for configuration issues.
+func _get_configuration_warnings() -> PackedStringArray:
+	var warnings := PackedStringArray()
+
+	if !pickable_audio_type:
+		warnings.append("Pickable audio type not specified")
+
+	# Return warnings
+	return warnings

addons/godot-xr-tools/audio/pickable_audio.tscn

@@ -0,0 +1,9 @@
+[gd_scene load_steps=2 format=3 uid="uid://bikkxsbo8x7sd"]
+
+[ext_resource type="Script" path="res://addons/godot-xr-tools/audio/pickable_audio.gd" id="1_cfg1k"]
+
+[node name="PickableAudio" type="AudioStreamPlayer3D"]
+unit_size = 3.0
+max_db = 1.0
+max_distance = 100.0
+script = ExtResource("1_cfg1k")

addons/godot-xr-tools/audio/pickable_audio_type.gd

@@ -0,0 +1,34 @@
+@tool
+@icon("res://addons/godot-xr-tools/editor/icons/audio.svg")
+class_name XRToolsPickableAudioType
+extends Resource
+
+
+## XRTools Pickable Audio Type Resource
+##
+## This resource defines the audio streams to play when
+## the pickable is being picked up/ dropped/ hit something while being held
+
+
+## Surface name
+@export var name : String = ""
+
+## Optional audio stream to play when the player picks up the pickable
+@export var grab_sound : AudioStream
+
+## Optional audio stream to play when the player drops the pickable
+@export var drop_sound : AudioStream
+
+## Optional audio stream to play when the item is beign held by the player
+@export var hit_sound : AudioStream
+
+
+# This method checks for configuration issues.
+func _get_configuration_warnings() -> PackedStringArray:
+	var warnings := PackedStringArray()
+
+	if name == "":
+		warnings.append("Pickable audio type must have a name")
+
+	# Return warnings
+	return warnings

addons/godot-xr-tools/editor/icons/audio.svg.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dhnfbf4p0s74"
+path="res://.godot/imported/audio.svg-20d7f0b624a1b2ef54f1b4d12970c8d0.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://addons/godot-xr-tools/editor/icons/audio.svg"
+dest_files=["res://.godot/imported/audio.svg-20d7f0b624a1b2ef54f1b4d12970c8d0.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false