diff --git a/GettingStartedGuides/HoloLens2_GettingStarted/HoloLens2GetStartedApp/Assets/XRI/Settings/Resources/XRDeviceSimulatorSettings.asset b/GettingStartedGuides/HoloLens2_GettingStarted/HoloLens2GetStartedApp/Assets/XRI/Settings/Resources/XRDeviceSimulatorSettings.asset new file mode 100644 index 00000000..7466a7d1 --- /dev/null +++ b/GettingStartedGuides/HoloLens2_GettingStarted/HoloLens2GetStartedApp/Assets/XRI/Settings/Resources/XRDeviceSimulatorSettings.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: 690929a59dc7a42da9030305190d391f, type: 3} + m_Name: XRDeviceSimulatorSettings + m_EditorClassIdentifier: + m_AutomaticallyInstantiateSimulatorPrefab: 0 + m_SimulatorPrefab: {fileID: 0} diff --git a/GettingStartedGuides/HoloLens2_GettingStarted/HoloLens2GetStartedApp/Assets/XRI/Settings/Resources/XRDeviceSimulatorSettings.asset.meta b/GettingStartedGuides/HoloLens2_GettingStarted/HoloLens2GetStartedApp/Assets/XRI/Settings/Resources/XRDeviceSimulatorSettings.asset.meta new file mode 100644 index 00000000..7ed0a02c --- /dev/null +++ b/GettingStartedGuides/HoloLens2_GettingStarted/HoloLens2GetStartedApp/Assets/XRI/Settings/Resources/XRDeviceSimulatorSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7f994e6ea9c904c41b88cdf098587bf3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/GettingStartedGuides/HoloLens2_GettingStarted/HoloLens2GetStartedApp/Packages/manifest.json b/GettingStartedGuides/HoloLens2_GettingStarted/HoloLens2GetStartedApp/Packages/manifest.json index d20e006a..cc37929d 100644 --- a/GettingStartedGuides/HoloLens2_GettingStarted/HoloLens2GetStartedApp/Packages/manifest.json +++ b/GettingStartedGuides/HoloLens2_GettingStarted/HoloLens2GetStartedApp/Packages/manifest.json @@ -1,50 +1,50 @@ -{ - "dependencies": { - "com.microsoft.mixedreality.openxr": "file:MixedReality/com.microsoft.mixedreality.openxr-1.8.0.tgz", - "com.microsoft.mixedreality.toolkit.foundation": "file:MixedReality/com.microsoft.mixedreality.toolkit.foundation-2.8.3.tgz", - "com.microsoft.mixedreality.toolkit.standardassets": "file:MixedReality/com.microsoft.mixedreality.toolkit.standardassets-2.8.3.tgz", - "com.microsoft.mixedreality.webview.unity": "file:MixedReality/com.microsoft.mixedreality.webview.unity-0.17.1-pre.3.tgz", - "com.unity.collab-proxy": "1.17.7", - "com.unity.ide.rider": "3.0.18", - "com.unity.ide.visualstudio": "2.0.17", - "com.unity.ide.vscode": "1.2.5", - "com.unity.test-framework": "1.1.31", - "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.6.4", - "com.unity.ugui": "1.0.0", - "com.unity.visualscripting": "1.8.0", - "com.unity.xr.interaction.toolkit": "2.2.0", - "com.unity.xr.openxr": "1.7.0", - "com.unity.modules.ai": "1.0.0", - "com.unity.modules.androidjni": "1.0.0", - "com.unity.modules.animation": "1.0.0", - "com.unity.modules.assetbundle": "1.0.0", - "com.unity.modules.audio": "1.0.0", - "com.unity.modules.cloth": "1.0.0", - "com.unity.modules.director": "1.0.0", - "com.unity.modules.imageconversion": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.particlesystem": "1.0.0", - "com.unity.modules.physics": "1.0.0", - "com.unity.modules.physics2d": "1.0.0", - "com.unity.modules.screencapture": "1.0.0", - "com.unity.modules.terrain": "1.0.0", - "com.unity.modules.terrainphysics": "1.0.0", - "com.unity.modules.tilemap": "1.0.0", - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.uielements": "1.0.0", - "com.unity.modules.umbra": "1.0.0", - "com.unity.modules.unityanalytics": "1.0.0", - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.modules.unitywebrequestassetbundle": "1.0.0", - "com.unity.modules.unitywebrequestaudio": "1.0.0", - "com.unity.modules.unitywebrequesttexture": "1.0.0", - "com.unity.modules.unitywebrequestwww": "1.0.0", - "com.unity.modules.vehicles": "1.0.0", - "com.unity.modules.video": "1.0.0", - "com.unity.modules.vr": "1.0.0", - "com.unity.modules.wind": "1.0.0", - "com.unity.modules.xr": "1.0.0" - } -} +{ + "dependencies": { + "com.microsoft.mixedreality.openxr": "file:MixedReality/com.microsoft.mixedreality.openxr-1.8.0.tgz", + "com.microsoft.mixedreality.toolkit.foundation": "file:MixedReality/com.microsoft.mixedreality.toolkit.foundation-2.8.3.tgz", + "com.microsoft.mixedreality.toolkit.standardassets": "file:MixedReality/com.microsoft.mixedreality.toolkit.standardassets-2.8.3.tgz", + "com.microsoft.mixedreality.webview.unity": "file:MixedReality/com.microsoft.mixedreality.webview.unity-0.17.1-pre.3.tgz", + "com.unity.collab-proxy": "2.0.3", + "com.unity.ide.rider": "3.0.20", + "com.unity.ide.visualstudio": "2.0.18", + "com.unity.ide.vscode": "1.2.5", + "com.unity.test-framework": "1.1.31", + "com.unity.textmeshpro": "3.0.6", + "com.unity.timeline": "1.6.4", + "com.unity.ugui": "1.0.0", + "com.unity.visualscripting": "1.8.0", + "com.unity.xr.interaction.toolkit": "2.3.1", + "com.unity.xr.openxr": "1.7.0", + "com.unity.modules.ai": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.cloth": "1.0.0", + "com.unity.modules.director": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.physics2d": "1.0.0", + "com.unity.modules.screencapture": "1.0.0", + "com.unity.modules.terrain": "1.0.0", + "com.unity.modules.terrainphysics": "1.0.0", + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.umbra": "1.0.0", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.unitywebrequesttexture": "1.0.0", + "com.unity.modules.unitywebrequestwww": "1.0.0", + "com.unity.modules.vehicles": "1.0.0", + "com.unity.modules.video": "1.0.0", + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.wind": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } +} diff --git a/GettingStartedGuides/HoloLens2_GettingStarted/HoloLens2GetStartedApp/Packages/packages-lock.json b/GettingStartedGuides/HoloLens2_GettingStarted/HoloLens2GetStartedApp/Packages/packages-lock.json index 96d4baaa..ed75a01a 100644 --- a/GettingStartedGuides/HoloLens2_GettingStarted/HoloLens2GetStartedApp/Packages/packages-lock.json +++ b/GettingStartedGuides/HoloLens2_GettingStarted/HoloLens2GetStartedApp/Packages/packages-lock.json @@ -34,12 +34,10 @@ "dependencies": {} }, "com.unity.collab-proxy": { - "version": "1.17.7", + "version": "2.0.3", "depth": 0, "source": "registry", - "dependencies": { - "com.unity.services.core": "1.0.1" - }, + "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { @@ -50,7 +48,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.18", + "version": "3.0.20", "depth": 0, "source": "registry", "dependencies": { @@ -59,7 +57,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.17", + "version": "2.0.18", "depth": 0, "source": "registry", "dependencies": { @@ -75,7 +73,7 @@ "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.4.4", + "version": "1.5.1", "depth": 1, "source": "registry", "dependencies": { @@ -83,13 +81,11 @@ }, "url": "https://packages.unity.com" }, - "com.unity.services.core": { - "version": "1.0.1", + "com.unity.mathematics": { + "version": "1.2.6", "depth": 1, "source": "registry", - "dependencies": { - "com.unity.modules.unitywebrequest": "1.0.0" - }, + "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.subsystemregistration": { @@ -153,26 +149,28 @@ "url": "https://packages.unity.com" }, "com.unity.xr.arfoundation": { - "version": "4.1.7", + "version": "4.2.7", "depth": 1, "source": "registry", "dependencies": { - "com.unity.xr.arsubsystems": "4.1.7", - "com.unity.xr.management": "4.0.1" + "com.unity.xr.arsubsystems": "4.2.7", + "com.unity.xr.management": "4.0.1", + "com.unity.modules.particlesystem": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.xr.arsubsystems": { - "version": "4.1.9", + "version": "4.2.7", "depth": 2, "source": "registry", "dependencies": { - "com.unity.subsystemregistration": "1.1.0" + "com.unity.subsystemregistration": "1.1.0", + "com.unity.xr.management": "4.0.1" }, "url": "https://packages.unity.com" }, "com.unity.xr.core-utils": { - "version": "2.1.0", + "version": "2.2.0", "depth": 1, "source": "registry", "dependencies": { @@ -181,14 +179,15 @@ "url": "https://packages.unity.com" }, "com.unity.xr.interaction.toolkit": { - "version": "2.2.0", + "version": "2.3.1", "depth": 0, "source": "registry", "dependencies": { - "com.unity.inputsystem": "1.3.0", + "com.unity.inputsystem": "1.4.4", + "com.unity.mathematics": "1.2.6", "com.unity.ugui": "1.0.0", - "com.unity.xr.core-utils": "2.0.0", - "com.unity.xr.legacyinputhelpers": "2.1.8", + "com.unity.xr.core-utils": "2.2.0", + "com.unity.xr.legacyinputhelpers": "2.1.10", "com.unity.modules.audio": "1.0.0", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.physics": "1.0.0" @@ -196,7 +195,7 @@ "url": "https://packages.unity.com" }, "com.unity.xr.legacyinputhelpers": { - "version": "2.1.9", + "version": "2.1.10", "depth": 1, "source": "registry", "dependencies": { @@ -206,15 +205,14 @@ "url": "https://packages.unity.com" }, "com.unity.xr.management": { - "version": "4.2.0", + "version": "4.3.3", "depth": 1, "source": "registry", "dependencies": { "com.unity.modules.subsystems": "1.0.0", "com.unity.modules.vr": "1.0.0", "com.unity.modules.xr": "1.0.0", - "com.unity.xr.legacyinputhelpers": "2.1.7", - "com.unity.subsystemregistration": "1.0.6" + "com.unity.xr.legacyinputhelpers": "2.1.7" }, "url": "https://packages.unity.com" }, diff --git a/GettingStartedGuides/HoloLens2_GettingStarted/HoloLens2GetStartedApp/ProjectSettings/ProjectSettings.asset b/GettingStartedGuides/HoloLens2_GettingStarted/HoloLens2GetStartedApp/ProjectSettings/ProjectSettings.asset index 2c029611..32048859 100644 --- a/GettingStartedGuides/HoloLens2_GettingStarted/HoloLens2GetStartedApp/ProjectSettings/ProjectSettings.asset +++ b/GettingStartedGuides/HoloLens2_GettingStarted/HoloLens2GetStartedApp/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 22 + serializedVersion: 24 productGUID: 5644c80d498d50e4e9f702e2639c32a1 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -147,6 +147,7 @@ PlayerSettings: enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 + enableOpenGLProfilerGPURecorders: 1 useHDRDisplay: 0 D3DHDRBitDepth: 0 m_ColorGamuts: 00000000 @@ -177,10 +178,10 @@ PlayerSettings: StripUnusedMeshComponents: 1 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 11.0 + iOSTargetOSVersionString: 12.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 11.0 + tvOSTargetOSVersionString: 12.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -218,6 +219,7 @@ PlayerSettings: iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] + macOSURLSchemes: [] iOSBackgroundModes: 0 iOSMetalForceHardShadows: 0 metalEditorSupport: 1 @@ -286,6 +288,7 @@ PlayerSettings: - m_BuildTarget: WebGL m_StaticBatching: 0 m_DynamicBatching: 0 + m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: - m_BuildTarget: MacStandaloneSupport m_GraphicsJobs: 0 @@ -320,8 +323,8 @@ PlayerSettings: m_GraphicsJobMode: 0 m_BuildTargetGraphicsAPIs: - m_BuildTarget: AndroidPlayer - m_APIs: 150000000b000000 - m_Automatic: 1 + m_APIs: 0b00000008000000 + m_Automatic: 0 - m_BuildTarget: iOSSupport m_APIs: 10000000 m_Automatic: 1 @@ -337,6 +340,8 @@ PlayerSettings: m_Devices: - Oculus - OpenVR + m_DefaultShaderChunkSizeInMB: 16 + m_DefaultShaderChunkCount: 0 openGLRequireES31: 0 openGLRequireES31AEP: 0 openGLRequireES32: 0 @@ -360,6 +365,7 @@ PlayerSettings: m_Encoding: 1 - m_BuildTarget: tvOS m_Encoding: 1 + m_BuildTargetDefaultTextureCompressionFormat: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -378,6 +384,7 @@ PlayerSettings: switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 switchUseGOLDLinker: 0 + switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: switchTitleNames_0: @@ -453,7 +460,6 @@ PlayerSettings: switchReleaseVersion: 0 switchDisplayVersion: 1.0.0 switchStartupUserAccount: 0 - switchTouchScreenUsage: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 switchApplicationErrorCodeCategory: @@ -495,6 +501,7 @@ PlayerSettings: switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 + switchEnableTouchScreen: 1 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -507,6 +514,7 @@ PlayerSettings: switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 + switchUseLegacyFmodPriorities: 1 switchUseMicroSleepForYield: 1 switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 @@ -606,19 +614,32 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 - scriptingDefineSymbols: - 0: USE_INPUT_SYSTEM_POSE_CONTROL;USE_INPUT_SYSTEM_POSE_CONTROL;USE_INPUT_SYSTEM_POSE_CONTROL + webGLPowerPreference: 2 + scriptingDefineSymbols: {} additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} - managedStrippingLevel: {} + managedStrippingLevel: + EmbeddedLinux: 1 + GameCoreScarlett: 1 + GameCoreXboxOne: 1 + Lumin: 1 + Nintendo Switch: 1 + PS4: 1 + PS5: 1 + Stadia: 1 + WebGL: 1 + Windows Store Apps: 1 + XboxOne: 1 + iPhone: 1 + tvOS: 1 incrementalIl2cppBuild: {} suppressCommonWarnings: 1 allowUnsafeCode: 0 useDeterministicCompilation: 1 - useReferenceAssemblies: 1 enableRoslynAnalyzers: 1 + selectedPlatform: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 @@ -631,9 +652,9 @@ PlayerSettings: metroPackageVersion: 1.0.0.0 metroCertificatePath: Assets/WSATestCertificate.pfx metroCertificatePassword: - metroCertificateSubject: DefaultCompany - metroCertificateIssuer: DefaultCompany - metroCertificateNotAfter: 8025d422ec95da01 + metroCertificateSubject: Microsoft + metroCertificateIssuer: Microsoft + metroCertificateNotAfter: 0058b1b2ed9cda01 metroApplicationDescription: WebView2_Hololens_Sample wsaImages: {} metroTileShortName: MRTKAdaptiveCards2InclusionTest @@ -703,6 +724,7 @@ PlayerSettings: m_VersionName: apiCompatibilityLevel: 6 activeInputHandler: 2 + windowsGamepadBackendHint: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] @@ -710,4 +732,6 @@ PlayerSettings: organizationId: cloudEnabled: 0 legacyClampBlendShapeWeights: 0 + playerDataPath: + forceSRGBBlit: 1 virtualTexturingSupportEnabled: 0 diff --git a/GettingStartedGuides/HoloLens2_GettingStarted/HoloLens2GetStartedApp/ProjectSettings/ProjectVersion.txt b/GettingStartedGuides/HoloLens2_GettingStarted/HoloLens2GetStartedApp/ProjectSettings/ProjectVersion.txt index 0f6bd7af..6c676f05 100644 --- a/GettingStartedGuides/HoloLens2_GettingStarted/HoloLens2GetStartedApp/ProjectSettings/ProjectVersion.txt +++ b/GettingStartedGuides/HoloLens2_GettingStarted/HoloLens2GetStartedApp/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.35f1 -m_EditorVersionWithRevision: 2020.3.35f1 (18e4db7a9996) +m_EditorVersion: 2021.3.24f1 +m_EditorVersionWithRevision: 2021.3.24f1 (cf10dcf7010d)