diff --git a/sdkproject/Assets/Mapbox/Examples/2_ZoomableMap/ZoomableMap.unity b/sdkproject/Assets/Mapbox/Examples/2_ZoomableMap/ZoomableMap.unity index c5ca57abf..98182181d 100644 --- a/sdkproject/Assets/Mapbox/Examples/2_ZoomableMap/ZoomableMap.unity +++ b/sdkproject/Assets/Mapbox/Examples/2_ZoomableMap/ZoomableMap.unity @@ -243,7 +243,7 @@ Prefab: - target: {fileID: 224835413515161394, guid: 98be219873e6d4dffb5949746f515a33, type: 2} propertyPath: m_AnchoredPosition.y - value: -56.40388 + value: -57.82929 objectReference: {fileID: 0} - target: {fileID: 224835413515161394, guid: 98be219873e6d4dffb5949746f515a33, type: 2} @@ -253,12 +253,12 @@ Prefab: - target: {fileID: 224835413515161394, guid: 98be219873e6d4dffb5949746f515a33, type: 2} propertyPath: m_SizeDelta.y - value: 92.80776 + value: 95.65858 objectReference: {fileID: 0} - target: {fileID: 224857786874416376, guid: 98be219873e6d4dffb5949746f515a33, type: 2} propertyPath: m_SizeDelta.y - value: 112.80776 + value: 115.65858 objectReference: {fileID: 0} - target: {fileID: 224907856650798614, guid: 98be219873e6d4dffb5949746f515a33, type: 2} @@ -494,9 +494,12 @@ MonoBehaviour: wallMaterial: {fileID: 0} _vectorData: _layerProperty: - sourceType: 3 + tileJsonData: + tileJSONLoaded: 0 + LayerDisplayNames: [] + _sourceType: 1 sourceOptions: - isActive: 0 + isActive: 1 layerSource: Name: Mapbox Streets Id: mapbox.mapbox-streets-v7 @@ -512,6 +515,7 @@ MonoBehaviour: isEnabled: 1 entityPerCoroutine: 20 vectorSubLayers: [] + locationPrefabList: [] _tileProvider: {fileID: 0} --- !u!4 &555018384 Transform: diff --git a/sdkproject/Assets/Mapbox/Examples/6_LocationPrefabs/LocationPrefabs.unity b/sdkproject/Assets/Mapbox/Examples/6_LocationPrefabs/LocationPrefabs.unity index 4e54dc7bb..aed3491ac 100644 --- a/sdkproject/Assets/Mapbox/Examples/6_LocationPrefabs/LocationPrefabs.unity +++ b/sdkproject/Assets/Mapbox/Examples/6_LocationPrefabs/LocationPrefabs.unity @@ -675,7 +675,7 @@ Prefab: - target: {fileID: 224907993215804030, guid: 98be219873e6d4dffb5949746f515a33, type: 2} propertyPath: m_AnchorMin.y - value: 0.14468281 + value: 0.20733595 objectReference: {fileID: 0} - target: {fileID: 224907993215804030, guid: 98be219873e6d4dffb5949746f515a33, type: 2} @@ -795,7 +795,7 @@ Prefab: - target: {fileID: 224835413515161394, guid: 98be219873e6d4dffb5949746f515a33, type: 2} propertyPath: m_AnchoredPosition.y - value: -116.91571 + value: -126.156845 objectReference: {fileID: 0} - target: {fileID: 224835413515161394, guid: 98be219873e6d4dffb5949746f515a33, type: 2} @@ -805,12 +805,12 @@ Prefab: - target: {fileID: 224835413515161394, guid: 98be219873e6d4dffb5949746f515a33, type: 2} propertyPath: m_SizeDelta.y - value: 213.83142 + value: 232.31369 objectReference: {fileID: 0} - target: {fileID: 224857786874416376, guid: 98be219873e6d4dffb5949746f515a33, type: 2} propertyPath: m_SizeDelta.y - value: 233.83142 + value: 252.31369 objectReference: {fileID: 0} - target: {fileID: 224907856650798614, guid: 98be219873e6d4dffb5949746f515a33, type: 2} @@ -947,20 +947,103 @@ MonoBehaviour: wallHeight: 10 wallMaterial: {fileID: 0} _vectorData: - _locationPrefabsLayerProperties: + _layerProperty: + tileJsonData: + tileJSONLoaded: 0 + LayerDisplayNames: + - landuse + - waterway + - aeroway + - barrier_line + - building (layer found in more than one data source) + - landuse_overlay + - road + - admin + - country_label + - marine_label + - state_label + - place_label + - water_label + - airport_label + - rail_station_label + - mountain_peak_label + - poi_label + - motorway_junction + - road_label + - waterway_label + - housenum_label + _sourceType: 0 + sourceOptions: + isActive: 1 + layerSource: + Name: Mapbox Terrain + Id: mapbox.3d-buildings,mapbox.mapbox-streets-v7 + Modified: + UserName: + useOptimizedStyle: 0 + optimizedStyle: + Name: + Id: + Modified: + UserName: + performanceOptions: + isEnabled: 1 + entityPerCoroutine: 20 + vectorSubLayers: + - coreOptions: + sourceId: mapbox.3d-buildings,mapbox.mapbox-streets-v7 + isActive: 1 + sublayerName: Building + geometryType: 2 + layerName: building + snapToTerrain: 1 + groupFeatures: 0 + lineWidth: 1 + filterOptions: + _selectedLayerName: building + filters: [] + combinerType: 0 + extrusionOptions: + _selectedLayerName: building + extrusionType: 1 + extrusionGeometryType: 0 + propertyName: height + minimumHeight: 0 + maximumHeight: 0 + extrusionScaleFactor: 1 + colliderOptions: + colliderType: 0 + materialOptions: + texturingType: 3 + materials: + - Materials: + - {fileID: 2100000, guid: d4d7464e3429a44e090f55a4ac17f110, type: 2} + - Materials: + - {fileID: 2100000, guid: 55cc6edead802446b9106b2998406844, type: 2} + atlasInfo: {fileID: 11400000, guid: 414754d7155df47beb52ca117a774f21, type: 2} + colorPalette: {fileID: 11400000, guid: b01b6d453d33e40119c0f9472d50c45f, + type: 2} + honorBuildingIdSetting: 1 + buildingsWithUniqueIds: 1 + moveFeaturePositionTo: 0 + MeshModifiers: [] + GoModifiers: [] locationPrefabList: - coreOptions: + sourceId: isActive: 1 - sublayerName: Arts and Enterinment + sublayerName: Arts and Entertainment geometryType: 0 layerName: snapToTerrain: 1 groupFeatures: 0 lineWidth: 0 filterOptions: + _selectedLayerName: filters: [] combinerType: 0 extrusionOptions: + _selectedLayerName: extrusionType: 0 extrusionGeometryType: 0 propertyName: @@ -985,10 +1068,11 @@ MonoBehaviour: scaleDownWithWorld: 1 findByType: 0 categories: 1 - nameString: POI Name + nameString: coordinates: [] - density: 10 + density: 15 - coreOptions: + sourceId: isActive: 1 sublayerName: Food geometryType: 0 @@ -997,9 +1081,11 @@ MonoBehaviour: groupFeatures: 0 lineWidth: 0 filterOptions: + _selectedLayerName: filters: [] combinerType: 0 extrusionOptions: + _selectedLayerName: extrusionType: 0 extrusionGeometryType: 0 propertyName: @@ -1024,10 +1110,11 @@ MonoBehaviour: scaleDownWithWorld: 1 findByType: 0 categories: 2 - nameString: POI Name + nameString: coordinates: [] density: 15 - coreOptions: + sourceId: isActive: 1 sublayerName: Nightlife geometryType: 0 @@ -1036,9 +1123,11 @@ MonoBehaviour: groupFeatures: 0 lineWidth: 0 filterOptions: + _selectedLayerName: filters: [] combinerType: 0 extrusionOptions: + _selectedLayerName: extrusionType: 0 extrusionGeometryType: 0 propertyName: @@ -1063,10 +1152,11 @@ MonoBehaviour: scaleDownWithWorld: 1 findByType: 0 categories: 4 - nameString: POI Name + nameString: coordinates: [] - density: 10 + density: 15 - coreOptions: + sourceId: isActive: 1 sublayerName: Outdoors and Recreation geometryType: 0 @@ -1075,9 +1165,11 @@ MonoBehaviour: groupFeatures: 0 lineWidth: 0 filterOptions: + _selectedLayerName: filters: [] combinerType: 0 extrusionOptions: + _selectedLayerName: extrusionType: 0 extrusionGeometryType: 0 propertyName: @@ -1102,10 +1194,11 @@ MonoBehaviour: scaleDownWithWorld: 1 findByType: 0 categories: 8 - nameString: POI Name + nameString: coordinates: [] - density: 20 + density: 15 - coreOptions: + sourceId: isActive: 1 sublayerName: Services geometryType: 0 @@ -1114,9 +1207,11 @@ MonoBehaviour: groupFeatures: 0 lineWidth: 0 filterOptions: + _selectedLayerName: filters: [] combinerType: 0 extrusionOptions: + _selectedLayerName: extrusionType: 0 extrusionGeometryType: 0 propertyName: @@ -1141,10 +1236,11 @@ MonoBehaviour: scaleDownWithWorld: 1 findByType: 0 categories: 16 - nameString: POI Name + nameString: coordinates: [] - density: 5 + density: 10 - coreOptions: + sourceId: isActive: 1 sublayerName: Shops geometryType: 0 @@ -1153,9 +1249,11 @@ MonoBehaviour: groupFeatures: 0 lineWidth: 0 filterOptions: + _selectedLayerName: filters: [] combinerType: 0 extrusionOptions: + _selectedLayerName: extrusionType: 0 extrusionGeometryType: 0 propertyName: @@ -1180,10 +1278,11 @@ MonoBehaviour: scaleDownWithWorld: 1 findByType: 0 categories: 32 - nameString: POI Name + nameString: coordinates: [] - density: 10 + density: 15 - coreOptions: + sourceId: isActive: 1 sublayerName: Transportation geometryType: 0 @@ -1192,9 +1291,11 @@ MonoBehaviour: groupFeatures: 0 lineWidth: 0 filterOptions: + _selectedLayerName: filters: [] combinerType: 0 extrusionOptions: + _selectedLayerName: extrusionType: 0 extrusionGeometryType: 0 propertyName: @@ -1219,21 +1320,24 @@ MonoBehaviour: scaleDownWithWorld: 1 findByType: 0 categories: 64 - nameString: POI Name + nameString: coordinates: [] - density: 10 + density: 15 - coreOptions: + sourceId: isActive: 0 - sublayerName: All Points of Interest (POIs) + sublayerName: All POIs geometryType: 0 layerName: snapToTerrain: 1 groupFeatures: 0 lineWidth: 0 filterOptions: + _selectedLayerName: filters: [] combinerType: 0 extrusionOptions: + _selectedLayerName: extrusionType: 0 extrusionGeometryType: 0 propertyName: @@ -1258,63 +1362,9 @@ MonoBehaviour: scaleDownWithWorld: 1 findByType: 0 categories: -1 - nameString: POI Name + nameString: coordinates: [] - density: 15 - _layerProperty: - _sourceType: 0 - sourceOptions: - isActive: 1 - layerSource: - Name: Mapbox Terrain - Id: mapbox.3d-buildings,mapbox.mapbox-streets-v7 - Modified: - UserName: - useOptimizedStyle: 0 - optimizedStyle: - Name: - Id: - Modified: - UserName: - performanceOptions: - isEnabled: 1 - entityPerCoroutine: 20 - vectorSubLayers: - - coreOptions: - isActive: 1 - sublayerName: Building - geometryType: 2 - layerName: building - snapToTerrain: 1 - groupFeatures: 0 - lineWidth: 1 - filterOptions: - filters: [] - combinerType: 0 - extrusionOptions: - extrusionType: 1 - extrusionGeometryType: 0 - propertyName: height - minimumHeight: 0 - maximumHeight: 0 - extrusionScaleFactor: 1 - colliderOptions: - colliderType: 0 - materialOptions: - texturingType: 3 - materials: - - Materials: - - {fileID: 2100000, guid: d4d7464e3429a44e090f55a4ac17f110, type: 2} - - Materials: - - {fileID: 2100000, guid: 55cc6edead802446b9106b2998406844, type: 2} - atlasInfo: {fileID: 11400000, guid: 414754d7155df47beb52ca117a774f21, type: 2} - colorPalette: {fileID: 11400000, guid: b01b6d453d33e40119c0f9472d50c45f, - type: 2} - honorBuildingIdSetting: 1 - buildingsWithUniqueIds: 1 - moveFeaturePositionTo: 0 - MeshModifiers: [] - GoModifiers: [] + density: 30 _tileProvider: {fileID: 0} --- !u!4 &967308907 Transform: diff --git a/sdkproject/Assets/StreamingAssets/build_info.txt.meta b/sdkproject/Assets/Mapbox/Examples/6_LocationPrefabs/Resources.meta similarity index 62% rename from sdkproject/Assets/StreamingAssets/build_info.txt.meta rename to sdkproject/Assets/Mapbox/Examples/6_LocationPrefabs/Resources.meta index 3f9f612c1..0f2148965 100644 --- a/sdkproject/Assets/StreamingAssets/build_info.txt.meta +++ b/sdkproject/Assets/Mapbox/Examples/6_LocationPrefabs/Resources.meta @@ -1,6 +1,7 @@ fileFormatVersion: 2 -guid: 1bb0ecaed5b8841b0bfb500b045609d7 -timeCreated: 1522712544 +guid: 1acaca7e3dc9643a0a02c1eba9606393 +folderAsset: yes +timeCreated: 1525896643 licenseType: Pro DefaultImporter: externalObjects: {} diff --git a/sdkproject/Assets/Mapbox/Examples/7_LocationProvider/LocationProvider.unity b/sdkproject/Assets/Mapbox/Examples/7_LocationProvider/LocationProvider.unity index 182a95f21..4ac3d1b89 100644 --- a/sdkproject/Assets/Mapbox/Examples/7_LocationProvider/LocationProvider.unity +++ b/sdkproject/Assets/Mapbox/Examples/7_LocationProvider/LocationProvider.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1} + m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641252, b: 0.574817, a: 1} --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -951,7 +951,31 @@ MonoBehaviour: wallMaterial: {fileID: 0} _vectorData: _layerProperty: - sourceType: 1 + tileJsonData: + tileJSONLoaded: 0 + LayerDisplayNames: + - landuse + - waterway + - aeroway + - barrier_line + - building + - landuse_overlay + - road + - admin + - country_label + - marine_label + - state_label + - place_label + - water_label + - airport_label + - rail_station_label + - mountain_peak_label + - poi_label + - motorway_junction + - road_label + - waterway_label + - housenum_label + _sourceType: 1 sourceOptions: isActive: 1 layerSource: @@ -969,6 +993,7 @@ MonoBehaviour: isEnabled: 1 entityPerCoroutine: 20 vectorSubLayers: [] + locationPrefabList: [] _tileProvider: {fileID: 0} --- !u!4 &1411663282 Transform: @@ -1001,7 +1026,7 @@ MonoBehaviour: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1411663280} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 96f0fa82f89d64bb9a6524c72d538179, type: 3} m_Name: diff --git a/sdkproject/Assets/Resources.meta b/sdkproject/Assets/Resources.meta index 3543acb15..bb25bb333 100644 --- a/sdkproject/Assets/Resources.meta +++ b/sdkproject/Assets/Resources.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 6c7f7345a2ce049d9b39d8ee2f388854 +guid: 5554fe114a053430487cf14c0f5cf21a folderAsset: yes -timeCreated: 1522933685 +timeCreated: 1525904254 licenseType: Pro DefaultImporter: externalObjects: {} diff --git a/sdkproject/ProjectSettings/ProjectVersion.txt b/sdkproject/ProjectSettings/ProjectVersion.txt index ac7d21464..27997c5a0 100644 --- a/sdkproject/ProjectSettings/ProjectVersion.txt +++ b/sdkproject/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2017.4.0f1 +m_EditorVersion: 2017.3.1f1