pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix curve intersection

Browse Source
This commit is contained in:
Prokhorov Kirill
2025-09-08 09:47:53 +03:00
parent 9b7bb7c602
commit 39e6c1e2c6
3 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
DesktopEditor/graphics/BooleanOperations.cpp
View File

@ -75,7 +75,7 @@ bool Segment::IsValid(const BooleanOpType& op) const noexcept
else if (Id == 2 && Winding == 1)
return true;
}
else if (Winding == op)
else if (Winding && op == Intersection || !Winding && op == Union)
return true;
return false;
}
@ -396,18 +396,12 @@ Curve Curve::GetPart(double from, double to) const noexcept
if (from > 0)
{
result = Subdivide(from)[1];
result.Segment2.HI.X -= result.Segment2.P.X;
result.Segment2.HI.Y -= result.Segment2.P.Y;
result.Segment2.HO.X -= result.Segment2.P.X;
result.Segment2.HO.Y -= result.Segment2.P.Y;
result.Segment2.SetHandles(result.Segment2.HI, result.Segment2.HO);
}
if (to < 1)
{
result = result.Subdivide((to - from) / (1 - from))[0];
result.Segment2.HI.X -= result.Segment2.P.X;
result.Segment2.HI.Y -= result.Segment2.P.Y;
result.Segment2.HO.X -= result.Segment2.P.X;
result.Segment2.HO.Y -= result.Segment2.P.Y;
result.Segment2.SetHandles(result.Segment2.HI, result.Segment2.HO);
}
if (from > to)
@ -688,8 +682,7 @@ void Curve::Flip() noexcept
PointD tmpHI = Segment2.P + Segment2.HI;
PointD tmpHO = Segment2.P + Segment2.HO;
std::swap(Segment1.P, Segment2.P);
Segment2.HI = tmpHI - Segment2.P;
Segment2.HO = tmpHO - Segment2.P;
Segment2.SetHandles(tmpHO, tmpHI);
}
bool Curve::IsStraight() const noexcept
@ -938,7 +931,8 @@ void CBooleanOperations::TraceAllOverlap()
}
else
{
bool winding1, winding2;
bool winding1{false},
winding2{false};
for (const auto& s : Segments1)
{
if (!s.Inters)
@ -966,7 +960,7 @@ void CBooleanOperations::TraceAllOverlap()
{
if (!winding1 && !winding2)
TracePaths();
else if (!winding2)
else if (!winding1)
Result = std::move(Path1);
else
Result = std::move(Path2);
@ -1545,9 +1539,9 @@ int CBooleanOperations::AddCurveIntersection(const Curve& curve1, const Curve& c
double d1 = getSignedDistance(x2[0], y2[0], x2[3], y2[3], x2[1], y2[1], false),
d2 = getSignedDistance(x2[0], y2[0], x2[3], y2[3], x2[2], y2[2], false),
factor = (d1 * d2) > 0 ? 3.0 / 4.0 : 4.0 / 9.0,
dMin = factor * min(0, d1, d2),
dMax = factor * max(0, d1, d2),
factor = (d1 * d2) > 0.0 ? 3.0 / 4.0 : 4.0 / 9.0,
dMin = factor * min(0.0, d1, d2),
dMax = factor * max(0.0, d1, d2),
dp0 = getSignedDistance(x2[0], y2[0], x2[3], y2[3], x1[0], y1[0], false),
dp1 = getSignedDistance(x2[0], y2[0], x2[3], y2[3], x1[1], y1[1], false),
dp2 = getSignedDistance(x2[0], y2[0], x2[3], y2[3], x1[2], y1[2], false),

2
DesktopEditor/graphics/GraphicsPath.h
View File

@ -189,7 +189,7 @@ namespace Aggplus
Exclusion = 3
};
GRAPHICS_DECL CGraphicsPath CalcBooleanOperation(const CGraphicsPath& path1, const CGraphicsPath& path2, BooleanOpType op, long fillType, bool isLuminosity);
GRAPHICS_DECL CGraphicsPath CalcBooleanOperation(const CGraphicsPath& path1, const CGraphicsPath& path2, BooleanOpType op, long fillType = c_nWindingFillMode, bool isLuminosity = false);
} // namespace Aggplus

2
DesktopEditor/graphics/boolean_operations_math.h
View File

@ -244,7 +244,7 @@ inline void getConvexHull(const double& dq0, const double& dq1,
}
}
if (dist1 < 0.0 || dist2 < 0.0)
if (dist1 < 0.0 || (dist1 == 0.0 && dist2 < 0.0))
std::swap(top, bottom);
}