diff --git a/documentation/docs/05-changelog.md b/documentation/docs/05-changelog.md index 1780dca71..b9963caf4 100644 --- a/documentation/docs/05-changelog.md +++ b/documentation/docs/05-changelog.md @@ -4,6 +4,7 @@ ##### New Features - Added a **Feature Replacement Modifer** that allows replacement of a vector feature at a given Latitude,Longitude with a supplied prefab. Enables replacing a procedurally generated building at a given Latitude,Longitude with a custom 3D model. - Texturing Style dropdown now allows users to select from prepackaged texture styles or custom, which allows for user-defined texturing. +- Mesh and GameObject modifiers can now be created and added to AbstractMap via `Add New` buttons. ##### Improvements - Improvements to UV mapping for side walls of extruded polygons when using atlas textures. Enables better handling of leftover areas when creating columns. ##### Bug Fixes diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles.meta index 4a364ca51..48508ed81 100644 --- a/sdkproject/Assets/Mapbox/Resources/MapboxStyles.meta +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 44999f1e7095d414a8de86aacbe5a279 +guid: a5b6f0096f22b4cdb826cdc4a583aa40 folderAsset: yes timeCreated: 1520623954 licenseType: Pro diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/122751851.png b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/122751851.png deleted file mode 100644 index ce9031664..000000000 Binary files a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/122751851.png and /dev/null differ diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/122751851.png.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/122751851.png.meta deleted file mode 100644 index 758fec969..000000000 --- a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Materials/122751851.png.meta +++ /dev/null @@ -1,77 +0,0 @@ -fileFormatVersion: 2 -guid: 75fc2a18f6683b64c8847d721a6babdd -timeCreated: 1524138198 -licenseType: Pro -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets/Palettes.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets/Palettes.meta new file mode 100644 index 000000000..ffdccf2f0 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets/Palettes.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 771f2f33d5f594505ba69de66c364d1d +folderAsset: yes +timeCreated: 1524502575 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets/Textures.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets/Textures.meta new file mode 100644 index 000000000..01e2b134f --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Dark/Assets/Textures.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c0b7a33eb93a549cca3c9e2fac461bbc +folderAsset: yes +timeCreated: 1524502522 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Palettes.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Palettes.meta new file mode 100644 index 000000000..2f8cd4a51 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Fantasy/Assets/Palettes.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e3dbce362ab604c2a96b5b784d1db5a7 +folderAsset: yes +timeCreated: 1524502575 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets/Palettes.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets/Palettes.meta new file mode 100644 index 000000000..e4cc632c1 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets/Palettes.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e5e4635db729d431883830ca2d3fc1ea +folderAsset: yes +timeCreated: 1524502575 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets/Textures.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets/Textures.meta new file mode 100644 index 000000000..85590817f --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Light/Assets/Textures.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 19d73c30a4c75499d8faddcccc297ca8 +folderAsset: yes +timeCreated: 1524502522 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Materials/RealisticSideMaterial.mat b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Materials/RealisticSideMaterial.mat index de03d837b..64935a3e3 100644 --- a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Materials/RealisticSideMaterial.mat +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Materials/RealisticSideMaterial.mat @@ -19,7 +19,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BumpMap: - m_Texture: {fileID: 2800000, guid: c07f20ee049aa4eab8a3a8d03f54e9f3, type: 3} + m_Texture: {fileID: 2800000, guid: d2a73dbb08d7ca840a90744f29331d48, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: @@ -39,15 +39,15 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: d11bc2319ebb5411f8efebff0925c138, type: 3} + m_Texture: {fileID: 2800000, guid: b1e095fa97e0735448d692ea5d0f52b5, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: - m_Texture: {fileID: 2800000, guid: e205ac20618104844a2a98f32ab42ecb, type: 3} + m_Texture: {fileID: 2800000, guid: 916910a2b0b27a440970a3f9c651e595, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: - m_Texture: {fileID: 2800000, guid: 3a4d7ce79f9254d91b21cedc2eeb995b, type: 3} + m_Texture: {fileID: 2800000, guid: d80341d897c46944dac3b14c8311e585, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _ParallaxMap: @@ -55,7 +55,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _SpecGlossMap: - m_Texture: {fileID: 2800000, guid: 4ce0ee39a19494b1fb6eb6664647e31f, type: 3} + m_Texture: {fileID: 2800000, guid: 523830272e1419a4eae6d3f62dc02761, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Palettes.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Palettes.meta new file mode 100644 index 000000000..2d5981fd7 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Realistic/Assets/Palettes.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 729564d1ac00949debaffb55c44f9346 +folderAsset: yes +timeCreated: 1524502575 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/Assets/Atlas.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/Assets/Atlas.meta new file mode 100644 index 000000000..0fd28cfff --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/Assets/Atlas.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 79c501a64347f44a0b44e85fc4b6a48f +folderAsset: yes +timeCreated: 1524502554 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/Assets/Palettes.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/Assets/Palettes.meta new file mode 100644 index 000000000..a66898272 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/Assets/Palettes.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: fb03908411c9243278f508b386449f72 +folderAsset: yes +timeCreated: 1524502575 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/Assets/Textures.meta b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/Assets/Textures.meta new file mode 100644 index 000000000..35f0c94d1 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Resources/MapboxStyles/Styles/MapboxSampleStyles/Satellite/Assets/Textures.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c2220a1d462af4519b9d7a482cec2f7d +folderAsset: yes +timeCreated: 1524502522 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Unity/Constants.cs b/sdkproject/Assets/Mapbox/Unity/Constants.cs index 1fcc608c2..ba6495b1e 100644 --- a/sdkproject/Assets/Mapbox/Unity/Constants.cs +++ b/sdkproject/Assets/Mapbox/Unity/Constants.cs @@ -1,9 +1,6 @@ namespace Mapbox.Unity { using UnityEngine; - using Mapbox.Unity.MeshGeneration.Data; - using System.Collections.Generic; - using Mapbox.Unity.Map; public static class Constants { @@ -20,6 +17,9 @@ public static class Path public static readonly string MAPBOX_RESOURCES_RELATIVE = System.IO.Path.Combine("Mapbox", "MapboxConfiguration"); public static readonly string MAPBOX_RESOURCES_ABSOLUTE = System.IO.Path.Combine(System.IO.Path.Combine(Application.dataPath, "Resources"), "Mapbox"); + public static readonly string MAPBOX_USER = System.IO.Path.Combine("Assets", System.IO.Path.Combine("Mapbox", "User")); + public static readonly string MAPBOX_USER_MODIFIERS = System.IO.Path.Combine(MAPBOX_USER, "Modifiers"); + public static readonly string MAP_FEATURE_STYLES_DEFAULT_STYLE_ASSETS = System.IO.Path.Combine("MapboxStyles", "DefaultStyleAssets"); public static readonly string MAP_FEATURE_STYLES_SAMPLES = System.IO.Path.Combine(System.IO.Path.Combine("MapboxStyles", "Styles"), "MapboxSampleStyles"); diff --git a/sdkproject/Assets/Mapbox/Unity/Editor/PopupSelectionMenu.cs b/sdkproject/Assets/Mapbox/Unity/Editor/PopupSelectionMenu.cs new file mode 100644 index 000000000..8645a0505 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Editor/PopupSelectionMenu.cs @@ -0,0 +1,180 @@ +using UnityEngine; +using UnityEditor; +using System.Collections.Generic; +using System; +using System.IO; +using System.Reflection; +using Mapbox.Unity; + +namespace Mapbox.Editor +{ + /// + /// Pop up menu for selecting, creating and assigning modifier instances to AbstractMap. + /// + public class PopupSelectionMenu : PopupWindowContent + { + + private Type _type; + + private Action _act; + + private List _modTypes; + + private SerializedProperty _finalize; + + private int _index = -1; + + private Vector2 _scrollPos; + + public override Vector2 GetWindowSize() + { + return new Vector2(250, 250); + } + + public override void OnGUI(Rect rect) + { + if (_modTypes == null || _modTypes.Count == 0) + { + _modTypes = new List(); + + AppDomain currentDomain = AppDomain.CurrentDomain; + Assembly[] assemblies = currentDomain.GetAssemblies(); + for (int i = 0; i < assemblies.Length; i++) + { + Type[] types = assemblies[i].GetTypes(); + for (int j = 0; j < types.Length; j++) + { + if (types[j].IsSubclassOf(_type)) + { + _modTypes.Add(types[j]); + } + } + } + } + + GUILayout.Label(String.Format("{0}s", _type.Name), EditorStyles.boldLabel); + var st = new GUIStyle(); + st.padding = new RectOffset(0, 0, 15, 15); + _scrollPos = EditorGUILayout.BeginScrollView(_scrollPos, st); + + for (int i = 0; i < _modTypes.Count; i++) + { + Type asset = _modTypes[i]; + if (asset == null) //yea turns out this can happen + continue; + var style = GUI.skin.button; + style.alignment = TextAnchor.MiddleLeft; + string shortTypeName = GetShortTypeName(asset.ToString()); + if (GUILayout.Button(shortTypeName, style)) + { + CreateNewModiferInstance(asset, shortTypeName); + editorWindow.Close(); + } + } + EditorGUILayout.EndScrollView(); + } + + /// + /// Gets the short name of the type. + /// + /// The short type name. + /// Input. + private string GetShortTypeName(string input) + { + int pos = input.LastIndexOf(".", StringComparison.CurrentCulture) + 1; + return input.Substring(pos, input.Length - pos); + } + + /// + /// Creates the new modifer instance. + /// + /// Type. + /// Name. + private void CreateNewModiferInstance(Type type, string name) + { + var modifierInstance = ScriptableObject.CreateInstance(type); + + string pathCandidate = Constants.Path.MAPBOX_USER_MODIFIERS; + if(!Directory.Exists(pathCandidate)) + { + + string userFolder = Constants.Path.MAPBOX_USER; + if(!Directory.Exists(userFolder)) + { + string parentPath = System.IO.Path.Combine("Assets", "Mapbox"); + AssetDatabase.CreateFolder(parentPath, "User"); + } + AssetDatabase.CreateFolder(userFolder, "Modifiers"); + } + + foreach (UnityEngine.Object obj in Selection.GetFiltered(typeof(UnityEngine.Object), SelectionMode.Assets)) + { + pathCandidate = AssetDatabase.GetAssetPath(obj); + if (!string.IsNullOrEmpty(pathCandidate) && File.Exists(pathCandidate)) + { + pathCandidate = Path.GetDirectoryName(pathCandidate); + break; + } + } + + string combinedPath = string.Format("{0}{1}.asset", Path.Combine(pathCandidate, "New"), name); + string uniqueAssetPath = AssetDatabase.GenerateUniqueAssetPath(combinedPath); + + modifierInstance.name = name; + + AssetDatabase.CreateAsset(modifierInstance, uniqueAssetPath); + + AssetDatabase.SaveAssets(); + AssetDatabase.Refresh(); + + AddNewInstanceToArray(modifierInstance); + + Debug.Log(string.Format("Created new {0} modifer at {1}", name, uniqueAssetPath)); + } + + /// + /// Adds the new instance to array. + /// + /// Object. + public void AddNewInstanceToArray(object obj) + { + ScriptableObject asset = obj as ScriptableObject; + if (_act != null) + { + _act(asset); + } + else + { + if (_index == -1) + { + _finalize.arraySize++; + _finalize.GetArrayElementAtIndex(_finalize.arraySize - 1).objectReferenceValue = asset; + _finalize.serializedObject.ApplyModifiedProperties(); + } + else + { + _finalize.GetArrayElementAtIndex(_index).objectReferenceValue = asset; + _finalize.serializedObject.ApplyModifiedProperties(); + } + } + } + + /// + /// Initializes a new instance of the class. + /// + /// T. + /// P. + /// Index. + /// Act. + public PopupSelectionMenu(Type t, SerializedProperty p, int index = -1, Action act = null) + { + _type = t; + _finalize = p; + _act = act; + if (index > -1) + { + _index = index; + } + } + } +} \ No newline at end of file diff --git a/sdkproject/Assets/Mapbox/Unity/Editor/PopupSelectionMenu.cs.meta b/sdkproject/Assets/Mapbox/Unity/Editor/PopupSelectionMenu.cs.meta new file mode 100644 index 000000000..abfb974cf --- /dev/null +++ b/sdkproject/Assets/Mapbox/Unity/Editor/PopupSelectionMenu.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: a6c73878fee204232a755433b391ccd5 +timeCreated: 1526401331 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/FeaturesSubLayerPropertiesDrawer.cs b/sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/FeaturesSubLayerPropertiesDrawer.cs index 0215208e7..358bcf170 100644 --- a/sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/FeaturesSubLayerPropertiesDrawer.cs +++ b/sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/FeaturesSubLayerPropertiesDrawer.cs @@ -420,14 +420,10 @@ void DrawModifiers(SerializedProperty property, GUIContent label) EditorGUILayout.EndVertical(); - if (GUILayout.Button(new GUIContent("+"), (GUIStyle)"minibuttonleft", GUILayout.Width(30))) - { - ScriptableCreatorWindow.Open(typeof(MeshModifier), meshfac, ind); - } - - if (GUILayout.Button(new GUIContent("-"), (GUIStyle)"minibuttonright", GUILayout.Width(30))) + if (GUILayout.Button(new GUIContent("x"), (GUIStyle)"minibuttonright", GUILayout.Width(30))) { meshfac.DeleteArrayElementAtIndex(ind); + meshfac.DeleteArrayElementAtIndex(ind); } EditorGUILayout.EndHorizontal(); @@ -437,13 +433,14 @@ void DrawModifiers(SerializedProperty property, GUIContent label) EditorGUI.indentLevel++; EditorGUILayout.BeginHorizontal(); GUILayout.Space(EditorGUI.indentLevel * 12); - if (GUILayout.Button(new GUIContent("Add New Empty"), (GUIStyle)"minibuttonleft")) + Rect buttonRect = GUILayoutUtility.GetLastRect(); + if (GUILayout.Button(new GUIContent("Add New"), (GUIStyle)"minibuttonleft")) { - meshfac.arraySize++; - meshfac.GetArrayElementAtIndex(meshfac.arraySize - 1).objectReferenceValue = null; + PopupWindow.Show(buttonRect, new PopupSelectionMenu(typeof(MeshModifier), meshfac)); + if (Event.current.type == EventType.Repaint) buttonRect = GUILayoutUtility.GetLastRect(); } - if (GUILayout.Button(new GUIContent("Find Asset"), (GUIStyle)"minibuttonright")) + if (GUILayout.Button(new GUIContent("Add Existing"), (GUIStyle)"minibuttonright")) { ScriptableCreatorWindow.Open(typeof(MeshModifier), meshfac); } @@ -451,6 +448,7 @@ void DrawModifiers(SerializedProperty property, GUIContent label) EditorGUILayout.EndHorizontal(); EditorGUI.indentLevel--; EditorGUILayout.Space(); + EditorGUILayout.LabelField(new GUIContent { text = "Game Object Modifiers", @@ -468,14 +466,10 @@ void DrawModifiers(SerializedProperty property, GUIContent label) false) as ScriptableObject; EditorGUILayout.EndVertical(); - if (GUILayout.Button(new GUIContent("+"), (GUIStyle)"minibuttonleft", GUILayout.Width(30))) - { - ScriptableCreatorWindow.Open(typeof(GameObjectModifier), gofac, ind); - } - - if (GUILayout.Button(new GUIContent("-"), (GUIStyle)"minibuttonright", GUILayout.Width(30))) + if (GUILayout.Button(new GUIContent("x"), GUILayout.Width(30))) { gofac.DeleteArrayElementAtIndex(ind); + gofac.DeleteArrayElementAtIndex(ind); } EditorGUILayout.EndHorizontal(); @@ -485,14 +479,17 @@ void DrawModifiers(SerializedProperty property, GUIContent label) EditorGUI.indentLevel++; EditorGUILayout.BeginHorizontal(); GUILayout.Space(EditorGUI.indentLevel * 12); - if (GUILayout.Button(new GUIContent("Add New Empty"), (GUIStyle)"minibuttonleft")) + //buttonRect = GUILayoutUtility.GetLastRect(); + if (GUILayout.Button(new GUIContent("Add New"), (GUIStyle)"minibuttonleft")) { - gofac.arraySize++; - gofac.GetArrayElementAtIndex(gofac.arraySize - 1).objectReferenceValue = null; + PopupWindow.Show(buttonRect, new PopupSelectionMenu(typeof(GameObjectModifier), gofac)); + if (Event.current.type == EventType.Repaint) buttonRect = GUILayoutUtility.GetLastRect(); } - - if (GUILayout.Button(new GUIContent("Find Asset"), (GUIStyle)"minibuttonright")) + //EditorWindow.Repaint(); + //buttonRect = GUILayoutUtility.GetLastRect(); + if (GUILayout.Button(new GUIContent("Add Existing"), (GUIStyle)"minibuttonright")) { + ScriptableCreatorWindow.Open(typeof(GameObjectModifier), gofac); } diff --git a/sdkproject/Assets/Mapbox/User.meta b/sdkproject/Assets/Mapbox/User.meta new file mode 100644 index 000000000..a7048f729 --- /dev/null +++ b/sdkproject/Assets/Mapbox/User.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 03eba24992f324d27981949f29c2e712 +folderAsset: yes +timeCreated: 1527202430 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/User/Modifiers.meta b/sdkproject/Assets/Mapbox/User/Modifiers.meta new file mode 100644 index 000000000..e3101c25e --- /dev/null +++ b/sdkproject/Assets/Mapbox/User/Modifiers.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 8f0a52c3794d14ba3af97c95e965a613 +folderAsset: yes +timeCreated: 1527202439 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/ProjectSettings/ProjectSettings.asset b/sdkproject/ProjectSettings/ProjectSettings.asset index 5288a9d41..f68a03cb0 100644 --- a/sdkproject/ProjectSettings/ProjectSettings.asset +++ b/sdkproject/ProjectSettings/ProjectSettings.asset @@ -80,7 +80,7 @@ PlayerSettings: forceSingleInstance: 0 resizableWindow: 0 useMacAppStoreValidation: 0 - macAppStoreCategory: + macAppStoreCategory: gpuSkinning: 0 graphicsJobs: 0 xboxPIXTextureCapture: 0 @@ -169,7 +169,7 @@ PlayerSettings: AndroidMinSdkVersion: 24 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 - aotOptions: + aotOptions: stripEngineCode: 1 iPhoneStrippingLevel: 0 iPhoneScriptCallOptimization: 0 @@ -222,7 +222,7 @@ PlayerSettings: rgba: 0 iOSLaunchScreenFillPct: 100 iOSLaunchScreenSize: 100 - iOSLaunchScreenCustomXibPath: + iOSLaunchScreenCustomXibPath: iOSLaunchScreeniPadType: 0 iOSLaunchScreeniPadImage: {fileID: 0} iOSLaunchScreeniPadBackgroundColor: @@ -230,9 +230,9 @@ PlayerSettings: rgba: 0 iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 - iOSLaunchScreeniPadCustomXibPath: + iOSLaunchScreeniPadCustomXibPath: iOSUseLaunchScreenStoryboard: 0 - iOSLaunchScreenCustomStoryboardPath: + iOSLaunchScreenCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] iOSBackgroundModes: 0 @@ -240,16 +240,16 @@ PlayerSettings: metalEditorSupport: 0 metalAPIValidation: 1 iOSRenderExtraFrameOnPause: 1 - appleDeveloperTeamID: - iOSManualSigningProvisioningProfileID: - tvOSManualSigningProvisioningProfileID: + appleDeveloperTeamID: + iOSManualSigningProvisioningProfileID: + tvOSManualSigningProvisioningProfileID: appleEnableAutomaticSigning: 0 clonedFromGUID: 00000000000000000000000000000000 AndroidTargetDevice: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} - AndroidKeystoreName: - AndroidKeyaliasName: + AndroidKeystoreName: + AndroidKeyaliasName: AndroidTVCompatibility: 1 AndroidIsGame: 1 AndroidEnableTango: 1 @@ -262,7 +262,7 @@ PlayerSettings: androidGamepadSupportLevel: 0 resolutionDialogBanner: {fileID: 0} m_BuildTargetIcons: - - m_BuildTarget: + - m_BuildTarget: m_Icons: - serializedVersion: 2 m_Icon: {fileID: 0} @@ -364,7 +364,7 @@ PlayerSettings: wiiUTVStartupScreen: {fileID: 0} wiiUGamePadStartupScreen: {fileID: 0} wiiUDrcBufferDisabled: 0 - wiiUProfilerLibPath: + wiiUProfilerLibPath: playModeTestRunnerEnabled: 1 actionOnDotNetUnhandledException: 1 enableInternalProfiler: 0 @@ -372,45 +372,45 @@ PlayerSettings: enableCrashReportAPI: 0 cameraUsageDescription: AR locationUsageDescription: For testing and development - microphoneUsageDescription: - switchNetLibKey: + microphoneUsageDescription: + switchNetLibKey: switchSocketMemoryPoolSize: 6144 switchSocketAllocatorPoolSize: 128 switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 switchApplicationID: 0x01004b9000490000 - switchNSODependencies: - switchTitleNames_0: - switchTitleNames_1: - switchTitleNames_2: - switchTitleNames_3: - switchTitleNames_4: - switchTitleNames_5: - switchTitleNames_6: - switchTitleNames_7: - switchTitleNames_8: - switchTitleNames_9: - switchTitleNames_10: - switchTitleNames_11: - switchTitleNames_12: - switchTitleNames_13: - switchTitleNames_14: - switchPublisherNames_0: - switchPublisherNames_1: - switchPublisherNames_2: - switchPublisherNames_3: - switchPublisherNames_4: - switchPublisherNames_5: - switchPublisherNames_6: - switchPublisherNames_7: - switchPublisherNames_8: - switchPublisherNames_9: - switchPublisherNames_10: - switchPublisherNames_11: - switchPublisherNames_12: - switchPublisherNames_13: - switchPublisherNames_14: + switchNSODependencies: + switchTitleNames_0: + switchTitleNames_1: + switchTitleNames_2: + switchTitleNames_3: + switchTitleNames_4: + switchTitleNames_5: + switchTitleNames_6: + switchTitleNames_7: + switchTitleNames_8: + switchTitleNames_9: + switchTitleNames_10: + switchTitleNames_11: + switchTitleNames_12: + switchTitleNames_13: + switchTitleNames_14: + switchPublisherNames_0: + switchPublisherNames_1: + switchPublisherNames_2: + switchPublisherNames_3: + switchPublisherNames_4: + switchPublisherNames_5: + switchPublisherNames_6: + switchPublisherNames_7: + switchPublisherNames_8: + switchPublisherNames_9: + switchPublisherNames_10: + switchPublisherNames_11: + switchPublisherNames_12: + switchPublisherNames_13: + switchPublisherNames_14: switchIcons_0: {fileID: 0} switchIcons_1: {fileID: 0} switchIcons_2: {fileID: 0} @@ -441,9 +441,9 @@ PlayerSettings: switchSmallIcons_12: {fileID: 0} switchSmallIcons_13: {fileID: 0} switchSmallIcons_14: {fileID: 0} - switchManualHTML: - switchAccessibleURLs: - switchLegalInformation: + switchManualHTML: + switchAccessibleURLs: + switchLegalInformation: switchMainThreadStackSize: 1048576 switchPresenceGroupId: 0x01004b9000490000 switchLogoHandling: 0 @@ -453,7 +453,7 @@ PlayerSettings: switchTouchScreenUsage: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 - switchApplicationErrorCodeCategory: + switchApplicationErrorCodeCategory: switchUserAccountSaveDataSize: 0 switchUserAccountSaveDataJournalSize: 0 switchApplicationAttribute: 0 @@ -473,13 +473,13 @@ PlayerSettings: switchRatingsInt_10: 0 switchRatingsInt_11: 0 switchLocalCommunicationIds_0: 0x01004b9000490000 - switchLocalCommunicationIds_1: - switchLocalCommunicationIds_2: - switchLocalCommunicationIds_3: - switchLocalCommunicationIds_4: - switchLocalCommunicationIds_5: - switchLocalCommunicationIds_6: - switchLocalCommunicationIds_7: + switchLocalCommunicationIds_1: + switchLocalCommunicationIds_2: + switchLocalCommunicationIds_3: + switchLocalCommunicationIds_4: + switchLocalCommunicationIds_5: + switchLocalCommunicationIds_6: + switchLocalCommunicationIds_7: switchParentalControl: 0 switchAllowsScreenshot: 1 switchAllowsVideoCapturing: 1 @@ -498,34 +498,34 @@ PlayerSettings: switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 ps4NPAgeRating: 12 - ps4NPTitleSecret: - ps4NPTrophyPackPath: + ps4NPTitleSecret: + ps4NPTrophyPackPath: ps4ParentalLevel: 1 ps4ContentID: ED1633-NPXX51362_00-0000000000000000 ps4Category: 0 ps4MasterVersion: 01.00 ps4AppVersion: 01.00 ps4AppType: 0 - ps4ParamSfxPath: + ps4ParamSfxPath: ps4VideoOutPixelFormat: 0 ps4VideoOutInitialWidth: 1920 ps4VideoOutBaseModeInitialWidth: 1920 ps4VideoOutReprojectionRate: 120 - ps4PronunciationXMLPath: - ps4PronunciationSIGPath: - ps4BackgroundImagePath: - ps4StartupImagePath: - ps4StartupImagesFolder: - ps4IconImagesFolder: - ps4SaveDataImagePath: - ps4SdkOverride: - ps4BGMPath: - ps4ShareFilePath: - ps4ShareOverlayImagePath: - ps4PrivacyGuardImagePath: - ps4NPtitleDatPath: + ps4PronunciationXMLPath: + ps4PronunciationSIGPath: + ps4BackgroundImagePath: + ps4StartupImagePath: + ps4StartupImagesFolder: + ps4IconImagesFolder: + ps4SaveDataImagePath: + ps4SdkOverride: + ps4BGMPath: + ps4ShareFilePath: + ps4ShareOverlayImagePath: + ps4PrivacyGuardImagePath: + ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 - ps4RemotePlayKeyMappingDir: + ps4RemotePlayKeyMappingDir: ps4PlayTogetherPlayerCount: 0 ps4EnterButtonAssignment: 1 ps4ApplicationParam1: 0 @@ -549,9 +549,9 @@ PlayerSettings: ps4ScriptOptimizationLevel: 3 ps4Audio3dVirtualSpeakerCount: 14 ps4attribCpuUsage: 0 - ps4PatchPkgPath: - ps4PatchLatestPkgPath: - ps4PatchChangeinfoPath: + ps4PatchPkgPath: + ps4PatchLatestPkgPath: + ps4PatchChangeinfoPath: ps4PatchDayOne: 0 ps4attribUserManagement: 0 ps4attribMoveSupport: 0 @@ -563,37 +563,37 @@ PlayerSettings: ps4contentSearchFeaturesUsed: 0 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] - monoEnv: + monoEnv: psp2Splashimage: {fileID: 0} - psp2NPTrophyPackPath: + psp2NPTrophyPackPath: psp2NPSupportGBMorGJP: 0 psp2NPAgeRating: 12 - psp2NPTitleDatPath: - psp2NPCommsID: - psp2NPCommunicationsID: - psp2NPCommsPassphrase: - psp2NPCommsSig: - psp2ParamSfxPath: - psp2ManualPath: - psp2LiveAreaGatePath: - psp2LiveAreaBackroundPath: - psp2LiveAreaPath: - psp2LiveAreaTrialPath: - psp2PatchChangeInfoPath: - psp2PatchOriginalPackage: + psp2NPTitleDatPath: + psp2NPCommsID: + psp2NPCommunicationsID: + psp2NPCommsPassphrase: + psp2NPCommsSig: + psp2ParamSfxPath: + psp2ManualPath: + psp2LiveAreaGatePath: + psp2LiveAreaBackroundPath: + psp2LiveAreaPath: + psp2LiveAreaTrialPath: + psp2PatchChangeInfoPath: + psp2PatchOriginalPackage: psp2PackagePassword: WRK5RhRXdCdG5nG5azdNMK66MuCV6GXi - psp2KeystoneFile: + psp2KeystoneFile: psp2MemoryExpansionMode: 0 psp2DRMType: 0 psp2StorageType: 0 psp2MediaCapacity: 0 - psp2DLCConfigPath: - psp2ThumbnailPath: - psp2BackgroundPath: - psp2SoundPath: - psp2TrophyCommId: - psp2TrophyPackagePath: - psp2PackagedResourcesPath: + psp2DLCConfigPath: + psp2ThumbnailPath: + psp2BackgroundPath: + psp2SoundPath: + psp2TrophyCommId: + psp2TrophyPackagePath: + psp2PackagedResourcesPath: psp2SaveDataQuota: 10240 psp2ParentalLevel: 1 psp2ShortTitle: Not Set @@ -620,8 +620,8 @@ PlayerSettings: webGLNameFilesAsHashes: 0 webGLDataCaching: 0 webGLDebugSymbols: 0 - webGLEmscriptenArgs: - webGLModulesDirectory: + webGLEmscriptenArgs: + webGLModulesDirectory: webGLTemplate: APPLICATION:Default webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 @@ -636,22 +636,22 @@ PlayerSettings: WebGL: 1 iOS: 1 incrementalIl2cppBuild: {} - additionalIl2CppArgs: + additionalIl2CppArgs: scriptingRuntimeVersion: 0 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: sdkproject - metroPackageVersion: - metroCertificatePath: - metroCertificatePassword: - metroCertificateSubject: - metroCertificateIssuer: + metroPackageVersion: + metroCertificatePath: + metroCertificatePassword: + metroCertificateSubject: + metroCertificateIssuer: metroCertificateNotAfter: 0000000000000000 metroApplicationDescription: sdkproject wsaImages: {} - metroTileShortName: - metroCommandLineArgsFile: + metroTileShortName: + metroCommandLineArgsFile: metroTileShowName: 0 metroMediumTileShowName: 0 metroLargeTileShowName: 0 @@ -663,16 +663,16 @@ PlayerSettings: a: 1} metroSplashScreenUseBackgroundColor: 0 platformCapabilities: {} - metroFTAName: + metroFTAName: metroFTAFileTypes: [] - metroProtocolName: + metroProtocolName: metroCompilationOverrides: 1 - tizenProductDescription: - tizenProductURL: - tizenSigningProfileName: + tizenProductDescription: + tizenProductURL: + tizenSigningProfileName: tizenGPSPermissions: 0 tizenMicrophonePermissions: 0 - tizenDeploymentTarget: + tizenDeploymentTarget: tizenDeploymentTargetType: -1 tizenMinOSVersion: 1 n3dsUseExtSaveData: 0 @@ -684,20 +684,20 @@ PlayerSettings: n3dsMediaSize: 0 n3dsLogoStyle: 3 n3dsTitle: GameName - n3dsProductCode: + n3dsProductCode: n3dsApplicationId: 0xFF3FF - XboxOneProductId: - XboxOneUpdateKey: - XboxOneSandboxId: - XboxOneContentId: - XboxOneTitleId: - XboxOneSCId: - XboxOneGameOsOverridePath: - XboxOnePackagingOverridePath: - XboxOneAppManifestOverridePath: + XboxOneProductId: + XboxOneUpdateKey: + XboxOneSandboxId: + XboxOneContentId: + XboxOneTitleId: + XboxOneSCId: + XboxOneGameOsOverridePath: + XboxOnePackagingOverridePath: + XboxOneAppManifestOverridePath: XboxOnePackageEncryption: 0 XboxOnePackageUpdateGranularity: 2 - XboxOneDescription: + XboxOneDescription: XboxOneLanguage: - enus XboxOneCapability: []