Skip to content

Merge master develop #781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 16, 2018
Merged

Merge master develop #781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f3ff431
Release/v1.4.1 (#682)
abhishektrip Apr 17, 2018
d54659b
Release/v1.4.2 (#772)
abhishektrip May 14, 2018
8919242
V1.4.2 hotfix (#780)
abhishektrip May 16, 2018
8ed8533
Merge branch 'master' into merge-master-develop
abhishektrip May 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions documentation/docs/05-changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#### 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
- `Filters` with empty key or value parameters will exclude all features in a layer.
Expand Down
2 changes: 1 addition & 1 deletion sdkproject/Assets/Mapbox/Unity/LayerProperties/CoreVectorLayerProperties.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
public class CoreVectorLayerProperties
{
[SerializeField]
private string sourceId = "";
private string sourceId;
[Tooltip("Is visualizer active.")]
public bool isActive = true;
[Tooltip("Name of the visualizer. ")]
Expand Down
19 changes: 6 additions & 13 deletions ...roject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/GameObjectModifiers/PrefabModifier.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@ namespace Mapbox.Unity.MeshGeneration.Modifiers
[CreateAssetMenu(menuName = "Mapbox/Modifiers/Prefab Modifier")]
public class PrefabModifier : GameObjectModifier
{
//[SerializeField]
//private GameObject _prefab;

//[SerializeField]
//private bool _scaleDownWithWorld = false;

private Dictionary<GameObject, GameObject> _objects;
[SerializeField]
private SpawnPrefabOptions _options;
Expand Down Expand Up @@ -63,11 +57,11 @@ public override void Run(VectorEntity ve, UnityTile tile)
{
goRectTransform.anchoredPosition3D = met;
}
//go.transform.localScale = Constants.Math.Vector3One;


if (!_options.scaleDownWithWorld)
if (_options.scaleDownWithWorld)
{
go.transform.localScale = (go.transform.localScale * (1.0f / tile.TileScale));
go.transform.localScale = (go.transform.localScale * (tile.TileScale));
}
return;
}
Expand All @@ -89,19 +83,18 @@ public override void Run(VectorEntity ve, UnityTile tile)
{
goRectTransform.anchoredPosition3D = met;
}

go.transform.SetParent(ve.GameObject.transform, false);
go.transform.localScale = Constants.Math.Vector3One;
//go.transform.localScale = Constants.Math.Vector3One;

settable = go.GetComponent<IFeaturePropertySettable>();
if (settable != null)
{
settable.Set(ve.Feature.Properties);
}

if (!_options.scaleDownWithWorld)
if (_options.scaleDownWithWorld)
{
go.transform.localScale = (go.transform.localScale * (1.0f / tile.TileScale));
go.transform.localScale = (go.transform.localScale * (tile.TileScale));
}

if (_options.AllPrefabsInstatiated != null)
Expand Down