alexandru.stanciu/immersive-home
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

bug fixes regarding touch system

Browse Source
This commit is contained in:
Nitwel 2023-11-28 00:51:44 +01:00
parent 9a4b493d72
commit f3f2c5077b
3 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
content/system/hands/hands.gd
View File

@ -23,7 +23,10 @@ var grabbed_right = false
func _ready(): func _ready():
touch = Touch.new({ touch = Touch.new({
Finger.Type.INDEX_RIGHT: $XRHandRight/IndexTip/IndexArea Finger.Type.INDEX_RIGHT: $XRHandRight/IndexTip/IndexArea,
Finger.Type.INDEX_LEFT: $XRHandLeft/IndexTip/IndexArea,
Finger.Type.MIDDLE_RIGHT: $XRHandRight/MiddleTip/MiddleArea,
Finger.Type.MIDDLE_LEFT: $XRHandLeft/MiddleTip/MiddleArea
}) })
add_child(touch) add_child(touch)

40
content/system/hands/hands.tscn
View File

@ -1,4 +1,4 @@
[gd_scene load_steps=6 format=3 uid="uid://bsx12q23v8apy"] [gd_scene load_steps=5 format=3 uid="uid://bsx12q23v8apy"]
[ext_resource type="Script" path="res://content/system/hands/hands.gd" id="1_c4f76"] [ext_resource type="Script" path="res://content/system/hands/hands.gd" id="1_c4f76"]
[ext_resource type="PackedScene" uid="uid://c0kow4g10wolq" path="res://assets/models/hands_steam/right_hand.glb" id="1_uekbj"] [ext_resource type="PackedScene" uid="uid://c0kow4g10wolq" path="res://assets/models/hands_steam/right_hand.glb" id="1_uekbj"]
@ -8,9 +8,6 @@
radius = 0.001 radius = 0.001
height = 0.02 height = 0.02
[sub_resource type="BoxShape3D" id="BoxShape3D_wty44"]
size = Vector3(0.0274034, 0.194213, 0.133443)
[node name="Hands" type="Node3D"] [node name="Hands" type="Node3D"]
script = ExtResource("1_c4f76") script = ExtResource("1_c4f76")
@ -31,6 +28,16 @@ external_skeleton = NodePath("../left_hand/Armature_001/Skeleton3D")
[node name="Marker3D" type="Marker3D" parent="XRHandLeft/IndexTip"] [node name="Marker3D" type="Marker3D" parent="XRHandLeft/IndexTip"]
gizmo_extents = 0.02 gizmo_extents = 0.02
[node name="IndexArea" type="Area3D" parent="XRHandLeft/IndexTip"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0.01)
collision_layer = 2
collision_mask = 2
monitorable = false
[node name="CollisionShape3D" type="CollisionShape3D" parent="XRHandLeft/IndexTip/IndexArea"]
transform = Transform3D(1, -7.45058e-09, -2.22045e-16, 7.45058e-09, 1, 0, 0, 0, 1, 0, 0, 0)
shape = SubResource("CapsuleShape3D_dopke")
[node name="ThumbTip" type="BoneAttachment3D" parent="XRHandLeft"] [node name="ThumbTip" type="BoneAttachment3D" parent="XRHandLeft"]
transform = Transform3D(0.937246, 0.0284254, -0.347508, 0.0184905, 0.991216, 0.130949, 0.348178, -0.129157, 0.928488, 0.0498668, 0.0560917, -0.0797768) transform = Transform3D(0.937246, 0.0284254, -0.347508, 0.0184905, 0.991216, 0.130949, 0.348178, -0.129157, 0.928488, 0.0498668, 0.0560917, -0.0797768)
bone_name = "Thumb_Tip_L" bone_name = "Thumb_Tip_L"
@ -51,6 +58,16 @@ external_skeleton = NodePath("../left_hand/Armature_001/Skeleton3D")
[node name="Marker3D" type="Marker3D" parent="XRHandLeft/MiddleTip"] [node name="Marker3D" type="Marker3D" parent="XRHandLeft/MiddleTip"]
gizmo_extents = 0.02 gizmo_extents = 0.02
[node name="IndexArea" type="Area3D" parent="XRHandLeft/MiddleTip"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0.01)
collision_layer = 2
collision_mask = 2
monitorable = false
[node name="CollisionShape3D" type="CollisionShape3D" parent="XRHandLeft/MiddleTip/IndexArea"]
transform = Transform3D(1, -7.45058e-09, -2.22045e-16, 7.45058e-09, 1, 0, 0, 0, 1, 0, 0, 0)
shape = SubResource("CapsuleShape3D_dopke")
[node name="XRHandRight" type="OpenXRHand" parent="."] [node name="XRHandRight" type="OpenXRHand" parent="."]
transform = Transform3D(0.999998, -0.000567105, -2.5179e-05, -2.51789e-05, 4.39886e-08, -0.999999, 0.000567104, 0.999999, 2.97064e-08, 0.264391, 0, 0) transform = Transform3D(0.999998, -0.000567105, -2.5179e-05, -2.51789e-05, 4.39886e-08, -0.999999, 0.000567104, 0.999999, 2.97064e-08, 0.264391, 0, 0)
hand = 1 hand = 1
@ -99,14 +116,15 @@ external_skeleton = NodePath("../right_hand/Armature/Skeleton3D")
[node name="Marker3D" type="Marker3D" parent="XRHandRight/MiddleTip"] [node name="Marker3D" type="Marker3D" parent="XRHandRight/MiddleTip"]
gizmo_extents = 0.02 gizmo_extents = 0.02
[node name="AnimatableBody3D" type="AnimatableBody3D" parent="XRHandRight"] [node name="IndexArea" type="Area3D" parent="XRHandRight/MiddleTip"]
transform = Transform3D(1, 0, 4.7579e-13, 0, 1, 0, -3.16048e-12, 1.77636e-15, 1, 5.36442e-07, -9.16771e-10, 0.0208378) transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0.01)
collision_layer = 4 collision_layer = 2
collision_mask = 4 collision_mask = 2
monitorable = false
[node name="CollisionShape3D" type="CollisionShape3D" parent="XRHandRight/AnimatableBody3D"] [node name="CollisionShape3D" type="CollisionShape3D" parent="XRHandRight/MiddleTip/IndexArea"]
transform = Transform3D(1, 0, 4.7579e-13, -1.16415e-10, 1, 0, -1.04364e-11, 1.77636e-15, 1, -0.0166854, -0.0757538, 4.16786e-07) transform = Transform3D(1, -7.45058e-09, -2.22045e-16, 7.45058e-09, 1, 0, 0, 0, 1, 0, 0, 0)
shape = SubResource("BoxShape3D_wty44") shape = SubResource("CapsuleShape3D_dopke")
[editable path="XRHandLeft/left_hand"] [editable path="XRHandLeft/left_hand"]
[editable path="XRHandRight/right_hand"] [editable path="XRHandRight/right_hand"]

