diff --git a/Assets/XRI.meta b/Assets/XRI.meta new file mode 100644 index 0000000..ea79651 --- /dev/null +++ b/Assets/XRI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f9a8059c895f04444a9cd6224e548392 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/XRI/Settings.meta b/Assets/XRI/Settings.meta new file mode 100644 index 0000000..4c58bd1 --- /dev/null +++ b/Assets/XRI/Settings.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 271e4b6e47cb9a74faf8b4078e90753b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/XRI/Settings/Resources.meta b/Assets/XRI/Settings/Resources.meta new file mode 100644 index 0000000..56fb832 --- /dev/null +++ b/Assets/XRI/Settings/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4cfcfa226645cd64e939295fd53de18b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/XRI/Settings/Resources/InteractionLayerSettings.asset b/Assets/XRI/Settings/Resources/InteractionLayerSettings.asset new file mode 100644 index 0000000..3f314b5 --- /dev/null +++ b/Assets/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/XRI/Settings/Resources/InteractionLayerSettings.asset.meta b/Assets/XRI/Settings/Resources/InteractionLayerSettings.asset.meta new file mode 100644 index 0000000..d577fb1 --- /dev/null +++ b/Assets/XRI/Settings/Resources/InteractionLayerSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c0423ab56e61cac4a9f4d1eb4605eb2e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/XRI/Settings/XRInteractionEditorSettings.asset b/Assets/XRI/Settings/XRInteractionEditorSettings.asset new file mode 100644 index 0000000..529491b --- /dev/null +++ b/Assets/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: 1 + m_ShowOldInteractionLayerMaskInInspector: 0 diff --git a/Assets/XRI/Settings/XRInteractionEditorSettings.asset.meta b/Assets/XRI/Settings/XRInteractionEditorSettings.asset.meta new file mode 100644 index 0000000..61346d1 --- /dev/null +++ b/Assets/XRI/Settings/XRInteractionEditorSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 994dfc7db1d18494aa6fed234d16744d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index b2c0917..59003df 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -8,6 +8,7 @@ "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.4.8", "com.unity.ugui": "1.0.0", + "com.unity.xr.interaction.toolkit": "2.0.1", "com.unity.xr.management": "4.2.1", "com.unity.xr.oculus": "1.11.2", "com.unity.modules.ai": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index ade8df4..fe9bd45 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -41,6 +41,15 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.inputsystem": { + "version": "1.2.0", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.modules.uielements": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.services.core": { "version": "1.0.1", "depth": 1, @@ -98,6 +107,30 @@ "com.unity.modules.imgui": "1.0.0" } }, + "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.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.inputsystem": "1.2.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.8", "depth": 1, diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 879cacf..89dc661 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -773,7 +773,7 @@ PlayerSettings: m_VersionCode: 1 m_VersionName: apiCompatibilityLevel: 6 - activeInputHandler: 0 + activeInputHandler: 1 cloudProjectId: framebufferDepthMemorylessMode: 0 qualitySettingsNames: []