66232248ff
This change is for speedup of fat line drawing when using X11. This is a long-term problem which never really progressed, but is avoided using Cairo in the future. Still - if used, speedup using current state and buffering possibilities. Two speedup steps will be used: (1) The tesselation is no longer done using trapezoids. That works (but was done wrong leaving artifacts) but is not fast and done every time. It is even not done with FatLines and more than 1000 points. New version will use triangulation. Dspite using the existing triangulator (that works but is slow) extend the FatLine geometry creator to directly create triangles. This is also necessary since for buffering that data a transformation-invariant version is needed (in device coordinates the data changes all the time when scrolling). Trapezoids are by definition *not* transformation-invariant (e.g. rotation) (2) Buffer that triangulation - with the needed care and watch. It is e.g. necessary to react on 'hairlines' since these change their logical LineWidth view-dependent (zoom). In those cases, the buffered data *has* to be removed due to the base for buffering is the created FatLine geometry based on one stable logical LineWidth Also took the time to adapt B2DPolygonTriangulator to use an own data type (B2DTriangle) and a vector of these for better understandability and security. Adapted all usages as needed. Change-Id: Iedb2932b094a8786fd9c32d0d0ab1ca603a1a7b2 Reviewed-on: https://gerrit.libreoffice.org/60818 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
142 lines
6.0 KiB
C++
142 lines
6.0 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#include <sal/config.h>
|
|
#include <sal/log.hxx>
|
|
|
|
#include <basegfx/polygon/b2dpolygoncutandtouch.hxx>
|
|
#include <basegfx/polygon/b2dpolygontriangulator.hxx>
|
|
#include <basegfx/polygon/b2dpolypolygontools.hxx>
|
|
|
|
#include "surfaceproxy.hxx"
|
|
|
|
namespace canvas
|
|
{
|
|
SurfaceProxy::SurfaceProxy( const std::shared_ptr<canvas::IColorBuffer>& pBuffer,
|
|
const PageManagerSharedPtr& pPageManager ) :
|
|
mpPageManager( pPageManager ),
|
|
maSurfaceList(),
|
|
mpBuffer( pBuffer )
|
|
{
|
|
const ::basegfx::B2ISize aImageSize(mpBuffer->getWidth(),mpBuffer->getHeight());
|
|
const ::basegfx::B2ISize aPageSize(mpPageManager->getPageSize());
|
|
const sal_Int32 aPageSizeX(aPageSize.getX());
|
|
const sal_Int32 aPageSizeY(aPageSize.getY());
|
|
const sal_Int32 aImageSizeX(aImageSize.getX());
|
|
const sal_Int32 aImageSizeY(aImageSize.getY());
|
|
|
|
// see if the size of the colorbuffer is larger than the size
|
|
// of a single page. if this is the case we divide the
|
|
// colorbuffer into as many surfaces as we need to get the
|
|
// whole area distributed. otherwise (the colorbuffer is
|
|
// smaller than the size of a single page) we search for free
|
|
// pages or create a new one.
|
|
// the incoming image is too large to fit into a single
|
|
// page. strategy: we split the image into rectangular
|
|
// areas that are as large as the maximum page size
|
|
// dictates and follow the strategy for fitting images.
|
|
size_t dwNumSurfaces(0);
|
|
for(sal_Int32 y=0; y<aImageSizeY; y+=aPageSizeY)
|
|
for(sal_Int32 x=0; x<aImageSizeX; x+=aPageSizeX)
|
|
++dwNumSurfaces;
|
|
maSurfaceList.reserve(dwNumSurfaces);
|
|
|
|
for(sal_Int32 y=0; y<aImageSizeY; y+=aPageSizeY)
|
|
{
|
|
for(sal_Int32 x=0; x<aImageSizeX; x+=aPageSizeX)
|
|
{
|
|
// the current surface is located at the position [x,y]
|
|
// and has the size [min(restx,pagesizex),min(resty,pagesizey)
|
|
::basegfx::B2IPoint aOffset(x,y);
|
|
::basegfx::B2ISize aSize( std::min( aImageSize.getX()-x,
|
|
aPageSize.getX() ),
|
|
std::min( aImageSize.getY()-y,
|
|
aPageSize.getY() ) );
|
|
|
|
maSurfaceList.push_back(
|
|
std::make_shared<Surface>(
|
|
mpPageManager,
|
|
mpBuffer,
|
|
aOffset,
|
|
aSize));
|
|
}
|
|
}
|
|
}
|
|
|
|
void SurfaceProxy::setColorBufferDirty()
|
|
{
|
|
for( const auto& rSurfacePtr : maSurfaceList )
|
|
rSurfacePtr->setColorBufferDirty();
|
|
}
|
|
|
|
bool SurfaceProxy::draw( double fAlpha,
|
|
const ::basegfx::B2DPoint& rPos,
|
|
const ::basegfx::B2DHomMatrix& rTransform )
|
|
{
|
|
for( const auto& rSurfacePtr : maSurfaceList )
|
|
rSurfacePtr->draw( fAlpha, rPos, rTransform );
|
|
|
|
return true;
|
|
}
|
|
|
|
bool SurfaceProxy::draw( double fAlpha,
|
|
const ::basegfx::B2DPoint& rPos,
|
|
const ::basegfx::B2DRange& rArea,
|
|
const ::basegfx::B2DHomMatrix& rTransform )
|
|
{
|
|
for( const auto& rSurfacePtr : maSurfaceList )
|
|
rSurfacePtr->drawRectangularArea( fAlpha, rPos, rArea, rTransform );
|
|
|
|
return true;
|
|
}
|
|
|
|
bool SurfaceProxy::draw( double fAlpha,
|
|
const ::basegfx::B2DPoint& rPos,
|
|
const ::basegfx::B2DPolyPolygon& rClipPoly,
|
|
const ::basegfx::B2DHomMatrix& rTransform )
|
|
{
|
|
const ::basegfx::triangulator::B2DTriangleVector& rTriangulatedVector(
|
|
::basegfx::triangulator::triangulate(rClipPoly));
|
|
|
|
// we have now an explicit ::B2DTriangle and ::B2DTriangleVector,
|
|
// but I do not know enough about 'drawWithClip' or 'clipTriangleListOnRange'
|
|
// to adapt to that. Convert back to old three-point-in-polygon convention
|
|
::basegfx::B2DPolygon aTriangulatedPolygon;
|
|
aTriangulatedPolygon.reserve(rTriangulatedVector.size() * 3);
|
|
|
|
for(const auto& rCandidate : rTriangulatedVector)
|
|
{
|
|
aTriangulatedPolygon.append(rCandidate.getA());
|
|
aTriangulatedPolygon.append(rCandidate.getB());
|
|
aTriangulatedPolygon.append(rCandidate.getC());
|
|
}
|
|
|
|
// dump polygons
|
|
SAL_INFO("canvas", "Original clip polygon: " << basegfx::utils::exportToSvgD( rClipPoly, true, true, false ));
|
|
SAL_INFO("canvas", "Triangulated polygon: " << basegfx::utils::exportToSvgD(basegfx::B2DPolyPolygon(aTriangulatedPolygon), true, true, false ));
|
|
|
|
for( const auto& rSurfacePtr : maSurfaceList )
|
|
rSurfacePtr->drawWithClip( fAlpha, rPos, aTriangulatedPolygon, rTransform );
|
|
|
|
return true;
|
|
}
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|