Merge commit '712cd80dd287588b40b164b20ab4ced121d79ffc' into ui-fixes

* commit '712cd80dd287588b40b164b20ab4ced121d79ffc':
  Fix range height extrusion (#613)

# Conflicts:
#	sdkproject/Assets/Mapbox/Unity/DataContainers/MapboxEnums.cs

Author: abhishektrip

documentation/docs/05-changelog.md

@@ -1,22 +1,28 @@
 ## CHANGELOG
+### v.1.4.0
+*??/??/2018*
+
+#####
+- Fix `Range Property` extrusion option for vector features.
+- Add scale factor for extrusion value derived from feature property.
 
 ### v.1.4.0
 *03/20/2018*
 
 #####
-- Drag and drop prefabs for most common use cases. 
+- Drag and drop prefabs for most common use cases.
 - New Abstract Map UI
-- Style development - colorization and atlas template generator 
+- Style development - colorization and atlas template generator
 - Use texture atlas for building geometries.
-- Merge buildings with unique ids using the experimental 3D buildings tileset. 
+- Merge buildings with unique ids using the experimental 3D buildings tileset.
 - Added a API call on AbstractMap to query height at a certain latitude longitude.
 - Included EditorConfig file to enforce coding style
 - Integration of previously seperate AR support https://github.com/mapbox/mapbox-unity-sdk/pull/544
 
 ### v.1.3.0
 *12/18/2017*
 
-##### Upgrade Instructions 
+##### Upgrade Instructions
 - As always, if you already have a project with a previous version of the SDK, please remove older versions before installing this new one!
 - `FeatureBehaviour` is no longer added to feature gameobjects by default. Use a `FeatureBehaviourModifier` to add this component (optimization).
 - `TextureModifier` is obsolete. Please use `MaterialModifier`.
@@ -31,7 +37,7 @@
 
 ##### New Features
 - Added convenience methods to `AbstractMap`  to convert between Lat/Lon ↔ Vector3. This also works for maps that have been translated, rotated, or scaled! #387
-- Added tile error exception events that you can hook into to know when specific tiles fail to load. We provide an example `TileErrorHandler` object that logs these to console. 
+- Added tile error exception events that you can hook into to know when specific tiles fail to load. We provide an example `TileErrorHandler` object that logs these to console.
 - Added C# wrapper for Mapbox Token API (to validate tokens).
 - Added transparency shader for raster tiles—this enables you to convert black to alpha from Mapbox studio styles (to render just road labels, for example).
 - Added new `LoftModifier`—use this to make complex geometry from line features.
@@ -43,7 +49,7 @@
 ##### Bug Fixes
 - It should now be safe to nest the Mapbox folder (SDK) in your own projects.
 - You can now properly change/load scenes at runtime. #381
-- Fixed token validation issues (validate token when initializing `MapboxAccess`). #430 
+- Fixed token validation issues (validate token when initializing `MapboxAccess`). #430
 - Custom inspectors now properly serialize assets assigned via built-in object browser.
 - Fix for certain tile providers not updating properly when re-initializing a map.
 - Fixed issue where clipped features would result in several new features. #398
@@ -67,7 +73,7 @@
   - Array support to mock a specific route (`LocationArrayEditorLocationProvider`).
   - Transform support on `EditorLocationProvider` to create simple offsets.
   - Use Unity Remote app to send location updates directly to the Unity editor from your device!
-- `DynamicZoom` example has been improved, see new `Zoomable` map example. 
+- `DynamicZoom` example has been improved, see new `Zoomable` map example.
 - Added string to lat/lon conversion method.
 - Various nodes in the map factory framework now have public fields to support run-time styling or modification before map generation (based on settings, for example).
 - Maps now support float values for zoom level—you can use this to inform camera controllers, for example.
@@ -214,7 +220,7 @@
 - Elevation textures are no longer held in memory and height data parsing and access is much faster
 - Added new `FlatTerrainFactory` that is optimized specifically for flat maps
 - Tiles can now be cached in memory—configure the cache size in `MapboxAccess.cs` (default size is 500)
-- Slippy maps now dispose tiles that determined to be "out of range" 
+- Slippy maps now dispose tiles that determined to be "out of range"
   - Tiles that are out of range before completion are properly cancelled
 - Terrain generation in Unity 5.5+ should be much faster and allocate less memory
 
@@ -256,12 +262,12 @@
 - Fixed issue where visualizers for `MeshFactories` were not being serialized properly
 - Fixed null reference exception when creating a new `MeshFactory`
 
-### v0.5.0 
+### v0.5.0
 
 *04/26/2017*
 
-- Added support for UWP 
-    - Share your Hololens creations with us! 
+- Added support for UWP
+    - Share your Hololens creations with us!
 - Fixed precision issue with tile conversions
     - Replaced `Geocoordinate` with `Vector2d`
 - Mapbox API Token is now stored in MapboxAccess.txt

sdkproject/Assets/Mapbox/Unity/DataContainers/GeometryExtrusionOptions.cs

@@ -3,6 +3,7 @@
 	using System;
 	using Mapbox.Unity.MeshGeneration.Modifiers;
 	using Mapbox.Unity.MeshGeneration.Data;
+	using UnityEngine;
 
 	[Serializable]
 	public class GeometryExtrusionOptions : ModifierProperties
@@ -16,9 +17,12 @@ public override Type ModifierType
 		}
 		public ExtrusionType extrusionType = ExtrusionType.None;
 		public ExtrusionGeometryType extrusionGeometryType = ExtrusionGeometryType.RoofAndSide;
