Kaydet (Commit) 08f81f0b authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl Kaydeden (comit) Andras Timar

tdf#93736 opengl: use "old" SubdivideBezier when drawing PolyLines

SubdivideBezier creates polygons which are more exact for drawing
in opengl when drawing hairline PolyLines - so let's use that with
AA line drawing.

(cherry picked from commit b3de73f3)

Change-Id: I490fd0f19361b5fc9e1f4e03851c1ae1a1f75f71
Signed-off-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
üst b9cfedce
......@@ -1419,30 +1419,25 @@ bool OpenGLSalGraphicsImpl::drawPolyLine(
const double fHalfWidth = 0.5 * rLineWidth.getX();
// shortcut for hairline drawing to improve performance
if( bIsHairline )
if (bIsHairline)
{
basegfx::B2DTrapezoidVector aTrapezVector;
basegfx::tools::createLineTrapezoidFromB2DPolygon(aTrapezVector, aPolygon, rLineWidth.getX());
if (aTrapezVector.size())
PreDraw();
if (UseSolidAA(mnLineColor, fTransparency))
{
PreDraw();
if (UseSolidAA(mnLineColor, fTransparency))
Polygon aToolsPolygon(aPolygon);
sal_uInt32 nPoints = aToolsPolygon.GetSize();
if (aToolsPolygon.HasFlags())
{
aToolsPolygon = Polygon::SubdivideBezier(aToolsPolygon);
nPoints = aToolsPolygon.GetSize();
}
for (sal_uInt32 i = 0; i < nPoints - 1; ++i)
{
for (size_t i = 0; i < aTrapezVector.size(); ++i)
{
const basegfx::B2DPolygon& rTrapezPolygon = aTrapezVector[i].getB2DPolygon();
sal_uInt32 nPoints = rTrapezPolygon.count();
for (sal_uInt32 j = 0; j < nPoints - 1; ++j)
{
const basegfx::B2DPoint& rPoint1 = rTrapezPolygon.getB2DPoint(j);
const basegfx::B2DPoint& rPoint2 = rTrapezPolygon.getB2DPoint(j + 1);
DrawLineAA(rPoint1.getX(), rPoint1.getY(),
rPoint2.getX(), rPoint2.getY());
}
}
DrawLineAA(aToolsPolygon[i].X(), aToolsPolygon[i].Y(),
aToolsPolygon[i + 1].X(), aToolsPolygon[i + 1].Y());
}
PostDraw();
}
PostDraw();
return true;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment