preparing v0.4.3 release

NeoSpark314 · Jun 20, 2022 · 6567608 · 6567608
1 parent 3fd9aa3
commit 6567608
Show file tree

Hide file tree

Showing 33 changed files with 57 additions and 51 deletions.
diff --git a/...lkit/OQ_ARVRController/models3d/OculusQuest2/OculusQuest2TouchController_Left.gltf.import b/...lkit/OQ_ARVRController/models3d/OculusQuest2/OculusQuest2TouchController_Left.gltf.import
@@ -16,9 +16,11 @@ nodes/root_name="Scene Root"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
+nodes/use_legacy_names=true
 materials/location=1
 materials/storage=1
 materials/keep_on_reimport=true
+meshes/octahedral_compression=true
 meshes/compress=true
 meshes/ensure_tangents=true
 meshes/storage=0

diff --git a/...kit/OQ_ARVRController/models3d/OculusQuest2/OculusQuest2TouchController_Right.gltf.import b/...kit/OQ_ARVRController/models3d/OculusQuest2/OculusQuest2TouchController_Right.gltf.import
@@ -16,9 +16,11 @@ nodes/root_name="Scene Root"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
+nodes/use_legacy_names=true
 materials/location=1
 materials/storage=1
 materials/keep_on_reimport=true
+meshes/octahedral_compression=true
 meshes/compress=true
 meshes/ensure_tangents=true
 meshes/storage=0

diff --git a/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuest2/buttons.png.import b/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuest2/buttons.png.import
@@ -30,6 +30,7 @@ process/fix_alpha_border=false
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=false

diff --git a/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestHandTexture_Color.webp.import b/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestHandTexture_Color.webp.import
@@ -30,6 +30,7 @@ process/fix_alpha_border=false
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=false

diff --git a/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestHand_Left.gltf.import b/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestHand_Left.gltf.import
@@ -16,9 +16,11 @@ nodes/root_name="Scene Root"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
+nodes/use_legacy_names=true
 materials/location=1
 materials/storage=1
 materials/keep_on_reimport=true
+meshes/octahedral_compression=true
 meshes/compress=true
 meshes/ensure_tangents=true
 meshes/storage=0

diff --git a/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestHand_Right.gltf.import b/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestHand_Right.gltf.import
@@ -16,9 +16,11 @@ nodes/root_name="Scene Root"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
+nodes/use_legacy_names=true
 materials/location=1
 materials/storage=1
 materials/keep_on_reimport=true
+meshes/octahedral_compression=true
 meshes/compress=true
 meshes/ensure_tangents=true
 meshes/storage=0

diff --git a/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestTouchControllerTexture_Color.png.import b/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestTouchControllerTexture_Color.png.import
@@ -30,6 +30,7 @@ process/fix_alpha_border=false
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=false

diff --git a/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestTouchControllerTexture_Roughness.png.import b/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestTouchControllerTexture_Roughness.png.import
@@ -30,6 +30,7 @@ process/fix_alpha_border=false
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=false

diff --git a/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestTouchController_Left.gltf.import b/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestTouchController_Left.gltf.import
@@ -16,9 +16,11 @@ nodes/root_name="Scene Root"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
+nodes/use_legacy_names=true
 materials/location=1
 materials/storage=1
 materials/keep_on_reimport=true
+meshes/octahedral_compression=true
 meshes/compress=true
 meshes/ensure_tangents=true
 meshes/storage=0

diff --git a/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestTouchController_Left_Reactive.gltf.import b/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestTouchController_Left_Reactive.gltf.import
@@ -16,9 +16,11 @@ nodes/root_name="Scene Root"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
+nodes/use_legacy_names=true
 materials/location=1
 materials/storage=1
 materials/keep_on_reimport=true
+meshes/octahedral_compression=true
 meshes/compress=true
 meshes/ensure_tangents=true
 meshes/storage=0

diff --git a/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestTouchController_Right.gltf.import b/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestTouchController_Right.gltf.import
@@ -16,9 +16,11 @@ nodes/root_name="Scene Root"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
+nodes/use_legacy_names=true
 materials/location=1
 materials/storage=1
 materials/keep_on_reimport=true
+meshes/octahedral_compression=true
 meshes/compress=true
 meshes/ensure_tangents=true
 meshes/storage=0

diff --git a/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestTouchController_Right_Reactive.gltf.import b/OQ_Toolkit/OQ_ARVRController/models3d/OculusQuestTouchController_Right_Reactive.gltf.import
@@ -16,9 +16,11 @@ nodes/root_name="Scene Root"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
+nodes/use_legacy_names=true
 materials/location=1
 materials/storage=1
 materials/keep_on_reimport=true
