From 745823a4ba503cc8361e563dc17d90f8697f6880 Mon Sep 17 00:00:00 2001 From: Brian Kircher Date: Wed, 2 Jun 2021 16:55:17 -0700 Subject: [PATCH] Update sample project to SDK 0.11.0, MRTK 2.6.2, and Unity 2019.4.27f1. --- .../2DMapExample/2DMapExample.unity | 9 ++++++--- .../2DPanelExample/2DPanelExample.unity | 8 ++++++-- .../CityTourExample/CityTourExample.unity | 5 ++++- .../CustomElevationExample.unity | 3 +++ .../MapPinExample/MapPinExample.unity | 5 ++++- .../MapServicesExample/MapServiceExample.unity | 5 ++++- .../UnityARMapExample/UnityARMapExample.unity | 1 + .../WeatherCubeExample/WeatherCubeExample.unity | 1 + SampleProject/Packages/manifest.json | 10 +++++----- SampleProject/ProjectSettings/ProjectVersion.txt | 4 ++-- SampleProject/ProjectSettings/QualitySettings.asset | 2 +- 11 files changed, 37 insertions(+), 16 deletions(-) diff --git a/SampleProject/Assets/Microsoft.Maps.Unity.Examples/2DMapExample/2DMapExample.unity b/SampleProject/Assets/Microsoft.Maps.Unity.Examples/2DMapExample/2DMapExample.unity index 60e9af3b..969822c6 100644 --- a/SampleProject/Assets/Microsoft.Maps.Unity.Examples/2DMapExample/2DMapExample.unity +++ b/SampleProject/Assets/Microsoft.Maps.Unity.Examples/2DMapExample/2DMapExample.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -242,10 +242,12 @@ MonoBehaviour: _mapEdgeColor: {r: 0.62352943, g: 0.64705884, b: 0.69411767, a: 1} _mapEdgeColorFadeDistance: 0 _detailOffset: 0 + _numElevationTileFallbackLods: 2 + _requestTilesAroundView: 1 _center: _latitude: 47.6096481206096 _longitude: -122.351074731585 - _zoomLevel: 10.840002 + _zoomLevel: 4.42 _minimumZoomLevel: 1 _maximumZoomLevel: 20 _mapTerrainType: 2 @@ -261,6 +263,7 @@ MonoBehaviour: _isClippingVolumeWallEnabled: 0 _clippingVolumeMaterial: {fileID: 0} _clippingVolumeDistanceTextureResolution: 2 + _clippingDistanceLayer: 23 _textureTileLayers: _list: - {fileID: 26182499} @@ -2239,7 +2242,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\xA9 2020 Microsoft" + m_text: "\xA9 2021 Microsoft" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 484364120} diff --git a/SampleProject/Assets/Microsoft.Maps.Unity.Examples/2DPanelExample/2DPanelExample.unity b/SampleProject/Assets/Microsoft.Maps.Unity.Examples/2DPanelExample/2DPanelExample.unity index 4cb2410d..b935182b 100644 --- a/SampleProject/Assets/Microsoft.Maps.Unity.Examples/2DPanelExample/2DPanelExample.unity +++ b/SampleProject/Assets/Microsoft.Maps.Unity.Examples/2DPanelExample/2DPanelExample.unity @@ -656,7 +656,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\xA9 2020 Microsoft" + m_text: "\xA9 2021 Microsoft" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 76533969} @@ -725,6 +725,7 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_renderer: {fileID: 611363901} m_maskType: 0 + _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 --- !u!222 &611363899 @@ -1283,7 +1284,7 @@ MonoBehaviour: moveLerpTime: 0.1 rotateLerpTime: 0.1 scaleLerpTime: 0 - maintainScale: 1 + maintainScaleOnInitialization: 1 smoothing: 1 lifetime: 0 autoStart: 0 @@ -2419,6 +2420,8 @@ MonoBehaviour: _mapEdgeColor: {r: 0.04705883, g: 0.5176471, b: 0.5176471, a: 1} _mapEdgeColorFadeDistance: 0 _detailOffset: 0 + _numElevationTileFallbackLods: 2 + _requestTilesAroundView: 1 _center: _latitude: 49.8457301182239 _longitude: -110.734009177481 @@ -2438,6 +2441,7 @@ MonoBehaviour: _isClippingVolumeWallEnabled: 0 _clippingVolumeMaterial: {fileID: 0} _clippingVolumeDistanceTextureResolution: 2 + _clippingDistanceLayer: 23 _textureTileLayers: _list: - {fileID: 1276686199} diff --git a/SampleProject/Assets/Microsoft.Maps.Unity.Examples/CityTourExample/CityTourExample.unity b/SampleProject/Assets/Microsoft.Maps.Unity.Examples/CityTourExample/CityTourExample.unity index d888db17..5b583e2e 100644 --- a/SampleProject/Assets/Microsoft.Maps.Unity.Examples/CityTourExample/CityTourExample.unity +++ b/SampleProject/Assets/Microsoft.Maps.Unity.Examples/CityTourExample/CityTourExample.unity @@ -561,6 +561,8 @@ MonoBehaviour: _mapEdgeColor: {r: 0.27450982, g: 0.33333334, b: 0.5529412, a: 1} _mapEdgeColorFadeDistance: 0 _detailOffset: 0 + _numElevationTileFallbackLods: 2 + _requestTilesAroundView: 1 _center: _latitude: 47.620365 _longitude: -122.349305 @@ -580,6 +582,7 @@ MonoBehaviour: _isClippingVolumeWallEnabled: 1 _clippingVolumeMaterial: {fileID: 0} _clippingVolumeDistanceTextureResolution: 2 + _clippingDistanceLayer: 23 _textureTileLayers: _list: - {fileID: 1488338474} @@ -724,7 +727,7 @@ MonoBehaviour: moveLerpTime: 0.1 rotateLerpTime: 0.1 scaleLerpTime: 0 - maintainScale: 1 + maintainScaleOnInitialization: 1 smoothing: 1 lifetime: 0 autoStart: 0 diff --git a/SampleProject/Assets/Microsoft.Maps.Unity.Examples/CustomElevationExample/CustomElevationExample.unity b/SampleProject/Assets/Microsoft.Maps.Unity.Examples/CustomElevationExample/CustomElevationExample.unity index 6a3f93ef..5f2f9b1e 100644 --- a/SampleProject/Assets/Microsoft.Maps.Unity.Examples/CustomElevationExample/CustomElevationExample.unity +++ b/SampleProject/Assets/Microsoft.Maps.Unity.Examples/CustomElevationExample/CustomElevationExample.unity @@ -1567,6 +1567,8 @@ MonoBehaviour: _mapEdgeColor: {r: 0.39168903, g: 0.44490546, b: 0.48900002, a: 1} _mapEdgeColorFadeDistance: 0 _detailOffset: 1 + _numElevationTileFallbackLods: 2 + _requestTilesAroundView: 1 _center: _latitude: 34.0511830789976 _longitude: -116.201788161759 @@ -1586,6 +1588,7 @@ MonoBehaviour: _isClippingVolumeWallEnabled: 1 _clippingVolumeMaterial: {fileID: 0} _clippingVolumeDistanceTextureResolution: 2 + _clippingDistanceLayer: 23 _textureTileLayers: _list: - {fileID: 1886841721} diff --git a/SampleProject/Assets/Microsoft.Maps.Unity.Examples/MapPinExample/MapPinExample.unity b/SampleProject/Assets/Microsoft.Maps.Unity.Examples/MapPinExample/MapPinExample.unity index 743e3827..0e18f0a2 100644 --- a/SampleProject/Assets/Microsoft.Maps.Unity.Examples/MapPinExample/MapPinExample.unity +++ b/SampleProject/Assets/Microsoft.Maps.Unity.Examples/MapPinExample/MapPinExample.unity @@ -767,6 +767,8 @@ MonoBehaviour: _mapEdgeColor: {r: 0.31842372, g: 0.44599998, b: 0.264924, a: 1} _mapEdgeColorFadeDistance: 0.01 _detailOffset: 0 + _numElevationTileFallbackLods: 2 + _requestTilesAroundView: 1 _center: _latitude: 37.2779714028801 _longitude: -121.219809007815 @@ -786,6 +788,7 @@ MonoBehaviour: _isClippingVolumeWallEnabled: 1 _clippingVolumeMaterial: {fileID: 0} _clippingVolumeDistanceTextureResolution: 2 + _clippingDistanceLayer: 23 _textureTileLayers: _list: - {fileID: 1276686198} @@ -950,7 +953,7 @@ MonoBehaviour: moveLerpTime: 0.1 rotateLerpTime: 0.1 scaleLerpTime: 0 - maintainScale: 1 + maintainScaleOnInitialization: 1 smoothing: 1 lifetime: 0 autoStart: 0 diff --git a/SampleProject/Assets/Microsoft.Maps.Unity.Examples/MapServicesExample/MapServiceExample.unity b/SampleProject/Assets/Microsoft.Maps.Unity.Examples/MapServicesExample/MapServiceExample.unity index dd61516c..56a02c60 100644 --- a/SampleProject/Assets/Microsoft.Maps.Unity.Examples/MapServicesExample/MapServiceExample.unity +++ b/SampleProject/Assets/Microsoft.Maps.Unity.Examples/MapServicesExample/MapServiceExample.unity @@ -514,7 +514,7 @@ MonoBehaviour: moveLerpTime: 0.1 rotateLerpTime: 0.1 scaleLerpTime: 0 - maintainScale: 1 + maintainScaleOnInitialization: 1 smoothing: 1 lifetime: 0 autoStart: 0 @@ -584,6 +584,8 @@ MonoBehaviour: _mapEdgeColor: {r: 0.04705883, g: 0.5176471, b: 0.5176471, a: 1} _mapEdgeColorFadeDistance: 0.01 _detailOffset: 0 + _numElevationTileFallbackLods: 2 + _requestTilesAroundView: 1 _center: _latitude: 47.6148544965444 _longitude: -122.195821273054 @@ -603,6 +605,7 @@ MonoBehaviour: _isClippingVolumeWallEnabled: 1 _clippingVolumeMaterial: {fileID: 0} _clippingVolumeDistanceTextureResolution: 2 + _clippingDistanceLayer: 23 _textureTileLayers: _list: - {fileID: 1276686199} diff --git a/SampleProject/Assets/Microsoft.Maps.Unity.Examples/UnityARMapExample/UnityARMapExample.unity b/SampleProject/Assets/Microsoft.Maps.Unity.Examples/UnityARMapExample/UnityARMapExample.unity index 7e556cd2..f2664090 100644 --- a/SampleProject/Assets/Microsoft.Maps.Unity.Examples/UnityARMapExample/UnityARMapExample.unity +++ b/SampleProject/Assets/Microsoft.Maps.Unity.Examples/UnityARMapExample/UnityARMapExample.unity @@ -4913,6 +4913,7 @@ MonoBehaviour: _isClippingVolumeWallEnabled: 1 _clippingVolumeMaterial: {fileID: 0} _clippingVolumeDistanceTextureResolution: 2 + _clippingDistanceLayer: 23 _textureTileLayers: _list: - {fileID: 2026101498} diff --git a/SampleProject/Assets/Microsoft.Maps.Unity.Examples/WeatherCubeExample/WeatherCubeExample.unity b/SampleProject/Assets/Microsoft.Maps.Unity.Examples/WeatherCubeExample/WeatherCubeExample.unity index 70b0b9a9..833d2cc5 100644 --- a/SampleProject/Assets/Microsoft.Maps.Unity.Examples/WeatherCubeExample/WeatherCubeExample.unity +++ b/SampleProject/Assets/Microsoft.Maps.Unity.Examples/WeatherCubeExample/WeatherCubeExample.unity @@ -198,6 +198,7 @@ MonoBehaviour: _isClippingVolumeWallEnabled: 1 _clippingVolumeMaterial: {fileID: 0} _clippingVolumeDistanceTextureResolution: 2 + _clippingDistanceLayer: 23 _textureTileLayers: _list: - {fileID: 220598126} diff --git a/SampleProject/Packages/manifest.json b/SampleProject/Packages/manifest.json index 22e04edf..857f84f3 100644 --- a/SampleProject/Packages/manifest.json +++ b/SampleProject/Packages/manifest.json @@ -17,10 +17,10 @@ } ], "dependencies": { - "com.microsoft.maps.unity": "0.10.2", - "com.microsoft.mixedreality.toolkit.examples": "2.6.1", - "com.microsoft.mixedreality.toolkit.foundation": "2.6.1", - "com.microsoft.mixedreality.toolkit.tools": "2.6.1", + "com.microsoft.maps.unity": "0.11.0", + "com.microsoft.mixedreality.toolkit.examples": "2.6.2", + "com.microsoft.mixedreality.toolkit.foundation": "2.6.2", + "com.microsoft.mixedreality.toolkit.tools": "2.6.2", "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", "com.unity.ide.rider": "1.2.1", @@ -34,7 +34,7 @@ "com.unity.xr.arfoundation": "2.1.18", "com.unity.xr.arkit": "2.1.18", "com.unity.xr.legacyinputhelpers": "2.1.7", - "com.unity.xr.management": "3.2.16", + "com.unity.xr.management": "4.0.5", "com.unity.xr.openvr.standalone": "2.0.5", "com.unity.xr.windowsmr.metro": "4.2.3", "com.unity.modules.ai": "1.0.0", diff --git a/SampleProject/ProjectSettings/ProjectVersion.txt b/SampleProject/ProjectSettings/ProjectVersion.txt index ba35eb1c..b6a81cb4 100644 --- a/SampleProject/ProjectSettings/ProjectVersion.txt +++ b/SampleProject/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.4.25f1 -m_EditorVersionWithRevision: 2019.4.25f1 (01a0494af254) +m_EditorVersion: 2019.4.27f1 +m_EditorVersionWithRevision: 2019.4.27f1 (23dc10685eb4) diff --git a/SampleProject/ProjectSettings/QualitySettings.asset b/SampleProject/ProjectSettings/QualitySettings.asset index 70e5cf94..0a7502e6 100644 --- a/SampleProject/ProjectSettings/QualitySettings.asset +++ b/SampleProject/ProjectSettings/QualitySettings.asset @@ -4,7 +4,7 @@ QualitySettings: m_ObjectHideFlags: 0 serializedVersion: 5 - m_CurrentQuality: 0 + m_CurrentQuality: 5 m_QualitySettings: - serializedVersion: 2 name: Very Low