|
@@ -1,5 +1,6 @@
|
|
|
using System.Diagnostics;
|
|
using System.Diagnostics;
|
|
|
using Drawie.Backend.Core;
|
|
using Drawie.Backend.Core;
|
|
|
|
|
+using Drawie.Backend.Core.ColorsImpl;
|
|
|
using Drawie.Backend.Core.ColorsImpl.Paintables;
|
|
using Drawie.Backend.Core.ColorsImpl.Paintables;
|
|
|
using Drawie.Backend.Core.Numerics;
|
|
using Drawie.Backend.Core.Numerics;
|
|
|
using Drawie.Backend.Core.Surfaces;
|
|
using Drawie.Backend.Core.Surfaces;
|
|
@@ -42,7 +43,7 @@ public class BrushEngine : IDisposable
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if (brushData.BrushGraph.AllNodes.FirstOrDefault(x => x is BrushOutputNode) is not BrushOutputNode brushNode)
|
|
|
|
|
|
|
+ if (brushData.BrushGraph.LookupNode(brushData.TargetBrushNodeId) is not BrushOutputNode brushNode)
|
|
|
{
|
|
{
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
@@ -108,7 +109,7 @@ public class BrushEngine : IDisposable
|
|
|
public void ExecuteBrush(ChunkyImage? target, BrushData brushData, VecD point, KeyFrameTime frameTime, ColorSpace cs,
|
|
public void ExecuteBrush(ChunkyImage? target, BrushData brushData, VecD point, KeyFrameTime frameTime, ColorSpace cs,
|
|
|
SamplingOptions samplingOptions, PointerInfo pointerInfo, KeyboardInfo keyboardInfo, EditorData editorData)
|
|
SamplingOptions samplingOptions, PointerInfo pointerInfo, KeyboardInfo keyboardInfo, EditorData editorData)
|
|
|
{
|
|
{
|
|
|
- var brushNode = brushData.BrushGraph?.AllNodes?.FirstOrDefault(x => x is BrushOutputNode) as BrushOutputNode;
|
|
|
|
|
|
|
+ var brushNode = brushData.BrushGraph?.LookupNode(brushData.TargetBrushNodeId) as BrushOutputNode;
|
|
|
if (brushNode == null)
|
|
if (brushNode == null)
|
|
|
{
|
|
{
|
|
|
return;
|
|
return;
|
|
@@ -119,7 +120,8 @@ public class BrushEngine : IDisposable
|
|
|
editorData);
|
|
editorData);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- private void ExecuteVectorShapeBrush(ChunkyImage? target, BrushOutputNode brushNode, BrushData brushData, VecD point,
|
|
|
|
|
|
|
+ private void ExecuteVectorShapeBrush(ChunkyImage? target, BrushOutputNode brushNode, BrushData brushData,
|
|
|
|
|
+ VecD point,
|
|
|
KeyFrameTime frameTime,
|
|
KeyFrameTime frameTime,
|
|
|
ColorSpace colorSpace, SamplingOptions samplingOptions,
|
|
ColorSpace colorSpace, SamplingOptions samplingOptions,
|
|
|
PointerInfo pointerInfo, KeyboardInfo keyboardInfo, EditorData editorData)
|
|
PointerInfo pointerInfo, KeyboardInfo keyboardInfo, EditorData editorData)
|