8
content/ui/components/button/button.gd
View File

@ -18,9 +18,9 @@ const IconFont = preload("res://assets/icons/icons.tres")
focusable = value focusable = value
if !is_node_ready(): await ready if !is_node_ready(): await ready
if value: if value:
$Body.add_to_group("ui_focus_skip") add_to_group("ui_focus_skip")
else: else:
$Body.remove_from_group("ui_focus_skip") remove_from_group("ui_focus_skip")
@export var font_size: int = 10: @export var font_size: int = 10:
set(value): set(value):
@ -71,14 +71,11 @@ func _ready():
active = true active = true
func update_animation(): func update_animation():
print(1)
var length = animation_player.get_animation("down").length var length = animation_player.get_animation("down").length
if active && animation_player.current_animation_position != length: if active && animation_player.current_animation_position != length:
print(2)
animation_player.play("down") animation_player.play("down")
elif !active && animation_player.current_animation_position != 0: elif !active && animation_player.current_animation_position != 0:
print(3)
animation_player.play_backwards("down") animation_player.play_backwards("down")
func _on_press_down(event): func _on_press_down(event):
@ -114,6 +111,7 @@ func _on_touch_enter(event: EventTouch):
animation_player.stop() animation_player.stop()
animation_player.speed_scale = 0 animation_player.speed_scale = 0
animation_player.current_animation = "down" animation_player.current_animation = "down"
AudioPlayer.play_effect("click")
_touch_change(event) _touch_change(event)
func _on_touch_move(event: EventTouch): func _on_touch_move(event: EventTouch):