diff --git a/Assets/XR/Loaders/Mock HMD Loader.asset b/Assets/XR/Loaders/Mock HMD Loader.asset new file mode 100644 index 0000000..f7b4662 --- /dev/null +++ b/Assets/XR/Loaders/Mock HMD Loader.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: 0660e8fc444734757ae6f6c40c2d33a0, type: 3} + m_Name: Mock HMD Loader + m_EditorClassIdentifier: diff --git a/Assets/XR/Loaders/Mock HMD Loader.asset.meta b/Assets/XR/Loaders/Mock HMD Loader.asset.meta new file mode 100644 index 0000000..28cb83b --- /dev/null +++ b/Assets/XR/Loaders/Mock HMD Loader.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: df4ed463f699a594593b8eb5ed412658 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/XR/Settings/Mock HMD Build Settings.asset b/Assets/XR/Settings/Mock HMD Build Settings.asset new file mode 100644 index 0000000..5cd2a32 --- /dev/null +++ b/Assets/XR/Settings/Mock HMD Build Settings.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: c8bf066bf8a4947a1be502d267edb82f, type: 3} + m_Name: Mock HMD Build Settings + m_EditorClassIdentifier: + renderMode: 0 diff --git a/Assets/XR/Settings/Mock HMD Build Settings.asset.meta b/Assets/XR/Settings/Mock HMD Build Settings.asset.meta new file mode 100644 index 0000000..913d049 --- /dev/null +++ b/Assets/XR/Settings/Mock HMD Build Settings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d3188622f79ccb44db3e51adc5a9beb1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/XR/XRGeneralSettings.asset b/Assets/XR/XRGeneralSettings.asset index d3a30e5..8f118d2 100644 --- a/Assets/XR/XRGeneralSettings.asset +++ b/Assets/XR/XRGeneralSettings.asset @@ -46,3 +46,4 @@ MonoBehaviour: m_AutomaticRunning: 0 m_Loaders: - {fileID: 11400000, guid: dfe61e10b085aa149bce80b468d7fab2, type: 2} + - {fileID: 11400000, guid: df4ed463f699a594593b8eb5ed412658, type: 2} diff --git a/Packages/manifest.json b/Packages/manifest.json index 2fc4ad0..61b347a 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -12,6 +12,7 @@ "com.unity.ugui": "1.0.0", "com.unity.visualscripting": "1.8.0", "com.unity.xr.interaction.toolkit": "2.2.0", + "com.unity.xr.mock-hmd": "1.3.1-preview.1", "com.unity.xr.openxr": "1.6.0", "io.realm.unity": "10.18.0", "com.unity.modules.ai": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 2ce311f..167bc96 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -218,6 +218,15 @@ }, "url": "https://packages.unity.com" }, + "com.unity.xr.mock-hmd": { + "version": "1.3.1-preview.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.xr.management": "4.0.1" + }, + "url": "https://packages.unity.com" + }, "com.unity.xr.openxr": { "version": "1.6.0", "depth": 0, diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 901e7aa..095f288 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -16,3 +16,5 @@ EditorBuildSettings: type: 2} com.unity.xr.openxr.settings4: {fileID: 11400000, guid: 4fc8ed80f87d6b94981580316e2b7811, type: 2} + xr.sdk.mock-hmd.settings: {fileID: 11400000, guid: d3188622f79ccb44db3e51adc5a9beb1, + type: 2} diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index 24283fd..7bf0abd 100644 --- a/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectSettings/PackageManagerSettings.asset @@ -13,11 +13,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_EnablePreReleasePackages: 1 - m_EnablePackageDependencies: 0 m_AdvancedSettingsExpanded: 1 m_ScopedRegistriesSettingsExpanded: 1 m_SeeAllPackageVersions: 0 - m_DismissPreviewPackagesInUse: 0 + m_DismissPreviewPackagesInUse: 1 oneTimeWarningShown: 1 m_Registries: - m_Id: main @@ -40,6 +39,6 @@ MonoBehaviour: m_RegistryInfoDraft: m_Modified: 0 m_ErrorMessage: - m_UserModificationsInstanceId: -828 - m_OriginalInstanceId: -830 + m_UserModificationsInstanceId: -838 + m_OriginalInstanceId: -842 m_LoadAssets: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 3f55dcf..26a325f 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -52,6 +52,7 @@ PlayerSettings: m_MTRendering: 1 mipStripping: 0 numberOfMipsStripped: 0 + numberOfMipsStrippedPerMipmapLimitGroup: {} m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 @@ -676,6 +677,7 @@ PlayerSettings: switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 + switchUseLegacyFmodPriorities: 0 switchUseMicroSleepForYield: 1 switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 @@ -783,7 +785,10 @@ PlayerSettings: webGLMemoryGeometricGrowthStep: 0.2 webGLMemoryGeometricGrowthCap: 96 webGLPowerPreference: 2 - scriptingDefineSymbols: {} + scriptingDefineSymbols: + Android: USE_INPUT_SYSTEM_POSE_CONTROL;USE_INPUT_SYSTEM_POSE_CONTROL + Standalone: USE_INPUT_SYSTEM_POSE_CONTROL;USE_INPUT_SYSTEM_POSE_CONTROL + Windows Store Apps: USE_INPUT_SYSTEM_POSE_CONTROL;USE_INPUT_SYSTEM_POSE_CONTROL additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: {} @@ -873,6 +878,7 @@ PlayerSettings: hmiPlayerDataPath: hmiForceSRGBBlit: 1 embeddedLinuxEnableGamepadInput: 1 + hmiLogStartupTiming: 0 hmiCpuConfiguration: apiCompatibilityLevel: 6 activeInputHandler: 2