Renamed field input to func input

src/PixiEditor.ChangeableDocument/ChangeInfos/NodeGraph/CreateNode_ChangeInfo.cs

@@ -30,7 +30,7 @@ public record CreateNode_ChangeInfo(
 
     private static object? GetNonOverridenValue(INodeProperty property) => property switch
     {
-        IFieldInputProperty fieldProperty => fieldProperty.GetFieldConstantValue(),
+        IFuncInputProperty fieldProperty => fieldProperty.GetFuncConstantValue(),
         IInputProperty inputProperty => inputProperty.NonOverridenValue,
         _ => null
     };

src/PixiEditor.ChangeableDocument/Changeables/Graph/Context/FieldContext.cs

@@ -1,19 +0,0 @@
-using PixiEditor.ChangeableDocument.Changeables.Graph.Interfaces;
-using PixiEditor.Numerics;
-
-namespace PixiEditor.ChangeableDocument.Changeables.Graph.Context;
-
-public record struct FieldContext(VecD Position, VecI Size, bool HasContext)
-{
-    public FieldContext(VecD position, VecI size) : this(position, size, true) { }
-
-    public static FieldContext NoContext => new(VecD.Zero, VecI.Zero, false);
-
-    public void ThrowOnMissingContext()
-    {
-        if (!HasContext)
-        {
-            throw new NoNodeFieldContextException();
-        }
-    }
-}

src/PixiEditor.ChangeableDocument/Changeables/Graph/Context/FuncContext.cs

@@ -0,0 +1,19 @@
+using PixiEditor.ChangeableDocument.Changeables.Graph.Interfaces;
+using PixiEditor.Numerics;
+
+namespace PixiEditor.ChangeableDocument.Changeables.Graph.Context;
+
+public record struct FuncContext(VecD Position, VecI Size, bool HasContext)
+{
+    public FuncContext(VecD position, VecI size) : this(position, size, true) { }
+
+    public static FuncContext NoContext => new(VecD.Zero, VecI.Zero, false);
+
+    public void ThrowOnMissingContext()
+    {
+        if (!HasContext)
+        {
+            throw new NoNodeFuncContextException();
+        }
+    }
+}

src/PixiEditor.ChangeableDocument/Changeables/Graph/Context/NoNodeFieldContextException.cs

@@ -1,7 +0,0 @@
-namespace PixiEditor.ChangeableDocument.Changeables.Graph.Interfaces;
-
-public class NoNodeFieldContextException : Exception
-{
-    public NoNodeFieldContextException() : base("The node field requires context")
-    { }
-}

src/PixiEditor.ChangeableDocument/Changeables/Graph/Context/NoNodeFuncContextException.cs

@@ -0,0 +1,7 @@
+namespace PixiEditor.ChangeableDocument.Changeables.Graph.Interfaces;
+
+public class NoNodeFuncContextException : Exception
+{
+    public NoNodeFuncContextException() : base("The node field requires context")
+    { }
+}

src/PixiEditor.ChangeableDocument/Changeables/Graph/FieldInputProperty.cs → src/PixiEditor.ChangeableDocument/Changeables/Graph/FuncInputProperty.cs

@@ -4,19 +4,19 @@ using PixiEditor.ChangeableDocument.Changeables.Graph.Nodes;
 
 namespace PixiEditor.ChangeableDocument.Changeables.Graph;
 
-public class FieldInputProperty<T> : InputProperty<Func<FieldContext, T>>, IFieldInputProperty
+public class FuncInputProperty<T> : InputProperty<Func<FuncContext, T>>, IFuncInputProperty
 {
     private T? constantNonOverrideValue;
     
-    internal FieldInputProperty(Node node, string internalName, string displayName, T defaultValue) : base(node, internalName, displayName, null)
+    internal FuncInputProperty(Node node, string internalName, string displayName, T defaultValue) : base(node, internalName, displayName, null)
     {
         constantNonOverrideValue = defaultValue;
         NonOverridenValue = _ => constantNonOverrideValue;
     }
 
-    object? IFieldInputProperty.GetFieldConstantValue() => constantNonOverrideValue;
+    object? IFuncInputProperty.GetFuncConstantValue() => constantNonOverrideValue;
 
-    void IFieldInputProperty.SetFieldConstantValue(object? value)
+    void IFuncInputProperty.SetFuncConstantValue(object? value)
     {
         constantNonOverrideValue = (T)value;
     }

src/PixiEditor.ChangeableDocument/Changeables/Graph/FieldOutputProperty.cs → src/PixiEditor.ChangeableDocument/Changeables/Graph/FuncOutputProperty.cs

@@ -4,9 +4,9 @@ using PixiEditor.ChangeableDocument.Changeables.Graph.Nodes;
 
 namespace PixiEditor.ChangeableDocument.Changeables.Graph;
 
-public class FieldOutputProperty<T> : OutputProperty<Func<FieldContext, T>>
+public class FuncOutputProperty<T> : OutputProperty<Func<FuncContext, T>>
 {
-    internal FieldOutputProperty(Node node, string internalName, string displayName, Func<FieldContext, T> defaultValue) : base(node, internalName, displayName, defaultValue)
+    internal FuncOutputProperty(Node node, string internalName, string displayName, Func<FuncContext, T> defaultValue) : base(node, internalName, displayName, defaultValue)
     {
     }
 }

src/PixiEditor.ChangeableDocument/Changeables/Graph/IFieldInputProperty.cs

@@ -1,8 +0,0 @@
-namespace PixiEditor.ChangeableDocument.Changeables.Graph;
-
-internal interface IFieldInputProperty
-{
-    object? GetFieldConstantValue();
-    
-    void SetFieldConstantValue(object? value);
-}

src/PixiEditor.ChangeableDocument/Changeables/Graph/IFuncInputProperty.cs

@@ -0,0 +1,8 @@
+namespace PixiEditor.ChangeableDocument.Changeables.Graph;
+
+internal interface IFuncInputProperty
+{
+    object? GetFuncConstantValue();
+    
+    void SetFuncConstantValue(object? value);
+}

src/PixiEditor.ChangeableDocument/Changeables/Graph/InputProperty.cs

@@ -24,12 +24,12 @@ public class InputProperty : IInputProperty
             
             if (!ValueType.IsAssignableTo(typeof(Delegate)) && connectionValue is Delegate connectionField)
             {
-                return connectionField.DynamicInvoke(FieldContext.NoContext);
+                return connectionField.DynamicInvoke(FuncContext.NoContext);
             }
 
             if (ValueType.IsAssignableTo(typeof(Delegate)) && connectionValue is not Delegate)
             {
-                Func<FieldContext, object> field = _ => connectionValue;
+                Func<FuncContext, object> field = _ => connectionValue;
                 return field;
             }
 

src/PixiEditor.ChangeableDocument/Changeables/Graph/Nodes/CombineSeparate/CombineColorNode.cs

@@ -6,15 +6,15 @@ namespace PixiEditor.ChangeableDocument.Changeables.Graph.Nodes.CombineSeparate;
 
 public class CombineColorNode : Node
 {
-    public FieldOutputProperty<Color> Color { get; }
+    public FuncOutputProperty<Color> Color { get; }
 
-    public FieldInputProperty<double> R { get; }
+    public FuncInputProperty<double> R { get; }
 
-    public FieldInputProperty<double> G { get; }
+    public FuncInputProperty<double> G { get; }
 
-    public FieldInputProperty<double> B { get; }
+    public FuncInputProperty<double> B { get; }
 
-    public FieldInputProperty<double> A { get; }
+    public FuncInputProperty<double> A { get; }
 
     public override string DisplayName { get; set; } = "COMBINE_COLOR_NODE";
 
@@ -22,13 +22,13 @@ public class CombineColorNode : Node
     {
         Color = CreateFieldOutput(nameof(Color), "COLOR", GetColor);
 
-        R = CreateFieldInput("R", "R", 0d);
-        G = CreateFieldInput("G", "G", 0d);
-        B = CreateFieldInput("B", "B", 0d);
-        A = CreateFieldInput("A", "A", 0d);
+        R = CreateFuncInput("R", "R", 0d);
+        G = CreateFuncInput("G", "G", 0d);
+        B = CreateFuncInput("B", "B", 0d);
+        A = CreateFuncInput("A", "A", 0d);
     }
 
-    private Color GetColor(FieldContext ctx)
+    private Color GetColor(FuncContext ctx)
     {
         var r = R.Value(ctx) * 255;
         var g = G.Value(ctx) * 255;

src/PixiEditor.ChangeableDocument/Changeables/Graph/Nodes/CombineSeparate/CombineVecD.cs

@@ -7,11 +7,11 @@ namespace PixiEditor.ChangeableDocument.Changeables.Graph.Nodes.CombineSeparate;
 
 public class CombineVecD : Node
 {
-    public FieldOutputProperty<VecD> Vector { get; }
+    public FuncOutputProperty<VecD> Vector { get; }
     
-    public FieldInputProperty<double> X { get; }
+    public FuncInputProperty<double> X { get; }
     
-    public FieldInputProperty<double> Y { get; }
+    public FuncInputProperty<double> Y { get; }
     
     
     public override string DisplayName { get; set; } = "COMBINE_VECD_NODE";
@@ -20,11 +20,11 @@ public class CombineVecD : Node
     {
         Vector = CreateFieldOutput(nameof(Vector), "VECTOR", GetVector);
 
-        X = CreateFieldInput(nameof(X), "X", 0d);
-        Y = CreateFieldInput(nameof(Y), "Y", 0d);
+        X = CreateFuncInput(nameof(X), "X", 0d);
+        Y = CreateFuncInput(nameof(Y), "Y", 0d);
     }
     
-    private VecD GetVector(FieldContext ctx)
+    private VecD GetVector(FuncContext ctx)
     {
         var r = X.Value(ctx);
         var g = Y.Value(ctx);

src/PixiEditor.ChangeableDocument/Changeables/Graph/Nodes/CombineSeparate/CombineVecI.cs

@@ -6,11 +6,11 @@ namespace PixiEditor.ChangeableDocument.Changeables.Graph.Nodes.CombineSeparate;
 
 public class CombineVecI : Node
 {
-    public FieldOutputProperty<VecI> Vector { get; }
+    public FuncOutputProperty<VecI> Vector { get; }
     
-    public FieldInputProperty<int> X { get; }
+    public FuncInputProperty<int> X { get; }
     
-    public FieldInputProperty<int> Y { get; }
+    public FuncInputProperty<int> Y { get; }
 
     public override string DisplayName { get; set; } = "COMBINE_VECI_NODE";
 
@@ -18,11 +18,11 @@ public class CombineVecI : Node
     {
         Vector = CreateFieldOutput(nameof(Vector), "VECTOR", GetVector);
 
-        X = CreateFieldInput(nameof(X), "X", 0);
-        Y = CreateFieldInput(nameof(Y), "Y", 0);
+        X = CreateFuncInput(nameof(X), "X", 0);
+        Y = CreateFuncInput(nameof(Y), "Y", 0);
     }
 
-    private VecI GetVector(FieldContext ctx)
+    private VecI GetVector(FuncContext ctx)
     {
         var r = X.Value(ctx);
         var g = Y.Value(ctx);

src/PixiEditor.ChangeableDocument/Changeables/Graph/Nodes/CombineSeparate/SeparateColorNode.cs

@@ -5,21 +5,21 @@ namespace PixiEditor.ChangeableDocument.Changeables.Graph.Nodes.CombineSeparate;
 
 public class SeparateColorNode : Node
 {
-    public FieldInputProperty<Color> Color { get; }
+    public FuncInputProperty<Color> Color { get; }
     
-    public FieldOutputProperty<double> R { get; }
+    public FuncOutputProperty<double> R { get; }
     
-    public FieldOutputProperty<double> G { get; }
+    public FuncOutputProperty<double> G { get; }
     
-    public FieldOutputProperty<double> B { get; }
+    public FuncOutputProperty<double> B { get; }
     
-    public FieldOutputProperty<double> A { get; }
+    public FuncOutputProperty<double> A { get; }
     
     public override string DisplayName { get; set; } = "SEPARATE_COLOR_NODE";
 
     public SeparateColorNode()
     {
-        Color = CreateFieldInput(nameof(Color), "COLOR", new Color());
+        Color = CreateFuncInput(nameof(Color), "COLOR", new Color());
         R = CreateFieldOutput(nameof(R), "R", ctx => Color.Value(ctx).R / 255d);
         G = CreateFieldOutput(nameof(G), "G", ctx => Color.Value(ctx).G / 255d);
         B = CreateFieldOutput(nameof(B), "B", ctx => Color.Value(ctx).B / 255d);

src/PixiEditor.ChangeableDocument/Changeables/Graph/Nodes/CombineSeparate/SeparateVecDNode.cs

@@ -5,11 +5,11 @@ namespace PixiEditor.ChangeableDocument.Changeables.Graph.Nodes.CombineSeparate;
 
 public class SeparateVecDNode : Node
 {
-    public FieldInputProperty<VecD> Vector { get; }
+    public FuncInputProperty<VecD> Vector { get; }
     
-    public FieldOutputProperty<double> X { get; }
+    public FuncOutputProperty<double> X { get; }
     
-    public FieldOutputProperty<double> Y { get; }
+    public FuncOutputProperty<double> Y { get; }
     
     public override string DisplayName { get; set; } = "SEPARATE_VECD_NODE";
 
@@ -17,7 +17,7 @@ public class SeparateVecDNode : Node
     {
         X = CreateFieldOutput("X", "X", ctx => Vector.Value(ctx).X);
         Y = CreateFieldOutput("Y", "Y", ctx => Vector.Value(ctx).Y);
-        Vector = CreateFieldInput("Vector", "VECTOR", new VecD(0, 0));
+        Vector = CreateFuncInput("Vector", "VECTOR", new VecD(0, 0));
     }
 
     protected override string NodeUniqueName => "SeparateVecD";

src/PixiEditor.ChangeableDocument/Changeables/Graph/Nodes/CombineSeparate/SeparateVecINode.cs

@@ -5,11 +5,11 @@ namespace PixiEditor.ChangeableDocument.Changeables.Graph.Nodes.CombineSeparate;
 
 public class SeparateVecINode : Node
 {
-    public FieldInputProperty<VecI> Vector { get; }
+    public FuncInputProperty<VecI> Vector { get; }
     
-    public FieldOutputProperty<int> X { get; }
+    public FuncOutputProperty<int> X { get; }
     
-    public FieldOutputProperty<int> Y { get; }
+    public FuncOutputProperty<int> Y { get; }
     
     public override string DisplayName { get; set; } = "SEPARATE_VECI_NODE";
 
@@ -17,7 +17,7 @@ public class SeparateVecINode : Node
     {
         X = CreateFieldOutput("X", "X", ctx => Vector.Value(ctx).X);
         Y = CreateFieldOutput("Y", "Y", ctx => Vector.Value(ctx).Y);
-        Vector = CreateFieldInput("Vector", "VECTOR", new VecI(0, 0));
+        Vector = CreateFuncInput("Vector", "VECTOR", new VecI(0, 0));
     }
 
     protected override string NodeUniqueName => "SeparateVecI";

src/PixiEditor.ChangeableDocument/Changeables/Graph/Nodes/ImageSpaceNode.cs

@@ -8,9 +8,9 @@ namespace PixiEditor.ChangeableDocument.Changeables.Graph.Nodes;
 
 public class ImageSpaceNode : Node
 {
-    public FieldOutputProperty<VecD> SpacePosition { get; }
+    public FuncOutputProperty<VecD> SpacePosition { get; }
     
-    public FieldOutputProperty<VecI> Size { get; }
+    public FuncOutputProperty<VecI> Size { get; }
 
     public override string DisplayName { get; set; } = "IMAGE_SPACE_NODE";
     public ImageSpaceNode()

src/PixiEditor.ChangeableDocument/Changeables/Graph/Nodes/MathNode.cs

@@ -9,15 +9,15 @@ namespace PixiEditor.ChangeableDocument.Changeables.Graph.Nodes;
 
 public class MathNode : Node
 {
-    public FieldOutputProperty<double> Result { get; }
+    public FuncOutputProperty<double> Result { get; }
 
     public InputProperty<MathNodeMode> Mode { get; }
     
     public InputProperty<bool> Clamp { get; }
 
-    public FieldInputProperty<double> X { get; }
+    public FuncInputProperty<double> X { get; }
     
-    public FieldInputProperty<double> Y { get; }
+    public FuncInputProperty<double> Y { get; }
     
     
     public override string DisplayName { get; set; } = "MATH_NODE";
@@ -27,11 +27,11 @@ public class MathNode : Node
         Result = CreateFieldOutput(nameof(Result), "RESULT", Calculate);
         Mode = CreateInput(nameof(Mode), "MATH_MODE", MathNodeMode.Add);
         Clamp = CreateInput(nameof(Clamp), "CLAMP", false);
-        X = CreateFieldInput(nameof(X), "X", 0d);
-        Y = CreateFieldInput(nameof(Y), "Y", 0d);
+        X = CreateFuncInput(nameof(X), "X", 0d);
+        Y = CreateFuncInput(nameof(Y), "Y", 0d);
     }
 
-    private double Calculate(FieldContext context)
+    private double Calculate(FuncContext context)
     {
         var (x, y) = GetValues(context);
 
@@ -51,7 +51,7 @@ public class MathNode : Node
         return result;
     }
 
-    private (double x, double y) GetValues(FieldContext context) => (X.Value(context), Y.Value(context));
+    private (double x, double y) GetValues(FuncContext context) => (X.Value(context), Y.Value(context));
 
     protected override string NodeUniqueName => "Math";
 

src/PixiEditor.ChangeableDocument/Changeables/Graph/Nodes/ModifyImageLeftNode.cs

@@ -16,9 +16,9 @@ public class ModifyImageLeftNode : Node
 
     public InputProperty<Surface?> Image { get; }
     
-    public FieldOutputProperty<VecD> Coordinate { get; }
+    public FuncOutputProperty<VecD> Coordinate { get; }
     
-    public FieldOutputProperty<Color> Color { get; }
+    public FuncOutputProperty<Color> Color { get; }
 
     public override string DisplayName { get; set; } = "MODIFY_IMAGE_LEFT_NODE";
 
@@ -29,7 +29,7 @@ public class ModifyImageLeftNode : Node
         Color = CreateFieldOutput(nameof(Color), "COLOR", GetColor);
     }
 
-    private Color GetColor(FieldContext context)
+    private Color GetColor(FuncContext context)
     {
         context.ThrowOnMissingContext();
         

src/PixiEditor.ChangeableDocument/Changeables/Graph/Nodes/ModifyImageRightNode.cs

@@ -17,7 +17,7 @@ public class ModifyImageRightNode : Node
     
     private Paint drawingPaint = new Paint() { BlendMode = BlendMode.Src };
     
-    public FieldInputProperty<Color> Color { get; }
+    public FuncInputProperty<Color> Color { get; }
     
     public OutputProperty<Surface> Output { get; }
 
@@ -26,7 +26,7 @@ public class ModifyImageRightNode : Node
     public ModifyImageRightNode(ModifyImageLeftNode startNode)
     {
         this.startNode = startNode;
-        Color = CreateFieldInput(nameof(Color), "COLOR", new Color());
+        Color = CreateFuncInput(nameof(Color), "COLOR", new Color());
         Output = CreateOutput<Surface>(nameof(Output), "OUTPUT", null);
     }
 
@@ -50,7 +50,7 @@ public class ModifyImageRightNode : Node
         {
             for (int x = 0; x < width; x++)
             {
-                var context = new FieldContext(new VecD((double)x / width, (double)y / height), new VecI(width, height));
+                var context = new FuncContext(new VecD((double)x / width, (double)y / height), new VecI(width, height));
                 var color = Color.Value(context);
 
                 drawingPaint.Color = color;

src/PixiEditor.ChangeableDocument/Changeables/Graph/Nodes/Node.cs

@@ -196,9 +196,9 @@ public abstract class Node : IReadOnlyNode, IDisposable
         _keyFramesDirty = true;
     }
 
-    protected FieldInputProperty<T> CreateFieldInput<T>(string propName, string displayName, T defaultValue)
+    protected FuncInputProperty<T> CreateFuncInput<T>(string propName, string displayName, T defaultValue)
     {
-        var property = new FieldInputProperty<T>(this, propName, displayName, defaultValue);
+        var property = new FuncInputProperty<T>(this, propName, displayName, defaultValue);
         if (InputProperties.Any(x => x.InternalPropertyName == propName))
         {
             throw new InvalidOperationException($"Input with name {propName} already exists.");
@@ -220,10 +220,10 @@ public abstract class Node : IReadOnlyNode, IDisposable
         return property;
     }
 
-    protected FieldOutputProperty<T> CreateFieldOutput<T>(string propName, string displayName,
-        Func<FieldContext, T> defaultFunc)
+    protected FuncOutputProperty<T> CreateFieldOutput<T>(string propName, string displayName,
+        Func<FuncContext, T> defaultFunc)
     {
-        var property = new FieldOutputProperty<T>(this, propName, displayName, defaultFunc);
+        var property = new FuncOutputProperty<T>(this, propName, displayName, defaultFunc);
         outputs.Add(property);
         return property;
     }

src/PixiEditor.ChangeableDocument/Changes/NodeGraph/UpdateProperty_Change.cs

@@ -44,9 +44,9 @@ internal class UpdatePropertyValue_Change : Change
 
     private static void SetValue(InputProperty property, object? value)
     {
-        if (property is IFieldInputProperty fieldInput)
+        if (property is IFuncInputProperty fieldInput)
         {
-            fieldInput.SetFieldConstantValue(value);
+            fieldInput.SetFuncConstantValue(value);
         }
         else
         {
@@ -57,9 +57,9 @@ internal class UpdatePropertyValue_Change : Change
 
     private static object? GetValue(InputProperty property)
     {
-        if (property is IFieldInputProperty fieldInput)
+        if (property is IFuncInputProperty fieldInput)
         {
-            return fieldInput.GetFieldConstantValue();
+            return fieldInput.GetFuncConstantValue();
         }
 
         return property.NonOverridenValue;