+meshes/octahedral_compression=true
 meshes/compress=true
 meshes/ensure_tangents=true
 meshes/storage=0

diff --git a/OQ_Toolkit/OQ_UI2D/theme/godot_splash_512.png.import b/OQ_Toolkit/OQ_UI2D/theme/godot_splash_512.png.import
@@ -30,6 +30,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=false

diff --git a/OQ_Toolkit/OQ_UI2D/theme/oq_ui2d_standard.theme b/OQ_Toolkit/OQ_UI2D/theme/oq_ui2d_standard.theme
diff --git a/OQ_Toolkit/vr_autoload.gd b/OQ_Toolkit/vr_autoload.gd
@@ -874,7 +874,7 @@ func initialize(initialize_vr = true):
 		if arvr_openxr_interface.initialize():
 			active_arvr_interface_name = "OpenVR"
 			get_viewport().arvr = true;
-			get_viewport().keep_3d_linear = true
+			get_viewport().keep_3d_linear = false;
 			Engine.target_fps = 72 
 			OS.vsync_enabled = false;
 			inVR = true;

diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
 # Godot Oculus Quest Toolkit <!-- omit in toc --> 
 This is an in-development toolkit for basic VR interactions using the Godot game engine.
 
-The main target of this toolkit is native Oculus Quest development but it also supports WebXR export and DesktopVR (via the OpenVR and Oculus Godot modules) and most of the features are not platform specific.
+The main target of this toolkit is native Oculus Quest development but it also supports the Godot OpenXR plugin, WebXR export and DesktopVR (via the OpenXR, OpenVR and Oculus Godot modules). Most of the implemented features are **not platform specific**.
 
 You can try a Web-Exported version of the tookit at https://neospark314.itch.io/godot-oculus-quest-toolkit
 
-The toolkit in this repository requires (at the time of writing) a recent version of Godot 3.4.
+The current version of the toolkit in this repository was build/tested with Godot 3.4.5.
 
 If you have questions or run into problems please open an issue here or contact me on discord.
 

diff --git a/demo_games/BeepSaber/data/BeepCube_Emission.png.import b/demo_games/BeepSaber/data/BeepCube_Emission.png.import
@@ -30,6 +30,7 @@ process/fix_alpha_border=false
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=false

diff --git a/demo_games/BeepSaber/data/beepsaber_logo.png.import b/demo_games/BeepSaber/data/beepsaber_logo.png.import
@@ -30,6 +30,7 @@ process/fix_alpha_border=false
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/demo_games/BeepSaber/data/maps/TheFatRat_Timelapse/cover.jpg.import b/demo_games/BeepSaber/data/maps/TheFatRat_Timelapse/cover.jpg.import
@@ -30,6 +30,7 @@ process/fix_alpha_border=false
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/demo_scenes/ClimbingScene.tscn b/demo_scenes/ClimbingScene.tscn
@@ -18,8 +18,6 @@
 [ext_resource path="res://OQ_Toolkit/OQ_UI2D/OQ_UI2DLabel.tscn" type="PackedScene" id=16]
 [ext_resource path="res://OQ_Toolkit/OQ_ARVROrigin/Feature_MixedRealityCapture.tscn" type="PackedScene" id=17]
 
-
-
 [sub_resource type="BoxShape" id=1]
 extents = Vector3( 0.5, 0.05, 0.05 )
 

diff --git a/demo_scenes/UIDemoScene.tscn b/demo_scenes/UIDemoScene.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=29 format=2]
+[gd_scene load_steps=28 format=2]
 
 [ext_resource path="res://OQ_Toolkit/OQ_ARVRCamera.tscn" type="PackedScene" id=1]
 [ext_resource path="res://OQ_Toolkit/OQ_ARVROrigin/Feature_VRSimulator.tscn" type="PackedScene" id=2]
@@ -22,7 +22,6 @@
 [ext_resource path="res://demo_scenes/data/Material_Red.material" type="Material" id=22]
 [ext_resource path="res://OQ_Toolkit/OQ_ARVRController/Feature_AreaObjectGrab.tscn" type="PackedScene" id=23]
 [ext_resource path="res://demo_games/BeepSaber/data/beepsaber_logo.png" type="Texture" id=24]
-[ext_resource path="res://OQ_Toolkit/OQ_ARVROrigin/Feature_MixedRealityCapture.tscn" type="PackedScene" id=25]
 
 [sub_resource type="PlaneMesh" id=1]
 size = Vector2( 16, 16 )
