From 0614e27cd557198a6b562aaa04f27a907a138950 Mon Sep 17 00:00:00 2001 From: Chromium <62724067+Chromum@users.noreply.github.com> Date: Mon, 28 Apr 2025 04:16:02 +0100 Subject: [PATCH] oomphies --- Editor/Scripts/Editor/Data Types/IPTPort.cs | 2 -- .../Windows/ImageProcessingGraphNodeVisual.cs | 17 +++++++++++++---- Node.uss | 7 ++----- NodeError.uss | 7 +++++++ NodeError.uss.meta | 3 +++ 5 files changed, 25 insertions(+), 11 deletions(-) create mode 100644 NodeError.uss create mode 100644 NodeError.uss.meta diff --git a/Editor/Scripts/Editor/Data Types/IPTPort.cs b/Editor/Scripts/Editor/Data Types/IPTPort.cs index f88fa34..9abdf23 100644 --- a/Editor/Scripts/Editor/Data Types/IPTPort.cs +++ b/Editor/Scripts/Editor/Data Types/IPTPort.cs @@ -10,12 +10,10 @@ namespace ImageProcessingGraph.Editor { public FieldInfo fieldInfo; private VisualElement _exposedPropertyContainer; - public VisualElement ExposedPropertyContainer { set { - Debug.Log($"🔥 Someone is SETTING ExposedPropertyContainer to {value} 🔥"); _exposedPropertyContainer = value; } get diff --git a/Editor/Scripts/Editor/Windows/ImageProcessingGraphNodeVisual.cs b/Editor/Scripts/Editor/Windows/ImageProcessingGraphNodeVisual.cs index d0bf546..c3e4fcb 100644 --- a/Editor/Scripts/Editor/Windows/ImageProcessingGraphNodeVisual.cs +++ b/Editor/Scripts/Editor/Windows/ImageProcessingGraphNodeVisual.cs @@ -22,6 +22,7 @@ namespace ImageProcessingGraph.Editor.Unity_Image_Processing.Scripts.Editor.Wind private ImageProcessingGraphViewWindow window; + private StyleSheet defaaStyleSheet; private StyleSheet errorStyleSheet; public ImageProcessingGraphNodeVisual(BaseImageNode node, ImageProcessingGraphViewWindow window) @@ -79,10 +80,17 @@ namespace ImageProcessingGraph.Editor.Unity_Image_Processing.Scripts.Editor.Wind } - errorStyleSheet = AssetDatabase.LoadAssetAtPath("Assets/Unity Image Processing/Node.uss"); + defaaStyleSheet = AssetDatabase.LoadAssetAtPath("Assets/Unity Image Processing/Node.uss"); + if (defaaStyleSheet == null) + { + defaaStyleSheet = EditorGUIUtility.Load("Packages/com.chromium.imageprocessingrah/Node.uss") as StyleSheet; + } + styleSheets.Add(defaaStyleSheet); + + errorStyleSheet = AssetDatabase.LoadAssetAtPath("Assets/Unity Image Processing/NodeError.uss"); if (errorStyleSheet == null) { - errorStyleSheet = EditorGUIUtility.Load("Packages/com.chromium.imageprocessingrah/Node.uss") as StyleSheet; + errorStyleSheet = EditorGUIUtility.Load("Packages/com.chromium.imageprocessingrah/NodeError.uss") as StyleSheet; } graphNode.onFailed += () => @@ -139,12 +147,13 @@ namespace ImageProcessingGraph.Editor.Unity_Image_Processing.Scripts.Editor.Wind // Exposes a variable on the port for editing when it's not connected public void ExposeVariableToPort(Port port, FieldInfo field) { + VisualElement NewElement; var ExposedPropertyContainer = ((IPTPort)port).ExposedPropertyContainer; Type containerType = null; if (ExposedPropertyContainer == null) { - var NewElement = new VisualElement(); + NewElement = new VisualElement(); NewElement.name = "property-field-container"; VisualElement the = CreatePropertyFieldForType(field.FieldType, field.GetValue(graphNode)); @@ -242,7 +251,7 @@ namespace ImageProcessingGraph.Editor.Unity_Image_Processing.Scripts.Editor.Wind }); } - port.Add(ExposedPropertyContainer); + port.Add(NewElement); } public void ToggleExposedVariable(Port port, bool value) diff --git a/Node.uss b/Node.uss index 7364771..91da203 100644 --- a/Node.uss +++ b/Node.uss @@ -1,7 +1,4 @@ -#node-border +#input { - border-bottom-color: red; - border-left-color: red; - border-right-color: red; - border-top-color: red; + flex-shrink: 1 } \ No newline at end of file diff --git a/NodeError.uss b/NodeError.uss new file mode 100644 index 0000000..7364771 --- /dev/null +++ b/NodeError.uss @@ -0,0 +1,7 @@ +#node-border +{ + border-bottom-color: red; + border-left-color: red; + border-right-color: red; + border-top-color: red; +} \ No newline at end of file diff --git a/NodeError.uss.meta b/NodeError.uss.meta new file mode 100644 index 0000000..00c63b3 --- /dev/null +++ b/NodeError.uss.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 7ecdb9925f9c4d018e1e54b8ae734ccb +timeCreated: 1745808720 \ No newline at end of file