Skip to content
This repository has been archived by the owner on Jan 21, 2025. It is now read-only.

Update Godot Oculus Quest Toolkit and merge local changes in #32

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update Godot Oculus Quest Toolkit and merge local changes in #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
156 changes: 156 additions & 0 deletions OQ_Toolkit/OQ_ARVRController/Feature_ControllerModel_Left_Reactive.tscn
View file
Open in desktop

Large diffs are not rendered by default.

153 changes: 153 additions & 0 deletions OQ_Toolkit/OQ_ARVRController/Feature_ControllerModel_Right_Reactive.tscn
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...troller/Feature_ControllerModel_Left.tscn → ...r/Feature_Quest1ControllerModel_Left.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[ext_resource path="res://OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestTouchController_Left.gltf" type="PackedScene" id=1]
[ext_resource path="res://OQ_Toolkit/OQ_ARVRController/scripts/Feature_ControllerModel.gd" type="Script" id=2]

[node name="Feature_ControllerModel_Left" type="Spatial"]
[node name="Feature_Quest1ControllerModel_Left" type="Spatial"]
script = ExtResource( 2 )

[node name="OculusQuestTouchController_Left" parent="." instance=ExtResource( 1 )]
Expand Down
2 changes: 1 addition & 1 deletion ...roller/Feature_ControllerModel_Right.tscn → .../Feature_Quest1ControllerModel_Right.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[ext_resource path="res://OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestTouchController_Right.gltf" type="PackedScene" id=1]
[ext_resource path="res://OQ_Toolkit/OQ_ARVRController/scripts/Feature_ControllerModel.gd" type="Script" id=2]

[node name="Feature_ControllerModel_Right" type="Spatial"]
[node name="Feature_Quest1ControllerModel_Right" type="Spatial"]
script = ExtResource( 2 )

[node name="OculusQuestTouchController_Right" parent="." instance=ExtResource( 1 )]
Expand Down
14 changes: 14 additions & 0 deletions OQ_Toolkit/OQ_ARVRController/Feature_Quest2ControllerModel_Left.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[gd_scene load_steps=3 format=2]

[ext_resource path="res://OQ_Toolkit/OQ_ARVRController/models3d/OculusQuest2/OculusQuest2TouchController_Left.gltf" type="PackedScene" id=1]
[ext_resource path="res://OQ_Toolkit/OQ_ARVRController/scripts/Feature_ControllerModel.gd" type="Script" id=2]

[node name="Feature_Quest2ControllerModel_Left" instance=ExtResource( 1 )]
transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0 )
script = ExtResource( 2 )

[node name="PalmMarker" type="Spatial" parent="." index="1"]

[node name="GrabMarker" type="Spatial" parent="." index="2"]

[node name="UIMarker" type="Spatial" parent="." index="3"]
14 changes: 14 additions & 0 deletions OQ_Toolkit/OQ_ARVRController/Feature_Quest2ControllerModel_Right.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[gd_scene load_steps=3 format=2]

[ext_resource path="res://OQ_Toolkit/OQ_ARVRController/models3d/OculusQuest2/OculusQuest2TouchController_Right.gltf" type="PackedScene" id=1]
[ext_resource path="res://OQ_Toolkit/OQ_ARVRController/scripts/Feature_ControllerModel.gd" type="Script" id=2]

[node name="Feature_Quest2ControllerModel_Right" instance=ExtResource( 1 )]
transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0 )
script = ExtResource( 2 )

[node name="PalmMarker" type="Spatial" parent="." index="1"]

[node name="GrabMarker" type="Spatial" parent="." index="2"]

[node name="UIMarker" type="Spatial" parent="." index="3"]
2 changes: 2 additions & 0 deletions OQ_Toolkit/OQ_ARVRController/Feature_RigidBodyGrab.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,5 @@ angular_limit/upper = 0.0
angular_limit/lower = 0.0
angular_limit/bias = 0.99
angular_limit/relaxation = 0.5
[connection signal="body_entered" from="GrabArea" to="." method="_on_GrabArea_body_entered"]
[connection signal="body_exited" from="GrabArea" to="." method="_on_GrabArea_body_exited"]
Loading