@@ -65,9 +64,6 @@ invisible_on_start = true
 
 [node name="OQ_UI2DCanvas_NumButtons" parent="OQ_ARVROrigin/OQ_LeftController/OQ_VisibilityToggle" instance=ExtResource( 10 )]
 transform = Transform( 0.796625, 0, 0.604474, 0, 1, 0, -0.604474, 0, 0.796625, -0.0757154, 0.186514, -0.0449487 )
-editor_live_update = false
-transparent = false
-disable_collision = false
 
 [node name="ReferenceRect" type="ReferenceRect" parent="OQ_ARVROrigin/OQ_LeftController/OQ_VisibilityToggle/OQ_UI2DCanvas_NumButtons"]
 visible = false
@@ -194,16 +190,11 @@ ui_raycast_visible_button = -1
 
 [node name="Locomotion_Stick" parent="OQ_ARVROrigin" instance=ExtResource( 11 )]
 
-[node name="Feature_MixedRealityCapture" parent="OQ_ARVROrigin" instance=ExtResource( 25 )]
-
 [node name="OQ_UI2DLogWindow" parent="." instance=ExtResource( 17 )]
 transform = Transform( -4, 0, -8.74228e-08, 1.74846e-07, 3.4641, -0.5, 3.02841e-07, -2, -0.866025, 0, 3, 2 )
 
 [node name="TestUI" parent="." instance=ExtResource( 10 )]
 transform = Transform( -8.74227e-08, 0, -1, 0, 2, 0, 2, 0, -4.37114e-08, 1.85, 1.752, 0 )
-editor_live_update = false
-transparent = false
-disable_collision = false
 
 [node name="Control" type="ReferenceRect" parent="TestUI"]
 visible = false
@@ -318,9 +309,6 @@ color = Color( 0.192157, 0.411765, 0.141176, 1 )
 
 [node name="OQ_UI2DCanvas_MovementOptions" parent="." instance=ExtResource( 10 )]
 transform = Transform( -8.74228e-08, 0, 1, 0, 2, 0, -2, 0, -4.37114e-08, -2, 1.5, -0.246 )
-editor_live_update = false
-transparent = false
-disable_collision = false
 
 [node name="Control" type="ReferenceRect" parent="OQ_UI2DCanvas_MovementOptions"]
 visible = false
@@ -439,20 +427,9 @@ material/0 = SubResource( 4 )
 [node name="InfoLabel" parent="." instance=ExtResource( 3 )]
 transform = Transform( 1.50805, 0, 0.656849, 0, 2, 0, -1.3137, 0, 0.754022, -0.969193, 2.03673, -1.09883 )
 text = "Info Label"
-margin = 16
-billboard = false
-depth_test = true
-resize_mode = 0
-font_size_multiplier = 1.0
-font_color = Color( 1, 1, 1, 1 )
-background_color = Color( 0, 0, 0, 1 )
-transparent = false
 
 [node name="OQ_UI2DCanvas_LevelSelector" parent="." instance=ExtResource( 10 )]
 transform = Transform( 1.67744, -0.544566, 0.471608, 0, 1.73205, 0.5, -1.08913, -0.838718, 0.726351, -0.915071, 1.17961, -1.52167 )
-editor_live_update = false
-transparent = false
-disable_collision = false
 
 [node name="ReferenceRect" type="ReferenceRect" parent="OQ_UI2DCanvas_LevelSelector"]
 margin_right = 544.0
