Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OQ_Toolkit as plugin #40

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

OQ_Toolkit as plugin #40

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3fd7c83
OQ_Toolkit as plugin
Wavesonics Jul 1, 2020
393268e
Added core scripts as Nodes in the editor
Wavesonics Jul 1, 2020
6da7712
OQ_ARVROrigin now auto initialized vr singleton
Wavesonics Jul 1, 2020
2eaf195
Properly remove custom types
Wavesonics Jul 1, 2020
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
2 changes: 1 addition & 1 deletion GameMain.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func _process(_dt):
# vr.switch_scene(room_list[0]);

func _ready():
vr.initialize();
#vr.initialize();

#vr.set_display_refresh_rate(60);
#Engine.target_fps = 60;
Expand Down
Binary file removed OQ_Toolkit/OQ_ARVRCamera/scripts/StereoPanorama.material
View file
Open in desktop
Binary file not shown.
Binary file removed OQ_Toolkit/OQ_ARVRController/models3d/HandMaterialLeft.material
View file
Open in desktop
Binary file not shown.
Binary file removed OQ_Toolkit/OQ_ARVRController/models3d/HandMaterialRight.material
View file
Open in desktop
Binary file not shown.
Binary file removed OQ_Toolkit/OQ_ARVRController/models3d/controllerMTL.material
View file
Open in desktop
Binary file not shown.
6 changes: 0 additions & 6 deletions OQ_Toolkit/OQ_ARVROrigin/Feature_Climbing.tscn
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions OQ_Toolkit/OQ_ARVROrigin/Feature_Falling.tscn
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions OQ_Toolkit/OQ_ARVROrigin/Feature_VRRecorder.tscn
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions OQ_Toolkit/OQ_ARVROrigin/Feature_VRSimulator.tscn
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions OQ_Toolkit/OQ_ARVROrigin/Locomotion_WalkInPlace.tscn
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions OQ_Toolkit/OQ_UI2D/OQ_UI2DLabel_IPD.tscn
View file
Open in desktop

This file was deleted.

Binary file removed OQ_Toolkit/OQ_UI2D/theme/oq_ui2d_standard.theme
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion OQ_Toolkit/OQ_ARVRCamera.tscn → addons/OQ_Toolkit/OQ_ARVRCamera.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[gd_scene load_steps=2 format=2]

[ext_resource path="res://OQ_Toolkit/OQ_ARVRCamera/scripts/OQ_ARVRCamera.gd" type="Script" id=1]
[ext_resource path="res://addons/OQ_Toolkit/OQ_ARVRCamera/scripts/OQ_ARVRCamera.gd" type="Script" id=1]


[node name="OQ_ARVRCamera" type="ARVRCamera"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.8, 0 )
Expand Down
5 changes: 3 additions & 2 deletions ...OQ_ARVRCamera/Feature_StereoPanorama.tscn → ...OQ_ARVRCamera/Feature_StereoPanorama.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[gd_scene load_steps=4 format=2]

[ext_resource path="res://OQ_Toolkit/OQ_ARVRCamera/scripts/Feature_StereoPanorama.gd" type="Script" id=1]
[ext_resource path="res://OQ_Toolkit/OQ_ARVRCamera/scripts/StereoPanorama.material" type="Material" id=2]
[ext_resource path="res://addons/OQ_Toolkit/OQ_ARVRCamera/scripts/Feature_StereoPanorama.gd" type="Script" id=1]
[ext_resource path="res://addons/OQ_Toolkit/OQ_ARVRCamera/scripts/StereoPanorama.material" type="Material" id=2]


