Compare commits

...

2 Commits

Author SHA1 Message Date
max
8b44c33813 Editor layout
- Cleanup the editors a bit
- Editor foldout scope
- Cell size to editor (this is user preference data, could be put in EditorPrefs later)
2023-07-09 23:01:48 +02:00
max
ddf71ef7d7 GameObject menu copy file Id
- GameObject menu copy file id
2023-07-09 23:00:23 +02:00
8 changed files with 166 additions and 92 deletions

View File

@ -16,5 +16,18 @@ public static void HorizontalLine(Color color)
} }
public static void HorizontalLine() => HorizontalLine(horizontalLineColor); public static void HorizontalLine() => HorizontalLine(horizontalLineColor);
public class FoldoutHeaderScope : System.IDisposable
{
public FoldoutHeaderScope(string label, ref bool foldout)
{
foldout = EditorGUILayout.BeginFoldoutHeaderGroup(foldout, label);
}
public void Dispose()
{
EditorGUILayout.EndFoldoutHeaderGroup();
}
}
} }
} }

View File

@ -9,8 +9,9 @@ public class ScenePartitionEditorWindow : EditorWindow
private const int cellSize = 10; private const int cellSize = 10;
private Vector2 scrollPos = Vector2.zero; private Vector2 scrollPos = Vector2.zero;
private bool foldoutGroupEnabled = false;
[MenuItem("Max/ScenePartitionWindow")] [MenuItem("Window/ScenePartition")]
public static void ShowExample() public static void ShowExample()
{ {
ScenePartitionEditorWindow window = GetWindow<ScenePartitionEditorWindow>(); ScenePartitionEditorWindow window = GetWindow<ScenePartitionEditorWindow>();
@ -41,58 +42,63 @@ private void OnGUI()
private void DrawSceneDataCache() private void DrawSceneDataCache()
{ {
using (EditorGUILayout.ScrollViewScope scope = new EditorGUILayout.ScrollViewScope(scrollPos)) using (EditorGUIUtils.FoldoutHeaderScope foldoutGroup = new EditorGUIUtils.FoldoutHeaderScope("SceneDataCache", ref foldoutGroupEnabled))
{ {
scrollPos = scope.scrollPosition; if (!foldoutGroupEnabled) return;
using (new EditorGUI.DisabledGroupScope(true)) using (EditorGUILayout.ScrollViewScope scope = new EditorGUILayout.ScrollViewScope(scrollPos))
{ {
ScenePartitionSS scenePartitionSS = ScenePartitionSS.instance; scrollPos = scope.scrollPosition;
foreach (KeyValuePair<ScenePartitionSO, ScenePartitionData> sceneData in scenePartitionSS.SceneDataCache) using (new EditorGUI.DisabledGroupScope(true))
{ {
if (sceneData.Key == null || sceneData.Value == null) continue; ScenePartitionSS scenePartitionSS = ScenePartitionSS.instance;
EditorGUILayout.LabelField($"{sceneData.Key.name}"); foreach (KeyValuePair<ScenePartitionSO, ScenePartitionData> sceneData in scenePartitionSS.SceneDataCache)
if (sceneData.Value.HasCreatedPartitions)
{ {
EditorGUILayout.LabelField($"scenePartitions"); if (sceneData.Key == null || sceneData.Value == null) continue;
foreach (KeyValuePair<ulong, ScenePartition> scenePartition in sceneData.Value.ScenePartitions) EditorGUILayout.LabelField($"{sceneData.Key.name}");
if (sceneData.Value.HasCreatedPartitions)
{ {
EditorGUILayout.LongField((long)scenePartition.Key); EditorGUILayout.LabelField($"scenePartitions");
}
}
EditorGUILayout.Space(); foreach (KeyValuePair<ulong, ScenePartition> scenePartition in sceneData.Value.ScenePartitions)
if (sceneData.Value.HasLoadedPartitions)
{
EditorGUILayout.LabelField($"loadedScenePartitions");
foreach (KeyValuePair<ulong, ScenePartition> scenePartition in sceneData.Value.LoadedScenePartitions)
{
EditorGUILayout.LongField((long)scenePartition.Value.id);
}
}
if (sceneData.Value.SceneGrid != null)
{
EditorGUILayout.LabelField($"generatedSceneGrid");
foreach (KeyValuePair<int, GridList> item in sceneData.Value.SceneGrid.Grid)
{
EditorGUILayout.IntField("gridId", item.Key);
EditorGUI.indentLevel++;
foreach (ulong id in item.Value.list)
{ {
EditorGUILayout.LongField((long)id); EditorGUILayout.LongField((long)scenePartition.Key);
} }
}
EditorGUI.indentLevel--; EditorGUILayout.Space();
if (sceneData.Value.HasLoadedPartitions)
{
EditorGUILayout.LabelField($"loadedScenePartitions");
foreach (KeyValuePair<ulong, ScenePartition> scenePartition in sceneData.Value.LoadedScenePartitions)
{
EditorGUILayout.LongField((long)scenePartition.Value.id);
}
}
if (sceneData.Value.SceneGrid != null)
{
EditorGUILayout.LabelField($"generatedSceneGrid");
foreach (KeyValuePair<int, GridList> item in sceneData.Value.SceneGrid.Grid)
{
EditorGUILayout.IntField("gridId", item.Key);
EditorGUI.indentLevel++;
foreach (ulong id in item.Value.list)
{
EditorGUILayout.LongField((long)id);
}
EditorGUI.indentLevel--;
}
} }
} }
} }

View File

@ -0,0 +1,29 @@
using UnityEditor;
using UnityEngine;
namespace VertexColor.ScenePartition.Editor
{
public static class ScenePartitionMenuEditor
{
[MenuItem("GameObject/CopyFileId", false, 10000)]
public static void CreateTextArea5()
{
GameObject go = Selection.activeGameObject;
if (go == null) return;
GlobalObjectId id = GlobalObjectId.GetGlobalObjectIdSlow(go);
if (id.targetPrefabId == 0) // 0 = no prefab.
{
EditorGUIUtility.systemCopyBuffer = id.targetObjectId.ToString();
Debug.Log($"object id: {id.targetObjectId}");
}
else
{
EditorGUIUtility.systemCopyBuffer = id.targetPrefabId.ToString();
Debug.Log($"object id: {id.targetPrefabId}");
}
}
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: ab63a69b46a3ff4438723520d0656c93
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -281,11 +281,11 @@ public void GenerateSceneGridData()
if (ids[i].targetPrefabId == 0) // 0 = no prefab. if (ids[i].targetPrefabId == 0) // 0 = no prefab.
{ {
Data.SceneGrid.Insert(ids[i].targetObjectId, rootGameObjects[i].transform.position); Data.SceneGrid.Insert(ids[i].targetObjectId, rootGameObjects[i].transform.position, ScenePartitionSceneViewEditor.cellSize);
} }
else else
{ {
Data.SceneGrid.Insert(ids[i].targetPrefabId, rootGameObjects[i].transform.position); Data.SceneGrid.Insert(ids[i].targetPrefabId, rootGameObjects[i].transform.position, ScenePartitionSceneViewEditor.cellSize);
} }
} }

View File

@ -9,6 +9,7 @@ public class ScenePartitionSOEditor : UnityEditor.Editor
{ {
private ulong id = 0; private ulong id = 0;
private int gridId = 0; private int gridId = 0;
private bool foldoutGroupEnabled = false;
public override void OnInspectorGUI() public override void OnInspectorGUI()
{ {
@ -20,7 +21,7 @@ public override void OnInspectorGUI()
//EditorGUILayout.PropertyField(sceneAssetProperty); //EditorGUILayout.PropertyField(sceneAssetProperty);
serializedObject.ApplyModifiedProperties(); serializedObject.ApplyModifiedProperties();
EditorGUILayout.Space(); EditorGUIUtils.HorizontalLine();
if (scenePartitionSO.SceneAsset == null) if (scenePartitionSO.SceneAsset == null)
{ {
@ -31,72 +32,88 @@ public override void OnInspectorGUI()
} }
else else
{ {
if (GUILayout.Button("Load All"))
{
scenePartitionSO.LoadAll();
}
if (GUILayout.Button("Reload"))
{
scenePartitionSO.Reload();
}
if (GUILayout.Button("Save"))
{
scenePartitionSO.Save();
}
if (GUILayout.Button("Unload"))
{
scenePartitionSO.Unload();
}
EditorGUILayout.Space();
if (GUILayout.Button("Open Scene Data Folder")) if (GUILayout.Button("Open Scene Data Folder"))
{ {
EditorUtility.RevealInFinder(ScenePartitionUtils.GetDataPath(scenePartitionSO)); EditorUtility.RevealInFinder(ScenePartitionUtils.GetDataPath(scenePartitionSO));
} }
EditorGUILayout.Space(); EditorGUIUtils.HorizontalLine();
id = (ulong)EditorGUILayout.LongField("id", (long)id); using (new EditorGUILayout.HorizontalScope())
if (GUILayout.Button("Load Section"))
{ {
scenePartitionSO.LoadPartitions(new ulong[1] { id }); if (GUILayout.Button("Load All", EditorStyles.miniButtonLeft))
{
scenePartitionSO.LoadAll();
}
if (GUILayout.Button("Unload", EditorStyles.miniButtonRight))
{
scenePartitionSO.Unload();
}
} }
using (new EditorGUILayout.HorizontalScope())
{
if (GUILayout.Button("Save", EditorStyles.miniButtonLeft))
{
scenePartitionSO.Save();
}
if (GUILayout.Button(new GUIContent("Reload", "Discard changes and reload"), EditorStyles.miniButtonRight))
{
scenePartitionSO.Reload();
}
}
EditorGUIUtils.HorizontalLine();
using (new EditorGUILayout.HorizontalScope())
{
id = (ulong)EditorGUILayout.LongField("id", (long)id);
if (GUILayout.Button("Load Id"))
{
scenePartitionSO.LoadPartitions(new ulong[1] { id });
}
}
EditorGUIUtils.HorizontalLine();
ScenePartitionSceneViewEditor.cellSize = EditorGUILayout.IntSlider("cellSize", ScenePartitionSceneViewEditor.cellSize, 10, 1000);
if (GUILayout.Button("GenerateSceneGrid")) if (GUILayout.Button("GenerateSceneGrid"))
{ {
scenePartitionSO.GenerateSceneGridData(); scenePartitionSO.GenerateSceneGridData();
} }
gridId = EditorGUILayout.IntField("gridId", gridId);
if (GUILayout.Button("LoadSceneGrid"))
{
scenePartitionSO.LoadCell(gridId);
}
if (scenePartitionSO.Data.SceneGrid != null) if (scenePartitionSO.Data.SceneGrid != null)
{ {
EditorGUILayout.LabelField($"generatedSceneGrid"); gridId = EditorGUILayout.IntField("gridId", gridId);
scenePartitionSO.Data.SceneGrid.cellSize = EditorGUILayout.IntSlider("cellSize", scenePartitionSO.Data.SceneGrid.cellSize, 10, 1000); if (GUILayout.Button("LoadSceneGrid"))
foreach (KeyValuePair<int, GridList> item in scenePartitionSO.Data.SceneGrid.Grid)
{ {
EditorGUILayout.LongField("gridId", item.Key); scenePartitionSO.LoadCell(gridId);
}
EditorGUI.indentLevel++; using (EditorGUIUtils.FoldoutHeaderScope foldoutGroup = new EditorGUIUtils.FoldoutHeaderScope("gridData", ref foldoutGroupEnabled))
{
if (!foldoutGroupEnabled) return;
foreach (ulong id in item.Value.list) EditorGUILayout.LabelField($"generatedSceneGrid");
foreach (KeyValuePair<int, GridList> item in scenePartitionSO.Data.SceneGrid.Grid)
{ {
EditorGUILayout.LongField((long)id); EditorGUILayout.LongField("gridId", item.Key);
}
EditorGUI.indentLevel--; EditorGUI.indentLevel++;
foreach (ulong id in item.Value.list)
{
EditorGUILayout.LongField((long)id);
}
EditorGUI.indentLevel--;
}
} }
} }
} }

View File

@ -6,6 +6,8 @@ namespace VertexColor.ScenePartition.Editor
[InitializeOnLoad] [InitializeOnLoad]
public class ScenePartitionSceneViewEditor : UnityEditor.Editor public class ScenePartitionSceneViewEditor : UnityEditor.Editor
{ {
public static int cellSize = 100;
private static ScenePartitionSO scenePartitionSO = null; private static ScenePartitionSO scenePartitionSO = null;
static ScenePartitionSceneViewEditor() static ScenePartitionSceneViewEditor()
@ -18,7 +20,6 @@ private static void HandleDuringSceneGui(SceneView sceneView)
if (Event.current.modifiers != EventModifiers.Control) return; if (Event.current.modifiers != EventModifiers.Control) return;
if (!ScenePartitionUtils.TryGetScenePartitionSOForActiveScene(out scenePartitionSO)) return; if (!ScenePartitionUtils.TryGetScenePartitionSOForActiveScene(out scenePartitionSO)) return;
int cellSize = scenePartitionSO.Data.SceneGrid.cellSize;
Vector3 gridPosition = CalculateGridPosition(Event.current.mousePosition); Vector3 gridPosition = CalculateGridPosition(Event.current.mousePosition);
int gridId = SceneGrid.CalculateGridPosition(gridPosition, cellSize); int gridId = SceneGrid.CalculateGridPosition(gridPosition, cellSize);

View File

@ -5,15 +5,12 @@ namespace VertexColor.ScenePartition
[System.Serializable] [System.Serializable]
public class SceneGrid public class SceneGrid
{ {
[SerializeField]
public int cellSize = 10;
[SerializeField] [SerializeField]
private SceneGridDictionary grid = new SceneGridDictionary(); private SceneGridDictionary grid = new SceneGridDictionary();
public SceneGridDictionary Grid => grid; public SceneGridDictionary Grid => grid;
public void Insert(ulong scenePartitionId, Vector3 point) public void Insert(ulong scenePartitionId, Vector3 point, int cellSize)
{ {
int gridId = CalculateGridPosition(point, cellSize); int gridId = CalculateGridPosition(point, cellSize);
if (grid.TryGetValue(gridId, out GridList ids)) if (grid.TryGetValue(gridId, out GridList ids))