Browse Source

Set default noise to fractal, fixed layer name loading

flabbet 1 year ago
parent
commit
9f1d9b9690

+ 2 - 2
src/PixiEditor.ChangeableDocument/Changeables/Graph/Nodes/NoiseNode.cs

@@ -13,7 +13,7 @@ public class NoiseNode : Node
 {
 {
     private double previousScale = double.NaN;
     private double previousScale = double.NaN;
     private double previousSeed = double.NaN;
     private double previousSeed = double.NaN;
-    private NoiseType previousNoiseType = Nodes.NoiseType.TurbulencePerlin;
+    private NoiseType previousNoiseType = Nodes.NoiseType.FractalPerlin;
     private int previousOctaves = -1;
     private int previousOctaves = -1;
     
     
     private Paint paint = new();
     private Paint paint = new();
@@ -35,7 +35,7 @@ public class NoiseNode : Node
     public NoiseNode()
     public NoiseNode()
     {
     {
         Noise = CreateOutput<Texture>(nameof(Noise), "NOISE", null);
         Noise = CreateOutput<Texture>(nameof(Noise), "NOISE", null);
-        NoiseType = CreateInput(nameof(NoiseType), "NOISE_TYPE", Nodes.NoiseType.TurbulencePerlin);
+        NoiseType = CreateInput(nameof(NoiseType), "NOISE_TYPE", Nodes.NoiseType.FractalPerlin);
         Size = CreateInput(nameof(Size), "SIZE", new VecI(64, 64));
         Size = CreateInput(nameof(Size), "SIZE", new VecI(64, 64));
         Scale = CreateInput(nameof(Scale), "SCALE", 10d);
         Scale = CreateInput(nameof(Scale), "SCALE", 10d);
         Octaves = CreateInput(nameof(Octaves), "OCTAVES", 1);
         Octaves = CreateInput(nameof(Octaves), "OCTAVES", 1);

+ 7 - 3
src/PixiEditor.ChangeableDocument/Changeables/Graph/Nodes/StructureNode.cs

@@ -27,10 +27,12 @@ public abstract class StructureNode : Node, IReadOnlyStructureNode, IBackgroundI
 
 
     public OutputProperty<Texture?> FilterlessOutput { get; }
     public OutputProperty<Texture?> FilterlessOutput { get; }
 
 
-    public string MemberName { get; set; } = DefaultMemberName;
+    public string MemberName
+    {
+        get => DisplayName;
+        set => DisplayName = value;
+    } 
     
     
-    public string DisplayName => MemberName;
-
     private Paint maskPaint = new Paint() { BlendMode = DrawingApi.Core.Surfaces.BlendMode.DstIn };
     private Paint maskPaint = new Paint() { BlendMode = DrawingApi.Core.Surfaces.BlendMode.DstIn };
     protected Paint blendPaint = new Paint();
     protected Paint blendPaint = new Paint();
 
 
@@ -47,6 +49,8 @@ public abstract class StructureNode : Node, IReadOnlyStructureNode, IBackgroundI
 
 
         Output = CreateOutput<Texture?>("Output", "OUTPUT", null);
         Output = CreateOutput<Texture?>("Output", "OUTPUT", null);
         FilterlessOutput = CreateOutput<Texture?>(nameof(FilterlessOutput), "WITHOUT_FILTERS", null);
         FilterlessOutput = CreateOutput<Texture?>(nameof(FilterlessOutput), "WITHOUT_FILTERS", null);
+        
+        MemberName = DefaultMemberName;
     }
     }
 
 
     protected override bool AffectedByChunkResolution => true;
     protected override bool AffectedByChunkResolution => true;