[sub_resource type="QuadMesh" id=1]
size = Vector2( 4, 2 )
Expand Down
0 ...RCamera/scripts/Feature_StereoPanorama.gd → ...RCamera/scripts/Feature_StereoPanorama.gd
View file
Open in desktop
File renamed without changes.
0 ...it/OQ_ARVRCamera/scripts/OQ_ARVRCamera.gd → ...it/OQ_ARVRCamera/scripts/OQ_ARVRCamera.gd
View file
Open in desktop
File renamed without changes.
Binary file added addons/OQ_Toolkit/OQ_ARVRCamera/scripts/StereoPanorama.material
View file
Open in desktop
Binary file not shown.
0 ..._ARVRCamera/scripts/StereoPanorama.shader → ..._ARVRCamera/scripts/StereoPanorama.shader
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion ...RVRController/Feature_AreaObjectGrab.tscn → ...RVRController/Feature_AreaObjectGrab.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[gd_scene load_steps=3 format=2]

[ext_resource path="res://OQ_Toolkit/OQ_ARVRController/scripts/Feature_AreaObjectGrab.gd" type="Script" id=1]
[ext_resource path="res://addons/OQ_Toolkit/OQ_ARVRController/scripts/Feature_AreaObjectGrab.gd" type="Script" id=1]


[sub_resource type="SphereShape" id=1]
radius = 0.1
Expand Down
5 changes: 3 additions & 2 deletions ...troller/Feature_ControllerModel_Left.tscn → ...troller/Feature_ControllerModel_Left.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[gd_scene load_steps=3 format=2]

[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]
[ext_resource path="res://addons/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestTouchController_Left.gltf" type="PackedScene" id=1]
[ext_resource path="res://addons/OQ_Toolkit/OQ_ARVRController/scripts/Feature_ControllerModel.gd" type="Script" id=2]


[node name="Feature_ControllerModel_Left" type="Spatial"]
script = ExtResource( 2 )
Expand Down
5 changes: 3 additions & 2 deletions ...roller/Feature_ControllerModel_Right.tscn → ...roller/Feature_ControllerModel_Right.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[gd_scene load_steps=3 format=2]

[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]
[ext_resource path="res://addons/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestTouchController_Right.gltf" type="PackedScene" id=1]
[ext_resource path="res://addons/OQ_Toolkit/OQ_ARVRController/scripts/Feature_ControllerModel.gd" type="Script" id=2]


[node name="Feature_ControllerModel_Right" type="Spatial"]
script = ExtResource( 2 )
Expand Down
5 changes: 3 additions & 2 deletions ...RVRController/Feature_HandModel_Left.tscn → ...RVRController/Feature_HandModel_Left.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[gd_scene load_steps=3 format=2]

[ext_resource path="res://OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestHand_Left.gltf" type="PackedScene" id=1]
[ext_resource path="res://OQ_Toolkit/OQ_ARVRController/scripts/Feature_HandModel.gd" type="Script" id=2]
[ext_resource path="res://addons/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestHand_Left.gltf" type="PackedScene" id=1]
[ext_resource path="res://addons/OQ_Toolkit/OQ_ARVRController/scripts/Feature_HandModel.gd" type="Script" id=2]


[node name="Feature_HandModel_Left" type="Spatial"]
script = ExtResource( 2 )
Expand Down
5 changes: 3 additions & 2 deletions ...VRController/Feature_HandModel_Right.tscn → ...VRController/Feature_HandModel_Right.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[gd_scene load_steps=3 format=2]

[ext_resource path="res://OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestHand_Right.gltf" type="PackedScene" id=1]
[ext_resource path="res://OQ_Toolkit/OQ_ARVRController/scripts/Feature_HandModel.gd" type="Script" id=2]
[ext_resource path="res://addons/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestHand_Right.gltf" type="PackedScene" id=1]
[ext_resource path="res://addons/OQ_Toolkit/OQ_ARVRController/scripts/Feature_HandModel.gd" type="Script" id=2]


[node name="Feature_HandModel_Right" type="Spatial"]
script = ExtResource( 2 )
Expand Down
3 changes: 2 additions & 1 deletion ...ARVRController/Feature_RigidBodyGrab.tscn → ...ARVRController/Feature_RigidBodyGrab.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[gd_scene load_steps=4 format=2]

[ext_resource path="res://OQ_Toolkit/OQ_ARVRController/scripts/Feature_RigidBodyGrab.gd" type="Script" id=1]
[ext_resource path="res://addons/OQ_Toolkit/OQ_ARVRController/scripts/Feature_RigidBodyGrab.gd" type="Script" id=1]


