Merge branch 'develop' into v146-master-develop

* develop: (617 commits) Fixed material assignment in prefabs. (#1072) fix resetmap function in AbstractMap (#1068) Vector tile factory file restructure (#1070) Unity 2017 custom material fix (#1067) Add test for map + fix errors. (#1066) move all interfaces and classes inside AbstractMap file to individual files and their respective folders (#1054) Removed update debug messages (#1065) Fix tabletop ar snap to plane (#999) Custom material fix (#1064) Edit IImageryLayer comments (#1055) SnapToZero fix (#1063) Clean unbinding ui events (#1062) Salesforce Tower fix in Unity 2017.4.2f2 (#1060) Add default terrain-rgb if custom source is empty. (#1061) Zombie object fix (#1057) Removing feature layers through UI calls vectorLayerProperties.OnSubLayerPropertyRemoved to trigger VectorLayer.RemoveVectorLayer (#1056) fix an issue where ReplaceFeatureModifier was creating duplicates on layer toggling (#1051) Api methods review (#1052) Enable disable vector layer fix (#1050) Added /// comments to VectorFilterOptions. (#1049) ... # Conflicts: # documentation/docs/05-changelog.md # sdkproject/Assets/Mapbox/Examples/0_PrefabScenes/CitySimulator.unity # sdkproject/Assets/Mapbox/Examples/0_PrefabScenes/LocationBasedGame.unity.meta # sdkproject/Assets/Mapbox/Examples/1_DataExplorer/DataExplorer.unity # sdkproject/Assets/Mapbox/Examples/1_DataExplorer/InteractiveStyledVectorMap.unity # sdkproject/Assets/Mapbox/Examples/1_DataExplorer/Modules/TrafficLayer/SevereTraffic/ExplorerSevereTrafficMaterial.asset # sdkproject/Assets/Mapbox/Examples/1_DataExplorer/Traffic/HeavyTrafficMaterial.asset # sdkproject/Assets/Mapbox/Examples/1_DataExplorer/Traffic/LowTrafficMaterial.asset # sdkproject/Assets/Mapbox/Examples/1_DataExplorer/Traffic/ModerateTrafficMaterial.asset # sdkproject/Assets/Mapbox/Examples/1_DataExplorer/Traffic/SevereTrafficMaterial.asset # sdkproject/Assets/Mapbox/Examples/1_DataExplorer/Traffic/SevereTrafficMaterial.mat.meta # sdkproject/Assets/Mapbox/Examples/1_DataExplorer/TrafficAndDirections.unity # sdkproject/Assets/Mapbox/Examples/1_DataExplorer/TrafficAndDirections.unity.meta # sdkproject/Assets/Mapbox/Examples/2_AstronautGame/AstronautGame.unity # sdkproject/Assets/Mapbox/Examples/2_AstronautGame/AstronautGame.unity.meta # sdkproject/Assets/Mapbox/Examples/2_AstronautGame/AstronautGame/Park/cone.FBX.meta # sdkproject/Assets/Mapbox/Examples/2_AstronautGame/AstronautGame/Road/LocationRoadMaterialModifier.asset # sdkproject/Assets/Mapbox/Examples/4_ReplaceFeatures/IconicBuildings.unity # sdkproject/Assets/Mapbox/Examples/4_ReplaceFeatures/ReplaceFeatures.unity # sdkproject/Assets/Mapbox/Examples/5_Playground/Materials/HeadingMat.mat # sdkproject/Assets/Mapbox/Examples/5_Playground/Materials/HeadingMat.mat.meta # sdkproject/Assets/Mapbox/Examples/5_Playground/Scenes/RemoveZ-Fighting.unity # sdkproject/Assets/Mapbox/Examples/Prefabs/ReloadMapIconicBuildingCanvas.prefab # sdkproject/Assets/Mapbox/Examples/Resources/DirectionMaterial.mat.meta # sdkproject/Assets/Mapbox/Prefabs/CitySimulatorMap.prefab # sdkproject/Assets/Mapbox/Prefabs/IconicBuildingMap.prefab # sdkproject/Assets/Mapbox/Resources/HeroStructures/Materials/StatueOfLibertyBase.mat # sdkproject/Assets/Mapbox/Resources/HeroStructures/Materials/StatueOfLibertyBody.mat # sdkproject/Assets/Mapbox/Unity/DataContainers/ElevationRequiredOptions.cs # sdkproject/Assets/Mapbox/Unity/DataContainers/GeometryMaterialOptions.cs # sdkproject/Assets/Mapbox/Unity/DataContainers/TileProviderOptions.cs # sdkproject/Assets/Mapbox/Unity/Editor/FeatureSubLayerTreeView.cs # sdkproject/Assets/Mapbox/Unity/Editor/MapManagerEditor.cs # sdkproject/Assets/Mapbox/Unity/Editor/PointsOfInterestSubLayerTreeView.cs # sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/BehaviorModifiersSectionDrawer.cs # sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/CoreVectorLayerPropertiesDrawer.cs # sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/ElevationLayerPropertiesDrawer.cs # sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/ElevationRequiredOptionsDrawer.cs # sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/FeaturesSubLayerPropertiesDrawer.cs # sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/GeometryMaterialOptionsDrawer.cs # sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/ModelingSectionDrawer.cs # sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/PointsOfInterestSubLayerPropertiesDrawer.cs # sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/VectorFilterOptionsDrawer.cs # sdkproject/Assets/Mapbox/Unity/LayerProperties/CoreVectorLayerProperties.cs # sdkproject/Assets/Mapbox/Unity/LayerProperties/VectorSubLayerProperties.cs # sdkproject/Assets/Mapbox/Unity/Map/AbstractMap.cs # sdkproject/Assets/Mapbox/Unity/Map/AbstractMapVisualizer.cs # sdkproject/Assets/Mapbox/Unity/Map/AbstractTileProvider.cs # sdkproject/Assets/Mapbox/Unity/Map/GlobeTileProvider.cs # sdkproject/Assets/Mapbox/Unity/Map/Interfaces/IMap.cs # sdkproject/Assets/Mapbox/Unity/Map/QuadTreeTileProvider.cs # sdkproject/Assets/Mapbox/Unity/Map/RangeAroundTransformTileProvider.cs # sdkproject/Assets/Mapbox/Unity/Map/RangeTileProvider.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Data/UnityTile.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/AbstractTileFactory.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/ImageDataFetcher.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/MapImageFactory.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/TerrainDataFetcher.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/TerrainFactoryBase.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/TerrainStrategies/ElevatedTerrainStrategy.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/TerrainStrategies/ElevatedTerrainWithSidesStrategy.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/TerrainStrategies/FlatSphereTerrainStrategy.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/TerrainStrategies/FlatTerrainStrategy.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/TerrainStrategies/LowPolyTerrainStrategy.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/VectorDataFetcher.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/VectorTileFactory.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Interfaces/LayerVisualizerBase.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/LayerVisualizers/LocationPrefabsLayerVisualizer.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/LayerVisualizers/VectorLayerVisualizer.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshModifiers/ReplaceFeatureCollectionModifier.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshModifiers/ReplaceFeatureModifier.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/TextureSideWallModifier.cs # sdkproject/Assets/Mapbox/Unity/SourceLayers/MapboxDefaultStyles.cs # sdkproject/Assets/Mapbox/Unity/SourceLayers/TerrainLayer.cs # sdkproject/Assets/MapboxAR/Examples/Scenes/TabletopAR.unity # sdkproject/Assets/MapboxAR/Examples/Scenes/WorldScaleAR-ManualAlignment.unity # sdkproject/Assets/MapboxAR/Examples/Scenes/WorldScaleAR.unity # sdkproject/Assets/Resources.meta # sdkproject/ProjectSettings/ProjectSettings.asset # sdkproject/ProjectSettings/ProjectVersion.txt
mapbox · Oct 9, 2018 · 9f31aeb · 9f31aeb
2 parents cf02f6d + 894a557
commit 9f31aeb
Show file tree

Hide file tree

Showing 337 changed files with 28,036 additions and 3,510 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,13 @@
 # Autosave files
 *~
 
+# HoloToolkit
+sdkproject/Assets/HoloToolkit-Examples.meta
+sdkproject/Assets/HoloToolkit-Examples/
+sdkproject/Assets/HoloToolkit.meta
+sdkproject/Assets/HoloToolkit/
+sdkproject/UWP/
+
 MapboxSDKforUnityCore*/
 
 sdkproject/Assets/WSATestCertificate.pfx

diff --git a/.gitmodules b/.gitmodules
diff --git a/README.md b/README.md
@@ -46,16 +46,6 @@ Linux/Mac: `./update-mapbox-unity-sdk-core.sh`
 # Documentation
 Documentation is generated using DocFX from this repo and is hosted at: https://www.mapbox.com/mapbox-unity-sdk/.
 
-# Dependencies
-This project includes git submodule dependencies outlined in [this gitmodules](https://github.com/mapbox/mapbox-unity-sdk/blob/develop/.gitmodules) file.
-
-To install/update the dependencies after `git clone`/`git pull` run `update-mapbox-unity-sdk-core.bat` or `update-mapbox-unity-sdk-core.sh` (depending on your OS).
-
-These repos are actively developed and maintained:
-- https://github.com/mapbox/vector-tile-cs
-
-**NOTE: As of May 16, 2017, the https://github.com/mapbox/mapbox-sdk-cs repo has been merged into this repo. These source files are now located here: `/sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs`. Core `cs` changes will be backported on a case-by-case basis.**
-
 # Building a Unity Package
 To build a Unity Package for import into your own project from the included `sdkproject`:
 1. Select `Mapbox` folder in the project view.
@@ -68,3 +58,4 @@ To build a Unity Package for import into your own project from the included `sdk
 ![screen shot 2017-05-26 at 1 14 55 pm](https://cloud.githubusercontent.com/assets/23202691/26509585/9d9677c2-4216-11e7-82ae-c34d150d6d5c.png)
 
 4. Click `Export` and choose a location.
+<!--<
diff --git a/SharpCompress.dll b/SharpCompress.dll
diff --git a/UnityPackager.exe b/UnityPackager.exe
diff --git a/dependencies/vector-tile-cs b/dependencies/vector-tile-cs
diff --git a/documentation/docs/05-changelog.md b/documentation/docs/05-changelog.md
@@ -1,5 +1,28 @@
 ## CHANGELOG
 
+### v.1.4.6
+10/15/2018
+##### New Features
+- *Runtime editing of map features* - Map elements like Imagery, Terrain, Feature Properties can now be updated during runtime, using AbstractMap UI in the Editor , or by using the API methods.
+- *Map API’s* - Maps SDK for Unity now has API methods to build and edit maps entirely using scripts.
+##### Improvements
+- Improves fallback for terrain tiles with missing or no data. Image will be now rendered on flat tiles instead of blank tiles.
+- Improves terrain height query by using local position/rotation/scale of a tile. Use `QueryElevationInUnityUnitsAt` or `QueryElevationInMetersAt` API methods to query height.
+- Terrain module “Sample Count” property changed to a slider.
+- Improves tile loading and recycling performance.
+##### Bug Fixes
+- Fixes issue where Terrain was not turned off with `None` option.
+- Fixes issue where Node Editor script was throwing a compilation error due to deprecated API in Unity 2018.2
+- Fixes issue where SnapToZero moved the map for each new tile loaded instead of only using the first one.
+- Fixes issue with the height modifier where floor height calculations were wrong causing overlapping floors.
+- Fixes issue where dispose buffer setting was being ignored by `RangeAroundTransform` extent type.
+- Fixes builds for UWP/ Hololens environments.
+- Fixes issue where ARTableTop map would not snap to the detected plane on zooming in/out.
+- Fixes issue where `BuildingsWithUniqueIds`  setting was getting applied incorrectly, resulting in missing buildings.
+
+##### Breaking Changes
+- Any `Feature` layers under `Map Layers` using a `Custom` style type will need to be re-assigned through the AbstractMap UI. This change was necessary to persist custom style options when switching between different styles.
+
 ### v.1.4.5
 08/20/2018
 ##### New Features