From ac445603285185db027dff4cf8714def90f43e51 Mon Sep 17 00:00:00 2001 From: Toomas Tamm Date: Sat, 23 Jan 2021 18:12:00 +0200 Subject: [PATCH] Upgrade to Unity 2020.2.2f --- ...haderGraphHDRP.unitypackage.meta~HEAD.meta | 7 ++ ...derGraphHDRP.unitypackage.meta~master.meta | 7 ++ .../SampleFramework/Core/Locomotion.meta | 8 +++ .../Core/Locomotion/Materials.meta | 8 +++ .../Core/TouchControllers.meta | 8 +++ .../Core/TouchControllers/Materials.meta | 8 +++ .../Core/TouchControllers/Models.meta | 8 +++ Assets/Oculus/SampleFramework/Usage.meta | 8 +++ .../SampleFramework/Usage/DistanceGrab.meta | 8 +++ .../Usage/DistanceGrab/Materials.meta | 8 +++ .../Usage/HandsTrainExample.meta | 8 +++ .../Usage/HandsTrainExample/Materials.meta | 8 +++ .../SampleFramework/Usage/Locomotion.meta | 8 +++ .../Usage/Locomotion/Materials.meta | 8 +++ .../SampleFramework/Usage/SharedAssets.meta | 8 +++ .../Usage/SharedAssets/Materials.meta | 8 +++ Packages/packages-lock.json | 7 +- ProjectSettings/ProjectSettings.asset | 64 +++++++++---------- ProjectSettings/ProjectVersion.txt | 4 +- 19 files changed, 162 insertions(+), 39 deletions(-) create mode 100644 Assets/Bakery/shader/Bakery_ShaderGraphHDRP.unitypackage.meta~HEAD.meta create mode 100644 Assets/Bakery/shader/Bakery_ShaderGraphHDRP.unitypackage.meta~master.meta create mode 100644 Assets/Oculus/SampleFramework/Core/Locomotion.meta create mode 100644 Assets/Oculus/SampleFramework/Core/Locomotion/Materials.meta create mode 100644 Assets/Oculus/SampleFramework/Core/TouchControllers.meta create mode 100644 Assets/Oculus/SampleFramework/Core/TouchControllers/Materials.meta create mode 100644 Assets/Oculus/SampleFramework/Core/TouchControllers/Models.meta create mode 100644 Assets/Oculus/SampleFramework/Usage.meta create mode 100644 Assets/Oculus/SampleFramework/Usage/DistanceGrab.meta create mode 100644 Assets/Oculus/SampleFramework/Usage/DistanceGrab/Materials.meta create mode 100644 Assets/Oculus/SampleFramework/Usage/HandsTrainExample.meta create mode 100644 Assets/Oculus/SampleFramework/Usage/HandsTrainExample/Materials.meta create mode 100644 Assets/Oculus/SampleFramework/Usage/Locomotion.meta create mode 100644 Assets/Oculus/SampleFramework/Usage/Locomotion/Materials.meta create mode 100644 Assets/Oculus/SampleFramework/Usage/SharedAssets.meta create mode 100644 Assets/Oculus/SampleFramework/Usage/SharedAssets/Materials.meta diff --git a/Assets/Bakery/shader/Bakery_ShaderGraphHDRP.unitypackage.meta~HEAD.meta b/Assets/Bakery/shader/Bakery_ShaderGraphHDRP.unitypackage.meta~HEAD.meta new file mode 100644 index 00000000..13def9f0 --- /dev/null +++ b/Assets/Bakery/shader/Bakery_ShaderGraphHDRP.unitypackage.meta~HEAD.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8047766b75cdf0f49ab33359414b6180 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bakery/shader/Bakery_ShaderGraphHDRP.unitypackage.meta~master.meta b/Assets/Bakery/shader/Bakery_ShaderGraphHDRP.unitypackage.meta~master.meta new file mode 100644 index 00000000..b905a974 --- /dev/null +++ b/Assets/Bakery/shader/Bakery_ShaderGraphHDRP.unitypackage.meta~master.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b0399983d72385549807a056e27c97e7 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Oculus/SampleFramework/Core/Locomotion.meta b/Assets/Oculus/SampleFramework/Core/Locomotion.meta new file mode 100644 index 00000000..8f4c540a --- /dev/null +++ b/Assets/Oculus/SampleFramework/Core/Locomotion.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 51caa913bc69a0542a0f01c7885e0f4e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Oculus/SampleFramework/Core/Locomotion/Materials.meta b/Assets/Oculus/SampleFramework/Core/Locomotion/Materials.meta new file mode 100644 index 00000000..69481564 --- /dev/null +++ b/Assets/Oculus/SampleFramework/Core/Locomotion/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 520de8343dce87941a9c1d5356b7bf29 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Oculus/SampleFramework/Core/TouchControllers.meta b/Assets/Oculus/SampleFramework/Core/TouchControllers.meta new file mode 100644 index 00000000..240e7cc7 --- /dev/null +++ b/Assets/Oculus/SampleFramework/Core/TouchControllers.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cb818f7de7e27234dacf74a926fc894d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Oculus/SampleFramework/Core/TouchControllers/Materials.meta b/Assets/Oculus/SampleFramework/Core/TouchControllers/Materials.meta new file mode 100644 index 00000000..8d21d989 --- /dev/null +++ b/Assets/Oculus/SampleFramework/Core/TouchControllers/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9b80d17281f465941b958581ecf9898e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Oculus/SampleFramework/Core/TouchControllers/Models.meta b/Assets/Oculus/SampleFramework/Core/TouchControllers/Models.meta new file mode 100644 index 00000000..6c8f23fb --- /dev/null +++ b/Assets/Oculus/SampleFramework/Core/TouchControllers/Models.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 80ee07926b66d8f40a2f58c5530ca87a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Oculus/SampleFramework/Usage.meta b/Assets/Oculus/SampleFramework/Usage.meta new file mode 100644 index 00000000..90f79f67 --- /dev/null +++ b/Assets/Oculus/SampleFramework/Usage.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0de37f08b38f0ac48a601ebb09f37194 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Oculus/SampleFramework/Usage/DistanceGrab.meta b/Assets/Oculus/SampleFramework/Usage/DistanceGrab.meta new file mode 100644 index 00000000..067fe02f --- /dev/null +++ b/Assets/Oculus/SampleFramework/Usage/DistanceGrab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a16e5b231d09df649b7fe62656f28e8e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Oculus/SampleFramework/Usage/DistanceGrab/Materials.meta b/Assets/Oculus/SampleFramework/Usage/DistanceGrab/Materials.meta new file mode 100644 index 00000000..ba75f6ff --- /dev/null +++ b/Assets/Oculus/SampleFramework/Usage/DistanceGrab/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0fab02c51823cdb45b6dc0e04d819e30 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Oculus/SampleFramework/Usage/HandsTrainExample.meta b/Assets/Oculus/SampleFramework/Usage/HandsTrainExample.meta new file mode 100644 index 00000000..efb265f9 --- /dev/null +++ b/Assets/Oculus/SampleFramework/Usage/HandsTrainExample.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 060b4c3acdf1a5b48a1adf5e78a1fbf9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Oculus/SampleFramework/Usage/HandsTrainExample/Materials.meta b/Assets/Oculus/SampleFramework/Usage/HandsTrainExample/Materials.meta new file mode 100644 index 00000000..299a2cfe --- /dev/null +++ b/Assets/Oculus/SampleFramework/Usage/HandsTrainExample/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2a6b72c5826163b40ae65106f35cccd7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Oculus/SampleFramework/Usage/Locomotion.meta b/Assets/Oculus/SampleFramework/Usage/Locomotion.meta new file mode 100644 index 00000000..15217423 --- /dev/null +++ b/Assets/Oculus/SampleFramework/Usage/Locomotion.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 430b604af28435f4c9ea866052b13076 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Oculus/SampleFramework/Usage/Locomotion/Materials.meta b/Assets/Oculus/SampleFramework/Usage/Locomotion/Materials.meta new file mode 100644 index 00000000..a3dfd39e --- /dev/null +++ b/Assets/Oculus/SampleFramework/Usage/Locomotion/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fc6b1f87da916db44987526b57eb30b8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Oculus/SampleFramework/Usage/SharedAssets.meta b/Assets/Oculus/SampleFramework/Usage/SharedAssets.meta new file mode 100644 index 00000000..3ab49c27 --- /dev/null +++ b/Assets/Oculus/SampleFramework/Usage/SharedAssets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9814ddc6460cf0e4dbc6e0dec988d58d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Oculus/SampleFramework/Usage/SharedAssets/Materials.meta b/Assets/Oculus/SampleFramework/Usage/SharedAssets/Materials.meta new file mode 100644 index 00000000..f4e52cd9 --- /dev/null +++ b/Assets/Oculus/SampleFramework/Usage/SharedAssets/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1f36e8dd21642d745a6a17274e07ca46 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 0fcbd8bf..fa9109bc 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -201,10 +201,13 @@ "url": "https://packages.unity.com" }, "com.unity.xr.legacyinputhelpers": { - "version": "2.1.6", + "version": "2.1.7", "depth": 1, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.xr": "1.0.0" + }, "url": "https://packages.unity.com" }, "com.unity.xr.management": { diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 04483a8a..fadcb10f 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 20 + serializedVersion: 22 productGUID: 542290945576d804abffb34cf29d7b53 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -119,6 +119,7 @@ PlayerSettings: stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 2 vulkanEnableSetSRGBWrite: 0 + vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 m_SupportedAspectRatios: 4:3: 1 @@ -134,31 +135,6 @@ PlayerSettings: xboxOneDisableKinectGpuReservation: 1 xboxOneEnable7thCore: 1 vrSettings: - cardboard: - depthFormat: 0 - enableTransitionView: 0 - daydream: - depthFormat: 0 - useSustainedPerformanceMode: 0 - enableVideoLayer: 0 - useProtectedVideoMemory: 0 - minimumSupportedHeadTracking: 0 - maximumSupportedHeadTracking: 1 - hololens: - depthFormat: 1 - depthBufferSharingEnabled: 1 - lumin: - depthFormat: 0 - frameTiming: 2 - enableGLCache: 0 - glCacheMaxBlobSize: 524288 - glCacheMaxFileSize: 8388608 - oculus: - sharedDepthBuffer: 1 - dashSupport: 1 - lowOverheadMode: 0 - protectedContext: 0 - v2Signing: 1 enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 @@ -171,7 +147,11 @@ PlayerSettings: androidMaxAspectRatio: 2.1 applicationIdentifier: Standalone: com.TT.DeltaVR - buildNumber: {} + buildNumber: + Standalone: 0 + iPhone: 0 + tvOS: 0 + overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 19 AndroidTargetSdkVersion: 0 @@ -225,8 +205,8 @@ PlayerSettings: iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 iOSLaunchScreeniPadCustomXibPath: - iOSUseLaunchScreenStoryboard: 0 iOSLaunchScreenCustomStoryboardPath: + iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] iOSBackgroundModes: 0 @@ -244,9 +224,17 @@ PlayerSettings: iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 appleEnableProMotion: 0 + shaderPrecisionModel: 0 clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea templatePackageId: com.unity.template.3d@1.3.0 templateDefaultScene: Assets/Scenes/SampleScene.unity + useCustomMainManifest: 0 + useCustomLauncherManifest: 0 + useCustomMainGradleTemplate: 0 + useCustomLauncherGradleManifest: 0 + useCustomBaseGradleTemplate: 0 + useCustomGradlePropertiesTemplate: 0 + useCustomProguardFile: 0 AndroidTargetArchitectures: 5 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} @@ -335,7 +323,7 @@ PlayerSettings: m_Automatic: 1 - m_BuildTarget: AppleTVSupport m_APIs: 10000000 - m_Automatic: 0 + m_Automatic: 1 - m_BuildTarget: WebGLSupport m_APIs: 0b000000 m_Automatic: 1 @@ -355,6 +343,7 @@ PlayerSettings: tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetNormalMapEncoding: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -496,6 +485,7 @@ PlayerSettings: switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 + switchUseNewStyleFilepaths: 0 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -604,6 +594,9 @@ PlayerSettings: 28: UNITY_POST_PROCESSING_STACK_V2 29: UNITY_POST_PROCESSING_STACK_V2 30: UNITY_POST_PROCESSING_STACK_V2 + 31: UNITY_POST_PROCESSING_STACK_V2 + 32: UNITY_POST_PROCESSING_STACK_V2 + additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} @@ -612,9 +605,12 @@ PlayerSettings: suppressCommonWarnings: 1 allowUnsafeCode: 0 useDeterministicCompilation: 1 + useReferenceAssemblies: 1 + enableRoslynAnalyzers: 1 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 0 + assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: Standalone: 3 @@ -665,6 +661,7 @@ PlayerSettings: XboxOneCapability: [] XboxOneGameRating: {} XboxOneIsContentPackage: 0 + XboxOneEnhancedXboxCompatibilityMode: 0 XboxOneEnableGPUVariability: 1 XboxOneSockets: {} XboxOneSplashScreen: {fileID: 0} @@ -673,10 +670,7 @@ PlayerSettings: XboxOneXTitleMemory: 8 XboxOneOverrideIdentityName: XboxOneOverrideIdentityPublisher: - vrEditorSettings: - daydream: - daydreamIconForeground: {fileID: 0} - daydreamIconBackground: {fileID: 0} + vrEditorSettings: {} cloudServicesEnabled: Analytics: 1 Build: 0 @@ -697,12 +691,12 @@ PlayerSettings: m_VersionCode: 1 m_VersionName: apiCompatibilityLevel: 6 + activeInputHandler: 1 cloudProjectId: 9c596bd8-1f5c-457c-b4d8-4f4f4d685029 framebufferDepthMemorylessMode: 0 + qualitySettingsNames: [] projectName: DeltaVR organizationId: surplus cloudEnabled: 0 - enableNativePlatformBackendsForNewInputSystem: 1 - disableOldInputManagerSupport: 1 legacyClampBlendShapeWeights: 0 virtualTexturingSupportEnabled: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index a328ffde..39ae3a3b 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.2.1f1 -m_EditorVersionWithRevision: 2020.2.1f1 (270dd8c3da1c) +m_EditorVersion: 2020.2.2f1 +m_EditorVersionWithRevision: 2020.2.2f1 (068178b99f32)