[sub_resource type="SphereShape" id=1]
radius = 0.1
Expand Down
3 changes: 2 additions & 1 deletion ...OQ_ARVRController/Feature_StaticGrab.tscn → ...OQ_ARVRController/Feature_StaticGrab.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[gd_scene load_steps=3 format=2]

[ext_resource path="res://OQ_Toolkit/OQ_ARVRController/scripts/Feature_StaticGrab.gd" type="Script" id=1]
[ext_resource path="res://addons/OQ_Toolkit/OQ_ARVRController/scripts/Feature_StaticGrab.gd" type="Script" id=1]


[sub_resource type="SphereShape" id=1]
radius = 0.1
Expand Down
3 changes: 2 additions & 1 deletion ...t/OQ_ARVRController/Feature_ToolGrab.tscn → ...t/OQ_ARVRController/Feature_ToolGrab.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[gd_scene load_steps=4 format=2]

[ext_resource path="res://OQ_Toolkit/OQ_ARVRController/scripts/Feature_ToolGrab.gd" type="Script" id=1]
[ext_resource path="res://addons/OQ_Toolkit/OQ_ARVRController/scripts/Feature_ToolGrab.gd" type="Script" id=1]


[sub_resource type="SphereShape" id=1]
radius = 0.1
Expand Down
3 changes: 2 additions & 1 deletion .../OQ_ARVRController/Feature_UIRayCast.tscn → .../OQ_ARVRController/Feature_UIRayCast.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[gd_scene load_steps=6 format=2]

[ext_resource path="res://OQ_Toolkit/OQ_ARVRController/scripts/Feature_UIRayCast.gd" type="Script" id=1]
[ext_resource path="res://addons/OQ_Toolkit/OQ_ARVRController/scripts/Feature_UIRayCast.gd" type="Script" id=1]


[sub_resource type="CubeMesh" id=1]
size = Vector3( 0.004, 0.004, 1 )
Expand Down
Binary file added addons/OQ_Toolkit/OQ_ARVRController/models3d/HandMaterialLeft.material
View file
Open in desktop
Binary file not shown.
Binary file added addons/OQ_Toolkit/OQ_ARVRController/models3d/HandMaterialRight.material
View file
Open in desktop
Binary file not shown.
0 ...odels3d/OculusQuestHandTexture_Color.webp → ...odels3d/OculusQuestHandTexture_Color.webp
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions .../OculusQuestHandTexture_Color.webp.import → .../OculusQuestHandTexture_Color.webp.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@

importer="texture"
type="StreamTexture"
path.s3tc="res://.import/OculusQuestHandTexture_Color.webp-4cddb0a692cdeb3e8035fd88d73767ea.s3tc.stex"
path.etc="res://.import/OculusQuestHandTexture_Color.webp-4cddb0a692cdeb3e8035fd88d73767ea.etc.stex"
path.s3tc="res://.import/OculusQuestHandTexture_Color.webp-1fe37fba1d81878097dd632fa00d1b03.s3tc.stex"
path.etc="res://.import/OculusQuestHandTexture_Color.webp-1fe37fba1d81878097dd632fa00d1b03.etc.stex"
metadata={
"imported_formats": [ "s3tc", "etc" ],
"vram_texture": true
}

[deps]

source_file="res://OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestHandTexture_Color.webp"
dest_files=[ "res://.import/OculusQuestHandTexture_Color.webp-4cddb0a692cdeb3e8035fd88d73767ea.s3tc.stex", "res://.import/OculusQuestHandTexture_Color.webp-4cddb0a692cdeb3e8035fd88d73767ea.etc.stex" ]
source_file="res://addons/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestHandTexture_Color.webp"
dest_files=[ "res://.import/OculusQuestHandTexture_Color.webp-1fe37fba1d81878097dd632fa00d1b03.s3tc.stex", "res://.import/OculusQuestHandTexture_Color.webp-1fe37fba1d81878097dd632fa00d1b03.etc.stex" ]

