diff --git a/documentation/docs/05-changelog.md b/documentation/docs/05-changelog.md index 5e191fe5a..83e095c77 100644 --- a/documentation/docs/05-changelog.md +++ b/documentation/docs/05-changelog.md @@ -1,4 +1,23 @@ ## CHANGELOG + ### v.1.4.3 +*05/29/2018* +##### New Features +- Added a **Feature Replacement Modifer** that allows replacement of a vector feature at a given Latitude,Longitude with a supplied prefab. Enables replacing a procedurally generated building at a given Latitude,Longitude with a custom 3D model. +- Texturing Style dropdown now allows users to select from prepackaged texture styles or custom, which allows for user-defined texturing. +- Mesh and GameObject modifiers can now be created and added to AbstractMap via `Add New` buttons. +- Example scene `LocationProvider` can be used to log GPS traces. See documentation on how to copy logs from devices. +- GPS traces can be played back in the Editor with `EditorLocationProviderLocationLog`. +- `UserHeading` and `DeviceOrientation` values can be smoothed via different smoothing algorithms. +##### Improvements +- Improvements to UV mapping for side walls of extruded polygons when using atlas textures. Enables better handling of leftover areas when creating columns. +- DeviceLocationProvider should work on devices. Tested with iPhone 7/8/X, Google Pixel 2, Samsung S8, Samsung Galaxy Note 8, OnePlus 3 +##### Bug Fixes +- Fix issue with UvModifier which caused wrong roof uv positions calculations. +- Fix issue with data fetcher to handle failed connections properly, which caused IndexOutOfRangeException during tile loading/unloading. +- Fix issue with ambient file caching on Windows with .NET4.6 runtime and long file names. https://github.com/mapbox/mapbox-unity-sdk/pull/825 https://github.com/mapbox/mapbox-unity-sdk/issues/815 +##### Known Issues +- ARInterface related errors and crashes on Unity 2018.1.1f1 related to bug in Unity https://issuetracker.unity3d.com/issues/vuforia-gameobject-transforms-are-not-being-disabled-when-the-player-is-stopped + ### v.1.4.2 *05/14/2018* @@ -26,12 +45,12 @@ - Factories register to events in DataFetchers - `Layer Name` , `Extrusion Property Name` and `Filter Key` are now selectable dropdowns indicating the layers and properties available in the current `Data Source`. Layers and properties no longer require manual string entry. -#### Bug Fixes +##### Bug Fixes - Added checks to prevent NRE in `GeocodeAttributeSearchWindow` when searching with an invalid token or no connection. - Fix issue where side wall mesh generation did not work with elevated terrain. - Fix issue with scaling prefabs for POI's. Enables correct scaling of objects with map. -#### Known Issues +##### Known Issues - `Filters` with empty key or value parameters will exclude all features in a layer. - SDK will throw `[Physics.PhysX] cleaning the mesh failed` error if a MapFeature is used with the following options: {Primitive Type: `Line`, LayerName: `Road`, Collider Type: `Mesh Collider`} diff --git a/documentation/docs/access-gps-logs.md b/documentation/docs/access-gps-logs.md new file mode 100644 index 000000000..a358ccd3d --- /dev/null +++ b/documentation/docs/access-gps-logs.md @@ -0,0 +1,39 @@ +# Accessing GPS log files + +`LocationProvider` scene has the option to write location data into files. +Follow these steps download the logs from your device. + +## Android + +Log files can be accessed directly via Explorer after plugging in the device. + +**Note:** If files don't show up disconnect/connect your device. Sometimes even a reboot seems to be required as folders/files only get synced on first connection. + +**Alternative:** use a file manager (eg [Solid Explorer Classic](https://play.google.com/store/apps/details?id=pl.solidexplorer)) on your device and copy files to eg `/Download` that should trigger a refresh. + + +Location: + +``` +///Android/data//files/ +``` + +![log file location on Android](images/access-gps-logs/android-logfile-location.png) + +## iOS + +Open the exported project in `XCode` and add `Application supports iTunes file sharing : YES` key to `Info.plist` file: + +![edit info.plist](images/access-gps-logs/info.plist.png) + +Build to the device, run, log and connect device to your computer. + +Select the device in `iTunes`: + +![select device in itunes](images/access-gps-logs/itunes-select-device.png) + +1. Click on `File Sharing` +2. Select `Bundle Identifier` eg `MBX-SDK` from the `Apps` list +3. Access log files + +![get log files in itunes](images/access-gps-logs/itunes-file-sharing.png) diff --git a/documentation/docs/images/access-gps-logs/android-logfile-location.png b/documentation/docs/images/access-gps-logs/android-logfile-location.png new file mode 100644 index 000000000..aa015bae2 Binary files /dev/null and b/documentation/docs/images/access-gps-logs/android-logfile-location.png differ diff --git a/documentation/docs/images/access-gps-logs/info.plist.png b/documentation/docs/images/access-gps-logs/info.plist.png new file mode 100644 index 000000000..1badc49bb Binary files /dev/null and b/documentation/docs/images/access-gps-logs/info.plist.png differ diff --git a/documentation/docs/images/access-gps-logs/itunes-file-sharing.png b/documentation/docs/images/access-gps-logs/itunes-file-sharing.png new file mode 100644 index 000000000..2c71599de Binary files /dev/null and b/documentation/docs/images/access-gps-logs/itunes-file-sharing.png differ diff --git a/documentation/docs/images/access-gps-logs/itunes-select-device.png b/documentation/docs/images/access-gps-logs/itunes-select-device.png new file mode 100644 index 000000000..573b55279 Binary files /dev/null and b/documentation/docs/images/access-gps-logs/itunes-select-device.png differ diff --git a/documentation/docs/toc.yml b/documentation/docs/toc.yml index 9d8309381..720806d12 100644 --- a/documentation/docs/toc.yml +++ b/documentation/docs/toc.yml @@ -11,4 +11,7 @@ href: windowsstore-uwp-hololens.md - name: HoloLens Development - href: hololens-development.md + href: hololens-development.md + +- name: Access GPS logs + href: access-gps-logs.md diff --git a/sdkproject/Assets/GoogleARCore/SDK/Scripts/Editor/BuildHelper.cs b/sdkproject/Assets/GoogleARCore/SDK/Scripts/Editor/BuildHelper.cs index 6ec83a2cf..47c82f310 100644 --- a/sdkproject/Assets/GoogleARCore/SDK/Scripts/Editor/BuildHelper.cs +++ b/sdkproject/Assets/GoogleARCore/SDK/Scripts/Editor/BuildHelper.cs @@ -30,9 +30,13 @@ namespace GoogleARCoreInternal [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:ElementsMustBeDocumented", Justification = "Internal")] - public class BuildHelper : IPreprocessBuild - { - [SuppressMessage("UnityRules.UnityStyleRules", "US1000:FieldsMustBeUpperCamelCase", +#if UNITY_2018_1_OR_NEWER + public class BuildHelper : IPreprocessBuildWithReport +#else + public class BuildHelper : IPreprocessBuild +#endif + { + [SuppressMessage("UnityRules.UnityStyleRules", "US1000:FieldsMustBeUpperCamelCase", Justification = "Overriden property.")] public int callbackOrder { @@ -48,7 +52,7 @@ public void OnPreprocessBuild(BuildReport report) #else public void OnPreprocessBuild(BuildTarget target, string path) { -#endif +#endif var isARCoreRequired = ARCoreProjectSettings.Instance.IsARCoreRequired; Debug.LogFormat("Building application with {0} ARCore support.", diff --git a/sdkproject/Assets/Mapbox/Core/cheap-ruler-cs/CheapRuler.cs b/sdkproject/Assets/Mapbox/Core/cheap-ruler-cs/CheapRuler.cs index a91de32cc..9850c990f 100644 --- a/sdkproject/Assets/Mapbox/Core/cheap-ruler-cs/CheapRuler.cs +++ b/sdkproject/Assets/Mapbox/Core/cheap-ruler-cs/CheapRuler.cs @@ -35,28 +35,28 @@ public CheapRuler(double latitude, CheapRulerUnits outputUnits = CheapRulerUnits switch (outputUnits) { case CheapRulerUnits.Kilometers: - factor = 1; + factor = 1.0d; break; case CheapRulerUnits.Miles: - factor = 1000 / 1609.344; + factor = 1000.0d / 1609.344; break; case CheapRulerUnits.NauticalMiles: - factor = 1000 / 1852; + factor = 1000.0d / 1852.0d; break; case CheapRulerUnits.Meters: - factor = 1000; + factor = 1000.0d; break; case CheapRulerUnits.Yards: - factor = 1000 / 0.9144; + factor = 1000.0d / 0.9144; break; case CheapRulerUnits.Feet: - factor = 1000 / 0.3048; + factor = 1000.0d / 0.3048; break; case CheapRulerUnits.Inches: - factor = 1000 / 0.0254; + factor = 1000.0d / 0.0254; break; default: - factor = 1; + factor = 1.0d; break; } @@ -161,4 +161,4 @@ private double[] offset(double[] p, double dx, double dy) } -} \ No newline at end of file +} diff --git a/sdkproject/Assets/Mapbox/Core/cheap-ruler-cs/Tests/Editor/MapboxUnitTests_CheapRulerCs.cs b/sdkproject/Assets/Mapbox/Core/cheap-ruler-cs/Tests/Editor/MapboxUnitTests_CheapRulerCs.cs index 0df01ff76..36ef2e3ed 100644 --- a/sdkproject/Assets/Mapbox/Core/cheap-ruler-cs/Tests/Editor/MapboxUnitTests_CheapRulerCs.cs +++ b/sdkproject/Assets/Mapbox/Core/cheap-ruler-cs/Tests/Editor/MapboxUnitTests_CheapRulerCs.cs @@ -21,6 +21,11 @@ internal class CheapRulerCsTest { + // TODO more tests //////////////////// + // see https://github.com/mapbox/cheap-ruler/blob/master/test/test.js + ////////////////////////// + + internal class point { public double x; public double y; } internal class line { @@ -44,6 +49,8 @@ public void FixturesLoaded() Assert.AreEqual(58, _lineFixtures.Count); } + + [Test] public void DistanceInMiles() { @@ -53,10 +60,40 @@ public void DistanceInMiles() double distKm = ruler.Distance(new double[] { 30.5, 32.8351 }, new double[] { 30.51, 32.8451 }); double distMiles = rulerMiles.Distance(new double[] { 30.5, 32.8351 }, new double[] { 30.51, 32.8451 }); + Debug.LogFormat("{0} {1}", distKm, distMiles); Assert.AreEqual(1.609344, distKm / distMiles, 1e-12, "wrong distance in miles"); } + [Test] + public void DistanceInNauticalMiles() + { + CheapRuler ruler = new CheapRuler(32.8351); + CheapRuler rulerMiles = new CheapRuler(32.8351, CheapRulerUnits.Miles); + CheapRuler rulerNauticalMiles = new CheapRuler(32.8351, CheapRulerUnits.NauticalMiles); + + double distKm = ruler.Distance(new double[] { 30.5, 32.8351 }, new double[] { 30.51, 32.8451 }); + double distMiles = rulerMiles.Distance(new double[] { 30.5, 32.8351 }, new double[] { 30.51, 32.8451 }); + double distNauticalMiles = rulerNauticalMiles.Distance(new double[] { 30.5, 32.8351 }, new double[] { 30.51, 32.8451 }); + + Debug.LogFormat("{0} {1}", distKm, distNauticalMiles); + Assert.AreEqual(1.852, distKm / distNauticalMiles, 1e-12, "wrong distance km vs nautical miles"); + Assert.AreEqual(1.15078, distMiles / distNauticalMiles, 1e-6, "wrong distance miles vs nautical miles"); + } + + + [Test] + public void FromTile() + { + CheapRuler ruler1 = new CheapRuler(50.5); + CheapRuler ruler2 = CheapRuler.FromTile(11041, 15); + + var p1 = new double[] { 30.5, 50.5 }; + var p2 = new double[] { 30.51, 50.51 }; + + Assert.AreEqual(ruler1.Distance(p1, p2), ruler2.Distance(p1, p2), 3e-5, "CheapRuler.FromTile distance"); + } + private List loadFixtures() diff --git a/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/CachingWebFileSource.cs b/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/CachingWebFileSource.cs index 8a3c26a8c..173f1aa99 100644 --- a/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/CachingWebFileSource.cs +++ b/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/CachingWebFileSource.cs @@ -100,6 +100,14 @@ public void Clear() } + public void ReInit() { + foreach (var cache in _caches) + { + cache.ReInit(); + } + } + + public IAsyncRequest Request( string uri , Action callback diff --git a/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/ICache.cs b/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/ICache.cs index 7a69903ba..dc7b3a6a7 100644 --- a/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/ICache.cs +++ b/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/ICache.cs @@ -14,6 +14,7 @@ public interface ICache /// uint MaxCacheSize { get; } + /// /// Add tile data to the cache /// @@ -42,5 +43,11 @@ public interface ICache /// /// void Clear(string mapId); + + + /// + /// Reinitialize cache. Might be needed after 'Clear', eg for SQLiteCache + /// + void ReInit(); } -} \ No newline at end of file +} diff --git a/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/MbTilesCache.cs b/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/MbTilesCache.cs deleted file mode 100644 index b018acad5..000000000 --- a/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/MbTilesCache.cs +++ /dev/null @@ -1,195 +0,0 @@ -namespace Mapbox.Platform.Cache -{ - - - using Mapbox.Map; - using Mapbox.Platform.MbTiles; - using System; - using System.Collections.Generic; - using System.Linq; - - - public class MbTilesCache : ICache, IDisposable - { - - public MbTilesCache(uint maxCacheSize) - { -#if MAPBOX_DEBUG_CACHE - _className = this.GetType().Name; -#endif - _maxCacheSize = maxCacheSize; - _mbTiles = new Dictionary(); - } - - -#region IDisposable - - - ~MbTilesCache() - { - Dispose(false); - } - - public void Dispose() - { - Dispose(true); - GC.SuppressFinalize(this); - } - - protected virtual void Dispose(bool disposeManagedResources) - { - if (!_disposed) - { - if (disposeManagedResources) - { - foreach (var mbtCache in _mbTiles) - { - MbTilesDb mbt = mbtCache.Value; - mbt.Dispose(); - mbt = null; - } - _mbTiles.Clear(); - } - _disposed = true; - } - } - - -#endregion - - -#if MAPBOX_DEBUG_CACHE - private string _className; -#endif - private bool _disposed; - private uint _maxCacheSize; - private object _lock = new object(); - private Dictionary _mbTiles; - - - public uint MaxCacheSize - { - get { return _maxCacheSize; } - } - - - public void Add(string mapId, CanonicalTileId tileId, CacheItem item, bool forceInsert) - { - - mapId = cleanMapId(mapId); - -#if MAPBOX_DEBUG_CACHE - string methodName = _className + "." + new System.Diagnostics.StackFrame().GetMethod().Name; - UnityEngine.Debug.LogFormat("{0} {1} {2} forceInsert:{3}", methodName, mapId, tileId, forceInsert); -#endif - - lock (_lock) - { - if (!_mbTiles.ContainsKey(mapId)) - { - initializeMbTiles(mapId); - } - } - - MbTilesDb currentMbTiles = _mbTiles[mapId]; - - if (!currentMbTiles.TileExists(tileId) || forceInsert) - { - _mbTiles[mapId].AddTile(tileId, item, forceInsert); - } - } - - - private void initializeMbTiles(string mapId) - { - if (string.IsNullOrEmpty(mapId)) - { - throw new Exception("Cannot intialize MbTilesCache without a map id"); - } - - mapId = cleanMapId(mapId); - - MbTilesDb mbt = new MbTilesDb(mapId + ".cache", _maxCacheSize); - MetaDataRequired md = new MetaDataRequired() - { - TilesetName = mapId, - Description = "TODO: " + mapId, - Format = "TODO: " + mapId, - Type = "TODO: " + mapId, - Version = 1 - }; - mbt.CreateMetaData(md); - - _mbTiles[mapId] = mbt; - } - - - - public CacheItem Get(string mapId, CanonicalTileId tileId) - { - mapId = cleanMapId(mapId); - -#if MAPBOX_DEBUG_CACHE - string methodName = _className + "." + new System.Diagnostics.StackFrame().GetMethod().Name; - UnityEngine.Debug.LogFormat("{0} {1} {2}", methodName, mapId, tileId); -#endif - - lock (_lock) - { - if (!_mbTiles.ContainsKey(mapId)) - { -#if MAPBOX_DEBUG_CACHE - UnityEngine.Debug.LogFormat("initializing MbTiles {0}", mapId); -#endif - initializeMbTiles(mapId); - } - } - - CacheItem item = _mbTiles[mapId].GetTile(tileId); - if (null == item) - { - return null; - } - - return item; - } - - - public void Clear() - { - string[] toDelete = _mbTiles.Keys.ToArray(); - foreach (var mapId in toDelete) - { - Clear(mapId); - } - } - - - public void Clear(string mapId) - { - mapId = cleanMapId(mapId); - lock (_lock) - { - if (!_mbTiles.ContainsKey(mapId)) { return; } - - _mbTiles[mapId].Delete(); - _mbTiles[mapId].Dispose(); - _mbTiles[mapId] = null; - _mbTiles.Remove(mapId); - } - } - - - /// - /// Map ID (tile set name) could be somehting like 'mapbox://styles/mapbox/dark-v9.cache'. - /// This doesn't work as a file name - /// - /// Map ID, tile set name - /// - private string cleanMapId(string mapId) - { - return mapId.Substring(mapId.LastIndexOf('/') + 1); - } - - } -} diff --git a/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/MemoryCache.cs b/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/MemoryCache.cs index 7332e86d0..b7af4c156 100644 --- a/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/MemoryCache.cs +++ b/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/MemoryCache.cs @@ -37,6 +37,12 @@ public uint MaxCacheSize } + public void ReInit() + { + _cachedResponses = new Dictionary(); + } + + public void Add(string mapdId, CanonicalTileId tileId, CacheItem item, bool forceInsert) { string key = mapdId + "||" + tileId; diff --git a/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/MbTiles.meta b/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/SQLiteCache.meta similarity index 100% rename from sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/MbTiles.meta rename to sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/SQLiteCache.meta diff --git a/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/SQLiteCache/SQLiteCache.cs b/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/SQLiteCache/SQLiteCache.cs new file mode 100644 index 000000000..69b5c3e34 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/SQLiteCache/SQLiteCache.cs @@ -0,0 +1,495 @@ +namespace Mapbox.Platform.Cache +{ + + using Mapbox.Map; + using Mapbox.Utils; + using SQLite4Unity3d; + using System; + using System.Collections.Generic; + using System.IO; + using System.Linq; + using UnityEngine; + + public class SQLiteCache : ICache, IDisposable + { + + + /// + /// maximum number tiles that get cached + /// + public uint MaxCacheSize { get { return _maxTileCount; } } + + + /// + /// Check cache size every n inserts + /// + public uint PruneCacheDelta { get { return _pruneCacheDelta; } } + + +#if MAPBOX_DEBUG_CACHE + private string _className; +#endif + private bool _disposed; + private string _dbName; + private string _dbPath; + private SQLiteConnection _sqlite; + private readonly uint _maxTileCount; + /// check cache size only every '_pruneCacheDelta' calls to 'Add()' to avoid being too chatty with the database + private const int _pruneCacheDelta = 20; + /// counter to keep track of calls to `Add()` + private int _pruneCacheCounter = 0; + private object _lock = new object(); + + + public SQLiteCache(uint? maxTileCount = null, string dbName = "cache.db") + { + _maxTileCount = maxTileCount ?? 3000; + _dbName = dbName; + init(); + } + + + #region idisposable + + + ~SQLiteCache() + { + Dispose(false); + } + + public void Dispose() + { + Dispose(true); + GC.SuppressFinalize(this); + } + + protected virtual void Dispose(bool disposeManagedResources) + { + if (!_disposed) + { + if (disposeManagedResources) + { + if (null != _sqlite) + { + _sqlite.Execute("VACUUM;"); // compact db to keep file size small + _sqlite.Close(); + _sqlite.Dispose(); + _sqlite = null; + } + } + _disposed = true; + } + } + + + #endregion + + + private void init() + { + +#if MAPBOX_DEBUG_CACHE + _className = this.GetType().Name; +#endif + openOrCreateDb(_dbName); + + //hrmpf: multiple PKs not supported by sqlite.net + //https://github.com/praeclarum/sqlite-net/issues/282 + //do it via plain SQL + + List colInfoTileset = _sqlite.GetTableInfo(typeof(tilesets).Name); + if (0 == colInfoTileset.Count) + { + string cmdCreateTableTilesets = @"CREATE TABLE tilesets( +id INTEGER PRIMARY KEY ASC AUTOINCREMENT NOT NULL UNIQUE, +name STRING NOT NULL +);"; + _sqlite.Execute(cmdCreateTableTilesets); + string cmdCreateIdxNames = @"CREATE UNIQUE INDEX idx_names ON tilesets (name ASC);"; + _sqlite.Execute(cmdCreateIdxNames); + } + + List colInfoTiles = _sqlite.GetTableInfo(typeof(tiles).Name); + if (0 == colInfoTiles.Count) + { + //sqlite does not support multiple PK columns, create table manually + //_sqlite.CreateTable(); + + string cmdCreateTableTiles = @"CREATE TABLE tiles( +tile_set INTEGER REFERENCES tilesets (id) ON DELETE CASCADE ON UPDATE CASCADE, +zoom_level INTEGER NOT NULL, +tile_column BIGINT NOT NULL, +tile_row BIGINT NOT NULL, +tile_data BLOB NOT NULL, +timestamp INTEGER NOT NULL, +etag TEXT, +lastmodified INTEGER, + PRIMARY KEY( + tile_set ASC, + zoom_level ASC, + tile_column ASC, + tile_row ASC + ) +);"; + _sqlite.Execute(cmdCreateTableTiles); + + string cmdIdxTileset = "CREATE INDEX idx_tileset ON tiles (tile_set ASC);"; + _sqlite.Execute(cmdIdxTileset); + string cmdIdxTimestamp = "CREATE INDEX idx_timestamp ON tiles (timestamp ASC);"; + _sqlite.Execute(cmdIdxTimestamp); + } + + + // some pragmas to speed things up a bit :-) + // inserting 1,000 tiles takes 1-2 sec as opposed to ~20 sec + string[] cmds = new string[] + { + "PRAGMA synchronous=OFF", + "PRAGMA count_changes=OFF", + "PRAGMA journal_mode=MEMORY", + "PRAGMA temp_store=MEMORY" + }; + foreach (var cmd in cmds) + { + try + { + _sqlite.Execute(cmd); + } + catch (SQLiteException ex) + { + // workaround for sqlite.net's exeception: + // https://stackoverflow.com/a/23839503 + if (ex.Result != SQLite3.Result.Row) + { + UnityEngine.Debug.LogErrorFormat("{0}: {1}", cmd, ex); + // TODO: when mapbox-sdk-cs gets backported to its own repo -> throw + //throw; // to throw or not to throw??? + } + } + } + } + + + private void openOrCreateDb(string dbName) + { + _dbPath = GetFullDbPath(dbName); + _sqlite = new SQLiteConnection(_dbPath, SQLiteOpenFlags.ReadWrite | SQLiteOpenFlags.Create); + //Debug.LogFormat("SQLiteCache path ----> {0}", _dbPath); + } + + + /// + /// Reinitialize cache. + /// This is needed after 'Clear()' to recreate the cache database. + /// And has been implemented on purpose to not hold on to any references to the cache directory after 'Clear()' + /// + public void ReInit() + { + if (null != _sqlite) + { + _sqlite.Dispose(); + _sqlite = null; + } + + init(); + } + + + public static string GetFullDbPath(string dbName) + { + string dbPath = Path.Combine(Application.persistentDataPath, "cache"); +#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_WSA + dbPath = Path.GetFullPath(dbPath); +#endif + if (!Directory.Exists(dbPath)) { Directory.CreateDirectory(dbPath); } + dbPath = Path.Combine(dbPath, dbName); + + return dbPath; + } + + + + public void Add(string tilesetName, CanonicalTileId tileId, CacheItem item, bool forceInsert = false) + { + +#if MAPBOX_DEBUG_CACHE + string methodName = _className + "." + new System.Diagnostics.StackFrame().GetMethod().Name; + UnityEngine.Debug.LogFormat("{0} {1} {2} forceInsert:{3}", methodName, tileset, tileId, forceInsert); +#endif + try + { + // tile exists and we don't want to overwrite -> exit early + if ( + TileExists(tilesetName, tileId) + && !forceInsert + ) + { + return; + } + + int? tilesetId = null; + lock (_lock) + { + tilesetId = getTilesetId(tilesetName); + if (!tilesetId.HasValue) + { + tilesetId = insertTileset(tilesetName); + } + } + + if (tilesetId < 0) + { + Debug.LogErrorFormat("could not get tilesetID for [{0}] tile: {1}", tilesetName, tileId); + return; + } + + //_sqlite.BeginTransaction(); + int rowsAffected = _sqlite.InsertOrReplace(new tiles + { + tile_set = tilesetId.Value, + zoom_level = tileId.Z, + tile_column = tileId.X, + tile_row = tileId.Y, + tile_data = item.Data, + timestamp = (int)UnixTimestampUtils.To(DateTime.Now), + etag = item.ETag + }); + if (1 != rowsAffected) + { + throw new Exception(string.Format("tile [{0} / {1}] was not inserted, rows affected:{2}", tilesetName, tileId, rowsAffected)); + } + } + catch (Exception ex) + { + Debug.LogErrorFormat("Error inserting {0} {1} {2} ", tilesetName, tileId, ex); + } + finally + { + //_sqlite.Commit(); + } + + // update counter only when new tile gets inserted + if (!forceInsert) + { + _pruneCacheCounter++; + } + if (0 == _pruneCacheCounter % _pruneCacheDelta) + { + _pruneCacheCounter = 0; + prune(); + } + } + + + private void prune() + { + + long tileCnt = _sqlite.ExecuteScalar("SELECT COUNT(zoom_level) FROM tiles"); + + if (tileCnt < _maxTileCount) { return; } + + long toDelete = tileCnt - _maxTileCount; + +#if MAPBOX_DEBUG_CACHE + string methodName = _className + "." + new System.Diagnostics.StackFrame().GetMethod().Name; + Debug.LogFormat("{0} {1} about to prune()", methodName, _tileset); +#endif + + try + { + // no 'ORDER BY' or 'LIMIT' possible if sqlite hasn't been compiled with 'SQLITE_ENABLE_UPDATE_DELETE_LIMIT' + // https://sqlite.org/compile.html#enable_update_delete_limit + // int rowsAffected = _sqlite.Execute("DELETE FROM tiles ORDER BY timestamp ASC LIMIT ?", toDelete); + _sqlite.Execute("DELETE FROM tiles WHERE rowid IN ( SELECT rowid FROM tiles ORDER BY timestamp ASC LIMIT ? );", toDelete); + } + catch (Exception ex) + { + Debug.LogErrorFormat("error pruning: {0}", ex); + } + } + + + /// + /// Returns the tile data, otherwise null + /// + /// Canonical tile id to identify the tile + /// tile data as byte[], if tile is not cached returns null + public CacheItem Get(string tilesetName, CanonicalTileId tileId) + { +#if MAPBOX_DEBUG_CACHE + string methodName = _className + "." + new System.Diagnostics.StackFrame().GetMethod().Name; + Debug.LogFormat("{0} {1} {2}", methodName, _tileset, tileId); +#endif + tiles tile = null; + + try + { + int? tilesetId = getTilesetId(tilesetName); + if (!tilesetId.HasValue) + { + return null; + } + + tile = _sqlite + .Table() + .Where(t => + t.tile_set == tilesetId.Value + && t.zoom_level == tileId.Z + && t.tile_column == tileId.X + && t.tile_row == tileId.Y + ) + .FirstOrDefault(); + } + catch (Exception ex) + { + Debug.LogErrorFormat("error getting tile {1} {2} from cache{0}{3}", Environment.NewLine, tilesetName, tileId, ex); + return null; + } + if (null == tile) + { + return null; + } + + DateTime? lastModified = null; + if (tile.lastmodified.HasValue) { lastModified = UnixTimestampUtils.From((double)tile.lastmodified.Value); } + + return new CacheItem() + { + Data = tile.tile_data, + AddedToCacheTicksUtc = tile.timestamp, + ETag = tile.etag, + LastModified = lastModified + }; + } + + + /// + /// Check if tile exists + /// + /// Canonical tile id + /// True if tile exists + public bool TileExists(string tilesetName, CanonicalTileId tileId) + { + int? tilesetId = getTilesetId(tilesetName); + if (!tilesetId.HasValue) + { + return false; + } + + return null != _sqlite + .Table() + .Where(t => + t.tile_set == tilesetId.Value + && t.zoom_level == tileId.Z + && t.tile_column == tileId.X + && t.tile_row == tileId.Y + ) + .FirstOrDefault(); + } + + + private int insertTileset(string tilesetName) + { + try + { + _sqlite.BeginTransaction(true); + //return _sqlite.Insert(new tilesets { name = tilesetName }); + tilesets newTileset = new tilesets { name = tilesetName }; + int rowsAffected = _sqlite.Insert(newTileset); + if (1 != rowsAffected) + { + throw new Exception(string.Format("tileset [{0}] was not inserted, rows affected:{1}", tilesetName, rowsAffected)); + } + return newTileset.id; + } + catch (Exception ex) + { + Debug.LogErrorFormat("could not insert tileset [{0}]: {1}", tilesetName, ex); + return -1; + } + finally + { + _sqlite.Commit(); + } + } + + + private int? getTilesetId(string tilesetName) + { + tilesets tileset = _sqlite + .Table() + .Where(ts => ts.name.Equals(tilesetName)) + .FirstOrDefault(); + return null == tileset ? (int?)null : tileset.id; + } + + + /// + /// FOR INTERNAL DEBUGGING ONLY - DON'T RELY ON IN PRODUCTION + /// + /// + /// + public long TileCount(string tilesetName) + { + int? tilesetId = getTilesetId(tilesetName); + if (!tilesetId.HasValue) { return 0; } + + return _sqlite + .Table() + .Where(t => t.tile_set == tilesetId.Value) + .LongCount(); + } + + + /// + /// Clear cache for one tile set + /// + /// + public void Clear(string tilesetName) + { + int? tilesetId = getTilesetId(tilesetName); + if (!tilesetId.HasValue) { return; } + //just delete on table 'tilesets', we've setup cascading which should take care of tabls 'tiles' + _sqlite.Delete(tilesetId.Value); + } + + + /// + /// Delete the database file. + /// Call 'ReInit()' if you intend to continue using the cache after 'Clear()! + /// + public void Clear() + { + //already disposed + if (null == _sqlite) { return; } + + _sqlite.Close(); + _sqlite.Dispose(); + _sqlite = null; + + Debug.LogFormat("deleting {0}", _dbPath); + + // try several times in case SQLite needs a bit more time to dispose + for (int i = 0; i < 5; i++) + { + try + { + File.Delete(_dbPath); + return; + } + catch + { +#if !WINDOWS_UWP + System.Threading.Thread.Sleep(100); +#else + System.Threading.Tasks.Task.Delay(100).Wait(); +#endif + } + } + + // if we got till here, throw on last try + File.Delete(_dbPath); + } + + } +} diff --git a/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/MbTiles/MbTiles.cs.meta b/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/SQLiteCache/SQLiteCache.cs.meta similarity index 100% rename from sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/MbTiles/MbTiles.cs.meta rename to sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/SQLiteCache/SQLiteCache.cs.meta diff --git a/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/MbTiles/Tiles.cs b/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/SQLiteCache/Tiles.cs similarity index 89% rename from sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/MbTiles/Tiles.cs rename to sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/SQLiteCache/Tiles.cs index 2b7edb878..18629526b 100644 --- a/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/MbTiles/Tiles.cs +++ b/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/SQLiteCache/Tiles.cs @@ -3,16 +3,17 @@ using UnityEngine; using SQLite4Unity3d; -namespace Mapbox.Platform.MbTiles +namespace Mapbox.Platform.Cache { /// - /// https://github.com/mapbox/mbtiles-spec/blob/master/1.1/spec.md#tiles /// Don't change the class name: sqlite-net uses it for table creation /// public class tiles { + public int tile_set { get; set; } + //hrmpf: multiple PKs not supported by sqlite.net //https://github.com/praeclarum/sqlite-net/issues/282 //TODO: do it via plain SQL @@ -36,4 +37,4 @@ public class tiles /// Last-Modified header value of API response. Not all APIs populate it, will be -1 in that case. public int? lastmodified { get; set; } } -} \ No newline at end of file +} diff --git a/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/MbTiles/Tiles.cs.meta b/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/SQLiteCache/Tiles.cs.meta similarity index 100% rename from sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/MbTiles/Tiles.cs.meta rename to sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/SQLiteCache/Tiles.cs.meta diff --git a/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/SQLiteCache/Tilesets.cs b/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/SQLiteCache/Tilesets.cs new file mode 100644 index 000000000..ebd47aa28 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/SQLiteCache/Tilesets.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using SQLite4Unity3d; + +namespace Mapbox.Platform.Cache +{ + + /// + /// Don't change the class name: sqlite-net uses it for table creation + /// + public class tilesets + { + + //hrmpf: multiple PKs not supported by sqlite.net + //https://github.com/praeclarum/sqlite-net/issues/282 + //TODO: do it via plain SQL + [PrimaryKey, AutoIncrement] + public int id { get; set; } + + public string name { get; set; } + } +} diff --git a/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/MbTiles/MetaData.cs.meta b/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/SQLiteCache/Tilesets.cs.meta similarity index 70% rename from sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/MbTiles/MetaData.cs.meta rename to sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/SQLiteCache/Tilesets.cs.meta index 89b5fe0a3..6ee5789f7 100644 --- a/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/MbTiles/MetaData.cs.meta +++ b/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/SQLiteCache/Tilesets.cs.meta @@ -1,8 +1,9 @@ fileFormatVersion: 2 -guid: e6dbdeb6a6a974aad9f358b03a1a4e13 -timeCreated: 1497883479 +guid: bb0cc61c516c1984f8ab3ac0ce3c3e64 +timeCreated: 1527515199 licenseType: Pro MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/MbTiles/MbTiles.cs b/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/MbTiles/MbTiles.cs deleted file mode 100644 index 28e3b7a40..000000000 --- a/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/MbTiles/MbTiles.cs +++ /dev/null @@ -1,351 +0,0 @@ -namespace Mapbox.Platform.MbTiles -{ - - using Mapbox.Map; - using Mapbox.Platform.Cache; - using Mapbox.Utils; - using SQLite4Unity3d; - using System; - using System.Collections.Generic; - using System.IO; - using System.Linq; - using UnityEngine; - - public class MbTilesDb : IDisposable - { - - -#if MAPBOX_DEBUG_CACHE - private string _className; -#endif - private string _tileset; - private bool _disposed; - private string _dbPath; - private SQLiteConnection _sqlite; - private uint? _maxTileCount; - /// check cache size only every '_pruneCacheDelta' calls to 'Add()' to avoid being too chatty with the database - private const int _pruneCacheDelta = 20; - /// counter to keep track of calls to `Add()` - private int _pruneCacheCounter = 0; - - - public MbTilesDb(string tileset, uint? maxTileCount = null) - { -#if MAPBOX_DEBUG_CACHE - _className = this.GetType().Name; -#endif - _tileset = tileset; - openOrCreateDb(_tileset); - _maxTileCount = maxTileCount; - - //hrmpf: multiple PKs not supported by sqlite.net - //https://github.com/praeclarum/sqlite-net/issues/282 - //TODO: do it via plain SQL - - List colInfo = _sqlite.GetTableInfo(typeof(tiles).Name); - if (0 == colInfo.Count) - { - //sqlite does not support multiple PK columns, create table manually - //_sqlite.CreateTable(); - - string cmdCreateTTbliles = @"CREATE TABLE tiles( -zoom_level INTEGER NOT NULL, -tile_column BIGINT NOT NULL, -tile_row BIGINT NOT NULL, -tile_data BLOB NOT NULL, -timestamp INTEGER NOT NULL, -etag TEXT, -lastmodified INTEGER, - PRIMARY KEY( - zoom_level ASC, - tile_column ASC, - tile_row ASC - ) -);"; - _sqlite.Execute(cmdCreateTTbliles); - - string cmdIdxTimestamp = "CREATE INDEX idx_timestamp ON tiles (timestamp ASC);"; - _sqlite.Execute(cmdIdxTimestamp); - } - - // auto migrate old caches - if ( - 0 != colInfo.Count - && null == colInfo.FirstOrDefault(ci => ci.Name.Equals("etag")) - ) - { - string sql = "ALTER TABLE tiles ADD COLUMN etag text;"; - _sqlite.Execute(sql); - sql = "ALTER TABLE tiles ADD COLUMN lastmodified INTEGER;"; - _sqlite.Execute(sql); - } - - //some pragmas to speed things up a bit :-) - string[] cmds = new string[] - { - "PRAGMA synchronous=OFF", - "PRAGMA count_changes=OFF", - "PRAGMA journal_mode=MEMORY", - "PRAGMA temp_store=MEMORY" - }; - foreach (var cmd in cmds) - { - try - { - _sqlite.Execute(cmd); - } - catch (SQLiteException ex) - { - // workaround for sqlite.net's exeception: - // https://stackoverflow.com/a/23839503 - if (ex.Result != SQLite3.Result.Row) - { - UnityEngine.Debug.LogErrorFormat("{0}: {1}", cmd, ex); - // TODO: when mapbox-sdk-cs gets backported to its own repo -> throw - //throw; // to throw or not to throw??? - } - } - } - } - - -#region idisposable - - - ~MbTilesDb() - { - Dispose(false); - } - - public void Dispose() - { - Dispose(true); - GC.SuppressFinalize(this); - } - - protected virtual void Dispose(bool disposeManagedResources) - { - if (!_disposed) - { - if (disposeManagedResources) - { - if (null != _sqlite) - { - _sqlite.Execute("VACUUM;"); // compact db to keep file size small - _sqlite.Dispose(); - _sqlite = null; - } - } - _disposed = true; - } - } - - -#endregion - - - private void openOrCreateDb(string dbName) - { - _dbPath = Path.Combine(Application.persistentDataPath, "cache"); -#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_WSA - // 1. workaround the 260 character MAX_PATH path and file name limit by prepeding `\\?\` - // see https://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx#maxpath - // 2. use `GetFullPath` on that to sanitize the path: replaces `/` returned by `Application.persistentDataPath` with `\` - _dbPath = Path.GetFullPath(@"\\?\" + _dbPath); -#endif - if (!Directory.Exists(_dbPath)) { Directory.CreateDirectory(_dbPath); } - _dbPath = Path.Combine(_dbPath, dbName); - _sqlite = new SQLiteConnection(_dbPath, SQLiteOpenFlags.ReadWrite | SQLiteOpenFlags.Create); - //Debug.LogFormat("MBTiles path ----> {0}", _dbPath); - } - - - - - public System.Collections.ObjectModel.ReadOnlyCollection> MetaData() - { - TableQuery tq = _sqlite.Table(); - if (null == tq) { return null; } - return tq.Select(r => new KeyValuePair(r.name, r.value)).ToList().AsReadOnly(); - } - - - public void CreateMetaData(MetaDataRequired md) - { - List colInfo = _sqlite.GetTableInfo(typeof(metadata).Name); - if (0 != colInfo.Count) { return; } - - //UnityEngine.Debug.LogFormat("creating table '{0}'", typeof(metadata).Name); - _sqlite.CreateTable(); - _sqlite.InsertAll(new[] - { - new metadata{ name="name", value=md.TilesetName}, - new metadata{name="type", value=md.Type}, - new metadata{name="version", value=md.Version.ToString()}, - new metadata{name="description", value=md.Description}, - new metadata{name="format", value=md.Format} - }); - } - - - public void AddTile(CanonicalTileId tileId, CacheItem item, bool update = false) - { - -#if MAPBOX_DEBUG_CACHE - string methodName = _className + "." + new System.Diagnostics.StackFrame().GetMethod().Name; - UnityEngine.Debug.LogFormat("{0} {1} {2} update:{3}", methodName, _tileset, tileId, update); -#endif - try - { - _sqlite.InsertOrReplace(new tiles - { - zoom_level = tileId.Z, - tile_column = tileId.X, - tile_row = tileId.Y, - tile_data = item.Data, - timestamp = (int)UnixTimestampUtils.To(DateTime.Now), - etag = item.ETag - }); - } - catch (Exception ex) - { - Debug.LogErrorFormat("Error inserting {0} {1} {2} ", _tileset, tileId, ex); - } - - // update counter only when new tile gets inserted - if (!update) - { - _pruneCacheCounter++; - } - if (0 == _pruneCacheCounter % _pruneCacheDelta) - { - _pruneCacheCounter = 0; - prune(); - } - } - - - private void prune() - { - if (!_maxTileCount.HasValue) { return; } - - long tileCnt = _sqlite.ExecuteScalar("SELECT COUNT(zoom_level) FROM tiles"); - - if (tileCnt < _maxTileCount.Value) { return; } - - long toDelete = tileCnt - _maxTileCount.Value; - -#if MAPBOX_DEBUG_CACHE - string methodName = _className + "." + new System.Diagnostics.StackFrame().GetMethod().Name; - Debug.LogFormat("{0} {1} about to prune()", methodName, _tileset); -#endif - - try - { - // no 'ORDER BY' or 'LIMIT' possible if sqlite hasn't been compiled with 'SQLITE_ENABLE_UPDATE_DELETE_LIMIT' - // https://sqlite.org/compile.html#enable_update_delete_limit - // int rowsAffected = _sqlite.Execute("DELETE FROM tiles ORDER BY timestamp ASC LIMIT ?", toDelete); - _sqlite.Execute("DELETE FROM tiles WHERE rowid IN ( SELECT rowid FROM tiles ORDER BY timestamp ASC LIMIT ? );", toDelete); - } - catch (Exception ex) - { - Debug.LogErrorFormat("error pruning: {0}", ex); - } - } - - - /// - /// Returns the tile data, otherwise null - /// - /// Canonical tile id to identify the tile - /// tile data as byte[], if tile is not cached returns null - public CacheItem GetTile(CanonicalTileId tileId) - { -#if MAPBOX_DEBUG_CACHE - string methodName = _className + "." + new System.Diagnostics.StackFrame().GetMethod().Name; - Debug.LogFormat("{0} {1} {2}", methodName, _tileset, tileId); -#endif - tiles tile = null; - - try - { - tile = _sqlite - .Table() - .Where(t => t.zoom_level == tileId.Z && t.tile_column == tileId.X && t.tile_row == tileId.Y) - .FirstOrDefault(); - } - catch (Exception ex) - { - Debug.LogErrorFormat("error getting tile {1} {2} from cache{0}{3}", Environment.NewLine, _tileset, tileId, ex); - return null; - } - if (null == tile) - { - return null; - } - - DateTime? lastModified = null; - if (tile.lastmodified.HasValue) { lastModified = UnixTimestampUtils.From((double)tile.lastmodified.Value); } - - return new CacheItem() - { - Data = tile.tile_data, - AddedToCacheTicksUtc = tile.timestamp, - ETag = tile.etag, - LastModified = lastModified - }; - } - - - /// - /// Check if tile exists - /// - /// Canonical tile id - /// True if tile exists - public bool TileExists(CanonicalTileId tileId) - { - return null != _sqlite - .Table() - .Where(t => t.zoom_level == tileId.Z && t.tile_column == tileId.X && t.tile_row == tileId.Y) - .FirstOrDefault(); - } - - - /// - /// Delete the database file - /// - public void Delete() - { - //already disposed - if (null == _sqlite) { return; } - - _sqlite.Close(); - _sqlite.Dispose(); - _sqlite = null; - - UnityEngine.Debug.LogFormat("deleting {0}", _dbPath); - - // try several times in case SQLite needs a bit more time to dispose - for (int i = 0; i < 5; i++) - { - try - { - File.Delete(_dbPath); - return; - } - catch - { -#if !WINDOWS_UWP - System.Threading.Thread.Sleep(100); -#else - System.Threading.Tasks.Task.Delay(100).Wait(); -#endif - } - } - - // if we got till here, throw on last try - File.Delete(_dbPath); - } - - } -} diff --git a/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/MbTiles/MetaData.cs b/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/MbTiles/MetaData.cs deleted file mode 100644 index 9436023d7..000000000 --- a/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/MbTiles/MetaData.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - - -namespace Mapbox.Platform.MbTiles -{ - - /// - /// https://github.com/mapbox/mbtiles-spec/blob/master/1.1/spec.md#metadata - /// Don't change the class name: sqlite-net uses it for table creation - /// - public class metadata - { - - public string name { get; set; } - - public string value { get; set; } - } - -} \ No newline at end of file diff --git a/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/MbTiles/MetaDataRequired.cs b/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/MbTiles/MetaDataRequired.cs deleted file mode 100644 index b0f3eb6f8..000000000 --- a/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/MbTiles/MetaDataRequired.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Mapbox.Platform.MbTiles -{ - - /// - /// https://github.com/mapbox/mbtiles-spec/blob/master/1.1/spec.md#content - /// - public class MetaDataRequired - { - - public string TilesetName { get; set; } - /// overlay or baselayer - public string Type { get; set; } - - public int Version { get; set; } - - public string Description { get; set; } - - public string Format { get; set; } - - - - } -} diff --git a/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/SQLite/SQLite.cs b/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/SQLite/SQLite.cs index 17f604482..b28b443c4 100644 --- a/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/SQLite/SQLite.cs +++ b/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/SQLite/SQLite.cs @@ -885,7 +885,7 @@ public bool IsInTransaction /// Begins a new transaction. Call to end the transaction. /// /// Throws if a transaction has already begun. - public void BeginTransaction() + public void BeginTransaction(bool exclusive = false) { // The BEGIN command only works if the transaction stack is empty, // or in other words if there are no pending transactions. @@ -897,7 +897,14 @@ public void BeginTransaction() { try { - Execute("begin transaction"); + if (exclusive) + { + Execute("BEGIN EXCLUSIVE TRANSACTION;"); + } + else + { + Execute("begin transaction"); + } } catch (Exception ex) { @@ -1310,7 +1317,7 @@ public int Insert(object obj, string extra, Type objType) var map = GetMapping(objType); #if NETFX_CORE - if (map.PK != null && map.PK.IsAutoGuid) + if (map.PK != null && map.PK.IsAutoInc) { // no GetProperty so search our way up the inheritance chain till we find it PropertyInfo prop; @@ -1331,7 +1338,7 @@ public int Insert(object obj, string extra, Type objType) } } #else - if (map.PK != null && map.PK.IsAutoGuid) + if (map.PK != null && map.PK.IsAutoInc) { var prop = objType.GetProperty(map.PK.PropertyName); if (prop != null) @@ -1933,7 +1940,7 @@ public Column(PropertyInfo prop, CreateFlags createFlags = CreateFlags.None) var isAuto = Orm.IsAutoInc(prop) || (IsPK && ((createFlags & CreateFlags.AutoIncPK) == CreateFlags.AutoIncPK)); IsAutoGuid = isAuto && ColumnType == typeof(Guid); - IsAutoInc = isAuto && !IsAutoGuid; + IsAutoInc = isAuto && !IsAutoGuid || isAuto; Indices = Orm.GetIndices(prop); if (!Indices.Any() diff --git a/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Tests/UnitTests/Editor/MapboxUnitTests_SQLiteCache.cs b/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Tests/UnitTests/Editor/MapboxUnitTests_SQLiteCache.cs new file mode 100644 index 000000000..a1d9bc085 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Tests/UnitTests/Editor/MapboxUnitTests_SQLiteCache.cs @@ -0,0 +1,309 @@ +namespace Mapbox.MapboxSdkCs.UnitTest +{ + using Mapbox.Map; + using Mapbox.Platform.Cache; + using Mapbox.Unity.Utilities; + using Mapbox.Utils; + using NUnit.Framework; + using System; + using System.Collections; + using System.Collections.Generic; + using System.Diagnostics; + using System.Globalization; + using System.IO; + using System.Linq; + using ued = UnityEngine.Debug; + using UnityEngine.TestTools; + + + [TestFixture] + internal class SQLiteCacheTest + { + + + private const string _dbName = "UNITTEST.db"; + // tileset names + private const string TS_NO_OVERWRITE = "NoOverwrite"; + private const string TS_FORCE_OVERWRITE = "ForceOverwrite"; + private const string TS_CONCURRENT1 = "concurrent1"; + private const string TS_CONCURRENT2 = "concurrent2"; + private const string TS_CONCURRENT3 = "concurrent3"; + private const string TS_CONCURRENT4 = "concurrent4"; + private const string TS_PRUNE = "concurrent4"; + private const string TS_REINIT = "reinit"; + private string[] _allTilesetNames; + private SQLiteCache _cache; + private string _className; + private HashSet _tileIds; + // be careful when setting the 'maxTileCount' parameter. when setting too low unwanted pruning might happen. + private uint _maxCacheTileCount = 6000; + + + [OneTimeSetUp] + public void Init() + { + _className = this.GetType().Name; + + Runnable.EnableRunnableInEditor(); + + _allTilesetNames = new string[] { + TS_NO_OVERWRITE + , TS_FORCE_OVERWRITE + , TS_CONCURRENT1 + , TS_CONCURRENT2 + , TS_CONCURRENT3 + , TS_CONCURRENT4 + , TS_PRUNE + , TS_REINIT + }; + + Vector2d southWest = new Vector2d(48.2174, 16.3662); + Vector2d northEast = new Vector2d(48.2310, 16.3877); + Vector2dBounds bounds = new Vector2dBounds(southWest, northEast); + _tileIds = TileCover.Get(bounds, 19); + + + // delete cache from previous runs + string dbFullPath = SQLiteCache.GetFullDbPath(_dbName); + if (File.Exists(dbFullPath)) { File.Delete(dbFullPath); } + + _cache = new SQLiteCache(_maxCacheTileCount, _dbName); + } + + + [OneTimeTearDown] + public void Cleanup() + { + if (null != _cache) + { + //_cache.Clear(); + _cache.Dispose(); + _cache = null; + } + } + + + [Test, Order(1)] + public void InsertSameTileNoOverwrite() + { + string methodName = _className + "." + new StackFrame().GetMethod().Name; + List elapsed = simpleInsert(TS_NO_OVERWRITE, false); + logTime(methodName, elapsed); + cacheItemAsserts(TS_NO_OVERWRITE, new CanonicalTileId(0, 0, 0)); + Assert.AreEqual(1, _cache.TileCount(TS_NO_OVERWRITE), "tileset {0}: unexpected number of tiles", TS_NO_OVERWRITE); + } + + + [Test, Order(2)] + public void InsertSameTileForceOverwrite() + { + string methodName = _className + "." + new StackFrame().GetMethod().Name; + List elapsed = simpleInsert(TS_FORCE_OVERWRITE, true); + logTime(methodName, elapsed); + cacheItemAsserts(TS_FORCE_OVERWRITE, new CanonicalTileId(0, 0, 0)); + Assert.AreEqual(1, _cache.TileCount(TS_FORCE_OVERWRITE), "tileset {0}: unexpected number of tiles", TS_FORCE_OVERWRITE); + } + + + [UnityTest, Order(3)] + public IEnumerator ConcurrentTilesetInsert() + { + + ued.LogFormat("about to insert {0} tiles for each tileset", _tileIds.Count); + + int rIdCr1 = Runnable.Run(InsertCoroutine(TS_CONCURRENT1, false, _tileIds)); + int rIdCr2 = Runnable.Run(InsertCoroutine(TS_CONCURRENT2, false, _tileIds)); + int rIdCr3 = Runnable.Run(InsertCoroutine(TS_CONCURRENT3, false, _tileIds)); + int rIdCr4 = Runnable.Run(InsertCoroutine(TS_CONCURRENT4, false, _tileIds)); + + while (Runnable.IsRunning(rIdCr1) || Runnable.IsRunning(rIdCr2) || Runnable.IsRunning(rIdCr3) || Runnable.IsRunning(rIdCr4)) + { + yield return null; + } + + } + + + [Test, Order(4)] + public void VerifyTilesFromConcurrentInsert() + { + ued.Log("verifying concurrently inserted tiles ..."); + + string[] tilesetNames = new string[] { TS_CONCURRENT1, TS_CONCURRENT2, TS_CONCURRENT3, TS_CONCURRENT4 }; + + foreach (string tilesetName in tilesetNames) + { + Assert.AreEqual(_tileIds.Count, _cache.TileCount(tilesetName), "tileset '{0}' does not contain expected number of tiles", tilesetName); + } + + foreach (string tilesetName in tilesetNames) + { + foreach (CanonicalTileId tileId in _tileIds) + { + cacheItemAsserts(tilesetName, tileId); + } + } + + ued.Log("all tiles in cache!"); + } + + + [Test, Order(5)] + public void Prune() + { + string methodName = _className + "." + new StackFrame().GetMethod().Name; + HashSet tileIds = new HashSet(); + + int tiles2Insert = (int)_maxCacheTileCount + (int)_cache.PruneCacheDelta + 1; + ued.Log(string.Format("about to insert {0} tiles", tiles2Insert)); + for (int x = 0; x < tiles2Insert; x++) + { + tileIds.Add(new CanonicalTileId(x, 131205, 18)); + } + + List elapsed = simpleInsert(TS_PRUNE, false, tileIds); + logTime(methodName, elapsed); + Assert.AreEqual(_maxCacheTileCount, _cache.TileCount(TS_PRUNE), _cache.PruneCacheDelta, "tileset [{0}]: pruning did not work as expected", TS_PRUNE); + } + + + [Test, Order(6)] + public void Clear() + { + // We still should have tiles in the cache + long tileCnt = getAllTilesCount(); + + // beware 'Assert.Greater' has parameters flipped compared to 'Assert.AreEqual' + Assert.GreaterOrEqual(tileCnt, _cache.MaxCacheSize, "number of tiles lower than expected"); + + _cache.Clear(); + // have to Reinit after Clear() + _cache.ReInit(); + + tileCnt = getAllTilesCount(); + + Assert.AreEqual(0, tileCnt, "'Clear()' did not work as expected"); + } + + + [Test, Order(7)] + public void ReInit() + { + // after previous 'Clear' there shouldn't be any tiles in cache + long tileCnt = getAllTilesCount(); + Assert.AreEqual(0, tileCnt, "'Clear()' did not work as expected"); + // insert one tile + simpleInsert(TS_REINIT, false, itemCount: 1); + tileCnt = getAllTilesCount(); + Assert.AreEqual(1, tileCnt, "one tile was not inserted"); + + _cache.ReInit(); + + Assert.AreEqual(1, tileCnt, "tile was lost during 'ReInit()'"); + } + + + #region helper methods + + + private long getAllTilesCount() + { + long tileCnt = 0; + foreach (string tilesetName in _allTilesetNames) + { + tileCnt += _cache.TileCount(tilesetName); + } + return tileCnt; + } + + + private void cacheItemAsserts(string tilesetName, CanonicalTileId tileId) + { + CacheItem ci = _cache.Get(tilesetName, tileId); + Assert.NotNull(ci, "tileset '{0}': {1} not found in cache", tilesetName, tileId); + Assert.NotNull(ci.Data, "tileset '{0}': {1} tile data is null", tilesetName, tileId); + Assert.NotZero(ci.Data.Length, "tileset '{0}': {1} data length is 0", tilesetName, tileId); + } + + + private IEnumerator InsertCoroutine(string tileSetName, bool forceInsert, HashSet tileIds = null) + { + ued.Log(string.Format("coroutine [{0}] started", tileSetName)); + yield return null; + + List elapsed = simpleInsert(tileSetName, forceInsert, tileIds); + + //List elapsed = new List(); + //foreach (CanonicalTileId tileId in tileIds) + //{ + // HashSet tmpIds = new HashSet(new CanonicalTileId[] { tileId }); + // elapsed.AddRange(simpleInsert(tileSetName, forceInsert, tmpIds)); + // yield return null; + //} + + ued.Log(string.Format("coroutine [{0}] finished", tileSetName)); + logTime(tileSetName, elapsed); + } + + + private List simpleInsert(string tileSetName, bool forceInsert, HashSet tileIds = null, int itemCount = 1000) + { + if (null != tileIds) { itemCount = tileIds.Count; } + + List elapsed = new List(); + Stopwatch sw = new Stopwatch(); + + for (int i = 0; i < itemCount; i++) + { + CanonicalTileId tileId = null != tileIds ? tileIds.ElementAt(i) : new CanonicalTileId(0, 0, 0); + DateTime now = DateTime.UtcNow; + CacheItem cacheItem = new CacheItem() + { + AddedToCacheTicksUtc = now.Ticks, + // simulate 100KB data + Data = Enumerable.Repeat((byte)0x58, 100 * 1024).ToArray(), + ETag = "etag", + LastModified = now + }; + + sw.Start(); + _cache.Add(tileSetName, tileId, cacheItem, forceInsert); + sw.Stop(); + elapsed.Add(sw.ElapsedMilliseconds); + sw.Reset(); + } + + return elapsed; + } + + + + private void logTime(string label, List elapsed) + { + double overall = elapsed.Sum() / 1000.0; + double min = elapsed.Min() / 1000.0; + double max = elapsed.Max() / 1000.0; + double avg = elapsed.Average() / 1000.0; + + double sum = elapsed.Sum(d => Math.Pow(d - avg, 2)); + double stdDev = (Math.Sqrt((sum) / (elapsed.Count - 1))) / 1000.0; + + ued.Log(string.Format( + CultureInfo.InvariantCulture + , "[{0}] {1} items, overall time:{2,6:0.000}s avg:{3,6:0.000}s min:{4,6:0.000}s max:{5,6:0.000}s stdDev:{6,6:0.000}s" + , label + , elapsed.Count + , overall + , avg + , min + , max + , stdDev + )); + } + + + #endregion + + + } +} diff --git a/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/MbTilesCache.cs.meta b/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Tests/UnitTests/Editor/MapboxUnitTests_SQLiteCache.cs.meta similarity index 70% rename from sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/MbTilesCache.cs.meta rename to sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Tests/UnitTests/Editor/MapboxUnitTests_SQLiteCache.cs.meta index 3c4cc049d..b40a774f1 100644 --- a/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/MbTilesCache.cs.meta +++ b/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Tests/UnitTests/Editor/MapboxUnitTests_SQLiteCache.cs.meta @@ -1,8 +1,9 @@ fileFormatVersion: 2 -guid: 10c4574fc365d40bfbde0a7f3746f0c8 -timeCreated: 1497883478 +guid: e9829dc6854b57c4daa504cf64758026 +timeCreated: 1528105352 licenseType: Pro MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Utils/UnixTimestampUtils.cs b/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Utils/UnixTimestampUtils.cs index b07d9a47b..d984f9070 100644 --- a/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Utils/UnixTimestampUtils.cs +++ b/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Utils/UnixTimestampUtils.cs @@ -4,7 +4,8 @@ // //----------------------------------------------------------------------- -namespace Mapbox.Utils { +namespace Mapbox.Utils +{ using System; using System.Collections.Generic; using System.Text; @@ -13,7 +14,8 @@ namespace Mapbox.Utils { /// /// A set of Unix Timestamp utils. /// - public static class UnixTimestampUtils { + public static class UnixTimestampUtils + { // http://gigi.nullneuron.net/gigilabs/converting-tofrom-unix-timestamp-in-c/ @@ -22,7 +24,8 @@ public static class UnixTimestampUtils { /// /// /// - public static double To(DateTime date) { + public static double To(DateTime date) + { //return date.ToLocalTime().Subtract(new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc)).TotalSeconds; return date.Subtract(new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc)).TotalSeconds; } diff --git a/sdkproject/Assets/Mapbox/Examples/0_PrefabScenes/CitySimulator.unity b/sdkproject/Assets/Mapbox/Examples/0_PrefabScenes/CitySimulator.unity index 99ef84195..044e3e6c4 100644 --- a/sdkproject/Assets/Mapbox/Examples/0_PrefabScenes/CitySimulator.unity +++ b/sdkproject/Assets/Mapbox/Examples/0_PrefabScenes/CitySimulator.unity @@ -247,6 +247,26 @@ Prefab: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[2].materialOptions.materials.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[2].materialOptions.materials.Array.data[0].Materials.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[2].materialOptions.materials.Array.data[1].Materials.Array.size + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4187505068457818, guid: 5bb46bae81bf04608ac699be504c5e66, type: 2} propertyPath: m_LocalPosition.x value: 0 @@ -285,6 +305,103 @@ Prefab: value: objectReference: {fileID: 11400000, guid: ef118b5e263da4b1fa4327ca1d3e0c7b, type: 2} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[1].extrusionOptions._selectedLayerName + value: road + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[2].coreOptions.isActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[2].coreOptions.sublayerName + value: Untitled + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[2].coreOptions.geometryType + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[2].coreOptions.layerName + value: building + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[2].coreOptions.snapToTerrain + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[2].coreOptions.lineWidth + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[2].extrusionOptions._selectedLayerName + value: building + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[2].extrusionOptions.propertyName + value: height + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[2].extrusionOptions.maximumHeight + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[2].extrusionOptions.extrusionScaleFactor + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[2].materialOptions.style + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[2].materialOptions.materials.Array.data[0].Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: a1aa333e18c0640d7b428eecff9c4af7, type: 2} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[2].materialOptions.materials.Array.data[1].Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: c0653693b48614a139a124871d499679, type: 2} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[2].materialOptions.atlasInfo + value: + objectReference: {fileID: 11400000, guid: 414754d7155df47beb52ca117a774f21, + type: 2} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[2].materialOptions.colorPalette + value: + objectReference: {fileID: 11400000, guid: 57bdfa37edf7a4f7f999d19443497554, + type: 2} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[2].honorBuildingIdSetting + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[0].materialOptions.style + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[1].materialOptions.style + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 5bb46bae81bf04608ac699be504c5e66, type: 2} m_IsPrefabParent: 0 diff --git a/sdkproject/Assets/Mapbox/Examples/0_PrefabScenes/CitySimulator.unity.meta b/sdkproject/Assets/Mapbox/Examples/0_PrefabScenes/CitySimulator.unity.meta index e9ecca6e0..8c15f924e 100644 --- a/sdkproject/Assets/Mapbox/Examples/0_PrefabScenes/CitySimulator.unity.meta +++ b/sdkproject/Assets/Mapbox/Examples/0_PrefabScenes/CitySimulator.unity.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: d24dbd32aba234c98826e2c59ebfdf84 -timeCreated: 1521142644 +guid: e9aaa5d7902ec4a07bb4b1f2923cafc8 +timeCreated: 1527127310 licenseType: Pro DefaultImporter: externalObjects: {} diff --git a/sdkproject/Assets/Mapbox/Examples/0_PrefabScenes/LocationBasedGame.unity b/sdkproject/Assets/Mapbox/Examples/0_PrefabScenes/LocationBasedGame.unity index 295ef705b..3524e2a85 100644 --- a/sdkproject/Assets/Mapbox/Examples/0_PrefabScenes/LocationBasedGame.unity +++ b/sdkproject/Assets/Mapbox/Examples/0_PrefabScenes/LocationBasedGame.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641252, b: 0.574817, a: 1} + m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1} --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -298,6 +298,11 @@ Prefab: propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} + - target: {fileID: 114472907270853152, guid: 35ce2bb4caba9434db5e656796b632b1, + type: 2} + propertyPath: _editorDebuggingOnly._locationLogFile + value: + objectReference: {fileID: 4900000, guid: 5e6bb7224cef35c4788a4817b1c9778d, type: 3} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 35ce2bb4caba9434db5e656796b632b1, type: 2} m_IsPrefabParent: 0 diff --git a/sdkproject/Assets/Mapbox/Examples/1_DataExplorer/DataExplorer.unity b/sdkproject/Assets/Mapbox/Examples/1_DataExplorer/DataExplorer.unity index 8253ca410..106e812aa 100644 --- a/sdkproject/Assets/Mapbox/Examples/1_DataExplorer/DataExplorer.unity +++ b/sdkproject/Assets/Mapbox/Examples/1_DataExplorer/DataExplorer.unity @@ -427,6 +427,7 @@ MonoBehaviour: entityPerCoroutine: 20 vectorSubLayers: - coreOptions: + sourceId: isActive: 1 sublayerName: Buildings geometryType: 2 @@ -450,6 +451,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 1 texturingType: 3 materials: - Materials: @@ -465,6 +467,7 @@ MonoBehaviour: MeshModifiers: [] GoModifiers: [] - coreOptions: + sourceId: isActive: 1 sublayerName: Parks geometryType: 2 @@ -494,6 +497,7 @@ MonoBehaviour: colliderOptions: colliderType: 2 materialOptions: + style: 0 texturingType: 0 materials: - Materials: @@ -511,6 +515,7 @@ MonoBehaviour: - {fileID: 11400000, guid: d5cfd67d46b2f4892ae231737f3a95f8, type: 2} - {fileID: 11400000, guid: 4aeb0629486794f25bf199af8a4f4830, type: 2} - coreOptions: + sourceId: isActive: 1 sublayerName: Roads geometryType: 1 @@ -534,6 +539,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: - Materials: @@ -548,6 +554,7 @@ MonoBehaviour: MeshModifiers: [] GoModifiers: [] - coreOptions: + sourceId: isActive: 1 sublayerName: PoiLabels geometryType: 0 @@ -578,6 +585,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: - Materials: @@ -593,6 +601,7 @@ MonoBehaviour: GoModifiers: - {fileID: 11400000, guid: 90f8fc7667430374d9ddd1907cf522dd, type: 2} - coreOptions: + sourceId: isActive: 1 sublayerName: Pois geometryType: 0 @@ -616,6 +625,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: - Materials: @@ -632,6 +642,7 @@ MonoBehaviour: - {fileID: 11400000, guid: 873cf898fb44149798c637959fd811ba, type: 2} - {fileID: 11400000, guid: 69c9fbc203d6e934ea944041d43ea709, type: 2} - coreOptions: + sourceId: isActive: 1 sublayerName: Water geometryType: 2 @@ -655,6 +666,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: - Materials: @@ -669,6 +681,7 @@ MonoBehaviour: MeshModifiers: [] GoModifiers: [] - coreOptions: + sourceId: isActive: 0 sublayerName: Waterway geometryType: 1 @@ -692,6 +705,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: - Materials: @@ -706,6 +720,7 @@ MonoBehaviour: MeshModifiers: [] GoModifiers: [] - coreOptions: + sourceId: isActive: 0 sublayerName: Aeroway geometryType: 1 @@ -729,6 +744,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: - Materials: @@ -743,6 +759,7 @@ MonoBehaviour: MeshModifiers: [] GoModifiers: [] - coreOptions: + sourceId: isActive: 0 sublayerName: BarrierLine geometryType: 1 @@ -766,6 +783,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: - Materials: @@ -780,6 +798,7 @@ MonoBehaviour: MeshModifiers: [] GoModifiers: [] - coreOptions: + sourceId: isActive: 0 sublayerName: LanduseOverlay geometryType: 2 @@ -803,6 +822,7 @@ MonoBehaviour: colliderOptions: colliderType: 2 materialOptions: + style: 0 texturingType: 0 materials: - Materials: @@ -817,6 +837,7 @@ MonoBehaviour: MeshModifiers: [] GoModifiers: [] - coreOptions: + sourceId: isActive: 0 sublayerName: Admin geometryType: 1 @@ -840,6 +861,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: - Materials: @@ -854,6 +876,7 @@ MonoBehaviour: MeshModifiers: [] GoModifiers: [] - coreOptions: + sourceId: isActive: 0 sublayerName: CountryLabel geometryType: 0 @@ -877,6 +900,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: - Materials: @@ -892,6 +916,7 @@ MonoBehaviour: GoModifiers: - {fileID: 11400000, guid: 856c73f1fff593349bebf4e5b37f6e50, type: 2} - coreOptions: + sourceId: isActive: 0 sublayerName: MarineLabel geometryType: 0 @@ -915,6 +940,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: - Materials: @@ -930,6 +956,7 @@ MonoBehaviour: GoModifiers: - {fileID: 11400000, guid: 856c73f1fff593349bebf4e5b37f6e50, type: 2} - coreOptions: + sourceId: isActive: 0 sublayerName: StateLabel geometryType: 0 @@ -953,6 +980,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: - Materials: @@ -968,6 +996,7 @@ MonoBehaviour: GoModifiers: - {fileID: 11400000, guid: 856c73f1fff593349bebf4e5b37f6e50, type: 2} - coreOptions: + sourceId: isActive: 0 sublayerName: WaterLabel geometryType: 0 @@ -991,6 +1020,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: - Materials: @@ -1006,6 +1036,7 @@ MonoBehaviour: GoModifiers: - {fileID: 11400000, guid: 856c73f1fff593349bebf4e5b37f6e50, type: 2} - coreOptions: + sourceId: isActive: 0 sublayerName: PlaceLabel geometryType: 0 @@ -1029,6 +1060,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: - Materials: @@ -1044,6 +1076,7 @@ MonoBehaviour: GoModifiers: - {fileID: 11400000, guid: 856c73f1fff593349bebf4e5b37f6e50, type: 2} - coreOptions: + sourceId: isActive: 0 sublayerName: RoadLabel geometryType: 0 @@ -1067,6 +1100,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: - Materials: @@ -1082,6 +1116,7 @@ MonoBehaviour: GoModifiers: - {fileID: 11400000, guid: 856c73f1fff593349bebf4e5b37f6e50, type: 2} - coreOptions: + sourceId: isActive: 0 sublayerName: WaterwayLabel geometryType: 0 @@ -1105,6 +1140,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: - Materials: @@ -1120,6 +1156,7 @@ MonoBehaviour: GoModifiers: - {fileID: 11400000, guid: 856c73f1fff593349bebf4e5b37f6e50, type: 2} - coreOptions: + sourceId: isActive: 0 sublayerName: AirportLabel geometryType: 0 @@ -1143,6 +1180,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: - Materials: @@ -1158,6 +1196,7 @@ MonoBehaviour: GoModifiers: - {fileID: 11400000, guid: 856c73f1fff593349bebf4e5b37f6e50, type: 2} - coreOptions: + sourceId: isActive: 0 sublayerName: RailStationLabel geometryType: 0 @@ -1181,6 +1220,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: - Materials: @@ -1196,6 +1236,7 @@ MonoBehaviour: GoModifiers: - {fileID: 11400000, guid: 856c73f1fff593349bebf4e5b37f6e50, type: 2} - coreOptions: + sourceId: isActive: 0 sublayerName: MountainPeakLabel geometryType: 0 @@ -1219,6 +1260,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: - Materials: @@ -1234,6 +1276,7 @@ MonoBehaviour: GoModifiers: - {fileID: 11400000, guid: 856c73f1fff593349bebf4e5b37f6e50, type: 2} - coreOptions: + sourceId: isActive: 0 sublayerName: HouseNumberLabel geometryType: 0 @@ -1257,6 +1300,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: - Materials: @@ -1272,6 +1316,7 @@ MonoBehaviour: GoModifiers: - {fileID: 11400000, guid: 856c73f1fff593349bebf4e5b37f6e50, type: 2} - coreOptions: + sourceId: isActive: 0 sublayerName: MotorwayJunction geometryType: 0 @@ -1295,6 +1340,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: - Materials: @@ -1310,6 +1356,7 @@ MonoBehaviour: GoModifiers: - {fileID: 11400000, guid: ceca5248b4c18354d8089a76da2f7f45, type: 2} - coreOptions: + sourceId: isActive: 0 sublayerName: Landcover geometryType: 2 @@ -1333,6 +1380,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: - Materials: @@ -1347,6 +1395,7 @@ MonoBehaviour: MeshModifiers: [] GoModifiers: [] - coreOptions: + sourceId: isActive: 0 sublayerName: Hillshade geometryType: 2 @@ -1370,6 +1419,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: - Materials: @@ -1384,6 +1434,7 @@ MonoBehaviour: MeshModifiers: [] GoModifiers: [] - coreOptions: + sourceId: isActive: 0 sublayerName: Contour geometryType: 1 @@ -1407,6 +1458,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: - Materials: @@ -1421,6 +1473,7 @@ MonoBehaviour: MeshModifiers: [] GoModifiers: [] - coreOptions: + sourceId: isActive: 1 sublayerName: LowTrafficCongestion geometryType: 1 @@ -1451,6 +1504,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: - Materials: @@ -1465,6 +1519,7 @@ MonoBehaviour: MeshModifiers: [] GoModifiers: [] - coreOptions: + sourceId: isActive: 1 sublayerName: ModerateTrafficCongestion geometryType: 1 @@ -1495,6 +1550,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: - Materials: @@ -1509,6 +1565,7 @@ MonoBehaviour: MeshModifiers: [] GoModifiers: [] - coreOptions: + sourceId: isActive: 1 sublayerName: HeavyTrafficCongestion geometryType: 1 @@ -1539,6 +1596,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: - Materials: @@ -1553,6 +1611,7 @@ MonoBehaviour: MeshModifiers: [] GoModifiers: [] - coreOptions: + sourceId: isActive: 1 sublayerName: SevereTrafficCongestion geometryType: 1 @@ -1583,6 +1642,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: - Materials: diff --git a/sdkproject/Assets/Mapbox/Examples/1_DataExplorer/InteractiveStyledVectorMap.unity b/sdkproject/Assets/Mapbox/Examples/1_DataExplorer/InteractiveStyledVectorMap.unity index 5f2d72eec..8f1ed4358 100644 --- a/sdkproject/Assets/Mapbox/Examples/1_DataExplorer/InteractiveStyledVectorMap.unity +++ b/sdkproject/Assets/Mapbox/Examples/1_DataExplorer/InteractiveStyledVectorMap.unity @@ -442,17 +442,18 @@ MonoBehaviour: filterOperator: 0 combinerType: 0 extrusionOptions: - _selectedLayerName: + _selectedLayerName: building extrusionType: 1 extrusionGeometryType: 0 propertyName: height - propertyDescription: + propertyDescription: Number. Height of building or part of building. minimumHeight: 0 maximumHeight: 0 extrusionScaleFactor: 1 colliderOptions: colliderType: 1 materialOptions: + style: 4 texturingType: 3 materials: - Materials: @@ -489,17 +490,18 @@ MonoBehaviour: filterOperator: 0 combinerType: 0 extrusionOptions: - _selectedLayerName: + _selectedLayerName: building extrusionType: 1 extrusionGeometryType: 0 propertyName: height - propertyDescription: + propertyDescription: Number. Height of building or part of building. minimumHeight: 0 maximumHeight: 0 extrusionScaleFactor: 1 colliderOptions: colliderType: 1 materialOptions: + style: 4 texturingType: 3 materials: - Materials: @@ -542,17 +544,18 @@ MonoBehaviour: filterOperator: 0 combinerType: 2 extrusionOptions: - _selectedLayerName: + _selectedLayerName: building extrusionType: 1 extrusionGeometryType: 0 propertyName: height - propertyDescription: + propertyDescription: Number. Height of building or part of building. minimumHeight: 0 maximumHeight: 0 extrusionScaleFactor: 1 colliderOptions: colliderType: 1 materialOptions: + style: 4 texturingType: 3 materials: - Materials: @@ -590,7 +593,7 @@ MonoBehaviour: filterOperator: 0 combinerType: 0 extrusionOptions: - _selectedLayerName: + _selectedLayerName: landuse extrusionType: 0 extrusionGeometryType: 0 propertyName: height @@ -601,6 +604,7 @@ MonoBehaviour: colliderOptions: colliderType: 2 materialOptions: + style: 0 texturingType: 0 materials: - Materials: @@ -1868,62 +1872,62 @@ Prefab: - target: {fileID: 224907993215804030, guid: 98be219873e6d4dffb5949746f515a33, type: 2} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224907993215804030, guid: 98be219873e6d4dffb5949746f515a33, type: 2} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224835413515161394, guid: 98be219873e6d4dffb5949746f515a33, type: 2} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224835413515161394, guid: 98be219873e6d4dffb5949746f515a33, type: 2} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224835413515161394, guid: 98be219873e6d4dffb5949746f515a33, type: 2} propertyPath: m_AnchoredPosition.x - value: 116.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224835413515161394, guid: 98be219873e6d4dffb5949746f515a33, type: 2} propertyPath: m_AnchoredPosition.y - value: -67.20215 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224835413515161394, guid: 98be219873e6d4dffb5949746f515a33, type: 2} propertyPath: m_SizeDelta.x - value: 213 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224835413515161394, guid: 98be219873e6d4dffb5949746f515a33, type: 2} propertyPath: m_SizeDelta.y - value: 114.404305 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224857786874416376, guid: 98be219873e6d4dffb5949746f515a33, type: 2} propertyPath: m_SizeDelta.y - value: 134.4043 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224907856650798614, guid: 98be219873e6d4dffb5949746f515a33, type: 2} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224907856650798614, guid: 98be219873e6d4dffb5949746f515a33, type: 2} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224907856650798614, guid: 98be219873e6d4dffb5949746f515a33, type: 2} propertyPath: m_SizeDelta.x - value: -17 + value: 0 objectReference: {fileID: 0} - target: {fileID: 114603753021256032, guid: 98be219873e6d4dffb5949746f515a33, type: 2} @@ -2191,12 +2195,12 @@ Prefab: - target: {fileID: 224000013044306136, guid: 3adcee2515f8c49f4a7afb3bacf2c56e, type: 2} propertyPath: m_LocalPosition.x - value: 371 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224000013044306136, guid: 3adcee2515f8c49f4a7afb3bacf2c56e, type: 2} propertyPath: m_LocalPosition.y - value: 197.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224000013044306136, guid: 3adcee2515f8c49f4a7afb3bacf2c56e, type: 2} diff --git a/sdkproject/Assets/Mapbox/Examples/1_DataExplorer/Modules/Resources/LabelPrefab.prefab b/sdkproject/Assets/Mapbox/Examples/1_DataExplorer/Modules/Resources/LabelPrefab.prefab index 86f52ad10..7a7490572 100644 --- a/sdkproject/Assets/Mapbox/Examples/1_DataExplorer/Modules/Resources/LabelPrefab.prefab +++ b/sdkproject/Assets/Mapbox/Examples/1_DataExplorer/Modules/Resources/LabelPrefab.prefab @@ -54,7 +54,7 @@ Transform: m_GameObject: {fileID: 1706413382388718} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 5, y: 5, z: 5} m_Children: - {fileID: 4774780138522716} m_Father: {fileID: 0} diff --git a/sdkproject/Assets/Mapbox/Examples/5_Playground/Materials/DeviceOrientationMat.mat b/sdkproject/Assets/Mapbox/Examples/5_Playground/Materials/DeviceOrientationMat.mat new file mode 100644 index 000000000..d26eba19a --- /dev/null +++ b/sdkproject/Assets/Mapbox/Examples/5_Playground/Materials/DeviceOrientationMat.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: DeviceOrientationMat + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _ALPHAPREMULTIPLY_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 3 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 1, g: 0, b: 0, a: 0.391} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/sdkproject/Assets/Mapbox/Examples/5_Playground/Materials/DeviceOrientationMat.mat.meta b/sdkproject/Assets/Mapbox/Examples/5_Playground/Materials/DeviceOrientationMat.mat.meta new file mode 100644 index 000000000..14d2e2baf --- /dev/null +++ b/sdkproject/Assets/Mapbox/Examples/5_Playground/Materials/DeviceOrientationMat.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 107ca5e7bb5e26f46b0ce09f5fc2e817 +timeCreated: 1526382537 +licenseType: Pro +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Examples/5_Playground/Materials/HeadingMat.mat.meta b/sdkproject/Assets/Mapbox/Examples/5_Playground/Materials/HeadingMat.mat.meta index 05a7e640f..1e4bfbeba 100644 --- a/sdkproject/Assets/Mapbox/Examples/5_Playground/Materials/HeadingMat.mat.meta +++ b/sdkproject/Assets/Mapbox/Examples/5_Playground/Materials/HeadingMat.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0ac9a851f526145d988d06970008482d +guid: 9cd87e4a7579b3c4e85d198cf4d7f65f timeCreated: 1524792279 licenseType: Pro NativeFormatImporter: diff --git a/sdkproject/Assets/Mapbox/Examples/5_Playground/Materials/UserHeadingMat.mat b/sdkproject/Assets/Mapbox/Examples/5_Playground/Materials/UserHeadingMat.mat new file mode 100644 index 000000000..03d510b4b --- /dev/null +++ b/sdkproject/Assets/Mapbox/Examples/5_Playground/Materials/UserHeadingMat.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: UserHeadingMat + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _ALPHAPREMULTIPLY_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 3 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 0.11724138, g: 1, b: 0, a: 0.39215687} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/sdkproject/Assets/Mapbox/Examples/5_Playground/Materials/UserHeadingMat.mat.meta b/sdkproject/Assets/Mapbox/Examples/5_Playground/Materials/UserHeadingMat.mat.meta new file mode 100644 index 000000000..1ccab6461 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Examples/5_Playground/Materials/UserHeadingMat.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 51476a26efe56174b870328f2bbccae5 +timeCreated: 1524792279 +licenseType: Pro +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Examples/5_Playground/Scenes/LocationProvider.unity b/sdkproject/Assets/Mapbox/Examples/5_Playground/Scenes/LocationProvider.unity index dc0d8ba69..1893e56bd 100644 --- a/sdkproject/Assets/Mapbox/Examples/5_Playground/Scenes/LocationProvider.unity +++ b/sdkproject/Assets/Mapbox/Examples/5_Playground/Scenes/LocationProvider.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641252, b: 0.574817, a: 1} + m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1} --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -113,6 +113,74 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &4433748 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 4433749} + - component: {fileID: 4433751} + - component: {fileID: 4433750} + m_Layer: 5 + m_Name: Checkmark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4433749 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 4433748} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1587024385} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &4433750 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 4433748} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &4433751 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 4433748} --- !u!1 &295714336 GameObject: m_ObjectHideFlags: 0 @@ -239,6 +307,7 @@ GameObject: - component: {fileID: 424127798} - component: {fileID: 424127800} - component: {fileID: 424127799} + - component: {fileID: 424127801} m_Layer: 5 m_Name: LocationProviderLogText m_TagString: Untagged @@ -285,10 +354,10 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 + m_FontSize: 27 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 2 m_MaxSize: 40 m_Alignment: 0 m_AlignByGeometry: 0 @@ -303,6 +372,150 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 424127797} +--- !u!114 &424127801 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 424127797} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 1, g: 1, b: 1, a: 0.5} + m_EffectDistance: {x: 0.5, y: -0.5} + m_UseGraphicAlpha: 0 +--- !u!1 &484400919 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 484400920} + - component: {fileID: 484400921} + m_Layer: 0 + m_Name: OrientationSmoothingNoOperation + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &484400920 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 484400919} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 849657522} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &484400921 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 484400919} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1ea49ff9cb53e9b44b5fa981d0009588, type: 3} + m_Name: + m_EditorClassIdentifier: + _measurements: 5 +--- !u!1 &503300257 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 503300258} + - component: {fileID: 503300260} + - component: {fileID: 503300259} + - component: {fileID: 503300261} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &503300258 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 503300257} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1086928929} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -10.9, y: -0.5} + m_SizeDelta: {x: -28, y: -3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &503300259 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 503300257} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: start logging +--- !u!222 &503300260 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 503300257} +--- !u!114 &503300261 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 503300257} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 1, g: 1, b: 1, a: 0.5} + m_EffectDistance: {x: 0.5, y: -0.5} + m_UseGraphicAlpha: 1 --- !u!1 &536971210 GameObject: m_ObjectHideFlags: 0 @@ -331,6 +544,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _logText: {fileID: 424127799} + _logToggle: {fileID: 1086928930} --- !u!4 &536971212 Transform: m_ObjectHideFlags: 0 @@ -381,7 +595,7 @@ MeshRenderer: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 541353170} m_Enabled: 1 - m_CastShadows: 1 + m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 m_MotionVectors: 1 @@ -472,6 +686,89 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &758854909 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 758854910} + - component: {fileID: 758854911} + m_Layer: 0 + m_Name: HeadingSmoothingNoOperation + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &758854910 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 758854909} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 849657522} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &758854911 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 758854909} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1ea49ff9cb53e9b44b5fa981d0009588, type: 3} + m_Name: + m_EditorClassIdentifier: + _measurements: 5 +--- !u!1 &802813065 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 802813066} + - component: {fileID: 802813067} + m_Layer: 0 + m_Name: HeadingSmoothingLowPass + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &802813066 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 802813065} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 849657522} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &802813067 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 802813065} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5bc20e719eeb82d448d4698d29d526c0, type: 3} + m_Name: + m_EditorClassIdentifier: + _measurements: 2 + _smoothingFactor: 0.009999999776482582 --- !u!1 &849657520 GameObject: m_ObjectHideFlags: 0 @@ -499,9 +796,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a38712e93231418a84665190b8473d0, type: 3} m_Name: m_EditorClassIdentifier: - _desiredAccuracyInMeters: 100 - _updateDistanceInMeters: 0 - _updateTimeInMilliSeconds: 1000 + _desiredAccuracyInMeters: 1 + _updateDistanceInMeters: 0.5 + _updateTimeInMilliSeconds: 500 + _userHeadingSmoothing: {fileID: 802813067} + _deviceOrientationSmoothing: {fileID: 1410188430} + _editorDebuggingOnly: + _mockUnityInputLocation: 1 + _locationLogFile: {fileID: 4900000, guid: 5e6bb7224cef35c4788a4817b1c9778d, type: 3} --- !u!4 &849657522 Transform: m_ObjectHideFlags: 0 @@ -511,10 +813,179 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 758854910} + - {fileID: 1006159208} + - {fileID: 802813066} + - {fileID: 484400920} + - {fileID: 1029803709} + - {fileID: 1410188429} m_Father: {fileID: 1908994634} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1006159207 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1006159208} + - component: {fileID: 1006159209} + m_Layer: 0 + m_Name: HeadingSmoothingAverage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1006159208 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1006159207} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 849657522} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1006159209 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1006159207} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6843ccbf70c208645a89b4c8c37a4ecf, type: 3} + m_Name: + m_EditorClassIdentifier: + _measurements: 5 +--- !u!1 &1029803707 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1029803709} + - component: {fileID: 1029803708} + m_Layer: 0 + m_Name: OrientationSmoothingAverage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1029803708 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1029803707} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6843ccbf70c208645a89b4c8c37a4ecf, type: 3} + m_Name: + m_EditorClassIdentifier: + _measurements: 10 +--- !u!4 &1029803709 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1029803707} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 849657522} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1086928928 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1086928929} + - component: {fileID: 1086928930} + m_Layer: 5 + m_Name: LoggingToggle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1086928929 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1086928928} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 1} + m_Children: + - {fileID: 1587024385} + - {fileID: 503300258} + m_Father: {fileID: 1304608539} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 20} + m_SizeDelta: {x: 120, y: 20} + m_Pivot: {x: 1, y: 0} +--- !u!114 &1086928930 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1086928928} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 2109663825, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1587024386} + toggleTransition: 1 + graphic: {fileID: 4433750} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null + m_IsOn: 0 --- !u!1 &1304608535 GameObject: m_ObjectHideFlags: 0 @@ -601,6 +1072,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 424127798} + - {fileID: 1086928929} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -619,7 +1091,7 @@ GameObject: - component: {fileID: 1363590664} - component: {fileID: 1363590663} m_Layer: 0 - m_Name: EditorGpsLogLocationProvider + m_Name: EditorLocationProviderLocationLog m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -633,14 +1105,14 @@ MonoBehaviour: m_GameObject: {fileID: 1363590662} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b7aa6be6e90405940b281e996bcb2f20, type: 3} + m_Script: {fileID: 11500000, guid: beed7ad1e12d3434a943d5fb6807cb6d, type: 3} m_Name: m_EditorClassIdentifier: - _accuracy: 5 + _accuracy: 0 _autoFireEvent: 1 - _updateInterval: 1 + _updateInterval: 500 _sendEvent: 0 - _gpsLogFile: {fileID: 4900000, guid: b9abe7d031734c34e83d93fc4b21fa58, type: 3} + _locationLogFile: {fileID: 4900000, guid: 5e6bb7224cef35c4788a4817b1c9778d, type: 3} --- !u!4 &1363590664 Transform: m_ObjectHideFlags: 0 @@ -803,7 +1275,7 @@ MeshRenderer: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1390435044} m_Enabled: 1 - m_CastShadows: 1 + m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 m_MotionVectors: 1 @@ -851,6 +1323,48 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1390435044} m_Mesh: {fileID: 1856438662} +--- !u!1 &1410188428 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1410188429} + - component: {fileID: 1410188430} + m_Layer: 0 + m_Name: OrientationSmoothingLowPass + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1410188429 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1410188428} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 849657522} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1410188430 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1410188428} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5bc20e719eeb82d448d4698d29d526c0, type: 3} + m_Name: + m_EditorClassIdentifier: + _measurements: 7 + _smoothingFactor: 0.5 --- !u!1 &1411663280 GameObject: m_ObjectHideFlags: 0 @@ -1027,8 +1541,77 @@ MonoBehaviour: _subtractUserHeading: 0 _rotationFollowFactor: 2 _rotateZ: 0 - _useNegativeAngle: 1 + _useNegativeAngle: 0 _useTransformLocationProvider: 0 +--- !u!1 &1587024384 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1587024385} + - component: {fileID: 1587024387} + - component: {fileID: 1587024386} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1587024385 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1587024384} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4433749} + m_Father: {fileID: 1086928929} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 97.4, y: -10} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1587024386 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1587024384} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1587024387 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1587024384} --- !u!1 &1830401241 GameObject: m_ObjectHideFlags: 0 @@ -1295,14 +1878,14 @@ MeshRenderer: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1972204560} m_Enabled: 1 - m_CastShadows: 1 + m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_Materials: - - {fileID: 2100000, guid: 0de83c8715792fe43aceecafcdbd8b24, type: 2} + - {fileID: 2100000, guid: 107ca5e7bb5e26f46b0ce09f5fc2e817, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1448,7 +2031,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &2054056459 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1460,7 +2043,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d3d557417079b1446999d2d86ff71dfb, type: 3} m_Name: m_EditorClassIdentifier: - _updateDistanceInMeters: 0 + _updateDistanceInMeters: 0.5 _updateTimeInMilliSeconds: 500 --- !u!4 &2054056460 Transform: diff --git a/sdkproject/Assets/Mapbox/Examples/5_Playground/Scripts/LogLocationProviderData.cs b/sdkproject/Assets/Mapbox/Examples/5_Playground/Scripts/LogLocationProviderData.cs index 49839ebee..6dafd8530 100644 --- a/sdkproject/Assets/Mapbox/Examples/5_Playground/Scripts/LogLocationProviderData.cs +++ b/sdkproject/Assets/Mapbox/Examples/5_Playground/Scripts/LogLocationProviderData.cs @@ -6,6 +6,7 @@ namespace Mapbox.Examples.Scripts using System.Collections; using System.Collections.Generic; using System.Globalization; + using System.IO; using System.Text; using UnityEngine; using UnityEngine.UI; @@ -16,25 +17,46 @@ public class LogLocationProviderData : MonoBehaviour [SerializeField] private Text _logText; + [SerializeField] + private Toggle _logToggle; + private CultureInfo _invariantCulture = CultureInfo.InvariantCulture; + private bool _logToFile = false; + private LocationLogWriter _logWriter = null; - // Use this for initialization void Start() { + Screen.sleepTimeout = SleepTimeout.NeverSleep; LocationProviderFactory.Instance.DefaultLocationProvider.OnLocationUpdated += LocationProvider_OnLocationUpdated; + + if (null != _logToggle) + { + _logToggle.onValueChanged.AddListener((isOn) => { _logToFile = isOn; }); + } + else + { + Debug.LogError("no logtoggle attached, cannot log"); + } + if (null == _logText) + { + Debug.LogError("no text to log to"); + } } void OnDestroy() { + closeLogWriter(); LocationProviderFactory.Instance.DefaultLocationProvider.OnLocationUpdated -= LocationProvider_OnLocationUpdated; } void LocationProvider_OnLocationUpdated(Location location) { + + /////////////// GUI logging ////////////////////// StringBuilder sb = new StringBuilder(); sb.AppendLine(string.Format("IsLocationServiceEnabled: {0}", location.IsLocationServiceEnabled)); @@ -50,9 +72,40 @@ void LocationProvider_OnLocationUpdated(Location location) sb.AppendLine(string.Format(_invariantCulture, "device orientation: {0:0.0}°", location.DeviceOrientation)); sb.AppendLine(nullableAsStr(location.SpeedKmPerHour, "speed: {0:0.0}km/h")); sb.AppendLine(nullableAsStr(location.HasGpsFix, "HasGpsFix: {0}")); - sb.AppendLine(nullableAsStr(location.SatellitesUsed, "SatellitesUsed:{0} ") + nullableAsStr(location.SatellitesInView, "SatellitesInView:{0}")); + sb.AppendLine(nullableAsStr(location.SatellitesUsed, "SatellitesUsed:{0} ")); + sb.AppendLine(nullableAsStr(location.SatellitesInView, "SatellitesInView:{0}")); + + if (null != _logText) + { + _logText.text = sb.ToString(); + } + + + /////////////// file logging ////////////////////// - _logText.text = sb.ToString(); + // start logging to file + if (_logToFile && null == _logWriter) + { + Debug.Log("--- about to start logging to file ---"); + _logWriter = new LocationLogWriter(); + _logToggle.GetComponentInChildren().text = "stop logging"; + } + + + // stop logging to file + if (!_logToFile && null != _logWriter) + { + Debug.Log("--- about to stop logging to file ---"); + _logToggle.GetComponentInChildren().text = "start logging"; + closeLogWriter(); + } + + + // write line to log file + if (_logToFile && null != _logWriter) + { + _logWriter.Write(location); + } } @@ -65,13 +118,18 @@ private string nullableAsStr(T? val, string formatString = null) where T : st } - // Update is called once per frame - void Update() + private void closeLogWriter() { - + if (null == _logWriter) { return; } + Debug.Log("closing stream writer"); + _logWriter.Dispose(); + _logWriter = null; } + void Update() { } + + } } diff --git a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/POIPlacement.unity b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/POIPlacement.unity index 6e3837f85..b31f8ee32 100644 --- a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/POIPlacement.unity +++ b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/POIPlacement.unity @@ -992,6 +992,7 @@ MonoBehaviour: entityPerCoroutine: 20 vectorSubLayers: - coreOptions: + sourceId: isActive: 1 sublayerName: Building geometryType: 2 @@ -1008,13 +1009,14 @@ MonoBehaviour: extrusionType: 1 extrusionGeometryType: 0 propertyName: height - propertyDescription: + propertyDescription: Number. Height of building or part of building. minimumHeight: 0 maximumHeight: 0 extrusionScaleFactor: 1 colliderOptions: colliderType: 0 materialOptions: + style: 1 texturingType: 3 materials: - Materials: @@ -1031,6 +1033,7 @@ MonoBehaviour: GoModifiers: [] locationPrefabList: - coreOptions: + sourceId: isActive: 1 sublayerName: Arts and Entertainment geometryType: 0 @@ -1054,6 +1057,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: [] atlasInfo: {fileID: 0} @@ -1064,7 +1068,7 @@ MonoBehaviour: MeshModifiers: [] GoModifiers: [] spawnPrefabOptions: - prefab: {fileID: 1707885508695930, guid: 29d1abf5ba6514d81a7974353f130ca8, + prefab: {fileID: 1895949781674336, guid: 29d1abf5ba6514d81a7974353f130ca8, type: 2} scaleDownWithWorld: 1 findByType: 0 @@ -1073,6 +1077,7 @@ MonoBehaviour: coordinates: [] density: 15 - coreOptions: + sourceId: isActive: 1 sublayerName: Food geometryType: 0 @@ -1096,6 +1101,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: [] atlasInfo: {fileID: 0} @@ -1115,6 +1121,7 @@ MonoBehaviour: coordinates: [] density: 15 - coreOptions: + sourceId: isActive: 1 sublayerName: Nightlife geometryType: 0 @@ -1138,6 +1145,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: [] atlasInfo: {fileID: 0} @@ -1148,7 +1156,7 @@ MonoBehaviour: MeshModifiers: [] GoModifiers: [] spawnPrefabOptions: - prefab: {fileID: 1707885508695930, guid: 61bcd2d324dd34bb9b722d856749c28c, + prefab: {fileID: 1424114192387644, guid: 61bcd2d324dd34bb9b722d856749c28c, type: 2} scaleDownWithWorld: 1 findByType: 0 @@ -1157,6 +1165,7 @@ MonoBehaviour: coordinates: [] density: 15 - coreOptions: + sourceId: isActive: 1 sublayerName: Outdoors and Recreation geometryType: 0 @@ -1180,6 +1189,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: [] atlasInfo: {fileID: 0} @@ -1190,7 +1200,7 @@ MonoBehaviour: MeshModifiers: [] GoModifiers: [] spawnPrefabOptions: - prefab: {fileID: 1707885508695930, guid: b0e54a880e97f4c5ead7dcc1c0918e05, + prefab: {fileID: 1004221095257992, guid: b0e54a880e97f4c5ead7dcc1c0918e05, type: 2} scaleDownWithWorld: 1 findByType: 0 @@ -1199,6 +1209,7 @@ MonoBehaviour: coordinates: [] density: 15 - coreOptions: + sourceId: isActive: 1 sublayerName: Services geometryType: 0 @@ -1222,6 +1233,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: [] atlasInfo: {fileID: 0} @@ -1232,7 +1244,7 @@ MonoBehaviour: MeshModifiers: [] GoModifiers: [] spawnPrefabOptions: - prefab: {fileID: 1707885508695930, guid: 60a41cfc23d514878814f0d425912eff, + prefab: {fileID: 1550249727436304, guid: 60a41cfc23d514878814f0d425912eff, type: 2} scaleDownWithWorld: 1 findByType: 0 @@ -1241,6 +1253,7 @@ MonoBehaviour: coordinates: [] density: 10 - coreOptions: + sourceId: isActive: 1 sublayerName: Shops geometryType: 0 @@ -1264,6 +1277,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: [] atlasInfo: {fileID: 0} @@ -1274,7 +1288,7 @@ MonoBehaviour: MeshModifiers: [] GoModifiers: [] spawnPrefabOptions: - prefab: {fileID: 1707885508695930, guid: 49bc5d782d9184533a37abea20ed30e4, + prefab: {fileID: 1665298560487606, guid: 49bc5d782d9184533a37abea20ed30e4, type: 2} scaleDownWithWorld: 1 findByType: 0 @@ -1283,6 +1297,7 @@ MonoBehaviour: coordinates: [] density: 15 - coreOptions: + sourceId: isActive: 1 sublayerName: Transportation geometryType: 0 @@ -1306,6 +1321,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: [] atlasInfo: {fileID: 0} @@ -1316,7 +1332,7 @@ MonoBehaviour: MeshModifiers: [] GoModifiers: [] spawnPrefabOptions: - prefab: {fileID: 1707885508695930, guid: 22150daba6e8b47b69fd30f00b9c56cd, + prefab: {fileID: 1295758952425276, guid: 22150daba6e8b47b69fd30f00b9c56cd, type: 2} scaleDownWithWorld: 1 findByType: 0 @@ -1325,6 +1341,7 @@ MonoBehaviour: coordinates: [] density: 15 - coreOptions: + sourceId: isActive: 0 sublayerName: All POIs geometryType: 0 @@ -1348,6 +1365,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: [] atlasInfo: {fileID: 0} @@ -1358,7 +1376,7 @@ MonoBehaviour: MeshModifiers: [] GoModifiers: [] spawnPrefabOptions: - prefab: {fileID: 1707885508695930, guid: d748e6a0b26334f4d933c1438339484d, + prefab: {fileID: 1396740541782364, guid: d748e6a0b26334f4d933c1438339484d, type: 2} scaleDownWithWorld: 1 findByType: 0 @@ -1543,8 +1561,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.25, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: -12} + m_AnchoredPosition: {x: 0, y: -11} + m_SizeDelta: {x: 0, y: 10} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1077699859 GameObject: @@ -2416,6 +2434,6 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 127.5, y: -45.5} - m_SizeDelta: {x: 231, y: 23} + m_AnchoredPosition: {x: 127.5, y: -23} + m_SizeDelta: {x: 231, y: 8} m_Pivot: {x: 0.5, y: 0.5} diff --git a/sdkproject/Assets/StreamingAssets.meta b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources.meta similarity index 70% rename from sdkproject/Assets/StreamingAssets.meta rename to sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources.meta index d04283834..777cfaa1b 100644 --- a/sdkproject/Assets/StreamingAssets.meta +++ b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 7ad5bb5010449443388dd2ce544bad0a +guid: 93ceadc5862b00c4f8fe863f98a18e01 folderAsset: yes -timeCreated: 1524161041 +timeCreated: 1526382059 licenseType: Pro DefaultImporter: externalObjects: {} diff --git a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/ArtsPoiLabelPrefab.prefab b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/ArtsPoiLabelPrefab.prefab index 36ac1d2d7..9e04e1da3 100644 --- a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/ArtsPoiLabelPrefab.prefab +++ b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/ArtsPoiLabelPrefab.prefab @@ -9,54 +9,54 @@ Prefab: m_Modifications: [] m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1707885508695930} + m_RootGameObject: {fileID: 1895949781674336} m_IsPrefabParent: 1 ---- !u!1 &1265934954306918 +--- !u!1 &1348505215756078 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224460406485636372} - - component: {fileID: 23953474672158714} - - component: {fileID: 102524361988852780} - - component: {fileID: 222132644478461976} + - component: {fileID: 224696713710260372} + - component: {fileID: 222470863973442320} + - component: {fileID: 114938141246306308} + - component: {fileID: 114050678122733478} + - component: {fileID: 114776992940635054} m_Layer: 10 - m_Name: TextMesh + m_Name: TextBackground m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1672087740313684 +--- !u!1 &1718399521123926 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224296160621579024} - - component: {fileID: 222675931880023072} - - component: {fileID: 114051004161669530} + - component: {fileID: 4724048298677076} + - component: {fileID: 212086518383404294} m_Layer: 10 - m_Name: TextBackground + m_Name: LabelIcon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1707885508695930 +--- !u!1 &1895949781674336 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224247300890674866} - - component: {fileID: 114862004446283512} - - component: {fileID: 223163049547055646} - - component: {fileID: 114848487314916712} + - component: {fileID: 224008978619379300} + - component: {fileID: 114289697198773512} + - component: {fileID: 223575821624634810} + - component: {fileID: 114250159056332880} m_Layer: 10 m_Name: ArtsPoiLabelPrefab m_TagString: Untagged @@ -64,148 +64,176 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1733686239018384 +--- !u!1 &1926862074818246 GameObject: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 4162236002511050} - - component: {fileID: 212008642798578640} + - component: {fileID: 224637640871225912} + - component: {fileID: 222787186898692958} + - component: {fileID: 114772597570723800} + - component: {fileID: 114629509233654474} m_Layer: 10 - m_Name: LabelIcon + m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4162236002511050 +--- !u!4 &4724048298677076 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1733686239018384} + m_GameObject: {fileID: 1718399521123926} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 3, z: 0} - m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} + m_LocalPosition: {x: -14, y: 3.75, z: 0} + m_LocalScale: {x: 2.143244, y: 2.143244, z: 2.143244} m_Children: [] - m_Father: {fileID: 224247300890674866} - m_RootOrder: 2 + m_Father: {fileID: 224008978619379300} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &23953474672158714 -MeshRenderer: +--- !u!114 &114050678122733478 +MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1265934954306918} + m_GameObject: {fileID: 1348505215756078} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: 7dfc2e1472ac84e1bb749a8a9f934483, type: 3} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!102 &102524361988852780 -TextMesh: - serializedVersion: 3 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &114250159056332880 +MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1265934954306918} - m_Text: - m_OffsetZ: -1 - m_CharacterSize: 1 - m_LineSpacing: 1 - m_Anchor: 4 - m_Alignment: 1 - m_TabSize: 4 - m_FontSize: 200 - m_FontStyle: 0 - m_RichText: 1 - m_Font: {fileID: 12800000, guid: 7dfc2e1472ac84e1bb749a8a9f934483, type: 3} - m_Color: - serializedVersion: 2 - rgba: 4294967295 ---- !u!114 &114051004161669530 + m_GameObject: {fileID: 1895949781674336} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ba99666da3af044c0ae878f372ea4115, type: 3} + m_Name: + m_EditorClassIdentifier: + _text: {fileID: 114772597570723800} + _background: {fileID: 114938141246306308} +--- !u!114 &114289697198773512 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1672087740313684} + m_GameObject: {fileID: 1895949781674336} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 22805dac1b8933d49b89c409a8903cde, type: 3} + m_Name: + m_EditorClassIdentifier: + _camera: {fileID: 0} +--- !u!114 &114629509233654474 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1926862074818246} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &114772597570723800 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1926862074818246} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.7294118, g: 0.23137255, b: 0.24705882, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!114 &114848487314916712 + m_FontData: + m_Font: {fileID: 12800000, guid: bd1ea67ca2b5742d1a24fcbdc17c55e1, type: 3} + m_FontSize: 180 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 300 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Placeholder Text +--- !u!114 &114776992940635054 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1707885508695930} + m_GameObject: {fileID: 1348505215756078} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ba99666da3af044c0ae878f372ea4115, type: 3} + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - _textMesh: {fileID: 102524361988852780} - _background: {fileID: 114051004161669530} ---- !u!114 &114862004446283512 + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 +--- !u!114 &114938141246306308 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1707885508695930} + m_GameObject: {fileID: 1348505215756078} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 22805dac1b8933d49b89c409a8903cde, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - _camera: {fileID: 0} ---- !u!212 &212008642798578640 + m_Material: {fileID: 0} + m_Color: {r: 0.7294118, g: 0.23137255, b: 0.24705882, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!212 &212086518383404294 SpriteRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1733686239018384} + m_GameObject: {fileID: 1718399521123926} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -244,24 +272,24 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 ---- !u!222 &222132644478461976 +--- !u!222 &222470863973442320 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1265934954306918} ---- !u!222 &222675931880023072 + m_GameObject: {fileID: 1348505215756078} +--- !u!222 &222787186898692958 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1672087740313684} ---- !u!223 &223163049547055646 + m_GameObject: {fileID: 1926862074818246} +--- !u!223 &223575821624634810 Canvas: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1707885508695930} + m_GameObject: {fileID: 1895949781674336} m_Enabled: 1 serializedVersion: 3 m_RenderMode: 2 @@ -276,60 +304,60 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!224 &224247300890674866 +--- !u!224 &224008978619379300 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1707885508695930} + m_GameObject: {fileID: 1895949781674336} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 4, y: 4, z: 4} m_Children: - - {fileID: 224296160621579024} - - {fileID: 224460406485636372} - - {fileID: 4162236002511050} + - {fileID: 224696713710260372} + - {fileID: 4724048298677076} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 3} + m_AnchoredPosition: {x: -14, y: 3} m_SizeDelta: {x: 5, y: 5} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224296160621579024 +--- !u!224 &224637640871225912 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1672087740313684} + m_GameObject: {fileID: 1926862074818246} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 224247300890674866} + m_Father: {fileID: 224696713710260372} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 3} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 698, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224460406485636372 +--- !u!224 &224696713710260372 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1265934954306918} + m_GameObject: {fileID: 1348505215756078} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} - m_Children: [] - m_Father: {fileID: 224247300890674866} - m_RootOrder: 1 + m_LocalScale: {x: 0.020000001, y: 0.020000001, z: 0.020000001} + m_Children: + - {fileID: 224637640871225912} + m_Father: {fileID: 224008978619379300} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: -14, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} diff --git a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/ArtsPoiLabelPrefab.prefab.meta b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/ArtsPoiLabelPrefab.prefab.meta index ec9c9e4cf..17a0013ed 100644 --- a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/ArtsPoiLabelPrefab.prefab.meta +++ b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/ArtsPoiLabelPrefab.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 29d1abf5ba6514d81a7974353f130ca8 -timeCreated: 1523314292 +timeCreated: 1527197170 licenseType: Pro NativeFormatImporter: externalObjects: {} diff --git a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/DefaultPoiLabelPrefab.prefab b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/DefaultPoiLabelPrefab.prefab index a99d609e3..d915ed187 100644 --- a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/DefaultPoiLabelPrefab.prefab +++ b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/DefaultPoiLabelPrefab.prefab @@ -9,151 +9,182 @@ Prefab: m_Modifications: [] m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1707885508695930} + m_RootGameObject: {fileID: 1396740541782364} m_IsPrefabParent: 1 ---- !u!1 &1265934954306918 +--- !u!1 &1292503684160346 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224460406485636372} - - component: {fileID: 23953474672158714} - - component: {fileID: 102524361988852780} - - component: {fileID: 222132644478461976} + - component: {fileID: 4313779964940754} + - component: {fileID: 212222304942764664} m_Layer: 10 - m_Name: TextMesh + m_Name: LabelIcon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1672087740313684 +--- !u!1 &1396740541782364 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224296160621579024} - - component: {fileID: 222675931880023072} - - component: {fileID: 114051004161669530} + - component: {fileID: 224030423811238682} + - component: {fileID: 114257982971136964} + - component: {fileID: 223969381223222710} + - component: {fileID: 114413777003902038} m_Layer: 10 - m_Name: TextBackground + m_Name: DefaultPoiLabelPrefab m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1707885508695930 +--- !u!1 &1746901838054686 GameObject: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224247300890674866} - - component: {fileID: 114862004446283512} - - component: {fileID: 223163049547055646} - - component: {fileID: 114354941156370630} + - component: {fileID: 224924182702299544} + - component: {fileID: 222882829815511386} + - component: {fileID: 114326163339638534} + - component: {fileID: 114159563624705982} m_Layer: 10 - m_Name: DefaultPoiLabelPrefab + m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1733686239018384 +--- !u!1 &1845169531071616 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 4162236002511050} - - component: {fileID: 212008642798578640} + - component: {fileID: 224766342451082296} + - component: {fileID: 222480346266569002} + - component: {fileID: 114578215827768836} + - component: {fileID: 114202162810099450} + - component: {fileID: 114692116265799192} m_Layer: 10 - m_Name: LabelIcon + m_Name: TextBackground m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4162236002511050 +--- !u!4 &4313779964940754 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1733686239018384} + m_GameObject: {fileID: 1292503684160346} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 3, z: 0} - m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} + m_LocalPosition: {x: -14, y: 3.75, z: -1.33} + m_LocalScale: {x: 2.143244, y: 2.143244, z: 2.143244} m_Children: [] - m_Father: {fileID: 224247300890674866} - m_RootOrder: 2 + m_Father: {fileID: 224030423811238682} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &23953474672158714 -MeshRenderer: +--- !u!114 &114159563624705982 +MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1265934954306918} + m_GameObject: {fileID: 1746901838054686} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: 7dfc2e1472ac84e1bb749a8a9f934483, type: 3} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!102 &102524361988852780 -TextMesh: - serializedVersion: 3 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &114202162810099450 +MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1265934954306918} - m_Text: - m_OffsetZ: -1 - m_CharacterSize: 1 - m_LineSpacing: 1 - m_Anchor: 4 - m_Alignment: 1 - m_TabSize: 4 - m_FontSize: 200 - m_FontStyle: 0 - m_RichText: 1 - m_Font: {fileID: 12800000, guid: 7dfc2e1472ac84e1bb749a8a9f934483, type: 3} - m_Color: - serializedVersion: 2 - rgba: 4294967295 ---- !u!114 &114051004161669530 + m_GameObject: {fileID: 1845169531071616} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &114257982971136964 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1672087740313684} + m_GameObject: {fileID: 1396740541782364} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 22805dac1b8933d49b89c409a8903cde, type: 3} + m_Name: + m_EditorClassIdentifier: + _camera: {fileID: 0} +--- !u!114 &114326163339638534 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1746901838054686} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: bd1ea67ca2b5742d1a24fcbdc17c55e1, type: 3} + m_FontSize: 180 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 300 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Placeholder Text +--- !u!114 &114413777003902038 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1396740541782364} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ba99666da3af044c0ae878f372ea4115, type: 3} + m_Name: + m_EditorClassIdentifier: + _text: {fileID: 114326163339638534} + _background: {fileID: 114578215827768836} +--- !u!114 &114578215827768836 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1845169531071616} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -175,37 +206,34 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &114354941156370630 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1707885508695930} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ba99666da3af044c0ae878f372ea4115, type: 3} - m_Name: - m_EditorClassIdentifier: - _textMesh: {fileID: 102524361988852780} - _background: {fileID: 114051004161669530} ---- !u!114 &114862004446283512 +--- !u!114 &114692116265799192 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1707885508695930} + m_GameObject: {fileID: 1845169531071616} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 22805dac1b8933d49b89c409a8903cde, type: 3} + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - _camera: {fileID: 0} ---- !u!212 &212008642798578640 + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 +--- !u!212 &212222304942764664 SpriteRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1733686239018384} + m_GameObject: {fileID: 1292503684160346} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -244,24 +272,24 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 ---- !u!222 &222132644478461976 +--- !u!222 &222480346266569002 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1265934954306918} ---- !u!222 &222675931880023072 + m_GameObject: {fileID: 1845169531071616} +--- !u!222 &222882829815511386 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1672087740313684} ---- !u!223 &223163049547055646 + m_GameObject: {fileID: 1746901838054686} +--- !u!223 &223969381223222710 Canvas: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1707885508695930} + m_GameObject: {fileID: 1396740541782364} m_Enabled: 1 serializedVersion: 3 m_RenderMode: 2 @@ -276,60 +304,60 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!224 &224247300890674866 +--- !u!224 &224030423811238682 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1707885508695930} + m_GameObject: {fileID: 1396740541782364} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 4, y: 4, z: 4} m_Children: - - {fileID: 224296160621579024} - - {fileID: 224460406485636372} - - {fileID: 4162236002511050} + - {fileID: 224766342451082296} + - {fileID: 4313779964940754} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 3} + m_AnchoredPosition: {x: -14, y: 3} m_SizeDelta: {x: 5, y: 5} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224296160621579024 +--- !u!224 &224766342451082296 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1672087740313684} + m_GameObject: {fileID: 1845169531071616} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 224247300890674866} + m_LocalScale: {x: 0.020000001, y: 0.020000001, z: 0.020000001} + m_Children: + - {fileID: 224924182702299544} + m_Father: {fileID: 224030423811238682} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 3} + m_AnchoredPosition: {x: -14, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224460406485636372 +--- !u!224 &224924182702299544 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1265934954306918} + m_GameObject: {fileID: 1746901838054686} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 224247300890674866} - m_RootOrder: 1 + m_Father: {fileID: 224766342451082296} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 698, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} diff --git a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/DefaultPoiLabelPrefab.prefab.meta b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/DefaultPoiLabelPrefab.prefab.meta index f8e98e276..ed52ca504 100644 --- a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/DefaultPoiLabelPrefab.prefab.meta +++ b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/DefaultPoiLabelPrefab.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: d748e6a0b26334f4d933c1438339484d -timeCreated: 1523314292 +timeCreated: 1527197790 licenseType: Pro NativeFormatImporter: externalObjects: {} diff --git a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/FoodPoiLabelPrefab.prefab b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/FoodPoiLabelPrefab.prefab index 57fe5047b..7f70bfc15 100644 --- a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/FoodPoiLabelPrefab.prefab +++ b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/FoodPoiLabelPrefab.prefab @@ -11,34 +11,36 @@ Prefab: m_ParentPrefab: {fileID: 0} m_RootGameObject: {fileID: 1707885508695930} m_IsPrefabParent: 1 ---- !u!1 &1265934954306918 +--- !u!1 &1189325480219374 GameObject: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224460406485636372} - - component: {fileID: 23953474672158714} - - component: {fileID: 102524361988852780} - - component: {fileID: 222132644478461976} + - component: {fileID: 224624196988776878} + - component: {fileID: 222370072117198688} + - component: {fileID: 114349136819514582} + - component: {fileID: 114045605651210526} m_Layer: 10 - m_Name: TextMesh + m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1672087740313684 +--- !u!1 &1457276987270130 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224296160621579024} - - component: {fileID: 222675931880023072} - - component: {fileID: 114051004161669530} + - component: {fileID: 224412850433162780} + - component: {fileID: 222149120586535960} + - component: {fileID: 114704683156925328} + - component: {fileID: 114998721219635902} + - component: {fileID: 114647201446152978} m_Layer: 10 m_Name: TextBackground m_TagString: Untagged @@ -87,73 +89,86 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1733686239018384} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 3, z: 0} - m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} + m_LocalPosition: {x: -13.8, y: 4.2, z: -1.33} + m_LocalScale: {x: 2.1432443, y: 2.143244, z: 2.143244} m_Children: [] m_Father: {fileID: 224247300890674866} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &23953474672158714 -MeshRenderer: +--- !u!114 &114045605651210526 +MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1265934954306918} + m_GameObject: {fileID: 1189325480219374} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: 7dfc2e1472ac84e1bb749a8a9f934483, type: 3} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!102 &102524361988852780 -TextMesh: - serializedVersion: 3 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &114349136819514582 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1189325480219374} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: bd1ea67ca2b5742d1a24fcbdc17c55e1, type: 3} + m_FontSize: 180 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 300 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Placeholder Text +--- !u!114 &114647201446152978 +MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1265934954306918} - m_Text: - m_OffsetZ: -1 - m_CharacterSize: 1 - m_LineSpacing: 1 - m_Anchor: 4 - m_Alignment: 1 - m_TabSize: 4 - m_FontSize: 200 - m_FontStyle: 0 - m_RichText: 1 - m_Font: {fileID: 12800000, guid: 7dfc2e1472ac84e1bb749a8a9f934483, type: 3} - m_Color: - serializedVersion: 2 - rgba: 4294967295 ---- !u!114 &114051004161669530 + m_GameObject: {fileID: 1457276987270130} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 +--- !u!114 &114704683156925328 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1672087740313684} + m_GameObject: {fileID: 1457276987270130} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -186,8 +201,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ba99666da3af044c0ae878f372ea4115, type: 3} m_Name: m_EditorClassIdentifier: - _textMesh: {fileID: 102524361988852780} - _background: {fileID: 114051004161669530} + _text: {fileID: 114349136819514582} + _background: {fileID: 114704683156925328} --- !u!114 &114862004446283512 MonoBehaviour: m_ObjectHideFlags: 1 @@ -200,6 +215,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _camera: {fileID: 0} +--- !u!114 &114998721219635902 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1457276987270130} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 --- !u!212 &212008642798578640 SpriteRenderer: m_ObjectHideFlags: 1 @@ -244,18 +272,18 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 ---- !u!222 &222132644478461976 +--- !u!222 &222149120586535960 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1265934954306918} ---- !u!222 &222675931880023072 + m_GameObject: {fileID: 1457276987270130} +--- !u!222 &222370072117198688 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1672087740313684} + m_GameObject: {fileID: 1189325480219374} --- !u!223 &223163049547055646 Canvas: m_ObjectHideFlags: 1 @@ -284,52 +312,52 @@ RectTransform: m_GameObject: {fileID: 1707885508695930} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 4, y: 4, z: 4} m_Children: - - {fileID: 224296160621579024} - - {fileID: 224460406485636372} + - {fileID: 224412850433162780} - {fileID: 4162236002511050} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 3} + m_AnchoredPosition: {x: -14, y: 3} m_SizeDelta: {x: 5, y: 5} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224296160621579024 +--- !u!224 &224412850433162780 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1672087740313684} + m_GameObject: {fileID: 1457276987270130} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_LocalScale: {x: 0.020000001, y: 0.020000001, z: 0.020000001} + m_Children: + - {fileID: 224624196988776878} m_Father: {fileID: 224247300890674866} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 3} + m_AnchoredPosition: {x: -14, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224460406485636372 +--- !u!224 &224624196988776878 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1265934954306918} + m_GameObject: {fileID: 1189325480219374} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 224247300890674866} - m_RootOrder: 1 + m_Father: {fileID: 224412850433162780} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 698, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} diff --git a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/NightlifePoiLabelPrefab.prefab b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/NightlifePoiLabelPrefab.prefab index 3ad2dfa51..97edd7795 100644 --- a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/NightlifePoiLabelPrefab.prefab +++ b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/NightlifePoiLabelPrefab.prefab @@ -9,151 +9,145 @@ Prefab: m_Modifications: [] m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1707885508695930} + m_RootGameObject: {fileID: 1424114192387644} m_IsPrefabParent: 1 ---- !u!1 &1265934954306918 +--- !u!1 &1139598083911944 GameObject: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224460406485636372} - - component: {fileID: 23953474672158714} - - component: {fileID: 102524361988852780} - - component: {fileID: 222132644478461976} + - component: {fileID: 224422428331375356} + - component: {fileID: 222242750269825858} + - component: {fileID: 114692428661833728} + - component: {fileID: 114824037733315064} m_Layer: 10 - m_Name: TextMesh + m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1672087740313684 +--- !u!1 &1424114192387644 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224296160621579024} - - component: {fileID: 222675931880023072} - - component: {fileID: 114051004161669530} + - component: {fileID: 224210809402533110} + - component: {fileID: 114347475860375664} + - component: {fileID: 223791692523062612} + - component: {fileID: 114079454347144290} m_Layer: 10 - m_Name: TextBackground + m_Name: NightlifePoiLabelPrefab m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1707885508695930 +--- !u!1 &1564163789704960 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224247300890674866} - - component: {fileID: 114862004446283512} - - component: {fileID: 223163049547055646} - - component: {fileID: 114202860846738256} + - component: {fileID: 4249837737002090} + - component: {fileID: 212187017409953766} m_Layer: 10 - m_Name: NightlifePoiLabelPrefab + m_Name: LabelIcon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1733686239018384 +--- !u!1 &1962226126752764 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 4162236002511050} - - component: {fileID: 212008642798578640} + - component: {fileID: 224154799150308216} + - component: {fileID: 222879563942261794} + - component: {fileID: 114470481600307948} + - component: {fileID: 114573363496354548} + - component: {fileID: 114363323314846268} m_Layer: 10 - m_Name: LabelIcon + m_Name: TextBackground m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4162236002511050 +--- !u!4 &4249837737002090 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1733686239018384} + m_GameObject: {fileID: 1564163789704960} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 3, z: 0} - m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} + m_LocalPosition: {x: -14, y: 3.75, z: -1.33} + m_LocalScale: {x: 2.143244, y: 2.143244, z: 2.143244} m_Children: [] - m_Father: {fileID: 224247300890674866} - m_RootOrder: 2 + m_Father: {fileID: 224210809402533110} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &23953474672158714 -MeshRenderer: +--- !u!114 &114079454347144290 +MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1265934954306918} + m_GameObject: {fileID: 1424114192387644} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: 7dfc2e1472ac84e1bb749a8a9f934483, type: 3} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!102 &102524361988852780 -TextMesh: - serializedVersion: 3 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ba99666da3af044c0ae878f372ea4115, type: 3} + m_Name: + m_EditorClassIdentifier: + _text: {fileID: 114692428661833728} + _background: {fileID: 114470481600307948} +--- !u!114 &114347475860375664 +MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1265934954306918} - m_Text: - m_OffsetZ: -1 - m_CharacterSize: 1 - m_LineSpacing: 1 - m_Anchor: 4 - m_Alignment: 1 - m_TabSize: 4 - m_FontSize: 200 - m_FontStyle: 0 - m_RichText: 1 - m_Font: {fileID: 12800000, guid: 7dfc2e1472ac84e1bb749a8a9f934483, type: 3} - m_Color: - serializedVersion: 2 - rgba: 4294967295 ---- !u!114 &114051004161669530 + m_GameObject: {fileID: 1424114192387644} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 22805dac1b8933d49b89c409a8903cde, type: 3} + m_Name: + m_EditorClassIdentifier: + _camera: {fileID: 0} +--- !u!114 &114363323314846268 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1672087740313684} + m_GameObject: {fileID: 1962226126752764} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 +--- !u!114 &114470481600307948 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1962226126752764} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -175,37 +169,71 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &114202860846738256 +--- !u!114 &114573363496354548 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1707885508695930} + m_GameObject: {fileID: 1962226126752764} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ba99666da3af044c0ae878f372ea4115, type: 3} + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - _textMesh: {fileID: 102524361988852780} - _background: {fileID: 114051004161669530} ---- !u!114 &114862004446283512 + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &114692428661833728 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1707885508695930} + m_GameObject: {fileID: 1139598083911944} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 22805dac1b8933d49b89c409a8903cde, type: 3} + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - _camera: {fileID: 0} ---- !u!212 &212008642798578640 + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: bd1ea67ca2b5742d1a24fcbdc17c55e1, type: 3} + m_FontSize: 180 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 300 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Placeholder Text +--- !u!114 &114824037733315064 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1139598083911944} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!212 &212187017409953766 SpriteRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1733686239018384} + m_GameObject: {fileID: 1564163789704960} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -244,24 +272,24 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 ---- !u!222 &222132644478461976 +--- !u!222 &222242750269825858 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1265934954306918} ---- !u!222 &222675931880023072 + m_GameObject: {fileID: 1139598083911944} +--- !u!222 &222879563942261794 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1672087740313684} ---- !u!223 &223163049547055646 + m_GameObject: {fileID: 1962226126752764} +--- !u!223 &223791692523062612 Canvas: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1707885508695930} + m_GameObject: {fileID: 1424114192387644} m_Enabled: 1 serializedVersion: 3 m_RenderMode: 2 @@ -276,60 +304,60 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!224 &224247300890674866 +--- !u!224 &224154799150308216 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1707885508695930} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 1962226126752764} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.020000001, y: 0.020000001, z: 0.020000001} m_Children: - - {fileID: 224296160621579024} - - {fileID: 224460406485636372} - - {fileID: 4162236002511050} - m_Father: {fileID: 0} + - {fileID: 224422428331375356} + m_Father: {fileID: 224210809402533110} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 3} - m_SizeDelta: {x: 5, y: 5} + m_AnchoredPosition: {x: -14, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224296160621579024 +--- !u!224 &224210809402533110 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1672087740313684} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 1424114192387644} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 224247300890674866} + m_LocalScale: {x: 4, y: 4, z: 4} + m_Children: + - {fileID: 224154799150308216} + - {fileID: 4249837737002090} + m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 3} + m_AnchoredPosition: {x: -14, y: 3} + m_SizeDelta: {x: 5, y: 5} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224460406485636372 +--- !u!224 &224422428331375356 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1265934954306918} + m_GameObject: {fileID: 1139598083911944} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 224247300890674866} - m_RootOrder: 1 + m_Father: {fileID: 224154799150308216} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 698, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} diff --git a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/NightlifePoiLabelPrefab.prefab.meta b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/NightlifePoiLabelPrefab.prefab.meta index d51b58798..3aed98346 100644 --- a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/NightlifePoiLabelPrefab.prefab.meta +++ b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/NightlifePoiLabelPrefab.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 61bcd2d324dd34bb9b722d856749c28c -timeCreated: 1523314292 +timeCreated: 1527197998 licenseType: Pro NativeFormatImporter: externalObjects: {} diff --git a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/OutdoorPoiLabelPrefab.prefab b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/OutdoorPoiLabelPrefab.prefab index 7c4eb8f85..891a1d7f7 100644 --- a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/OutdoorPoiLabelPrefab.prefab +++ b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/OutdoorPoiLabelPrefab.prefab @@ -9,203 +9,231 @@ Prefab: m_Modifications: [] m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1707885508695930} + m_RootGameObject: {fileID: 1004221095257992} m_IsPrefabParent: 1 ---- !u!1 &1265934954306918 +--- !u!1 &1004221095257992 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224460406485636372} - - component: {fileID: 23953474672158714} - - component: {fileID: 102524361988852780} - - component: {fileID: 222132644478461976} + - component: {fileID: 224697045332689684} + - component: {fileID: 114230065919782620} + - component: {fileID: 223268923490078138} + - component: {fileID: 114346654055798904} m_Layer: 10 - m_Name: TextMesh + m_Name: OutdoorPoiLabelPrefab m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1672087740313684 +--- !u!1 &1085748494245196 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224296160621579024} - - component: {fileID: 222675931880023072} - - component: {fileID: 114051004161669530} + - component: {fileID: 4196941624106064} + - component: {fileID: 212457671412055602} m_Layer: 10 - m_Name: TextBackground + m_Name: LabelIcon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1707885508695930 +--- !u!1 &1324167948117656 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224247300890674866} - - component: {fileID: 114862004446283512} - - component: {fileID: 223163049547055646} - - component: {fileID: 114911108916016812} + - component: {fileID: 224268754250336072} + - component: {fileID: 222833602635793852} + - component: {fileID: 114728776789975380} + - component: {fileID: 114727558933577938} + - component: {fileID: 114012080040735814} m_Layer: 10 - m_Name: OutdoorPoiLabelPrefab + m_Name: TextBackground m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1733686239018384 +--- !u!1 &1334765807688498 GameObject: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 4162236002511050} - - component: {fileID: 212008642798578640} + - component: {fileID: 224325099516681702} + - component: {fileID: 222661059492819030} + - component: {fileID: 114354945941583394} + - component: {fileID: 114219887372327000} m_Layer: 10 - m_Name: LabelIcon + m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4162236002511050 +--- !u!4 &4196941624106064 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1733686239018384} + m_GameObject: {fileID: 1085748494245196} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 3, z: 0} - m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} + m_LocalPosition: {x: -14, y: 3.75, z: -1.33} + m_LocalScale: {x: 2.143244, y: 2.143244, z: 2.143244} m_Children: [] - m_Father: {fileID: 224247300890674866} - m_RootOrder: 2 + m_Father: {fileID: 224697045332689684} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &23953474672158714 -MeshRenderer: +--- !u!114 &114012080040735814 +MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1265934954306918} + m_GameObject: {fileID: 1324167948117656} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: 7dfc2e1472ac84e1bb749a8a9f934483, type: 3} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!102 &102524361988852780 -TextMesh: - serializedVersion: 3 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 +--- !u!114 &114219887372327000 +MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1265934954306918} - m_Text: - m_OffsetZ: -1 - m_CharacterSize: 1 - m_LineSpacing: 1 - m_Anchor: 4 - m_Alignment: 1 - m_TabSize: 4 - m_FontSize: 200 - m_FontStyle: 0 - m_RichText: 1 - m_Font: {fileID: 12800000, guid: 7dfc2e1472ac84e1bb749a8a9f934483, type: 3} - m_Color: - serializedVersion: 2 - rgba: 4294967295 ---- !u!114 &114051004161669530 + m_GameObject: {fileID: 1334765807688498} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &114230065919782620 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1672087740313684} + m_GameObject: {fileID: 1004221095257992} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 22805dac1b8933d49b89c409a8903cde, type: 3} + m_Name: + m_EditorClassIdentifier: + _camera: {fileID: 0} +--- !u!114 &114346654055798904 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1004221095257992} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ba99666da3af044c0ae878f372ea4115, type: 3} + m_Name: + m_EditorClassIdentifier: + _text: {fileID: 114354945941583394} + _background: {fileID: 114728776789975380} +--- !u!114 &114354945941583394 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1334765807688498} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.14901961, g: 0.58431375, b: 0.38039216, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!114 &114862004446283512 + m_FontData: + m_Font: {fileID: 12800000, guid: bd1ea67ca2b5742d1a24fcbdc17c55e1, type: 3} + m_FontSize: 180 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 300 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Placeholder Text +--- !u!114 &114727558933577938 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1707885508695930} + m_GameObject: {fileID: 1324167948117656} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 22805dac1b8933d49b89c409a8903cde, type: 3} + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - _camera: {fileID: 0} ---- !u!114 &114911108916016812 + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &114728776789975380 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1707885508695930} + m_GameObject: {fileID: 1324167948117656} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ba99666da3af044c0ae878f372ea4115, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - _textMesh: {fileID: 102524361988852780} - _background: {fileID: 114051004161669530} ---- !u!212 &212008642798578640 + m_Material: {fileID: 0} + m_Color: {r: 0.14901961, g: 0.58431375, b: 0.38039216, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!212 &212457671412055602 SpriteRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1733686239018384} + m_GameObject: {fileID: 1085748494245196} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -244,24 +272,24 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 ---- !u!222 &222132644478461976 +--- !u!222 &222661059492819030 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1265934954306918} ---- !u!222 &222675931880023072 + m_GameObject: {fileID: 1334765807688498} +--- !u!222 &222833602635793852 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1672087740313684} ---- !u!223 &223163049547055646 + m_GameObject: {fileID: 1324167948117656} +--- !u!223 &223268923490078138 Canvas: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1707885508695930} + m_GameObject: {fileID: 1004221095257992} m_Enabled: 1 serializedVersion: 3 m_RenderMode: 2 @@ -276,60 +304,60 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!224 &224247300890674866 +--- !u!224 &224268754250336072 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1707885508695930} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 1324167948117656} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.020000001, y: 0.020000001, z: 0.020000001} m_Children: - - {fileID: 224296160621579024} - - {fileID: 224460406485636372} - - {fileID: 4162236002511050} - m_Father: {fileID: 0} + - {fileID: 224325099516681702} + m_Father: {fileID: 224697045332689684} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 3} - m_SizeDelta: {x: 5, y: 5} + m_AnchoredPosition: {x: -14, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224296160621579024 +--- !u!224 &224325099516681702 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1672087740313684} + m_GameObject: {fileID: 1334765807688498} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 224247300890674866} + m_Father: {fileID: 224268754250336072} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 3} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 698, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224460406485636372 +--- !u!224 &224697045332689684 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1265934954306918} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 1004221095257992} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} - m_Children: [] - m_Father: {fileID: 224247300890674866} - m_RootOrder: 1 + m_LocalScale: {x: 4, y: 4, z: 4} + m_Children: + - {fileID: 224268754250336072} + - {fileID: 4196941624106064} + m_Father: {fileID: 0} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: -14, y: 3} + m_SizeDelta: {x: 5, y: 5} m_Pivot: {x: 0.5, y: 0.5} diff --git a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/OutdoorPoiLabelPrefab.prefab.meta b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/OutdoorPoiLabelPrefab.prefab.meta index adba59456..b49f7d96d 100644 --- a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/OutdoorPoiLabelPrefab.prefab.meta +++ b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/OutdoorPoiLabelPrefab.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: b0e54a880e97f4c5ead7dcc1c0918e05 -timeCreated: 1523314292 +timeCreated: 1527198080 licenseType: Pro NativeFormatImporter: externalObjects: {} diff --git a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/ServicePoiLabelPrefab.prefab b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/ServicePoiLabelPrefab.prefab index 66578f3c4..d233de115 100644 --- a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/ServicePoiLabelPrefab.prefab +++ b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/ServicePoiLabelPrefab.prefab @@ -9,70 +9,72 @@ Prefab: m_Modifications: [] m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1707885508695930} + m_RootGameObject: {fileID: 1550249727436304} m_IsPrefabParent: 1 ---- !u!1 &1265934954306918 +--- !u!1 &1388528484174694 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224460406485636372} - - component: {fileID: 23953474672158714} - - component: {fileID: 102524361988852780} - - component: {fileID: 222132644478461976} + - component: {fileID: 224561070649640738} + - component: {fileID: 222816397402481402} + - component: {fileID: 114269471373682478} + - component: {fileID: 114135850898149578} + - component: {fileID: 114618566063731686} m_Layer: 10 - m_Name: TextMesh + m_Name: TextBackground m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1672087740313684 +--- !u!1 &1550249727436304 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224296160621579024} - - component: {fileID: 222675931880023072} - - component: {fileID: 114051004161669530} + - component: {fileID: 224564660901456998} + - component: {fileID: 114411151926404462} + - component: {fileID: 223687135526774410} + - component: {fileID: 114958483898210508} m_Layer: 10 - m_Name: TextBackground + m_Name: ServicePoiLabelPrefab m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1707885508695930 +--- !u!1 &1703732941097044 GameObject: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224247300890674866} - - component: {fileID: 114862004446283512} - - component: {fileID: 223163049547055646} - - component: {fileID: 114280324952901670} + - component: {fileID: 224439370673493072} + - component: {fileID: 222677277816497252} + - component: {fileID: 114834841667761492} + - component: {fileID: 114244664709860616} m_Layer: 10 - m_Name: ServicePoiLabelPrefab + m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1733686239018384 +--- !u!1 &1811557742726476 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 4162236002511050} - - component: {fileID: 212008642798578640} + - component: {fileID: 4443302213748912} + - component: {fileID: 212657809318268000} m_Layer: 10 m_Name: LabelIcon m_TagString: Untagged @@ -80,80 +82,51 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4162236002511050 +--- !u!4 &4443302213748912 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1733686239018384} + m_GameObject: {fileID: 1811557742726476} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 3, z: 0} - m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} + m_LocalPosition: {x: -14, y: 3.75, z: -1.33} + m_LocalScale: {x: 2.143244, y: 2.143244, z: 2.143244} m_Children: [] - m_Father: {fileID: 224247300890674866} - m_RootOrder: 2 + m_Father: {fileID: 224564660901456998} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &23953474672158714 -MeshRenderer: +--- !u!114 &114135850898149578 +MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1265934954306918} + m_GameObject: {fileID: 1388528484174694} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: 7dfc2e1472ac84e1bb749a8a9f934483, type: 3} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!102 &102524361988852780 -TextMesh: - serializedVersion: 3 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &114244664709860616 +MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1265934954306918} - m_Text: - m_OffsetZ: -1 - m_CharacterSize: 1 - m_LineSpacing: 1 - m_Anchor: 4 - m_Alignment: 1 - m_TabSize: 4 - m_FontSize: 200 - m_FontStyle: 0 - m_RichText: 1 - m_Font: {fileID: 12800000, guid: 7dfc2e1472ac84e1bb749a8a9f934483, type: 3} - m_Color: - serializedVersion: 2 - rgba: 4294967295 ---- !u!114 &114051004161669530 + m_GameObject: {fileID: 1703732941097044} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &114269471373682478 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1672087740313684} + m_GameObject: {fileID: 1388528484174694} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -175,37 +148,92 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &114280324952901670 +--- !u!114 &114411151926404462 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1707885508695930} + m_GameObject: {fileID: 1550249727436304} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ba99666da3af044c0ae878f372ea4115, type: 3} + m_Script: {fileID: 11500000, guid: 22805dac1b8933d49b89c409a8903cde, type: 3} m_Name: m_EditorClassIdentifier: - _textMesh: {fileID: 102524361988852780} - _background: {fileID: 114051004161669530} ---- !u!114 &114862004446283512 + _camera: {fileID: 0} +--- !u!114 &114618566063731686 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1707885508695930} + m_GameObject: {fileID: 1388528484174694} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 22805dac1b8933d49b89c409a8903cde, type: 3} + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - _camera: {fileID: 0} ---- !u!212 &212008642798578640 + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 +--- !u!114 &114834841667761492 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1703732941097044} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: bd1ea67ca2b5742d1a24fcbdc17c55e1, type: 3} + m_FontSize: 180 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 300 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Placeholder Text +--- !u!114 &114958483898210508 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1550249727436304} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ba99666da3af044c0ae878f372ea4115, type: 3} + m_Name: + m_EditorClassIdentifier: + _text: {fileID: 114834841667761492} + _background: {fileID: 114269471373682478} +--- !u!212 &212657809318268000 SpriteRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1733686239018384} + m_GameObject: {fileID: 1811557742726476} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -244,24 +272,24 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 ---- !u!222 &222132644478461976 +--- !u!222 &222677277816497252 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1265934954306918} ---- !u!222 &222675931880023072 + m_GameObject: {fileID: 1703732941097044} +--- !u!222 &222816397402481402 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1672087740313684} ---- !u!223 &223163049547055646 + m_GameObject: {fileID: 1388528484174694} +--- !u!223 &223687135526774410 Canvas: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1707885508695930} + m_GameObject: {fileID: 1550249727436304} m_Enabled: 1 serializedVersion: 3 m_RenderMode: 2 @@ -276,60 +304,60 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!224 &224247300890674866 +--- !u!224 &224439370673493072 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1707885508695930} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 1703732941097044} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 224296160621579024} - - {fileID: 224460406485636372} - - {fileID: 4162236002511050} - m_Father: {fileID: 0} + m_Children: [] + m_Father: {fileID: 224561070649640738} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 3} - m_SizeDelta: {x: 5, y: 5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 698, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224296160621579024 +--- !u!224 &224561070649640738 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1672087740313684} + m_GameObject: {fileID: 1388528484174694} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 224247300890674866} + m_LocalScale: {x: 0.020000001, y: 0.020000001, z: 0.020000001} + m_Children: + - {fileID: 224439370673493072} + m_Father: {fileID: 224564660901456998} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 3} + m_AnchoredPosition: {x: -14, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224460406485636372 +--- !u!224 &224564660901456998 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1265934954306918} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 1550249727436304} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} - m_Children: [] - m_Father: {fileID: 224247300890674866} - m_RootOrder: 1 + m_LocalScale: {x: 4, y: 4, z: 4} + m_Children: + - {fileID: 224561070649640738} + - {fileID: 4443302213748912} + m_Father: {fileID: 0} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: -14, y: 3} + m_SizeDelta: {x: 5, y: 5} m_Pivot: {x: 0.5, y: 0.5} diff --git a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/ServicePoiLabelPrefab.prefab.meta b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/ServicePoiLabelPrefab.prefab.meta index 674f06b9b..f1a199b4b 100644 --- a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/ServicePoiLabelPrefab.prefab.meta +++ b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/ServicePoiLabelPrefab.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 60a41cfc23d514878814f0d425912eff -timeCreated: 1523314292 +timeCreated: 1527198268 licenseType: Pro NativeFormatImporter: externalObjects: {} diff --git a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/ShopPoiLabelPrefab.prefab b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/ShopPoiLabelPrefab.prefab index ef14367b3..0264a0f39 100644 --- a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/ShopPoiLabelPrefab.prefab +++ b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/ShopPoiLabelPrefab.prefab @@ -9,70 +9,72 @@ Prefab: m_Modifications: [] m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1707885508695930} + m_RootGameObject: {fileID: 1665298560487606} m_IsPrefabParent: 1 ---- !u!1 &1265934954306918 +--- !u!1 &1444467056296288 GameObject: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224460406485636372} - - component: {fileID: 23953474672158714} - - component: {fileID: 102524361988852780} - - component: {fileID: 222132644478461976} + - component: {fileID: 224098334656958960} + - component: {fileID: 222340057222360330} + - component: {fileID: 114366715499295196} + - component: {fileID: 114230558117708252} m_Layer: 10 - m_Name: TextMesh + m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1672087740313684 +--- !u!1 &1665298560487606 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224296160621579024} - - component: {fileID: 222675931880023072} - - component: {fileID: 114051004161669530} + - component: {fileID: 224217757915894418} + - component: {fileID: 114028682954861286} + - component: {fileID: 223040127970496470} + - component: {fileID: 114773685892043796} m_Layer: 10 - m_Name: TextBackground + m_Name: ShopPoiLabelPrefab m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1707885508695930 +--- !u!1 &1780759975101526 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224247300890674866} - - component: {fileID: 114862004446283512} - - component: {fileID: 223163049547055646} - - component: {fileID: 114567880144019398} + - component: {fileID: 224798898366651696} + - component: {fileID: 222076934418866904} + - component: {fileID: 114413730570487816} + - component: {fileID: 114276377448501972} + - component: {fileID: 114437480781528488} m_Layer: 10 - m_Name: ShopPoiLabelPrefab + m_Name: TextBackground m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1733686239018384 +--- !u!1 &1979517982270276 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 4162236002511050} - - component: {fileID: 212008642798578640} + - component: {fileID: 4114189036734000} + - component: {fileID: 212138595724354360} m_Layer: 10 m_Name: LabelIcon m_TagString: Untagged @@ -80,80 +82,96 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4162236002511050 +--- !u!4 &4114189036734000 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1733686239018384} + m_GameObject: {fileID: 1979517982270276} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 3, z: 0} - m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} + m_LocalPosition: {x: -14, y: 3.75, z: -1.33} + m_LocalScale: {x: 2.143244, y: 2.143244, z: 2.143244} m_Children: [] - m_Father: {fileID: 224247300890674866} - m_RootOrder: 2 + m_Father: {fileID: 224217757915894418} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &23953474672158714 -MeshRenderer: +--- !u!114 &114028682954861286 +MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1265934954306918} + m_GameObject: {fileID: 1665298560487606} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: 7dfc2e1472ac84e1bb749a8a9f934483, type: 3} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!102 &102524361988852780 -TextMesh: - serializedVersion: 3 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 22805dac1b8933d49b89c409a8903cde, type: 3} + m_Name: + m_EditorClassIdentifier: + _camera: {fileID: 0} +--- !u!114 &114230558117708252 +MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1265934954306918} - m_Text: - m_OffsetZ: -1 - m_CharacterSize: 1 - m_LineSpacing: 1 - m_Anchor: 4 - m_Alignment: 1 - m_TabSize: 4 - m_FontSize: 200 - m_FontStyle: 0 - m_RichText: 1 - m_Font: {fileID: 12800000, guid: 7dfc2e1472ac84e1bb749a8a9f934483, type: 3} - m_Color: - serializedVersion: 2 - rgba: 4294967295 ---- !u!114 &114051004161669530 + m_GameObject: {fileID: 1444467056296288} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &114276377448501972 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1672087740313684} + m_GameObject: {fileID: 1780759975101526} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &114366715499295196 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1444467056296288} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: bd1ea67ca2b5742d1a24fcbdc17c55e1, type: 3} + m_FontSize: 180 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 300 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Placeholder Text +--- !u!114 &114413730570487816 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1780759975101526} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -175,37 +193,47 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &114567880144019398 +--- !u!114 &114437480781528488 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1707885508695930} + m_GameObject: {fileID: 1780759975101526} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ba99666da3af044c0ae878f372ea4115, type: 3} + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - _textMesh: {fileID: 102524361988852780} - _background: {fileID: 114051004161669530} ---- !u!114 &114862004446283512 + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 +--- !u!114 &114773685892043796 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1707885508695930} + m_GameObject: {fileID: 1665298560487606} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 22805dac1b8933d49b89c409a8903cde, type: 3} + m_Script: {fileID: 11500000, guid: ba99666da3af044c0ae878f372ea4115, type: 3} m_Name: m_EditorClassIdentifier: - _camera: {fileID: 0} ---- !u!212 &212008642798578640 + _text: {fileID: 114366715499295196} + _background: {fileID: 114413730570487816} +--- !u!212 &212138595724354360 SpriteRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1733686239018384} + m_GameObject: {fileID: 1979517982270276} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -244,24 +272,24 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 ---- !u!222 &222132644478461976 +--- !u!222 &222076934418866904 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1265934954306918} ---- !u!222 &222675931880023072 + m_GameObject: {fileID: 1780759975101526} +--- !u!222 &222340057222360330 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1672087740313684} ---- !u!223 &223163049547055646 + m_GameObject: {fileID: 1444467056296288} +--- !u!223 &223040127970496470 Canvas: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1707885508695930} + m_GameObject: {fileID: 1665298560487606} m_Enabled: 1 serializedVersion: 3 m_RenderMode: 2 @@ -276,60 +304,60 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!224 &224247300890674866 +--- !u!224 &224098334656958960 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1707885508695930} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 1444467056296288} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 224296160621579024} - - {fileID: 224460406485636372} - - {fileID: 4162236002511050} - m_Father: {fileID: 0} + m_Children: [] + m_Father: {fileID: 224798898366651696} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 3} - m_SizeDelta: {x: 5, y: 5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 698, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224296160621579024 +--- !u!224 &224217757915894418 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1672087740313684} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 1665298560487606} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 224247300890674866} + m_LocalScale: {x: 4, y: 4, z: 4} + m_Children: + - {fileID: 224798898366651696} + - {fileID: 4114189036734000} + m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 3} + m_AnchoredPosition: {x: -14, y: 3} + m_SizeDelta: {x: 5, y: 5} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224460406485636372 +--- !u!224 &224798898366651696 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1265934954306918} + m_GameObject: {fileID: 1780759975101526} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} - m_Children: [] - m_Father: {fileID: 224247300890674866} - m_RootOrder: 1 + m_LocalScale: {x: 0.020000001, y: 0.020000001, z: 0.020000001} + m_Children: + - {fileID: 224098334656958960} + m_Father: {fileID: 224217757915894418} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: -14, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} diff --git a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/ShopPoiLabelPrefab.prefab.meta b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/ShopPoiLabelPrefab.prefab.meta index a9f00020f..bced6b30f 100644 --- a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/ShopPoiLabelPrefab.prefab.meta +++ b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/ShopPoiLabelPrefab.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 49bc5d782d9184533a37abea20ed30e4 -timeCreated: 1523314292 +timeCreated: 1527198325 licenseType: Pro NativeFormatImporter: externalObjects: {} diff --git a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/TransportationPoiLabelPrefab.prefab b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/TransportationPoiLabelPrefab.prefab index 3275829a6..4a6d53f3b 100644 --- a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/TransportationPoiLabelPrefab.prefab +++ b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/TransportationPoiLabelPrefab.prefab @@ -9,151 +9,191 @@ Prefab: m_Modifications: [] m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1707885508695930} + m_RootGameObject: {fileID: 1295758952425276} m_IsPrefabParent: 1 ---- !u!1 &1265934954306918 +--- !u!1 &1208586745600294 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224460406485636372} - - component: {fileID: 23953474672158714} - - component: {fileID: 102524361988852780} - - component: {fileID: 222132644478461976} + - component: {fileID: 4881803303959862} + - component: {fileID: 212423247285982060} m_Layer: 10 - m_Name: TextMesh + m_Name: LabelIcon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1672087740313684 +--- !u!1 &1295758952425276 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224296160621579024} - - component: {fileID: 222675931880023072} - - component: {fileID: 114051004161669530} + - component: {fileID: 224719232094423712} + - component: {fileID: 114065061957675814} + - component: {fileID: 223504752897195498} + - component: {fileID: 114652372319761880} m_Layer: 10 - m_Name: TextBackground + m_Name: TransportationPoiLabelPrefab m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1707885508695930 +--- !u!1 &1418439391676942 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224247300890674866} - - component: {fileID: 114862004446283512} - - component: {fileID: 223163049547055646} - - component: {fileID: 114145366152452004} + - component: {fileID: 224294137039291060} + - component: {fileID: 222746265049925354} + - component: {fileID: 114702148998547232} + - component: {fileID: 114997537271173470} + - component: {fileID: 114042121892678640} m_Layer: 10 - m_Name: TransportationPoiLabelPrefab + m_Name: TextBackground m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1733686239018384 +--- !u!1 &1800864131950862 GameObject: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 4162236002511050} - - component: {fileID: 212008642798578640} + - component: {fileID: 224083837097222782} + - component: {fileID: 222710272256179442} + - component: {fileID: 114331597656622048} + - component: {fileID: 114604851063711006} m_Layer: 10 - m_Name: LabelIcon + m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4162236002511050 +--- !u!4 &4881803303959862 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1733686239018384} + m_GameObject: {fileID: 1208586745600294} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 3, z: 0} - m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} + m_LocalPosition: {x: -14, y: 3.75, z: -1.33} + m_LocalScale: {x: 2.143244, y: 2.143244, z: 2.143244} m_Children: [] - m_Father: {fileID: 224247300890674866} - m_RootOrder: 2 + m_Father: {fileID: 224719232094423712} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &23953474672158714 -MeshRenderer: +--- !u!114 &114042121892678640 +MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1265934954306918} + m_GameObject: {fileID: 1418439391676942} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: 7dfc2e1472ac84e1bb749a8a9f934483, type: 3} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!102 &102524361988852780 -TextMesh: - serializedVersion: 3 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 +--- !u!114 &114065061957675814 +MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1265934954306918} - m_Text: - m_OffsetZ: -1 - m_CharacterSize: 1 - m_LineSpacing: 1 - m_Anchor: 4 - m_Alignment: 1 - m_TabSize: 4 - m_FontSize: 200 - m_FontStyle: 0 - m_RichText: 1 - m_Font: {fileID: 12800000, guid: 7dfc2e1472ac84e1bb749a8a9f934483, type: 3} - m_Color: - serializedVersion: 2 - rgba: 4294967295 ---- !u!114 &114051004161669530 + m_GameObject: {fileID: 1295758952425276} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 22805dac1b8933d49b89c409a8903cde, type: 3} + m_Name: + m_EditorClassIdentifier: + _camera: {fileID: 0} +--- !u!114 &114331597656622048 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1672087740313684} + m_GameObject: {fileID: 1800864131950862} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: bd1ea67ca2b5742d1a24fcbdc17c55e1, type: 3} + m_FontSize: 180 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 300 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Placeholder Text +--- !u!114 &114604851063711006 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1800864131950862} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &114652372319761880 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1295758952425276} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ba99666da3af044c0ae878f372ea4115, type: 3} + m_Name: + m_EditorClassIdentifier: + _text: {fileID: 114331597656622048} + _background: {fileID: 114702148998547232} +--- !u!114 &114702148998547232 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1418439391676942} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -175,37 +215,25 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &114145366152452004 +--- !u!114 &114997537271173470 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1707885508695930} + m_GameObject: {fileID: 1418439391676942} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ba99666da3af044c0ae878f372ea4115, type: 3} + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - _textMesh: {fileID: 102524361988852780} - _background: {fileID: 114051004161669530} ---- !u!114 &114862004446283512 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1707885508695930} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 22805dac1b8933d49b89c409a8903cde, type: 3} - m_Name: - m_EditorClassIdentifier: - _camera: {fileID: 0} ---- !u!212 &212008642798578640 + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!212 &212423247285982060 SpriteRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1733686239018384} + m_GameObject: {fileID: 1208586745600294} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -244,24 +272,24 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 ---- !u!222 &222132644478461976 +--- !u!222 &222710272256179442 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1265934954306918} ---- !u!222 &222675931880023072 + m_GameObject: {fileID: 1800864131950862} +--- !u!222 &222746265049925354 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1672087740313684} ---- !u!223 &223163049547055646 + m_GameObject: {fileID: 1418439391676942} +--- !u!223 &223504752897195498 Canvas: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1707885508695930} + m_GameObject: {fileID: 1295758952425276} m_Enabled: 1 serializedVersion: 3 m_RenderMode: 2 @@ -276,60 +304,60 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!224 &224247300890674866 +--- !u!224 &224083837097222782 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1707885508695930} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 1800864131950862} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 224296160621579024} - - {fileID: 224460406485636372} - - {fileID: 4162236002511050} - m_Father: {fileID: 0} + m_Children: [] + m_Father: {fileID: 224294137039291060} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 3} - m_SizeDelta: {x: 5, y: 5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 698, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224296160621579024 +--- !u!224 &224294137039291060 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1672087740313684} + m_GameObject: {fileID: 1418439391676942} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 224247300890674866} + m_LocalScale: {x: 0.020000001, y: 0.020000001, z: 0.020000001} + m_Children: + - {fileID: 224083837097222782} + m_Father: {fileID: 224719232094423712} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 3} + m_AnchoredPosition: {x: -14, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224460406485636372 +--- !u!224 &224719232094423712 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1265934954306918} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 1295758952425276} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} - m_Children: [] - m_Father: {fileID: 224247300890674866} - m_RootOrder: 1 + m_LocalScale: {x: 4, y: 4, z: 4} + m_Children: + - {fileID: 224294137039291060} + - {fileID: 4881803303959862} + m_Father: {fileID: 0} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: -14, y: 3} + m_SizeDelta: {x: 5, y: 5} m_Pivot: {x: 0.5, y: 0.5} diff --git a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/TransportationPoiLabelPrefab.prefab.meta b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/TransportationPoiLabelPrefab.prefab.meta index e81daaa9c..0c62843b8 100644 --- a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/TransportationPoiLabelPrefab.prefab.meta +++ b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Resources/TransportationPoiLabelPrefab.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 22150daba6e8b47b69fd30f00b9c56cd -timeCreated: 1523314292 +timeCreated: 1527198391 licenseType: Pro NativeFormatImporter: externalObjects: {} diff --git a/sdkproject/Assets/Mapbox/Unity/Location/ExampleGpsTraces/walking_device_looking_in_different_direction_2.txt.meta b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Screenshots.meta similarity index 54% rename from sdkproject/Assets/Mapbox/Unity/Location/ExampleGpsTraces/walking_device_looking_in_different_direction_2.txt.meta rename to sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Screenshots.meta index b630ffbe9..334ae7ee6 100644 --- a/sdkproject/Assets/Mapbox/Unity/Location/ExampleGpsTraces/walking_device_looking_in_different_direction_2.txt.meta +++ b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Screenshots.meta @@ -1,8 +1,9 @@ fileFormatVersion: 2 -guid: 7a07747909ea237468470c6398307001 -timeCreated: 1524823522 +guid: 56e82a2b2d57941cc8efe151672b09ab +folderAsset: yes +timeCreated: 1528324686 licenseType: Pro -TextScriptImporter: +DefaultImporter: externalObjects: {} userData: assetBundleName: diff --git a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Screenshots/POIPlacement.png b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Screenshots/POIPlacement.png new file mode 100644 index 000000000..86c26c3bd Binary files /dev/null and b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Screenshots/POIPlacement.png differ diff --git a/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Screenshots/POIPlacement.png.meta b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Screenshots/POIPlacement.png.meta new file mode 100644 index 000000000..b1f684490 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Examples/6_POIPlacement/Screenshots/POIPlacement.png.meta @@ -0,0 +1,118 @@ +fileFormatVersion: 2 +guid: c2103bdd982e845a0a07bc8ee6649a17 +timeCreated: 1528324695 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures.meta b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures.meta new file mode 100644 index 000000000..db4a2bb3d --- /dev/null +++ b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 6001130ed86fa45a791d75cee022c9d6 +folderAsset: yes +timeCreated: 1526669716 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Materials.meta b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Materials.meta new file mode 100644 index 000000000..57fc32e1a --- /dev/null +++ b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Materials.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 3ba73d6f3a89a45e0915fb7dc68847e7 +folderAsset: yes +timeCreated: 1527012907 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Materials/FuturisticBuilding.mat b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Materials/FuturisticBuilding.mat new file mode 100644 index 000000000..a2fdc248e --- /dev/null +++ b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Materials/FuturisticBuilding.mat @@ -0,0 +1,76 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: FuturisticBuilding + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 35f9d408432e04487bba4cd10a5e389a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Materials/FuturisticBuilding.mat.meta b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Materials/FuturisticBuilding.mat.meta new file mode 100644 index 000000000..043e7e1f3 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Materials/FuturisticBuilding.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: bcdc978d68ad74fdfbf505307563a8af +timeCreated: 1527012834 +licenseType: Pro +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Models.meta b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Models.meta new file mode 100644 index 000000000..1a0f39d24 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Models.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 3db1ccb2525054408aaf6644d622695b +folderAsset: yes +timeCreated: 1527012901 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Models/Building.fbx b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Models/Building.fbx new file mode 100755 index 000000000..d2786ffaf Binary files /dev/null and b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Models/Building.fbx differ diff --git a/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Models/Building.fbx.meta b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Models/Building.fbx.meta new file mode 100644 index 000000000..fb2f89eba --- /dev/null +++ b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Models/Building.fbx.meta @@ -0,0 +1,93 @@ +fileFormatVersion: 2 +guid: 2141b6d18b38b426a9b2f49077af7bc1 +timeCreated: 1527012834 +licenseType: Pro +ModelImporter: + serializedVersion: 22 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2100000: Building1 + 2300000: //RootNode + 3300000: //RootNode + 4300000: FuturisticBuilding + externalObjects: {} + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 10 + meshCompression: 0 + addColliders: 0 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + preserveHierarchy: 0 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + serializedVersion: 2 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + rootMotionBoneName: + rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 0 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Prefabs.meta b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Prefabs.meta new file mode 100644 index 000000000..1b973a492 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Prefabs.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 1494cb8f024e74382b1833fd0c9c5d1b +folderAsset: yes +timeCreated: 1527012918 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Prefabs/Building Pivot.prefab b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Prefabs/Building Pivot.prefab new file mode 100644 index 000000000..bc18f4ccd --- /dev/null +++ b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Prefabs/Building Pivot.prefab @@ -0,0 +1,166 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1557236772398302} + m_IsPrefabParent: 1 +--- !u!1 &1444201703355662 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4389725340166072} + - component: {fileID: 33402775852504282} + - component: {fileID: 23611109054619142} + m_Layer: 0 + m_Name: Building + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1557236772398302 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4903565309632786} + m_Layer: 0 + m_Name: Building Pivot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1970543083324894 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4545093131443120} + - component: {fileID: 122037596422965424} + - component: {fileID: 114556322251953184} + m_Layer: 0 + m_Name: Point light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4389725340166072 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1444201703355662} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.757, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4903565309632786} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4545093131443120 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1970543083324894} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.564, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4903565309632786} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4903565309632786 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1557236772398302} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 100, y: 100, z: 100} + m_Children: + - {fileID: 4389725340166072} + - {fileID: 4545093131443120} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &23611109054619142 +MeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1444201703355662} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: bcdc978d68ad74fdfbf505307563a8af, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &33402775852504282 +MeshFilter: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1444201703355662} + m_Mesh: {fileID: 4300000, guid: 2141b6d18b38b426a9b2f49077af7bc1, type: 3} +--- !u!114 &114556322251953184 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1970543083324894} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 42a992266d3e1416a9b8a41a17635f42, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!122 &122037596422965424 +Halo: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1970543083324894} + m_Enabled: 1 + m_Color: + serializedVersion: 2 + rgba: 4278190256 + m_Size: 0.98 diff --git a/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Prefabs/Building Pivot.prefab.meta b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Prefabs/Building Pivot.prefab.meta new file mode 100644 index 000000000..a2d4760e4 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Prefabs/Building Pivot.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c71927789464440f59ea08b68c2f1073 +timeCreated: 1527013576 +licenseType: Pro +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/ReplaceFeatureModifier.asset b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/ReplaceFeatureModifier.asset new file mode 100644 index 000000000..c6a4505b8 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/ReplaceFeatureModifier.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f386309a8f86f48aaabbbd02b9f95059, type: 3} + m_Name: ReplaceFeatureModifier + m_EditorClassIdentifier: + Active: 1 + _options: + prefab: {fileID: 1557236772398302, guid: c71927789464440f59ea08b68c2f1073, type: 2} + scaleDownWithWorld: 1 + _prefabLocations: + - 37.8024, -122.405833 diff --git a/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/ReplaceFeatureModifier.asset.meta b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/ReplaceFeatureModifier.asset.meta new file mode 100644 index 000000000..6daaadb7e --- /dev/null +++ b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/ReplaceFeatureModifier.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ad0d5eb721d8a4e4ba2d7356ce1fba7e +timeCreated: 1525817592 +licenseType: Pro +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/ReplaceFeatures.unity b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/ReplaceFeatures.unity new file mode 100644 index 000000000..2aad777a7 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/ReplaceFeatures.unity @@ -0,0 +1,722 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 8 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641252, b: 0.574817, a: 1} +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 0 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_TemporalCoherenceThreshold: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 1 + m_LightmapEditorSettings: + serializedVersion: 9 + m_Resolution: 2 + m_BakeResolution: 40 + m_TextureWidth: 1024 + m_TextureHeight: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 0 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringMode: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 1 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1001 &559552215 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.locationPrefabList.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[0].GoModifiers.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.locationPrefabList.Array.data[0].coordinates.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4187505068457818, guid: 5bb46bae81bf04608ac699be504c5e66, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4187505068457818, guid: 5bb46bae81bf04608ac699be504c5e66, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4187505068457818, guid: 5bb46bae81bf04608ac699be504c5e66, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4187505068457818, guid: 5bb46bae81bf04608ac699be504c5e66, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4187505068457818, guid: 5bb46bae81bf04608ac699be504c5e66, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4187505068457818, guid: 5bb46bae81bf04608ac699be504c5e66, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4187505068457818, guid: 5bb46bae81bf04608ac699be504c5e66, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4187505068457818, guid: 5bb46bae81bf04608ac699be504c5e66, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _options.locationOptions.latitudeLongitude + value: 37.8025, -122.405833 + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[0].filterOptions._selectedLayerName + value: building + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[0].GoModifiers.Array.data[0] + value: + objectReference: {fileID: 11400000, guid: ad0d5eb721d8a4e4ba2d7356ce1fba7e, + type: 2} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.locationPrefabList.Array.data[0].coreOptions.isActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.locationPrefabList.Array.data[0].coreOptions.sublayerName + value: Coit tower + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.locationPrefabList.Array.data[0].coreOptions.snapToTerrain + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.locationPrefabList.Array.data[0].categories + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.locationPrefabList.Array.data[0].density + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.locationPrefabList.Array.data[0].spawnPrefabOptions.prefab + value: + objectReference: {fileID: 100004, guid: b093854c080244261b8cacc85953aed7, type: 3} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.locationPrefabList.Array.data[0].findByType + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.locationPrefabList.Array.data[0].coordinates.Array.data[0] + value: 37.8025, -122.405833 + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[1].filterOptions._selectedLayerName + value: road + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[1].extrusionOptions._selectedLayerName + value: road + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[1].honorBuildingIdSetting + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[0].GoModifiers.Array.data[1] + value: + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[0].moveFeaturePositionTo + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty._sourceType + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.sourceOptions.layerSource.Id + value: mapbox.3d-buildings,mapbox.mapbox-streets-v7 + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[0].honorBuildingIdSetting + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[0].coreOptions.groupFeatures + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66, + type: 2} + propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[0].materialOptions.style + value: 4 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 5bb46bae81bf04608ac699be504c5e66, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1383075241 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 224315790701160254, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 224315790701160254, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224315790701160254, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224315790701160254, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224315790701160254, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224315790701160254, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224315790701160254, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224315790701160254, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224315790701160254, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 224315790701160254, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224315790701160254, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224315790701160254, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224315790701160254, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224315790701160254, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224315790701160254, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224315790701160254, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224315790701160254, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224315790701160254, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224315790701160254, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224907993215804030, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224907993215804030, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224907993215804030, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224835413515161394, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224835413515161394, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224835413515161394, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224835413515161394, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224835413515161394, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224835413515161394, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224857786874416376, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114731470950229392, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_Size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114603753021256032, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_Text + value: 'Replacing Mapbox building with your own 3D Models + + + Whether you wish to replace your corporate office locations with a custom + branded building model of your own or spawn a highly detailed historical monument + on a 3D map, use our Feature Replacement Modifier to swap out a default + extruded building at a given Lat-Lon with your supplied prefab. You can add + your Feature Replacement Modifier directly to the list of Game Object modifiers + of your buildings visualizer.' + objectReference: {fileID: 0} + - target: {fileID: 224857786874416376, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224907856650798614, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224907856650798614, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224907856650798614, guid: 98be219873e6d4dffb5949746f515a33, + type: 2} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 98be219873e6d4dffb5949746f515a33, type: 2} + m_IsPrefabParent: 0 +--- !u!1 &1621501858 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1621501860} + - component: {fileID: 1621501859} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &1621501859 +Light: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1621501858} + m_Enabled: 1 + serializedVersion: 8 + m_Type: 1 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_Lightmapping: 4 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &1621501860 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1621501858} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &1937886447 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1937886451} + - component: {fileID: 1937886450} + - component: {fileID: 1937886449} + - component: {fileID: 1937886448} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &1937886448 +AudioListener: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1937886447} + m_Enabled: 1 +--- !u!124 &1937886449 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1937886447} + m_Enabled: 1 +--- !u!20 &1937886450 +Camera: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1937886447} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1937886451 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1937886447} + m_LocalRotation: {x: -0.044007145, y: 0.90626585, z: -0.09774506, w: -0.40889063} + m_LocalPosition: {x: 23.844204, y: 31.281227, z: 27.604948} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 18, y: 0, z: 0} +--- !u!1001 &2096890157 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 224000013044306136, guid: 3adcee2515f8c49f4a7afb3bacf2c56e, + type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 224000013044306136, guid: 3adcee2515f8c49f4a7afb3bacf2c56e, + type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224000013044306136, guid: 3adcee2515f8c49f4a7afb3bacf2c56e, + type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224000013044306136, guid: 3adcee2515f8c49f4a7afb3bacf2c56e, + type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224000013044306136, guid: 3adcee2515f8c49f4a7afb3bacf2c56e, + type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224000013044306136, guid: 3adcee2515f8c49f4a7afb3bacf2c56e, + type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224000013044306136, guid: 3adcee2515f8c49f4a7afb3bacf2c56e, + type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224000013044306136, guid: 3adcee2515f8c49f4a7afb3bacf2c56e, + type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224000013044306136, guid: 3adcee2515f8c49f4a7afb3bacf2c56e, + type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 224000013044306136, guid: 3adcee2515f8c49f4a7afb3bacf2c56e, + type: 2} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224000013044306136, guid: 3adcee2515f8c49f4a7afb3bacf2c56e, + type: 2} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224000013044306136, guid: 3adcee2515f8c49f4a7afb3bacf2c56e, + type: 2} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224000013044306136, guid: 3adcee2515f8c49f4a7afb3bacf2c56e, + type: 2} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224000013044306136, guid: 3adcee2515f8c49f4a7afb3bacf2c56e, + type: 2} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224000013044306136, guid: 3adcee2515f8c49f4a7afb3bacf2c56e, + type: 2} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224000013044306136, guid: 3adcee2515f8c49f4a7afb3bacf2c56e, + type: 2} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224000013044306136, guid: 3adcee2515f8c49f4a7afb3bacf2c56e, + type: 2} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224000013044306136, guid: 3adcee2515f8c49f4a7afb3bacf2c56e, + type: 2} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224000013044306136, guid: 3adcee2515f8c49f4a7afb3bacf2c56e, + type: 2} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 3adcee2515f8c49f4a7afb3bacf2c56e, type: 2} + m_IsPrefabParent: 0 diff --git a/sdkproject/Assets/Mapbox/Unity/Location/ExampleGpsTraces/walking_device_looking_in_different_direction_1.txt.meta b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/ReplaceFeatures.unity.meta similarity index 58% rename from sdkproject/Assets/Mapbox/Unity/Location/ExampleGpsTraces/walking_device_looking_in_different_direction_1.txt.meta rename to sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/ReplaceFeatures.unity.meta index 410054ee0..aceb89fde 100644 --- a/sdkproject/Assets/Mapbox/Unity/Location/ExampleGpsTraces/walking_device_looking_in_different_direction_1.txt.meta +++ b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/ReplaceFeatures.unity.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 2f4711c36ccfd3f43bc3cfbbe2a68b6c -timeCreated: 1524823522 +guid: 54d1b7ee40bee49559dd74210c7d5a57 +timeCreated: 1526669733 licenseType: Pro -TextScriptImporter: +DefaultImporter: externalObjects: {} userData: assetBundleName: diff --git a/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Screenshots.meta b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Screenshots.meta new file mode 100644 index 000000000..7d8be1649 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Screenshots.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 1c6b90b2eae84460fb7c3812651a64fd +folderAsset: yes +timeCreated: 1528324725 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Screenshots/ReplaceFeatures.png b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Screenshots/ReplaceFeatures.png new file mode 100644 index 000000000..1075ecf33 Binary files /dev/null and b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Screenshots/ReplaceFeatures.png differ diff --git a/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Screenshots/ReplaceFeatures.png.meta b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Screenshots/ReplaceFeatures.png.meta new file mode 100644 index 000000000..345684493 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Screenshots/ReplaceFeatures.png.meta @@ -0,0 +1,118 @@ +fileFormatVersion: 2 +guid: 81e4425f6c22e497d9f87b864accb082 +timeCreated: 1528324735 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Scripts.meta b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Scripts.meta new file mode 100644 index 000000000..d2c0d0176 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Scripts.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 6ebd1ada4313b460c9bd85e862eea602 +folderAsset: yes +timeCreated: 1527013956 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Scripts/BlinkLight.cs b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Scripts/BlinkLight.cs new file mode 100644 index 000000000..2bf06b7eb --- /dev/null +++ b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Scripts/BlinkLight.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class BlinkLight : MonoBehaviour { + + float blinkDuration = 2.0f; + void Start () { + StartCoroutine(BlinkLed()); + } + + private IEnumerator BlinkLed() + { + Component halo = gameObject.GetComponent("Halo"); + while(true) + { + ((Behaviour)halo).enabled = !((Behaviour)halo).enabled; + yield return new WaitForSeconds(blinkDuration); + } + } +} diff --git a/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/MbTiles/MetaDataRequired.cs.meta b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Scripts/BlinkLight.cs.meta similarity index 70% rename from sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/MbTiles/MetaDataRequired.cs.meta rename to sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Scripts/BlinkLight.cs.meta index 06b422516..336e19078 100644 --- a/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/MbTiles/MetaDataRequired.cs.meta +++ b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Scripts/BlinkLight.cs.meta @@ -1,8 +1,9 @@ fileFormatVersion: 2 -guid: 0d2ec22b5bd564d4d8e1f335e4ebb572 -timeCreated: 1497883478 +guid: 42a992266d3e1416a9b8a41a17635f42 +timeCreated: 1527013969 licenseType: Pro MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures.meta b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Textures.meta similarity index 60% rename from sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures.meta rename to sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Textures.meta index 82bc389c7..b0893debf 100644 --- a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures.meta +++ b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Textures.meta @@ -1,9 +1,10 @@ fileFormatVersion: 2 -guid: 9bf94a6b1df0a4312b0fa803e0d6d616 +guid: e1bf9f3382f4b45f58bd51356f4dbe3c folderAsset: yes -timeCreated: 1520628858 +timeCreated: 1527012912 licenseType: Pro DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Textures/FuturisticBuilding [Albedo].png b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Textures/FuturisticBuilding [Albedo].png new file mode 100755 index 000000000..f5d3939c5 Binary files /dev/null and b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Textures/FuturisticBuilding [Albedo].png differ diff --git a/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Textures/FuturisticBuilding [Albedo].png.meta b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Textures/FuturisticBuilding [Albedo].png.meta new file mode 100644 index 000000000..c64272d1d --- /dev/null +++ b/sdkproject/Assets/Mapbox/Examples/7_ReplaceFeatures/Textures/FuturisticBuilding [Albedo].png.meta @@ -0,0 +1,78 @@ +fileFormatVersion: 2 +guid: 35f9d408432e04487bba4cd10a5e389a +timeCreated: 1527012834 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Examples/Resources/RoadMaterial.mat b/sdkproject/Assets/Mapbox/Examples/Resources/RoadMaterial.mat index 0999e572c..86d47d764 100644 --- a/sdkproject/Assets/Mapbox/Examples/Resources/RoadMaterial.mat +++ b/sdkproject/Assets/Mapbox/Examples/Resources/RoadMaterial.mat @@ -10,118 +10,67 @@ Material: m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: _EMISSION m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} + disabledShaderPasses: [] m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - - first: - name: _BumpMap - second: + - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _DetailAlbedoMap - second: + - _DetailAlbedoMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _DetailMask - second: + - _DetailMask: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _DetailNormalMap - second: + - _DetailNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _EmissionMap - second: + - _EmissionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _MainTex - second: + - _MainTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _MetallicGlossMap - second: + - _MetallicGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _OcclusionMap - second: + - _OcclusionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _ParallaxMap - second: + - _ParallaxMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - first: - name: _BumpScale - second: 1 - - first: - name: _Cutoff - second: 0.5 - - first: - name: _DetailNormalMapScale - second: 1 - - first: - name: _DstBlend - second: 0 - - first: - name: _GlossMapScale - second: 1 - - first: - name: _Glossiness - second: 0 - - first: - name: _GlossyReflections - second: 1 - - first: - name: _Metallic - second: 0 - - first: - name: _Mode - second: 0 - - first: - name: _OcclusionStrength - second: 1 - - first: - name: _Parallax - second: 0.02 - - first: - name: _SmoothnessTextureChannel - second: 0 - - first: - name: _SpecularHighlights - second: 1 - - first: - name: _SrcBlend - second: 1 - - first: - name: _UVSec - second: 0 - - first: - name: _ZWrite - second: 1 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 m_Colors: - - first: - name: _Color - second: {r: 0.6102941, g: 0.6102941, b: 0.6102941, a: 1} - - first: - name: _EmissionColor - second: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 0.6102941, g: 0.6102941, b: 0.6102941, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/sdkproject/Assets/Mapbox/Examples/Resources/RoadSideMaterial.mat b/sdkproject/Assets/Mapbox/Examples/Resources/RoadSideMaterial.mat new file mode 100644 index 000000000..78a761f83 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Examples/Resources/RoadSideMaterial.mat @@ -0,0 +1,76 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: RoadSideMaterial + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.6117647, g: 0.6117647, b: 0.6117647, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/sdkproject/Assets/Mapbox/Examples/Resources/RoadSideMaterial.mat.meta b/sdkproject/Assets/Mapbox/Examples/Resources/RoadSideMaterial.mat.meta new file mode 100644 index 000000000..393bd1e91 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Examples/Resources/RoadSideMaterial.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b00db1eb69ea64eb4adb30b2c0fb01cb +timeCreated: 1528238089 +licenseType: Pro +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Examples/Resources/SeamlessRoadTexture.jpg b/sdkproject/Assets/Mapbox/Examples/Resources/SeamlessRoadTexture.jpg new file mode 100644 index 000000000..11bf3b47d Binary files /dev/null and b/sdkproject/Assets/Mapbox/Examples/Resources/SeamlessRoadTexture.jpg differ diff --git a/sdkproject/Assets/Mapbox/Examples/Resources/SeamlessRoadTexture.jpg.meta b/sdkproject/Assets/Mapbox/Examples/Resources/SeamlessRoadTexture.jpg.meta new file mode 100644 index 000000000..b85e7e135 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Examples/Resources/SeamlessRoadTexture.jpg.meta @@ -0,0 +1,78 @@ +fileFormatVersion: 2 +guid: 80a9f5451284e4a468bf97d34a9e8dd9 +timeCreated: 1528237947 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Examples/Scripts/PoiLabelTextSetter.cs b/sdkproject/Assets/Mapbox/Examples/Scripts/PoiLabelTextSetter.cs index c5d566ab9..9b4bbfdbf 100644 --- a/sdkproject/Assets/Mapbox/Examples/Scripts/PoiLabelTextSetter.cs +++ b/sdkproject/Assets/Mapbox/Examples/Scripts/PoiLabelTextSetter.cs @@ -1,4 +1,4 @@ -namespace Mapbox.Examples + namespace Mapbox.Examples { using Mapbox.Unity.MeshGeneration.Interfaces; using System.Collections.Generic; @@ -8,31 +8,33 @@ namespace Mapbox.Examples public class PoiLabelTextSetter : MonoBehaviour, IFeaturePropertySettable { [SerializeField] - TextMesh _textMesh; - + Text _text; [SerializeField] Image _background; public void Set(Dictionary props) { - _textMesh.text = ""; + _text.text = ""; if (props.ContainsKey("name")) { - _textMesh.text = props["name"].ToString(); + _text.text = props["name"].ToString(); } else if (props.ContainsKey("house_num")) { - _textMesh.text = props["house_num"].ToString(); + _text.text = props["house_num"].ToString(); } else if (props.ContainsKey("type")) { - _textMesh.text = props["type"].ToString(); + _text.text = props["type"].ToString(); } + RefreshBackground(); + } - float textWidth = _textMesh.GetComponent().bounds.size.x; + public void RefreshBackground() + { RectTransform backgroundRect = _background.GetComponent(); - backgroundRect.sizeDelta = new Vector2 (textWidth + 4f, 3f); + LayoutRebuilder.ForceRebuildLayoutImmediate(backgroundRect); } } } \ No newline at end of file diff --git a/sdkproject/Assets/Mapbox/Examples/Scripts/RotateWithLocationProvider.cs b/sdkproject/Assets/Mapbox/Examples/Scripts/RotateWithLocationProvider.cs index 9191422ae..e126a9738 100644 --- a/sdkproject/Assets/Mapbox/Examples/Scripts/RotateWithLocationProvider.cs +++ b/sdkproject/Assets/Mapbox/Examples/Scripts/RotateWithLocationProvider.cs @@ -104,7 +104,20 @@ void LocationProvider_OnLocationUpdated(Location location) // 'Orientation' changes all the time, pass through immediately if (_useDeviceOrientation) { - if (_subtractUserHeading) { rotationAngle -= location.UserHeading; } + if (_subtractUserHeading) + { + if (rotationAngle > location.UserHeading) + { + rotationAngle = 360 - (rotationAngle - location.UserHeading); + } + else + { + rotationAngle = location.UserHeading - rotationAngle + 360; + } + + if (rotationAngle < 0) { rotationAngle += 360; } + if (rotationAngle >= 360) { rotationAngle -= 360; } + } _targetRotation = Quaternion.Euler(getNewEulerAngles(rotationAngle)); } else @@ -133,7 +146,7 @@ private Vector3 getNewEulerAngles(float newAngle) } else { - euler.y = newAngle; + euler.y = -newAngle; euler.x = currentEuler.x; euler.z = currentEuler.z; diff --git a/sdkproject/Assets/Mapbox/Examples/_sharedModules/AddRemoveBuildingMonobehavior.asset b/sdkproject/Assets/Mapbox/Examples/_sharedModules/AddRemoveBuildingMonobehavior.asset new file mode 100644 index 000000000..dc2919459 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Examples/_sharedModules/AddRemoveBuildingMonobehavior.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c3b6ec6b924494ffda604db0a299df8d, type: 3} + m_Name: AddRemoveBuildingMonobehavior + m_EditorClassIdentifier: + Active: 1 + _types: + - _typeString: RemoveBuildingsScript + _script: {fileID: 11500000, guid: a088088ee5eb042d6832643c8c17452f, type: 3} diff --git a/sdkproject/Assets/Mapbox/Examples/_sharedModules/AddRemoveBuildingMonobehavior.asset.meta b/sdkproject/Assets/Mapbox/Examples/_sharedModules/AddRemoveBuildingMonobehavior.asset.meta new file mode 100644 index 000000000..aa3ec2c3d --- /dev/null +++ b/sdkproject/Assets/Mapbox/Examples/_sharedModules/AddRemoveBuildingMonobehavior.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 13e618a59576440f598bb23fcb160b32 +timeCreated: 1525811307 +licenseType: Pro +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Prefabs/CitySimulatorMap.prefab b/sdkproject/Assets/Mapbox/Prefabs/CitySimulatorMap.prefab index 2c05d4453..50b5cdd33 100644 --- a/sdkproject/Assets/Mapbox/Prefabs/CitySimulatorMap.prefab +++ b/sdkproject/Assets/Mapbox/Prefabs/CitySimulatorMap.prefab @@ -174,7 +174,7 @@ MonoBehaviour: groupFeatures: 0 lineWidth: 1 filterOptions: - _selectedLayerName: + _selectedLayerName: building filters: [] combinerType: 0 extrusionOptions: @@ -189,6 +189,7 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 4 texturingType: 3 materials: - Materials: @@ -217,7 +218,7 @@ MonoBehaviour: filters: [] combinerType: 0 extrusionOptions: - _selectedLayerName: + _selectedLayerName: road extrusionType: 5 extrusionGeometryType: 0 propertyName: height @@ -228,12 +229,13 @@ MonoBehaviour: colliderOptions: colliderType: 0 materialOptions: + style: 0 texturingType: 0 materials: - Materials: - {fileID: 2100000, guid: 8e8afdee0a225a84282f04f2fb89b8b6, type: 2} - Materials: - - {fileID: 2100000, guid: 8e8afdee0a225a84282f04f2fb89b8b6, type: 2} + - {fileID: 2100000, guid: b00db1eb69ea64eb4adb30b2c0fb01cb, type: 2} atlasInfo: {fileID: 0} colorPalette: {fileID: 0} honorBuildingIdSetting: 1 diff --git a/sdkproject/Assets/Mapbox/README.txt b/sdkproject/Assets/Mapbox/README.txt index afd6da019..6317c3e2b 100644 --- a/sdkproject/Assets/Mapbox/README.txt +++ b/sdkproject/Assets/Mapbox/README.txt @@ -11,7 +11,7 @@ API: https://www.mapbox.com/mapbox-unity-sdk/api/ -Current version: 1.4.2, as of May 14th, 2018 +Current version: 1.4.3, as of May 29th, 2018 Changelog: https://www.mapbox.com/mapbox-unity-sdk/docs/05-changelog.html diff --git a/sdkproject/Assets/Mapbox/Resources/Mapbox/ScenesList.asset b/sdkproject/Assets/Mapbox/Resources/Mapbox/ScenesList.asset index c5123bd30..1ed387680 100644 --- a/sdkproject/Assets/Mapbox/Resources/Mapbox/ScenesList.asset +++ b/sdkproject/Assets/Mapbox/Resources/Mapbox/ScenesList.asset @@ -12,22 +12,25 @@ MonoBehaviour: m_Name: ScenesList m_EditorClassIdentifier: SceneList: - - {fileID: 114135836211073326} - - {fileID: 114913229455173400} - - {fileID: 114224719226131940} - - {fileID: 114036575997409906} - - {fileID: 114355411128924820} - - {fileID: 114443502154486502} - - {fileID: 114578689700373772} - - {fileID: 114969508297636996} - - {fileID: 114794791762574442} - - {fileID: 114622309397357286} - - {fileID: 114008749368902212} - - {fileID: 114194236092159354} - - {fileID: 114058130912328646} - - {fileID: 114030303491931442} - - {fileID: 114192026020400542} ---- !u!114 &114008749368902212 + - {fileID: 114688988765332248} + - {fileID: 114887960629177622} + - {fileID: 114371735446550412} + - {fileID: 114947955583720068} + - {fileID: 114292996554851750} + - {fileID: 114134294010564432} + - {fileID: 114511646209385808} + - {fileID: 114535030167530634} + - {fileID: 114161719402381348} + - {fileID: 114518324369644072} + - {fileID: 114001676243815868} + - {fileID: 114396432687311622} + - {fileID: 114710637078422722} + - {fileID: 114274193539132564} + - {fileID: 114359600294027658} + - {fileID: 114009067385727690} + - {fileID: 114846260120171130} + - {fileID: 114657725836242830} +--- !u!114 &114001676243815868 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -36,13 +39,13 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e5d9ef4c9a5f1410ea3cf247b3917654, type: 3} - m_Name: ReverseGeocoder + m_Name: RasterTile m_EditorClassIdentifier: - Name: ReverseGeocoder - ScenePath: Assets/Mapbox/Examples/5_Playground/Scenes/ReverseGeocoder.unity + Name: RasterTile + ScenePath: Assets/Mapbox/Examples/5_Playground/Scenes/RasterTile.unity Image: {fileID: 0} Text: {fileID: 0} ---- !u!114 &114030303491931442 +--- !u!114 &114009067385727690 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -51,13 +54,13 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e5d9ef4c9a5f1410ea3cf247b3917654, type: 3} - m_Name: WorldScaleAR-ManualAlignment + m_Name: TabletopAR m_EditorClassIdentifier: - Name: WorldScaleAR-ManualAlignment - ScenePath: Assets/MapboxAR/Examples/Scenes/WorldScaleAR-ManualAlignment.unity + Name: TabletopAR + ScenePath: Assets/MapboxAR/Examples/Scenes/TabletopAR.unity Image: {fileID: 0} Text: {fileID: 0} ---- !u!114 &114036575997409906 +--- !u!114 &114134294010564432 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -66,13 +69,13 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e5d9ef4c9a5f1410ea3cf247b3917654, type: 3} - m_Name: InteractiveStyledVectorMap + m_Name: Globe m_EditorClassIdentifier: - Name: InteractiveStyledVectorMap - ScenePath: Assets/Mapbox/Examples/1_DataExplorer/InteractiveStyledVectorMap.unity - Image: {fileID: 0} + Name: Globe + ScenePath: Assets/Mapbox/Examples/3_Globe/Globe.unity + Image: {fileID: 2800000, guid: 31ea88f94a559415194f73d9ae78c4bb, type: 3} Text: {fileID: 0} ---- !u!114 &114058130912328646 +--- !u!114 &114161719402381348 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -81,13 +84,13 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e5d9ef4c9a5f1410ea3cf247b3917654, type: 3} - m_Name: TabletopAR + m_Name: ForwardGeocoder m_EditorClassIdentifier: - Name: TabletopAR - ScenePath: Assets/MapboxAR/Examples/Scenes/TabletopAR.unity + Name: ForwardGeocoder + ScenePath: Assets/Mapbox/Examples/5_Playground/Scenes/ForwardGeocoder.unity Image: {fileID: 0} Text: {fileID: 0} ---- !u!114 &114135836211073326 +--- !u!114 &114274193539132564 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -96,13 +99,13 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e5d9ef4c9a5f1410ea3cf247b3917654, type: 3} - m_Name: CitySimulator + m_Name: POIPlacement m_EditorClassIdentifier: - Name: CitySimulator - ScenePath: Assets/Mapbox/Examples/0_PrefabScenes/CitySimulator.unity - Image: {fileID: 0} + Name: POIPlacement + ScenePath: Assets/Mapbox/Examples/6_POIPlacement/POIPlacement.unity + Image: {fileID: 2800000, guid: c2103bdd982e845a0a07bc8ee6649a17, type: 3} Text: {fileID: 0} ---- !u!114 &114192026020400542 +--- !u!114 &114292996554851750 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -111,13 +114,13 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e5d9ef4c9a5f1410ea3cf247b3917654, type: 3} - m_Name: WorldScaleAR + m_Name: ZoomableMap m_EditorClassIdentifier: - Name: WorldScaleAR - ScenePath: Assets/MapboxAR/Examples/Scenes/WorldScaleAR.unity - Image: {fileID: 0} + Name: ZoomableMap + ScenePath: Assets/Mapbox/Examples/2_ZoomableMap/ZoomableMap.unity + Image: {fileID: 2800000, guid: f1321adbaa6e24299bb58ab33ad3adf9, type: 3} Text: {fileID: 0} ---- !u!114 &114194236092159354 +--- !u!114 &114359600294027658 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -126,13 +129,13 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e5d9ef4c9a5f1410ea3cf247b3917654, type: 3} - m_Name: VectorTile + m_Name: ReplaceFeatures m_EditorClassIdentifier: - Name: VectorTile - ScenePath: Assets/Mapbox/Examples/5_Playground/Scenes/VectorTile.unity - Image: {fileID: 0} + Name: ReplaceFeatures + ScenePath: Assets/Mapbox/Examples/7_ReplaceFeatures/ReplaceFeatures.unity + Image: {fileID: 2800000, guid: 81e4425f6c22e497d9f87b864accb082, type: 3} Text: {fileID: 0} ---- !u!114 &114224719226131940 +--- !u!114 &114371735446550412 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -147,7 +150,7 @@ MonoBehaviour: ScenePath: Assets/Mapbox/Examples/1_DataExplorer/DataExplorer.unity Image: {fileID: 2800000, guid: 1b7a3200c45d3425bbf8e891123932d8, type: 3} Text: {fileID: 0} ---- !u!114 &114355411128924820 +--- !u!114 &114396432687311622 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -156,13 +159,13 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e5d9ef4c9a5f1410ea3cf247b3917654, type: 3} - m_Name: ZoomableMap + m_Name: ReverseGeocoder m_EditorClassIdentifier: - Name: ZoomableMap - ScenePath: Assets/Mapbox/Examples/2_ZoomableMap/ZoomableMap.unity - Image: {fileID: 2800000, guid: f1321adbaa6e24299bb58ab33ad3adf9, type: 3} + Name: ReverseGeocoder + ScenePath: Assets/Mapbox/Examples/5_Playground/Scenes/ReverseGeocoder.unity + Image: {fileID: 0} Text: {fileID: 0} ---- !u!114 &114443502154486502 +--- !u!114 &114511646209385808 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -171,13 +174,13 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e5d9ef4c9a5f1410ea3cf247b3917654, type: 3} - m_Name: Globe + m_Name: VoxelMap m_EditorClassIdentifier: - Name: Globe - ScenePath: Assets/Mapbox/Examples/3_Globe/Globe.unity - Image: {fileID: 2800000, guid: 31ea88f94a559415194f73d9ae78c4bb, type: 3} + Name: VoxelMap + ScenePath: Assets/Mapbox/Examples/4_VoxelMap/VoxelMap.unity + Image: {fileID: 2800000, guid: 805ed9e7e2bcd4071bd22b135125a912, type: 3} Text: {fileID: 0} ---- !u!114 &114578689700373772 +--- !u!114 &114518324369644072 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -186,13 +189,13 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e5d9ef4c9a5f1410ea3cf247b3917654, type: 3} - m_Name: VoxelMap + m_Name: LocationProvider m_EditorClassIdentifier: - Name: VoxelMap - ScenePath: Assets/Mapbox/Examples/4_VoxelMap/VoxelMap.unity - Image: {fileID: 2800000, guid: 805ed9e7e2bcd4071bd22b135125a912, type: 3} + Name: LocationProvider + ScenePath: Assets/Mapbox/Examples/5_Playground/Scenes/LocationProvider.unity + Image: {fileID: 0} Text: {fileID: 0} ---- !u!114 &114622309397357286 +--- !u!114 &114535030167530634 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -201,13 +204,13 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e5d9ef4c9a5f1410ea3cf247b3917654, type: 3} - m_Name: RasterTile + m_Name: Directions m_EditorClassIdentifier: - Name: RasterTile - ScenePath: Assets/Mapbox/Examples/5_Playground/Scenes/RasterTile.unity + Name: Directions + ScenePath: Assets/Mapbox/Examples/5_Playground/Scenes/Directions.unity Image: {fileID: 0} Text: {fileID: 0} ---- !u!114 &114794791762574442 +--- !u!114 &114657725836242830 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -216,13 +219,58 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e5d9ef4c9a5f1410ea3cf247b3917654, type: 3} - m_Name: ForwardGeocoder + m_Name: WorldScaleAR m_EditorClassIdentifier: - Name: ForwardGeocoder - ScenePath: Assets/Mapbox/Examples/5_Playground/Scenes/ForwardGeocoder.unity + Name: WorldScaleAR + ScenePath: Assets/MapboxAR/Examples/Scenes/WorldScaleAR.unity Image: {fileID: 0} Text: {fileID: 0} ---- !u!114 &114913229455173400 +--- !u!114 &114688988765332248 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e5d9ef4c9a5f1410ea3cf247b3917654, type: 3} + m_Name: CitySimulator + m_EditorClassIdentifier: + Name: CitySimulator + ScenePath: Assets/Mapbox/Examples/0_PrefabScenes/CitySimulator.unity + Image: {fileID: 0} + Text: {fileID: 0} +--- !u!114 &114710637078422722 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e5d9ef4c9a5f1410ea3cf247b3917654, type: 3} + m_Name: VectorTile + m_EditorClassIdentifier: + Name: VectorTile + ScenePath: Assets/Mapbox/Examples/5_Playground/Scenes/VectorTile.unity + Image: {fileID: 0} + Text: {fileID: 0} +--- !u!114 &114846260120171130 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e5d9ef4c9a5f1410ea3cf247b3917654, type: 3} + m_Name: WorldScaleAR-ManualAlignment + m_EditorClassIdentifier: + Name: WorldScaleAR-ManualAlignment + ScenePath: Assets/MapboxAR/Examples/Scenes/WorldScaleAR-ManualAlignment.unity + Image: {fileID: 0} + Text: {fileID: 0} +--- !u!114 &114887960629177622 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -237,7 +285,7 @@ MonoBehaviour: ScenePath: Assets/Mapbox/Examples/0_PrefabScenes/LocationBasedGame.unity Image: {fileID: 0} Text: {fileID: 0} ---- !u!114 &114969508297636996 +--- !u!114 &114947955583720068 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -246,9 +294,9 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e5d9ef4c9a5f1410ea3cf247b3917654, type: 3} - m_Name: Directions + m_Name: InteractiveStyledVectorMap m_EditorClassIdentifier: - Name: Directions - ScenePath: Assets/Mapbox/Examples/5_Playground/Scenes/Directions.unity + Name: InteractiveStyledVectorMap + ScenePath: Assets/Mapbox/Examples/1_DataExplorer/InteractiveStyledVectorMap.unity Image: {fileID: 0} Text: {fileID: 0} diff --git a/sdkproject/Assets/Mapbox/Resources/Mapbox/ScenesList.asset.meta b/sdkproject/Assets/Mapbox/Resources/Mapbox/ScenesList.asset.meta index 9ce72aab0..4989318d7 100644 --- a/sdkproject/Assets/Mapbox/Resources/Mapbox/ScenesList.asset.meta +++ b/sdkproject/Assets/Mapbox/Resources/Mapbox/ScenesList.asset.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 5424214e66dd94ac79007c7c31989849 -timeCreated: 1522985103 +timeCreated: 1528324759 licenseType: Pro NativeFormatImporter: externalObjects: {} diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles.meta index 4a364ca51..48508ed81 100644 --- a/sdkproject/Assets/Mapbox/Resources/MapboxStyles.meta +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 44999f1e7095d414a8de86aacbe5a279 +guid: a5b6f0096f22b4cdb826cdc4a583aa40 folderAsset: yes timeCreated: 1520623954 licenseType: Pro diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets.meta new file mode 100644 index 000000000..361ae628e --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: d90a3ccee913b4a34859e3651cbdc26a +folderAsset: yes +timeCreated: 1524243556 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Atlas.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Atlas.meta new file mode 100644 index 000000000..46a13ab65 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Atlas.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 05547ab88e9284d98804718999dc129d +folderAsset: yes +timeCreated: 1524504493 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Atlas/DefaultAtlasInfo.asset b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Atlas/DefaultAtlasInfo.asset new file mode 100644 index 000000000..63e508192 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Atlas/DefaultAtlasInfo.asset @@ -0,0 +1,239 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48879146f3ce9fb4abc113a9a2bb8e0a, type: 3} + m_Name: DefaultAtlasInfo + m_EditorClassIdentifier: + Textures: + - TextureRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 3 + TopSectionRatio: 0.3 + BottomSectionRatio: 0.4 + PreferredEdgeSectionLength: 40 + FloorHeight: 10 + FirstFloorHeight: 12 + TopFloorHeight: 12 + - TextureRect: + serializedVersion: 2 + x: 0.25 + y: 0 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 4 + TopSectionRatio: 0.3 + BottomSectionRatio: 0.4 + PreferredEdgeSectionLength: 40 + FloorHeight: 10 + FirstFloorHeight: 12 + TopFloorHeight: 12 + - TextureRect: + serializedVersion: 2 + x: 0.5 + y: 0 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 5 + TopSectionRatio: 0.3 + BottomSectionRatio: 0.4 + PreferredEdgeSectionLength: 40 + FloorHeight: 10 + FirstFloorHeight: 12 + TopFloorHeight: 12 + - TextureRect: + serializedVersion: 2 + x: 0.75 + y: 0 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 6 + TopSectionRatio: 0.3 + BottomSectionRatio: 0.4 + PreferredEdgeSectionLength: 40 + FloorHeight: 10 + FirstFloorHeight: 12 + TopFloorHeight: 12 + - TextureRect: + serializedVersion: 2 + x: 0 + y: 0.25 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 4 + TopSectionRatio: 0.3 + BottomSectionRatio: 0.4 + PreferredEdgeSectionLength: 40 + FloorHeight: 10 + FirstFloorHeight: 12 + TopFloorHeight: 12 + - TextureRect: + serializedVersion: 2 + x: 0.25 + y: 0.25 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 2 + TopSectionRatio: 0.3 + BottomSectionRatio: 0.4 + PreferredEdgeSectionLength: 40 + FloorHeight: 10 + FirstFloorHeight: 12 + TopFloorHeight: 12 + - TextureRect: + serializedVersion: 2 + x: 0.5 + y: 0.25 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 1 + TopSectionRatio: 0.3 + BottomSectionRatio: 0.4 + PreferredEdgeSectionLength: 40 + FloorHeight: 10 + FirstFloorHeight: 12 + TopFloorHeight: 12 + - TextureRect: + serializedVersion: 2 + x: 0.75 + y: 0.25 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 11 + TopSectionRatio: 0.3 + BottomSectionRatio: 0.4 + PreferredEdgeSectionLength: 40 + FloorHeight: 10 + FirstFloorHeight: 12 + TopFloorHeight: 12 + - TextureRect: + serializedVersion: 2 + x: 0 + y: 0.5 + width: 0.5 + height: 0.5 + MidFloorCount: 4 + ColumnCount: 1 + TopSectionRatio: 0.2 + BottomSectionRatio: 0.2 + PreferredEdgeSectionLength: 40 + FloorHeight: 50 + FirstFloorHeight: 12 + TopFloorHeight: 12 + - TextureRect: + serializedVersion: 2 + x: 0.25 + y: 0.5 + width: 0.25 + height: 0.5 + MidFloorCount: 4 + ColumnCount: 2 + TopSectionRatio: 0.2 + BottomSectionRatio: 0.2 + PreferredEdgeSectionLength: 40 + FloorHeight: 50 + FirstFloorHeight: 12 + TopFloorHeight: 12 + - TextureRect: + serializedVersion: 2 + x: 0.5 + y: 0.5 + width: 0.25 + height: 0.5 + MidFloorCount: 4 + ColumnCount: 3 + TopSectionRatio: 0.2 + BottomSectionRatio: 0.2 + PreferredEdgeSectionLength: 40 + FloorHeight: 50 + FirstFloorHeight: 12 + TopFloorHeight: 12 + - TextureRect: + serializedVersion: 2 + x: 0.75 + y: 0.5 + width: 0.25 + height: 0.5 + MidFloorCount: 4 + ColumnCount: 4 + TopSectionRatio: 0.2 + BottomSectionRatio: 0.2 + PreferredEdgeSectionLength: 40 + FloorHeight: 50 + FirstFloorHeight: 12 + TopFloorHeight: 12 + Roofs: + - TextureRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0.5 + height: 0.5 + MidFloorCount: 0 + ColumnCount: 0 + TopSectionRatio: 0 + BottomSectionRatio: 0 + PreferredEdgeSectionLength: 0 + FloorHeight: 0 + FirstFloorHeight: 0 + TopFloorHeight: 0 + - TextureRect: + serializedVersion: 2 + x: 0.5 + y: 0 + width: 0.5 + height: 0.5 + MidFloorCount: 0 + ColumnCount: 0 + TopSectionRatio: 0 + BottomSectionRatio: 0 + PreferredEdgeSectionLength: 0 + FloorHeight: 0 + FirstFloorHeight: 0 + TopFloorHeight: 0 + - TextureRect: + serializedVersion: 2 + x: 0 + y: 0.5 + width: 0.5 + height: 0.5 + MidFloorCount: 0 + ColumnCount: 0 + TopSectionRatio: 0 + BottomSectionRatio: 0 + PreferredEdgeSectionLength: 0 + FloorHeight: 0 + FirstFloorHeight: 0 + TopFloorHeight: 0 + - TextureRect: + serializedVersion: 2 + x: 0.5 + y: 0.5 + width: 0.5 + height: 0.5 + MidFloorCount: 0 + ColumnCount: 0 + TopSectionRatio: 0 + BottomSectionRatio: 0 + PreferredEdgeSectionLength: 0 + FloorHeight: 0 + FirstFloorHeight: 0 + TopFloorHeight: 0 diff --git a/sdkproject/Assets/Mapbox/Resources/AtlasInfo.asset.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Atlas/DefaultAtlasInfo.asset.meta similarity index 100% rename from sdkproject/Assets/Mapbox/Resources/AtlasInfo.asset.meta rename to sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Atlas/DefaultAtlasInfo.asset.meta diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Materials.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Materials.meta new file mode 100644 index 000000000..2866dc4c1 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Materials.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ace8a1e70c1984f91ac902b84df653aa +folderAsset: yes +timeCreated: 1524504545 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Materials/DefaultPerRendererMaterial.mat b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Materials/DefaultPerRendererMaterial.mat new file mode 100644 index 000000000..04ab47fe2 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Materials/DefaultPerRendererMaterial.mat @@ -0,0 +1,92 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: DefaultPerRendererMaterial + m_Shader: {fileID: 4800000, guid: 02ca05f28416c4bbab659e473fa74ec6, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailTex1: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailTex2: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _Emission: 0.1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _DetailColor1: {r: 1, g: 1, b: 1, a: 1} + - _DetailColor2: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Materials/DefaultPerRendererMaterial.mat.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Materials/DefaultPerRendererMaterial.mat.meta new file mode 100644 index 000000000..becd03c37 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Materials/DefaultPerRendererMaterial.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: babb58a68f0154cc28f9140a42b4f5c3 +timeCreated: 1527011731 +licenseType: Pro +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Materials/DefaultSideMaterial.mat b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Materials/DefaultSideMaterial.mat new file mode 100644 index 000000000..69ac48c73 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Materials/DefaultSideMaterial.mat @@ -0,0 +1,76 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: DefaultSideMaterial + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: eef5c5fe165da49da9d0ee7a33401d97, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Materials/DefaultSideMaterial.mat.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Materials/DefaultSideMaterial.mat.meta new file mode 100644 index 000000000..9b3adf70d --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Materials/DefaultSideMaterial.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c0653693b48614a139a124871d499679 +timeCreated: 1524504520 +licenseType: Pro +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Materials/DefaultTopMaterial.mat b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Materials/DefaultTopMaterial.mat new file mode 100644 index 000000000..145e2055d --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Materials/DefaultTopMaterial.mat @@ -0,0 +1,76 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: DefaultTopMaterial + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: c300b2d31e97547d98e91667b2998bfc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Materials/DefaultTopMaterial.mat.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Materials/DefaultTopMaterial.mat.meta new file mode 100644 index 000000000..3bba2e6fc --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Materials/DefaultTopMaterial.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: a1aa333e18c0640d7b428eecff9c4af7 +timeCreated: 1524504507 +licenseType: Pro +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Palettes.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Palettes.meta new file mode 100644 index 000000000..44a74f395 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Palettes.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: bf42686f8a8f346bdb651c756df746ea +folderAsset: yes +timeCreated: 1524504575 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Palettes/DefaultPalette.asset b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Palettes/DefaultPalette.asset new file mode 100644 index 000000000..fd34f8090 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Palettes/DefaultPalette.asset @@ -0,0 +1,25 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 324a61621a4444024b4a9423715bd22b, type: 3} + m_Name: DefaultPalette + m_EditorClassIdentifier: + m_numColors: 3 + m_keyColor: {r: 1, g: 1, b: 1, a: 1} + m_colors: [] + m_hueRange: 0 + m_saturationRange: 0 + m_valueRange: 0 + m_setBaseColor_Override: 0 + m_setDetailColor1_Override: 0 + m_setDetailColor2_Override: 0 + m_baseColor_Override: {r: 1, g: 1, b: 1, a: 1} + m_detailColor1_Override: {r: 1, g: 1, b: 1, a: 1} + m_detailColor2_Override: {r: 1, g: 1, b: 1, a: 1} diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Palettes/DefaultPalette.asset.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Palettes/DefaultPalette.asset.meta new file mode 100644 index 000000000..e8c7ef97a --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Palettes/DefaultPalette.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 57bdfa37edf7a4f7f999d19443497554 +timeCreated: 1524504588 +licenseType: Pro +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Textures.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Textures.meta new file mode 100644 index 000000000..4a063e75e --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Textures.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 31022fd2d5b8b4a0d93345aeec1c4e50 +folderAsset: yes +timeCreated: 1524504554 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Textures/DefaultSideTexture.png b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Textures/DefaultSideTexture.png new file mode 100644 index 000000000..4028914da Binary files /dev/null and b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Textures/DefaultSideTexture.png differ diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Textures/DefaultSideTexture.png.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Textures/DefaultSideTexture.png.meta new file mode 100644 index 000000000..c272e8905 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Textures/DefaultSideTexture.png.meta @@ -0,0 +1,78 @@ +fileFormatVersion: 2 +guid: eef5c5fe165da49da9d0ee7a33401d97 +timeCreated: 1524158945 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Textures/DefaultTopTexture.png b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Textures/DefaultTopTexture.png new file mode 100644 index 000000000..bf92f1680 Binary files /dev/null and b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Textures/DefaultTopTexture.png differ diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Textures/DefaultTopTexture.png.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Textures/DefaultTopTexture.png.meta new file mode 100644 index 000000000..698c174d0 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/DefaultStyleAssets/Textures/DefaultTopTexture.png.meta @@ -0,0 +1,78 @@ +fileFormatVersion: 2 +guid: c300b2d31e97547d98e91667b2998bfc +timeCreated: 1524241384 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials.meta index b8fa3653b..0af2598e0 100644 --- a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials.meta +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials.meta @@ -1,9 +1,10 @@ fileFormatVersion: 2 -guid: 1ee27030e65c8453a8b021d0ebd46288 +guid: 041012e11f3cb4f4e83a5c06b5c4243d folderAsset: yes -timeCreated: 1520628849 +timeCreated: 1527182001 licenseType: Pro DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesFacades.mat b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesFacades.mat index 8bab9a892..e71100a87 100644 --- a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesFacades.mat +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesFacades.mat @@ -38,10 +38,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _DetailTex: - m_Texture: {fileID: 2800000, guid: 36bfefc139bfa434daf90848bb333e1d, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _DetailTex1: m_Texture: {fileID: 2800000, guid: 36bfefc139bfa434daf90848bb333e1d, type: 3} m_Scale: {x: 1, y: 1} @@ -70,18 +66,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _WindowTex: - m_Texture: {fileID: 2800000, guid: aaebc04bedf1444bebad66d5386b3744, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 - - _Emission: 0.75 + - _Emission: 0.1 - _GlossMapScale: 1 - - _Glossiness: 0 + - _Glossiness: 0.5 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 @@ -93,10 +85,8 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColor: {r: 0.28676468, g: 0.28676468, b: 0.28676468, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _DetailColor: {r: 0, g: 0.751724, b: 1, a: 1} - - _DetailColor1: {r: 1, g: 0, b: 0, a: 1} - - _DetailColor2: {r: 0.058823586, g: 0, b: 1, a: 1} + - _DetailColor1: {r: 0.5147059, g: 0.5147059, b: 0.5147059, a: 1} + - _DetailColor2: {r: 0.7647059, g: 0.7647059, b: 0.7647059, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WindowColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesFacades.mat.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesFacades.mat.meta index dc1b52a8a..cfbd6c0ae 100644 --- a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesFacades.mat.meta +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesFacades.mat.meta @@ -1,8 +1,9 @@ fileFormatVersion: 2 -guid: 9cd2ac441e9584949b33b75b4854380c -timeCreated: 1520454477 +guid: 402dd72669f434508aa3ebc1a1491897 +timeCreated: 1527182014 licenseType: Pro NativeFormatImporter: + externalObjects: {} mainObjectFileID: 2100000 userData: assetBundleName: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesFacadesPerRenderer.mat b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesFacadesPerRenderer.mat index d25cb7c62..49d248a33 100644 --- a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesFacadesPerRenderer.mat +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesFacadesPerRenderer.mat @@ -38,10 +38,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _DetailTex: - m_Texture: {fileID: 2800000, guid: 36bfefc139bfa434daf90848bb333e1d, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _DetailTex1: m_Texture: {fileID: 2800000, guid: 36bfefc139bfa434daf90848bb333e1d, type: 3} m_Scale: {x: 1, y: 1} @@ -70,18 +66,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _WindowTex: - m_Texture: {fileID: 2800000, guid: aaebc04bedf1444bebad66d5386b3744, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 - - _Emission: 0.75 + - _Emission: 0.1 - _GlossMapScale: 1 - - _Glossiness: 0 + - _Glossiness: 0.5 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 @@ -95,8 +87,6 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _DetailColor: {r: 0, g: 0.751724, b: 1, a: 1} - _DetailColor1: {r: 1, g: 1, b: 1, a: 1} - _DetailColor2: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WindowColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesFacadesPerRenderer.mat.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesFacadesPerRenderer.mat.meta index 58033e2f4..5b1545df9 100644 --- a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesFacadesPerRenderer.mat.meta +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesFacadesPerRenderer.mat.meta @@ -1,8 +1,9 @@ fileFormatVersion: 2 -guid: 55cc6edead802446b9106b2998406844 -timeCreated: 1520454477 +guid: e094fd573e6524af3a68b053b7de22c8 +timeCreated: 1527182014 licenseType: Pro NativeFormatImporter: + externalObjects: {} mainObjectFileID: 2100000 userData: assetBundleName: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesRoofs.mat b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesRoofs.mat index abdbbee08..7c41e096c 100644 --- a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesRoofs.mat +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesRoofs.mat @@ -38,10 +38,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _DetailTex: - m_Texture: {fileID: 2800000, guid: a88424a1da5f049169a689bf6ba4e638, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _DetailTex1: m_Texture: {fileID: 2800000, guid: a7ad6933f58d64d56a4879cc266290b3, type: 3} m_Scale: {x: 1, y: 1} @@ -70,10 +66,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _WindowTex: - m_Texture: {fileID: 2800000, guid: a88424a1da5f049169a689bf6ba4e638, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 @@ -81,7 +73,7 @@ Material: - _DstBlend: 0 - _Emission: 0.1 - _GlossMapScale: 1 - - _Glossiness: 0 + - _Glossiness: 0.5 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 @@ -93,10 +85,8 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColor: {r: 0.28676468, g: 0.28676468, b: 0.28676468, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _DetailColor: {r: 1, g: 0.99264705, b: 1, a: 1} - - _DetailColor1: {r: 1, g: 1, b: 1, a: 1} - - _DetailColor2: {r: 1, g: 1, b: 1, a: 1} + - _DetailColor1: {r: 0.5147059, g: 0.5147059, b: 0.5147059, a: 1} + - _DetailColor2: {r: 0.7647059, g: 0.7647059, b: 0.7647059, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WindowColor: {r: 0.23529412, g: 0.41911763, b: 1, a: 1} diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesRoofs.mat.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesRoofs.mat.meta index 00e7f641f..a28fc9bd7 100644 --- a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesRoofs.mat.meta +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesRoofs.mat.meta @@ -1,8 +1,9 @@ fileFormatVersion: 2 -guid: eafab4783c4094989a440d2284f7d203 -timeCreated: 1520454477 +guid: 7b8186f8ab7c84eaaa1f9890eb440693 +timeCreated: 1527182014 licenseType: Pro NativeFormatImporter: + externalObjects: {} mainObjectFileID: 2100000 userData: assetBundleName: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesRoofsPerRenderer.mat b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesRoofsPerRenderer.mat index 4ac1825ed..d30f0ae2f 100644 --- a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesRoofsPerRenderer.mat +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesRoofsPerRenderer.mat @@ -38,10 +38,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _DetailTex: - m_Texture: {fileID: 2800000, guid: a88424a1da5f049169a689bf6ba4e638, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _DetailTex1: m_Texture: {fileID: 2800000, guid: a7ad6933f58d64d56a4879cc266290b3, type: 3} m_Scale: {x: 1, y: 1} @@ -70,10 +66,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _WindowTex: - m_Texture: {fileID: 2800000, guid: a88424a1da5f049169a689bf6ba4e638, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 @@ -81,7 +73,7 @@ Material: - _DstBlend: 0 - _Emission: 0.1 - _GlossMapScale: 1 - - _Glossiness: 0 + - _Glossiness: 0.5 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 @@ -95,8 +87,6 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _DetailColor: {r: 1, g: 0.99264705, b: 1, a: 1} - _DetailColor1: {r: 1, g: 1, b: 1, a: 1} - _DetailColor2: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WindowColor: {r: 0.23529412, g: 0.41911763, b: 1, a: 1} diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesRoofsPerRenderer.mat.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesRoofsPerRenderer.mat.meta index f0fc15821..f8a2a5bd5 100644 --- a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesRoofsPerRenderer.mat.meta +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/MapboxStylesRoofsPerRenderer.mat.meta @@ -1,8 +1,9 @@ fileFormatVersion: 2 -guid: d4d7464e3429a44e090f55a4ac17f110 -timeCreated: 1520454477 +guid: 97a65133a2ed4494bb233afaa06385bd +timeCreated: 1527182014 licenseType: Pro NativeFormatImporter: + externalObjects: {} mainObjectFileID: 2100000 userData: assetBundleName: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles.meta new file mode 100644 index 000000000..96dd1015e --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 568d0dea9fa974961b4baaa83a571258 +folderAsset: yes +timeCreated: 1524244146 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles.meta new file mode 100644 index 000000000..227b65b88 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7241f5e399a064a5fb9b8bc54e740622 +folderAsset: yes +timeCreated: 1524690481 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark.meta new file mode 100644 index 000000000..f27784155 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 979f508a7dc824a57bf76a9d0b81330f +folderAsset: yes +timeCreated: 1525729182 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets.meta new file mode 100644 index 000000000..9df0f033c --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: de8a1d9f6101f44529f0f7e08bfc8cf7 +folderAsset: yes +timeCreated: 1524673128 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets/Atlas.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets/Atlas.meta new file mode 100644 index 000000000..497875079 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets/Atlas.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 1e200e749ca644415aeef1e0c8fe963b +folderAsset: yes +timeCreated: 1524502554 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets/Atlas/DarkAtlasInfo.asset b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets/Atlas/DarkAtlasInfo.asset new file mode 100644 index 000000000..c4901b441 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets/Atlas/DarkAtlasInfo.asset @@ -0,0 +1,86 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48879146f3ce9fb4abc113a9a2bb8e0a, type: 3} + m_Name: DarkAtlasInfo + m_EditorClassIdentifier: + Textures: + - TextureRect: + serializedVersion: 2 + x: 0.5 + y: 0 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 1 + TopSectionRatio: 0.2 + BottomSectionRatio: 0.2 + PreferredEdgeSectionLength: 30 + FloorHeight: 18 + FirstFloorHeight: 6 + TopFloorHeight: 6 + Roofs: + - TextureRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0.5 + height: 0.5 + MidFloorCount: 0 + ColumnCount: 0 + TopSectionRatio: 0 + BottomSectionRatio: 0 + PreferredEdgeSectionLength: 0 + FloorHeight: 0 + FirstFloorHeight: 0 + TopFloorHeight: 0 + - TextureRect: + serializedVersion: 2 + x: 0.5 + y: 0 + width: 0.5 + height: 0.5 + MidFloorCount: 0 + ColumnCount: 0 + TopSectionRatio: 0 + BottomSectionRatio: 0 + PreferredEdgeSectionLength: 0 + FloorHeight: 0 + FirstFloorHeight: 0 + TopFloorHeight: 0 + - TextureRect: + serializedVersion: 2 + x: 0 + y: 0.5 + width: 0.5 + height: 0.5 + MidFloorCount: 0 + ColumnCount: 0 + TopSectionRatio: 0 + BottomSectionRatio: 0 + PreferredEdgeSectionLength: 0 + FloorHeight: 0 + FirstFloorHeight: 0 + TopFloorHeight: 0 + - TextureRect: + serializedVersion: 2 + x: 0.5 + y: 0.5 + width: 0.5 + height: 0.5 + MidFloorCount: 0 + ColumnCount: 0 + TopSectionRatio: 0 + BottomSectionRatio: 0 + PreferredEdgeSectionLength: 0 + FloorHeight: 0 + FirstFloorHeight: 0 + TopFloorHeight: 0 + AtlasEntityType: 0 diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets/Atlas/DarkAtlasInfo.asset.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets/Atlas/DarkAtlasInfo.asset.meta new file mode 100644 index 000000000..062315a1a --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets/Atlas/DarkAtlasInfo.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 59ca6a03aa1ab4d5797fc37bc0f37797 +timeCreated: 1515083851 +licenseType: Pro +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets/Materials.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets/Materials.meta new file mode 100644 index 000000000..08abec151 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets/Materials.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 5c84d35c417e140258f724c4556cff3c +folderAsset: yes +timeCreated: 1524502483 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets/Materials/DarkSideMaterial.mat b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets/Materials/DarkSideMaterial.mat new file mode 100644 index 000000000..b188fc01d --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets/Materials/DarkSideMaterial.mat @@ -0,0 +1,102 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: DarkSideMaterial + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseTex: + m_Texture: {fileID: 2800000, guid: 4d520150ef3724e4bb52237605c761df, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailTex: + m_Texture: {fileID: 2800000, guid: 36bfefc139bfa434daf90848bb333e1d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailTex1: + m_Texture: {fileID: 2800000, guid: 36bfefc139bfa434daf90848bb333e1d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailTex2: + m_Texture: {fileID: 2800000, guid: aaebc04bedf1444bebad66d5386b3744, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _WindowTex: + m_Texture: {fileID: 2800000, guid: aaebc04bedf1444bebad66d5386b3744, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _Emission: 0.75 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.25, g: 0.25, b: 0.25, a: 1} + - _DetailColor: {r: 0, g: 0.751724, b: 1, a: 1} + - _DetailColor1: {r: 1, g: 1, b: 1, a: 1} + - _DetailColor2: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + - _WindowColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets/Materials/DarkSideMaterial.mat.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets/Materials/DarkSideMaterial.mat.meta new file mode 100644 index 000000000..6b927dd08 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets/Materials/DarkSideMaterial.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 5cb4277d0de1443ce84170893d05adca +timeCreated: 1520454477 +licenseType: Pro +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets/Materials/DarkTopMaterial.mat b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets/Materials/DarkTopMaterial.mat new file mode 100644 index 000000000..b8ae5711a --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets/Materials/DarkTopMaterial.mat @@ -0,0 +1,102 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: DarkTopMaterial + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseTex: + m_Texture: {fileID: 2800000, guid: 89d3c1f500b7e4b8bba0ce9b760e9134, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailTex: + m_Texture: {fileID: 2800000, guid: a88424a1da5f049169a689bf6ba4e638, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailTex1: + m_Texture: {fileID: 2800000, guid: a7ad6933f58d64d56a4879cc266290b3, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailTex2: + m_Texture: {fileID: 2800000, guid: abf274fea99064d7f9087e58ccaf6d27, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _WindowTex: + m_Texture: {fileID: 2800000, guid: a88424a1da5f049169a689bf6ba4e638, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _Emission: 0.1 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.25, g: 0.25, b: 0.25, a: 1} + - _DetailColor: {r: 1, g: 0.99264705, b: 1, a: 1} + - _DetailColor1: {r: 1, g: 1, b: 1, a: 1} + - _DetailColor2: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + - _WindowColor: {r: 0.23529412, g: 0.41911763, b: 1, a: 1} diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets/Materials/DarkTopMaterial.mat.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets/Materials/DarkTopMaterial.mat.meta new file mode 100644 index 000000000..152e6812e --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets/Materials/DarkTopMaterial.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 1c7d76a44fa2d4908bf4ee096556a5db +timeCreated: 1520454477 +licenseType: Pro +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/DarkIcon.png b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/DarkIcon.png new file mode 100644 index 000000000..6505bf444 Binary files /dev/null and b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/DarkIcon.png differ diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/DarkIcon.png.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/DarkIcon.png.meta new file mode 100644 index 000000000..3d744d944 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/DarkIcon.png.meta @@ -0,0 +1,78 @@ +fileFormatVersion: 2 +guid: 8000e1968557249138e2cc002b9c082f +timeCreated: 1525734304 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy.meta new file mode 100644 index 000000000..440273a36 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 5e23a332724014d2c9c637a78cad8cb6 +folderAsset: yes +timeCreated: 1524075919 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets.meta new file mode 100644 index 000000000..26e0c1218 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 94f396a4e39be4445bd593c3c2892fbf +folderAsset: yes +timeCreated: 1524673128 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Atlas.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Atlas.meta new file mode 100644 index 000000000..d4c9c9eb7 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Atlas.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9db5db299e4da48688f54c671bd508db +folderAsset: yes +timeCreated: 1524502876 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Atlas/FantasyAtlasInfo.asset b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Atlas/FantasyAtlasInfo.asset new file mode 100644 index 000000000..62bec047a --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Atlas/FantasyAtlasInfo.asset @@ -0,0 +1,155 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48879146f3ce9fb4abc113a9a2bb8e0a, type: 3} + m_Name: FantasyAtlasInfo + m_EditorClassIdentifier: + Textures: + - TextureRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 3 + TopSectionRatio: 0.3 + BottomSectionRatio: 0.4 + PreferredEdgeSectionLength: 40 + FloorHeight: 10 + FirstFloorHeight: 12 + TopFloorHeight: 12 + - TextureRect: + serializedVersion: 2 + x: 0.25 + y: 0 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 4 + TopSectionRatio: 0.3 + BottomSectionRatio: 0.4 + PreferredEdgeSectionLength: 40 + FloorHeight: 10 + FirstFloorHeight: 12 + TopFloorHeight: 12 + - TextureRect: + serializedVersion: 2 + x: 0.5 + y: 0 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 5 + TopSectionRatio: 0.3 + BottomSectionRatio: 0.4 + PreferredEdgeSectionLength: 40 + FloorHeight: 10 + FirstFloorHeight: 12 + TopFloorHeight: 12 + - TextureRect: + serializedVersion: 2 + x: 0.75 + y: 0 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 6 + TopSectionRatio: 0.3 + BottomSectionRatio: 0.4 + PreferredEdgeSectionLength: 40 + FloorHeight: 10 + FirstFloorHeight: 12 + TopFloorHeight: 12 + - TextureRect: + serializedVersion: 2 + x: 0 + y: 0.25 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 4 + TopSectionRatio: 0.3 + BottomSectionRatio: 0.4 + PreferredEdgeSectionLength: 40 + FloorHeight: 10 + FirstFloorHeight: 12 + TopFloorHeight: 12 + - TextureRect: + serializedVersion: 2 + x: 0.25 + y: 0.25 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 2 + TopSectionRatio: 0.3 + BottomSectionRatio: 0.4 + PreferredEdgeSectionLength: 40 + FloorHeight: 10 + FirstFloorHeight: 12 + TopFloorHeight: 12 + - TextureRect: + serializedVersion: 2 + x: 0.5 + y: 0.25 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 1 + TopSectionRatio: 0.3 + BottomSectionRatio: 0.4 + PreferredEdgeSectionLength: 40 + FloorHeight: 10 + FirstFloorHeight: 12 + TopFloorHeight: 12 + - TextureRect: + serializedVersion: 2 + x: 0.75 + y: 0.25 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 11 + TopSectionRatio: 0.3 + BottomSectionRatio: 0.4 + PreferredEdgeSectionLength: 40 + FloorHeight: 10 + FirstFloorHeight: 12 + TopFloorHeight: 12 + Roofs: + - TextureRect: + serializedVersion: 2 + x: 0 + y: 0.5 + width: 0.5 + height: 0.5 + MidFloorCount: 0 + ColumnCount: 0 + TopSectionRatio: 0 + BottomSectionRatio: 0 + PreferredEdgeSectionLength: 0 + FloorHeight: 0 + FirstFloorHeight: 0 + TopFloorHeight: 0 + - TextureRect: + serializedVersion: 2 + x: 0.5 + y: 0.5 + width: 0.5 + height: 0.5 + MidFloorCount: 0 + ColumnCount: 0 + TopSectionRatio: 0 + BottomSectionRatio: 0 + PreferredEdgeSectionLength: 0 + FloorHeight: 0 + FirstFloorHeight: 0 + TopFloorHeight: 0 diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Atlas/FantasyAtlasInfo.asset.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Atlas/FantasyAtlasInfo.asset.meta new file mode 100644 index 000000000..9b00cac73 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Atlas/FantasyAtlasInfo.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4793568a8fb3c40a0ab74f5419319b48 +timeCreated: 1525818671 +licenseType: Pro +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Materials.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Materials.meta new file mode 100644 index 000000000..9cac51d70 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Materials.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 3d041e98647384eaf92cc34f92a9b9fc +folderAsset: yes +timeCreated: 1524502856 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Materials/FantasySideMaterial.mat b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Materials/FantasySideMaterial.mat new file mode 100644 index 000000000..7644f27d8 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Materials/FantasySideMaterial.mat @@ -0,0 +1,80 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: FantasySideMaterial + m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _METALLICGLOSSMAP _NORMALMAP _SPECGLOSSMAP + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 6c801f3efbdc94d458dd5caccafcf7bd, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: be8045f06973b4cea8c11703963a59cb, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 2800000, guid: 646be5e773e1d420f8d5639bae7d5295, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 2800000, guid: b87ccc15844234e58bad8ef21a35fadf, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Materials/FantasySideMaterial.mat.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Materials/FantasySideMaterial.mat.meta new file mode 100644 index 000000000..fc9c6e254 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Materials/FantasySideMaterial.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7420a65a71a3f48a083a5e43216a8a6e +timeCreated: 1523481632 +licenseType: Pro +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Materials/FantasyTopMaterial.mat b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Materials/FantasyTopMaterial.mat new file mode 100644 index 000000000..0312707b2 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Materials/FantasyTopMaterial.mat @@ -0,0 +1,80 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: FantasyTopMaterial + m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _METALLICGLOSSMAP _NORMALMAP _SPECGLOSSMAP + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 6c801f3efbdc94d458dd5caccafcf7bd, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: be8045f06973b4cea8c11703963a59cb, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 2800000, guid: 646be5e773e1d420f8d5639bae7d5295, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 2800000, guid: b87ccc15844234e58bad8ef21a35fadf, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Materials/FantasyTopMaterial.mat.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Materials/FantasyTopMaterial.mat.meta new file mode 100644 index 000000000..a063ed995 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Materials/FantasyTopMaterial.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 2cc3bc1f1604c4145aebb2232440059b +timeCreated: 1523481632 +licenseType: Pro +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures.meta new file mode 100644 index 000000000..0898683ec --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: dcaab30292cce476197b688f231dd19d +folderAsset: yes +timeCreated: 1524502864 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures/FantasyAlbedo.png b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures/FantasyAlbedo.png new file mode 100644 index 000000000..11b52b7af Binary files /dev/null and b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures/FantasyAlbedo.png differ diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures/FantasyAlbedo.png.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures/FantasyAlbedo.png.meta new file mode 100644 index 000000000..763f7eb4c --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures/FantasyAlbedo.png.meta @@ -0,0 +1,78 @@ +fileFormatVersion: 2 +guid: be8045f06973b4cea8c11703963a59cb +timeCreated: 1525819487 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures/FantasyMetallic.png b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures/FantasyMetallic.png new file mode 100644 index 000000000..88410bb25 Binary files /dev/null and b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures/FantasyMetallic.png differ diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures/FantasyMetallic.png.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures/FantasyMetallic.png.meta new file mode 100644 index 000000000..220fa1b35 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures/FantasyMetallic.png.meta @@ -0,0 +1,78 @@ +fileFormatVersion: 2 +guid: 646be5e773e1d420f8d5639bae7d5295 +timeCreated: 1525818651 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures/FantasyNormal.png b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures/FantasyNormal.png new file mode 100644 index 000000000..c50524861 Binary files /dev/null and b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures/FantasyNormal.png differ diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures/FantasyNormal.png.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures/FantasyNormal.png.meta new file mode 100644 index 000000000..77a294915 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures/FantasyNormal.png.meta @@ -0,0 +1,78 @@ +fileFormatVersion: 2 +guid: 6c801f3efbdc94d458dd5caccafcf7bd +timeCreated: 1525818653 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 1 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures/FantasyRoughness.png b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures/FantasyRoughness.png new file mode 100644 index 000000000..cfead36ce Binary files /dev/null and b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures/FantasyRoughness.png differ diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures/FantasyRoughness.png.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures/FantasyRoughness.png.meta new file mode 100644 index 000000000..635c3d37a --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures/FantasyRoughness.png.meta @@ -0,0 +1,78 @@ +fileFormatVersion: 2 +guid: b87ccc15844234e58bad8ef21a35fadf +timeCreated: 1525818654 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures/FantasySideAlbedo.png b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures/FantasySideAlbedo.png new file mode 100644 index 000000000..85e58dccf Binary files /dev/null and b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures/FantasySideAlbedo.png differ diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures/FantasySideAlbedo.png.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures/FantasySideAlbedo.png.meta new file mode 100644 index 000000000..a55d1b618 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Textures/FantasySideAlbedo.png.meta @@ -0,0 +1,78 @@ +fileFormatVersion: 2 +guid: c82ae680bf01149e28016e02aca8a79d +timeCreated: 1524680877 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/FantasyIcon.png b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/FantasyIcon.png new file mode 100644 index 000000000..d3094b4ad Binary files /dev/null and b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/FantasyIcon.png differ diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/FantasyIcon.png.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/FantasyIcon.png.meta new file mode 100644 index 000000000..12e788be1 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/FantasyIcon.png.meta @@ -0,0 +1,78 @@ +fileFormatVersion: 2 +guid: e05ca07235f774564ac030037ceadf8c +timeCreated: 1523562702 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light.meta new file mode 100644 index 000000000..0b9204124 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 3ca2306bb5abf45a5a7658b0a34a4f23 +folderAsset: yes +timeCreated: 1525729182 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets.meta new file mode 100644 index 000000000..35b99fc60 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4c1d2a7e681424689a0b8b7ee56a214a +folderAsset: yes +timeCreated: 1524673128 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets/Atlas.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets/Atlas.meta new file mode 100644 index 000000000..9f814d4a6 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets/Atlas.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7afea0e425ae943f681258a33a848e8b +folderAsset: yes +timeCreated: 1524502554 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/AtlasInfo.asset b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets/Atlas/LightAtlasInfo.asset similarity index 99% rename from sdkproject/Assets/Mapbox/Resources/AtlasInfo.asset rename to sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets/Atlas/LightAtlasInfo.asset index a7b9dd350..1cf85a450 100644 --- a/sdkproject/Assets/Mapbox/Resources/AtlasInfo.asset +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets/Atlas/LightAtlasInfo.asset @@ -9,7 +9,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 48879146f3ce9fb4abc113a9a2bb8e0a, type: 3} - m_Name: AtlasInfo + m_Name: LightAtlasInfo m_EditorClassIdentifier: Textures: - TextureRect: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets/Atlas/LightAtlasInfo.asset.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets/Atlas/LightAtlasInfo.asset.meta new file mode 100644 index 000000000..cb073b2b6 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets/Atlas/LightAtlasInfo.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 817b646f06c8845628ba7acf4819a67d +timeCreated: 1515083851 +licenseType: Pro +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets/Materials.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets/Materials.meta new file mode 100644 index 000000000..895c1beca --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets/Materials.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9728fd5c889f64b3198102e28e9c5d83 +folderAsset: yes +timeCreated: 1524502483 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets/Materials/LightSideMaterial.mat b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets/Materials/LightSideMaterial.mat new file mode 100644 index 000000000..c4c8d6edb --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets/Materials/LightSideMaterial.mat @@ -0,0 +1,102 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: LightSideMaterial + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseTex: + m_Texture: {fileID: 2800000, guid: 4d520150ef3724e4bb52237605c761df, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailTex: + m_Texture: {fileID: 2800000, guid: 36bfefc139bfa434daf90848bb333e1d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailTex1: + m_Texture: {fileID: 2800000, guid: 36bfefc139bfa434daf90848bb333e1d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailTex2: + m_Texture: {fileID: 2800000, guid: aaebc04bedf1444bebad66d5386b3744, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _WindowTex: + m_Texture: {fileID: 2800000, guid: aaebc04bedf1444bebad66d5386b3744, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _Emission: 0.75 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.78676474, g: 0.78676474, b: 0.78676474, a: 1} + - _DetailColor: {r: 0, g: 0.751724, b: 1, a: 1} + - _DetailColor1: {r: 1, g: 1, b: 1, a: 1} + - _DetailColor2: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + - _WindowColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets/Materials/LightSideMaterial.mat.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets/Materials/LightSideMaterial.mat.meta new file mode 100644 index 000000000..52773dbf2 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets/Materials/LightSideMaterial.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: b0c7fbba2306f4732b02134faa797327 +timeCreated: 1520454477 +licenseType: Pro +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets/Materials/LightTopMaterial.mat b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets/Materials/LightTopMaterial.mat new file mode 100644 index 000000000..cd566706c --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets/Materials/LightTopMaterial.mat @@ -0,0 +1,102 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: LightTopMaterial + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseTex: + m_Texture: {fileID: 2800000, guid: 89d3c1f500b7e4b8bba0ce9b760e9134, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailTex: + m_Texture: {fileID: 2800000, guid: a88424a1da5f049169a689bf6ba4e638, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailTex1: + m_Texture: {fileID: 2800000, guid: a7ad6933f58d64d56a4879cc266290b3, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailTex2: + m_Texture: {fileID: 2800000, guid: abf274fea99064d7f9087e58ccaf6d27, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _WindowTex: + m_Texture: {fileID: 2800000, guid: a88424a1da5f049169a689bf6ba4e638, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _Emission: 0.1 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.78676474, g: 0.78676474, b: 0.78676474, a: 1} + - _DetailColor: {r: 1, g: 0.99264705, b: 1, a: 1} + - _DetailColor1: {r: 1, g: 1, b: 1, a: 1} + - _DetailColor2: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + - _WindowColor: {r: 0.23529412, g: 0.41911763, b: 1, a: 1} diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets/Materials/LightTopMaterial.mat.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets/Materials/LightTopMaterial.mat.meta new file mode 100644 index 000000000..349a0e696 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets/Materials/LightTopMaterial.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: ce046f747f2e84761ab461cb5f85fcbd +timeCreated: 1520454477 +licenseType: Pro +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/LightIcon.png b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/LightIcon.png new file mode 100644 index 000000000..7305e66d8 Binary files /dev/null and b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/LightIcon.png differ diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/LightIcon.png.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/LightIcon.png.meta new file mode 100644 index 000000000..2eee3d131 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/LightIcon.png.meta @@ -0,0 +1,78 @@ +fileFormatVersion: 2 +guid: a6abe9dc5451a4d4683e41afd413a0d5 +timeCreated: 1523562702 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic.meta new file mode 100644 index 000000000..d4d63e41e --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 1d39b68bd0fcc41e88196412d22a683f +folderAsset: yes +timeCreated: 1524075909 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets.meta new file mode 100644 index 000000000..e2c62ab0e --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: bdbdb0d8875404b278dd343cf3b95064 +folderAsset: yes +timeCreated: 1524673128 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Atlas.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Atlas.meta new file mode 100644 index 000000000..5bd1ffc24 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Atlas.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: baf18efdb9c1e4533b37895d97c04abc +folderAsset: yes +timeCreated: 1524502876 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Atlas/RealisticAtlasInfo.asset b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Atlas/RealisticAtlasInfo.asset new file mode 100644 index 000000000..2c23bcc36 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Atlas/RealisticAtlasInfo.asset @@ -0,0 +1,320 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48879146f3ce9fb4abc113a9a2bb8e0a, type: 3} + m_Name: RealisticAtlasInfo + m_EditorClassIdentifier: + Textures: + - TextureRect: + serializedVersion: 2 + x: 0.25 + y: 0.5 + width: 0.25 + height: 0.5 + MidFloorCount: 4 + ColumnCount: 2 + TopSectionRatio: 0.2 + BottomSectionRatio: 0.2 + PreferredEdgeSectionLength: 40 + FloorHeight: 48 + FirstFloorHeight: 16 + TopFloorHeight: 16 + bottomOfTopUv: 0.9 + topOfMidUv: 0.9 + topOfBottomUv: 0.6 + midUvHeight: 0.3 + WallToFloorRatio: 1.2 + - TextureRect: + serializedVersion: 2 + x: 0.5 + y: 0.25 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 3 + TopSectionRatio: 0.3 + BottomSectionRatio: 0.4 + PreferredEdgeSectionLength: 40 + FloorHeight: 11.999999 + FirstFloorHeight: 16 + TopFloorHeight: 12 + bottomOfTopUv: 0.425 + topOfMidUv: 0.425 + topOfBottomUv: 0.35 + midUvHeight: 0.074999996 + WallToFloorRatio: 0.29999998 + - TextureRect: + serializedVersion: 2 + x: 0 + y: 0.25 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 4 + TopSectionRatio: 0.3 + BottomSectionRatio: 0.4 + PreferredEdgeSectionLength: 40 + FloorHeight: 11.999999 + FirstFloorHeight: 16 + TopFloorHeight: 12 + bottomOfTopUv: 0.425 + topOfMidUv: 0.425 + topOfBottomUv: 0.35 + midUvHeight: 0.074999996 + WallToFloorRatio: 0.29999998 + - TextureRect: + serializedVersion: 2 + x: 0.75 + y: 0.25 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 11 + TopSectionRatio: 0.3 + BottomSectionRatio: 0.4 + PreferredEdgeSectionLength: 40 + FloorHeight: 11.999999 + FirstFloorHeight: 16 + TopFloorHeight: 12 + bottomOfTopUv: 0.425 + topOfMidUv: 0.425 + topOfBottomUv: 0.35 + midUvHeight: 0.074999996 + WallToFloorRatio: 0.29999998 + - TextureRect: + serializedVersion: 2 + x: 0.25 + y: 0.25 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 2 + TopSectionRatio: 0.3 + BottomSectionRatio: 0.4 + PreferredEdgeSectionLength: 40 + FloorHeight: 11.999999 + FirstFloorHeight: 16 + TopFloorHeight: 12 + bottomOfTopUv: 0.425 + topOfMidUv: 0.425 + topOfBottomUv: 0.35 + midUvHeight: 0.074999996 + WallToFloorRatio: 0.29999998 + - TextureRect: + serializedVersion: 2 + x: 0.25 + y: 0 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 2 + TopSectionRatio: 0.3 + BottomSectionRatio: 0.4 + PreferredEdgeSectionLength: 40 + FloorHeight: 11.999999 + FirstFloorHeight: 16 + TopFloorHeight: 12 + bottomOfTopUv: 0.175 + topOfMidUv: 0.175 + topOfBottomUv: 0.1 + midUvHeight: 0.074999996 + WallToFloorRatio: 0.29999998 + - TextureRect: + serializedVersion: 2 + x: 0.75 + y: 0 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 6 + TopSectionRatio: 0.3 + BottomSectionRatio: 0.4 + PreferredEdgeSectionLength: 40 + FloorHeight: 11.999999 + FirstFloorHeight: 16 + TopFloorHeight: 12 + bottomOfTopUv: 0.175 + topOfMidUv: 0.175 + topOfBottomUv: 0.1 + midUvHeight: 0.074999996 + WallToFloorRatio: 0.29999998 + - TextureRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 3 + TopSectionRatio: 0.3 + BottomSectionRatio: 0.4 + PreferredEdgeSectionLength: 30 + FloorHeight: 8.999999 + FirstFloorHeight: 12 + TopFloorHeight: 9 + bottomOfTopUv: 0.175 + topOfMidUv: 0.175 + topOfBottomUv: 0.1 + midUvHeight: 0.074999996 + WallToFloorRatio: 0.29999998 + - TextureRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 3 + TopSectionRatio: 0.3 + BottomSectionRatio: 0.4 + PreferredEdgeSectionLength: 40 + FloorHeight: 11.999999 + FirstFloorHeight: 16 + TopFloorHeight: 12 + bottomOfTopUv: 0.175 + topOfMidUv: 0.175 + topOfBottomUv: 0.1 + midUvHeight: 0.074999996 + WallToFloorRatio: 0.29999998 + - TextureRect: + serializedVersion: 2 + x: 0 + y: 0.5 + width: 0.25 + height: 0.5 + MidFloorCount: 4 + ColumnCount: 3 + TopSectionRatio: 0.2 + BottomSectionRatio: 0.2 + PreferredEdgeSectionLength: 40 + FloorHeight: 48 + FirstFloorHeight: 16 + TopFloorHeight: 16 + bottomOfTopUv: 0.9 + topOfMidUv: 0.9 + topOfBottomUv: 0.6 + midUvHeight: 0.3 + WallToFloorRatio: 1.2 + - TextureRect: + serializedVersion: 2 + x: 0.5 + y: 0.5 + width: 0.25 + height: 0.5 + MidFloorCount: 4 + ColumnCount: 3 + TopSectionRatio: 0.2 + BottomSectionRatio: 0.2 + PreferredEdgeSectionLength: 40 + FloorHeight: 48 + FirstFloorHeight: 16 + TopFloorHeight: 16 + bottomOfTopUv: 0.9 + topOfMidUv: 0.9 + topOfBottomUv: 0.6 + midUvHeight: 0.3 + WallToFloorRatio: 1.2 + - TextureRect: + serializedVersion: 2 + x: 0.75 + y: 0.5 + width: 0.25 + height: 0.5 + MidFloorCount: 4 + ColumnCount: 4 + TopSectionRatio: 0.2 + BottomSectionRatio: 0.2 + PreferredEdgeSectionLength: 40 + FloorHeight: 48 + FirstFloorHeight: 16 + TopFloorHeight: 16 + bottomOfTopUv: 0.9 + topOfMidUv: 0.9 + topOfBottomUv: 0.6 + midUvHeight: 0.3 + WallToFloorRatio: 1.2 + Roofs: + - TextureRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0.5 + height: 0.5 + MidFloorCount: 0 + ColumnCount: 0 + TopSectionRatio: 0 + BottomSectionRatio: 0 + PreferredEdgeSectionLength: 0 + FloorHeight: 0 + FirstFloorHeight: 0 + TopFloorHeight: 0 + bottomOfTopUv: 0 + topOfMidUv: 0 + topOfBottomUv: 0 + midUvHeight: 0 + WallToFloorRatio: 0 + - TextureRect: + serializedVersion: 2 + x: 0.5 + y: 0 + width: 0.5 + height: 0.5 + MidFloorCount: 0 + ColumnCount: 0 + TopSectionRatio: 0 + BottomSectionRatio: 0 + PreferredEdgeSectionLength: 0 + FloorHeight: 0 + FirstFloorHeight: 0 + TopFloorHeight: 0 + bottomOfTopUv: 0 + topOfMidUv: 0 + topOfBottomUv: 0 + midUvHeight: 0 + WallToFloorRatio: 0 + - TextureRect: + serializedVersion: 2 + x: 0 + y: 0.5 + width: 0.5 + height: 0.5 + MidFloorCount: 0 + ColumnCount: 0 + TopSectionRatio: 0 + BottomSectionRatio: 0 + PreferredEdgeSectionLength: 0 + FloorHeight: 0 + FirstFloorHeight: 0 + TopFloorHeight: 0 + bottomOfTopUv: 0 + topOfMidUv: 0 + topOfBottomUv: 0 + midUvHeight: 0 + WallToFloorRatio: 0 + - TextureRect: + serializedVersion: 2 + x: 0.5 + y: 0.5 + width: 0.5 + height: 0.5 + MidFloorCount: 0 + ColumnCount: 0 + TopSectionRatio: 0 + BottomSectionRatio: 0 + PreferredEdgeSectionLength: 0 + FloorHeight: 0 + FirstFloorHeight: 0 + TopFloorHeight: 0 + bottomOfTopUv: 0 + topOfMidUv: 0 + topOfBottomUv: 0 + midUvHeight: 0 + WallToFloorRatio: 0 + AtlasEntityType: 0 diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Atlas/RealisticAtlasInfo.asset.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Atlas/RealisticAtlasInfo.asset.meta new file mode 100644 index 000000000..1cfd80229 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Atlas/RealisticAtlasInfo.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c422f39ca8fe566479230c87805b3301 +timeCreated: 1527158143 +licenseType: Pro +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Materials.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Materials.meta new file mode 100644 index 000000000..127b2ab79 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Materials.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 17022f11f743746409ecc2920ba138af +folderAsset: yes +timeCreated: 1524502856 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Materials/RealisticSideMaterial.mat b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Materials/RealisticSideMaterial.mat new file mode 100644 index 000000000..64935a3e3 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Materials/RealisticSideMaterial.mat @@ -0,0 +1,80 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: RealisticSideMaterial + m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _METALLICGLOSSMAP _NORMALMAP _SPECGLOSSMAP + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: d2a73dbb08d7ca840a90744f29331d48, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: b1e095fa97e0735448d692ea5d0f52b5, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 2800000, guid: 916910a2b0b27a440970a3f9c651e595, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 2800000, guid: d80341d897c46944dac3b14c8311e585, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 2800000, guid: 523830272e1419a4eae6d3f62dc02761, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Materials/RealisticSideMaterial.mat.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Materials/RealisticSideMaterial.mat.meta new file mode 100644 index 000000000..d9b48ca92 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Materials/RealisticSideMaterial.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9f4e4d809e3e14cc08a842dc23ff86ed +timeCreated: 1523481632 +licenseType: Pro +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Materials/RealisticTopMaterial.mat b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Materials/RealisticTopMaterial.mat new file mode 100644 index 000000000..ade17652a --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Materials/RealisticTopMaterial.mat @@ -0,0 +1,80 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: RealisticTopMaterial + m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _NORMALMAP + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 51c66b5db8c2a4b24a57320af1b9ccba, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 350555390fc65468c902fcfa4326a7ae, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 2800000, guid: 78882085082044e13b4522161b27799e, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Materials/RealisticTopMaterial.mat.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Materials/RealisticTopMaterial.mat.meta new file mode 100644 index 000000000..e2ff3b7a4 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Materials/RealisticTopMaterial.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e510beb4b52b54f9eace1c065a96dd24 +timeCreated: 1523481632 +licenseType: Pro +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures.meta new file mode 100644 index 000000000..65fe43f73 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: d238bfe6909294cbfbd4158ecf549a1a +folderAsset: yes +timeCreated: 1524502864 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticSideAO.png b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticSideAO.png new file mode 100644 index 000000000..76b299458 Binary files /dev/null and b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticSideAO.png differ diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticSideAO.png.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticSideAO.png.meta new file mode 100644 index 000000000..069e98291 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticSideAO.png.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: d80341d897c46944dac3b14c8311e585 +timeCreated: 1527203129 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticSideAlbedo.png b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticSideAlbedo.png new file mode 100644 index 000000000..b3232e53d Binary files /dev/null and b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticSideAlbedo.png differ diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticSideAlbedo.png.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticSideAlbedo.png.meta new file mode 100644 index 000000000..222db0720 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticSideAlbedo.png.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: b1e095fa97e0735448d692ea5d0f52b5 +timeCreated: 1527203127 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticSideMetallic.png b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticSideMetallic.png new file mode 100644 index 000000000..0f3196223 Binary files /dev/null and b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticSideMetallic.png differ diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticSideMetallic.png.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticSideMetallic.png.meta new file mode 100644 index 000000000..e20ba14ab --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticSideMetallic.png.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: 916910a2b0b27a440970a3f9c651e595 +timeCreated: 1527203126 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticSideNormal.png b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticSideNormal.png new file mode 100644 index 000000000..d65882977 Binary files /dev/null and b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticSideNormal.png differ diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticSideNormal.png.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticSideNormal.png.meta new file mode 100644 index 000000000..9625a4f4d --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticSideNormal.png.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: d2a73dbb08d7ca840a90744f29331d48 +timeCreated: 1527203235 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 1 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticSideRoughness.png b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticSideRoughness.png new file mode 100644 index 000000000..960e35369 Binary files /dev/null and b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticSideRoughness.png differ diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticSideRoughness.png.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticSideRoughness.png.meta new file mode 100644 index 000000000..9d23c2342 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticSideRoughness.png.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: 523830272e1419a4eae6d3f62dc02761 +timeCreated: 1527203126 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticTopAO.png b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticTopAO.png new file mode 100644 index 000000000..22e055c20 Binary files /dev/null and b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticTopAO.png differ diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticTopAO.png.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticTopAO.png.meta new file mode 100644 index 000000000..0640725b4 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticTopAO.png.meta @@ -0,0 +1,78 @@ +fileFormatVersion: 2 +guid: 78882085082044e13b4522161b27799e +timeCreated: 1524771524 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticTopAlbedo.png b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticTopAlbedo.png new file mode 100644 index 000000000..044b26f5a Binary files /dev/null and b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticTopAlbedo.png differ diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticTopAlbedo.png.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticTopAlbedo.png.meta new file mode 100644 index 000000000..cd6c082d0 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticTopAlbedo.png.meta @@ -0,0 +1,78 @@ +fileFormatVersion: 2 +guid: 350555390fc65468c902fcfa4326a7ae +timeCreated: 1524614431 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticTopNormal.png b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticTopNormal.png new file mode 100644 index 000000000..cf0b4c284 Binary files /dev/null and b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticTopNormal.png differ diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticTopNormal.png.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticTopNormal.png.meta new file mode 100644 index 000000000..8714cce0b --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Textures/RealisticTopNormal.png.meta @@ -0,0 +1,78 @@ +fileFormatVersion: 2 +guid: 51c66b5db8c2a4b24a57320af1b9ccba +timeCreated: 1524771523 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 1 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/RealisticIcon.png b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/RealisticIcon.png new file mode 100644 index 000000000..96ee78839 Binary files /dev/null and b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/RealisticIcon.png differ diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/RealisticIcon.png.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/RealisticIcon.png.meta new file mode 100644 index 000000000..dd82459c7 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/RealisticIcon.png.meta @@ -0,0 +1,78 @@ +fileFormatVersion: 2 +guid: 8d7b18fbb73ab4574887f2502c6b332d +timeCreated: 1523562702 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite.meta new file mode 100644 index 000000000..b9f57986e --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 8773d242ae6264de6b2d9dde90edfc84 +folderAsset: yes +timeCreated: 1525729182 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/Assets.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/Assets.meta new file mode 100644 index 000000000..f88b5ab0e --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/Assets.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 6ad17a97f632a40fba47671b05212900 +folderAsset: yes +timeCreated: 1524673128 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/Assets/Materials.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/Assets/Materials.meta new file mode 100644 index 000000000..ec23d6eb8 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/Assets/Materials.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c93c2d52130b8459bafe6d51c50d4ce6 +folderAsset: yes +timeCreated: 1524502483 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/Assets/Materials/SatelliteSideMaterial.mat b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/Assets/Materials/SatelliteSideMaterial.mat new file mode 100644 index 000000000..bfc1338d0 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/Assets/Materials/SatelliteSideMaterial.mat @@ -0,0 +1,102 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: SatelliteSideMaterial + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseTex: + m_Texture: {fileID: 2800000, guid: 4d520150ef3724e4bb52237605c761df, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailTex: + m_Texture: {fileID: 2800000, guid: 36bfefc139bfa434daf90848bb333e1d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailTex1: + m_Texture: {fileID: 2800000, guid: 36bfefc139bfa434daf90848bb333e1d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailTex2: + m_Texture: {fileID: 2800000, guid: aaebc04bedf1444bebad66d5386b3744, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _WindowTex: + m_Texture: {fileID: 2800000, guid: aaebc04bedf1444bebad66d5386b3744, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _Emission: 0.75 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _DetailColor: {r: 0, g: 0.751724, b: 1, a: 1} + - _DetailColor1: {r: 1, g: 1, b: 1, a: 1} + - _DetailColor2: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + - _WindowColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/Assets/Materials/SatelliteSideMaterial.mat.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/Assets/Materials/SatelliteSideMaterial.mat.meta new file mode 100644 index 000000000..8746c5590 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/Assets/Materials/SatelliteSideMaterial.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: ace449cc706bd49b7a69aa1cf216554b +timeCreated: 1520454477 +licenseType: Pro +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/Assets/Materials/SatelliteTopMaterial.mat b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/Assets/Materials/SatelliteTopMaterial.mat new file mode 100644 index 000000000..f9437c90a --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/Assets/Materials/SatelliteTopMaterial.mat @@ -0,0 +1,102 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: SatelliteTopMaterial + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseTex: + m_Texture: {fileID: 2800000, guid: 89d3c1f500b7e4b8bba0ce9b760e9134, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailTex: + m_Texture: {fileID: 2800000, guid: a88424a1da5f049169a689bf6ba4e638, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailTex1: + m_Texture: {fileID: 2800000, guid: a7ad6933f58d64d56a4879cc266290b3, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailTex2: + m_Texture: {fileID: 2800000, guid: abf274fea99064d7f9087e58ccaf6d27, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _WindowTex: + m_Texture: {fileID: 2800000, guid: a88424a1da5f049169a689bf6ba4e638, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _Emission: 0.1 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _DetailColor: {r: 1, g: 0.99264705, b: 1, a: 1} + - _DetailColor1: {r: 1, g: 1, b: 1, a: 1} + - _DetailColor2: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + - _WindowColor: {r: 0.23529412, g: 0.41911763, b: 1, a: 1} diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/Assets/Materials/SatelliteTopMaterial.mat.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/Assets/Materials/SatelliteTopMaterial.mat.meta new file mode 100644 index 000000000..fe9fb27e5 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/Assets/Materials/SatelliteTopMaterial.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 37ef2b0c2d42647a79863b9c9661beeb +timeCreated: 1520454477 +licenseType: Pro +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/SatelliteIcon.png b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/SatelliteIcon.png new file mode 100644 index 000000000..7e1809f31 Binary files /dev/null and b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/SatelliteIcon.png differ diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/SatelliteIcon.png.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/SatelliteIcon.png.meta new file mode 100644 index 000000000..b17d5b069 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/SatelliteIcon.png.meta @@ -0,0 +1,78 @@ +fileFormatVersion: 2 +guid: ad764ebd3ff314d70b7e1caac328efd6 +timeCreated: 1523562702 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple.meta new file mode 100644 index 000000000..bb008ca75 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 61aefc08b5ccc4377ae9b402d4aced81 +folderAsset: yes +timeCreated: 1525729182 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets.meta new file mode 100644 index 000000000..3e47848bc --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b559719ab140941b0804edd9cd5150f2 +folderAsset: yes +timeCreated: 1524673128 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Atlas.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Atlas.meta new file mode 100644 index 000000000..896988bf7 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Atlas.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 85506310233344ca692aaa8aa0ded9b3 +folderAsset: yes +timeCreated: 1524502554 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Atlas/SimpleAtlasInfo.asset b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Atlas/SimpleAtlasInfo.asset new file mode 100644 index 000000000..0a30d555a --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Atlas/SimpleAtlasInfo.asset @@ -0,0 +1,239 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48879146f3ce9fb4abc113a9a2bb8e0a, type: 3} + m_Name: SimpleAtlasInfo + m_EditorClassIdentifier: + Textures: + - TextureRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 3 + TopSectionRatio: 0.3 + BottomSectionRatio: 0.4 + PreferredEdgeSectionLength: 40 + FloorHeight: 10 + FirstFloorHeight: 12 + TopFloorHeight: 12 + - TextureRect: + serializedVersion: 2 + x: 0.25 + y: 0 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 4 + TopSectionRatio: 0.3 + BottomSectionRatio: 0.4 + PreferredEdgeSectionLength: 40 + FloorHeight: 10 + FirstFloorHeight: 12 + TopFloorHeight: 12 + - TextureRect: + serializedVersion: 2 + x: 0.5 + y: 0 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 5 + TopSectionRatio: 0.3 + BottomSectionRatio: 0.4 + PreferredEdgeSectionLength: 40 + FloorHeight: 10 + FirstFloorHeight: 12 + TopFloorHeight: 12 + - TextureRect: + serializedVersion: 2 + x: 0.75 + y: 0 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 6 + TopSectionRatio: 0.3 + BottomSectionRatio: 0.4 + PreferredEdgeSectionLength: 40 + FloorHeight: 10 + FirstFloorHeight: 12 + TopFloorHeight: 12 + - TextureRect: + serializedVersion: 2 + x: 0 + y: 0.25 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 4 + TopSectionRatio: 0.3 + BottomSectionRatio: 0.4 + PreferredEdgeSectionLength: 40 + FloorHeight: 10 + FirstFloorHeight: 12 + TopFloorHeight: 12 + - TextureRect: + serializedVersion: 2 + x: 0.25 + y: 0.25 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 2 + TopSectionRatio: 0.3 + BottomSectionRatio: 0.4 + PreferredEdgeSectionLength: 40 + FloorHeight: 10 + FirstFloorHeight: 12 + TopFloorHeight: 12 + - TextureRect: + serializedVersion: 2 + x: 0.5 + y: 0.25 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 1 + TopSectionRatio: 0.3 + BottomSectionRatio: 0.4 + PreferredEdgeSectionLength: 40 + FloorHeight: 10 + FirstFloorHeight: 12 + TopFloorHeight: 12 + - TextureRect: + serializedVersion: 2 + x: 0.75 + y: 0.25 + width: 0.25 + height: 0.25 + MidFloorCount: 1 + ColumnCount: 11 + TopSectionRatio: 0.3 + BottomSectionRatio: 0.4 + PreferredEdgeSectionLength: 40 + FloorHeight: 10 + FirstFloorHeight: 12 + TopFloorHeight: 12 + - TextureRect: + serializedVersion: 2 + x: 0 + y: 0.5 + width: 0.5 + height: 0.5 + MidFloorCount: 4 + ColumnCount: 1 + TopSectionRatio: 0.2 + BottomSectionRatio: 0.2 + PreferredEdgeSectionLength: 40 + FloorHeight: 50 + FirstFloorHeight: 12 + TopFloorHeight: 12 + - TextureRect: + serializedVersion: 2 + x: 0.25 + y: 0.5 + width: 0.25 + height: 0.5 + MidFloorCount: 4 + ColumnCount: 2 + TopSectionRatio: 0.2 + BottomSectionRatio: 0.2 + PreferredEdgeSectionLength: 40 + FloorHeight: 50 + FirstFloorHeight: 12 + TopFloorHeight: 12 + - TextureRect: + serializedVersion: 2 + x: 0.5 + y: 0.5 + width: 0.25 + height: 0.5 + MidFloorCount: 4 + ColumnCount: 3 + TopSectionRatio: 0.2 + BottomSectionRatio: 0.2 + PreferredEdgeSectionLength: 40 + FloorHeight: 50 + FirstFloorHeight: 12 + TopFloorHeight: 12 + - TextureRect: + serializedVersion: 2 + x: 0.75 + y: 0.5 + width: 0.25 + height: 0.5 + MidFloorCount: 4 + ColumnCount: 4 + TopSectionRatio: 0.2 + BottomSectionRatio: 0.2 + PreferredEdgeSectionLength: 40 + FloorHeight: 50 + FirstFloorHeight: 12 + TopFloorHeight: 12 + Roofs: + - TextureRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0.5 + height: 0.5 + MidFloorCount: 0 + ColumnCount: 0 + TopSectionRatio: 0 + BottomSectionRatio: 0 + PreferredEdgeSectionLength: 0 + FloorHeight: 0 + FirstFloorHeight: 0 + TopFloorHeight: 0 + - TextureRect: + serializedVersion: 2 + x: 0.5 + y: 0 + width: 0.5 + height: 0.5 + MidFloorCount: 0 + ColumnCount: 0 + TopSectionRatio: 0 + BottomSectionRatio: 0 + PreferredEdgeSectionLength: 0 + FloorHeight: 0 + FirstFloorHeight: 0 + TopFloorHeight: 0 + - TextureRect: + serializedVersion: 2 + x: 0 + y: 0.5 + width: 0.5 + height: 0.5 + MidFloorCount: 0 + ColumnCount: 0 + TopSectionRatio: 0 + BottomSectionRatio: 0 + PreferredEdgeSectionLength: 0 + FloorHeight: 0 + FirstFloorHeight: 0 + TopFloorHeight: 0 + - TextureRect: + serializedVersion: 2 + x: 0.5 + y: 0.5 + width: 0.5 + height: 0.5 + MidFloorCount: 0 + ColumnCount: 0 + TopSectionRatio: 0 + BottomSectionRatio: 0 + PreferredEdgeSectionLength: 0 + FloorHeight: 0 + FirstFloorHeight: 0 + TopFloorHeight: 0 diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Atlas/SimpleAtlasInfo.asset.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Atlas/SimpleAtlasInfo.asset.meta new file mode 100644 index 000000000..98f20eab3 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Atlas/SimpleAtlasInfo.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4df87964fe5004278acef942d9a878d4 +timeCreated: 1515083851 +licenseType: Pro +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Materials.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Materials.meta new file mode 100644 index 000000000..832dbadb7 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Materials.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: fbf857b3329304fdeb9c0c0ef551ad0e +folderAsset: yes +timeCreated: 1524502483 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Materials/SimpleSideMaterial.mat b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Materials/SimpleSideMaterial.mat new file mode 100644 index 000000000..7f91d27dc --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Materials/SimpleSideMaterial.mat @@ -0,0 +1,102 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: SimpleSideMaterial + m_Shader: {fileID: 4800000, guid: 02ca05f28416c4bbab659e473fa74ec6, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseTex: + m_Texture: {fileID: 2800000, guid: 4d520150ef3724e4bb52237605c761df, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailTex: + m_Texture: {fileID: 2800000, guid: 36bfefc139bfa434daf90848bb333e1d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailTex1: + m_Texture: {fileID: 2800000, guid: 36bfefc139bfa434daf90848bb333e1d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailTex2: + m_Texture: {fileID: 2800000, guid: aaebc04bedf1444bebad66d5386b3744, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _WindowTex: + m_Texture: {fileID: 2800000, guid: aaebc04bedf1444bebad66d5386b3744, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _Emission: 0.5 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _DetailColor: {r: 0, g: 0.751724, b: 1, a: 1} + - _DetailColor1: {r: 1, g: 1, b: 1, a: 1} + - _DetailColor2: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WindowColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Materials/SimpleSideMaterial.mat.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Materials/SimpleSideMaterial.mat.meta new file mode 100644 index 000000000..58033e2f4 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Materials/SimpleSideMaterial.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 55cc6edead802446b9106b2998406844 +timeCreated: 1520454477 +licenseType: Pro +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Materials/SimpleTopMaterial.mat b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Materials/SimpleTopMaterial.mat new file mode 100644 index 000000000..42b7a46dc --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Materials/SimpleTopMaterial.mat @@ -0,0 +1,102 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: SimpleTopMaterial + m_Shader: {fileID: 4800000, guid: 02ca05f28416c4bbab659e473fa74ec6, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseTex: + m_Texture: {fileID: 2800000, guid: 89d3c1f500b7e4b8bba0ce9b760e9134, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailTex: + m_Texture: {fileID: 2800000, guid: a88424a1da5f049169a689bf6ba4e638, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailTex1: + m_Texture: {fileID: 2800000, guid: a7ad6933f58d64d56a4879cc266290b3, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailTex2: + m_Texture: {fileID: 2800000, guid: abf274fea99064d7f9087e58ccaf6d27, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _WindowTex: + m_Texture: {fileID: 2800000, guid: a88424a1da5f049169a689bf6ba4e638, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _Emission: 0.1 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _DetailColor: {r: 1, g: 0.99264705, b: 1, a: 1} + - _DetailColor1: {r: 1, g: 1, b: 1, a: 1} + - _DetailColor2: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WindowColor: {r: 0.23529412, g: 0.41911763, b: 1, a: 1} diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Materials/SimpleTopMaterial.mat.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Materials/SimpleTopMaterial.mat.meta new file mode 100644 index 000000000..f0fc15821 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Materials/SimpleTopMaterial.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: d4d7464e3429a44e090f55a4ac17f110 +timeCreated: 1520454477 +licenseType: Pro +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Palettes.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Palettes.meta new file mode 100644 index 000000000..5fbf88a48 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Palettes.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9a885e2bd58ba447d8b6058ec9503125 +folderAsset: yes +timeCreated: 1524502575 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Palettes/SimplePalette.asset b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Palettes/SimplePalette.asset new file mode 100644 index 000000000..ea29adfc8 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Palettes/SimplePalette.asset @@ -0,0 +1,34 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 324a61621a4444024b4a9423715bd22b, type: 3} + m_Name: SimplePalette + m_EditorClassIdentifier: + m_numColors: 9 + m_keyColor: {r: 0.8161765, g: 0.69962716, b: 0.5521194, a: 1} + m_colors: + - {r: 0.6328619, g: 0.49346206, b: 0.44425955, a: 1} + - {r: 0.6985294, g: 0.6954592, b: 0.64716697, a: 1} + - {r: 0.93227565, g: 0.9338235, b: 0.9269572, a: 1} + - {r: 0.8897059, g: 0.70093226, b: 0.50373054, a: 1} + - {r: 0.5068123, g: 0.56482077, b: 0.63235295, a: 1} + - {r: 0.58965516, g: 0.50580156, b: 0.48993406, a: 1} + - {r: 0.866, g: 0.628776, b: 0.527394, a: 1} + - {r: 0.9191176, g: 0.8699924, b: 0.7096129, a: 1} + - {r: 0.593929, g: 0.53991795, b: 0.46728235, a: 1} + m_hueRange: 0.118 + m_saturationRange: 0.144 + m_valueRange: 0.569 + m_setBaseColor_Override: 0 + m_setDetailColor1_Override: 0 + m_setDetailColor2_Override: 1 + m_baseColor_Override: {r: 1, g: 1, b: 1, a: 1} + m_detailColor1_Override: {r: 1, g: 1, b: 1, a: 1} + m_detailColor2_Override: {r: 0.934, g: 0.9042066, b: 0.8996618, a: 1} diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Palettes/SimplePalette.asset.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Palettes/SimplePalette.asset.meta new file mode 100644 index 000000000..91a78d941 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Palettes/SimplePalette.asset.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 4fd73d34b66444b66b89dc5cbdf1f7a1 +timeCreated: 1520536530 +licenseType: Pro +NativeFormatImporter: + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures.meta new file mode 100644 index 000000000..da2768d7f --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ad3eb3b8c15c8417fb462e9ab69c8534 +folderAsset: yes +timeCreated: 1524502522 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasFacades_base.png b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasFacades_base.png similarity index 100% rename from sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasFacades_base.png rename to sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasFacades_base.png diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasFacades_base.png.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasFacades_base.png.meta similarity index 100% rename from sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasFacades_base.png.meta rename to sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasFacades_base.png.meta diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasFacades_detailMask_1.png b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasFacades_detailMask_1.png similarity index 100% rename from sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasFacades_detailMask_1.png rename to sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasFacades_detailMask_1.png diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasFacades_detailMask_1.png.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasFacades_detailMask_1.png.meta similarity index 100% rename from sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasFacades_detailMask_1.png.meta rename to sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasFacades_detailMask_1.png.meta diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasFacades_detailMask_2.png b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasFacades_detailMask_2.png similarity index 100% rename from sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasFacades_detailMask_2.png rename to sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasFacades_detailMask_2.png diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasFacades_detailMask_2.png.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasFacades_detailMask_2.png.meta similarity index 100% rename from sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasFacades_detailMask_2.png.meta rename to sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasFacades_detailMask_2.png.meta diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasRoofs_base.png b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasRoofs_base.png similarity index 100% rename from sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasRoofs_base.png rename to sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasRoofs_base.png diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasRoofs_base.png.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasRoofs_base.png.meta similarity index 100% rename from sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasRoofs_base.png.meta rename to sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasRoofs_base.png.meta diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasRoofs_detailMask_1.png b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasRoofs_detailMask_1.png similarity index 100% rename from sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasRoofs_detailMask_1.png rename to sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasRoofs_detailMask_1.png diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasRoofs_detailMask_1.png.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasRoofs_detailMask_1.png.meta similarity index 100% rename from sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasRoofs_detailMask_1.png.meta rename to sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasRoofs_detailMask_1.png.meta diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasRoofs_detailMask_2.png b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasRoofs_detailMask_2.png similarity index 100% rename from sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasRoofs_detailMask_2.png rename to sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasRoofs_detailMask_2.png diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasRoofs_detailMask_2.png.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasRoofs_detailMask_2.png.meta similarity index 100% rename from sdkproject/Assets/Mapbox/Resources/MapboxStyles/Textures/BuildingAtlasRoofs_detailMask_2.png.meta rename to sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/Assets/Textures/BuildingAtlasRoofs_detailMask_2.png.meta diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/SimpleIcon.png b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/SimpleIcon.png new file mode 100644 index 000000000..5c86bb29d Binary files /dev/null and b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/SimpleIcon.png differ diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/SimpleIcon.png.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/SimpleIcon.png.meta new file mode 100644 index 000000000..b02e68c62 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Simple/SimpleIcon.png.meta @@ -0,0 +1,78 @@ +fileFormatVersion: 2 +guid: 1e03266b76f414711a005e4161875ebc +timeCreated: 1523562702 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/ScriptablePalettes/Cool.asset b/sdkproject/Assets/Mapbox/Resources/ScriptablePalettes/Cool.asset index c4df68402..e277d64aa 100644 --- a/sdkproject/Assets/Mapbox/Resources/ScriptablePalettes/Cool.asset +++ b/sdkproject/Assets/Mapbox/Resources/ScriptablePalettes/Cool.asset @@ -22,3 +22,9 @@ MonoBehaviour: m_hueRange: 0.21 m_saturationRange: 0.203 m_valueRange: 0.292 + m_setBaseColor_Override: 0 + m_setDetailColor1_Override: 0 + m_setDetailColor2_Override: 0 + m_baseColor_Override: {r: 1, g: 1, b: 1, a: 1} + m_detailColor1_Override: {r: 1, g: 1, b: 1, a: 1} + m_detailColor2_Override: {r: 1, g: 1, b: 1, a: 1} diff --git a/sdkproject/Assets/Mapbox/Resources/ScriptablePalettes/Rainbow.asset b/sdkproject/Assets/Mapbox/Resources/ScriptablePalettes/Rainbow.asset index 5d938c3dc..f1d8dce89 100644 --- a/sdkproject/Assets/Mapbox/Resources/ScriptablePalettes/Rainbow.asset +++ b/sdkproject/Assets/Mapbox/Resources/ScriptablePalettes/Rainbow.asset @@ -25,3 +25,9 @@ MonoBehaviour: m_hueRange: 0.537 m_saturationRange: 0 m_valueRange: 0 + m_setBaseColor_Override: 0 + m_setDetailColor1_Override: 0 + m_setDetailColor2_Override: 0 + m_baseColor_Override: {r: 1, g: 1, b: 1, a: 1} + m_detailColor1_Override: {r: 1, g: 1, b: 1, a: 1} + m_detailColor2_Override: {r: 1, g: 1, b: 1, a: 1} diff --git a/sdkproject/Assets/Mapbox/Resources/ScriptablePalettes/Urban.asset b/sdkproject/Assets/Mapbox/Resources/ScriptablePalettes/Urban.asset index 0cc108564..4d4819b51 100644 --- a/sdkproject/Assets/Mapbox/Resources/ScriptablePalettes/Urban.asset +++ b/sdkproject/Assets/Mapbox/Resources/ScriptablePalettes/Urban.asset @@ -22,3 +22,9 @@ MonoBehaviour: m_hueRange: 0.144 m_saturationRange: 0.305 m_valueRange: 0.253 + m_setBaseColor_Override: 0 + m_setDetailColor1_Override: 0 + m_setDetailColor2_Override: 0 + m_baseColor_Override: {r: 1, g: 1, b: 1, a: 1} + m_detailColor1_Override: {r: 1, g: 1, b: 1, a: 1} + m_detailColor2_Override: {r: 1, g: 1, b: 1, a: 1} diff --git a/sdkproject/Assets/Mapbox/Resources/ScriptablePalettes/Warm.asset b/sdkproject/Assets/Mapbox/Resources/ScriptablePalettes/Warm.asset index 59a7ded43..af85a442d 100644 --- a/sdkproject/Assets/Mapbox/Resources/ScriptablePalettes/Warm.asset +++ b/sdkproject/Assets/Mapbox/Resources/ScriptablePalettes/Warm.asset @@ -22,3 +22,9 @@ MonoBehaviour: m_hueRange: 0.185 m_saturationRange: 0.682 m_valueRange: 0.253 + m_setBaseColor_Override: 0 + m_setDetailColor1_Override: 0 + m_setDetailColor2_Override: 0 + m_baseColor_Override: {r: 1, g: 1, b: 1, a: 1} + m_detailColor1_Override: {r: 1, g: 1, b: 1, a: 1} + m_detailColor2_Override: {r: 1, g: 1, b: 1, a: 1} diff --git a/sdkproject/Assets/Mapbox/Unity/Constants.cs b/sdkproject/Assets/Mapbox/Unity/Constants.cs index 0bac94b2b..f8e197e9c 100644 --- a/sdkproject/Assets/Mapbox/Unity/Constants.cs +++ b/sdkproject/Assets/Mapbox/Unity/Constants.cs @@ -4,7 +4,7 @@ namespace Mapbox.Unity public static class Constants { - public const string SDK_VERSION = "1.4.2"; + public const string SDK_VERSION = "1.4.3"; public static class Path { @@ -16,6 +16,17 @@ public static class Path public const string DID_PROMPT_CONFIGURATION = "MAPBOX_DID_PROMPT_CONFIGURATION"; public static readonly string MAPBOX_RESOURCES_RELATIVE = System.IO.Path.Combine("Mapbox", "MapboxConfiguration"); public static readonly string MAPBOX_RESOURCES_ABSOLUTE = System.IO.Path.Combine(System.IO.Path.Combine(Application.dataPath, "Resources"), "Mapbox"); + + public static readonly string MAPBOX_USER = System.IO.Path.Combine("Assets", System.IO.Path.Combine("Mapbox", "User")); + public static readonly string MAPBOX_USER_MODIFIERS = System.IO.Path.Combine(MAPBOX_USER, "Modifiers"); + + public static readonly string MAP_FEATURE_STYLES_DEFAULT_STYLE_ASSETS = System.IO.Path.Combine("MapboxStyles", "DefaultStyleAssets"); + public static readonly string MAP_FEATURE_STYLES_SAMPLES = System.IO.Path.Combine(System.IO.Path.Combine("MapboxStyles", "Styles"), "MapboxSampleStyles"); + + public const string MAPBOX_STYLES_ASSETS_FOLDER = "Assets"; + public const string MAPBOX_STYLES_ATLAS_FOLDER = "Atlas"; + public const string MAPBOX_STYLES_MATERIAL_FOLDER = "Materials"; + public const string MAPBOX_STYLES_PALETTES_FOLDER = "Palettes"; } /// @@ -31,5 +42,33 @@ public static class Math public static Vector3 Vector3Right = new Vector3(1, 0, 0); } + + /// + /// Store common style asset prefixes and suffixes to avoid string spelling errors in code. + /// + public static class StyleAssetNames + { + public const string ALTAS_SUFFIX = "AtlasInfo"; + public const string PALETTE_SUFFIX = "Palette"; + + public const string TOP_MATERIAL_SUFFIX = "TopMaterial"; + public const string SIDE_MATERIAL_SUFFIX = "SideMaterial"; + } + + public static class GUI + { + public static class Colors + { + public static readonly Color EDITOR_TEXT_COLOR = new Color(0.7f, 0.7f, 0.7f); + public static readonly Color EDITOR_NOTE_COLOR = new Color(1.0f, 0.8f, 0.0f); + } + + public static class Styles + { + public static readonly GUIStyle EDITOR_NOTE_STYLE = new GUIStyle { wordWrap = true, normal = { textColor = Colors.EDITOR_NOTE_COLOR } }; + public static readonly GUIStyle EDITOR_TEXTURE_STYLE_DESCRIPTION_STYLE = new GUIStyle { wordWrap = true, normal = { textColor = Colors.EDITOR_TEXT_COLOR } }; + public static readonly GUIStyle EDITOR_TEXTURE_THUMBNAIL_STYLE = new GUIStyle { imagePosition = ImagePosition.ImageOnly, wordWrap = true }; + } + } } } diff --git a/sdkproject/Assets/Mapbox/Unity/DataContainers/GeometryMaterialOptions.cs b/sdkproject/Assets/Mapbox/Unity/DataContainers/GeometryMaterialOptions.cs index f23737692..484b7665e 100644 --- a/sdkproject/Assets/Mapbox/Unity/DataContainers/GeometryMaterialOptions.cs +++ b/sdkproject/Assets/Mapbox/Unity/DataContainers/GeometryMaterialOptions.cs @@ -3,7 +3,6 @@ using System; using Mapbox.Unity.MeshGeneration.Modifiers; using Mapbox.Unity.MeshGeneration.Data; - using UnityEngine; [Serializable] public class GeometryMaterialOptions : ModifierProperties @@ -15,6 +14,9 @@ public override Type ModifierType return typeof(MaterialModifier); } } + + public StyleTypes style; + public UvMapType texturingType = UvMapType.Tiled; public MaterialList[] materials = new MaterialList[2]; public AtlasInfo atlasInfo; @@ -38,7 +40,9 @@ public override Type ModifierType return typeof(UvModifier); } } + public StyleTypes style; public UvMapType texturingType = UvMapType.Tiled; public AtlasInfo atlasInfo; } + } diff --git a/sdkproject/Assets/Mapbox/Unity/DataContainers/MapboxEnums.cs b/sdkproject/Assets/Mapbox/Unity/DataContainers/MapboxEnums.cs index 2aa0260c4..0cfb5d4b4 100644 --- a/sdkproject/Assets/Mapbox/Unity/DataContainers/MapboxEnums.cs +++ b/sdkproject/Assets/Mapbox/Unity/DataContainers/MapboxEnums.cs @@ -74,13 +74,11 @@ public enum VectorPrimitiveType public enum UvMapType { [Description("Use image texture using tiled UV.")] - Tiled, - [Description("Use image texture from the Imagery source as texture for roofs. ")] - Satellite, + Tiled = 0, [Description("Use an image texture atlas to define textures for roof & sides of buildings.")] - Atlas, + Atlas = 2, [Description("Use an image texture atlas and a color pallete to define textures for roof & sides of buildings.")] - AtlasWithColorPalette, + AtlasWithColorPalette = 3, } public enum ImagerySourceType @@ -177,6 +175,35 @@ public enum ColliderType SphereCollider, } + public enum MapFeatureType + { + [Description("Building Layer.")] + Building, + [Description("Road Layer.")] + Road, + [Description("Parkland Layer.")] + Parkland, + }; + + public enum StyleTypes + { + [Description("Custom style.")] + Custom, + [Description("Simple style combines stylized vector designs with scriptable palettes to create a simple, procedurally colored rendering style.")] + Simple, + [Description("Light style uses colored materials to create light, greyscale shading for your map.")] + Light, + [Description("Dark style uses colored materials to create dark, greyscale shading for your map.")] + Dark, + [Description("Realistic style combines modern, urban designs with physically based rendering materials to help create a contemporary, realistic rendering style.")] + Realistic, + [Description("Fantasy style combines old world medieval designs with physically based rendering materials to help create a fantasy rendering style.")] + Fantasy, + [Description("Satellite style uses high-resolution satellite imagery as a texture set. The comprehensive set of road, label, and POI information brings clarity and context to the crisp detail in our high-resolution satellite imagery.")] + Satellite, + + } + public enum LocationPrefabFindBy { [Description("Display points of interest based on a choice of categories")] @@ -199,4 +226,11 @@ public enum LocationPrefabCategories Shops = 1 << 5, Transportation = 1 << 6 } + + public enum FeatureProcessingStage + { + PreProcess, + Process, + PostProcess + } } diff --git a/sdkproject/Assets/Mapbox/Unity/Editor/ClearFileCache.cs b/sdkproject/Assets/Mapbox/Unity/Editor/ClearFileCache.cs new file mode 100644 index 000000000..c6033fe82 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Editor/ClearFileCache.cs @@ -0,0 +1,19 @@ +namespace Mapbox.Editor +{ + using UnityEditor; + using UnityEngine; + + [InitializeOnLoad] + public class ClearFileCache : MonoBehaviour + { + + + [MenuItem("Mapbox/Clear File Cache")] + public static void ClearAllCachFiles() + { + Unity.MapboxAccess.Instance.ClearAllCacheFiles(); + } + + + } +} diff --git a/sdkproject/Assets/Mapbox/Unity/Editor/ClearMbTilesCache.cs.meta b/sdkproject/Assets/Mapbox/Unity/Editor/ClearFileCache.cs.meta similarity index 100% rename from sdkproject/Assets/Mapbox/Unity/Editor/ClearMbTilesCache.cs.meta rename to sdkproject/Assets/Mapbox/Unity/Editor/ClearFileCache.cs.meta diff --git a/sdkproject/Assets/Mapbox/Unity/Editor/ClearMbTilesCache.cs b/sdkproject/Assets/Mapbox/Unity/Editor/ClearMbTilesCache.cs deleted file mode 100644 index ddb5f36fc..000000000 --- a/sdkproject/Assets/Mapbox/Unity/Editor/ClearMbTilesCache.cs +++ /dev/null @@ -1,27 +0,0 @@ -namespace Mapbox.Editor -{ - using System.Collections; - using UnityEditor; - using UnityEngine; - - [InitializeOnLoad] - public class ClearMbTilesCache : MonoBehaviour - { - - - [MenuItem("Mapbox/Clear Caches/Current Scene")] - public static void ClearCachingFileSource() - { - Mapbox.Unity.MapboxAccess.Instance.ClearSceneCache(); - } - - - [MenuItem("Mapbox/Clear Caches/All")] - public static void ClearAllCachFiles() - { - Mapbox.Unity.MapboxAccess.Instance.ClearAllCacheFiles(); - } - - - } -} \ No newline at end of file diff --git a/sdkproject/Assets/Mapbox/Unity/Editor/MapboxConfigurationWindow.cs b/sdkproject/Assets/Mapbox/Unity/Editor/MapboxConfigurationWindow.cs index 69762ab7f..f8d75f98c 100644 --- a/sdkproject/Assets/Mapbox/Unity/Editor/MapboxConfigurationWindow.cs +++ b/sdkproject/Assets/Mapbox/Unity/Editor/MapboxConfigurationWindow.cs @@ -28,7 +28,7 @@ public class MapboxConfigurationWindow : EditorWindow [Range(0, 1000)] static int _memoryCacheSize = 500; [Range(0, 3000)] - static int _mbtilesCacheSize = 2000; + static int _fileCacheSize = 25000; static int _webRequestTimeout = 30; static bool _autoRefreshCache = false; @@ -136,7 +136,7 @@ static void Init() { AccessToken = _accessToken, MemoryCacheSize = (uint)_memoryCacheSize, - MbTilesCacheSize = (uint)_mbtilesCacheSize, + FileCacheSize = (uint)_fileCacheSize, AutoRefreshCache = _autoRefreshCache, DefaultTimeout = _webRequestTimeout }; @@ -167,7 +167,7 @@ static void OpenWindow() { _accessToken = _mapboxConfig.AccessToken; _memoryCacheSize = (int)_mapboxConfig.MemoryCacheSize; - _mbtilesCacheSize = (int)_mapboxConfig.MbTilesCacheSize; + _fileCacheSize = (int)_mapboxConfig.FileCacheSize; _autoRefreshCache = _mapboxConfig.AutoRefreshCache; _webRequestTimeout = (int)_mapboxConfig.DefaultTimeout; @@ -254,7 +254,7 @@ private static void SubmitConfiguration() { AccessToken = _accessToken, MemoryCacheSize = (uint)_memoryCacheSize, - MbTilesCacheSize = (uint)_mbtilesCacheSize, + FileCacheSize = (uint)_fileCacheSize, AutoRefreshCache = _autoRefreshCache, DefaultTimeout = _webRequestTimeout }; @@ -563,7 +563,7 @@ void DrawConfigurationSettings() EditorGUIUtility.labelWidth = 240f; EditorGUI.indentLevel = 2; _memoryCacheSize = EditorGUILayout.IntSlider("Mem Cache Size (# of tiles)", _memoryCacheSize, 0, 1000); - _mbtilesCacheSize = EditorGUILayout.IntSlider("MBTiles Cache Size (# of tiles)", _mbtilesCacheSize, 0, 3000); + _fileCacheSize = EditorGUILayout.IntSlider("File Cache Size (# of tiles)", _fileCacheSize, 0, 3000); _autoRefreshCache = EditorGUILayout.Toggle(new GUIContent("Auto refresh cache", "Automatically update tiles in the local ambient cache if there is a newer version available online. ATTENTION: for every tile displayed (even a cached one) a webrequest needs to be made to check for updates."), _autoRefreshCache); _webRequestTimeout = EditorGUILayout.IntField("Default Web Request Timeout (s)", _webRequestTimeout); @@ -686,4 +686,4 @@ static bool ShouldShowConfigurationWindow() return PlayerPrefs.GetInt(Constants.Path.DID_PROMPT_CONFIGURATION) == 0; } } -} \ No newline at end of file +} diff --git a/sdkproject/Assets/Mapbox/Unity/Editor/PopupSelectionMenu.cs b/sdkproject/Assets/Mapbox/Unity/Editor/PopupSelectionMenu.cs new file mode 100644 index 000000000..8645a0505 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Editor/PopupSelectionMenu.cs @@ -0,0 +1,180 @@ +using UnityEngine; +using UnityEditor; +using System.Collections.Generic; +using System; +using System.IO; +using System.Reflection; +using Mapbox.Unity; + +namespace Mapbox.Editor +{ + /// + /// Pop up menu for selecting, creating and assigning modifier instances to AbstractMap. + /// + public class PopupSelectionMenu : PopupWindowContent + { + + private Type _type; + + private Action _act; + + private List _modTypes; + + private SerializedProperty _finalize; + + private int _index = -1; + + private Vector2 _scrollPos; + + public override Vector2 GetWindowSize() + { + return new Vector2(250, 250); + } + + public override void OnGUI(Rect rect) + { + if (_modTypes == null || _modTypes.Count == 0) + { + _modTypes = new List(); + + AppDomain currentDomain = AppDomain.CurrentDomain; + Assembly[] assemblies = currentDomain.GetAssemblies(); + for (int i = 0; i < assemblies.Length; i++) + { + Type[] types = assemblies[i].GetTypes(); + for (int j = 0; j < types.Length; j++) + { + if (types[j].IsSubclassOf(_type)) + { + _modTypes.Add(types[j]); + } + } + } + } + + GUILayout.Label(String.Format("{0}s", _type.Name), EditorStyles.boldLabel); + var st = new GUIStyle(); + st.padding = new RectOffset(0, 0, 15, 15); + _scrollPos = EditorGUILayout.BeginScrollView(_scrollPos, st); + + for (int i = 0; i < _modTypes.Count; i++) + { + Type asset = _modTypes[i]; + if (asset == null) //yea turns out this can happen + continue; + var style = GUI.skin.button; + style.alignment = TextAnchor.MiddleLeft; + string shortTypeName = GetShortTypeName(asset.ToString()); + if (GUILayout.Button(shortTypeName, style)) + { + CreateNewModiferInstance(asset, shortTypeName); + editorWindow.Close(); + } + } + EditorGUILayout.EndScrollView(); + } + + /// + /// Gets the short name of the type. + /// + /// The short type name. + /// Input. + private string GetShortTypeName(string input) + { + int pos = input.LastIndexOf(".", StringComparison.CurrentCulture) + 1; + return input.Substring(pos, input.Length - pos); + } + + /// + /// Creates the new modifer instance. + /// + /// Type. + /// Name. + private void CreateNewModiferInstance(Type type, string name) + { + var modifierInstance = ScriptableObject.CreateInstance(type); + + string pathCandidate = Constants.Path.MAPBOX_USER_MODIFIERS; + if(!Directory.Exists(pathCandidate)) + { + + string userFolder = Constants.Path.MAPBOX_USER; + if(!Directory.Exists(userFolder)) + { + string parentPath = System.IO.Path.Combine("Assets", "Mapbox"); + AssetDatabase.CreateFolder(parentPath, "User"); + } + AssetDatabase.CreateFolder(userFolder, "Modifiers"); + } + + foreach (UnityEngine.Object obj in Selection.GetFiltered(typeof(UnityEngine.Object), SelectionMode.Assets)) + { + pathCandidate = AssetDatabase.GetAssetPath(obj); + if (!string.IsNullOrEmpty(pathCandidate) && File.Exists(pathCandidate)) + { + pathCandidate = Path.GetDirectoryName(pathCandidate); + break; + } + } + + string combinedPath = string.Format("{0}{1}.asset", Path.Combine(pathCandidate, "New"), name); + string uniqueAssetPath = AssetDatabase.GenerateUniqueAssetPath(combinedPath); + + modifierInstance.name = name; + + AssetDatabase.CreateAsset(modifierInstance, uniqueAssetPath); + + AssetDatabase.SaveAssets(); + AssetDatabase.Refresh(); + + AddNewInstanceToArray(modifierInstance); + + Debug.Log(string.Format("Created new {0} modifer at {1}", name, uniqueAssetPath)); + } + + /// + /// Adds the new instance to array. + /// + /// Object. + public void AddNewInstanceToArray(object obj) + { + ScriptableObject asset = obj as ScriptableObject; + if (_act != null) + { + _act(asset); + } + else + { + if (_index == -1) + { + _finalize.arraySize++; + _finalize.GetArrayElementAtIndex(_finalize.arraySize - 1).objectReferenceValue = asset; + _finalize.serializedObject.ApplyModifiedProperties(); + } + else + { + _finalize.GetArrayElementAtIndex(_index).objectReferenceValue = asset; + _finalize.serializedObject.ApplyModifiedProperties(); + } + } + } + + /// + /// Initializes a new instance of the class. + /// + /// T. + /// P. + /// Index. + /// Act. + public PopupSelectionMenu(Type t, SerializedProperty p, int index = -1, Action act = null) + { + _type = t; + _finalize = p; + _act = act; + if (index > -1) + { + _index = index; + } + } + } +} \ No newline at end of file diff --git a/sdkproject/Assets/Mapbox/Unity/Editor/PopupSelectionMenu.cs.meta b/sdkproject/Assets/Mapbox/Unity/Editor/PopupSelectionMenu.cs.meta new file mode 100644 index 000000000..abfb974cf --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Editor/PopupSelectionMenu.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: a6c73878fee204232a755433b391ccd5 +timeCreated: 1526401331 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/FeaturesSubLayerPropertiesDrawer.cs b/sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/FeaturesSubLayerPropertiesDrawer.cs index b3201c690..358bcf170 100644 --- a/sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/FeaturesSubLayerPropertiesDrawer.cs +++ b/sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/FeaturesSubLayerPropertiesDrawer.cs @@ -226,12 +226,36 @@ public void DrawUI(SerializedProperty property) subLayerFilterOptions.FindPropertyRelative("combinerType").enumValueIndex = (int)LayerFilterCombinerOperationType.Any; - var subLayerMaterialOptions = subLayer.FindPropertyRelative("materialOptions"); - subLayerMaterialOptions.FindPropertyRelative("materials").ClearArray(); - subLayerMaterialOptions.FindPropertyRelative("materials").arraySize = 2; - subLayerMaterialOptions.FindPropertyRelative("atlasInfo").objectReferenceValue = null; - subLayerMaterialOptions.FindPropertyRelative("colorPalette").objectReferenceValue = null; - subLayerMaterialOptions.FindPropertyRelative("texturingType").enumValueIndex = (int)UvMapType.Tiled; + var subLayerGeometryMaterialOptions = subLayer.FindPropertyRelative("materialOptions"); + subLayerGeometryMaterialOptions.FindPropertyRelative("style").enumValueIndex = (int)StyleTypes.Realistic; + + GeometryMaterialOptions geometryMaterialOptionsReference = MapboxDefaultStyles.GetDefaultAssets(); + + var mats = subLayerGeometryMaterialOptions.FindPropertyRelative("materials"); + mats.arraySize = 2; + + var topMatArray = mats.GetArrayElementAtIndex(0).FindPropertyRelative("Materials"); + var sideMatArray = mats.GetArrayElementAtIndex(1).FindPropertyRelative("Materials"); + + if (topMatArray.arraySize == 0) + { + topMatArray.arraySize = 1; + } + if (sideMatArray.arraySize == 0) + { + sideMatArray.arraySize = 1; + } + + var topMat = topMatArray.GetArrayElementAtIndex(0); + var sideMat = sideMatArray.GetArrayElementAtIndex(0); + + var atlas = subLayerGeometryMaterialOptions.FindPropertyRelative("atlasInfo"); + var palette = subLayerGeometryMaterialOptions.FindPropertyRelative("colorPalette"); + + topMat.objectReferenceValue = geometryMaterialOptionsReference.materials[0].Materials[0]; + sideMat.objectReferenceValue = geometryMaterialOptionsReference.materials[1].Materials[0]; + atlas.objectReferenceValue = geometryMaterialOptionsReference.atlasInfo; + palette.objectReferenceValue = geometryMaterialOptionsReference.colorPalette; subLayer.FindPropertyRelative("buildingsWithUniqueIds").boolValue = false; subLayer.FindPropertyRelative("moveFeaturePositionTo").enumValueIndex = (int)PositionTargetType.TileCenter; @@ -316,10 +340,11 @@ void DrawLayerVisualizerProperties(VectorSourceType sourceType, SerializedProper EditorGUILayout.PropertyField(layerProperty.FindPropertyRelative("colliderOptions")); GUILayout.Space(-_lineHeight); EditorGUILayout.PropertyField(layerProperty.FindPropertyRelative("extrusionOptions")); + GUILayout.Space(-_lineHeight); EditorGUILayout.PropertyField(layerProperty.FindPropertyRelative("materialOptions")); } - EditorGUI.indentLevel--; + //EditorGUI.indentLevel--; ShowOthers = EditorGUILayout.Foldout(ShowOthers, "Advanced"); EditorGUI.indentLevel++; if (ShowOthers) @@ -395,14 +420,10 @@ void DrawModifiers(SerializedProperty property, GUIContent label) EditorGUILayout.EndVertical(); - if (GUILayout.Button(new GUIContent("+"), (GUIStyle)"minibuttonleft", GUILayout.Width(30))) - { - ScriptableCreatorWindow.Open(typeof(MeshModifier), meshfac, ind); - } - - if (GUILayout.Button(new GUIContent("-"), (GUIStyle)"minibuttonright", GUILayout.Width(30))) + if (GUILayout.Button(new GUIContent("x"), (GUIStyle)"minibuttonright", GUILayout.Width(30))) { meshfac.DeleteArrayElementAtIndex(ind); + meshfac.DeleteArrayElementAtIndex(ind); } EditorGUILayout.EndHorizontal(); @@ -412,13 +433,14 @@ void DrawModifiers(SerializedProperty property, GUIContent label) EditorGUI.indentLevel++; EditorGUILayout.BeginHorizontal(); GUILayout.Space(EditorGUI.indentLevel * 12); - if (GUILayout.Button(new GUIContent("Add New Empty"), (GUIStyle)"minibuttonleft")) + Rect buttonRect = GUILayoutUtility.GetLastRect(); + if (GUILayout.Button(new GUIContent("Add New"), (GUIStyle)"minibuttonleft")) { - meshfac.arraySize++; - meshfac.GetArrayElementAtIndex(meshfac.arraySize - 1).objectReferenceValue = null; + PopupWindow.Show(buttonRect, new PopupSelectionMenu(typeof(MeshModifier), meshfac)); + if (Event.current.type == EventType.Repaint) buttonRect = GUILayoutUtility.GetLastRect(); } - if (GUILayout.Button(new GUIContent("Find Asset"), (GUIStyle)"minibuttonright")) + if (GUILayout.Button(new GUIContent("Add Existing"), (GUIStyle)"minibuttonright")) { ScriptableCreatorWindow.Open(typeof(MeshModifier), meshfac); } @@ -426,6 +448,7 @@ void DrawModifiers(SerializedProperty property, GUIContent label) EditorGUILayout.EndHorizontal(); EditorGUI.indentLevel--; EditorGUILayout.Space(); + EditorGUILayout.LabelField(new GUIContent { text = "Game Object Modifiers", @@ -443,14 +466,10 @@ void DrawModifiers(SerializedProperty property, GUIContent label) false) as ScriptableObject; EditorGUILayout.EndVertical(); - if (GUILayout.Button(new GUIContent("+"), (GUIStyle)"minibuttonleft", GUILayout.Width(30))) - { - ScriptableCreatorWindow.Open(typeof(GameObjectModifier), gofac, ind); - } - - if (GUILayout.Button(new GUIContent("-"), (GUIStyle)"minibuttonright", GUILayout.Width(30))) + if (GUILayout.Button(new GUIContent("x"), GUILayout.Width(30))) { gofac.DeleteArrayElementAtIndex(ind); + gofac.DeleteArrayElementAtIndex(ind); } EditorGUILayout.EndHorizontal(); @@ -460,14 +479,17 @@ void DrawModifiers(SerializedProperty property, GUIContent label) EditorGUI.indentLevel++; EditorGUILayout.BeginHorizontal(); GUILayout.Space(EditorGUI.indentLevel * 12); - if (GUILayout.Button(new GUIContent("Add New Empty"), (GUIStyle)"minibuttonleft")) + //buttonRect = GUILayoutUtility.GetLastRect(); + if (GUILayout.Button(new GUIContent("Add New"), (GUIStyle)"minibuttonleft")) { - gofac.arraySize++; - gofac.GetArrayElementAtIndex(gofac.arraySize - 1).objectReferenceValue = null; + PopupWindow.Show(buttonRect, new PopupSelectionMenu(typeof(GameObjectModifier), gofac)); + if (Event.current.type == EventType.Repaint) buttonRect = GUILayoutUtility.GetLastRect(); } - - if (GUILayout.Button(new GUIContent("Find Asset"), (GUIStyle)"minibuttonright")) + //EditorWindow.Repaint(); + //buttonRect = GUILayoutUtility.GetLastRect(); + if (GUILayout.Button(new GUIContent("Add Existing"), (GUIStyle)"minibuttonright")) { + ScriptableCreatorWindow.Open(typeof(GameObjectModifier), gofac); } diff --git a/sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/GeometryMaterialOptionsDrawer.cs b/sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/GeometryMaterialOptionsDrawer.cs index 3723eb7f8..62c84b1a4 100644 --- a/sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/GeometryMaterialOptionsDrawer.cs +++ b/sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/GeometryMaterialOptionsDrawer.cs @@ -2,118 +2,129 @@ { using UnityEditor; using UnityEngine; + using Mapbox.Unity; using Mapbox.Unity.Map; + using Mapbox.Unity.MeshGeneration.Data; + using Mapbox.VectorTile.ExtensionMethods; + using System.IO; + using System.Collections.Generic; + + public class StyleIconBundle + { + public string path; + public Texture texture; + + public void Load() + { + if (texture == null) + { + texture = Resources.Load(path) as Texture; + } + } + + public StyleIconBundle(string styleName) + { + path = Path.Combine(Constants.Path.MAP_FEATURE_STYLES_SAMPLES, Path.Combine(styleName, string.Format("{0}Icon", styleName))); + } + } [CustomPropertyDrawer(typeof(GeometryMaterialOptions))] public class GeometryMaterialOptionsDrawer : PropertyDrawer { static float lineHeight = EditorGUIUtility.singleLineHeight; - bool showPosition = true; + + private Dictionary _styleIconBundles = new Dictionary() + { + {StyleTypes.Simple, new StyleIconBundle(StyleTypes.Simple.ToString())}, + {StyleTypes.Realistic, new StyleIconBundle(StyleTypes.Realistic.ToString())}, + {StyleTypes.Fantasy, new StyleIconBundle(StyleTypes.Fantasy.ToString())}, + {StyleTypes.Light, new StyleIconBundle(StyleTypes.Light.ToString())}, + {StyleTypes.Dark, new StyleIconBundle(StyleTypes.Dark.ToString())}, + {StyleTypes.Satellite, new StyleIconBundle(StyleTypes.Satellite.ToString())}, + }; + + /// + /// Loads the default style icons. + /// + private void LoadDefaultStyleIcons() + { + foreach (var key in _styleIconBundles.Keys) + { + _styleIconBundles[key].Load(); + } + } public override void OnGUI(Rect position, SerializedProperty property, GUIContent label) { + LoadDefaultStyleIcons(); EditorGUI.BeginProperty(position, label, property); - //showPosition = EditorGUI.Foldout(new Rect(position.x, position.y, position.width, lineHeight), showPosition, label.text); - EditorGUI.LabelField(new Rect(position.x, position.y, position.width, lineHeight), new GUIContent { text = "Material Options", tooltip = "Unity materials to be used for features. " }); + + //position.y += lineHeight; + var styleTypeLabel = new GUIContent { text = "Texturing Style", tooltip = "Texturing style for feature; choose from sample style or create your own by choosing Custom. " }; + var styleType = property.FindPropertyRelative("style"); + + GUIContent[] styleTypeGuiContent = new GUIContent[styleType.enumDisplayNames.Length]; + for (int i = 0; i < styleType.enumDisplayNames.Length; i++) + { + styleTypeGuiContent[i] = new GUIContent + { + text = styleType.enumDisplayNames[i] + }; + } + + styleType.enumValueIndex = EditorGUILayout.Popup(styleTypeLabel, styleType.enumValueIndex, styleTypeGuiContent); EditorGUI.indentLevel++; - //if (showPosition) + if ((StyleTypes)styleType.enumValueIndex != StyleTypes.Custom) + { + GUILayout.BeginHorizontal(); + + Texture2D thumbnailTexture = (Texture2D)_styleIconBundles[(StyleTypes)styleType.enumValueIndex].texture; + + string descriptionLabel = EnumExtensions.Description((StyleTypes)styleType.enumValueIndex); + EditorGUILayout.LabelField(new GUIContent(" ", thumbnailTexture), Constants.GUI.Styles.EDITOR_TEXTURE_THUMBNAIL_STYLE, GUILayout.Height(60), GUILayout.Width(EditorGUIUtility.labelWidth - 60)); + EditorGUILayout.TextArea(descriptionLabel, (GUIStyle)"wordWrappedLabel"); + + GUILayout.EndHorizontal(); + } + else { - position.y += lineHeight; - var typePosition = EditorGUI.PrefixLabel(new Rect(position.x, position.y, position.width, lineHeight), GUIUtility.GetControlID(FocusType.Passive), new GUIContent { text = "Texturing Type", tooltip = "Use image texture from the Imagery source as texture for roofs. " }); var texturingType = property.FindPropertyRelative("texturingType"); - EditorGUI.indentLevel -= 2; - texturingType.enumValueIndex = EditorGUI.Popup(typePosition, texturingType.enumValueIndex, texturingType.enumDisplayNames); + int valIndex = texturingType.enumValueIndex == 0 ? 0 : texturingType.enumValueIndex + 1; + var texturingTypeGUI = new GUIContent { text = "Texturing Type", tooltip = EnumExtensions.Description((UvMapType)valIndex) }; - EditorGUI.indentLevel += 2; + EditorGUILayout.PropertyField(texturingType, texturingTypeGUI); var matList = property.FindPropertyRelative("materials"); if (matList.arraySize == 0) { matList.arraySize = 2; } - + GUILayout.Space(-lineHeight); var roofMat = matList.GetArrayElementAtIndex(0); - EditorGUI.PropertyField(new Rect(position.x, position.y, position.width, lineHeight), roofMat, new GUIContent { text = "Roof Material", tooltip = "Unity material to use for extruded roof/top mesh. " }); - position.y += EditorGUI.GetPropertyHeight(roofMat); + EditorGUILayout.PropertyField(roofMat, new GUIContent { text = "Top Material", tooltip = "Unity material to use for extruded top/roof mesh. " }); + GUILayout.Space(-lineHeight); var wallMat = matList.GetArrayElementAtIndex(1); - EditorGUI.PropertyField(new Rect(position.x, position.y, position.width, lineHeight), wallMat, new GUIContent { text = "Wall Material", tooltip = "Unity material to use for extruded wall/side mesh. " }); - position.y += EditorGUI.GetPropertyHeight(wallMat); + EditorGUILayout.PropertyField(wallMat, new GUIContent { text = "Side Material", tooltip = "Unity material to use for extruded side/wall mesh. " }); - if ((UvMapType)texturingType.enumValueIndex == UvMapType.Atlas) + if ((UvMapType)texturingType.enumValueIndex + 1 == UvMapType.Atlas) { - position.y += lineHeight; var atlasInfo = property.FindPropertyRelative("atlasInfo"); - EditorGUI.ObjectField(new Rect(position.x, position.y, position.width, lineHeight), atlasInfo, new GUIContent { text = "Altas Info", tooltip = "Atlas information scriptable object, this defines how the texture roof and wall texture atlases will be used. " }); + EditorGUILayout.ObjectField(atlasInfo, new GUIContent { text = "Altas Info", tooltip = "Atlas information scriptable object, this defines how the texture roof and wall texture atlases will be used. " }); } - if ((UvMapType)texturingType.enumValueIndex == UvMapType.AtlasWithColorPalette) + if ((UvMapType)texturingType.enumValueIndex + 1 == UvMapType.AtlasWithColorPalette) { - position.y += lineHeight; var atlasInfo = property.FindPropertyRelative("atlasInfo"); - EditorGUI.ObjectField(new Rect(position.x, position.y, position.width, lineHeight), atlasInfo, new GUIContent { text = "Altas Info", tooltip = "Atlas information scriptable object, this defines how the texture roof and wall texture atlases will be used. " }); - position.y += lineHeight; + EditorGUILayout.ObjectField(atlasInfo, new GUIContent { text = "Altas Info", tooltip = "Atlas information scriptable object, this defines how the texture roof and wall texture atlases will be used. " }); var colorPalette = property.FindPropertyRelative("colorPalette"); - EditorGUI.ObjectField(new Rect(position.x, position.y, position.width, lineHeight), colorPalette, new GUIContent { text = "Color Palette", tooltip = "Atlas information scriptable object, this defines how the texture roof and wall texture atlases will be used. " }); - } - } - //EditorGUI.indentLevel--; - EditorGUI.EndProperty(); - } - public override float GetPropertyHeight(SerializedProperty property, GUIContent label) - { - // Reserve space for the total visible properties. - float height = 0.0f; - if (showPosition) - { - height += (2.0f * lineHeight); - var matList = property.FindPropertyRelative("materials"); + EditorGUILayout.ObjectField(colorPalette, new GUIContent { text = "Color Palette", tooltip = "Color palette scriptable object, allows texture features to be procedurally colored at runtime. Requires materials that use the MapboxPerRenderer shader. " }); - for (int i = 0; i < matList.arraySize; i++) - { - var matInList = matList.GetArrayElementAtIndex(i); - height += EditorGUI.GetPropertyHeight(matInList); - } - var texturingType = property.FindPropertyRelative("texturingType"); - if ((UvMapType)texturingType.enumValueIndex == UvMapType.Atlas) - { - height += lineHeight; - } - if ((UvMapType)texturingType.enumValueIndex == UvMapType.AtlasWithColorPalette) - { - height += (2.0f * lineHeight); + EditorGUILayout.LabelField(new GUIContent { text = "Note: Atlas With Color Palette requires materials that use the MapboxPerRenderer shader." }, Constants.GUI.Styles.EDITOR_NOTE_STYLE); } } - else - { - height = EditorGUIUtility.singleLineHeight; - } - return height; + EditorGUI.indentLevel--; + EditorGUI.EndProperty(); } } - - //[CustomPropertyDrawer(typeof(TypeVisualizerTuple))] - //public class TypeVisualizerBaseDrawer : PropertyDrawer - //{ - // static float lineHeight = EditorGUIUtility.singleLineHeight; - // bool showPosition = true; - // public override void OnGUI(Rect position, SerializedProperty property, GUIContent label) - // { - // EditorGUI.BeginProperty(position, label, property); - - // position.height = lineHeight; - - // EditorGUI.PropertyField(position, property.FindPropertyRelative("Stack")); - - // EditorGUI.EndProperty(); - // } - // public override float GetPropertyHeight(SerializedProperty property, GUIContent label) - // { - // // Reserve space for the total visible properties. - // int rows = 2; - // //Debug.Log("Height - " + rows * lineHeight); - // return (float)rows * lineHeight; - // } - //} - } diff --git a/sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/MaterialListDrawer.cs b/sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/MaterialListDrawer.cs index 8ea1370a9..2015535ee 100644 --- a/sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/MaterialListDrawer.cs +++ b/sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/MaterialListDrawer.cs @@ -7,51 +7,16 @@ [CustomPropertyDrawer(typeof(MaterialList))] public class MaterialListDrawer : PropertyDrawer { - static float lineHeight = EditorGUIUtility.singleLineHeight; public override void OnGUI(Rect position, SerializedProperty property, GUIContent label) { EditorGUI.BeginProperty(position, label, property); - //EditorGUI.indentLevel++; - position.y += lineHeight; var matArray = property.FindPropertyRelative("Materials"); if (matArray.arraySize == 0) { matArray.arraySize = 1; } - EditorGUI.PropertyField(new Rect(position.x, position.y, position.width, lineHeight), property.FindPropertyRelative("Materials").GetArrayElementAtIndex(0), label); + EditorGUILayout.PropertyField(property.FindPropertyRelative("Materials").GetArrayElementAtIndex(0), label); EditorGUI.EndProperty(); } - public override float GetPropertyHeight(SerializedProperty property, GUIContent label) - { - // Reserve space for the total visible properties. - var matList = property.FindPropertyRelative("Materials"); - int rows = (matList.isExpanded) ? matList.arraySize : 1; - return (float)rows * lineHeight; - } } - - //[CustomPropertyDrawer(typeof(TypeVisualizerTuple))] - //public class TypeVisualizerBaseDrawer : PropertyDrawer - //{ - // static float lineHeight = EditorGUIUtility.singleLineHeight; - // bool showPosition = true; - // public override void OnGUI(Rect position, SerializedProperty property, GUIContent label) - // { - // EditorGUI.BeginProperty(position, label, property); - - // position.height = lineHeight; - - // EditorGUI.PropertyField(position, property.FindPropertyRelative("Stack")); - - // EditorGUI.EndProperty(); - // } - // public override float GetPropertyHeight(SerializedProperty property, GUIContent label) - // { - // // Reserve space for the total visible properties. - // int rows = 2; - // //Debug.Log("Height - " + rows * lineHeight); - // return (float)rows * lineHeight; - // } - //} - } \ No newline at end of file diff --git a/sdkproject/Assets/Mapbox/Unity/Editor/VectorSubLayerTreeView.cs.meta b/sdkproject/Assets/Mapbox/Unity/Editor/VectorSubLayerTreeView.cs.meta new file mode 100644 index 000000000..bffbd132f --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Editor/VectorSubLayerTreeView.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: e597f3da0a26e469584070315e18e4f1 +timeCreated: 1526503584 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Unity/LayerProperties/PrefabItemOptions.cs b/sdkproject/Assets/Mapbox/Unity/LayerProperties/PrefabItemOptions.cs index 4c235702c..0399f2567 100644 --- a/sdkproject/Assets/Mapbox/Unity/LayerProperties/PrefabItemOptions.cs +++ b/sdkproject/Assets/Mapbox/Unity/LayerProperties/PrefabItemOptions.cs @@ -142,7 +142,6 @@ public Action> OnAllPrefabsInstantiated spawnPrefabOptions.AllPrefabsInstatiated = value; } } - #endregion } } \ No newline at end of file diff --git a/sdkproject/Assets/Mapbox/Unity/LayerProperties/VectorSubLayerProperties.cs b/sdkproject/Assets/Mapbox/Unity/LayerProperties/VectorSubLayerProperties.cs index 9a92edee6..81038033e 100644 --- a/sdkproject/Assets/Mapbox/Unity/LayerProperties/VectorSubLayerProperties.cs +++ b/sdkproject/Assets/Mapbox/Unity/LayerProperties/VectorSubLayerProperties.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using Mapbox.Unity.MeshGeneration.Modifiers; using Mapbox.Unity.Utilities; + using UnityEngine; [Serializable] public class VectorSubLayerProperties : LayerProperties @@ -21,10 +22,13 @@ public class VectorSubLayerProperties : LayerProperties { colliderType = ColliderType.None, }; + public GeometryMaterialOptions materialOptions = new GeometryMaterialOptions(); + //HACK : workaround to avoid users accidentaly leaving the buildingsWithUniqueIds settign on and have missing buildings. public bool honorBuildingIdSetting = true; public bool buildingsWithUniqueIds = false; + public PositionTargetType moveFeaturePositionTo; [NodeEditorElement("Mesh Modifiers")] public List MeshModifiers; diff --git a/sdkproject/Assets/Mapbox/Unity/Location/AbstractEditorLocationProvider.cs b/sdkproject/Assets/Mapbox/Unity/Location/AbstractEditorLocationProvider.cs index a8b7d1d45..4a530eebf 100644 --- a/sdkproject/Assets/Mapbox/Unity/Location/AbstractEditorLocationProvider.cs +++ b/sdkproject/Assets/Mapbox/Unity/Location/AbstractEditorLocationProvider.cs @@ -17,7 +17,7 @@ public abstract class AbstractEditorLocationProvider : AbstractLocationProvider [SerializeField] bool _sendEvent; - WaitForSeconds _wait; + WaitForSeconds _wait = new WaitForSeconds(0); #if UNITY_EDITOR protected virtual void Awake() diff --git a/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing.meta b/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing.meta new file mode 100644 index 000000000..6b2a8d550 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: a6514d9c3a647294ab532e1232696c50 +folderAsset: yes +timeCreated: 1527231979 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/AngleSmoothingAbstractBase.cs b/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/AngleSmoothingAbstractBase.cs new file mode 100644 index 000000000..0e5378eac --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/AngleSmoothingAbstractBase.cs @@ -0,0 +1,49 @@ +namespace Mapbox.Unity.Location +{ + + + using Mapbox.Utils; + using UnityEngine; + + + /// + /// Base class for implementing different smoothing strategies + /// + public abstract class AngleSmoothingAbstractBase : MonoBehaviour, IAngleSmoothing + { + + + [SerializeField] + [Tooltip("Number of measurements used for smoothing. Keep that number as low as feasible as collection of measurements depends on update time of location provider (minimum 500ms). eg 6 smoothes over the last 3 seconds.")] + [Range(5, 20)] + public int _measurements = 5; + + + public AngleSmoothingAbstractBase() + { + _angles = new CircularBuffer(_measurements); + } + + + /// + /// Internal storage for latest 'n' values. + /// + protected CircularBuffer _angles; + + + /// + /// Add angle to list of angles used for calculation. + /// + /// + public void Add(double angle) { _angles.Add(angle); } + + + /// + /// Calculate smoothed angle from previously added angles. + /// + /// Smoothed angle + public abstract double Calculate(); + + + } +} diff --git a/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/AngleSmoothingAbstractBase.cs.meta b/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/AngleSmoothingAbstractBase.cs.meta new file mode 100644 index 000000000..dd37d925e --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/AngleSmoothingAbstractBase.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 96b2e341a57b7f44a965174f6d88c67a +timeCreated: 1527175159 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/AngleSmoothingAverage.cs b/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/AngleSmoothingAverage.cs new file mode 100644 index 000000000..1a36bb243 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/AngleSmoothingAverage.cs @@ -0,0 +1,33 @@ +namespace Mapbox.Unity.Location +{ + + + using System; + using System.Linq; + + + /// + /// Simple averaging latest 'n' values. + /// + public class AngleSmoothingAverage : AngleSmoothingAbstractBase + { + + + public override double Calculate() + { + // calc mean heading taking into account that eg 355� and 5� should result in 0� and not 180� + // ref https://rosettacode.org/wiki/Averages/Mean_angle and https://rosettacode.org/wiki/Averages/Mean_angle#C.23 + double cos = _angles.Sum(a => Math.Cos(a * Math.PI / 180.0)) / _angles.Count; + double sin = _angles.Sum(a => Math.Sin(a * Math.PI / 180.0)) / _angles.Count; + + double finalAngle = (Math.Atan2(sin, cos) * 180.0 / Math.PI); + //stay positive ;-) + if (finalAngle < 0) { finalAngle += 360.0; } + + return finalAngle; + } + + + + } +} diff --git a/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/AngleSmoothingAverage.cs.meta b/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/AngleSmoothingAverage.cs.meta new file mode 100644 index 000000000..88b11b16c --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/AngleSmoothingAverage.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 6843ccbf70c208645a89b4c8c37a4ecf +timeCreated: 1527174926 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/AngleSmoothingLowPass.cs b/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/AngleSmoothingLowPass.cs new file mode 100644 index 000000000..aee1226ca --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/AngleSmoothingLowPass.cs @@ -0,0 +1,69 @@ +namespace Mapbox.Unity.Location +{ + using System; + using System.Collections; + using System.Collections.Generic; + using UnityEngine; + + + /// + /// Smoothing via low pass filter + /// + public class AngleSmoothingLowPass : AngleSmoothingAbstractBase + { + + + [SerializeField] + [Tooltip("Factor to change smoothing. The higher the factor the slower the angle changes.")] + [Range(0.01f, 0.9f)] + private double _smoothingFactor = 0.5; + + private double _lastSinus; + private double _lastCosinus; + + + public override double Calculate() + { + + //// v1: using just previous angle //// + /* + double angle = _angles[0]; + _lastSinus = _smoothingFactor * _lastSinus + (1 - _smoothingFactor) * Math.Sin(angle * Math.PI / 180.0); + _lastCosinus = _smoothingFactor * _lastCosinus + (1 - _smoothingFactor) * Math.Cos(angle * Math.PI / 180.0); + + double finalAngle = (Math.Atan2(_lastSinus, _lastCosinus) * 180.0 / Math.PI); + //stay positive ;-) + if (finalAngle < 0) { finalAngle += 360.0; } + + return finalAngle; + */ + + //// v2: using sum of collected angles + // infered from pseudo code: https://en.wikipedia.org/wiki/Low-pass_filter#Simple_infinite_impulse_response_filter + + double sumSin = 0.0; + double sumCos = 0.0; + + + for (int i = _angles.Count - 2; i >= 0; i--) + { + double angle = _angles[i]; + double prevAngle = _angles[i + 1]; + + _lastSinus = _smoothingFactor * Math.Sin(prevAngle * Math.PI / 180.0); + _lastCosinus = _smoothingFactor * Math.Cos(prevAngle * Math.PI / 180.0); + + sumSin += _smoothingFactor * _lastSinus + (1 - _smoothingFactor) * Math.Sin(angle * Math.PI / 180.0); + sumCos += _smoothingFactor * _lastCosinus + (1 - _smoothingFactor) * Math.Cos(angle * Math.PI / 180.0); + } + + double finalAngle = Math.Atan2(sumSin / _angles.Count, sumCos / _angles.Count) * 180.0 / Math.PI; + //stay positive ;-) + if (finalAngle < 0) { finalAngle += 360.0; } + + return finalAngle; + } + + + } +} diff --git a/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/AngleSmoothingLowPass.cs.meta b/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/AngleSmoothingLowPass.cs.meta new file mode 100644 index 000000000..195d28524 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/AngleSmoothingLowPass.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 5bc20e719eeb82d448d4698d29d526c0 +timeCreated: 1527174376 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/AngleSmoothingNoOp.cs b/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/AngleSmoothingNoOp.cs new file mode 100644 index 000000000..55d55aebd --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/AngleSmoothingNoOp.cs @@ -0,0 +1,16 @@ +namespace Mapbox.Unity.Location +{ + + + /// + /// Doesn't do any calculations. Just passes latest value through. + /// + public class AngleSmoothingNoOp : AngleSmoothingAbstractBase + { + + + public override double Calculate() { return _angles[0]; } + + + } +} diff --git a/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/AngleSmoothingNoOp.cs.meta b/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/AngleSmoothingNoOp.cs.meta new file mode 100644 index 000000000..f9ee23258 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/AngleSmoothingNoOp.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 1ea49ff9cb53e9b44b5fa981d0009588 +timeCreated: 1527179489 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/AngleSmoothingWeighted.cs b/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/AngleSmoothingWeighted.cs new file mode 100644 index 000000000..1b307326e --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/AngleSmoothingWeighted.cs @@ -0,0 +1,32 @@ +namespace Mapbox.Unity.Location +{ + + + using UnityEngine; + + + /// + /// NOT IMPLEMENTED YET + /// Smooths angles via a weighted algorithm. + /// + public class AngleSmoothingWeighted : AngleSmoothingAbstractBase + { + + + ///// weights for calculating 'UserHeading'. hardcoded for now. TODO: auto-calc based on time, distance, ... + //private float[] _headingWeights = new float[]{ + // 0, + // -0.5f, + // -1.0f, + // -1.5f + //}; + + + public override double Calculate() { + Debug.LogWarning("AngleSmoothingWeighted: not implemented"); + return 0.0; + } + + + } +} diff --git a/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/AngleSmoothingWeighted.cs.meta b/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/AngleSmoothingWeighted.cs.meta new file mode 100644 index 000000000..b3a5df3f2 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/AngleSmoothingWeighted.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 26ab886ba5422c248b693e60311088c7 +timeCreated: 1527174401 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/IAngleSmoothing.cs b/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/IAngleSmoothing.cs new file mode 100644 index 000000000..962515401 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/IAngleSmoothing.cs @@ -0,0 +1,15 @@ +namespace Mapbox.Unity.Location +{ + + using System.Collections; + using System.Collections.Generic; + using UnityEngine; + + public interface IAngleSmoothing + { + + void Add(double angle); + double Calculate(); + + } +} diff --git a/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/IAngleSmoothing.cs.meta b/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/IAngleSmoothing.cs.meta new file mode 100644 index 000000000..5fc551dd7 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/AngleSmoothing/IAngleSmoothing.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 0e44baa04db660e4a953a1c006235c94 +timeCreated: 1527174166 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Unity/Location/DeviceLocationProvider.cs b/sdkproject/Assets/Mapbox/Unity/Location/DeviceLocationProvider.cs index ab7e7c442..ae5142631 100644 --- a/sdkproject/Assets/Mapbox/Unity/Location/DeviceLocationProvider.cs +++ b/sdkproject/Assets/Mapbox/Unity/Location/DeviceLocationProvider.cs @@ -1,5 +1,7 @@ namespace Mapbox.Unity.Location { + + using System.Collections; using UnityEngine; using Mapbox.Utils; @@ -7,6 +9,8 @@ namespace Mapbox.Unity.Location using System; using System.Linq; + + /// /// The DeviceLocationProvider is responsible for providing real world location and heading data, /// served directly from native hardware and OS. @@ -15,13 +19,16 @@ namespace Mapbox.Unity.Location /// public class DeviceLocationProvider : AbstractLocationProvider { + + /// /// Using higher value like 500 usually does not require to turn GPS chip on and thus saves battery power. /// Values like 5-10 could be used for getting best accuracy. /// [SerializeField] [Tooltip("Using higher value like 500 usually does not require to turn GPS chip on and thus saves battery power. Values like 5-10 could be used for getting best accuracy.")] - float _desiredAccuracyInMeters = 5f; + public float _desiredAccuracyInMeters = 1.0f; + /// /// The minimum distance (measured in meters) a device must move laterally before Input.location property is updated. @@ -29,17 +36,44 @@ public class DeviceLocationProvider : AbstractLocationProvider /// [SerializeField] [Tooltip("The minimum distance (measured in meters) a device must move laterally before Input.location property is updated. Higher values like 500 imply less overhead.")] - float _updateDistanceInMeters = 5f; + public float _updateDistanceInMeters = 0.0f; [SerializeField] - [Tooltip("The minimum time interval between location updates, in milliseconds.")] - long _updateTimeInMilliSeconds = 1000; + [Tooltip("The minimum time interval between location updates, in milliseconds. It's reasonable to not go below 500ms.")] + public long _updateTimeInMilliSeconds = 500; + [SerializeField] + [Tooltip("Smoothing strategy to be applied to the UserHeading.")] + public AngleSmoothingAbstractBase _userHeadingSmoothing; + + + [SerializeField] + [Tooltip("Smoothing strategy to applied to the DeviceOrientation.")] + public AngleSmoothingAbstractBase _deviceOrientationSmoothing; + + + [Serializable] + public struct DebuggingInEditor + { + [Header("Set 'EditorLocationProvider' to 'DeviceLocationProvider' and connect device with UnityRemote.")] + [SerializeField] + [Tooltip("Mock Unity's 'Input.Location' to route location log files through this class (eg fresh calculation of 'UserHeading') instead of just replaying them. To use set 'Editor Location Provider' in 'Location Factory' to 'Device Location Provider' and select a location log file below.")] + public bool _mockUnityInputLocation; + + [SerializeField] + [Tooltip("Also see above. Location log file to mock Unity's 'Input.Location'.")] + public TextAsset _locationLogFile; + } + + [Space(20)] + public DebuggingInEditor _editorDebuggingOnly; + + + private IMapboxLocationService _locationService; private Coroutine _pollRoutine; private double _lastLocationTimestamp; - private double _lastHeadingTimestamp; private WaitForSeconds _wait1sec; private WaitForSeconds _waitUpdateTime; /// list of positions to keep for calculations @@ -48,13 +82,6 @@ public class DeviceLocationProvider : AbstractLocationProvider private int _maxLastPositions = 5; /// minimum needed distance between oldest and newest position before UserHeading is calculated private double _minDistanceOldestNewestPosition = 1.5; - /// weights for calculating 'UserHeading'. hardcoded for now. TODO: auto-calc based on time, distance, ... - private float[] _headingWeights = new float[]{ - 0, - -0.5f, - -1.0f, - -1.5f - }; // Android 6+ permissions have to be granted during runtime @@ -71,17 +98,32 @@ public class DeviceLocationProvider : AbstractLocationProvider protected virtual void Awake() { +#if UNITY_EDITOR + if (_editorDebuggingOnly._mockUnityInputLocation) + { + if (null == _editorDebuggingOnly._locationLogFile || null == _editorDebuggingOnly._locationLogFile.bytes) + { + throw new ArgumentNullException("Location Log File"); + } + + _locationService = new MapboxLocationServiceMock(_editorDebuggingOnly._locationLogFile.bytes); + } + else + { +#endif + _locationService = new MapboxLocationServiceUnityWrapper(); +#if UNITY_EDITOR + } +#endif + _currentLocation.Provider = "unity"; _wait1sec = new WaitForSeconds(1f); - _waitUpdateTime = _updateTimeInMilliSeconds < 500 ? new WaitForSeconds(500) : new WaitForSeconds(_updateTimeInMilliSeconds / 1000); + _waitUpdateTime = _updateTimeInMilliSeconds < 500 ? new WaitForSeconds(0.5f) : new WaitForSeconds((float)_updateTimeInMilliSeconds / 1000.0f); + + if (null == _userHeadingSmoothing) { _userHeadingSmoothing = transform.gameObject.AddComponent(); } + if (null == _deviceOrientationSmoothing) { _deviceOrientationSmoothing = transform.gameObject.AddComponent(); } _lastPositions = new CircularBuffer(_maxLastPositions); - // safe measure till we have auto calculated weights - // "_maxLastPositions - 1" because we calculate user heading on the fly: nr of angles = nr of positions - 1 - if (_headingWeights.Length != _maxLastPositions - 1) - { - throw new Exception("number of last positions NOT equal number of heading weights"); - } if (_pollRoutine == null) { @@ -101,14 +143,24 @@ IEnumerator PollLocationRoutine() #if UNITY_EDITOR while (!UnityEditor.EditorApplication.isRemoteConnected) { - yield return null; + // exit if we are not the selected location provider + if (null != LocationProviderFactory.Instance && null != LocationProviderFactory.Instance.DefaultLocationProvider) + { + if (!this.Equals(LocationProviderFactory.Instance.DefaultLocationProvider)) + { + yield break; + } + } + + Debug.LogWarning("Remote device not connected via 'Unity Remote'. Waiting ..." + Environment.NewLine + "If Unity seems to be stuck here make sure 'Unity Remote' is running and restart Unity with your device already connected."); + yield return _wait1sec; } #endif //request runtime fine location permission on Android if not yet allowed #if UNITY_ANDROID - if (!Input.location.isEnabledByUser) + if (!_locationService.isEnabledByUser) { UniAndroidPermission.RequestPermission(AndroidPermission.ACCESS_FINE_LOCATION); //wait for user to allow or deny @@ -117,7 +169,7 @@ IEnumerator PollLocationRoutine() #endif - if (!Input.location.isEnabledByUser) + if (!_locationService.isEnabledByUser) { Debug.LogError("DeviceLocationProvider: Location is not enabled by user!"); _currentLocation.IsLocationServiceEnabled = false; @@ -127,11 +179,11 @@ IEnumerator PollLocationRoutine() _currentLocation.IsLocationServiceInitializing = true; - Input.location.Start(_desiredAccuracyInMeters, _updateDistanceInMeters); + _locationService.Start(_desiredAccuracyInMeters, _updateDistanceInMeters); Input.compass.enabled = true; int maxWait = 20; - while (Input.location.status == LocationServiceStatus.Initializing && maxWait > 0) + while (_locationService.status == LocationServiceStatus.Initializing && maxWait > 0) { yield return _wait1sec; maxWait--; @@ -146,7 +198,7 @@ IEnumerator PollLocationRoutine() yield break; } - if (Input.location.status == LocationServiceStatus.Failed) + if (_locationService.status == LocationServiceStatus.Failed) { Debug.LogError("DeviceLocationProvider: " + "Failed to initialize location services!"); _currentLocation.IsLocationServiceInitializing = false; @@ -169,7 +221,19 @@ IEnumerator PollLocationRoutine() while (true) { - _currentLocation.IsLocationServiceEnabled = Input.location.status == LocationServiceStatus.Running; + var lastData = _locationService.lastData; + var timestamp = lastData.timestamp; + + /////////////////////////////// + // oh boy, Unity what are you doing??? + // on some devices it seems that + // Input.location.status != LocationServiceStatus.Running + // nevertheless new location is available + ////////////////////////////// + //Debug.LogFormat("Input.location.status: {0}", Input.location.status); + _currentLocation.IsLocationServiceEnabled = + _locationService.status == LocationServiceStatus.Running + || timestamp > _lastLocationTimestamp; _currentLocation.IsUserHeadingUpdated = false; _currentLocation.IsLocationUpdated = false; @@ -181,12 +245,8 @@ IEnumerator PollLocationRoutine() } // device orientation, user heading get calculated below - _currentLocation.DeviceOrientation = Input.compass.trueHeading; - - - var lastData = Input.location.lastData; - var timestamp = lastData.timestamp; - //Debug.LogFormat("{0:yyyyMMdd-HHmmss} acc:{1:0.00} {2} / {3}", UnixTimestampUtils.From(timestamp), lastData.horizontalAccuracy, lastData.latitude, lastData.longitude); + _deviceOrientationSmoothing.Add(Input.compass.trueHeading); + _currentLocation.DeviceOrientation = (float)_deviceOrientationSmoothing.Calculate(); //_currentLocation.LatitudeLongitude = new Vector2d(lastData.latitude, lastData.longitude); @@ -194,22 +254,47 @@ IEnumerator PollLocationRoutine() // https://forum.unity.com/threads/precision-of-location-longitude-is-worse-when-longitude-is-beyond-100-degrees.133192/#post-1835164 double latitude = double.Parse(lastData.latitude.ToString("R", invariantCulture), invariantCulture); double longitude = double.Parse(lastData.longitude.ToString("R", invariantCulture), invariantCulture); + Vector2d previousLocation = new Vector2d(_currentLocation.LatitudeLongitude.x, _currentLocation.LatitudeLongitude.y); _currentLocation.LatitudeLongitude = new Vector2d(latitude, longitude); - _currentLocation.Accuracy = (int)System.Math.Floor(lastData.horizontalAccuracy); - _currentLocation.IsLocationUpdated = timestamp > _lastLocationTimestamp; + _currentLocation.Accuracy = (float)Math.Floor(lastData.horizontalAccuracy); + // sometimes Unity's timestamp doesn't seem to get updated, or even jump back in time + // do an additional check if location has changed + _currentLocation.IsLocationUpdated = timestamp > _lastLocationTimestamp || !_currentLocation.LatitudeLongitude.Equals(previousLocation); _currentLocation.Timestamp = timestamp; _lastLocationTimestamp = timestamp; if (_currentLocation.IsLocationUpdated) { - _lastPositions.Add(_currentLocation.LatitudeLongitude); + if (_lastPositions.Count > 0) + { + // only add position if user has moved +1m since we added the previous position to the list + CheapRuler cheapRuler = new CheapRuler(_currentLocation.LatitudeLongitude.x, CheapRulerUnits.Meters); + Vector2d p = _currentLocation.LatitudeLongitude; + double distance = cheapRuler.Distance( + new double[] { p.y, p.x }, + new double[] { _lastPositions[0].y, _lastPositions[0].x } + ); + if (distance > 1.0) + { + _lastPositions.Add(_currentLocation.LatitudeLongitude); + } + } + else + { + _lastPositions.Add(_currentLocation.LatitudeLongitude); + } } - // calculate user heading. only if we have enough positions available + // if we have enough positions calculate user heading ourselves. + // Unity does not provide bearing based on GPS locations, just + // device orientation based on Compass.Heading. + // nevertheless, use compass for intial UserHeading till we have + // enough values to calculate ourselves. if (_lastPositions.Count < _maxLastPositions) { - _currentLocation.UserHeading = 0; + _currentLocation.UserHeading = _currentLocation.DeviceOrientation; + _currentLocation.IsUserHeadingUpdated = true; } else { @@ -224,37 +309,34 @@ IEnumerator PollLocationRoutine() // positions are minimum required distance apart (user is moving), calculate user heading if (distance >= _minDistanceOldestNewestPosition) { - // calculate final heading from last positions but give newest headings more weight: - // '_lastPositions' contains newest at [0] - // formula: - // (heading[0] * e^weight[0] + heading[1] * e^weight[1] + .... ) / weight sum float[] lastHeadings = new float[_maxLastPositions - 1]; - float[] actualWeights = new float[_maxLastPositions - 1]; - float finalHeading = 0f; for (int i = 1; i < _maxLastPositions; i++) { - lastHeadings[i - 1] = (float)(Math.Atan2(_lastPositions[i].y - _lastPositions[i - 1].y, _lastPositions[i].x - _lastPositions[i - 1].x) * 180 / Math.PI); - // quick fix to take care of 355� and 5� being apart 10� and not 350� - if (lastHeadings[i - 1] > 180) { lastHeadings[i - 1] -= 360f; } + // atan2 increases angle CCW, flip sign of latDiff to get CW + double latDiff = -(_lastPositions[i].x - _lastPositions[i - 1].x); + double lngDiff = _lastPositions[i].y - _lastPositions[i - 1].y; + // +90.0 to make top (north) 0� + double heading = (Math.Atan2(latDiff, lngDiff) * 180.0 / Math.PI) + 90.0f; + // stay within [0..360]� range + if (heading < 0) { heading += 360; } + if (heading >= 360) { heading -= 360; } + lastHeadings[i - 1] = (float)heading; } - for (int i = 0; i < lastHeadings.Length; i++) - { - actualWeights[i] = (float)Math.Exp(_headingWeights[i]); - finalHeading += lastHeadings[i] * actualWeights[i]; - } + _userHeadingSmoothing.Add(lastHeadings[0]); + float finalHeading = (float)_userHeadingSmoothing.Calculate(); + + //fix heading to have 0� for north, 90� for east, 180� for south and 270� for west + finalHeading = finalHeading >= 180.0f ? finalHeading - 180.0f : finalHeading + 180.0f; - float weightSum = actualWeights.Sum(); - finalHeading /= weightSum; - // stay within [0..359] no negative angles - if (finalHeading < 0) { finalHeading += 360; } _currentLocation.UserHeading = finalHeading; _currentLocation.IsUserHeadingUpdated = true; } } + _currentLocation.TimestampDevice = UnixTimestampUtils.To(DateTime.UtcNow); SendLocation(_currentLocation); yield return _waitUpdateTime; diff --git a/sdkproject/Assets/Mapbox/Unity/Location/DeviceLocationProviderAndroidNative.cs b/sdkproject/Assets/Mapbox/Unity/Location/DeviceLocationProviderAndroidNative.cs index 4a6f35463..986796670 100644 --- a/sdkproject/Assets/Mapbox/Unity/Location/DeviceLocationProviderAndroidNative.cs +++ b/sdkproject/Assets/Mapbox/Unity/Location/DeviceLocationProviderAndroidNative.cs @@ -6,7 +6,7 @@ using System; using System.IO; using System.Text; - + using Mapbox.Utils; public class DeviceLocationProviderAndroidNative : AbstractLocationProvider, IDisposable { @@ -18,7 +18,7 @@ public class DeviceLocationProviderAndroidNative : AbstractLocationProvider, IDi /// [SerializeField] [Tooltip("The minimum distance (measured in meters) a device must move laterally before location is updated. Higher values like 500 imply less overhead.")] - float _updateDistanceInMeters = 0.5f; + float _updateDistanceInMeters = 0.0f; /// @@ -26,7 +26,7 @@ public class DeviceLocationProviderAndroidNative : AbstractLocationProvider, IDi /// https://developer.android.com/reference/android/location/LocationManager.html#requestLocationUpdates(java.lang.String,%20long,%20float,%20android.location.LocationListener) /// [SerializeField] - [Tooltip("The minimum time interval between location updates, in milliseconds.")] + [Tooltip("The minimum time interval between location updates, in milliseconds. It's reasonable to not go below 500ms.")] long _updateTimeInMilliSeconds = 1000; @@ -99,12 +99,16 @@ private void shutdown() protected virtual void Awake() { + // safe measures to not run when disabled or not selected as location provider + if (!enabled) { return; } + if (!transform.gameObject.activeInHierarchy) { return; } + _wait1sec = new WaitForSeconds(1); _wait5sec = new WaitForSeconds(5); _wait60sec = new WaitForSeconds(60); // throttle if entered update intervall is unreasonably low - _waitUpdateTime = _updateTimeInMilliSeconds < 500 ? new WaitForSeconds(500) : new WaitForSeconds(_updateTimeInMilliSeconds / 1000); + _waitUpdateTime = _updateTimeInMilliSeconds < 500 ? new WaitForSeconds(0.5f) : new WaitForSeconds((float)_updateTimeInMilliSeconds / 1000.0f); _currentLocation.IsLocationServiceEnabled = false; _currentLocation.IsLocationServiceInitializing = true; @@ -258,6 +262,7 @@ private IEnumerator locationRoutine() if (null != locGps && null != locNetwork) { populateWithBetterLocation(locGps, locNetwork); } + _currentLocation.TimestampDevice = UnixTimestampUtils.To(DateTime.UtcNow); SendLocation(_currentLocation); } catch (Exception ex) diff --git a/sdkproject/Assets/Mapbox/Unity/Location/EditorLocationProviderLocationLog.cs b/sdkproject/Assets/Mapbox/Unity/Location/EditorLocationProviderLocationLog.cs new file mode 100644 index 000000000..c16c7a44c --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/EditorLocationProviderLocationLog.cs @@ -0,0 +1,67 @@ +namespace Mapbox.Unity.Location +{ + using System; + using System.Collections.Generic; + using System.Globalization; + using System.IO; + using Mapbox.Unity.Utilities; + using Mapbox.Utils; + using UnityEngine; + + /// + /// + /// The EditorLocationProvider is responsible for providing mock location data via log file collected with the 'LocationProvider' scene + /// + /// + public class EditorLocationProviderLocationLog : AbstractEditorLocationProvider + { + + + /// + /// The mock "latitude, longitude" location, respresented with a string. + /// You can search for a place using the embedded "Search" button in the inspector. + /// This value can be changed at runtime in the inspector. + /// + [SerializeField] + private TextAsset _locationLogFile; + + + private LocationLogReader _logReader; + private IEnumerator _locationEnumerator; + + +#if UNITY_EDITOR + protected override void Awake() + { + base.Awake(); + _logReader = new LocationLogReader(_locationLogFile.bytes); + _locationEnumerator = _logReader.GetLocations(); + } +#endif + + + private void OnDestroy() + { + if (null != _locationEnumerator) + { + _locationEnumerator.Dispose(); + _locationEnumerator = null; + } + if (null != _logReader) + { + _logReader.Dispose(); + _logReader = null; + } + } + + + protected override void SetLocation() + { + if (null == _locationEnumerator) { return; } + + // no need to check if 'MoveNext()' returns false as LocationLogReader loops through log file + _locationEnumerator.MoveNext(); + _currentLocation = _locationEnumerator.Current; + } + } +} diff --git a/sdkproject/Assets/Mapbox/Unity/Location/EditorLocationProviderLocationLog.cs.meta b/sdkproject/Assets/Mapbox/Unity/Location/EditorLocationProviderLocationLog.cs.meta new file mode 100644 index 000000000..5e046add9 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/EditorLocationProviderLocationLog.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: beed7ad1e12d3434a943d5fb6807cb6d +timeCreated: 1524639538 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Unity/Location/ExampleGpsTraces/Helsinki.txt b/sdkproject/Assets/Mapbox/Unity/Location/ExampleGpsTraces/Helsinki.txt new file mode 100644 index 000000000..8712d0d32 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/ExampleGpsTraces/Helsinki.txt @@ -0,0 +1,713 @@ +#location service enabled;location service intializing;location updated;userheading updated;location provider;location provider class;time device [utc];time location [utc];latitude;longitude;accuracy [m];user heading [�];device orientation [�];speed [km/h];has gps fix;satellites used;satellites in view +True;False;False;True;unity;DeviceLocationProvider;20180524-163505.787;20180524-163427.922;60.19188000;24.96858220;34.0;305.1;305.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163506.249;20180524-163427.922;60.19188000;24.96858220;34.0;313.5;313.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163506.749;20180524-163427.922;60.19188000;24.96858220;34.0;349.1;349.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163507.254;20180524-163427.922;60.19188000;24.96858220;34.0;308.9;308.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163507.757;20180524-163427.922;60.19188000;24.96858220;34.0;336.6;336.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163508.256;20180524-163427.922;60.19188000;24.96858220;34.0;288.9;288.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163508.757;20180524-163427.922;60.19188000;24.96858220;34.0;325.7;325.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163509.258;20180524-163427.922;60.19188000;24.96858220;34.0;309.8;309.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163509.760;20180524-163427.922;60.19188000;24.96858220;34.0;328.4;328.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163510.256;20180524-163510.533;60.19185260;24.96877670;4.0;329.2;329.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163510.761;20180524-163510.533;60.19185260;24.96877670;4.0;331.0;331.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163511.259;20180524-163512.000;60.19185640;24.96873660;4.0;344.2;344.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163511.761;20180524-163512.000;60.19185640;24.96873660;4.0;317.6;317.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163512.282;20180524-163513.000;60.19181000;24.96869660;4.0;255.6;336.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163512.749;20180524-163513.000;60.19181000;24.96869660;4.0;255.6;286.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163513.263;20180524-163514.000;60.19179000;24.96865460;4.0;231.7;321.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163513.764;20180524-163514.000;60.19179000;24.96865460;4.0;231.7;280.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163514.165;20180524-163515.000;60.19179000;24.96862220;4.0;252.9;313.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163514.701;20180524-163516.000;60.19180300;24.96859740;3.0;258.1;322.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163515.204;20180524-163516.000;60.19180300;24.96859740;3.0;258.1;336.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163515.736;20180524-163517.000;60.19182210;24.96856000;3.0;277.6;325.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163516.240;20180524-163517.000;60.19182210;24.96856000;3.0;277.6;346.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163516.742;20180524-163518.000;60.19184000;24.96854000;3.0;294.2;319.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163517.240;20180524-163518.000;60.19184000;24.96854000;3.0;294.2;351.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163517.745;20180524-163519.000;60.19185260;24.96852000;3.0;302.2;311.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163518.243;20180524-163519.000;60.19185260;24.96852000;3.0;302.2;333.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163518.742;20180524-163520.000;60.19186780;24.96849820;3.0;304.0;287.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163519.244;20180524-163520.000;60.19186780;24.96849820;3.0;304.0;333.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163519.746;20180524-163521.000;60.19188310;24.96847530;3.0;305.7;281.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163520.252;20180524-163521.000;60.19188310;24.96847530;3.0;305.7;338.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163520.746;20180524-163522.000;60.19189450;24.96845820;3.0;303.6;278.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163521.251;20180524-163522.000;60.19189450;24.96845820;3.0;303.6;317.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163521.749;20180524-163523.000;60.19190220;24.96844670;3.0;304.0;306.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163522.250;20180524-163523.000;60.19190220;24.96844670;3.0;304.0;331.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163522.749;20180524-163524.000;60.19191360;24.96843000;3.0;303.9;322.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163523.252;20180524-163524.000;60.19191360;24.96843000;3.0;303.9;316.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163523.753;20180524-163525.000;60.19192500;24.96840480;3.0;301.5;336.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163524.255;20180524-163525.000;60.19192500;24.96840480;3.0;301.5;322.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163524.736;20180524-163526.000;60.19193270;24.96838000;3.0;297.4;305.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163525.239;20180524-163526.000;60.19193270;24.96838000;3.0;297.4;311.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163525.741;20180524-163527.000;60.19193650;24.96835710;3.0;291.3;322.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163526.255;20180524-163527.000;60.19193650;24.96835710;3.0;291.3;322.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163526.755;20180524-163528.000;60.19193650;24.96832850;3.0;282.8;341.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163527.260;20180524-163528.000;60.19193650;24.96832850;3.0;282.8;328.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163527.740;20180524-163529.000;60.19194410;24.96829800;3.0;280.2;306.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163528.246;20180524-163529.000;60.19194410;24.96829800;3.0;280.2;312.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163528.744;20180524-163530.000;60.19194790;24.96827320;3.0;278.0;320.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163529.246;20180524-163530.000;60.19194790;24.96827320;3.0;278.0;298.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163529.744;20180524-163531.000;60.19195000;24.96825220;3.0;277.1;313.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163530.249;20180524-163531.000;60.19195000;24.96825220;3.0;277.1;296.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163530.744;20180524-163532.000;60.19196000;24.96822740;3.0;282.6;317.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163531.248;20180524-163532.000;60.19196000;24.96822740;3.0;282.6;303.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163531.751;20180524-163533.000;60.19196320;24.96820450;3.0;281.1;319.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163532.252;20180524-163533.000;60.19196320;24.96820450;3.0;281.1;287.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163532.771;20180524-163534.000;60.19196700;24.96818160;3.0;281.2;317.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163533.268;20180524-163534.000;60.19196700;24.96818160;3.0;281.2;298.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163533.771;20180524-163535.000;60.19197000;24.96815490;3.0;281.4;314.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163534.272;20180524-163535.000;60.19197000;24.96815490;3.0;281.4;300.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163534.753;20180524-163536.000;60.19197460;24.96812630;3.0;278.2;325.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163535.255;20180524-163536.000;60.19197460;24.96812630;3.0;278.2;301.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163535.753;20180524-163537.000;60.19198230;24.96809580;3.0;279.8;335.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163536.258;20180524-163537.000;60.19198230;24.96809580;3.0;279.8;307.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163536.756;20180524-163538.000;60.19199000;24.96807000;3.0;281.6;331.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163537.259;20180524-163538.000;60.19199000;24.96807000;3.0;281.6;307.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163537.766;20180524-163539.000;60.19199750;24.96804430;3.0;284.0;331.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163538.257;20180524-163539.000;60.19199750;24.96804430;3.0;284.0;298.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163538.754;20180524-163540.000;60.19200000;24.96801570;3.0;283.0;320.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163539.261;20180524-163540.000;60.19200000;24.96801570;3.0;283.0;301.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163539.761;20180524-163541.000;60.19201000;24.96798520;3.0;284.0;322.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163540.264;20180524-163541.000;60.19201000;24.96798520;3.0;284.0;295.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163540.779;20180524-163542.000;60.19201660;24.96795460;3.0;282.9;344.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163541.281;20180524-163542.000;60.19201660;24.96795460;3.0;282.9;298.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163541.781;20180524-163543.000;60.19202420;24.96792600;3.0;282.6;317.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163542.285;20180524-163543.000;60.19202420;24.96792600;3.0;282.6;314.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163542.760;20180524-163544.000;60.19203000;24.96789550;3.0;284.0;301.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163543.268;20180524-163544.000;60.19203000;24.96789550;3.0;284.0;295.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163543.784;20180524-163545.000;60.19204000;24.96786310;3.0;283.7;314.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163544.284;20180524-163545.000;60.19204000;24.96786310;3.0;283.7;320.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163544.787;20180524-163546.000;60.19204710;24.96783000;3.0;283.7;316.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163545.289;20180524-163546.000;60.19204710;24.96783000;3.0;283.7;289.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163545.785;20180524-163547.000;60.19205470;24.96780780;3.0;284.7;320.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163546.288;20180524-163547.000;60.19205470;24.96780780;3.0;284.7;213.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163546.770;20180524-163548.000;60.19206240;24.96779250;3.0;288.7;257.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163547.285;20180524-163548.000;60.19206240;24.96779250;3.0;288.7;246.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163547.772;20180524-163549.000;60.19207000;24.96777340;3.0;289.9;46.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163548.270;20180524-163549.000;60.19207000;24.96777340;3.0;289.9;244.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163548.772;20180524-163550.000;60.19207760;24.96774860;3.0;291.1;30.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163549.276;20180524-163550.000;60.19207760;24.96774860;3.0;291.1;315.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163549.776;20180524-163551.000;60.19208530;24.96772580;3.0;291.0;343.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163550.278;20180524-163551.000;60.19208530;24.96772580;3.0;291.0;299.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163550.781;20180524-163552.000;60.19209000;24.96770100;3.0;287.0;334.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163551.296;20180524-163552.000;60.19209000;24.96770100;3.0;287.0;286.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163551.799;20180524-163553.000;60.19209670;24.96767430;3.0;285.1;345.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163552.281;20180524-163553.000;60.19209670;24.96767430;3.0;285.1;262.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163552.783;20180524-163554.000;60.19210000;24.96765330;3.0;283.1;135.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163553.298;20180524-163554.000;60.19210000;24.96765330;3.0;283.1;52.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163553.798;20180524-163555.000;60.19211200;24.96763230;3.0;285.8;268.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163554.301;20180524-163555.000;60.19211200;24.96763230;3.0;285.8;242.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163554.800;20180524-163556.000;60.19212000;24.96761510;3.0;289.4;261.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163555.298;20180524-163556.000;60.19212000;24.96761510;3.0;289.4;248.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163555.801;20180524-163557.000;60.19212340;24.96760180;3.0;289.4;274.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163556.304;20180524-163557.000;60.19212340;24.96760180;3.0;289.4;330.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163556.806;20180524-163558.000;60.19213490;24.96758000;3.0;291.7;205.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163557.305;20180524-163558.000;60.19213490;24.96758000;3.0;291.7;350.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163557.807;20180524-163559.000;60.19214250;24.96756170;3.0;295.1;233.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163558.310;20180524-163559.000;60.19214250;24.96756170;3.0;295.1;60.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163558.807;20180524-163600.000;60.19215000;24.96754650;3.0;294.2;265.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163559.310;20180524-163600.000;60.19215000;24.96754650;3.0;294.2;114.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163559.809;20180524-163601.000;60.19215770;24.96752170;3.0;292.3;129.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163600.308;20180524-163601.000;60.19215770;24.96752170;3.0;292.3;132.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163600.809;20180524-163602.000;60.19216540;24.96749690;3.0;290.8;123.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163601.313;20180524-163602.000;60.19216540;24.96749690;3.0;290.8;325.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163601.794;20180524-163603.000;60.19217300;24.96747590;3.0;290.2;291.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163602.296;20180524-163603.000;60.19217300;24.96747590;3.0;290.2;312.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163602.798;20180524-163604.000;60.19217680;24.96744350;3.0;285.3;333.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163603.297;20180524-163604.000;60.19217680;24.96744350;3.0;285.3;313.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163603.798;20180524-163605.000;60.19217680;24.96740720;3.0;281.0;314.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163604.299;20180524-163605.000;60.19217680;24.96740720;3.0;281.0;275.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163604.798;20180524-163606.000;60.19218440;24.96737670;3.0;280.1;228.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163605.300;20180524-163606.000;60.19218440;24.96737670;3.0;280.1;169.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163605.800;20180524-163607.000;60.19219000;24.96735380;3.0;278.6;224.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163606.303;20180524-163607.000;60.19219000;24.96735380;3.0;278.6;268.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163606.805;20180524-163608.000;60.19219590;24.96733000;3.0;280.4;339.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163607.302;20180524-163608.000;60.19219590;24.96733000;3.0;280.4;277.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163607.803;20180524-163609.000;60.19220350;24.96730000;3.0;284.0;326.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163608.304;20180524-163609.000;60.19220350;24.96730000;3.0;284.0;280.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163608.807;20180524-163610.000;60.19221000;24.96727560;4.0;284.2;312.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163609.306;20180524-163610.000;60.19221000;24.96727560;4.0;284.2;276.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163609.824;20180524-163611.000;60.19221500;24.96724890;4.0;283.4;336.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163610.326;20180524-163611.000;60.19221500;24.96724890;4.0;283.4;290.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163610.820;20180524-163612.000;60.19222260;24.96721460;3.0;283.1;2.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163611.326;20180524-163612.000;60.19222260;24.96721460;3.0;283.1;281.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163611.823;20180524-163613.000;60.19223000;24.96718410;3.0;282.9;18.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163612.327;20180524-163613.000;60.19223000;24.96718410;3.0;282.9;264.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163612.809;20180524-163614.000;60.19223000;24.96714210;3.0;279.2;47.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163613.315;20180524-163614.000;60.19223000;24.96714210;3.0;279.2;213.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163613.814;20180524-163615.000;60.19223000;24.96710780;4.0;276.5;105.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163614.313;20180524-163615.000;60.19223000;24.96710780;4.0;276.5;245.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163614.813;20180524-163616.000;60.19222260;24.96708680;3.0;268.6;37.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163615.317;20180524-163616.000;60.19222260;24.96708680;3.0;268.6;265.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163615.818;20180524-163617.000;60.19220730;24.96706770;3.0;255.6;191.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163616.315;20180524-163617.000;60.19220730;24.96706770;3.0;255.6;23.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163616.816;20180524-163618.000;60.19219210;24.96706200;3.0;238.4;293.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163617.319;20180524-163618.000;60.19219210;24.96706200;3.0;238.4;16.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163617.836;20180524-163619.000;60.19217680;24.96705440;3.0;222.1;339.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163618.338;20180524-163619.000;60.19217680;24.96705440;3.0;222.1;22.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163618.837;20180524-163620.000;60.19215770;24.96704860;3.0;208.7;340.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163619.337;20180524-163620.000;60.19215770;24.96704860;3.0;208.7;87.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163619.823;20180524-163621.000;60.19214250;24.96704100;3.0;202.6;248.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163620.320;20180524-163621.000;60.19214250;24.96704100;3.0;202.6;16.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163620.841;20180524-163622.000;60.19212720;24.96702580;3.0;208.6;288.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163621.342;20180524-163622.000;60.19212720;24.96702580;3.0;208.6;332.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163621.837;20180524-163623.000;60.19211580;24.96701240;3.0;214.5;286.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163622.343;20180524-163623.000;60.19211580;24.96701240;3.0;214.5;184.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163622.834;20180524-163624.000;60.19210000;24.96700480;3.0;216.7;198.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163623.327;20180524-163624.000;60.19210000;24.96700480;3.0;216.7;197.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163623.848;20180524-163625.000;60.19209000;24.96699710;3.0;219.4;210.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163624.345;20180524-163625.000;60.19209000;24.96699710;3.0;219.4;210.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163624.827;20180524-163626.000;60.19207380;24.96699330;3.0;211.5;210.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163625.331;20180524-163626.000;60.19207380;24.96699330;3.0;211.5;201.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163625.831;20180524-163627.000;60.19206240;24.96698760;3.0;205.8;217.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163626.332;20180524-163627.000;60.19206240;24.96698760;3.0;205.8;110.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163626.831;20180524-163628.000;60.19205470;24.96698190;3.0;205.8;197.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163627.331;20180524-163628.000;60.19205470;24.96698190;3.0;205.8;145.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163627.835;20180524-163629.000;60.19204330;24.96697430;3.0;208.1;204.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163628.336;20180524-163629.000;60.19204330;24.96697430;3.0;208.1;127.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163628.840;20180524-163630.000;60.19202800;24.96696660;3.0;205.3;215.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163629.366;20180524-163630.000;60.19202800;24.96696660;3.0;205.3;167.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163629.836;20180524-163631.000;60.19201660;24.96696280;3.0;206.6;220.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163630.338;20180524-163631.000;60.19201660;24.96696280;3.0;206.6;141.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163630.837;20180524-163632.000;60.19200520;24.96696000;3.0;203.4;196.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163631.338;20180524-163632.000;60.19200520;24.96696000;3.0;203.4;222.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163631.856;20180524-163633.000;60.19199000;24.96695710;3.0;197.4;178.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163632.357;20180524-163633.000;60.19199000;24.96695710;3.0;197.4;97.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163632.857;20180524-163634.000;60.19197000;24.96695000;3.0;195.6;212.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163633.360;20180524-163634.000;60.19197000;24.96695000;3.0;195.6;157.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163633.860;20180524-163635.000;60.19195000;24.96694560;3.0;194.1;201.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163634.361;20180524-163635.000;60.19195000;24.96694560;3.0;194.1;26.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163634.859;20180524-163636.000;60.19194000;24.96694180;3.0;195.9;204.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163635.358;20180524-163636.000;60.19194000;24.96694180;3.0;195.9;93.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163635.846;20180524-163637.000;60.19192500;24.96694180;3.0;193.2;210.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163636.342;20180524-163637.000;60.19192500;24.96694180;3.0;193.2;158.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163636.849;20180524-163638.000;60.19191000;24.96694180;3.0;188.3;227.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163637.349;20180524-163638.000;60.19191000;24.96694180;3.0;188.3;284.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163637.847;20180524-163639.000;60.19189450;24.96694180;3.0;185.2;290.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163638.350;20180524-163639.000;60.19189450;24.96694180;3.0;185.2;331.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163638.854;20180524-163640.000;60.19187550;24.96694000;3.0;181.4;192.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163639.371;20180524-163640.000;60.19187550;24.96694000;3.0;181.4;159.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163639.870;20180524-163641.000;60.19185640;24.96693800;3.0;182.8;154.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163640.369;20180524-163641.000;60.19185640;24.96693800;3.0;182.8;121.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163640.872;20180524-163642.000;60.19183730;24.96694000;3.0;181.4;211.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163641.374;20180524-163642.000;60.19183730;24.96694000;3.0;181.4;161.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163641.857;20180524-163643.000;60.19182210;24.96694000;3.0;181.4;272.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163642.374;20180524-163643.000;60.19182210;24.96694000;3.0;181.4;302.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163642.869;20180524-163644.000;60.19180680;24.96693420;3.0;185.2;232.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163643.376;20180524-163644.000;60.19180680;24.96693420;3.0;185.2;301.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163643.841;20180524-163645.000;60.19179000;24.96692660;3.0;189.8;21.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163644.345;20180524-163645.000;60.19179000;24.96692660;3.0;189.8;324.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163644.847;20180524-163646.000;60.19178000;24.96691510;3.0;203.5;188.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163645.361;20180524-163646.000;60.19178000;24.96691510;3.0;203.5;60.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163645.862;20180524-163647.000;60.19176480;24.96690370;3.0;212.7;195.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163646.364;20180524-163647.000;60.19176480;24.96690370;3.0;212.7;183.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163646.881;20180524-163648.000;60.19175340;24.96689410;3.0;217.6;195.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163647.383;20180524-163648.000;60.19175340;24.96689410;3.0;217.6;111.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163647.883;20180524-163649.000;60.19174190;24.96688000;3.0;224.2;209.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163648.383;20180524-163649.000;60.19174190;24.96688000;3.0;224.2;110.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163648.864;20180524-163650.000;60.19173430;24.96686740;3.0;226.7;210.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163649.368;20180524-163650.000;60.19173430;24.96686740;3.0;226.7;101.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163649.873;20180524-163651.000;60.19172670;24.96685000;4.0;234.1;206.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163650.375;20180524-163651.000;60.19172670;24.96685000;4.0;234.1;147.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163650.871;20180524-163652.000;60.19171000;24.96683310;3.0;235.4;180.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163651.371;20180524-163652.000;60.19171000;24.96683310;3.0;235.4;171.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163651.871;20180524-163653.000;60.19169620;24.96681790;3.0;234.6;173.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163652.373;20180524-163653.000;60.19169620;24.96681790;3.0;234.6;128.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163652.872;20180524-163654.000;60.19168470;24.96680830;4.0;229.8;171.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163653.372;20180524-163654.000;60.19168470;24.96680830;4.0;229.8;153.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163653.878;20180524-163655.000;60.19168000;24.96678000;4.0;233.2;177.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163654.377;20180524-163655.000;60.19168000;24.96678000;4.0;233.2;163.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163654.896;20180524-163656.000;60.19167330;24.96674730;4.0;241.7;173.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163655.377;20180524-163656.000;60.19167330;24.96674730;4.0;241.7;162.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163655.877;20180524-163657.000;60.19166000;24.96672250;4.0;245.3;172.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163656.378;20180524-163657.000;60.19166000;24.96672250;4.0;245.3;145.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163656.878;20180524-163658.000;60.19164660;24.96670720;4.0;247.4;166.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163657.380;20180524-163658.000;60.19164660;24.96670720;4.0;247.4;180.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163657.882;20180524-163659.000;60.19163000;24.96670150;3.0;232.2;185.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163658.402;20180524-163659.000;60.19163000;24.96670150;3.0;232.2;192.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163658.897;20180524-163700.000;60.19162000;24.96669390;3.0;221.7;246.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163659.399;20180524-163700.000;60.19162000;24.96669390;3.0;221.7;220.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163659.901;20180524-163701.000;60.19160460;24.96668240;3.0;215.5;243.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163700.400;20180524-163701.000;60.19160460;24.96668240;3.0;215.5;256.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163700.899;20180524-163702.000;60.19159320;24.96665380;3.0;220.1;262.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163701.403;20180524-163702.000;60.19159320;24.96665380;3.0;220.1;267.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163701.906;20180524-163703.000;60.19159000;24.96664000;4.0;220.1;240.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163702.387;20180524-163703.000;60.19159000;24.96664000;4.0;220.1;273.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163702.892;20180524-163704.000;60.19158550;24.96663280;4.0;233.0;259.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163703.394;20180524-163704.000;60.19158550;24.96663280;4.0;233.0;285.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163703.907;20180524-163705.000;60.19158550;24.96661190;4.0;246.4;311.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163704.410;20180524-163705.000;60.19158550;24.96661190;4.0;246.4;281.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163704.891;20180524-163706.000;60.19159000;24.96658710;3.0;262.1;286.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163705.393;20180524-163706.000;60.19159000;24.96658710;3.0;262.1;297.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163705.893;20180524-163707.000;60.19159000;24.96655270;3.0;267.6;276.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163706.395;20180524-163707.000;60.19159000;24.96655270;3.0;267.6;293.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163706.894;20180524-163708.000;60.19159000;24.96652220;3.0;272.6;279.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163707.397;20180524-163708.000;60.19159000;24.96652220;3.0;272.6;302.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163707.897;20180524-163709.000;60.19158550;24.96649170;3.0;270.5;271.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163708.397;20180524-163709.000;60.19158550;24.96649170;3.0;270.5;257.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163708.900;20180524-163710.000;60.19158550;24.96646120;3.0;267.9;236.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163709.399;20180524-163710.000;60.19158550;24.96646120;3.0;267.9;185.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163709.900;20180524-163711.000;60.19159000;24.96643830;3.0;270.7;204.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163710.400;20180524-163711.000;60.19159000;24.96643830;3.0;270.7;203.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163710.902;20180524-163712.000;60.19158000;24.96640780;3.0;266.1;182.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163711.420;20180524-163712.000;60.19158000;24.96640780;3.0;266.1;199.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163711.903;20180524-163713.000;60.19156650;24.96638680;3.0;260.1;170.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163712.406;20180524-163713.000;60.19156650;24.96638680;3.0;260.1;177.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163712.901;20180524-163714.000;60.19154740;24.96638300;3.0;241.1;191.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163713.407;20180524-163714.000;60.19154740;24.96638300;3.0;241.1;169.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163713.923;20180524-163715.000;60.19153000;24.96638300;3.0;215.0;146.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163714.425;20180524-163715.000;60.19153000;24.96638300;3.0;215.0;258.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163714.911;20180524-163716.000;60.19151000;24.96638110;3.0;197.8;168.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163715.430;20180524-163716.000;60.19151000;24.96638110;3.0;197.8;134.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163715.911;20180524-163717.000;60.19149000;24.96637730;3.0;186.9;228.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163716.414;20180524-163717.000;60.19149000;24.96637730;3.0;186.9;182.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163716.930;20180524-163718.000;60.19147000;24.96636770;3.0;190.4;141.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163717.434;20180524-163718.000;60.19147000;24.96636770;3.0;190.4;217.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163717.934;20180524-163719.000;60.19145580;24.96637000;3.0;188.2;253.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163718.432;20180524-163719.000;60.19145580;24.96637000;3.0;188.2;235.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163718.934;20180524-163720.000;60.19144000;24.96637730;3.0;180.6;191.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163719.421;20180524-163720.000;60.19144000;24.96637730;3.0;180.6;156.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163719.929;20180524-163721.000;60.19142530;24.96638490;4.0;170.7;197.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163720.434;20180524-163721.000;60.19142530;24.96638490;4.0;170.7;237.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163720.937;20180524-163722.000;60.19141000;24.96639250;4.0;158.0;50.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163721.437;20180524-163722.000;60.19141000;24.96639250;4.0;158.0;314.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163721.920;20180524-163723.000;60.19140000;24.96641000;4.0;145.5;24.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163722.421;20180524-163723.000;60.19140000;24.96641000;4.0;145.5;0.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163722.917;20180524-163724.000;60.19139000;24.96644400;5.0;133.2;344.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163723.440;20180524-163724.000;60.19139000;24.96644400;5.0;133.2;89.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163723.939;20180524-163725.000;60.19138340;24.96648220;5.0;119.5;131.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163724.440;20180524-163725.000;60.19138340;24.96648220;5.0;119.5;164.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163724.940;20180524-163726.000;60.19137570;24.96651650;5.0;107.1;7.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163725.445;20180524-163726.000;60.19137570;24.96651650;5.0;107.1;178.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163725.943;20180524-163727.000;60.19135670;24.96653180;5.0;112.2;154.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163726.444;20180524-163727.000;60.19135670;24.96653180;5.0;112.2;193.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163726.943;20180524-163728.000;60.19133760;24.96652790;5.0;132.0;61.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163727.446;20180524-163728.000;60.19133760;24.96652790;5.0;132.0;197.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163727.947;20180524-163729.000;60.19131470;24.96651460;4.0;162.4;157.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163728.451;20180524-163729.000;60.19131470;24.96651460;4.0;162.4;105.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163728.942;20180524-163730.000;60.19129560;24.96650310;4.0;189.6;162.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163729.448;20180524-163730.000;60.19129560;24.96650310;4.0;189.6;292.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163729.940;20180524-163731.000;60.19128000;24.96649000;3.0;208.2;173.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163730.436;20180524-163731.000;60.19128000;24.96649000;3.0;208.2;179.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163730.952;20180524-163732.000;60.19126510;24.96647640;3.0;215.9;222.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163731.454;20180524-163732.000;60.19126510;24.96647640;3.0;215.9;213.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163731.953;20180524-163733.000;60.19125000;24.96646120;3.0;219.7;194.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163732.452;20180524-163733.000;60.19125000;24.96646120;3.0;219.7;196.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163732.954;20180524-163734.000;60.19124000;24.96644590;3.0;226.1;193.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163733.461;20180524-163734.000;60.19124000;24.96644590;3.0;226.1;211.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163733.955;20180524-163735.000;60.19122310;24.96643000;3.0;226.9;179.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163734.443;20180524-163735.000;60.19122310;24.96643000;3.0;226.9;191.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163734.940;20180524-163736.000;60.19120410;24.96641540;3.0;225.7;188.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163735.441;20180524-163736.000;60.19120410;24.96641540;3.0;225.7;195.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163735.942;20180524-163737.000;60.19118500;24.96639820;3.0;224.9;188.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163736.445;20180524-163737.000;60.19118500;24.96639820;3.0;224.9;194.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163736.945;20180524-163738.000;60.19117360;24.96638300;3.0;224.0;229.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163737.448;20180524-163738.000;60.19117360;24.96638300;3.0;224.0;193.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163737.945;20180524-163739.000;60.19115450;24.96637000;3.0;221.7;1.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163738.445;20180524-163739.000;60.19115450;24.96637000;3.0;221.7;184.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163738.947;20180524-163740.000;60.19113540;24.96635820;3.0;220.3;200.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163739.448;20180524-163740.000;60.19113540;24.96635820;3.0;220.3;147.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163739.974;20180524-163741.000;60.19112400;24.96634670;3.0;221.1;227.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163740.449;20180524-163741.000;60.19112400;24.96634670;3.0;221.1;190.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163740.946;20180524-163742.000;60.19111000;24.96633530;4.0;217.6;198.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163741.447;20180524-163742.000;60.19111000;24.96633530;4.0;217.6;188.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163741.952;20180524-163743.000;60.19109730;24.96632580;4.0;218.2;309.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163742.453;20180524-163743.000;60.19109730;24.96632580;4.0;218.2;154.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163742.953;20180524-163744.000;60.19108200;24.96631620;5.0;218.3;147.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163743.453;20180524-163744.000;60.19108200;24.96631620;5.0;218.3;352.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163743.951;20180524-163745.000;60.19106000;24.96631620;5.0;207.2;93.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163744.455;20180524-163745.000;60.19106000;24.96631620;5.0;207.2;163.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163744.953;20180524-163746.000;60.19104000;24.96632000;6.0;194.6;200.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163745.452;20180524-163746.000;60.19104000;24.96632000;6.0;194.6;203.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163745.958;20180524-163747.000;60.19102000;24.96630860;6.0;192.8;148.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163746.461;20180524-163747.000;60.19102000;24.96630860;6.0;192.8;290.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163746.960;20180524-163748.000;60.19101000;24.96629330;6.0;198.6;297.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163747.460;20180524-163748.000;60.19101000;24.96629330;6.0;198.6;278.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163747.960;20180524-163749.000;60.19099810;24.96627240;6.0;214.9;7.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163748.462;20180524-163749.000;60.19099810;24.96627240;6.0;214.9;257.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163748.962;20180524-163750.000;60.19098280;24.96625140;7.0;230.3;153.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163749.464;20180524-163750.000;60.19098280;24.96625140;7.0;230.3;196.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163749.947;20180524-163751.000;60.19098280;24.96624180;8.0;230.3;245.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163750.461;20180524-163751.000;60.19098280;24.96624180;8.0;230.3;155.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163750.963;20180524-163752.000;60.19097520;24.96624760;8.0;230.3;44.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163751.468;20180524-163752.000;60.19097520;24.96624760;8.0;230.3;196.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163751.971;20180524-163753.000;60.19095230;24.96625330;8.0;223.0;332.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163752.470;20180524-163753.000;60.19095230;24.96625330;8.0;223.0;193.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163752.987;20180524-163754.000;60.19093320;24.96626850;9.0;199.1;47.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163753.489;20180524-163754.000;60.19093320;24.96626850;9.0;199.1;167.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163753.987;20180524-163755.000;60.19091800;24.96628190;9.0;170.2;327.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163754.490;20180524-163755.000;60.19091800;24.96628190;9.0;170.2;202.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163754.990;20180524-163756.000;60.19090000;24.96628570;9.0;156.1;209.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163755.492;20180524-163756.000;60.19090000;24.96628570;9.0;156.1;173.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163755.973;20180524-163757.000;60.19088000;24.96627000;8.0;165.2;167.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163756.484;20180524-163757.000;60.19088000;24.96627000;8.0;165.2;171.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163756.994;20180524-163758.000;60.19086460;24.96625330;8.0;188.6;158.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163757.494;20180524-163758.000;60.19086460;24.96625330;8.0;188.6;169.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163757.994;20180524-163759.000;60.19084550;24.96623800;7.0;208.8;169.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163758.496;20180524-163759.000;60.19084550;24.96623800;7.0;208.8;174.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163758.995;20180524-163800.000;60.19083000;24.96624000;7.0;209.7;248.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163759.496;20180524-163800.000;60.19083000;24.96624000;7.0;209.7;166.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163759.996;20180524-163801.000;60.19081000;24.96624000;7.0;199.7;180.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163800.496;20180524-163801.000;60.19081000;24.96624000;7.0;199.7;167.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163801.001;20180524-163802.000;60.19079590;24.96623800;7.0;189.6;179.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163801.483;20180524-163802.000;60.19079590;24.96623800;7.0;189.6;175.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163802.004;20180524-163803.000;60.19078000;24.96623230;6.0;185.1;173.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163802.503;20180524-163803.000;60.19078000;24.96623230;6.0;185.1;181.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163803.002;20180524-163804.000;60.19076540;24.96622470;6.0;193.8;178.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163803.505;20180524-163804.000;60.19076540;24.96622470;6.0;193.8;191.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163804.003;20180524-163805.000;60.19075390;24.96621320;6.0;205.0;188.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163804.505;20180524-163805.000;60.19075390;24.96621320;6.0;205.0;175.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163805.003;20180524-163806.000;60.19074250;24.96620000;6.0;215.4;184.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163805.507;20180524-163806.000;60.19074250;24.96620000;6.0;215.4;178.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163806.006;20180524-163807.000;60.19072720;24.96619420;5.0;215.6;201.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163806.508;20180524-163807.000;60.19072720;24.96619420;5.0;215.6;172.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163807.007;20180524-163808.000;60.19071000;24.96618840;5.0;213.4;203.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163807.508;20180524-163808.000;60.19071000;24.96618840;5.0;213.4;181.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163808.010;20180524-163809.000;60.19069670;24.96618000;4.0;210.2;197.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163808.511;20180524-163809.000;60.19069670;24.96618000;4.0;210.2;185.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163809.013;20180524-163810.000;60.19068530;24.96617510;5.0;203.7;206.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163809.541;20180524-163810.000;60.19068530;24.96617510;5.0;203.7;193.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163809.995;20180524-163811.000;60.19066620;24.96616550;4.0;205.2;205.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163810.496;20180524-163811.000;60.19066620;24.96616550;4.0;205.2;194.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163810.999;20180524-163812.000;60.19064710;24.96616170;4.0;203.4;219.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163811.501;20180524-163812.000;60.19064710;24.96616170;4.0;203.4;207.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163812.020;20180524-163813.000;60.19063000;24.96615600;4.0;199.9;229.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163812.504;20180524-163813.000;60.19063000;24.96615600;4.0;199.9;196.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163813.018;20180524-163814.000;60.19061280;24.96615000;4.0;198.9;210.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163813.517;20180524-163814.000;60.19061280;24.96615000;4.0;198.9;220.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163814.017;20180524-163815.000;60.19059370;24.96614460;5.0;196.2;215.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163814.521;20180524-163815.000;60.19059370;24.96614460;5.0;196.2;216.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163815.018;20180524-163816.000;60.19058000;24.96613690;5.0;200.7;216.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163815.522;20180524-163816.000;60.19058000;24.96613690;5.0;200.7;194.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163816.022;20180524-163817.000;60.19056000;24.96612740;5.0;202.4;208.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163816.522;20180524-163817.000;60.19056000;24.96612740;5.0;202.4;196.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163817.026;20180524-163818.000;60.19054000;24.96612170;5.0;201.6;207.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163817.525;20180524-163818.000;60.19054000;24.96612170;5.0;201.6;175.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163818.028;20180524-163819.000;60.19052510;24.96611790;5.0;201.2;212.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163818.510;20180524-163819.000;60.19052510;24.96611790;5.0;201.2;182.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163819.007;20180524-163820.000;60.19050220;24.96611400;4.0;196.3;184.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163819.512;20180524-163820.000;60.19050220;24.96611400;4.0;196.3;181.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163820.013;20180524-163821.000;60.19048000;24.96610830;4.0;193.6;195.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163820.516;20180524-163821.000;60.19048000;24.96610830;4.0;193.6;196.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163821.015;20180524-163822.000;60.19045260;24.96610640;4.0;190.6;209.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163821.515;20180524-163822.000;60.19045260;24.96610640;4.0;190.6;177.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163822.034;20180524-163823.000;60.19043000;24.96610450;4.0;188.2;197.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163822.531;20180524-163823.000;60.19043000;24.96610450;4.0;188.2;150.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163823.035;20180524-163824.000;60.19041440;24.96610260;4.0;187.5;160.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163823.534;20180524-163824.000;60.19041440;24.96610260;4.0;187.5;126.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163824.034;20180524-163825.000;60.19040000;24.96610000;4.0;186.5;124.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163824.535;20180524-163825.000;60.19040000;24.96610000;4.0;186.5;127.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163825.038;20180524-163826.000;60.19038770;24.96610000;4.0;185.5;114.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163825.538;20180524-163826.000;60.19038770;24.96610000;4.0;185.5;109.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163826.041;20180524-163827.000;60.19038000;24.96611400;4.0;170.5;120.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163826.541;20180524-163827.000;60.19038000;24.96611400;4.0;170.5;86.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163827.041;20180524-163828.000;60.19037630;24.96613880;3.0;147.1;77.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163827.540;20180524-163828.000;60.19037630;24.96613880;3.0;147.1;66.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163828.044;20180524-163829.000;60.19037630;24.96616170;3.0;119.6;70.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163828.544;20180524-163829.000;60.19037630;24.96616170;3.0;119.6;41.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163829.046;20180524-163830.000;60.19038390;24.96618840;3.0;95.3;30.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163829.560;20180524-163830.000;60.19038390;24.96618840;3.0;95.3;65.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163830.044;20180524-163831.000;60.19039540;24.96620560;3.0;79.8;69.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163830.548;20180524-163831.000;60.19039540;24.96620560;3.0;79.8;60.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163831.048;20180524-163832.000;60.19039540;24.96622660;3.0;77.7;68.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163831.548;20180524-163832.000;60.19039540;24.96622660;3.0;77.7;53.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163832.051;20180524-163833.000;60.19039540;24.96625140;3.0;77.7;60.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163832.549;20180524-163833.000;60.19039540;24.96625140;3.0;77.7;62.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163833.052;20180524-163834.000;60.19039540;24.96627810;3.0;81.7;65.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163833.553;20180524-163834.000;60.19039540;24.96627810;3.0;81.7;87.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163834.057;20180524-163835.000;60.19039000;24.96630860;3.0;92.5;54.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163834.554;20180524-163835.000;60.19039000;24.96630860;3.0;92.5;57.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163835.054;20180524-163836.000;60.19039000;24.96634100;3.0;92.5;55.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163835.559;20180524-163836.000;60.19039000;24.96634100;3.0;92.5;25.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163836.054;20180524-163837.000;60.19039000;24.96636580;3.0;92.5;60.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163836.560;20180524-163837.000;60.19039000;24.96636580;3.0;92.5;58.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163837.056;20180524-163838.000;60.19039000;24.96639440;3.0;92.5;53.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163837.558;20180524-163838.000;60.19039000;24.96639440;3.0;92.5;17.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163838.061;20180524-163839.000;60.19038770;24.96642110;3.0;91.2;33.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163838.544;20180524-163839.000;60.19038770;24.96642110;3.0;91.2;66.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163839.059;20180524-163840.000;60.19038770;24.96644780;3.0;91.2;63.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163839.587;20180524-163840.000;60.19038770;24.96644780;3.0;91.2;88.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163840.066;20180524-163841.000;60.19038390;24.96647640;3.0;93.1;88.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163840.566;20180524-163841.000;60.19038390;24.96647640;3.0;93.1;18.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163841.068;20180524-163842.000;60.19038390;24.96650510;3.0;93.1;84.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163841.567;20180524-163842.000;60.19038390;24.96650510;3.0;93.1;346.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163842.069;20180524-163843.000;60.19038390;24.96653180;3.0;91.9;72.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163842.570;20180524-163843.000;60.19038390;24.96653180;3.0;91.9;26.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163843.070;20180524-163844.000;60.19038390;24.96655850;3.0;91.9;77.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163843.554;20180524-163844.000;60.19038390;24.96655850;3.0;91.9;22.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163844.054;20180524-163845.000;60.19038390;24.96658900;3.0;90.0;78.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163844.554;20180524-163845.000;60.19038390;24.96658900;3.0;90.0;57.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163845.052;20180524-163846.000;60.19038000;24.96662000;3.0;91.8;80.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163845.556;20180524-163846.000;60.19038000;24.96662000;3.0;91.8;20.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163846.057;20180524-163847.000;60.19038000;24.96664810;3.0;91.8;94.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163846.556;20180524-163847.000;60.19038000;24.96664810;3.0;91.8;53.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163847.059;20180524-163848.000;60.19038000;24.96668240;3.0;91.8;73.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163847.560;20180524-163848.000;60.19038000;24.96668240;3.0;91.8;26.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163848.059;20180524-163849.000;60.19038000;24.96671680;3.0;91.8;81.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163848.559;20180524-163849.000;60.19038000;24.96671680;3.0;91.8;33.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163849.061;20180524-163850.000;60.19038000;24.96674160;3.0;90.0;67.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163849.565;20180524-163850.000;60.19038000;24.96674160;3.0;90.0;348.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163850.078;20180524-163851.000;60.19037630;24.96677000;3.0;91.9;68.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163850.578;20180524-163851.000;60.19037630;24.96677000;3.0;91.9;40.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163851.081;20180524-163852.000;60.19037630;24.96679880;3.0;91.9;81.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163851.583;20180524-163852.000;60.19037630;24.96679880;3.0;91.9;33.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163852.101;20180524-163853.000;60.19037630;24.96682740;3.0;91.9;75.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163852.584;20180524-163853.000;60.19037630;24.96682740;3.0;91.9;27.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163853.100;20180524-163854.000;60.19037630;24.96685790;3.0;91.9;71.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163853.602;20180524-163854.000;60.19037630;24.96685790;3.0;91.9;13.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163854.088;20180524-163855.000;60.19037250;24.96689000;3.0;91.7;89.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163854.587;20180524-163855.000;60.19037250;24.96689000;3.0;91.7;43.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163855.092;20180524-163856.000;60.19037250;24.96691130;3.0;91.7;77.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163855.592;20180524-163856.000;60.19037250;24.96691130;3.0;91.7;44.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163856.096;20180524-163857.000;60.19037000;24.96692850;3.0;91.7;74.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163856.607;20180524-163857.000;60.19037000;24.96692850;3.0;91.7;35.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163857.108;20180524-163858.000;60.19037250;24.96695710;3.0;91.7;62.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163857.612;20180524-163858.000;60.19037250;24.96695710;3.0;91.7;33.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163858.113;20180524-163859.000;60.19037630;24.96698000;3.0;89.3;54.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163858.612;20180524-163859.000;60.19037630;24.96698000;3.0;89.3;358.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163859.095;20180524-163900.000;60.19038770;24.96700100;3.0;80.6;38.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163859.596;20180524-163900.000;60.19038770;24.96700100;3.0;80.6;2.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163900.095;20180524-163901.000;60.19040000;24.96701810;3.0;71.6;38.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163900.597;20180524-163901.000;60.19040000;24.96701810;3.0;71.6;347.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163901.117;20180524-163902.000;60.19040680;24.96703000;3.0;64.1;25.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163901.598;20180524-163902.000;60.19040680;24.96703000;3.0;64.1;348.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163902.100;20180524-163903.000;60.19042210;24.96704670;3.0;55.9;15.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163902.601;20180524-163903.000;60.19042210;24.96704670;3.0;55.9;346.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163903.122;20180524-163904.000;60.19043350;24.96705630;3.0;50.5;17.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163903.619;20180524-163904.000;60.19043350;24.96705630;3.0;50.5;356.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163904.122;20180524-163905.000;60.19044490;24.96706770;3.0;48.2;9.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163904.608;20180524-163905.000;60.19044490;24.96706770;3.0;48.2;347.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163905.124;20180524-163906.000;60.19045640;24.96708490;3.0;47.2;13.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163905.607;20180524-163906.000;60.19045640;24.96708490;3.0;47.2;349.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163906.122;20180524-163907.000;60.19047000;24.96710210;3.0;48.3;2.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163906.628;20180524-163907.000;60.19047000;24.96710210;3.0;48.3;358.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163907.108;20180524-163908.000;60.19048310;24.96711540;3.0;49.6;352.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163907.613;20180524-163908.000;60.19048310;24.96711540;3.0;49.6;355.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163908.127;20180524-163909.000;60.19049450;24.96712880;3.0;50.7;2.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163908.631;20180524-163909.000;60.19049450;24.96712880;3.0;50.7;354.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163909.136;20180524-163910.000;60.19051000;24.96714400;3.0;47.8;325.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163909.633;20180524-163910.000;60.19051000;24.96714400;3.0;47.8;49.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163910.131;20180524-163911.000;60.19052510;24.96714780;3.0;38.6;90.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163910.631;20180524-163911.000;60.19052510;24.96714780;3.0;38.6;104.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163911.115;20180524-163912.000;60.19053270;24.96714000;4.0;38.6;329.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163911.621;20180524-163912.000;60.19053270;24.96714000;4.0;38.6;358.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163912.117;20180524-163913.000;60.19054410;24.96712880;5.0;18.2;357.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163912.618;20180524-163913.000;60.19054410;24.96712880;5.0;18.2;355.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163913.135;20180524-163914.000;60.19056000;24.96710780;6.0;349.4;234.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163913.637;20180524-163914.000;60.19056000;24.96710780;6.0;349.4;143.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163914.121;20180524-163915.000;60.19057000;24.96709440;6.0;324.4;244.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163914.620;20180524-163915.000;60.19057000;24.96709440;6.0;324.4;156.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163915.105;20180524-163916.000;60.19058610;24.96709630;6.0;323.0;299.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163915.608;20180524-163916.000;60.19058610;24.96709630;6.0;323.0;10.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163916.124;20180524-163917.000;60.19060520;24.96709000;5.0;330.3;5.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163916.625;20180524-163917.000;60.19060520;24.96709000;5.0;330.3;27.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163917.125;20180524-163918.000;60.19062420;24.96708870;5.0;343.2;348.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163917.651;20180524-163918.000;60.19062420;24.96708870;5.0;343.2;22.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163918.128;20180524-163919.000;60.19064000;24.96708870;5.0;356.2;13.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163918.629;20180524-163919.000;60.19064000;24.96708870;5.0;356.2;34.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163919.147;20180524-163920.000;60.19066000;24.96708300;5.0;350.5;346.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163919.655;20180524-163920.000;60.19066000;24.96708300;5.0;350.5;29.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163920.133;20180524-163921.000;60.19067380;24.96707530;6.0;347.8;189.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163920.633;20180524-163921.000;60.19067380;24.96707530;6.0;347.8;244.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163921.147;20180524-163922.000;60.19069000;24.96705820;6.0;337.1;229.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163921.655;20180524-163923.000;60.19070430;24.96705630;4.0;335.3;245.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163922.137;20180524-163923.000;60.19070430;24.96705630;4.0;335.3;53.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163922.660;20180524-163924.000;60.19071580;24.96706000;4.0;343.5;20.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163923.155;20180524-163924.000;60.19071580;24.96706000;4.0;343.5;14.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163923.655;20180524-163925.000;60.19072720;24.96707000;4.0;1.8;2.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163924.154;20180524-163925.000;60.19072720;24.96707000;4.0;1.8;16.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163924.655;20180524-163925.000;60.19072720;24.96707000;4.0;1.8;2.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163925.156;20180524-163926.000;60.19073000;24.96710210;5.0;33.3;22.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163925.660;20180524-163926.000;60.19073000;24.96710210;5.0;33.3;357.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163926.155;20180524-163927.000;60.19074000;24.96712880;5.0;53.5;8.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163926.657;20180524-163928.000;60.19075000;24.96714590;6.0;63.9;340.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163927.160;20180524-163928.000;60.19075000;24.96714590;6.0;63.9;20.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163927.659;20180524-163929.000;60.19075780;24.96715550;6.0;66.2;2.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163928.161;20180524-163929.000;60.19075780;24.96715550;6.0;66.2;19.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163928.663;20180524-163930.000;60.19076540;24.96716000;6.0;66.2;338.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163929.145;20180524-163930.000;60.19076540;24.96716000;6.0;66.2;25.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163929.656;20180524-163931.000;60.19077300;24.96715160;7.0;43.5;324.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163930.166;20180524-163931.000;60.19077300;24.96715160;7.0;43.5;19.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163930.670;20180524-163932.000;60.19078000;24.96715000;7.0;43.5;328.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163931.167;20180524-163932.000;60.19078000;24.96715000;7.0;43.5;17.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163931.681;20180524-163933.000;60.19079590;24.96716690;6.0;33.5;1.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163932.166;20180524-163933.000;60.19079590;24.96716690;6.0;33.5;31.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163932.674;20180524-163934.000;60.19081000;24.96718220;6.0;30.3;348.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163933.172;20180524-163934.000;60.19081000;24.96718220;6.0;30.3;42.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163933.664;20180524-163935.000;60.19083000;24.96719170;6.0;23.5;350.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163934.168;20180524-163935.000;60.19083000;24.96719170;6.0;23.5;44.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163934.674;20180524-163936.000;60.19085000;24.96719740;7.0;30.6;336.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163935.156;20180524-163936.000;60.19085000;24.96719740;7.0;30.6;45.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163935.654;20180524-163937.000;60.19087220;24.96720310;8.0;25.7;338.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163936.157;20180524-163937.000;60.19087220;24.96720310;8.0;25.7;3.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163936.675;20180524-163938.000;60.19089510;24.96720700;8.0;16.3;352.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163937.174;20180524-163938.000;60.19089510;24.96720700;8.0;16.3;23.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163937.683;20180524-163939.000;60.19091000;24.96724000;7.0;25.7;345.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163938.177;20180524-163939.000;60.19091000;24.96724000;7.0;25.7;8.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163938.693;20180524-163940.000;60.19092560;24.96727560;8.0;39.0;359.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163939.179;20180524-163940.000;60.19092560;24.96727560;8.0;39.0;17.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163939.667;20180524-163941.000;60.19094000;24.96732140;10.0;54.6;15.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163940.164;20180524-163941.000;60.19094000;24.96732140;10.0;54.6;356.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163940.677;20180524-163942.000;60.19095000;24.96736000;9.0;70.0;8.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163941.183;20180524-163942.000;60.19095000;24.96736000;9.0;70.0;9.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163941.683;20180524-163943.000;60.19097000;24.96738000;9.0;64.9;12.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163942.184;20180524-163943.000;60.19097000;24.96738000;9.0;64.9;23.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163942.683;20180524-163944.000;60.19099810;24.96739000;9.0;53.4;22.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163943.186;20180524-163944.000;60.19099810;24.96739000;9.0;53.4;10.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163943.684;20180524-163945.000;60.19101330;24.96741290;8.0;49.2;2.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163944.187;20180524-163945.000;60.19101330;24.96741290;8.0;49.2;11.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163944.699;20180524-163946.000;60.19103000;24.96743200;8.0;42.6;350.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163945.172;20180524-163946.000;60.19103000;24.96743200;8.0;42.6;12.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163945.693;20180524-163947.000;60.19104390;24.96744540;7.0;42.3;4.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163946.192;20180524-163947.000;60.19104390;24.96744540;7.0;42.3;359.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163946.714;20180524-163948.000;60.19105000;24.96742820;7.0;30.6;336.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163947.228;20180524-163948.000;60.19105000;24.96742820;7.0;30.6;52.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163947.723;20180524-163949.000;60.19103620;24.96741680;7.0;352.0;0.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163948.223;20180524-163949.000;60.19103620;24.96741680;7.0;352.0;20.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163948.724;20180524-163950.000;60.19104390;24.96743000;6.0;358.4;4.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163949.225;20180524-163950.000;60.19104390;24.96743000;6.0;358.4;306.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;False;unity;DeviceLocationProvider;20180524-163949.728;20180524-163951.000;60.19105530;24.96744540;6.0;358.4;35.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;False;unity;DeviceLocationProvider;20180524-163950.232;20180524-163951.000;60.19105530;24.96744540;6.0;358.4;1.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;False;unity;DeviceLocationProvider;20180524-163950.713;20180524-163952.000;60.19106000;24.96745300;6.0;358.4;21.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;False;unity;DeviceLocationProvider;20180524-163951.216;20180524-163952.000;60.19106000;24.96745300;6.0;358.4;350.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163951.714;20180524-163953.000;60.19106670;24.96745680;5.0;59.2;28.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163952.217;20180524-163953.000;60.19106670;24.96745680;5.0;59.2;26.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163952.718;20180524-163954.000;60.19108000;24.96743770;5.0;33.2;10.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163953.218;20180524-163954.000;60.19108000;24.96743770;5.0;33.2;7.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163953.720;20180524-163955.000;60.19109000;24.96741490;5.0;354.3;43.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163954.220;20180524-163955.000;60.19109000;24.96741490;5.0;354.3;14.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163954.720;20180524-163956.000;60.19111250;24.96740530;5.0;331.3;23.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163955.223;20180524-163956.000;60.19111250;24.96740530;5.0;331.3;22.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163955.724;20180524-163957.000;60.19113540;24.96740720;4.0;324.7;32.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163956.223;20180524-163957.000;60.19113540;24.96740720;4.0;324.7;39.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163956.721;20180524-163958.000;60.19115000;24.96740340;4.0;335.8;32.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163957.227;20180524-163958.000;60.19115000;24.96740340;4.0;335.8;7.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163957.724;20180524-163959.000;60.19117000;24.96740530;4.0;353.1;25.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163958.229;20180524-163959.000;60.19117000;24.96740530;4.0;353.1;347.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163958.726;20180524-164000.000;60.19118500;24.96741100;4.0;4.1;25.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-163959.229;20180524-164000.000;60.19118500;24.96741100;4.0;4.1;10.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-163959.730;20180524-164001.000;60.19120000;24.96741870;9.0;9.8;20.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164000.235;20180524-164001.000;60.19120000;24.96741870;9.0;9.8;353.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164000.749;20180524-164002.000;60.19121000;24.96742000;9.0;15.2;21.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164001.250;20180524-164002.000;60.19121000;24.96742000;9.0;15.2;318.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164001.748;20180524-164003.000;60.19123460;24.96741490;9.0;11.0;20.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164002.249;20180524-164003.000;60.19123460;24.96741490;9.0;11.0;326.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164002.750;20180524-164004.000;60.19125750;24.96741100;9.0;3.2;25.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164003.254;20180524-164004.000;60.19125750;24.96741100;9.0;3.2;355.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164003.755;20180524-164005.000;60.19127660;24.96741000;9.0;355.7;33.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164004.254;20180524-164005.000;60.19127660;24.96741000;9.0;355.7;335.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164004.756;20180524-164006.000;60.19129560;24.96741490;9.0;357.5;22.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164005.259;20180524-164006.000;60.19129560;24.96741490;9.0;357.5;343.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164005.758;20180524-164007.000;60.19131000;24.96741490;9.0;0.4;26.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164006.261;20180524-164007.000;60.19131000;24.96741490;9.0;0.4;357.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164006.759;20180524-164008.000;60.19132610;24.96741490;9.0;2.8;19.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164007.264;20180524-164008.000;60.19132610;24.96741490;9.0;2.8;359.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164007.761;20180524-164009.000;60.19134000;24.96741680;9.0;5.6;33.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164008.262;20180524-164009.000;60.19134000;24.96741680;9.0;5.6;4.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164008.763;20180524-164010.000;60.19136000;24.96741680;9.0;1.9;14.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164009.245;20180524-164010.000;60.19136000;24.96741680;9.0;1.9;13.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164009.747;20180524-164011.000;60.19137570;24.96742630;3.0;9.6;19.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164010.248;20180524-164011.000;60.19137570;24.96742630;3.0;9.6;9.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164010.750;20180524-164012.000;60.19138720;24.96744000;3.0;22.1;6.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164011.268;20180524-164012.000;60.19138720;24.96744000;3.0;22.1;23.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164011.768;20180524-164013.000;60.19140630;24.96745490;3.0;30.0;11.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164012.271;20180524-164013.000;60.19140630;24.96745490;3.0;30.0;13.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164012.774;20180524-164014.000;60.19142000;24.96746640;3.0;39.8;19.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164013.272;20180524-164014.000;60.19142000;24.96746640;3.0;39.8;20.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164013.772;20180524-164015.000;60.19143000;24.96748000;3.0;45.4;6.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164014.272;20180524-164015.000;60.19143000;24.96748000;3.0;45.4;5.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164014.774;20180524-164016.000;60.19145000;24.96749310;3.0;41.2;324.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164015.274;20180524-164016.000;60.19145000;24.96749310;3.0;41.2;358.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164015.775;20180524-164017.000;60.19146730;24.96751000;3.0;42.8;356.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164016.260;20180524-164017.000;60.19146730;24.96751000;3.0;42.8;30.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164016.777;20180524-164018.000;60.19148000;24.96752170;3.0;43.5;343.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164017.277;20180524-164018.000;60.19148000;24.96752170;3.0;43.5;17.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164017.777;20180524-164019.000;60.19149000;24.96753310;3.0;42.2;320.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164018.278;20180524-164019.000;60.19149000;24.96753310;3.0;42.2;5.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164018.763;20180524-164020.000;60.19149780;24.96754650;3.0;48.9;338.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164019.264;20180524-164020.000;60.19149780;24.96754650;3.0;48.9;37.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164019.765;20180524-164021.000;60.19151000;24.96755790;3.0;48.5;12.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164020.271;20180524-164021.000;60.19151000;24.96755790;3.0;48.5;36.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164020.781;20180524-164022.000;60.19151310;24.96756360;3.0;48.5;349.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164021.282;20180524-164022.000;60.19151310;24.96756360;3.0;48.5;30.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164021.783;20180524-164023.000;60.19152450;24.96757000;3.0;47.8;17.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164022.287;20180524-164023.000;60.19152450;24.96757000;3.0;47.8;39.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164022.788;20180524-164024.000;60.19153590;24.96757510;3.0;41.7;11.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164023.291;20180524-164024.000;60.19153590;24.96757510;3.0;41.7;15.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164023.793;20180524-164025.000;60.19154740;24.96758270;3.0;35.1;1.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164024.288;20180524-164025.000;60.19154740;24.96758270;3.0;35.1;1.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164024.791;20180524-164026.000;60.19156270;24.96758270;3.0;24.5;355.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164025.289;20180524-164026.000;60.19156270;24.96758270;3.0;24.5;347.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164025.792;20180524-164027.000;60.19157410;24.96758650;3.0;19.0;24.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164026.291;20180524-164027.000;60.19157410;24.96758650;3.0;19.0;6.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164026.795;20180524-164028.000;60.19158550;24.96759220;3.0;19.7;13.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164027.278;20180524-164028.000;60.19158550;24.96759220;3.0;19.7;30.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164027.779;20180524-164029.000;60.19160000;24.96759800;3.0;16.7;345.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164028.278;20180524-164029.000;60.19160000;24.96759800;3.0;16.7;26.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164028.780;20180524-164030.000;60.19161610;24.96759800;3.0;16.7;11.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164029.281;20180524-164030.000;60.19161610;24.96759800;3.0;16.7;354.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164029.780;20180524-164031.000;60.19163510;24.96759800;3.0;12.1;355.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164030.278;20180524-164031.000;60.19163510;24.96759800;3.0;12.1;4.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164030.788;20180524-164032.000;60.19164660;24.96759610;3.0;3.0;7.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164031.285;20180524-164032.000;60.19164660;24.96759610;3.0;3.0;327.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164031.785;20180524-164033.000;60.19165800;24.96760000;3.0;2.3;22.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164032.285;20180524-164033.000;60.19165800;24.96760000;3.0;2.3;340.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164032.786;20180524-164034.000;60.19167330;24.96760180;3.0;4.0;28.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164033.287;20180524-164034.000;60.19167330;24.96760180;3.0;4.0;325.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164033.791;20180524-164035.000;60.19168470;24.96761130;3.0;14.0;19.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164034.291;20180524-164035.000;60.19168470;24.96761130;3.0;14.0;329.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164034.791;20180524-164036.000;60.19170380;24.96763610;3.0;29.4;13.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164035.290;20180524-164036.000;60.19170380;24.96763610;3.0;29.4;344.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164035.794;20180524-164037.000;60.19173000;24.96765140;3.0;32.4;27.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164036.291;20180524-164037.000;60.19173000;24.96765140;3.0;32.4;330.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164036.795;20180524-164038.000;60.19175340;24.96767810;4.0;42.8;26.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164037.311;20180524-164038.000;60.19175340;24.96767810;4.0;42.8;331.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164037.809;20180524-164039.000;60.19177630;24.96769520;4.0;42.1;20.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164038.313;20180524-164039.000;60.19177630;24.96769520;4.0;42.1;336.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164038.801;20180524-164040.000;60.19180300;24.96771000;5.0;36.2;30.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164039.314;20180524-164040.000;60.19180300;24.96771000;5.0;36.2;353.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164039.814;20180524-164041.000;60.19182210;24.96772190;5.0;36.6;24.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164040.317;20180524-164041.000;60.19182210;24.96772190;5.0;36.6;8.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164040.798;20180524-164042.000;60.19184000;24.96773720;5.0;34.5;9.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164041.319;20180524-164042.000;60.19184000;24.96773720;5.0;34.5;10.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164041.802;20180524-164043.000;60.19186000;24.96775250;6.0;34.7;6.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164042.319;20180524-164043.000;60.19186000;24.96775250;6.0;34.7;350.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164042.819;20180524-164044.000;60.19187550;24.96777000;5.0;39.6;352.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164043.323;20180524-164044.000;60.19187550;24.96777000;5.0;39.6;7.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164043.806;20180524-164045.000;60.19189000;24.96778680;5.0;43.9;359.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164044.308;20180524-164045.000;60.19189000;24.96778680;5.0;43.9;2.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164044.808;20180524-164046.000;60.19191000;24.96779820;5.0;41.2;24.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164045.324;20180524-164046.000;60.19191000;24.96779820;5.0;41.2;6.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164045.822;20180524-164047.000;60.19192000;24.96781350;5.0;46.1;7.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164046.327;20180524-164047.000;60.19192000;24.96781350;5.0;46.1;356.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164046.810;20180524-164048.000;60.19193650;24.96782880;5.0;44.7;12.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164047.313;20180524-164048.000;60.19193650;24.96782880;5.0;44.7;10.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164047.811;20180524-164049.000;60.19195000;24.96784000;5.0;42.2;21.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164048.317;20180524-164049.000;60.19195000;24.96784000;5.0;42.2;21.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164048.812;20180524-164050.000;60.19196320;24.96785160;4.0;45.1;1.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164049.316;20180524-164050.000;60.19196320;24.96785160;4.0;45.1;9.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164049.814;20180524-164051.000;60.19198000;24.96786500;4.0;40.6;347.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164050.317;20180524-164051.000;60.19198000;24.96786500;4.0;40.6;9.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164050.820;20180524-164052.000;60.19199370;24.96787260;4.0;37.2;351.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164051.317;20180524-164052.000;60.19199370;24.96787260;4.0;37.2;26.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164051.818;20180524-164053.000;60.19201000;24.96788220;3.0;34.8;344.3;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164052.320;20180524-164053.000;60.19201000;24.96788220;3.0;34.8;4.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164052.839;20180524-164054.000;60.19202000;24.96789170;3.0;35.4;351.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164053.338;20180524-164054.000;60.19202000;24.96789170;3.0;35.4;3.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164053.836;20180524-164055.000;60.19203000;24.96790000;3.0;35.7;350.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164054.339;20180524-164055.000;60.19203000;24.96790000;3.0;35.7;10.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164054.840;20180524-164056.000;60.19204330;24.96790890;4.0;36.9;348.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164055.341;20180524-164056.000;60.19204330;24.96790890;4.0;36.9;13.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164055.841;20180524-164057.000;60.19205000;24.96791270;4.0;36.9;9.7;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164056.344;20180524-164057.000;60.19205000;24.96791270;4.0;36.9;28.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164056.840;20180524-164058.000;60.19206240;24.96792000;3.0;36.8;14.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164057.339;20180524-164058.000;60.19206240;24.96792000;3.0;36.8;35.9;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164057.841;20180524-164059.000;60.19206240;24.96793560;3.0;36.8;54.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164058.342;20180524-164059.000;60.19206240;24.96793560;3.0;36.8;53.4;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164058.843;20180524-164100.000;60.19206000;24.96795460;3.0;48.4;78.6;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164059.343;20180524-164100.000;60.19206000;24.96795460;3.0;48.4;84.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164059.844;20180524-164101.000;60.19205000;24.96797560;3.0;68.0;59.2;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164100.346;20180524-164101.000;60.19205000;24.96797560;3.0;68.0;60.8;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164100.845;20180524-164102.000;60.19204330;24.96800000;3.0;88.3;65.1;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;False;True;unity;DeviceLocationProvider;20180524-164101.346;20180524-164102.000;60.19204330;24.96800000;3.0;88.3;74.0;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] +True;False;True;True;unity;DeviceLocationProvider;20180524-164101.848;20180524-164103.000;60.19203570;24.96801760;3.0;107.1;84.5;[not supported by provider];[not supported by provider];[not supported by provider];[not supported by provider] diff --git a/sdkproject/Assets/Mapbox/Unity/Location/ExampleGpsTraces/driving_in_circles.txt.meta b/sdkproject/Assets/Mapbox/Unity/Location/ExampleGpsTraces/Helsinki.txt.meta similarity index 68% rename from sdkproject/Assets/Mapbox/Unity/Location/ExampleGpsTraces/driving_in_circles.txt.meta rename to sdkproject/Assets/Mapbox/Unity/Location/ExampleGpsTraces/Helsinki.txt.meta index 300041673..6ddc0229c 100644 --- a/sdkproject/Assets/Mapbox/Unity/Location/ExampleGpsTraces/driving_in_circles.txt.meta +++ b/sdkproject/Assets/Mapbox/Unity/Location/ExampleGpsTraces/Helsinki.txt.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: b9abe7d031734c34e83d93fc4b21fa58 -timeCreated: 1524823523 +guid: 5e6bb7224cef35c4788a4817b1c9778d +timeCreated: 1527247128 licenseType: Pro TextScriptImporter: externalObjects: {} diff --git a/sdkproject/Assets/Mapbox/Unity/Location/ExampleGpsTraces/driving_in_circles.txt b/sdkproject/Assets/Mapbox/Unity/Location/ExampleGpsTraces/driving_in_circles.txt deleted file mode 100644 index 3f85eda86..000000000 --- a/sdkproject/Assets/Mapbox/Unity/Location/ExampleGpsTraces/driving_in_circles.txt +++ /dev/null @@ -1,75 +0,0 @@ -# -# Header Description: -# -# Version: v2.0.0.1 Platform: 8.1.0 Manufacturer: Google Model: Pixel 2 -# -# Raw,ElapsedRealtimeMillis,TimeNanos,LeapSecond,TimeUncertaintyNanos,FullBiasNanos,BiasNanos,BiasUncertaintyNanos,DriftNanosPerSecond,DriftUncertaintyNanosPerSecond,HardwareClockDiscontinuityCount,Svid,TimeOffsetNanos,State,ReceivedSvTimeNanos,ReceivedSvTimeUncertaintyNanos,Cn0DbHz,PseudorangeRateMetersPerSecond,PseudorangeRateUncertaintyMetersPerSecond,AccumulatedDeltaRangeState,AccumulatedDeltaRangeMeters,AccumulatedDeltaRangeUncertaintyMeters,CarrierFrequencyHz,CarrierCycles,CarrierPhase,CarrierPhaseUncertainty,MultipathIndicator,SnrInDb,ConstellationType,AgcDb,CarrierFrequencyHz -# -# Fix,Provider,Latitude,Longitude,Altitude,Speed,Accuracy,Bearing,Orientation,(UTC)TimeInMs -# -# Nav,Svid,Type,Status,MessageId,Sub-messageId,Data(Bytes) -# -Fix,gps,48.392460,15.580114,244.883911,9.390000,6.432000,301.899994,334.030670,1524811861000 -Fix,gps,48.392497,15.580005,244.502075,9.420000,6.432000,302.200012,356.722412,1524811862000 -Fix,gps,48.392535,15.579900,244.335815,9.110000,6.432000,302.100006,337.497375,1524811863000 -Fix,gps,48.392591,15.579806,245.396973,8.770000,6.432000,304.700012,328.809753,1524811864000 -Fix,gps,48.392640,15.579716,246.453857,8.240000,6.432000,306.899994,337.404144,1524811865000 -Fix,gps,48.392684,15.579633,247.263794,7.830000,6.432000,310.500000,343.111816,1524811866000 -Fix,gps,48.392726,15.579557,247.475830,6.980000,6.432000,311.700012,343.911804,1524811867000 -Fix,gps,48.392765,15.579495,247.146606,6.360000,6.432000,312.200012,301.802979,1524811868000 -Fix,gps,48.392801,15.579444,247.211426,5.640000,6.432000,320.700012,292.912048,1524811869000 -Fix,gps,48.392873,15.579432,248.650513,5.360000,5.360000,353.100006,312.574524,1524811870000 -Fix,gps,48.392936,15.579439,249.810303,5.370000,5.360000,4.000000,11.799591,1524811871000 -Fix,gps,48.393015,15.579457,251.073669,5.360000,5.360000,4.500000,9.302094,1524811872000 -Fix,gps,48.393060,15.579467,250.311707,5.240000,5.360000,5.600000,353.394348,1524811873000 -Fix,gps,48.393110,15.579506,248.511841,4.570000,5.360000,22.500000,20.054871,1524811874000 -Fix,gps,48.393134,15.579535,250.789001,2.630000,5.360000,52.700001,21.669250,1524811875000 -Fix,gps,48.393144,15.579542,251.441162,2.190000,5.360000,53.099998,38.185944,1524811876000 -Fix,gps,48.393155,15.579566,250.443970,2.320000,6.432000,60.500000,25.426697,1524811877000 -Fix,gps,48.393171,15.579592,249.187744,2.860000,5.360000,59.000000,2.520996,1524811878000 -Fix,gps,48.393190,15.579632,249.578064,3.300000,6.432000,62.400002,22.211792,1524811879000 -Fix,gps,48.393196,15.579679,249.463745,3.620000,7.504000,68.300003,23.735138,1524811880000 -Fix,gps,48.393178,15.579792,249.380310,6.160000,6.432000,87.400002,39.551819,1524811881000 -Fix,gps,48.393176,15.579887,249.851685,6.630000,6.432000,87.099998,45.347504,1524811882000 -Fix,gps,48.393177,15.579986,249.472839,7.310000,6.432000,90.099998,60.602692,1524811883000 -Fix,gps,48.393178,15.580067,251.104004,7.230000,6.432000,90.500000,55.074615,1524811884000 -Fix,gps,48.393179,15.580178,252.305542,7.710000,6.432000,89.800003,62.261932,1524811885000 -Fix,gps,48.393174,15.580299,252.311340,8.020000,6.432000,88.300003,56.904602,1524811886000 -Fix,gps,48.393178,15.580401,252.797974,8.130000,5.360000,89.400002,57.664520,1524811887000 -Fix,gps,48.393169,15.580510,253.922913,7.880000,6.432000,91.800003,59.466614,1524811888000 -Fix,gps,48.393158,15.580611,254.727783,7.380000,6.432000,98.699997,57.058105,1524811889000 -Fix,gps,48.393146,15.580707,254.793213,7.460000,8.576000,99.800003,58.042450,1524811890000 -Fix,gps,48.393142,15.580794,255.472534,7.230000,9.648001,100.099998,60.344513,1524811891000 -Fix,gps,48.393133,15.580865,254.628052,5.960000,10.720000,103.300003,43.094696,1524811892000 -Fix,gps,48.393152,15.580894,253.319580,3.660000,7.504000,94.300003,20.634552,1524811893000 -Fix,gps,48.393108,15.580980,253.978394,3.040000,6.432000,101.199997,35.580109,1524811894000 -Fix,gps,48.393123,15.580985,252.116333,2.510000,5.360000,111.300003,39.748627,1524811895000 -Fix,gps,48.393084,15.580971,249.278687,3.860000,4.288000,170.800003,77.634735,1524811896000 -Fix,gps,48.393032,15.580975,248.985718,4.890000,4.288000,182.399994,111.085358,1524811897000 -Fix,gps,48.392973,15.580979,248.940613,5.860000,4.288000,179.399994,91.379883,1524811898000 -Fix,gps,48.392909,15.580980,248.620728,6.580000,4.288000,181.199997,96.948364,1524811899000 -Fix,gps,48.392846,15.580961,248.185242,6.960000,4.288000,180.699997,101.203766,1524811900000 -Fix,gps,48.392775,15.580957,247.287048,7.540000,3.216000,179.500000,113.452393,1524811901000 -Fix,gps,48.392708,15.580955,249.459717,7.170000,4.288000,180.899994,112.928162,1524811902000 -Fix,gps,48.392629,15.580986,244.933838,6.950000,4.288000,176.899994,128.389648,1524811903000 -Fix,gps,48.392572,15.580986,245.168640,6.390000,4.288000,166.600006,114.726624,1524811904000 -Fix,gps,48.392516,15.581026,245.518494,5.840000,4.288000,163.000000,95.297943,1524811905000 -Fix,gps,48.392461,15.581032,246.189392,5.700000,4.288000,179.300003,117.780823,1524811906000 -Fix,gps,48.392420,15.581017,247.584778,5.050000,4.288000,195.699997,124.594269,1524811907000 -Fix,gps,48.392383,15.580989,247.182800,4.650000,4.288000,198.600006,138.293549,1524811908000 -Fix,gps,48.392345,15.580972,246.859680,4.370000,5.360000,197.600006,144.620636,1524811909000 -Fix,gps,48.392313,15.580951,247.098267,3.730000,5.360000,196.899994,134.438171,1524811910000 -Fix,gps,48.392290,15.580937,247.084595,2.540000,5.360000,197.300003,135.109497,1524811911000 -Fix,gps,48.392276,15.580941,248.742065,1.850000,5.360000,193.899994,126.031342,1524811912000 -Fix,gps,48.392265,15.580947,250.434326,2.050000,5.360000,196.199997,121.141296,1524811913000 -Fix,gps,48.392249,15.580924,248.297485,2.930000,5.360000,227.399994,180.330917,1524811914000 -Fix,gps,48.392235,15.580886,247.739380,3.560000,5.360000,246.699997,223.269897,1524811915000 -Fix,gps,48.392232,15.580815,247.006714,4.210000,5.360000,272.000000,260.906097,1524811916000 -Fix,gps,48.392244,15.580764,247.198364,5.010000,4.288000,296.500000,333.928589,1524811917000 -Fix,gps,48.392265,15.580697,246.952759,5.790000,4.288000,298.500000,320.642914,1524811918000 -Fix,gps,48.392300,15.580619,244.495605,6.740000,4.288000,298.899994,313.861298,1524811919000 -Fix,gps,48.392337,15.580541,245.298340,7.400000,5.360000,299.899994,332.772858,1524811920000 -Fix,gps,48.392357,15.580446,247.091309,7.790000,5.360000,300.500000,331.011536,1524811921000 -Fix,gps,48.392394,15.580357,248.781311,8.180000,5.360000,300.200012,322.085754,1524811922000 -Fix,gps,48.392436,15.580266,250.037842,8.310000,6.432000,301.200012,326.440704,1524811923000 -Fix,gps,48.392466,15.580163,250.725220,8.180000,6.432000,300.700012,322.919556,1524811924000 diff --git a/sdkproject/Assets/Mapbox/Unity/Location/ExampleGpsTraces/walking_device_looking_in_different_direction_1.txt b/sdkproject/Assets/Mapbox/Unity/Location/ExampleGpsTraces/walking_device_looking_in_different_direction_1.txt deleted file mode 100644 index 3a5ba5ac9..000000000 --- a/sdkproject/Assets/Mapbox/Unity/Location/ExampleGpsTraces/walking_device_looking_in_different_direction_1.txt +++ /dev/null @@ -1,67 +0,0 @@ -# -# Header Description: -# -# Version: v2.0.0.1 Platform: 8.1.0 Manufacturer: Google Model: Pixel 2 -# -# Raw,ElapsedRealtimeMillis,TimeNanos,LeapSecond,TimeUncertaintyNanos,FullBiasNanos,BiasNanos,BiasUncertaintyNanos,DriftNanosPerSecond,DriftUncertaintyNanosPerSecond,HardwareClockDiscontinuityCount,Svid,TimeOffsetNanos,State,ReceivedSvTimeNanos,ReceivedSvTimeUncertaintyNanos,Cn0DbHz,PseudorangeRateMetersPerSecond,PseudorangeRateUncertaintyMetersPerSecond,AccumulatedDeltaRangeState,AccumulatedDeltaRangeMeters,AccumulatedDeltaRangeUncertaintyMeters,CarrierFrequencyHz,CarrierCycles,CarrierPhase,CarrierPhaseUncertainty,MultipathIndicator,SnrInDb,ConstellationType,AgcDb,CarrierFrequencyHz -# -# Fix,Provider,Latitude,Longitude,Altitude,Speed,Accuracy,Bearing,Orientation,(UTC)TimeInMs -# -# Nav,Svid,Type,Status,MessageId,Sub-messageId,Data(Bytes) -# -Fix,gps,48.401137,15.580709,245.929199,0.000000,4.288000,0.000000,36.201172,1524812233000 -Fix,gps,48.401139,15.580707,245.270020,0.000000,4.288000,0.000000,35.610931,1524812234000 -Fix,gps,48.401145,15.580716,243.787476,0.940000,4.288000,68.699997,46.157867,1524812235000 -Fix,gps,48.401150,15.580729,244.414124,0.910000,4.288000,69.000000,39.437592,1524812236000 -Fix,gps,48.401154,15.580745,245.492493,1.100000,4.288000,68.800003,39.046448,1524812237000 -Fix,gps,48.401156,15.580759,244.975525,0.720000,4.288000,68.900002,113.287476,1524812238000 -Fix,gps,48.401160,15.580770,245.419189,0.700000,4.288000,68.800003,148.380981,1524812239000 -Fix,gps,48.401167,15.580781,245.705994,0.920000,3.216000,68.800003,92.319824,1524812240000 -Fix,gps,48.401180,15.580790,249.440308,1.130000,4.288000,56.200001,117.828125,1524812241000 -Fix,gps,48.401190,15.580799,247.578369,0.650000,4.288000,56.099998,134.270660,1524812242000 -Fix,gps,48.401199,15.580807,246.863037,0.970000,4.288000,56.200001,105.560791,1524812243000 -Fix,gps,48.401210,15.580818,246.981628,1.240000,4.288000,56.200001,106.089172,1524812244000 -Fix,gps,48.401220,15.580831,247.495850,1.190000,4.288000,58.000000,71.565247,1524812245000 -Fix,gps,48.401225,15.580844,247.263489,0.610000,4.288000,58.700001,54.364960,1524812246000 -Fix,gps,48.401224,15.580860,246.933716,0.940000,4.288000,58.700001,64.185486,1524812247000 -Fix,gps,48.401224,15.580874,247.686707,0.800000,4.288000,58.700001,43.939209,1524812248000 -Fix,gps,48.401223,15.580887,247.793152,0.840000,4.288000,58.799999,14.145813,1524812249000 -Fix,gps,48.401227,15.580909,249.692810,1.450000,4.288000,72.500000,3.823486,1524812250000 -Fix,gps,48.401231,15.580930,249.153015,1.060000,4.288000,72.099998,51.032776,1524812251000 -Fix,gps,48.401235,15.580949,249.517578,1.330000,4.288000,73.099998,26.742035,1524812252000 -Fix,gps,48.401241,15.580969,248.711670,1.170000,4.288000,72.500000,5.418152,1524812253000 -Fix,gps,48.401245,15.580989,248.390015,1.070000,3.216000,72.199997,66.550507,1524812254000 -Fix,gps,48.401250,15.581006,247.221924,0.990000,3.216000,71.800003,66.619202,1524812255000 -Fix,gps,48.401258,15.581026,248.757263,1.480000,3.216000,65.800003,39.423584,1524812256000 -Fix,gps,48.401262,15.581041,247.216248,0.530000,4.288000,71.800003,19.969055,1524812257000 -Fix,gps,48.401263,15.581056,247.573120,1.010000,4.288000,72.099998,72.931488,1524812258000 -Fix,gps,48.401264,15.581074,245.630737,1.190000,4.288000,82.900002,115.124847,1524812259000 -Fix,gps,48.401267,15.581092,246.393066,1.150000,4.288000,71.599998,141.298950,1524812260000 -Fix,gps,48.401272,15.581111,246.450378,1.330000,4.288000,67.099998,124.325073,1524812261000 -Fix,gps,48.401281,15.581129,245.926758,1.460000,4.288000,51.900002,98.007538,1524812262000 -Fix,gps,48.401296,15.581148,246.954712,1.460000,4.288000,51.400002,111.513733,1524812263000 -Fix,gps,48.401305,15.581163,244.545898,0.970000,4.288000,66.199997,51.654816,1524812264000 -Fix,gps,48.401315,15.581180,245.624451,1.540000,4.288000,66.099998,63.866333,1524812265000 -Fix,gps,48.401326,15.581200,243.205444,1.300000,4.288000,65.900002,356.770752,1524812266000 -Fix,gps,48.401336,15.581217,243.070190,1.330000,3.216000,61.900002,14.589813,1524812267000 -Fix,gps,48.401346,15.581233,243.229004,1.580000,3.216000,61.900002,254.350632,1524812268000 -Fix,gps,48.401355,15.581248,243.035278,1.050000,3.216000,61.799999,255.439468,1524812269000 -Fix,gps,48.401364,15.581263,241.838318,1.230000,3.216000,62.599998,346.248627,1524812270000 -Fix,gps,48.401371,15.581281,242.006836,1.230000,3.216000,64.900002,214.524628,1524812271000 -Fix,gps,48.401374,15.581299,243.845337,0.980000,3.216000,64.699997,35.856598,1524812272000 -Fix,gps,48.401376,15.581316,244.388550,1.060000,3.216000,64.800003,289.739197,1524812273000 -Fix,gps,48.401381,15.581337,244.104736,1.510000,3.216000,66.699997,70.997620,1524812274000 -Fix,gps,48.401388,15.581358,244.617065,1.340000,3.216000,59.000000,92.856598,1524812275000 -Fix,gps,48.401396,15.581379,244.530151,1.350000,3.216000,59.000000,102.894409,1524812276000 -Fix,gps,48.401403,15.581398,244.302612,1.280000,3.216000,59.000000,143.935608,1524812277000 -Fix,gps,48.401409,15.581416,242.362427,1.500000,3.216000,60.599998,56.021271,1524812278000 -Fix,gps,48.401417,15.581434,242.836548,1.510000,3.216000,59.200001,115.338959,1524812279000 -Fix,gps,48.401426,15.581451,243.172363,1.290000,3.216000,62.900002,107.219208,1524812280000 -Fix,gps,48.401433,15.581465,243.601624,1.150000,3.216000,63.099998,154.416992,1524812281000 -Fix,gps,48.401440,15.581480,243.132446,1.320000,3.216000,60.500000,70.152557,1524812282000 -Fix,gps,48.401446,15.581496,243.096252,1.360000,3.216000,60.799999,91.036591,1524812283000 -Fix,gps,48.401450,15.581510,241.862244,0.850000,3.216000,60.700001,42.567261,1524812284000 -Fix,gps,48.401454,15.581524,240.710327,1.310000,3.216000,70.000000,61.725555,1524812285000 -Fix,gps,48.401458,15.581539,241.147034,0.910000,3.216000,70.199997,97.414124,1524812286000 -Fix,gps,48.401461,15.581553,240.948975,1.070000,3.216000,70.199997,48.457611,1524812287000 -Fix,gps,48.401463,15.581569,240.471313,1.100000,3.216000,70.199997,58.961212,1524812288000 diff --git a/sdkproject/Assets/Mapbox/Unity/Location/ExampleGpsTraces/walking_device_looking_in_different_direction_2.txt b/sdkproject/Assets/Mapbox/Unity/Location/ExampleGpsTraces/walking_device_looking_in_different_direction_2.txt deleted file mode 100644 index d67e44248..000000000 --- a/sdkproject/Assets/Mapbox/Unity/Location/ExampleGpsTraces/walking_device_looking_in_different_direction_2.txt +++ /dev/null @@ -1,52 +0,0 @@ -# -# Header Description: -# -# Version: v2.0.0.1 Platform: 8.1.0 Manufacturer: Google Model: Pixel 2 -# -# Raw,ElapsedRealtimeMillis,TimeNanos,LeapSecond,TimeUncertaintyNanos,FullBiasNanos,BiasNanos,BiasUncertaintyNanos,DriftNanosPerSecond,DriftUncertaintyNanosPerSecond,HardwareClockDiscontinuityCount,Svid,TimeOffsetNanos,State,ReceivedSvTimeNanos,ReceivedSvTimeUncertaintyNanos,Cn0DbHz,PseudorangeRateMetersPerSecond,PseudorangeRateUncertaintyMetersPerSecond,AccumulatedDeltaRangeState,AccumulatedDeltaRangeMeters,AccumulatedDeltaRangeUncertaintyMeters,CarrierFrequencyHz,CarrierCycles,CarrierPhase,CarrierPhaseUncertainty,MultipathIndicator,SnrInDb,ConstellationType,AgcDb,CarrierFrequencyHz -# -# Fix,Provider,Latitude,Longitude,Altitude,Speed,Accuracy,Bearing,Orientation,(UTC)TimeInMs -# -# Nav,Svid,Type,Status,MessageId,Sub-messageId,Data(Bytes) -# -Fix,gps,48.401470,15.581564,239.372437,1.250000,4.288000,243.699997,296.390839,1524812301000 -Fix,gps,48.401465,15.581543,240.132813,1.380000,4.288000,244.000000,209.778687,1524812302000 -Fix,gps,48.401462,15.581527,239.432861,1.310000,4.288000,243.899994,217.233627,1524812303000 -Fix,gps,48.401457,15.581511,238.657837,1.510000,4.288000,237.000000,205.576096,1524812304000 -Fix,gps,48.401451,15.581494,237.291260,1.200000,4.288000,237.899994,226.405075,1524812305000 -Fix,gps,48.401448,15.581479,237.910278,1.310000,3.216000,252.100006,185.663177,1524812306000 -Fix,gps,48.401445,15.581462,239.442322,1.460000,3.216000,251.600006,228.428009,1524812307000 -Fix,gps,48.401439,15.581445,239.804016,1.450000,3.216000,248.600006,288.253235,1524812308000 -Fix,gps,48.401434,15.581429,240.121399,1.360000,3.216000,248.300003,167.671753,1524812309000 -Fix,gps,48.401430,15.581414,240.766479,1.470000,3.216000,241.199997,244.694870,1524812310000 -Fix,gps,48.401425,15.581399,240.985352,1.390000,3.216000,241.500000,231.099686,1524812311000 -Fix,gps,48.401422,15.581382,241.680420,1.370000,3.216000,245.699997,213.599182,1524812312000 -Fix,gps,48.401416,15.581365,241.713623,1.330000,3.216000,245.699997,205.036087,1524812313000 -Fix,gps,48.401409,15.581348,242.522400,1.460000,3.216000,231.100006,221.961700,1524812314000 -Fix,gps,48.401404,15.581333,242.039795,0.960000,3.216000,231.899994,115.955505,1524812315000 -Fix,gps,48.401401,15.581320,244.083618,0.800000,3.216000,231.899994,353.523254,1524812316000 -Fix,gps,48.401399,15.581307,243.582642,0.910000,3.216000,231.800003,44.814453,1524812317000 -Fix,gps,48.401396,15.581291,243.239258,1.390000,3.216000,231.899994,186.703064,1524812318000 -Fix,gps,48.401391,15.581274,242.858276,1.250000,4.288000,231.899994,175.234802,1524812319000 -Fix,gps,48.401384,15.581258,243.053101,1.400000,4.288000,235.600006,46.602692,1524812320000 -Fix,gps,48.401375,15.581242,242.284119,1.430000,4.288000,234.300003,181.293716,1524812321000 -Fix,gps,48.401367,15.581230,242.040710,1.150000,4.288000,251.699997,180.824478,1524812322000 -Fix,gps,48.401359,15.581217,241.915222,1.240000,4.288000,251.000000,184.571945,1524812323000 -Fix,gps,48.401351,15.581201,241.671082,1.530000,3.216000,250.800003,224.857269,1524812324000 -Fix,gps,48.401343,15.581189,241.956238,0.940000,3.216000,250.399994,212.995300,1524812325000 -Fix,gps,48.401338,15.581180,240.524841,0.650000,4.288000,250.600006,241.228729,1524812326000 -Fix,gps,48.401332,15.581167,241.209290,1.310000,3.216000,243.600006,255.005325,1524812327000 -Fix,gps,48.401323,15.581147,240.034241,1.740000,3.216000,237.399994,224.298218,1524812328000 -Fix,gps,48.401318,15.581132,239.855530,0.630000,4.288000,237.399994,162.067444,1524812329000 -Fix,gps,48.401315,15.581123,239.742004,0.760000,3.216000,238.000000,128.484619,1524812330000 -Fix,gps,48.401312,15.581112,237.688782,1.010000,3.216000,237.800003,122.311005,1524812331000 -Fix,gps,48.401308,15.581093,237.908875,1.490000,3.216000,247.899994,82.809784,1524812332000 -Fix,gps,48.401304,15.581075,238.167175,1.260000,4.288000,247.899994,297.621918,1524812333000 -Fix,gps,48.401300,15.581062,238.709473,0.920000,4.288000,247.899994,263.619781,1524812334000 -Fix,gps,48.401295,15.581051,238.228394,0.740000,4.288000,247.800003,309.353851,1524812335000 -Fix,gps,48.401289,15.581045,238.358093,0.700000,4.288000,247.800003,91.646362,1524812336000 -Fix,gps,48.401281,15.581042,239.408081,0.630000,4.288000,247.699997,259.156616,1524812337000 -Fix,gps,48.401272,15.581041,239.833130,0.730000,4.288000,247.600006,136.276184,1524812338000 -Fix,gps,48.401260,15.581033,240.729187,1.410000,4.288000,214.500000,10.447052,1524812339000 -Fix,gps,48.401251,15.581016,240.395752,1.240000,4.288000,231.699997,252.099960,1524812340000 -Fix,gps,48.401243,15.580996,240.424194,1.460000,4.288000,229.600006,230.531143,1524812341000 diff --git a/sdkproject/Assets/Mapbox/Unity/Location/Location.cs b/sdkproject/Assets/Mapbox/Unity/Location/Location.cs index 5e3c64072..ec0ead0d0 100644 --- a/sdkproject/Assets/Mapbox/Unity/Location/Location.cs +++ b/sdkproject/Assets/Mapbox/Unity/Location/Location.cs @@ -1,10 +1,12 @@ namespace Mapbox.Unity.Location { using Mapbox.Utils; + using System.Diagnostics; - /// - /// Location contains heading, latitude, longitude, accuracy and a timestamp. - /// + /// + /// Location contains heading, latitude, longitude, accuracy and a timestamp. + /// + [DebuggerDisplay("{LatitudeLongitude,nq} {Accuracy}m hdg:{UserHeading} orientation:{DeviceOrientation}")] public struct Location { /// @@ -31,10 +33,15 @@ public struct Location public float DeviceOrientation; /// - /// Timestamp (in seconds since 1970) when location was last updated. + /// UTC Timestamp (in seconds since 1970) when location was last updated. /// public double Timestamp; + /// + /// UTC Timestamp (in seconds since 1970) of the device when OnLocationUpdated was fired. + /// + public double TimestampDevice; + /// /// Horizontal Accuracy of the location. /// @@ -87,10 +94,16 @@ public float? SpeedKmPerHour } } /// - /// Name of the location provider. 'Null' if not supported by the active location provider. + /// Name of the location provider. GPS or network or 'Null' if not supported by the active location provider. /// public string Provider; + + /// + /// Name of the location provider script class in Unity + /// + public string ProviderClass; + /// /// Has the heading changed since last update? /// diff --git a/sdkproject/Assets/Mapbox/Unity/Location/LocationGpsLogEditorLocationProvider.cs.meta b/sdkproject/Assets/Mapbox/Unity/Location/LocationGpsLogEditorLocationProvider.cs.meta index db578a894..7d122d75b 100644 --- a/sdkproject/Assets/Mapbox/Unity/Location/LocationGpsLogEditorLocationProvider.cs.meta +++ b/sdkproject/Assets/Mapbox/Unity/Location/LocationGpsLogEditorLocationProvider.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b7aa6be6e90405940b281e996bcb2f20 +guid: c34c76d6349bc9844998f48d16f0d3bb timeCreated: 1524639538 licenseType: Pro MonoImporter: diff --git a/sdkproject/Assets/Mapbox/Unity/Location/LocationProviderFactory.cs b/sdkproject/Assets/Mapbox/Unity/Location/LocationProviderFactory.cs index 2d2351dc3..3809ea3b1 100644 --- a/sdkproject/Assets/Mapbox/Unity/Location/LocationProviderFactory.cs +++ b/sdkproject/Assets/Mapbox/Unity/Location/LocationProviderFactory.cs @@ -144,7 +144,7 @@ protected virtual void Awake() [System.Diagnostics.Conditional("UNITY_EDITOR")] void InjectEditorLocationProvider() { - Debug.Log("LocationProviderFactory: " + "Injected EDITOR Location Provider"); + Debug.LogFormat("LocationProviderFactory: Injected EDITOR Location Provider - {0}", _editorLocationProvider.GetType()); DefaultLocationProvider = _editorLocationProvider; } @@ -161,21 +161,24 @@ void InjectDeviceLocationProvider() if (match.Success) { int.TryParse(match.Groups[0].Value, out AndroidApiVersion); } Debug.LogFormat("{0} => API version: {1}", SystemInfo.operatingSystem, AndroidApiVersion); - + // only inject native provider if platform requirement is met + // and script itself as well as parent game object are active if (Application.platform == RuntimePlatform.Android && null != _deviceLocationProviderAndroid + && _deviceLocationProviderAndroid.enabled + && _deviceLocationProviderAndroid.transform.gameObject.activeInHierarchy // API version 24 => Android 7 (Nougat): we are using GnssStatus 'https://developer.android.com/reference/android/location/GnssStatus.html' // in the native plugin. // GnssStatus is not available with versions lower than 24 && AndroidApiVersion >= 24 ) { - Debug.Log("LocationProviderFactory: " + "Injected native Android DEVICE Location Provider"); + Debug.LogFormat("LocationProviderFactory: Injected native Android DEVICE Location Provider - {0}", _deviceLocationProviderAndroid.GetType()); DefaultLocationProvider = _deviceLocationProviderAndroid; } else { - Debug.Log("LocationProviderFactory: " + "Injected DEVICE Location Provider"); + Debug.LogFormat("LocationProviderFactory: Injected DEVICE Location Provider - {0}", _deviceLocationProviderUnity.GetType()); DefaultLocationProvider = _deviceLocationProviderUnity; } } diff --git a/sdkproject/Assets/Mapbox/Unity/Location/LocationSmoothing.meta b/sdkproject/Assets/Mapbox/Unity/Location/LocationSmoothing.meta new file mode 100644 index 000000000..0d2e71b81 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/LocationSmoothing.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: a46b0caa775595d4e9f98b6af5df5056 +folderAsset: yes +timeCreated: 1527232149 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Unity/Location/KalmanFilter.cs b/sdkproject/Assets/Mapbox/Unity/Location/LocationSmoothing/KalmanFilter.cs similarity index 100% rename from sdkproject/Assets/Mapbox/Unity/Location/KalmanFilter.cs rename to sdkproject/Assets/Mapbox/Unity/Location/LocationSmoothing/KalmanFilter.cs diff --git a/sdkproject/Assets/Mapbox/Unity/Location/KalmanFilter.cs.meta b/sdkproject/Assets/Mapbox/Unity/Location/LocationSmoothing/KalmanFilter.cs.meta similarity index 100% rename from sdkproject/Assets/Mapbox/Unity/Location/KalmanFilter.cs.meta rename to sdkproject/Assets/Mapbox/Unity/Location/LocationSmoothing/KalmanFilter.cs.meta diff --git a/sdkproject/Assets/Mapbox/Unity/Location/Logging.meta b/sdkproject/Assets/Mapbox/Unity/Location/Logging.meta new file mode 100644 index 000000000..30bbc2820 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/Logging.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 57ce5991286556c4e974aeb3a99c9675 +folderAsset: yes +timeCreated: 1527232033 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Unity/Location/Logging/LocationLogAbstractBase.cs b/sdkproject/Assets/Mapbox/Unity/Location/Logging/LocationLogAbstractBase.cs new file mode 100644 index 000000000..89f088768 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/Logging/LocationLogAbstractBase.cs @@ -0,0 +1,80 @@ +namespace Mapbox.Unity.Location +{ + + + using System; + using System.ComponentModel; + using System.Globalization; + using Mapbox.VectorTile.ExtensionMethods; + + + /// + /// Base class for reading/writing location logs + /// + public abstract class LocationLogAbstractBase + { + + + public readonly string Delimiter = ";"; + protected readonly CultureInfo _invariantCulture = CultureInfo.InvariantCulture; + + + public enum LogfileColumns + { + [Description("location service enabled")] + LocationServiceEnabled = 0, + [Description("location service intializing")] + LocationServiceInitializing = 1, + [Description("location updated")] + LocationUpdated = 2, + [Description("userheading updated")] + UserHeadingUpdated = 3, + [Description("location provider")] + LocationProvider = 4, + [Description("location provider class")] + LocationProviderClass = 5, + [Description("time device [utc]")] + UtcTimeDevice = 6, + [Description("time location [utc]")] + UtcTimeOfLocation = 7, + [Description("latitude")] + Latitude = 8, + [Description("longitude")] + Longitude = 9, + [Description("accuracy [m]")] + Accuracy = 10, + [Description("user heading [�]")] + UserHeading = 11, + [Description("device orientation [�]")] + DeviceOrientation = 12, + [Description("speed [km/h]")] + Speed = 13, + [Description("has gps fix")] + HasGpsFix = 14, + [Description("satellites used")] + SatellitesUsed = 15, + [Description("satellites in view")] + SatellitesInView = 16 + } + + + public string[] HeaderNames + { + get + { + Type enumType = typeof(LogfileColumns); + Array arrEnumVals = Enum.GetValues(enumType); + string[] hdrs = new string[arrEnumVals.Length]; + for (int i = 0; i < arrEnumVals.Length; i++) + { + hdrs[i] = ((LogfileColumns)Enum.Parse(enumType, arrEnumVals.GetValue(i).ToString())).Description(); + + } + return hdrs; + } + } + + + + } +} diff --git a/sdkproject/Assets/Mapbox/Unity/Location/Logging/LocationLogAbstractBase.cs.meta b/sdkproject/Assets/Mapbox/Unity/Location/Logging/LocationLogAbstractBase.cs.meta new file mode 100644 index 000000000..424d9a13e --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/Logging/LocationLogAbstractBase.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 8837e931abc92c5488b8c41e1caa2e65 +timeCreated: 1526467177 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Unity/Location/Logging/LocationLogReader.cs b/sdkproject/Assets/Mapbox/Unity/Location/Logging/LocationLogReader.cs new file mode 100644 index 000000000..9eeb36c75 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/Logging/LocationLogReader.cs @@ -0,0 +1,164 @@ +namespace Mapbox.Unity.Location +{ + + + using Mapbox.Utils; + using System; + using System.Collections.Generic; + using System.Globalization; + using System.IO; + using UnityEngine; + + + /// + /// Parses location data and returns Location objects. + /// + public class LocationLogReader : LocationLogAbstractBase, IDisposable + { + + + public LocationLogReader(byte[] contents) + { + MemoryStream ms = new MemoryStream(contents); + _textReader = new StreamReader(ms); + } + + + private bool _disposed; + private TextReader _textReader; + + + #region idisposable + + + ~LocationLogReader() + { + Dispose(false); + } + + + public void Dispose() + { + Dispose(true); + GC.SuppressFinalize(this); + } + + + protected virtual void Dispose(bool disposeManagedResources) + { + if (!_disposed) + { + if (disposeManagedResources) + { + if (null != _textReader) + { + _textReader.Close(); + _textReader.Dispose(); + _textReader = null; + } + } + _disposed = true; + } + } + + + #endregion + + + /// + /// Returns 'Location' objects from the data passed in. Loops through the data. + /// + /// 'Location' objects and loops through the data. + public IEnumerator GetLocations() + { + + while (true) + { + string line = string.Empty; + + while (1 == 1) + { + line = _textReader.ReadLine(); + // rewind if end of log (or last empty line) reached + if (null == line || string.IsNullOrEmpty(line)) + { + ((StreamReader)_textReader).BaseStream.Position = 0; + ((StreamReader)_textReader).DiscardBufferedData(); + continue; + } + + // skip comments + if (line.StartsWith("#")) { continue; } else { break; } + } + + string[] tokens = line.Split(Delimiter.ToCharArray()); + //simple safety net: check if number of columns matches + if (tokens.Length != HeaderNames.Length) + { + Debug.LogError("unsupported log file"); + yield return new Location(); + } + + Location location = new Location(); + + location.IsLocationServiceEnabled = bool.Parse(tokens[(int)LogfileColumns.LocationServiceEnabled]); + location.IsLocationServiceInitializing = bool.Parse(tokens[(int)LogfileColumns.LocationServiceInitializing]); + location.IsLocationUpdated = bool.Parse(tokens[(int)LogfileColumns.LocationUpdated]); + location.IsUserHeadingUpdated = bool.Parse(tokens[(int)LogfileColumns.UserHeadingUpdated]); + location.Provider = tokens[(int)LogfileColumns.LocationProvider]; + location.ProviderClass = tokens[(int)LogfileColumns.LocationProviderClass]; + + DateTime dtDevice; + string dtDeviceTxt = tokens[(int)LogfileColumns.UtcTimeDevice]; + if (DateTime.TryParseExact(dtDeviceTxt, "yyyyMMdd-HHmmss.fff", _invariantCulture, DateTimeStyles.AssumeUniversal, out dtDevice)) + { + location.TimestampDevice = UnixTimestampUtils.To(dtDevice); + } + + DateTime dtLocation; + string dtLocationTxt = tokens[(int)LogfileColumns.UtcTimeOfLocation]; + if (DateTime.TryParseExact(dtLocationTxt, "yyyyMMdd-HHmmss.fff", _invariantCulture, DateTimeStyles.AssumeUniversal, out dtLocation)) + { + location.Timestamp = UnixTimestampUtils.To(dtLocation); + } + + double lat; + string latTxt = tokens[(int)LogfileColumns.Latitude]; + double lng; + string lngTxt = tokens[(int)LogfileColumns.Longitude]; + if ( + !double.TryParse(latTxt, NumberStyles.Any, _invariantCulture, out lat) + || !double.TryParse(lngTxt, NumberStyles.Any, _invariantCulture, out lng) + ) + { + location.LatitudeLongitude = Vector2d.zero; + } + else + { + location.LatitudeLongitude = new Vector2d(lat, lng); + } + + + float accuracy; + location.Accuracy = float.TryParse(tokens[(int)LogfileColumns.Accuracy], NumberStyles.Any, _invariantCulture, out accuracy) ? accuracy : 0; + float userHeading; + location.UserHeading = float.TryParse(tokens[(int)LogfileColumns.UserHeading], NumberStyles.Any, _invariantCulture, out userHeading) ? userHeading : 0; + float deviceOrientation; + location.DeviceOrientation = float.TryParse(tokens[(int)LogfileColumns.DeviceOrientation], NumberStyles.Any, _invariantCulture, out deviceOrientation) ? deviceOrientation : 0; + float speed; + location.SpeedMetersPerSecond = float.TryParse(tokens[(int)LogfileColumns.Speed], NumberStyles.Any, _invariantCulture, out speed) ? speed / 3.6f : (float?)null; + bool hasGpsFix; + location.HasGpsFix = bool.TryParse(tokens[(int)LogfileColumns.HasGpsFix], out hasGpsFix) ? hasGpsFix : (bool?)null; + int satellitesUsed; + location.SatellitesUsed = int.TryParse(tokens[(int)LogfileColumns.SatellitesUsed], out satellitesUsed) ? satellitesUsed : (int?)null; + int satellitesInView; + location.SatellitesInView = int.TryParse(tokens[(int)LogfileColumns.SatellitesInView], out satellitesInView) ? satellitesInView : (int?)null; + + yield return location; + } + } + + + + } +} diff --git a/sdkproject/Assets/Mapbox/Unity/Location/Logging/LocationLogReader.cs.meta b/sdkproject/Assets/Mapbox/Unity/Location/Logging/LocationLogReader.cs.meta new file mode 100644 index 000000000..b4fde41b6 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/Logging/LocationLogReader.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 31c75110fe6926946b6e5e098ec9562f +timeCreated: 1526467150 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Unity/Location/Logging/LocationLogWriter.cs b/sdkproject/Assets/Mapbox/Unity/Location/Logging/LocationLogWriter.cs new file mode 100644 index 000000000..0f6c7abc4 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/Logging/LocationLogWriter.cs @@ -0,0 +1,124 @@ +namespace Mapbox.Unity.Location +{ + + + using Mapbox.Utils; + using System; + using System.IO; + using System.Text; + using UnityEngine; + + + /// + /// Writes location data into Application.persistentDataPath + /// + public class LocationLogWriter : LocationLogAbstractBase, IDisposable + { + + + public LocationLogWriter() + { + string fileName = "MBX-location-log-" + DateTime.Now.ToString("yyyyMMdd-HHmmss") + ".txt"; + string persistentPath = Application.persistentDataPath; + string fullFilePathAndName = Path.Combine(persistentPath, fileName); +#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_WSA + // use `GetFullPath` on that to sanitize the path: replaces `/` returned by `Application.persistentDataPath` with `\` + fullFilePathAndName = Path.GetFullPath(fullFilePathAndName); +#endif + Debug.Log("starting new log file: " + fullFilePathAndName); + + _textWriter = new StreamWriter(fullFilePathAndName, false, new UTF8Encoding(false)); + _textWriter.WriteLine("#" + string.Join(Delimiter, HeaderNames)); + + } + + + private bool _disposed; + private TextWriter _textWriter; + private long _lineCount = 0; + + + #region idisposable + + + ~LocationLogWriter() + { + Dispose(false); + } + + + public void Dispose() + { + Dispose(true); + GC.SuppressFinalize(this); + } + + + protected virtual void Dispose(bool disposeManagedResources) + { + if (!_disposed) + { + if (disposeManagedResources) + { + Debug.LogFormat("{0} locations logged", _lineCount); + if (null != _textWriter) + { + _textWriter.Flush(); + _textWriter.Close(); + _textWriter.Dispose(); + _textWriter = null; + } + } + _disposed = true; + } + } + + + #endregion + + + public void Write(Location location) + { + string[] lineTokens = new string[] + { + location.IsLocationServiceEnabled.ToString(), + location.IsLocationServiceInitializing.ToString(), + location.IsLocationUpdated.ToString(), + location.IsUserHeadingUpdated.ToString(), + location.Provider, + LocationProviderFactory.Instance.DefaultLocationProvider.GetType().Name, + DateTime.UtcNow.ToString("yyyyMMdd-HHmmss.fff"), + UnixTimestampUtils.From(location.Timestamp).ToString("yyyyMMdd-HHmmss.fff"), + string.Format(_invariantCulture, "{0:0.00000000}", location.LatitudeLongitude.x), + string.Format(_invariantCulture, "{0:0.00000000}", location.LatitudeLongitude.y), + string.Format(_invariantCulture, "{0:0.0}", location.Accuracy), + string.Format(_invariantCulture, "{0:0.0}", location.UserHeading), + string.Format(_invariantCulture, "{0:0.0}", location.DeviceOrientation), + nullableAsStr(location.SpeedKmPerHour, "{0:0.0}"), + nullableAsStr(location.HasGpsFix, "{0}"), + nullableAsStr(location.SatellitesUsed, "{0}"), + nullableAsStr(location.SatellitesInView, "{0}") + }; + + _lineCount++; + string logMsg = string.Join(Delimiter, lineTokens); + Debug.Log(logMsg); + _textWriter.WriteLine(logMsg); + _textWriter.Flush(); + } + + + private string nullableAsStr(T? val, string formatString = null) where T : struct + { + if (null == val && null == formatString) { return "[not supported by provider]"; } + if (null == val && null != formatString) { return string.Format(_invariantCulture, formatString, "[not supported by provider]"); } + if (null != val && null == formatString) { return val.Value.ToString(); } + return string.Format(_invariantCulture, formatString, val); + } + + + + + + } +} diff --git a/sdkproject/Assets/Mapbox/Unity/Location/Logging/LocationLogWriter.cs.meta b/sdkproject/Assets/Mapbox/Unity/Location/Logging/LocationLogWriter.cs.meta new file mode 100644 index 000000000..2421dd07f --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/Logging/LocationLogWriter.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 2949fba833e7b6b45aca033b7289b971 +timeCreated: 1526467128 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers.meta b/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers.meta new file mode 100644 index 000000000..336b02b2c --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 69e8d23f97397e1479ae641ffce10426 +folderAsset: yes +timeCreated: 1527232086 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/IMapboxLocationInfo.cs b/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/IMapboxLocationInfo.cs new file mode 100644 index 000000000..f5d2b0188 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/IMapboxLocationInfo.cs @@ -0,0 +1,20 @@ +namespace Mapbox.Unity.Location +{ + + + public interface IMapboxLocationInfo + { + + float latitude { get; } + + float longitude { get; } + + float altitude { get; } + + float horizontalAccuracy { get; } + + float verticalAccuracy { get; } + + double timestamp { get; } + } +} diff --git a/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/IMapboxLocationInfo.cs.meta b/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/IMapboxLocationInfo.cs.meta new file mode 100644 index 000000000..5a6ffb65a --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/IMapboxLocationInfo.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 47359cd2008e00a40bf984d7901ad818 +timeCreated: 1527084333 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/IMapboxLocationService.cs b/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/IMapboxLocationService.cs new file mode 100644 index 000000000..28e002fac --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/IMapboxLocationService.cs @@ -0,0 +1,22 @@ +namespace Mapbox.Unity.Location +{ + + + using UnityEngine; + + + public interface IMapboxLocationService + { + + + bool isEnabledByUser { get; } + + LocationServiceStatus status { get; } + + IMapboxLocationInfo lastData { get; } + + void Start(float desiredAccuracyInMeters, float updateDistanceInMeters); + + void Stop(); + } +} diff --git a/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/IMapboxLocationService.cs.meta b/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/IMapboxLocationService.cs.meta new file mode 100644 index 000000000..4e1c82b7f --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/IMapboxLocationService.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 06b9053759d45444dafd119c1e56d6ad +timeCreated: 1527078706 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/MapboxLocationInfoMock.cs b/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/MapboxLocationInfoMock.cs new file mode 100644 index 000000000..439943f85 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/MapboxLocationInfoMock.cs @@ -0,0 +1,34 @@ +namespace Mapbox.Unity.Location +{ + + + /// + /// Wrapper to mock our 'Location' objects as Unity's 'LocationInfo' + /// + public struct MapboxLocationInfoMock : IMapboxLocationInfo + { + + + public MapboxLocationInfoMock(Location location) + { + _location = location; + } + + + private Location _location; + + public float latitude { get { return (float)_location.LatitudeLongitude.x; } } + + public float longitude { get { return (float)_location.LatitudeLongitude.y; } } + + public float altitude { get { return 0f; } } + + public float horizontalAccuracy { get { return _location.Accuracy; } } + + public float verticalAccuracy { get { return 0; } } + + public double timestamp { get { return _location.Timestamp; } } + + + } +} diff --git a/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/MapboxLocationInfoMock.cs.meta b/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/MapboxLocationInfoMock.cs.meta new file mode 100644 index 000000000..194a9e3b4 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/MapboxLocationInfoMock.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 0125a68c0c6f0f1488fed592d7f135b1 +timeCreated: 1527084357 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/MapboxLocationInfoUnityWrapper.cs b/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/MapboxLocationInfoUnityWrapper.cs new file mode 100644 index 000000000..3dbe51575 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/MapboxLocationInfoUnityWrapper.cs @@ -0,0 +1,36 @@ +namespace Mapbox.Unity.Location +{ + + + using UnityEngine; + + + /// + /// Wrapper to use Unity's LocationInfo as MapboxLocationInfo + /// + public struct MapboxLocationInfoUnityWrapper : IMapboxLocationInfo + { + + public MapboxLocationInfoUnityWrapper(LocationInfo locationInfo) + { + _locationInfo = locationInfo; + } + + private LocationInfo _locationInfo; + + + public float latitude { get { return _locationInfo.latitude; } } + + public float longitude { get { return _locationInfo.longitude; } } + + public float altitude { get { return _locationInfo.altitude; } } + + public float horizontalAccuracy { get { return _locationInfo.horizontalAccuracy; } } + + public float verticalAccuracy { get { return _locationInfo.verticalAccuracy; } } + + public double timestamp { get { return _locationInfo.timestamp; } } + + + } +} diff --git a/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/MapboxLocationInfoUnityWrapper.cs.meta b/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/MapboxLocationInfoUnityWrapper.cs.meta new file mode 100644 index 000000000..6fa4a913e --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/MapboxLocationInfoUnityWrapper.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: d766be27edd431a4d8085a38f6ffe6c9 +timeCreated: 1527084962 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/MapboxLocationServiceMock.cs b/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/MapboxLocationServiceMock.cs new file mode 100644 index 000000000..4bfc0246c --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/MapboxLocationServiceMock.cs @@ -0,0 +1,111 @@ + +namespace Mapbox.Unity.Location +{ + + + using System; + using System.Collections.Generic; + using UnityEngine; + + + /// + /// Class to mock Unity's location service Input.location + /// + public class MapboxLocationServiceMock : IMapboxLocationService, IDisposable + { + + + public MapboxLocationServiceMock(byte[] locationLogFileContents) + { + if (null == locationLogFileContents || locationLogFileContents.Length < 1) + { + throw new ArgumentNullException("locationLogFileContents"); + } + + _logReader = new LocationLogReader(locationLogFileContents); + _locationEnumerator = _logReader.GetLocations(); + } + + + private LocationLogReader _logReader; + private IEnumerator _locationEnumerator; + private bool _isRunning; + private bool _disposed; + + + #region idisposable + + + ~MapboxLocationServiceMock() + { + Dispose(false); + } + + + public void Dispose() + { + Dispose(true); + GC.SuppressFinalize(this); + } + + + protected virtual void Dispose(bool disposeManagedResources) + { + if (!_disposed) + { + if (disposeManagedResources) + { + if (null != _locationEnumerator) + { + _locationEnumerator.Dispose(); + _locationEnumerator = null; + } + if (null != _logReader) + { + _logReader.Dispose(); + _logReader = null; + } + } + _disposed = true; + } + } + + + #endregion + + + public bool isEnabledByUser { get { return true; } } + + + public LocationServiceStatus status { get { return _isRunning ? LocationServiceStatus.Running : LocationServiceStatus.Stopped; } } + + + public IMapboxLocationInfo lastData + { + get + { + if (null == _locationEnumerator) { return new MapboxLocationInfoMock(); } + // no need to check if 'MoveNext()' returns false as LocationLogReader loops through log file + _locationEnumerator.MoveNext(); + Location currentLocation = _locationEnumerator.Current; + + return new MapboxLocationInfoMock(currentLocation); + } + } + + + public void Start(float desiredAccuracyInMeters, float updateDistanceInMeters) + { + _isRunning = true; + } + + + public void Stop() + { + _isRunning = false; + } + + + + } +} diff --git a/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/MapboxLocationServiceMock.cs.meta b/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/MapboxLocationServiceMock.cs.meta new file mode 100644 index 000000000..477104c72 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/MapboxLocationServiceMock.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 9a728e844cc08d94d9e26af90c5a7bce +timeCreated: 1527077195 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/MapboxLocationServiceUnityWrapper.cs b/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/MapboxLocationServiceUnityWrapper.cs new file mode 100644 index 000000000..eceebd50f --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/MapboxLocationServiceUnityWrapper.cs @@ -0,0 +1,37 @@ +namespace Mapbox.Unity.Location +{ + + + using UnityEngine; + + + /// + /// Wrap Unity's LocationService into MapboxLocationService + /// + public class MapboxLocationServiceUnityWrapper : IMapboxLocationService + { + + public bool isEnabledByUser { get { return Input.location.isEnabledByUser; } } + + + public LocationServiceStatus status { get { return Input.location.status; } } + + + public IMapboxLocationInfo lastData { get { return new MapboxLocationInfoUnityWrapper(Input.location.lastData); } } + + + public void Start(float desiredAccuracyInMeters, float updateDistanceInMeters) + { + Input.location.Start(desiredAccuracyInMeters, updateDistanceInMeters); + } + + + public void Stop() + { + Input.location.Stop(); + } + + + + } +} diff --git a/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/MapboxLocationServiceUnityWrapper.cs.meta b/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/MapboxLocationServiceUnityWrapper.cs.meta new file mode 100644 index 000000000..bed6ad20d --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Location/UnityLocationWrappers/MapboxLocationServiceUnityWrapper.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 9a2e88434d3341343b1a9acec29fc49e +timeCreated: 1527078784 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Unity/Map/AbstractMap.cs b/sdkproject/Assets/Mapbox/Unity/Map/AbstractMap.cs index 1cd9dee6b..f3ac688ca 100644 --- a/sdkproject/Assets/Mapbox/Unity/Map/AbstractMap.cs +++ b/sdkproject/Assets/Mapbox/Unity/Map/AbstractMap.cs @@ -9,6 +9,7 @@ namespace Mapbox.Unity.Map using Mapbox.Map; using Mapbox.Unity.MeshGeneration.Factories; using Mapbox.Unity.MeshGeneration.Data; + using System.Globalization; public interface IUnifiedMap { @@ -495,7 +496,7 @@ public virtual void Initialize(Vector2d latLon, int zoom) { _options = new MapOptions(); } - _options.locationOptions.latitudeLongitude = String.Format("{0},{1}", latLon.x, latLon.y); + _options.locationOptions.latitudeLongitude = String.Format(CultureInfo.InvariantCulture, "{0},{1}", latLon.x, latLon.y); _options.locationOptions.zoom = zoom; SetUpMap(); @@ -534,7 +535,7 @@ public virtual void UpdateMap(Vector2d latLon, float zoom) if (Math.Abs(differenceInZoom) > Constants.EpsilonFloatingPoint) { _mapScaleFactor = Vector3.one * Mathf.Pow(2, differenceInZoom); - _mapScaleFactor.y = 1; + //_mapScaleFactor.y = 1; Root.localScale = _mapScaleFactor; } diff --git a/sdkproject/Assets/Mapbox/Unity/MapboxAccess.cs b/sdkproject/Assets/Mapbox/Unity/MapboxAccess.cs index 1e8f3b3a3..34dfb44dc 100644 --- a/sdkproject/Assets/Mapbox/Unity/MapboxAccess.cs +++ b/sdkproject/Assets/Mapbox/Unity/MapboxAccess.cs @@ -110,34 +110,13 @@ public void SetConfiguration(MapboxConfiguration configuration, bool throwExecpt } - /// - /// Deprecated. Use 'ClearSceneCache' or 'ClearAllCacheFiles' instead. - /// - [Obsolete("Deprecated. Use 'ClearSceneCache' or 'ClearAllCacheFiles' instead.")] - public void ClearCache() - { - ClearSceneCache(); - } - - - /// - /// Clear all existing tile caches. Deletes MBTiles database files. - /// - public void ClearSceneCache() - { - CachingWebFileSource cwfs = _fileSource as CachingWebFileSource; - if (null != cwfs) - { - cwfs.Clear(); - } - } - - public void ClearAllCacheFiles() { - // call ClearSceneCache to close any connections that might be open - ClearSceneCache(); + // explicity call Clear() to close any connections that might be referenced by the current scene + CachingWebFileSource cwfs = _fileSource as CachingWebFileSource; + if (null != cwfs) { cwfs.Clear(); } + // remove all left over files (eg orphaned .journal) from the cache directory string cacheDirectory = Path.Combine(Application.persistentDataPath, "cache"); if (!Directory.Exists(cacheDirectory)) { return; } @@ -152,6 +131,11 @@ public void ClearAllCacheFiles() Debug.LogErrorFormat("Could not delete [{0}]: {1}", file, deleteEx); } } + + //reinit caches after clear + if (null != cwfs) { cwfs.ReInit(); } + + Debug.Log("done clearing caches"); } /// @@ -183,7 +167,7 @@ void ConfigureFileSource() _fileSource = new CachingWebFileSource(_configuration.AccessToken, _configuration.AutoRefreshCache) .AddCache(new MemoryCache(_configuration.MemoryCacheSize)) #if !UNITY_WEBGL - .AddCache(new MbTilesCache(_configuration.MbTilesCacheSize)) + .AddCache(new SQLiteCache(_configuration.FileCacheSize)) #endif ; } @@ -344,7 +328,7 @@ public class MapboxConfiguration { public string AccessToken; public uint MemoryCacheSize = 500; - public uint MbTilesCacheSize = 2000; + public uint FileCacheSize = 2500; public int DefaultTimeout = 30; public bool AutoRefreshCache = false; } diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Data/AtlasInfo.cs b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Data/AtlasInfo.cs index 9c58a9371..31b0e6cf6 100644 --- a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Data/AtlasInfo.cs +++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Data/AtlasInfo.cs @@ -20,6 +20,27 @@ public class AtlasEntity public float FloorHeight; public float FirstFloorHeight; public float TopFloorHeight; + + [HideInInspector] public float bottomOfTopUv; + [HideInInspector] public float topOfMidUv; + [HideInInspector] public float topOfBottomUv; + [HideInInspector] public float midUvHeight; + [HideInInspector] public float WallToFloorRatio; + + public void CalculateParameters() + { + bottomOfTopUv = TextureRect.yMax - (TextureRect.size.y * TopSectionRatio); //not doing that scaling thing for y axis and floors yet + topOfMidUv = TextureRect.yMax - (TextureRect.height * TopSectionRatio); + topOfBottomUv = TextureRect.yMin + (TextureRect.size.y * BottomSectionRatio); // * (Mathf.Max(1, (float)Math.Floor(tby * textureSection.TopSectionFloorCount)) / textureSection.TopSectionFloorCount); + midUvHeight = TextureRect.height * (1 - TopSectionRatio - BottomSectionRatio); + WallToFloorRatio = (1 - TopSectionRatio - BottomSectionRatio) * (TextureRect.height / TextureRect.width); + } + } + + public enum AtlasEntityType + { + TextureBased, + MeshGenBased } [CreateAssetMenu(menuName = "Mapbox/AtlasInfo")] @@ -30,6 +51,8 @@ public class AtlasInfo : ScriptableObject private UnityEvent m_OnValidate = new UnityEvent(); + public AtlasEntityType AtlasEntityType; + public void AddOnValidateEvent(UnityAction action) { m_OnValidate.AddListener(action); @@ -41,6 +64,26 @@ protected virtual void OnValidate() { m_OnValidate.Invoke(); } + + if(AtlasEntityType == AtlasEntityType.TextureBased) + { + foreach (var tex in Textures) + { + + tex.FirstFloorHeight = tex.PreferredEdgeSectionLength * ((tex.TextureRect.height * tex.BottomSectionRatio) / tex.TextureRect.width); + tex.TopFloorHeight = tex.PreferredEdgeSectionLength * ((tex.TextureRect.height * tex.TopSectionRatio) / tex.TextureRect.width); + tex.FloorHeight = tex.PreferredEdgeSectionLength * ((1 - tex.TopSectionRatio - tex.BottomSectionRatio) * (tex.TextureRect.height / tex.TextureRect.width)); + } + } + else + { + foreach (var tex in Textures) + { + tex.BottomSectionRatio = (tex.FirstFloorHeight / tex.PreferredEdgeSectionLength) * tex.TextureRect.width / tex.TextureRect.height; + tex.TopSectionRatio = (tex.TopFloorHeight / tex.PreferredEdgeSectionLength) * tex.TextureRect.width / tex.TextureRect.height; + } + } + } } } diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Data/UnityTile.cs b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Data/UnityTile.cs index 16bb4e306..3e1fc88ac 100644 --- a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Data/UnityTile.cs +++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Data/UnityTile.cs @@ -132,7 +132,7 @@ internal void Initialize(IMapReadable map, UnwrappedTileId tileId, float scale, } scaleFactor = Mathf.Pow(2, (map.InitialZoom - zoom)); - gameObject.transform.localScale = new Vector3(scaleFactor, 1, scaleFactor); + gameObject.transform.localScale = new Vector3(scaleFactor, scaleFactor, scaleFactor); gameObject.SetActive(true); } diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Data/VectorFeatureUnity.cs b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Data/VectorFeatureUnity.cs index fed4aca79..43d031270 100644 --- a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Data/VectorFeatureUnity.cs +++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Data/VectorFeatureUnity.cs @@ -4,12 +4,15 @@ namespace Mapbox.Unity.MeshGeneration.Data using System.Collections.Generic; using Mapbox.VectorTile.Geometry; using UnityEngine; + using Mapbox.Utils; + using Mapbox.Unity.Utilities; public class VectorFeatureUnity { public VectorTileFeature Data; public Dictionary Properties; public List> Points = new List>(); + public UnityTile Tile; private double _rectSizex; private double _rectSizey; @@ -28,6 +31,7 @@ public VectorFeatureUnity(VectorTileFeature feature, UnityTile tile, float layer Data = feature; Properties = Data.GetProperties(); Points.Clear(); + Tile = tile; //this is a temp hack until we figure out how streets ids works if (buildingsWithUniqueIds == true) //ids from building dataset is big ulongs @@ -55,5 +59,23 @@ public VectorFeatureUnity(VectorTileFeature feature, UnityTile tile, float layer Points.Add(_newPoints); } } + + public bool ContainsLatLon(Vector2d coord) + { + ////first check tile + var coordinateTileId = Conversions.LatitudeLongitudeToTileId( + coord.x, coord.y, Tile.InitialZoom); + if (!coordinateTileId.Canonical.Equals(Tile.CanonicalTileId)) + { + return false; + } + + //then check polygon + var point = Conversions.LatitudeLongitudeToVectorTilePosition(coord, Tile.InitialZoom); + var output = PolygonUtils.PointInPolygon(new Point2d(point.x, point.y), _geom); + + return output; + } + } } diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/ImageDataFetcher.cs b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/ImageDataFetcher.cs index a3cce4495..177cb84fb 100644 --- a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/ImageDataFetcher.cs +++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/ImageDataFetcher.cs @@ -29,10 +29,11 @@ public void FetchImage(CanonicalTileId canonicalTileId, string mapid, UnityTile if (rasterTile.HasError) { FetchingError(tile, new TileErrorEventArgs(tile.CanonicalTileId, rasterTile.GetType(), tile, rasterTile.Exceptions)); - return; } - - DataRecieved(tile, rasterTile); + else + { + DataRecieved(tile, rasterTile); + } }); } } diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/TerrainDataFetcher.cs b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/TerrainDataFetcher.cs index 43a499930..df6d0d534 100644 --- a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/TerrainDataFetcher.cs +++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/TerrainDataFetcher.cs @@ -22,7 +22,7 @@ public class TerrainDataFetcher : DataFetcher public Action FetchingError = (t, s) => { }; //tile here should be totally optional and used only not to have keep a dictionary in terrain factory base - public void FetchTerrain(CanonicalTileId canonicalTileId, string mapid, UnityTile tile = null) + public void FetchTerrain(CanonicalTileId canonicalTileId, string mapid, UnityTile tile = null) { var pngRasterTile = new RawPngRasterTile(); pngRasterTile.Initialize(_fileSource, canonicalTileId, mapid, () => @@ -31,8 +31,10 @@ public void FetchTerrain(CanonicalTileId canonicalTileId, string mapid, UnityTil { FetchingError(tile, new TileErrorEventArgs(canonicalTileId, pngRasterTile.GetType(), null, pngRasterTile.Exceptions)); } - - DataRecieved(tile, pngRasterTile); + else + { + DataRecieved(tile, pngRasterTile); + } }); } } diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/VectorDataFetcher.cs b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/VectorDataFetcher.cs index d731dfac8..412fdc6e1 100644 --- a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/VectorDataFetcher.cs +++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/VectorDataFetcher.cs @@ -19,10 +19,11 @@ public void FetchVector(CanonicalTileId canonicalTileId, string mapid, UnityTile { FetchingError(tile, new TileErrorEventArgs(tile.CanonicalTileId, vectorTile.GetType(), tile, vectorTile.Exceptions)); tile.VectorDataState = TilePropertyState.Error; - return; } - - DataRecieved(tile, vectorTile); + else + { + DataRecieved(tile, vectorTile); + } }); } } diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Interfaces/LayerVisualizerBase.cs b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Interfaces/LayerVisualizerBase.cs index 6bf8dc03d..0c76a99bc 100644 --- a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Interfaces/LayerVisualizerBase.cs +++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Interfaces/LayerVisualizerBase.cs @@ -9,10 +9,12 @@ namespace Mapbox.Unity.MeshGeneration.Interfaces /// Layer visualizers contains sytling logic and processes features /// public abstract class LayerVisualizerBase : ScriptableObject - { - public bool Active = true; - public abstract string Key { get; set; } - public abstract void Create(VectorTileLayer layer, UnityTile tile, Action callback = null); + { + public bool Active = true; + public abstract string Key { get; set; } + //public event Action FeaturePreProcessEvent; + //public event Action FeaturePostProcessEvent; + public abstract void Create(VectorTileLayer layer, UnityTile tile, Action callback = null); public virtual void Initialize() { diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/LayerVisualizers/LocationPrefabsLayerVisualizer.cs b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/LayerVisualizers/LocationPrefabsLayerVisualizer.cs index 6c97b03d0..b378fb84f 100644 --- a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/LayerVisualizers/LocationPrefabsLayerVisualizer.cs +++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/LayerVisualizers/LocationPrefabsLayerVisualizer.cs @@ -75,6 +75,8 @@ public void SetProperties(PrefabItemOptions item, LayerPerformanceOptions perfor var prefabModifier = ScriptableObject.CreateInstance(); prefabModifier.SetProperties(itemProperties.spawnPrefabOptions); _defaultStack = ScriptableObject.CreateInstance(); + (_defaultStack as ModifierStack).moveFeaturePositionTo = item.moveFeaturePositionTo; + if (_defaultStack.GoModifiers == null) { _defaultStack.GoModifiers = new List(); @@ -85,7 +87,6 @@ public void SetProperties(PrefabItemOptions item, LayerPerformanceOptions perfor { _defaultStack.MeshModifiers.Add(ScriptableObject.CreateInstance()); } - } break; default: @@ -274,28 +275,11 @@ private void BuildFeatureFromLatLon(VectorTileLayer layer, UnityTile tile) feature.Properties = new Dictionary(); feature.Points = new List>(); - //create a point in tilespace from coordinates + //create submesh for feature var latLonPoint = new List(); - //Create a feature point based on the coordinate - var _meters = Conversions.LatLonToMeters(coordinate); - var _rect = tile.Rect; - var _scale = tile.TileScale; - var _extent = layer.Extent; - - //vectortile space point (0 - layerExtent) - var point = new Vector3((float)((_meters - _rect.Min).x / _rect.Size.x) * _extent, - 0, - (float)((_meters - _rect.Max).y / _rect.Size.y) * _extent - ); - - //UnityTile space - latLonPoint.Add(new Vector3((float)(point.x / _extent * _rect.Size.x - (_rect.Size.x / 2)) * tile.TileScale, - 0, - (float)((point.z) / _extent * _rect.Size.y - (_rect.Size.y / 2)) * tile.TileScale - )); - - //add coordinate feature to feature points + //add point to submesh, and submesh to feature + latLonPoint.Add(Conversions.LatitudeLongitudeToUnityTilePosition(coordinate, tile.InitialZoom, tile.TileScale,layer.Extent).ToVector3xz()); feature.Points.Add(latLonPoint); //pass valid feature.Data to modifiers diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/LayerVisualizers/VectorLayerVisualizer.cs b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/LayerVisualizers/VectorLayerVisualizer.cs index b3967e4ff..ab3f1dbeb 100644 --- a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/LayerVisualizers/VectorLayerVisualizer.cs +++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/LayerVisualizers/VectorLayerVisualizer.cs @@ -10,6 +10,17 @@ using UnityEngine; using Mapbox.Unity.Map; using Mapbox.Unity.Utilities; + using Mapbox.Unity.MeshGeneration.Filters; + + public class VectorLayerVisualizerProperties + { + public FeatureProcessingStage featureProcessingStage; + public bool buildingsWithUniqueIds = false; + public VectorTileLayer vectorTileLayer; + public ILayerFeatureFilterComparer[] layerFeatureFilters; + public ILayerFeatureFilterComparer layerFeatureFilterCombiner; + } + public class VectorLayerVisualizer : LayerVisualizerBase { @@ -56,7 +67,7 @@ public override string Key public void SetProperties(VectorSubLayerProperties properties, LayerPerformanceOptions performanceOptions) { List defaultMeshModifierStack = new List(); - List defaultGOModifierStack = new List(); + List defaultGOModifierStack = new List(); _layerProperties = properties; _performanceOptions = performanceOptions; @@ -91,7 +102,6 @@ public void SetProperties(VectorSubLayerProperties properties, LayerPerformanceO lineMeshMod.Width = _layerProperties.coreOptions.lineWidth; defaultMeshModifierStack.Add(lineMeshMod); - //defaultMeshModifierStack.Add(CreateInstance()); if (_layerProperties.extrusionOptions.extrusionType != Map.ExtrusionType.None) { var heightMod = CreateInstance(); @@ -111,9 +121,10 @@ public void SetProperties(VectorSubLayerProperties properties, LayerPerformanceO defaultGOModifierStack.Add(lineColliderMod); } - var lineMatMod = CreateInstance(); - lineMatMod.SetProperties(_layerProperties.materialOptions); - defaultGOModifierStack.Add(lineMatMod); + var lineStyleMod = CreateInstance(); + lineStyleMod.SetProperties(MapboxDefaultStyles.GetGeometryMaterialOptions(_layerProperties.materialOptions)); + defaultGOModifierStack.Add(lineStyleMod); + break; case VectorPrimitiveType.Polygon: if (_layerProperties.coreOptions.snapToTerrain == true) @@ -121,18 +132,22 @@ public void SetProperties(VectorSubLayerProperties properties, LayerPerformanceO defaultMeshModifierStack.Add(CreateInstance()); } defaultMeshModifierStack.Add(CreateInstance()); - UVModifierOptions uvModOptions = new UVModifierOptions - { - texturingType = _layerProperties.materialOptions.texturingType, - atlasInfo = _layerProperties.materialOptions.atlasInfo - }; + + GeometryMaterialOptions geometryMaterialOptions = MapboxDefaultStyles.GetGeometryMaterialOptions(_layerProperties.materialOptions); + + UVModifierOptions uvModOptions = new UVModifierOptions(); + uvModOptions.texturingType = geometryMaterialOptions.texturingType; + uvModOptions.atlasInfo = geometryMaterialOptions.atlasInfo; + uvModOptions.style = geometryMaterialOptions.style; + var uvMod = CreateInstance(); uvMod.SetProperties(uvModOptions); defaultMeshModifierStack.Add(uvMod); if (_layerProperties.extrusionOptions.extrusionType != Map.ExtrusionType.None) { - if (_layerProperties.materialOptions.texturingType == UvMapType.Atlas || _layerProperties.materialOptions.texturingType == UvMapType.AtlasWithColorPalette) + //replace materialOptions with styleOptions + if (geometryMaterialOptions.texturingType == UvMapType.Atlas || geometryMaterialOptions.texturingType == UvMapType.AtlasWithColorPalette) { var atlasMod = CreateInstance(); GeometryExtrusionWithAtlasOptions atlasOptions = new GeometryExtrusionWithAtlasOptions(_layerProperties.extrusionOptions, uvModOptions); @@ -155,14 +170,15 @@ public void SetProperties(VectorSubLayerProperties properties, LayerPerformanceO defaultGOModifierStack.Add(polyColliderMod); } - var matMod = CreateInstance(); - matMod.SetProperties(_layerProperties.materialOptions); - defaultGOModifierStack.Add(matMod); + var styleMod = CreateInstance(); - if (_layerProperties.materialOptions.texturingType == UvMapType.AtlasWithColorPalette) + styleMod.SetProperties(geometryMaterialOptions); + defaultGOModifierStack.Add(styleMod); + + if (geometryMaterialOptions.texturingType == UvMapType.AtlasWithColorPalette) { var colorPaletteMod = CreateInstance(); - colorPaletteMod.m_scriptablePalette = _layerProperties.materialOptions.colorPalette; + colorPaletteMod.m_scriptablePalette = geometryMaterialOptions.colorPalette; defaultGOModifierStack.Add(colorPaletteMod); } @@ -177,8 +193,102 @@ public void SetProperties(VectorSubLayerProperties properties, LayerPerformanceO //Add any additional modifiers that were added. _defaultStack.MeshModifiers.AddRange(_layerProperties.MeshModifiers); _defaultStack.GoModifiers.AddRange(_layerProperties.GoModifiers); + + } + + /// + /// Add the replacement criteria to any mesh modifiers implementing IReplaceable + /// + /// Criteria. + protected void SetReplacementCriteria(IReplacementCriteria criteria) + { + foreach (var meshMod in _defaultStack.MeshModifiers) + { + if (meshMod is IReplaceable) + { + ((IReplaceable)meshMod).Criteria.Add(criteria); + } + } + } + + #region Private Helper Methods + /// + /// Convenience function to add feature to Tile object pool. + /// + /// Feature to be added to the pool. + /// Tile currently being processed. + private void AddFeatureToTileObjectPool(VectorFeatureUnity feature, UnityTile tile) + { + _activeIds.Add(feature.Data.Id); + if (!_idPool.ContainsKey(tile)) + { + _idPool.Add(tile, new List()); + } + else + { + _idPool[tile].Add(feature.Data.Id); + } } + /// + /// Apply filters to the layer and check if the current feature is eleigible for rendering. + /// + /// true, if feature eligible after filtering was applied, false otherwise. + /// Feature. + private bool IsFeatureEligibleAfterFiltering(VectorFeatureUnity feature, UnityTile tile, VectorLayerVisualizerProperties layerProperties) + { + if (layerProperties.layerFeatureFilters.Count() == 0) + { + return true; + } + else + { + // build features only if the filter returns true. + if (layerProperties.layerFeatureFilterCombiner.Try(feature)) + { + return true; + } + } + return false; + } + + /// + /// Function to fetch feature in vector tile at the index specified. + /// + /// The feature in tile at the index requested. + /// Unity Tile containing the feature. + /// Index of the vector feature being requested. + private VectorFeatureUnity GetFeatureinTileAtIndex(int index, UnityTile tile, VectorLayerVisualizerProperties layerProperties) + { + return new VectorFeatureUnity(layerProperties.vectorTileLayer.GetFeature(index), + tile, + layerProperties.vectorTileLayer.Extent, + layerProperties.buildingsWithUniqueIds); + } + + /// + /// Function to check if the feature is already in the active Id pool, features already in active Id pool should be skipped from processing. + /// + /// true, if feature is already in activeId pool or if the layer has buildingsWithUniqueId flag set to , false otherwise. + /// Feature identifier. + private bool ShouldSkipProcessingFeatureWithId(ulong featureId, UnityTile tile, VectorLayerVisualizerProperties layerProperties) + { + return (layerProperties.buildingsWithUniqueIds && _activeIds.Contains(featureId)); + } + + /// + /// Gets a value indicating whether this entity per coroutine bucket is full. + /// + /// true if coroutine bucket is full; otherwise, false. + private bool IsCoroutineBucketFull + { + get + { + return (_performanceOptions != null && _performanceOptions.isEnabled && _entityInCurrentCoroutine >= _performanceOptions.entityPerCoroutine); + } + } + + #endregion public override void Initialize() { base.Initialize(); @@ -200,7 +310,7 @@ public override void Create(VectorTileLayer layer, UnityTile tile, Action callba _activeCoroutines[tile].Add(Runnable.Run(ProcessLayer(layer, tile, callback))); } - private IEnumerator ProcessLayer(VectorTileLayer layer, UnityTile tile, Action callback = null) + protected IEnumerator ProcessLayer(VectorTileLayer layer, UnityTile tile, Action callback = null) { //HACK to prevent request finishing on same frame which breaks modules started/finished events yield return null; @@ -210,91 +320,113 @@ private IEnumerator ProcessLayer(VectorTileLayer layer, UnityTile tile, Action c yield break; } - //testing each feature with filters - var fc = layer.FeatureCount(); + VectorLayerVisualizerProperties tempLayerProperties = new VectorLayerVisualizerProperties(); + tempLayerProperties.vectorTileLayer = layer; + tempLayerProperties.featureProcessingStage = FeatureProcessingStage.PreProcess; + //Get all filters in the array. - var filters = _layerProperties.filterOptions.filters.Select(m => m.GetFilterComparer()).ToArray(); + tempLayerProperties.layerFeatureFilters = _layerProperties.filterOptions.filters.Select(m => m.GetFilterComparer()).ToArray(); // Pass them to the combiner - Filters.ILayerFeatureFilterComparer combiner = new Filters.LayerFilterComparer(); + tempLayerProperties.layerFeatureFilterCombiner = new Filters.LayerFilterComparer(); switch (_layerProperties.filterOptions.combinerType) { case Filters.LayerFilterCombinerOperationType.Any: - combiner = Filters.LayerFilterComparer.AnyOf(filters); + tempLayerProperties.layerFeatureFilterCombiner = Filters.LayerFilterComparer.AnyOf(tempLayerProperties.layerFeatureFilters); break; case Filters.LayerFilterCombinerOperationType.All: - combiner = Filters.LayerFilterComparer.AllOf(filters); + tempLayerProperties.layerFeatureFilterCombiner = Filters.LayerFilterComparer.AllOf(tempLayerProperties.layerFeatureFilters); break; case Filters.LayerFilterCombinerOperationType.None: - combiner = Filters.LayerFilterComparer.NoneOf(filters); + tempLayerProperties.layerFeatureFilterCombiner = Filters.LayerFilterComparer.NoneOf(tempLayerProperties.layerFeatureFilters); break; default: break; } - for (int i = 0; i < fc; i++) - { - - var buildingsWithUniqueIds = - (_layerProperties.honorBuildingIdSetting) && _layerProperties.buildingsWithUniqueIds; + tempLayerProperties.buildingsWithUniqueIds = (_layerProperties.honorBuildingIdSetting) && _layerProperties.buildingsWithUniqueIds; - var feature = new VectorFeatureUnity(layer.GetFeature(i), tile, layer.Extent, buildingsWithUniqueIds); - - //skip existing features, only works on tilesets with unique ids - if (buildingsWithUniqueIds && _activeIds.Contains(feature.Data.Id)) + ////find any replacement criteria and assign them + foreach (var goModifier in _defaultStack.GoModifiers) + { + if (goModifier is IReplacementCriteria && goModifier.Active) { - continue; - } - else - { - _activeIds.Add(feature.Data.Id); - if (!_idPool.ContainsKey(tile)) - { - _idPool.Add(tile, new List()); - } - else - { - _idPool[tile].Add(feature.Data.Id); - } + SetReplacementCriteria((IReplacementCriteria)goModifier); } + } - if (filters.Length == 0) - { - // no filters, just build the features. - if (tile != null && tile.gameObject != null && tile.VectorDataState != Enums.TilePropertyState.Cancelled) - Build(feature, tile, tile.gameObject); + #region PreProcess & Process. - _entityInCurrentCoroutine++; - } - else + var featureCount = tempLayerProperties.vectorTileLayer.FeatureCount(); + do + { + for (int i = 0; i < featureCount; i++) { - // build features only if the filter returns true. - if (combiner.Try(feature)) - { - if (tile != null && tile.gameObject != null && tile.VectorDataState != Enums.TilePropertyState.Cancelled) - Build(feature, tile, tile.gameObject); - _entityInCurrentCoroutine++; + ProcessFeature(i, tile, tempLayerProperties); + + if (IsCoroutineBucketFull) + { + //Reset bucket.. + _entityInCurrentCoroutine = 0; + yield return null; } } + // move processing to next stage. + tempLayerProperties.featureProcessingStage++; + } while (tempLayerProperties.featureProcessingStage == FeatureProcessingStage.PreProcess + || tempLayerProperties.featureProcessingStage == FeatureProcessingStage.Process); - if (_performanceOptions!=null && _performanceOptions.isEnabled && _entityInCurrentCoroutine >= _performanceOptions.entityPerCoroutine) - { - _entityInCurrentCoroutine = 0; - yield return null; - } - } + #endregion + #region PostProcess + // TODO : Clean this up to follow the same pattern. var mergedStack = _defaultStack as MergedModifierStack; if (mergedStack != null && tile != null) { mergedStack.End(tile, tile.gameObject, layer.Name); } + #endregion if (callback != null) callback(); } + private bool ProcessFeature(int index, UnityTile tile, VectorLayerVisualizerProperties layerProperties) + { + var feature = GetFeatureinTileAtIndex(index, tile, layerProperties); + + if (IsFeatureEligibleAfterFiltering(feature, tile, layerProperties)) + { + if (tile != null && tile.gameObject != null && tile.VectorDataState != Enums.TilePropertyState.Cancelled) + { + switch (layerProperties.featureProcessingStage) + { + case FeatureProcessingStage.PreProcess: + //pre process features. + PreProcessFeatures(feature, tile, tile.gameObject); + break; + case FeatureProcessingStage.Process: + //skip existing features, only works on tilesets with unique ids + if (ShouldSkipProcessingFeatureWithId(feature.Data.Id, tile, layerProperties)) + { + return false; + } + //feature not skipped. Add to pool only if features are in preprocess stage. + AddFeatureToTileObjectPool(feature, tile); + Build(feature, tile, tile.gameObject); + break; + case FeatureProcessingStage.PostProcess: + break; + default: + break; + } + _entityInCurrentCoroutine++; + } + } + return true; + } + /// /// Preprocess features, finds the relevant modifier stack and passes the feature to that stack /// @@ -312,6 +444,18 @@ private bool IsFeatureValid(VectorFeatureUnity feature) return true; } + protected void PreProcessFeatures(VectorFeatureUnity feature, UnityTile tile, GameObject parent) + { + ////find any replacement criteria and assign them + foreach (var goModifier in _defaultStack.GoModifiers) + { + if (goModifier is IReplacementCriteria && goModifier.Active) + { + goModifier.FeaturePreProcess(feature); + } + } + } + protected void Build(VectorFeatureUnity feature, UnityTile tile, GameObject parent) { if (feature.Properties.ContainsKey("extrude") && !Convert.ToBoolean(feature.Properties["extrude"])) @@ -338,6 +482,14 @@ protected void Build(VectorFeatureUnity feature, UnityTile tile, GameObject pare } } + protected void PostProcessFeatures(VectorFeatureUnity feature, UnityTile tile, GameObject parent) + { + //var mergedStack = _defaultStack as MergedModifierStack; + //if (mergedStack != null && tile != null) + //{ + // mergedStack.End(tile, tile.gameObject, _vectorFeaturesPerTile[tile].vectorTileLayer.Name); + //} + } private string FindSelectorKey(VectorFeatureUnity feature) { // TODO: FIX THIS!! diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/GameObjectModifiers/MaterialModifier.cs b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/GameObjectModifiers/MaterialModifier.cs index 1ba37eeda..7249c2489 100644 --- a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/GameObjectModifiers/MaterialModifier.cs +++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/GameObjectModifiers/MaterialModifier.cs @@ -26,7 +26,7 @@ public override void Run(VectorEntity ve, UnityTile tile) var min = Math.Min(_options.materials.Length, ve.MeshFilter.mesh.subMeshCount); var mats = new Material[min]; - if (_options.texturingType != UvMapType.Satellite) + if (_options.style != StyleTypes.Satellite) { for (int i = 0; i < min; i++) { diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/GameObjectModifiers/PrefabModifier.cs b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/GameObjectModifiers/PrefabModifier.cs index 3e11a967d..2e43c3cea 100644 --- a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/GameObjectModifiers/PrefabModifier.cs +++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/GameObjectModifiers/PrefabModifier.cs @@ -31,59 +31,59 @@ public override void SetProperties(ModifierProperties properties) public override void Run(VectorEntity ve, UnityTile tile) { - int selpos = ve.Feature.Points[0].Count / 2; - var met = ve.Feature.Points[0][selpos]; - RectTransform goRectTransform; - IFeaturePropertySettable settable = null; - GameObject go; + GameObject go = null; if (_objects.ContainsKey(ve.GameObject)) { go = _objects[ve.GameObject]; - settable = go.GetComponent(); - if (settable != null) - { - go = (settable as MonoBehaviour).gameObject; - settable.Set(ve.Feature.Properties); - } - // set gameObject transform - go.name = ve.Feature.Data.Id.ToString(); - goRectTransform = go.GetComponent(); - if (goRectTransform == null) - { - go.transform.localPosition = met; - } - else - { - goRectTransform.anchoredPosition3D = met; - } - //go.transform.localScale = Constants.Math.Vector3One; - - if (_options.scaleDownWithWorld) - { - go.transform.localScale = (go.transform.localScale * (tile.TileScale)); - } - return; } else { go = Instantiate(_options.prefab); _prefabList.Add(go); _objects.Add(ve.GameObject, go); + go.transform.SetParent(ve.GameObject.transform, false); + } + + PositionScaleRectTransform(ve, tile, go); + + if (_options.AllPrefabsInstatiated != null) + { + _options.AllPrefabsInstatiated(_prefabList); + } + } + + public void PositionScaleRectTransform(VectorEntity ve, UnityTile tile, GameObject go) + { + RectTransform goRectTransform; + IFeaturePropertySettable settable = null; + var centroidVector = new Vector3(); + foreach (var point in ve.Feature.Points[0]) + { + centroidVector += point; } + centroidVector = centroidVector / ve.Feature.Points[0].Count; go.name = ve.Feature.Data.Id.ToString(); goRectTransform = go.GetComponent(); if (goRectTransform == null) { - go.transform.localPosition = met; + go.transform.localPosition = centroidVector; + if (_options.scaleDownWithWorld) + { + go.transform.localScale = _options.prefab.transform.localScale * (tile.TileScale); + } } else { - goRectTransform.anchoredPosition3D = met; + goRectTransform.anchoredPosition3D = centroidVector; + if (_options.scaleDownWithWorld) + { + goRectTransform.localScale = _options.prefab.transform.localScale * (tile.TileScale); + } } - go.transform.SetParent(ve.GameObject.transform, false); + //go.transform.localScale = Constants.Math.Vector3One; settable = go.GetComponent(); @@ -91,21 +91,6 @@ public override void Run(VectorEntity ve, UnityTile tile) { settable.Set(ve.Feature.Properties); } - - if (_options.scaleDownWithWorld) - { - go.transform.localScale = (go.transform.localScale * (tile.TileScale)); - } - - if (_options.AllPrefabsInstatiated != null) - { - _options.AllPrefabsInstatiated(_prefabList); - } - } - - public List returnInstanceList() - { - return _prefabList; } } } diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/IReplaceable.cs b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/IReplaceable.cs new file mode 100644 index 000000000..c5f159523 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/IReplaceable.cs @@ -0,0 +1,10 @@ +using System.Collections.Generic; + +namespace Mapbox.Unity.MeshGeneration.Modifiers +{ + public interface IReplaceable + { + List Criteria { get; set; } + + } +} diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/IReplaceable.cs.meta b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/IReplaceable.cs.meta new file mode 100644 index 000000000..4d72e63ab --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/IReplaceable.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 5548109d5836140a0bc45d1b5fc881e2 +timeCreated: 1526594257 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/IReplacementCriteria.cs b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/IReplacementCriteria.cs new file mode 100644 index 000000000..5acb6f4f1 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/IReplacementCriteria.cs @@ -0,0 +1,9 @@ +namespace Mapbox.Unity.MeshGeneration.Modifiers +{ + using Mapbox.Unity.MeshGeneration.Data; + + public interface IReplacementCriteria + { + bool ShouldReplaceFeature(VectorFeatureUnity feature); + } +} \ No newline at end of file diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/IReplacementCriteria.cs.meta b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/IReplacementCriteria.cs.meta new file mode 100644 index 000000000..dda812f60 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/IReplacementCriteria.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: f3eb10303f9b149e5980a3508a9f1039 +timeCreated: 1526586060 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshGenerationBase.cs b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshGenerationBase.cs new file mode 100644 index 000000000..3947e7dd3 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshGenerationBase.cs @@ -0,0 +1,14 @@ +using UnityEngine; +using System.Collections; +using Mapbox.Unity.MeshGeneration.Modifiers; +using System.Collections.Generic; + +public class MeshGenerationBase : MeshModifier, IReplaceable +{ + public List Criteria{get; set;} + public override void Initialize() + { + base.Initialize(); + Criteria = new List(); + } +} diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshGenerationBase.cs.meta b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshGenerationBase.cs.meta new file mode 100644 index 000000000..38d13ac2c --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshGenerationBase.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: b5a0bb09f203344eab30606cb0f57438 +timeCreated: 1526508352 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshModifiers/PolygonMeshModifier.cs b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshModifiers/PolygonMeshModifier.cs index 615af939d..8b51b4c72 100644 --- a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshModifiers/PolygonMeshModifier.cs +++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshModifiers/PolygonMeshModifier.cs @@ -11,7 +11,7 @@ namespace Mapbox.Unity.MeshGeneration.Modifiers /// Currently uses Triangle.Net for triangulation, which occasionally adds extra vertices to maintain a good triangulation so output vertex list might not be exactly same as the original vertex list. /// [CreateAssetMenu(menuName = "Mapbox/Modifiers/Polygon Mesh Modifier")] - public class PolygonMeshModifier : MeshModifier + public class PolygonMeshModifier : MeshGenerationBase { public override ModifierType Type { get { return ModifierType.Preprocess; } } @@ -33,6 +33,17 @@ public bool IsClockwise(IList vertices) public override void Run(VectorFeatureUnity feature, MeshData md, UnityTile tile = null) { + if(Criteria!=null && Criteria.Count > 0) + { + foreach(var criterion in Criteria) + { + if(criterion.ShouldReplaceFeature(feature)) + { + return; + } + } + } + _secondCounter = feature.Points.Count; var subset = new List>(_secondCounter); Data flatData = null; diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshModifiers/ReplaceFeatureModifier.cs b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshModifiers/ReplaceFeatureModifier.cs new file mode 100644 index 000000000..c969b44ed --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshModifiers/ReplaceFeatureModifier.cs @@ -0,0 +1,223 @@ +namespace Mapbox.Unity.MeshGeneration.Modifiers +{ + using System.Collections.Generic; + using UnityEngine; + using Mapbox.Unity.MeshGeneration.Data; + using System; + using Mapbox.Unity.Map; + using Mapbox.Utils; + using Mapbox.Unity.Utilities; + using Mapbox.VectorTile.Geometry; + using Mapbox.Unity.MeshGeneration.Interfaces; + + + /// + /// ReplaceBuildingFeatureModifier takes in POIs and checks if the feature layer has those points and deletes them + /// + [CreateAssetMenu(menuName = "Mapbox/Modifiers/Replace Feature Modifier")] + public class ReplaceFeatureModifier : GameObjectModifier, IReplacementCriteria + { + private List _latLonToSpawn; + + private Dictionary _objects; + [SerializeField] + private SpawnPrefabOptions _options; + private List _prefabList = new List(); + + [SerializeField] + [Geocode] + private List _prefabLocations; + + [SerializeField] + private List _explicitlyBlockedFeatureIds; + /// + /// List of featureIds to test against. + /// We need a list of featureIds per location. + /// A list is required since buildings on tile boundary will have multiple id's for the same feature. + /// + private List> _featureId; + private string _tempFeatureId; + + public override void Initialize() + { + base.Initialize(); + //duplicate the list of lat/lons to track which coordinates have already been spawned + _latLonToSpawn = new List(_prefabLocations); + _featureId = new List>(); + for (int i = 0; i < _prefabLocations.Count; i++) + { + _featureId.Add(new List()); + } + if (_objects == null) + { + _objects = new Dictionary(); + } + _latLonToSpawn = new List(_prefabLocations); + } + + public override void SetProperties(ModifierProperties properties) + { + _options = (SpawnPrefabOptions)properties; + } + + public override void FeaturePreProcess(VectorFeatureUnity feature) + { + int index = -1; + foreach (var point in _prefabLocations) + { + try + { + index++; + var coord = Conversions.StringToLatLon(point); + if (feature.ContainsLatLon(coord) && (feature.Data.Id != 0)) + { + _featureId[index] = (_featureId[index] == null) ? new List() : _featureId[index]; + _tempFeatureId = feature.Data.Id.ToString(); + _featureId[index].Add(_tempFeatureId.Substring(0, _tempFeatureId.Length - 3)); + } + } + catch (Exception e) + { + Debug.LogException(e); + } + } + } + + /// + /// Check the feature against the list of lat/lons in the modifier + /// + /// true, if the feature overlaps with a lat/lon in the modifier false otherwise. + /// Feature. + public bool ShouldReplaceFeature(VectorFeatureUnity feature) + { + int index = -1; + + foreach (var point in _prefabLocations) + { + try + { + index++; + if (_featureId[index] != null) + { + foreach (var featureId in _featureId[index]) + { + //preventing spawning of explicitly blocked features + foreach (var blockedId in _explicitlyBlockedFeatureIds) + { + if (feature.Data.Id.ToString() == blockedId) + { + return true; + } + } + + if (feature.Data.Id.ToString().StartsWith(featureId, StringComparison.CurrentCulture)) + { + return true; + } + } + } + } + catch (Exception e) + { + Debug.LogException(e); + } + + } + return false; + } + + public override void Run(VectorEntity ve, UnityTile tile) + { + //replace the feature only once per lat/lon + if (ShouldSpawnFeature(ve.Feature)) + { + SpawnPrefab(ve, tile); + } + } + + private void SpawnPrefab(VectorEntity ve, UnityTile tile) + { + GameObject go = new GameObject(); + + if (_objects.ContainsKey(ve.GameObject)) + { + go = _objects[ve.GameObject]; + } + else + { + go = Instantiate(_options.prefab); + _prefabList.Add(go); + _objects.Add(ve.GameObject, go); + go.transform.SetParent(ve.GameObject.transform, false); + } + + PositionScaleRectTransform(ve, tile, go); + + if (_options.AllPrefabsInstatiated != null) + { + _options.AllPrefabsInstatiated(_prefabList); + } + } + + public void PositionScaleRectTransform(VectorEntity ve, UnityTile tile, GameObject go) + { + RectTransform goRectTransform; + IFeaturePropertySettable settable = null; + var centroidVector = new Vector3(); + foreach (var point in ve.Feature.Points[0]) + { + centroidVector += point; + } + centroidVector = centroidVector / ve.Feature.Points[0].Count; + + go.name = ve.Feature.Data.Id.ToString(); + + goRectTransform = go.GetComponent(); + if (goRectTransform == null) + { + go.transform.localPosition = centroidVector; + } + else + { + goRectTransform.anchoredPosition3D = centroidVector; + } + //go.transform.localScale = Constants.Math.Vector3One; + + settable = go.GetComponent(); + if (settable != null) + { + settable.Set(ve.Feature.Properties); + } + + if (_options.scaleDownWithWorld) + { + go.transform.localScale = (go.transform.localScale * (tile.TileScale)); + } + } + + /// + /// Checks if the feature should be used to spawn a prefab, once per lat/lon + /// + /// true, if the feature should be spawned false otherwise. + /// Feature. + private bool ShouldSpawnFeature(VectorFeatureUnity feature) + { + if (feature == null) + { + return false; + } + + foreach (var point in _latLonToSpawn) + { + var coord = Conversions.StringToLatLon(point); + if (feature.ContainsLatLon(coord)) + { + _latLonToSpawn.Remove(point); + return true; + } + } + + return false; + } + } +} diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshModifiers/ReplaceFeatureModifier.cs.meta b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshModifiers/ReplaceFeatureModifier.cs.meta new file mode 100644 index 000000000..d1bdf9e9a --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshModifiers/ReplaceFeatureModifier.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: f386309a8f86f48aaabbbd02b9f95059 +timeCreated: 1525817443 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshModifiers/UvModifier.cs b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshModifiers/UvModifier.cs index a919bc274..25fb0f9e5 100644 --- a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshModifiers/UvModifier.cs +++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshModifiers/UvModifier.cs @@ -23,6 +23,7 @@ public class UvModifier : MeshModifier private Vector3 _vert; private List _uv = new List(); + #region Atlas Fields //texture uv fields //public AtlasInfo AtlasInfo; private AtlasEntity _currentFacade; @@ -31,6 +32,12 @@ public class UvModifier : MeshModifier private Vector3 _vertexRelativePos; private Vector3 _firstVert; + private float minx; + private float miny; + private float maxx; + private float maxy; + #endregion + public override void SetProperties(ModifierProperties properties) { _options = (UVModifierOptions)properties; @@ -38,6 +45,11 @@ public override void SetProperties(ModifierProperties properties) public override void Run(VectorFeatureUnity feature, MeshData md, UnityTile tile = null) { + if (md.Vertices.Count == 0 || feature == null || feature.Points.Count < 1) + { + return; + } + _uv.Clear(); _mdVertexCount = md.Vertices.Count; _size = md.TileRect.Size; @@ -47,25 +59,30 @@ public override void Run(VectorFeatureUnity feature, MeshData md, UnityTile tile for (int i = 0; i < _mdVertexCount; i++) { _vert = md.Vertices[i]; - if (_options.texturingType == UvMapType.Tiled) - { - _uv.Add(new Vector2(_vert.x, _vert.z)); - } - else if (_options.texturingType == UvMapType.Satellite) + + if (_options.style == StyleTypes.Satellite) { var fromBottomLeft = new Vector2((float)(((_vert.x + md.PositionInTile.x) / tile.TileScale + _size.x / 2) / _size.x), (float)(((_vert.z + md.PositionInTile.z) / tile.TileScale + _size.x / 2) / _size.x)); _uv.Add(fromBottomLeft); } + else if (_options.texturingType == UvMapType.Tiled) + { + _uv.Add(new Vector2(_vert.x, _vert.z)); + } } } else if (_options.texturingType == UvMapType.Atlas || _options.texturingType == UvMapType.AtlasWithColorPalette) { _currentFacade = _options.atlasInfo.Roofs[UnityEngine.Random.Range(0, _options.atlasInfo.Roofs.Count)]; - float minx = float.MaxValue, miny = float.MaxValue, maxx = float.MinValue, maxy = float.MinValue; + minx = float.MaxValue; + miny = float.MaxValue; + maxx = float.MinValue; + maxy = float.MinValue; + _textureUvCoordinates = new Vector2[_mdVertexCount]; - _textureDirection = Quaternion.FromToRotation((md.Vertices[_mdVertexCount - 2] - md.Vertices[0]), Mapbox.Unity.Constants.Math.Vector3Right); + _textureDirection = Quaternion.FromToRotation((md.Vertices[0] - md.Vertices[1]), Mapbox.Unity.Constants.Math.Vector3Right); _textureUvCoordinates[0] = new Vector2(0, 0); _firstVert = md.Vertices[0]; for (int i = 1; i < _mdVertexCount; i++) @@ -85,14 +102,10 @@ public override void Run(VectorFeatureUnity feature, MeshData md, UnityTile tile } var width = maxx - minx; - var height = maxy - minx; + var height = maxy - miny; for (int i = 0; i < _mdVertexCount; i++) { - //var nx = _textureUvCoordinates[i].x - minx; //first point isn't always the min - //var ny = _textureUvCoordinates[i].y - miny; - //var xx = (nx / (maxx - minx)) * _currentFacade.TextureRect.width + _currentFacade.TextureRect.x; - //var yy = (ny / (maxy - miny)) * _currentFacade.TextureRect.height + _currentFacade.TextureRect.y; _uv.Add(new Vector2( (((_textureUvCoordinates[i].x - minx) / width) * _currentFacade.TextureRect.width) + _currentFacade.TextureRect.x, (((_textureUvCoordinates[i].y - miny) / height) * _currentFacade.TextureRect.height) + _currentFacade.TextureRect.y)); diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/ModifierBase.cs b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/ModifierBase.cs index eab74875b..e54acf50d 100644 --- a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/ModifierBase.cs +++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/ModifierBase.cs @@ -2,6 +2,7 @@ namespace Mapbox.Unity.MeshGeneration.Modifiers { using UnityEngine; using System; + using Mapbox.Unity.MeshGeneration.Data; [Serializable] public abstract class ModifierProperties @@ -24,5 +25,10 @@ public virtual void Initialize() { } + + public virtual void FeaturePreProcess(VectorFeatureUnity feature) + { + + } } } diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/ModifierStack.cs b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/ModifierStack.cs index 8f137481b..7d08cb639 100644 --- a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/ModifierStack.cs +++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/ModifierStack.cs @@ -114,7 +114,6 @@ public override void Initialize() } } - public override GameObject Execute(UnityTile tile, VectorFeatureUnity feature, MeshData meshData, GameObject parent = null, string type = "") { _counter = feature.Points.Count; diff --git a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/TextureSideWallModifier.cs b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/TextureSideWallModifier.cs index 66aa91b9a..5f863da69 100644 --- a/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/TextureSideWallModifier.cs +++ b/sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/TextureSideWallModifier.cs @@ -9,54 +9,56 @@ namespace Mapbox.Unity.MeshGeneration.Modifiers [CreateAssetMenu(menuName = "Mapbox/Modifiers/Textured Side Wall Modifier")] public class TextureSideWallModifier : MeshModifier { - private float _scaledFloorHeight = 0; + #region ModifierOptions private float _scaledFirstFloorHeight = 0; private float _scaledTopFloorHeight = 0; - private int _maxEdgeSectionCount = 40; - + //private int _maxEdgeSectionCount = 40; + private float _scaledPreferredWallLength; [SerializeField] private bool _centerSegments = true; [SerializeField] private bool _separateSubmesh = true; - private List edgeList; - float dist = 0; - float step = 0; - float dif = 0; + #endregion + float currentWallLength = 0; Vector3 start = Constants.Math.Vector3Zero; Vector3 wallDirection = Constants.Math.Vector3Zero; - Vector3 fs; - Vector3 sc; - float d; - Vector3 v1; - Vector3 v2; + + Vector3 wallSegmentFirstVertex; + Vector3 wallSegmentSecondVertex; + Vector3 wallSegmentDirection; + float wallSegmentLength; //public AtlasInfo AtlasInfo; private AtlasEntity _currentFacade; private Rect _currentTextureRect; - private float firstHeight; - private float topHeight; - private float midHeight; - private int floorCount; - private float scaledFloorHeight; - private int ind; + private float finalFirstHeight; + private float finalTopHeight; + private float finalMidHeight; + private float _scaledFloorHeight; + private int triIndex; private Vector3 wallNormal; private List wallTriangles; private float columnScaleRatio; - private float floorScaleRatio; private float rightOfEdgeUv; - private float bottomOfTopUv; - private float topOfBottomUv; + private float currentY1; private float currentY2; - private float bottomOfMidUv; - private float topOfMidUv; + private float _wallSizeEpsilon = 0.99f; + private float _narrowWallWidthDelta = 0.01f; + private float _shortRowHeightDelta = 0.015f; GeometryExtrusionWithAtlasOptions _options; private int _counter = 0; - float height = 0.0f; - float _scale = 1f; + private float height = 0.0f; + private float _scale = 1f; + private float _minWallLength; + private float _singleFloorHeight; + private float _currentMidHeight; + private float _midUvInCurrentStep; + private float _singleColumnLength; + private float _leftOverColumnLength; public override void SetProperties(ModifierProperties properties) { @@ -66,7 +68,10 @@ public override void SetProperties(ModifierProperties properties) public override void Initialize() { base.Initialize(); - edgeList = new List(); + foreach (var atlasEntity in _options.atlasInfo.Textures) + { + atlasEntity.CalculateParameters(); + } } public override void Run(VectorFeatureUnity feature, MeshData md, UnityTile tile = null) @@ -77,87 +82,94 @@ public override void Run(VectorFeatureUnity feature, MeshData md, UnityTile tile if (tile != null) _scale = tile.TileScale; + //facade texture to decorate this building _currentFacade = _options.atlasInfo.Textures[UnityEngine.Random.Range(0, _options.atlasInfo.Textures.Count)]; //rect is a struct so we're caching this _currentTextureRect = _currentFacade.TextureRect; //this can be moved to initialize or in an if clause if you're sure all your tiles will be same level/scale - _scaledFloorHeight = tile.TileScale * _currentFacade.FloorHeight; + _singleFloorHeight = (tile.TileScale * _currentFacade.FloorHeight) / _currentFacade.MidFloorCount; _scaledFirstFloorHeight = tile.TileScale * _currentFacade.FirstFloorHeight; _scaledTopFloorHeight = tile.TileScale * _currentFacade.TopFloorHeight; + _scaledPreferredWallLength = tile.TileScale * _currentFacade.PreferredEdgeSectionLength; + _scaledFloorHeight = _scaledPreferredWallLength * _currentFacade.WallToFloorRatio; + _singleColumnLength = _scaledPreferredWallLength / _currentFacade.ColumnCount; //read or force height float maxHeight = 1, minHeight = 0; + //query height and push polygon up to create roof + //can we do this vice versa and create roof at last? QueryHeight(feature, md, tile, out maxHeight, out minHeight); maxHeight = maxHeight * _options.extrusionScaleFactor * _scale; minHeight = minHeight * _options.extrusionScaleFactor * _scale; height = (maxHeight - minHeight); - GenerateRoofMesh(md, minHeight, maxHeight); if (_options.extrusionGeometryType != ExtrusionGeometryType.RoofOnly) { - edgeList.Clear(); - //cuts long edges into smaller ones using PreferredEdgeSectionLength - CalculateEdgeList(md, tile, _currentFacade.PreferredEdgeSectionLength); - //limiting section heights, first floor gets priority, then we draw top floor, then mid if we still have space - firstHeight = Mathf.Min(height, _scaledFirstFloorHeight); - topHeight = Mathf.Min(height - firstHeight, _scaledTopFloorHeight); - midHeight = Mathf.Max(0, height - (firstHeight + topHeight)); + finalFirstHeight = Mathf.Min(height, _scaledFirstFloorHeight); + finalTopHeight = (height - finalFirstHeight) < _scaledTopFloorHeight ? 0 : _scaledTopFloorHeight; + finalMidHeight = Mathf.Max(0, height - (finalFirstHeight + finalTopHeight)); + //scaledFloorHeight = midHeight / floorCount; + wallTriangles = new List(); - //we're merging small mid sections to top and small top sections to first floor to avoid really short/compressed floors - //I think we need this but I'm not sure about implementation. I feel like mid height should be shared by top&bottom for example. - if (midHeight < _scaledFloorHeight / (_currentFacade.MidFloorCount * 2)) - { - topHeight += midHeight; - _scaledTopFloorHeight += midHeight; - midHeight = 0; - } - if (topHeight < _scaledTopFloorHeight * 0.66f) //0.66 here is just a random number for acceptable stretching + //cuts long edges into smaller ones using PreferredEdgeSectionLength + currentWallLength = 0; + start = Constants.Math.Vector3Zero; + wallSegmentDirection = Constants.Math.Vector3Zero; + for (int i = 0; i < md.Edges.Count; i += 2) { - firstHeight += topHeight; - topHeight = 0; - } + var v1 = md.Vertices[md.Edges[i]]; + var v2 = md.Vertices[md.Edges[i + 1]]; - floorCount = (int)(midHeight / _scaledFloorHeight) + 1; - scaledFloorHeight = midHeight / floorCount; - wallTriangles = new List(); + wallDirection = v2 - v1; - //this first loop is for columns - for (int i = 0; i < edgeList.Count - 1; i += 2) - { - v1 = edgeList[i]; - v2 = edgeList[i + 1]; - ind = md.Vertices.Count; - wallDirection = (v2 - v1); - d = wallDirection.magnitude; - - //this part minimizes stretching for narrow columns - //if texture has 3 columns, 33% (of preferred edge length) wide walls will get 1 window. - //0-33% gets 1 window, 33-66 gets 2, 66-100 gets all three - //we're not wrapping/repeating texture as it won't work with atlases - columnScaleRatio = Math.Min(1, d / (_currentFacade.PreferredEdgeSectionLength * tile.TileScale)); - rightOfEdgeUv = _currentTextureRect.xMin + _currentTextureRect.size.x * Math.Min(1, ((float)(Math.Floor(columnScaleRatio * _currentFacade.ColumnCount) + 1) / _currentFacade.ColumnCount)); - bottomOfTopUv = _currentTextureRect.yMax - (_currentTextureRect.size.y * _currentFacade.TopSectionRatio); //not doing that scaling thing for y axis and floors yet - topOfBottomUv = _currentTextureRect.yMin + (_currentTextureRect.size.y * _currentFacade.BottomSectionRatio); // * (Mathf.Max(1, (float)Math.Floor(tby * textureSection.TopSectionFloorCount)) / textureSection.TopSectionFloorCount); - - wallNormal = new Vector3(-(v1.z - v2.z), 0, (v1.x - v2.x)).normalized; - currentY1 = v1.y; - currentY2 = v2.y; - - floorScaleRatio = Math.Min(1, midHeight / _scaledFloorHeight); - var midSecHeight = (_currentTextureRect.height * (1 - _currentFacade.TopSectionRatio - _currentFacade.BottomSectionRatio)); - var midFittedHeight = midSecHeight * Math.Min(1, ((float)(Math.Floor(floorScaleRatio * _currentFacade.MidFloorCount) + 1) / _currentFacade.MidFloorCount)); // midHeight < _scaledFloorHeight * 0.66 ? 0.5f : 0.125f; - bottomOfMidUv = (_currentTextureRect.yMax - (_currentTextureRect.height * _currentFacade.TopSectionRatio)) - midFittedHeight; - topOfMidUv = _currentTextureRect.yMax - (_currentTextureRect.height * _currentFacade.TopSectionRatio); - - TopFloor(md); - MidFloors(md); - FirstFloor(md, height); + currentWallLength = Vector3.Distance(v1, v2); + _leftOverColumnLength = currentWallLength % _singleColumnLength; + start = v1; + wallSegmentDirection = (v2 - v1).normalized; + + //half of leftover column (if _centerSegments ofc) at the begining + if (_centerSegments && currentWallLength > _singleColumnLength) + { + //save left,right vertices and wall length + wallSegmentFirstVertex = start; + wallSegmentLength = (_leftOverColumnLength / 2); + start += wallSegmentDirection * wallSegmentLength; + wallSegmentSecondVertex = start; + + _leftOverColumnLength = _leftOverColumnLength / 2; + CreateWall(md); + } + + while (currentWallLength > _singleColumnLength) + { + wallSegmentFirstVertex = start; + //columns fitting wall / max column we have in texture + var stepRatio = (float)Math.Min(_currentFacade.ColumnCount, Math.Floor(currentWallLength / _singleColumnLength)) / _currentFacade.ColumnCount; + wallSegmentLength = stepRatio * _scaledPreferredWallLength; + start += wallSegmentDirection * wallSegmentLength; + wallSegmentSecondVertex = start; + + currentWallLength -= (stepRatio * _scaledPreferredWallLength); + CreateWall(md); + } + + //left over column at the end + if (_leftOverColumnLength > 0) + { + wallSegmentFirstVertex = start; + wallSegmentSecondVertex = v2; + wallSegmentLength = _leftOverColumnLength; + CreateWall(md); + } } + //this first loop is for columns + + if (_separateSubmesh) { md.Triangles.Add(wallTriangles); @@ -170,22 +182,121 @@ public override void Run(VectorFeatureUnity feature, MeshData md, UnityTile tile } } - private void MidFloors(MeshData md) + private void CreateWall(MeshData md) + { + //need to keep track of this for triangulation indices + triIndex = md.Vertices.Count; + + //this part minimizes stretching for narrow columns + //if texture has 3 columns, 33% (of preferred edge length) wide walls will get 1 window. + //0-33% gets 1 window, 33-66 gets 2, 66-100 gets all three + //we're not wrapping/repeating texture as it won't work with atlases + columnScaleRatio = Math.Min(1, wallSegmentLength / _scaledPreferredWallLength); + rightOfEdgeUv = _currentTextureRect.xMin + _currentTextureRect.size.x * columnScaleRatio; // Math.Min(1, ((float)(Math.Floor(columnScaleRatio * _currentFacade.ColumnCount) + 1) / _currentFacade.ColumnCount)); + + //leftover row means the area left after first/top/mid floors placed without any stretching + var leftOver = finalMidHeight > 0 ? finalMidHeight : finalTopHeight; + leftOver = leftOver % _singleFloorHeight; + _minWallLength = (_scaledPreferredWallLength / _currentFacade.ColumnCount) * _wallSizeEpsilon; + //common for all top/mid/bottom segments + wallNormal = new Vector3(-(wallSegmentFirstVertex.z - wallSegmentSecondVertex.z), 0, (wallSegmentFirstVertex.x - wallSegmentSecondVertex.x)).normalized; + //height of the left/right edges + currentY1 = wallSegmentFirstVertex.y; + currentY2 = wallSegmentSecondVertex.y; + + //moving leftover row to top + LeftOverRow(md, leftOver); + + FirstFloor(md, height); + TopFloor(md, leftOver); + MidFloors(md); + } + + private void LeftOverRow(MeshData md, float leftOver) { - for (int f = 0; f < floorCount; f++) + //leftover. we're moving small leftover row to top of the building + if (leftOver > 0) { - currentY1 -= scaledFloorHeight; - currentY2 -= scaledFloorHeight; + md.Vertices.Add(new Vector3(wallSegmentFirstVertex.x, currentY1, wallSegmentFirstVertex.z)); + md.Vertices.Add(new Vector3(wallSegmentSecondVertex.x, currentY2, wallSegmentSecondVertex.z)); + //move offsets bottom + currentY1 -= leftOver; + currentY2 -= leftOver; + //bottom two vertices + md.Vertices.Add(new Vector3(wallSegmentFirstVertex.x, currentY1, wallSegmentFirstVertex.z)); + md.Vertices.Add(new Vector3(wallSegmentSecondVertex.x, currentY2, wallSegmentSecondVertex.z)); + + if (wallSegmentLength >= _minWallLength) + { + md.UV[0].Add(new Vector2(_currentTextureRect.xMin, _currentTextureRect.yMax)); + md.UV[0].Add(new Vector2(rightOfEdgeUv, _currentTextureRect.yMax)); + md.UV[0].Add(new Vector2(_currentTextureRect.xMin, _currentTextureRect.yMax - _shortRowHeightDelta)); + md.UV[0].Add(new Vector2(rightOfEdgeUv, _currentTextureRect.yMax - _shortRowHeightDelta)); + } + else + { + md.UV[0].Add(new Vector2(_currentTextureRect.xMin, _currentTextureRect.yMax)); + md.UV[0].Add(new Vector2(_currentTextureRect.xMin + _narrowWallWidthDelta, _currentTextureRect.yMax)); + md.UV[0].Add(new Vector2(_currentTextureRect.xMin, _currentTextureRect.yMax - _shortRowHeightDelta)); + md.UV[0].Add(new Vector2(_currentTextureRect.xMin + _narrowWallWidthDelta, _currentTextureRect.yMax - _shortRowHeightDelta)); + } + + md.Normals.Add(wallNormal); + md.Normals.Add(wallNormal); + md.Normals.Add(wallNormal); + md.Normals.Add(wallNormal); + + md.Tangents.Add(wallDirection); + md.Tangents.Add(wallDirection); + md.Tangents.Add(wallDirection); + md.Tangents.Add(wallDirection); - md.Vertices.Add(new Vector3(v1.x, currentY1 + scaledFloorHeight, v1.z)); - md.Vertices.Add(new Vector3(v2.x, currentY2 + scaledFloorHeight, v2.z)); - md.Vertices.Add(new Vector3(v1.x, currentY1, v1.z)); - md.Vertices.Add(new Vector3(v2.x, currentY2, v2.z)); + wallTriangles.Add(triIndex); + wallTriangles.Add(triIndex + 1); + wallTriangles.Add(triIndex + 2); - md.UV[0].Add(new Vector2(_currentTextureRect.xMin, topOfMidUv)); - md.UV[0].Add(new Vector2(rightOfEdgeUv, topOfMidUv)); - md.UV[0].Add(new Vector2(_currentTextureRect.xMin, bottomOfMidUv)); - md.UV[0].Add(new Vector2(rightOfEdgeUv, bottomOfMidUv)); + wallTriangles.Add(triIndex + 1); + wallTriangles.Add(triIndex + 3); + wallTriangles.Add(triIndex + 2); + + triIndex += 4; + } + } + + private void MidFloors(MeshData md) + { + _currentMidHeight = finalMidHeight; + while (_currentMidHeight >= _singleFloorHeight - 0.01f) + { + //first part is the number of floors fitting current wall segment. You can fit max of "row count in mid". Or if wall + //is smaller and it can only fit i.e. 3 floors instead of 5; we use 3/5 of the mid section texture as well. + _midUvInCurrentStep = ((float)Math.Min(_currentFacade.MidFloorCount, Math.Round(_currentMidHeight / _singleFloorHeight))) / _currentFacade.MidFloorCount; + + //top two vertices + md.Vertices.Add(new Vector3(wallSegmentFirstVertex.x, currentY1, wallSegmentFirstVertex.z)); + md.Vertices.Add(new Vector3(wallSegmentSecondVertex.x, currentY2, wallSegmentSecondVertex.z)); + //move offsets bottom + currentY1 -= (_scaledFloorHeight * _midUvInCurrentStep); + currentY2 -= (_scaledFloorHeight * _midUvInCurrentStep); + //bottom two vertices + md.Vertices.Add(new Vector3(wallSegmentFirstVertex.x, currentY1, wallSegmentFirstVertex.z)); + md.Vertices.Add(new Vector3(wallSegmentSecondVertex.x, currentY2, wallSegmentSecondVertex.z)); + + //we uv narrow walls different so they won't have condensed windows + if (wallSegmentLength >= _minWallLength) + { + md.UV[0].Add(new Vector2(_currentTextureRect.xMin, _currentFacade.topOfMidUv)); + md.UV[0].Add(new Vector2(rightOfEdgeUv, _currentFacade.topOfMidUv)); + md.UV[0].Add(new Vector2(_currentTextureRect.xMin, _currentFacade.topOfMidUv - _currentFacade.midUvHeight * _midUvInCurrentStep)); + md.UV[0].Add(new Vector2(rightOfEdgeUv, _currentFacade.topOfMidUv - _currentFacade.midUvHeight * _midUvInCurrentStep)); + } + else + { + md.UV[0].Add(new Vector2(_currentTextureRect.xMin, _currentFacade.topOfMidUv)); + md.UV[0].Add(new Vector2(_currentTextureRect.xMin + _narrowWallWidthDelta, _currentFacade.topOfMidUv)); + md.UV[0].Add(new Vector2(_currentTextureRect.xMin, _currentFacade.topOfMidUv - _currentFacade.midUvHeight * _midUvInCurrentStep)); + md.UV[0].Add(new Vector2(_currentTextureRect.xMin + _narrowWallWidthDelta, _currentFacade.topOfMidUv - _currentFacade.midUvHeight * _midUvInCurrentStep)); + } md.Normals.Add(wallNormal); md.Normals.Add(wallNormal); @@ -197,31 +308,43 @@ private void MidFloors(MeshData md) md.Tangents.Add(wallDirection); md.Tangents.Add(wallDirection); - wallTriangles.Add(ind); - wallTriangles.Add(ind + 1); - wallTriangles.Add(ind + 2); + wallTriangles.Add(triIndex); + wallTriangles.Add(triIndex + 1); + wallTriangles.Add(triIndex + 2); - wallTriangles.Add(ind + 1); - wallTriangles.Add(ind + 3); - wallTriangles.Add(ind + 2); + wallTriangles.Add(triIndex + 1); + wallTriangles.Add(triIndex + 3); + wallTriangles.Add(triIndex + 2); - ind += 4; + triIndex += 4; + _currentMidHeight -= Math.Max(0.1f, (_scaledFloorHeight * _midUvInCurrentStep)); } } - private void TopFloor(MeshData md) + private void TopFloor(MeshData md, float leftOver) { - currentY1 -= topHeight; - currentY2 -= topHeight; - md.Vertices.Add(new Vector3(v1.x, v1.y, v1.z)); - md.Vertices.Add(new Vector3(v2.x, v2.y, v2.z)); - md.Vertices.Add(new Vector3(v1.x, v1.y - topHeight, v1.z)); - md.Vertices.Add(new Vector3(v2.x, v2.y - topHeight, v2.z)); - - md.UV[0].Add(new Vector2(_currentTextureRect.xMin, _currentTextureRect.yMax)); - md.UV[0].Add(new Vector2(rightOfEdgeUv, _currentTextureRect.yMax)); - md.UV[0].Add(new Vector2(_currentTextureRect.xMin, bottomOfTopUv)); - md.UV[0].Add(new Vector2(rightOfEdgeUv, bottomOfTopUv)); + //top floor start + currentY1 -= finalTopHeight; + currentY2 -= finalTopHeight; + md.Vertices.Add(new Vector3(wallSegmentFirstVertex.x, wallSegmentFirstVertex.y - leftOver, wallSegmentFirstVertex.z)); + md.Vertices.Add(new Vector3(wallSegmentSecondVertex.x, wallSegmentSecondVertex.y - leftOver, wallSegmentSecondVertex.z)); + md.Vertices.Add(new Vector3(wallSegmentFirstVertex.x, wallSegmentFirstVertex.y - leftOver - finalTopHeight, wallSegmentFirstVertex.z)); + md.Vertices.Add(new Vector3(wallSegmentSecondVertex.x, wallSegmentSecondVertex.y - leftOver - finalTopHeight, wallSegmentSecondVertex.z)); + + if (wallSegmentLength >= _minWallLength) + { + md.UV[0].Add(new Vector2(_currentTextureRect.xMin, _currentTextureRect.yMax)); + md.UV[0].Add(new Vector2(rightOfEdgeUv, _currentTextureRect.yMax)); + md.UV[0].Add(new Vector2(_currentTextureRect.xMin, _currentFacade.bottomOfTopUv)); + md.UV[0].Add(new Vector2(rightOfEdgeUv, _currentFacade.bottomOfTopUv)); + } + else + { + md.UV[0].Add(new Vector2(_currentTextureRect.xMin, _currentTextureRect.yMax)); + md.UV[0].Add(new Vector2(_currentTextureRect.xMin + _narrowWallWidthDelta, _currentTextureRect.yMax)); + md.UV[0].Add(new Vector2(_currentTextureRect.xMin, _currentFacade.bottomOfTopUv)); + md.UV[0].Add(new Vector2(_currentTextureRect.xMin + _narrowWallWidthDelta, _currentFacade.bottomOfTopUv)); + } md.Normals.Add(wallNormal); md.Normals.Add(wallNormal); @@ -234,23 +357,23 @@ private void TopFloor(MeshData md) md.Tangents.Add(wallDirection); md.Tangents.Add(wallDirection); - wallTriangles.Add(ind); - wallTriangles.Add(ind + 1); - wallTriangles.Add(ind + 2); + wallTriangles.Add(triIndex); + wallTriangles.Add(triIndex + 1); + wallTriangles.Add(triIndex + 2); - wallTriangles.Add(ind + 1); - wallTriangles.Add(ind + 3); - wallTriangles.Add(ind + 2); + wallTriangles.Add(triIndex + 1); + wallTriangles.Add(triIndex + 3); + wallTriangles.Add(triIndex + 2); - ind += 4; + triIndex += 4; } private void FirstFloor(MeshData md, float hf) { - md.Vertices.Add(new Vector3(v1.x, v1.y - hf + firstHeight, v1.z)); - md.Vertices.Add(new Vector3(v2.x, v2.y - hf + firstHeight, v2.z)); - md.Vertices.Add(new Vector3(v1.x, v1.y - hf, v1.z)); - md.Vertices.Add(new Vector3(v2.x, v2.y - hf, v2.z)); + md.Vertices.Add(new Vector3(wallSegmentFirstVertex.x, wallSegmentFirstVertex.y - hf + finalFirstHeight, wallSegmentFirstVertex.z)); + md.Vertices.Add(new Vector3(wallSegmentSecondVertex.x, wallSegmentSecondVertex.y - hf + finalFirstHeight, wallSegmentSecondVertex.z)); + md.Vertices.Add(new Vector3(wallSegmentFirstVertex.x, wallSegmentFirstVertex.y - hf, wallSegmentFirstVertex.z)); + md.Vertices.Add(new Vector3(wallSegmentSecondVertex.x, wallSegmentSecondVertex.y - hf, wallSegmentSecondVertex.z)); md.Normals.Add(wallNormal); md.Normals.Add(wallNormal); @@ -261,67 +384,35 @@ private void FirstFloor(MeshData md, float hf) md.Tangents.Add(wallDirection); md.Tangents.Add(wallDirection); - d = (v2 - v1).magnitude; - md.UV[0].Add(new Vector2(_currentTextureRect.xMin, topOfBottomUv)); - md.UV[0].Add(new Vector2(rightOfEdgeUv, topOfBottomUv)); - md.UV[0].Add(new Vector2(_currentTextureRect.xMin, _currentTextureRect.yMin)); - md.UV[0].Add(new Vector2(rightOfEdgeUv, _currentTextureRect.yMin)); - + if (wallSegmentLength >= _minWallLength) + { + md.UV[0].Add(new Vector2(_currentTextureRect.xMin, _currentFacade.topOfBottomUv)); + md.UV[0].Add(new Vector2(rightOfEdgeUv, _currentFacade.topOfBottomUv)); + md.UV[0].Add(new Vector2(_currentTextureRect.xMin, _currentTextureRect.yMin)); + md.UV[0].Add(new Vector2(rightOfEdgeUv, _currentTextureRect.yMin)); + } + else + { + md.UV[0].Add(new Vector2(_currentTextureRect.xMin, _currentFacade.topOfBottomUv)); + md.UV[0].Add(new Vector2(_currentTextureRect.xMin + _narrowWallWidthDelta, _currentFacade.topOfBottomUv)); + md.UV[0].Add(new Vector2(_currentTextureRect.xMin, _currentTextureRect.yMin)); + md.UV[0].Add(new Vector2(_currentTextureRect.xMin + _narrowWallWidthDelta, _currentTextureRect.yMin)); + } - wallTriangles.Add(ind); - wallTriangles.Add(ind + 1); - wallTriangles.Add(ind + 2); + wallTriangles.Add(triIndex); + wallTriangles.Add(triIndex + 1); + wallTriangles.Add(triIndex + 2); - wallTriangles.Add(ind + 1); - wallTriangles.Add(ind + 3); - wallTriangles.Add(ind + 2); + wallTriangles.Add(triIndex + 1); + wallTriangles.Add(triIndex + 3); + wallTriangles.Add(triIndex + 2); - ind += 4; + triIndex += 4; } private void CalculateEdgeList(MeshData md, UnityTile tile, float preferredEdgeSectionLength) { - dist = 0; - step = 0; - dif = 0; - start = Constants.Math.Vector3Zero; - wallDirection = Constants.Math.Vector3Zero; - for (int i = 0; i < md.Edges.Count; i += 2) - { - fs = md.Vertices[md.Edges[i]]; - sc = md.Vertices[md.Edges[i + 1]]; - - dist = Vector3.Distance(fs, sc); - step = Mathf.Min(_maxEdgeSectionCount, dist / (preferredEdgeSectionLength * tile.TileScale)); - start = fs; - edgeList.Add(start); - wallDirection = (sc - fs).normalized; - if (_centerSegments && step > 1) - { - dif = dist - ((int)step * (preferredEdgeSectionLength * tile.TileScale)); - //prevent new point being to close to existing corner - if (dif > 2 * tile.TileScale) - { - //first step, original point or another close point if sections are centered - start = fs + (wallDirection * (dif / 2)); - //to compansate step-1 below, so if there's more than 2m to corner, go one more step - } - edgeList.Add(start); - edgeList.Add(start); - } - if (step > 1) - { - for (int s = 1; s < step; s++) - { - var da = start + wallDirection * s * (preferredEdgeSectionLength * tile.TileScale); - edgeList.Add(da); - edgeList.Add(da); - } - } - - edgeList.Add(sc); - } } private void GenerateRoofMesh(MeshData md, float minHeight, float maxHeight) @@ -377,7 +468,7 @@ private void GenerateRoofMesh(MeshData md, float minHeight, float maxHeight) } } - protected virtual void QueryHeight(VectorFeatureUnity feature, MeshData md, UnityTile tile, out float maxHeight, out float minHeight) + private void QueryHeight(VectorFeatureUnity feature, MeshData md, UnityTile tile, out float maxHeight, out float minHeight) { minHeight = 0.0f; maxHeight = 0.0f; @@ -391,20 +482,11 @@ protected virtual void QueryHeight(VectorFeatureUnity feature, MeshData md, Unit case ExtrusionType.MaxHeight: if (feature.Properties.ContainsKey(_options.propertyName)) { - try - { - maxHeight = Convert.ToSingle(feature.Properties[_options.propertyName]); - } - catch (Exception) - { - Debug.LogError("Property: '" + _options.propertyName + "' must contain a numerical value for extrusion."); - return; - } - + maxHeight = Convert.ToSingle(feature.Properties[_options.propertyName]); if (feature.Properties.ContainsKey("min_height")) { minHeight = Convert.ToSingle(feature.Properties["min_height"]); - //maxHeight -= minHeight; + //hf -= minHeight; } } break; @@ -418,23 +500,13 @@ protected virtual void QueryHeight(VectorFeatureUnity feature, MeshData md, Unit _options.minimumHeight = _options.maximumHeight; _options.maximumHeight = temp; } - - float featureHeight; - try - { - featureHeight = Convert.ToSingle(feature.Properties[_options.propertyName]); - } - catch (Exception) - { - Debug.LogError("Property: '" + _options.propertyName + "' must contain a numerical value for extrusion."); - return; - } - + var featureHeight = Convert.ToSingle(feature.Properties[_options.propertyName]); maxHeight = Math.Min(Math.Max(_options.minimumHeight, featureHeight), _options.maximumHeight); if (feature.Properties.ContainsKey("min_height")) { var featureMinHeight = Convert.ToSingle(feature.Properties["min_height"]); minHeight = Math.Min(featureMinHeight, _options.maximumHeight); + //maxHeight -= minHeight; } } break; diff --git a/sdkproject/Assets/Mapbox/Unity/SourceLayers/MapboxDefaultStyles.cs b/sdkproject/Assets/Mapbox/Unity/SourceLayers/MapboxDefaultStyles.cs new file mode 100644 index 000000000..416a0cd9f --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/SourceLayers/MapboxDefaultStyles.cs @@ -0,0 +1,106 @@ + +namespace Mapbox.Unity.Map +{ + using UnityEngine; + using System.IO; + using Mapbox.Unity.MeshGeneration.Data; + + /// + /// MapboxDefaultStyles generates a new GeometryMaterialOptions object based on data contained in a MapFeatureStyleOptions. + /// + + public class StyleAssetPathBundle + { + public string topMaterialPath; + public string sideMaterialPath; + public string atlasPath; + public string palettePath; + + public StyleAssetPathBundle(string styleName, string path) + { + string topMaterialName = string.Format("{0}{1}", styleName, Constants.StyleAssetNames.TOP_MATERIAL_SUFFIX); + string sideMaterialName = string.Format("{0}{1}", styleName, Constants.StyleAssetNames.SIDE_MATERIAL_SUFFIX); + string atlasInfoName = string.Format("{0}{1}", styleName, Constants.StyleAssetNames.ALTAS_SUFFIX); + string paletteName = string.Format("{0}{1}", styleName, Constants.StyleAssetNames.PALETTE_SUFFIX); + + string materialFolderPath = Path.Combine(path, Constants.Path.MAPBOX_STYLES_MATERIAL_FOLDER); + string atlasFolderPath = Path.Combine(path, Constants.Path.MAPBOX_STYLES_ATLAS_FOLDER); + string paletteFolderPath = Path.Combine(path, Constants.Path.MAPBOX_STYLES_PALETTES_FOLDER); + + topMaterialPath = Path.Combine(materialFolderPath, topMaterialName); + sideMaterialPath = Path.Combine(materialFolderPath, sideMaterialName); + atlasPath = Path.Combine(atlasFolderPath, atlasInfoName); + palettePath = Path.Combine(paletteFolderPath, paletteName); + } + } + + public static class MapboxDefaultStyles + { + /// + /// Returns a new GeometryMaterialOptions object; called from VectorLayerVisualizer.SetProperties. + /// + /// The geometry material options. + /// Map feature style options. + /// + + public static GeometryMaterialOptions GetGeometryMaterialOptions(GeometryMaterialOptions geometryMaterialOptionsRef) + { + GeometryMaterialOptions geometryMaterialOptions; + if (geometryMaterialOptionsRef.style == StyleTypes.Custom) + { + geometryMaterialOptions = geometryMaterialOptionsRef; + } + else + { + string styleName = geometryMaterialOptionsRef.style.ToString(); + + string path = Path.Combine(Constants.Path.MAP_FEATURE_STYLES_SAMPLES, Path.Combine(styleName, Constants.Path.MAPBOX_STYLES_ASSETS_FOLDER)); + + StyleAssetPathBundle styleAssetPathBundle = new StyleAssetPathBundle(styleName, path); + + geometryMaterialOptions = AssignAssets(new GeometryMaterialOptions(), styleAssetPathBundle); + + geometryMaterialOptions.style = geometryMaterialOptionsRef.style; + + if(geometryMaterialOptions.style == StyleTypes.Satellite) + { + geometryMaterialOptions.texturingType = UvMapType.Tiled; + } + else if (geometryMaterialOptions.style == StyleTypes.Simple) + { + geometryMaterialOptions.texturingType = UvMapType.AtlasWithColorPalette; + } + else + { + geometryMaterialOptions.texturingType = UvMapType.Atlas; + } + } + return geometryMaterialOptions; + } + + public static GeometryMaterialOptions AssignAssets(GeometryMaterialOptions geometryMaterialOptions, StyleAssetPathBundle styleAssetPathBundle) + { + Material topMaterial = Resources.Load(styleAssetPathBundle.topMaterialPath, typeof(Material)) as Material; + Material sideMaterial = Resources.Load(styleAssetPathBundle.sideMaterialPath, typeof(Material)) as Material; + + AtlasInfo atlas = Resources.Load(styleAssetPathBundle.atlasPath, typeof(AtlasInfo)) as AtlasInfo; + ScriptablePalette palette = Resources.Load(styleAssetPathBundle.palettePath, typeof(ScriptablePalette)) as ScriptablePalette; + + geometryMaterialOptions.materials[0].Materials[0] = topMaterial; + geometryMaterialOptions.materials[1].Materials[0] = sideMaterial; + geometryMaterialOptions.atlasInfo = atlas; + geometryMaterialOptions.colorPalette = palette; + + return geometryMaterialOptions; + } + + public static GeometryMaterialOptions GetDefaultAssets() + { + + StyleAssetPathBundle styleAssetPathBundle = new StyleAssetPathBundle("Default", Constants.Path.MAP_FEATURE_STYLES_DEFAULT_STYLE_ASSETS); + GeometryMaterialOptions geometryMaterialOptions = new GeometryMaterialOptions(); + geometryMaterialOptions.texturingType = UvMapType.Atlas; + return AssignAssets(geometryMaterialOptions, styleAssetPathBundle); + } + } +} \ No newline at end of file diff --git a/sdkproject/Assets/Mapbox/Unity/SourceLayers/MapboxDefaultStyles.cs.meta b/sdkproject/Assets/Mapbox/Unity/SourceLayers/MapboxDefaultStyles.cs.meta new file mode 100644 index 000000000..97eef3e8a --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/SourceLayers/MapboxDefaultStyles.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 8ff494b8d5c6a455d91a0e5ef54f549e +timeCreated: 1524678818 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Unity/Utilities/Conversions.cs b/sdkproject/Assets/Mapbox/Unity/Utilities/Conversions.cs index e8ab9755d..2c5e4d2f3 100644 --- a/sdkproject/Assets/Mapbox/Unity/Utilities/Conversions.cs +++ b/sdkproject/Assets/Mapbox/Unity/Utilities/Conversions.cs @@ -11,6 +11,7 @@ namespace Mapbox.Unity.Utilities using Mapbox.Utils; using UnityEngine; using System.Globalization; + using Mapbox.Unity.MeshGeneration.Data; /// /// A set of Geo and Terrain Conversion utils. @@ -209,6 +210,57 @@ public static UnwrappedTileId LatitudeLongitudeToTileId(double latitude, double return new UnwrappedTileId(zoom, x, y); } + + /// + /// Get coordinates for a given latitude/longitude in tile-space. Useful when comparing feature geometry to lat/lon coordinates. + /// + /// The longitude to tile position. + /// Coordinate. + /// The zoom level of the tile. + /// Layer extent. Optional, but recommended. Defaults to 4096, the standard for Mapbox Tiles + public static Vector2 LatitudeLongitudeToVectorTilePosition(Vector2d coordinate, int tileZoom, ulong layerExtent = 4096) + { + var coordinateTileId = Conversions.LatitudeLongitudeToTileId( + coordinate.x, coordinate.y, tileZoom); + var _meters = LatLonToMeters(coordinate); + var _rect = Conversions.TileBounds(coordinateTileId); + + //vectortile space point (0 - layerExtent) + var vectorTilePoint = new Vector2((float)((_meters - _rect.Min).x / _rect.Size.x) * layerExtent, + (float)(layerExtent - ((_meters - _rect.Max).y / _rect.Size.y) * layerExtent)); + + return vectorTilePoint; + } + + public static Vector2 LatitudeLongitudeToUnityTilePosition(Vector2d coordinate, UnityTile tile, ulong layerExtent = 4096) + { + return LatitudeLongitudeToUnityTilePosition(coordinate, tile.InitialZoom, tile.TileScale, layerExtent); + } + + /// + /// Get coordinates for a given latitude/longitude in tile-space. Useful when comparing feature geometry to lat/lon coordinates. + /// + /// The longitude to tile position. + /// Coordinate. + /// The zoom level of the tile. + /// Tile scale. Optional, but recommended. Defaults to a scale of 1. + /// Layer extent. Optional, but recommended. Defaults to 4096, the standard for Mapbox Tiles + public static Vector2 LatitudeLongitudeToUnityTilePosition(Vector2d coordinate, int tileZoom, float tileScale, ulong layerExtent = 4096) + { + var coordinateTileId = Conversions.LatitudeLongitudeToTileId( + coordinate.x, coordinate.y, tileZoom); + var _rect = Conversions.TileBounds(coordinateTileId); + + //vectortile space point (0 - layerExtent) + var vectorTilePoint = LatitudeLongitudeToVectorTilePosition(coordinate, tileZoom, layerExtent); + + //UnityTile space + var unityTilePoint = new Vector2((float)(vectorTilePoint.x / layerExtent * _rect.Size.x - (_rect.Size.x / 2)) * tileScale, + (float)((layerExtent - vectorTilePoint.y) / layerExtent * _rect.Size.y - (_rect.Size.y / 2)) * tileScale); + + return unityTilePoint; + } + /// /// Gets the WGS84 longitude of the northwest corner from a tile's X position and zoom level. /// See: http://wiki.openstreetmap.org/wiki/Slippy_map_tilenames. @@ -285,7 +337,6 @@ public static Vector2d TileIdToCenterWebMercator(int x, int y, int zoom) return new Vector2d(centerX, centerY); } - /// /// Gets the meters per pixels at given latitude and zoom level for a 256x256 tile. /// See: http://wiki.openstreetmap.org/wiki/Zoom_levels. diff --git a/sdkproject/Assets/Mapbox/Unity/Utilities/PolygonUtils.cs b/sdkproject/Assets/Mapbox/Unity/Utilities/PolygonUtils.cs new file mode 100644 index 000000000..50a993802 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Utilities/PolygonUtils.cs @@ -0,0 +1,39 @@ +using UnityEngine; +using System.Collections.Generic; +using Mapbox.VectorTile.Geometry; +using Mapbox.VectorTile.Geometry.InteralClipperLib; + +namespace Mapbox.Utils +{ + + using Polygon = List; + using Polygons = List>; + + + public static class PolygonUtils + { + /// + /// Method to check if a point is contained inside a polygon, ignores vertical axis (y axis), + /// + /// true, if point lies inside the constructed polygon, false otherwise. + /// Polygon points. + /// The point that is to be tested. + public static bool PointInPolygon(Point2d coord, List>> poly) + { + var point = new InternalClipper.IntPoint(coord.X, coord.Y); + var polygon = new Polygon(); + + + foreach (var vert in poly[0]) + { + polygon.Add(new InternalClipper.IntPoint(vert.X, vert.Y)); + } + + //then check the actual polygon + int result = InternalClipper.Clipper.PointInPolygon(point, polygon); + return (result == 1) ? true : false; + } + } + +} + diff --git a/sdkproject/Assets/Mapbox/Unity/Utilities/PolygonUtils.cs.meta b/sdkproject/Assets/Mapbox/Unity/Utilities/PolygonUtils.cs.meta new file mode 100644 index 000000000..46ba77583 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Utilities/PolygonUtils.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: a8bec9161e1794b4eb4297f7098296d7 +timeCreated: 1526332346 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/MapboxAR/Examples/ARTabletop/Scripts/ARTableTopCameraMovement.cs b/sdkproject/Assets/MapboxAR/Examples/ARTabletop/Scripts/ARTableTopCameraMovement.cs index fffed6b00..4df7dc35c 100644 --- a/sdkproject/Assets/MapboxAR/Examples/ARTabletop/Scripts/ARTableTopCameraMovement.cs +++ b/sdkproject/Assets/MapboxAR/Examples/ARTabletop/Scripts/ARTableTopCameraMovement.cs @@ -117,7 +117,7 @@ void PanMapUsingKeyBoard(float xMove, float zMove) // Divide it by the tile width in pixels ( 256 in our case) // to get degrees represented by each pixel. // Keyboard offset is in pixels, therefore multiply the factor with the offset to move the center. - float factor = (_panSpeed / 100) * (Conversions.GetTileScaleInDegrees((float)_mapManager.CenterLatitudeLongitude.x, _mapManager.AbsoluteZoom)); + float factor = (_panSpeed) * (Conversions.GetTileScaleInDegrees((float)_mapManager.CenterLatitudeLongitude.x, _mapManager.AbsoluteZoom)); var latitudeLongitude = new Vector2d(_mapManager.CenterLatitudeLongitude.x + zMove * factor * 2.0f, _mapManager.CenterLatitudeLongitude.y + xMove * factor * 4.0f); _mapManager.UpdateMap(latitudeLongitude, _mapManager.Zoom); } diff --git a/sdkproject/Assets/MapboxAR/Examples/Scenes/TabletopAR.unity b/sdkproject/Assets/MapboxAR/Examples/Scenes/TabletopAR.unity index 092423c26..379c7fba9 100644 --- a/sdkproject/Assets/MapboxAR/Examples/Scenes/TabletopAR.unity +++ b/sdkproject/Assets/MapboxAR/Examples/Scenes/TabletopAR.unity @@ -218,47 +218,47 @@ Prefab: - target: {fileID: 224907993215804030, guid: 98be219873e6d4dffb5949746f515a33, type: 2} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224907993215804030, guid: 98be219873e6d4dffb5949746f515a33, type: 2} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224835413515161394, guid: 98be219873e6d4dffb5949746f515a33, type: 2} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224835413515161394, guid: 98be219873e6d4dffb5949746f515a33, type: 2} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224835413515161394, guid: 98be219873e6d4dffb5949746f515a33, type: 2} propertyPath: m_AnchoredPosition.x - value: 116.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224835413515161394, guid: 98be219873e6d4dffb5949746f515a33, type: 2} propertyPath: m_AnchoredPosition.y - value: -95.28874 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224835413515161394, guid: 98be219873e6d4dffb5949746f515a33, type: 2} propertyPath: m_SizeDelta.x - value: 213 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224835413515161394, guid: 98be219873e6d4dffb5949746f515a33, type: 2} propertyPath: m_SizeDelta.y - value: 170.57748 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224857786874416376, guid: 98be219873e6d4dffb5949746f515a33, type: 2} propertyPath: m_SizeDelta.y - value: 190.57748 + value: 0 objectReference: {fileID: 0} - target: {fileID: 114603753021256032, guid: 98be219873e6d4dffb5949746f515a33, type: 2} @@ -290,31 +290,21 @@ Prefab: - target: {fileID: 224907856650798614, guid: 98be219873e6d4dffb5949746f515a33, type: 2} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224907856650798614, guid: 98be219873e6d4dffb5949746f515a33, type: 2} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224907856650798614, guid: 98be219873e6d4dffb5949746f515a33, type: 2} propertyPath: m_SizeDelta.x - value: -17 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 98be219873e6d4dffb5949746f515a33, type: 2} m_IsPrefabParent: 0 ---- !u!4 &475324404 stripped -Transform: - m_PrefabParentObject: {fileID: 4324505364571932, guid: c0ce4c9dacbd84ff09f18011abded7e6, - type: 2} - m_PrefabInternal: {fileID: 2141252174} ---- !u!20 &627250951 stripped -Camera: - m_PrefabParentObject: {fileID: 20512144627957390, guid: c0ce4c9dacbd84ff09f18011abded7e6, - type: 2} - m_PrefabInternal: {fileID: 2141252174} --- !u!1 &673908967 GameObject: m_ObjectHideFlags: 0 @@ -377,32 +367,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &888358159 stripped -GameObject: - m_PrefabParentObject: {fileID: 1752371506266588, guid: c0ce4c9dacbd84ff09f18011abded7e6, - type: 2} - m_PrefabInternal: {fileID: 2141252174} ---- !u!114 &888358161 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 888358159} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5209c2a5ffaf941c5b8bbbb59a81c0c3, type: 3} - m_Name: - m_EditorClassIdentifier: - _panSpeed: 1 - _zoomSpeed: 0.25 - _referenceCamera: {fileID: 627250951} - _mapManager: {fileID: 888358162} ---- !u!114 &888358162 stripped -MonoBehaviour: - m_PrefabParentObject: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, - type: 2} - m_PrefabInternal: {fileID: 2141252174} - m_Script: {fileID: 11500000, guid: cd961b1c9541a4cee99686069ecce852, type: 3} --- !u!1001 &2141252174 Prefab: m_ObjectHideFlags: 0 @@ -442,38 +406,11 @@ Prefab: propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, + - target: {fileID: 114949404173606746, guid: c0ce4c9dacbd84ff09f18011abded7e6, type: 2} - propertyPath: _options.extentOptions.extentType - value: 1 + propertyPath: _panSpeed + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, - type: 2} - propertyPath: _options.extentOptions.rangeAroundTransformOptions.targetTransform - value: - objectReference: {fileID: 475324404} - - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, - type: 2} - propertyPath: _options.extentOptions.rangeAroundTransformOptions.visibleBuffer - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, - type: 2} - propertyPath: _options.extentOptions.rangeAroundTransformOptions.disposeBuffer - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, - type: 2} - propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[0].materialOptions.colorPalette - value: - objectReference: {fileID: 11400000, guid: ef118b5e263da4b1fa4327ca1d3e0c7b, - type: 2} - - target: {fileID: 114378541491328834, guid: c0ce4c9dacbd84ff09f18011abded7e6, - type: 2} - propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[0].buildingsWithUniqueIds - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 114978445388900478, guid: c0ce4c9dacbd84ff09f18011abded7e6, type: 2} + m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: c0ce4c9dacbd84ff09f18011abded7e6, type: 2} m_IsPrefabParent: 0 diff --git a/sdkproject/Assets/MapboxAR/Prefabs/ARTabletopKit.prefab b/sdkproject/Assets/MapboxAR/Prefabs/ARTabletopKit.prefab index da1ae0302..0d8812178 100644 --- a/sdkproject/Assets/MapboxAR/Prefabs/ARTabletopKit.prefab +++ b/sdkproject/Assets/MapboxAR/Prefabs/ARTabletopKit.prefab @@ -136,8 +136,8 @@ GameObject: serializedVersion: 5 m_Component: - component: {fileID: 4694041931287344} - - component: {fileID: 114978445388900478} - component: {fileID: 114378541491328834} + - component: {fileID: 114949404173606746} m_Layer: 0 m_Name: MapRoot m_TagString: Untagged @@ -490,6 +490,7 @@ MonoBehaviour: m_PlaneDetection: 1 m_LightEstimation: 0 m_PointCloud: 1 + m_BackgroundRendering: 1 m_Scale: 1 pointOfInterest: {x: 0, y: 0, z: 0} --- !u!114 &114212010089517918 @@ -532,7 +533,7 @@ MonoBehaviour: latitudeLongitude: 37.784179, -122.401583 zoom: 16 extentOptions: - extentType: 3 + extentType: 2 cameraBoundsOptions: camera: {fileID: 0} visibleBuffer: 0 @@ -544,12 +545,12 @@ MonoBehaviour: east: 1 south: 1 rangeAroundTransformOptions: - targetTransform: {fileID: 0} - visibleBuffer: 0 - disposeBuffer: 0 + targetTransform: {fileID: 4324505364571932} + visibleBuffer: 2 + disposeBuffer: 3 placementOptions: placementType: 1 - snapMapToZero: 1 + snapMapToZero: 0 scalingOptions: scalingType: 1 unityTileSize: 1 @@ -596,7 +597,32 @@ MonoBehaviour: wallMaterial: {fileID: 0} _vectorData: _layerProperty: - sourceType: 0 + tileJsonData: + tileJSONLoaded: 0 + LayerDisplayNames: + - admin + - aeroway + - airport_label + - barrier_line + - building + - country_label + - housenum_label + - landuse + - landuse_overlay + - marine_label + - motorway_junction + - mountain_peak_label + - place_label + - poi_label + - rail_station_label + - road + - road_label + - state_label + - water + - water_label + - waterway + - waterway_label + _sourceType: 0 sourceOptions: isActive: 1 layerSource: @@ -615,6 +641,7 @@ MonoBehaviour: entityPerCoroutine: 20 vectorSubLayers: - coreOptions: + sourceId: isActive: 1 sublayerName: ExtrudedBuildings geometryType: 2 @@ -623,16 +650,22 @@ MonoBehaviour: groupFeatures: 1 lineWidth: 1 filterOptions: + _selectedLayerName: building filters: [] combinerType: 0 extrusionOptions: + _selectedLayerName: building extrusionType: 1 extrusionGeometryType: 0 propertyName: height + propertyDescription: Number. Height of building or part of building. minimumHeight: 0 maximumHeight: 0 + extrusionScaleFactor: 1 + colliderOptions: + colliderType: 0 materialOptions: - projectMapImagery: 0 + style: 0 texturingType: 3 materials: - Materials: @@ -640,13 +673,15 @@ MonoBehaviour: - Materials: - {fileID: 2100000, guid: 29ccb82811b0d43f8adac026781c4c15, type: 2} atlasInfo: {fileID: 11400000, guid: 414754d7155df47beb52ca117a774f21, type: 2} - colorPallete: {fileID: 11400000, guid: ef118b5e263da4b1fa4327ca1d3e0c7b, + colorPalette: {fileID: 11400000, guid: ef118b5e263da4b1fa4327ca1d3e0c7b, type: 2} - buildingsWithUniqueIds: 0 + honorBuildingIdSetting: 1 + buildingsWithUniqueIds: 1 moveFeaturePositionTo: 0 MeshModifiers: [] GoModifiers: [] - _tileProvider: {fileID: 114978445388900478} + locationPrefabList: [] + _tileProvider: {fileID: 0} --- !u!114 &114518577050598568 MonoBehaviour: m_ObjectHideFlags: 1 @@ -713,7 +748,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5698001a6edd244c898af1c8f86a48ba, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &114978445388900478 +--- !u!114 &114949404173606746 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} @@ -721,13 +756,13 @@ MonoBehaviour: m_GameObject: {fileID: 1752371506266588} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1d5cc584a855041e79782eef5872fa10, type: 3} + m_Script: {fileID: 11500000, guid: 5209c2a5ffaf941c5b8bbbb59a81c0c3, type: 3} m_Name: m_EditorClassIdentifier: - _basicMap: {fileID: 114378541491328834} - _targetTransform: {fileID: 4324505364571932} - _visibleBuffer: 2 - _disposeBuffer: 3 + _panSpeed: 1 + _zoomSpeed: 0.25 + _referenceCamera: {fileID: 20512144627957390} + _mapManager: {fileID: 114378541491328834} --- !u!124 &124147286325951530 Behaviour: m_ObjectHideFlags: 1 diff --git a/sdkproject/Assets/MapboxAR/Unity/Ar/LerpAlignmentStrategy.cs b/sdkproject/Assets/MapboxAR/Unity/Ar/LerpAlignmentStrategy.cs index 218368724..3d6b3c3a0 100644 --- a/sdkproject/Assets/MapboxAR/Unity/Ar/LerpAlignmentStrategy.cs +++ b/sdkproject/Assets/MapboxAR/Unity/Ar/LerpAlignmentStrategy.cs @@ -9,20 +9,27 @@ public class LerpAlignmentStrategy : AbstractAlignmentStrategy Vector3 _targetPosition; Quaternion _targetRotation = Quaternion.identity; + bool _isAlignmentAvailable = false; public override void OnAlignmentAvailable(Alignment alignment) { _targetPosition = alignment.Position; _targetRotation = Quaternion.Euler(0, alignment.Rotation, 0); + _isAlignmentAvailable = true; } // FIXME: this should be in a coroutine, which is activated in Align. void Update() { - var t = _followFactor * Time.deltaTime; - _transform.SetPositionAndRotation( - Vector3.Lerp(_transform.localPosition, _targetPosition, t), - Quaternion.Lerp(_transform.localRotation, _targetRotation, t)); + if (_isAlignmentAvailable) + { + var t = _followFactor * Time.deltaTime; + _transform.SetPositionAndRotation( + Vector3.Lerp(_transform.localPosition, _targetPosition, t), + Quaternion.Lerp(_transform.localRotation, _targetRotation, t)); + _isAlignmentAvailable = false; + } + } } } diff --git a/sdkproject/Assets/MapboxAR/Unity/Ar/SimpleAutomaticSynchronizationContextBehaviour.cs b/sdkproject/Assets/MapboxAR/Unity/Ar/SimpleAutomaticSynchronizationContextBehaviour.cs index 4b24888f5..a3d61c044 100644 --- a/sdkproject/Assets/MapboxAR/Unity/Ar/SimpleAutomaticSynchronizationContextBehaviour.cs +++ b/sdkproject/Assets/MapboxAR/Unity/Ar/SimpleAutomaticSynchronizationContextBehaviour.cs @@ -175,7 +175,8 @@ void LocationProvider_OnLocationUpdated(Location location) , "lightblue" ); - var position = Conversions.GeoToWorldPosition(latitudeLongitude, _map.CenterMercator, _map.WorldRelativeScale).ToVector3xz(); + var position = _map.GeoToWorldPosition(latitudeLongitude, false); + position.y = _map.Root.position.y; _synchronizationContext.AddSynchronizationNodes(location, position, _arPositionReference.localPosition); } } diff --git a/sdkproject/Assets/MapboxAR/Unity/Ar/Utilities/PlotRoute.cs b/sdkproject/Assets/MapboxAR/Unity/Ar/Utilities/PlotRoute.cs index b65b4e8be..9fbb0a26b 100644 --- a/sdkproject/Assets/MapboxAR/Unity/Ar/Utilities/PlotRoute.cs +++ b/sdkproject/Assets/MapboxAR/Unity/Ar/Utilities/PlotRoute.cs @@ -30,7 +30,7 @@ public class PlotRoute : MonoBehaviour int _currentIndex = 0; float _sqDistance; Vector3 _lastPosition; - bool _isStable; + bool _isStable = false; void Awake() { diff --git a/sdkproject/Assets/MapboxDevTools/PoGo_Water.mat b/sdkproject/Assets/MapboxDevTools/PoGo_Water.mat new file mode 100644 index 000000000..63e4d371d --- /dev/null +++ b/sdkproject/Assets/MapboxDevTools/PoGo_Water.mat @@ -0,0 +1,76 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: PoGo_Water + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.83823526, g: 0.22188582, b: 0.5916957, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/sdkproject/Assets/MapboxDevTools/PoGo_Water.mat.meta b/sdkproject/Assets/MapboxDevTools/PoGo_Water.mat.meta new file mode 100644 index 000000000..aabfdb84f --- /dev/null +++ b/sdkproject/Assets/MapboxDevTools/PoGo_Water.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 77a54642174da4e1fb3ec9c1ff5ad6c0 +timeCreated: 1523572175 +licenseType: Pro +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/MapboxDevTools/PoGo_buildings.mat b/sdkproject/Assets/MapboxDevTools/PoGo_buildings.mat new file mode 100644 index 000000000..b3ac4354f --- /dev/null +++ b/sdkproject/Assets/MapboxDevTools/PoGo_buildings.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: PoGo_buildings + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _ALPHAPREMULTIPLY_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 3 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 0, g: 0.7931032, b: 1, a: 0.291} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/sdkproject/Assets/MapboxDevTools/PoGo_buildings.mat.meta b/sdkproject/Assets/MapboxDevTools/PoGo_buildings.mat.meta new file mode 100644 index 000000000..5c0a746ed --- /dev/null +++ b/sdkproject/Assets/MapboxDevTools/PoGo_buildings.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 89c1183f235ed408aafe0a42dc56c7db +timeCreated: 1523569807 +licenseType: Pro +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/MapboxDevTools/PoGo_roads.mat b/sdkproject/Assets/MapboxDevTools/PoGo_roads.mat new file mode 100644 index 000000000..7c27e6fa7 --- /dev/null +++ b/sdkproject/Assets/MapboxDevTools/PoGo_roads.mat @@ -0,0 +1,76 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: PoGo_roads + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.9191176, g: 0.9191176, b: 0.9191176, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/sdkproject/Assets/MapboxDevTools/PoGo_roads.mat.meta b/sdkproject/Assets/MapboxDevTools/PoGo_roads.mat.meta new file mode 100644 index 000000000..3af766962 --- /dev/null +++ b/sdkproject/Assets/MapboxDevTools/PoGo_roads.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: bbfb0545f19fa4a42b539950fda4a010 +timeCreated: 1523569807 +licenseType: Pro +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/UnityARKitPlugin/Examples/Common/Models.meta b/sdkproject/Assets/UnityARKitPlugin/Examples/Common/Models.meta index 51fa2ac59..debdeb343 100644 --- a/sdkproject/Assets/UnityARKitPlugin/Examples/Common/Models.meta +++ b/sdkproject/Assets/UnityARKitPlugin/Examples/Common/Models.meta @@ -1,9 +1,10 @@ fileFormatVersion: 2 -guid: a7bb5a53dd8ac49759db6bf17162dd20 +guid: 4df8dc2b2f3354d468f2584a32efbef8 folderAsset: yes -timeCreated: 1503626045 +timeCreated: 1528385085 licenseType: Pro DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/sdkproject/ProjectSettings/ProjectSettings.asset b/sdkproject/ProjectSettings/ProjectSettings.asset index f68a03cb0..1edb17d02 100644 --- a/sdkproject/ProjectSettings/ProjectSettings.asset +++ b/sdkproject/ProjectSettings/ProjectSettings.asset @@ -126,7 +126,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 1.4.2 + bundleVersion: 1.4.3 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -708,6 +708,7 @@ PlayerSettings: XboxOneSplashScreen: {fileID: 0} XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 + XboxOneXTitleMemory: 8 xboxOneScriptCompiler: 0 vrEditorSettings: daydream: diff --git a/sdkproject/ProjectSettings/TagManager.asset b/sdkproject/ProjectSettings/TagManager.asset index 53a6ce3ba..bb2a77b93 100644 --- a/sdkproject/ProjectSettings/TagManager.asset +++ b/sdkproject/ProjectSettings/TagManager.asset @@ -3,7 +3,8 @@ --- !u!78 &1 TagManager: serializedVersion: 2 - tags: [] + tags: + - POIPrefab layers: - Default - TransparentFX @@ -21,7 +22,7 @@ TagManager: - Both - Path - ARGameObject - - + - POIPrefab - - -