Skip to content

Commit 9288df1

Browse files
committed
Merge commit 'f3ff431e6291610e90b1b9f2885cf74d26d098c5' into release/v1.4.2
* commit 'f3ff431e6291610e90b1b9f2885cf74d26d098c5': Release/v1.4.1 (#682) # Conflicts: # documentation/docs/05-changelog.md # sdkproject/Assets/Mapbox/Core/cheap-ruler-cs/Tests/Editor/CheapRulerCsTests.cs.meta # sdkproject/Assets/Mapbox/Core/cheap-ruler-cs/Tests/Editor/MapboxUnitTests_CheapRulerCs.cs.meta # sdkproject/Assets/Mapbox/Examples/1_DataExplorer/DataExplorer.unity # sdkproject/Assets/Mapbox/Examples/1_DataExplorer/InteractiveStyledVectorMap.unity # sdkproject/Assets/Mapbox/Examples/2_ZoomableMap/ZoomableMap.unity # sdkproject/Assets/Mapbox/Unity/Constants.cs # sdkproject/Assets/Mapbox/Unity/DataContainers/MapboxEnums.cs # sdkproject/Assets/Mapbox/Unity/Editor/GeocodeAttributeSearchWindow.cs # sdkproject/Assets/Mapbox/Unity/Editor/MapManagerEditor.cs # sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/ColliderOptionsDrawer.cs # sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/CoreVectorLayerPropertiesDrawer.cs # sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/ElevationLayerPropertiesDrawer.cs # sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/GeometryExtrusionOptionsDrawer.cs # sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/GeometryMaterialOptionsDrawer.cs # sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/ImageryLayerPropertiesDrawer.cs # sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/MapExtentOptionsDrawer.cs # sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/MapPlacementOptionsDrawer.cs # sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/MapScalingOptionsDrawer.cs # sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/StyleOptionsDrawer.cs # sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/VectorLayerPropertiesDrawer.cs # sdkproject/Assets/Mapbox/Unity/Editor/VectorSubLayerTreeView.cs # sdkproject/Assets/Mapbox/Unity/Map/InitializeMapWithLocationProvider.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/TerrainFactoryWithSideWalls.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/TerrainStrategies/ElevatedTerrainWithSidesStrategy.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/TerrainWithSideWallsFactory.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/TerrainWithSideWallsFactory.cs.meta # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Filters/TypeFilter.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/GameObjectModifiers/ColliderModifier.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshModifiers/HeightModifier.cs # sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/TextureSideWallModifier.cs # sdkproject/Assets/MapboxAR/Examples/Scenes/WorldScaleAR-ManualAlignment.unity # sdkproject/Assets/MapboxAR/Examples/Scenes/WorldScaleAR.unity # sdkproject/Assets/MapboxAR/Prefabs/WorldAlignmentKit.prefab # sdkproject/Assets/MapboxAR/Prefabs/WorldAlignmentKitManual.prefab # sdkproject/Assets/MapboxAR/Prefabs/WorldAlignmentKitManual.prefab.meta # sdkproject/Assets/MapboxDevTools/Editor/CopyEditModeTests.cs.meta # sdkproject/Assets/UnityARKitPlugin/Examples/Common/Models.meta # sdkproject/ProjectSettings/EditorBuildSettings.asset # sdkproject/ProjectSettings/ProjectSettings.asset
2 parents f199991 + f3ff431 commit 9288df1

File tree

5 files changed

+677
-10
lines changed

5 files changed

+677
-10
lines changed

sdkproject/Assets/Mapbox/Examples/0_PrefabScenes/CitySimulator.unity

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,12 @@ Prefab:
279279
propertyPath: m_RootOrder
280280
value: 2
281281
objectReference: {fileID: 0}
282+
- target: {fileID: 114196496685157712, guid: 5bb46bae81bf04608ac699be504c5e66,
283+
type: 2}
284+
propertyPath: _vectorData._layerProperty.vectorSubLayers.Array.data[0].materialOptions.colorPalette
285+
value:
286+
objectReference: {fileID: 11400000, guid: ef118b5e263da4b1fa4327ca1d3e0c7b,
287+
type: 2}
282288
m_RemovedComponents: []
283289
m_ParentPrefab: {fileID: 100100000, guid: 5bb46bae81bf04608ac699be504c5e66, type: 2}
284290
m_IsPrefabParent: 0
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
namespace Mapbox.Editor
2+
{
3+
using System.Collections;
4+
using System.Collections.Generic;
5+
using UnityEngine;
6+
using UnityEditor.IMGUI.Controls;
7+
using UnityEditor;
8+
using Mapbox.Unity.Map;
9+
10+
public class VectorSubLayerTreeView : TreeView
11+
{
12+
public SerializedProperty Layers;
13+
14+
public VectorSubLayerTreeView(TreeViewState state)
15+
: base(state)
16+
{
17+
showAlternatingRowBackgrounds = true;
18+
showBorder = true;
19+
Reload();
20+
}
21+
22+
protected override TreeViewItem BuildRoot()
23+
{
24+
// The root item is required to have a depth of -1, and the rest of the items increment from that.
25+
var root = new TreeViewItem { id = -1, depth = -1, displayName = "Root" };
26+
27+
var items = new List<TreeViewItem>();
28+
var index = 0;
29+
30+
if (Layers != null)
31+
{
32+
for (int i = 0; i < Layers.arraySize; i++)
33+
{
34+
var name = Layers.GetArrayElementAtIndex(i).FindPropertyRelative("coreOptions.sublayerName").stringValue;
35+
//Debug.Log(name);
36+
items.Add(new TreeViewItem { id = index, depth = 0, displayName = name });
37+
index++;
38+
}
39+
}
40+
41+
// Utility method that initializes the TreeViewItem.children and .parent for all items.
42+
SetupParentsAndChildrenFromDepths(root, items);
43+
44+
// Return root of the tree
45+
return root;
46+
}
47+
48+
protected override bool CanRename(TreeViewItem item)
49+
{
50+
return true;
51+
}
52+
53+
protected override void RenameEnded(RenameEndedArgs args)
54+
{
55+
if (Layers != null)
56+
{
57+
//var layer = Layers[args.itemID]; //
58+
//layer = args.newName;
59+
var layer = Layers.GetArrayElementAtIndex(args.itemID);
60+
if (string.IsNullOrEmpty(args.newName.Trim()))
61+
{
62+
layer.FindPropertyRelative("coreOptions.sublayerName").stringValue = args.originalName;
63+
}
64+
else
65+
{
66+
layer.FindPropertyRelative("coreOptions.sublayerName").stringValue = args.newName;
67+
}
68+
}
69+
}
70+
}
71+
}

0 commit comments

Comments
 (0)