[params]

Expand Down
0 ...troller/models3d/OculusQuestHand_Left.bin → ...troller/models3d/OculusQuestHand_Left.bin
View file
Open in desktop
File renamed without changes.
0 ...roller/models3d/OculusQuestHand_Left.gltf → ...roller/models3d/OculusQuestHand_Left.gltf
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...models3d/OculusQuestHand_Left.gltf.import → ...models3d/OculusQuestHand_Left.gltf.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

importer="scene"
type="PackedScene"
path="res://.import/OculusQuestHand_Left.gltf-5162d761ce4b20cdff3f64e5593dd105.scn"
path="res://.import/OculusQuestHand_Left.gltf-8aa6bb52f6acb8dec3504ec28a44f37f.scn"

[deps]

source_file="res://OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestHand_Left.gltf"
dest_files=[ "res://.import/OculusQuestHand_Left.gltf-5162d761ce4b20cdff3f64e5593dd105.scn" ]
source_file="res://addons/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestHand_Left.gltf"
dest_files=[ "res://.import/OculusQuestHand_Left.gltf-8aa6bb52f6acb8dec3504ec28a44f37f.scn" ]

[params]

Expand Down
0 ...roller/models3d/OculusQuestHand_Right.bin → ...roller/models3d/OculusQuestHand_Right.bin
View file
Open in desktop
File renamed without changes.
0 ...oller/models3d/OculusQuestHand_Right.gltf → ...oller/models3d/OculusQuestHand_Right.gltf
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...odels3d/OculusQuestHand_Right.gltf.import → ...odels3d/OculusQuestHand_Right.gltf.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

importer="scene"
type="PackedScene"
path="res://.import/OculusQuestHand_Right.gltf-2bae7afcb09ff56e3adc96d9b9564d9d.scn"
path="res://.import/OculusQuestHand_Right.gltf-74fdb0606154ad830f332532d5d780c8.scn"

[deps]

source_file="res://OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestHand_Right.gltf"
dest_files=[ "res://.import/OculusQuestHand_Right.gltf-2bae7afcb09ff56e3adc96d9b9564d9d.scn" ]
source_file="res://addons/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestHand_Right.gltf"
dest_files=[ "res://.import/OculusQuestHand_Right.gltf-74fdb0606154ad830f332532d5d780c8.scn" ]

[params]

Expand Down
0 ...ulusQuestTouchControllerTexture_Color.png → ...ulusQuestTouchControllerTexture_Color.png
View file
Open in desktop
File renamed without changes
8 changes: 4 additions & 4 deletions ...stTouchControllerTexture_Color.png.import → ...stTouchControllerTexture_Color.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@

importer="texture"
type="StreamTexture"
path.s3tc="res://.import/OculusQuestTouchControllerTexture_Color.png-50b970087254ba4407e4489b8d7b9761.s3tc.stex"
path.etc="res://.import/OculusQuestTouchControllerTexture_Color.png-50b970087254ba4407e4489b8d7b9761.etc.stex"
path.s3tc="res://.import/OculusQuestTouchControllerTexture_Color.png-b0c10b7ea78b1d7180abd8485726d103.s3tc.stex"
path.etc="res://.import/OculusQuestTouchControllerTexture_Color.png-b0c10b7ea78b1d7180abd8485726d103.etc.stex"
metadata={
"imported_formats": [ "s3tc", "etc" ],
"vram_texture": true
}

[deps]

source_file="res://OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestTouchControllerTexture_Color.png"
dest_files=[ "res://.import/OculusQuestTouchControllerTexture_Color.png-50b970087254ba4407e4489b8d7b9761.s3tc.stex", "res://.import/OculusQuestTouchControllerTexture_Color.png-50b970087254ba4407e4489b8d7b9761.etc.stex" ]
source_file="res://addons/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestTouchControllerTexture_Color.png"
dest_files=[ "res://.import/OculusQuestTouchControllerTexture_Color.png-b0c10b7ea78b1d7180abd8485726d103.s3tc.stex", "res://.import/OculusQuestTouchControllerTexture_Color.png-b0c10b7ea78b1d7180abd8485726d103.etc.stex" ]

