From 0ff7c2291c3db3bafb9593b00d5eaf3d520fdded Mon Sep 17 00:00:00 2001 From: sega Date: Fri, 27 Mar 2026 14:38:57 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D1=8B=20XR?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/XR.meta | 8 +++ Assets/XR/Loaders.meta | 8 +++ Assets/XR/Loaders/OculusLoader.asset | 14 +++++ Assets/XR/Loaders/OculusLoader.asset.meta | 8 +++ Assets/XR/Settings.meta | 8 +++ Assets/XR/Settings/OculusSettings.asset | 36 +++++++++++ Assets/XR/Settings/OculusSettings.asset.meta | 8 +++ Assets/XRI.meta | 8 +++ Assets/XRI/Settings.meta | 8 +++ Assets/XRI/Settings/Resources.meta | 8 +++ .../Resources/InteractionLayerSettings.asset | 47 +++++++++++++++ .../InteractionLayerSettings.asset.meta | 8 +++ .../Resources/XRDeviceSimulatorSettings.asset | 18 ++++++ .../XRDeviceSimulatorSettings.asset.meta | 8 +++ .../XRInteractionEditorSettings.asset | 15 +++++ .../XRInteractionEditorSettings.asset.meta | 8 +++ Packages/manifest.json | 3 + Packages/packages-lock.json | 59 ++++++++++++++++++- ProjectSettings/GraphicsSettings.asset | 2 +- 19 files changed, 280 insertions(+), 2 deletions(-) create mode 100644 Assets/XR.meta create mode 100644 Assets/XR/Loaders.meta create mode 100644 Assets/XR/Loaders/OculusLoader.asset create mode 100644 Assets/XR/Loaders/OculusLoader.asset.meta create mode 100644 Assets/XR/Settings.meta create mode 100644 Assets/XR/Settings/OculusSettings.asset create mode 100644 Assets/XR/Settings/OculusSettings.asset.meta create mode 100644 Assets/XRI.meta create mode 100644 Assets/XRI/Settings.meta create mode 100644 Assets/XRI/Settings/Resources.meta create mode 100644 Assets/XRI/Settings/Resources/InteractionLayerSettings.asset create mode 100644 Assets/XRI/Settings/Resources/InteractionLayerSettings.asset.meta create mode 100644 Assets/XRI/Settings/Resources/XRDeviceSimulatorSettings.asset create mode 100644 Assets/XRI/Settings/Resources/XRDeviceSimulatorSettings.asset.meta create mode 100644 Assets/XRI/Settings/XRInteractionEditorSettings.asset create mode 100644 Assets/XRI/Settings/XRInteractionEditorSettings.asset.meta diff --git a/Assets/XR.meta b/Assets/XR.meta new file mode 100644 index 0000000..36962ce --- /dev/null +++ b/Assets/XR.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2ec51150a0ab341468a4364781f97c70 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/XR/Loaders.meta b/Assets/XR/Loaders.meta new file mode 100644 index 0000000..6d9d479 --- /dev/null +++ b/Assets/XR/Loaders.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f3dc8fac56d44f9449a522b66da3df55 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/XR/Loaders/OculusLoader.asset b/Assets/XR/Loaders/OculusLoader.asset new file mode 100644 index 0000000..57ff242 --- /dev/null +++ b/Assets/XR/Loaders/OculusLoader.asset @@ -0,0 +1,14 @@ +%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: 03bc68f14d65e7747a59d5ff74bd199b, type: 3} + m_Name: OculusLoader + m_EditorClassIdentifier: Unity.XR.Oculus::Unity.XR.Oculus.OculusLoader diff --git a/Assets/XR/Loaders/OculusLoader.asset.meta b/Assets/XR/Loaders/OculusLoader.asset.meta new file mode 100644 index 0000000..e978b7f --- /dev/null +++ b/Assets/XR/Loaders/OculusLoader.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 03b86042c9044544ab671d808f1dc3d1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/XR/Settings.meta b/Assets/XR/Settings.meta new file mode 100644 index 0000000..0b88403 --- /dev/null +++ b/Assets/XR/Settings.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 52bbc69995cbba14fbbe22fca2492208 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/XR/Settings/OculusSettings.asset b/Assets/XR/Settings/OculusSettings.asset new file mode 100644 index 0000000..7e08fbd --- /dev/null +++ b/Assets/XR/Settings/OculusSettings.asset @@ -0,0 +1,36 @@ +%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: c353a8f1e58cf884584123914fe63cd5, type: 3} + m_Name: OculusSettings + m_EditorClassIdentifier: Unity.XR.Oculus::Unity.XR.Oculus.OculusSettings + m_StereoRenderingModeDesktop: 1 + m_StereoRenderingModeAndroid: 2 + SharedDepthBuffer: 1 + DepthSubmission: 0 + DashSupport: 1 + LowOverheadMode: 0 + OptimizeBufferDiscards: 1 + PhaseSync: 1 + SymmetricProjection: 1 + SubsampledLayout: 0 + FoveatedRenderingMethod: 0 + LateLatching: 0 + LateLatchingDebug: 0 + EnableTrackingOriginStageMode: 0 + SpaceWarp: 0 + TargetQuest2: 1 + TargetQuestPro: 0 + TargetQuest3: 0 + TargetQuest3S: 0 + SystemSplashScreen: {fileID: 0} + UseStickControlThumbsticks: 0 + OptimizeMultiviewRenderRegions: 0 diff --git a/Assets/XR/Settings/OculusSettings.asset.meta b/Assets/XR/Settings/OculusSettings.asset.meta new file mode 100644 index 0000000..c8424d4 --- /dev/null +++ b/Assets/XR/Settings/OculusSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 491482ebd544ea943b1ec87d39dfcc03 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/XRI.meta b/Assets/XRI.meta new file mode 100644 index 0000000..3ad9adb --- /dev/null +++ b/Assets/XRI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3d83c9d592c8932419f93ea9db288923 +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..d1b65f0 --- /dev/null +++ b/Assets/XRI/Settings.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fbd6eabf4c580ac4eb44a60c333038c7 +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..102e163 --- /dev/null +++ b/Assets/XRI/Settings/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d2faeda9d1334e848b79689b9af90b38 +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..87dbbee --- /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: Unity.XR.Interaction.Toolkit::UnityEngine.XR.Interaction.Toolkit.InteractionLayerSettings + 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..dd0b25d --- /dev/null +++ b/Assets/XRI/Settings/Resources/InteractionLayerSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e779141eecfe41d44a76524a6fbf7fa5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/XRI/Settings/Resources/XRDeviceSimulatorSettings.asset b/Assets/XRI/Settings/Resources/XRDeviceSimulatorSettings.asset new file mode 100644 index 0000000..d35bf34 --- /dev/null +++ b/Assets/XRI/Settings/Resources/XRDeviceSimulatorSettings.asset @@ -0,0 +1,18 @@ +%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: 690929a59dc7a42da9030305190d391f, type: 3} + m_Name: XRDeviceSimulatorSettings + m_EditorClassIdentifier: Unity.XR.Interaction.Toolkit::UnityEngine.XR.Interaction.Toolkit.Inputs.Simulation.XRDeviceSimulatorSettings + m_AutomaticallyInstantiateSimulatorPrefab: 0 + m_AutomaticallyInstantiateInEditorOnly: 1 + m_UseClassic: 0 + m_SimulatorPrefab: {fileID: 0} diff --git a/Assets/XRI/Settings/Resources/XRDeviceSimulatorSettings.asset.meta b/Assets/XRI/Settings/Resources/XRDeviceSimulatorSettings.asset.meta new file mode 100644 index 0000000..40170fb --- /dev/null +++ b/Assets/XRI/Settings/Resources/XRDeviceSimulatorSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 09463142eaee8ba4f89e5c460c3a3daa +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..17550f4 --- /dev/null +++ b/Assets/XRI/Settings/XRInteractionEditorSettings.asset @@ -0,0 +1,15 @@ +%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: Unity.XR.Interaction.Toolkit.Editor::UnityEditor.XR.Interaction.Toolkit.XRInteractionEditorSettings + m_InputReaderPropertyDrawerMode: 0 diff --git a/Assets/XRI/Settings/XRInteractionEditorSettings.asset.meta b/Assets/XRI/Settings/XRInteractionEditorSettings.asset.meta new file mode 100644 index 0000000..f09806d --- /dev/null +++ b/Assets/XRI/Settings/XRInteractionEditorSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d10fa1a1e7d75d349a55a3f81c2043b7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index 43e4dbe..8c072dd 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -11,6 +11,9 @@ "com.unity.timeline": "1.8.10", "com.unity.ugui": "2.0.0", "com.unity.visualscripting": "1.9.9", + "com.unity.xr.interaction.toolkit": "3.3.1", + "com.unity.xr.management": "4.5.4", + "com.unity.xr.oculus": "4.5.4", "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.adaptiveperformance": "1.0.0", "com.unity.modules.ai": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 6de98f4..aa14caf 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -74,7 +74,7 @@ }, "com.unity.mathematics": { "version": "1.3.3", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" @@ -193,6 +193,63 @@ }, "url": "https://packages.unity.com" }, + "com.unity.xr.core-utils": { + "version": "2.5.3", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.modules.xr": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.xr.interaction.toolkit": { + "version": "3.3.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.modules.xr": "1.0.0", + "com.unity.inputsystem": "1.8.1", + "com.unity.mathematics": "1.2.6", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.xr.core-utils": "2.4.0", + "com.unity.modules.physics": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.xr.legacyinputhelpers": { + "version": "2.1.13", + "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.xr.management": { + "version": "4.5.4", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.xr": "1.0.0", + "com.unity.xr.core-utils": "2.2.1", + "com.unity.modules.subsystems": "1.0.0", + "com.unity.xr.legacyinputhelpers": "2.1.11" + }, + "url": "https://packages.unity.com" + }, + "com.unity.xr.oculus": { + "version": "4.5.4", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.xr.management": "4.4.0", + "com.unity.modules.androidjni": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.modules.accessibility": { "version": "1.0.0", "depth": 0, diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 84b2182..640cc49 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -58,7 +58,7 @@ GraphicsSettings: m_FogKeepExp2: 1 m_AlbedoSwatchInfos: [] m_RenderPipelineGlobalSettingsMap: - UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 18dc0cd2c080841dea60987a38ce93fa, type: 2} + UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: ebc9cbe6b322eee4dbfb1c2bc20378e3, type: 2} m_ShaderBuildSettings: keywordDeclarationOverrides: [] m_LightsUseLinearIntensity: 1