From e9031e4e399dd2a9f1af3f77c50d8119b7407c99 Mon Sep 17 00:00:00 2001 From: Mark Beiline Date: Mon, 3 Apr 2023 15:06:02 -0400 Subject: [PATCH 1/2] First pass --- .../DisguiseRenderStreamSettingsEditor.cs | 35 +++++++++++++++++ ...DisguiseRenderStreamSettingsEditor.cs.meta | 13 +++++++ .../DisguiseRenderStreamSettingsEditor.uss | 12 ++++++ ...isguiseRenderStreamSettingsEditor.uss.meta | 11 ++++++ .../DisguiseRenderStreamSettingsEditor.uxml | 4 ++ ...sguiseRenderStreamSettingsEditor.uxml.meta | 10 +++++ .../DisguiseRenderStreamSettingsProvider.cs | 39 +++++++++++++++++++ ...sguiseRenderStreamSettingsProvider.cs.meta | 11 ++++++ .../PipelineAbstraction/AssemblyInfo.cs.meta | 11 ++++++ ...nderStream.PipelineAbstraction.asmdef.meta | 7 ++++ .../Runtime/Util/AutoDisposable.cs.meta | 11 ++++++ 11 files changed, 164 insertions(+) create mode 100644 DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsEditor.cs create mode 100644 DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsEditor.cs.meta create mode 100644 DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsEditor.uss create mode 100644 DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsEditor.uss.meta create mode 100644 DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsEditor.uxml create mode 100644 DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsEditor.uxml.meta create mode 100644 DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsProvider.cs create mode 100644 DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsProvider.cs.meta create mode 100644 DisguiseUnityRenderStream/Runtime/PipelineAbstraction/AssemblyInfo.cs.meta create mode 100644 DisguiseUnityRenderStream/Runtime/PipelineAbstraction/Disguise.RenderStream.PipelineAbstraction.asmdef.meta create mode 100644 DisguiseUnityRenderStream/Runtime/Util/AutoDisposable.cs.meta diff --git a/DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsEditor.cs b/DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsEditor.cs new file mode 100644 index 0000000..ac8faae --- /dev/null +++ b/DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsEditor.cs @@ -0,0 +1,35 @@ +using UnityEditor; +using UnityEditor.UIElements; +using UnityEngine; +using UnityEngine.UIElements; + +namespace Disguise.RenderStream +{ + [CustomEditor(typeof(DisguiseRenderStreamSettings))] + class DisguiseRenderStreamSettingsEditor : Editor + { + public static class Style + { + public const string DisguiseSettingsContainer = "disguise-settings-container"; + public const string DisguiseSettingsTitle = "disguise-settings-title"; + } + + [SerializeField] + VisualTreeAsset m_Layout; + + [SerializeField] + StyleSheet m_Style; + + public override VisualElement CreateInspectorGUI() + { + var root = new VisualElement(); + + m_Layout.CloneTree(root); + root.styleSheets.Add(m_Style); + + root.Bind(serializedObject); + + return root; + } + } +} diff --git a/DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsEditor.cs.meta b/DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsEditor.cs.meta new file mode 100644 index 0000000..79167ef --- /dev/null +++ b/DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsEditor.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: d85289020b1f03e4981e88ece03dbacf +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: + - m_Layout: {fileID: 9197481963319205126, guid: 507d9ffa39ec44b419ba9ab3bbcd1cab, type: 3} + - m_Style: {fileID: 7433441132597879392, guid: fa44cd66f158c0447a66c89089cc0e82, type: 3} + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsEditor.uss b/DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsEditor.uss new file mode 100644 index 0000000..e42dbf7 --- /dev/null +++ b/DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsEditor.uss @@ -0,0 +1,12 @@ +.disguise-settings-container +{ + margin-left: 9px; + margin-top: 1px; +} + +.disguise-settings-title +{ + font-size: 19px; + -unity-font-style: bold; + margin-bottom: 12px; +} diff --git a/DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsEditor.uss.meta b/DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsEditor.uss.meta new file mode 100644 index 0000000..a367707 --- /dev/null +++ b/DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsEditor.uss.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fa44cd66f158c0447a66c89089cc0e82 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0} + disableValidation: 0 diff --git a/DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsEditor.uxml b/DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsEditor.uxml new file mode 100644 index 0000000..c7bbd37 --- /dev/null +++ b/DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsEditor.uxml @@ -0,0 +1,4 @@ + + + + diff --git a/DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsEditor.uxml.meta b/DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsEditor.uxml.meta new file mode 100644 index 0000000..8425b33 --- /dev/null +++ b/DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsEditor.uxml.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 507d9ffa39ec44b419ba9ab3bbcd1cab +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0} diff --git a/DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsProvider.cs b/DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsProvider.cs new file mode 100644 index 0000000..31c0c74 --- /dev/null +++ b/DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsProvider.cs @@ -0,0 +1,39 @@ +using UnityEditor; +using UnityEditor.UIElements; +using UnityEngine.UIElements; + +namespace Disguise.RenderStream +{ + static class DisguiseRenderStreamSettingsProvider + { + static readonly string k_SettingsPath = "Project/DisguiseRenderStream"; + const string k_StyleSheetCommon = "Packages/com.unity.cluster-display/Editor/UI/SettingsWindowCommon.uss"; + + class Contents + { + public const string SettingsName = "Disguise RenderStream"; + } + + [SettingsProvider] + static SettingsProvider CreateSettingsProvider() => + new (k_SettingsPath, SettingsScope.Project) + { + label = Contents.SettingsName, + activateHandler = (searchContext, parentElement) => + { + var settings = DisguiseRenderStreamSettings.GetOrCreateSettings(); + var editor = Editor.CreateEditor(settings); + + var gui = editor.CreateInspectorGUI(); + gui.AddToClassList(DisguiseRenderStreamSettingsEditor.Style.DisguiseSettingsContainer); + + var title = new Label { text = Contents.SettingsName }; + title.AddToClassList(DisguiseRenderStreamSettingsEditor.Style.DisguiseSettingsTitle); + gui.Insert(0, title); + + parentElement.Add(gui); + }, + keywords = SettingsProvider.GetSearchKeywordsFromSerializedObject(new SerializedObject(DisguiseRenderStreamSettings.GetOrCreateSettings())) + }; + } +} diff --git a/DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsProvider.cs.meta b/DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsProvider.cs.meta new file mode 100644 index 0000000..9c0218b --- /dev/null +++ b/DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsProvider.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 283858074c5af2045926847f746495ef +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/DisguiseUnityRenderStream/Runtime/PipelineAbstraction/AssemblyInfo.cs.meta b/DisguiseUnityRenderStream/Runtime/PipelineAbstraction/AssemblyInfo.cs.meta new file mode 100644 index 0000000..ca1a3c5 --- /dev/null +++ b/DisguiseUnityRenderStream/Runtime/PipelineAbstraction/AssemblyInfo.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a526d157660a6d34db40073d2c776562 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/DisguiseUnityRenderStream/Runtime/PipelineAbstraction/Disguise.RenderStream.PipelineAbstraction.asmdef.meta b/DisguiseUnityRenderStream/Runtime/PipelineAbstraction/Disguise.RenderStream.PipelineAbstraction.asmdef.meta new file mode 100644 index 0000000..9f7edfe --- /dev/null +++ b/DisguiseUnityRenderStream/Runtime/PipelineAbstraction/Disguise.RenderStream.PipelineAbstraction.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 690973e5dff7e66418d830800339e71f +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/DisguiseUnityRenderStream/Runtime/Util/AutoDisposable.cs.meta b/DisguiseUnityRenderStream/Runtime/Util/AutoDisposable.cs.meta new file mode 100644 index 0000000..48f1547 --- /dev/null +++ b/DisguiseUnityRenderStream/Runtime/Util/AutoDisposable.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4209034702abda0428aa6f6428d6927c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 5da05d70246416012e9ad3cf02dd96826e0200f9 Mon Sep 17 00:00:00 2001 From: Mark Beiline Date: Mon, 3 Apr 2023 15:27:27 -0400 Subject: [PATCH 2/2] Removed unused code --- .../Editor/DisguiseRenderStreamSettingsProvider.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsProvider.cs b/DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsProvider.cs index 31c0c74..ca755da 100644 --- a/DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsProvider.cs +++ b/DisguiseUnityRenderStream/Editor/DisguiseRenderStreamSettingsProvider.cs @@ -1,5 +1,4 @@ using UnityEditor; -using UnityEditor.UIElements; using UnityEngine.UIElements; namespace Disguise.RenderStream @@ -7,7 +6,6 @@ namespace Disguise.RenderStream static class DisguiseRenderStreamSettingsProvider { static readonly string k_SettingsPath = "Project/DisguiseRenderStream"; - const string k_StyleSheetCommon = "Packages/com.unity.cluster-display/Editor/UI/SettingsWindowCommon.uss"; class Contents {