[params]

Expand Down
0 ...QuestTouchControllerTexture_Roughness.png → ...QuestTouchControllerTexture_Roughness.png
View file
Open in desktop
File renamed without changes
8 changes: 4 additions & 4 deletions ...uchControllerTexture_Roughness.png.import → ...uchControllerTexture_Roughness.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@

importer="texture"
type="StreamTexture"
path.s3tc="res://.import/OculusQuestTouchControllerTexture_Roughness.png-5c4589e69a03b4c3cd6caf8c4c1ae6ef.s3tc.stex"
path.etc="res://.import/OculusQuestTouchControllerTexture_Roughness.png-5c4589e69a03b4c3cd6caf8c4c1ae6ef.etc.stex"
path.s3tc="res://.import/OculusQuestTouchControllerTexture_Roughness.png-c8571da729a5370121631b35b09ca359.s3tc.stex"
path.etc="res://.import/OculusQuestTouchControllerTexture_Roughness.png-c8571da729a5370121631b35b09ca359.etc.stex"
metadata={
"imported_formats": [ "s3tc", "etc" ],
"vram_texture": true
}

[deps]

source_file="res://OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestTouchControllerTexture_Roughness.png"
dest_files=[ "res://.import/OculusQuestTouchControllerTexture_Roughness.png-5c4589e69a03b4c3cd6caf8c4c1ae6ef.s3tc.stex", "res://.import/OculusQuestTouchControllerTexture_Roughness.png-5c4589e69a03b4c3cd6caf8c4c1ae6ef.etc.stex" ]
source_file="res://addons/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestTouchControllerTexture_Roughness.png"
dest_files=[ "res://.import/OculusQuestTouchControllerTexture_Roughness.png-c8571da729a5370121631b35b09ca359.s3tc.stex", "res://.import/OculusQuestTouchControllerTexture_Roughness.png-c8571da729a5370121631b35b09ca359.etc.stex" ]

[params]

Expand Down
0 ...els3d/OculusQuestTouchController_Left.bin → ...els3d/OculusQuestTouchController_Left.bin
View file
Open in desktop
File renamed without changes.
0 ...ls3d/OculusQuestTouchController_Left.gltf → ...ls3d/OculusQuestTouchController_Left.gltf
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...ulusQuestTouchController_Left.gltf.import → ...ulusQuestTouchController_Left.gltf.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

importer="scene"
type="PackedScene"
path="res://.import/OculusQuestTouchController_Left.gltf-8c6bcf0c6eb7a4223a94539a3fe95ef1.scn"
path="res://.import/OculusQuestTouchController_Left.gltf-4689fcb3c8cde6668fb4bbcea33b3f2e.scn"

[deps]

source_file="res://OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestTouchController_Left.gltf"
dest_files=[ "res://.import/OculusQuestTouchController_Left.gltf-8c6bcf0c6eb7a4223a94539a3fe95ef1.scn" ]
source_file="res://addons/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestTouchController_Left.gltf"
dest_files=[ "res://.import/OculusQuestTouchController_Left.gltf-4689fcb3c8cde6668fb4bbcea33b3f2e.scn" ]

[params]

Expand Down
0 ...ls3d/OculusQuestTouchController_Right.bin → ...ls3d/OculusQuestTouchController_Right.bin
View file
Open in desktop
File renamed without changes.
0 ...s3d/OculusQuestTouchController_Right.gltf → ...s3d/OculusQuestTouchController_Right.gltf
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...lusQuestTouchController_Right.gltf.import → ...lusQuestTouchController_Right.gltf.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

importer="scene"
type="PackedScene"
path="res://.import/OculusQuestTouchController_Right.gltf-07fd49f7972b14e8676c8ad4784d564d.scn"
path="res://.import/OculusQuestTouchController_Right.gltf-1709cbb5a9380720705c14892bbb1aa8.scn"

[deps]

