From 2ae88c4dc6ec47f3a4f4cf990b941cfda51c2736 Mon Sep 17 00:00:00 2001
From: s402520 <sven.gerlach@stud-mail.uni-wuerzburg.de>
Date: Mon, 8 May 2023 09:17:35 +0200
Subject: [PATCH] Added XR Interaction Toolkit
---
Assets/Plugins/XRI.meta | 8 ++
Assets/Plugins/XRI/Settings.meta | 8 ++
Assets/Plugins/XRI/Settings/Resources.meta | 8 ++
.../Resources/InteractionLayerSettings.asset | 47 ++++++++++
.../InteractionLayerSettings.asset.meta | 8 ++
.../XRInteractionEditorSettings.asset | 16 ++++
.../XRInteractionEditorSettings.asset.meta | 8 ++
Assets/Scenes/ArticyTestScene.unity | 87 +++++++++++++++----
Packages/manifest.json | 1 +
Packages/packages-lock.json | 43 +++++++++
10 files changed, 219 insertions(+), 15 deletions(-)
create mode 100644 Assets/Plugins/XRI.meta
create mode 100644 Assets/Plugins/XRI/Settings.meta
create mode 100644 Assets/Plugins/XRI/Settings/Resources.meta
create mode 100644 Assets/Plugins/XRI/Settings/Resources/InteractionLayerSettings.asset
create mode 100644 Assets/Plugins/XRI/Settings/Resources/InteractionLayerSettings.asset.meta
create mode 100644 Assets/Plugins/XRI/Settings/XRInteractionEditorSettings.asset
create mode 100644 Assets/Plugins/XRI/Settings/XRInteractionEditorSettings.asset.meta
diff --git a/Assets/Plugins/XRI.meta b/Assets/Plugins/XRI.meta
new file mode 100644
index 0000000..bcc1c9b
--- /dev/null
+++ b/Assets/Plugins/XRI.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ba604474d01acad418ecde3cd44b1236
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Plugins/XRI/Settings.meta b/Assets/Plugins/XRI/Settings.meta
new file mode 100644
index 0000000..ff2e7b1
--- /dev/null
+++ b/Assets/Plugins/XRI/Settings.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fcb8b6205c819d84c82ac77560fb43f9
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Plugins/XRI/Settings/Resources.meta b/Assets/Plugins/XRI/Settings/Resources.meta
new file mode 100644
index 0000000..18374c6
--- /dev/null
+++ b/Assets/Plugins/XRI/Settings/Resources.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 17fdebdafc8f4174ca19abc1d9d597e7
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Plugins/XRI/Settings/Resources/InteractionLayerSettings.asset b/Assets/Plugins/XRI/Settings/Resources/InteractionLayerSettings.asset
new file mode 100644
index 0000000..3f314b5
--- /dev/null
+++ b/Assets/Plugins/XRI/Settings/Resources/InteractionLayerSettings.asset
@@ -0,0 +1,47 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 191492db6e452eb468b95433ec162164, type: 3}
+ m_Name: InteractionLayerSettings
+ m_EditorClassIdentifier:
+ m_LayerNames:
+ - Default
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
diff --git a/Assets/Plugins/XRI/Settings/Resources/InteractionLayerSettings.asset.meta b/Assets/Plugins/XRI/Settings/Resources/InteractionLayerSettings.asset.meta
new file mode 100644
index 0000000..75ff2e4
--- /dev/null
+++ b/Assets/Plugins/XRI/Settings/Resources/InteractionLayerSettings.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e8ace4d064052654b806dcfa4f47fe9c
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Plugins/XRI/Settings/XRInteractionEditorSettings.asset b/Assets/Plugins/XRI/Settings/XRInteractionEditorSettings.asset
new file mode 100644
index 0000000..7ed8fa7
--- /dev/null
+++ b/Assets/Plugins/XRI/Settings/XRInteractionEditorSettings.asset
@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 2d38fb1463c5c804b8847c20e8873623, type: 3}
+ m_Name: XRInteractionEditorSettings
+ m_EditorClassIdentifier:
+ m_InteractionLayerUpdaterShown: 0
+ m_ShowOldInteractionLayerMaskInInspector: 0
diff --git a/Assets/Plugins/XRI/Settings/XRInteractionEditorSettings.asset.meta b/Assets/Plugins/XRI/Settings/XRInteractionEditorSettings.asset.meta
new file mode 100644
index 0000000..6b9ca91
--- /dev/null
+++ b/Assets/Plugins/XRI/Settings/XRInteractionEditorSettings.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8837fd5b7f4d49e47a00979bb75114f3
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/ArticyTestScene.unity b/Assets/Scenes/ArticyTestScene.unity
index 49482f1..d6459f8 100644
--- a/Assets/Scenes/ArticyTestScene.unity
+++ b/Assets/Scenes/ArticyTestScene.unity
@@ -126,8 +126,8 @@ NavMeshSettings:
--- !u!1 &692528162
GameObject:
m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
+ m_CorrespondingSourceObject: {fileID: 37849165960466488, guid: 283a87519024a9544b7bb2a225211046, type: 3}
+ m_PrefabInstance: {fileID: 37849165310030874}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
@@ -138,7 +138,7 @@ GameObject:
- component: {fileID: 692528164}
- component: {fileID: 692528163}
m_Layer: 5
- m_Name: UIDocument
+ m_Name: ScreenSpaceDialogueBox
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -147,8 +147,8 @@ GameObject:
--- !u!114 &692528163
MonoBehaviour:
m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
+ m_CorrespondingSourceObject: {fileID: 37849165960466489, guid: 283a87519024a9544b7bb2a225211046, type: 3}
+ m_PrefabInstance: {fileID: 37849165310030874}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 692528162}
m_Enabled: 1
@@ -169,8 +169,8 @@ MonoBehaviour:
--- !u!114 &692528164
MonoBehaviour:
m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
+ m_CorrespondingSourceObject: {fileID: 37849165960466494, guid: 283a87519024a9544b7bb2a225211046, type: 3}
+ m_PrefabInstance: {fileID: 37849165310030874}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 692528162}
m_Enabled: 1
@@ -181,8 +181,8 @@ MonoBehaviour:
--- !u!114 &692528165
MonoBehaviour:
m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
+ m_CorrespondingSourceObject: {fileID: 37849165960466495, guid: 283a87519024a9544b7bb2a225211046, type: 3}
+ m_PrefabInstance: {fileID: 37849165310030874}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 692528162}
m_Enabled: 1
@@ -206,8 +206,8 @@ MonoBehaviour:
--- !u!114 &692528166
MonoBehaviour:
m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
+ m_CorrespondingSourceObject: {fileID: 37849165960466492, guid: 283a87519024a9544b7bb2a225211046, type: 3}
+ m_PrefabInstance: {fileID: 37849165310030874}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 692528162}
m_Enabled: 1
@@ -221,8 +221,8 @@ MonoBehaviour:
--- !u!114 &692528167
MonoBehaviour:
m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
+ m_CorrespondingSourceObject: {fileID: 37849165960466493, guid: 283a87519024a9544b7bb2a225211046, type: 3}
+ m_PrefabInstance: {fileID: 37849165310030874}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 692528162}
m_Enabled: 1
@@ -237,8 +237,8 @@ MonoBehaviour:
--- !u!4 &692528168
Transform:
m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
+ m_CorrespondingSourceObject: {fileID: 37849165960466482, guid: 283a87519024a9544b7bb2a225211046, type: 3}
+ m_PrefabInstance: {fileID: 37849165310030874}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 692528162}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
@@ -448,3 +448,60 @@ MonoBehaviour:
m_ShadowLayerMask: 1
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
+--- !u!1001 &37849165310030874
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 37849165960466482, guid: 283a87519024a9544b7bb2a225211046, type: 3}
+ propertyPath: m_RootOrder
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 37849165960466482, guid: 283a87519024a9544b7bb2a225211046, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 37849165960466482, guid: 283a87519024a9544b7bb2a225211046, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 37849165960466482, guid: 283a87519024a9544b7bb2a225211046, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 37849165960466482, guid: 283a87519024a9544b7bb2a225211046, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 37849165960466482, guid: 283a87519024a9544b7bb2a225211046, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 37849165960466482, guid: 283a87519024a9544b7bb2a225211046, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 37849165960466482, guid: 283a87519024a9544b7bb2a225211046, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 37849165960466482, guid: 283a87519024a9544b7bb2a225211046, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 37849165960466482, guid: 283a87519024a9544b7bb2a225211046, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 37849165960466482, guid: 283a87519024a9544b7bb2a225211046, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 37849165960466488, guid: 283a87519024a9544b7bb2a225211046, type: 3}
+ propertyPath: m_Name
+ value: ScreenSpaceDialogueBox
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 283a87519024a9544b7bb2a225211046, type: 3}
diff --git a/Packages/manifest.json b/Packages/manifest.json
index a36b320..9a20394 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -11,6 +11,7 @@
"com.unity.timeline": "1.6.4",
"com.unity.ugui": "1.0.0",
"com.unity.visualscripting": "1.7.8",
+ "com.unity.xr.interaction.toolkit": "2.0.4",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.animation": "1.0.0",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index eb2eb16..a7322ca 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -71,6 +71,15 @@
"dependencies": {},
"url": "https://packages.unity.com"
},
+ "com.unity.inputsystem": {
+ "version": "1.4.2",
+ "depth": 1,
+ "source": "registry",
+ "dependencies": {
+ "com.unity.modules.uielements": "1.0.0"
+ },
+ "url": "https://packages.unity.com"
+ },
"com.unity.mathematics": {
"version": "1.2.6",
"depth": 1,
@@ -208,6 +217,40 @@
},
"url": "https://packages.unity.com"
},
+ "com.unity.xr.core-utils": {
+ "version": "2.0.0",
+ "depth": 1,
+ "source": "registry",
+ "dependencies": {
+ "com.unity.modules.xr": "1.0.0"
+ },
+ "url": "https://packages.unity.com"
+ },
+ "com.unity.xr.interaction.toolkit": {
+ "version": "2.0.4",
+ "depth": 0,
+ "source": "registry",
+ "dependencies": {
+ "com.unity.inputsystem": "1.3.0",
+ "com.unity.ugui": "1.0.0",
+ "com.unity.xr.core-utils": "2.0.0",
+ "com.unity.xr.legacyinputhelpers": "2.1.8",
+ "com.unity.modules.audio": "1.0.0",
+ "com.unity.modules.imgui": "1.0.0",
+ "com.unity.modules.physics": "1.0.0"
+ },
+ "url": "https://packages.unity.com"
+ },
+ "com.unity.xr.legacyinputhelpers": {
+ "version": "2.1.10",
+ "depth": 1,
+ "source": "registry",
+ "dependencies": {
+ "com.unity.modules.vr": "1.0.0",
+ "com.unity.modules.xr": "1.0.0"
+ },
+ "url": "https://packages.unity.com"
+ },
"com.unity.modules.ai": {
"version": "1.0.0",
"depth": 0,
--
GitLab