gg

2025-04-05 18:54:01 +02:00 · 2025-04-05 18:54:01 +02:00 · 48599d6fe9
parent 0b1a3a142c
commit 48599d6fe9
3 changed files with 43 additions and 127 deletions
--- a/models/desk.fbx.import
+++ b/models/desk.fbx.import
@ -0,0 +1,38 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://bnfw3rfvsg33j"
+path="res://.godot/imported/desk.fbx-061fed6313261d8e4f6d07303cf3e4a3.scn"
+
+[deps]
+
+source_file="res://models/desk.fbx"
+dest_files=["res://.godot/imported/desk.fbx-061fed6313261d8e4f6d07303cf3e4a3.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=true
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+_subresources={}
+fbx/importer=0
+fbx/allow_geometry_helper_nodes=false
+fbx/embedded_image_handling=1
--- a/openxr_action_map.tres
+++ b/openxr_action_map.tres
@ -1,4 +1,4 @@
-[gd_resource type="OpenXRActionMap" load_steps=71 format=3 uid="uid://bcubmw1ntpto1"]
+[gd_resource type="OpenXRActionMap" load_steps=40 format=3 uid="uid://bcubmw1ntpto1"]

 [sub_resource type="OpenXRAction" id="OpenXRAction_6ivru"]
 resource_name = "trigger"
@ -200,130 +200,6 @@ binding_path = "/user/hand/right/output/haptic"
 interaction_profile_path = "/interaction_profiles/khr/simple_controller"
 bindings = [SubResource("OpenXRIPBinding_r3qn1"), SubResource("OpenXRIPBinding_n01b8"), SubResource("OpenXRIPBinding_pjtev"), SubResource("OpenXRIPBinding_nqyri"), SubResource("OpenXRIPBinding_86uui"), SubResource("OpenXRIPBinding_nrtxc"), SubResource("OpenXRIPBinding_qovyo"), SubResource("OpenXRIPBinding_d6uso"), SubResource("OpenXRIPBinding_hvi7v"), SubResource("OpenXRIPBinding_7dxun"), SubResource("OpenXRIPBinding_rp8ih"), SubResource("OpenXRIPBinding_0uca0"), SubResource("OpenXRIPBinding_rjtq8"), SubResource("OpenXRIPBinding_lce2q")]

-[sub_resource type="OpenXRIPBinding" id="OpenXRIPBinding_61gsj"]
-action = SubResource("OpenXRAction_oi0ij")
-binding_path = "/user/hand/left/input/aim/pose"
-
-[sub_resource type="OpenXRIPBinding" id="OpenXRIPBinding_f63eo"]
-action = SubResource("OpenXRAction_oi0ij")
-binding_path = "/user/hand/right/input/aim/pose"
-
-[sub_resource type="OpenXRIPBinding" id="OpenXRIPBinding_3megw"]
-action = SubResource("OpenXRAction_m08eo")
-binding_path = "/user/hand/left/input/aim/pose"
-
-[sub_resource type="OpenXRIPBinding" id="OpenXRIPBinding_1875n"]
-action = SubResource("OpenXRAction_m08eo")
-binding_path = "/user/hand/right/input/aim/pose"
-
-[sub_resource type="OpenXRIPBinding" id="OpenXRIPBinding_jrx7l"]
-action = SubResource("OpenXRAction_c4j1d")
-binding_path = "/user/hand/left/input/grip/pose"
-
-[sub_resource type="OpenXRIPBinding" id="OpenXRIPBinding_sddo8"]
-action = SubResource("OpenXRAction_c4j1d")
-binding_path = "/user/hand/right/input/grip/pose"
-
-[sub_resource type="OpenXRIPBinding" id="OpenXRIPBinding_5idg5"]
-action = SubResource("OpenXRAction_sopde")
-binding_path = "/user/hand/left/input/palm_ext/pose"
-
-[sub_resource type="OpenXRIPBinding" id="OpenXRIPBinding_5vlhu"]
-action = SubResource("OpenXRAction_sopde")
-binding_path = "/user/hand/right/input/palm_ext/pose"
-
-[sub_resource type="OpenXRIPBinding" id="OpenXRIPBinding_yto2p"]
-action = SubResource("OpenXRAction_iphn4")
-binding_path = "/user/hand/left/input/menu/click"
-
-[sub_resource type="OpenXRIPBinding" id="OpenXRIPBinding_35s7d"]
-action = SubResource("OpenXRAction_3p2as")
-binding_path = "/user/hand/right/input/system/click"
-
-[sub_resource type="OpenXRIPBinding" id="OpenXRIPBinding_cukgo"]
-action = SubResource("OpenXRAction_wdehm")
-binding_path = "/user/hand/left/input/x/click"
-
-[sub_resource type="OpenXRIPBinding" id="OpenXRIPBinding_58wje"]
-action = SubResource("OpenXRAction_wdehm")
-binding_path = "/user/hand/right/input/a/click"
-
-[sub_resource type="OpenXRIPBinding" id="OpenXRIPBinding_x1ifb"]
-action = SubResource("OpenXRAction_e1frq")
-binding_path = "/user/hand/left/input/y/click"
-
-[sub_resource type="OpenXRIPBinding" id="OpenXRIPBinding_hw16p"]
-action = SubResource("OpenXRAction_e1frq")
-binding_path = "/user/hand/right/input/b/click"
-
-[sub_resource type="OpenXRIPBinding" id="OpenXRIPBinding_gdlwa"]
-action = SubResource("OpenXRAction_6ivru")
-binding_path = "/user/hand/left/input/trigger/value"
-
-[sub_resource type="OpenXRIPBinding" id="OpenXRIPBinding_drau7"]
-action = SubResource("OpenXRAction_6ivru")
-binding_path = "/user/hand/right/input/trigger/value"
-
-[sub_resource type="OpenXRIPBinding" id="OpenXRIPBinding_0vq03"]
-action = SubResource("OpenXRAction_vfhwq")
-binding_path = "/user/hand/left/input/trigger/click"
-
-[sub_resource type="OpenXRIPBinding" id="OpenXRIPBinding_y7ek0"]
-action = SubResource("OpenXRAction_vfhwq")
-binding_path = "/user/hand/right/input/trigger/click"
-
-[sub_resource type="OpenXRIPBinding" id="OpenXRIPBinding_cy6rb"]
-action = SubResource("OpenXRAction_typ1r")
-binding_path = "/user/hand/left/input/squeeze/click"
-
-[sub_resource type="OpenXRIPBinding" id="OpenXRIPBinding_6r8a6"]
-action = SubResource("OpenXRAction_typ1r")
-binding_path = "/user/hand/right/input/squeeze/click"
-
-[sub_resource type="OpenXRIPBinding" id="OpenXRIPBinding_vmwlg"]
-action = SubResource("OpenXRAction_clvbf")
-binding_path = "/user/hand/left/input/squeeze/click"
-
-[sub_resource type="OpenXRIPBinding" id="OpenXRIPBinding_qcgh6"]
-action = SubResource("OpenXRAction_clvbf")
-binding_path = "/user/hand/right/input/squeeze/click"
-
-[sub_resource type="OpenXRIPBinding" id="OpenXRIPBinding_bwwah"]
-action = SubResource("OpenXRAction_3k6la")
-binding_path = "/user/hand/left/input/thumbstick"
-
-[sub_resource type="OpenXRIPBinding" id="OpenXRIPBinding_rtyas"]
-action = SubResource("OpenXRAction_3k6la")
-binding_path = "/user/hand/right/input/thumbstick"
-
-[sub_resource type="OpenXRIPBinding" id="OpenXRIPBinding_hk5ci"]
-action = SubResource("OpenXRAction_i8esw")
-binding_path = "/user/hand/left/input/thumbstick/click"
-
-[sub_resource type="OpenXRIPBinding" id="OpenXRIPBinding_4j055"]
-action = SubResource("OpenXRAction_i8esw")
-binding_path = "/user/hand/right/input/thumbstick/click"
-
-[sub_resource type="OpenXRIPBinding" id="OpenXRIPBinding_awtpp"]
-action = SubResource("OpenXRAction_um1hv")
-binding_path = "/user/hand/left/input/thumbstick/touch"
-
-[sub_resource type="OpenXRIPBinding" id="OpenXRIPBinding_xh6fl"]
-action = SubResource("OpenXRAction_um1hv")
-binding_path = "/user/hand/right/input/thumbstick/touch"
-
-[sub_resource type="OpenXRIPBinding" id="OpenXRIPBinding_ixewl"]
-action = SubResource("OpenXRAction_sow2k")
-binding_path = "/user/hand/left/output/haptic"
-
-[sub_resource type="OpenXRIPBinding" id="OpenXRIPBinding_qwqvw"]
-action = SubResource("OpenXRAction_sow2k")
-binding_path = "/user/hand/right/output/haptic"
-
-[sub_resource type="OpenXRInteractionProfile" id="OpenXRInteractionProfile_oqlrv"]
-interaction_profile_path = "/interaction_profiles/htc/vive_cosmos_controller"
-bindings = [SubResource("OpenXRIPBinding_61gsj"), SubResource("OpenXRIPBinding_f63eo"), SubResource("OpenXRIPBinding_3megw"), SubResource("OpenXRIPBinding_1875n"), SubResource("OpenXRIPBinding_jrx7l"), SubResource("OpenXRIPBinding_sddo8"), SubResource("OpenXRIPBinding_5idg5"), SubResource("OpenXRIPBinding_5vlhu"), SubResource("OpenXRIPBinding_yto2p"), SubResource("OpenXRIPBinding_35s7d"), SubResource("OpenXRIPBinding_cukgo"), SubResource("OpenXRIPBinding_58wje"), SubResource("OpenXRIPBinding_x1ifb"), SubResource("OpenXRIPBinding_hw16p"), SubResource("OpenXRIPBinding_gdlwa"), SubResource("OpenXRIPBinding_drau7"), SubResource("OpenXRIPBinding_0vq03"), SubResource("OpenXRIPBinding_y7ek0"), SubResource("OpenXRIPBinding_cy6rb"), SubResource("OpenXRIPBinding_6r8a6"), SubResource("OpenXRIPBinding_vmwlg"), SubResource("OpenXRIPBinding_qcgh6"), SubResource("OpenXRIPBinding_bwwah"), SubResource("OpenXRIPBinding_rtyas"), SubResource("OpenXRIPBinding_hk5ci"), SubResource("OpenXRIPBinding_4j055"), SubResource("OpenXRIPBinding_awtpp"), SubResource("OpenXRIPBinding_xh6fl"), SubResource("OpenXRIPBinding_ixewl"), SubResource("OpenXRIPBinding_qwqvw")]
-
 [resource]
 action_sets = [SubResource("OpenXRActionSet_ngwcy")]
-interaction_profiles = [SubResource("OpenXRInteractionProfile_ckeh6"), SubResource("OpenXRInteractionProfile_oqlrv")]
+interaction_profiles = [SubResource("OpenXRInteractionProfile_ckeh6")]
--- a/resources/player.tscn
+++ b/resources/player.tscn
@ -1,6 +1,7 @@
-[gd_scene load_steps=7 format=3 uid="uid://8fmy7u5fyonc"]
+[gd_scene load_steps=8 format=3 uid="uid://8fmy7u5fyonc"]

 [ext_resource type="Script" uid="uid://bf27rxigs8b22" path="res://scripts/XRHand.cs" id="1_gyc3h"]
+[ext_resource type="Script" uid="uid://dglj0x0bpkx5i" path="res://scripts/XrOrigin3d.cs" id="1_ucfva"]
 [ext_resource type="Script" uid="uid://typrll7n6g3e" path="res://scripts/Mouth.cs" id="3_un1ji"]

 [sub_resource type="CapsuleMesh" id="CapsuleMesh_ij1v8"]
@ -18,6 +19,7 @@ radius = 0.03

 [node name="XROrigin3D" type="XROrigin3D"]
 current = true
+script = ExtResource("1_ucfva")

 [node name="LeftHand" type="XRController3D" parent="." node_paths=PackedStringArray("rb")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.381652, 0.302346, 0)