source_file="res://OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestTouchController_Right.gltf"
dest_files=[ "res://.import/OculusQuestTouchController_Right.gltf-07fd49f7972b14e8676c8ad4784d564d.scn" ]
source_file="res://addons/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestTouchController_Right.gltf"
dest_files=[ "res://.import/OculusQuestTouchController_Right.gltf-1709cbb5a9380720705c14892bbb1aa8.scn" ]

[params]

Expand Down
Binary file added addons/OQ_Toolkit/OQ_ARVRController/models3d/controllerMTL.material
View file
Open in desktop
Binary file not shown.
0 ...troller/scripts/Feature_AreaObjectGrab.gd → ...troller/scripts/Feature_AreaObjectGrab.gd
View file
Open in desktop
File renamed without changes.
0 ...roller/scripts/Feature_ControllerModel.gd → ...roller/scripts/Feature_ControllerModel.gd
View file
Open in desktop
File renamed without changes.
0 ...ler/scripts/Feature_ControllerVelocity.gd → ...ler/scripts/Feature_ControllerVelocity.gd
View file
Open in desktop
File renamed without changes.
0 ...VRController/scripts/Feature_HandModel.gd → ...VRController/scripts/Feature_HandModel.gd
View file
Open in desktop
File renamed without changes.
0 ...ntroller/scripts/Feature_RigidBodyGrab.gd → ...ntroller/scripts/Feature_RigidBodyGrab.gd
View file
Open in desktop
File renamed without changes.
0 ...RController/scripts/Feature_StaticGrab.gd → ...RController/scripts/Feature_StaticGrab.gd
View file
Open in desktop
File renamed without changes.
0 ...RVRController/scripts/Feature_ToolGrab.gd → ...RVRController/scripts/Feature_ToolGrab.gd
View file
Open in desktop
File renamed without changes.
0 ...VRController/scripts/Feature_UIRayCast.gd → ...VRController/scripts/Feature_UIRayCast.gd
View file
Open in desktop
File renamed without changes.
0 ...VRController/scripts/OQ_ARVRController.gd → ...VRController/scripts/OQ_ARVRController.gd
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion OQ_Toolkit/OQ_ARVROrigin.tscn → addons/OQ_Toolkit/OQ_ARVROrigin.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[gd_scene load_steps=2 format=2]

[ext_resource path="res://OQ_Toolkit/OQ_ARVROrigin/scripts/OQ_ARVROrigin.gd" type="Script" id=1]
[ext_resource path="res://addons/OQ_Toolkit/OQ_ARVROrigin/scripts/OQ_ARVROrigin.gd" type="Script" id=1]


[node name="OQ_ARVROrigin" type="ARVROrigin"]
script = ExtResource( 1 )
7 changes: 7 additions & 0 deletions addons/OQ_Toolkit/OQ_ARVROrigin/Feature_Climbing.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[gd_scene load_steps=2 format=2]

[ext_resource path="res://addons/OQ_Toolkit/OQ_ARVROrigin/scripts/Feature_Climbing.gd" type="Script" id=1]


[node name="Feature_Climbing" type="Spatial"]
script = ExtResource( 1 )
7 changes: 7 additions & 0 deletions addons/OQ_Toolkit/OQ_ARVROrigin/Feature_Falling.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[gd_scene load_steps=2 format=2]

[ext_resource path="res://addons/OQ_Toolkit/OQ_ARVROrigin/scripts/Feature_Falling.gd" type="Script" id=1]


[node name="Feature_Falling" type="Spatial"]
script = ExtResource( 1 )
3 changes: 2 additions & 1 deletion ...VROrigin/Feature_MixedRealityCapture.tscn → ...VROrigin/Feature_MixedRealityCapture.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[gd_scene load_steps=2 format=2]

[ext_resource path="res://OQ_Toolkit/OQ_ARVROrigin/scripts/Feature_MixedRealityCapture.gd" type="Script" id=1]
[ext_resource path="res://addons/OQ_Toolkit/OQ_ARVROrigin/scripts/Feature_MixedRealityCapture.gd" type="Script" id=1]