+		[Tooltip("Property name in feature layer to use for extrusion.")]
 		public string propertyName = "height";
 		public float minimumHeight = 0f;
 		public float maximumHeight = 0f;
+		[Tooltip("Scale factor to multiply the extrusion value of the feature.")]
+		public float extrusionScaleFactor = 1f;
 	}
 
 	[Serializable]
@@ -38,6 +42,7 @@ public override Type ModifierType
 		public string propertyName = "height";
 		public float minimumHeight = 0f;
 		public float maximumHeight = 0f;
+		public float extrusionScaleFactor = 1f;
 
 		public GeometryExtrusionWithAtlasOptions()
 		{
@@ -50,6 +55,7 @@ public GeometryExtrusionWithAtlasOptions(GeometryExtrusionOptions extrusionOptio
 			propertyName = extrusionOptions.propertyName;
 			minimumHeight = extrusionOptions.minimumHeight;
 			maximumHeight = extrusionOptions.maximumHeight;
+			extrusionScaleFactor = extrusionOptions.extrusionScaleFactor;
 
 			texturingType = uvOptions.texturingType;
 			atlasInfo = uvOptions.atlasInfo;

sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/GeometryExtrusionOptionsDrawer.cs

@@ -3,6 +3,7 @@
 	using UnityEditor;
 	using UnityEngine;
 	using Mapbox.Unity.Map;
+	using Mapbox.VectorTile.ExtensionMethods;
 
 	[CustomPropertyDrawer(typeof(GeometryExtrusionOptions))]
 	public class GeometryExtrusionOptionsDrawer : PropertyDrawer
@@ -12,9 +13,9 @@ public class GeometryExtrusionOptionsDrawer : PropertyDrawer
 		public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
 		{
 			EditorGUI.BeginProperty(position, label, property);
-
-			var typePosition = EditorGUI.PrefixLabel(new Rect(position.x, position.y, position.width, lineHeight), GUIUtility.GetControlID(FocusType.Passive), new GUIContent("Extrusion Type"));
 			var extrusionTypeProperty = property.FindPropertyRelative("extrusionType");
+			var typePosition = EditorGUI.PrefixLabel(new Rect(position.x, position.y, position.width, lineHeight), GUIUtility.GetControlID(FocusType.Passive), new GUIContent { text = "Extrusion Type", tooltip = EnumExtensions.Description((Unity.Map.ExtrusionType)extrusionTypeProperty.enumValueIndex) });
+
 
 			EditorGUI.indentLevel--;
 			extrusionTypeProperty.enumValueIndex = EditorGUI.Popup(typePosition, extrusionTypeProperty.enumValueIndex, extrusionTypeProperty.enumDisplayNames);
@@ -24,48 +25,57 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
 			var minHeightProperty = property.FindPropertyRelative("minimumHeight");
 			var maxHeightProperty = property.FindPropertyRelative("maximumHeight");
 
+			var extrusionGeometryType = property.FindPropertyRelative("extrusionGeometryType");
+			var extrusionGeometryGUI = new GUIContent { text = "Extrusion Geometry Type", tooltip = EnumExtensions.Description((Unity.Map.ExtrusionGeometryType)extrusionGeometryType.enumValueIndex) };
 			EditorGUI.indentLevel++;
 			switch (sourceTypeValue)
 			{
 				case Unity.Map.ExtrusionType.None:
 					break;
 				case Unity.Map.ExtrusionType.PropertyHeight:
 					position.y += lineHeight;
-					EditorGUI.PropertyField(new Rect(position.x, position.y, position.width, lineHeight), property.FindPropertyRelative("extrusionGeometryType"));
+					EditorGUI.PropertyField(new Rect(position.x, position.y, position.width, lineHeight), extrusionGeometryType, extrusionGeometryGUI);
 					position.y += lineHeight;
 					EditorGUI.PropertyField(new Rect(position.x, position.y, position.width, lineHeight), property.FindPropertyRelative("propertyName"));
 					break;
 				case Unity.Map.ExtrusionType.MinHeight:
 					position.y += lineHeight;
-					EditorGUI.PropertyField(new Rect(position.x, position.y, position.width, lineHeight), property.FindPropertyRelative("extrusionGeometryType"));
+					EditorGUI.PropertyField(new Rect(position.x, position.y, position.width, lineHeight), extrusionGeometryType, extrusionGeometryGUI);
 					position.y += lineHeight;
 					EditorGUI.PropertyField(new Rect(position.x, position.y, position.width, lineHeight), property.FindPropertyRelative("propertyName"));
 					break;
 				case Unity.Map.ExtrusionType.MaxHeight:
 					position.y += lineHeight;
-					EditorGUI.PropertyField(new Rect(position.x, position.y, position.width, lineHeight), property.FindPropertyRelative("extrusionGeometryType"));
+					EditorGUI.PropertyField(new Rect(position.x, position.y, position.width, lineHeight), extrusionGeometryType, extrusionGeometryGUI);
 					position.y += lineHeight;
 					EditorGUI.PropertyField(new Rect(position.x, position.y, position.width, lineHeight), property.FindPropertyRelative("propertyName"));
 					break;
 				case Unity.Map.ExtrusionType.RangeHeight:
 					position.y += lineHeight;
-					EditorGUI.PropertyField(new Rect(position.x, position.y, position.width, lineHeight), property.FindPropertyRelative("extrusionGeometryType"));
+					EditorGUI.PropertyField(new Rect(position.x, position.y, position.width, lineHeight), extrusionGeometryType, extrusionGeometryGUI);
 					position.y += lineHeight;
 					EditorGUI.PropertyField(new Rect(position.x, position.y, position.width, lineHeight), property.FindPropertyRelative("propertyName"));
 					position.y += lineHeight;
 					EditorGUI.PropertyField(new Rect(position.x, position.y, position.width, lineHeight), minHeightProperty);
 					position.y += lineHeight;
 					EditorGUI.PropertyField(new Rect(position.x, position.y, position.width, lineHeight), maxHeightProperty);
+					if (minHeightProperty.floatValue > maxHeightProperty.floatValue)
+					{
+						//position.y += lineHeight;
+						EditorGUILayout.HelpBox("Maximum Height less than Minimum Height!", MessageType.Error);
+					}
 					break;
 				case Unity.Map.ExtrusionType.AbsoluteHeight:
 					position.y += lineHeight;
-					EditorGUI.PropertyField(new Rect(position.x, position.y, position.width, lineHeight), property.FindPropertyRelative("extrusionGeometryType"));
+					EditorGUI.PropertyField(new Rect(position.x, position.y, position.width, lineHeight), extrusionGeometryType, extrusionGeometryGUI);
 					position.y += lineHeight;
 					EditorGUI.PropertyField(new Rect(position.x, position.y, position.width, lineHeight), maxHeightProperty, new GUIContent { text = "Height" });
 					break;
 				default:
 					break;
 			}
+			position.y += lineHeight;
+			EditorGUI.PropertyField(new Rect(position.x, position.y, position.width, lineHeight), property.FindPropertyRelative("extrusionScaleFactor"), new GUIContent { text = "Scale Factor" });
 			EditorGUI.indentLevel--;
 
 			EditorGUI.EndProperty();
@@ -75,7 +85,7 @@ public override float GetPropertyHeight(SerializedProperty property, GUIContent
 			var extrusionTypeProperty = property.FindPropertyRelative("extrusionType");
 			var sourceTypeValue = (Unity.Map.ExtrusionType)extrusionTypeProperty.enumValueIndex;
 
-			int rows = 0;
+			int rows = 1;
 			//if (showPosition)
 			{
 				switch (sourceTypeValue)

sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshModifiers/HeightModifier.cs

@@ -39,17 +39,6 @@ public static MinMaxPair GetMinMaxHeight(List<Vector3> vertices)
 	[CreateAssetMenu(menuName = "Mapbox/Modifiers/Height Modifier")]
 	public class HeightModifier : MeshModifier
 	{
-		//[SerializeField]
-		//[Tooltip("Flatten top polygons to prevent unwanted slanted roofs because of the bumpy terrain")]
-		//private bool _flatTops;
-
-		//[SerializeField]
-		//[Tooltip("Fix all features to certain height, suggested to be used for pushing roads above terrain level to prevent z-fighting.")]
-		//private bool _forceHeight;
-
-		//[SerializeField]
-		//[Tooltip("Fixed height value for ForceHeight option")]
-		//private float _height;
 		private float _scale = 1;
 
 		//[SerializeField]
@@ -89,17 +78,21 @@ public override void Run(VectorFeatureUnity feature, MeshData md, UnityTile tile
 
 			float maxHeight = 1.0f;
 			float minHeight = 0.0f;
+
 			QueryHeight(feature, md, tile, out maxHeight, out minHeight);
-			height = (maxHeight - minHeight) * _scale;
-			maxHeight = maxHeight * _scale;
-			minHeight = minHeight * _scale;
+
+			maxHeight = maxHeight * _options.extrusionScaleFactor * _scale;
+			minHeight = minHeight * _options.extrusionScaleFactor * _scale;
+			height = (maxHeight - minHeight);
+
 			//Set roof height 
 			GenerateRoofMesh(md, minHeight, maxHeight);
 
 			GenerateWallMesh(md);
 
 		}
-		private void GenerateWallMesh(MeshData md)
+
+		protected virtual void GenerateWallMesh(MeshData md)
 		{
 			md.Vertices.Capacity = _counter + md.Edges.Count * 2;
 			float d = 0f;
@@ -170,7 +163,7 @@ private void GenerateWallMesh(MeshData md)
 			}
 		}
 
-		private void GenerateRoofMesh(MeshData md, float minHeight, float maxHeight)
+		protected virtual void GenerateRoofMesh(MeshData md, float minHeight, float maxHeight)
 		{
 			if (_options.extrusionGeometryType != ExtrusionGeometryType.SideOnly)
 			{
@@ -206,6 +199,10 @@ private void GenerateRoofMesh(MeshData md, float minHeight, float maxHeight)
 						}
 						break;
 					case ExtrusionType.RangeHeight:
+						for (int i = 0; i < _counter; i++)
+						{
+							md.Vertices[i] = new Vector3(md.Vertices[i].x, md.Vertices[i].y + maxHeight, md.Vertices[i].z);
+						}
 						break;
 					case ExtrusionType.AbsoluteHeight:
 						for (int i = 0; i < _counter; i++)
@@ -219,7 +216,7 @@ private void GenerateRoofMesh(MeshData md, float minHeight, float maxHeight)
 			}
 		}
 
-		private void QueryHeight(VectorFeatureUnity feature, MeshData md, UnityTile tile, out float maxHeight, out float minHeight)
+		protected virtual void QueryHeight(VectorFeatureUnity feature, MeshData md, UnityTile tile, out float maxHeight, out float minHeight)
 		{
 			minHeight = 0.0f;
 			maxHeight = 0.0f;
@@ -244,8 +241,20 @@ private void QueryHeight(VectorFeatureUnity feature, MeshData md, UnityTile tile
 				case ExtrusionType.RangeHeight:
 					if (feature.Properties.ContainsKey(_options.propertyName))
 					{
+						if (_options.minimumHeight > _options.maximumHeight)
+						{
+							Debug.LogError("Maximum Height less than Minimum Height.Swapping values for extrusion.");
+							var temp = _options.minimumHeight;
+							_options.minimumHeight = _options.maximumHeight;
+							_options.maximumHeight = temp;
+						}
 						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);
+						}
 					}
 					break;
 				case ExtrusionType.AbsoluteHeight:

sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/TextureSideWallModifier.cs

@@ -9,11 +9,6 @@ namespace Mapbox.Unity.MeshGeneration.Modifiers
 	[CreateAssetMenu(menuName = "Mapbox/Modifiers/Textured Side Wall Modifier")]
 	public class TextureSideWallModifier : MeshModifier
 	{
-		//[SerializeField]
-		//private float _height;
-		//[SerializeField]
-		//private bool _forceHeight;
-
 		private float _scaledFloorHeight = 0;
 		private float _scaledFirstFloorHeight = 0;
 		private float _scaledTopFloorHeight = 0;
@@ -92,17 +87,11 @@ public override void Run(VectorFeatureUnity feature, MeshData md, UnityTile tile
 
 			//read or force height
 			float maxHeight = 1, minHeight = 0;
-			//SetHeight(feature, md, tile, out maxHeight, out minHeight);
-			//height = maxHeight - minHeight;
-			//for (int i = 0; i < md.Vertices.Count; i++)
-			//{
-			//	md.Vertices[i] = new Vector3(md.Vertices[i].x, md.Vertices[i].y + maxHeight, md.Vertices[i].z);
-			//}
 
 			QueryHeight(feature, md, tile, out maxHeight, out minHeight);
-			height = (maxHeight - minHeight) * _scale;
-			maxHeight = maxHeight * _scale;
-			minHeight = minHeight * _scale;
+			maxHeight = maxHeight * _options.extrusionScaleFactor * _scale;
+			minHeight = minHeight * _options.extrusionScaleFactor * _scale;
+			height = (maxHeight - minHeight);
 
 			GenerateRoofMesh(md, minHeight, maxHeight);
 
@@ -367,6 +356,10 @@ private void GenerateRoofMesh(MeshData md, float minHeight, float maxHeight)
 						}
 						break;
 					case ExtrusionType.RangeHeight:
+						for (int i = 0; i < _counter; i++)
+						{
+							md.Vertices[i] = new Vector3(md.Vertices[i].x, md.Vertices[i].y + maxHeight, md.Vertices[i].z);
+						}
 						break;
 					case ExtrusionType.AbsoluteHeight:
 						for (int i = 0; i < _counter; i++)
@@ -405,8 +398,21 @@ private void QueryHeight(VectorFeatureUnity feature, MeshData md, UnityTile tile
 				case ExtrusionType.RangeHeight:
 					if (feature.Properties.ContainsKey(_options.propertyName))
 					{
+						if (_options.minimumHeight > _options.maximumHeight)
+						{
+							Debug.LogError("Maximum Height less than Minimum Height.Swapping values for extrusion.");
+							var temp = _options.minimumHeight;
+							_options.minimumHeight = _options.maximumHeight;
+							_options.maximumHeight = temp;
+						}
 						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;
 				case ExtrusionType.AbsoluteHeight: