Skip to content

Commit

Permalink
Cleanup and remove unused methods
Browse files Browse the repository at this point in the history
  • Loading branch information
@JimBobSquarePants
JimBobSquarePants committed Aug 14, 2023
1 parent 513abad commit 85ec501
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 167 deletions.
2 changes: 1 addition & 1 deletion src/ImageSharp.Drawing/Processing/PathGradientBrush.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ protected override void Dispose(bool disposing)
Vector2 ip = default;
Vector2 closestIntersection = default;
Edge closestEdge = null;
float minDistance = float.MaxValue;
const float minDistance = float.MaxValue;
foreach (Edge edge in this.edges)
{
if (!edge.Intersect(start, end, ref ip))
Expand Down
16 changes: 8 additions & 8 deletions src/ImageSharp.Drawing/Shapes/PolygonClipper/BoundsF.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,38 +52,38 @@ public BoundsF(bool isValid)

public float Width
{
get => this.Right - this.Left;
readonly get => this.Right - this.Left;
set => this.Right = this.Left + value;
}

public float Height
{
get => this.Bottom - this.Top;
readonly get => this.Bottom - this.Top;
set => this.Bottom = this.Top + value;
}

public bool IsEmpty()
public readonly bool IsEmpty()
=> this.Bottom <= this.Top || this.Right <= this.Left;

public Vector2 MidPoint()
public readonly Vector2 MidPoint()
=> new Vector2(this.Left + this.Right, this.Top + this.Bottom) * .5F;

public bool Contains(Vector2 pt)
public readonly bool Contains(Vector2 pt)
=> pt.X > this.Left
&& pt.X < this.Right
&& pt.Y > this.Top && pt.Y < this.Bottom;

public bool Contains(BoundsF bounds)
public readonly bool Contains(BoundsF bounds)
=> bounds.Left >= this.Left
&& bounds.Right <= this.Right
&& bounds.Top >= this.Top
&& bounds.Bottom <= this.Bottom;

public bool Intersects(BoundsF bounds)
public readonly bool Intersects(BoundsF bounds)
=> (Math.Max(this.Left, bounds.Left) < Math.Min(this.Right, bounds.Right))
&& (Math.Max(this.Top, bounds.Top) < Math.Min(this.Bottom, bounds.Bottom));

public PathF AsPath()
public readonly PathF AsPath()
=> new(4)
{
new Vector2(this.Left, this.Top),
Expand Down
164 changes: 6 additions & 158 deletions src/ImageSharp.Drawing/Shapes/PolygonClipper/PolygonClipper.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -925,158 +925,6 @@ private static OutPt DisposeOutPt(OutPt op)
return result;
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static BoundsF GetBounds(OutPt op)
{
BoundsF result = new(op.Point.X, op.Point.Y, op.Point.X, op.Point.Y);
OutPt op2 = op.Next;
while (op2 != op)
{
if (op2.Point.X < result.Left)
{
result.Left = op2.Point.X;
}
else if (op2.Point.X > result.Right)
{
result.Right = op2.Point.X;
}

if (op2.Point.Y < result.Top)
{
result.Top = op2.Point.Y;
}
else if (op2.Point.Y > result.Bottom)
{
result.Bottom = op2.Point.Y;
}

op2 = op2.Next;
}

return result;
}

private static PointInPolygonResult PointInOpPolygon(Vector2 pt, OutPt op)
{
if (op == op.Next || op.Prev == op.Next)
{
return PointInPolygonResult.IsOutside;
}

OutPt op2 = op;
do
{
if (op.Point.Y != pt.Y)
{
break;
}

op = op.Next;
}
while (op != op2);

// not a proper polygon
if (op.Point.Y == pt.Y)
{
return PointInPolygonResult.IsOutside;
}

// must be above or below to get here
bool isAbove = op.Point.Y < pt.Y, startingAbove = isAbove;
int val = 0;

op2 = op.Next;
while (op2 != op)
{
if (isAbove)
{
while (op2 != op && op2.Point.Y < pt.Y)
{
op2 = op2.Next;
}
}
else
{
while (op2 != op && op2.Point.Y > pt.Y)
{
op2 = op2.Next;
}
}

if (op2 == op)
{
break;
}

// must have touched or crossed the pt.Y horizonal
// and this must happen an even number of times
// touching the horizontal
if (op2.Point.Y == pt.Y)
{
if (op2.Point.X == pt.X || (op2.Point.Y == op2.Prev.Point.Y
&& (pt.X < op2.Prev.Point.X) != (pt.X < op2.Point.X)))
{
return PointInPolygonResult.IsOn;
}

op2 = op2.Next;
if (op2 == op)
{
break;
}

continue;
}

if (op2.Point.X <= pt.X || op2.Prev.Point.X <= pt.X)
{
if (op2.Prev.Point.X < pt.X && op2.Point.X < pt.X)
{
val = 1 - val; // toggle val
}
else
{
float d = ClipperUtils.CrossProduct(op2.Prev.Point, op2.Point, pt);
if (d == 0)
{
return PointInPolygonResult.IsOn;
}

if ((d < 0) == isAbove)
{
val = 1 - val;
}
}
}

isAbove = !isAbove;
op2 = op2.Next;
}

if (isAbove != startingAbove)
{
float d = ClipperUtils.CrossProduct(op2.Prev.Point, op2.Point, pt);
if (d == 0)
{
return PointInPolygonResult.IsOn;
}

if ((d < 0) == isAbove)
{
val = 1 - val;
}
}

if (val == 0)
{
return PointInPolygonResult.IsOutside;
}
else
{
return PointInPolygonResult.IsInside;
}
}

private void ProcessHorzJoins()
{
foreach (HorzJoin j in this.horzJoinList)
Expand All @@ -1091,6 +939,7 @@ private void ProcessHorzJoins()
op1b.Prev = op2b;
op2b.Next = op1b;

// 'join' is really a split
if (or1 == or2)
{
or2 = new OutRec
Expand Down Expand Up @@ -1179,7 +1028,6 @@ private void DoSplitOp(OutRec outrec, OutPt splitOp)
OutPt prevOp = splitOp.Prev;
OutPt nextNextOp = splitOp.Next.Next;
outrec.Pts = prevOp;
OutPt result = prevOp;

ClipperUtils.GetIntersectPoint(
prevOp.Point, splitOp.Point, splitOp.Next.Point, nextNextOp.Point, out Vector2 ip);
Expand All @@ -1193,11 +1041,6 @@ private void DoSplitOp(OutRec outrec, OutPt splitOp)
return;
}

// nb: area1 is the path's area *before* splitting, whereas area2 is
// the area of the triangle containing splitOp & splitOp.next.
// So the only way for these areas to have the same sign is if
// the split triangle is larger than the path containing prevOp or
// if there's more than one self=intersection.
float area2 = AreaTriangle(ip, splitOp.Point, splitOp.Next.Point);
float absArea2 = Math.Abs(area2);

Expand All @@ -1220,6 +1063,11 @@ private void DoSplitOp(OutRec outrec, OutPt splitOp)
prevOp.Next = newOp2;
}

// nb: area1 is the path's area *before* splitting, whereas area2 is
// the area of the triangle containing splitOp & splitOp.next.
// So the only way for these areas to have the same sign is if
// the split triangle is larger than the path containing prevOp or
// if there's more than one self=intersection.
if (absArea2 > 1 && (absArea2 > absArea1 || ((area2 > 0) == (area1 > 0))))
{
OutRec newOutRec = this.NewOutRec();
Expand Down

0 comments on commit 85ec501

Please sign in to comment.