[node name="Feature_MixedRealityCapture" type="Spatial"]
script = ExtResource( 1 )
Expand Down
3 changes: 2 additions & 1 deletion ...Q_ARVROrigin/Feature_PlayerCollision.tscn → ...Q_ARVROrigin/Feature_PlayerCollision.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[gd_scene load_steps=3 format=2]

[ext_resource path="res://OQ_Toolkit/OQ_ARVROrigin/scripts/Feature_PlayerCollision.gd" type="Script" id=1]
[ext_resource path="res://addons/OQ_Toolkit/OQ_ARVROrigin/scripts/Feature_PlayerCollision.gd" type="Script" id=1]


[sub_resource type="CapsuleShape" id=1]
radius = 0.15
Expand Down
7 changes: 7 additions & 0 deletions addons/OQ_Toolkit/OQ_ARVROrigin/Feature_VRRecorder.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[gd_scene load_steps=2 format=2]

[ext_resource path="res://addons/OQ_Toolkit/OQ_ARVROrigin/scripts/Feature_VRRecorder.gd" type="Script" id=1]


[node name="Feature_VRRecorder" type="Spatial"]
script = ExtResource( 1 )
7 changes: 7 additions & 0 deletions addons/OQ_Toolkit/OQ_ARVROrigin/Feature_VRSimulator.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[gd_scene load_steps=2 format=2]

[ext_resource path="res://addons/OQ_Toolkit/OQ_ARVROrigin/scripts/Feature_VRSimulator.gd" type="Script" id=1]


[node name="Feature_VRSimulator" type="Spatial"]
script = ExtResource( 1 )
5 changes: 3 additions & 2 deletions ...olkit/OQ_ARVROrigin/Locomotion_Stick.tscn → ...olkit/OQ_ARVROrigin/Locomotion_Stick.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[gd_scene load_steps=4 format=2]

[ext_resource path="res://OQ_Toolkit/OQ_ARVROrigin/scripts/Locomotion_Stick.gd" type="Script" id=1]
[ext_resource path="res://OQ_Toolkit/OQ_ARVROrigin/scripts/MovementVignette_CanvasItem.shader" type="Shader" id=2]
[ext_resource path="res://addons/OQ_Toolkit/OQ_ARVROrigin/scripts/Locomotion_Stick.gd" type="Script" id=1]
[ext_resource path="res://addons/OQ_Toolkit/OQ_ARVROrigin/scripts/MovementVignette_CanvasItem.shader" type="Shader" id=2]


[sub_resource type="ShaderMaterial" id=1]
shader = ExtResource( 2 )
Expand Down
7 changes: 7 additions & 0 deletions addons/OQ_Toolkit/OQ_ARVROrigin/Locomotion_WalkInPlace.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[gd_scene load_steps=2 format=2]

[ext_resource path="res://addons/OQ_Toolkit/OQ_ARVROrigin/scripts/Locomotion_WalkInPlace.gd" type="Script" id=1]


[node name="Locomotion_WalkInPlace" type="Spatial"]
script = ExtResource( 1 )
0 ...OQ_ARVROrigin/scripts/Feature_Climbing.gd → ...OQ_ARVROrigin/scripts/Feature_Climbing.gd
View file
Open in desktop
File renamed without changes.
0 .../OQ_ARVROrigin/scripts/Feature_Falling.gd → .../OQ_ARVROrigin/scripts/Feature_Falling.gd
View file
Open in desktop
File renamed without changes.
0 ...in/scripts/Feature_MixedRealityCapture.gd → ...in/scripts/Feature_MixedRealityCapture.gd
View file
Open in desktop
File renamed without changes.
0 ...Origin/scripts/Feature_PlayerCollision.gd → ...Origin/scripts/Feature_PlayerCollision.gd
View file
Open in desktop
File renamed without changes.
0 ..._ARVROrigin/scripts/Feature_VRRecorder.gd → ..._ARVROrigin/scripts/Feature_VRRecorder.gd
View file
Open in desktop
File renamed without changes.
0 ...ARVROrigin/scripts/Feature_VRSimulator.gd → ...ARVROrigin/scripts/Feature_VRSimulator.gd
View file
Open in desktop
File renamed without changes.
0 ...OQ_ARVROrigin/scripts/Locomotion_Stick.gd → ...OQ_ARVROrigin/scripts/Locomotion_Stick.gd
View file
Open in desktop
File renamed without changes.
0 ...ROrigin/scripts/Locomotion_WalkInPlace.gd → ...ROrigin/scripts/Locomotion_WalkInPlace.gd
View file
Open in desktop
File renamed without changes.
0 ...cripts/MovementVignette_CanvasItem.shader → ...cripts/MovementVignette_CanvasItem.shader
View file
Open in desktop
File renamed without changes.
4 changes: 4 additions & 0 deletions ...it/OQ_ARVROrigin/scripts/OQ_ARVROrigin.gd → ...it/OQ_ARVROrigin/scripts/OQ_ARVROrigin.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,15 @@ export var debug_information := false;

