Skip to content

fix mesh factory editor script null ref errors and not saving on change #41

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
david-rhodes merged 4 commits into from
May 1, 2017
Merged

fix mesh factory editor script null ref errors and not saving on change #41

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
b748803
fix mesh factory editor script null ref errors and not saving on change
brnkhy Apr 28, 2017
820ab97
Merge branch 'develop' of github.com:mapbox/mapbox-unity-sdk into mes…
May 1, 2017
e1e4c77
fix an issue where terrain factory visualizers list isn't getting ini…
brnkhy May 1, 2017
d15b92f
Merge branch 'meshFactoryEditorFix' of https://github.com/mapbox/mapb…
brnkhy May 1, 2017
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
32 changes: 20 additions & 12 deletions sdkproject/Assets/Mapbox/Core/Unity/Editor/MeshFactoryEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@ void OnEnable()
mapId_Prop = serializedObject.FindProperty("_mapId");
script = MonoScript.FromScriptableObject(_factory);
}

public override void OnInspectorGUI()
{
if (_factory == null)
return;

serializedObject.Update();

GUI.enabled = false;
Expand All @@ -42,32 +46,36 @@ public override void OnInspectorGUI()
EditorGUILayout.Space();
EditorGUILayout.Space();
EditorGUILayout.LabelField("Layer Visualizers");

EditorGUILayout.Space();
EditorGUILayout.BeginHorizontal();
EditorGUILayout.LabelField("Key");
EditorGUILayout.LabelField("Visualizers");
EditorGUILayout.EndHorizontal();
for (int i = 0; i < _factory.Visualizers.Count; i++)
{
EditorGUILayout.BeginHorizontal();
if(_factory.Visualizers[i] != null)
_factory.Visualizers[i].Key = EditorGUILayout.TextField(_factory.Visualizers[i].Key, GUILayout.MaxWidth(100));
_factory.Visualizers[i] = (LayerVisualizerBase)EditorGUILayout.ObjectField(_factory.Visualizers[i], typeof(LayerVisualizerBase));

if (GUILayout.Button("-", GUILayout.MaxWidth(20)))
if (_factory.Visualizers != null)
{
for (int i = 0; i < _factory.Visualizers.Count; i++)
{
_visualizerList.DeleteArrayElementAtIndex(i);
}
EditorGUILayout.BeginHorizontal();
if (_factory.Visualizers[i] != null)
_factory.Visualizers[i].Key = EditorGUILayout.TextField(_factory.Visualizers[i].Key, GUILayout.MaxWidth(100));
_factory.Visualizers[i] = (LayerVisualizerBase)EditorGUILayout.ObjectField(_factory.Visualizers[i], typeof(LayerVisualizerBase));

if (GUILayout.Button("-", GUILayout.MaxWidth(20)))
{
_visualizerList.DeleteArrayElementAtIndex(i);
}

EditorGUILayout.EndHorizontal();
EditorGUILayout.EndHorizontal();
}
}

if (GUILayout.Button("Add New Visualizer"))
{
_factory.Visualizers.Add(null);
}

EditorUtility.SetDirty(_factory);
serializedObject.ApplyModifiedProperties();
}
}
6 changes: 6 additions & 0 deletions sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/Factories/MeshFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ public class MeshFactory : Factory
private Dictionary<Vector2, UnityTile> _tiles;
private Dictionary<string, List<LayerVisualizerBase>> _layerBuilder;

public void OnEnable()
{
if (Visualizers == null)
Visualizers = new List<LayerVisualizerBase>();
}

/// <summary>
/// Sets up the Mesh Factory
/// </summary>
Expand Down