haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Gerbview: seriously speed up the calculation time to draw polygons on OpenGL. 

Mainly CacheTriangulation() was creating triangles using partition mode.
But this mode is optimized for Pcbnew and Gerbview and different internal units.
Now CacheTriangulation() is used in no partition, much faster in GERBVIEW_PAINTER.
Fixes #11549
https://gitlab.com/kicad/code/kicad/issues/11549
This commit is contained in:
jean-pierre charras 2022-05-13 18:09:22 +02:00
parent d252ce9026
commit 9108404efe
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gerbview/gerbview_painter.cpp
View File

@ -282,8 +282,11 @@ void GERBVIEW_PAINTER::draw( /*const*/ GERBER_DRAW_ITEM* aItem, int aLayer )
// On Opengl, a not convex filled polygon is usually drawn by using triangles as
// primitives. CacheTriangulation() can create basic triangle primitives to draw the
// polygon solid shape on Opengl
// We use the fastest CacheTriangulation calculation mode: no partition created because
// the partition is useless in Gerbview, and very time consumming (optimized only
// for pcbnew that has different internal unit)
if( m_gal->IsOpenGlEngine() && !aItem->m_AbsolutePolygon.IsTriangulationUpToDate() )
aItem->m_AbsolutePolygon.CacheTriangulation();
aItem->m_AbsolutePolygon.CacheTriangulation( false /* fastest triangulation calculation mode */ );
m_gal->DrawPolygon( aItem->m_AbsolutePolygon );
}

12
libs/kimath/include/geometry/shape_poly_set.h
View File

@ -498,6 +498,16 @@ public:
SHAPE_POLY_SET& operator=( const SHAPE_POLY_SET& aOther );
/**
* Build a polygon triangulation, needed to draw a polygon on OpenGL and in some
* other calculations
* @param aPartition = true to created a trinagulation in a partition on a grid
* false to create a more basic triangulation of the polygons
* Note
* in partition calculations the grid size is hard coded to 1e7.
* This is a good value for Pcbnew: 1cm, in internal units.
* But not good for Gerbview (1e7 = 10cm), however using a partition is not useful.
*/
void CacheTriangulation( bool aPartition = true );
bool IsTriangulationUpToDate() const;
@ -1359,7 +1369,7 @@ public:
/**
* Build a SHAPE_POLY_SET from a bunch of outlines in provided in random order.
*
*
* @param aPath set of closed outlines forming the polygon. Positive orientation = outline, negative = hole
* @param aReverseOrientation inverts the sign of the orientation of aPaths (so negative = outline)
* @param aEvenOdd forces the even-off fill rule (default is non zero)