var is_fixed = false;

export(bool) var initialize_vr := true

# Sets up everything as it is expected by the helper scripts in the vr singleton
func _enter_tree():
if (!vr):
vr.log_error("in OQ_ARVROrigin._enter_tree(): no vr singleton");
return;
if (!vr.initialized and initialize_vr):
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like the idea to make it easier to use by auto-initializing and not requiring it user code; but as you have written this will make some settings and other required code (like the scene switch root) slightly more intransparent for users who will rely on this mechanism.
Also in my applications I have a OQ_ARVROrigin in every scene I switch to; but this should not be a problem I think with the guard.

Would it be possible to make the option part of the plugin settings (somehting like auto_initialize_vr)?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

absolutely, and probably needs to be for flexibility.

vr.initialize()
if (vr.vrOrigin != null):
vr.log_warning("in OQ_ARVROrigin._enter_tree(): origin already set; overwrting it");
vr.vrOrigin = self;
Expand Down
0 .../OQ_Classes/OQClass_GrabbableRigidBody.gd → .../OQ_Classes/OQClass_GrabbableRigidBody.gd
View file
Open in desktop
File renamed without changes.
0 ...t/OQ_Classes/OQClass_GrabbableToolPart.gd → ...t/OQ_Classes/OQClass_GrabbableToolPart.gd
View file
Open in desktop
File renamed without changes.
0 OQ_Toolkit/OQ_Classes/OQClass_Tool.gd → addons/OQ_Toolkit/OQ_Classes/OQClass_Tool.gd
View file
Open in desktop
File renamed without changes.
0 .../OQ_Classes/OQClass_ToolGrabController.gd → .../OQ_Classes/OQClass_ToolGrabController.gd
View file
Open in desktop
File renamed without changes.
0 ...asses/OQClass_ToolGrabLinearController.gd → ...asses/OQClass_ToolGrabLinearController.gd
View file
Open in desktop
File renamed without changes.
0 OQ_Toolkit/OQ_Helpers/Desktop_DebugCamera.gd → ...Toolkit/OQ_Helpers/Desktop_DebugCamera.gd
View file
Open in desktop
File renamed without changes.
5 changes: 3 additions & 2 deletions OQ_Toolkit/OQ_Helpers/OQ_SplashScreen.tscn → ...Q_Toolkit/OQ_Helpers/OQ_SplashScreen.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[gd_scene load_steps=5 format=2]

[ext_resource path="res://OQ_Toolkit/OQ_UI2D/theme/godot_splash_512.png" type="Texture" id=1]
[ext_resource path="res://OQ_Toolkit/OQ_Helpers/scripts/OQ_SplashScreen.gd" type="Script" id=2]
[ext_resource path="res://addons/OQ_Toolkit/OQ_UI2D/theme/godot_splash_512.png" type="Texture" id=1]
[ext_resource path="res://addons/OQ_Toolkit/OQ_Helpers/scripts/OQ_SplashScreen.gd" type="Script" id=2]


[sub_resource type="PlaneMesh" id=1]

Expand Down
Loading