@@ -554,9 +531,6 @@ __meta__ = {
 
 [node name="OQ_UI2DCanvas_DemoGameSelect" parent="." instance=ExtResource( 10 )]
 transform = Transform( 2, 0, 0, 0, 2, 0, 0, 0, 1, 0.084929, 1.17961, -1.52167 )
-editor_live_update = false
-transparent = false
-disable_collision = false
 
 [node name="ReferenceRect" type="Panel" parent="OQ_UI2DCanvas_DemoGameSelect"]
 visible = false
@@ -608,14 +582,7 @@ transform = Transform( -0.737772, -0.174716, 0.652048, -1.13133e-08, 0.965926, 0
 [node name="TestTextInputLabel" parent="OQ_UI2DKeyboard" instance=ExtResource( 3 )]
 transform = Transform( 1, 1.49012e-08, 0, -2.98023e-08, 1, 0, 1.19209e-07, 8.9407e-08, 1, -0.0543875, 0.421844, 0.0514949 )
 text = "Input Log"
-margin = 16
-billboard = false
-depth_test = true
-resize_mode = 0
-font_size_multiplier = 1.0
-font_color = Color( 1, 1, 1, 1 )
-background_color = Color( 0, 0, 0, 1 )
-transparent = false
+
 [connection signal="value_changed" from="OQ_UI2DCanvas_MovementOptions/Control/MoveSpeedSpinBox" to="." method="_on_MoveSpeedSpinBox_value_changed"]
 [connection signal="value_changed" from="OQ_UI2DCanvas_MovementOptions/Control/RotateSpeedSpinBox" to="." method="_on_RotateSpeedSpinBox_value_changed"]
 [connection signal="value_changed" from="OQ_UI2DCanvas_MovementOptions/Control/ClickTurnAngleSpinBox" to="." method="_on_ClickTurnAngleSpinBox_value_changed"]

diff --git a/demo_scenes/data/models_3d/GrabAndThrowRoom/GrabAndThrowRoom.gltf.import b/demo_scenes/data/models_3d/GrabAndThrowRoom/GrabAndThrowRoom.gltf.import
@@ -16,9 +16,11 @@ nodes/root_name="Scene Root"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
+nodes/use_legacy_names=true
 materials/location=1
 materials/storage=1
 materials/keep_on_reimport=true
+meshes/octahedral_compression=true
 meshes/compress=true
 meshes/ensure_tangents=true
 meshes/storage=0

diff --git a/demo_scenes/data/models_3d/GrabAndThrowRoom/Untitled.png.import b/demo_scenes/data/models_3d/GrabAndThrowRoom/Untitled.png.import
@@ -30,6 +30,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=false

diff --git a/demo_scenes/data/models_3d/Pistol/frame.fbx.import b/demo_scenes/data/models_3d/Pistol/frame.fbx.import
@@ -16,9 +16,11 @@ nodes/root_name="Scene Root"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
+nodes/use_legacy_names=true
 materials/location=1
 materials/storage=1
 materials/keep_on_reimport=true
+meshes/octahedral_compression=true
 meshes/compress=true
 meshes/ensure_tangents=true
 meshes/storage=0

diff --git a/demo_scenes/data/models_3d/Pistol/slide.fbx.import b/demo_scenes/data/models_3d/Pistol/slide.fbx.import
@@ -16,9 +16,11 @@ nodes/root_name="Scene Root"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
+nodes/use_legacy_names=true
 materials/location=1
 materials/storage=1
 materials/keep_on_reimport=true
+meshes/octahedral_compression=true
 meshes/compress=true
 meshes/ensure_tangents=true
 meshes/storage=0

diff --git a/demo_scenes/data/models_3d/TableTennis/Racket.gltf.import b/demo_scenes/data/models_3d/TableTennis/Racket.gltf.import
@@ -16,9 +16,11 @@ nodes/root_name="Scene Root"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
+nodes/use_legacy_names=true
 materials/location=1
 materials/storage=1
 materials/keep_on_reimport=true
+meshes/octahedral_compression=true
 meshes/compress=true
 meshes/ensure_tangents=true
 meshes/storage=0

diff --git a/demo_scenes/data/models_3d/TableTennis/TableTennisRoom.gltf.import b/demo_scenes/data/models_3d/TableTennis/TableTennisRoom.gltf.import
@@ -16,9 +16,11 @@ nodes/root_name="Scene Root"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
+nodes/use_legacy_names=true
 materials/location=1
 materials/storage=1
 materials/keep_on_reimport=true
+meshes/octahedral_compression=true
 meshes/compress=true
 meshes/ensure_tangents=true
 meshes/storage=0

diff --git a/demo_scenes/data/models_3d/TableTennis/Untitled.png.import b/demo_scenes/data/models_3d/TableTennis/Untitled.png.import
@@ -30,6 +30,7 @@ process/fix_alpha_border=false
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=false

diff --git a/demo_scenes/data/models_3d/medieval_city/CityLightmap_lowquality.webp.import b/demo_scenes/data/models_3d/medieval_city/CityLightmap_lowquality.webp.import
@@ -30,6 +30,7 @@ process/fix_alpha_border=false
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=false

diff --git a/demo_scenes/data/models_3d/medieval_weapons_pack/scene.gltf.import b/demo_scenes/data/models_3d/medieval_weapons_pack/scene.gltf.import
@@ -16,9 +16,11 @@ nodes/root_name="Scene Root"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
+nodes/use_legacy_names=true
 materials/location=1
 materials/storage=1
 materials/keep_on_reimport=true
+meshes/octahedral_compression=true
 meshes/compress=true
 meshes/ensure_tangents=true
 meshes/storage=1

diff --git a/demo_scenes/data/sponza_2k_ods.webp.import b/demo_scenes/data/sponza_2k_ods.webp.import
@@ -30,6 +30,7 @@ process/fix_alpha_border=false
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=false